[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
branch master updated: * tp/Texinfo/Convert/HTML.pm (_convert_heading_co
|
From: |
Patrice Dumas |
|
Subject: |
branch master updated: * tp/Texinfo/Convert/HTML.pm (_convert_heading_command): use command as class for anchors, as if it is a @node the heading has another class name, and for an empty @top, there are two classes as for sectioning commands. Move code around, change variable names, add comments for clarity and add FIXMEs. |
|
Date: |
Tue, 11 Jan 2022 17:37:29 -0500 |
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 ce27db8d04 * tp/Texinfo/Convert/HTML.pm (_convert_heading_command):
use command as class for anchors, as if it is a @node the heading has another
class name, and for an empty @top, there are two classes as for sectioning
commands. Move code around, change variable names, add comments for clarity and
add FIXMEs.
ce27db8d04 is described below
commit ce27db8d0465b36212fdad08e454a3526ca2d12e
Author: Patrice Dumas <pertusus@free.fr>
AuthorDate: Tue Jan 11 23:37:17 2022 +0100
* tp/Texinfo/Convert/HTML.pm (_convert_heading_command): use
command as class for anchors, as if it is a @node the
heading has another class name, and for an empty @top, there
are two classes as for sectioning commands.
Move code around, change variable names, add comments for
clarity and add FIXMEs.
* tp/Texinfo/Convert/HTML.pm (_convert_index_command): use
index-entry-id as class name.
* tp/Texinfo/Convert/HTML.pm (_normalized_label_id_file):
rename _node_id_file() as _normalized_label_id_file().
* tp/Texinfo/Convert/HTML.pm: change variable names for better
code readibility.
---
ChangeLog | 18 ++
tp/TODO | 17 ++
tp/Texinfo/Convert/HTML.pm | 137 ++++++-----
.../results/converters_tests/at_commands_in_raw.pl | 2 +-
.../index_entry_in_preformatted.pl | 6 +-
.../printindex_merged_indices_code_style.pl | 10 +-
.../converters_tests/spaces_in_empty_node_names.pl | 2 +-
.../converters_tests/spaces_in_node_names.pl | 8 +-
tp/t/results/converters_tests/top_in_ref.pl | 4 +-
.../converters_tests/top_in_ref_keep_top.pl | 4 +-
tp/t/results/coverage/commands.pl | 2 +-
tp/t/results/coverage/multitable.pl | 2 +-
.../coverage/punctuation_in_line_commands.pl | 2 +-
tp/t/results/coverage/table.pl | 4 +-
.../results/coverage_braces/heading_in_footnote.pl | 2 +-
tp/t/results/float/cindex_in_caption.pl | 2 +-
tp/t/results/float/complex_float.pl | 6 +-
tp/t/results/float/float_copying.pl | 24 +-
.../char_latin1_latin1_in_refs/res_html/c.html | 12 +-
.../char_latin1_utf8_in_refs/res_html/c.html | 12 +-
.../res_html/A-a-_002c-E-e.html | 2 +-
.../res_html/DiYiZhang_0028First-Chapter_0029.html | 8 +-
tp/t/results/formatting/cond.pl | 2 +-
.../results/formatting/cond_ifhtml_ifinfo_iftex.pl | 2 +-
.../cond_no-ifhtml_no-ifinfo_no-iftex.pl | 2 +-
.../float_copying/res_html/Copying-and-floats.html | 10 +-
.../float_copying/res_html/float_copying_fot.html | 12 +-
.../formatting/float_copying/res_html/index.html | 6 +-
.../res_html/simplest.html | 2 +-
.../simplest_test_prefix/res_html/truc.html | 2 +-
tp/t/results/formatting/texi_cond.pl | 2 +-
tp/t/results/heading/heading_in_copying.pl | 2 +-
tp/t/results/html_tests/check_htmlxref.pl | 2 +-
.../results/html_tests/index_and_node_same_name.pl | 2 +-
tp/t/results/html_tests/index_below.pl | 2 +-
.../res_html/circumflex.html | 2 +-
.../redirection_same_labels/res_html/umlaut.html | 4 +-
tp/t/results/html_tests/ref_in_preformatted.pl | 4 +-
tp/t/results/html_tests/simple_menu.pl | 2 +-
.../htmlxref/htmlxref/res_html/test_refs.html | 6 +-
...25_0026_0027_0028_0029_002a_002b_002d_002e.html | 2 +-
...3f_005b_005c_005d_005e_005f_0060_007c_007e.html | 2 +-
.../htmlxref_nodes/res_html/local-node.html | 2 +-
.../htmlxref_only_mono/res_html/test_refs.html | 6 +-
...25_0026_0027_0028_0029_002a_002b_002d_002e.html | 2 +-
...3f_005b_005c_005d_005e_005f_0060_007c_007e.html | 2 +-
.../res_html/local-node.html | 2 +-
.../htmlxref_only_split/res_html/test_refs.html | 6 +-
...25_0026_0027_0028_0029_002a_002b_002d_002e.html | 2 +-
...3f_005b_005c_005d_005e_005f_0060_007c_007e.html | 2 +-
.../res_html/local-node.html | 2 +-
tp/t/results/indices/def_syn_indices.pl | 14 +-
...default_cp_index_and_one_letter_syncodeindex.pl | 4 +-
tp/t/results/indices/double_index_entry.pl | 10 +-
tp/t/results/indices/double_syncodeindex.pl | 4 +-
tp/t/results/indices/empty_string_index_entry.pl | 2 +-
.../encoding_index_ascii/res_html/index.html | 110 ++++-----
.../res_html/index.html | 110 ++++-----
.../encoding_index_latin1/res_html/index.html | 110 ++++-----
.../res_html/index.html | 110 ++++-----
.../encoding_index_utf8/res_html/index.html | 110 ++++-----
.../res_html/index.html | 110 ++++-----
tp/t/results/indices/explicit_sort_key.pl | 10 +-
tp/t/results/indices/ftable_vtable.pl | 2 +-
tp/t/results/indices/image_lines_count.pl | 2 +-
tp/t/results/indices/image_text_lines_count.pl | 2 +-
tp/t/results/indices/index_entries_locations.pl | 8 +-
.../indices/index_entry_before_first_node.pl | 2 +-
tp/t/results/indices/index_entry_before_node.pl | 8 +-
tp/t/results/indices/index_entry_in_footnote.pl | 2 +-
.../index_entry_in_footnote_different_node_end.pl | 8 +-
.../indices/index_entry_in_footnote_separate.pl | 8 +-
.../indices/printindex_index_entry_in_copying.pl | 4 +-
...rintindex_index_entry_in_copying_in_footnote.pl | 4 +-
.../indices/printindex_with_space_before.pl | 2 +-
.../indices/same_index_entry_merged_indices.pl | 2 +-
tp/t/results/indices/seealso_duplicate.pl | 4 +-
tp/t/results/indices/seeentry.pl | 2 +-
tp/t/results/indices/subentries.pl | 18 +-
tp/t/results/indices/subentry_and_sortas.pl | 12 +-
tp/t/results/indices/syncode_index_print_both.pl | 4 +-
tp/t/results/indices/syncodeindex_to_plain.pl | 6 +-
tp/t/results/indices/transparent_sort_chars.pl | 8 +-
tp/t/results/indices/w_lines_count.pl | 4 +-
.../itemize/inter_item_commands_in_enumerate.pl | 14 +-
.../itemize/inter_item_commands_in_itemize.pl | 8 +-
.../no_monolithic/res_html/no_monolithic.html | 2 +-
tp/t/results/menu/comment_on_menu_line.pl | 2 +-
tp/t/results/menu/entry_after_detailmenu.pl | 6 +-
tp/t/results/menu/menu_title_before_entries.pl | 4 +-
tp/t/results/menu/sc_in_menu.pl | 4 +-
.../misc_commands/comment_space_command_on_line.pl | 2 +-
tp/t/results/morecoverage/formatting_fr.pl | 40 ++--
tp/t/results/morecoverage/texi_formatting.pl | 40 ++--
.../res_html/double_index_entry.html | 10 +-
.../index_no_node/res_html/Chapter.html | 4 +-
.../moreindices/index_no_node/res_html/index.html | 18 +-
.../index_no_node/res_html/unnumbered.html | 6 +-
.../moreindices/index_split/res_html/first.html | 42 ++--
.../moreindices/index_split/res_html/index.html | 2 +-
.../index_split_nodes/res_html/first.html | 16 +-
.../index_split_nodes/res_html/index.html | 2 +-
.../res_html/node-2-in-section-3.html | 8 +-
.../res_html/node-3-in-section-3.html | 4 +-
.../res_html/node-in-section-3.html | 4 +-
.../index_split_nodes/res_html/section-1.html | 4 +-
.../index_split_nodes/res_html/section-3.html | 2 +-
.../index_split_nodes/res_html/subsection-2.html | 4 +-
.../res_html/first-before-top.html | 36 +--
.../nodes_before_top/res_html/index.html | 4 +-
.../res_html/nodes_before_top_and_sections.html | 42 ++--
.../nodes_before_top_no_nodes/res_html/index.html | 34 +--
.../nodes_before_top_nodes/res_html/a-node.html | 8 +-
.../nodes_before_top_nodes/res_html/another.html | 8 +-
.../res_html/first-before-top.html | 4 +-
.../nodes_before_top_nodes/res_html/first.html | 8 +-
.../nodes_before_top_nodes/res_html/index.html | 4 +-
.../res_html/node-in-menu-before-top.html | 6 +-
.../nodes_before_top_nodes/res_html/second.html | 2 +-
.../split_chapter_index/res_html/first.html | 22 +-
.../split_chapter_index/res_html/index.html | 2 +-
.../res_html/equivalent_nodes.html | 6 +-
.../res_html/equivalent_nodes.html | 6 +-
.../node_footnote_end/res_html/node_footnote.html | 8 +-
.../res_html/node_footnote.html | 8 +-
.../node_footnote_use_node/res_html/a.html | 6 +-
.../node_footnote_use_node/res_html/index.html | 2 +-
.../res_html/nodes_after_top_before_chapter.html | 4 +-
.../res_html/index.html | 4 +-
.../res_html/index.html | 4 +-
.../res_html/nodes_after_top_before_section.html | 4 +-
.../res_html/index.html | 4 +-
.../res_html/placed_things_before_element.html | 2 +-
.../sectioning_frames/res_html/First-node.html | 2 +-
.../res_html/Third-node-unnumbered.html | 2 +-
.../sectioning_frames/res_html/index.html | 2 +-
.../inter_item_commands_in_multitable.pl | 6 +-
.../sectioning/character_and_spaces_in_node.pl | 10 +-
.../sectioning/character_and_spaces_in_refs.pl | 6 +-
...25_0026_0027_0028_0029_002a_002b_002d_002e.html | 2 +-
...3f_005b_005c_005d_005e_005f_0060_007c_007e.html | 2 +-
.../res_html/local-node.html | 2 +-
.../results/sectioning/double_node_anchor_float.pl | 2 +-
tp/t/results/sectioning/double_top.pl | 2 +-
tp/t/results/sectioning/empty_top_node_up.pl | 2 +-
tp/t/results/sectioning/equivalent_nodes.pl | 4 +-
.../results/sectioning/explicit_node_directions.pl | 6 +-
tp/t/results/sectioning/internal_top_node_up.pl | 2 +-
tp/t/results/sectioning/no_element.pl | 2 +-
tp/t/results/sectioning/no_menu.pl | 2 +-
.../sectioning/node_sectop_before_lone_node_Top.pl | 2 +-
tp/t/results/sectioning/node_up_external_node.pl | 4 +-
.../nodes_after_top_before_chapter_nodes.pl | 4 +-
.../nodes_after_top_before_chapter_not_split.pl | 4 +-
...ore_chapter_not_split_no_use_node_directions.pl | 4 +-
.../nodes_after_top_before_chapter_sections.pl | 4 +-
.../nodes_after_top_before_section_nodes.pl | 4 +-
.../nodes_after_top_before_section_sections.pl | 4 +-
.../nodes_no_node_top_explicit_directions.pl | 4 +-
.../non_automatic_internal_top_node_up.pl | 2 +-
.../non_automatic_top_node_up_and_url.pl | 2 +-
.../sectioning/non_automatic_top_node_up_url.pl | 2 +-
tp/t/results/sectioning/part_node_after_top.pl | 2 +-
tp/t/results/sectioning/part_node_before_top.pl | 2 +-
.../sectioning/placed_things_before_element.pl | 2 +-
.../sectioning/placed_things_before_node.pl | 2 +-
.../sectioning/protected_node_parentheses.pl | 2 +-
.../section_before_after_top_node_last_node.pl | 2 +-
tp/t/results/sectioning/space_in_node.pl | 8 +-
.../results/sectioning/top_no_argument_and_node.pl | 2 +-
.../sectioning/top_no_argument_and_top_node.pl | 2 +-
.../sectioning/top_node_no_menu_direction.pl | 4 +-
tp/t/results/sectioning/top_node_up_url.pl | 2 +-
.../res_html/a.html | 4 +-
.../res_html/index.html | 2 +-
.../res_html/n.html | 2 +-
tp/t/results/sectioning/two_nodes_at_the_end.pl | 4 +-
.../sectioning/two_nodes_between_chapters.pl | 2 +-
tp/t/results/xtable/block_commands_in_table.pl | 2 +-
.../results/xtable/inter_item_commands_in_table.pl | 22 +-
.../inter_item_commands_in_table_in_example.pl | 2 +-
tp/t/test_utils.pl | 2 +-
.../index_and_node_same_name.html | 2 +-
.../index_entry_in_footnote.html | 2 +-
.../index_no_node_no_top/index_no_node_no_top.html | 28 +--
.../res_parser/index_nodes/index_nodes.html | 28 +--
.../res_parser/index_nodes_nodes/a-node.html | 8 +-
.../res_parser/index_nodes_nodes/another.html | 8 +-
.../res_parser/index_nodes_nodes/first.html | 10 +-
.../res_parser/index_nodes_nodes/index.html | 4 +-
.../res_parser/index_nodes_nodes/second.html | 2 +-
.../res_parser/index_one_node/index_one_node.html | 6 +-
.../res_parser/index_special_region/Chapter.html | 4 +-
.../index_special_region/Copying-and-indices.html | 6 +-
.../index_special_region_fot.html | 4 +-
.../index_special_region_html/Chapter.html | 4 +-
.../Copying-and-indices.html | 6 +-
.../index_special_region_html/index.html | 4 +-
.../index_special_region_fot.html | 8 +-
.../Chapter.html | 2 +-
.../Copying-and-indices.html | 4 +-
.../Chapter.html | 2 +-
.../Copying-and-indices.html | 4 +-
.../index.html | 4 +-
.../index_special_region_no_insertcopying_fot.html | 4 +-
.../index_special_region_no_region/Chapter.html | 2 +-
.../Copying-and-indices.html | 4 +-
.../Chapter.html | 2 +-
.../Copying-and-indices.html | 4 +-
.../index_special_region_no_region_html/index.html | 4 +-
.../index_special_region_no_region_fot.html | 4 +-
.../res_parser/index_table/indices-refs.html | 256 ++++++++++-----------
.../index_table/node-with-ftable-and-vtable.html | 4 +-
.../indices_in_begin_tables_lists.html | 44 ++--
.../chapter.html | 4 +-
.../index.html | 38 +--
.../chapter.html | 4 +-
.../first-before-top.html | 10 +-
.../index.html | 30 +--
.../printindex_between_node_section.html | 32 +--
.../printindex_between_part_chapter.html | 32 +--
.../Copying-and-indices.html | 8 +-
.../index_special_region_html/index.html | 6 +-
.../Copying-and-indices.html | 4 +-
.../index.html | 2 +-
.../Copying-and-indices.html | 4 +-
.../index_special_region_no_region_html/index.html | 2 +-
.../chapter.html | 4 +-
.../first-before-top.html | 10 +-
.../index.html | 30 +--
.../chapter.html | 4 +-
.../first-before-top.html | 10 +-
.../index.html | 30 +--
.../layout/res_parser/formatting/formatting.html | 134 +++++------
.../layout/res_parser/formatting_chm/chapter.html | 98 ++++----
.../res_parser/formatting_chm/formatting.html | 36 +--
.../formatting_enable_encoding/formatting.html | 134 +++++------
.../EPUB/xhtml/formatting.xhtml | 134 +++++------
.../EPUB/xhtml/chapter.xhtml | 94 ++++----
.../EPUB/xhtml/formatting.xhtml | 36 +--
.../EPUB/xhtml/formatting_fot.xhtml | 4 +-
.../res_parser/formatting_exotic/chapter.html | 98 ++++----
.../res_parser/formatting_fr_icons/formatting.html | 134 +++++------
.../res_parser/formatting_html/formatting.html | 134 +++++------
.../formatting_html_no_texi2html/formatting.html | 98 ++++----
.../res_parser/formatting_html_nodes/chapter.html | 94 ++++----
.../formatting_html_nodes/formatting_fot.html | 4 +-
.../res_parser/formatting_html_nodes/index.html | 36 +--
.../formatting_inline_css/formatting.html | 134 +++++------
.../res_parser/formatting_mathjax/formatting.html | 134 +++++------
.../res_parser/formatting_nodes/chapter.html | 94 ++++----
.../formatting_nodes/formatting_fot.html | 4 +-
.../layout/res_parser/formatting_nodes/index.html | 36 +--
.../formatting_numerical_entities/formatting.html | 134 +++++------
.../formatting_regions/formatting_regions.html | 104 ++++-----
.../formatting_weird_quotes/formatting.html | 134 +++++------
.../res_parser/formatting_xhtml/formatting.html | 134 +++++------
.../no_monolithic_only_toc_out/no_monolithic.html | 2 +-
.../sectioning_directions/sectioning.html | 6 +-
.../First-node.html | 2 +-
.../Third-node-unnumbered.html | 2 +-
.../sectioning_directions_split_chapter/index.html | 2 +-
.../res_parser/formatting_singular/chapter.html | 94 ++++----
.../res_parser/formatting_singular/sing_fot.htm | 4 +-
.../res_parser/tex_not_closed/tex_not_closed.html | 2 +-
265 files changed, 2475 insertions(+), 2409 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 0a61d63e1a..cdbef8aa8b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,21 @@
+2022-01-11 Patrice Dumas <pertusus@free.fr>
+
+ * tp/Texinfo/Convert/HTML.pm (_convert_heading_command): use
+ command as class for anchors, as if it is a @node the
+ heading has another class name, and for an empty @top, there
+ are two classes as for sectioning commands.
+ Move code around, change variable names, add comments for
+ clarity and add FIXMEs.
+
+ * tp/Texinfo/Convert/HTML.pm (_convert_index_command): use
+ index-entry-id as class name.
+
+ * tp/Texinfo/Convert/HTML.pm (_normalized_label_id_file):
+ rename _node_id_file() as _normalized_label_id_file().
+
+ * tp/Texinfo/Convert/HTML.pm: change variable names for better
+ code readibility.
+
2022-01-10 Patrice Dumas <pertusus@free.fr>
* tp/Texinfo/Convert/HTML.pm (%css_map, _protect_space):
diff --git a/tp/TODO b/tp/TODO
index 19383939a0..11da404f6d 100644
--- a/tp/TODO
+++ b/tp/TODO
@@ -17,6 +17,23 @@ Change in doc:
The text of @copying is output as a comment at the beginning of Info, HTML,
XML, and DocBook output files.
Not true for docbook and XML, it is in elements.
+
+Test of ASCII_PUNCTUATION on texinfo like:
+
+``in double q''. `in simple q'.
+
+@'e, --- @dfn{def} @code{in code}. aé. @exclamdown{}. @dots{}
+@geq{} @enddots{} @AA{} @'e @dotaccent{A} @l{}. @copyright{}. @error{}.
+@quotedblright{}.
+
+Check existing tests there are already some that are similar, in particular
+t/html_tests.t $test_accents_sc_no_brace_commands_quotes (also tests @sc and
accents)
+
+Test with @documentencoding ISO-8859-1, default (@documentencoding utf-8)
+and @documentencoding US-ASCII using files as there is an encoded character
+and test also OUTPUT_ENCODING (set to utf8)
+
+
Bugs
====
diff --git a/tp/Texinfo/Convert/HTML.pm b/tp/Texinfo/Convert/HTML.pm
index ad54834341..8301c18f21 100644
--- a/tp/Texinfo/Convert/HTML.pm
+++ b/tp/Texinfo/Convert/HTML.pm
@@ -568,6 +568,8 @@ sub _get_target($$)
}
# API for elemnts directions formatting
+
+# This returns the id specific of the $COMMAND tree element
sub command_id($$)
{
my $self = shift;
@@ -3265,21 +3267,37 @@ sub _convert_heading_command($$$$$)
my $result = '';
# not clear that it may really happen
- if ($self->in_string) {
+ if ($self->in_string()) {
$result .= $self->command_string($element) ."\n" if ($cmdname ne 'node');
$result .= $content if (defined($content));
return $result;
}
my $element_id = $self->command_id($element);
- my $section;
+
+ my $level_corrected_cmdname = $cmdname;
+ if (defined $element->{'structure'}->{'section_level'}) {
+ # if the level was changed, use a consistent command name
+ $level_corrected_cmdname
+ = Texinfo::Structuring::section_level_adjusted_command_name($element);
+ }
+
+ # find the section starting here, can be through the associated node
+ # preceding the section, or the section itself
+ my $opening_section;
+ my $level_corrected_opening_section_cmdname;
if ($cmdname eq 'node' and $element->{'extra'}->{'associated_section'}) {
- $section = $element->{'extra'}->{'associated_section'};
+ $opening_section = $element->{'extra'}->{'associated_section'};
+ $level_corrected_opening_section_cmdname
+ =
Texinfo::Structuring::section_level_adjusted_command_name($opening_section);
} elsif ($cmdname ne 'node'
+ # if there is an associated node, it is not a section opening
+ # the section was opened before when the node was encountered
and not $element->{'extra'}->{'associated_node'}
# to avoid *heading* @-commands
and $Texinfo::Common::root_commands{$cmdname}) {
- $section = $element;
+ $opening_section = $element;
+ $level_corrected_opening_section_cmdname = $level_corrected_cmdname;
}
print STDERR "CONVERT elt heading $element "
@@ -3298,12 +3316,16 @@ sub _convert_heading_command($$$$$)
# if set, the id is associated to the heading text
my $heading_id;
- if ($section) {
- my $level = $section->{'structure'}->{'section_level'};
+ if ($opening_section) {
+ my $level = $opening_section->{'structure'}->{'section_level'};
$result .= join('', $self->close_registered_sections_level($level));
$self->register_opened_section_level($level, "</div>\n");
- $result .= $self->html_attribute_class('div', $section->{'cmdname'});
+ # FIXME if this is not the section element, it should not be the
+ # section as class
+ $result .= $self->html_attribute_class('div',
$opening_section->{'cmdname'});
+ #"${level_corrected_section_opening_cmdname}");
+ #"${level_corrected_section_opening_cmdname}-level-extent");
$result .= " id=\"$element_id\""
if (defined($element_id) and $element_id ne '');
@@ -3311,9 +3333,9 @@ sub _convert_heading_command($$$$$)
} elsif (defined($element_id) and $element_id ne '') {
if ($element_header ne '') {
# case of a @node without sectioning command and with a header.
- # put the anchor element before the header
+ # put the node element anchor before the header
$result .= &{$self->{'format_separate_anchor'}}($self, $element_id,
- "${cmdname}-anchor");
+ $cmdname);
} else {
$heading_id = $element_id;
}
@@ -3322,7 +3344,6 @@ sub _convert_heading_command($$$$$)
$result .= $element_header;
my $heading_level;
- my $cmdname_for_heading = $cmdname;
# node is used as heading if there is nothing else.
if ($cmdname eq 'node') {
# FIXME what to do if the $tree_unit extra does not contain any
@@ -3331,8 +3352,7 @@ sub _convert_heading_command($$$$$)
# or !$tree_unit->{'extra'}->{'unit_command'}
or ($tree_unit->{'extra'}->{'unit_command'}
and $tree_unit->{'extra'}->{'unit_command'} eq $element
- and $tree_unit->{'extra'}->{'unit_command'}->{'cmdname'} eq 'node'
- and not
$tree_unit->{'extra'}->{'unit_command'}->{'extra'}->{'associated_section'}))
+ and not $element->{'extra'}->{'associated_section'}))
and defined($element->{'extra'}->{'normalized'})) {
if ($element->{'extra'}->{'normalized'} eq 'Top') {
$heading_level = 0;
@@ -3342,9 +3362,6 @@ sub _convert_heading_command($$$$$)
}
} elsif (defined $element->{'structure'}->{'section_level'}) {
$heading_level = $element->{'structure'}->{'section_level'};
- # if the level was changed, set the command name right
- $cmdname_for_heading
- = Texinfo::Structuring::section_level_adjusted_command_name($element);
} else {
# for *heading* @-commands which do not have a level
# in the document as they are not associated with the
@@ -3374,14 +3391,19 @@ sub _convert_heading_command($$$$$)
}
$result .= "<strong${id_str}>".$heading.'</strong>'."\n";
} else {
- $result .= &{$self->{'format_heading_text'}}($self, $cmdname_for_heading,
+ # FIXME for sectioning commands there is a class here but
+ # it also was the opening section, possibly when encountering
+ # the associated node element
+ $result .= &{$self->{'format_heading_text'}}($self,
$level_corrected_cmdname,
$heading, $heading_level
+$self->get_conf('CHAPTER_HEADER_LEVEL') -1,
$element, $heading_id);
}
} elsif (defined($heading_id)) {
# case of a lone node and no header, and case of an empty @top
+ # FIXME In case of an empty top there a class here and above
+ # as the empty top was also the $opening_section
$result .= &{$self->{'format_separate_anchor'}}($self, $heading_id,
- "${cmdname}-anchor");
+ $cmdname);
}
$result .= $content if (defined($content));
@@ -3939,7 +3961,7 @@ sub _convert_float_command($$$$$)
$float_type_number_caption
= $self->html_attribute_class('div',$caption_command_name). '>'
.$caption_text.'</div>';
- } elsif ($prepended_text ne '') {
+ } elsif (defined($prepended) and $prepended_text ne '') {
$float_type_number_caption
= $self->html_attribute_class('div','type-number-float'). '>'
. $prepended_text .'</div>';
@@ -4163,7 +4185,7 @@ sub _convert_item_command($$$$)
last;
}
}
- my $index_id = $self->command_id ($command);
+ my $index_id = $self->command_id($command);
my $anchor;
my $anchor_span_open = '';
my $anchor_span_close = '';
@@ -4486,7 +4508,7 @@ sub _convert_index_command($$$$)
and !@{$self->{'multiple_pass'}}
and !$self->in_string()) {
my $result = &{$self->{'format_separate_anchor'}}($self, $index_id,
- 'index-entry-anchor');
+ 'index-entry-id');
$result .= "\n" unless ($self->in_preformatted());
return $result;
}
@@ -6632,21 +6654,22 @@ sub _prepare_css($)
$self->{'css_rule_lines'} = \@css_rule_lines;
}
-# Get the name of a file containing a node, as well as the anchor within
-# that file to link to that node. Argument is the 'extra' value on
-# an element hash, or something that looks like it.
-sub _node_id_file($$)
+# Get the name of a file containing a label, as well as the identifier within
+# that file to link to that label. Argument is the 'extra' value on
+# an element hash, or something that looks like it. Labels are typically
+# associated to @node, @anchor or @float.
+sub _normalized_label_id_file($$)
{
my $self = shift;
- my $node_info = shift;
+ my $label_info = shift;
my $target;
- my $normalized;
- if ($node_info->{'normalized'}) {
- $normalized = $node_info->{'normalized'};
- } elsif ($node_info->{'node_content'}) {
- $normalized = Texinfo::Convert::NodeNameNormalization::normalize_node (
- { 'contents' => $node_info->{'node_content'} });
+ my $normalized;
+ if ($label_info->{'normalized'}) {
+ $normalized = $label_info->{'normalized'};
+ } elsif ($label_info->{'node_content'}) {
+ $normalized = Texinfo::Convert::NodeNameNormalization::normalize_node(
+ { 'contents' => $label_info->{'node_content'} });
}
if (defined($normalized)) {
@@ -6654,12 +6677,13 @@ sub _node_id_file($$)
} else {
$target = '';
}
- # to find out the Top node, one could check $node_info->{'normalized'}
+ # to find out the Top node, one could check $label_info->{'normalized'}
+ # FIXME change name? It is not only for nodes
if (defined($Texinfo::Config::node_target_name)) {
- $target = &$Texinfo::Config::node_target_name($node_info, $target);
+ $target = &$Texinfo::Config::node_target_name($label_info, $target);
}
- my $filename = $self->node_information_filename($node_info);
+ my $filename = $self->node_information_filename($label_info);
return ($filename, $target);
}
@@ -6669,11 +6693,11 @@ sub _new_sectioning_command_target($$)
my $self = shift;
my $command = shift;
- my ($normalized_name, $filename)
+ my ($normalized_name, $filename)
= $self->normalized_sectioning_command_filename($command);
my $target_base = _normalized_to_id($normalized_name);
- if ($target_base !~ /\S/ and $command->{'cmdname'} eq 'top'
+ if ($target_base !~ /\S/ and $command->{'cmdname'} eq 'top'
and defined($self->{'special_elements_targets'}->{'Top'})) {
$target_base = $self->{'special_elements_targets'}->{'Top'};
}
@@ -6720,8 +6744,8 @@ sub _new_sectioning_command_target($$)
if (defined($Texinfo::Config::sectioning_command_target_name)) {
($target, $target_contents,
- $target_shortcontents, $filename)
- = &$Texinfo::Config::sectioning_command_target_name($self,
+ $target_shortcontents, $filename)
+ = &$Texinfo::Config::sectioning_command_target_name($self,
$command, $target,
$target_contents,
$target_shortcontents,
@@ -6741,7 +6765,7 @@ sub _new_sectioning_command_target($$)
$self->{'targets'}->{$command}->{'contents_target'} = '';
}
if (defined($target_shortcontents)) {
- $self->{'targets'}->{$command}->{'shortcontents_target'}
+ $self->{'targets'}->{$command}->{'shortcontents_target'}
= $target_shortcontents;
} else {
$self->{'targets'}->{$command}->{'shortcontents_target'} = '';
@@ -6749,10 +6773,12 @@ sub _new_sectioning_command_target($$)
return $self->{'targets'}->{$command};
}
-# This set 2 unrelated things.
-# * The target informations of sectioning elements
+# This set with two different codes
# * the target information, id and normalized filename of 'labels',
# ie everything that may be the target of a ref, like @node, @float,
@anchor...
+# * The target informations of sectioning elements by going through tree units
+# @node and section commands targets are therefore both set.
+#
# conversion to HTML is done on-demand, upon call to command_text
# and similar functions.
# Note that 'node_filename', which is set here for Top target information
@@ -6763,7 +6789,7 @@ sub _set_root_commands_targets_node_files($$)
my $tree_units = shift;
my $no_unidecode;
- $no_unidecode = 1 if (defined($self->get_conf('USE_UNIDECODE'))
+ $no_unidecode = 1 if (defined($self->get_conf('USE_UNIDECODE'))
and !$self->get_conf('USE_UNIDECODE'));
my $extension = '';
@@ -6771,17 +6797,18 @@ sub _set_root_commands_targets_node_files($$)
if (defined($self->get_conf('EXTENSION'))
and $self->get_conf('EXTENSION') ne '');
if ($self->{'labels'}) {
- foreach my $root_command (values(%{$self->{'labels'}})) {
- my ($filename, $target) = $self->_node_id_file($root_command->{'extra'});
+ foreach my $label_element (values(%{$self->{'labels'}})) {
+ my ($filename, $target)
+ = $self->_normalized_label_id_file($label_element->{'extra'});
$filename .= $extension;
if (defined($Texinfo::Config::node_file_name)) {
- $filename = &$Texinfo::Config::node_file_name($self, $root_command,
+ $filename = &$Texinfo::Config::node_file_name($self, $label_element,
$filename);
}
if ($self->get_conf('DEBUG')) {
- print STDERR "Register label($root_command) $target, $filename\n";
+ print STDERR "Label($label_element) \@$label_element->{'cmdname'}
$target, $filename\n";
}
- $self->{'targets'}->{$root_command} = {'target' => $target,
+ $self->{'targets'}->{$label_element} = {'target' => $target,
'node_filename' => $filename};
$self->{'seen_ids'}->{$target} = 1;
}
@@ -6789,13 +6816,13 @@ sub _set_root_commands_targets_node_files($$)
if ($tree_units) {
foreach my $tree_unit (@$tree_units) {
- foreach my $root_command(@{$tree_unit->{'contents'}}) {
+ foreach my $root_element(@{$tree_unit->{'contents'}}) {
# this happens for types which would precede the root commands.
# The target may already be set for the top node tree unit.
- next if (!defined($root_command->{'cmdname'})
- or $self->{'targets'}->{$root_command});
- if ($Texinfo::Common::sectioning_commands{$root_command->{'cmdname'}})
{
- $self->_new_sectioning_command_target($root_command);
+ next if (!defined($root_element->{'cmdname'})
+ or $self->{'targets'}->{$root_element});
+ if ($Texinfo::Common::sectioning_commands{$root_element->{'cmdname'}})
{
+ $self->_new_sectioning_command_target($root_element);
}
}
}
@@ -7421,12 +7448,16 @@ sub _external_node_href($$$$)
my $link_command = shift;
#print STDERR "external_node: ".join('|', keys(%$external_node))."\n";
- my ($target_filebase, $target) = $self->_node_id_file($external_node);
+ my ($target_filebase, $target)
+ = $self->_normalized_label_id_file($external_node);
my $xml_target = _normalized_to_id($target);
my $default_target_split = $self->get_conf('EXTERNAL_CROSSREF_SPLIT');
+ # FIXME it makes sense to have something different from the
+ # EXTENSION, for external manuals, but it would be better to
+ # be able to change it nonetheless.
my $external_file_extension = '.html';
my $target_split;
diff --git a/tp/t/results/converters_tests/at_commands_in_raw.pl
b/tp/t/results/converters_tests/at_commands_in_raw.pl
index 9e4e6fbf38..4838443e77 100644
--- a/tp/t/results/converters_tests/at_commands_in_raw.pl
+++ b/tp/t/results/converters_tests/at_commands_in_raw.pl
@@ -1221,7 +1221,7 @@ $result_converted{'html_text'}->{'at_commands_in_raw'} =
'<h1 class="node-headin
<p>See <a class="xref" href="#anchor-in-html">anchor in html</a>.
</p>
<p>‘anchor in tex’.
-<a class="index-entry-anchor" id="index-fentry2"></a>
+<a class="index-entry-id" id="index-fentry2"></a>
</p>
<p> newidx entry
</p>
diff --git a/tp/t/results/converters_tests/index_entry_in_preformatted.pl
b/tp/t/results/converters_tests/index_entry_in_preformatted.pl
index 28b0535fd0..fa0e5425b6 100644
--- a/tp/t/results/converters_tests/index_entry_in_preformatted.pl
+++ b/tp/t/results/converters_tests/index_entry_in_preformatted.pl
@@ -378,10 +378,10 @@
$result_converted{'plaintext'}->{'index_entry_in_preformatted'} = ' text
$result_converted{'html_text'}->{'index_entry_in_preformatted'} = '<h1
class="node-heading" id="Top">Top</h1>
<div class="example">
-<pre class="example-preformatted"><a class="index-entry-anchor"
id="index-first"></a>text
+<pre class="example-preformatted"><a class="index-entry-id"
id="index-first"></a>text
-<a class="index-entry-anchor" id="index-other"></a>text2
-<a class="index-entry-anchor" id="index-last"></a></pre></div>
+<a class="index-entry-id" id="index-other"></a>text2
+<a class="index-entry-id" id="index-last"></a></pre></div>
';
diff --git
a/tp/t/results/converters_tests/printindex_merged_indices_code_style.pl
b/tp/t/results/converters_tests/printindex_merged_indices_code_style.pl
index 5089f9affe..ab6c6a64f4 100644
--- a/tp/t/results/converters_tests/printindex_merged_indices_code_style.pl
+++ b/tp/t/results/converters_tests/printindex_merged_indices_code_style.pl
@@ -780,19 +780,19 @@
$result_converted{'html_text'}->{'printindex_merged_indices_code_style'} = '<h1
-<a class="index-entry-anchor" id="index-c_0060_0060b"></a>
+<a class="index-entry-id" id="index-c_0060_0060b"></a>
-<a class="index-entry-anchor" id="index-v_0060_0060j"></a>
+<a class="index-entry-id" id="index-v_0060_0060j"></a>
-<a class="index-entry-anchor" id="index-f_0060_0060g"></a>
+<a class="index-entry-id" id="index-f_0060_0060g"></a>
-<a class="index-entry-anchor" id="index-cdi_0060_0060h"></a>
+<a class="index-entry-id" id="index-cdi_0060_0060h"></a>
-<a class="index-entry-anchor" id="index-ddi_0060_0060g"></a>
+<a class="index-entry-id" id="index-ddi_0060_0060g"></a>
<div class="printindex fn-printindex">
<table class="fn-letters-header-printindex"><tr><th valign="top">Jump to:
</th><td><a class="summary-letter-printindex"
href="#t_h_fn_letter-C"><b>C</b></a>
diff --git a/tp/t/results/converters_tests/spaces_in_empty_node_names.pl
b/tp/t/results/converters_tests/spaces_in_empty_node_names.pl
index 2c506047e7..a7d7077b02 100644
--- a/tp/t/results/converters_tests/spaces_in_empty_node_names.pl
+++ b/tp/t/results/converters_tests/spaces_in_empty_node_names.pl
@@ -946,7 +946,7 @@
$result_converted{'plaintext'}->{'spaces_in_empty_node_names'} = '*note ::
';
-$result_converted{'html_text'}->{'spaces_in_empty_node_names'} = '<a
class="node-anchor" id="Top"></a><div class="nav-header">
+$result_converted{'html_text'}->{'spaces_in_empty_node_names'} = '<a
class="node" id="Top"></a><div class="nav-header">
<p>
</p>
</div>
diff --git a/tp/t/results/converters_tests/spaces_in_node_names.pl
b/tp/t/results/converters_tests/spaces_in_node_names.pl
index 3d31ab7ad2..f125da456f 100644
--- a/tp/t/results/converters_tests/spaces_in_node_names.pl
+++ b/tp/t/results/converters_tests/spaces_in_node_names.pl
@@ -1051,7 +1051,7 @@ $result_converted{'plaintext'}->{'spaces_in_node_names'}
= '*note a ::
';
-$result_converted{'html_text'}->{'spaces_in_node_names'} = '<a
class="node-anchor" id="Top"></a><div class="nav-header">
+$result_converted{'html_text'}->{'spaces_in_node_names'} = '<a class="node"
id="Top"></a><div class="nav-header">
<p>
</p>
</div>
@@ -1059,21 +1059,21 @@
$result_converted{'html_text'}->{'spaces_in_node_names'} = '<a class="node-ancho
<hr>
-<a class="node-anchor" id="a--"></a><div class="nav-header">
+<a class="node" id="a--"></a><div class="nav-header">
<p>
</p>
</div>
<h4 class="node-heading">a </h4>
<hr>
-<a class="node-anchor" id="b-"></a><div class="nav-header">
+<a class="node" id="b-"></a><div class="nav-header">
<p>
</p>
</div>
<h4 class="node-heading">b<tt class="verb"> </tt></h4>
<hr>
-<a class="node-anchor" id="c-"></a><div class="nav-header">
+<a class="node" id="c-"></a><div class="nav-header">
<p>
</p>
</div>
diff --git a/tp/t/results/converters_tests/top_in_ref.pl
b/tp/t/results/converters_tests/top_in_ref.pl
index b15c80134a..53bf318e45 100644
--- a/tp/t/results/converters_tests/top_in_ref.pl
+++ b/tp/t/results/converters_tests/top_in_ref.pl
@@ -4458,14 +4458,14 @@ name)Top::
';
-$result_converted{'html_text'}->{'top_in_ref'} = '<a class="node-anchor"
id="Top"></a><div class="nav-header">
+$result_converted{'html_text'}->{'top_in_ref'} = '<a class="node"
id="Top"></a><div class="nav-header">
<p>
</p>
</div>
<h1 class="node-heading">Top</h1>
<hr>
-<a class="node-anchor" id="refs-node"></a><div class="nav-header">
+<a class="node" id="refs-node"></a><div class="nav-header">
<p>
</p>
</div>
diff --git a/tp/t/results/converters_tests/top_in_ref_keep_top.pl
b/tp/t/results/converters_tests/top_in_ref_keep_top.pl
index c15c7ea06a..7c263370ca 100644
--- a/tp/t/results/converters_tests/top_in_ref_keep_top.pl
+++ b/tp/t/results/converters_tests/top_in_ref_keep_top.pl
@@ -4420,14 +4420,14 @@ $result_floats{'top_in_ref_keep_top'} = {};
-$result_converted{'html_text'}->{'top_in_ref_keep_top'} = '<a
class="node-anchor" id="Top"></a><div class="nav-header">
+$result_converted{'html_text'}->{'top_in_ref_keep_top'} = '<a class="node"
id="Top"></a><div class="nav-header">
<p>
</p>
</div>
<h1 class="node-heading">Top</h1>
<hr>
-<a class="node-anchor" id="refs-node"></a><div class="nav-header">
+<a class="node" id="refs-node"></a><div class="nav-header">
<p>
</p>
</div>
diff --git a/tp/t/results/coverage/commands.pl
b/tp/t/results/coverage/commands.pl
index f9c5bc4292..3301e40f48 100644
--- a/tp/t/results/coverage/commands.pl
+++ b/tp/t/results/coverage/commands.pl
@@ -579,7 +579,7 @@ File → Open.
<a class="email" href="mailto:a";>b</a> <code class="code">code --- -- \'\'
``</code>
— – ” “. <small class="sc">SMALL CAPS</small>.
</p>
-<a class="index-entry-anchor"
id="index-index-entry-_0060_0060in-text_0027_0027-LaTeX"></a>
+<a class="index-entry-id"
id="index-index-entry-_0060_0060in-text_0027_0027-LaTeX"></a>
<h2 class="majorheading" id="majorheading-in-b">majorheading <b class="b">in
b</b></h2>
';
diff --git a/tp/t/results/coverage/multitable.pl
b/tp/t/results/coverage/multitable.pl
index bc2577d844..005c85829f 100644
--- a/tp/t/results/coverage/multitable.pl
+++ b/tp/t/results/coverage/multitable.pl
@@ -706,7 +706,7 @@ $result_converted{'html_text'}->{'multitable'} = '
<thead><tr><th width="60%">mu–ltitable headitem</th><th
width="40%">another tab</th></tr></thead>
<tbody><tr><td width="60%">mu–ltitable item</td><td
width="40%">multitable tab</td></tr>
<tr><td width="60%">mu–ltitable item 2</td><td width="40%">multitable
tab 2
-<a class="index-entry-anchor"
id="index-index-entry-within-multitable"></a></td></tr>
+<a class="index-entry-id"
id="index-index-entry-within-multitable"></a></td></tr>
<tr><td width="60%">lone mu–ltitable item</td></tr>
</tbody>
</table>
diff --git a/tp/t/results/coverage/punctuation_in_line_commands.pl
b/tp/t/results/coverage/punctuation_in_line_commands.pl
index eef926d1e3..34ff91e48d 100644
--- a/tp/t/results/coverage/punctuation_in_line_commands.pl
+++ b/tp/t/results/coverage/punctuation_in_line_commands.pl
@@ -1215,7 +1215,7 @@
$result_converted{'html_text'}->{'punctuation_in_line_commands'} = '
<dt><a href="#label-with-caption">float type! After punc
2</a></dt><dd><p>caption! After punc</p></dd>
</dl>
-<a class="index-entry-anchor" id="index-index_0021-After-punc"></a>
+<a class="index-entry-id" id="index-index_0021-After-punc"></a>
<h3 class="heading" id="heading_0021-After-punc">heading! After punc</h3>
diff --git a/tp/t/results/coverage/table.pl b/tp/t/results/coverage/table.pl
index 48fa1d377c..8e3f9c9cc1 100644
--- a/tp/t/results/coverage/table.pl
+++ b/tp/t/results/coverage/table.pl
@@ -709,11 +709,11 @@ $result_converted{'html_text'}->{'table'} = '
</dl>
<dl class="vtable">
-<dd><a class="index-entry-anchor" id="index-index-entry"></a>
+<dd><a class="index-entry-id" id="index-index-entry"></a>
</dd>
<dt id=\'index-vtable-item\'><span>‘<samp class="samp">vtable
item</samp>’<a class="copiable-anchor" href=\'#index-vtable-item\'>
¶</a></span></dt>
-<dd><a class="index-entry-anchor" id="index-key"></a>
+<dd><a class="index-entry-id" id="index-key"></a>
</dd>
<dt id=\'index-itemx-vtable\'><span>‘<samp class="samp">itemx
vtable</samp>’<a class="copiable-anchor" href=\'#index-itemx-vtable\'>
¶</a></span></dt>
</dl>
diff --git a/tp/t/results/coverage_braces/heading_in_footnote.pl
b/tp/t/results/coverage_braces/heading_in_footnote.pl
index 0f48d45992..5909a1fea5 100644
--- a/tp/t/results/coverage_braces/heading_in_footnote.pl
+++ b/tp/t/results/coverage_braces/heading_in_footnote.pl
@@ -221,7 +221,7 @@ $result_converted{'html_text'}->{'heading_in_footnote'} =
'<p>T<a class="footnot
<h5><a id="FOOT1" href="#DOCF1">(1)</a></h5>
<p>AAA
</p><h3 class="heading" id="H1">H1</h3>
-<a class="index-entry-anchor" id="index-ind-e"></a>
+<a class="index-entry-id" id="index-ind-e"></a>
<p>BBB
</p>
</div>
diff --git a/tp/t/results/float/cindex_in_caption.pl
b/tp/t/results/float/cindex_in_caption.pl
index 83ce690569..afd19327ee 100644
--- a/tp/t/results/float/cindex_in_caption.pl
+++ b/tp/t/results/float/cindex_in_caption.pl
@@ -540,7 +540,7 @@ a.summary-letter-printindex {text-decoration: none}
<p>In float.
</p>
<div class="caption"><p><strong class="strong">fl 1: </strong>in caption
-<a class="index-entry-anchor" id="index-index-entry"></a>
+<a class="index-entry-id" id="index-index-entry"></a>
</p></div></div>
<div class="printindex cp-printindex">
<table class="cp-letters-header-printindex"><tr><th valign="top">Jump to:
</th><td><a class="summary-letter-printindex"
href="#Top_cp_letter-I"><b>I</b></a>
diff --git a/tp/t/results/float/complex_float.pl
b/tp/t/results/float/complex_float.pl
index bcd74e088b..0d47b8ede8 100644
--- a/tp/t/results/float/complex_float.pl
+++ b/tp/t/results/float/complex_float.pl
@@ -4933,7 +4933,7 @@ A footnote 2.
</p>
<p>An index entry
-<a class="index-entry-anchor" id="index-float-example"></a>
+<a class="index-entry-id" id="index-float-example"></a>
</p>
<p>A table.
</p><dl class="table">
@@ -4980,7 +4980,7 @@ An example.
</tbody>
</table>
<p>An index entry
-<a class="index-entry-anchor" id="index-float-example-in-caption"></a>
+<a class="index-entry-id" id="index-float-example-in-caption"></a>
</p>
<p>An itemize.
</p><ul class="itemize mark-minus">
@@ -5032,7 +5032,7 @@ An example 2.
</tbody>
</table>
<p>An index entry 2
-<a class="index-entry-anchor" id="index-float-example-in-caption-2"></a>
+<a class="index-entry-id" id="index-float-example-in-caption-2"></a>
</p>
<p>An itemize 2.
</p><ul class="itemize mark-minus">
diff --git a/tp/t/results/float/float_copying.pl
b/tp/t/results/float/float_copying.pl
index 700822ae1b..f8f48192c7 100644
--- a/tp/t/results/float/float_copying.pl
+++ b/tp/t/results/float/float_copying.pl
@@ -1643,8 +1643,8 @@ the author abandon his copyright.
</p>
<div class="caption"><p><strong class="strong">Copyright notice 1:
</strong>The Public Domain notice<a class="footnote" id="DOCF1"
href="#FOOT1"><sup>1</sup></a>
</p>
-<a class="anchor" id="public-domain-anchor"></a><a class="index-entry-anchor"
id="index-copying-indexed-caption"></a>
-<a class="index-entry-anchor" id="index-copying-indexed-caption-function"></a>
+<a class="anchor" id="public-domain-anchor"></a><a class="index-entry-id"
id="index-copying-indexed-caption"></a>
+<a class="index-entry-id" id="index-copying-indexed-caption-function"></a>
</div></div>
<ul class="mini-toc">
@@ -1666,8 +1666,8 @@ the author abandon his copyright.
</p>
<div class="caption"><p><strong class="strong">Copyright notice 1:
</strong>The Public Domain notice<a class="footnote" id="DOCF1_2"
href="#FOOT1_2"><sup>2</sup></a>
</p>
-<a class="anchor" id="public-domain-anchor"></a><a class="index-entry-anchor"
id="index-copying-indexed-caption"></a>
-<a class="index-entry-anchor" id="index-copying-indexed-caption-function"></a>
+<a class="anchor" id="public-domain-anchor"></a><a class="index-entry-id"
id="index-copying-indexed-caption"></a>
+<a class="index-entry-id" id="index-copying-indexed-caption-function"></a>
</div></div>
<div class="float" id="public-domain">
@@ -1676,8 +1676,8 @@ the author abandon his copyright.
</p>
<div class="caption"><p><strong class="strong">Copyright notice 1:
</strong>The Public Domain notice<a class="footnote" id="DOCF1_3"
href="#FOOT1_3"><sup>3</sup></a>
</p>
-<a class="anchor" id="public-domain-anchor"></a><a class="index-entry-anchor"
id="index-copying-indexed-caption"></a>
-<a class="index-entry-anchor" id="index-copying-indexed-caption-function"></a>
+<a class="anchor" id="public-domain-anchor"></a><a class="index-entry-id"
id="index-copying-indexed-caption"></a>
+<a class="index-entry-id" id="index-copying-indexed-caption-function"></a>
</div></div>
<dl class="listoffloats">
<dt><a href="#public-domain">Copyright notice 1</a></dt><dd><p>The Public
Domain notice<a class="footnote" id="t_hlistoffloats_DOCF1_4"
href="#t_hlistoffloats_FOOT1_4"><sup>4</sup></a>
@@ -1732,24 +1732,24 @@ the author abandon his copyright.
<h5><a id="FOOT1" href="#DOCF1">(1)</a></h5>
<p>The caption copying footnote
<a class="anchor" id="caption-copying-footnote-anchor"></a></p>
-<a class="index-entry-anchor"
id="index-copying-indexed-caption-copying-footnote"></a>
-<a class="index-entry-anchor" id="index-copying-public-domain-function"></a>
+<a class="index-entry-id"
id="index-copying-indexed-caption-copying-footnote"></a>
+<a class="index-entry-id" id="index-copying-public-domain-function"></a>
<p>see <a class="ref" href="#Copying-and-floats">Copying and floats</a>.
</p>
<h5><a id="FOOT1_2" href="#DOCF1_2">(2)</a></h5>
<p>The caption copying footnote
<a class="anchor" id="caption-copying-footnote-anchor"></a></p>
-<a class="index-entry-anchor"
id="index-copying-indexed-caption-copying-footnote"></a>
-<a class="index-entry-anchor" id="index-copying-public-domain-function"></a>
+<a class="index-entry-id"
id="index-copying-indexed-caption-copying-footnote"></a>
+<a class="index-entry-id" id="index-copying-public-domain-function"></a>
<p>see <a class="ref" href="#Copying-and-floats">Copying and floats</a>.
</p>
<h5><a id="FOOT1_3" href="#DOCF1_3">(3)</a></h5>
<p>The caption copying footnote
<a class="anchor" id="caption-copying-footnote-anchor"></a></p>
-<a class="index-entry-anchor"
id="index-copying-indexed-caption-copying-footnote"></a>
-<a class="index-entry-anchor" id="index-copying-public-domain-function"></a>
+<a class="index-entry-id"
id="index-copying-indexed-caption-copying-footnote"></a>
+<a class="index-entry-id" id="index-copying-public-domain-function"></a>
<p>see <a class="ref" href="#Copying-and-floats">Copying and floats</a>.
</p>
diff --git
a/tp/t/results/formats_encodings/char_latin1_latin1_in_refs/res_html/c.html
b/tp/t/results/formats_encodings/char_latin1_latin1_in_refs/res_html/c.html
index ea3b5625b3..5537813305 100644
--- a/tp/t/results/formats_encodings/char_latin1_latin1_in_refs/res_html/c.html
+++ b/tp/t/results/formats_encodings/char_latin1_latin1_in_refs/res_html/c.html
@@ -38,12 +38,12 @@ Previous: <a href="a-e-i-o-u-A-E-I-O-U.html" accesskey="p"
rel="prev">
<a class="ref" href="a-e-i-o-u-A-E-I-O-U.html">� � � � � � � � � �</a>
<a class="ref" href="#g_t_00e7">�</a>
</p>
-<a class="index-entry-anchor" id="index-a-e-i-o-u-y"></a>
-<a class="index-entry-anchor" id="index-A-E-I-O-U"></a>
-<a class="index-entry-anchor" id="index-e"></a>
-<a class="index-entry-anchor" id="index-e-1"></a>
-<a class="index-entry-anchor" id="index-a-e-i-o-u-A-E-I-O-U"></a>
-<a class="index-entry-anchor" id="index-c"></a>
+<a class="index-entry-id" id="index-a-e-i-o-u-y"></a>
+<a class="index-entry-id" id="index-A-E-I-O-U"></a>
+<a class="index-entry-id" id="index-e"></a>
+<a class="index-entry-id" id="index-e-1"></a>
+<a class="index-entry-id" id="index-a-e-i-o-u-A-E-I-O-U"></a>
+<a class="index-entry-id" id="index-c"></a>
</div>
diff --git
a/tp/t/results/formats_encodings/char_latin1_utf8_in_refs/res_html/c.html
b/tp/t/results/formats_encodings/char_latin1_utf8_in_refs/res_html/c.html
index 31b0cc7bcc..37df30079a 100644
--- a/tp/t/results/formats_encodings/char_latin1_utf8_in_refs/res_html/c.html
+++ b/tp/t/results/formats_encodings/char_latin1_utf8_in_refs/res_html/c.html
@@ -38,12 +38,12 @@ Previous: <a href="a-e-i-o-u-A-E-I-O-U.html" accesskey="p"
rel="prev">â ê î
<a class="ref" href="a-e-i-o-u-A-E-I-O-U.html">â ê î ô û Â Ê Î Ô Û</a>
<a class="ref" href="#g_t_00e7">ç</a>
</p>
-<a class="index-entry-anchor" id="index-a-e-i-o-u-y"></a>
-<a class="index-entry-anchor" id="index-A-E-I-O-U"></a>
-<a class="index-entry-anchor" id="index-e"></a>
-<a class="index-entry-anchor" id="index-e-1"></a>
-<a class="index-entry-anchor" id="index-a-e-i-o-u-A-E-I-O-U"></a>
-<a class="index-entry-anchor" id="index-c"></a>
+<a class="index-entry-id" id="index-a-e-i-o-u-y"></a>
+<a class="index-entry-id" id="index-A-E-I-O-U"></a>
+<a class="index-entry-id" id="index-e"></a>
+<a class="index-entry-id" id="index-e-1"></a>
+<a class="index-entry-id" id="index-a-e-i-o-u-A-E-I-O-U"></a>
+<a class="index-entry-id" id="index-c"></a>
</div>
diff --git
a/tp/t/results/formats_encodings/char_latin2_latin2_in_refs/res_html/A-a-_002c-E-e.html
b/tp/t/results/formats_encodings/char_latin2_latin2_in_refs/res_html/A-a-_002c-E-e.html
index 04000247b1..0224e55b1b 100644
---
a/tp/t/results/formats_encodings/char_latin2_latin2_in_refs/res_html/A-a-_002c-E-e.html
+++
b/tp/t/results/formats_encodings/char_latin2_latin2_in_refs/res_html/A-a-_002c-E-e.html
@@ -32,7 +32,7 @@ Previous: <a href="index.html" accesskey="p"
rel="prev">top</a>, Up: <a href="in
<hr>
<h2 class="chapter" id="A-a-_002c-E-e">1 � � � � �</h2>
-<a class="index-entry-anchor" id="index-A-a-_002c-E-e"></a>
+<a class="index-entry-id" id="index-A-a-_002c-E-e"></a>
</div>
diff --git
a/tp/t/results/formats_encodings/sample_utf8/res_html/DiYiZhang_0028First-Chapter_0029.html
b/tp/t/results/formats_encodings/sample_utf8/res_html/DiYiZhang_0028First-Chapter_0029.html
index 18d70284ae..f8d1c62ba4 100644
---
a/tp/t/results/formats_encodings/sample_utf8/res_html/DiYiZhang_0028First-Chapter_0029.html
+++
b/tp/t/results/formats_encodings/sample_utf8/res_html/DiYiZhang_0028First-Chapter_0029.html
@@ -38,12 +38,12 @@ Next: <a href="Second-Chapter-AE-AE-ae-ae.html"
accesskey="n" rel="next">Chapter
<hr>
<h2 class="chapter" id="DiYiZhang_0028First-Chapter_0029">1 第一章（First
Chapter）</h2>
-<a class="index-entry-anchor" id="index-chapter_002c-first"></a>
+<a class="index-entry-id" id="index-chapter_002c-first"></a>
<p>This is the first chapter. 这是第一章。
-<a class="index-entry-anchor" id="index-LingYiGe_002cindex-entry"></a>
-<a class="index-entry-anchor" id="index-AE-ae-ae"></a>
-<a class="index-entry-anchor" id="index-e-A"></a>
+<a class="index-entry-id" id="index-LingYiGe_002cindex-entry"></a>
+<a class="index-entry-id" id="index-AE-ae-ae"></a>
+<a class="index-entry-id" id="index-e-A"></a>
</p>
<p>Here is a numbered list.
</p>
diff --git a/tp/t/results/formatting/cond.pl b/tp/t/results/formatting/cond.pl
index 0f61a65f5e..314ae3ad3a 100644
--- a/tp/t/results/formatting/cond.pl
+++ b/tp/t/results/formatting/cond.pl
@@ -482,7 +482,7 @@ span.program-in-footer {font-size: smaller}
<body lang="en">
-<a class="node-anchor" id="Top"></a>
+<a class="node" id="Top"></a>
This is html text.
<p>This is ifhtml text.
diff --git a/tp/t/results/formatting/cond_ifhtml_ifinfo_iftex.pl
b/tp/t/results/formatting/cond_ifhtml_ifinfo_iftex.pl
index 1ae677a4ac..3b638dd670 100644
--- a/tp/t/results/formatting/cond_ifhtml_ifinfo_iftex.pl
+++ b/tp/t/results/formatting/cond_ifhtml_ifinfo_iftex.pl
@@ -499,7 +499,7 @@ span.program-in-footer {font-size: smaller}
<body lang="en">
-<a class="node-anchor" id="Top"></a>
+<a class="node" id="Top"></a>
This is html text.
<p>This is ifhtml text.
diff --git a/tp/t/results/formatting/cond_no-ifhtml_no-ifinfo_no-iftex.pl
b/tp/t/results/formatting/cond_no-ifhtml_no-ifinfo_no-iftex.pl
index b8f3ff54d2..fe8689d0c2 100644
--- a/tp/t/results/formatting/cond_no-ifhtml_no-ifinfo_no-iftex.pl
+++ b/tp/t/results/formatting/cond_no-ifhtml_no-ifinfo_no-iftex.pl
@@ -465,7 +465,7 @@ span.program-in-footer {font-size: smaller}
<body lang="en">
-<a class="node-anchor" id="Top"></a>
+<a class="node" id="Top"></a>
<p>This is ifnothtml text.
diff --git
a/tp/t/results/formatting/float_copying/res_html/Copying-and-floats.html
b/tp/t/results/formatting/float_copying/res_html/Copying-and-floats.html
index c15392acdd..d95451b27d 100644
--- a/tp/t/results/formatting/float_copying/res_html/Copying-and-floats.html
+++ b/tp/t/results/formatting/float_copying/res_html/Copying-and-floats.html
@@ -54,7 +54,7 @@ and the list of coyright notices (listoffloats).
</p>
<p>See the float <a class="ref" href="index.html#public-domain">Copyright
notice 1</a>.
</p>
-<a class="index-entry-anchor" id="index-listofloats"></a>
+<a class="index-entry-id" id="index-listofloats"></a>
<div class="float" id="public-domain">
@@ -64,8 +64,8 @@ the author abandon his copyright.
</p>
<div class="caption"><p><strong class="strong">Copyright notice 1:
</strong>The Public Domain notice<a class="footnote" id="DOCF1_2"
href="float_copying_fot.html#FOOT1_2"><sup>2</sup></a>
</p>
-<a class="anchor" id="public-domain-anchor"></a><a class="index-entry-anchor"
id="index-copying-indexed-caption"></a>
-<a class="index-entry-anchor" id="index-copying-indexed-caption-function"></a>
+<a class="anchor" id="public-domain-anchor"></a><a class="index-entry-id"
id="index-copying-indexed-caption"></a>
+<a class="index-entry-id" id="index-copying-indexed-caption-function"></a>
</div></div>
<div class="float" id="public-domain">
@@ -74,8 +74,8 @@ the author abandon his copyright.
</p>
<div class="caption"><p><strong class="strong">Copyright notice 1:
</strong>The Public Domain notice<a class="footnote" id="DOCF1_3"
href="float_copying_fot.html#FOOT1_3"><sup>3</sup></a>
</p>
-<a class="anchor" id="public-domain-anchor"></a><a class="index-entry-anchor"
id="index-copying-indexed-caption"></a>
-<a class="index-entry-anchor" id="index-copying-indexed-caption-function"></a>
+<a class="anchor" id="public-domain-anchor"></a><a class="index-entry-id"
id="index-copying-indexed-caption"></a>
+<a class="index-entry-id" id="index-copying-indexed-caption-function"></a>
</div></div>
<h3 class="subheading" id="listoffloats">listoffloats</h3>
<dl class="listoffloats">
diff --git
a/tp/t/results/formatting/float_copying/res_html/float_copying_fot.html
b/tp/t/results/formatting/float_copying/res_html/float_copying_fot.html
index 1be7c1cd6c..0390ec1b3c 100644
--- a/tp/t/results/formatting/float_copying/res_html/float_copying_fot.html
+++ b/tp/t/results/formatting/float_copying/res_html/float_copying_fot.html
@@ -40,24 +40,24 @@ span.program-in-footer {font-size: smaller}
<h5><a id="FOOT1" href="index.html#DOCF1">(1)</a></h5>
<p>The caption copying footnote
<a class="anchor" id="caption-copying-footnote-anchor"></a></p>
-<a class="index-entry-anchor"
id="index-copying-indexed-caption-copying-footnote"></a>
-<a class="index-entry-anchor" id="index-copying-public-domain-function"></a>
+<a class="index-entry-id"
id="index-copying-indexed-caption-copying-footnote"></a>
+<a class="index-entry-id" id="index-copying-public-domain-function"></a>
<p>see <a class="ref" href="Copying-and-floats.html">Copying and floats</a>.
</p>
<h5><a id="FOOT1_2" href="Copying-and-floats.html#DOCF1_2">(2)</a></h5>
<p>The caption copying footnote
<a class="anchor" id="caption-copying-footnote-anchor"></a></p>
-<a class="index-entry-anchor"
id="index-copying-indexed-caption-copying-footnote"></a>
-<a class="index-entry-anchor" id="index-copying-public-domain-function"></a>
+<a class="index-entry-id"
id="index-copying-indexed-caption-copying-footnote"></a>
+<a class="index-entry-id" id="index-copying-public-domain-function"></a>
<p>see <a class="ref" href="#Copying-and-floats">Copying and floats</a>.
</p>
<h5><a id="FOOT1_3" href="Copying-and-floats.html#DOCF1_3">(3)</a></h5>
<p>The caption copying footnote
<a class="anchor" id="caption-copying-footnote-anchor"></a></p>
-<a class="index-entry-anchor"
id="index-copying-indexed-caption-copying-footnote"></a>
-<a class="index-entry-anchor" id="index-copying-public-domain-function"></a>
+<a class="index-entry-id"
id="index-copying-indexed-caption-copying-footnote"></a>
+<a class="index-entry-id" id="index-copying-public-domain-function"></a>
<p>see <a class="ref" href="#Copying-and-floats">Copying and floats</a>.
</p>
diff --git a/tp/t/results/formatting/float_copying/res_html/index.html
b/tp/t/results/formatting/float_copying/res_html/index.html
index 64f59722b1..4d518075b2 100644
--- a/tp/t/results/formatting/float_copying/res_html/index.html
+++ b/tp/t/results/formatting/float_copying/res_html/index.html
@@ -41,7 +41,7 @@ span.program-in-footer {font-size: smaller}
</tr></table>
<h1 class="top" id="Top-1">Top</h1>
-<a class="index-entry-anchor" id="index-Top"></a>
+<a class="index-entry-id" id="index-Top"></a>
<p>See the caption <a class="ref" href="#public-domain-anchor">public domain
anchor</a>.
</p>
@@ -55,8 +55,8 @@ the author abandon his copyright.
</p>
<div class="caption"><p><strong class="strong">Copyright notice 1:
</strong>The Public Domain notice<a class="footnote" id="DOCF1"
href="float_copying_fot.html#FOOT1"><sup>1</sup></a>
</p>
-<a class="anchor" id="public-domain-anchor"></a><a class="index-entry-anchor"
id="index-copying-indexed-caption"></a>
-<a class="index-entry-anchor" id="index-copying-indexed-caption-function"></a>
+<a class="anchor" id="public-domain-anchor"></a><a class="index-entry-id"
id="index-copying-indexed-caption"></a>
+<a class="index-entry-id" id="index-copying-indexed-caption-function"></a>
</div></div>
<table class="menu" border="0" cellspacing="0">
<tr><td align="left" valign="top"><a href="Copying-and-floats.html"
rel="index">Appendix A Copying and floats</a></td><td> </td><td
align="left" valign="top">
diff --git
a/tp/t/results/formatting/simplest_test_date_in_header/res_html/simplest.html
b/tp/t/results/formatting/simplest_test_date_in_header/res_html/simplest.html
index 4f6b40bb76..0e7141ade3 100644
---
a/tp/t/results/formatting/simplest_test_date_in_header/res_html/simplest.html
+++
b/tp/t/results/formatting/simplest_test_date_in_header/res_html/simplest.html
@@ -24,7 +24,7 @@ span.program-in-footer {font-size: smaller}
<body lang="en">
-<a class="node-anchor" id="Top"></a>
+<a class="node" id="Top"></a>
<p>This is a very simple texi manual <>.
</p>
<hr>
diff --git a/tp/t/results/formatting/simplest_test_prefix/res_html/truc.html
b/tp/t/results/formatting/simplest_test_prefix/res_html/truc.html
index a5bca7b71b..adb3c770fb 100644
--- a/tp/t/results/formatting/simplest_test_prefix/res_html/truc.html
+++ b/tp/t/results/formatting/simplest_test_prefix/res_html/truc.html
@@ -23,7 +23,7 @@ span.program-in-footer {font-size: smaller}
<body lang="en">
-<a class="node-anchor" id="Top"></a>
+<a class="node" id="Top"></a>
<p>This is a very simple texi manual <>.
</p>
<hr>
diff --git a/tp/t/results/formatting/texi_cond.pl
b/tp/t/results/formatting/texi_cond.pl
index 8a219c2174..d0e043ec02 100644
--- a/tp/t/results/formatting/texi_cond.pl
+++ b/tp/t/results/formatting/texi_cond.pl
@@ -482,7 +482,7 @@ span.program-in-footer {font-size: smaller}
<body lang="en">
-<a class="node-anchor" id="Top"></a>
+<a class="node" id="Top"></a>
This is html text.
<p>This is ifhtml text.
diff --git a/tp/t/results/heading/heading_in_copying.pl
b/tp/t/results/heading/heading_in_copying.pl
index ab08f44ae8..481c53b888 100644
--- a/tp/t/results/heading/heading_in_copying.pl
+++ b/tp/t/results/heading/heading_in_copying.pl
@@ -441,7 +441,7 @@ second in copying @ subheading
<h3 class="heading" id="in-copying-_0040-heading">in copying @ <em
class="emph">heading</em></h3>
-<a class="index-entry-anchor" id="index-copying-cindex-copying"></a>
+<a class="index-entry-id" id="index-copying-cindex-copying"></a>
<h4 class="subheading" id="second-in-copying-_0040-subheading">second in
copying @ <em class="emph">subheading</em></h4>
diff --git a/tp/t/results/html_tests/check_htmlxref.pl
b/tp/t/results/html_tests/check_htmlxref.pl
index 70f230e52c..ebece4a443 100644
--- a/tp/t/results/html_tests/check_htmlxref.pl
+++ b/tp/t/results/html_tests/check_htmlxref.pl
@@ -844,7 +844,7 @@ Next: <a href="no_existing_no_manual_direction.html#Top"
accesskey="n" rel="next
</p>
<hr>
-<a class="node-anchor" id="first"></a><div class="nav-header">
+<a class="node" id="first"></a><div class="nav-header">
<p>
Next: <a href="no_existing_no_manual.html#Top" accesskey="n"
rel="next">(no_existing_no_manual.info)</a> </p>
</div>
diff --git a/tp/t/results/html_tests/index_and_node_same_name.pl
b/tp/t/results/html_tests/index_and_node_same_name.pl
index 80046d1486..36f167557c 100644
--- a/tp/t/results/html_tests/index_and_node_same_name.pl
+++ b/tp/t/results/html_tests/index_and_node_same_name.pl
@@ -284,7 +284,7 @@ a.summary-letter-printindex {text-decoration: none}
<h1 class="top">top</h1>
<h4 class="node-heading" id="index-node">index node</h4>
-<a class="index-entry-anchor" id="index-node-1"></a>
+<a class="index-entry-id" id="index-node-1"></a>
<div class="printindex cp-printindex">
<table class="cp-letters-header-printindex"><tr><th valign="top">Jump to:
</th><td><a class="summary-letter-printindex"
href="#index-node_cp_letter-N"><b>N</b></a>
diff --git a/tp/t/results/html_tests/index_below.pl
b/tp/t/results/html_tests/index_below.pl
index bfe4391521..958ec83a06 100644
--- a/tp/t/results/html_tests/index_below.pl
+++ b/tp/t/results/html_tests/index_below.pl
@@ -551,7 +551,7 @@ a.summary-letter-printindex {text-decoration: none}
</div>
<h3 class="section">1.1 sec</h3>
-<a class="index-entry-anchor" id="index-entry"></a>
+<a class="index-entry-id" id="index-entry"></a>
<div class="printindex cp-printindex">
<table class="cp-letters-header-printindex"><tr><th valign="top">Jump to:
</th><td><a class="summary-letter-printindex"
href="#sec_cp_letter-E"><b>E</b></a>
diff --git
a/tp/t/results/html_tests/redirection_same_labels/res_html/circumflex.html
b/tp/t/results/html_tests/redirection_same_labels/res_html/circumflex.html
index 97fa75a1af..39968a681f 100644
--- a/tp/t/results/html_tests/redirection_same_labels/res_html/circumflex.html
+++ b/tp/t/results/html_tests/redirection_same_labels/res_html/circumflex.html
@@ -32,7 +32,7 @@ Previous: <a href="umlaut.html#umlaut" accesskey="p"
rel="prev">umlaut</a>, Up:
<hr>
-<a class="node-anchor" id="g_t_00ee"></a><div class="nav-header">
+<a class="node" id="g_t_00ee"></a><div class="nav-header">
<p>
Up: <a href="#circumflex" accesskey="u" rel="up">circumflex</a> </p>
</div>
diff --git
a/tp/t/results/html_tests/redirection_same_labels/res_html/umlaut.html
b/tp/t/results/html_tests/redirection_same_labels/res_html/umlaut.html
index ab3d67518f..a9fe6e2780 100644
--- a/tp/t/results/html_tests/redirection_same_labels/res_html/umlaut.html
+++ b/tp/t/results/html_tests/redirection_same_labels/res_html/umlaut.html
@@ -33,14 +33,14 @@ Next: <a href="circumflex.html#circumflex" accesskey="n"
rel="next">circumflex</
<hr>
-<a class="node-anchor" id="g_t_00ef"></a><div class="nav-header">
+<a class="node" id="g_t_00ef"></a><div class="nav-header">
<p>
Next: <a href="#g_t_0129" accesskey="n" rel="next">ĩ</a>, Up: <a
href="#umlaut" accesskey="u" rel="up">umlaut</a> </p>
</div>
<h4 class="node-heading">ï</h4>
<hr>
-<a class="node-anchor" id="g_t_0129"></a><div class="nav-header">
+<a class="node" id="g_t_0129"></a><div class="nav-header">
<p>
Previous: <a href="#g_t_00ef" accesskey="p" rel="prev">ï</a>, Up: <a
href="#umlaut" accesskey="u" rel="up">umlaut</a> </p>
</div>
diff --git a/tp/t/results/html_tests/ref_in_preformatted.pl
b/tp/t/results/html_tests/ref_in_preformatted.pl
index b3feefc037..433c06e8e5 100644
--- a/tp/t/results/html_tests/ref_in_preformatted.pl
+++ b/tp/t/results/html_tests/ref_in_preformatted.pl
@@ -461,7 +461,7 @@ $result_floats{'ref_in_preformatted'} = {};
-$result_converted{'html_text'}->{'ref_in_preformatted'} = '<a
class="node-anchor" id="Top"></a><div class="nav-header">
+$result_converted{'html_text'}->{'ref_in_preformatted'} = '<a class="node"
id="Top"></a><div class="nav-header">
<p>
</p>
</div>
@@ -474,7 +474,7 @@ node name</a>
</pre></div>
<hr>
-<a class="node-anchor" id="nnn-the-node-name"></a><div class="nav-header">
+<a class="node" id="nnn-the-node-name"></a><div class="nav-header">
<p>
</p>
</div>
diff --git a/tp/t/results/html_tests/simple_menu.pl
b/tp/t/results/html_tests/simple_menu.pl
index d7bb632a4a..c8069cddff 100644
--- a/tp/t/results/html_tests/simple_menu.pl
+++ b/tp/t/results/html_tests/simple_menu.pl
@@ -2249,7 +2249,7 @@ $result_converted{'html'}->{'simple_menu'} = '<!DOCTYPE
html>
<body lang="en">
<div class="top" id="Top">
-<a class="top-anchor" id="SEC_Top"></a>
+<a class="top" id="SEC_Top"></a>
</div>
diff --git a/tp/t/results/htmlxref/htmlxref/res_html/test_refs.html
b/tp/t/results/htmlxref/htmlxref/res_html/test_refs.html
index 2d7a4f196e..1c72ee50b6 100644
--- a/tp/t/results/htmlxref/htmlxref/res_html/test_refs.html
+++ b/tp/t/results/htmlxref/htmlxref/res_html/test_refs.html
@@ -132,15 +132,15 @@ split: ../doc/node.html#node
</td></tr>
</table>
-<a class="node-anchor"
id="g_t_0021_005f_0022_0023_0024_0025_0026_0027_0028_0029_002a_002b_002d_002e"></a><div
class="example">
+<a class="node"
id="g_t_0021_005f_0022_0023_0024_0025_0026_0027_0028_0029_002a_002b_002d_002e"></a><div
class="example">
<pre class="example-preformatted">id:
_0021_005f_0022_0023_0024_0025_0026_0027_0028_0029_002a_002b_002d_002e
</pre></div>
-<a class="node-anchor"
id="g_t_002f_003b_003c_003d_003e_003f_005b_005c_005d_005e_005f_0060_007c_007e"></a><div
class="example">
+<a class="node"
id="g_t_002f_003b_003c_003d_003e_003f_005b_005c_005d_005e_005f_0060_007c_007e"></a><div
class="example">
<pre class="example-preformatted">id:
002f_003b_003c_003d_003e_003f_005b_005c_005d_005e_005f_0060_007c_007e
</pre></div>
-<a class="node-anchor" id="local-node"></a><div class="example">
+<a class="node" id="local-node"></a><div class="example">
<pre class="example-preformatted">id: local-node
</pre></div>
diff --git
a/tp/t/results/htmlxref/htmlxref_nodes/res_html/_0021_005f_0022_0023_0024_0025_0026_0027_0028_0029_002a_002b_002d_002e.html
b/tp/t/results/htmlxref/htmlxref_nodes/res_html/_0021_005f_0022_0023_0024_0025_0026_0027_0028_0029_002a_002b_002d_002e.html
index a0de41358b..f059c3d0b3 100644
---
a/tp/t/results/htmlxref/htmlxref_nodes/res_html/_0021_005f_0022_0023_0024_0025_0026_0027_0028_0029_002a_002b_002d_002e.html
+++
b/tp/t/results/htmlxref/htmlxref_nodes/res_html/_0021_005f_0022_0023_0024_0025_0026_0027_0028_0029_002a_002b_002d_002e.html
@@ -23,7 +23,7 @@ span.program-in-footer {font-size: smaller}
</head>
<body lang="en">
-<a class="node-anchor"
id="g_t_0021_005f_0022_0023_0024_0025_0026_0027_0028_0029_002a_002b_002d_002e"></a><table
class="nav-header" cellpadding="1" cellspacing="1" border="0">
+<a class="node"
id="g_t_0021_005f_0022_0023_0024_0025_0026_0027_0028_0029_002a_002b_002d_002e"></a><table
class="nav-header" cellpadding="1" cellspacing="1" border="0">
<tr><td valign="middle" align="left">[<a href="other-nodes.html"
title="Beginning of this chapter or previous chapter"> << </a>]</td>
<td valign="middle" align="left">[<a href="other-nodes.html" title="Previous
section in reading order"> < </a>]</td>
<td valign="middle" align="left">[<a href="other-nodes.html" title="Up
section"> Up </a>]</td>
diff --git
a/tp/t/results/htmlxref/htmlxref_nodes/res_html/_002f_003b_003c_003d_003e_003f_005b_005c_005d_005e_005f_0060_007c_007e.html
b/tp/t/results/htmlxref/htmlxref_nodes/res_html/_002f_003b_003c_003d_003e_003f_005b_005c_005d_005e_005f_0060_007c_007e.html
index 4730dc60a6..937b61f425 100644
---
a/tp/t/results/htmlxref/htmlxref_nodes/res_html/_002f_003b_003c_003d_003e_003f_005b_005c_005d_005e_005f_0060_007c_007e.html
+++
b/tp/t/results/htmlxref/htmlxref_nodes/res_html/_002f_003b_003c_003d_003e_003f_005b_005c_005d_005e_005f_0060_007c_007e.html
@@ -23,7 +23,7 @@ span.program-in-footer {font-size: smaller}
</head>
<body lang="en">
-<a class="node-anchor"
id="g_t_002f_003b_003c_003d_003e_003f_005b_005c_005d_005e_005f_0060_007c_007e"></a><table
class="nav-header" cellpadding="1" cellspacing="1" border="0">
+<a class="node"
id="g_t_002f_003b_003c_003d_003e_003f_005b_005c_005d_005e_005f_0060_007c_007e"></a><table
class="nav-header" cellpadding="1" cellspacing="1" border="0">
<tr><td valign="middle" align="left">[<a href="other-nodes.html"
title="Beginning of this chapter or previous chapter"> << </a>]</td>
<td valign="middle" align="left">[<a
href="_0021_005f_0022_0023_0024_0025_0026_0027_0028_0029_002a_002b_002d_002e.html"
title="Previous section in reading order"> < </a>]</td>
<td valign="middle" align="left">[<a href="other-nodes.html" title="Up
section"> Up </a>]</td>
diff --git a/tp/t/results/htmlxref/htmlxref_nodes/res_html/local-node.html
b/tp/t/results/htmlxref/htmlxref_nodes/res_html/local-node.html
index f21f6a316b..8c608a4e8b 100644
--- a/tp/t/results/htmlxref/htmlxref_nodes/res_html/local-node.html
+++ b/tp/t/results/htmlxref/htmlxref_nodes/res_html/local-node.html
@@ -23,7 +23,7 @@ span.program-in-footer {font-size: smaller}
</head>
<body lang="en">
-<a class="node-anchor" id="local-node"></a><table class="nav-header"
cellpadding="1" cellspacing="1" border="0">
+<a class="node" id="local-node"></a><table class="nav-header" cellpadding="1"
cellspacing="1" border="0">
<tr><td valign="middle" align="left">[<a href="other-nodes.html"
title="Beginning of this chapter or previous chapter"> << </a>]</td>
<td valign="middle" align="left">[<a
href="_002f_003b_003c_003d_003e_003f_005b_005c_005d_005e_005f_0060_007c_007e.html"
title="Previous section in reading order"> < </a>]</td>
<td valign="middle" align="left">[<a href="other-nodes.html" title="Up
section"> Up </a>]</td>
diff --git a/tp/t/results/htmlxref/htmlxref_only_mono/res_html/test_refs.html
b/tp/t/results/htmlxref/htmlxref_only_mono/res_html/test_refs.html
index 2d7a4f196e..1c72ee50b6 100644
--- a/tp/t/results/htmlxref/htmlxref_only_mono/res_html/test_refs.html
+++ b/tp/t/results/htmlxref/htmlxref_only_mono/res_html/test_refs.html
@@ -132,15 +132,15 @@ split: ../doc/node.html#node
</td></tr>
</table>
-<a class="node-anchor"
id="g_t_0021_005f_0022_0023_0024_0025_0026_0027_0028_0029_002a_002b_002d_002e"></a><div
class="example">
+<a class="node"
id="g_t_0021_005f_0022_0023_0024_0025_0026_0027_0028_0029_002a_002b_002d_002e"></a><div
class="example">
<pre class="example-preformatted">id:
_0021_005f_0022_0023_0024_0025_0026_0027_0028_0029_002a_002b_002d_002e
</pre></div>
-<a class="node-anchor"
id="g_t_002f_003b_003c_003d_003e_003f_005b_005c_005d_005e_005f_0060_007c_007e"></a><div
class="example">
+<a class="node"
id="g_t_002f_003b_003c_003d_003e_003f_005b_005c_005d_005e_005f_0060_007c_007e"></a><div
class="example">
<pre class="example-preformatted">id:
002f_003b_003c_003d_003e_003f_005b_005c_005d_005e_005f_0060_007c_007e
</pre></div>
-<a class="node-anchor" id="local-node"></a><div class="example">
+<a class="node" id="local-node"></a><div class="example">
<pre class="example-preformatted">id: local-node
</pre></div>
diff --git
a/tp/t/results/htmlxref/htmlxref_only_mono_nodes/res_html/_0021_005f_0022_0023_0024_0025_0026_0027_0028_0029_002a_002b_002d_002e.html
b/tp/t/results/htmlxref/htmlxref_only_mono_nodes/res_html/_0021_005f_0022_0023_0024_0025_0026_0027_0028_0029_002a_002b_002d_002e.html
index a0de41358b..f059c3d0b3 100644
---
a/tp/t/results/htmlxref/htmlxref_only_mono_nodes/res_html/_0021_005f_0022_0023_0024_0025_0026_0027_0028_0029_002a_002b_002d_002e.html
+++
b/tp/t/results/htmlxref/htmlxref_only_mono_nodes/res_html/_0021_005f_0022_0023_0024_0025_0026_0027_0028_0029_002a_002b_002d_002e.html
@@ -23,7 +23,7 @@ span.program-in-footer {font-size: smaller}
</head>
<body lang="en">
-<a class="node-anchor"
id="g_t_0021_005f_0022_0023_0024_0025_0026_0027_0028_0029_002a_002b_002d_002e"></a><table
class="nav-header" cellpadding="1" cellspacing="1" border="0">
+<a class="node"
id="g_t_0021_005f_0022_0023_0024_0025_0026_0027_0028_0029_002a_002b_002d_002e"></a><table
class="nav-header" cellpadding="1" cellspacing="1" border="0">
<tr><td valign="middle" align="left">[<a href="other-nodes.html"
title="Beginning of this chapter or previous chapter"> << </a>]</td>
<td valign="middle" align="left">[<a href="other-nodes.html" title="Previous
section in reading order"> < </a>]</td>
<td valign="middle" align="left">[<a href="other-nodes.html" title="Up
section"> Up </a>]</td>
diff --git
a/tp/t/results/htmlxref/htmlxref_only_mono_nodes/res_html/_002f_003b_003c_003d_003e_003f_005b_005c_005d_005e_005f_0060_007c_007e.html
b/tp/t/results/htmlxref/htmlxref_only_mono_nodes/res_html/_002f_003b_003c_003d_003e_003f_005b_005c_005d_005e_005f_0060_007c_007e.html
index 4730dc60a6..937b61f425 100644
---
a/tp/t/results/htmlxref/htmlxref_only_mono_nodes/res_html/_002f_003b_003c_003d_003e_003f_005b_005c_005d_005e_005f_0060_007c_007e.html
+++
b/tp/t/results/htmlxref/htmlxref_only_mono_nodes/res_html/_002f_003b_003c_003d_003e_003f_005b_005c_005d_005e_005f_0060_007c_007e.html
@@ -23,7 +23,7 @@ span.program-in-footer {font-size: smaller}
</head>
<body lang="en">
-<a class="node-anchor"
id="g_t_002f_003b_003c_003d_003e_003f_005b_005c_005d_005e_005f_0060_007c_007e"></a><table
class="nav-header" cellpadding="1" cellspacing="1" border="0">
+<a class="node"
id="g_t_002f_003b_003c_003d_003e_003f_005b_005c_005d_005e_005f_0060_007c_007e"></a><table
class="nav-header" cellpadding="1" cellspacing="1" border="0">
<tr><td valign="middle" align="left">[<a href="other-nodes.html"
title="Beginning of this chapter or previous chapter"> << </a>]</td>
<td valign="middle" align="left">[<a
href="_0021_005f_0022_0023_0024_0025_0026_0027_0028_0029_002a_002b_002d_002e.html"
title="Previous section in reading order"> < </a>]</td>
<td valign="middle" align="left">[<a href="other-nodes.html" title="Up
section"> Up </a>]</td>
diff --git
a/tp/t/results/htmlxref/htmlxref_only_mono_nodes/res_html/local-node.html
b/tp/t/results/htmlxref/htmlxref_only_mono_nodes/res_html/local-node.html
index f21f6a316b..8c608a4e8b 100644
--- a/tp/t/results/htmlxref/htmlxref_only_mono_nodes/res_html/local-node.html
+++ b/tp/t/results/htmlxref/htmlxref_only_mono_nodes/res_html/local-node.html
@@ -23,7 +23,7 @@ span.program-in-footer {font-size: smaller}
</head>
<body lang="en">
-<a class="node-anchor" id="local-node"></a><table class="nav-header"
cellpadding="1" cellspacing="1" border="0">
+<a class="node" id="local-node"></a><table class="nav-header" cellpadding="1"
cellspacing="1" border="0">
<tr><td valign="middle" align="left">[<a href="other-nodes.html"
title="Beginning of this chapter or previous chapter"> << </a>]</td>
<td valign="middle" align="left">[<a
href="_002f_003b_003c_003d_003e_003f_005b_005c_005d_005e_005f_0060_007c_007e.html"
title="Previous section in reading order"> < </a>]</td>
<td valign="middle" align="left">[<a href="other-nodes.html" title="Up
section"> Up </a>]</td>
diff --git a/tp/t/results/htmlxref/htmlxref_only_split/res_html/test_refs.html
b/tp/t/results/htmlxref/htmlxref_only_split/res_html/test_refs.html
index ad29aeb3cf..7875691a22 100644
--- a/tp/t/results/htmlxref/htmlxref_only_split/res_html/test_refs.html
+++ b/tp/t/results/htmlxref/htmlxref_only_split/res_html/test_refs.html
@@ -132,15 +132,15 @@ split: ../doc/node.html#node
</td></tr>
</table>
-<a class="node-anchor"
id="g_t_0021_005f_0022_0023_0024_0025_0026_0027_0028_0029_002a_002b_002d_002e"></a><div
class="example">
+<a class="node"
id="g_t_0021_005f_0022_0023_0024_0025_0026_0027_0028_0029_002a_002b_002d_002e"></a><div
class="example">
<pre class="example-preformatted">id:
_0021_005f_0022_0023_0024_0025_0026_0027_0028_0029_002a_002b_002d_002e
</pre></div>
-<a class="node-anchor"
id="g_t_002f_003b_003c_003d_003e_003f_005b_005c_005d_005e_005f_0060_007c_007e"></a><div
class="example">
+<a class="node"
id="g_t_002f_003b_003c_003d_003e_003f_005b_005c_005d_005e_005f_0060_007c_007e"></a><div
class="example">
<pre class="example-preformatted">id:
002f_003b_003c_003d_003e_003f_005b_005c_005d_005e_005f_0060_007c_007e
</pre></div>
-<a class="node-anchor" id="local-node"></a><div class="example">
+<a class="node" id="local-node"></a><div class="example">
<pre class="example-preformatted">id: local-node
</pre></div>
diff --git
a/tp/t/results/htmlxref/htmlxref_only_split_nodes/res_html/_0021_005f_0022_0023_0024_0025_0026_0027_0028_0029_002a_002b_002d_002e.html
b/tp/t/results/htmlxref/htmlxref_only_split_nodes/res_html/_0021_005f_0022_0023_0024_0025_0026_0027_0028_0029_002a_002b_002d_002e.html
index a0de41358b..f059c3d0b3 100644
---
a/tp/t/results/htmlxref/htmlxref_only_split_nodes/res_html/_0021_005f_0022_0023_0024_0025_0026_0027_0028_0029_002a_002b_002d_002e.html
+++
b/tp/t/results/htmlxref/htmlxref_only_split_nodes/res_html/_0021_005f_0022_0023_0024_0025_0026_0027_0028_0029_002a_002b_002d_002e.html
@@ -23,7 +23,7 @@ span.program-in-footer {font-size: smaller}
</head>
<body lang="en">
-<a class="node-anchor"
id="g_t_0021_005f_0022_0023_0024_0025_0026_0027_0028_0029_002a_002b_002d_002e"></a><table
class="nav-header" cellpadding="1" cellspacing="1" border="0">
+<a class="node"
id="g_t_0021_005f_0022_0023_0024_0025_0026_0027_0028_0029_002a_002b_002d_002e"></a><table
class="nav-header" cellpadding="1" cellspacing="1" border="0">
<tr><td valign="middle" align="left">[<a href="other-nodes.html"
title="Beginning of this chapter or previous chapter"> << </a>]</td>
<td valign="middle" align="left">[<a href="other-nodes.html" title="Previous
section in reading order"> < </a>]</td>
<td valign="middle" align="left">[<a href="other-nodes.html" title="Up
section"> Up </a>]</td>
diff --git
a/tp/t/results/htmlxref/htmlxref_only_split_nodes/res_html/_002f_003b_003c_003d_003e_003f_005b_005c_005d_005e_005f_0060_007c_007e.html
b/tp/t/results/htmlxref/htmlxref_only_split_nodes/res_html/_002f_003b_003c_003d_003e_003f_005b_005c_005d_005e_005f_0060_007c_007e.html
index 4730dc60a6..937b61f425 100644
---
a/tp/t/results/htmlxref/htmlxref_only_split_nodes/res_html/_002f_003b_003c_003d_003e_003f_005b_005c_005d_005e_005f_0060_007c_007e.html
+++
b/tp/t/results/htmlxref/htmlxref_only_split_nodes/res_html/_002f_003b_003c_003d_003e_003f_005b_005c_005d_005e_005f_0060_007c_007e.html
@@ -23,7 +23,7 @@ span.program-in-footer {font-size: smaller}
</head>
<body lang="en">
-<a class="node-anchor"
id="g_t_002f_003b_003c_003d_003e_003f_005b_005c_005d_005e_005f_0060_007c_007e"></a><table
class="nav-header" cellpadding="1" cellspacing="1" border="0">
+<a class="node"
id="g_t_002f_003b_003c_003d_003e_003f_005b_005c_005d_005e_005f_0060_007c_007e"></a><table
class="nav-header" cellpadding="1" cellspacing="1" border="0">
<tr><td valign="middle" align="left">[<a href="other-nodes.html"
title="Beginning of this chapter or previous chapter"> << </a>]</td>
<td valign="middle" align="left">[<a
href="_0021_005f_0022_0023_0024_0025_0026_0027_0028_0029_002a_002b_002d_002e.html"
title="Previous section in reading order"> < </a>]</td>
<td valign="middle" align="left">[<a href="other-nodes.html" title="Up
section"> Up </a>]</td>
diff --git
a/tp/t/results/htmlxref/htmlxref_only_split_nodes/res_html/local-node.html
b/tp/t/results/htmlxref/htmlxref_only_split_nodes/res_html/local-node.html
index f21f6a316b..8c608a4e8b 100644
--- a/tp/t/results/htmlxref/htmlxref_only_split_nodes/res_html/local-node.html
+++ b/tp/t/results/htmlxref/htmlxref_only_split_nodes/res_html/local-node.html
@@ -23,7 +23,7 @@ span.program-in-footer {font-size: smaller}
</head>
<body lang="en">
-<a class="node-anchor" id="local-node"></a><table class="nav-header"
cellpadding="1" cellspacing="1" border="0">
+<a class="node" id="local-node"></a><table class="nav-header" cellpadding="1"
cellspacing="1" border="0">
<tr><td valign="middle" align="left">[<a href="other-nodes.html"
title="Beginning of this chapter or previous chapter"> << </a>]</td>
<td valign="middle" align="left">[<a
href="_002f_003b_003c_003d_003e_003f_005b_005c_005d_005e_005f_0060_007c_007e.html"
title="Previous section in reading order"> < </a>]</td>
<td valign="middle" align="left">[<a href="other-nodes.html" title="Up
section"> Up </a>]</td>
diff --git a/tp/t/results/indices/def_syn_indices.pl
b/tp/t/results/indices/def_syn_indices.pl
index a4c7b3bd1e..3b0f38370d 100644
--- a/tp/t/results/indices/def_syn_indices.pl
+++ b/tp/t/results/indices/def_syn_indices.pl
@@ -2069,23 +2069,23 @@ $result_converted{'html_text'}->{'def_syn_indices'} = '
<p>definedx truc
after
</p>
-<a class="index-entry-anchor" id="index-index-truc"></a>
+<a class="index-entry-id" id="index-index-truc"></a>
-<a class="index-entry-anchor" id="index-a-index-entry-te-i"></a>
+<a class="index-entry-id" id="index-a-index-entry-te-i"></a>
-<a class="index-entry-anchor" id="index-cindex-entry"></a>
+<a class="index-entry-id" id="index-cindex-entry"></a>
-<a class="index-entry-anchor" id="index-truc-kindex"></a>
-<a class="index-entry-anchor" id="index-pindex-codeidx"></a>
+<a class="index-entry-id" id="index-truc-kindex"></a>
+<a class="index-entry-id" id="index-pindex-codeidx"></a>
-<a class="index-entry-anchor" id="index-defg-index-entry"></a>
+<a class="index-entry-id" id="index-defg-index-entry"></a>
-<a class="index-entry-anchor" id="index-abc-index-entry"></a>
+<a class="index-entry-id" id="index-abc-index-entry"></a>
<p>pg
</p><div class="printindex pg-printindex">
diff --git
a/tp/t/results/indices/default_cp_index_and_one_letter_syncodeindex.pl
b/tp/t/results/indices/default_cp_index_and_one_letter_syncodeindex.pl
index d5d4485bf3..a8da067ec5 100644
--- a/tp/t/results/indices/default_cp_index_and_one_letter_syncodeindex.pl
+++ b/tp/t/results/indices/default_cp_index_and_one_letter_syncodeindex.pl
@@ -388,8 +388,8 @@
$result_converted{'plaintext'}->{'default_cp_index_and_one_letter_syncodeindex'}
$result_converted{'html_text'}->{'default_cp_index_and_one_letter_syncodeindex'}
= '<h1 class="node-heading" id="Top">Top</h1>
-<a class="index-entry-anchor" id="index-_002d_002dcindex"></a>
-<a class="index-entry-anchor" id="index-_002d_002dcpindex"></a>
+<a class="index-entry-id" id="index-_002d_002dcindex"></a>
+<a class="index-entry-id" id="index-_002d_002dcpindex"></a>
<div class="printindex fn-printindex">
<table class="fn-letters-header-printindex"><tr><th valign="top">Jump to:
</th><td><a class="summary-letter-printindex"
href="#t_h_fn_symbol-1"><b>-</b></a>
diff --git a/tp/t/results/indices/double_index_entry.pl
b/tp/t/results/indices/double_index_entry.pl
index c045ce75a8..a5a973200b 100644
--- a/tp/t/results/indices/double_index_entry.pl
+++ b/tp/t/results/indices/double_index_entry.pl
@@ -666,27 +666,27 @@ $result_converted{'plaintext'}->{'double_index_entry'} =
'Text
';
-$result_converted{'html_text'}->{'double_index_entry'} = '<a
class="node-anchor" id="Top"></a><div class="nav-header">
+$result_converted{'html_text'}->{'double_index_entry'} = '<a class="node"
id="Top"></a><div class="nav-header">
<p>
[<a href="#other-node" title="Index" rel="index">Index</a>]</p>
</div>
<h1 class="node-heading">Top</h1>
-<a class="index-entry-anchor" id="index-aaa"></a>
+<a class="index-entry-id" id="index-aaa"></a>
<p>Text
</p>
-<a class="index-entry-anchor" id="index-aaa-1"></a>
+<a class="index-entry-id" id="index-aaa-1"></a>
<hr>
-<a class="node-anchor" id="other-node"></a><div class="nav-header">
+<a class="node" id="other-node"></a><div class="nav-header">
<p>
[<a href="#other-node" title="Index" rel="index">Index</a>]</p>
</div>
<h4 class="node-heading">other node</h4>
-<a class="index-entry-anchor" id="index-aaa-2"></a>
+<a class="index-entry-id" id="index-aaa-2"></a>
<div class="printindex cp-printindex">
<table class="cp-letters-header-printindex"><tr><th valign="top">Jump to:
</th><td><a class="summary-letter-printindex"
href="#t_h_cp_letter-A"><b>A</b></a>
diff --git a/tp/t/results/indices/double_syncodeindex.pl
b/tp/t/results/indices/double_syncodeindex.pl
index 7d61367018..c2c02138e8 100644
--- a/tp/t/results/indices/double_syncodeindex.pl
+++ b/tp/t/results/indices/double_syncodeindex.pl
@@ -470,8 +470,8 @@ $result_converted{'plaintext'}->{'double_syncodeindex'} =
'* Menu:
$result_converted{'html_text'}->{'double_syncodeindex'} = '
<h1 class="node-heading" id="Top">Top</h1>
-<a class="index-entry-anchor" id="index-cindex-entry"></a>
-<a class="index-entry-anchor" id="index-findex-entry"></a>
+<a class="index-entry-id" id="index-cindex-entry"></a>
+<a class="index-entry-id" id="index-findex-entry"></a>
<div class="printindex fn-printindex">
<table class="fn-letters-header-printindex"><tr><th valign="top">Jump to:
</th><td><a class="summary-letter-printindex"
href="#t_h_fn_letter-C"><b>C</b></a>
diff --git a/tp/t/results/indices/empty_string_index_entry.pl
b/tp/t/results/indices/empty_string_index_entry.pl
index c29b21c437..32e4e072ae 100644
--- a/tp/t/results/indices/empty_string_index_entry.pl
+++ b/tp/t/results/indices/empty_string_index_entry.pl
@@ -925,7 +925,7 @@
$result_converted_errors{'plaintext'}->{'empty_string_index_entry'} = [
$result_converted{'html_text'}->{'empty_string_index_entry'} = '<h1
class="node-heading" id="Top">Top</h1>
-<a class="index-entry-anchor" id="index-"></a>
+<a class="index-entry-id" id="index-"></a>
<dl class="ftable">
<dt id=\'index--1\'><span><code class="code"><!-- /@w --></code><a
class="copiable-anchor" href=\'#index--1\'> ¶</a></span></dt>
diff --git a/tp/t/results/indices/encoding_index_ascii/res_html/index.html
b/tp/t/results/indices/encoding_index_ascii/res_html/index.html
index f3cfc01cc4..9c543eddbf 100644
--- a/tp/t/results/indices/encoding_index_ascii/res_html/index.html
+++ b/tp/t/results/indices/encoding_index_ascii/res_html/index.html
@@ -27,61 +27,61 @@ a.summary-letter-printindex {text-decoration: none}
<div class="top" id="Top">
<h1 class="top" id="top">top</h1>
-<a class="index-entry-anchor" id="index-e-e"></a>
-<a class="index-entry-anchor" id="index-i-iii"></a>
-<a class="index-entry-anchor" id="index-i-iiii"></a>
-<a class="index-entry-anchor" id="index-a"></a>
-<a class="index-entry-anchor" id="index-b"></a>
-<a class="index-entry-anchor" id="index-c"></a>
-<a class="index-entry-anchor" id="index-d"></a>
-<a class="index-entry-anchor" id="index-e"></a>
-<a class="index-entry-anchor" id="index-f"></a>
-<a class="index-entry-anchor" id="index-g"></a>
-<a class="index-entry-anchor" id="index-h"></a>
-<a class="index-entry-anchor" id="index-i"></a>
-<a class="index-entry-anchor" id="index-j"></a>
-<a class="index-entry-anchor" id="index-k"></a>
-<a class="index-entry-anchor" id="index-l"></a>
-<a class="index-entry-anchor" id="index-m"></a>
-<a class="index-entry-anchor" id="index-n"></a>
-<a class="index-entry-anchor" id="index-o"></a>
-<a class="index-entry-anchor" id="index-p"></a>
-<a class="index-entry-anchor" id="index-q"></a>
-<a class="index-entry-anchor" id="index-r"></a>
-<a class="index-entry-anchor" id="index-s"></a>
-<a class="index-entry-anchor" id="index-t"></a>
-<a class="index-entry-anchor" id="index-u"></a>
-<a class="index-entry-anchor" id="index-v"></a>
-<a class="index-entry-anchor" id="index-w"></a>
-<a class="index-entry-anchor" id="index-x"></a>
-<a class="index-entry-anchor" id="index-y"></a>
-<a class="index-entry-anchor" id="index-z"></a>
-<a class="index-entry-anchor" id="index-A"></a>
-<a class="index-entry-anchor" id="index-B"></a>
-<a class="index-entry-anchor" id="index-l-1"></a>
-<a class="index-entry-anchor" id="index-L"></a>
-<a class="index-entry-anchor" id="index-i-i-_0028dotless_0029"></a>
-<a class="index-entry-anchor" id="index-i-i-_0028dotless_0029-1"></a>
-<a class="index-entry-anchor" id="index-ss"></a>
-<a class="index-entry-anchor" id="index-_20ac"></a>
-<a class="index-entry-anchor" id="index-AE"></a>
-<a class="index-entry-anchor" id="index-_00a1"></a>
-<a class="index-entry-anchor" id="index-TH"></a>
-<a class="index-entry-anchor" id="index-D"></a>
-<a class="index-entry-anchor" id="index-_00b0"></a>
-<a class="index-entry-anchor" id="index-0"></a>
-<a class="index-entry-anchor" id="index-9"></a>
-<a class="index-entry-anchor" id="index-_201c"></a>
-<a class="index-entry-anchor" id="index-_2265"></a>
-<a class="index-entry-anchor" id="index-_002c"></a>
-<a class="index-entry-anchor" id="index-_0060_0060"></a>
-<a class="index-entry-anchor" id="index-_0060"></a>
-<a class="index-entry-anchor" id="index-_0027"></a>
-<a class="index-entry-anchor" id="index-_0027_0027"></a>
-<a class="index-entry-anchor" id="index-_0022"></a>
-<a class="index-entry-anchor" id="index-_0040"></a>
-<a class="index-entry-anchor" id="index-_002d_002d"></a>
-<a class="index-entry-anchor" id="index-_002d_002d_002d"></a>
+<a class="index-entry-id" id="index-e-e"></a>
+<a class="index-entry-id" id="index-i-iii"></a>
+<a class="index-entry-id" id="index-i-iiii"></a>
+<a class="index-entry-id" id="index-a"></a>
+<a class="index-entry-id" id="index-b"></a>
+<a class="index-entry-id" id="index-c"></a>
+<a class="index-entry-id" id="index-d"></a>
+<a class="index-entry-id" id="index-e"></a>
+<a class="index-entry-id" id="index-f"></a>
+<a class="index-entry-id" id="index-g"></a>
+<a class="index-entry-id" id="index-h"></a>
+<a class="index-entry-id" id="index-i"></a>
+<a class="index-entry-id" id="index-j"></a>
+<a class="index-entry-id" id="index-k"></a>
+<a class="index-entry-id" id="index-l"></a>
+<a class="index-entry-id" id="index-m"></a>
+<a class="index-entry-id" id="index-n"></a>
+<a class="index-entry-id" id="index-o"></a>
+<a class="index-entry-id" id="index-p"></a>
+<a class="index-entry-id" id="index-q"></a>
+<a class="index-entry-id" id="index-r"></a>
+<a class="index-entry-id" id="index-s"></a>
+<a class="index-entry-id" id="index-t"></a>
+<a class="index-entry-id" id="index-u"></a>
+<a class="index-entry-id" id="index-v"></a>
+<a class="index-entry-id" id="index-w"></a>
+<a class="index-entry-id" id="index-x"></a>
+<a class="index-entry-id" id="index-y"></a>
+<a class="index-entry-id" id="index-z"></a>
+<a class="index-entry-id" id="index-A"></a>
+<a class="index-entry-id" id="index-B"></a>
+<a class="index-entry-id" id="index-l-1"></a>
+<a class="index-entry-id" id="index-L"></a>
+<a class="index-entry-id" id="index-i-i-_0028dotless_0029"></a>
+<a class="index-entry-id" id="index-i-i-_0028dotless_0029-1"></a>
+<a class="index-entry-id" id="index-ss"></a>
+<a class="index-entry-id" id="index-_20ac"></a>
+<a class="index-entry-id" id="index-AE"></a>
+<a class="index-entry-id" id="index-_00a1"></a>
+<a class="index-entry-id" id="index-TH"></a>
+<a class="index-entry-id" id="index-D"></a>
+<a class="index-entry-id" id="index-_00b0"></a>
+<a class="index-entry-id" id="index-0"></a>
+<a class="index-entry-id" id="index-9"></a>
+<a class="index-entry-id" id="index-_201c"></a>
+<a class="index-entry-id" id="index-_2265"></a>
+<a class="index-entry-id" id="index-_002c"></a>
+<a class="index-entry-id" id="index-_0060_0060"></a>
+<a class="index-entry-id" id="index-_0060"></a>
+<a class="index-entry-id" id="index-_0027"></a>
+<a class="index-entry-id" id="index-_0027_0027"></a>
+<a class="index-entry-id" id="index-_0022"></a>
+<a class="index-entry-id" id="index-_0040"></a>
+<a class="index-entry-id" id="index-_002d_002d"></a>
+<a class="index-entry-id" id="index-_002d_002d_002d"></a>
<div class="printindex cp-printindex">
<table class="cp-letters-header-printindex"><tr><th valign="top">Jump to:
</th><td><a class="summary-letter-printindex"
href="#Top_cp_symbol-1"><b>!</b></a>
diff --git
a/tp/t/results/indices/encoding_index_ascii_enable_encoding/res_html/index.html
b/tp/t/results/indices/encoding_index_ascii_enable_encoding/res_html/index.html
index f3cfc01cc4..9c543eddbf 100644
---
a/tp/t/results/indices/encoding_index_ascii_enable_encoding/res_html/index.html
+++
b/tp/t/results/indices/encoding_index_ascii_enable_encoding/res_html/index.html
@@ -27,61 +27,61 @@ a.summary-letter-printindex {text-decoration: none}
<div class="top" id="Top">
<h1 class="top" id="top">top</h1>
-<a class="index-entry-anchor" id="index-e-e"></a>
-<a class="index-entry-anchor" id="index-i-iii"></a>
-<a class="index-entry-anchor" id="index-i-iiii"></a>
-<a class="index-entry-anchor" id="index-a"></a>
-<a class="index-entry-anchor" id="index-b"></a>
-<a class="index-entry-anchor" id="index-c"></a>
-<a class="index-entry-anchor" id="index-d"></a>
-<a class="index-entry-anchor" id="index-e"></a>
-<a class="index-entry-anchor" id="index-f"></a>
-<a class="index-entry-anchor" id="index-g"></a>
-<a class="index-entry-anchor" id="index-h"></a>
-<a class="index-entry-anchor" id="index-i"></a>
-<a class="index-entry-anchor" id="index-j"></a>
-<a class="index-entry-anchor" id="index-k"></a>
-<a class="index-entry-anchor" id="index-l"></a>
-<a class="index-entry-anchor" id="index-m"></a>
-<a class="index-entry-anchor" id="index-n"></a>
-<a class="index-entry-anchor" id="index-o"></a>
-<a class="index-entry-anchor" id="index-p"></a>
-<a class="index-entry-anchor" id="index-q"></a>
-<a class="index-entry-anchor" id="index-r"></a>
-<a class="index-entry-anchor" id="index-s"></a>
-<a class="index-entry-anchor" id="index-t"></a>
-<a class="index-entry-anchor" id="index-u"></a>
-<a class="index-entry-anchor" id="index-v"></a>
-<a class="index-entry-anchor" id="index-w"></a>
-<a class="index-entry-anchor" id="index-x"></a>
-<a class="index-entry-anchor" id="index-y"></a>
-<a class="index-entry-anchor" id="index-z"></a>
-<a class="index-entry-anchor" id="index-A"></a>
-<a class="index-entry-anchor" id="index-B"></a>
-<a class="index-entry-anchor" id="index-l-1"></a>
-<a class="index-entry-anchor" id="index-L"></a>
-<a class="index-entry-anchor" id="index-i-i-_0028dotless_0029"></a>
-<a class="index-entry-anchor" id="index-i-i-_0028dotless_0029-1"></a>
-<a class="index-entry-anchor" id="index-ss"></a>
-<a class="index-entry-anchor" id="index-_20ac"></a>
-<a class="index-entry-anchor" id="index-AE"></a>
-<a class="index-entry-anchor" id="index-_00a1"></a>
-<a class="index-entry-anchor" id="index-TH"></a>
-<a class="index-entry-anchor" id="index-D"></a>
-<a class="index-entry-anchor" id="index-_00b0"></a>
-<a class="index-entry-anchor" id="index-0"></a>
-<a class="index-entry-anchor" id="index-9"></a>
-<a class="index-entry-anchor" id="index-_201c"></a>
-<a class="index-entry-anchor" id="index-_2265"></a>
-<a class="index-entry-anchor" id="index-_002c"></a>
-<a class="index-entry-anchor" id="index-_0060_0060"></a>
-<a class="index-entry-anchor" id="index-_0060"></a>
-<a class="index-entry-anchor" id="index-_0027"></a>
-<a class="index-entry-anchor" id="index-_0027_0027"></a>
-<a class="index-entry-anchor" id="index-_0022"></a>
-<a class="index-entry-anchor" id="index-_0040"></a>
-<a class="index-entry-anchor" id="index-_002d_002d"></a>
-<a class="index-entry-anchor" id="index-_002d_002d_002d"></a>
+<a class="index-entry-id" id="index-e-e"></a>
+<a class="index-entry-id" id="index-i-iii"></a>
+<a class="index-entry-id" id="index-i-iiii"></a>
+<a class="index-entry-id" id="index-a"></a>
+<a class="index-entry-id" id="index-b"></a>
+<a class="index-entry-id" id="index-c"></a>
+<a class="index-entry-id" id="index-d"></a>
+<a class="index-entry-id" id="index-e"></a>
+<a class="index-entry-id" id="index-f"></a>
+<a class="index-entry-id" id="index-g"></a>
+<a class="index-entry-id" id="index-h"></a>
+<a class="index-entry-id" id="index-i"></a>
+<a class="index-entry-id" id="index-j"></a>
+<a class="index-entry-id" id="index-k"></a>
+<a class="index-entry-id" id="index-l"></a>
+<a class="index-entry-id" id="index-m"></a>
+<a class="index-entry-id" id="index-n"></a>
+<a class="index-entry-id" id="index-o"></a>
+<a class="index-entry-id" id="index-p"></a>
+<a class="index-entry-id" id="index-q"></a>
+<a class="index-entry-id" id="index-r"></a>
+<a class="index-entry-id" id="index-s"></a>
+<a class="index-entry-id" id="index-t"></a>
+<a class="index-entry-id" id="index-u"></a>
+<a class="index-entry-id" id="index-v"></a>
+<a class="index-entry-id" id="index-w"></a>
+<a class="index-entry-id" id="index-x"></a>
+<a class="index-entry-id" id="index-y"></a>
+<a class="index-entry-id" id="index-z"></a>
+<a class="index-entry-id" id="index-A"></a>
+<a class="index-entry-id" id="index-B"></a>
+<a class="index-entry-id" id="index-l-1"></a>
+<a class="index-entry-id" id="index-L"></a>
+<a class="index-entry-id" id="index-i-i-_0028dotless_0029"></a>
+<a class="index-entry-id" id="index-i-i-_0028dotless_0029-1"></a>
+<a class="index-entry-id" id="index-ss"></a>
+<a class="index-entry-id" id="index-_20ac"></a>
+<a class="index-entry-id" id="index-AE"></a>
+<a class="index-entry-id" id="index-_00a1"></a>
+<a class="index-entry-id" id="index-TH"></a>
+<a class="index-entry-id" id="index-D"></a>
+<a class="index-entry-id" id="index-_00b0"></a>
+<a class="index-entry-id" id="index-0"></a>
+<a class="index-entry-id" id="index-9"></a>
+<a class="index-entry-id" id="index-_201c"></a>
+<a class="index-entry-id" id="index-_2265"></a>
+<a class="index-entry-id" id="index-_002c"></a>
+<a class="index-entry-id" id="index-_0060_0060"></a>
+<a class="index-entry-id" id="index-_0060"></a>
+<a class="index-entry-id" id="index-_0027"></a>
+<a class="index-entry-id" id="index-_0027_0027"></a>
+<a class="index-entry-id" id="index-_0022"></a>
+<a class="index-entry-id" id="index-_0040"></a>
+<a class="index-entry-id" id="index-_002d_002d"></a>
+<a class="index-entry-id" id="index-_002d_002d_002d"></a>
<div class="printindex cp-printindex">
<table class="cp-letters-header-printindex"><tr><th valign="top">Jump to:
</th><td><a class="summary-letter-printindex"
href="#Top_cp_symbol-1"><b>!</b></a>
diff --git a/tp/t/results/indices/encoding_index_latin1/res_html/index.html
b/tp/t/results/indices/encoding_index_latin1/res_html/index.html
index 6c2930db55..6e71abc605 100644
--- a/tp/t/results/indices/encoding_index_latin1/res_html/index.html
+++ b/tp/t/results/indices/encoding_index_latin1/res_html/index.html
@@ -27,61 +27,61 @@ a.summary-letter-printindex {text-decoration: none}
<div class="top" id="Top">
<h1 class="top" id="top">top</h1>
-<a class="index-entry-anchor" id="index-e-e"></a>
-<a class="index-entry-anchor" id="index-i-iii"></a>
-<a class="index-entry-anchor" id="index-i-iiii"></a>
-<a class="index-entry-anchor" id="index-a"></a>
-<a class="index-entry-anchor" id="index-b"></a>
-<a class="index-entry-anchor" id="index-c"></a>
-<a class="index-entry-anchor" id="index-d"></a>
-<a class="index-entry-anchor" id="index-e"></a>
-<a class="index-entry-anchor" id="index-f"></a>
-<a class="index-entry-anchor" id="index-g"></a>
-<a class="index-entry-anchor" id="index-h"></a>
-<a class="index-entry-anchor" id="index-i"></a>
-<a class="index-entry-anchor" id="index-j"></a>
-<a class="index-entry-anchor" id="index-k"></a>
-<a class="index-entry-anchor" id="index-l"></a>
-<a class="index-entry-anchor" id="index-m"></a>
-<a class="index-entry-anchor" id="index-n"></a>
-<a class="index-entry-anchor" id="index-o"></a>
-<a class="index-entry-anchor" id="index-p"></a>
-<a class="index-entry-anchor" id="index-q"></a>
-<a class="index-entry-anchor" id="index-r"></a>
-<a class="index-entry-anchor" id="index-s"></a>
-<a class="index-entry-anchor" id="index-t"></a>
-<a class="index-entry-anchor" id="index-u"></a>
-<a class="index-entry-anchor" id="index-v"></a>
-<a class="index-entry-anchor" id="index-w"></a>
-<a class="index-entry-anchor" id="index-x"></a>
-<a class="index-entry-anchor" id="index-y"></a>
-<a class="index-entry-anchor" id="index-z"></a>
-<a class="index-entry-anchor" id="index-A"></a>
-<a class="index-entry-anchor" id="index-B"></a>
-<a class="index-entry-anchor" id="index-l-1"></a>
-<a class="index-entry-anchor" id="index-L"></a>
-<a class="index-entry-anchor" id="index-i-i-_0028dotless_0029"></a>
-<a class="index-entry-anchor" id="index-i-i-_0028dotless_0029-1"></a>
-<a class="index-entry-anchor" id="index-ss"></a>
-<a class="index-entry-anchor" id="index-_20ac"></a>
-<a class="index-entry-anchor" id="index-AE"></a>
-<a class="index-entry-anchor" id="index-_00a1"></a>
-<a class="index-entry-anchor" id="index-TH"></a>
-<a class="index-entry-anchor" id="index-D"></a>
-<a class="index-entry-anchor" id="index-_00b0"></a>
-<a class="index-entry-anchor" id="index-0"></a>
-<a class="index-entry-anchor" id="index-9"></a>
-<a class="index-entry-anchor" id="index-_201c"></a>
-<a class="index-entry-anchor" id="index-_2265"></a>
-<a class="index-entry-anchor" id="index-_002c"></a>
-<a class="index-entry-anchor" id="index-_0060_0060"></a>
-<a class="index-entry-anchor" id="index-_0060"></a>
-<a class="index-entry-anchor" id="index-_0027"></a>
-<a class="index-entry-anchor" id="index-_0027_0027"></a>
-<a class="index-entry-anchor" id="index-_0022"></a>
-<a class="index-entry-anchor" id="index-_0040"></a>
-<a class="index-entry-anchor" id="index-_002d_002d"></a>
-<a class="index-entry-anchor" id="index-_002d_002d_002d"></a>
+<a class="index-entry-id" id="index-e-e"></a>
+<a class="index-entry-id" id="index-i-iii"></a>
+<a class="index-entry-id" id="index-i-iiii"></a>
+<a class="index-entry-id" id="index-a"></a>
+<a class="index-entry-id" id="index-b"></a>
+<a class="index-entry-id" id="index-c"></a>
+<a class="index-entry-id" id="index-d"></a>
+<a class="index-entry-id" id="index-e"></a>
+<a class="index-entry-id" id="index-f"></a>
+<a class="index-entry-id" id="index-g"></a>
+<a class="index-entry-id" id="index-h"></a>
+<a class="index-entry-id" id="index-i"></a>
+<a class="index-entry-id" id="index-j"></a>
+<a class="index-entry-id" id="index-k"></a>
+<a class="index-entry-id" id="index-l"></a>
+<a class="index-entry-id" id="index-m"></a>
+<a class="index-entry-id" id="index-n"></a>
+<a class="index-entry-id" id="index-o"></a>
+<a class="index-entry-id" id="index-p"></a>
+<a class="index-entry-id" id="index-q"></a>
+<a class="index-entry-id" id="index-r"></a>
+<a class="index-entry-id" id="index-s"></a>
+<a class="index-entry-id" id="index-t"></a>
+<a class="index-entry-id" id="index-u"></a>
+<a class="index-entry-id" id="index-v"></a>
+<a class="index-entry-id" id="index-w"></a>
+<a class="index-entry-id" id="index-x"></a>
+<a class="index-entry-id" id="index-y"></a>
+<a class="index-entry-id" id="index-z"></a>
+<a class="index-entry-id" id="index-A"></a>
+<a class="index-entry-id" id="index-B"></a>
+<a class="index-entry-id" id="index-l-1"></a>
+<a class="index-entry-id" id="index-L"></a>
+<a class="index-entry-id" id="index-i-i-_0028dotless_0029"></a>
+<a class="index-entry-id" id="index-i-i-_0028dotless_0029-1"></a>
+<a class="index-entry-id" id="index-ss"></a>
+<a class="index-entry-id" id="index-_20ac"></a>
+<a class="index-entry-id" id="index-AE"></a>
+<a class="index-entry-id" id="index-_00a1"></a>
+<a class="index-entry-id" id="index-TH"></a>
+<a class="index-entry-id" id="index-D"></a>
+<a class="index-entry-id" id="index-_00b0"></a>
+<a class="index-entry-id" id="index-0"></a>
+<a class="index-entry-id" id="index-9"></a>
+<a class="index-entry-id" id="index-_201c"></a>
+<a class="index-entry-id" id="index-_2265"></a>
+<a class="index-entry-id" id="index-_002c"></a>
+<a class="index-entry-id" id="index-_0060_0060"></a>
+<a class="index-entry-id" id="index-_0060"></a>
+<a class="index-entry-id" id="index-_0027"></a>
+<a class="index-entry-id" id="index-_0027_0027"></a>
+<a class="index-entry-id" id="index-_0022"></a>
+<a class="index-entry-id" id="index-_0040"></a>
+<a class="index-entry-id" id="index-_002d_002d"></a>
+<a class="index-entry-id" id="index-_002d_002d_002d"></a>
<div class="printindex cp-printindex">
<table class="cp-letters-header-printindex"><tr><th valign="top">Jump to:
</th><td><a class="summary-letter-printindex"
href="#Top_cp_symbol-1"><b>!</b></a>
diff --git
a/tp/t/results/indices/encoding_index_latin1_enable_encoding/res_html/index.html
b/tp/t/results/indices/encoding_index_latin1_enable_encoding/res_html/index.html
index c033352ae5..896c673842 100644
---
a/tp/t/results/indices/encoding_index_latin1_enable_encoding/res_html/index.html
+++
b/tp/t/results/indices/encoding_index_latin1_enable_encoding/res_html/index.html
@@ -27,61 +27,61 @@ a.summary-letter-printindex {text-decoration: none}
<div class="top" id="Top">
<h1 class="top" id="top">top</h1>
-<a class="index-entry-anchor" id="index-e-e"></a>
-<a class="index-entry-anchor" id="index-i-iii"></a>
-<a class="index-entry-anchor" id="index-i-iiii"></a>
-<a class="index-entry-anchor" id="index-a"></a>
-<a class="index-entry-anchor" id="index-b"></a>
-<a class="index-entry-anchor" id="index-c"></a>
-<a class="index-entry-anchor" id="index-d"></a>
-<a class="index-entry-anchor" id="index-e"></a>
-<a class="index-entry-anchor" id="index-f"></a>
-<a class="index-entry-anchor" id="index-g"></a>
-<a class="index-entry-anchor" id="index-h"></a>
-<a class="index-entry-anchor" id="index-i"></a>
-<a class="index-entry-anchor" id="index-j"></a>
-<a class="index-entry-anchor" id="index-k"></a>
-<a class="index-entry-anchor" id="index-l"></a>
-<a class="index-entry-anchor" id="index-m"></a>
-<a class="index-entry-anchor" id="index-n"></a>
-<a class="index-entry-anchor" id="index-o"></a>
-<a class="index-entry-anchor" id="index-p"></a>
-<a class="index-entry-anchor" id="index-q"></a>
-<a class="index-entry-anchor" id="index-r"></a>
-<a class="index-entry-anchor" id="index-s"></a>
-<a class="index-entry-anchor" id="index-t"></a>
-<a class="index-entry-anchor" id="index-u"></a>
-<a class="index-entry-anchor" id="index-v"></a>
-<a class="index-entry-anchor" id="index-w"></a>
-<a class="index-entry-anchor" id="index-x"></a>
-<a class="index-entry-anchor" id="index-y"></a>
-<a class="index-entry-anchor" id="index-z"></a>
-<a class="index-entry-anchor" id="index-A"></a>
-<a class="index-entry-anchor" id="index-B"></a>
-<a class="index-entry-anchor" id="index-l-1"></a>
-<a class="index-entry-anchor" id="index-L"></a>
-<a class="index-entry-anchor" id="index-i-i-_0028dotless_0029"></a>
-<a class="index-entry-anchor" id="index-i-i-_0028dotless_0029-1"></a>
-<a class="index-entry-anchor" id="index-ss"></a>
-<a class="index-entry-anchor" id="index-_20ac"></a>
-<a class="index-entry-anchor" id="index-AE"></a>
-<a class="index-entry-anchor" id="index-_00a1"></a>
-<a class="index-entry-anchor" id="index-TH"></a>
-<a class="index-entry-anchor" id="index-D"></a>
-<a class="index-entry-anchor" id="index-_00b0"></a>
-<a class="index-entry-anchor" id="index-0"></a>
-<a class="index-entry-anchor" id="index-9"></a>
-<a class="index-entry-anchor" id="index-_201c"></a>
-<a class="index-entry-anchor" id="index-_2265"></a>
-<a class="index-entry-anchor" id="index-_002c"></a>
-<a class="index-entry-anchor" id="index-_0060_0060"></a>
-<a class="index-entry-anchor" id="index-_0060"></a>
-<a class="index-entry-anchor" id="index-_0027"></a>
-<a class="index-entry-anchor" id="index-_0027_0027"></a>
-<a class="index-entry-anchor" id="index-_0022"></a>
-<a class="index-entry-anchor" id="index-_0040"></a>
-<a class="index-entry-anchor" id="index-_002d_002d"></a>
-<a class="index-entry-anchor" id="index-_002d_002d_002d"></a>
+<a class="index-entry-id" id="index-e-e"></a>
+<a class="index-entry-id" id="index-i-iii"></a>
+<a class="index-entry-id" id="index-i-iiii"></a>
+<a class="index-entry-id" id="index-a"></a>
+<a class="index-entry-id" id="index-b"></a>
+<a class="index-entry-id" id="index-c"></a>
+<a class="index-entry-id" id="index-d"></a>
+<a class="index-entry-id" id="index-e"></a>
+<a class="index-entry-id" id="index-f"></a>
+<a class="index-entry-id" id="index-g"></a>
+<a class="index-entry-id" id="index-h"></a>
+<a class="index-entry-id" id="index-i"></a>
+<a class="index-entry-id" id="index-j"></a>
+<a class="index-entry-id" id="index-k"></a>
+<a class="index-entry-id" id="index-l"></a>
+<a class="index-entry-id" id="index-m"></a>
+<a class="index-entry-id" id="index-n"></a>
+<a class="index-entry-id" id="index-o"></a>
+<a class="index-entry-id" id="index-p"></a>
+<a class="index-entry-id" id="index-q"></a>
+<a class="index-entry-id" id="index-r"></a>
+<a class="index-entry-id" id="index-s"></a>
+<a class="index-entry-id" id="index-t"></a>
+<a class="index-entry-id" id="index-u"></a>
+<a class="index-entry-id" id="index-v"></a>
+<a class="index-entry-id" id="index-w"></a>
+<a class="index-entry-id" id="index-x"></a>
+<a class="index-entry-id" id="index-y"></a>
+<a class="index-entry-id" id="index-z"></a>
+<a class="index-entry-id" id="index-A"></a>
+<a class="index-entry-id" id="index-B"></a>
+<a class="index-entry-id" id="index-l-1"></a>
+<a class="index-entry-id" id="index-L"></a>
+<a class="index-entry-id" id="index-i-i-_0028dotless_0029"></a>
+<a class="index-entry-id" id="index-i-i-_0028dotless_0029-1"></a>
+<a class="index-entry-id" id="index-ss"></a>
+<a class="index-entry-id" id="index-_20ac"></a>
+<a class="index-entry-id" id="index-AE"></a>
+<a class="index-entry-id" id="index-_00a1"></a>
+<a class="index-entry-id" id="index-TH"></a>
+<a class="index-entry-id" id="index-D"></a>
+<a class="index-entry-id" id="index-_00b0"></a>
+<a class="index-entry-id" id="index-0"></a>
+<a class="index-entry-id" id="index-9"></a>
+<a class="index-entry-id" id="index-_201c"></a>
+<a class="index-entry-id" id="index-_2265"></a>
+<a class="index-entry-id" id="index-_002c"></a>
+<a class="index-entry-id" id="index-_0060_0060"></a>
+<a class="index-entry-id" id="index-_0060"></a>
+<a class="index-entry-id" id="index-_0027"></a>
+<a class="index-entry-id" id="index-_0027_0027"></a>
+<a class="index-entry-id" id="index-_0022"></a>
+<a class="index-entry-id" id="index-_0040"></a>
+<a class="index-entry-id" id="index-_002d_002d"></a>
+<a class="index-entry-id" id="index-_002d_002d_002d"></a>
<div class="printindex cp-printindex">
<table class="cp-letters-header-printindex"><tr><th valign="top">Jump to:
</th><td><a class="summary-letter-printindex"
href="#Top_cp_symbol-1"><b>"</b></a>
diff --git a/tp/t/results/indices/encoding_index_utf8/res_html/index.html
b/tp/t/results/indices/encoding_index_utf8/res_html/index.html
index b94df3b241..4eaae8a069 100644
--- a/tp/t/results/indices/encoding_index_utf8/res_html/index.html
+++ b/tp/t/results/indices/encoding_index_utf8/res_html/index.html
@@ -27,61 +27,61 @@ a.summary-letter-printindex {text-decoration: none}
<div class="top" id="Top">
<h1 class="top" id="top">top</h1>
-<a class="index-entry-anchor" id="index-e-e"></a>
-<a class="index-entry-anchor" id="index-i-iii"></a>
-<a class="index-entry-anchor" id="index-i-iiii"></a>
-<a class="index-entry-anchor" id="index-a"></a>
-<a class="index-entry-anchor" id="index-b"></a>
-<a class="index-entry-anchor" id="index-c"></a>
-<a class="index-entry-anchor" id="index-d"></a>
-<a class="index-entry-anchor" id="index-e"></a>
-<a class="index-entry-anchor" id="index-f"></a>
-<a class="index-entry-anchor" id="index-g"></a>
-<a class="index-entry-anchor" id="index-h"></a>
-<a class="index-entry-anchor" id="index-i"></a>
-<a class="index-entry-anchor" id="index-j"></a>
-<a class="index-entry-anchor" id="index-k"></a>
-<a class="index-entry-anchor" id="index-l"></a>
-<a class="index-entry-anchor" id="index-m"></a>
-<a class="index-entry-anchor" id="index-n"></a>
-<a class="index-entry-anchor" id="index-o"></a>
-<a class="index-entry-anchor" id="index-p"></a>
-<a class="index-entry-anchor" id="index-q"></a>
-<a class="index-entry-anchor" id="index-r"></a>
-<a class="index-entry-anchor" id="index-s"></a>
-<a class="index-entry-anchor" id="index-t"></a>
-<a class="index-entry-anchor" id="index-u"></a>
-<a class="index-entry-anchor" id="index-v"></a>
-<a class="index-entry-anchor" id="index-w"></a>
-<a class="index-entry-anchor" id="index-x"></a>
-<a class="index-entry-anchor" id="index-y"></a>
-<a class="index-entry-anchor" id="index-z"></a>
-<a class="index-entry-anchor" id="index-A"></a>
-<a class="index-entry-anchor" id="index-B"></a>
-<a class="index-entry-anchor" id="index-l-1"></a>
-<a class="index-entry-anchor" id="index-L"></a>
-<a class="index-entry-anchor" id="index-i-i-_0028dotless_0029"></a>
-<a class="index-entry-anchor" id="index-i-i-_0028dotless_0029-1"></a>
-<a class="index-entry-anchor" id="index-ss"></a>
-<a class="index-entry-anchor" id="index-_20ac"></a>
-<a class="index-entry-anchor" id="index-AE"></a>
-<a class="index-entry-anchor" id="index-_00a1"></a>
-<a class="index-entry-anchor" id="index-TH"></a>
-<a class="index-entry-anchor" id="index-D"></a>
-<a class="index-entry-anchor" id="index-_00b0"></a>
-<a class="index-entry-anchor" id="index-0"></a>
-<a class="index-entry-anchor" id="index-9"></a>
-<a class="index-entry-anchor" id="index-_201c"></a>
-<a class="index-entry-anchor" id="index-_2265"></a>
-<a class="index-entry-anchor" id="index-_002c"></a>
-<a class="index-entry-anchor" id="index-_0060_0060"></a>
-<a class="index-entry-anchor" id="index-_0060"></a>
-<a class="index-entry-anchor" id="index-_0027"></a>
-<a class="index-entry-anchor" id="index-_0027_0027"></a>
-<a class="index-entry-anchor" id="index-_0022"></a>
-<a class="index-entry-anchor" id="index-_0040"></a>
-<a class="index-entry-anchor" id="index-_002d_002d"></a>
-<a class="index-entry-anchor" id="index-_002d_002d_002d"></a>
+<a class="index-entry-id" id="index-e-e"></a>
+<a class="index-entry-id" id="index-i-iii"></a>
+<a class="index-entry-id" id="index-i-iiii"></a>
+<a class="index-entry-id" id="index-a"></a>
+<a class="index-entry-id" id="index-b"></a>
+<a class="index-entry-id" id="index-c"></a>
+<a class="index-entry-id" id="index-d"></a>
+<a class="index-entry-id" id="index-e"></a>
+<a class="index-entry-id" id="index-f"></a>
+<a class="index-entry-id" id="index-g"></a>
+<a class="index-entry-id" id="index-h"></a>
+<a class="index-entry-id" id="index-i"></a>
+<a class="index-entry-id" id="index-j"></a>
+<a class="index-entry-id" id="index-k"></a>
+<a class="index-entry-id" id="index-l"></a>
+<a class="index-entry-id" id="index-m"></a>
+<a class="index-entry-id" id="index-n"></a>
+<a class="index-entry-id" id="index-o"></a>
+<a class="index-entry-id" id="index-p"></a>
+<a class="index-entry-id" id="index-q"></a>
+<a class="index-entry-id" id="index-r"></a>
+<a class="index-entry-id" id="index-s"></a>
+<a class="index-entry-id" id="index-t"></a>
+<a class="index-entry-id" id="index-u"></a>
+<a class="index-entry-id" id="index-v"></a>
+<a class="index-entry-id" id="index-w"></a>
+<a class="index-entry-id" id="index-x"></a>
+<a class="index-entry-id" id="index-y"></a>
+<a class="index-entry-id" id="index-z"></a>
+<a class="index-entry-id" id="index-A"></a>
+<a class="index-entry-id" id="index-B"></a>
+<a class="index-entry-id" id="index-l-1"></a>
+<a class="index-entry-id" id="index-L"></a>
+<a class="index-entry-id" id="index-i-i-_0028dotless_0029"></a>
+<a class="index-entry-id" id="index-i-i-_0028dotless_0029-1"></a>
+<a class="index-entry-id" id="index-ss"></a>
+<a class="index-entry-id" id="index-_20ac"></a>
+<a class="index-entry-id" id="index-AE"></a>
+<a class="index-entry-id" id="index-_00a1"></a>
+<a class="index-entry-id" id="index-TH"></a>
+<a class="index-entry-id" id="index-D"></a>
+<a class="index-entry-id" id="index-_00b0"></a>
+<a class="index-entry-id" id="index-0"></a>
+<a class="index-entry-id" id="index-9"></a>
+<a class="index-entry-id" id="index-_201c"></a>
+<a class="index-entry-id" id="index-_2265"></a>
+<a class="index-entry-id" id="index-_002c"></a>
+<a class="index-entry-id" id="index-_0060_0060"></a>
+<a class="index-entry-id" id="index-_0060"></a>
+<a class="index-entry-id" id="index-_0027"></a>
+<a class="index-entry-id" id="index-_0027_0027"></a>
+<a class="index-entry-id" id="index-_0022"></a>
+<a class="index-entry-id" id="index-_0040"></a>
+<a class="index-entry-id" id="index-_002d_002d"></a>
+<a class="index-entry-id" id="index-_002d_002d_002d"></a>
<div class="printindex cp-printindex">
<table class="cp-letters-header-printindex"><tr><th valign="top">Jump to:
</th><td><a class="summary-letter-printindex"
href="#Top_cp_symbol-1"><b>!</b></a>
diff --git
a/tp/t/results/indices/encoding_index_utf8_enable_encoding/res_html/index.html
b/tp/t/results/indices/encoding_index_utf8_enable_encoding/res_html/index.html
index 6a51887d48..2691afc7c0 100644
---
a/tp/t/results/indices/encoding_index_utf8_enable_encoding/res_html/index.html
+++
b/tp/t/results/indices/encoding_index_utf8_enable_encoding/res_html/index.html
@@ -27,61 +27,61 @@ a.summary-letter-printindex {text-decoration: none}
<div class="top" id="Top">
<h1 class="top" id="top">top</h1>
-<a class="index-entry-anchor" id="index-e-e"></a>
-<a class="index-entry-anchor" id="index-i-iii"></a>
-<a class="index-entry-anchor" id="index-i-iiii"></a>
-<a class="index-entry-anchor" id="index-a"></a>
-<a class="index-entry-anchor" id="index-b"></a>
-<a class="index-entry-anchor" id="index-c"></a>
-<a class="index-entry-anchor" id="index-d"></a>
-<a class="index-entry-anchor" id="index-e"></a>
-<a class="index-entry-anchor" id="index-f"></a>
-<a class="index-entry-anchor" id="index-g"></a>
-<a class="index-entry-anchor" id="index-h"></a>
-<a class="index-entry-anchor" id="index-i"></a>
-<a class="index-entry-anchor" id="index-j"></a>
-<a class="index-entry-anchor" id="index-k"></a>
-<a class="index-entry-anchor" id="index-l"></a>
-<a class="index-entry-anchor" id="index-m"></a>
-<a class="index-entry-anchor" id="index-n"></a>
-<a class="index-entry-anchor" id="index-o"></a>
-<a class="index-entry-anchor" id="index-p"></a>
-<a class="index-entry-anchor" id="index-q"></a>
-<a class="index-entry-anchor" id="index-r"></a>
-<a class="index-entry-anchor" id="index-s"></a>
-<a class="index-entry-anchor" id="index-t"></a>
-<a class="index-entry-anchor" id="index-u"></a>
-<a class="index-entry-anchor" id="index-v"></a>
-<a class="index-entry-anchor" id="index-w"></a>
-<a class="index-entry-anchor" id="index-x"></a>
-<a class="index-entry-anchor" id="index-y"></a>
-<a class="index-entry-anchor" id="index-z"></a>
-<a class="index-entry-anchor" id="index-A"></a>
-<a class="index-entry-anchor" id="index-B"></a>
-<a class="index-entry-anchor" id="index-l-1"></a>
-<a class="index-entry-anchor" id="index-L"></a>
-<a class="index-entry-anchor" id="index-i-i-_0028dotless_0029"></a>
-<a class="index-entry-anchor" id="index-i-i-_0028dotless_0029-1"></a>
-<a class="index-entry-anchor" id="index-ss"></a>
-<a class="index-entry-anchor" id="index-_20ac"></a>
-<a class="index-entry-anchor" id="index-AE"></a>
-<a class="index-entry-anchor" id="index-_00a1"></a>
-<a class="index-entry-anchor" id="index-TH"></a>
-<a class="index-entry-anchor" id="index-D"></a>
-<a class="index-entry-anchor" id="index-_00b0"></a>
-<a class="index-entry-anchor" id="index-0"></a>
-<a class="index-entry-anchor" id="index-9"></a>
-<a class="index-entry-anchor" id="index-_201c"></a>
-<a class="index-entry-anchor" id="index-_2265"></a>
-<a class="index-entry-anchor" id="index-_002c"></a>
-<a class="index-entry-anchor" id="index-_0060_0060"></a>
-<a class="index-entry-anchor" id="index-_0060"></a>
-<a class="index-entry-anchor" id="index-_0027"></a>
-<a class="index-entry-anchor" id="index-_0027_0027"></a>
-<a class="index-entry-anchor" id="index-_0022"></a>
-<a class="index-entry-anchor" id="index-_0040"></a>
-<a class="index-entry-anchor" id="index-_002d_002d"></a>
-<a class="index-entry-anchor" id="index-_002d_002d_002d"></a>
+<a class="index-entry-id" id="index-e-e"></a>
+<a class="index-entry-id" id="index-i-iii"></a>
+<a class="index-entry-id" id="index-i-iiii"></a>
+<a class="index-entry-id" id="index-a"></a>
+<a class="index-entry-id" id="index-b"></a>
+<a class="index-entry-id" id="index-c"></a>
+<a class="index-entry-id" id="index-d"></a>
+<a class="index-entry-id" id="index-e"></a>
+<a class="index-entry-id" id="index-f"></a>
+<a class="index-entry-id" id="index-g"></a>
+<a class="index-entry-id" id="index-h"></a>
+<a class="index-entry-id" id="index-i"></a>
+<a class="index-entry-id" id="index-j"></a>
+<a class="index-entry-id" id="index-k"></a>
+<a class="index-entry-id" id="index-l"></a>
+<a class="index-entry-id" id="index-m"></a>
+<a class="index-entry-id" id="index-n"></a>
+<a class="index-entry-id" id="index-o"></a>
+<a class="index-entry-id" id="index-p"></a>
+<a class="index-entry-id" id="index-q"></a>
+<a class="index-entry-id" id="index-r"></a>
+<a class="index-entry-id" id="index-s"></a>
+<a class="index-entry-id" id="index-t"></a>
+<a class="index-entry-id" id="index-u"></a>
+<a class="index-entry-id" id="index-v"></a>
+<a class="index-entry-id" id="index-w"></a>
+<a class="index-entry-id" id="index-x"></a>
+<a class="index-entry-id" id="index-y"></a>
+<a class="index-entry-id" id="index-z"></a>
+<a class="index-entry-id" id="index-A"></a>
+<a class="index-entry-id" id="index-B"></a>
+<a class="index-entry-id" id="index-l-1"></a>
+<a class="index-entry-id" id="index-L"></a>
+<a class="index-entry-id" id="index-i-i-_0028dotless_0029"></a>
+<a class="index-entry-id" id="index-i-i-_0028dotless_0029-1"></a>
+<a class="index-entry-id" id="index-ss"></a>
+<a class="index-entry-id" id="index-_20ac"></a>
+<a class="index-entry-id" id="index-AE"></a>
+<a class="index-entry-id" id="index-_00a1"></a>
+<a class="index-entry-id" id="index-TH"></a>
+<a class="index-entry-id" id="index-D"></a>
+<a class="index-entry-id" id="index-_00b0"></a>
+<a class="index-entry-id" id="index-0"></a>
+<a class="index-entry-id" id="index-9"></a>
+<a class="index-entry-id" id="index-_201c"></a>
+<a class="index-entry-id" id="index-_2265"></a>
+<a class="index-entry-id" id="index-_002c"></a>
+<a class="index-entry-id" id="index-_0060_0060"></a>
+<a class="index-entry-id" id="index-_0060"></a>
+<a class="index-entry-id" id="index-_0027"></a>
+<a class="index-entry-id" id="index-_0027_0027"></a>
+<a class="index-entry-id" id="index-_0022"></a>
+<a class="index-entry-id" id="index-_0040"></a>
+<a class="index-entry-id" id="index-_002d_002d"></a>
+<a class="index-entry-id" id="index-_002d_002d_002d"></a>
<div class="printindex cp-printindex">
<table class="cp-letters-header-printindex"><tr><th valign="top">Jump to:
</th><td><a class="summary-letter-printindex"
href="#Top_cp_symbol-1"><b>"</b></a>
diff --git a/tp/t/results/indices/explicit_sort_key.pl
b/tp/t/results/indices/explicit_sort_key.pl
index 5ab6e14fa2..632bcdc8c1 100644
--- a/tp/t/results/indices/explicit_sort_key.pl
+++ b/tp/t/results/indices/explicit_sort_key.pl
@@ -1015,12 +1015,12 @@ $result_converted{'plaintext'}->{'explicit_sort_key'} =
'in a reuglar para. ‘
$result_converted{'html_text'}->{'explicit_sort_key'} = '<div class="top"
id="Top">
-<a class="top-anchor" id="SEC_Top"></a>
+<a class="top" id="SEC_Top"></a>
-<a class="index-entry-anchor" id="index-bbbbbbb-_0028first_0029"></a>
-<a class="index-entry-anchor" id="index-aaaaaaa-_0028second_0029"></a>
-<a class="index-entry-anchor" id="index-zero-sort-key"></a>
-<a class="index-entry-anchor" id="index-aaa"></a>
+<a class="index-entry-id" id="index-bbbbbbb-_0028first_0029"></a>
+<a class="index-entry-id" id="index-aaaaaaa-_0028second_0029"></a>
+<a class="index-entry-id" id="index-zero-sort-key"></a>
+<a class="index-entry-id" id="index-aaa"></a>
<p>in a reuglar para. <code class="code">inside another</code>.
</p>
diff --git a/tp/t/results/indices/ftable_vtable.pl
b/tp/t/results/indices/ftable_vtable.pl
index 7f3c12249c..f3e0d3b50c 100644
--- a/tp/t/results/indices/ftable_vtable.pl
+++ b/tp/t/results/indices/ftable_vtable.pl
@@ -963,7 +963,7 @@ $result_converted{'html_text'}->{'ftable_vtable'} = '<h1
class="node-heading" id
<dt id=\'index-var3\'><span><em class="emph">var3</em><a
class="copiable-anchor" href=\'#index-var3\'> ¶</a></span></dt>
</dl>
-<a class="index-entry-anchor" id="index-function1-1"></a>
+<a class="index-entry-id" id="index-function1-1"></a>
<div class="printindex fn-printindex">
<table class="fn-letters-header-printindex"><tr><th valign="top">Jump to:
</th><td><a class="summary-letter-printindex"
href="#t_h_fn_letter-F"><b>F</b></a>
diff --git a/tp/t/results/indices/image_lines_count.pl
b/tp/t/results/indices/image_lines_count.pl
index ef9ab6ca08..2a5f0d9707 100644
--- a/tp/t/results/indices/image_lines_count.pl
+++ b/tp/t/results/indices/image_lines_count.pl
@@ -307,7 +307,7 @@ $result_converted{'html_text'}->{'image_lines_count'} =
'<h1 class="node-heading
<img class="image" src="count_image.png" alt="count_image">
-<a class="index-entry-anchor" id="index-index-entry"></a>
+<a class="index-entry-id" id="index-index-entry"></a>
<div class="printindex cp-printindex">
<table class="cp-letters-header-printindex"><tr><th valign="top">Jump to:
</th><td><a class="summary-letter-printindex"
href="#t_h_cp_letter-I"><b>I</b></a>
diff --git a/tp/t/results/indices/image_text_lines_count.pl
b/tp/t/results/indices/image_text_lines_count.pl
index e4138302b4..7a05ebad57 100644
--- a/tp/t/results/indices/image_text_lines_count.pl
+++ b/tp/t/results/indices/image_text_lines_count.pl
@@ -306,7 +306,7 @@ $result_converted{'html_text'}->{'image_text_lines_count'}
= '<h1 class="node-he
<img class="image" src="count_image_text.jpg" alt="count_image_text">
-<a class="index-entry-anchor" id="index-index-entry"></a>
+<a class="index-entry-id" id="index-index-entry"></a>
<div class="printindex cp-printindex">
<table class="cp-letters-header-printindex"><tr><th valign="top">Jump to:
</th><td><a class="summary-letter-printindex"
href="#t_h_cp_letter-I"><b>I</b></a>
diff --git a/tp/t/results/indices/index_entries_locations.pl
b/tp/t/results/indices/index_entries_locations.pl
index 6e42665a66..ab8b253581 100644
--- a/tp/t/results/indices/index_entries_locations.pl
+++ b/tp/t/results/indices/index_entries_locations.pl
@@ -565,16 +565,16 @@
$result_converted{'html_text'}->{'index_entries_locations'} = '<h1 class="node-h
<p>Initial paragraph.
</p>
<p>Paragraph
-<a class="index-entry-anchor" id="index-entry-in-paragraph"></a>
+<a class="index-entry-id" id="index-entry-in-paragraph"></a>
end paragraph.
-<a class="index-entry-anchor" id="index-entry-at-end-of-paragraph_002e"></a>
+<a class="index-entry-id" id="index-entry-at-end-of-paragraph_002e"></a>
</p>
<p>New paragraph.
</p>
-<a class="index-entry-anchor" id="index-Entry-before-paragraph"></a>
+<a class="index-entry-id" id="index-Entry-before-paragraph"></a>
<p>Another paragraph.
</p>
-<a class="index-entry-anchor" id="index-lone-entry"></a>
+<a class="index-entry-id" id="index-lone-entry"></a>
<p>Last paragraph.
</p>
diff --git a/tp/t/results/indices/index_entry_before_first_node.pl
b/tp/t/results/indices/index_entry_before_first_node.pl
index fe503ecde4..2e97541b44 100644
--- a/tp/t/results/indices/index_entry_before_first_node.pl
+++ b/tp/t/results/indices/index_entry_before_first_node.pl
@@ -290,7 +290,7 @@
$result_converted_errors{'plaintext'}->{'index_entry_before_first_node'} = [
-$result_converted{'html_text'}->{'index_entry_before_first_node'} = '<a
class="index-entry-anchor" id="index-before-nodes"></a>
+$result_converted{'html_text'}->{'index_entry_before_first_node'} = '<a
class="index-entry-id" id="index-before-nodes"></a>
<h1 class="node-heading" id="Top">Top</h1>
diff --git a/tp/t/results/indices/index_entry_before_node.pl
b/tp/t/results/indices/index_entry_before_node.pl
index 32900090e5..00032778a6 100644
--- a/tp/t/results/indices/index_entry_before_node.pl
+++ b/tp/t/results/indices/index_entry_before_node.pl
@@ -759,7 +759,7 @@ $result_converted{'plaintext'}->{'index_entry_before_node'}
= 'Para.
';
-$result_converted{'html_text'}->{'index_entry_before_node'} = '<a
class="node-anchor" id="Top"></a><div class="nav-header">
+$result_converted{'html_text'}->{'index_entry_before_node'} = '<a class="node"
id="Top"></a><div class="nav-header">
<p>
[<a href="#second" title="Index" rel="index">Index</a>]</p>
</div>
@@ -767,7 +767,7 @@ $result_converted{'html_text'}->{'index_entry_before_node'}
= '<a class="node-an
<hr>
-<a class="node-anchor" id="first"></a><div class="nav-header">
+<a class="node" id="first"></a><div class="nav-header">
<p>
[<a href="#second" title="Index" rel="index">Index</a>]</p>
</div>
@@ -775,10 +775,10 @@
$result_converted{'html_text'}->{'index_entry_before_node'} = '<a class="node-an
<p>Para.
</p>
-<a class="index-entry-anchor" id="index-lone-entry"></a>
+<a class="index-entry-id" id="index-lone-entry"></a>
<hr>
-<a class="node-anchor" id="second"></a><div class="nav-header">
+<a class="node" id="second"></a><div class="nav-header">
<p>
[<a href="#second" title="Index" rel="index">Index</a>]</p>
</div>
diff --git a/tp/t/results/indices/index_entry_in_footnote.pl
b/tp/t/results/indices/index_entry_in_footnote.pl
index d76703305c..d5bb99de6a 100644
--- a/tp/t/results/indices/index_entry_in_footnote.pl
+++ b/tp/t/results/indices/index_entry_in_footnote.pl
@@ -333,7 +333,7 @@ $result_converted{'html_text'}->{'index_entry_in_footnote'}
= '<h1 class="node-h
<h5><a id="FOOT1" href="#DOCF1">(1)</a></h5>
<p>in footnote
-<a class="index-entry-anchor" id="index-index-entry-in-footnote"></a>
+<a class="index-entry-id" id="index-index-entry-in-footnote"></a>
</p>
</div>
';
diff --git a/tp/t/results/indices/index_entry_in_footnote_different_node_end.pl
b/tp/t/results/indices/index_entry_in_footnote_different_node_end.pl
index ca5337a402..eb1fa86653 100644
--- a/tp/t/results/indices/index_entry_in_footnote_different_node_end.pl
+++ b/tp/t/results/indices/index_entry_in_footnote_different_node_end.pl
@@ -662,7 +662,7 @@
$result_converted{'plaintext'}->{'index_entry_in_footnote_different_node_end'} =
';
-$result_converted{'html_text'}->{'index_entry_in_footnote_different_node_end'}
= '<a class="node-anchor" id="Top"></a><div class="nav-header">
+$result_converted{'html_text'}->{'index_entry_in_footnote_different_node_end'}
= '<a class="node" id="Top"></a><div class="nav-header">
<p>
[<a href="#First" title="Index" rel="index">Index</a>]</p>
</div>
@@ -672,7 +672,7 @@
$result_converted{'html_text'}->{'index_entry_in_footnote_different_node_end'} =
<p>Top node<a class="footnote" id="DOCF1" href="#FOOT1"><sup>1</sup></a>
</p>
<hr>
-<a class="node-anchor" id="First"></a><div class="nav-header">
+<a class="node" id="First"></a><div class="nav-header">
<p>
[<a href="#First" title="Index" rel="index">Index</a>]</p>
</div>
@@ -706,13 +706,13 @@
$result_converted{'html_text'}->{'index_entry_in_footnote_different_node_end'} =
<h5><a id="FOOT1" href="#DOCF1">(1)</a></h5>
<p>in footnote
-<a class="index-entry-anchor" id="index-index-entry-in-footnote"></a>
+<a class="index-entry-id" id="index-index-entry-in-footnote"></a>
</p>
<p>Blah
</p>
<p>Blih
</p>
-<a class="index-entry-anchor" id="index-counting-entry"></a>
+<a class="index-entry-id" id="index-counting-entry"></a>
</div>
';
diff --git a/tp/t/results/indices/index_entry_in_footnote_separate.pl
b/tp/t/results/indices/index_entry_in_footnote_separate.pl
index 1b9e8be4fb..54ea07abad 100644
--- a/tp/t/results/indices/index_entry_in_footnote_separate.pl
+++ b/tp/t/results/indices/index_entry_in_footnote_separate.pl
@@ -698,7 +698,7 @@
$result_converted{'plaintext'}->{'index_entry_in_footnote_separate'} = 'Top node
';
-$result_converted{'html_text'}->{'index_entry_in_footnote_separate'} = '<a
class="node-anchor" id="Top"></a><div class="nav-header">
+$result_converted{'html_text'}->{'index_entry_in_footnote_separate'} = '<a
class="node" id="Top"></a><div class="nav-header">
<p>
[<a href="#First" title="Index" rel="index">Index</a>]</p>
</div>
@@ -708,7 +708,7 @@
$result_converted{'html_text'}->{'index_entry_in_footnote_separate'} = '<a class
<p>Top node<a class="footnote" id="DOCF1" href="#FOOT1"><sup>1</sup></a>
</p>
<hr>
-<a class="node-anchor" id="First"></a><div class="nav-header">
+<a class="node" id="First"></a><div class="nav-header">
<p>
[<a href="#First" title="Index" rel="index">Index</a>]</p>
</div>
@@ -745,13 +745,13 @@
$result_converted{'html_text'}->{'index_entry_in_footnote_separate'} = '<a class
<h5><a id="FOOT1" href="#DOCF1">(1)</a></h5>
<p>in footnote
-<a class="index-entry-anchor" id="index-index-entry-in-footnote"></a>
+<a class="index-entry-id" id="index-index-entry-in-footnote"></a>
</p>
<p>Blah
</p>
<p>Blih
</p>
-<a class="index-entry-anchor" id="index-counting-entry"></a>
+<a class="index-entry-id" id="index-counting-entry"></a>
</div>';
1;
diff --git a/tp/t/results/indices/printindex_index_entry_in_copying.pl
b/tp/t/results/indices/printindex_index_entry_in_copying.pl
index 209442a319..6bbc55df83 100644
--- a/tp/t/results/indices/printindex_index_entry_in_copying.pl
+++ b/tp/t/results/indices/printindex_index_entry_in_copying.pl
@@ -1427,7 +1427,7 @@
$result_converted{'html_text'}->{'printindex_index_entry_in_copying'} = '
<p>Top.
</p>
-<a class="index-entry-anchor" id="index-copying-Copying-this-document"></a>
+<a class="index-entry-id" id="index-copying-Copying-this-document"></a>
<dl class="first-deffn first-defun-alias-first-deffn">
<dt class="deffn defun-alias-deffn" id="index-copying-fun"><span
class="category-def">Function: </span><span><strong class="strong">fun</strong>
<em class="emph">arg</em><a class="copiable-anchor"
href=\'#index-copying-fun\'> ¶</a></span></dt>
@@ -1486,7 +1486,7 @@
$result_converted{'html_text'}->{'printindex_index_entry_in_copying'} = '
<h2 class="chapter" id="Chapter">1 Chapter</h2>
-<a class="index-entry-anchor" id="index-copying-Copying-this-document"></a>
+<a class="index-entry-id" id="index-copying-Copying-this-document"></a>
<dl class="first-deffn first-defun-alias-first-deffn">
<dt class="deffn defun-alias-deffn" id="index-copying-fun"><span
class="category-def">Function: </span><span><strong class="strong">fun</strong>
<em class="emph">arg</em><a class="copiable-anchor"
href=\'#index-copying-fun\'> ¶</a></span></dt>
diff --git
a/tp/t/results/indices/printindex_index_entry_in_copying_in_footnote.pl
b/tp/t/results/indices/printindex_index_entry_in_copying_in_footnote.pl
index 034056683d..50a1bf9e6d 100644
--- a/tp/t/results/indices/printindex_index_entry_in_copying_in_footnote.pl
+++ b/tp/t/results/indices/printindex_index_entry_in_copying_in_footnote.pl
@@ -965,11 +965,11 @@
$result_converted{'html_text'}->{'printindex_index_entry_in_copying_in_footnote'
<h5><a id="FOOT1" href="#DOCF1">(1)</a></h5>
<p>In footnote
-<a class="index-entry-anchor" id="index-copying-Copying-this-document"></a>
+<a class="index-entry-id" id="index-copying-Copying-this-document"></a>
</p>
<h5><a id="FOOT1_2" href="#DOCF1_2">(2)</a></h5>
<p>In footnote
-<a class="index-entry-anchor" id="index-copying-Copying-this-document"></a>
+<a class="index-entry-id" id="index-copying-Copying-this-document"></a>
</p>
</div>
';
diff --git a/tp/t/results/indices/printindex_with_space_before.pl
b/tp/t/results/indices/printindex_with_space_before.pl
index 35f555dced..9b4a6e0cc1 100644
--- a/tp/t/results/indices/printindex_with_space_before.pl
+++ b/tp/t/results/indices/printindex_with_space_before.pl
@@ -262,7 +262,7 @@
$result_converted{'plaintext'}->{'printindex_with_space_before'} = 'Text.
$result_converted{'html_text'}->{'printindex_with_space_before'} = '<h1
class="node-heading" id="Top">Top</h1>
-<a class="index-entry-anchor" id="index-index"></a>
+<a class="index-entry-id" id="index-index"></a>
<p>Text.
</p><div class="printindex cp-printindex">
diff --git a/tp/t/results/indices/same_index_entry_merged_indices.pl
b/tp/t/results/indices/same_index_entry_merged_indices.pl
index 290b2fd009..b04b3ab521 100644
--- a/tp/t/results/indices/same_index_entry_merged_indices.pl
+++ b/tp/t/results/indices/same_index_entry_merged_indices.pl
@@ -756,7 +756,7 @@
$result_converted{'plaintext'}->{'same_index_entry_merged_indices'} = 'Text.
$result_converted{'html_text'}->{'same_index_entry_merged_indices'} = '
<div class="top" id="Top">
-<a class="top-anchor" id="SEC_Top"></a>
+<a class="top" id="SEC_Top"></a>
<p>Text.
</p>
<dl class="first-deffn">
diff --git a/tp/t/results/indices/seealso_duplicate.pl
b/tp/t/results/indices/seealso_duplicate.pl
index db115cb163..e580a5d603 100644
--- a/tp/t/results/indices/seealso_duplicate.pl
+++ b/tp/t/results/indices/seealso_duplicate.pl
@@ -459,8 +459,8 @@ $result_converted{'plaintext'}->{'seealso_duplicate'} = '*
Menu:
$result_converted{'html_text'}->{'seealso_duplicate'} = '<h1
class="node-heading" id="Top">Top</h1>
-<a class="index-entry-anchor" id="index-awk"></a>
-<a class="index-entry-anchor" id="index-awk-1"></a>
+<a class="index-entry-id" id="index-awk"></a>
+<a class="index-entry-id" id="index-awk-1"></a>
<div class="printindex cp-printindex">
<table class="cp-letters-header-printindex"><tr><th valign="top">Jump to:
</th><td><a class="summary-letter-printindex"
href="#t_h_cp_letter-A"><b>A</b></a>
diff --git a/tp/t/results/indices/seeentry.pl b/tp/t/results/indices/seeentry.pl
index 9c7eb5a2be..f000d6b9c7 100644
--- a/tp/t/results/indices/seeentry.pl
+++ b/tp/t/results/indices/seeentry.pl
@@ -820,7 +820,7 @@ $result_converted{'html_text'}->{'seeentry'} = '
<p>
[<a href="#chapter-index" title="Index" rel="index">Index</a>]</p>
</div>
-<a class="top-anchor" id="SEC_Top"></a>
+<a class="top" id="SEC_Top"></a>
<ul class="mini-toc">
<li><a href="#chapter-index" accesskey="1">Index</a></li>
</ul>
diff --git a/tp/t/results/indices/subentries.pl
b/tp/t/results/indices/subentries.pl
index e672243ce3..6f2a494aca 100644
--- a/tp/t/results/indices/subentries.pl
+++ b/tp/t/results/indices/subentries.pl
@@ -1347,7 +1347,7 @@ $result_converted{'html_text'}->{'subentries'} = '
<p>
[<a href="#chapter-index" title="Index" rel="index">Index</a>]</p>
</div>
-<a class="top-anchor" id="SEC_Top"></a>
+<a class="top" id="SEC_Top"></a>
<ul class="mini-toc">
<li><a href="#chapter-index" accesskey="1">Index</a></li>
</ul>
@@ -1359,15 +1359,15 @@ $result_converted{'html_text'}->{'subentries'} = '
</div>
<h2 class="chapter" id="Index">1 Index</h2>
-<a class="index-entry-anchor" id="index-a_002d_002d_002da"></a>
-<a class="index-entry-anchor" id="index-b_002d_002d_002db"></a>
-<a class="index-entry-anchor" id="index-d_002d_002d_002ddd"></a>
-<a class="index-entry-anchor" id="index-g_002d_002d_002dgg"></a>
+<a class="index-entry-id" id="index-a_002d_002d_002da"></a>
+<a class="index-entry-id" id="index-b_002d_002d_002db"></a>
+<a class="index-entry-id" id="index-d_002d_002d_002ddd"></a>
+<a class="index-entry-id" id="index-g_002d_002d_002dgg"></a>
-<a class="index-entry-anchor" id="index-f_002d_002d_002daa"></a>
-<a class="index-entry-anchor" id="index-f_002d_002d_002dbb"></a>
-<a class="index-entry-anchor" id="index-f_002d_002d_002dddd"></a>
-<a class="index-entry-anchor" id="index-f_002d_002d_002dggg"></a>
+<a class="index-entry-id" id="index-f_002d_002d_002daa"></a>
+<a class="index-entry-id" id="index-f_002d_002d_002dbb"></a>
+<a class="index-entry-id" id="index-f_002d_002d_002dddd"></a>
+<a class="index-entry-id" id="index-f_002d_002d_002dggg"></a>
<div class="printindex cp-printindex">
<table class="cp-letters-header-printindex"><tr><th valign="top">Jump to:
</th><td><a class="summary-letter-printindex"
href="#t_h_cp_letter-A"><b>A</b></a>
diff --git a/tp/t/results/indices/subentry_and_sortas.pl
b/tp/t/results/indices/subentry_and_sortas.pl
index 47d7fbc079..acadfe3589 100644
--- a/tp/t/results/indices/subentry_and_sortas.pl
+++ b/tp/t/results/indices/subentry_and_sortas.pl
@@ -799,7 +799,7 @@ a.summary-letter-printindex {text-decoration: none}
<p>
Next: <a href="#chapter-index" accesskey="n" rel="next">Index</a> [<a
href="#chapter-index" title="Index" rel="index">Index</a>]</p>
</div>
-<a class="top-anchor" id="SEC_Top"></a>
+<a class="top" id="SEC_Top"></a>
<ul class="mini-toc">
<li><a href="#chapter-index" accesskey="1">Index</a></li>
</ul>
@@ -811,9 +811,9 @@ Next: <a href="#chapter-index" accesskey="n"
rel="next">Index</a> [<a hre
</div>
<h2 class="chapter" id="Index">1 Index</h2>
-<a class="index-entry-anchor" id="index-aaa"></a>
+<a class="index-entry-id" id="index-aaa"></a>
-<a class="index-entry-anchor" id="index-xxx"></a>
+<a class="index-entry-id" id="index-xxx"></a>
<div class="printindex cp-printindex">
<table class="cp-letters-header-printindex"><tr><th valign="top">Jump to:
</th><td><a class="summary-letter-printindex"
href="#chapter-index_cp_letter-A"><b>A</b></a>
@@ -925,7 +925,7 @@ $result_converted{'html_text'}->{'subentry_and_sortas'} = '
<p>
[<a href="#chapter-index" title="Index" rel="index">Index</a>]</p>
</div>
-<a class="top-anchor" id="SEC_Top"></a>
+<a class="top" id="SEC_Top"></a>
<ul class="mini-toc">
<li><a href="#chapter-index" accesskey="1">Index</a></li>
</ul>
@@ -937,9 +937,9 @@ $result_converted{'html_text'}->{'subentry_and_sortas'} = '
</div>
<h2 class="chapter" id="Index">1 Index</h2>
-<a class="index-entry-anchor" id="index-aaa"></a>
+<a class="index-entry-id" id="index-aaa"></a>
-<a class="index-entry-anchor" id="index-xxx"></a>
+<a class="index-entry-id" id="index-xxx"></a>
<div class="printindex cp-printindex">
<table class="cp-letters-header-printindex"><tr><th valign="top">Jump to:
</th><td><a class="summary-letter-printindex"
href="#t_h_cp_letter-A"><b>A</b></a>
diff --git a/tp/t/results/indices/syncode_index_print_both.pl
b/tp/t/results/indices/syncode_index_print_both.pl
index a60af2798a..4428723094 100644
--- a/tp/t/results/indices/syncode_index_print_both.pl
+++ b/tp/t/results/indices/syncode_index_print_both.pl
@@ -799,8 +799,8 @@
$result_converted{'html_text'}->{'syncode_index_print_both'} = '
</div>
<h2 class="chapter" id="index">1 index</h2>
-<a class="index-entry-anchor" id="index-c_002d_002d_002doncept"></a>
-<a class="index-entry-anchor" id="index-f_002d_002d_002dun"></a>
+<a class="index-entry-id" id="index-c_002d_002d_002doncept"></a>
+<a class="index-entry-id" id="index-f_002d_002d_002dun"></a>
<p>Print fn
diff --git a/tp/t/results/indices/syncodeindex_to_plain.pl
b/tp/t/results/indices/syncodeindex_to_plain.pl
index 3195ada76e..3e0f478a3e 100644
--- a/tp/t/results/indices/syncodeindex_to_plain.pl
+++ b/tp/t/results/indices/syncodeindex_to_plain.pl
@@ -532,9 +532,9 @@ $result_converted{'plaintext'}->{'syncodeindex_to_plain'} =
'cp index.
$result_converted{'html_text'}->{'syncodeindex_to_plain'} = '
<h1 class="node-heading" id="Top">Top</h1>
-<a class="index-entry-anchor" id="index-_002d_002dk1"></a>
-<a class="index-entry-anchor" id="index-_002d_002dv"></a>
-<a class="index-entry-anchor" id="index-_002d_002dc"></a>
+<a class="index-entry-id" id="index-_002d_002dk1"></a>
+<a class="index-entry-id" id="index-_002d_002dv"></a>
+<a class="index-entry-id" id="index-_002d_002dc"></a>
<p>cp index.
</p><div class="printindex cp-printindex">
diff --git a/tp/t/results/indices/transparent_sort_chars.pl
b/tp/t/results/indices/transparent_sort_chars.pl
index 8f56f848a8..db3f9add18 100644
--- a/tp/t/results/indices/transparent_sort_chars.pl
+++ b/tp/t/results/indices/transparent_sort_chars.pl
@@ -496,10 +496,10 @@
$result_converted{'plaintext'}->{'transparent_sort_chars'} = '* Menu:
$result_converted{'html_text'}->{'transparent_sort_chars'} = '
<div class="top" id="Top">
-<a class="top-anchor" id="SEC_Top"></a>
-<a class="index-entry-anchor"
id="index-_002d_002dversion_002c-for-install_002dinfo"></a>
-<a class="index-entry-anchor" id="index-Source-file-format"></a>
-<a class="index-entry-anchor" id="index-Semantic-markup"></a>
+<a class="top" id="SEC_Top"></a>
+<a class="index-entry-id"
id="index-_002d_002dversion_002c-for-install_002dinfo"></a>
+<a class="index-entry-id" id="index-Source-file-format"></a>
+<a class="index-entry-id" id="index-Semantic-markup"></a>
<div class="printindex cp-printindex">
<table class="cp-letters-header-printindex"><tr><th valign="top">Jump to:
</th><td><a class="summary-letter-printindex"
href="#t_h_cp_letter-S"><b>S</b></a>
diff --git a/tp/t/results/indices/w_lines_count.pl
b/tp/t/results/indices/w_lines_count.pl
index d828f0e69f..e4f290af8e 100644
--- a/tp/t/results/indices/w_lines_count.pl
+++ b/tp/t/results/indices/w_lines_count.pl
@@ -454,11 +454,11 @@ $result_converted{'plaintext'}->{'w_lines_count'} =
'xzcompilationxdmbufferxmsub
$result_converted{'html_text'}->{'w_lines_count'} = '<div class="top" id="Top">
-<a class="top-anchor" id="SEC_Top"></a>
+<a class="top" id="SEC_Top"></a>
<p>xzcompilationxdmbufferxmsubsequentmxCtxaxxmcommandsmadvancemfrommthere.
<code class="code"><span class="w-nolinebreak-text">C-u</span></code><!-- /@w
--> starts again from the beginning
</p>
-<a class="index-entry-anchor" id="index-compilation_002dnext_002derror"></a>
+<a class="index-entry-id" id="index-compilation_002dnext_002derror"></a>
<p>Compilation mode also defines the keys <kbd class="key">SPC</kbd> and <kbd
class="key">DEL</kbd> to
</p>
<div class="printindex fn-printindex">
diff --git a/tp/t/results/itemize/inter_item_commands_in_enumerate.pl
b/tp/t/results/itemize/inter_item_commands_in_enumerate.pl
index 30c0a0601e..c28f79ad93 100644
--- a/tp/t/results/itemize/inter_item_commands_in_enumerate.pl
+++ b/tp/t/results/itemize/inter_item_commands_in_enumerate.pl
@@ -1518,33 +1518,33 @@
$result_converted{'html_text'}->{'inter_item_commands_in_enumerate'} = '
<ol class="enumerate">
<li>
-<a class="index-entry-anchor"
id="index-index-inter-in-enumerate-between-lines"></a>
+<a class="index-entry-id"
id="index-index-inter-in-enumerate-between-lines"></a>
</li><li> enumerate item
</li></ol>
<ol class="enumerate">
<li>
-<a class="index-entry-anchor"
id="index-index-inter-in-enumerate-after-line"></a>
+<a class="index-entry-id" id="index-index-inter-in-enumerate-after-line"></a>
</li><li> enumerate item
</li></ol>
<ol class="enumerate">
-<li><a class="index-entry-anchor"
id="index-index-inter-in-enumerate-before-line"></a>
+<li><a class="index-entry-id"
id="index-index-inter-in-enumerate-before-line"></a>
</li><li> enumerate item
</li></ol>
<ol class="enumerate">
<li>Title
-<a class="index-entry-anchor" id="index-cindex"></a>
+<a class="index-entry-id" id="index-cindex"></a>
</li><li> enum
</li></ol>
<ol class="enumerate">
-<li><a class="index-entry-anchor" id="index-first-idx"></a>
-<a class="index-entry-anchor" id="index-sedond-idx"></a>
-<a class="index-entry-anchor" id="index-another"></a>
+<li><a class="index-entry-id" id="index-first-idx"></a>
+<a class="index-entry-id" id="index-sedond-idx"></a>
+<a class="index-entry-id" id="index-another"></a>
</li><li> enum
</li></ol>
diff --git a/tp/t/results/itemize/inter_item_commands_in_itemize.pl
b/tp/t/results/itemize/inter_item_commands_in_itemize.pl
index 6713b29cd0..e9fd1911a4 100644
--- a/tp/t/results/itemize/inter_item_commands_in_itemize.pl
+++ b/tp/t/results/itemize/inter_item_commands_in_itemize.pl
@@ -1056,20 +1056,20 @@
$result_converted{'html_text'}->{'inter_item_commands_in_itemize'} = '
<h2 class="chapter" id="chap">1 chap</h2>
<ul class="itemize mark-minus">
-<li><a class="index-entry-anchor" id="index-also-a-cindex-in-itemize"></a>
+<li><a class="index-entry-id" id="index-also-a-cindex-in-itemize"></a>
</li><li>e–mph item
</li></ul>
<ul class="itemize mark-bullet">
-<li><a class="index-entry-anchor" id="index-index-entry-within-itemize"></a>
+<li><a class="index-entry-id" id="index-index-entry-within-itemize"></a>
</li><li>i–tem 1
-</li><li><a class="index-entry-anchor"
id="index-index-entry-right-after-_0040item"></a>
+</li><li><a class="index-entry-id"
id="index-index-entry-right-after-_0040item"></a>
i–tem 2
</li></ul>
<ul class="itemize mark-bullet">
<li>T–ext before items.
-<a class="index-entry-anchor" id="index-also-a-cindex-in-itemize-1"></a>
+<a class="index-entry-id" id="index-also-a-cindex-in-itemize-1"></a>
</li><li>bullet item
</li></ul>
</div>
diff --git a/tp/t/results/layout/no_monolithic/res_html/no_monolithic.html
b/tp/t/results/layout/no_monolithic/res_html/no_monolithic.html
index 062b313dc2..7d9c9711ea 100644
--- a/tp/t/results/layout/no_monolithic/res_html/no_monolithic.html
+++ b/tp/t/results/layout/no_monolithic/res_html/no_monolithic.html
@@ -37,7 +37,7 @@ span.program-in-footer {font-size: smaller}
<p>Not monolitic manual<a class="footnote" id="DOCF1"
href="no_monolithic_fot.html#FOOT1"><sup>1</sup></a>.
</p>
-<a class="index-entry-anchor" id="index-top"></a>
+<a class="index-entry-id" id="index-top"></a>
<table class="menu" border="0" cellspacing="0">
<tr><td align="left" valign="top"><a href="#chapter" rel="index">1
Chapter</a></td><td> </td><td align="left" valign="top">
diff --git a/tp/t/results/menu/comment_on_menu_line.pl
b/tp/t/results/menu/comment_on_menu_line.pl
index 5ccd9257cb..14e10895b6 100644
--- a/tp/t/results/menu/comment_on_menu_line.pl
+++ b/tp/t/results/menu/comment_on_menu_line.pl
@@ -458,7 +458,7 @@ Next: <a href="#first" accesskey="n" rel="next">first</a>
</p>
<h2 class="chapter" id="first-1">1 first</h2>
<hr>
-<a class="node-anchor" id="first"></a><div class="nav-header">
+<a class="node" id="first"></a><div class="nav-header">
<p>
Previous: <a href="#Top" accesskey="p" rel="prev">first</a>, Up: <a
href="#Top" accesskey="u" rel="up">first</a> </p>
</div>
diff --git a/tp/t/results/menu/entry_after_detailmenu.pl
b/tp/t/results/menu/entry_after_detailmenu.pl
index 94cf4d255d..a3321f0745 100644
--- a/tp/t/results/menu/entry_after_detailmenu.pl
+++ b/tp/t/results/menu/entry_after_detailmenu.pl
@@ -830,7 +830,7 @@ pre.menu-comment-preformatted {font-family: serif}
</head>
<body lang="en">
-<a class="node-anchor" id="Top"></a><div class="nav-header">
+<a class="node" id="Top"></a><div class="nav-header">
<p>
Next: <a href="#first" accesskey="n" rel="next">first</a> </p>
</div>
@@ -854,13 +854,13 @@ Menu comment
</table>
<hr>
-<a class="node-anchor" id="first"></a><div class="nav-header">
+<a class="node" id="first"></a><div class="nav-header">
<p>
Next: <a href="#second" accesskey="n" rel="next">second</a>, Previous: <a
href="#Top" accesskey="p" rel="prev">Top</a>, Up: <a href="#Top" accesskey="u"
rel="up">Top</a> </p>
</div>
<h4 class="node-heading">first</h4>
<hr>
-<a class="node-anchor" id="second"></a><div class="nav-header">
+<a class="node" id="second"></a><div class="nav-header">
<p>
Previous: <a href="#first" accesskey="p" rel="prev">first</a>, Up: <a
href="#Top" accesskey="u" rel="up">Top</a> </p>
</div>
diff --git a/tp/t/results/menu/menu_title_before_entries.pl
b/tp/t/results/menu/menu_title_before_entries.pl
index 4ff3475c13..5b5532dc05 100644
--- a/tp/t/results/menu/menu_title_before_entries.pl
+++ b/tp/t/results/menu/menu_title_before_entries.pl
@@ -378,7 +378,7 @@ pre.menu-comment-preformatted {font-family: serif}
</head>
<body lang="en">
-<a class="node-anchor" id="Top"></a><div class="nav-header">
+<a class="node" id="Top"></a><div class="nav-header">
<p>
Next: <a href="#subnode" accesskey="n" rel="next">subnode</a> </p>
</div>
@@ -391,7 +391,7 @@ Next: <a href="#subnode" accesskey="n"
rel="next">subnode</a> </p>
</table>
<hr>
-<a class="node-anchor" id="subnode"></a><div class="nav-header">
+<a class="node" id="subnode"></a><div class="nav-header">
<p>
Previous: <a href="#Top" accesskey="p" rel="prev">Top</a>, Up: <a href="#Top"
accesskey="u" rel="up">Top</a> </p>
</div>
diff --git a/tp/t/results/menu/sc_in_menu.pl b/tp/t/results/menu/sc_in_menu.pl
index 20869574e7..0839891f05 100644
--- a/tp/t/results/menu/sc_in_menu.pl
+++ b/tp/t/results/menu/sc_in_menu.pl
@@ -1141,7 +1141,7 @@ pre.menu-preformatted {font-family: serif}
<body lang="en">
-<a class="node-anchor" id="Top"></a><div class="nav-header">
+<a class="node" id="Top"></a><div class="nav-header">
<p>
Next: <a href="#NODE" accesskey="n" rel="next"><small
class="sc">NODE</small></a> </p>
</div>
@@ -1162,7 +1162,7 @@ Next: <a href="#NODE" accesskey="n" rel="next"><small
class="sc">NODE</small></a
</th></tr></table>
<hr>
-<a class="node-anchor" id="NODE"></a><div class="nav-header">
+<a class="node" id="NODE"></a><div class="nav-header">
<p>
Previous: <a href="#Top" accesskey="p" rel="prev">Top</a>, Up: <a href="#Top"
accesskey="u" rel="up">Top</a> </p>
</div>
diff --git a/tp/t/results/misc_commands/comment_space_command_on_line.pl
b/tp/t/results/misc_commands/comment_space_command_on_line.pl
index 1d81ba6da2..e04c428640 100644
--- a/tp/t/results/misc_commands/comment_space_command_on_line.pl
+++ b/tp/t/results/misc_commands/comment_space_command_on_line.pl
@@ -834,7 +834,7 @@
$result_converted{'html_text'}->{'comment_space_command_on_line'} = '
<h1 class="top" id="top-element-">top element </h1>
-<a class="index-entry-anchor" id="index-index-entry--"></a>
+<a class="index-entry-id" id="index-index-entry--"></a>
<h3 class="heading" id="Heading--">Heading </h3>
diff --git a/tp/t/results/morecoverage/formatting_fr.pl
b/tp/t/results/morecoverage/formatting_fr.pl
index de8fea362c..3a4c877d33 100644
--- a/tp/t/results/morecoverage/formatting_fr.pl
+++ b/tp/t/results/morecoverage/formatting_fr.pl
@@ -4962,16 +4962,16 @@ Menu comment
</pre></div>
-<a class="index-entry-anchor" id="index-t_002d_002druc"></a>
-<a class="index-entry-anchor" id="index-T_002d_002druc"></a>
-<a class="index-entry-anchor" id="index-_002e"></a>
-<a class="index-entry-anchor" id="index-_003f"></a>
-<a class="index-entry-anchor" id="index-a"></a>
-<a class="index-entry-anchor" id="index-t_002d_002druc-1"></a>
-<a class="index-entry-anchor" id="index-T_002d_002druc-1"></a>
-<a class="index-entry-anchor" id="index-_002e-1"></a>
-<a class="index-entry-anchor" id="index-_003f-1"></a>
-<a class="index-entry-anchor" id="index-a-1"></a>
+<a class="index-entry-id" id="index-t_002d_002druc"></a>
+<a class="index-entry-id" id="index-T_002d_002druc"></a>
+<a class="index-entry-id" id="index-_002e"></a>
+<a class="index-entry-id" id="index-_003f"></a>
+<a class="index-entry-id" id="index-a"></a>
+<a class="index-entry-id" id="index-t_002d_002druc-1"></a>
+<a class="index-entry-id" id="index-T_002d_002druc-1"></a>
+<a class="index-entry-id" id="index-_002e-1"></a>
+<a class="index-entry-id" id="index-_003f-1"></a>
+<a class="index-entry-id" id="index-a-1"></a>
<p>cp
@@ -5527,16 +5527,16 @@ Menu comment
</pre></div>
-<a class="index-entry-anchor" id="index-t_002d_002druc"></a>
-<a class="index-entry-anchor" id="index-T_002d_002druc"></a>
-<a class="index-entry-anchor" id="index-_002e"></a>
-<a class="index-entry-anchor" id="index-_003f"></a>
-<a class="index-entry-anchor" id="index-a"></a>
-<a class="index-entry-anchor" id="index-t_002d_002druc-1"></a>
-<a class="index-entry-anchor" id="index-T_002d_002druc-1"></a>
-<a class="index-entry-anchor" id="index-_002e-1"></a>
-<a class="index-entry-anchor" id="index-_003f-1"></a>
-<a class="index-entry-anchor" id="index-a-1"></a>
+<a class="index-entry-id" id="index-t_002d_002druc"></a>
+<a class="index-entry-id" id="index-T_002d_002druc"></a>
+<a class="index-entry-id" id="index-_002e"></a>
+<a class="index-entry-id" id="index-_003f"></a>
+<a class="index-entry-id" id="index-a"></a>
+<a class="index-entry-id" id="index-t_002d_002druc-1"></a>
+<a class="index-entry-id" id="index-T_002d_002druc-1"></a>
+<a class="index-entry-id" id="index-_002e-1"></a>
+<a class="index-entry-id" id="index-_003f-1"></a>
+<a class="index-entry-id" id="index-a-1"></a>
<p>cp
diff --git a/tp/t/results/morecoverage/texi_formatting.pl
b/tp/t/results/morecoverage/texi_formatting.pl
index 7c2fd7dff0..8d67edf1c6 100644
--- a/tp/t/results/morecoverage/texi_formatting.pl
+++ b/tp/t/results/morecoverage/texi_formatting.pl
@@ -4936,16 +4936,16 @@ Next: <a href="#chapter" accesskey="n"
rel="next">chapter</a> [<a href="#
</pre></div>
-<a class="index-entry-anchor" id="index-t_002d_002druc"></a>
-<a class="index-entry-anchor" id="index-T_002d_002druc"></a>
-<a class="index-entry-anchor" id="index-_002e"></a>
-<a class="index-entry-anchor" id="index-_003f"></a>
-<a class="index-entry-anchor" id="index-a"></a>
-<a class="index-entry-anchor" id="index-t_002d_002druc-1"></a>
-<a class="index-entry-anchor" id="index-T_002d_002druc-1"></a>
-<a class="index-entry-anchor" id="index-_002e-1"></a>
-<a class="index-entry-anchor" id="index-_003f-1"></a>
-<a class="index-entry-anchor" id="index-a-1"></a>
+<a class="index-entry-id" id="index-t_002d_002druc"></a>
+<a class="index-entry-id" id="index-T_002d_002druc"></a>
+<a class="index-entry-id" id="index-_002e"></a>
+<a class="index-entry-id" id="index-_003f"></a>
+<a class="index-entry-id" id="index-a"></a>
+<a class="index-entry-id" id="index-t_002d_002druc-1"></a>
+<a class="index-entry-id" id="index-T_002d_002druc-1"></a>
+<a class="index-entry-id" id="index-_002e-1"></a>
+<a class="index-entry-id" id="index-_003f-1"></a>
+<a class="index-entry-id" id="index-a-1"></a>
<p>cp
@@ -5261,16 +5261,16 @@ $result_converted{'html_text'}->{'texi_formatting'} = '
</pre></div>
-<a class="index-entry-anchor" id="index-t_002d_002druc"></a>
-<a class="index-entry-anchor" id="index-T_002d_002druc"></a>
-<a class="index-entry-anchor" id="index-_002e"></a>
-<a class="index-entry-anchor" id="index-_003f"></a>
-<a class="index-entry-anchor" id="index-a"></a>
-<a class="index-entry-anchor" id="index-t_002d_002druc-1"></a>
-<a class="index-entry-anchor" id="index-T_002d_002druc-1"></a>
-<a class="index-entry-anchor" id="index-_002e-1"></a>
-<a class="index-entry-anchor" id="index-_003f-1"></a>
-<a class="index-entry-anchor" id="index-a-1"></a>
+<a class="index-entry-id" id="index-t_002d_002druc"></a>
+<a class="index-entry-id" id="index-T_002d_002druc"></a>
+<a class="index-entry-id" id="index-_002e"></a>
+<a class="index-entry-id" id="index-_003f"></a>
+<a class="index-entry-id" id="index-a"></a>
+<a class="index-entry-id" id="index-t_002d_002druc-1"></a>
+<a class="index-entry-id" id="index-T_002d_002druc-1"></a>
+<a class="index-entry-id" id="index-_002e-1"></a>
+<a class="index-entry-id" id="index-_003f-1"></a>
+<a class="index-entry-id" id="index-a-1"></a>
<p>cp
diff --git
a/tp/t/results/moreindices/double_index_entry/res_html/double_index_entry.html
b/tp/t/results/moreindices/double_index_entry/res_html/double_index_entry.html
index 79f8110111..2a6785d630 100644
---
a/tp/t/results/moreindices/double_index_entry/res_html/double_index_entry.html
+++
b/tp/t/results/moreindices/double_index_entry/res_html/double_index_entry.html
@@ -23,20 +23,20 @@ span.program-in-footer {font-size: smaller}
</head>
<body lang="en">
-<a class="node-anchor" id="Top"></a>
-<a class="index-entry-anchor" id="index-aaa"></a>
+<a class="node" id="Top"></a>
+<a class="index-entry-id" id="index-aaa"></a>
<p>Text
</p>
-<a class="index-entry-anchor" id="index-aaa-1"></a>
+<a class="index-entry-id" id="index-aaa-1"></a>
<table class="menu" border="0" cellspacing="0">
<tr><td align="left" valign="top">• <a href="#other-node"
rel="index">other node</a></td><td> </td><td align="left"
valign="top">
</td></tr>
</table>
-<a class="node-anchor" id="other-node"></a>
-<a class="index-entry-anchor" id="index-aaa-2"></a>
+<a class="node" id="other-node"></a>
+<a class="index-entry-id" id="index-aaa-2"></a>
<div class="printindex cp-printindex">
<table class="cp-letters-header-printindex"><tr><th valign="top">Jump to:
</th><td><a class="summary-letter-printindex"
href="#t_h_cp_letter-A"><b>A</b></a>
diff --git a/tp/t/results/moreindices/index_no_node/res_html/Chapter.html
b/tp/t/results/moreindices/index_no_node/res_html/Chapter.html
index d5b75fedd2..4fe65c535f 100644
--- a/tp/t/results/moreindices/index_no_node/res_html/Chapter.html
+++ b/tp/t/results/moreindices/index_no_node/res_html/Chapter.html
@@ -40,7 +40,7 @@ span.program-in-footer {font-size: smaller}
<td valign="middle" align="left">[<a href="index_no_node_abt.html#SEC_About"
title="About (help)"> ? </a>]</td>
</tr></table>
<h1 class="chapter">1 Chapter</h1>
-<a class="index-entry-anchor" id="index-chapter"></a>
+<a class="index-entry-id" id="index-chapter"></a>
<div class="printindex cp-printindex">
<table class="cp-letters-header-printindex"><tr><th valign="top">Jump to:
</th><td><a class="summary-letter-printindex"
href="#Chapter_cp_letter-C"><b>C</b></a>
@@ -89,7 +89,7 @@ span.program-in-footer {font-size: smaller}
</td></tr></table>
</div>
<p>Text of chapter
-<a class="index-entry-anchor" id="index-Chapter2"></a>
+<a class="index-entry-id" id="index-Chapter2"></a>
</p>
</div>
<hr>
diff --git a/tp/t/results/moreindices/index_no_node/res_html/index.html
b/tp/t/results/moreindices/index_no_node/res_html/index.html
index 44ed434e42..0183dc70b7 100644
--- a/tp/t/results/moreindices/index_no_node/res_html/index.html
+++ b/tp/t/results/moreindices/index_no_node/res_html/index.html
@@ -34,12 +34,12 @@ span.program-in-footer {font-size: smaller}
</tr></table>
<h1 class="unnumbered">top section</h1>
-<a class="index-entry-anchor" id="index-top-section"></a>
-<a class="index-entry-anchor" id="index-top-section-1"></a>
-<a class="index-entry-anchor" id="index-top-section-2"></a>
-<a class="index-entry-anchor" id="index-top-section-3"></a>
-<a class="index-entry-anchor" id="index-top-section-4"></a>
-<a class="index-entry-anchor" id="index-top-section-5"></a>
+<a class="index-entry-id" id="index-top-section"></a>
+<a class="index-entry-id" id="index-top-section-1"></a>
+<a class="index-entry-id" id="index-top-section-2"></a>
+<a class="index-entry-id" id="index-top-section-3"></a>
+<a class="index-entry-id" id="index-top-section-4"></a>
+<a class="index-entry-id" id="index-top-section-5"></a>
<p>Top node
</p>
<div class="printindex cp-printindex">
@@ -89,7 +89,7 @@ span.program-in-footer {font-size: smaller}
</td></tr></table>
</div>
-<a class="index-entry-anchor" id="index-top-section1"></a>
+<a class="index-entry-id" id="index-top-section1"></a>
<hr style="height: 6px;">
@@ -157,9 +157,9 @@ span.program-in-footer {font-size: smaller}
</td></tr></table>
</div>
-<a class="index-entry-anchor" id="index-second"></a>
+<a class="index-entry-id" id="index-second"></a>
<p>second node
-<a class="index-entry-anchor" id="index-second-1"></a>
+<a class="index-entry-id" id="index-second-1"></a>
</p>
<div class="printindex cp-printindex">
<table class="cp-letters-header-printindex"><tr><th valign="top">Jump to:
</th><td><a class="summary-letter-printindex"
href="#second_cp_letter-C"><b>C</b></a>
diff --git a/tp/t/results/moreindices/index_no_node/res_html/unnumbered.html
b/tp/t/results/moreindices/index_no_node/res_html/unnumbered.html
index c21c06241a..8008f9a522 100644
--- a/tp/t/results/moreindices/index_no_node/res_html/unnumbered.html
+++ b/tp/t/results/moreindices/index_no_node/res_html/unnumbered.html
@@ -24,7 +24,7 @@ span.program-in-footer {font-size: smaller}
<body lang="en">
-<a class="index-entry-anchor" id="index-truc"></a>
+<a class="index-entry-id" id="index-truc"></a>
<p>Garbage
</p><div class="printindex cp-printindex">
<table class="cp-letters-header-printindex"><tr><th valign="top">Jump to:
</th><td><a class="summary-letter-printindex"
href="#unnumbered_cp_letter-C"><b>C</b></a>
@@ -92,9 +92,9 @@ span.program-in-footer {font-size: smaller}
</tr></table>
<h1 class="unnumbered">unnumbered</h1>
-<a class="index-entry-anchor" id="index-unnumbered"></a>
+<a class="index-entry-id" id="index-unnumbered"></a>
<p>in unnumbered
-<a class="index-entry-anchor" id="index-unnumbered-after-text"></a>
+<a class="index-entry-id" id="index-unnumbered-after-text"></a>
</p>
<div class="printindex cp-printindex">
<table class="cp-letters-header-printindex"><tr><th valign="top">Jump to:
</th><td><a class="summary-letter-printindex"
href="#unnumbered_cp_letter-C"><b>C</b></a>
diff --git a/tp/t/results/moreindices/index_split/res_html/first.html
b/tp/t/results/moreindices/index_split/res_html/first.html
index 924219f774..2d15ddfa73 100644
--- a/tp/t/results/moreindices/index_split/res_html/first.html
+++ b/tp/t/results/moreindices/index_split/res_html/first.html
@@ -41,10 +41,10 @@ span.program-in-footer {font-size: smaller}
</tr></table>
<p>Text and then index entries
-<a class="index-entry-anchor" id="index-entry-in-node"></a>
-<a class="index-entry-anchor" id="index-_0021-entry-in-node"></a>
-<a class="index-entry-anchor" id="index-fun-in-node"></a>
-<a class="index-entry-anchor" id="index-entry-in-node-1"></a>
+<a class="index-entry-id" id="index-entry-in-node"></a>
+<a class="index-entry-id" id="index-_0021-entry-in-node"></a>
+<a class="index-entry-id" id="index-fun-in-node"></a>
+<a class="index-entry-id" id="index-entry-in-node-1"></a>
</p>
<div class="printindex cp-printindex">
<table class="cp-letters-header-printindex"><tr><th valign="top">Jump to:
</th><td><a class="summary-letter-printindex"
href="#First-chapter_cp_symbol-1"><b>!</b></a>
@@ -145,12 +145,12 @@ span.program-in-footer {font-size: smaller}
</td></tr></table>
</div>
-<a class="index-entry-anchor" id="index-entry-after-printindex"></a>
+<a class="index-entry-id" id="index-entry-after-printindex"></a>
<h1 class="chapter" id="First-chapter">1 First chapter</h1>
-<a class="index-entry-anchor" id="index-a-function"></a>
-<a class="index-entry-anchor" id="index-a-concept-in-first"></a>
-<a class="index-entry-anchor" id="index-somewhere"></a>
+<a class="index-entry-id" id="index-a-function"></a>
+<a class="index-entry-id" id="index-a-concept-in-first"></a>
+<a class="index-entry-id" id="index-somewhere"></a>
<table class="menu" border="0" cellspacing="0">
<tr><td align="left" valign="top"><a href="#section-1" rel="index">1.1 Section
1</a></td><td> </td><td align="left" valign="top">
@@ -186,7 +186,7 @@ span.program-in-footer {font-size: smaller}
</tr></table>
<h2 class="section" id="Section-1">1.1 Section 1</h2>
-<a class="index-entry-anchor" id="index-something"></a>
+<a class="index-entry-id" id="index-something"></a>
<table class="menu" border="0" cellspacing="0">
<tr><td align="left" valign="top"><a href="#subsection-1">1.1.1 Subsection
1</a></td><td> </td><td align="left" valign="top">
@@ -265,7 +265,7 @@ span.program-in-footer {font-size: smaller}
</td></tr></table>
</div>
-<a class="index-entry-anchor" id="index-another"></a>
+<a class="index-entry-id" id="index-another"></a>
<hr>
<div class="subsection" id="subsection-1">
@@ -310,7 +310,7 @@ span.program-in-footer {font-size: smaller}
<p>index in subsction 2
</p>
-<a class="index-entry-anchor" id="index-subsection-2"></a>
+<a class="index-entry-id" id="index-subsection-2"></a>
<div class="printindex cp-printindex">
<table class="cp-letters-header-printindex"><tr><th valign="top">Jump to:
</th><td><a class="summary-letter-printindex"
href="#Subsection-2_cp_symbol-1"><b>!</b></a>
@@ -381,7 +381,7 @@ span.program-in-footer {font-size: smaller}
</td></tr></table>
</div>
-<a class="index-entry-anchor" id="index-printindex-subsection-2"></a>
+<a class="index-entry-id" id="index-printindex-subsection-2"></a>
<hr>
</div>
@@ -426,7 +426,7 @@ span.program-in-footer {font-size: smaller}
</tr></table>
<h2 class="section" id="Section-3">1.3 Section 3</h2>
-<a class="index-entry-anchor" id="index-section-3"></a>
+<a class="index-entry-id" id="index-section-3"></a>
<div class="printindex cp-printindex">
<table class="cp-letters-header-printindex"><tr><th valign="top">Jump to:
</th><td><a class="summary-letter-printindex"
href="#Section-3_cp_symbol-1"><b>!</b></a>
@@ -497,12 +497,12 @@ span.program-in-footer {font-size: smaller}
</td></tr></table>
</div>
-<a class="node-anchor" id="node-in-section-3"></a>
-<a class="index-entry-anchor" id="index-node-in-section-3"></a>
+<a class="node" id="node-in-section-3"></a>
+<a class="index-entry-id" id="index-node-in-section-3"></a>
<p>Text for the node in section 3
</p>
-<a class="node-anchor" id="node-2-in-section-3"></a>
-<a class="index-entry-anchor" id="index-node-2-in-section-3"></a>
+<a class="node" id="node-2-in-section-3"></a>
+<a class="index-entry-id" id="index-node-2-in-section-3"></a>
<p>Text for the node 2 in section 3
</p>
<div class="printindex cp-printindex">
@@ -574,7 +574,7 @@ span.program-in-footer {font-size: smaller}
</td></tr></table>
</div>
-<a class="index-entry-anchor"
id="index-between-printindex-node-in-section-3"></a>
+<a class="index-entry-id" id="index-between-printindex-node-in-section-3"></a>
<div class="printindex cp-printindex">
<table class="cp-letters-header-printindex"><tr><th valign="top">Jump to:
</th><td><a class="summary-letter-printindex"
href="#Section-3_cp_symbol-1"><b>!</b></a>
@@ -645,10 +645,10 @@ span.program-in-footer {font-size: smaller}
</td></tr></table>
</div>
-<a class="index-entry-anchor"
id="index-after-second-printindex-node-in-section-3"></a>
+<a class="index-entry-id"
id="index-after-second-printindex-node-in-section-3"></a>
-<a class="node-anchor" id="node-3-in-section-3"></a>
-<a class="index-entry-anchor" id="index-node-3-in-section-3"></a>
+<a class="node" id="node-3-in-section-3"></a>
+<a class="index-entry-id" id="index-node-3-in-section-3"></a>
</div>
</div>
diff --git a/tp/t/results/moreindices/index_split/res_html/index.html
b/tp/t/results/moreindices/index_split/res_html/index.html
index e5f5c679d2..1f871df853 100644
--- a/tp/t/results/moreindices/index_split/res_html/index.html
+++ b/tp/t/results/moreindices/index_split/res_html/index.html
@@ -34,7 +34,7 @@ span.program-in-footer {font-size: smaller}
<td valign="middle" align="left">[<a href="index_split_abt.html#SEC_About"
title="About (help)"> ? </a>]</td>
</tr></table>
<h1 class="top" id="split-indices">split indices</h1>
-<a class="index-entry-anchor" id="index-entry-a"></a>
+<a class="index-entry-id" id="index-entry-a"></a>
<div class="printindex cp-printindex">
<table class="cp-letters-header-printindex"><tr><th valign="top">Jump to:
</th><td><a class="summary-letter-printindex"
href="#split-indices_cp_symbol-1"><b>!</b></a>
diff --git a/tp/t/results/moreindices/index_split_nodes/res_html/first.html
b/tp/t/results/moreindices/index_split_nodes/res_html/first.html
index 3fac21a44a..75665f985d 100644
--- a/tp/t/results/moreindices/index_split_nodes/res_html/first.html
+++ b/tp/t/results/moreindices/index_split_nodes/res_html/first.html
@@ -42,10 +42,10 @@ span.program-in-footer {font-size: smaller}
<hr>
<p>Text and then index entries
-<a class="index-entry-anchor" id="index-entry-in-node"></a>
-<a class="index-entry-anchor" id="index-_0021-entry-in-node"></a>
-<a class="index-entry-anchor" id="index-fun-in-node"></a>
-<a class="index-entry-anchor" id="index-entry-in-node-1"></a>
+<a class="index-entry-id" id="index-entry-in-node"></a>
+<a class="index-entry-id" id="index-_0021-entry-in-node"></a>
+<a class="index-entry-id" id="index-fun-in-node"></a>
+<a class="index-entry-id" id="index-entry-in-node-1"></a>
</p>
<div class="printindex cp-printindex">
<table class="cp-letters-header-printindex"><tr><th valign="top">Jump to:
</th><td><a class="summary-letter-printindex"
href="#first_cp_symbol-1"><b>!</b></a>
@@ -146,12 +146,12 @@ span.program-in-footer {font-size: smaller}
</td></tr></table>
</div>
-<a class="index-entry-anchor" id="index-entry-after-printindex"></a>
+<a class="index-entry-id" id="index-entry-after-printindex"></a>
<h1 class="chapter" id="First-chapter">1 First chapter</h1>
-<a class="index-entry-anchor" id="index-a-function"></a>
-<a class="index-entry-anchor" id="index-a-concept-in-first"></a>
-<a class="index-entry-anchor" id="index-somewhere"></a>
+<a class="index-entry-id" id="index-a-function"></a>
+<a class="index-entry-id" id="index-a-concept-in-first"></a>
+<a class="index-entry-id" id="index-somewhere"></a>
<table class="menu" border="0" cellspacing="0">
<tr><td align="left" valign="top">• <a href="section-1.html"
rel="index">section 1</a></td><td> </td><td align="left"
valign="top">
diff --git a/tp/t/results/moreindices/index_split_nodes/res_html/index.html
b/tp/t/results/moreindices/index_split_nodes/res_html/index.html
index ac177e8b0f..5c39a60060 100644
--- a/tp/t/results/moreindices/index_split_nodes/res_html/index.html
+++ b/tp/t/results/moreindices/index_split_nodes/res_html/index.html
@@ -35,7 +35,7 @@ span.program-in-footer {font-size: smaller}
</tr></table>
<hr>
<h1 class="top" id="split-indices">split indices</h1>
-<a class="index-entry-anchor" id="index-entry-a"></a>
+<a class="index-entry-id" id="index-entry-a"></a>
<div class="printindex cp-printindex">
<table class="cp-letters-header-printindex"><tr><th valign="top">Jump to:
</th><td><a class="summary-letter-printindex"
href="#Top_cp_symbol-1"><b>!</b></a>
diff --git
a/tp/t/results/moreindices/index_split_nodes/res_html/node-2-in-section-3.html
b/tp/t/results/moreindices/index_split_nodes/res_html/node-2-in-section-3.html
index e09e60e669..5b578205cb 100644
---
a/tp/t/results/moreindices/index_split_nodes/res_html/node-2-in-section-3.html
+++
b/tp/t/results/moreindices/index_split_nodes/res_html/node-2-in-section-3.html
@@ -23,7 +23,7 @@ span.program-in-footer {font-size: smaller}
</head>
<body lang="en">
-<a class="node-anchor" id="node-2-in-section-3"></a><table class="nav-header"
cellpadding="1" cellspacing="1" border="0">
+<a class="node" id="node-2-in-section-3"></a><table class="nav-header"
cellpadding="1" cellspacing="1" border="0">
<tr><td valign="middle" align="left">[ << ]</td>
<td valign="middle" align="left">[<a href="node-in-section-3.html"
title="Previous section in reading order"> < </a>]</td>
<td valign="middle" align="left">[<a href="first.html" title="Up section"> Up
</a>]</td>
@@ -41,7 +41,7 @@ span.program-in-footer {font-size: smaller}
<hr>
<h3 class="node-heading">node 2 in section 3</h3>
-<a class="index-entry-anchor" id="index-node-2-in-section-3"></a>
+<a class="index-entry-id" id="index-node-2-in-section-3"></a>
<p>Text for the node 2 in section 3
</p>
<div class="printindex cp-printindex">
@@ -113,7 +113,7 @@ span.program-in-footer {font-size: smaller}
</td></tr></table>
</div>
-<a class="index-entry-anchor"
id="index-between-printindex-node-in-section-3"></a>
+<a class="index-entry-id" id="index-between-printindex-node-in-section-3"></a>
<div class="printindex cp-printindex">
<table class="cp-letters-header-printindex"><tr><th valign="top">Jump to:
</th><td><a class="summary-letter-printindex"
href="#node-2-in-section-3_cp_symbol-1"><b>!</b></a>
@@ -184,7 +184,7 @@ span.program-in-footer {font-size: smaller}
</td></tr></table>
</div>
-<a class="index-entry-anchor"
id="index-after-second-printindex-node-in-section-3"></a>
+<a class="index-entry-id"
id="index-after-second-printindex-node-in-section-3"></a>
<hr>
<table class="nav-header" cellpadding="1" cellspacing="1" border="0">
diff --git
a/tp/t/results/moreindices/index_split_nodes/res_html/node-3-in-section-3.html
b/tp/t/results/moreindices/index_split_nodes/res_html/node-3-in-section-3.html
index 0e977ce233..56f306b9fe 100644
---
a/tp/t/results/moreindices/index_split_nodes/res_html/node-3-in-section-3.html
+++
b/tp/t/results/moreindices/index_split_nodes/res_html/node-3-in-section-3.html
@@ -22,7 +22,7 @@ span.program-in-footer {font-size: smaller}
</head>
<body lang="en">
-<a class="node-anchor" id="node-3-in-section-3"></a><table class="nav-header"
cellpadding="1" cellspacing="1" border="0">
+<a class="node" id="node-3-in-section-3"></a><table class="nav-header"
cellpadding="1" cellspacing="1" border="0">
<tr><td valign="middle" align="left">[ << ]</td>
<td valign="middle" align="left">[<a href="node-2-in-section-3.html"
title="Previous section in reading order"> < </a>]</td>
<td valign="middle" align="left">[<a href="first.html" title="Up section"> Up
</a>]</td>
@@ -40,7 +40,7 @@ span.program-in-footer {font-size: smaller}
<hr>
<h3 class="node-heading">node 3 in section 3</h3>
-<a class="index-entry-anchor" id="index-node-3-in-section-3"></a>
+<a class="index-entry-id" id="index-node-3-in-section-3"></a>
<hr>
<p>
diff --git
a/tp/t/results/moreindices/index_split_nodes/res_html/node-in-section-3.html
b/tp/t/results/moreindices/index_split_nodes/res_html/node-in-section-3.html
index dde12bc27e..9265a24eb5 100644
--- a/tp/t/results/moreindices/index_split_nodes/res_html/node-in-section-3.html
+++ b/tp/t/results/moreindices/index_split_nodes/res_html/node-in-section-3.html
@@ -22,7 +22,7 @@ span.program-in-footer {font-size: smaller}
</head>
<body lang="en">
-<a class="node-anchor" id="node-in-section-3"></a><table class="nav-header"
cellpadding="1" cellspacing="1" border="0">
+<a class="node" id="node-in-section-3"></a><table class="nav-header"
cellpadding="1" cellspacing="1" border="0">
<tr><td valign="middle" align="left">[ << ]</td>
<td valign="middle" align="left">[<a href="section-3.html" title="Previous
section in reading order"> < </a>]</td>
<td valign="middle" align="left">[<a href="first.html" title="Up section"> Up
</a>]</td>
@@ -40,7 +40,7 @@ span.program-in-footer {font-size: smaller}
<hr>
<h3 class="node-heading">node in section 3</h3>
-<a class="index-entry-anchor" id="index-node-in-section-3"></a>
+<a class="index-entry-id" id="index-node-in-section-3"></a>
<p>Text for the node in section 3
</p>
<hr>
diff --git a/tp/t/results/moreindices/index_split_nodes/res_html/section-1.html
b/tp/t/results/moreindices/index_split_nodes/res_html/section-1.html
index 11bf8d021a..31f1fab159 100644
--- a/tp/t/results/moreindices/index_split_nodes/res_html/section-1.html
+++ b/tp/t/results/moreindices/index_split_nodes/res_html/section-1.html
@@ -42,7 +42,7 @@ span.program-in-footer {font-size: smaller}
<hr>
<h2 class="section" id="Section-1">1.1 Section 1</h2>
-<a class="index-entry-anchor" id="index-something"></a>
+<a class="index-entry-id" id="index-something"></a>
<table class="menu" border="0" cellspacing="0">
<tr><td align="left" valign="top">• <a
href="subsection-1.html">subsection 1</a></td><td> </td><td
align="left" valign="top">
@@ -121,7 +121,7 @@ span.program-in-footer {font-size: smaller}
</td></tr></table>
</div>
-<a class="index-entry-anchor" id="index-another"></a>
+<a class="index-entry-id" id="index-another"></a>
</div>
<hr>
diff --git a/tp/t/results/moreindices/index_split_nodes/res_html/section-3.html
b/tp/t/results/moreindices/index_split_nodes/res_html/section-3.html
index ada22e8041..6730c9193d 100644
--- a/tp/t/results/moreindices/index_split_nodes/res_html/section-3.html
+++ b/tp/t/results/moreindices/index_split_nodes/res_html/section-3.html
@@ -42,7 +42,7 @@ span.program-in-footer {font-size: smaller}
<hr>
<h2 class="section" id="Section-3">1.3 Section 3</h2>
-<a class="index-entry-anchor" id="index-section-3"></a>
+<a class="index-entry-id" id="index-section-3"></a>
<div class="printindex cp-printindex">
<table class="cp-letters-header-printindex"><tr><th valign="top">Jump to:
</th><td><a class="summary-letter-printindex"
href="#section-3_cp_symbol-1"><b>!</b></a>
diff --git
a/tp/t/results/moreindices/index_split_nodes/res_html/subsection-2.html
b/tp/t/results/moreindices/index_split_nodes/res_html/subsection-2.html
index bfb7a07331..ec3db1428d 100644
--- a/tp/t/results/moreindices/index_split_nodes/res_html/subsection-2.html
+++ b/tp/t/results/moreindices/index_split_nodes/res_html/subsection-2.html
@@ -44,7 +44,7 @@ span.program-in-footer {font-size: smaller}
<p>index in subsction 2
</p>
-<a class="index-entry-anchor" id="index-subsection-2"></a>
+<a class="index-entry-id" id="index-subsection-2"></a>
<div class="printindex cp-printindex">
<table class="cp-letters-header-printindex"><tr><th valign="top">Jump to:
</th><td><a class="summary-letter-printindex"
href="#subsection-2_cp_symbol-1"><b>!</b></a>
@@ -115,7 +115,7 @@ span.program-in-footer {font-size: smaller}
</td></tr></table>
</div>
-<a class="index-entry-anchor" id="index-printindex-subsection-2"></a>
+<a class="index-entry-id" id="index-printindex-subsection-2"></a>
</div>
<hr>
diff --git
a/tp/t/results/moreindices/nodes_before_top/res_html/first-before-top.html
b/tp/t/results/moreindices/nodes_before_top/res_html/first-before-top.html
index e0855897f9..465f2b73f9 100644
--- a/tp/t/results/moreindices/nodes_before_top/res_html/first-before-top.html
+++ b/tp/t/results/moreindices/nodes_before_top/res_html/first-before-top.html
@@ -25,7 +25,7 @@ span.program-in-footer {font-size: smaller}
<body lang="en">
-<a class="node-anchor" id="first-before-top"></a><table class="nav-header"
cellpadding="1" cellspacing="1" border="0">
+<a class="node" id="first-before-top"></a><table class="nav-header"
cellpadding="1" cellspacing="1" border="0">
<tr><td valign="middle" align="left">[ << ]</td>
<td valign="middle" align="left">[ < ]</td>
<td valign="middle" align="left">[<a href="../dir/index.html" title="Up
section"> Up </a>]</td>
@@ -41,7 +41,7 @@ span.program-in-footer {font-size: smaller}
<td valign="middle" align="left">[<a
href="nodes_before_top_abt.html#SEC_About" title="About (help)"> ? </a>]</td>
</tr></table>
<h3 class="node-heading">first before top</h3>
-<a class="index-entry-anchor" id="index-first-before-top"></a>
+<a class="index-entry-id" id="index-first-before-top"></a>
<div class="printindex cp-printindex">
<table class="cp-letters-header-printindex"><tr><th valign="top">Jump to:
</th><td><a class="summary-letter-printindex"
href="#first-before-top_cp_symbol-1"><b>!</b></a>
@@ -111,7 +111,7 @@ span.program-in-footer {font-size: smaller}
</table>
<hr>
-<a class="node-anchor" id="node-in-menu-before-top"></a><table
class="nav-header" cellpadding="1" cellspacing="1" border="0">
+<a class="node" id="node-in-menu-before-top"></a><table class="nav-header"
cellpadding="1" cellspacing="1" border="0">
<tr><td valign="middle" align="left">[ << ]</td>
<td valign="middle" align="left">[<a href="#first-before-top" title="Previous
section in reading order"> < </a>]</td>
<td valign="middle" align="left">[<a href="#first-before-top" title="Up
section"> Up </a>]</td>
@@ -128,7 +128,7 @@ span.program-in-footer {font-size: smaller}
</tr></table>
<h3 class="node-heading">node in menu before top</h3>
-<a class="index-entry-anchor" id="index-node-in-menu-before-top"></a>
+<a class="index-entry-id" id="index-node-in-menu-before-top"></a>
<div class="printindex cp-printindex">
<table class="cp-letters-header-printindex"><tr><th valign="top">Jump to:
</th><td><a class="summary-letter-printindex"
href="#node-in-menu-before-top_cp_symbol-1"><b>!</b></a>
@@ -193,11 +193,11 @@ span.program-in-footer {font-size: smaller}
</div>
<p>node in menu before top text
</p>
-<a class="index-entry-anchor"
id="index-printindex-node-in-menu-before-top"></a>
+<a class="index-entry-id" id="index-printindex-node-in-menu-before-top"></a>
<hr style="height: 6px;">
-<a class="node-anchor" id="first"></a><table class="nav-header"
cellpadding="1" cellspacing="1" border="0">
+<a class="node" id="first"></a><table class="nav-header" cellpadding="1"
cellspacing="1" border="0">
<tr><td valign="middle" align="left">[ << ]</td>
<td valign="middle" align="left">[<a href="index.html" title="Previous section
in reading order"> < </a>]</td>
<td valign="middle" align="left">[<a href="index.html" title="Up section"> Up
</a>]</td>
@@ -214,9 +214,9 @@ span.program-in-footer {font-size: smaller}
</tr></table>
<h3 class="node-heading">first</h3>
<p>Text and then index entries
-<a class="index-entry-anchor" id="index-_0021-entry-in-node"></a>
-<a class="index-entry-anchor" id="index-fun-in-node"></a>
-<a class="index-entry-anchor" id="index-entry-in-node"></a>
+<a class="index-entry-id" id="index-_0021-entry-in-node"></a>
+<a class="index-entry-id" id="index-fun-in-node"></a>
+<a class="index-entry-id" id="index-entry-in-node"></a>
</p>
<div class="printindex cp-printindex">
<table class="cp-letters-header-printindex"><tr><th valign="top">Jump to:
</th><td><a class="summary-letter-printindex"
href="#first_cp_symbol-1"><b>!</b></a>
@@ -287,7 +287,7 @@ span.program-in-footer {font-size: smaller}
</table>
<hr>
-<a class="node-anchor" id="second"></a><table class="nav-header"
cellpadding="1" cellspacing="1" border="0">
+<a class="node" id="second"></a><table class="nav-header" cellpadding="1"
cellspacing="1" border="0">
<tr><td valign="middle" align="left">[ << ]</td>
<td valign="middle" align="left">[<a href="#first" title="Previous section in
reading order"> < </a>]</td>
<td valign="middle" align="left">[<a href="#first" title="Up section"> Up
</a>]</td>
@@ -341,7 +341,7 @@ span.program-in-footer {font-size: smaller}
</div>
<hr>
-<a class="node-anchor" id="another"></a><table class="nav-header"
cellpadding="1" cellspacing="1" border="0">
+<a class="node" id="another"></a><table class="nav-header" cellpadding="1"
cellspacing="1" border="0">
<tr><td valign="middle" align="left">[ << ]</td>
<td valign="middle" align="left">[<a href="#second" title="Previous section in
reading order"> < </a>]</td>
<td valign="middle" align="left">[<a href="#second" title="Up section"> Up
</a>]</td>
@@ -358,12 +358,12 @@ span.program-in-footer {font-size: smaller}
</tr></table>
<h3 class="node-heading">another</h3>
-<a class="index-entry-anchor" id="index-something"></a>
-<a class="index-entry-anchor" id="index-somewhere"></a>
-<a class="index-entry-anchor" id="index-another"></a>
+<a class="index-entry-id" id="index-something"></a>
+<a class="index-entry-id" id="index-somewhere"></a>
+<a class="index-entry-id" id="index-another"></a>
<hr>
-<a class="node-anchor" id="a-node"></a><table class="nav-header"
cellpadding="1" cellspacing="1" border="0">
+<a class="node" id="a-node"></a><table class="nav-header" cellpadding="1"
cellspacing="1" border="0">
<tr><td valign="middle" align="left">[ << ]</td>
<td valign="middle" align="left">[<a href="#another" title="Previous section
in reading order"> < </a>]</td>
<td valign="middle" align="left">[<a href="#second" title="Up section"> Up
</a>]</td>
@@ -379,7 +379,7 @@ span.program-in-footer {font-size: smaller}
<td valign="middle" align="left">[<a
href="nodes_before_top_abt.html#SEC_About" title="About (help)"> ? </a>]</td>
</tr></table>
<h3 class="node-heading">a node</h3>
-<a class="index-entry-anchor" id="index-entry-after-printindex"></a>
+<a class="index-entry-id" id="index-entry-after-printindex"></a>
<div class="printindex cp-printindex">
<table class="cp-letters-header-printindex"><tr><th valign="top">Jump to:
</th><td><a class="summary-letter-printindex"
href="#a-node_cp_symbol-1"><b>!</b></a>
@@ -444,8 +444,8 @@ span.program-in-footer {font-size: smaller}
</td></tr></table>
</div>
-<a class="index-entry-anchor" id="index-a-function"></a>
-<a class="index-entry-anchor" id="index-a-concept-a-node"></a>
+<a class="index-entry-id" id="index-a-function"></a>
+<a class="index-entry-id" id="index-a-concept-a-node"></a>
<div class="printindex cp-printindex">
<table class="cp-letters-header-printindex"><tr><th valign="top">Jump to:
</th><td><a class="summary-letter-printindex"
href="#a-node_cp_symbol-1"><b>!</b></a>
diff --git a/tp/t/results/moreindices/nodes_before_top/res_html/index.html
b/tp/t/results/moreindices/nodes_before_top/res_html/index.html
index 09b7a6abce..c9d33e3ab4 100644
--- a/tp/t/results/moreindices/nodes_before_top/res_html/index.html
+++ b/tp/t/results/moreindices/nodes_before_top/res_html/index.html
@@ -23,7 +23,7 @@ span.program-in-footer {font-size: smaller}
</head>
<body lang="en">
-<a class="node-anchor" id="Top"></a><table class="nav-header" cellpadding="1"
cellspacing="1" border="0">
+<a class="node" id="Top"></a><table class="nav-header" cellpadding="1"
cellspacing="1" border="0">
<tr><td valign="middle" align="left">[<a
href="first-before-top.html#node-in-menu-before-top" title="Previous section in
reading order"> < </a>]</td>
<td valign="middle" align="left">[<a href="first-before-top.html#first"
title="Next section in reading order"> > </a>]</td>
<td valign="middle" align="left"> </td>
@@ -32,7 +32,7 @@ span.program-in-footer {font-size: smaller}
<td valign="middle" align="left">[<a
href="nodes_before_top_abt.html#SEC_About" title="About (help)"> ? </a>]</td>
</tr></table>
<h1 class="node-heading">Top</h1>
-<a class="index-entry-anchor" id="index-entry-a"></a>
+<a class="index-entry-id" id="index-entry-a"></a>
<div class="printindex cp-printindex">
<table class="cp-letters-header-printindex"><tr><th valign="top">Jump to:
</th><td><a class="summary-letter-printindex"
href="#Top_cp_symbol-1"><b>!</b></a>
diff --git
a/tp/t/results/moreindices/nodes_before_top_and_sections_monolithic/res_html/nodes_before_top_and_sections.html
b/tp/t/results/moreindices/nodes_before_top_and_sections_monolithic/res_html/nodes_before_top_and_sections.html
index b78b8941c7..7e730e1d7b 100644
---
a/tp/t/results/moreindices/nodes_before_top_and_sections_monolithic/res_html/nodes_before_top_and_sections.html
+++
b/tp/t/results/moreindices/nodes_before_top_and_sections_monolithic/res_html/nodes_before_top_and_sections.html
@@ -25,7 +25,7 @@ span.program-in-footer {font-size: smaller}
<body lang="en">
-<a class="node-anchor" id="first-before-top"></a><table class="nav-header"
cellpadding="1" cellspacing="1" border="0">
+<a class="node" id="first-before-top"></a><table class="nav-header"
cellpadding="1" cellspacing="1" border="0">
<tr><td valign="middle" align="left">[ < ]</td>
<td valign="middle" align="left">[<a href="#chapter" title="Next section in
reading order"> > </a>]</td>
<td valign="middle" align="left"> </td>
@@ -33,7 +33,7 @@ span.program-in-footer {font-size: smaller}
<td valign="middle" align="left">[<a href="#Top" title="Index">Index</a>]</td>
<td valign="middle" align="left">[<a href="#SEC_About" title="About (help)"> ?
</a>]</td>
</tr></table>
-<a class="index-entry-anchor" id="index-first-before-top"></a>
+<a class="index-entry-id" id="index-first-before-top"></a>
<p>in first node before printindex
</p><div class="printindex cp-printindex">
@@ -183,8 +183,8 @@ span.program-in-footer {font-size: smaller}
</td></tr>
</table>
-<a class="node-anchor" id="node-in-menu-before-top"></a>
-<a class="index-entry-anchor" id="index-node-in-menu-before-top"></a>
+<a class="node" id="node-in-menu-before-top"></a>
+<a class="index-entry-id" id="index-node-in-menu-before-top"></a>
<p>between node in menu before top and printindex
</p><div class="printindex cp-printindex">
<table class="cp-letters-header-printindex"><tr><th valign="top">Jump to:
</th><td><a class="summary-letter-printindex"
href="#top-section_cp_symbol-1"><b>!</b></a>
@@ -258,11 +258,11 @@ span.program-in-footer {font-size: smaller}
</div>
<p>node in menu before top text after printindex
</p>
-<a class="index-entry-anchor"
id="index-printindex-node-in-menu-before-top"></a>
+<a class="index-entry-id" id="index-printindex-node-in-menu-before-top"></a>
<div class="top" id="Top">
-<a class="index-entry-anchor" id="index-entry-a"></a>
+<a class="index-entry-id" id="index-entry-a"></a>
<p>in top node.
</p><div class="printindex cp-printindex">
<table class="cp-letters-header-printindex"><tr><th valign="top">Jump to:
</th><td><a class="summary-letter-printindex"
href="#top-section_cp_symbol-1"><b>!</b></a>
@@ -439,7 +439,7 @@ span.program-in-footer {font-size: smaller}
</div>
<h1 class="top" id="top-section">top section</h1>
-<a class="index-entry-anchor" id="index-top-section"></a>
+<a class="index-entry-id" id="index-top-section"></a>
<p>in top section
</p>
@@ -452,10 +452,10 @@ span.program-in-footer {font-size: smaller}
</td></tr>
</table>
-<a class="node-anchor" id="first"></a><p>Text and then index entries
-<a class="index-entry-anchor" id="index-_0021-entry-in-node"></a>
-<a class="index-entry-anchor" id="index-fun-in-node"></a>
-<a class="index-entry-anchor" id="index-entry-in-node"></a>
+<a class="node" id="first"></a><p>Text and then index entries
+<a class="index-entry-id" id="index-_0021-entry-in-node"></a>
+<a class="index-entry-id" id="index-fun-in-node"></a>
+<a class="index-entry-id" id="index-entry-in-node"></a>
</p>
<div class="printindex cp-printindex">
<table class="cp-letters-header-printindex"><tr><th valign="top">Jump to:
</th><td><a class="summary-letter-printindex"
href="#top-section_cp_symbol-1"><b>!</b></a>
@@ -533,7 +533,7 @@ span.program-in-footer {font-size: smaller}
</td></tr>
</table>
-<a class="node-anchor" id="second"></a><table class="menu" border="0"
cellspacing="0">
+<a class="node" id="second"></a><table class="menu" border="0" cellspacing="0">
<tr><td align="left" valign="top">• <a href="#a-node" rel="index">a
node</a></td><td> </td><td align="left" valign="top">
</td></tr>
<tr><td align="left" valign="top">• <a
href="#another">another</a></td><td> </td><td align="left"
valign="top">
@@ -570,12 +570,12 @@ span.program-in-footer {font-size: smaller}
</td></tr></table>
</div>
-<a class="node-anchor" id="another"></a>
-<a class="index-entry-anchor" id="index-something"></a>
-<a class="index-entry-anchor" id="index-somewhere"></a>
-<a class="index-entry-anchor" id="index-another"></a>
+<a class="node" id="another"></a>
+<a class="index-entry-id" id="index-something"></a>
+<a class="index-entry-id" id="index-somewhere"></a>
+<a class="index-entry-id" id="index-another"></a>
-<a class="node-anchor" id="a-node"></a><a class="index-entry-anchor"
id="index-entry-after-printindex"></a>
+<a class="node" id="a-node"></a><a class="index-entry-id"
id="index-entry-after-printindex"></a>
<div class="printindex cp-printindex">
<table class="cp-letters-header-printindex"><tr><th valign="top">Jump to:
</th><td><a class="summary-letter-printindex"
href="#top-section_cp_symbol-1"><b>!</b></a>
@@ -648,8 +648,8 @@ span.program-in-footer {font-size: smaller}
</td></tr></table>
</div>
-<a class="index-entry-anchor" id="index-a-function"></a>
-<a class="index-entry-anchor" id="index-a-concept-a-node"></a>
+<a class="index-entry-id" id="index-a-function"></a>
+<a class="index-entry-id" id="index-a-concept-a-node"></a>
<div class="printindex cp-printindex">
<table class="cp-letters-header-printindex"><tr><th valign="top">Jump to:
</th><td><a class="summary-letter-printindex"
href="#top-section_cp_symbol-1"><b>!</b></a>
@@ -812,8 +812,8 @@ span.program-in-footer {font-size: smaller}
</td></tr></table>
</div>
-<a class="node-anchor" id="node-in-chapter"></a>
-<a class="index-entry-anchor" id="index-node-in-chapter"></a>
+<a class="node" id="node-in-chapter"></a>
+<a class="index-entry-id" id="index-node-in-chapter"></a>
<hr style="height: 6px;">
</div>
diff --git
a/tp/t/results/moreindices/nodes_before_top_no_nodes/res_html/index.html
b/tp/t/results/moreindices/nodes_before_top_no_nodes/res_html/index.html
index bba1d07468..0d290cc927 100644
--- a/tp/t/results/moreindices/nodes_before_top_no_nodes/res_html/index.html
+++ b/tp/t/results/moreindices/nodes_before_top_no_nodes/res_html/index.html
@@ -25,7 +25,7 @@ span.program-in-footer {font-size: smaller}
<body lang="en">
-<a class="node-anchor" id="first-before-top"></a><a class="index-entry-anchor"
id="index-first-before-top"></a>
+<a class="node" id="first-before-top"></a><a class="index-entry-id"
id="index-first-before-top"></a>
<div class="printindex cp-printindex">
<table class="cp-letters-header-printindex"><tr><th valign="top">Jump to:
</th><td><a class="summary-letter-printindex"
href="#t_h_cp_symbol-1"><b>!</b></a>
@@ -94,8 +94,8 @@ span.program-in-footer {font-size: smaller}
</td></tr>
</table>
-<a class="node-anchor" id="node-in-menu-before-top"></a>
-<a class="index-entry-anchor" id="index-node-in-menu-before-top"></a>
+<a class="node" id="node-in-menu-before-top"></a>
+<a class="index-entry-id" id="index-node-in-menu-before-top"></a>
<div class="printindex cp-printindex">
<table class="cp-letters-header-printindex"><tr><th valign="top">Jump to:
</th><td><a class="summary-letter-printindex"
href="#t_h_cp_symbol-1"><b>!</b></a>
@@ -160,10 +160,10 @@ span.program-in-footer {font-size: smaller}
</div>
<p>node in menu before top text
</p>
-<a class="index-entry-anchor"
id="index-printindex-node-in-menu-before-top"></a>
+<a class="index-entry-id" id="index-printindex-node-in-menu-before-top"></a>
-<a class="node-anchor" id="Top"></a><a class="index-entry-anchor"
id="index-entry-a"></a>
+<a class="node" id="Top"></a><a class="index-entry-id" id="index-entry-a"></a>
<div class="printindex cp-printindex">
<table class="cp-letters-header-printindex"><tr><th valign="top">Jump to:
</th><td><a class="summary-letter-printindex"
href="#t_h_cp_symbol-1"><b>!</b></a>
@@ -328,10 +328,10 @@ span.program-in-footer {font-size: smaller}
</td></tr>
</table>
-<a class="node-anchor" id="first"></a><p>Text and then index entries
-<a class="index-entry-anchor" id="index-_0021-entry-in-node"></a>
-<a class="index-entry-anchor" id="index-fun-in-node"></a>
-<a class="index-entry-anchor" id="index-entry-in-node"></a>
+<a class="node" id="first"></a><p>Text and then index entries
+<a class="index-entry-id" id="index-_0021-entry-in-node"></a>
+<a class="index-entry-id" id="index-fun-in-node"></a>
+<a class="index-entry-id" id="index-entry-in-node"></a>
</p>
<div class="printindex cp-printindex">
<table class="cp-letters-header-printindex"><tr><th valign="top">Jump to:
</th><td><a class="summary-letter-printindex"
href="#t_h_cp_symbol-1"><b>!</b></a>
@@ -401,7 +401,7 @@ span.program-in-footer {font-size: smaller}
</td></tr>
</table>
-<a class="node-anchor" id="second"></a><table class="menu" border="0"
cellspacing="0">
+<a class="node" id="second"></a><table class="menu" border="0" cellspacing="0">
<tr><td align="left" valign="top">• <a href="#a-node" rel="index">a
node</a></td><td> </td><td align="left" valign="top">
</td></tr>
<tr><td align="left" valign="top">• <a
href="#another">another</a></td><td> </td><td align="left"
valign="top">
@@ -438,12 +438,12 @@ span.program-in-footer {font-size: smaller}
</td></tr></table>
</div>
-<a class="node-anchor" id="another"></a>
-<a class="index-entry-anchor" id="index-something"></a>
-<a class="index-entry-anchor" id="index-somewhere"></a>
-<a class="index-entry-anchor" id="index-another"></a>
+<a class="node" id="another"></a>
+<a class="index-entry-id" id="index-something"></a>
+<a class="index-entry-id" id="index-somewhere"></a>
+<a class="index-entry-id" id="index-another"></a>
-<a class="node-anchor" id="a-node"></a><a class="index-entry-anchor"
id="index-entry-after-printindex"></a>
+<a class="node" id="a-node"></a><a class="index-entry-id"
id="index-entry-after-printindex"></a>
<div class="printindex cp-printindex">
<table class="cp-letters-header-printindex"><tr><th valign="top">Jump to:
</th><td><a class="summary-letter-printindex"
href="#t_h_cp_symbol-1"><b>!</b></a>
@@ -508,8 +508,8 @@ span.program-in-footer {font-size: smaller}
</td></tr></table>
</div>
-<a class="index-entry-anchor" id="index-a-function"></a>
-<a class="index-entry-anchor" id="index-a-concept-a-node"></a>
+<a class="index-entry-id" id="index-a-function"></a>
+<a class="index-entry-id" id="index-a-concept-a-node"></a>
<div class="printindex cp-printindex">
<table class="cp-letters-header-printindex"><tr><th valign="top">Jump to:
</th><td><a class="summary-letter-printindex"
href="#t_h_cp_symbol-1"><b>!</b></a>
diff --git
a/tp/t/results/moreindices/nodes_before_top_nodes/res_html/a-node.html
b/tp/t/results/moreindices/nodes_before_top_nodes/res_html/a-node.html
index 1fea46e31e..f887af8b09 100644
--- a/tp/t/results/moreindices/nodes_before_top_nodes/res_html/a-node.html
+++ b/tp/t/results/moreindices/nodes_before_top_nodes/res_html/a-node.html
@@ -23,7 +23,7 @@ span.program-in-footer {font-size: smaller}
</head>
<body lang="en">
-<a class="node-anchor" id="a-node"></a><table class="nav-header"
cellpadding="1" cellspacing="1" border="0">
+<a class="node" id="a-node"></a><table class="nav-header" cellpadding="1"
cellspacing="1" border="0">
<tr><td valign="middle" align="left">[ << ]</td>
<td valign="middle" align="left">[<a href="another.html" title="Previous
section in reading order"> < </a>]</td>
<td valign="middle" align="left">[<a href="second.html" title="Up section"> Up
</a>]</td>
@@ -40,7 +40,7 @@ span.program-in-footer {font-size: smaller}
</tr></table>
<hr>
<h3 class="node-heading">a node</h3>
-<a class="index-entry-anchor" id="index-entry-after-printindex"></a>
+<a class="index-entry-id" id="index-entry-after-printindex"></a>
<div class="printindex cp-printindex">
<table class="cp-letters-header-printindex"><tr><th valign="top">Jump to:
</th><td><a class="summary-letter-printindex"
href="#a-node_cp_symbol-1"><b>!</b></a>
@@ -105,8 +105,8 @@ span.program-in-footer {font-size: smaller}
</td></tr></table>
</div>
-<a class="index-entry-anchor" id="index-a-function"></a>
-<a class="index-entry-anchor" id="index-a-concept-a-node"></a>
+<a class="index-entry-id" id="index-a-function"></a>
+<a class="index-entry-id" id="index-a-concept-a-node"></a>
<div class="printindex cp-printindex">
<table class="cp-letters-header-printindex"><tr><th valign="top">Jump to:
</th><td><a class="summary-letter-printindex"
href="#a-node_cp_symbol-1"><b>!</b></a>
diff --git
a/tp/t/results/moreindices/nodes_before_top_nodes/res_html/another.html
b/tp/t/results/moreindices/nodes_before_top_nodes/res_html/another.html
index 217bf68eb1..7683bc0405 100644
--- a/tp/t/results/moreindices/nodes_before_top_nodes/res_html/another.html
+++ b/tp/t/results/moreindices/nodes_before_top_nodes/res_html/another.html
@@ -22,7 +22,7 @@ span.program-in-footer {font-size: smaller}
</head>
<body lang="en">
-<a class="node-anchor" id="another"></a><table class="nav-header"
cellpadding="1" cellspacing="1" border="0">
+<a class="node" id="another"></a><table class="nav-header" cellpadding="1"
cellspacing="1" border="0">
<tr><td valign="middle" align="left">[ << ]</td>
<td valign="middle" align="left">[<a href="second.html" title="Previous
section in reading order"> < </a>]</td>
<td valign="middle" align="left">[<a href="second.html" title="Up section"> Up
</a>]</td>
@@ -40,9 +40,9 @@ span.program-in-footer {font-size: smaller}
<hr>
<h3 class="node-heading">another</h3>
-<a class="index-entry-anchor" id="index-something"></a>
-<a class="index-entry-anchor" id="index-somewhere"></a>
-<a class="index-entry-anchor" id="index-another"></a>
+<a class="index-entry-id" id="index-something"></a>
+<a class="index-entry-id" id="index-somewhere"></a>
+<a class="index-entry-id" id="index-another"></a>
<hr>
<p>
diff --git
a/tp/t/results/moreindices/nodes_before_top_nodes/res_html/first-before-top.html
b/tp/t/results/moreindices/nodes_before_top_nodes/res_html/first-before-top.html
index f2e87922f7..01a2c4b834 100644
---
a/tp/t/results/moreindices/nodes_before_top_nodes/res_html/first-before-top.html
+++
b/tp/t/results/moreindices/nodes_before_top_nodes/res_html/first-before-top.html
@@ -25,7 +25,7 @@ span.program-in-footer {font-size: smaller}
<body lang="en">
-<a class="node-anchor" id="first-before-top"></a><table class="nav-header"
cellpadding="1" cellspacing="1" border="0">
+<a class="node" id="first-before-top"></a><table class="nav-header"
cellpadding="1" cellspacing="1" border="0">
<tr><td valign="middle" align="left">[ << ]</td>
<td valign="middle" align="left">[ < ]</td>
<td valign="middle" align="left">[<a href="../dir/index.html" title="Up
section"> Up </a>]</td>
@@ -42,7 +42,7 @@ span.program-in-footer {font-size: smaller}
</tr></table>
<hr>
<h3 class="node-heading">first before top</h3>
-<a class="index-entry-anchor" id="index-first-before-top"></a>
+<a class="index-entry-id" id="index-first-before-top"></a>
<div class="printindex cp-printindex">
<table class="cp-letters-header-printindex"><tr><th valign="top">Jump to:
</th><td><a class="summary-letter-printindex"
href="#first-before-top_cp_symbol-1"><b>!</b></a>
diff --git
a/tp/t/results/moreindices/nodes_before_top_nodes/res_html/first.html
b/tp/t/results/moreindices/nodes_before_top_nodes/res_html/first.html
index 64916511c2..ae9fcc5c37 100644
--- a/tp/t/results/moreindices/nodes_before_top_nodes/res_html/first.html
+++ b/tp/t/results/moreindices/nodes_before_top_nodes/res_html/first.html
@@ -23,7 +23,7 @@ span.program-in-footer {font-size: smaller}
</head>
<body lang="en">
-<a class="node-anchor" id="first"></a><table class="nav-header"
cellpadding="1" cellspacing="1" border="0">
+<a class="node" id="first"></a><table class="nav-header" cellpadding="1"
cellspacing="1" border="0">
<tr><td valign="middle" align="left">[ << ]</td>
<td valign="middle" align="left">[<a href="index.html" title="Previous section
in reading order"> < </a>]</td>
<td valign="middle" align="left">[<a href="index.html" title="Up section"> Up
</a>]</td>
@@ -41,9 +41,9 @@ span.program-in-footer {font-size: smaller}
<hr>
<h3 class="node-heading">first</h3>
<p>Text and then index entries
-<a class="index-entry-anchor" id="index-_0021-entry-in-node"></a>
-<a class="index-entry-anchor" id="index-fun-in-node"></a>
-<a class="index-entry-anchor" id="index-entry-in-node"></a>
+<a class="index-entry-id" id="index-_0021-entry-in-node"></a>
+<a class="index-entry-id" id="index-fun-in-node"></a>
+<a class="index-entry-id" id="index-entry-in-node"></a>
</p>
<div class="printindex cp-printindex">
<table class="cp-letters-header-printindex"><tr><th valign="top">Jump to:
</th><td><a class="summary-letter-printindex"
href="#first_cp_symbol-1"><b>!</b></a>
diff --git
a/tp/t/results/moreindices/nodes_before_top_nodes/res_html/index.html
b/tp/t/results/moreindices/nodes_before_top_nodes/res_html/index.html
index 5258a44876..e6affb5b93 100644
--- a/tp/t/results/moreindices/nodes_before_top_nodes/res_html/index.html
+++ b/tp/t/results/moreindices/nodes_before_top_nodes/res_html/index.html
@@ -23,7 +23,7 @@ span.program-in-footer {font-size: smaller}
</head>
<body lang="en">
-<a class="node-anchor" id="Top"></a><table class="nav-header" cellpadding="1"
cellspacing="1" border="0">
+<a class="node" id="Top"></a><table class="nav-header" cellpadding="1"
cellspacing="1" border="0">
<tr><td valign="middle" align="left">[<a href="node-in-menu-before-top.html"
title="Previous section in reading order"> < </a>]</td>
<td valign="middle" align="left">[<a href="first.html" title="Next section in
reading order"> > </a>]</td>
<td valign="middle" align="left"> </td>
@@ -33,7 +33,7 @@ span.program-in-footer {font-size: smaller}
</tr></table>
<hr>
<h1 class="node-heading">Top</h1>
-<a class="index-entry-anchor" id="index-entry-a"></a>
+<a class="index-entry-id" id="index-entry-a"></a>
<div class="printindex cp-printindex">
<table class="cp-letters-header-printindex"><tr><th valign="top">Jump to:
</th><td><a class="summary-letter-printindex"
href="#Top_cp_symbol-1"><b>!</b></a>
diff --git
a/tp/t/results/moreindices/nodes_before_top_nodes/res_html/node-in-menu-before-top.html
b/tp/t/results/moreindices/nodes_before_top_nodes/res_html/node-in-menu-before-top.html
index 5e869b4497..8a47351b7c 100644
---
a/tp/t/results/moreindices/nodes_before_top_nodes/res_html/node-in-menu-before-top.html
+++
b/tp/t/results/moreindices/nodes_before_top_nodes/res_html/node-in-menu-before-top.html
@@ -23,7 +23,7 @@ span.program-in-footer {font-size: smaller}
</head>
<body lang="en">
-<a class="node-anchor" id="node-in-menu-before-top"></a><table
class="nav-header" cellpadding="1" cellspacing="1" border="0">
+<a class="node" id="node-in-menu-before-top"></a><table class="nav-header"
cellpadding="1" cellspacing="1" border="0">
<tr><td valign="middle" align="left">[ << ]</td>
<td valign="middle" align="left">[<a href="first-before-top.html"
title="Previous section in reading order"> < </a>]</td>
<td valign="middle" align="left">[<a href="first-before-top.html" title="Up
section"> Up </a>]</td>
@@ -41,7 +41,7 @@ span.program-in-footer {font-size: smaller}
<hr>
<h3 class="node-heading">node in menu before top</h3>
-<a class="index-entry-anchor" id="index-node-in-menu-before-top"></a>
+<a class="index-entry-id" id="index-node-in-menu-before-top"></a>
<div class="printindex cp-printindex">
<table class="cp-letters-header-printindex"><tr><th valign="top">Jump to:
</th><td><a class="summary-letter-printindex"
href="#node-in-menu-before-top_cp_symbol-1"><b>!</b></a>
@@ -106,7 +106,7 @@ span.program-in-footer {font-size: smaller}
</div>
<p>node in menu before top text
</p>
-<a class="index-entry-anchor"
id="index-printindex-node-in-menu-before-top"></a>
+<a class="index-entry-id" id="index-printindex-node-in-menu-before-top"></a>
<hr>
diff --git
a/tp/t/results/moreindices/nodes_before_top_nodes/res_html/second.html
b/tp/t/results/moreindices/nodes_before_top_nodes/res_html/second.html
index a433e9daf8..eb75848489 100644
--- a/tp/t/results/moreindices/nodes_before_top_nodes/res_html/second.html
+++ b/tp/t/results/moreindices/nodes_before_top_nodes/res_html/second.html
@@ -23,7 +23,7 @@ span.program-in-footer {font-size: smaller}
</head>
<body lang="en">
-<a class="node-anchor" id="second"></a><table class="nav-header"
cellpadding="1" cellspacing="1" border="0">
+<a class="node" id="second"></a><table class="nav-header" cellpadding="1"
cellspacing="1" border="0">
<tr><td valign="middle" align="left">[ << ]</td>
<td valign="middle" align="left">[<a href="first.html" title="Previous section
in reading order"> < </a>]</td>
<td valign="middle" align="left">[<a href="first.html" title="Up section"> Up
</a>]</td>
diff --git a/tp/t/results/moreindices/split_chapter_index/res_html/first.html
b/tp/t/results/moreindices/split_chapter_index/res_html/first.html
index 0b4ee26730..638bf9c4d1 100644
--- a/tp/t/results/moreindices/split_chapter_index/res_html/first.html
+++ b/tp/t/results/moreindices/split_chapter_index/res_html/first.html
@@ -42,10 +42,10 @@ span.program-in-footer {font-size: smaller}
<h1 class="chapter" id="First-chapter">1 First chapter</h1>
<p>Text and then index entries
-<a class="index-entry-anchor" id="index-entry-in-node"></a>
-<a class="index-entry-anchor" id="index-_0021-entry-in-node"></a>
-<a class="index-entry-anchor" id="index-fun-in-node"></a>
-<a class="index-entry-anchor" id="index-entry-in-node-1"></a>
+<a class="index-entry-id" id="index-entry-in-node"></a>
+<a class="index-entry-id" id="index-_0021-entry-in-node"></a>
+<a class="index-entry-id" id="index-fun-in-node"></a>
+<a class="index-entry-id" id="index-entry-in-node-1"></a>
</p>
<div class="printindex cp-printindex">
<table class="cp-letters-header-printindex"><tr><th valign="top">Jump to:
</th><td><a class="summary-letter-printindex"
href="#First-chapter_cp_symbol-1"><b>!</b></a>
@@ -97,11 +97,11 @@ span.program-in-footer {font-size: smaller}
</td></tr></table>
</div>
-<a class="index-entry-anchor" id="index-entry-after-printindex"></a>
+<a class="index-entry-id" id="index-entry-after-printindex"></a>
-<a class="index-entry-anchor" id="index-a-function"></a>
-<a class="index-entry-anchor" id="index-a-concept-in-first"></a>
-<a class="index-entry-anchor" id="index-somewhere"></a>
+<a class="index-entry-id" id="index-a-function"></a>
+<a class="index-entry-id" id="index-a-concept-in-first"></a>
+<a class="index-entry-id" id="index-somewhere"></a>
<table class="menu" border="0" cellspacing="0">
<tr><td align="left" valign="top"><a href="#section-1">1.1 Section
1</a></td><td> </td><td align="left" valign="top">
@@ -132,9 +132,9 @@ span.program-in-footer {font-size: smaller}
</td></tr>
</table>
-<a class="index-entry-anchor" id="index-something"></a>
+<a class="index-entry-id" id="index-something"></a>
-<a class="index-entry-anchor" id="index-another"></a>
+<a class="index-entry-id" id="index-another"></a>
<hr>
<div class="subsection" id="subsection-1">
@@ -157,7 +157,7 @@ span.program-in-footer {font-size: smaller}
<p>In subsection 1
</p>
-<a class="index-entry-anchor" id="index-printindex-subsection-2"></a>
+<a class="index-entry-id" id="index-printindex-subsection-2"></a>
</div>
</div>
diff --git a/tp/t/results/moreindices/split_chapter_index/res_html/index.html
b/tp/t/results/moreindices/split_chapter_index/res_html/index.html
index e3fe8d1aad..c15514fc86 100644
--- a/tp/t/results/moreindices/split_chapter_index/res_html/index.html
+++ b/tp/t/results/moreindices/split_chapter_index/res_html/index.html
@@ -33,7 +33,7 @@ span.program-in-footer {font-size: smaller}
<td valign="middle" align="left">[<a
href="split_chapter_index_abt.html#SEC_About" title="About (help)"> ? </a>]</td>
</tr></table>
<h1 class="top" id="split-indices">split indices</h1>
-<a class="index-entry-anchor" id="index-entry-a"></a>
+<a class="index-entry-id" id="index-entry-a"></a>
<p>Text in top.
</p>
diff --git
a/tp/t/results/moresectioning/equivalent_nodes/res_html/equivalent_nodes.html
b/tp/t/results/moresectioning/equivalent_nodes/res_html/equivalent_nodes.html
index dfdbf8d804..d0392401f6 100644
---
a/tp/t/results/moresectioning/equivalent_nodes/res_html/equivalent_nodes.html
+++
b/tp/t/results/moresectioning/equivalent_nodes/res_html/equivalent_nodes.html
@@ -23,7 +23,7 @@ span.program-in-footer {font-size: smaller}
<body lang="en">
-<a class="node-anchor" id="before-top"></a><table class="nav-header"
cellpadding="1" cellspacing="1" border="0">
+<a class="node" id="before-top"></a><table class="nav-header" cellpadding="1"
cellspacing="1" border="0">
<tr><td valign="middle" align="left">[ << ]</td>
<td valign="middle" align="left">[ < ]</td>
<td valign="middle" align="left">[<a href="dir.html#Top" title="Up section">
Up </a>]</td>
@@ -41,7 +41,7 @@ span.program-in-footer {font-size: smaller}
<h3 class="node-heading">before top</h3>
<hr style="height: 6px;">
-<a class="node-anchor" id="Top"></a><table class="nav-header" cellpadding="1"
cellspacing="1" border="0">
+<a class="node" id="Top"></a><table class="nav-header" cellpadding="1"
cellspacing="1" border="0">
<tr><td valign="middle" align="left">[<a href="#before-top" title="Previous
section in reading order"> < </a>]</td>
<td valign="middle" align="left">[<a href="#node" title="Next section in
reading order"> > </a>]</td>
<td valign="middle" align="left"> </td>
@@ -59,7 +59,7 @@ span.program-in-footer {font-size: smaller}
</table>
<hr style="height: 6px;">
-<a class="node-anchor" id="node"></a><table class="nav-header" cellpadding="1"
cellspacing="1" border="0">
+<a class="node" id="node"></a><table class="nav-header" cellpadding="1"
cellspacing="1" border="0">
<tr><td valign="middle" align="left">[ << ]</td>
<td valign="middle" align="left">[<a href="#Top" title="Previous section in
reading order"> < </a>]</td>
<td valign="middle" align="left">[<a href="#Top" title="Up section"> Up
</a>]</td>
diff --git
a/tp/t/results/moresectioning/equivalent_nodes_no_node/res_html/equivalent_nodes.html
b/tp/t/results/moresectioning/equivalent_nodes_no_node/res_html/equivalent_nodes.html
index c3a96214e1..f55190cee3 100644
---
a/tp/t/results/moresectioning/equivalent_nodes_no_node/res_html/equivalent_nodes.html
+++
b/tp/t/results/moresectioning/equivalent_nodes_no_node/res_html/equivalent_nodes.html
@@ -23,8 +23,8 @@ span.program-in-footer {font-size: smaller}
<body lang="en">
-<a class="node-anchor" id="before-top"></a>
-<a class="node-anchor" id="Top"></a>
+<a class="node" id="before-top"></a>
+<a class="node" id="Top"></a>
<p>Equivalent nodes in node line and in menu.
</p>
<table class="menu" border="0" cellspacing="0">
@@ -32,7 +32,7 @@ span.program-in-footer {font-size: smaller}
</td></tr>
</table>
-<a class="node-anchor" id="node"></a>
+<a class="node" id="node"></a>
<div class="float">
<p>A figure
</p><div class="type-number-float"><p><strong class="strong">Figure
diff --git
a/tp/t/results/moresectioning/node_footnote_end/res_html/node_footnote.html
b/tp/t/results/moresectioning/node_footnote_end/res_html/node_footnote.html
index e6df40f86d..45c5c817a7 100644
--- a/tp/t/results/moresectioning/node_footnote_end/res_html/node_footnote.html
+++ b/tp/t/results/moresectioning/node_footnote_end/res_html/node_footnote.html
@@ -23,7 +23,7 @@ span.program-in-footer {font-size: smaller}
<body lang="en">
-<a class="node-anchor" id="Top"></a>
+<a class="node" id="Top"></a>
<table class="menu" border="0" cellspacing="0">
<tr><td align="left" valign="top">• <a
href="#g_t_00e1">á</a></td><td> </td><td align="left"
valign="top">
</td></tr>
@@ -35,11 +35,11 @@ span.program-in-footer {font-size: smaller}
</td></tr>
</table>
-<a class="node-anchor" id="g_t_00e1"></a>
+<a class="node" id="g_t_00e1"></a>
<p>node á,
Footnote 1<a class="footnote" id="DOCF1" href="#FOOT1"><sup>1</sup></a>.
</p>
-<a class="node-anchor" id="g_t_00e2"></a>
+<a class="node" id="g_t_00e2"></a>
<p>node â,
Footnote 2<a class="footnote" id="DOCF2" href="#FOOT2"><sup>2</sup></a>.
</p>
@@ -51,7 +51,7 @@ Footnote 2<a class="footnote" id="DOCF2"
href="#FOOT2"><sup>2</sup></a>.
</td></tr>
</table>
-<a class="node-anchor" id="g_t_00e0"></a>
+<a class="node" id="g_t_00e0"></a>
<p>node à,
Footnote 3<a class="footnote" id="DOCF3" href="#FOOT3"><sup>3</sup></a>.
</p>
diff --git
a/tp/t/results/moresectioning/node_footnote_separated/res_html/node_footnote.html
b/tp/t/results/moresectioning/node_footnote_separated/res_html/node_footnote.html
index e6df40f86d..45c5c817a7 100644
---
a/tp/t/results/moresectioning/node_footnote_separated/res_html/node_footnote.html
+++
b/tp/t/results/moresectioning/node_footnote_separated/res_html/node_footnote.html
@@ -23,7 +23,7 @@ span.program-in-footer {font-size: smaller}
<body lang="en">
-<a class="node-anchor" id="Top"></a>
+<a class="node" id="Top"></a>
<table class="menu" border="0" cellspacing="0">
<tr><td align="left" valign="top">• <a
href="#g_t_00e1">á</a></td><td> </td><td align="left"
valign="top">
</td></tr>
@@ -35,11 +35,11 @@ span.program-in-footer {font-size: smaller}
</td></tr>
</table>
-<a class="node-anchor" id="g_t_00e1"></a>
+<a class="node" id="g_t_00e1"></a>
<p>node á,
Footnote 1<a class="footnote" id="DOCF1" href="#FOOT1"><sup>1</sup></a>.
</p>
-<a class="node-anchor" id="g_t_00e2"></a>
+<a class="node" id="g_t_00e2"></a>
<p>node â,
Footnote 2<a class="footnote" id="DOCF2" href="#FOOT2"><sup>2</sup></a>.
</p>
@@ -51,7 +51,7 @@ Footnote 2<a class="footnote" id="DOCF2"
href="#FOOT2"><sup>2</sup></a>.
</td></tr>
</table>
-<a class="node-anchor" id="g_t_00e0"></a>
+<a class="node" id="g_t_00e0"></a>
<p>node à,
Footnote 3<a class="footnote" id="DOCF3" href="#FOOT3"><sup>3</sup></a>.
</p>
diff --git a/tp/t/results/moresectioning/node_footnote_use_node/res_html/a.html
b/tp/t/results/moresectioning/node_footnote_use_node/res_html/a.html
index cacab59b85..8067fac3c7 100644
--- a/tp/t/results/moresectioning/node_footnote_use_node/res_html/a.html
+++ b/tp/t/results/moresectioning/node_footnote_use_node/res_html/a.html
@@ -22,7 +22,7 @@ span.program-in-footer {font-size: smaller}
</head>
<body lang="en">
-<a class="node-anchor" id="g_t_00e1"></a><table class="nav-header"
cellpadding="1" cellspacing="1" border="0">
+<a class="node" id="g_t_00e1"></a><table class="nav-header" cellpadding="1"
cellspacing="1" border="0">
<tr><td valign="middle" align="left">[ << ]</td>
<td valign="middle" align="left">[<a href="index.html" title="Previous section
in reading order"> < </a>]</td>
<td valign="middle" align="left">[<a href="index.html" title="Up section"> Up
</a>]</td>
@@ -44,7 +44,7 @@ span.program-in-footer {font-size: smaller}
Footnote 1<a class="footnote" id="DOCF1" href="#FOOT1"><sup>1</sup></a>.
</p>
<hr>
-<a class="node-anchor" id="g_t_00e2"></a><table class="nav-header"
cellpadding="1" cellspacing="1" border="0">
+<a class="node" id="g_t_00e2"></a><table class="nav-header" cellpadding="1"
cellspacing="1" border="0">
<tr><td valign="middle" align="left">[ << ]</td>
<td valign="middle" align="left">[<a href="#g_t_00e1" title="Previous section
in reading order"> < </a>]</td>
<td valign="middle" align="left">[<a href="index.html" title="Up section"> Up
</a>]</td>
@@ -74,7 +74,7 @@ Footnote 2<a class="footnote" id="DOCF2"
href="#FOOT2"><sup>2</sup></a>.
<p>foot 2 â</p>
</div>
<hr>
-<a class="node-anchor" id="g_t_00e0"></a><table class="nav-header"
cellpadding="1" cellspacing="1" border="0">
+<a class="node" id="g_t_00e0"></a><table class="nav-header" cellpadding="1"
cellspacing="1" border="0">
<tr><td valign="middle" align="left">[<a href="chapter.html" title="Beginning
of this chapter or previous chapter"> << </a>]</td>
<td valign="middle" align="left">[<a href="chapter.html" title="Previous
section in reading order"> < </a>]</td>
<td valign="middle" align="left">[<a href="chapter.html" title="Up section">
Up </a>]</td>
diff --git
a/tp/t/results/moresectioning/node_footnote_use_node/res_html/index.html
b/tp/t/results/moresectioning/node_footnote_use_node/res_html/index.html
index 92dae4e1d6..89eca32be4 100644
--- a/tp/t/results/moresectioning/node_footnote_use_node/res_html/index.html
+++ b/tp/t/results/moresectioning/node_footnote_use_node/res_html/index.html
@@ -23,7 +23,7 @@ span.program-in-footer {font-size: smaller}
<body lang="en">
-<a class="node-anchor" id="Top"></a><table class="nav-header" cellpadding="1"
cellspacing="1" border="0">
+<a class="node" id="Top"></a><table class="nav-header" cellpadding="1"
cellspacing="1" border="0">
<tr><td valign="middle" align="left">[ < ]</td>
<td valign="middle" align="left">[<a href="a.html#g_t_00e1" title="Next
section in reading order"> > </a>]</td>
<td valign="middle" align="left"> </td>
diff --git
a/tp/t/results/moresectioning/nodes_after_top_before_chapter/res_html/nodes_after_top_before_chapter.html
b/tp/t/results/moresectioning/nodes_after_top_before_chapter/res_html/nodes_after_top_before_chapter.html
index 7eb13743a3..0b2c586fee 100644
---
a/tp/t/results/moresectioning/nodes_after_top_before_chapter/res_html/nodes_after_top_before_chapter.html
+++
b/tp/t/results/moresectioning/nodes_after_top_before_chapter/res_html/nodes_after_top_before_chapter.html
@@ -24,7 +24,7 @@ span.program-in-footer {font-size: smaller}
<body lang="en">
-<a class="node-anchor" id="Top"></a><p>Top node
+<a class="node" id="Top"></a><p>Top node
</p><table class="menu" border="0" cellspacing="0">
<tr><td align="left" valign="top">• <a href="#second-node">second
node</a></td><td> </td><td align="left" valign="top">
</td></tr>
@@ -32,7 +32,7 @@ span.program-in-footer {font-size: smaller}
</td></tr>
</table>
-<a class="node-anchor" id="second-node"></a>
+<a class="node" id="second-node"></a>
<p>second node
</p>
<div class="chapter" id="third-node">
diff --git
a/tp/t/results/moresectioning/nodes_after_top_before_chapter_use_nodes_chapter/res_html/index.html
b/tp/t/results/moresectioning/nodes_after_top_before_chapter_use_nodes_chapter/res_html/index.html
index 24f049ebfc..a15aa965b1 100644
---
a/tp/t/results/moresectioning/nodes_after_top_before_chapter_use_nodes_chapter/res_html/index.html
+++
b/tp/t/results/moresectioning/nodes_after_top_before_chapter_use_nodes_chapter/res_html/index.html
@@ -24,7 +24,7 @@ span.program-in-footer {font-size: smaller}
<body lang="en">
-<a class="node-anchor" id="Top"></a><table class="nav-header" cellpadding="1"
cellspacing="1" border="0">
+<a class="node" id="Top"></a><table class="nav-header" cellpadding="1"
cellspacing="1" border="0">
<tr><td valign="middle" align="left">[ < ]</td>
<td valign="middle" align="left">[<a href="#second-node" title="Next section
in reading order"> > </a>]</td>
<td valign="middle" align="left"> </td>
@@ -42,7 +42,7 @@ span.program-in-footer {font-size: smaller}
</table>
<hr style="height: 6px;">
-<a class="node-anchor" id="second-node"></a><table class="nav-header"
cellpadding="1" cellspacing="1" border="0">
+<a class="node" id="second-node"></a><table class="nav-header" cellpadding="1"
cellspacing="1" border="0">
<tr><td valign="middle" align="left">[ << ]</td>
<td valign="middle" align="left">[<a href="#Top" title="Previous section in
reading order"> < </a>]</td>
<td valign="middle" align="left">[<a href="#Top" title="Up section"> Up
</a>]</td>
diff --git
a/tp/t/results/moresectioning/nodes_after_top_before_section/res_html/index.html
b/tp/t/results/moresectioning/nodes_after_top_before_section/res_html/index.html
index a200b4ae07..077c4eead3 100644
---
a/tp/t/results/moresectioning/nodes_after_top_before_section/res_html/index.html
+++
b/tp/t/results/moresectioning/nodes_after_top_before_section/res_html/index.html
@@ -24,7 +24,7 @@ span.program-in-footer {font-size: smaller}
<body lang="en">
-<a class="node-anchor" id="Top"></a><p>Top node
+<a class="node" id="Top"></a><p>Top node
</p><table class="menu" border="0" cellspacing="0">
<tr><td align="left" valign="top">• <a href="#second-node">second
node</a></td><td> </td><td align="left" valign="top">
</td></tr>
@@ -32,7 +32,7 @@ span.program-in-footer {font-size: smaller}
</td></tr>
</table>
-<a class="node-anchor" id="second-node"></a>
+<a class="node" id="second-node"></a>
<p>second node
</p>
<div class="subsection" id="third-node">
diff --git
a/tp/t/results/moresectioning/nodes_after_top_before_section_use_nodes/res_html/nodes_after_top_before_section.html
b/tp/t/results/moresectioning/nodes_after_top_before_section_use_nodes/res_html/nodes_after_top_before_section.html
index fb97d0f0fa..48c485da43 100644
---
a/tp/t/results/moresectioning/nodes_after_top_before_section_use_nodes/res_html/nodes_after_top_before_section.html
+++
b/tp/t/results/moresectioning/nodes_after_top_before_section_use_nodes/res_html/nodes_after_top_before_section.html
@@ -24,7 +24,7 @@ span.program-in-footer {font-size: smaller}
<body lang="en">
-<a class="node-anchor" id="Top"></a><table class="nav-header" cellpadding="1"
cellspacing="1" border="0">
+<a class="node" id="Top"></a><table class="nav-header" cellpadding="1"
cellspacing="1" border="0">
<tr><td valign="middle" align="left">[ < ]</td>
<td valign="middle" align="left">[<a href="#second-node" title="Next section
in reading order"> > </a>]</td>
<td valign="middle" align="left"> </td>
@@ -42,7 +42,7 @@ span.program-in-footer {font-size: smaller}
</table>
<hr style="height: 6px;">
-<a class="node-anchor" id="second-node"></a><table class="nav-header"
cellpadding="1" cellspacing="1" border="0">
+<a class="node" id="second-node"></a><table class="nav-header" cellpadding="1"
cellspacing="1" border="0">
<tr><td valign="middle" align="left">[ << ]</td>
<td valign="middle" align="left">[<a href="#Top" title="Previous section in
reading order"> < </a>]</td>
<td valign="middle" align="left">[<a href="#Top" title="Up section"> Up
</a>]</td>
diff --git
a/tp/t/results/moresectioning/nodes_after_top_before_section_use_nodes_chapter/res_html/index.html
b/tp/t/results/moresectioning/nodes_after_top_before_section_use_nodes_chapter/res_html/index.html
index fea769d9fc..02524c5709 100644
---
a/tp/t/results/moresectioning/nodes_after_top_before_section_use_nodes_chapter/res_html/index.html
+++
b/tp/t/results/moresectioning/nodes_after_top_before_section_use_nodes_chapter/res_html/index.html
@@ -24,7 +24,7 @@ span.program-in-footer {font-size: smaller}
<body lang="en">
-<a class="node-anchor" id="Top"></a><table class="nav-header" cellpadding="1"
cellspacing="1" border="0">
+<a class="node" id="Top"></a><table class="nav-header" cellpadding="1"
cellspacing="1" border="0">
<tr><td valign="middle" align="left">[ < ]</td>
<td valign="middle" align="left">[<a href="#second-node" title="Next section
in reading order"> > </a>]</td>
<td valign="middle" align="left"> </td>
@@ -42,7 +42,7 @@ span.program-in-footer {font-size: smaller}
</table>
<hr style="height: 6px;">
-<a class="node-anchor" id="second-node"></a><table class="nav-header"
cellpadding="1" cellspacing="1" border="0">
+<a class="node" id="second-node"></a><table class="nav-header" cellpadding="1"
cellspacing="1" border="0">
<tr><td valign="middle" align="left">[ << ]</td>
<td valign="middle" align="left">[<a href="#Top" title="Previous section in
reading order"> < </a>]</td>
<td valign="middle" align="left">[<a href="#Top" title="Up section"> Up
</a>]</td>
diff --git
a/tp/t/results/moresectioning/placed_things_before_element/res_html/placed_things_before_element.html
b/tp/t/results/moresectioning/placed_things_before_element/res_html/placed_things_before_element.html
index d30c419203..a7a3ab4602 100644
---
a/tp/t/results/moresectioning/placed_things_before_element/res_html/placed_things_before_element.html
+++
b/tp/t/results/moresectioning/placed_things_before_element/res_html/placed_things_before_element.html
@@ -48,7 +48,7 @@ span.program-in-footer {font-size: smaller}
</td></tr>
</table>
-<a class="index-entry-anchor" id="index-index-entry"></a>
+<a class="index-entry-id" id="index-index-entry"></a>
<div class="section" id="section">
<h2 class="section">1 section</h2>
diff --git
a/tp/t/results/moresectioning/sectioning_frames/res_html/First-node.html
b/tp/t/results/moresectioning/sectioning_frames/res_html/First-node.html
index ded6f169c4..42974ed9bf 100644
--- a/tp/t/results/moresectioning/sectioning_frames/res_html/First-node.html
+++ b/tp/t/results/moresectioning/sectioning_frames/res_html/First-node.html
@@ -229,7 +229,7 @@ span.program-in-footer {font-size: smaller}
</tr></table>
<h2 class="section" id="numbered-section">1.1 numbered section</h2>
-<a class="node-anchor" id="between-node"></a>
+<a class="node" id="between-node"></a>
<p>between node, node without sectioning node
</p>
</div>
diff --git
a/tp/t/results/moresectioning/sectioning_frames/res_html/Third-node-unnumbered.html
b/tp/t/results/moresectioning/sectioning_frames/res_html/Third-node-unnumbered.html
index 38feb5142c..f95db99133 100644
---
a/tp/t/results/moresectioning/sectioning_frames/res_html/Third-node-unnumbered.html
+++
b/tp/t/results/moresectioning/sectioning_frames/res_html/Third-node-unnumbered.html
@@ -43,7 +43,7 @@ span.program-in-footer {font-size: smaller}
<p>unnumbered chapter text.
</p>
-<a class="node-anchor" id="Last-node-no-description"></a>
+<a class="node" id="Last-node-no-description"></a>
</div>
<hr>
<table class="nav-header" cellpadding="1" cellspacing="1" border="0">
diff --git a/tp/t/results/moresectioning/sectioning_frames/res_html/index.html
b/tp/t/results/moresectioning/sectioning_frames/res_html/index.html
index 362a66e59d..55cebd5176 100644
--- a/tp/t/results/moresectioning/sectioning_frames/res_html/index.html
+++ b/tp/t/results/moresectioning/sectioning_frames/res_html/index.html
@@ -32,7 +32,7 @@ span.program-in-footer {font-size: smaller}
<td valign="middle" align="left">[Index]</td>
<td valign="middle" align="left">[<a href="sectioning_abt.html#SEC_About"
title="About (help)"> ? </a>]</td>
</tr></table>
-<a class="top-anchor" id="SEC_Top"></a><table class="menu" border="0"
cellspacing="0">
+<a class="top" id="SEC_Top"></a><table class="menu" border="0" cellspacing="0">
<tr><td align="left" valign="top"><a href="First-node.html#First-node">1 first
node chapter</a></td><td> </td><td align="left" valign="top">node 1
explaination no heading ?
* and here ?
diff --git a/tp/t/results/multitable/inter_item_commands_in_multitable.pl
b/tp/t/results/multitable/inter_item_commands_in_multitable.pl
index 103c4d8347..999ca51fb5 100644
--- a/tp/t/results/multitable/inter_item_commands_in_multitable.pl
+++ b/tp/t/results/multitable/inter_item_commands_in_multitable.pl
@@ -1053,7 +1053,7 @@ thing
$result_converted{'html_text'}->{'inter_item_commands_in_multitable'} =
'<table class="multitable">
<tbody><tr><td>truc
-<a class="index-entry-anchor"
id="index-index-entry-between-empty-lines"></a></td></tr>
+<a class="index-entry-id"
id="index-index-entry-between-empty-lines"></a></td></tr>
<tr><td>trouc</td></tr>
</tbody>
</table>
@@ -1062,14 +1062,14 @@
$result_converted{'html_text'}->{'inter_item_commands_in_multitable'} = '<table
<thead><tr><th width="60%">mu–ltitable headitem</th><th
width="40%">another tab</th></tr></thead>
<tbody><tr><td width="60%">mu–ltitable item</td><td
width="40%">multitable tab</td></tr>
<tr><td width="60%">mu–ltitable item 2</td><td width="40%">multitable
tab 2
-<a class="index-entry-anchor"
id="index-index-entry-within-multitable"></a></td></tr>
+<a class="index-entry-id"
id="index-index-entry-within-multitable"></a></td></tr>
<tr><td width="60%">lone mu–ltitable item</td></tr>
</tbody>
</table>
<table class="multitable">
<tr><td>Title
-<a class="index-entry-anchor" id="index-cindex"></a></td></tr>
+<a class="index-entry-id" id="index-cindex"></a></td></tr>
<tbody><tr><td>thing</td></tr>
</tbody>
</table>
diff --git a/tp/t/results/sectioning/character_and_spaces_in_node.pl
b/tp/t/results/sectioning/character_and_spaces_in_node.pl
index 30cf282e7f..8086b07a81 100644
--- a/tp/t/results/sectioning/character_and_spaces_in_node.pl
+++ b/tp/t/results/sectioning/character_and_spaces_in_node.pl
@@ -629,31 +629,31 @@
$result_converted{'html'}->{'character_and_spaces_in_node'} = '<!DOCTYPE html>
<body lang="en">
-<a class="node-anchor" id="Top"></a><div class="nav-header">
+<a class="node" id="Top"></a><div class="nav-header">
<p>
Next: <a href="#other-nodes" accesskey="n" rel="next">other nodes</a>
</p>
</div>
<h1 class="node-heading">Top</h1>
<hr>
-<a class="node-anchor" id="other-nodes"></a><div class="nav-header">
+<a class="node" id="other-nodes"></a><div class="nav-header">
<p>
Next: <a
href="#g_t_0021_005f_0022_0023_0024_0025_0026_0027_0028_0029_002a_002b_002d_002e"
accesskey="n" rel="next">!_"#$%&\'()*+-.</a>, Previous: <a
href="#Top" accesskey="p" rel="prev">Top</a>, Up: <a href="#Top" accesskey="u"
rel="up">Top</a> </p>
</div>
<h4 class="node-heading">other nodes</h4>
<hr>
-<a class="node-anchor"
id="g_t_0021_005f_0022_0023_0024_0025_0026_0027_0028_0029_002a_002b_002d_002e"></a><div
class="nav-header">
+<a class="node"
id="g_t_0021_005f_0022_0023_0024_0025_0026_0027_0028_0029_002a_002b_002d_002e"></a><div
class="nav-header">
<p>
Next: <a
href="#g_t_002f_003b_003c_003d_003e_003f_005b_005c_005d_005e_005f_0060_007c_007e"
accesskey="n" rel="next">/;<=>?[\\]^_`|~</a>, Previous: <a
href="#other-nodes" accesskey="p" rel="prev">other nodes</a>, Up: <a
href="#other-nodes" accesskey="u" rel="up">other nodes</a> </p>
</div>
<h4 class="node-heading">!_"#$%&\'()*+-.</h4>
<hr>
-<a class="node-anchor"
id="g_t_002f_003b_003c_003d_003e_003f_005b_005c_005d_005e_005f_0060_007c_007e"></a><div
class="nav-header">
+<a class="node"
id="g_t_002f_003b_003c_003d_003e_003f_005b_005c_005d_005e_005f_0060_007c_007e"></a><div
class="nav-header">
<p>
Next: <a href="#local-node" accesskey="n" rel="next">local node</a>,
Previous: <a
href="#g_t_0021_005f_0022_0023_0024_0025_0026_0027_0028_0029_002a_002b_002d_002e"
accesskey="p" rel="prev">!_"#$%&\'()*+-.</a>, Up: <a
href="#other-nodes" accesskey="u" rel="up">other nodes</a> </p>
</div>
<h4 class="node-heading">/;<=>?[\\]^_`|~</h4>
<hr>
-<a class="node-anchor" id="local-node"></a><div class="nav-header">
+<a class="node" id="local-node"></a><div class="nav-header">
<p>
Previous: <a
href="#g_t_002f_003b_003c_003d_003e_003f_005b_005c_005d_005e_005f_0060_007c_007e"
accesskey="p" rel="prev">/;<=>?[\\]^_`|~</a>, Up: <a href="#other-nodes"
accesskey="u" rel="up">other nodes</a> </p>
</div>
diff --git a/tp/t/results/sectioning/character_and_spaces_in_refs.pl
b/tp/t/results/sectioning/character_and_spaces_in_refs.pl
index df9949c2cf..0ba4132ab9 100644
--- a/tp/t/results/sectioning/character_and_spaces_in_refs.pl
+++ b/tp/t/results/sectioning/character_and_spaces_in_refs.pl
@@ -2019,21 +2019,21 @@ Next: <a
href="#g_t_0021_005f_0022_0023_0024_0025_0026_0027_0028_0029_002a_002b_
<hr>
-<a class="node-anchor"
id="g_t_0021_005f_0022_0023_0024_0025_0026_0027_0028_0029_002a_002b_002d_002e"></a><div
class="nav-header">
+<a class="node"
id="g_t_0021_005f_0022_0023_0024_0025_0026_0027_0028_0029_002a_002b_002d_002e"></a><div
class="nav-header">
<p>
Next: <a
href="#g_t_002f_003b_003c_003d_003e_003f_005b_005c_005d_005e_005f_0060_007c_007e"
accesskey="n" rel="next">/;<=>?[\\]^_`|~</a>, Previous: <a
href="#other-nodes" accesskey="p" rel="prev">Chapter with nodes</a>, Up: <a
href="#other-nodes" accesskey="u" rel="up">Chapter with nodes</a> </p>
</div>
<h4 class="node-heading">!_"#$%&\'()*+-.</h4>
<hr>
-<a class="node-anchor"
id="g_t_002f_003b_003c_003d_003e_003f_005b_005c_005d_005e_005f_0060_007c_007e"></a><div
class="nav-header">
+<a class="node"
id="g_t_002f_003b_003c_003d_003e_003f_005b_005c_005d_005e_005f_0060_007c_007e"></a><div
class="nav-header">
<p>
Next: <a href="#local-node" accesskey="n" rel="next">local node</a>,
Previous: <a
href="#g_t_0021_005f_0022_0023_0024_0025_0026_0027_0028_0029_002a_002b_002d_002e"
accesskey="p" rel="prev">!_"#$%&\'()*+-.</a>, Up: <a
href="#other-nodes" accesskey="u" rel="up">Chapter with nodes</a> </p>
</div>
<h4 class="node-heading">/;<=>?[\\]^_`|~</h4>
<hr>
-<a class="node-anchor" id="local-node"></a><div class="nav-header">
+<a class="node" id="local-node"></a><div class="nav-header">
<p>
Previous: <a
href="#g_t_002f_003b_003c_003d_003e_003f_005b_005c_005d_005e_005f_0060_007c_007e"
accesskey="p" rel="prev">/;<=>?[\\]^_`|~</a>, Up: <a href="#other-nodes"
accesskey="u" rel="up">Chapter with nodes</a> </p>
</div>
diff --git
a/tp/t/results/sectioning/character_and_spaces_in_refs_out/res_html/_0021_005f_0022_0023_0024_0025_0026_0027_0028_0029_002a_002b_002d_002e.html
b/tp/t/results/sectioning/character_and_spaces_in_refs_out/res_html/_0021_005f_0022_0023_0024_0025_0026_0027_0028_0029_002a_002b_002d_002e.html
index dd0bda40ff..b31d4ab5e5 100644
---
a/tp/t/results/sectioning/character_and_spaces_in_refs_out/res_html/_0021_005f_0022_0023_0024_0025_0026_0027_0028_0029_002a_002b_002d_002e.html
+++
b/tp/t/results/sectioning/character_and_spaces_in_refs_out/res_html/_0021_005f_0022_0023_0024_0025_0026_0027_0028_0029_002a_002b_002d_002e.html
@@ -24,7 +24,7 @@
</head>
<body lang="en">
-<a class="node-anchor"
id="g_t_0021_005f_0022_0023_0024_0025_0026_0027_0028_0029_002a_002b_002d_002e"></a><div
class="nav-header">
+<a class="node"
id="g_t_0021_005f_0022_0023_0024_0025_0026_0027_0028_0029_002a_002b_002d_002e"></a><div
class="nav-header">
<p>
Next: <a
href="_002f_003b_003c_003d_003e_003f_005b_005c_005d_005e_005f_0060_007c_007e.html"
accesskey="n" rel="next">/;<=>?[\]^_`|~</a>, Previous: <a
href="other-nodes.html" accesskey="p" rel="prev">Chapter with nodes</a>, Up: <a
href="other-nodes.html" accesskey="u" rel="up">Chapter with nodes</a>
</p>
</div>
diff --git
a/tp/t/results/sectioning/character_and_spaces_in_refs_out/res_html/_002f_003b_003c_003d_003e_003f_005b_005c_005d_005e_005f_0060_007c_007e.html
b/tp/t/results/sectioning/character_and_spaces_in_refs_out/res_html/_002f_003b_003c_003d_003e_003f_005b_005c_005d_005e_005f_0060_007c_007e.html
index cc340b65b7..038cf003a8 100644
---
a/tp/t/results/sectioning/character_and_spaces_in_refs_out/res_html/_002f_003b_003c_003d_003e_003f_005b_005c_005d_005e_005f_0060_007c_007e.html
+++
b/tp/t/results/sectioning/character_and_spaces_in_refs_out/res_html/_002f_003b_003c_003d_003e_003f_005b_005c_005d_005e_005f_0060_007c_007e.html
@@ -24,7 +24,7 @@
</head>
<body lang="en">
-<a class="node-anchor"
id="g_t_002f_003b_003c_003d_003e_003f_005b_005c_005d_005e_005f_0060_007c_007e"></a><div
class="nav-header">
+<a class="node"
id="g_t_002f_003b_003c_003d_003e_003f_005b_005c_005d_005e_005f_0060_007c_007e"></a><div
class="nav-header">
<p>
Next: <a href="local-node.html" accesskey="n" rel="next">local node</a>,
Previous: <a
href="_0021_005f_0022_0023_0024_0025_0026_0027_0028_0029_002a_002b_002d_002e.html"
accesskey="p" rel="prev">!_"#$%&'()*+-.</a>, Up: <a
href="other-nodes.html" accesskey="u" rel="up">Chapter with nodes</a>
</p>
</div>
diff --git
a/tp/t/results/sectioning/character_and_spaces_in_refs_out/res_html/local-node.html
b/tp/t/results/sectioning/character_and_spaces_in_refs_out/res_html/local-node.html
index e201bc9504..e6b6885668 100644
---
a/tp/t/results/sectioning/character_and_spaces_in_refs_out/res_html/local-node.html
+++
b/tp/t/results/sectioning/character_and_spaces_in_refs_out/res_html/local-node.html
@@ -23,7 +23,7 @@
</head>
<body lang="en">
-<a class="node-anchor" id="local-node"></a><div class="nav-header">
+<a class="node" id="local-node"></a><div class="nav-header">
<p>
Previous: <a
href="_002f_003b_003c_003d_003e_003f_005b_005c_005d_005e_005f_0060_007c_007e.html"
accesskey="p" rel="prev">/;<=>?[\]^_`|~</a>, Up: <a
href="other-nodes.html" accesskey="u" rel="up">Chapter with nodes</a>
</p>
</div>
diff --git a/tp/t/results/sectioning/double_node_anchor_float.pl
b/tp/t/results/sectioning/double_node_anchor_float.pl
index fcedc0130c..fa5da1f13e 100644
--- a/tp/t/results/sectioning/double_node_anchor_float.pl
+++ b/tp/t/results/sectioning/double_node_anchor_float.pl
@@ -860,7 +860,7 @@ $result_converted{'html'}->{'double_node_anchor_float'} =
'<!DOCTYPE html>
</head>
<body lang="en">
-<a class="node-anchor" id="node1"></a><div class="nav-header">
+<a class="node" id="node1"></a><div class="nav-header">
<p>
</p>
</div>
diff --git a/tp/t/results/sectioning/double_top.pl
b/tp/t/results/sectioning/double_top.pl
index d5b15ecaf9..c4b8f615a1 100644
--- a/tp/t/results/sectioning/double_top.pl
+++ b/tp/t/results/sectioning/double_top.pl
@@ -352,7 +352,7 @@ $result_converted{'html'}->{'double_top'} = '<!DOCTYPE html>
</head>
<body lang="en">
-<a class="node-anchor" id="Top"></a><div class="nav-header">
+<a class="node" id="Top"></a><div class="nav-header">
<p>
Next: <a href="#Top" accesskey="n" rel="next">ToP</a> </p>
</div>
diff --git a/tp/t/results/sectioning/empty_top_node_up.pl
b/tp/t/results/sectioning/empty_top_node_up.pl
index 4cb3955804..284f0f9b2e 100644
--- a/tp/t/results/sectioning/empty_top_node_up.pl
+++ b/tp/t/results/sectioning/empty_top_node_up.pl
@@ -451,7 +451,7 @@ Next: <a href="#first" accesskey="n" rel="next">first</a>
</p>
<hr>
-<a class="node-anchor" id="first"></a><div class="nav-header">
+<a class="node" id="first"></a><div class="nav-header">
<p>
Previous: <a href="#Top" accesskey="p" rel="prev">empty top node up</a>, Up:
<a href="#Top" accesskey="u" rel="up">empty top node up</a> </p>
</div>
diff --git a/tp/t/results/sectioning/equivalent_nodes.pl
b/tp/t/results/sectioning/equivalent_nodes.pl
index 5d5061b1f8..f43e557c96 100644
--- a/tp/t/results/sectioning/equivalent_nodes.pl
+++ b/tp/t/results/sectioning/equivalent_nodes.pl
@@ -542,7 +542,7 @@ $result_converted{'html'}->{'equivalent_nodes'} =
'<!DOCTYPE html>
</head>
<body lang="en">
-<a class="node-anchor" id="Top"></a><div class="nav-header">
+<a class="node" id="Top"></a><div class="nav-header">
<p>
Next: <a href="#node" accesskey="n" rel="next">‘<samp
class="samp">node</samp>’</a> </p>
</div>
@@ -550,7 +550,7 @@ Next: <a href="#node" accesskey="n" rel="next">‘<samp
class="samp">node</s
<hr>
-<a class="node-anchor" id="node"></a><div class="nav-header">
+<a class="node" id="node"></a><div class="nav-header">
<p>
Up: <a href="#Top" accesskey="u" rel="up">Top</a> </p>
</div>
diff --git a/tp/t/results/sectioning/explicit_node_directions.pl
b/tp/t/results/sectioning/explicit_node_directions.pl
index 6d7e9dcd5c..9736437f14 100644
--- a/tp/t/results/sectioning/explicit_node_directions.pl
+++ b/tp/t/results/sectioning/explicit_node_directions.pl
@@ -989,7 +989,7 @@ $result_converted{'html'}->{'explicit_node_directions'} =
'<!DOCTYPE html>
</head>
<body lang="en">
-<a class="node-anchor" id="Top"></a><div class="nav-header">
+<a class="node" id="Top"></a><div class="nav-header">
<p>
Next: <a href="#second-node" accesskey="n" rel="next">second node</a>
</p>
</div>
@@ -997,7 +997,7 @@ Next: <a href="#second-node" accesskey="n"
rel="next">second node</a> </p
<p>Top node
</p>
<hr>
-<a class="node-anchor" id="second-node"></a><div class="nav-header">
+<a class="node" id="second-node"></a><div class="nav-header">
<p>
Next: <a href="#third-node" accesskey="n" rel="next">third node</a>, Previous:
<a href="#Top" accesskey="p" rel="prev">Top</a>, Up: <a href="#Top"
accesskey="u" rel="up">Top</a> </p>
</div>
@@ -1006,7 +1006,7 @@ Next: <a href="#third-node" accesskey="n"
rel="next">third node</a>, Previous: <
<p>second node
</p>
<hr>
-<a class="node-anchor" id="third-node"></a><div class="nav-header">
+<a class="node" id="third-node"></a><div class="nav-header">
<p>
Previous: <a href="#second-node" accesskey="p" rel="prev">second node</a>, Up:
<a href="#Top" accesskey="u" rel="up">Top</a> </p>
</div>
diff --git a/tp/t/results/sectioning/internal_top_node_up.pl
b/tp/t/results/sectioning/internal_top_node_up.pl
index 341caaf9b5..95f350d4b6 100644
--- a/tp/t/results/sectioning/internal_top_node_up.pl
+++ b/tp/t/results/sectioning/internal_top_node_up.pl
@@ -711,7 +711,7 @@ Next: <a href="#first" accesskey="n" rel="next">first</a>
</p>
<hr>
-<a class="node-anchor" id="first"></a><div class="nav-header">
+<a class="node" id="first"></a><div class="nav-header">
<p>
Previous: <a href="#Top" accesskey="p" rel="prev">internal top node up</a>,
Up: <a href="#Top" accesskey="u" rel="up">internal top node up</a> </p>
</div>
diff --git a/tp/t/results/sectioning/no_element.pl
b/tp/t/results/sectioning/no_element.pl
index 41f46b6a70..35149d94e6 100644
--- a/tp/t/results/sectioning/no_element.pl
+++ b/tp/t/results/sectioning/no_element.pl
@@ -997,7 +997,7 @@ h1.settitle {text-align:center}
<a class="ref" href="#float-anchor">1</a>.
</p>
-<a class="index-entry-anchor" id="index-index-entry"></a>
+<a class="index-entry-id" id="index-index-entry"></a>
<div class="footnote">
<hr>
<h4 class="footnotes-heading">Footnotes</h4>
diff --git a/tp/t/results/sectioning/no_menu.pl
b/tp/t/results/sectioning/no_menu.pl
index af728ecfc9..ac3c64f6e8 100644
--- a/tp/t/results/sectioning/no_menu.pl
+++ b/tp/t/results/sectioning/no_menu.pl
@@ -627,7 +627,7 @@ $result_converted{'html'}->{'no_menu'} = '<!DOCTYPE html>
<p>
Next: <a href="#c1" accesskey="n" rel="next">c1</a> </p>
</div>
-<a class="top-anchor" id="SEC_Top"></a>
+<a class="top" id="SEC_Top"></a>
<ul class="mini-toc">
<li><a href="#c1" accesskey="1">c1</a></li>
<li><a href="#c2" accesskey="2">c2</a></li>
diff --git a/tp/t/results/sectioning/node_sectop_before_lone_node_Top.pl
b/tp/t/results/sectioning/node_sectop_before_lone_node_Top.pl
index 62f4642bab..74a00197a3 100644
--- a/tp/t/results/sectioning/node_sectop_before_lone_node_Top.pl
+++ b/tp/t/results/sectioning/node_sectop_before_lone_node_Top.pl
@@ -532,7 +532,7 @@ Next: <a href="#chap" accesskey="n" rel="next">chap</a>,
Previous: <a href="#Top
<li><a href="#chap" accesskey="1">chap</a></li>
</ul>
<hr>
-<a class="node-anchor" id="Top"></a><div class="nav-header">
+<a class="node" id="Top"></a><div class="nav-header">
<p>
Next: <a href="#node-before" accesskey="n" rel="next">top sectionning</a>
</p>
</div>
diff --git a/tp/t/results/sectioning/node_up_external_node.pl
b/tp/t/results/sectioning/node_up_external_node.pl
index e343ac8648..3b9e52f475 100644
--- a/tp/t/results/sectioning/node_up_external_node.pl
+++ b/tp/t/results/sectioning/node_up_external_node.pl
@@ -757,7 +757,7 @@ $result_converted{'html'}->{'node_up_external_node'} =
'<!DOCTYPE html>
</head>
<body lang="en">
-<a class="node-anchor" id="Top"></a><div class="nav-header">
+<a class="node" id="Top"></a><div class="nav-header">
<p>
Next: <a href="#first" accesskey="n" rel="next">first</a> </p>
</div>
@@ -765,7 +765,7 @@ Next: <a href="#first" accesskey="n" rel="next">first</a>
</p>
<hr>
-<a class="node-anchor" id="first"></a><div class="nav-header">
+<a class="node" id="first"></a><div class="nav-header">
<p>
Next: <a href="manual1.html#Top" accesskey="n" rel="next">(manual1)</a>,
Previous: <a href="manual2.html#Top" accesskey="p" rel="prev">(manual2)</a>,
Up: <a href="manual3.html#Top" accesskey="u" rel="up">(manual3)</a> </p>
</div>
diff --git a/tp/t/results/sectioning/nodes_after_top_before_chapter_nodes.pl
b/tp/t/results/sectioning/nodes_after_top_before_chapter_nodes.pl
index ea497c6caa..6cbe537636 100644
--- a/tp/t/results/sectioning/nodes_after_top_before_chapter_nodes.pl
+++ b/tp/t/results/sectioning/nodes_after_top_before_chapter_nodes.pl
@@ -1154,7 +1154,7 @@
$result_converted{'html'}->{'nodes_after_top_before_chapter_nodes'} = '<!DOCTYPE
</head>
<body lang="en">
-<a class="node-anchor" id="Top"></a><div class="nav-header">
+<a class="node" id="Top"></a><div class="nav-header">
<p>
Next: <a href="#second-node" accesskey="n" rel="next">second node</a>
</p>
</div>
@@ -1162,7 +1162,7 @@ Next: <a href="#second-node" accesskey="n"
rel="next">second node</a> </p
<p>Top node
</p>
<hr>
-<a class="node-anchor" id="second-node"></a><div class="nav-header">
+<a class="node" id="second-node"></a><div class="nav-header">
<p>
Next: <a href="#third-node" accesskey="n" rel="next">chapter</a>, Previous: <a
href="#Top" accesskey="p" rel="prev">Top</a>, Up: <a href="#Top" accesskey="u"
rel="up">Top</a> </p>
</div>
diff --git
a/tp/t/results/sectioning/nodes_after_top_before_chapter_not_split.pl
b/tp/t/results/sectioning/nodes_after_top_before_chapter_not_split.pl
index 1b4cc5d68c..1bad24accf 100644
--- a/tp/t/results/sectioning/nodes_after_top_before_chapter_not_split.pl
+++ b/tp/t/results/sectioning/nodes_after_top_before_chapter_not_split.pl
@@ -720,7 +720,7 @@
$result_converted{'html'}->{'nodes_after_top_before_chapter_not_split'} = '<!DOC
</head>
<body lang="en">
-<a class="node-anchor" id="Top"></a><div class="nav-header">
+<a class="node" id="Top"></a><div class="nav-header">
<p>
Next: <a href="#second-node" accesskey="n" rel="next">second node</a>
</p>
</div>
@@ -728,7 +728,7 @@ Next: <a href="#second-node" accesskey="n"
rel="next">second node</a> </p
<p>Top node
</p>
<hr>
-<a class="node-anchor" id="second-node"></a><div class="nav-header">
+<a class="node" id="second-node"></a><div class="nav-header">
<p>
Next: <a href="#third-node" accesskey="n" rel="next">chapter</a>, Previous: <a
href="#Top" accesskey="p" rel="prev">Top</a>, Up: <a href="#Top" accesskey="u"
rel="up">Top</a> </p>
</div>
diff --git
a/tp/t/results/sectioning/nodes_after_top_before_chapter_not_split_no_use_node_directions.pl
b/tp/t/results/sectioning/nodes_after_top_before_chapter_not_split_no_use_node_directions.pl
index 94c2eeaf53..ad6c06622d 100644
---
a/tp/t/results/sectioning/nodes_after_top_before_chapter_not_split_no_use_node_directions.pl
+++
b/tp/t/results/sectioning/nodes_after_top_before_chapter_not_split_no_use_node_directions.pl
@@ -720,7 +720,7 @@
$result_converted{'html'}->{'nodes_after_top_before_chapter_not_split_no_use_nod
</head>
<body lang="en">
-<a class="node-anchor" id="Top"></a><div class="nav-header">
+<a class="node" id="Top"></a><div class="nav-header">
<p>
</p>
</div>
@@ -728,7 +728,7 @@
$result_converted{'html'}->{'nodes_after_top_before_chapter_not_split_no_use_nod
<p>Top node
</p>
<hr>
-<a class="node-anchor" id="second-node"></a><div class="nav-header">
+<a class="node" id="second-node"></a><div class="nav-header">
<p>
</p>
</div>
diff --git a/tp/t/results/sectioning/nodes_after_top_before_chapter_sections.pl
b/tp/t/results/sectioning/nodes_after_top_before_chapter_sections.pl
index b405375782..61920a361b 100644
--- a/tp/t/results/sectioning/nodes_after_top_before_chapter_sections.pl
+++ b/tp/t/results/sectioning/nodes_after_top_before_chapter_sections.pl
@@ -866,7 +866,7 @@
$result_converted{'html'}->{'nodes_after_top_before_chapter_sections'} = '<!DOCT
</head>
<body lang="en">
-<a class="node-anchor" id="Top"></a><div class="nav-header">
+<a class="node" id="Top"></a><div class="nav-header">
<p>
Next: <a href="#second-node" accesskey="n" rel="next">second node</a>
</p>
</div>
@@ -874,7 +874,7 @@ Next: <a href="#second-node" accesskey="n"
rel="next">second node</a> </p
<p>Top node
</p>
<hr>
-<a class="node-anchor" id="second-node"></a><div class="nav-header">
+<a class="node" id="second-node"></a><div class="nav-header">
<p>
Next: <a href="#third-node" accesskey="n" rel="next">chapter</a>, Previous: <a
href="#Top" accesskey="p" rel="prev">Top</a>, Up: <a href="#Top" accesskey="u"
rel="up">Top</a> </p>
</div>
diff --git a/tp/t/results/sectioning/nodes_after_top_before_section_nodes.pl
b/tp/t/results/sectioning/nodes_after_top_before_section_nodes.pl
index bf2030555c..c110e87111 100644
--- a/tp/t/results/sectioning/nodes_after_top_before_section_nodes.pl
+++ b/tp/t/results/sectioning/nodes_after_top_before_section_nodes.pl
@@ -1159,7 +1159,7 @@
$result_converted{'html'}->{'nodes_after_top_before_section_nodes'} = '<!DOCTYPE
</head>
<body lang="en">
-<a class="node-anchor" id="Top"></a><div class="nav-header">
+<a class="node" id="Top"></a><div class="nav-header">
<p>
Next: <a href="#second-node" accesskey="n" rel="next">second node</a>
</p>
</div>
@@ -1167,7 +1167,7 @@ Next: <a href="#second-node" accesskey="n"
rel="next">second node</a> </p
<p>Top node
</p>
<hr>
-<a class="node-anchor" id="second-node"></a><div class="nav-header">
+<a class="node" id="second-node"></a><div class="nav-header">
<p>
Next: <a href="#third-node" accesskey="n" rel="next">subsection</a>, Previous:
<a href="#Top" accesskey="p" rel="prev">Top</a>, Up: <a href="#Top"
accesskey="u" rel="up">Top</a> </p>
</div>
diff --git a/tp/t/results/sectioning/nodes_after_top_before_section_sections.pl
b/tp/t/results/sectioning/nodes_after_top_before_section_sections.pl
index 4a4d499a2f..281d583a41 100644
--- a/tp/t/results/sectioning/nodes_after_top_before_section_sections.pl
+++ b/tp/t/results/sectioning/nodes_after_top_before_section_sections.pl
@@ -871,7 +871,7 @@
$result_converted{'html'}->{'nodes_after_top_before_section_sections'} = '<!DOCT
</head>
<body lang="en">
-<a class="node-anchor" id="Top"></a><div class="nav-header">
+<a class="node" id="Top"></a><div class="nav-header">
<p>
Next: <a href="#second-node" accesskey="n" rel="next">second node</a>
</p>
</div>
@@ -879,7 +879,7 @@ Next: <a href="#second-node" accesskey="n"
rel="next">second node</a> </p
<p>Top node
</p>
<hr>
-<a class="node-anchor" id="second-node"></a><div class="nav-header">
+<a class="node" id="second-node"></a><div class="nav-header">
<p>
Next: <a href="#third-node" accesskey="n" rel="next">subsection</a>, Previous:
<a href="#Top" accesskey="p" rel="prev">Top</a>, Up: <a href="#Top"
accesskey="u" rel="up">Top</a> </p>
</div>
diff --git a/tp/t/results/sectioning/nodes_no_node_top_explicit_directions.pl
b/tp/t/results/sectioning/nodes_no_node_top_explicit_directions.pl
index eb062f364a..d72db139cb 100644
--- a/tp/t/results/sectioning/nodes_no_node_top_explicit_directions.pl
+++ b/tp/t/results/sectioning/nodes_no_node_top_explicit_directions.pl
@@ -727,7 +727,7 @@
$result_converted{'html'}->{'nodes_no_node_top_explicit_directions'} = '<!DOCTYP
</head>
<body lang="en">
-<a class="node-anchor" id="first"></a><div class="nav-header">
+<a class="node" id="first"></a><div class="nav-header">
<p>
Up: <a href="dir.html#Top" accesskey="u" rel="up">(dir)</a> </p>
</div>
@@ -736,7 +736,7 @@ Up: <a href="dir.html#Top" accesskey="u" rel="up">(dir)</a>
</p>
</p>
<hr>
-<a class="node-anchor" id="second-node"></a><div class="nav-header">
+<a class="node" id="second-node"></a><div class="nav-header">
<p>
Previous: <a href="#first" accesskey="p" rel="prev">first</a>, Up: <a
href="#first" accesskey="u" rel="up">first</a> </p>
</div>
diff --git a/tp/t/results/sectioning/non_automatic_internal_top_node_up.pl
b/tp/t/results/sectioning/non_automatic_internal_top_node_up.pl
index 77383a0551..68ffcd2ea9 100644
--- a/tp/t/results/sectioning/non_automatic_internal_top_node_up.pl
+++ b/tp/t/results/sectioning/non_automatic_internal_top_node_up.pl
@@ -1056,7 +1056,7 @@ Next: <a href="#first" accesskey="n" rel="next">first</a>
</p>
<hr>
-<a class="node-anchor" id="first"></a><div class="nav-header">
+<a class="node" id="first"></a><div class="nav-header">
<p>
Previous: <a href="#Top" accesskey="p" rel="prev">internal top node up</a>
</p>
</div>
diff --git a/tp/t/results/sectioning/non_automatic_top_node_up_and_url.pl
b/tp/t/results/sectioning/non_automatic_top_node_up_and_url.pl
index ac5ee3a1cb..1e3738ee48 100644
--- a/tp/t/results/sectioning/non_automatic_top_node_up_and_url.pl
+++ b/tp/t/results/sectioning/non_automatic_top_node_up_and_url.pl
@@ -1057,7 +1057,7 @@ Next: <a href="#first" accesskey="n"
rel="next">first</a>, Up: <a href="http://w
<hr>
-<a class="node-anchor" id="first"></a><div class="nav-header">
+<a class="node" id="first"></a><div class="nav-header">
<p>
Previous: <a href="#Top" accesskey="p" rel="prev">internal top node up</a>
</p>
</div>
diff --git a/tp/t/results/sectioning/non_automatic_top_node_up_url.pl
b/tp/t/results/sectioning/non_automatic_top_node_up_url.pl
index 8f7f5b4b1d..07fd182c6b 100644
--- a/tp/t/results/sectioning/non_automatic_top_node_up_url.pl
+++ b/tp/t/results/sectioning/non_automatic_top_node_up_url.pl
@@ -968,7 +968,7 @@ Next: <a href="#first" accesskey="n" rel="next">first</a>,
Previous: <a href="di
<hr>
-<a class="node-anchor" id="first"></a><div class="nav-header">
+<a class="node" id="first"></a><div class="nav-header">
<p>
Previous: <a href="#Top" accesskey="p" rel="prev">internal top node up</a>,
Up: <a href="dir.html#Top" accesskey="u" rel="up">(dir)</a> </p>
</div>
diff --git a/tp/t/results/sectioning/part_node_after_top.pl
b/tp/t/results/sectioning/part_node_after_top.pl
index fc8c90c94b..f91afec3d2 100644
--- a/tp/t/results/sectioning/part_node_after_top.pl
+++ b/tp/t/results/sectioning/part_node_after_top.pl
@@ -788,7 +788,7 @@ Next: <a href="#part-node-after-top" accesskey="n"
rel="next">part node after to
<hr>
-<a class="node-anchor" id="part-node-after-top"></a><div class="nav-header">
+<a class="node" id="part-node-after-top"></a><div class="nav-header">
<p>
Previous: <a href="#Top" accesskey="p" rel="prev">top</a>, Up: <a href="#Top"
accesskey="u" rel="up">top</a> </p>
</div>
diff --git a/tp/t/results/sectioning/part_node_before_top.pl
b/tp/t/results/sectioning/part_node_before_top.pl
index d47af6333c..6c43835839 100644
--- a/tp/t/results/sectioning/part_node_before_top.pl
+++ b/tp/t/results/sectioning/part_node_before_top.pl
@@ -722,7 +722,7 @@ $result_converted{'html'}->{'part_node_before_top'} =
'<!DOCTYPE html>
</head>
<body lang="en">
-<a class="node-anchor" id="part-node-before-top"></a><div class="nav-header">
+<a class="node" id="part-node-before-top"></a><div class="nav-header">
<p>
Next: <a href="#Top" accesskey="n" rel="next">top</a>, Previous: <a
href="#Top" accesskey="p" rel="prev">top</a>, Up: <a href="#Top" accesskey="u"
rel="up">top</a> </p>
</div>
diff --git a/tp/t/results/sectioning/placed_things_before_element.pl
b/tp/t/results/sectioning/placed_things_before_element.pl
index e2f325e848..1be729ec87 100644
--- a/tp/t/results/sectioning/placed_things_before_element.pl
+++ b/tp/t/results/sectioning/placed_things_before_element.pl
@@ -1114,7 +1114,7 @@
$result_converted{'html'}->{'placed_things_before_element'} = '<!DOCTYPE html>
<a class="ref" href="#float-anchor">1</a>.
</p>
-<a class="index-entry-anchor" id="index-index-entry"></a>
+<a class="index-entry-id" id="index-index-entry"></a>
<div class="section" id="section">
<h3 class="section">1 section</h3>
diff --git a/tp/t/results/sectioning/placed_things_before_node.pl
b/tp/t/results/sectioning/placed_things_before_node.pl
index a3355879ff..39bfdae2d8 100644
--- a/tp/t/results/sectioning/placed_things_before_node.pl
+++ b/tp/t/results/sectioning/placed_things_before_node.pl
@@ -1177,7 +1177,7 @@ $result_converted{'html'}->{'placed_things_before_node'}
= '<!DOCTYPE html>
<a class="ref" href="#float-anchor">1</a>.
</p>
-<a class="index-entry-anchor" id="index-index-entry"></a>
+<a class="index-entry-id" id="index-index-entry"></a>
<div class="top" id="Top">
<h1 class="top" id="top-section">top section</h1>
diff --git a/tp/t/results/sectioning/protected_node_parentheses.pl
b/tp/t/results/sectioning/protected_node_parentheses.pl
index d9cc94ec19..0cbec01fa2 100644
--- a/tp/t/results/sectioning/protected_node_parentheses.pl
+++ b/tp/t/results/sectioning/protected_node_parentheses.pl
@@ -684,7 +684,7 @@ Next: <a href="#g_t_0028manual_0029-name" accesskey="n"
rel="next">(manual) name
<hr>
-<a class="node-anchor" id="g_t_0028manual_0029-name"></a><div
class="nav-header">
+<a class="node" id="g_t_0028manual_0029-name"></a><div class="nav-header">
<p>
Previous: <a href="#Top" accesskey="p" rel="prev">top</a>, Up: <a href="#Top"
accesskey="u" rel="up">top</a> </p>
</div>
diff --git a/tp/t/results/sectioning/section_before_after_top_node_last_node.pl
b/tp/t/results/sectioning/section_before_after_top_node_last_node.pl
index a0e259f032..5bc074985d 100644
--- a/tp/t/results/sectioning/section_before_after_top_node_last_node.pl
+++ b/tp/t/results/sectioning/section_before_after_top_node_last_node.pl
@@ -504,7 +504,7 @@ Next: <a href="#node-after" accesskey="n" rel="next">node
after</a> </p>
<p>in chapter
</p>
<hr>
-<a class="node-anchor" id="node-after"></a><div class="nav-header">
+<a class="node" id="node-after"></a><div class="nav-header">
<p>
Previous: <a href="#Top" accesskey="p" rel="prev">top section</a> </p>
</div>
diff --git a/tp/t/results/sectioning/space_in_node.pl
b/tp/t/results/sectioning/space_in_node.pl
index 2da207bbb5..ef80bfdf0b 100644
--- a/tp/t/results/sectioning/space_in_node.pl
+++ b/tp/t/results/sectioning/space_in_node.pl
@@ -729,7 +729,7 @@ $result_converted{'html'}->{'space_in_node'} = '<!DOCTYPE
html>
<body lang="en">
-<a class="node-anchor" id="Top"></a><div class="nav-header">
+<a class="node" id="Top"></a><div class="nav-header">
<p>
Next: <a href="#Chap-first-here" accesskey="n" rel="next">Chap first here</a>
</p>
</div>
@@ -737,21 +737,21 @@ Next: <a href="#Chap-first-here" accesskey="n"
rel="next">Chap first here</a> &
<hr>
-<a class="node-anchor" id="Chap-first-here"></a><div class="nav-header">
+<a class="node" id="Chap-first-here"></a><div class="nav-header">
<p>
Next: <a href="#Test-title" accesskey="n" rel="next">Test
title</a>, Previous: <a href="#Top" accesskey="p" rel="prev">Top</a>, Up: <a
href="#Top" accesskey="u" rel="up">Top</a> </p>
</div>
<h4 class="node-heading">Chap first here</h4>
<hr>
-<a class="node-anchor" id="Test-title"></a><div class="nav-header">
+<a class="node" id="Test-title"></a><div class="nav-header">
<p>
Next: <a href="#Last-with-spaces" accesskey="n" rel="next">Last with
spaces</a>, Previous: <a href="#Chap-first-here" accesskey="p" rel="prev">Chap
first here</a>, Up: <a href="#Top" accesskey="u" rel="up">Top</a> </p>
</div>
<h4 class="node-heading">Test title</h4>
<hr>
-<a class="node-anchor" id="Last-with-spaces"></a><div class="nav-header">
+<a class="node" id="Last-with-spaces"></a><div class="nav-header">
<p>
Previous: <a href="#Test-title" accesskey="p" rel="prev">Test
title</a>, Up: <a href="#Top" accesskey="u" rel="up">Top</a> </p>
</div>
diff --git a/tp/t/results/sectioning/top_no_argument_and_node.pl
b/tp/t/results/sectioning/top_no_argument_and_node.pl
index c6b372def5..ff818fe691 100644
--- a/tp/t/results/sectioning/top_no_argument_and_node.pl
+++ b/tp/t/results/sectioning/top_no_argument_and_node.pl
@@ -197,7 +197,7 @@ $result_converted{'html'}->{'top_no_argument_and_node'} =
'<!DOCTYPE html>
<body lang="en">
<div class="top" id="start">
-<a class="top-anchor" id="SEC_Top"></a></div>
+<a class="top" id="SEC_Top"></a></div>
diff --git a/tp/t/results/sectioning/top_no_argument_and_top_node.pl
b/tp/t/results/sectioning/top_no_argument_and_top_node.pl
index e914ac0483..71706e948a 100644
--- a/tp/t/results/sectioning/top_no_argument_and_top_node.pl
+++ b/tp/t/results/sectioning/top_no_argument_and_top_node.pl
@@ -187,7 +187,7 @@ $result_converted{'html'}->{'top_no_argument_and_top_node'}
= '<!DOCTYPE html>
<body lang="en">
<div class="top" id="Top">
-<a class="top-anchor" id="SEC_Top"></a></div>
+<a class="top" id="SEC_Top"></a></div>
diff --git a/tp/t/results/sectioning/top_node_no_menu_direction.pl
b/tp/t/results/sectioning/top_node_no_menu_direction.pl
index 164bb5aee0..e939486982 100644
--- a/tp/t/results/sectioning/top_node_no_menu_direction.pl
+++ b/tp/t/results/sectioning/top_node_no_menu_direction.pl
@@ -526,7 +526,7 @@ $result_converted{'html'}->{'top_node_no_menu_direction'} =
'<!DOCTYPE html>
</head>
<body lang="en">
-<a class="node-anchor" id="Top"></a><div class="nav-header">
+<a class="node" id="Top"></a><div class="nav-header">
<p>
Next: <a href="#second-node" accesskey="n" rel="next">second node</a>
</p>
</div>
@@ -534,7 +534,7 @@ Next: <a href="#second-node" accesskey="n"
rel="next">second node</a> </p
<hr>
-<a class="node-anchor" id="second-node"></a><div class="nav-header">
+<a class="node" id="second-node"></a><div class="nav-header">
<p>
Previous: <a href="#Top" accesskey="p" rel="prev">Top</a>, Up: <a href="#Top"
accesskey="u" rel="up">Top</a> </p>
</div>
diff --git a/tp/t/results/sectioning/top_node_up_url.pl
b/tp/t/results/sectioning/top_node_up_url.pl
index 6688191bec..f96684e2bb 100644
--- a/tp/t/results/sectioning/top_node_up_url.pl
+++ b/tp/t/results/sectioning/top_node_up_url.pl
@@ -712,7 +712,7 @@ Next: <a href="#first" accesskey="n" rel="next">first</a>,
Up: <a href="http://w
<hr>
-<a class="node-anchor" id="first"></a><div class="nav-header">
+<a class="node" id="first"></a><div class="nav-header">
<p>
Previous: <a href="#Top" accesskey="p" rel="prev">internal top node up</a>,
Up: <a href="#Top" accesskey="u" rel="up">internal top node up</a> </p>
</div>
diff --git
a/tp/t/results/sectioning/transliterated_split_equivalent_nodes/res_html/a.html
b/tp/t/results/sectioning/transliterated_split_equivalent_nodes/res_html/a.html
index d76f368ea5..3aa73e01e2 100644
---
a/tp/t/results/sectioning/transliterated_split_equivalent_nodes/res_html/a.html
+++
b/tp/t/results/sectioning/transliterated_split_equivalent_nodes/res_html/a.html
@@ -24,7 +24,7 @@
</head>
<body lang="en">
-<a class="node-anchor" id="g_t_00e3"></a><div class="nav-header">
+<a class="node" id="g_t_00e3"></a><div class="nav-header">
<p>
Next: <a href="n.html" accesskey="n" rel="next">n</a>, Previous: <a
href="index.html" accesskey="p" rel="prev">Top</a>, Up: <a href="index.html"
accesskey="u" rel="up">Top</a> </p>
</div>
@@ -32,7 +32,7 @@ Next: <a href="n.html" accesskey="n" rel="next">n</a>,
Previous: <a href="index.
<h4 class="node-heading">ã</h4>
<hr>
-<a class="node-anchor" id="g_t_00e2"></a><div class="nav-header">
+<a class="node" id="g_t_00e2"></a><div class="nav-header">
<p>
Previous: <a href="n.html" accesskey="p" rel="prev">n</a>, Up: <a
href="index.html" accesskey="u" rel="up">Top</a> </p>
</div>
diff --git
a/tp/t/results/sectioning/transliterated_split_equivalent_nodes/res_html/index.html
b/tp/t/results/sectioning/transliterated_split_equivalent_nodes/res_html/index.html
index edb303bbff..26cd605fec 100644
---
a/tp/t/results/sectioning/transliterated_split_equivalent_nodes/res_html/index.html
+++
b/tp/t/results/sectioning/transliterated_split_equivalent_nodes/res_html/index.html
@@ -22,7 +22,7 @@
</head>
<body lang="en">
-<a class="node-anchor" id="Top"></a><div class="nav-header">
+<a class="node" id="Top"></a><div class="nav-header">
<p>
Next: <a href="a.html#g_t_00e3" accesskey="n" rel="next">ã</a>
</p>
</div>
diff --git
a/tp/t/results/sectioning/transliterated_split_equivalent_nodes/res_html/n.html
b/tp/t/results/sectioning/transliterated_split_equivalent_nodes/res_html/n.html
index 0e83667fb6..a502c5acc7 100644
---
a/tp/t/results/sectioning/transliterated_split_equivalent_nodes/res_html/n.html
+++
b/tp/t/results/sectioning/transliterated_split_equivalent_nodes/res_html/n.html
@@ -24,7 +24,7 @@
</head>
<body lang="en">
-<a class="node-anchor" id="n"></a><div class="nav-header">
+<a class="node" id="n"></a><div class="nav-header">
<p>
Next: <a href="a.html#g_t_00e2" accesskey="n" rel="next">â</a>,
Previous: <a href="a.html#g_t_00e3" accesskey="p" rel="prev">ã</a>, Up:
<a href="index.html" accesskey="u" rel="up">Top</a> </p>
</div>
diff --git a/tp/t/results/sectioning/two_nodes_at_the_end.pl
b/tp/t/results/sectioning/two_nodes_at_the_end.pl
index 37d06cca4f..9f8cb5ce0c 100644
--- a/tp/t/results/sectioning/two_nodes_at_the_end.pl
+++ b/tp/t/results/sectioning/two_nodes_at_the_end.pl
@@ -1222,7 +1222,7 @@ Next: <a href="#node-after-chapter-1" accesskey="n"
rel="next">node after chapte
<h2 class="chapter" id="chapter-c1">1 chapter c1</h2>
<hr>
-<a class="node-anchor" id="node-after-chapter-1"></a><div class="nav-header">
+<a class="node" id="node-after-chapter-1"></a><div class="nav-header">
<p>
Next: <a href="#node-after-chapter-2" accesskey="n" rel="next">node after
chapter 2</a>, Previous: <a href="#chapter-1" accesskey="p" rel="prev">chapter
c1</a>, Up: <a href="#Top" accesskey="u" rel="up">top</a> </p>
</div>
@@ -1231,7 +1231,7 @@ Next: <a href="#node-after-chapter-2" accesskey="n"
rel="next">node after chapte
<p>in node after chapter 1
</p>
<hr>
-<a class="node-anchor" id="node-after-chapter-2"></a><div class="nav-header">
+<a class="node" id="node-after-chapter-2"></a><div class="nav-header">
<p>
Previous: <a href="#node-after-chapter-1" accesskey="p" rel="prev">node after
chapter 1</a>, Up: <a href="#Top" accesskey="u" rel="up">top</a> </p>
</div>
diff --git a/tp/t/results/sectioning/two_nodes_between_chapters.pl
b/tp/t/results/sectioning/two_nodes_between_chapters.pl
index 4e1dccf79e..42ea265997 100644
--- a/tp/t/results/sectioning/two_nodes_between_chapters.pl
+++ b/tp/t/results/sectioning/two_nodes_between_chapters.pl
@@ -1467,7 +1467,7 @@ Next: <a href="#Top" accesskey="n" rel="next">top</a>,
Previous: <a href="#node-
<h2 class="chapter" id="chapter-c1">1 chapter c1</h2>
<hr>
-<a class="node-anchor" id="node-between-chapters"></a><div class="nav-header">
+<a class="node" id="node-between-chapters"></a><div class="nav-header">
<p>
Next: <a href="#chapter-2" accesskey="n" rel="next">chapter c2</a>, Previous:
<a href="#chapter-1" accesskey="p" rel="prev">chapter c1</a>, Up: <a
href="#Top" accesskey="u" rel="up">top</a> </p>
</div>
diff --git a/tp/t/results/xtable/block_commands_in_table.pl
b/tp/t/results/xtable/block_commands_in_table.pl
index 8bce69e9cd..ba85d35833 100644
--- a/tp/t/results/xtable/block_commands_in_table.pl
+++ b/tp/t/results/xtable/block_commands_in_table.pl
@@ -1769,7 +1769,7 @@ end example.
<dl class="vtable">
<dt id=\'index-item-before-ignored-lines\'><span><strong class="strong">item
before ignored lines</strong><a class="copiable-anchor"
href=\'#index-item-before-ignored-lines\'> ¶</a></span></dt>
-<dd><a class="index-entry-anchor" id="index-vindex"></a>
+<dd><a class="index-entry-id" id="index-vindex"></a>
</dd>
<dt id=\'index-itemx-now\'><span><strong class="strong">itemx now</strong><a
class="copiable-anchor" href=\'#index-itemx-now\'> ¶</a></span></dt>
<dd>
diff --git a/tp/t/results/xtable/inter_item_commands_in_table.pl
b/tp/t/results/xtable/inter_item_commands_in_table.pl
index 1291ec3ea4..c1230e95a9 100644
--- a/tp/t/results/xtable/inter_item_commands_in_table.pl
+++ b/tp/t/results/xtable/inter_item_commands_in_table.pl
@@ -3232,7 +3232,7 @@
$result_converted{'html_text'}->{'inter_item_commands_in_table'} = '
<dl class="ftable">
<dt id=\'index-avar_002d_002db\'><span><var class="var">avar–b</var><a
class="copiable-anchor" href=\'#index-avar_002d_002db\'> ¶</a></span></dt>
-<dd><a class="index-entry-anchor"
id="index-index-entry-between-item-and-itemx"></a>
+<dd><a class="index-entry-id"
id="index-index-entry-between-item-and-itemx"></a>
</dd>
<dt id=\'index-b\'><span><var class="var">b</var><a class="copiable-anchor"
href=\'#index-b\'> ¶</a></span></dt>
<dd><p>l–ine
@@ -3242,7 +3242,7 @@
$result_converted{'html_text'}->{'inter_item_commands_in_table'} = '
</dl>
<dl class="table">
-<dd><a class="index-entry-anchor" id="index-cindex-in-table"></a>
+<dd><a class="index-entry-id" id="index-cindex-in-table"></a>
</dd>
<dt><code class="code">abb</code></dt>
<dd><p>l–ine
@@ -3250,14 +3250,14 @@
$result_converted{'html_text'}->{'inter_item_commands_in_table'} = '
</dl>
<dl class="table">
-<dd><a class="index-entry-anchor" id="index-cindex-in-table-1"></a>
+<dd><a class="index-entry-id" id="index-cindex-in-table-1"></a>
<p>Texte before first item.
</p></dd>
<dt><code class="code">abb</code></dt>
</dl>
<dl class="table">
-<dd><a class="index-entry-anchor" id="index-samp-cindex-in-table"></a>
+<dd><a class="index-entry-id" id="index-samp-cindex-in-table"></a>
</dd>
<dt>‘<samp class="samp">asamp--bb</samp>’</dt>
<dd><p>l–ine samp
@@ -3265,7 +3265,7 @@
$result_converted{'html_text'}->{'inter_item_commands_in_table'} = '
</dl>
<dl class="table">
-<dd><a class="index-entry-anchor" id="index-samp-cindex-in-table-1"></a>
+<dd><a class="index-entry-id" id="index-samp-cindex-in-table-1"></a>
<p>Texte before first item samp.
</p></dd>
<dt>‘<samp class="samp">asamp--bb</samp>’</dt>
@@ -3273,14 +3273,14 @@
$result_converted{'html_text'}->{'inter_item_commands_in_table'} = '
<dl class="table">
<dd>
-<a class="index-entry-anchor" id="index-cindex-between-lines"></a>
+<a class="index-entry-id" id="index-cindex-between-lines"></a>
</dd>
<dt>‘<samp class="samp">asamp--bb1</samp>’</dt>
</dl>
<dl class="table">
-<dd><a class="index-entry-anchor" id="index-cindex-before-line"></a>
+<dd><a class="index-entry-id" id="index-cindex-before-line"></a>
</dd>
<dt>‘<samp class="samp">asamp--bb2</samp>’</dt>
@@ -3288,15 +3288,15 @@
$result_converted{'html_text'}->{'inter_item_commands_in_table'} = '
<dl class="table">
<dd>
-<a class="index-entry-anchor" id="index-cindex-after-line"></a>
+<a class="index-entry-id" id="index-cindex-after-line"></a>
</dd>
<dt>‘<samp class="samp">asamp--bb2</samp>’</dt>
</dl>
<dl class="table">
-<dd><a class="index-entry-anchor" id="index-cindex-first"></a>
-<a class="index-entry-anchor" id="index-second"></a>
-<a class="index-entry-anchor" id="index-third"></a>
+<dd><a class="index-entry-id" id="index-cindex-first"></a>
+<a class="index-entry-id" id="index-second"></a>
+<a class="index-entry-id" id="index-third"></a>
</dd>
<dt>‘<samp class="samp">asamp--bb2</samp>’</dt>
</dl>
diff --git a/tp/t/results/xtable/inter_item_commands_in_table_in_example.pl
b/tp/t/results/xtable/inter_item_commands_in_table_in_example.pl
index f56aecb404..1ddfe12531 100644
--- a/tp/t/results/xtable/inter_item_commands_in_table_in_example.pl
+++ b/tp/t/results/xtable/inter_item_commands_in_table_in_example.pl
@@ -558,7 +558,7 @@
$result_converted{'html_text'}->{'inter_item_commands_in_table_in_example'} = '
<div class="example">
<dl class="table">
<dt><tt><var class="var">a--b</var></tt></dt>
-<dd><pre class="example-preformatted"><a class="index-entry-anchor"
id="index-index-entry-between-item-and-itemx"></a></pre></dd>
+<dd><pre class="example-preformatted"><a class="index-entry-id"
id="index-index-entry-between-item-and-itemx"></a></pre></dd>
<dt><tt><var class="var">b</var></tt></dt>
<dd><pre class="example-preformatted">
diff --git a/tp/t/test_utils.pl b/tp/t/test_utils.pl
index b684cc90a4..0b65e005ee 100644
--- a/tp/t/test_utils.pl
+++ b/tp/t/test_utils.pl
@@ -795,7 +795,7 @@ sub test($$)
delete $parser_options->{'test_file'};
}
my $full_document;
- if ($parser_options->{'full_document'}) {
+ if (exists($parser_options->{'full_document'})) {
$full_document = $parser_options->{'full_document'};
delete $parser_options->{'full_document'};
}
diff --git
a/tp/tests/indices/res_parser/index_and_node_same_name/index_and_node_same_name.html
b/tp/tests/indices/res_parser/index_and_node_same_name/index_and_node_same_name.html
index e32087425f..a8f22698b6 100644
---
a/tp/tests/indices/res_parser/index_and_node_same_name/index_and_node_same_name.html
+++
b/tp/tests/indices/res_parser/index_and_node_same_name/index_and_node_same_name.html
@@ -37,7 +37,7 @@ span.program-in-footer {font-size: smaller}
<p>Text.
</p>
-<a class="index-entry-anchor" id="index-node-2"></a>
+<a class="index-entry-id" id="index-node-2"></a>
<table class="menu" border="0" cellspacing="0">
<tr><td align="left" valign="top"><a href="#index-node" rel="index">1 index
node</a></td><td> </td><td align="left" valign="top">
diff --git
a/tp/tests/indices/res_parser/index_entry_in_footnote/index_entry_in_footnote.html
b/tp/tests/indices/res_parser/index_entry_in_footnote/index_entry_in_footnote.html
index a42c210a1d..4c8f7373ad 100644
---
a/tp/tests/indices/res_parser/index_entry_in_footnote/index_entry_in_footnote.html
+++
b/tp/tests/indices/res_parser/index_entry_in_footnote/index_entry_in_footnote.html
@@ -93,7 +93,7 @@ span.program-in-footer {font-size: smaller}
<p>in footnote
</p>
<p>Another para in footnote.
-<a class="index-entry-anchor" id="index-index-entry-in-footnote"></a>
+<a class="index-entry-id" id="index-index-entry-in-footnote"></a>
</p>
</div><hr>
<div class="element-about" id="SEC_About">
diff --git
a/tp/tests/indices/res_parser/index_no_node_no_top/index_no_node_no_top.html
b/tp/tests/indices/res_parser/index_no_node_no_top/index_no_node_no_top.html
index 55e4e56114..58f9358a18 100644
--- a/tp/tests/indices/res_parser/index_no_node_no_top/index_no_node_no_top.html
+++ b/tp/tests/indices/res_parser/index_no_node_no_top/index_no_node_no_top.html
@@ -24,7 +24,7 @@ span.program-in-footer {font-size: smaller}
<body lang="en">
-<a class="index-entry-anchor" id="index-truc"></a>
+<a class="index-entry-id" id="index-truc"></a>
<p>Garbage
</p><div class="printindex cp-printindex">
<table class="cp-letters-header-printindex"><tr><th valign="top">Jump to:
</th><td><a class="summary-letter-printindex"
href="#unnumbered_cp_letter-C"><b>C</b></a>
@@ -92,9 +92,9 @@ span.program-in-footer {font-size: smaller}
</tr></table>
<h1 class="unnumbered">unnumbered</h1>
-<a class="index-entry-anchor" id="index-unnumbered"></a>
+<a class="index-entry-id" id="index-unnumbered"></a>
<p>in unnumbered
-<a class="index-entry-anchor" id="index-unnumbered-after-text"></a>
+<a class="index-entry-id" id="index-unnumbered-after-text"></a>
</p>
<div class="printindex cp-printindex">
<table class="cp-letters-header-printindex"><tr><th valign="top">Jump to:
</th><td><a class="summary-letter-printindex"
href="#unnumbered_cp_letter-C"><b>C</b></a>
@@ -163,12 +163,12 @@ span.program-in-footer {font-size: smaller}
</tr></table>
<h1 class="unnumbered">top (chapter) section</h1>
-<a class="index-entry-anchor" id="index-top-section"></a>
-<a class="index-entry-anchor" id="index-top-section-1"></a>
-<a class="index-entry-anchor" id="index-top-section-2"></a>
-<a class="index-entry-anchor" id="index-top-section-3"></a>
-<a class="index-entry-anchor" id="index-top-section-4"></a>
-<a class="index-entry-anchor" id="index-top-section-5"></a>
+<a class="index-entry-id" id="index-top-section"></a>
+<a class="index-entry-id" id="index-top-section-1"></a>
+<a class="index-entry-id" id="index-top-section-2"></a>
+<a class="index-entry-id" id="index-top-section-3"></a>
+<a class="index-entry-id" id="index-top-section-4"></a>
+<a class="index-entry-id" id="index-top-section-5"></a>
<p>Top node
</p>
<div class="printindex cp-printindex">
@@ -218,7 +218,7 @@ span.program-in-footer {font-size: smaller}
</td></tr></table>
</div>
-<a class="index-entry-anchor" id="index-top-section1"></a>
+<a class="index-entry-id" id="index-top-section1"></a>
<hr>
@@ -286,9 +286,9 @@ span.program-in-footer {font-size: smaller}
</td></tr></table>
</div>
-<a class="index-entry-anchor" id="index-second"></a>
+<a class="index-entry-id" id="index-second"></a>
<p>second node
-<a class="index-entry-anchor" id="index-second-1"></a>
+<a class="index-entry-id" id="index-second-1"></a>
</p>
<div class="printindex cp-printindex">
<table class="cp-letters-header-printindex"><tr><th valign="top">Jump to:
</th><td><a class="summary-letter-printindex"
href="#second_cp_letter-C"><b>C</b></a>
@@ -356,7 +356,7 @@ span.program-in-footer {font-size: smaller}
<td valign="middle" align="left">[<a href="#SEC_About" title="About (help)"> ?
</a>]</td>
</tr></table>
<h1 class="chapter">1 Chapter</h1>
-<a class="index-entry-anchor" id="index-chapter"></a>
+<a class="index-entry-id" id="index-chapter"></a>
<div class="printindex cp-printindex">
<table class="cp-letters-header-printindex"><tr><th valign="top">Jump to:
</th><td><a class="summary-letter-printindex"
href="#Chapter_cp_letter-C"><b>C</b></a>
@@ -405,7 +405,7 @@ span.program-in-footer {font-size: smaller}
</td></tr></table>
</div>
<p>Text of chapter
-<a class="index-entry-anchor" id="index-Chapter2"></a>
+<a class="index-entry-id" id="index-Chapter2"></a>
</p>
<hr>
</div>
diff --git a/tp/tests/indices/res_parser/index_nodes/index_nodes.html
b/tp/tests/indices/res_parser/index_nodes/index_nodes.html
index ebad4798c9..25eb923f13 100644
--- a/tp/tests/indices/res_parser/index_nodes/index_nodes.html
+++ b/tp/tests/indices/res_parser/index_nodes/index_nodes.html
@@ -24,7 +24,7 @@ span.program-in-footer {font-size: smaller}
<body lang="en">
-<a class="node-anchor" id="Top"></a><a class="index-entry-anchor"
id="index-entry-a"></a>
+<a class="node" id="Top"></a><a class="index-entry-id" id="index-entry-a"></a>
<div class="printindex cp-printindex">
<table class="cp-letters-header-printindex"><tr><th valign="top">Jump to:
</th><td><a class="summary-letter-printindex"
href="#t_h_cp_symbol-1"><b>!</b></a>
@@ -149,11 +149,11 @@ span.program-in-footer {font-size: smaller}
</td></tr>
</table>
-<a class="node-anchor" id="first"></a><p>Text and then index entries
-<a class="index-entry-anchor" id="index-entry-in-node"></a>
-<a class="index-entry-anchor" id="index-_0021-entry-in-node"></a>
-<a class="index-entry-anchor" id="index-fun-in-node"></a>
-<a class="index-entry-anchor" id="index-entry-in-node-1"></a>
+<a class="node" id="first"></a><p>Text and then index entries
+<a class="index-entry-id" id="index-entry-in-node"></a>
+<a class="index-entry-id" id="index-_0021-entry-in-node"></a>
+<a class="index-entry-id" id="index-fun-in-node"></a>
+<a class="index-entry-id" id="index-entry-in-node-1"></a>
</p>
<div class="printindex cp-printindex">
<table class="cp-letters-header-printindex"><tr><th valign="top">Jump to:
</th><td><a class="summary-letter-printindex"
href="#t_h_cp_symbol-1"><b>!</b></a>
@@ -203,7 +203,7 @@ span.program-in-footer {font-size: smaller}
</td></tr>
</table>
-<a class="node-anchor" id="second"></a><table class="menu" border="0"
cellspacing="0">
+<a class="node" id="second"></a><table class="menu" border="0" cellspacing="0">
<tr><td align="left" valign="top">• <a href="#a-node" rel="index">a
node</a></td><td> </td><td align="left" valign="top">
</td></tr>
<tr><td align="left" valign="top">• <a
href="#another">another</a></td><td> </td><td align="left"
valign="top">
@@ -240,12 +240,12 @@ span.program-in-footer {font-size: smaller}
</td></tr></table>
</div>
-<a class="node-anchor" id="another"></a>
-<a class="index-entry-anchor" id="index-something"></a>
-<a class="index-entry-anchor" id="index-somewhere"></a>
-<a class="index-entry-anchor" id="index-another"></a>
+<a class="node" id="another"></a>
+<a class="index-entry-id" id="index-something"></a>
+<a class="index-entry-id" id="index-somewhere"></a>
+<a class="index-entry-id" id="index-another"></a>
-<a class="node-anchor" id="a-node"></a><a class="index-entry-anchor"
id="index-entry-after-printindex"></a>
+<a class="node" id="a-node"></a><a class="index-entry-id"
id="index-entry-after-printindex"></a>
<div class="printindex cp-printindex">
<table class="cp-letters-header-printindex"><tr><th valign="top">Jump to:
</th><td><a class="summary-letter-printindex"
href="#t_h_cp_symbol-1"><b>!</b></a>
@@ -290,8 +290,8 @@ span.program-in-footer {font-size: smaller}
</td></tr></table>
</div>
-<a class="index-entry-anchor" id="index-a-function"></a>
-<a class="index-entry-anchor" id="index-a-concept-a-node"></a>
+<a class="index-entry-id" id="index-a-function"></a>
+<a class="index-entry-id" id="index-a-concept-a-node"></a>
<div class="printindex cp-printindex">
<table class="cp-letters-header-printindex"><tr><th valign="top">Jump to:
</th><td><a class="summary-letter-printindex"
href="#t_h_cp_symbol-1"><b>!</b></a>
diff --git a/tp/tests/indices/res_parser/index_nodes_nodes/a-node.html
b/tp/tests/indices/res_parser/index_nodes_nodes/a-node.html
index 593a063a17..8f82b9590b 100644
--- a/tp/tests/indices/res_parser/index_nodes_nodes/a-node.html
+++ b/tp/tests/indices/res_parser/index_nodes_nodes/a-node.html
@@ -23,7 +23,7 @@ span.program-in-footer {font-size: smaller}
</head>
<body lang="en">
-<a class="node-anchor" id="a-node"></a><table class="nav-header"
cellpadding="1" cellspacing="1" border="0">
+<a class="node" id="a-node"></a><table class="nav-header" cellpadding="1"
cellspacing="1" border="0">
<tr><td valign="middle" align="left">[ << ]</td>
<td valign="middle" align="left">[<a href="another.html" title="Previous
section in reading order"> < </a>]</td>
<td valign="middle" align="left">[<a href="second.html" title="Up section"> Up
</a>]</td>
@@ -40,7 +40,7 @@ span.program-in-footer {font-size: smaller}
</tr></table>
<hr>
<h3 class="node-heading">a node</h3>
-<a class="index-entry-anchor" id="index-entry-after-printindex"></a>
+<a class="index-entry-id" id="index-entry-after-printindex"></a>
<div class="printindex cp-printindex">
<table class="cp-letters-header-printindex"><tr><th valign="top">Jump to:
</th><td><a class="summary-letter-printindex"
href="#a-node_cp_symbol-1"><b>!</b></a>
@@ -85,8 +85,8 @@ span.program-in-footer {font-size: smaller}
</td></tr></table>
</div>
-<a class="index-entry-anchor" id="index-a-function"></a>
-<a class="index-entry-anchor" id="index-a-concept-a-node"></a>
+<a class="index-entry-id" id="index-a-function"></a>
+<a class="index-entry-id" id="index-a-concept-a-node"></a>
<div class="printindex cp-printindex">
<table class="cp-letters-header-printindex"><tr><th valign="top">Jump to:
</th><td><a class="summary-letter-printindex"
href="#a-node_cp_symbol-1"><b>!</b></a>
diff --git a/tp/tests/indices/res_parser/index_nodes_nodes/another.html
b/tp/tests/indices/res_parser/index_nodes_nodes/another.html
index a30cd377f5..8578e17411 100644
--- a/tp/tests/indices/res_parser/index_nodes_nodes/another.html
+++ b/tp/tests/indices/res_parser/index_nodes_nodes/another.html
@@ -22,7 +22,7 @@ span.program-in-footer {font-size: smaller}
</head>
<body lang="en">
-<a class="node-anchor" id="another"></a><table class="nav-header"
cellpadding="1" cellspacing="1" border="0">
+<a class="node" id="another"></a><table class="nav-header" cellpadding="1"
cellspacing="1" border="0">
<tr><td valign="middle" align="left">[ << ]</td>
<td valign="middle" align="left">[<a href="second.html" title="Previous
section in reading order"> < </a>]</td>
<td valign="middle" align="left">[<a href="second.html" title="Up section"> Up
</a>]</td>
@@ -40,9 +40,9 @@ span.program-in-footer {font-size: smaller}
<hr>
<h3 class="node-heading">another</h3>
-<a class="index-entry-anchor" id="index-something"></a>
-<a class="index-entry-anchor" id="index-somewhere"></a>
-<a class="index-entry-anchor" id="index-another"></a>
+<a class="index-entry-id" id="index-something"></a>
+<a class="index-entry-id" id="index-somewhere"></a>
+<a class="index-entry-id" id="index-another"></a>
<hr>
<p>
diff --git a/tp/tests/indices/res_parser/index_nodes_nodes/first.html
b/tp/tests/indices/res_parser/index_nodes_nodes/first.html
index 42ae50f1ae..edf1578235 100644
--- a/tp/tests/indices/res_parser/index_nodes_nodes/first.html
+++ b/tp/tests/indices/res_parser/index_nodes_nodes/first.html
@@ -23,7 +23,7 @@ span.program-in-footer {font-size: smaller}
</head>
<body lang="en">
-<a class="node-anchor" id="first"></a><table class="nav-header"
cellpadding="1" cellspacing="1" border="0">
+<a class="node" id="first"></a><table class="nav-header" cellpadding="1"
cellspacing="1" border="0">
<tr><td valign="middle" align="left">[ << ]</td>
<td valign="middle" align="left">[<a href="index.html" title="Previous section
in reading order"> < </a>]</td>
<td valign="middle" align="left">[<a href="index.html" title="Up section"> Up
</a>]</td>
@@ -41,10 +41,10 @@ span.program-in-footer {font-size: smaller}
<hr>
<h3 class="node-heading">first</h3>
<p>Text and then index entries
-<a class="index-entry-anchor" id="index-entry-in-node"></a>
-<a class="index-entry-anchor" id="index-_0021-entry-in-node"></a>
-<a class="index-entry-anchor" id="index-fun-in-node"></a>
-<a class="index-entry-anchor" id="index-entry-in-node-1"></a>
+<a class="index-entry-id" id="index-entry-in-node"></a>
+<a class="index-entry-id" id="index-_0021-entry-in-node"></a>
+<a class="index-entry-id" id="index-fun-in-node"></a>
+<a class="index-entry-id" id="index-entry-in-node-1"></a>
</p>
<div class="printindex cp-printindex">
<table class="cp-letters-header-printindex"><tr><th valign="top">Jump to:
</th><td><a class="summary-letter-printindex"
href="#first_cp_symbol-1"><b>!</b></a>
diff --git a/tp/tests/indices/res_parser/index_nodes_nodes/index.html
b/tp/tests/indices/res_parser/index_nodes_nodes/index.html
index c8a7f7eb22..b18c599cf5 100644
--- a/tp/tests/indices/res_parser/index_nodes_nodes/index.html
+++ b/tp/tests/indices/res_parser/index_nodes_nodes/index.html
@@ -24,7 +24,7 @@ span.program-in-footer {font-size: smaller}
<body lang="en">
-<a class="node-anchor" id="Top"></a><table class="nav-header" cellpadding="1"
cellspacing="1" border="0">
+<a class="node" id="Top"></a><table class="nav-header" cellpadding="1"
cellspacing="1" border="0">
<tr><td valign="middle" align="left">[ < ]</td>
<td valign="middle" align="left">[<a href="first.html" title="Next section in
reading order"> > </a>]</td>
<td valign="middle" align="left"> </td>
@@ -34,7 +34,7 @@ span.program-in-footer {font-size: smaller}
</tr></table>
<hr>
<h1 class="node-heading">Top</h1>
-<a class="index-entry-anchor" id="index-entry-a"></a>
+<a class="index-entry-id" id="index-entry-a"></a>
<div class="printindex cp-printindex">
<table class="cp-letters-header-printindex"><tr><th valign="top">Jump to:
</th><td><a class="summary-letter-printindex"
href="#Top_cp_symbol-1"><b>!</b></a>
diff --git a/tp/tests/indices/res_parser/index_nodes_nodes/second.html
b/tp/tests/indices/res_parser/index_nodes_nodes/second.html
index 8177ca70d5..eafaad9632 100644
--- a/tp/tests/indices/res_parser/index_nodes_nodes/second.html
+++ b/tp/tests/indices/res_parser/index_nodes_nodes/second.html
@@ -23,7 +23,7 @@ span.program-in-footer {font-size: smaller}
</head>
<body lang="en">
-<a class="node-anchor" id="second"></a><table class="nav-header"
cellpadding="1" cellspacing="1" border="0">
+<a class="node" id="second"></a><table class="nav-header" cellpadding="1"
cellspacing="1" border="0">
<tr><td valign="middle" align="left">[ << ]</td>
<td valign="middle" align="left">[<a href="first.html" title="Previous section
in reading order"> < </a>]</td>
<td valign="middle" align="left">[<a href="first.html" title="Up section"> Up
</a>]</td>
diff --git a/tp/tests/indices/res_parser/index_one_node/index_one_node.html
b/tp/tests/indices/res_parser/index_one_node/index_one_node.html
index 87e9754ced..d3353f9704 100644
--- a/tp/tests/indices/res_parser/index_one_node/index_one_node.html
+++ b/tp/tests/indices/res_parser/index_one_node/index_one_node.html
@@ -25,10 +25,10 @@ span.program-in-footer {font-size: smaller}
<body lang="en">
<p>Garbage
-<a class="index-entry-anchor" id="index-before-nodes"></a>
+<a class="index-entry-id" id="index-before-nodes"></a>
</p>
-<a class="node-anchor" id="one-node"></a><p>Top node
-<a class="index-entry-anchor" id="index-Top-node"></a>
+<a class="node" id="one-node"></a><p>Top node
+<a class="index-entry-id" id="index-Top-node"></a>
</p>
<p>anchor ref <a class="anchor" id="ref"></a>.
</p>
diff --git a/tp/tests/indices/res_parser/index_special_region/Chapter.html
b/tp/tests/indices/res_parser/index_special_region/Chapter.html
index 9431285cfa..10cadc88c4 100644
--- a/tp/tests/indices/res_parser/index_special_region/Chapter.html
+++ b/tp/tests/indices/res_parser/index_special_region/Chapter.html
@@ -50,7 +50,7 @@ span:hover a.copiable-anchor {visibility: visible}
<h1 class="chapter">1 Chapter</h1>
-<a class="index-entry-anchor" id="index-copying-Copying-this-document"></a>
+<a class="index-entry-id" id="index-copying-Copying-this-document"></a>
<a class="anchor" id="Copying-information"></a>
<p>This is a test manual, trivially and explicitly in the public
domain<a class="footnote" id="DOCF1"
href="index_special_region_fot.html#FOOT1"><sup>1</sup></a>.
@@ -91,7 +91,7 @@ domain<a class="footnote" id="DOCF1"
href="index_special_region_fot.html#FOOT1">
<p>This test demonstrates @anchor and indices in @copying
and titlepage, and various wrong index entries.
</p>
-<a class="index-entry-anchor" id="index-findex-entry"></a>
+<a class="index-entry-id" id="index-findex-entry"></a>
<dl class="first-deffn">
<dt class="deffn"><span class="category-def">truc: </span><strong
class="strong"></strong></dt>
diff --git
a/tp/tests/indices/res_parser/index_special_region/Copying-and-indices.html
b/tp/tests/indices/res_parser/index_special_region/Copying-and-indices.html
index bf83e0392c..491886dd22 100644
--- a/tp/tests/indices/res_parser/index_special_region/Copying-and-indices.html
+++ b/tp/tests/indices/res_parser/index_special_region/Copying-and-indices.html
@@ -49,9 +49,9 @@ span.program-in-footer {font-size: smaller}
<p>In the appendix, we print the indices and references.
</p>
-<a class="index-entry-anchor" id="index-another-fun"></a>
+<a class="index-entry-id" id="index-another-fun"></a>
-<a class="index-entry-anchor" id="index-Copying-appendix"></a>
+<a class="index-entry-id" id="index-Copying-appendix"></a>
<p><a class="ref" href="Chapter.html#Copying-information">Copying
information</a> for the copying information.
<a class="ref"
href="index_special_region_fot.html#Public-domain-reference">Public domain
reference</a> for reference on the licence.
@@ -60,7 +60,7 @@ span.program-in-footer {font-size: smaller}
<a class="ref"
href="index_special_region_fot.html#Titlepage-footnote-anchor">Titlepage
footnote anchor</a> for reference on the titlepage.
</p>
-<a class="index-entry-anchor" id="index-copying-Copying-this-document"></a>
+<a class="index-entry-id" id="index-copying-Copying-this-document"></a>
<a class="anchor" id="Copying-information"></a>
<p>This is a test manual, trivially and explicitly in the public
domain<a class="footnote" id="DOCF1_2"
href="index_special_region_fot.html#FOOT1_2"><sup>2</sup></a>.
diff --git
a/tp/tests/indices/res_parser/index_special_region/index_special_region_fot.html
b/tp/tests/indices/res_parser/index_special_region/index_special_region_fot.html
index b87cda0fc5..10e2c15f88 100644
---
a/tp/tests/indices/res_parser/index_special_region/index_special_region_fot.html
+++
b/tp/tests/indices/res_parser/index_special_region/index_special_region_fot.html
@@ -41,12 +41,12 @@ span.program-in-footer {font-size: smaller}
<a class="anchor" id="Public-domain-reference"></a><p>The public
domain is something you should allready know
</p>
-<a class="index-entry-anchor" id="index-copying-Public-domain"></a>
+<a class="index-entry-id" id="index-copying-Public-domain"></a>
<h5><a id="FOOT1_2" href="Copying-and-indices.html#DOCF1_2">(2)</a></h5>
<a class="anchor" id="Public-domain-reference"></a><p>The public
domain is something you should allready know
</p>
-<a class="index-entry-anchor" id="index-copying-Public-domain"></a>
+<a class="index-entry-id" id="index-copying-Public-domain"></a>
</div><hr>
<table class="nav-header" cellpadding="1" cellspacing="1" border="0">
<tr><td valign="middle" align="left">[<a href="index.html" title="Cover (top)
of document">Top</a>]</td>
diff --git a/tp/tests/indices/res_parser/index_special_region_html/Chapter.html
b/tp/tests/indices/res_parser/index_special_region_html/Chapter.html
index e706c532e7..47f1e0f2fa 100644
--- a/tp/tests/indices/res_parser/index_special_region_html/Chapter.html
+++ b/tp/tests/indices/res_parser/index_special_region_html/Chapter.html
@@ -50,7 +50,7 @@ span:hover a.copiable-anchor {visibility: visible}
<h1 class="chapter">1 Chapter</h1>
-<a class="index-entry-anchor" id="index-copying-Copying-this-document"></a>
+<a class="index-entry-id" id="index-copying-Copying-this-document"></a>
<a class="anchor" id="Copying-information"></a>
<p>This is a test manual, trivially and explicitly in the public
domain<a class="footnote" id="DOCF1_3"
href="index_special_region_fot.html#FOOT1_3"><sup>3</sup></a>.
@@ -91,7 +91,7 @@ domain<a class="footnote" id="DOCF1_3"
href="index_special_region_fot.html#FOOT1
<p>This test demonstrates @anchor and indices in @copying
and titlepage, and various wrong index entries.
</p>
-<a class="index-entry-anchor" id="index-findex-entry"></a>
+<a class="index-entry-id" id="index-findex-entry"></a>
<dl class="first-deffn">
<dt class="deffn"><span class="category-def">truc: </span><strong
class="strong"></strong></dt>
diff --git
a/tp/tests/indices/res_parser/index_special_region_html/Copying-and-indices.html
b/tp/tests/indices/res_parser/index_special_region_html/Copying-and-indices.html
index b561a289e9..ee27a66e60 100644
---
a/tp/tests/indices/res_parser/index_special_region_html/Copying-and-indices.html
+++
b/tp/tests/indices/res_parser/index_special_region_html/Copying-and-indices.html
@@ -49,9 +49,9 @@ span.program-in-footer {font-size: smaller}
<p>In the appendix, we print the indices and references.
</p>
-<a class="index-entry-anchor" id="index-another-fun"></a>
+<a class="index-entry-id" id="index-another-fun"></a>
-<a class="index-entry-anchor" id="index-Copying-appendix"></a>
+<a class="index-entry-id" id="index-Copying-appendix"></a>
<p><a class="ref" href="index.html#Copying-information">Copying
information</a> for the copying information.
<a class="ref"
href="index_special_region_fot.html#Public-domain-reference">Public domain
reference</a> for reference on the licence.
@@ -60,7 +60,7 @@ span.program-in-footer {font-size: smaller}
<a class="ref"
href="index_special_region_fot.html#Titlepage-footnote-anchor">Titlepage
footnote anchor</a> for reference on the titlepage.
</p>
-<a class="index-entry-anchor" id="index-copying-Copying-this-document"></a>
+<a class="index-entry-id" id="index-copying-Copying-this-document"></a>
<a class="anchor" id="Copying-information"></a>
<p>This is a test manual, trivially and explicitly in the public
domain<a class="footnote" id="DOCF1_4"
href="index_special_region_fot.html#FOOT1_4"><sup>4</sup></a>.
diff --git a/tp/tests/indices/res_parser/index_special_region_html/index.html
b/tp/tests/indices/res_parser/index_special_region_html/index.html
index 11666399e1..2f2d878426 100644
--- a/tp/tests/indices/res_parser/index_special_region_html/index.html
+++ b/tp/tests/indices/res_parser/index_special_region_html/index.html
@@ -30,12 +30,12 @@ span.program-in-footer {font-size: smaller}
<body lang="en">
-<a class="index-entry-anchor" id="index-titlepage-Titlepage-index"></a>
+<a class="index-entry-id" id="index-titlepage-Titlepage-index"></a>
<a class="anchor" id="Titlepage-anchor"></a>
<p>This is the titlepage<a class="footnote" id="DOCF2"
href="index_special_region_fot.html#FOOT2"><sup>1</sup></a>
</p>
-<a class="index-entry-anchor" id="index-copying-Copying-this-document"></a>
+<a class="index-entry-id" id="index-copying-Copying-this-document"></a>
<a class="anchor" id="Copying-information"></a>
<p>This is a test manual, trivially and explicitly in the public
domain<a class="footnote" id="DOCF1"
href="index_special_region_fot.html#FOOT1"><sup>2</sup></a>.
diff --git
a/tp/tests/indices/res_parser/index_special_region_html/index_special_region_fot.html
b/tp/tests/indices/res_parser/index_special_region_html/index_special_region_fot.html
index 2eb5e68f50..0573a82020 100644
---
a/tp/tests/indices/res_parser/index_special_region_html/index_special_region_fot.html
+++
b/tp/tests/indices/res_parser/index_special_region_html/index_special_region_fot.html
@@ -40,22 +40,22 @@ span.program-in-footer {font-size: smaller}
<h5><a id="FOOT2" href="index.html#DOCF2">(1)</a></h5>
<a class="anchor" id="Titlepage-footnote-anchor"></a><p>This is a fine
document.
</p>
-<a class="index-entry-anchor" id="index-titlepage-Titlepage-footnote"></a>
+<a class="index-entry-id" id="index-titlepage-Titlepage-footnote"></a>
<h5><a id="FOOT1" href="index.html#DOCF1">(2)</a></h5>
<a class="anchor" id="Public-domain-reference"></a><p>The public
domain is something you should allready know
</p>
-<a class="index-entry-anchor" id="index-copying-Public-domain"></a>
+<a class="index-entry-id" id="index-copying-Public-domain"></a>
<h5><a id="FOOT1_3" href="Chapter.html#DOCF1_3">(3)</a></h5>
<a class="anchor" id="Public-domain-reference"></a><p>The public
domain is something you should allready know
</p>
-<a class="index-entry-anchor" id="index-copying-Public-domain"></a>
+<a class="index-entry-id" id="index-copying-Public-domain"></a>
<h5><a id="FOOT1_4" href="Copying-and-indices.html#DOCF1_4">(4)</a></h5>
<a class="anchor" id="Public-domain-reference"></a><p>The public
domain is something you should allready know
</p>
-<a class="index-entry-anchor" id="index-copying-Public-domain"></a>
+<a class="index-entry-id" id="index-copying-Public-domain"></a>
</div><hr>
<table class="nav-header" cellpadding="1" cellspacing="1" border="0">
<tr><td valign="middle" align="left">[<a href="index.html" title="Cover (top)
of document">Top</a>]</td>
diff --git
a/tp/tests/indices/res_parser/index_special_region_no_insertcopying/Chapter.html
b/tp/tests/indices/res_parser/index_special_region_no_insertcopying/Chapter.html
index 9cbbb2505a..cdb913f413 100644
---
a/tp/tests/indices/res_parser/index_special_region_no_insertcopying/Chapter.html
+++
b/tp/tests/indices/res_parser/index_special_region_no_insertcopying/Chapter.html
@@ -52,7 +52,7 @@ span:hover a.copiable-anchor {visibility: visible}
<p>This test demonstrates @anchor and indices in @copying
and titlepage, and various wrong index entries.
</p>
-<a class="index-entry-anchor" id="index-findex-entry"></a>
+<a class="index-entry-id" id="index-findex-entry"></a>
<dl class="first-deffn">
<dt class="deffn"><span class="category-def">truc: </span><strong
class="strong"></strong></dt>
diff --git
a/tp/tests/indices/res_parser/index_special_region_no_insertcopying/Copying-and-indices.html
b/tp/tests/indices/res_parser/index_special_region_no_insertcopying/Copying-and-indices.html
index a373745747..f22dc1b654 100644
---
a/tp/tests/indices/res_parser/index_special_region_no_insertcopying/Copying-and-indices.html
+++
b/tp/tests/indices/res_parser/index_special_region_no_insertcopying/Copying-and-indices.html
@@ -49,9 +49,9 @@ span.program-in-footer {font-size: smaller}
<p>In the appendix, we print the indices and references.
</p>
-<a class="index-entry-anchor" id="index-another-fun"></a>
+<a class="index-entry-id" id="index-another-fun"></a>
-<a class="index-entry-anchor" id="index-Copying-appendix"></a>
+<a class="index-entry-id" id="index-Copying-appendix"></a>
<p><a class="ref" href="index.html#Copying-information">Copying
information</a> for the copying information.
<a class="ref"
href="index_special_region_no_insertcopying_fot.html#Public-domain-reference">Public
domain reference</a> for reference on the licence.
diff --git
a/tp/tests/indices/res_parser/index_special_region_no_insertcopying_html/Chapter.html
b/tp/tests/indices/res_parser/index_special_region_no_insertcopying_html/Chapter.html
index 49739148f9..420ec1fd19 100644
---
a/tp/tests/indices/res_parser/index_special_region_no_insertcopying_html/Chapter.html
+++
b/tp/tests/indices/res_parser/index_special_region_no_insertcopying_html/Chapter.html
@@ -52,7 +52,7 @@ span:hover a.copiable-anchor {visibility: visible}
<p>This test demonstrates @anchor and indices in @copying
and titlepage, and various wrong index entries.
</p>
-<a class="index-entry-anchor" id="index-findex-entry"></a>
+<a class="index-entry-id" id="index-findex-entry"></a>
<dl class="first-deffn">
<dt class="deffn"><span class="category-def">truc: </span><strong
class="strong"></strong></dt>
diff --git
a/tp/tests/indices/res_parser/index_special_region_no_insertcopying_html/Copying-and-indices.html
b/tp/tests/indices/res_parser/index_special_region_no_insertcopying_html/Copying-and-indices.html
index 9deb20a2c0..f0ffe54413 100644
---
a/tp/tests/indices/res_parser/index_special_region_no_insertcopying_html/Copying-and-indices.html
+++
b/tp/tests/indices/res_parser/index_special_region_no_insertcopying_html/Copying-and-indices.html
@@ -49,9 +49,9 @@ span.program-in-footer {font-size: smaller}
<p>In the appendix, we print the indices and references.
</p>
-<a class="index-entry-anchor" id="index-another-fun"></a>
+<a class="index-entry-id" id="index-another-fun"></a>
-<a class="index-entry-anchor" id="index-Copying-appendix"></a>
+<a class="index-entry-id" id="index-Copying-appendix"></a>
<p><a class="ref" href="index.html#Copying-information">Copying
information</a> for the copying information.
<a class="ref"
href="index_special_region_no_insertcopying_fot.html#Public-domain-reference">Public
domain reference</a> for reference on the licence.
diff --git
a/tp/tests/indices/res_parser/index_special_region_no_insertcopying_html/index.html
b/tp/tests/indices/res_parser/index_special_region_no_insertcopying_html/index.html
index c0c055fd10..58fd7af1ce 100644
---
a/tp/tests/indices/res_parser/index_special_region_no_insertcopying_html/index.html
+++
b/tp/tests/indices/res_parser/index_special_region_no_insertcopying_html/index.html
@@ -30,12 +30,12 @@ span.program-in-footer {font-size: smaller}
<body lang="en">
-<a class="index-entry-anchor" id="index-titlepage-Titlepage-index"></a>
+<a class="index-entry-id" id="index-titlepage-Titlepage-index"></a>
<a class="anchor" id="Titlepage-anchor"></a>
<p>This is the titlepage<a class="footnote" id="DOCF2"
href="index_special_region_no_insertcopying_fot.html#FOOT2"><sup>1</sup></a>
</p>
-<a class="index-entry-anchor" id="index-copying-Copying-this-document"></a>
+<a class="index-entry-id" id="index-copying-Copying-this-document"></a>
<a class="anchor" id="Copying-information"></a>
<p>This is a test manual, trivially and explicitly in the public
domain<a class="footnote" id="DOCF1"
href="index_special_region_no_insertcopying_fot.html#FOOT1"><sup>2</sup></a>.
diff --git
a/tp/tests/indices/res_parser/index_special_region_no_insertcopying_html/index_special_region_no_insertcopying_fot.html
b/tp/tests/indices/res_parser/index_special_region_no_insertcopying_html/index_special_region_no_insertcopying_fot.html
index 8964180637..46d930d1ea 100644
---
a/tp/tests/indices/res_parser/index_special_region_no_insertcopying_html/index_special_region_no_insertcopying_fot.html
+++
b/tp/tests/indices/res_parser/index_special_region_no_insertcopying_html/index_special_region_no_insertcopying_fot.html
@@ -40,12 +40,12 @@ span.program-in-footer {font-size: smaller}
<h5><a id="FOOT2" href="index.html#DOCF2">(1)</a></h5>
<a class="anchor" id="Titlepage-footnote-anchor"></a><p>This is a fine
document.
</p>
-<a class="index-entry-anchor" id="index-titlepage-Titlepage-footnote"></a>
+<a class="index-entry-id" id="index-titlepage-Titlepage-footnote"></a>
<h5><a id="FOOT1" href="index.html#DOCF1">(2)</a></h5>
<a class="anchor" id="Public-domain-reference"></a><p>The public
domain is something you should allready know
</p>
-<a class="index-entry-anchor" id="index-copying-Public-domain"></a>
+<a class="index-entry-id" id="index-copying-Public-domain"></a>
</div><hr>
<table class="nav-header" cellpadding="1" cellspacing="1" border="0">
<tr><td valign="middle" align="left">[<a href="index.html" title="Cover (top)
of document">Top</a>]</td>
diff --git
a/tp/tests/indices/res_parser/index_special_region_no_region/Chapter.html
b/tp/tests/indices/res_parser/index_special_region_no_region/Chapter.html
index 40dc83a0ab..7c4c493eb3 100644
--- a/tp/tests/indices/res_parser/index_special_region_no_region/Chapter.html
+++ b/tp/tests/indices/res_parser/index_special_region_no_region/Chapter.html
@@ -52,7 +52,7 @@ span:hover a.copiable-anchor {visibility: visible}
<p>This test demonstrates @anchor and indices in @copying
and titlepage, and various wrong index entries.
</p>
-<a class="index-entry-anchor" id="index-findex-entry"></a>
+<a class="index-entry-id" id="index-findex-entry"></a>
<dl class="first-deffn">
<dt class="deffn"><span class="category-def">truc: </span><strong
class="strong"></strong></dt>
diff --git
a/tp/tests/indices/res_parser/index_special_region_no_region/Copying-and-indices.html
b/tp/tests/indices/res_parser/index_special_region_no_region/Copying-and-indices.html
index 574d89c545..d6a1277603 100644
---
a/tp/tests/indices/res_parser/index_special_region_no_region/Copying-and-indices.html
+++
b/tp/tests/indices/res_parser/index_special_region_no_region/Copying-and-indices.html
@@ -49,9 +49,9 @@ span.program-in-footer {font-size: smaller}
<p>In the appendix, we print the indices and references.
</p>
-<a class="index-entry-anchor" id="index-another-fun"></a>
+<a class="index-entry-id" id="index-another-fun"></a>
-<a class="index-entry-anchor" id="index-Copying-appendix"></a>
+<a class="index-entry-id" id="index-Copying-appendix"></a>
<p><a class="ref" href="index.html#Copying-information">Copying
information</a> for the copying information.
<a class="ref"
href="index_special_region_no_region_fot.html#Public-domain-reference">Public
domain reference</a> for reference on the licence.
diff --git
a/tp/tests/indices/res_parser/index_special_region_no_region_html/Chapter.html
b/tp/tests/indices/res_parser/index_special_region_no_region_html/Chapter.html
index 4772c82e60..206d979802 100644
---
a/tp/tests/indices/res_parser/index_special_region_no_region_html/Chapter.html
+++
b/tp/tests/indices/res_parser/index_special_region_no_region_html/Chapter.html
@@ -52,7 +52,7 @@ span:hover a.copiable-anchor {visibility: visible}
<p>This test demonstrates @anchor and indices in @copying
and titlepage, and various wrong index entries.
</p>
-<a class="index-entry-anchor" id="index-findex-entry"></a>
+<a class="index-entry-id" id="index-findex-entry"></a>
<dl class="first-deffn">
<dt class="deffn"><span class="category-def">truc: </span><strong
class="strong"></strong></dt>
diff --git
a/tp/tests/indices/res_parser/index_special_region_no_region_html/Copying-and-indices.html
b/tp/tests/indices/res_parser/index_special_region_no_region_html/Copying-and-indices.html
index 1e1993570e..9afe54a699 100644
---
a/tp/tests/indices/res_parser/index_special_region_no_region_html/Copying-and-indices.html
+++
b/tp/tests/indices/res_parser/index_special_region_no_region_html/Copying-and-indices.html
@@ -49,9 +49,9 @@ span.program-in-footer {font-size: smaller}
<p>In the appendix, we print the indices and references.
</p>
-<a class="index-entry-anchor" id="index-another-fun"></a>
+<a class="index-entry-id" id="index-another-fun"></a>
-<a class="index-entry-anchor" id="index-Copying-appendix"></a>
+<a class="index-entry-id" id="index-Copying-appendix"></a>
<p><a class="ref" href="index.html#Copying-information">Copying
information</a> for the copying information.
<a class="ref"
href="index_special_region_no_region_fot.html#Public-domain-reference">Public
domain reference</a> for reference on the licence.
diff --git
a/tp/tests/indices/res_parser/index_special_region_no_region_html/index.html
b/tp/tests/indices/res_parser/index_special_region_no_region_html/index.html
index e75b29e531..a6da9ac729 100644
--- a/tp/tests/indices/res_parser/index_special_region_no_region_html/index.html
+++ b/tp/tests/indices/res_parser/index_special_region_no_region_html/index.html
@@ -30,12 +30,12 @@ span.program-in-footer {font-size: smaller}
<body lang="en">
-<a class="index-entry-anchor" id="index-titlepage-Titlepage-index"></a>
+<a class="index-entry-id" id="index-titlepage-Titlepage-index"></a>
<a class="anchor" id="Titlepage-anchor"></a>
<p>This is the titlepage<a class="footnote" id="DOCF2"
href="index_special_region_no_region_fot.html#FOOT2"><sup>1</sup></a>
</p>
-<a class="index-entry-anchor" id="index-copying-Copying-this-document"></a>
+<a class="index-entry-id" id="index-copying-Copying-this-document"></a>
<a class="anchor" id="Copying-information"></a>
<p>This is a test manual, trivially and explicitly in the public
domain<a class="footnote" id="DOCF1"
href="index_special_region_no_region_fot.html#FOOT1"><sup>2</sup></a>.
diff --git
a/tp/tests/indices/res_parser/index_special_region_no_region_html/index_special_region_no_region_fot.html
b/tp/tests/indices/res_parser/index_special_region_no_region_html/index_special_region_no_region_fot.html
index 86478fca97..95a74c7965 100644
---
a/tp/tests/indices/res_parser/index_special_region_no_region_html/index_special_region_no_region_fot.html
+++
b/tp/tests/indices/res_parser/index_special_region_no_region_html/index_special_region_no_region_fot.html
@@ -40,12 +40,12 @@ span.program-in-footer {font-size: smaller}
<h5><a id="FOOT2" href="index.html#DOCF2">(1)</a></h5>
<a class="anchor" id="Titlepage-footnote-anchor"></a><p>This is a fine
document.
</p>
-<a class="index-entry-anchor" id="index-titlepage-Titlepage-footnote"></a>
+<a class="index-entry-id" id="index-titlepage-Titlepage-footnote"></a>
<h5><a id="FOOT1" href="index.html#DOCF1">(2)</a></h5>
<a class="anchor" id="Public-domain-reference"></a><p>The public
domain is something you should allready know
</p>
-<a class="index-entry-anchor" id="index-copying-Public-domain"></a>
+<a class="index-entry-id" id="index-copying-Public-domain"></a>
</div><hr>
<table class="nav-header" cellpadding="1" cellspacing="1" border="0">
<tr><td valign="middle" align="left">[<a href="index.html" title="Cover (top)
of document">Top</a>]</td>
diff --git a/tp/tests/indices/res_parser/index_table/indices-refs.html
b/tp/tests/indices/res_parser/index_table/indices-refs.html
index e05d0d4413..2ea3cd932d 100644
--- a/tp/tests/indices/res_parser/index_table/indices-refs.html
+++ b/tp/tests/indices/res_parser/index_table/indices-refs.html
@@ -43,134 +43,134 @@ span.program-in-footer {font-size: smaller}
<table class="menu" border="0" cellspacing="0">
<tr><td align="left" valign="top"><a href="#node">3.1
node</a></td><td> </td><td align="left" valign="top"></td></tr>
</table>
-<a class="index-entry-anchor" id="index-concept"></a>
-<a class="index-entry-anchor" id="index-aoncept"></a>
-<a class="index-entry-anchor" id="index-zoncept"></a>
-<a class="index-entry-anchor" id="index-eoncept"></a>
-<a class="index-entry-anchor" id="index-roncept"></a>
-<a class="index-entry-anchor" id="index-toncept"></a>
-<a class="index-entry-anchor" id="index-yoncept"></a>
-<a class="index-entry-anchor" id="index-uoncept"></a>
-<a class="index-entry-anchor" id="index-ioncept"></a>
-<a class="index-entry-anchor" id="index-ooncept"></a>
-<a class="index-entry-anchor" id="index-poncept"></a>
-<a class="index-entry-anchor" id="index-qoncept"></a>
-<a class="index-entry-anchor" id="index-concep"></a>
-<a class="index-entry-anchor" id="index-rsconcept"></a>
-<a class="index-entry-anchor" id="index-soncept"></a>
-<a class="index-entry-anchor" id="index-doncept"></a>
-<a class="index-entry-anchor" id="index-foncept"></a>
-<a class="index-entry-anchor" id="index-goncept"></a>
-<a class="index-entry-anchor" id="index-honcept"></a>
-<a class="index-entry-anchor" id="index-joncept"></a>
-<a class="index-entry-anchor" id="index-koncept"></a>
-<a class="index-entry-anchor" id="index-loncept"></a>
-<a class="index-entry-anchor" id="index-moncept"></a>
-<a class="index-entry-anchor" id="index-roncept-1"></a>
-<a class="index-entry-anchor" id="index-woncept"></a>
-<a class="index-entry-anchor" id="index-xoncept"></a>
-<a class="index-entry-anchor" id="index-voncept"></a>
-<a class="index-entry-anchor" id="index-boncept"></a>
-<a class="index-entry-anchor" id="index-noncept"></a>
-<a class="index-entry-anchor" id="index-_002concept"></a>
-<a class="index-entry-anchor" id="index-_003foncept"></a>
-<a class="index-entry-anchor" id="index-_003boncept"></a>
-<a class="index-entry-anchor" id="index-_002foncept"></a>
-<a class="index-entry-anchor" id="index-_0021oncept"></a>
-<a class="index-entry-anchor" id="index-cancept"></a>
-<a class="index-entry-anchor" id="index-czncept"></a>
-<a class="index-entry-anchor" id="index-cencept"></a>
-<a class="index-entry-anchor" id="index-ctncept"></a>
-<a class="index-entry-anchor" id="index-cyncept"></a>
-<a class="index-entry-anchor" id="index-cuncept"></a>
-<a class="index-entry-anchor" id="index-cincept"></a>
-<a class="index-entry-anchor" id="index-concept-1"></a>
-<a class="index-entry-anchor" id="index-cpncept"></a>
-<a class="index-entry-anchor" id="index-cqncept"></a>
-<a class="index-entry-anchor" id="index-csncept"></a>
-<a class="index-entry-anchor" id="index-cdncept"></a>
-<a class="index-entry-anchor" id="index-cfncept"></a>
-<a class="index-entry-anchor" id="index-cgncept"></a>
-<a class="index-entry-anchor" id="index-chncept"></a>
-<a class="index-entry-anchor" id="index-cjncept"></a>
-<a class="index-entry-anchor" id="index-ckncept"></a>
-<a class="index-entry-anchor" id="index-clncept"></a>
-<a class="index-entry-anchor" id="index-cmncept"></a>
-<a class="index-entry-anchor" id="index-csdcept"></a>
-<a class="index-entry-anchor" id="index-cxncept"></a>
-<a class="index-entry-anchor" id="index-cvncept"></a>
-<a class="index-entry-anchor" id="index-cbncept"></a>
-<a class="index-entry-anchor" id="index-cnncept"></a>
-<a class="index-entry-anchor" id="index-c_002cncept"></a>
-<a class="index-entry-anchor" id="index-crncept"></a>
-<a class="index-entry-anchor" id="index-concept-2"></a>
-<a class="index-entry-anchor" id="index-concept-3"></a>
-<a class="index-entry-anchor" id="index-concept-4"></a>
-<a class="index-entry-anchor" id="index-concept-5"></a>
-<a class="index-entry-anchor" id="index-concept-6"></a>
-<a class="index-entry-anchor" id="index-concept-7"></a>
-<a class="index-entry-anchor" id="index-concept-8"></a>
-<a class="index-entry-anchor" id="index-concept-9"></a>
-<a class="index-entry-anchor" id="index-concept-10"></a>
-<a class="index-entry-anchor" id="index-concept-11"></a>
-<a class="index-entry-anchor" id="index-concept-12"></a>
-<a class="index-entry-anchor" id="index-concept-13"></a>
-<a class="index-entry-anchor" id="index-concept-14"></a>
-<a class="index-entry-anchor" id="index-concept-15"></a>
-<a class="index-entry-anchor" id="index-concept-16"></a>
-<a class="index-entry-anchor" id="index-concept-17"></a>
-<a class="index-entry-anchor" id="index-concept-18"></a>
-<a class="index-entry-anchor" id="index-concept-19"></a>
-<a class="index-entry-anchor" id="index-concept-20"></a>
-<a class="index-entry-anchor" id="index-concept-21"></a>
-<a class="index-entry-anchor" id="index-concept-22"></a>
-<a class="index-entry-anchor" id="index-concept-23"></a>
-<a class="index-entry-anchor" id="index-concept-24"></a>
-<a class="index-entry-anchor" id="index-concept-25"></a>
-<a class="index-entry-anchor" id="index-concept-26"></a>
-<a class="index-entry-anchor" id="index-concept-27"></a>
-<a class="index-entry-anchor" id="index-concept-28"></a>
-<a class="index-entry-anchor" id="index-concept-29"></a>
-<a class="index-entry-anchor" id="index-concept-30"></a>
-<a class="index-entry-anchor" id="index-concept-31"></a>
-<a class="index-entry-anchor" id="index-concept-32"></a>
-<a class="index-entry-anchor" id="index-concept-33"></a>
-<a class="index-entry-anchor" id="index-concept-34"></a>
-<a class="index-entry-anchor" id="index-concept-35"></a>
-<a class="index-entry-anchor" id="index-concept-36"></a>
-<a class="index-entry-anchor" id="index-concept-37"></a>
-<a class="index-entry-anchor" id="index-concept-38"></a>
-<a class="index-entry-anchor" id="index-concept-39"></a>
-<a class="index-entry-anchor" id="index-concept-40"></a>
-<a class="index-entry-anchor" id="index-concept-41"></a>
-<a class="index-entry-anchor" id="index-concept-42"></a>
-<a class="index-entry-anchor" id="index-concept-43"></a>
-<a class="index-entry-anchor" id="index-concept-44"></a>
-<a class="index-entry-anchor" id="index-concept-45"></a>
-<a class="index-entry-anchor" id="index-concept-46"></a>
-<a class="index-entry-anchor" id="index-concept-47"></a>
-<a class="index-entry-anchor" id="index-concept-48"></a>
-<a class="index-entry-anchor" id="index-concept-49"></a>
-<a class="index-entry-anchor" id="index-concept-50"></a>
-<a class="index-entry-anchor" id="index-concept-51"></a>
-<a class="index-entry-anchor" id="index-concept-52"></a>
-<a class="index-entry-anchor" id="index-concept-53"></a>
-<a class="index-entry-anchor" id="index-concept-54"></a>
-<a class="index-entry-anchor" id="index-concept-55"></a>
-<a class="index-entry-anchor" id="index-concept-56"></a>
-<a class="index-entry-anchor" id="index-concept-57"></a>
-<a class="index-entry-anchor" id="index-concept-58"></a>
-<a class="index-entry-anchor" id="index-concept-59"></a>
-<a class="index-entry-anchor" id="index-concept-60"></a>
-<a class="index-entry-anchor" id="index-concept-61"></a>
-<a class="index-entry-anchor" id="index-concept-62"></a>
-<a class="index-entry-anchor" id="index-concept-63"></a>
-<a class="index-entry-anchor" id="index-concept-64"></a>
-<a class="index-entry-anchor" id="index-concept-65"></a>
-<a class="index-entry-anchor" id="index-concept-66"></a>
-<a class="index-entry-anchor" id="index-concept-67"></a>
-<a class="index-entry-anchor" id="index-concept-68"></a>
-<a class="index-entry-anchor" id="index-concept-69"></a>
+<a class="index-entry-id" id="index-concept"></a>
+<a class="index-entry-id" id="index-aoncept"></a>
+<a class="index-entry-id" id="index-zoncept"></a>
+<a class="index-entry-id" id="index-eoncept"></a>
+<a class="index-entry-id" id="index-roncept"></a>
+<a class="index-entry-id" id="index-toncept"></a>
+<a class="index-entry-id" id="index-yoncept"></a>
+<a class="index-entry-id" id="index-uoncept"></a>
+<a class="index-entry-id" id="index-ioncept"></a>
+<a class="index-entry-id" id="index-ooncept"></a>
+<a class="index-entry-id" id="index-poncept"></a>
+<a class="index-entry-id" id="index-qoncept"></a>
+<a class="index-entry-id" id="index-concep"></a>
+<a class="index-entry-id" id="index-rsconcept"></a>
+<a class="index-entry-id" id="index-soncept"></a>
+<a class="index-entry-id" id="index-doncept"></a>
+<a class="index-entry-id" id="index-foncept"></a>
+<a class="index-entry-id" id="index-goncept"></a>
+<a class="index-entry-id" id="index-honcept"></a>
+<a class="index-entry-id" id="index-joncept"></a>
+<a class="index-entry-id" id="index-koncept"></a>
+<a class="index-entry-id" id="index-loncept"></a>
+<a class="index-entry-id" id="index-moncept"></a>
+<a class="index-entry-id" id="index-roncept-1"></a>
+<a class="index-entry-id" id="index-woncept"></a>
+<a class="index-entry-id" id="index-xoncept"></a>
+<a class="index-entry-id" id="index-voncept"></a>
+<a class="index-entry-id" id="index-boncept"></a>
+<a class="index-entry-id" id="index-noncept"></a>
+<a class="index-entry-id" id="index-_002concept"></a>
+<a class="index-entry-id" id="index-_003foncept"></a>
+<a class="index-entry-id" id="index-_003boncept"></a>
+<a class="index-entry-id" id="index-_002foncept"></a>
+<a class="index-entry-id" id="index-_0021oncept"></a>
+<a class="index-entry-id" id="index-cancept"></a>
+<a class="index-entry-id" id="index-czncept"></a>
+<a class="index-entry-id" id="index-cencept"></a>
+<a class="index-entry-id" id="index-ctncept"></a>
+<a class="index-entry-id" id="index-cyncept"></a>
+<a class="index-entry-id" id="index-cuncept"></a>
+<a class="index-entry-id" id="index-cincept"></a>
+<a class="index-entry-id" id="index-concept-1"></a>
+<a class="index-entry-id" id="index-cpncept"></a>
+<a class="index-entry-id" id="index-cqncept"></a>
+<a class="index-entry-id" id="index-csncept"></a>
+<a class="index-entry-id" id="index-cdncept"></a>
+<a class="index-entry-id" id="index-cfncept"></a>
+<a class="index-entry-id" id="index-cgncept"></a>
+<a class="index-entry-id" id="index-chncept"></a>
+<a class="index-entry-id" id="index-cjncept"></a>
+<a class="index-entry-id" id="index-ckncept"></a>
+<a class="index-entry-id" id="index-clncept"></a>
+<a class="index-entry-id" id="index-cmncept"></a>
+<a class="index-entry-id" id="index-csdcept"></a>
+<a class="index-entry-id" id="index-cxncept"></a>
+<a class="index-entry-id" id="index-cvncept"></a>
+<a class="index-entry-id" id="index-cbncept"></a>
+<a class="index-entry-id" id="index-cnncept"></a>
+<a class="index-entry-id" id="index-c_002cncept"></a>
+<a class="index-entry-id" id="index-crncept"></a>
+<a class="index-entry-id" id="index-concept-2"></a>
+<a class="index-entry-id" id="index-concept-3"></a>
+<a class="index-entry-id" id="index-concept-4"></a>
+<a class="index-entry-id" id="index-concept-5"></a>
+<a class="index-entry-id" id="index-concept-6"></a>
+<a class="index-entry-id" id="index-concept-7"></a>
+<a class="index-entry-id" id="index-concept-8"></a>
+<a class="index-entry-id" id="index-concept-9"></a>
+<a class="index-entry-id" id="index-concept-10"></a>
+<a class="index-entry-id" id="index-concept-11"></a>
+<a class="index-entry-id" id="index-concept-12"></a>
+<a class="index-entry-id" id="index-concept-13"></a>
+<a class="index-entry-id" id="index-concept-14"></a>
+<a class="index-entry-id" id="index-concept-15"></a>
+<a class="index-entry-id" id="index-concept-16"></a>
+<a class="index-entry-id" id="index-concept-17"></a>
+<a class="index-entry-id" id="index-concept-18"></a>
+<a class="index-entry-id" id="index-concept-19"></a>
+<a class="index-entry-id" id="index-concept-20"></a>
+<a class="index-entry-id" id="index-concept-21"></a>
+<a class="index-entry-id" id="index-concept-22"></a>
+<a class="index-entry-id" id="index-concept-23"></a>
+<a class="index-entry-id" id="index-concept-24"></a>
+<a class="index-entry-id" id="index-concept-25"></a>
+<a class="index-entry-id" id="index-concept-26"></a>
+<a class="index-entry-id" id="index-concept-27"></a>
+<a class="index-entry-id" id="index-concept-28"></a>
+<a class="index-entry-id" id="index-concept-29"></a>
+<a class="index-entry-id" id="index-concept-30"></a>
+<a class="index-entry-id" id="index-concept-31"></a>
+<a class="index-entry-id" id="index-concept-32"></a>
+<a class="index-entry-id" id="index-concept-33"></a>
+<a class="index-entry-id" id="index-concept-34"></a>
+<a class="index-entry-id" id="index-concept-35"></a>
+<a class="index-entry-id" id="index-concept-36"></a>
+<a class="index-entry-id" id="index-concept-37"></a>
+<a class="index-entry-id" id="index-concept-38"></a>
+<a class="index-entry-id" id="index-concept-39"></a>
+<a class="index-entry-id" id="index-concept-40"></a>
+<a class="index-entry-id" id="index-concept-41"></a>
+<a class="index-entry-id" id="index-concept-42"></a>
+<a class="index-entry-id" id="index-concept-43"></a>
+<a class="index-entry-id" id="index-concept-44"></a>
+<a class="index-entry-id" id="index-concept-45"></a>
+<a class="index-entry-id" id="index-concept-46"></a>
+<a class="index-entry-id" id="index-concept-47"></a>
+<a class="index-entry-id" id="index-concept-48"></a>
+<a class="index-entry-id" id="index-concept-49"></a>
+<a class="index-entry-id" id="index-concept-50"></a>
+<a class="index-entry-id" id="index-concept-51"></a>
+<a class="index-entry-id" id="index-concept-52"></a>
+<a class="index-entry-id" id="index-concept-53"></a>
+<a class="index-entry-id" id="index-concept-54"></a>
+<a class="index-entry-id" id="index-concept-55"></a>
+<a class="index-entry-id" id="index-concept-56"></a>
+<a class="index-entry-id" id="index-concept-57"></a>
+<a class="index-entry-id" id="index-concept-58"></a>
+<a class="index-entry-id" id="index-concept-59"></a>
+<a class="index-entry-id" id="index-concept-60"></a>
+<a class="index-entry-id" id="index-concept-61"></a>
+<a class="index-entry-id" id="index-concept-62"></a>
+<a class="index-entry-id" id="index-concept-63"></a>
+<a class="index-entry-id" id="index-concept-64"></a>
+<a class="index-entry-id" id="index-concept-65"></a>
+<a class="index-entry-id" id="index-concept-66"></a>
+<a class="index-entry-id" id="index-concept-67"></a>
+<a class="index-entry-id" id="index-concept-68"></a>
+<a class="index-entry-id" id="index-concept-69"></a>
<div class="printindex cp-printindex">
<table class="cp-letters-header-printindex"><tr><th valign="top">Jump to:
</th><td><a class="summary-letter-printindex"
href="#Indices-refs_cp_symbol-1"><b>!</b></a>
diff --git
a/tp/tests/indices/res_parser/index_table/node-with-ftable-and-vtable.html
b/tp/tests/indices/res_parser/index_table/node-with-ftable-and-vtable.html
index 2c605f3b77..9b3036bac9 100644
--- a/tp/tests/indices/res_parser/index_table/node-with-ftable-and-vtable.html
+++ b/tp/tests/indices/res_parser/index_table/node-with-ftable-and-vtable.html
@@ -42,10 +42,10 @@ span:hover a.copiable-anchor {visibility: visible}
</tr></table>
<h1 class="chapter" id="first-node-chapter_002c-with-ftable-and-vtable">1
first node chapter, with ftable and vtable</h1>
-<a class="index-entry-anchor" id="index-index-entry-in-node"></a>
+<a class="index-entry-id" id="index-index-entry-in-node"></a>
<p>Some text
-<a class="index-entry-anchor" id="index-an-second-index-entry-in-node"></a>
+<a class="index-entry-id" id="index-an-second-index-entry-in-node"></a>
</p>
diff --git
a/tp/tests/indices/res_parser/indices_in_begin_tables_lists/indices_in_begin_tables_lists.html
b/tp/tests/indices/res_parser/indices_in_begin_tables_lists/indices_in_begin_tables_lists.html
index de5719b4b9..d5826790ad 100644
---
a/tp/tests/indices/res_parser/indices_in_begin_tables_lists/indices_in_begin_tables_lists.html
+++
b/tp/tests/indices/res_parser/indices_in_begin_tables_lists/indices_in_begin_tables_lists.html
@@ -59,20 +59,20 @@ ul.mark-minus {list-style-type: "\2212"}
<h1 class="chapter" id="chap">1 chap</h1>
<ul class="itemize mark-minus">
-<li><a class="index-entry-anchor" id="index-also-a-cindex-in-itemize"></a>
+<li><a class="index-entry-id" id="index-also-a-cindex-in-itemize"></a>
e–mph item
</li></ul>
<ul class="itemize mark-bullet">
-<li><a class="index-entry-anchor" id="index-index-entry-within-itemize"></a>
+<li><a class="index-entry-id" id="index-index-entry-within-itemize"></a>
i–tem 1
-</li><li><a class="index-entry-anchor"
id="index-index-entry-right-after-_0040item"></a>
+</li><li><a class="index-entry-id"
id="index-index-entry-right-after-_0040item"></a>
i–tem 2
</li></ul>
<ul class="itemize mark-bullet">
<li>T–ext before items.
-</li><li><a class="index-entry-anchor"
id="index-also-a-cindex-in-itemize-1"></a>
+</li><li><a class="index-entry-id" id="index-also-a-cindex-in-itemize-1"></a>
bullet item
</li></ul>
@@ -82,32 +82,32 @@ bullet item
<ol class="enumerate">
<li>
-<a class="index-entry-anchor"
id="index-index-inter-in-enumerate-between-lines"></a>
+<a class="index-entry-id"
id="index-index-inter-in-enumerate-between-lines"></a>
</li><li> enumerate item
</li></ol>
<ol class="enumerate">
-<li> <a class="index-entry-anchor"
id="index-index-inter-in-enumerate-after-line"></a>
+<li> <a class="index-entry-id"
id="index-index-inter-in-enumerate-after-line"></a>
enumerate item
</li></ol>
<ol class="enumerate">
-<li><a class="index-entry-anchor"
id="index-index-inter-in-enumerate-before-line"></a>
+<li><a class="index-entry-id"
id="index-index-inter-in-enumerate-before-line"></a>
</li><li> enumerate item
</li></ol>
<ol class="enumerate">
<li>Title
-</li><li> <a class="index-entry-anchor" id="index-cindex"></a>
+</li><li> <a class="index-entry-id" id="index-cindex"></a>
enum
</li></ol>
<ol class="enumerate">
-<li> <a class="index-entry-anchor" id="index-first-idx"></a>
-<a class="index-entry-anchor" id="index-sedond-idx"></a>
-<a class="index-entry-anchor" id="index-another"></a>
+<li> <a class="index-entry-id" id="index-first-idx"></a>
+<a class="index-entry-id" id="index-sedond-idx"></a>
+<a class="index-entry-id" id="index-another"></a>
enum
</li></ol>
@@ -126,7 +126,7 @@ enum
<dl class="ftable">
<dt id='index-avar_002d_002db'><span><var class="var">avar–b</var><a
class="copiable-anchor" href='#index-avar_002d_002db'> ¶</a></span></dt>
-<dd><a class="index-entry-anchor"
id="index-index-entry-between-item-and-itemx"></a>
+<dd><a class="index-entry-id"
id="index-index-entry-between-item-and-itemx"></a>
</dd>
<dt id='index-b'><span><var class="var">b</var><a class="copiable-anchor"
href='#index-b'> ¶</a></span></dt>
<dd><p>l–ine
@@ -136,7 +136,7 @@ enum
</dl>
<dl class="table">
-<dd><a class="index-entry-anchor" id="index-cindex-in-table"></a>
+<dd><a class="index-entry-id" id="index-cindex-in-table"></a>
</dd>
<dt><code class="code">abb</code></dt>
<dd><p>l–ine
@@ -144,14 +144,14 @@ enum
</dl>
<dl class="table">
-<dd><a class="index-entry-anchor" id="index-cindex-in-table-1"></a>
+<dd><a class="index-entry-id" id="index-cindex-in-table-1"></a>
<p>Texte before first item.
</p></dd>
<dt><code class="code">abb</code></dt>
</dl>
<dl class="table">
-<dd><a class="index-entry-anchor" id="index-samp-cindex-in-table"></a>
+<dd><a class="index-entry-id" id="index-samp-cindex-in-table"></a>
</dd>
<dt>‘<samp class="samp">asamp--bb</samp>’</dt>
<dd><p>l–ine samp
@@ -159,7 +159,7 @@ enum
</dl>
<dl class="table">
-<dd><a class="index-entry-anchor" id="index-samp-cindex-in-table-1"></a>
+<dd><a class="index-entry-id" id="index-samp-cindex-in-table-1"></a>
<p>Texte before first item samp.
</p></dd>
<dt>‘<samp class="samp">asamp--bb</samp>’</dt>
@@ -167,14 +167,14 @@ enum
<dl class="table">
<dd>
-<a class="index-entry-anchor" id="index-cindex-between-lines"></a>
+<a class="index-entry-id" id="index-cindex-between-lines"></a>
</dd>
<dt>‘<samp class="samp">asamp--bb1</samp>’</dt>
</dl>
<dl class="table">
-<dd><a class="index-entry-anchor" id="index-cindex-before-line"></a>
+<dd><a class="index-entry-id" id="index-cindex-before-line"></a>
</dd>
<dt>‘<samp class="samp">asamp--bb2</samp>’</dt>
@@ -182,15 +182,15 @@ enum
<dl class="table">
<dd>
-<a class="index-entry-anchor" id="index-cindex-after-line"></a>
+<a class="index-entry-id" id="index-cindex-after-line"></a>
</dd>
<dt>‘<samp class="samp">asamp--bb2</samp>’</dt>
</dl>
<dl class="table">
-<dd><a class="index-entry-anchor" id="index-cindex-first"></a>
-<a class="index-entry-anchor" id="index-second"></a>
-<a class="index-entry-anchor" id="index-third"></a>
+<dd><a class="index-entry-id" id="index-cindex-first"></a>
+<a class="index-entry-id" id="index-second"></a>
+<a class="index-entry-id" id="index-third"></a>
</dd>
<dt>‘<samp class="samp">asamp--bb2</samp>’</dt>
</dl>
diff --git
a/tp/tests/indices/res_parser/nodes_before_top_and_sections_html_chapter/chapter.html
b/tp/tests/indices/res_parser/nodes_before_top_and_sections_html_chapter/chapter.html
index 3d0ede3a90..882552133e 100644
---
a/tp/tests/indices/res_parser/nodes_before_top_and_sections_html_chapter/chapter.html
+++
b/tp/tests/indices/res_parser/nodes_before_top_and_sections_html_chapter/chapter.html
@@ -112,8 +112,8 @@ span.program-in-footer {font-size: smaller}
</td></tr></table>
</div>
-<a class="node-anchor" id="node-in-chapter"></a>
-<a class="index-entry-anchor" id="index-node-in-chapter"></a>
+<a class="node" id="node-in-chapter"></a>
+<a class="index-entry-id" id="index-node-in-chapter"></a>
</div>
<hr>
diff --git
a/tp/tests/indices/res_parser/nodes_before_top_and_sections_html_chapter/index.html
b/tp/tests/indices/res_parser/nodes_before_top_and_sections_html_chapter/index.html
index e768fab0ec..e5a13b9f0f 100644
---
a/tp/tests/indices/res_parser/nodes_before_top_and_sections_html_chapter/index.html
+++
b/tp/tests/indices/res_parser/nodes_before_top_and_sections_html_chapter/index.html
@@ -25,7 +25,7 @@ span.program-in-footer {font-size: smaller}
<body lang="en">
-<a class="node-anchor" id="first-before-top"></a><table class="nav-header"
cellpadding="1" cellspacing="1" border="0">
+<a class="node" id="first-before-top"></a><table class="nav-header"
cellpadding="1" cellspacing="1" border="0">
<tr><td valign="middle" align="left">[ < ]</td>
<td valign="middle" align="left">[<a href="chapter.html" title="Next section
in reading order"> > </a>]</td>
<td valign="middle" align="left"> </td>
@@ -33,7 +33,7 @@ span.program-in-footer {font-size: smaller}
<td valign="middle" align="left">[<a href="#Top" title="Index">Index</a>]</td>
<td valign="middle" align="left">[<a
href="nodes_before_top_and_sections_abt.html#SEC_About" title="About (help)"> ?
</a>]</td>
</tr></table>
-<a class="index-entry-anchor" id="index-first-before-top"></a>
+<a class="index-entry-id" id="index-first-before-top"></a>
<p>in first node before printindex
</p><div class="printindex cp-printindex">
@@ -183,8 +183,8 @@ span.program-in-footer {font-size: smaller}
</td></tr>
</table>
-<a class="node-anchor" id="node-in-menu-before-top"></a>
-<a class="index-entry-anchor" id="index-node-in-menu-before-top"></a>
+<a class="node" id="node-in-menu-before-top"></a>
+<a class="index-entry-id" id="index-node-in-menu-before-top"></a>
<p>between node in menu before top and printindex
</p><div class="printindex cp-printindex">
<table class="cp-letters-header-printindex"><tr><th valign="top">Jump to:
</th><td><a class="summary-letter-printindex"
href="#top-section_cp_symbol-1"><b>!</b></a>
@@ -258,11 +258,11 @@ span.program-in-footer {font-size: smaller}
</div>
<p>node in menu before top text after printindex
</p>
-<a class="index-entry-anchor"
id="index-printindex-node-in-menu-before-top"></a>
+<a class="index-entry-id" id="index-printindex-node-in-menu-before-top"></a>
<div class="top" id="Top">
-<a class="index-entry-anchor" id="index-entry-a"></a>
+<a class="index-entry-id" id="index-entry-a"></a>
<p>in top node.
</p><div class="printindex cp-printindex">
<table class="cp-letters-header-printindex"><tr><th valign="top">Jump to:
</th><td><a class="summary-letter-printindex"
href="#top-section_cp_symbol-1"><b>!</b></a>
@@ -439,7 +439,7 @@ span.program-in-footer {font-size: smaller}
</div>
<h1 class="top" id="top-section">top section</h1>
-<a class="index-entry-anchor" id="index-top-section"></a>
+<a class="index-entry-id" id="index-top-section"></a>
<p>in top section
</p>
@@ -452,10 +452,10 @@ span.program-in-footer {font-size: smaller}
</td></tr>
</table>
-<a class="node-anchor" id="first"></a><p>Text and then index entries
-<a class="index-entry-anchor" id="index-_0021-entry-in-node"></a>
-<a class="index-entry-anchor" id="index-fun-in-node"></a>
-<a class="index-entry-anchor" id="index-entry-in-node"></a>
+<a class="node" id="first"></a><p>Text and then index entries
+<a class="index-entry-id" id="index-_0021-entry-in-node"></a>
+<a class="index-entry-id" id="index-fun-in-node"></a>
+<a class="index-entry-id" id="index-entry-in-node"></a>
</p>
<div class="printindex cp-printindex">
<table class="cp-letters-header-printindex"><tr><th valign="top">Jump to:
</th><td><a class="summary-letter-printindex"
href="#top-section_cp_symbol-1"><b>!</b></a>
@@ -533,7 +533,7 @@ span.program-in-footer {font-size: smaller}
</td></tr>
</table>
-<a class="node-anchor" id="second"></a><table class="menu" border="0"
cellspacing="0">
+<a class="node" id="second"></a><table class="menu" border="0" cellspacing="0">
<tr><td align="left" valign="top">• <a href="#a-node" rel="index">a
node</a></td><td> </td><td align="left" valign="top">
</td></tr>
<tr><td align="left" valign="top">• <a
href="#another">another</a></td><td> </td><td align="left"
valign="top">
@@ -570,12 +570,12 @@ span.program-in-footer {font-size: smaller}
</td></tr></table>
</div>
-<a class="node-anchor" id="another"></a>
-<a class="index-entry-anchor" id="index-something"></a>
-<a class="index-entry-anchor" id="index-somewhere"></a>
-<a class="index-entry-anchor" id="index-another"></a>
+<a class="node" id="another"></a>
+<a class="index-entry-id" id="index-something"></a>
+<a class="index-entry-id" id="index-somewhere"></a>
+<a class="index-entry-id" id="index-another"></a>
-<a class="node-anchor" id="a-node"></a><a class="index-entry-anchor"
id="index-entry-after-printindex"></a>
+<a class="node" id="a-node"></a><a class="index-entry-id"
id="index-entry-after-printindex"></a>
<div class="printindex cp-printindex">
<table class="cp-letters-header-printindex"><tr><th valign="top">Jump to:
</th><td><a class="summary-letter-printindex"
href="#top-section_cp_symbol-1"><b>!</b></a>
@@ -648,8 +648,8 @@ span.program-in-footer {font-size: smaller}
</td></tr></table>
</div>
-<a class="index-entry-anchor" id="index-a-function"></a>
-<a class="index-entry-anchor" id="index-a-concept-a-node"></a>
+<a class="index-entry-id" id="index-a-function"></a>
+<a class="index-entry-id" id="index-a-concept-a-node"></a>
<div class="printindex cp-printindex">
<table class="cp-letters-header-printindex"><tr><th valign="top">Jump to:
</th><td><a class="summary-letter-printindex"
href="#top-section_cp_symbol-1"><b>!</b></a>
diff --git
a/tp/tests/indices/res_parser/nodes_before_top_and_sections_html_chapter_nodes/chapter.html
b/tp/tests/indices/res_parser/nodes_before_top_and_sections_html_chapter_nodes/chapter.html
index f5728c4893..b3341adacf 100644
---
a/tp/tests/indices/res_parser/nodes_before_top_and_sections_html_chapter_nodes/chapter.html
+++
b/tp/tests/indices/res_parser/nodes_before_top_and_sections_html_chapter_nodes/chapter.html
@@ -113,7 +113,7 @@ span.program-in-footer {font-size: smaller}
</div>
<hr>
-<a class="node-anchor" id="node-in-chapter"></a><table class="nav-header"
cellpadding="1" cellspacing="1" border="0">
+<a class="node" id="node-in-chapter"></a><table class="nav-header"
cellpadding="1" cellspacing="1" border="0">
<tr><td valign="middle" align="left">[<a href="#chapter" title="Beginning of
this chapter or previous chapter"> << </a>]</td>
<td valign="middle" align="left">[<a href="#chapter" title="Previous section
in reading order"> < </a>]</td>
<td valign="middle" align="left">[<a href="index.html#Top" title="Up section">
Up </a>]</td>
@@ -130,7 +130,7 @@ span.program-in-footer {font-size: smaller}
</tr></table>
<h3 class="node-heading">node in chapter</h3>
-<a class="index-entry-anchor" id="index-node-in-chapter"></a>
+<a class="index-entry-id" id="index-node-in-chapter"></a>
</div>
<hr>
diff --git
a/tp/tests/indices/res_parser/nodes_before_top_and_sections_html_chapter_nodes/first-before-top.html
b/tp/tests/indices/res_parser/nodes_before_top_and_sections_html_chapter_nodes/first-before-top.html
index adc4d4d5c2..6a9407605a 100644
---
a/tp/tests/indices/res_parser/nodes_before_top_and_sections_html_chapter_nodes/first-before-top.html
+++
b/tp/tests/indices/res_parser/nodes_before_top_and_sections_html_chapter_nodes/first-before-top.html
@@ -25,7 +25,7 @@ span.program-in-footer {font-size: smaller}
<body lang="en">
-<a class="node-anchor" id="first-before-top"></a><table class="nav-header"
cellpadding="1" cellspacing="1" border="0">
+<a class="node" id="first-before-top"></a><table class="nav-header"
cellpadding="1" cellspacing="1" border="0">
<tr><td valign="middle" align="left">[ << ]</td>
<td valign="middle" align="left">[ < ]</td>
<td valign="middle" align="left">[<a href="../dir/index.html" title="Up
section"> Up </a>]</td>
@@ -41,7 +41,7 @@ span.program-in-footer {font-size: smaller}
<td valign="middle" align="left">[<a
href="nodes_before_top_and_sections_abt.html#SEC_About" title="About (help)"> ?
</a>]</td>
</tr></table>
<h3 class="node-heading">first before top</h3>
-<a class="index-entry-anchor" id="index-first-before-top"></a>
+<a class="index-entry-id" id="index-first-before-top"></a>
<p>in first node before printindex
</p><div class="printindex cp-printindex">
@@ -192,7 +192,7 @@ span.program-in-footer {font-size: smaller}
</table>
<hr>
-<a class="node-anchor" id="node-in-menu-before-top"></a><table
class="nav-header" cellpadding="1" cellspacing="1" border="0">
+<a class="node" id="node-in-menu-before-top"></a><table class="nav-header"
cellpadding="1" cellspacing="1" border="0">
<tr><td valign="middle" align="left">[ << ]</td>
<td valign="middle" align="left">[<a href="#first-before-top" title="Previous
section in reading order"> < </a>]</td>
<td valign="middle" align="left">[<a href="#first-before-top" title="Up
section"> Up </a>]</td>
@@ -209,7 +209,7 @@ span.program-in-footer {font-size: smaller}
</tr></table>
<h3 class="node-heading">node in menu before top</h3>
-<a class="index-entry-anchor" id="index-node-in-menu-before-top"></a>
+<a class="index-entry-id" id="index-node-in-menu-before-top"></a>
<p>between node in menu before top and printindex
</p><div class="printindex cp-printindex">
<table class="cp-letters-header-printindex"><tr><th valign="top">Jump to:
</th><td><a class="summary-letter-printindex"
href="#node-in-menu-before-top_cp_symbol-1"><b>!</b></a>
@@ -283,7 +283,7 @@ span.program-in-footer {font-size: smaller}
</div>
<p>node in menu before top text after printindex
</p>
-<a class="index-entry-anchor"
id="index-printindex-node-in-menu-before-top"></a>
+<a class="index-entry-id" id="index-printindex-node-in-menu-before-top"></a>
<hr>
diff --git
a/tp/tests/indices/res_parser/nodes_before_top_and_sections_html_chapter_nodes/index.html
b/tp/tests/indices/res_parser/nodes_before_top_and_sections_html_chapter_nodes/index.html
index f06d3577bf..b564454605 100644
---
a/tp/tests/indices/res_parser/nodes_before_top_and_sections_html_chapter_nodes/index.html
+++
b/tp/tests/indices/res_parser/nodes_before_top_and_sections_html_chapter_nodes/index.html
@@ -32,7 +32,7 @@ span.program-in-footer {font-size: smaller}
<td valign="middle" align="left">[<a
href="first-before-top.html#first-before-top" title="Index">Index</a>]</td>
<td valign="middle" align="left">[<a
href="nodes_before_top_and_sections_abt.html#SEC_About" title="About (help)"> ?
</a>]</td>
</tr></table>
-<a class="index-entry-anchor" id="index-entry-a"></a>
+<a class="index-entry-id" id="index-entry-a"></a>
<p>in top node.
</p><div class="printindex cp-printindex">
<table class="cp-letters-header-printindex"><tr><th valign="top">Jump to:
</th><td><a class="summary-letter-printindex"
href="#Top_cp_symbol-1"><b>!</b></a>
@@ -209,7 +209,7 @@ span.program-in-footer {font-size: smaller}
</div>
<h1 class="top" id="top-section">top section</h1>
-<a class="index-entry-anchor" id="index-top-section"></a>
+<a class="index-entry-id" id="index-top-section"></a>
<p>in top section
</p>
@@ -223,7 +223,7 @@ span.program-in-footer {font-size: smaller}
</table>
<hr style="height: 6px;">
-<a class="node-anchor" id="first"></a><table class="nav-header"
cellpadding="1" cellspacing="1" border="0">
+<a class="node" id="first"></a><table class="nav-header" cellpadding="1"
cellspacing="1" border="0">
<tr><td valign="middle" align="left">[<a href="#Top" title="Beginning of this
chapter or previous chapter"> << </a>]</td>
<td valign="middle" align="left">[<a href="#Top" title="Previous section in
reading order"> < </a>]</td>
<td valign="middle" align="left">[<a href="#Top" title="Up section"> Up
</a>]</td>
@@ -240,9 +240,9 @@ span.program-in-footer {font-size: smaller}
</tr></table>
<h3 class="node-heading">first</h3>
<p>Text and then index entries
-<a class="index-entry-anchor" id="index-_0021-entry-in-node"></a>
-<a class="index-entry-anchor" id="index-fun-in-node"></a>
-<a class="index-entry-anchor" id="index-entry-in-node"></a>
+<a class="index-entry-id" id="index-_0021-entry-in-node"></a>
+<a class="index-entry-id" id="index-fun-in-node"></a>
+<a class="index-entry-id" id="index-entry-in-node"></a>
</p>
<div class="printindex cp-printindex">
<table class="cp-letters-header-printindex"><tr><th valign="top">Jump to:
</th><td><a class="summary-letter-printindex"
href="#first_cp_symbol-1"><b>!</b></a>
@@ -321,7 +321,7 @@ span.program-in-footer {font-size: smaller}
</table>
<hr>
-<a class="node-anchor" id="second"></a><table class="nav-header"
cellpadding="1" cellspacing="1" border="0">
+<a class="node" id="second"></a><table class="nav-header" cellpadding="1"
cellspacing="1" border="0">
<tr><td valign="middle" align="left">[<a href="#Top" title="Beginning of this
chapter or previous chapter"> << </a>]</td>
<td valign="middle" align="left">[<a href="#first" title="Previous section in
reading order"> < </a>]</td>
<td valign="middle" align="left">[<a href="#first" title="Up section"> Up
</a>]</td>
@@ -375,7 +375,7 @@ span.program-in-footer {font-size: smaller}
</div>
<hr>
-<a class="node-anchor" id="another"></a><table class="nav-header"
cellpadding="1" cellspacing="1" border="0">
+<a class="node" id="another"></a><table class="nav-header" cellpadding="1"
cellspacing="1" border="0">
<tr><td valign="middle" align="left">[<a href="#Top" title="Beginning of this
chapter or previous chapter"> << </a>]</td>
<td valign="middle" align="left">[<a href="#second" title="Previous section in
reading order"> < </a>]</td>
<td valign="middle" align="left">[<a href="#second" title="Up section"> Up
</a>]</td>
@@ -392,12 +392,12 @@ span.program-in-footer {font-size: smaller}
</tr></table>
<h3 class="node-heading">another</h3>
-<a class="index-entry-anchor" id="index-something"></a>
-<a class="index-entry-anchor" id="index-somewhere"></a>
-<a class="index-entry-anchor" id="index-another"></a>
+<a class="index-entry-id" id="index-something"></a>
+<a class="index-entry-id" id="index-somewhere"></a>
+<a class="index-entry-id" id="index-another"></a>
<hr>
-<a class="node-anchor" id="a-node"></a><table class="nav-header"
cellpadding="1" cellspacing="1" border="0">
+<a class="node" id="a-node"></a><table class="nav-header" cellpadding="1"
cellspacing="1" border="0">
<tr><td valign="middle" align="left">[<a href="#Top" title="Beginning of this
chapter or previous chapter"> << </a>]</td>
<td valign="middle" align="left">[<a href="#another" title="Previous section
in reading order"> < </a>]</td>
<td valign="middle" align="left">[<a href="#second" title="Up section"> Up
</a>]</td>
@@ -413,7 +413,7 @@ span.program-in-footer {font-size: smaller}
<td valign="middle" align="left">[<a
href="nodes_before_top_and_sections_abt.html#SEC_About" title="About (help)"> ?
</a>]</td>
</tr></table>
<h3 class="node-heading">a node</h3>
-<a class="index-entry-anchor" id="index-entry-after-printindex"></a>
+<a class="index-entry-id" id="index-entry-after-printindex"></a>
<div class="printindex cp-printindex">
<table class="cp-letters-header-printindex"><tr><th valign="top">Jump to:
</th><td><a class="summary-letter-printindex"
href="#a-node_cp_symbol-1"><b>!</b></a>
@@ -486,8 +486,8 @@ span.program-in-footer {font-size: smaller}
</td></tr></table>
</div>
-<a class="index-entry-anchor" id="index-a-function"></a>
-<a class="index-entry-anchor" id="index-a-concept-a-node"></a>
+<a class="index-entry-id" id="index-a-function"></a>
+<a class="index-entry-id" id="index-a-concept-a-node"></a>
<div class="printindex cp-printindex">
<table class="cp-letters-header-printindex"><tr><th valign="top">Jump to:
</th><td><a class="summary-letter-printindex"
href="#a-node_cp_symbol-1"><b>!</b></a>
diff --git
a/tp/tests/indices/res_parser/printindex_between_node_section/printindex_between_node_section.html
b/tp/tests/indices/res_parser/printindex_between_node_section/printindex_between_node_section.html
index 8b981d0d64..21f391daf3 100644
---
a/tp/tests/indices/res_parser/printindex_between_node_section/printindex_between_node_section.html
+++
b/tp/tests/indices/res_parser/printindex_between_node_section/printindex_between_node_section.html
@@ -35,22 +35,22 @@ span.program-in-footer {font-size: smaller}
</tr></table>
<h1 class="top" id="top">top</h1>
-<a class="index-entry-anchor" id="index-top1"></a>
-<a class="index-entry-anchor" id="index-top1-1"></a>
-<a class="index-entry-anchor" id="index-top1-2"></a>
-<a class="index-entry-anchor" id="index-top1-3"></a>
-<a class="index-entry-anchor" id="index-top1-4"></a>
-<a class="index-entry-anchor" id="index-top1-5"></a>
-<a class="index-entry-anchor" id="index-top1-6"></a>
-<a class="index-entry-anchor" id="index-top1-7"></a>
-<a class="index-entry-anchor" id="index-top1-8"></a>
-<a class="index-entry-anchor" id="index-aop1"></a>
-<a class="index-entry-anchor" id="index-aop1-1"></a>
-<a class="index-entry-anchor" id="index-aop1-2"></a>
-<a class="index-entry-anchor" id="index-aop1-3"></a>
-<a class="index-entry-anchor" id="index-aop1-4"></a>
-<a class="index-entry-anchor" id="index-aop1-5"></a>
-<a class="index-entry-anchor" id="index-aop1-6"></a>
+<a class="index-entry-id" id="index-top1"></a>
+<a class="index-entry-id" id="index-top1-1"></a>
+<a class="index-entry-id" id="index-top1-2"></a>
+<a class="index-entry-id" id="index-top1-3"></a>
+<a class="index-entry-id" id="index-top1-4"></a>
+<a class="index-entry-id" id="index-top1-5"></a>
+<a class="index-entry-id" id="index-top1-6"></a>
+<a class="index-entry-id" id="index-top1-7"></a>
+<a class="index-entry-id" id="index-top1-8"></a>
+<a class="index-entry-id" id="index-aop1"></a>
+<a class="index-entry-id" id="index-aop1-1"></a>
+<a class="index-entry-id" id="index-aop1-2"></a>
+<a class="index-entry-id" id="index-aop1-3"></a>
+<a class="index-entry-id" id="index-aop1-4"></a>
+<a class="index-entry-id" id="index-aop1-5"></a>
+<a class="index-entry-id" id="index-aop1-6"></a>
<table class="menu" border="0" cellspacing="0">
diff --git
a/tp/tests/indices/res_parser/printindex_between_part_chapter/printindex_between_part_chapter.html
b/tp/tests/indices/res_parser/printindex_between_part_chapter/printindex_between_part_chapter.html
index 0f72a0d984..aedb049b72 100644
---
a/tp/tests/indices/res_parser/printindex_between_part_chapter/printindex_between_part_chapter.html
+++
b/tp/tests/indices/res_parser/printindex_between_part_chapter/printindex_between_part_chapter.html
@@ -35,22 +35,22 @@ span.program-in-footer {font-size: smaller}
</tr></table>
<h1 class="top" id="top">top</h1>
-<a class="index-entry-anchor" id="index-top1"></a>
-<a class="index-entry-anchor" id="index-top1-1"></a>
-<a class="index-entry-anchor" id="index-top1-2"></a>
-<a class="index-entry-anchor" id="index-top1-3"></a>
-<a class="index-entry-anchor" id="index-top1-4"></a>
-<a class="index-entry-anchor" id="index-top1-5"></a>
-<a class="index-entry-anchor" id="index-top1-6"></a>
-<a class="index-entry-anchor" id="index-top1-7"></a>
-<a class="index-entry-anchor" id="index-top1-8"></a>
-<a class="index-entry-anchor" id="index-aop1"></a>
-<a class="index-entry-anchor" id="index-aop1-1"></a>
-<a class="index-entry-anchor" id="index-aop1-2"></a>
-<a class="index-entry-anchor" id="index-aop1-3"></a>
-<a class="index-entry-anchor" id="index-aop1-4"></a>
-<a class="index-entry-anchor" id="index-aop1-5"></a>
-<a class="index-entry-anchor" id="index-aop1-6"></a>
+<a class="index-entry-id" id="index-top1"></a>
+<a class="index-entry-id" id="index-top1-1"></a>
+<a class="index-entry-id" id="index-top1-2"></a>
+<a class="index-entry-id" id="index-top1-3"></a>
+<a class="index-entry-id" id="index-top1-4"></a>
+<a class="index-entry-id" id="index-top1-5"></a>
+<a class="index-entry-id" id="index-top1-6"></a>
+<a class="index-entry-id" id="index-top1-7"></a>
+<a class="index-entry-id" id="index-top1-8"></a>
+<a class="index-entry-id" id="index-aop1"></a>
+<a class="index-entry-id" id="index-aop1-1"></a>
+<a class="index-entry-id" id="index-aop1-2"></a>
+<a class="index-entry-id" id="index-aop1-3"></a>
+<a class="index-entry-id" id="index-aop1-4"></a>
+<a class="index-entry-id" id="index-aop1-5"></a>
+<a class="index-entry-id" id="index-aop1-6"></a>
<table class="menu" border="0" cellspacing="0">
diff --git
a/tp/tests/indices/res_parser_info/index_special_region_html/Copying-and-indices.html
b/tp/tests/indices/res_parser_info/index_special_region_html/Copying-and-indices.html
index e8428c71ef..494481791a 100644
---
a/tp/tests/indices/res_parser_info/index_special_region_html/Copying-and-indices.html
+++
b/tp/tests/indices/res_parser_info/index_special_region_html/Copying-and-indices.html
@@ -41,9 +41,9 @@ Up: <a href="index.html" accesskey="u" rel="up">Top</a>
[<a href="index.h
<p>In the appendix, we print the indices and references.
</p>
-<a class="index-entry-anchor" id="index-another-fun"></a>
+<a class="index-entry-id" id="index-another-fun"></a>
-<a class="index-entry-anchor" id="index-Copying-appendix"></a>
+<a class="index-entry-id" id="index-Copying-appendix"></a>
<p><a class="ref" href="index.html#Copying-information">Copying
information</a> for the copying information.
<a class="ref" href="index.html#Public-domain-reference">Public domain
reference</a> for reference on the licence.
@@ -52,7 +52,7 @@ Up: <a href="index.html" accesskey="u" rel="up">Top</a>
[<a href="index.h
<a class="ref" href="index.html#Titlepage-footnote-anchor">Titlepage footnote
anchor</a> for reference on the titlepage.
</p>
-<a class="index-entry-anchor" id="index-copying-Copying-this-document"></a>
+<a class="index-entry-id" id="index-copying-Copying-this-document"></a>
<a class="anchor" id="Copying-information"></a>
<p>This is a test manual, trivially and explicitly in the public
domain<a class="footnote" id="DOCF1_2" href="#FOOT1_2"><sup>2</sup></a>.
@@ -154,7 +154,7 @@ domain<a class="footnote" id="DOCF1_2"
href="#FOOT1_2"><sup>2</sup></a>.
<a class="anchor" id="Public-domain-reference"></a><p>The public
domain is something you should allready know
</p>
-<a class="index-entry-anchor" id="index-copying-Public-domain"></a>
+<a class="index-entry-id" id="index-copying-Public-domain"></a>
</div>
<hr>
<div class="nav-header">
diff --git
a/tp/tests/indices/res_parser_info/index_special_region_html/index.html
b/tp/tests/indices/res_parser_info/index_special_region_html/index.html
index dc2344a9ef..b3a4f303cd 100644
--- a/tp/tests/indices/res_parser_info/index_special_region_html/index.html
+++ b/tp/tests/indices/res_parser_info/index_special_region_html/index.html
@@ -58,7 +58,7 @@ ul.toc-numbered-mark {list-style: none}
<h2 class="chapter">1 Chapter</h2>
-<a class="index-entry-anchor" id="index-copying-Copying-this-document"></a>
+<a class="index-entry-id" id="index-copying-Copying-this-document"></a>
<a class="anchor" id="Copying-information"></a>
<p>This is a test manual, trivially and explicitly in the public
domain<a class="footnote" id="DOCF1" href="#FOOT1"><sup>1</sup></a>.
@@ -99,7 +99,7 @@ domain<a class="footnote" id="DOCF1"
href="#FOOT1"><sup>1</sup></a>.
<p>This test demonstrates @anchor and indices in @copying
and titlepage, and various wrong index entries.
</p>
-<a class="index-entry-anchor" id="index-findex-entry"></a>
+<a class="index-entry-id" id="index-findex-entry"></a>
<dl class="first-deffn">
<dt class="deffn"><span class="category-def">truc: </span><strong
class="strong"></strong></dt>
@@ -122,7 +122,7 @@ and titlepage, and various wrong index entries.
<a class="anchor" id="Public-domain-reference"></a><p>The public
domain is something you should allready know
</p>
-<a class="index-entry-anchor" id="index-copying-Public-domain"></a>
+<a class="index-entry-id" id="index-copying-Public-domain"></a>
</div>
<hr>
<div class="nav-header">
diff --git
a/tp/tests/indices/res_parser_info/index_special_region_no_insertcopying_html/Copying-and-indices.html
b/tp/tests/indices/res_parser_info/index_special_region_no_insertcopying_html/Copying-and-indices.html
index 132e18925c..0e7945aedf 100644
---
a/tp/tests/indices/res_parser_info/index_special_region_no_insertcopying_html/Copying-and-indices.html
+++
b/tp/tests/indices/res_parser_info/index_special_region_no_insertcopying_html/Copying-and-indices.html
@@ -40,9 +40,9 @@ Up: <a href="index.html" accesskey="u" rel="up">Top</a>
[<a href="index.h
<p>In the appendix, we print the indices and references.
</p>
-<a class="index-entry-anchor" id="index-another-fun"></a>
+<a class="index-entry-id" id="index-another-fun"></a>
-<a class="index-entry-anchor" id="index-Copying-appendix"></a>
+<a class="index-entry-id" id="index-Copying-appendix"></a>
<p><a class="ref" href="index.html#Copying-information">Copying
information</a> for the copying information.
<a class="ref" href="index.html#Public-domain-reference">Public domain
reference</a> for reference on the licence.
diff --git
a/tp/tests/indices/res_parser_info/index_special_region_no_insertcopying_html/index.html
b/tp/tests/indices/res_parser_info/index_special_region_no_insertcopying_html/index.html
index 3273494b65..c4e7e7027f 100644
---
a/tp/tests/indices/res_parser_info/index_special_region_no_insertcopying_html/index.html
+++
b/tp/tests/indices/res_parser_info/index_special_region_no_insertcopying_html/index.html
@@ -59,7 +59,7 @@ ul.toc-numbered-mark {list-style: none}
<p>This test demonstrates @anchor and indices in @copying
and titlepage, and various wrong index entries.
</p>
-<a class="index-entry-anchor" id="index-findex-entry"></a>
+<a class="index-entry-id" id="index-findex-entry"></a>
<dl class="first-deffn">
<dt class="deffn"><span class="category-def">truc: </span><strong
class="strong"></strong></dt>
diff --git
a/tp/tests/indices/res_parser_info/index_special_region_no_region_html/Copying-and-indices.html
b/tp/tests/indices/res_parser_info/index_special_region_no_region_html/Copying-and-indices.html
index 132e18925c..0e7945aedf 100644
---
a/tp/tests/indices/res_parser_info/index_special_region_no_region_html/Copying-and-indices.html
+++
b/tp/tests/indices/res_parser_info/index_special_region_no_region_html/Copying-and-indices.html
@@ -40,9 +40,9 @@ Up: <a href="index.html" accesskey="u" rel="up">Top</a>
[<a href="index.h
<p>In the appendix, we print the indices and references.
</p>
-<a class="index-entry-anchor" id="index-another-fun"></a>
+<a class="index-entry-id" id="index-another-fun"></a>
-<a class="index-entry-anchor" id="index-Copying-appendix"></a>
+<a class="index-entry-id" id="index-Copying-appendix"></a>
<p><a class="ref" href="index.html#Copying-information">Copying
information</a> for the copying information.
<a class="ref" href="index.html#Public-domain-reference">Public domain
reference</a> for reference on the licence.
diff --git
a/tp/tests/indices/res_parser_info/index_special_region_no_region_html/index.html
b/tp/tests/indices/res_parser_info/index_special_region_no_region_html/index.html
index 9beee191ad..ce9770b550 100644
---
a/tp/tests/indices/res_parser_info/index_special_region_no_region_html/index.html
+++
b/tp/tests/indices/res_parser_info/index_special_region_no_region_html/index.html
@@ -60,7 +60,7 @@ ul.toc-numbered-mark {list-style: none}
<p>This test demonstrates @anchor and indices in @copying
and titlepage, and various wrong index entries.
</p>
-<a class="index-entry-anchor" id="index-findex-entry"></a>
+<a class="index-entry-id" id="index-findex-entry"></a>
<dl class="first-deffn">
<dt class="deffn"><span class="category-def">truc: </span><strong
class="strong"></strong></dt>
diff --git
a/tp/tests/indices/res_parser_info/nodes_before_top_and_sections_html_chapter/chapter.html
b/tp/tests/indices/res_parser_info/nodes_before_top_and_sections_html_chapter/chapter.html
index edf1e8dbba..56349b3341 100644
---
a/tp/tests/indices/res_parser_info/nodes_before_top_and_sections_html_chapter/chapter.html
+++
b/tp/tests/indices/res_parser_info/nodes_before_top_and_sections_html_chapter/chapter.html
@@ -105,13 +105,13 @@ Next: <a href="#node-in-chapter" accesskey="n"
rel="next">node in chapter</a>, U
</div>
<hr>
-<a class="node-anchor" id="node-in-chapter"></a><div class="nav-header">
+<a class="node" id="node-in-chapter"></a><div class="nav-header">
<p>
Previous: <a href="#chapter" accesskey="p" rel="prev">A chapter</a>, Up: <a
href="index.html#Top" accesskey="u" rel="up">top section</a> [<a
href="first-before-top.html#first-before-top" title="Index"
rel="index">Index</a>]</p>
</div>
<h4 class="node-heading">node in chapter</h4>
-<a class="index-entry-anchor" id="index-node-in-chapter"></a>
+<a class="index-entry-id" id="index-node-in-chapter"></a>
</div>
<hr>
diff --git
a/tp/tests/indices/res_parser_info/nodes_before_top_and_sections_html_chapter/first-before-top.html
b/tp/tests/indices/res_parser_info/nodes_before_top_and_sections_html_chapter/first-before-top.html
index 17d6ebf32c..9e97fe3362 100644
---
a/tp/tests/indices/res_parser_info/nodes_before_top_and_sections_html_chapter/first-before-top.html
+++
b/tp/tests/indices/res_parser_info/nodes_before_top_and_sections_html_chapter/first-before-top.html
@@ -28,12 +28,12 @@ a.summary-letter-printindex {text-decoration: none}
<body lang="en">
-<a class="node-anchor" id="first-before-top"></a><div class="nav-header">
+<a class="node" id="first-before-top"></a><div class="nav-header">
<p>
Next: <a href="index.html#Top" accesskey="n" rel="next">top section</a>, Up:
<a href="../dir/index.html" accesskey="u" rel="up">(dir)</a> [<a
href="#first-before-top" title="Index" rel="index">Index</a>]</p>
</div>
<h4 class="node-heading">first before top</h4>
-<a class="index-entry-anchor" id="index-first-before-top"></a>
+<a class="index-entry-id" id="index-first-before-top"></a>
<p>in first node before printindex
</p><div class="printindex cp-printindex">
@@ -180,13 +180,13 @@ Next: <a href="index.html#Top" accesskey="n"
rel="next">top section</a>, Up: <a
<p>after second printindex in first node
</p>
<hr>
-<a class="node-anchor" id="node-in-menu-before-top"></a><div
class="nav-header">
+<a class="node" id="node-in-menu-before-top"></a><div class="nav-header">
<p>
Up: <a href="#first-before-top" accesskey="u" rel="up">first before top</a>
[<a href="#first-before-top" title="Index" rel="index">Index</a>]</p>
</div>
<h4 class="node-heading">node in menu before top</h4>
-<a class="index-entry-anchor" id="index-node-in-menu-before-top"></a>
+<a class="index-entry-id" id="index-node-in-menu-before-top"></a>
<p>between node in menu before top and printindex
</p><div class="printindex cp-printindex">
<table class="cp-letters-header-printindex"><tr><th valign="top">Jump to:
</th><td><a class="summary-letter-printindex"
href="#node-in-menu-before-top_cp_symbol-1"><b>!</b></a>
@@ -260,7 +260,7 @@ Up: <a href="#first-before-top" accesskey="u"
rel="up">first before top</a> &nbs
</div>
<p>node in menu before top text after printindex
</p>
-<a class="index-entry-anchor"
id="index-printindex-node-in-menu-before-top"></a>
+<a class="index-entry-id" id="index-printindex-node-in-menu-before-top"></a>
<hr>
diff --git
a/tp/tests/indices/res_parser_info/nodes_before_top_and_sections_html_chapter/index.html
b/tp/tests/indices/res_parser_info/nodes_before_top_and_sections_html_chapter/index.html
index 159c8ca02e..7ca24a2695 100644
---
a/tp/tests/indices/res_parser_info/nodes_before_top_and_sections_html_chapter/index.html
+++
b/tp/tests/indices/res_parser_info/nodes_before_top_and_sections_html_chapter/index.html
@@ -30,7 +30,7 @@ a.summary-letter-printindex {text-decoration: none}
<p>
Previous: <a href="first-before-top.html#first-before-top" accesskey="p"
rel="prev">first before top</a> [<a
href="first-before-top.html#first-before-top" title="Index"
rel="index">Index</a>]</p>
</div>
-<a class="index-entry-anchor" id="index-entry-a"></a>
+<a class="index-entry-id" id="index-entry-a"></a>
<p>in top node.
</p><div class="printindex cp-printindex">
<table class="cp-letters-header-printindex"><tr><th valign="top">Jump to:
</th><td><a class="summary-letter-printindex"
href="#Top_cp_symbol-1"><b>!</b></a>
@@ -207,7 +207,7 @@ Previous: <a href="first-before-top.html#first-before-top"
accesskey="p" rel="pr
</div>
<h1 class="top" id="top-section">top section</h1>
-<a class="index-entry-anchor" id="index-top-section"></a>
+<a class="index-entry-id" id="index-top-section"></a>
<p>in top section
</p>
@@ -216,15 +216,15 @@ Previous: <a
href="first-before-top.html#first-before-top" accesskey="p" rel="pr
<li><a href="chapter.html#chapter" accesskey="1">A chapter</a></li>
</ul>
<hr>
-<a class="node-anchor" id="first"></a><div class="nav-header">
+<a class="node" id="first"></a><div class="nav-header">
<p>
Previous: <a href="#Top" accesskey="p" rel="prev">top section</a>, Up: <a
href="#Top" accesskey="u" rel="up">top section</a> [<a
href="first-before-top.html#first-before-top" title="Index"
rel="index">Index</a>]</p>
</div>
<h4 class="node-heading">first</h4>
<p>Text and then index entries
-<a class="index-entry-anchor" id="index-_0021-entry-in-node"></a>
-<a class="index-entry-anchor" id="index-fun-in-node"></a>
-<a class="index-entry-anchor" id="index-entry-in-node"></a>
+<a class="index-entry-id" id="index-_0021-entry-in-node"></a>
+<a class="index-entry-id" id="index-fun-in-node"></a>
+<a class="index-entry-id" id="index-entry-in-node"></a>
</p>
<div class="printindex cp-printindex">
<table class="cp-letters-header-printindex"><tr><th valign="top">Jump to:
</th><td><a class="summary-letter-printindex"
href="#first_cp_symbol-1"><b>!</b></a>
@@ -299,7 +299,7 @@ Previous: <a href="#Top" accesskey="p" rel="prev">top
section</a>, Up: <a href="
<hr>
-<a class="node-anchor" id="second"></a><div class="nav-header">
+<a class="node" id="second"></a><div class="nav-header">
<p>
Up: <a href="#first" accesskey="u" rel="up">first</a> [<a
href="first-before-top.html#first-before-top" title="Index"
rel="index">Index</a>]</p>
</div>
@@ -336,23 +336,23 @@ Up: <a href="#first" accesskey="u" rel="up">first</a>
[<a href="first-bef
</div>
<hr>
-<a class="node-anchor" id="another"></a><div class="nav-header">
+<a class="node" id="another"></a><div class="nav-header">
<p>
Previous: <a href="#a-node" accesskey="p" rel="prev">a node</a>, Up: <a
href="#second" accesskey="u" rel="up">second</a> [<a
href="first-before-top.html#first-before-top" title="Index"
rel="index">Index</a>]</p>
</div>
<h4 class="node-heading">another</h4>
-<a class="index-entry-anchor" id="index-something"></a>
-<a class="index-entry-anchor" id="index-somewhere"></a>
-<a class="index-entry-anchor" id="index-another"></a>
+<a class="index-entry-id" id="index-something"></a>
+<a class="index-entry-id" id="index-somewhere"></a>
+<a class="index-entry-id" id="index-another"></a>
<hr>
-<a class="node-anchor" id="a-node"></a><div class="nav-header">
+<a class="node" id="a-node"></a><div class="nav-header">
<p>
Next: <a href="#another" accesskey="n" rel="next">another</a>, Up: <a
href="#second" accesskey="u" rel="up">second</a> [<a
href="first-before-top.html#first-before-top" title="Index"
rel="index">Index</a>]</p>
</div>
<h4 class="node-heading">a node</h4>
-<a class="index-entry-anchor" id="index-entry-after-printindex"></a>
+<a class="index-entry-id" id="index-entry-after-printindex"></a>
<div class="printindex cp-printindex">
<table class="cp-letters-header-printindex"><tr><th valign="top">Jump to:
</th><td><a class="summary-letter-printindex"
href="#a-node_cp_symbol-1"><b>!</b></a>
@@ -425,8 +425,8 @@ Next: <a href="#another" accesskey="n"
rel="next">another</a>, Up: <a href="#sec
</td></tr></table>
</div>
-<a class="index-entry-anchor" id="index-a-function"></a>
-<a class="index-entry-anchor" id="index-a-concept-a-node"></a>
+<a class="index-entry-id" id="index-a-function"></a>
+<a class="index-entry-id" id="index-a-concept-a-node"></a>
<div class="printindex cp-printindex">
<table class="cp-letters-header-printindex"><tr><th valign="top">Jump to:
</th><td><a class="summary-letter-printindex"
href="#a-node_cp_symbol-1"><b>!</b></a>
diff --git
a/tp/tests/indices/res_parser_info/nodes_before_top_and_sections_html_chapter_nodes/chapter.html
b/tp/tests/indices/res_parser_info/nodes_before_top_and_sections_html_chapter_nodes/chapter.html
index edf1e8dbba..56349b3341 100644
---
a/tp/tests/indices/res_parser_info/nodes_before_top_and_sections_html_chapter_nodes/chapter.html
+++
b/tp/tests/indices/res_parser_info/nodes_before_top_and_sections_html_chapter_nodes/chapter.html
@@ -105,13 +105,13 @@ Next: <a href="#node-in-chapter" accesskey="n"
rel="next">node in chapter</a>, U
</div>
<hr>
-<a class="node-anchor" id="node-in-chapter"></a><div class="nav-header">
+<a class="node" id="node-in-chapter"></a><div class="nav-header">
<p>
Previous: <a href="#chapter" accesskey="p" rel="prev">A chapter</a>, Up: <a
href="index.html#Top" accesskey="u" rel="up">top section</a> [<a
href="first-before-top.html#first-before-top" title="Index"
rel="index">Index</a>]</p>
</div>
<h4 class="node-heading">node in chapter</h4>
-<a class="index-entry-anchor" id="index-node-in-chapter"></a>
+<a class="index-entry-id" id="index-node-in-chapter"></a>
</div>
<hr>
diff --git
a/tp/tests/indices/res_parser_info/nodes_before_top_and_sections_html_chapter_nodes/first-before-top.html
b/tp/tests/indices/res_parser_info/nodes_before_top_and_sections_html_chapter_nodes/first-before-top.html
index 17d6ebf32c..9e97fe3362 100644
---
a/tp/tests/indices/res_parser_info/nodes_before_top_and_sections_html_chapter_nodes/first-before-top.html
+++
b/tp/tests/indices/res_parser_info/nodes_before_top_and_sections_html_chapter_nodes/first-before-top.html
@@ -28,12 +28,12 @@ a.summary-letter-printindex {text-decoration: none}
<body lang="en">
-<a class="node-anchor" id="first-before-top"></a><div class="nav-header">
+<a class="node" id="first-before-top"></a><div class="nav-header">
<p>
Next: <a href="index.html#Top" accesskey="n" rel="next">top section</a>, Up:
<a href="../dir/index.html" accesskey="u" rel="up">(dir)</a> [<a
href="#first-before-top" title="Index" rel="index">Index</a>]</p>
</div>
<h4 class="node-heading">first before top</h4>
-<a class="index-entry-anchor" id="index-first-before-top"></a>
+<a class="index-entry-id" id="index-first-before-top"></a>
<p>in first node before printindex
</p><div class="printindex cp-printindex">
@@ -180,13 +180,13 @@ Next: <a href="index.html#Top" accesskey="n"
rel="next">top section</a>, Up: <a
<p>after second printindex in first node
</p>
<hr>
-<a class="node-anchor" id="node-in-menu-before-top"></a><div
class="nav-header">
+<a class="node" id="node-in-menu-before-top"></a><div class="nav-header">
<p>
Up: <a href="#first-before-top" accesskey="u" rel="up">first before top</a>
[<a href="#first-before-top" title="Index" rel="index">Index</a>]</p>
</div>
<h4 class="node-heading">node in menu before top</h4>
-<a class="index-entry-anchor" id="index-node-in-menu-before-top"></a>
+<a class="index-entry-id" id="index-node-in-menu-before-top"></a>
<p>between node in menu before top and printindex
</p><div class="printindex cp-printindex">
<table class="cp-letters-header-printindex"><tr><th valign="top">Jump to:
</th><td><a class="summary-letter-printindex"
href="#node-in-menu-before-top_cp_symbol-1"><b>!</b></a>
@@ -260,7 +260,7 @@ Up: <a href="#first-before-top" accesskey="u"
rel="up">first before top</a> &nbs
</div>
<p>node in menu before top text after printindex
</p>
-<a class="index-entry-anchor"
id="index-printindex-node-in-menu-before-top"></a>
+<a class="index-entry-id" id="index-printindex-node-in-menu-before-top"></a>
<hr>
diff --git
a/tp/tests/indices/res_parser_info/nodes_before_top_and_sections_html_chapter_nodes/index.html
b/tp/tests/indices/res_parser_info/nodes_before_top_and_sections_html_chapter_nodes/index.html
index 159c8ca02e..7ca24a2695 100644
---
a/tp/tests/indices/res_parser_info/nodes_before_top_and_sections_html_chapter_nodes/index.html
+++
b/tp/tests/indices/res_parser_info/nodes_before_top_and_sections_html_chapter_nodes/index.html
@@ -30,7 +30,7 @@ a.summary-letter-printindex {text-decoration: none}
<p>
Previous: <a href="first-before-top.html#first-before-top" accesskey="p"
rel="prev">first before top</a> [<a
href="first-before-top.html#first-before-top" title="Index"
rel="index">Index</a>]</p>
</div>
-<a class="index-entry-anchor" id="index-entry-a"></a>
+<a class="index-entry-id" id="index-entry-a"></a>
<p>in top node.
</p><div class="printindex cp-printindex">
<table class="cp-letters-header-printindex"><tr><th valign="top">Jump to:
</th><td><a class="summary-letter-printindex"
href="#Top_cp_symbol-1"><b>!</b></a>
@@ -207,7 +207,7 @@ Previous: <a href="first-before-top.html#first-before-top"
accesskey="p" rel="pr
</div>
<h1 class="top" id="top-section">top section</h1>
-<a class="index-entry-anchor" id="index-top-section"></a>
+<a class="index-entry-id" id="index-top-section"></a>
<p>in top section
</p>
@@ -216,15 +216,15 @@ Previous: <a
href="first-before-top.html#first-before-top" accesskey="p" rel="pr
<li><a href="chapter.html#chapter" accesskey="1">A chapter</a></li>
</ul>
<hr>
-<a class="node-anchor" id="first"></a><div class="nav-header">
+<a class="node" id="first"></a><div class="nav-header">
<p>
Previous: <a href="#Top" accesskey="p" rel="prev">top section</a>, Up: <a
href="#Top" accesskey="u" rel="up">top section</a> [<a
href="first-before-top.html#first-before-top" title="Index"
rel="index">Index</a>]</p>
</div>
<h4 class="node-heading">first</h4>
<p>Text and then index entries
-<a class="index-entry-anchor" id="index-_0021-entry-in-node"></a>
-<a class="index-entry-anchor" id="index-fun-in-node"></a>
-<a class="index-entry-anchor" id="index-entry-in-node"></a>
+<a class="index-entry-id" id="index-_0021-entry-in-node"></a>
+<a class="index-entry-id" id="index-fun-in-node"></a>
+<a class="index-entry-id" id="index-entry-in-node"></a>
</p>
<div class="printindex cp-printindex">
<table class="cp-letters-header-printindex"><tr><th valign="top">Jump to:
</th><td><a class="summary-letter-printindex"
href="#first_cp_symbol-1"><b>!</b></a>
@@ -299,7 +299,7 @@ Previous: <a href="#Top" accesskey="p" rel="prev">top
section</a>, Up: <a href="
<hr>
-<a class="node-anchor" id="second"></a><div class="nav-header">
+<a class="node" id="second"></a><div class="nav-header">
<p>
Up: <a href="#first" accesskey="u" rel="up">first</a> [<a
href="first-before-top.html#first-before-top" title="Index"
rel="index">Index</a>]</p>
</div>
@@ -336,23 +336,23 @@ Up: <a href="#first" accesskey="u" rel="up">first</a>
[<a href="first-bef
</div>
<hr>
-<a class="node-anchor" id="another"></a><div class="nav-header">
+<a class="node" id="another"></a><div class="nav-header">
<p>
Previous: <a href="#a-node" accesskey="p" rel="prev">a node</a>, Up: <a
href="#second" accesskey="u" rel="up">second</a> [<a
href="first-before-top.html#first-before-top" title="Index"
rel="index">Index</a>]</p>
</div>
<h4 class="node-heading">another</h4>
-<a class="index-entry-anchor" id="index-something"></a>
-<a class="index-entry-anchor" id="index-somewhere"></a>
-<a class="index-entry-anchor" id="index-another"></a>
+<a class="index-entry-id" id="index-something"></a>
+<a class="index-entry-id" id="index-somewhere"></a>
+<a class="index-entry-id" id="index-another"></a>
<hr>
-<a class="node-anchor" id="a-node"></a><div class="nav-header">
+<a class="node" id="a-node"></a><div class="nav-header">
<p>
Next: <a href="#another" accesskey="n" rel="next">another</a>, Up: <a
href="#second" accesskey="u" rel="up">second</a> [<a
href="first-before-top.html#first-before-top" title="Index"
rel="index">Index</a>]</p>
</div>
<h4 class="node-heading">a node</h4>
-<a class="index-entry-anchor" id="index-entry-after-printindex"></a>
+<a class="index-entry-id" id="index-entry-after-printindex"></a>
<div class="printindex cp-printindex">
<table class="cp-letters-header-printindex"><tr><th valign="top">Jump to:
</th><td><a class="summary-letter-printindex"
href="#a-node_cp_symbol-1"><b>!</b></a>
@@ -425,8 +425,8 @@ Next: <a href="#another" accesskey="n"
rel="next">another</a>, Up: <a href="#sec
</td></tr></table>
</div>
-<a class="index-entry-anchor" id="index-a-function"></a>
-<a class="index-entry-anchor" id="index-a-concept-a-node"></a>
+<a class="index-entry-id" id="index-a-function"></a>
+<a class="index-entry-id" id="index-a-concept-a-node"></a>
<div class="printindex cp-printindex">
<table class="cp-letters-header-printindex"><tr><th valign="top">Jump to:
</th><td><a class="summary-letter-printindex"
href="#a-node_cp_symbol-1"><b>!</b></a>
diff --git a/tp/tests/layout/res_parser/formatting/formatting.html
b/tp/tests/layout/res_parser/formatting/formatting.html
index c2f2f3d141..c6cb09660b 100644
--- a/tp/tests/layout/res_parser/formatting/formatting.html
+++ b/tp/tests/layout/res_parser/formatting/formatting.html
@@ -853,10 +853,10 @@ kbd: <kbd
class="kbd">``simple-double--three---four----''</kbd> <br>
</p>
<p>‘<!-- /@w -->‘simple-double-<!-- /@w
-->-three—four—-’<!-- /@w -->’<br>
</p>
-<a class="index-entry-anchor" id="index-titlepage-_002d_002doption"></a>
-<a class="index-entry-anchor" id="index-titlepage-_0060_0060"></a>
-<a class="index-entry-anchor" id="index-titlepage-_0060_0060-1"></a>
-<a class="index-entry-anchor" id="index-titlepage-_002d_002dfoption"></a>
+<a class="index-entry-id" id="index-titlepage-_002d_002doption"></a>
+<a class="index-entry-id" id="index-titlepage-_0060_0060"></a>
+<a class="index-entry-id" id="index-titlepage-_0060_0060-1"></a>
+<a class="index-entry-id" id="index-titlepage-_002d_002dfoption"></a>
<p>@"u ü
@"{U} Ü
@@ -1216,7 +1216,7 @@ error→ → - ∗ -| ⇒
</li></ul>
<ul class="itemize" style="list-style-type: '\2022 a\2013 n itemize line'">
-<li><a class="index-entry-anchor"
id="index-titlepage-index-entry-within-itemize"></a>
+<li><a class="index-entry-id"
id="index-titlepage-index-entry-within-itemize"></a>
i–tem 1
</li><li>i–tem 2
</li></ul>
@@ -1258,7 +1258,7 @@ i–tem 1
<thead><tr><th width="40%">mu–ltitable headitem</th><th
width="60%">another tab</th></tr></thead>
<tbody><tr><td width="40%">mu–ltitable item</td><td
width="60%">multitable tab</td></tr>
<tr><td width="40%">mu–ltitable item 2</td><td width="60%">multitable
tab 2
-<a class="index-entry-anchor"
id="index-titlepage-index-entry-within-multitable"></a></td></tr>
+<a class="index-entry-id"
id="index-titlepage-index-entry-within-multitable"></a></td></tr>
<tr><td width="40%">lone mu–ltitable item</td></tr>
</tbody>
</table>
@@ -1359,7 +1359,7 @@ f(x) = {1 \over \sigma \sqrt{2\pi}}e<sup class="sup">-{1
\over 2}\left({x-\mu \o
<dl class="first-deffn">
<dt class="deffn" id="index-titlepage-i"><span class="category-def">fset:
</span><span><strong class="strong"><var class="var">i</var></strong> <em
class="emph">a g</em><a class="copiable-anchor" href='#index-titlepage-i'>
¶</a></span></dt>
-<dd><a class="index-entry-anchor"
id="index-titlepage-index-entry-within-deffn"></a>
+<dd><a class="index-entry-id"
id="index-titlepage-index-entry-within-deffn"></a>
</dd><dt class="deffnx def-cmd-deffn" id="index-titlepage-truc"><span
class="category-def">cmde: </span><span><strong class="strong">truc</strong>
<em class="emph"></em><a class="copiable-anchor" href='#index-titlepage-truc'>
¶</a></span></dt>
<dt class="deffnx def-cmd-deffn" id="index-titlepage-log-trap"><span
class="category-def">Command: </span><span><strong class="strong">log
trap</strong> <em class="emph"></em><a class="copiable-anchor"
href='#index-titlepage-log-trap'> ¶</a></span></dt>
<dt class="deffnx def-cmd-deffn" id="index-titlepage-log-trap1"><span
class="category-def">Command: </span><span><strong class="strong">log
trap1</strong> <em class="emph"></em><a class="copiable-anchor"
href='#index-titlepage-log-trap1'> ¶</a></span></dt>
@@ -1652,7 +1652,7 @@ ref</a>
<dl class="ftable">
<dt id='index-titlepage-a-1'><span><em class="emph">a</em><a
class="copiable-anchor" href='#index-titlepage-a-1'> ¶</a></span></dt>
-<dd><a class="index-entry-anchor"
id="index-titlepage-index-entry-between-item-and-itemx"></a>
+<dd><a class="index-entry-id"
id="index-titlepage-index-entry-between-item-and-itemx"></a>
</dd>
<dt id='index-titlepage-b'><span><em class="emph">b</em><a
class="copiable-anchor" href='#index-titlepage-b'> ¶</a></span></dt>
<dd><p>l–ine
@@ -1794,7 +1794,7 @@ html ''
<dl class="ftable">
<dt id='index-titlepage-a-2'><span>a<a class="copiable-anchor"
href='#index-titlepage-a-2'> ¶</a></span></dt>
-<dd><a class="index-entry-anchor"
id="index-titlepage-index-entry-between-item-and-itemx-1"></a>
+<dd><a class="index-entry-id"
id="index-titlepage-index-entry-between-item-and-itemx-1"></a>
</dd>
<dt id='index-titlepage-b-1'><span>b<a class="copiable-anchor"
href='#index-titlepage-b-1'> ¶</a></span></dt>
<dd><p>l–ine
@@ -1869,10 +1869,10 @@ kbd: <kbd
class="kbd">``simple-double--three---four----''</kbd> <br>
</p>
<p>‘<!-- /@w -->‘simple-double-<!-- /@w
-->-three—four—-’<!-- /@w -->’<br>
</p>
-<a class="index-entry-anchor" id="index-copying-_002d_002doption"></a>
-<a class="index-entry-anchor" id="index-copying-_0060_0060"></a>
-<a class="index-entry-anchor" id="index-copying-_0060_0060-1"></a>
-<a class="index-entry-anchor" id="index-copying-_002d_002dfoption"></a>
+<a class="index-entry-id" id="index-copying-_002d_002doption"></a>
+<a class="index-entry-id" id="index-copying-_0060_0060"></a>
+<a class="index-entry-id" id="index-copying-_0060_0060-1"></a>
+<a class="index-entry-id" id="index-copying-_002d_002dfoption"></a>
<p>@"u ü
@"{U} Ü
@@ -2231,7 +2231,7 @@ error→ → - ∗ -| ⇒
</li></ul>
<ul class="itemize" style="list-style-type: '\2022 a\2013 n itemize line'">
-<li><a class="index-entry-anchor"
id="index-copying-index-entry-within-itemize"></a>
+<li><a class="index-entry-id"
id="index-copying-index-entry-within-itemize"></a>
i–tem 1
</li><li>i–tem 2
</li></ul>
@@ -2273,7 +2273,7 @@ i–tem 1
<thead><tr><th width="40%">mu–ltitable headitem</th><th
width="60%">another tab</th></tr></thead>
<tbody><tr><td width="40%">mu–ltitable item</td><td
width="60%">multitable tab</td></tr>
<tr><td width="40%">mu–ltitable item 2</td><td width="60%">multitable
tab 2
-<a class="index-entry-anchor"
id="index-copying-index-entry-within-multitable"></a></td></tr>
+<a class="index-entry-id"
id="index-copying-index-entry-within-multitable"></a></td></tr>
<tr><td width="40%">lone mu–ltitable item</td></tr>
</tbody>
</table>
@@ -2374,7 +2374,7 @@ f(x) = {1 \over \sigma \sqrt{2\pi}}e<sup class="sup">-{1
\over 2}\left({x-\mu \o
<dl class="first-deffn">
<dt class="deffn" id="index-copying-i"><span class="category-def">fset:
</span><span><strong class="strong"><var class="var">i</var></strong> <em
class="emph">a g</em><a class="copiable-anchor" href='#index-copying-i'>
¶</a></span></dt>
-<dd><a class="index-entry-anchor"
id="index-copying-index-entry-within-deffn"></a>
+<dd><a class="index-entry-id" id="index-copying-index-entry-within-deffn"></a>
</dd><dt class="deffnx def-cmd-deffn" id="index-copying-truc"><span
class="category-def">cmde: </span><span><strong class="strong">truc</strong>
<em class="emph"></em><a class="copiable-anchor" href='#index-copying-truc'>
¶</a></span></dt>
<dt class="deffnx def-cmd-deffn" id="index-copying-log-trap"><span
class="category-def">Command: </span><span><strong class="strong">log
trap</strong> <em class="emph"></em><a class="copiable-anchor"
href='#index-copying-log-trap'> ¶</a></span></dt>
<dt class="deffnx def-cmd-deffn" id="index-copying-log-trap1"><span
class="category-def">Command: </span><span><strong class="strong">log
trap1</strong> <em class="emph"></em><a class="copiable-anchor"
href='#index-copying-log-trap1'> ¶</a></span></dt>
@@ -2667,7 +2667,7 @@ ref</a>
<dl class="ftable">
<dt id='index-copying-a-1'><span><em class="emph">a</em><a
class="copiable-anchor" href='#index-copying-a-1'> ¶</a></span></dt>
-<dd><a class="index-entry-anchor"
id="index-copying-index-entry-between-item-and-itemx"></a>
+<dd><a class="index-entry-id"
id="index-copying-index-entry-between-item-and-itemx"></a>
</dd>
<dt id='index-copying-b'><span><em class="emph">b</em><a
class="copiable-anchor" href='#index-copying-b'> ¶</a></span></dt>
<dd><p>l–ine
@@ -2809,7 +2809,7 @@ html ''
<dl class="ftable">
<dt id='index-copying-a-2'><span>a<a class="copiable-anchor"
href='#index-copying-a-2'> ¶</a></span></dt>
-<dd><a class="index-entry-anchor"
id="index-copying-index-entry-between-item-and-itemx-1"></a>
+<dd><a class="index-entry-id"
id="index-copying-index-entry-between-item-and-itemx-1"></a>
</dd>
<dt id='index-copying-b-1'><span>b<a class="copiable-anchor"
href='#index-copying-b-1'> ¶</a></span></dt>
<dd><p>l–ine
@@ -2940,10 +2940,10 @@ kbd: <kbd
class="kbd">``simple-double--three---four----''</kbd> <br>
</p>
<p>‘<!-- /@w -->‘simple-double-<!-- /@w
-->-three—four—-’<!-- /@w -->’<br>
</p>
-<a class="index-entry-anchor" id="index-copying-_002d_002doption"></a>
-<a class="index-entry-anchor" id="index-copying-_0060_0060"></a>
-<a class="index-entry-anchor" id="index-copying-_0060_0060-1"></a>
-<a class="index-entry-anchor" id="index-copying-_002d_002dfoption"></a>
+<a class="index-entry-id" id="index-copying-_002d_002doption"></a>
+<a class="index-entry-id" id="index-copying-_0060_0060"></a>
+<a class="index-entry-id" id="index-copying-_0060_0060-1"></a>
+<a class="index-entry-id" id="index-copying-_002d_002dfoption"></a>
<p>@"u ü
@"{U} Ü
@@ -3302,7 +3302,7 @@ error→ → - ∗ -| ⇒
</li></ul>
<ul class="itemize" style="list-style-type: '\2022 a\2013 n itemize line'">
-<li><a class="index-entry-anchor"
id="index-copying-index-entry-within-itemize"></a>
+<li><a class="index-entry-id"
id="index-copying-index-entry-within-itemize"></a>
i–tem 1
</li><li>i–tem 2
</li></ul>
@@ -3344,7 +3344,7 @@ i–tem 1
<thead><tr><th width="40%">mu–ltitable headitem</th><th
width="60%">another tab</th></tr></thead>
<tbody><tr><td width="40%">mu–ltitable item</td><td
width="60%">multitable tab</td></tr>
<tr><td width="40%">mu–ltitable item 2</td><td width="60%">multitable
tab 2
-<a class="index-entry-anchor"
id="index-copying-index-entry-within-multitable"></a></td></tr>
+<a class="index-entry-id"
id="index-copying-index-entry-within-multitable"></a></td></tr>
<tr><td width="40%">lone mu–ltitable item</td></tr>
</tbody>
</table>
@@ -3445,7 +3445,7 @@ f(x) = {1 \over \sigma \sqrt{2\pi}}e<sup class="sup">-{1
\over 2}\left({x-\mu \o
<dl class="first-deffn">
<dt class="deffn" id="index-copying-i"><span class="category-def">fset:
</span><span><strong class="strong"><var class="var">i</var></strong> <em
class="emph">a g</em><a class="copiable-anchor" href='#index-copying-i'>
¶</a></span></dt>
-<dd><a class="index-entry-anchor"
id="index-copying-index-entry-within-deffn"></a>
+<dd><a class="index-entry-id" id="index-copying-index-entry-within-deffn"></a>
</dd><dt class="deffnx def-cmd-deffn" id="index-copying-truc"><span
class="category-def">cmde: </span><span><strong class="strong">truc</strong>
<em class="emph"></em><a class="copiable-anchor" href='#index-copying-truc'>
¶</a></span></dt>
<dt class="deffnx def-cmd-deffn" id="index-copying-log-trap"><span
class="category-def">Command: </span><span><strong class="strong">log
trap</strong> <em class="emph"></em><a class="copiable-anchor"
href='#index-copying-log-trap'> ¶</a></span></dt>
<dt class="deffnx def-cmd-deffn" id="index-copying-log-trap1"><span
class="category-def">Command: </span><span><strong class="strong">log
trap1</strong> <em class="emph"></em><a class="copiable-anchor"
href='#index-copying-log-trap1'> ¶</a></span></dt>
@@ -3738,7 +3738,7 @@ ref</a>
<dl class="ftable">
<dt id='index-copying-a-1'><span><em class="emph">a</em><a
class="copiable-anchor" href='#index-copying-a-1'> ¶</a></span></dt>
-<dd><a class="index-entry-anchor"
id="index-copying-index-entry-between-item-and-itemx"></a>
+<dd><a class="index-entry-id"
id="index-copying-index-entry-between-item-and-itemx"></a>
</dd>
<dt id='index-copying-b'><span><em class="emph">b</em><a
class="copiable-anchor" href='#index-copying-b'> ¶</a></span></dt>
<dd><p>l–ine
@@ -3880,7 +3880,7 @@ html ''
<dl class="ftable">
<dt id='index-copying-a-2'><span>a<a class="copiable-anchor"
href='#index-copying-a-2'> ¶</a></span></dt>
-<dd><a class="index-entry-anchor"
id="index-copying-index-entry-between-item-and-itemx-1"></a>
+<dd><a class="index-entry-id"
id="index-copying-index-entry-between-item-and-itemx-1"></a>
</dd>
<dt id='index-copying-b-1'><span>b<a class="copiable-anchor"
href='#index-copying-b-1'> ¶</a></span></dt>
<dd><p>l–ine
@@ -3954,10 +3954,10 @@ kbd: <kbd
class="kbd">``simple-double--three---four----''</kbd> <br>
</p>
<p>‘<!-- /@w -->‘simple-double-<!-- /@w
-->-three—four—-’<!-- /@w -->’<br>
</p>
-<a class="index-entry-anchor" id="index-_002d_002doption"></a>
-<a class="index-entry-anchor" id="index-_0060_0060"></a>
-<a class="index-entry-anchor" id="index-_0060_0060-2"></a>
-<a class="index-entry-anchor" id="index-_002d_002dfoption"></a>
+<a class="index-entry-id" id="index-_002d_002doption"></a>
+<a class="index-entry-id" id="index-_0060_0060"></a>
+<a class="index-entry-id" id="index-_0060_0060-2"></a>
+<a class="index-entry-id" id="index-_002d_002dfoption"></a>
<p>@"u ü
@"{U} Ü
@@ -4316,7 +4316,7 @@ error→ → - ∗ -| ⇒
</li></ul>
<ul class="itemize" style="list-style-type: '\2022 a\2013 n itemize line'">
-<li><a class="index-entry-anchor" id="index-index-entry-within-itemize"></a>
+<li><a class="index-entry-id" id="index-index-entry-within-itemize"></a>
i–tem 1
</li><li>i–tem 2
</li></ul>
@@ -4358,7 +4358,7 @@ i–tem 1
<thead><tr><th width="40%">mu–ltitable headitem</th><th
width="60%">another tab</th></tr></thead>
<tbody><tr><td width="40%">mu–ltitable item</td><td
width="60%">multitable tab</td></tr>
<tr><td width="40%">mu–ltitable item 2</td><td width="60%">multitable
tab 2
-<a class="index-entry-anchor"
id="index-index-entry-within-multitable"></a></td></tr>
+<a class="index-entry-id"
id="index-index-entry-within-multitable"></a></td></tr>
<tr><td width="40%">lone mu–ltitable item</td></tr>
</tbody>
</table>
@@ -4459,7 +4459,7 @@ f(x) = {1 \over \sigma \sqrt{2\pi}}e<sup class="sup">-{1
\over 2}\left({x-\mu \o
<dl class="first-deffn">
<dt class="deffn" id="index-i"><span class="category-def">fset:
</span><span><strong class="strong"><var class="var">i</var></strong> <em
class="emph">a g</em><a class="copiable-anchor" href='#index-i'>
¶</a></span></dt>
-<dd><a class="index-entry-anchor" id="index-index-entry-within-deffn"></a>
+<dd><a class="index-entry-id" id="index-index-entry-within-deffn"></a>
</dd><dt class="deffnx def-cmd-deffn" id="index-truc"><span
class="category-def">cmde: </span><span><strong class="strong">truc</strong>
<em class="emph"></em><a class="copiable-anchor" href='#index-truc'>
¶</a></span></dt>
<dt class="deffnx def-cmd-deffn" id="index-log-trap"><span
class="category-def">Command: </span><span><strong class="strong">log
trap</strong> <em class="emph"></em><a class="copiable-anchor"
href='#index-log-trap'> ¶</a></span></dt>
<dt class="deffnx def-cmd-deffn" id="index-log-trap1"><span
class="category-def">Command: </span><span><strong class="strong">log
trap1</strong> <em class="emph"></em><a class="copiable-anchor"
href='#index-log-trap1'> ¶</a></span></dt>
@@ -4752,7 +4752,7 @@ ref</a>
<dl class="ftable">
<dt id='index-a-2'><span><em class="emph">a</em><a class="copiable-anchor"
href='#index-a-2'> ¶</a></span></dt>
-<dd><a class="index-entry-anchor"
id="index-index-entry-between-item-and-itemx"></a>
+<dd><a class="index-entry-id"
id="index-index-entry-between-item-and-itemx"></a>
</dd>
<dt id='index-b'><span><em class="emph">b</em><a class="copiable-anchor"
href='#index-b'> ¶</a></span></dt>
<dd><p>l–ine
@@ -4894,7 +4894,7 @@ html ''
<dl class="ftable">
<dt id='index-a-3'><span>a<a class="copiable-anchor" href='#index-a-3'>
¶</a></span></dt>
-<dd><a class="index-entry-anchor"
id="index-index-entry-between-item-and-itemx-1"></a>
+<dd><a class="index-entry-id"
id="index-index-entry-between-item-and-itemx-1"></a>
</dd>
<dt id='index-b-1'><span>b<a class="copiable-anchor" href='#index-b-1'>
¶</a></span></dt>
<dd><p>l–ine
@@ -4976,7 +4976,7 @@ kbd: <kbd
class="kbd">``simple-double--three---four----''</kbd>
`<!-- /@w -->`simple-double-<!-- /@w -->-three---four----'<!-- /@w -->'
-<a class="index-entry-anchor" id="index-_002d_002doption-1"></a><a
class="index-entry-anchor" id="index-_0060_0060-1"></a><a
class="index-entry-anchor" id="index-_0060_0060-3"></a><a
class="index-entry-anchor" id="index-_002d_002dfoption-1"></a>
+<a class="index-entry-id" id="index-_002d_002doption-1"></a><a
class="index-entry-id" id="index-_0060_0060-1"></a><a class="index-entry-id"
id="index-_0060_0060-3"></a><a class="index-entry-id"
id="index-_002d_002dfoption-1"></a>
@"u ü
@"{U} Ü
@~n ñ
@@ -5374,7 +5374,7 @@ error→ → - ∗ -| ⇒
<pre class="example-preformatted">
</pre><ul class="itemize" style="list-style-type: '\2022 a\2013 n itemize
line'">
-<li><pre class="example-preformatted"><a class="index-entry-anchor"
id="index-index-entry-within-itemize-1"></a>i--tem 1
+<li><pre class="example-preformatted"><a class="index-entry-id"
id="index-index-entry-within-itemize-1"></a>i--tem 1
</pre></li><li><pre class="example-preformatted">i--tem 2
</pre></li></ul>
<pre class="example-preformatted">
@@ -5423,7 +5423,7 @@ error→ → - ∗ -| ⇒
<thead><tr><th width="40%"><pre class="example-preformatted">mu--ltitable
headitem</pre></th><th width="60%"><pre class="example-preformatted">another
tab</pre></th></tr></thead>
<tbody><tr><td width="40%"><pre class="example-preformatted">mu--ltitable
item</pre></td><td width="60%"><pre class="example-preformatted">multitable
tab</pre></td></tr>
<tr><td width="40%"><pre class="example-preformatted">mu--ltitable item
2</pre></td><td width="60%"><pre class="example-preformatted">multitable tab 2
-<a class="index-entry-anchor"
id="index-index-entry-within-multitable-1"></a></pre></td></tr>
+<a class="index-entry-id"
id="index-index-entry-within-multitable-1"></a></pre></td></tr>
<tr><td width="40%"><pre class="example-preformatted">lone mu--ltitable
item</pre></td></tr>
</tbody>
</table>
@@ -5546,7 +5546,7 @@ f(x) = {1 \over \sigma \sqrt{2\pi}}e<sup class="sup">-{1
\over 2}\left({x-\mu \o
<pre class="example-preformatted">
</pre><dl class="first-deffn">
<dt class="deffn" id="index-i-2"><span class="category-def">fset:
</span><span><strong class="strong"><var class="var">i</var></strong> <em
class="emph">a g</em><a class="copiable-anchor" href='#index-i-2'>
¶</a></span></dt>
-<dd><pre class="example-preformatted"><a class="index-entry-anchor"
id="index-index-entry-within-deffn-1"></a></pre></dd><dt class="deffnx
def-cmd-deffn" id="index-truc-2"><span class="category-def">cmde:
</span><span><strong class="strong">truc</strong> <em class="emph"></em><a
class="copiable-anchor" href='#index-truc-2'> ¶</a></span></dt>
+<dd><pre class="example-preformatted"><a class="index-entry-id"
id="index-index-entry-within-deffn-1"></a></pre></dd><dt class="deffnx
def-cmd-deffn" id="index-truc-2"><span class="category-def">cmde:
</span><span><strong class="strong">truc</strong> <em class="emph"></em><a
class="copiable-anchor" href='#index-truc-2'> ¶</a></span></dt>
<dt class="deffnx def-cmd-deffn" id="index-log-trap-1"><span
class="category-def">Command: </span><span><strong class="strong">log
trap</strong> <em class="emph"></em><a class="copiable-anchor"
href='#index-log-trap-1'> ¶</a></span></dt>
<dt class="deffnx def-cmd-deffn" id="index-log-trap1-1"><span
class="category-def">Command: </span><span><strong class="strong">log
trap1</strong> <em class="emph"></em><a class="copiable-anchor"
href='#index-log-trap1-1'> ¶</a></span></dt>
<dt class="deffnx def-cmd-deffn" id="index-log-trap2-1"><span
class="category-def">Command: </span><span><strong class="strong">log
trap2</strong> <em class="emph"></em><a class="copiable-anchor"
href='#index-log-trap2-1'> ¶</a></span></dt>
@@ -5890,7 +5890,7 @@ ref</a>
</pre><dl class="ftable">
<dt id='index-a-5'><span><tt><em class="emph">a</em></tt><a
class="copiable-anchor" href='#index-a-5'> ¶</a></span></dt>
-<dd><pre class="example-preformatted"><a class="index-entry-anchor"
id="index-index-entry-between-item-and-itemx-2"></a></pre></dd>
+<dd><pre class="example-preformatted"><a class="index-entry-id"
id="index-index-entry-between-item-and-itemx-2"></a></pre></dd>
<dt id='index-b-2'><span><tt><em class="emph">b</em></tt><a
class="copiable-anchor" href='#index-b-2'> ¶</a></span></dt>
<dd><pre class="example-preformatted">l--ine
</pre></dd>
@@ -6056,7 +6056,7 @@ Invalid use of @':
</pre><dl class="ftable">
<dt id='index-a-6'><span><tt>a</tt><a class="copiable-anchor"
href='#index-a-6'> ¶</a></span></dt>
-<dd><pre class="example-preformatted"><a class="index-entry-anchor"
id="index-index-entry-between-item-and-itemx-3"></a></pre></dd>
+<dd><pre class="example-preformatted"><a class="index-entry-id"
id="index-index-entry-between-item-and-itemx-3"></a></pre></dd>
<dt id='index-b-3'><span><tt>b</tt><a class="copiable-anchor"
href='#index-b-3'> ¶</a></span></dt>
<dd><pre class="example-preformatted">l--ine
</pre></dd>
@@ -6115,38 +6115,38 @@ Invalid use of @':
</pre></div>
-<a class="index-entry-anchor" id="index-t_002d_002druc"></a>
-<a class="index-entry-anchor" id="index-T_002d_002druc"></a>
-<a class="index-entry-anchor" id="index-_002e"></a>
-<a class="index-entry-anchor" id="index-_003f"></a>
-<a class="index-entry-anchor" id="index-a"></a>
-<a class="index-entry-anchor" id="index-t_002d_002druc-1"></a>
-<a class="index-entry-anchor" id="index-T_002d_002druc-1"></a>
-<a class="index-entry-anchor" id="index-_002e-1"></a>
-<a class="index-entry-anchor" id="index-_003f-1"></a>
-<a class="index-entry-anchor" id="index-a-7"></a>
+<a class="index-entry-id" id="index-t_002d_002druc"></a>
+<a class="index-entry-id" id="index-T_002d_002druc"></a>
+<a class="index-entry-id" id="index-_002e"></a>
+<a class="index-entry-id" id="index-_003f"></a>
+<a class="index-entry-id" id="index-a"></a>
+<a class="index-entry-id" id="index-t_002d_002druc-1"></a>
+<a class="index-entry-id" id="index-T_002d_002druc-1"></a>
+<a class="index-entry-id" id="index-_002e-1"></a>
+<a class="index-entry-id" id="index-_003f-1"></a>
+<a class="index-entry-id" id="index-a-7"></a>
-<a class="index-entry-anchor" id="index-a_002d_002d_002da"></a>
-<a class="index-entry-anchor" id="index-b_002d_002d_002db"></a>
-<a class="index-entry-anchor" id="index-d_002d_002d_002ddd"></a>
-<a class="index-entry-anchor" id="index-g_002d_002d_002dgg"></a>
+<a class="index-entry-id" id="index-a_002d_002d_002da"></a>
+<a class="index-entry-id" id="index-b_002d_002d_002db"></a>
+<a class="index-entry-id" id="index-d_002d_002d_002ddd"></a>
+<a class="index-entry-id" id="index-g_002d_002d_002dgg"></a>
-<a class="index-entry-anchor" id="index-f_002d_002d_002daa"></a>
-<a class="index-entry-anchor" id="index-f_002d_002d_002dbb"></a>
-<a class="index-entry-anchor" id="index-f_002d_002d_002dddd"></a>
-<a class="index-entry-anchor" id="index-f_002d_002d_002dggg"></a>
+<a class="index-entry-id" id="index-f_002d_002d_002daa"></a>
+<a class="index-entry-id" id="index-f_002d_002d_002dbb"></a>
+<a class="index-entry-id" id="index-f_002d_002d_002dddd"></a>
+<a class="index-entry-id" id="index-f_002d_002d_002dggg"></a>
-<a class="index-entry-anchor" id="index-aaa"></a>
+<a class="index-entry-id" id="index-aaa"></a>
-<a class="index-entry-anchor" id="index-xxx"></a>
+<a class="index-entry-id" id="index-xxx"></a>
-<a class="index-entry-anchor" id="index-"></a>
+<a class="index-entry-id" id="index-"></a>
-<a class="index-entry-anchor"
id="index-a-index_002d_002d_002dentry-te-_002d_002d_002d-i"></a>
+<a class="index-entry-id"
id="index-a-index_002d_002d_002dentry-te-_002d_002d_002d-i"></a>
-<a class="index-entry-anchor" id="index-truc-4"></a>
+<a class="index-entry-id" id="index-truc-4"></a>
<p>Text<a class="footnote" id="DOCF9" href="#FOOT9"><sup>11</sup></a>
@@ -7441,13 +7441,13 @@ Menu comment
<p>in footnote2</p>
<h5><a id="FOOT9" href="#DOCF9">(11)</a></h5>
<p>in footnote
-<a class="index-entry-anchor" id="index-index-entry-in-footnote"></a>
+<a class="index-entry-id" id="index-index-entry-in-footnote"></a>
</p>
<p>Blah
</p>
<p>Blih
</p>
-<a class="index-entry-anchor" id="index-counting-entry"></a>
+<a class="index-entry-id" id="index-counting-entry"></a>
<h5><a id="FOOT10" href="#DOCF10">(12)</a></h5>
<p>in footnote</p>
</div><hr>
diff --git a/tp/tests/layout/res_parser/formatting_chm/chapter.html
b/tp/tests/layout/res_parser/formatting_chm/chapter.html
index 3220e28eff..a57334e13f 100644
--- a/tp/tests/layout/res_parser/formatting_chm/chapter.html
+++ b/tp/tests/layout/res_parser/formatting_chm/chapter.html
@@ -855,10 +855,10 @@ kbd: <kbd
class="kbd">``simple-double--three---four----''</kbd> <br>
</p>
<p>‘<!-- /@w -->‘simple-double-<!-- /@w
-->-three—four—-’<!-- /@w -->’<br>
</p>
-<a class="index-entry-anchor" id="index-copying-_002d_002doption"></a>
-<a class="index-entry-anchor" id="index-copying-_0060_0060"></a>
-<a class="index-entry-anchor" id="index-copying-_0060_0060-1"></a>
-<a class="index-entry-anchor" id="index-copying-_002d_002dfoption"></a>
+<a class="index-entry-id" id="index-copying-_002d_002doption"></a>
+<a class="index-entry-id" id="index-copying-_0060_0060"></a>
+<a class="index-entry-id" id="index-copying-_0060_0060-1"></a>
+<a class="index-entry-id" id="index-copying-_002d_002dfoption"></a>
<p>@"u ü
@"{U} Ü
@@ -1217,7 +1217,7 @@ error→ → - ∗ -| ⇒
</li></ul>
<ul class="itemize" style="list-style-type: '\2022 a\2013 n itemize line'">
-<li><a class="index-entry-anchor"
id="index-copying-index-entry-within-itemize"></a>
+<li><a class="index-entry-id"
id="index-copying-index-entry-within-itemize"></a>
i–tem 1
</li><li>i–tem 2
</li></ul>
@@ -1259,7 +1259,7 @@ i–tem 1
<thead><tr><th width="40%">mu–ltitable headitem</th><th
width="60%">another tab</th></tr></thead>
<tbody><tr><td width="40%">mu–ltitable item</td><td
width="60%">multitable tab</td></tr>
<tr><td width="40%">mu–ltitable item 2</td><td width="60%">multitable
tab 2
-<a class="index-entry-anchor"
id="index-copying-index-entry-within-multitable"></a></td></tr>
+<a class="index-entry-id"
id="index-copying-index-entry-within-multitable"></a></td></tr>
<tr><td width="40%">lone mu–ltitable item</td></tr>
</tbody>
</table>
@@ -1360,7 +1360,7 @@ f(x) = {1 \over \sigma \sqrt{2\pi}}e<sup class="sup">-{1
\over 2}\left({x-\mu \o
<dl class="first-deffn">
<dt class="deffn" id="index-copying-i"><span class="category-def">fset:
</span><span><strong class="strong"><var class="var">i</var></strong> <em
class="emph">a g</em><a class="copiable-anchor" href='#index-copying-i'>
¶</a></span></dt>
-<dd><a class="index-entry-anchor"
id="index-copying-index-entry-within-deffn"></a>
+<dd><a class="index-entry-id" id="index-copying-index-entry-within-deffn"></a>
</dd><dt class="deffnx def-cmd-deffn" id="index-copying-truc"><span
class="category-def">cmde: </span><span><strong class="strong">truc</strong>
<em class="emph"></em><a class="copiable-anchor" href='#index-copying-truc'>
¶</a></span></dt>
<dt class="deffnx def-cmd-deffn" id="index-copying-log-trap"><span
class="category-def">Command: </span><span><strong class="strong">log
trap</strong> <em class="emph"></em><a class="copiable-anchor"
href='#index-copying-log-trap'> ¶</a></span></dt>
<dt class="deffnx def-cmd-deffn" id="index-copying-log-trap1"><span
class="category-def">Command: </span><span><strong class="strong">log
trap1</strong> <em class="emph"></em><a class="copiable-anchor"
href='#index-copying-log-trap1'> ¶</a></span></dt>
@@ -1653,7 +1653,7 @@ ref</a>
<dl class="ftable">
<dt id='index-copying-a-1'><span><em class="emph">a</em><a
class="copiable-anchor" href='#index-copying-a-1'> ¶</a></span></dt>
-<dd><a class="index-entry-anchor"
id="index-copying-index-entry-between-item-and-itemx"></a>
+<dd><a class="index-entry-id"
id="index-copying-index-entry-between-item-and-itemx"></a>
</dd>
<dt id='index-copying-b'><span><em class="emph">b</em><a
class="copiable-anchor" href='#index-copying-b'> ¶</a></span></dt>
<dd><p>l–ine
@@ -1795,7 +1795,7 @@ html ''
<dl class="ftable">
<dt id='index-copying-a-2'><span>a<a class="copiable-anchor"
href='#index-copying-a-2'> ¶</a></span></dt>
-<dd><a class="index-entry-anchor"
id="index-copying-index-entry-between-item-and-itemx-1"></a>
+<dd><a class="index-entry-id"
id="index-copying-index-entry-between-item-and-itemx-1"></a>
</dd>
<dt id='index-copying-b-1'><span>b<a class="copiable-anchor"
href='#index-copying-b-1'> ¶</a></span></dt>
<dd><p>l–ine
@@ -1869,10 +1869,10 @@ kbd: <kbd
class="kbd">``simple-double--three---four----''</kbd> <br>
</p>
<p>‘<!-- /@w -->‘simple-double-<!-- /@w
-->-three—four—-’<!-- /@w -->’<br>
</p>
-<a class="index-entry-anchor" id="index-_002d_002doption"></a>
-<a class="index-entry-anchor" id="index-_0060_0060"></a>
-<a class="index-entry-anchor" id="index-_0060_0060-2"></a>
-<a class="index-entry-anchor" id="index-_002d_002dfoption"></a>
+<a class="index-entry-id" id="index-_002d_002doption"></a>
+<a class="index-entry-id" id="index-_0060_0060"></a>
+<a class="index-entry-id" id="index-_0060_0060-2"></a>
+<a class="index-entry-id" id="index-_002d_002dfoption"></a>
<p>@"u ü
@"{U} Ü
@@ -2231,7 +2231,7 @@ error→ → - ∗ -| ⇒
</li></ul>
<ul class="itemize" style="list-style-type: '\2022 a\2013 n itemize line'">
-<li><a class="index-entry-anchor" id="index-index-entry-within-itemize"></a>
+<li><a class="index-entry-id" id="index-index-entry-within-itemize"></a>
i–tem 1
</li><li>i–tem 2
</li></ul>
@@ -2273,7 +2273,7 @@ i–tem 1
<thead><tr><th width="40%">mu–ltitable headitem</th><th
width="60%">another tab</th></tr></thead>
<tbody><tr><td width="40%">mu–ltitable item</td><td
width="60%">multitable tab</td></tr>
<tr><td width="40%">mu–ltitable item 2</td><td width="60%">multitable
tab 2
-<a class="index-entry-anchor"
id="index-index-entry-within-multitable"></a></td></tr>
+<a class="index-entry-id"
id="index-index-entry-within-multitable"></a></td></tr>
<tr><td width="40%">lone mu–ltitable item</td></tr>
</tbody>
</table>
@@ -2374,7 +2374,7 @@ f(x) = {1 \over \sigma \sqrt{2\pi}}e<sup class="sup">-{1
\over 2}\left({x-\mu \o
<dl class="first-deffn">
<dt class="deffn" id="index-i"><span class="category-def">fset:
</span><span><strong class="strong"><var class="var">i</var></strong> <em
class="emph">a g</em><a class="copiable-anchor" href='#index-i'>
¶</a></span></dt>
-<dd><a class="index-entry-anchor" id="index-index-entry-within-deffn"></a>
+<dd><a class="index-entry-id" id="index-index-entry-within-deffn"></a>
</dd><dt class="deffnx def-cmd-deffn" id="index-truc"><span
class="category-def">cmde: </span><span><strong class="strong">truc</strong>
<em class="emph"></em><a class="copiable-anchor" href='#index-truc'>
¶</a></span></dt>
<dt class="deffnx def-cmd-deffn" id="index-log-trap"><span
class="category-def">Command: </span><span><strong class="strong">log
trap</strong> <em class="emph"></em><a class="copiable-anchor"
href='#index-log-trap'> ¶</a></span></dt>
<dt class="deffnx def-cmd-deffn" id="index-log-trap1"><span
class="category-def">Command: </span><span><strong class="strong">log
trap1</strong> <em class="emph"></em><a class="copiable-anchor"
href='#index-log-trap1'> ¶</a></span></dt>
@@ -2667,7 +2667,7 @@ ref</a>
<dl class="ftable">
<dt id='index-a-2'><span><em class="emph">a</em><a class="copiable-anchor"
href='#index-a-2'> ¶</a></span></dt>
-<dd><a class="index-entry-anchor"
id="index-index-entry-between-item-and-itemx"></a>
+<dd><a class="index-entry-id"
id="index-index-entry-between-item-and-itemx"></a>
</dd>
<dt id='index-b'><span><em class="emph">b</em><a class="copiable-anchor"
href='#index-b'> ¶</a></span></dt>
<dd><p>l–ine
@@ -2809,7 +2809,7 @@ html ''
<dl class="ftable">
<dt id='index-a-3'><span>a<a class="copiable-anchor" href='#index-a-3'>
¶</a></span></dt>
-<dd><a class="index-entry-anchor"
id="index-index-entry-between-item-and-itemx-1"></a>
+<dd><a class="index-entry-id"
id="index-index-entry-between-item-and-itemx-1"></a>
</dd>
<dt id='index-b-1'><span>b<a class="copiable-anchor" href='#index-b-1'>
¶</a></span></dt>
<dd><p>l–ine
@@ -2891,7 +2891,7 @@ kbd: <kbd
class="kbd">``simple-double--three---four----''</kbd>
`<!-- /@w -->`simple-double-<!-- /@w -->-three---four----'<!-- /@w -->'
-<a class="index-entry-anchor" id="index-_002d_002doption-1"></a><a
class="index-entry-anchor" id="index-_0060_0060-1"></a><a
class="index-entry-anchor" id="index-_0060_0060-3"></a><a
class="index-entry-anchor" id="index-_002d_002dfoption-1"></a>
+<a class="index-entry-id" id="index-_002d_002doption-1"></a><a
class="index-entry-id" id="index-_0060_0060-1"></a><a class="index-entry-id"
id="index-_0060_0060-3"></a><a class="index-entry-id"
id="index-_002d_002dfoption-1"></a>
@"u ü
@"{U} Ü
@~n ñ
@@ -3289,7 +3289,7 @@ error→ → - ∗ -| ⇒
<pre class="example-preformatted">
</pre><ul class="itemize" style="list-style-type: '\2022 a\2013 n itemize
line'">
-<li><pre class="example-preformatted"><a class="index-entry-anchor"
id="index-index-entry-within-itemize-1"></a>i--tem 1
+<li><pre class="example-preformatted"><a class="index-entry-id"
id="index-index-entry-within-itemize-1"></a>i--tem 1
</pre></li><li><pre class="example-preformatted">i--tem 2
</pre></li></ul>
<pre class="example-preformatted">
@@ -3338,7 +3338,7 @@ error→ → - ∗ -| ⇒
<thead><tr><th width="40%"><pre class="example-preformatted">mu--ltitable
headitem</pre></th><th width="60%"><pre class="example-preformatted">another
tab</pre></th></tr></thead>
<tbody><tr><td width="40%"><pre class="example-preformatted">mu--ltitable
item</pre></td><td width="60%"><pre class="example-preformatted">multitable
tab</pre></td></tr>
<tr><td width="40%"><pre class="example-preformatted">mu--ltitable item
2</pre></td><td width="60%"><pre class="example-preformatted">multitable tab 2
-<a class="index-entry-anchor"
id="index-index-entry-within-multitable-1"></a></pre></td></tr>
+<a class="index-entry-id"
id="index-index-entry-within-multitable-1"></a></pre></td></tr>
<tr><td width="40%"><pre class="example-preformatted">lone mu--ltitable
item</pre></td></tr>
</tbody>
</table>
@@ -3461,7 +3461,7 @@ f(x) = {1 \over \sigma \sqrt{2\pi}}e<sup class="sup">-{1
\over 2}\left({x-\mu \o
<pre class="example-preformatted">
</pre><dl class="first-deffn">
<dt class="deffn" id="index-i-2"><span class="category-def">fset:
</span><span><strong class="strong"><var class="var">i</var></strong> <em
class="emph">a g</em><a class="copiable-anchor" href='#index-i-2'>
¶</a></span></dt>
-<dd><pre class="example-preformatted"><a class="index-entry-anchor"
id="index-index-entry-within-deffn-1"></a></pre></dd><dt class="deffnx
def-cmd-deffn" id="index-truc-2"><span class="category-def">cmde:
</span><span><strong class="strong">truc</strong> <em class="emph"></em><a
class="copiable-anchor" href='#index-truc-2'> ¶</a></span></dt>
+<dd><pre class="example-preformatted"><a class="index-entry-id"
id="index-index-entry-within-deffn-1"></a></pre></dd><dt class="deffnx
def-cmd-deffn" id="index-truc-2"><span class="category-def">cmde:
</span><span><strong class="strong">truc</strong> <em class="emph"></em><a
class="copiable-anchor" href='#index-truc-2'> ¶</a></span></dt>
<dt class="deffnx def-cmd-deffn" id="index-log-trap-1"><span
class="category-def">Command: </span><span><strong class="strong">log
trap</strong> <em class="emph"></em><a class="copiable-anchor"
href='#index-log-trap-1'> ¶</a></span></dt>
<dt class="deffnx def-cmd-deffn" id="index-log-trap1-1"><span
class="category-def">Command: </span><span><strong class="strong">log
trap1</strong> <em class="emph"></em><a class="copiable-anchor"
href='#index-log-trap1-1'> ¶</a></span></dt>
<dt class="deffnx def-cmd-deffn" id="index-log-trap2-1"><span
class="category-def">Command: </span><span><strong class="strong">log
trap2</strong> <em class="emph"></em><a class="copiable-anchor"
href='#index-log-trap2-1'> ¶</a></span></dt>
@@ -3805,7 +3805,7 @@ ref</a>
</pre><dl class="ftable">
<dt id='index-a-5'><span><tt><em class="emph">a</em></tt><a
class="copiable-anchor" href='#index-a-5'> ¶</a></span></dt>
-<dd><pre class="example-preformatted"><a class="index-entry-anchor"
id="index-index-entry-between-item-and-itemx-2"></a></pre></dd>
+<dd><pre class="example-preformatted"><a class="index-entry-id"
id="index-index-entry-between-item-and-itemx-2"></a></pre></dd>
<dt id='index-b-2'><span><tt><em class="emph">b</em></tt><a
class="copiable-anchor" href='#index-b-2'> ¶</a></span></dt>
<dd><pre class="example-preformatted">l--ine
</pre></dd>
@@ -3971,7 +3971,7 @@ Invalid use of @':
</pre><dl class="ftable">
<dt id='index-a-6'><span><tt>a</tt><a class="copiable-anchor"
href='#index-a-6'> ¶</a></span></dt>
-<dd><pre class="example-preformatted"><a class="index-entry-anchor"
id="index-index-entry-between-item-and-itemx-3"></a></pre></dd>
+<dd><pre class="example-preformatted"><a class="index-entry-id"
id="index-index-entry-between-item-and-itemx-3"></a></pre></dd>
<dt id='index-b-3'><span><tt>b</tt><a class="copiable-anchor"
href='#index-b-3'> ¶</a></span></dt>
<dd><pre class="example-preformatted">l--ine
</pre></dd>
@@ -4030,38 +4030,38 @@ Invalid use of @':
</pre></div>
-<a class="index-entry-anchor" id="index-t_002d_002druc"></a>
-<a class="index-entry-anchor" id="index-T_002d_002druc"></a>
-<a class="index-entry-anchor" id="index-_002e"></a>
-<a class="index-entry-anchor" id="index-_003f"></a>
-<a class="index-entry-anchor" id="index-a"></a>
-<a class="index-entry-anchor" id="index-t_002d_002druc-1"></a>
-<a class="index-entry-anchor" id="index-T_002d_002druc-1"></a>
-<a class="index-entry-anchor" id="index-_002e-1"></a>
-<a class="index-entry-anchor" id="index-_003f-1"></a>
-<a class="index-entry-anchor" id="index-a-7"></a>
+<a class="index-entry-id" id="index-t_002d_002druc"></a>
+<a class="index-entry-id" id="index-T_002d_002druc"></a>
+<a class="index-entry-id" id="index-_002e"></a>
+<a class="index-entry-id" id="index-_003f"></a>
+<a class="index-entry-id" id="index-a"></a>
+<a class="index-entry-id" id="index-t_002d_002druc-1"></a>
+<a class="index-entry-id" id="index-T_002d_002druc-1"></a>
+<a class="index-entry-id" id="index-_002e-1"></a>
+<a class="index-entry-id" id="index-_003f-1"></a>
+<a class="index-entry-id" id="index-a-7"></a>
-<a class="index-entry-anchor" id="index-a_002d_002d_002da"></a>
-<a class="index-entry-anchor" id="index-b_002d_002d_002db"></a>
-<a class="index-entry-anchor" id="index-d_002d_002d_002ddd"></a>
-<a class="index-entry-anchor" id="index-g_002d_002d_002dgg"></a>
+<a class="index-entry-id" id="index-a_002d_002d_002da"></a>
+<a class="index-entry-id" id="index-b_002d_002d_002db"></a>
+<a class="index-entry-id" id="index-d_002d_002d_002ddd"></a>
+<a class="index-entry-id" id="index-g_002d_002d_002dgg"></a>
-<a class="index-entry-anchor" id="index-f_002d_002d_002daa"></a>
-<a class="index-entry-anchor" id="index-f_002d_002d_002dbb"></a>
-<a class="index-entry-anchor" id="index-f_002d_002d_002dddd"></a>
-<a class="index-entry-anchor" id="index-f_002d_002d_002dggg"></a>
+<a class="index-entry-id" id="index-f_002d_002d_002daa"></a>
+<a class="index-entry-id" id="index-f_002d_002d_002dbb"></a>
+<a class="index-entry-id" id="index-f_002d_002d_002dddd"></a>
+<a class="index-entry-id" id="index-f_002d_002d_002dggg"></a>
-<a class="index-entry-anchor" id="index-aaa"></a>
+<a class="index-entry-id" id="index-aaa"></a>
-<a class="index-entry-anchor" id="index-xxx"></a>
+<a class="index-entry-id" id="index-xxx"></a>
-<a class="index-entry-anchor" id="index-"></a>
+<a class="index-entry-id" id="index-"></a>
-<a class="index-entry-anchor"
id="index-a-index_002d_002d_002dentry-te-_002d_002d_002d-i"></a>
+<a class="index-entry-id"
id="index-a-index_002d_002d_002dentry-te-_002d_002d_002d-i"></a>
-<a class="index-entry-anchor" id="index-truc-4"></a>
+<a class="index-entry-id" id="index-truc-4"></a>
<p>Text<a class="footnote" id="DOCF9" href="#FOOT9"><sup>11</sup></a>
@@ -4681,13 +4681,13 @@ Invalid use of @':
<p>in footnote2</p>
<h5><a id="FOOT9" href="#DOCF9">(11)</a></h5>
<p>in footnote
-<a class="index-entry-anchor" id="index-index-entry-in-footnote"></a>
+<a class="index-entry-id" id="index-index-entry-in-footnote"></a>
</p>
<p>Blah
</p>
<p>Blih
</p>
-<a class="index-entry-anchor" id="index-counting-entry"></a>
+<a class="index-entry-id" id="index-counting-entry"></a>
<h5><a id="FOOT10" href="#DOCF10">(12)</a></h5>
<p>in footnote</p>
</div>
diff --git a/tp/tests/layout/res_parser/formatting_chm/formatting.html
b/tp/tests/layout/res_parser/formatting_chm/formatting.html
index 3805ba90a9..94eade9847 100644
--- a/tp/tests/layout/res_parser/formatting_chm/formatting.html
+++ b/tp/tests/layout/res_parser/formatting_chm/formatting.html
@@ -847,10 +847,10 @@ kbd: <kbd
class="kbd">``simple-double--three---four----''</kbd> <br>
</p>
<p>‘<!-- /@w -->‘simple-double-<!-- /@w
-->-three—four—-’<!-- /@w -->’<br>
</p>
-<a class="index-entry-anchor" id="index-titlepage-_002d_002doption"></a>
-<a class="index-entry-anchor" id="index-titlepage-_0060_0060"></a>
-<a class="index-entry-anchor" id="index-titlepage-_0060_0060-1"></a>
-<a class="index-entry-anchor" id="index-titlepage-_002d_002dfoption"></a>
+<a class="index-entry-id" id="index-titlepage-_002d_002doption"></a>
+<a class="index-entry-id" id="index-titlepage-_0060_0060"></a>
+<a class="index-entry-id" id="index-titlepage-_0060_0060-1"></a>
+<a class="index-entry-id" id="index-titlepage-_002d_002dfoption"></a>
<p>@"u ü
@"{U} Ü
@@ -1210,7 +1210,7 @@ error→ → - ∗ -| ⇒
</li></ul>
<ul class="itemize" style="list-style-type: '\2022 a\2013 n itemize line'">
-<li><a class="index-entry-anchor"
id="index-titlepage-index-entry-within-itemize"></a>
+<li><a class="index-entry-id"
id="index-titlepage-index-entry-within-itemize"></a>
i–tem 1
</li><li>i–tem 2
</li></ul>
@@ -1252,7 +1252,7 @@ i–tem 1
<thead><tr><th width="40%">mu–ltitable headitem</th><th
width="60%">another tab</th></tr></thead>
<tbody><tr><td width="40%">mu–ltitable item</td><td
width="60%">multitable tab</td></tr>
<tr><td width="40%">mu–ltitable item 2</td><td width="60%">multitable
tab 2
-<a class="index-entry-anchor"
id="index-titlepage-index-entry-within-multitable"></a></td></tr>
+<a class="index-entry-id"
id="index-titlepage-index-entry-within-multitable"></a></td></tr>
<tr><td width="40%">lone mu–ltitable item</td></tr>
</tbody>
</table>
@@ -1353,7 +1353,7 @@ f(x) = {1 \over \sigma \sqrt{2\pi}}e<sup class="sup">-{1
\over 2}\left({x-\mu \o
<dl class="first-deffn">
<dt class="deffn" id="index-titlepage-i"><span class="category-def">fset:
</span><span><strong class="strong"><var class="var">i</var></strong> <em
class="emph">a g</em><a class="copiable-anchor" href='#index-titlepage-i'>
¶</a></span></dt>
-<dd><a class="index-entry-anchor"
id="index-titlepage-index-entry-within-deffn"></a>
+<dd><a class="index-entry-id"
id="index-titlepage-index-entry-within-deffn"></a>
</dd><dt class="deffnx def-cmd-deffn" id="index-titlepage-truc"><span
class="category-def">cmde: </span><span><strong class="strong">truc</strong>
<em class="emph"></em><a class="copiable-anchor" href='#index-titlepage-truc'>
¶</a></span></dt>
<dt class="deffnx def-cmd-deffn" id="index-titlepage-log-trap"><span
class="category-def">Command: </span><span><strong class="strong">log
trap</strong> <em class="emph"></em><a class="copiable-anchor"
href='#index-titlepage-log-trap'> ¶</a></span></dt>
<dt class="deffnx def-cmd-deffn" id="index-titlepage-log-trap1"><span
class="category-def">Command: </span><span><strong class="strong">log
trap1</strong> <em class="emph"></em><a class="copiable-anchor"
href='#index-titlepage-log-trap1'> ¶</a></span></dt>
@@ -1646,7 +1646,7 @@ ref</a>
<dl class="ftable">
<dt id='index-titlepage-a-1'><span><em class="emph">a</em><a
class="copiable-anchor" href='#index-titlepage-a-1'> ¶</a></span></dt>
-<dd><a class="index-entry-anchor"
id="index-titlepage-index-entry-between-item-and-itemx"></a>
+<dd><a class="index-entry-id"
id="index-titlepage-index-entry-between-item-and-itemx"></a>
</dd>
<dt id='index-titlepage-b'><span><em class="emph">b</em><a
class="copiable-anchor" href='#index-titlepage-b'> ¶</a></span></dt>
<dd><p>l–ine
@@ -1788,7 +1788,7 @@ html ''
<dl class="ftable">
<dt id='index-titlepage-a-2'><span>a<a class="copiable-anchor"
href='#index-titlepage-a-2'> ¶</a></span></dt>
-<dd><a class="index-entry-anchor"
id="index-titlepage-index-entry-between-item-and-itemx-1"></a>
+<dd><a class="index-entry-id"
id="index-titlepage-index-entry-between-item-and-itemx-1"></a>
</dd>
<dt id='index-titlepage-b-1'><span>b<a class="copiable-anchor"
href='#index-titlepage-b-1'> ¶</a></span></dt>
<dd><p>l–ine
@@ -1863,10 +1863,10 @@ kbd: <kbd
class="kbd">``simple-double--three---four----''</kbd> <br>
</p>
<p>‘<!-- /@w -->‘simple-double-<!-- /@w
-->-three—four—-’<!-- /@w -->’<br>
</p>
-<a class="index-entry-anchor" id="index-copying-_002d_002doption"></a>
-<a class="index-entry-anchor" id="index-copying-_0060_0060"></a>
-<a class="index-entry-anchor" id="index-copying-_0060_0060-1"></a>
-<a class="index-entry-anchor" id="index-copying-_002d_002dfoption"></a>
+<a class="index-entry-id" id="index-copying-_002d_002doption"></a>
+<a class="index-entry-id" id="index-copying-_0060_0060"></a>
+<a class="index-entry-id" id="index-copying-_0060_0060-1"></a>
+<a class="index-entry-id" id="index-copying-_002d_002dfoption"></a>
<p>@"u ü
@"{U} Ü
@@ -2225,7 +2225,7 @@ error→ → - ∗ -| ⇒
</li></ul>
<ul class="itemize" style="list-style-type: '\2022 a\2013 n itemize line'">
-<li><a class="index-entry-anchor"
id="index-copying-index-entry-within-itemize"></a>
+<li><a class="index-entry-id"
id="index-copying-index-entry-within-itemize"></a>
i–tem 1
</li><li>i–tem 2
</li></ul>
@@ -2267,7 +2267,7 @@ i–tem 1
<thead><tr><th width="40%">mu–ltitable headitem</th><th
width="60%">another tab</th></tr></thead>
<tbody><tr><td width="40%">mu–ltitable item</td><td
width="60%">multitable tab</td></tr>
<tr><td width="40%">mu–ltitable item 2</td><td width="60%">multitable
tab 2
-<a class="index-entry-anchor"
id="index-copying-index-entry-within-multitable"></a></td></tr>
+<a class="index-entry-id"
id="index-copying-index-entry-within-multitable"></a></td></tr>
<tr><td width="40%">lone mu–ltitable item</td></tr>
</tbody>
</table>
@@ -2368,7 +2368,7 @@ f(x) = {1 \over \sigma \sqrt{2\pi}}e<sup class="sup">-{1
\over 2}\left({x-\mu \o
<dl class="first-deffn">
<dt class="deffn" id="index-copying-i"><span class="category-def">fset:
</span><span><strong class="strong"><var class="var">i</var></strong> <em
class="emph">a g</em><a class="copiable-anchor" href='#index-copying-i'>
¶</a></span></dt>
-<dd><a class="index-entry-anchor"
id="index-copying-index-entry-within-deffn"></a>
+<dd><a class="index-entry-id" id="index-copying-index-entry-within-deffn"></a>
</dd><dt class="deffnx def-cmd-deffn" id="index-copying-truc"><span
class="category-def">cmde: </span><span><strong class="strong">truc</strong>
<em class="emph"></em><a class="copiable-anchor" href='#index-copying-truc'>
¶</a></span></dt>
<dt class="deffnx def-cmd-deffn" id="index-copying-log-trap"><span
class="category-def">Command: </span><span><strong class="strong">log
trap</strong> <em class="emph"></em><a class="copiable-anchor"
href='#index-copying-log-trap'> ¶</a></span></dt>
<dt class="deffnx def-cmd-deffn" id="index-copying-log-trap1"><span
class="category-def">Command: </span><span><strong class="strong">log
trap1</strong> <em class="emph"></em><a class="copiable-anchor"
href='#index-copying-log-trap1'> ¶</a></span></dt>
@@ -2661,7 +2661,7 @@ ref</a>
<dl class="ftable">
<dt id='index-copying-a-1'><span><em class="emph">a</em><a
class="copiable-anchor" href='#index-copying-a-1'> ¶</a></span></dt>
-<dd><a class="index-entry-anchor"
id="index-copying-index-entry-between-item-and-itemx"></a>
+<dd><a class="index-entry-id"
id="index-copying-index-entry-between-item-and-itemx"></a>
</dd>
<dt id='index-copying-b'><span><em class="emph">b</em><a
class="copiable-anchor" href='#index-copying-b'> ¶</a></span></dt>
<dd><p>l–ine
@@ -2803,7 +2803,7 @@ html ''
<dl class="ftable">
<dt id='index-copying-a-2'><span>a<a class="copiable-anchor"
href='#index-copying-a-2'> ¶</a></span></dt>
-<dd><a class="index-entry-anchor"
id="index-copying-index-entry-between-item-and-itemx-1"></a>
+<dd><a class="index-entry-id"
id="index-copying-index-entry-between-item-and-itemx-1"></a>
</dd>
<dt id='index-copying-b-1'><span>b<a class="copiable-anchor"
href='#index-copying-b-1'> ¶</a></span></dt>
<dd><p>l–ine
diff --git
a/tp/tests/layout/res_parser/formatting_enable_encoding/formatting.html
b/tp/tests/layout/res_parser/formatting_enable_encoding/formatting.html
index 7b2e358c73..aacb6c7171 100644
--- a/tp/tests/layout/res_parser/formatting_enable_encoding/formatting.html
+++ b/tp/tests/layout/res_parser/formatting_enable_encoding/formatting.html
@@ -853,10 +853,10 @@ kbd: <kbd
class="kbd">``simple-double--three---four----''</kbd> <br>
</p>
<p>‘<!-- /@w -->‘simple-double-<!-- /@w -->-three—four—-’<!-- /@w -->’<br>
</p>
-<a class="index-entry-anchor" id="index-titlepage-_002d_002doption"></a>
-<a class="index-entry-anchor" id="index-titlepage-_0060_0060"></a>
-<a class="index-entry-anchor" id="index-titlepage-_0060_0060-1"></a>
-<a class="index-entry-anchor" id="index-titlepage-_002d_002dfoption"></a>
+<a class="index-entry-id" id="index-titlepage-_002d_002doption"></a>
+<a class="index-entry-id" id="index-titlepage-_0060_0060"></a>
+<a class="index-entry-id" id="index-titlepage-_0060_0060-1"></a>
+<a class="index-entry-id" id="index-titlepage-_002d_002dfoption"></a>
<p>@"u ü
@"{U} Ü
@@ -1216,7 +1216,7 @@ error→ ↦ − ★ ⊣ ⇒
</li></ul>
<ul class="itemize" style="list-style-type: '• a\2013 n itemize line'">
-<li><a class="index-entry-anchor"
id="index-titlepage-index-entry-within-itemize"></a>
+<li><a class="index-entry-id"
id="index-titlepage-index-entry-within-itemize"></a>
i–tem 1
</li><li>i–tem 2
</li></ul>
@@ -1258,7 +1258,7 @@ i–tem 1
<thead><tr><th width="40%">mu–ltitable headitem</th><th width="60%">another
tab</th></tr></thead>
<tbody><tr><td width="40%">mu–ltitable item</td><td width="60%">multitable
tab</td></tr>
<tr><td width="40%">mu–ltitable item 2</td><td width="60%">multitable tab 2
-<a class="index-entry-anchor"
id="index-titlepage-index-entry-within-multitable"></a></td></tr>
+<a class="index-entry-id"
id="index-titlepage-index-entry-within-multitable"></a></td></tr>
<tr><td width="40%">lone mu–ltitable item</td></tr>
</tbody>
</table>
@@ -1359,7 +1359,7 @@ f(x) = {1 \over \sigma \sqrt{2\pi}}e<sup class="sup">-{1
\over 2}\left({x-\mu \o
<dl class="first-deffn">
<dt class="deffn" id="index-titlepage-i"><span class="category-def">fset:
</span><span><strong class="strong"><var class="var">i</var></strong> <em
class="emph">a g</em><a class="copiable-anchor" href='#index-titlepage-i'>
¶</a></span></dt>
-<dd><a class="index-entry-anchor"
id="index-titlepage-index-entry-within-deffn"></a>
+<dd><a class="index-entry-id"
id="index-titlepage-index-entry-within-deffn"></a>
</dd><dt class="deffnx def-cmd-deffn" id="index-titlepage-truc"><span
class="category-def">cmde: </span><span><strong class="strong">truc</strong>
<em class="emph"></em><a class="copiable-anchor" href='#index-titlepage-truc'>
¶</a></span></dt>
<dt class="deffnx def-cmd-deffn" id="index-titlepage-log-trap"><span
class="category-def">Command: </span><span><strong class="strong">log
trap</strong> <em class="emph"></em><a class="copiable-anchor"
href='#index-titlepage-log-trap'> ¶</a></span></dt>
<dt class="deffnx def-cmd-deffn" id="index-titlepage-log-trap1"><span
class="category-def">Command: </span><span><strong class="strong">log
trap1</strong> <em class="emph"></em><a class="copiable-anchor"
href='#index-titlepage-log-trap1'> ¶</a></span></dt>
@@ -1652,7 +1652,7 @@ ref</a>
<dl class="ftable">
<dt id='index-titlepage-a-1'><span><em class="emph">a</em><a
class="copiable-anchor" href='#index-titlepage-a-1'> ¶</a></span></dt>
-<dd><a class="index-entry-anchor"
id="index-titlepage-index-entry-between-item-and-itemx"></a>
+<dd><a class="index-entry-id"
id="index-titlepage-index-entry-between-item-and-itemx"></a>
</dd>
<dt id='index-titlepage-b'><span><em class="emph">b</em><a
class="copiable-anchor" href='#index-titlepage-b'> ¶</a></span></dt>
<dd><p>l–ine
@@ -1794,7 +1794,7 @@ html ''
<dl class="ftable">
<dt id='index-titlepage-a-2'><span>a<a class="copiable-anchor"
href='#index-titlepage-a-2'> ¶</a></span></dt>
-<dd><a class="index-entry-anchor"
id="index-titlepage-index-entry-between-item-and-itemx-1"></a>
+<dd><a class="index-entry-id"
id="index-titlepage-index-entry-between-item-and-itemx-1"></a>
</dd>
<dt id='index-titlepage-b-1'><span>b<a class="copiable-anchor"
href='#index-titlepage-b-1'> ¶</a></span></dt>
<dd><p>l–ine
@@ -1869,10 +1869,10 @@ kbd: <kbd
class="kbd">``simple-double--three---four----''</kbd> <br>
</p>
<p>‘<!-- /@w -->‘simple-double-<!-- /@w -->-three—four—-’<!-- /@w -->’<br>
</p>
-<a class="index-entry-anchor" id="index-copying-_002d_002doption"></a>
-<a class="index-entry-anchor" id="index-copying-_0060_0060"></a>
-<a class="index-entry-anchor" id="index-copying-_0060_0060-1"></a>
-<a class="index-entry-anchor" id="index-copying-_002d_002dfoption"></a>
+<a class="index-entry-id" id="index-copying-_002d_002doption"></a>
+<a class="index-entry-id" id="index-copying-_0060_0060"></a>
+<a class="index-entry-id" id="index-copying-_0060_0060-1"></a>
+<a class="index-entry-id" id="index-copying-_002d_002dfoption"></a>
<p>@"u ü
@"{U} Ü
@@ -2231,7 +2231,7 @@ error→ ↦ − ★ ⊣ ⇒
</li></ul>
<ul class="itemize" style="list-style-type: '• a\2013 n itemize line'">
-<li><a class="index-entry-anchor"
id="index-copying-index-entry-within-itemize"></a>
+<li><a class="index-entry-id"
id="index-copying-index-entry-within-itemize"></a>
i–tem 1
</li><li>i–tem 2
</li></ul>
@@ -2273,7 +2273,7 @@ i–tem 1
<thead><tr><th width="40%">mu–ltitable headitem</th><th width="60%">another
tab</th></tr></thead>
<tbody><tr><td width="40%">mu–ltitable item</td><td width="60%">multitable
tab</td></tr>
<tr><td width="40%">mu–ltitable item 2</td><td width="60%">multitable tab 2
-<a class="index-entry-anchor"
id="index-copying-index-entry-within-multitable"></a></td></tr>
+<a class="index-entry-id"
id="index-copying-index-entry-within-multitable"></a></td></tr>
<tr><td width="40%">lone mu–ltitable item</td></tr>
</tbody>
</table>
@@ -2374,7 +2374,7 @@ f(x) = {1 \over \sigma \sqrt{2\pi}}e<sup class="sup">-{1
\over 2}\left({x-\mu \o
<dl class="first-deffn">
<dt class="deffn" id="index-copying-i"><span class="category-def">fset:
</span><span><strong class="strong"><var class="var">i</var></strong> <em
class="emph">a g</em><a class="copiable-anchor" href='#index-copying-i'>
¶</a></span></dt>
-<dd><a class="index-entry-anchor"
id="index-copying-index-entry-within-deffn"></a>
+<dd><a class="index-entry-id" id="index-copying-index-entry-within-deffn"></a>
</dd><dt class="deffnx def-cmd-deffn" id="index-copying-truc"><span
class="category-def">cmde: </span><span><strong class="strong">truc</strong>
<em class="emph"></em><a class="copiable-anchor" href='#index-copying-truc'>
¶</a></span></dt>
<dt class="deffnx def-cmd-deffn" id="index-copying-log-trap"><span
class="category-def">Command: </span><span><strong class="strong">log
trap</strong> <em class="emph"></em><a class="copiable-anchor"
href='#index-copying-log-trap'> ¶</a></span></dt>
<dt class="deffnx def-cmd-deffn" id="index-copying-log-trap1"><span
class="category-def">Command: </span><span><strong class="strong">log
trap1</strong> <em class="emph"></em><a class="copiable-anchor"
href='#index-copying-log-trap1'> ¶</a></span></dt>
@@ -2667,7 +2667,7 @@ ref</a>
<dl class="ftable">
<dt id='index-copying-a-1'><span><em class="emph">a</em><a
class="copiable-anchor" href='#index-copying-a-1'> ¶</a></span></dt>
-<dd><a class="index-entry-anchor"
id="index-copying-index-entry-between-item-and-itemx"></a>
+<dd><a class="index-entry-id"
id="index-copying-index-entry-between-item-and-itemx"></a>
</dd>
<dt id='index-copying-b'><span><em class="emph">b</em><a
class="copiable-anchor" href='#index-copying-b'> ¶</a></span></dt>
<dd><p>l–ine
@@ -2809,7 +2809,7 @@ html ''
<dl class="ftable">
<dt id='index-copying-a-2'><span>a<a class="copiable-anchor"
href='#index-copying-a-2'> ¶</a></span></dt>
-<dd><a class="index-entry-anchor"
id="index-copying-index-entry-between-item-and-itemx-1"></a>
+<dd><a class="index-entry-id"
id="index-copying-index-entry-between-item-and-itemx-1"></a>
</dd>
<dt id='index-copying-b-1'><span>b<a class="copiable-anchor"
href='#index-copying-b-1'> ¶</a></span></dt>
<dd><p>l–ine
@@ -2940,10 +2940,10 @@ kbd: <kbd
class="kbd">``simple-double--three---four----''</kbd> <br>
</p>
<p>‘<!-- /@w -->‘simple-double-<!-- /@w -->-three—four—-’<!-- /@w -->’<br>
</p>
-<a class="index-entry-anchor" id="index-copying-_002d_002doption"></a>
-<a class="index-entry-anchor" id="index-copying-_0060_0060"></a>
-<a class="index-entry-anchor" id="index-copying-_0060_0060-1"></a>
-<a class="index-entry-anchor" id="index-copying-_002d_002dfoption"></a>
+<a class="index-entry-id" id="index-copying-_002d_002doption"></a>
+<a class="index-entry-id" id="index-copying-_0060_0060"></a>
+<a class="index-entry-id" id="index-copying-_0060_0060-1"></a>
+<a class="index-entry-id" id="index-copying-_002d_002dfoption"></a>
<p>@"u ü
@"{U} Ü
@@ -3302,7 +3302,7 @@ error→ ↦ − ★ ⊣ ⇒
</li></ul>
<ul class="itemize" style="list-style-type: '• a\2013 n itemize line'">
-<li><a class="index-entry-anchor"
id="index-copying-index-entry-within-itemize"></a>
+<li><a class="index-entry-id"
id="index-copying-index-entry-within-itemize"></a>
i–tem 1
</li><li>i–tem 2
</li></ul>
@@ -3344,7 +3344,7 @@ i–tem 1
<thead><tr><th width="40%">mu–ltitable headitem</th><th width="60%">another
tab</th></tr></thead>
<tbody><tr><td width="40%">mu–ltitable item</td><td width="60%">multitable
tab</td></tr>
<tr><td width="40%">mu–ltitable item 2</td><td width="60%">multitable tab 2
-<a class="index-entry-anchor"
id="index-copying-index-entry-within-multitable"></a></td></tr>
+<a class="index-entry-id"
id="index-copying-index-entry-within-multitable"></a></td></tr>
<tr><td width="40%">lone mu–ltitable item</td></tr>
</tbody>
</table>
@@ -3445,7 +3445,7 @@ f(x) = {1 \over \sigma \sqrt{2\pi}}e<sup class="sup">-{1
\over 2}\left({x-\mu \o
<dl class="first-deffn">
<dt class="deffn" id="index-copying-i"><span class="category-def">fset:
</span><span><strong class="strong"><var class="var">i</var></strong> <em
class="emph">a g</em><a class="copiable-anchor" href='#index-copying-i'>
¶</a></span></dt>
-<dd><a class="index-entry-anchor"
id="index-copying-index-entry-within-deffn"></a>
+<dd><a class="index-entry-id" id="index-copying-index-entry-within-deffn"></a>
</dd><dt class="deffnx def-cmd-deffn" id="index-copying-truc"><span
class="category-def">cmde: </span><span><strong class="strong">truc</strong>
<em class="emph"></em><a class="copiable-anchor" href='#index-copying-truc'>
¶</a></span></dt>
<dt class="deffnx def-cmd-deffn" id="index-copying-log-trap"><span
class="category-def">Command: </span><span><strong class="strong">log
trap</strong> <em class="emph"></em><a class="copiable-anchor"
href='#index-copying-log-trap'> ¶</a></span></dt>
<dt class="deffnx def-cmd-deffn" id="index-copying-log-trap1"><span
class="category-def">Command: </span><span><strong class="strong">log
trap1</strong> <em class="emph"></em><a class="copiable-anchor"
href='#index-copying-log-trap1'> ¶</a></span></dt>
@@ -3738,7 +3738,7 @@ ref</a>
<dl class="ftable">
<dt id='index-copying-a-1'><span><em class="emph">a</em><a
class="copiable-anchor" href='#index-copying-a-1'> ¶</a></span></dt>
-<dd><a class="index-entry-anchor"
id="index-copying-index-entry-between-item-and-itemx"></a>
+<dd><a class="index-entry-id"
id="index-copying-index-entry-between-item-and-itemx"></a>
</dd>
<dt id='index-copying-b'><span><em class="emph">b</em><a
class="copiable-anchor" href='#index-copying-b'> ¶</a></span></dt>
<dd><p>l–ine
@@ -3880,7 +3880,7 @@ html ''
<dl class="ftable">
<dt id='index-copying-a-2'><span>a<a class="copiable-anchor"
href='#index-copying-a-2'> ¶</a></span></dt>
-<dd><a class="index-entry-anchor"
id="index-copying-index-entry-between-item-and-itemx-1"></a>
+<dd><a class="index-entry-id"
id="index-copying-index-entry-between-item-and-itemx-1"></a>
</dd>
<dt id='index-copying-b-1'><span>b<a class="copiable-anchor"
href='#index-copying-b-1'> ¶</a></span></dt>
<dd><p>l–ine
@@ -3954,10 +3954,10 @@ kbd: <kbd
class="kbd">``simple-double--three---four----''</kbd> <br>
</p>
<p>‘<!-- /@w -->‘simple-double-<!-- /@w -->-three—four—-’<!-- /@w -->’<br>
</p>
-<a class="index-entry-anchor" id="index-_002d_002doption"></a>
-<a class="index-entry-anchor" id="index-_0060_0060"></a>
-<a class="index-entry-anchor" id="index-_0060_0060-2"></a>
-<a class="index-entry-anchor" id="index-_002d_002dfoption"></a>
+<a class="index-entry-id" id="index-_002d_002doption"></a>
+<a class="index-entry-id" id="index-_0060_0060"></a>
+<a class="index-entry-id" id="index-_0060_0060-2"></a>
+<a class="index-entry-id" id="index-_002d_002dfoption"></a>
<p>@"u ü
@"{U} Ü
@@ -4316,7 +4316,7 @@ error→ ↦ − ★ ⊣ ⇒
</li></ul>
<ul class="itemize" style="list-style-type: '• a\2013 n itemize line'">
-<li><a class="index-entry-anchor" id="index-index-entry-within-itemize"></a>
+<li><a class="index-entry-id" id="index-index-entry-within-itemize"></a>
i–tem 1
</li><li>i–tem 2
</li></ul>
@@ -4358,7 +4358,7 @@ i–tem 1
<thead><tr><th width="40%">mu–ltitable headitem</th><th width="60%">another
tab</th></tr></thead>
<tbody><tr><td width="40%">mu–ltitable item</td><td width="60%">multitable
tab</td></tr>
<tr><td width="40%">mu–ltitable item 2</td><td width="60%">multitable tab 2
-<a class="index-entry-anchor"
id="index-index-entry-within-multitable"></a></td></tr>
+<a class="index-entry-id"
id="index-index-entry-within-multitable"></a></td></tr>
<tr><td width="40%">lone mu–ltitable item</td></tr>
</tbody>
</table>
@@ -4459,7 +4459,7 @@ f(x) = {1 \over \sigma \sqrt{2\pi}}e<sup class="sup">-{1
\over 2}\left({x-\mu \o
<dl class="first-deffn">
<dt class="deffn" id="index-i"><span class="category-def">fset:
</span><span><strong class="strong"><var class="var">i</var></strong> <em
class="emph">a g</em><a class="copiable-anchor" href='#index-i'>
¶</a></span></dt>
-<dd><a class="index-entry-anchor" id="index-index-entry-within-deffn"></a>
+<dd><a class="index-entry-id" id="index-index-entry-within-deffn"></a>
</dd><dt class="deffnx def-cmd-deffn" id="index-truc"><span
class="category-def">cmde: </span><span><strong class="strong">truc</strong>
<em class="emph"></em><a class="copiable-anchor" href='#index-truc'>
¶</a></span></dt>
<dt class="deffnx def-cmd-deffn" id="index-log-trap"><span
class="category-def">Command: </span><span><strong class="strong">log
trap</strong> <em class="emph"></em><a class="copiable-anchor"
href='#index-log-trap'> ¶</a></span></dt>
<dt class="deffnx def-cmd-deffn" id="index-log-trap1"><span
class="category-def">Command: </span><span><strong class="strong">log
trap1</strong> <em class="emph"></em><a class="copiable-anchor"
href='#index-log-trap1'> ¶</a></span></dt>
@@ -4752,7 +4752,7 @@ ref</a>
<dl class="ftable">
<dt id='index-a-2'><span><em class="emph">a</em><a class="copiable-anchor"
href='#index-a-2'> ¶</a></span></dt>
-<dd><a class="index-entry-anchor"
id="index-index-entry-between-item-and-itemx"></a>
+<dd><a class="index-entry-id"
id="index-index-entry-between-item-and-itemx"></a>
</dd>
<dt id='index-b'><span><em class="emph">b</em><a class="copiable-anchor"
href='#index-b'> ¶</a></span></dt>
<dd><p>l–ine
@@ -4894,7 +4894,7 @@ html ''
<dl class="ftable">
<dt id='index-a-3'><span>a<a class="copiable-anchor" href='#index-a-3'>
¶</a></span></dt>
-<dd><a class="index-entry-anchor"
id="index-index-entry-between-item-and-itemx-1"></a>
+<dd><a class="index-entry-id"
id="index-index-entry-between-item-and-itemx-1"></a>
</dd>
<dt id='index-b-1'><span>b<a class="copiable-anchor" href='#index-b-1'>
¶</a></span></dt>
<dd><p>l–ine
@@ -4976,7 +4976,7 @@ kbd: <kbd
class="kbd">``simple-double--three---four----''</kbd>
`<!-- /@w -->`simple-double-<!-- /@w -->-three---four----'<!-- /@w -->'
-<a class="index-entry-anchor" id="index-_002d_002doption-1"></a><a
class="index-entry-anchor" id="index-_0060_0060-1"></a><a
class="index-entry-anchor" id="index-_0060_0060-3"></a><a
class="index-entry-anchor" id="index-_002d_002dfoption-1"></a>
+<a class="index-entry-id" id="index-_002d_002doption-1"></a><a
class="index-entry-id" id="index-_0060_0060-1"></a><a class="index-entry-id"
id="index-_0060_0060-3"></a><a class="index-entry-id"
id="index-_002d_002dfoption-1"></a>
@"u ü
@"{U} Ü
@~n ñ
@@ -5374,7 +5374,7 @@ error→ ↦ − ★ ⊣ ⇒
<pre class="example-preformatted">
</pre><ul class="itemize" style="list-style-type: '• a\2013 n itemize line'">
-<li><pre class="example-preformatted"><a class="index-entry-anchor"
id="index-index-entry-within-itemize-1"></a>i--tem 1
+<li><pre class="example-preformatted"><a class="index-entry-id"
id="index-index-entry-within-itemize-1"></a>i--tem 1
</pre></li><li><pre class="example-preformatted">i--tem 2
</pre></li></ul>
<pre class="example-preformatted">
@@ -5423,7 +5423,7 @@ error→ ↦ − ★ ⊣ ⇒
<thead><tr><th width="40%"><pre class="example-preformatted">mu--ltitable
headitem</pre></th><th width="60%"><pre class="example-preformatted">another
tab</pre></th></tr></thead>
<tbody><tr><td width="40%"><pre class="example-preformatted">mu--ltitable
item</pre></td><td width="60%"><pre class="example-preformatted">multitable
tab</pre></td></tr>
<tr><td width="40%"><pre class="example-preformatted">mu--ltitable item
2</pre></td><td width="60%"><pre class="example-preformatted">multitable tab 2
-<a class="index-entry-anchor"
id="index-index-entry-within-multitable-1"></a></pre></td></tr>
+<a class="index-entry-id"
id="index-index-entry-within-multitable-1"></a></pre></td></tr>
<tr><td width="40%"><pre class="example-preformatted">lone mu--ltitable
item</pre></td></tr>
</tbody>
</table>
@@ -5546,7 +5546,7 @@ f(x) = {1 \over \sigma \sqrt{2\pi}}e<sup class="sup">-{1
\over 2}\left({x-\mu \o
<pre class="example-preformatted">
</pre><dl class="first-deffn">
<dt class="deffn" id="index-i-2"><span class="category-def">fset:
</span><span><strong class="strong"><var class="var">i</var></strong> <em
class="emph">a g</em><a class="copiable-anchor" href='#index-i-2'>
¶</a></span></dt>
-<dd><pre class="example-preformatted"><a class="index-entry-anchor"
id="index-index-entry-within-deffn-1"></a></pre></dd><dt class="deffnx
def-cmd-deffn" id="index-truc-2"><span class="category-def">cmde:
</span><span><strong class="strong">truc</strong> <em class="emph"></em><a
class="copiable-anchor" href='#index-truc-2'> ¶</a></span></dt>
+<dd><pre class="example-preformatted"><a class="index-entry-id"
id="index-index-entry-within-deffn-1"></a></pre></dd><dt class="deffnx
def-cmd-deffn" id="index-truc-2"><span class="category-def">cmde:
</span><span><strong class="strong">truc</strong> <em class="emph"></em><a
class="copiable-anchor" href='#index-truc-2'> ¶</a></span></dt>
<dt class="deffnx def-cmd-deffn" id="index-log-trap-1"><span
class="category-def">Command: </span><span><strong class="strong">log
trap</strong> <em class="emph"></em><a class="copiable-anchor"
href='#index-log-trap-1'> ¶</a></span></dt>
<dt class="deffnx def-cmd-deffn" id="index-log-trap1-1"><span
class="category-def">Command: </span><span><strong class="strong">log
trap1</strong> <em class="emph"></em><a class="copiable-anchor"
href='#index-log-trap1-1'> ¶</a></span></dt>
<dt class="deffnx def-cmd-deffn" id="index-log-trap2-1"><span
class="category-def">Command: </span><span><strong class="strong">log
trap2</strong> <em class="emph"></em><a class="copiable-anchor"
href='#index-log-trap2-1'> ¶</a></span></dt>
@@ -5890,7 +5890,7 @@ ref</a>
</pre><dl class="ftable">
<dt id='index-a-5'><span><tt><em class="emph">a</em></tt><a
class="copiable-anchor" href='#index-a-5'> ¶</a></span></dt>
-<dd><pre class="example-preformatted"><a class="index-entry-anchor"
id="index-index-entry-between-item-and-itemx-2"></a></pre></dd>
+<dd><pre class="example-preformatted"><a class="index-entry-id"
id="index-index-entry-between-item-and-itemx-2"></a></pre></dd>
<dt id='index-b-2'><span><tt><em class="emph">b</em></tt><a
class="copiable-anchor" href='#index-b-2'> ¶</a></span></dt>
<dd><pre class="example-preformatted">l--ine
</pre></dd>
@@ -6056,7 +6056,7 @@ Invalid use of @':
</pre><dl class="ftable">
<dt id='index-a-6'><span><tt>a</tt><a class="copiable-anchor"
href='#index-a-6'> ¶</a></span></dt>
-<dd><pre class="example-preformatted"><a class="index-entry-anchor"
id="index-index-entry-between-item-and-itemx-3"></a></pre></dd>
+<dd><pre class="example-preformatted"><a class="index-entry-id"
id="index-index-entry-between-item-and-itemx-3"></a></pre></dd>
<dt id='index-b-3'><span><tt>b</tt><a class="copiable-anchor"
href='#index-b-3'> ¶</a></span></dt>
<dd><pre class="example-preformatted">l--ine
</pre></dd>
@@ -6115,38 +6115,38 @@ Invalid use of @':
</pre></div>
-<a class="index-entry-anchor" id="index-t_002d_002druc"></a>
-<a class="index-entry-anchor" id="index-T_002d_002druc"></a>
-<a class="index-entry-anchor" id="index-_002e"></a>
-<a class="index-entry-anchor" id="index-_003f"></a>
-<a class="index-entry-anchor" id="index-a"></a>
-<a class="index-entry-anchor" id="index-t_002d_002druc-1"></a>
-<a class="index-entry-anchor" id="index-T_002d_002druc-1"></a>
-<a class="index-entry-anchor" id="index-_002e-1"></a>
-<a class="index-entry-anchor" id="index-_003f-1"></a>
-<a class="index-entry-anchor" id="index-a-7"></a>
+<a class="index-entry-id" id="index-t_002d_002druc"></a>
+<a class="index-entry-id" id="index-T_002d_002druc"></a>
+<a class="index-entry-id" id="index-_002e"></a>
+<a class="index-entry-id" id="index-_003f"></a>
+<a class="index-entry-id" id="index-a"></a>
+<a class="index-entry-id" id="index-t_002d_002druc-1"></a>
+<a class="index-entry-id" id="index-T_002d_002druc-1"></a>
+<a class="index-entry-id" id="index-_002e-1"></a>
+<a class="index-entry-id" id="index-_003f-1"></a>
+<a class="index-entry-id" id="index-a-7"></a>
-<a class="index-entry-anchor" id="index-a_002d_002d_002da"></a>
-<a class="index-entry-anchor" id="index-b_002d_002d_002db"></a>
-<a class="index-entry-anchor" id="index-d_002d_002d_002ddd"></a>
-<a class="index-entry-anchor" id="index-g_002d_002d_002dgg"></a>
+<a class="index-entry-id" id="index-a_002d_002d_002da"></a>
+<a class="index-entry-id" id="index-b_002d_002d_002db"></a>
+<a class="index-entry-id" id="index-d_002d_002d_002ddd"></a>
+<a class="index-entry-id" id="index-g_002d_002d_002dgg"></a>
-<a class="index-entry-anchor" id="index-f_002d_002d_002daa"></a>
-<a class="index-entry-anchor" id="index-f_002d_002d_002dbb"></a>
-<a class="index-entry-anchor" id="index-f_002d_002d_002dddd"></a>
-<a class="index-entry-anchor" id="index-f_002d_002d_002dggg"></a>
+<a class="index-entry-id" id="index-f_002d_002d_002daa"></a>
+<a class="index-entry-id" id="index-f_002d_002d_002dbb"></a>
+<a class="index-entry-id" id="index-f_002d_002d_002dddd"></a>
+<a class="index-entry-id" id="index-f_002d_002d_002dggg"></a>
-<a class="index-entry-anchor" id="index-aaa"></a>
+<a class="index-entry-id" id="index-aaa"></a>
-<a class="index-entry-anchor" id="index-xxx"></a>
+<a class="index-entry-id" id="index-xxx"></a>
-<a class="index-entry-anchor" id="index-"></a>
+<a class="index-entry-id" id="index-"></a>
-<a class="index-entry-anchor"
id="index-a-index_002d_002d_002dentry-te-_002d_002d_002d-i"></a>
+<a class="index-entry-id"
id="index-a-index_002d_002d_002dentry-te-_002d_002d_002d-i"></a>
-<a class="index-entry-anchor" id="index-truc-4"></a>
+<a class="index-entry-id" id="index-truc-4"></a>
<p>Text<a class="footnote" id="DOCF9" href="#FOOT9"><sup>11</sup></a>
@@ -7441,13 +7441,13 @@ Menu comment
<p>in footnote2</p>
<h5><a id="FOOT9" href="#DOCF9">(11)</a></h5>
<p>in footnote
-<a class="index-entry-anchor" id="index-index-entry-in-footnote"></a>
+<a class="index-entry-id" id="index-index-entry-in-footnote"></a>
</p>
<p>Blah
</p>
<p>Blih
</p>
-<a class="index-entry-anchor" id="index-counting-entry"></a>
+<a class="index-entry-id" id="index-counting-entry"></a>
<h5><a id="FOOT10" href="#DOCF10">(12)</a></h5>
<p>in footnote</p>
</div><hr>
diff --git
a/tp/tests/layout/res_parser/formatting_epub/formatting_epub_package/EPUB/xhtml/formatting.xhtml
b/tp/tests/layout/res_parser/formatting_epub/formatting_epub_package/EPUB/xhtml/formatting.xhtml
index 11c7f51efc..61aed659eb 100644
---
a/tp/tests/layout/res_parser/formatting_epub/formatting_epub_package/EPUB/xhtml/formatting.xhtml
+++
b/tp/tests/layout/res_parser/formatting_epub/formatting_epub_package/EPUB/xhtml/formatting.xhtml
@@ -852,10 +852,10 @@ kbd: <kbd
class="kbd">``simple-double--three---four----''</kbd> <br/>
</p>
<p>‘<!-- /@w -->‘simple-double-<!-- /@w
-->-three—four—-’<!-- /@w -->’<br/>
</p>
-<a class="index-entry-anchor" id="index-titlepage-_002d_002doption"></a>
-<a class="index-entry-anchor" id="index-titlepage-_0060_0060"></a>
-<a class="index-entry-anchor" id="index-titlepage-_0060_0060-1"></a>
-<a class="index-entry-anchor" id="index-titlepage-_002d_002dfoption"></a>
+<a class="index-entry-id" id="index-titlepage-_002d_002doption"></a>
+<a class="index-entry-id" id="index-titlepage-_0060_0060"></a>
+<a class="index-entry-id" id="index-titlepage-_0060_0060-1"></a>
+<a class="index-entry-id" id="index-titlepage-_002d_002dfoption"></a>
<p>@"u ü
@"{U} Ü
@@ -1215,7 +1215,7 @@ error→ ↦ − ★ ⊣ ⇒
</li></ul>
<ul class="itemize" style="list-style-type: '\2022 a\2013 n itemize line'">
-<li><a class="index-entry-anchor"
id="index-titlepage-index-entry-within-itemize"></a>
+<li><a class="index-entry-id"
id="index-titlepage-index-entry-within-itemize"></a>
i–tem 1
</li><li>i–tem 2
</li></ul>
@@ -1257,7 +1257,7 @@ i–tem 1
<thead><tr><th width="40%">mu–ltitable headitem</th><th
width="60%">another tab</th></tr></thead>
<tbody><tr><td width="40%">mu–ltitable item</td><td
width="60%">multitable tab</td></tr>
<tr><td width="40%">mu–ltitable item 2</td><td width="60%">multitable
tab 2
-<a class="index-entry-anchor"
id="index-titlepage-index-entry-within-multitable"></a></td></tr>
+<a class="index-entry-id"
id="index-titlepage-index-entry-within-multitable"></a></td></tr>
<tr><td width="40%">lone mu–ltitable item</td></tr>
</tbody>
</table>
@@ -1358,7 +1358,7 @@ f(x) = {1 \over \sigma \sqrt{2\pi}}e<sup class="sup">-{1
\over 2}\left({x-\mu \o
<dl class="first-deffn">
<dt class="deffn" id="index-titlepage-i"><span class="category-def">fset:
</span><strong class="strong"><var class="var">i</var></strong> <em
class="emph">a g</em></dt>
-<dd><a class="index-entry-anchor"
id="index-titlepage-index-entry-within-deffn"></a>
+<dd><a class="index-entry-id"
id="index-titlepage-index-entry-within-deffn"></a>
</dd><dt class="deffnx def-cmd-deffn" id="index-titlepage-truc"><span
class="category-def">cmde: </span><strong class="strong">truc</strong> <em
class="emph"></em></dt>
<dt class="deffnx def-cmd-deffn" id="index-titlepage-log-trap"><span
class="category-def">Command: </span><strong class="strong">log trap</strong>
<em class="emph"></em></dt>
<dt class="deffnx def-cmd-deffn" id="index-titlepage-log-trap1"><span
class="category-def">Command: </span><strong class="strong">log trap1</strong>
<em class="emph"></em></dt>
@@ -1651,7 +1651,7 @@ ref</a>
<dl class="ftable">
<dt id='index-titlepage-a-1'><em class="emph">a</em></dt>
-<dd><a class="index-entry-anchor"
id="index-titlepage-index-entry-between-item-and-itemx"></a>
+<dd><a class="index-entry-id"
id="index-titlepage-index-entry-between-item-and-itemx"></a>
</dd>
<dt id='index-titlepage-b'><em class="emph">b</em></dt>
<dd><p>l–ine
@@ -1793,7 +1793,7 @@ html ''
<dl class="ftable">
<dt id='index-titlepage-a-2'>a</dt>
-<dd><a class="index-entry-anchor"
id="index-titlepage-index-entry-between-item-and-itemx-1"></a>
+<dd><a class="index-entry-id"
id="index-titlepage-index-entry-between-item-and-itemx-1"></a>
</dd>
<dt id='index-titlepage-b-1'>b</dt>
<dd><p>l–ine
@@ -1868,10 +1868,10 @@ kbd: <kbd
class="kbd">``simple-double--three---four----''</kbd> <br/>
</p>
<p>‘<!-- /@w -->‘simple-double-<!-- /@w
-->-three—four—-’<!-- /@w -->’<br/>
</p>
-<a class="index-entry-anchor" id="index-copying-_002d_002doption"></a>
-<a class="index-entry-anchor" id="index-copying-_0060_0060"></a>
-<a class="index-entry-anchor" id="index-copying-_0060_0060-1"></a>
-<a class="index-entry-anchor" id="index-copying-_002d_002dfoption"></a>
+<a class="index-entry-id" id="index-copying-_002d_002doption"></a>
+<a class="index-entry-id" id="index-copying-_0060_0060"></a>
+<a class="index-entry-id" id="index-copying-_0060_0060-1"></a>
+<a class="index-entry-id" id="index-copying-_002d_002dfoption"></a>
<p>@"u ü
@"{U} Ü
@@ -2230,7 +2230,7 @@ error→ ↦ − ★ ⊣ ⇒
</li></ul>
<ul class="itemize" style="list-style-type: '\2022 a\2013 n itemize line'">
-<li><a class="index-entry-anchor"
id="index-copying-index-entry-within-itemize"></a>
+<li><a class="index-entry-id"
id="index-copying-index-entry-within-itemize"></a>
i–tem 1
</li><li>i–tem 2
</li></ul>
@@ -2272,7 +2272,7 @@ i–tem 1
<thead><tr><th width="40%">mu–ltitable headitem</th><th
width="60%">another tab</th></tr></thead>
<tbody><tr><td width="40%">mu–ltitable item</td><td
width="60%">multitable tab</td></tr>
<tr><td width="40%">mu–ltitable item 2</td><td width="60%">multitable
tab 2
-<a class="index-entry-anchor"
id="index-copying-index-entry-within-multitable"></a></td></tr>
+<a class="index-entry-id"
id="index-copying-index-entry-within-multitable"></a></td></tr>
<tr><td width="40%">lone mu–ltitable item</td></tr>
</tbody>
</table>
@@ -2373,7 +2373,7 @@ f(x) = {1 \over \sigma \sqrt{2\pi}}e<sup class="sup">-{1
\over 2}\left({x-\mu \o
<dl class="first-deffn">
<dt class="deffn" id="index-copying-i"><span class="category-def">fset:
</span><strong class="strong"><var class="var">i</var></strong> <em
class="emph">a g</em></dt>
-<dd><a class="index-entry-anchor"
id="index-copying-index-entry-within-deffn"></a>
+<dd><a class="index-entry-id" id="index-copying-index-entry-within-deffn"></a>
</dd><dt class="deffnx def-cmd-deffn" id="index-copying-truc"><span
class="category-def">cmde: </span><strong class="strong">truc</strong> <em
class="emph"></em></dt>
<dt class="deffnx def-cmd-deffn" id="index-copying-log-trap"><span
class="category-def">Command: </span><strong class="strong">log trap</strong>
<em class="emph"></em></dt>
<dt class="deffnx def-cmd-deffn" id="index-copying-log-trap1"><span
class="category-def">Command: </span><strong class="strong">log trap1</strong>
<em class="emph"></em></dt>
@@ -2666,7 +2666,7 @@ ref</a>
<dl class="ftable">
<dt id='index-copying-a-1'><em class="emph">a</em></dt>
-<dd><a class="index-entry-anchor"
id="index-copying-index-entry-between-item-and-itemx"></a>
+<dd><a class="index-entry-id"
id="index-copying-index-entry-between-item-and-itemx"></a>
</dd>
<dt id='index-copying-b'><em class="emph">b</em></dt>
<dd><p>l–ine
@@ -2808,7 +2808,7 @@ html ''
<dl class="ftable">
<dt id='index-copying-a-2'>a</dt>
-<dd><a class="index-entry-anchor"
id="index-copying-index-entry-between-item-and-itemx-1"></a>
+<dd><a class="index-entry-id"
id="index-copying-index-entry-between-item-and-itemx-1"></a>
</dd>
<dt id='index-copying-b-1'>b</dt>
<dd><p>l–ine
@@ -2915,10 +2915,10 @@ kbd: <kbd
class="kbd">``simple-double--three---four----''</kbd> <br/>
</p>
<p>‘<!-- /@w -->‘simple-double-<!-- /@w
-->-three—four—-’<!-- /@w -->’<br/>
</p>
-<a class="index-entry-anchor" id="index-copying-_002d_002doption"></a>
-<a class="index-entry-anchor" id="index-copying-_0060_0060"></a>
-<a class="index-entry-anchor" id="index-copying-_0060_0060-1"></a>
-<a class="index-entry-anchor" id="index-copying-_002d_002dfoption"></a>
+<a class="index-entry-id" id="index-copying-_002d_002doption"></a>
+<a class="index-entry-id" id="index-copying-_0060_0060"></a>
+<a class="index-entry-id" id="index-copying-_0060_0060-1"></a>
+<a class="index-entry-id" id="index-copying-_002d_002dfoption"></a>
<p>@"u ü
@"{U} Ü
@@ -3277,7 +3277,7 @@ error→ ↦ − ★ ⊣ ⇒
</li></ul>
<ul class="itemize" style="list-style-type: '\2022 a\2013 n itemize line'">
-<li><a class="index-entry-anchor"
id="index-copying-index-entry-within-itemize"></a>
+<li><a class="index-entry-id"
id="index-copying-index-entry-within-itemize"></a>
i–tem 1
</li><li>i–tem 2
</li></ul>
@@ -3319,7 +3319,7 @@ i–tem 1
<thead><tr><th width="40%">mu–ltitable headitem</th><th
width="60%">another tab</th></tr></thead>
<tbody><tr><td width="40%">mu–ltitable item</td><td
width="60%">multitable tab</td></tr>
<tr><td width="40%">mu–ltitable item 2</td><td width="60%">multitable
tab 2
-<a class="index-entry-anchor"
id="index-copying-index-entry-within-multitable"></a></td></tr>
+<a class="index-entry-id"
id="index-copying-index-entry-within-multitable"></a></td></tr>
<tr><td width="40%">lone mu–ltitable item</td></tr>
</tbody>
</table>
@@ -3420,7 +3420,7 @@ f(x) = {1 \over \sigma \sqrt{2\pi}}e<sup class="sup">-{1
\over 2}\left({x-\mu \o
<dl class="first-deffn">
<dt class="deffn" id="index-copying-i"><span class="category-def">fset:
</span><strong class="strong"><var class="var">i</var></strong> <em
class="emph">a g</em></dt>
-<dd><a class="index-entry-anchor"
id="index-copying-index-entry-within-deffn"></a>
+<dd><a class="index-entry-id" id="index-copying-index-entry-within-deffn"></a>
</dd><dt class="deffnx def-cmd-deffn" id="index-copying-truc"><span
class="category-def">cmde: </span><strong class="strong">truc</strong> <em
class="emph"></em></dt>
<dt class="deffnx def-cmd-deffn" id="index-copying-log-trap"><span
class="category-def">Command: </span><strong class="strong">log trap</strong>
<em class="emph"></em></dt>
<dt class="deffnx def-cmd-deffn" id="index-copying-log-trap1"><span
class="category-def">Command: </span><strong class="strong">log trap1</strong>
<em class="emph"></em></dt>
@@ -3713,7 +3713,7 @@ ref</a>
<dl class="ftable">
<dt id='index-copying-a-1'><em class="emph">a</em></dt>
-<dd><a class="index-entry-anchor"
id="index-copying-index-entry-between-item-and-itemx"></a>
+<dd><a class="index-entry-id"
id="index-copying-index-entry-between-item-and-itemx"></a>
</dd>
<dt id='index-copying-b'><em class="emph">b</em></dt>
<dd><p>l–ine
@@ -3855,7 +3855,7 @@ html ''
<dl class="ftable">
<dt id='index-copying-a-2'>a</dt>
-<dd><a class="index-entry-anchor"
id="index-copying-index-entry-between-item-and-itemx-1"></a>
+<dd><a class="index-entry-id"
id="index-copying-index-entry-between-item-and-itemx-1"></a>
</dd>
<dt id='index-copying-b-1'>b</dt>
<dd><p>l–ine
@@ -3929,10 +3929,10 @@ kbd: <kbd
class="kbd">``simple-double--three---four----''</kbd> <br/>
</p>
<p>‘<!-- /@w -->‘simple-double-<!-- /@w
-->-three—four—-’<!-- /@w -->’<br/>
</p>
-<a class="index-entry-anchor" id="index-_002d_002doption"></a>
-<a class="index-entry-anchor" id="index-_0060_0060"></a>
-<a class="index-entry-anchor" id="index-_0060_0060-2"></a>
-<a class="index-entry-anchor" id="index-_002d_002dfoption"></a>
+<a class="index-entry-id" id="index-_002d_002doption"></a>
+<a class="index-entry-id" id="index-_0060_0060"></a>
+<a class="index-entry-id" id="index-_0060_0060-2"></a>
+<a class="index-entry-id" id="index-_002d_002dfoption"></a>
<p>@"u ü
@"{U} Ü
@@ -4291,7 +4291,7 @@ error→ ↦ − ★ ⊣ ⇒
</li></ul>
<ul class="itemize" style="list-style-type: '\2022 a\2013 n itemize line'">
-<li><a class="index-entry-anchor" id="index-index-entry-within-itemize"></a>
+<li><a class="index-entry-id" id="index-index-entry-within-itemize"></a>
i–tem 1
</li><li>i–tem 2
</li></ul>
@@ -4333,7 +4333,7 @@ i–tem 1
<thead><tr><th width="40%">mu–ltitable headitem</th><th
width="60%">another tab</th></tr></thead>
<tbody><tr><td width="40%">mu–ltitable item</td><td
width="60%">multitable tab</td></tr>
<tr><td width="40%">mu–ltitable item 2</td><td width="60%">multitable
tab 2
-<a class="index-entry-anchor"
id="index-index-entry-within-multitable"></a></td></tr>
+<a class="index-entry-id"
id="index-index-entry-within-multitable"></a></td></tr>
<tr><td width="40%">lone mu–ltitable item</td></tr>
</tbody>
</table>
@@ -4434,7 +4434,7 @@ f(x) = {1 \over \sigma \sqrt{2\pi}}e<sup class="sup">-{1
\over 2}\left({x-\mu \o
<dl class="first-deffn">
<dt class="deffn" id="index-i"><span class="category-def">fset: </span><strong
class="strong"><var class="var">i</var></strong> <em class="emph">a g</em></dt>
-<dd><a class="index-entry-anchor" id="index-index-entry-within-deffn"></a>
+<dd><a class="index-entry-id" id="index-index-entry-within-deffn"></a>
</dd><dt class="deffnx def-cmd-deffn" id="index-truc"><span
class="category-def">cmde: </span><strong class="strong">truc</strong> <em
class="emph"></em></dt>
<dt class="deffnx def-cmd-deffn" id="index-log-trap"><span
class="category-def">Command: </span><strong class="strong">log trap</strong>
<em class="emph"></em></dt>
<dt class="deffnx def-cmd-deffn" id="index-log-trap1"><span
class="category-def">Command: </span><strong class="strong">log trap1</strong>
<em class="emph"></em></dt>
@@ -4727,7 +4727,7 @@ ref</a>
<dl class="ftable">
<dt id='index-a-2'><em class="emph">a</em></dt>
-<dd><a class="index-entry-anchor"
id="index-index-entry-between-item-and-itemx"></a>
+<dd><a class="index-entry-id"
id="index-index-entry-between-item-and-itemx"></a>
</dd>
<dt id='index-b'><em class="emph">b</em></dt>
<dd><p>l–ine
@@ -4869,7 +4869,7 @@ html ''
<dl class="ftable">
<dt id='index-a-3'>a</dt>
-<dd><a class="index-entry-anchor"
id="index-index-entry-between-item-and-itemx-1"></a>
+<dd><a class="index-entry-id"
id="index-index-entry-between-item-and-itemx-1"></a>
</dd>
<dt id='index-b-1'>b</dt>
<dd><p>l–ine
@@ -4951,7 +4951,7 @@ kbd: <kbd
class="kbd">``simple-double--three---four----''</kbd>
`<!-- /@w -->`simple-double-<!-- /@w -->-three---four----'<!-- /@w -->'
-<a class="index-entry-anchor" id="index-_002d_002doption-1"></a><a
class="index-entry-anchor" id="index-_0060_0060-1"></a><a
class="index-entry-anchor" id="index-_0060_0060-3"></a><a
class="index-entry-anchor" id="index-_002d_002dfoption-1"></a>
+<a class="index-entry-id" id="index-_002d_002doption-1"></a><a
class="index-entry-id" id="index-_0060_0060-1"></a><a class="index-entry-id"
id="index-_0060_0060-3"></a><a class="index-entry-id"
id="index-_002d_002dfoption-1"></a>
@"u ü
@"{U} Ü
@~n ñ
@@ -5349,7 +5349,7 @@ error→ ↦ − ★ ⊣ ⇒
<pre class="example-preformatted">
</pre><ul class="itemize" style="list-style-type: '\2022 a\2013 n itemize
line'">
-<li><pre class="example-preformatted"><a class="index-entry-anchor"
id="index-index-entry-within-itemize-1"></a>i--tem 1
+<li><pre class="example-preformatted"><a class="index-entry-id"
id="index-index-entry-within-itemize-1"></a>i--tem 1
</pre></li><li><pre class="example-preformatted">i--tem 2
</pre></li></ul>
<pre class="example-preformatted">
@@ -5398,7 +5398,7 @@ error→ ↦ − ★ ⊣ ⇒
<thead><tr><th width="40%"><pre class="example-preformatted">mu--ltitable
headitem</pre></th><th width="60%"><pre class="example-preformatted">another
tab</pre></th></tr></thead>
<tbody><tr><td width="40%"><pre class="example-preformatted">mu--ltitable
item</pre></td><td width="60%"><pre class="example-preformatted">multitable
tab</pre></td></tr>
<tr><td width="40%"><pre class="example-preformatted">mu--ltitable item
2</pre></td><td width="60%"><pre class="example-preformatted">multitable tab 2
-<a class="index-entry-anchor"
id="index-index-entry-within-multitable-1"></a></pre></td></tr>
+<a class="index-entry-id"
id="index-index-entry-within-multitable-1"></a></pre></td></tr>
<tr><td width="40%"><pre class="example-preformatted">lone mu--ltitable
item</pre></td></tr>
</tbody>
</table>
@@ -5521,7 +5521,7 @@ f(x) = {1 \over \sigma \sqrt{2\pi}}e<sup class="sup">-{1
\over 2}\left({x-\mu \o
<pre class="example-preformatted">
</pre><dl class="first-deffn">
<dt class="deffn" id="index-i-2"><span class="category-def">fset:
</span><strong class="strong"><var class="var">i</var></strong> <em
class="emph">a g</em></dt>
-<dd><pre class="example-preformatted"><a class="index-entry-anchor"
id="index-index-entry-within-deffn-1"></a></pre></dd><dt class="deffnx
def-cmd-deffn" id="index-truc-2"><span class="category-def">cmde:
</span><strong class="strong">truc</strong> <em class="emph"></em></dt>
+<dd><pre class="example-preformatted"><a class="index-entry-id"
id="index-index-entry-within-deffn-1"></a></pre></dd><dt class="deffnx
def-cmd-deffn" id="index-truc-2"><span class="category-def">cmde:
</span><strong class="strong">truc</strong> <em class="emph"></em></dt>
<dt class="deffnx def-cmd-deffn" id="index-log-trap-1"><span
class="category-def">Command: </span><strong class="strong">log trap</strong>
<em class="emph"></em></dt>
<dt class="deffnx def-cmd-deffn" id="index-log-trap1-1"><span
class="category-def">Command: </span><strong class="strong">log trap1</strong>
<em class="emph"></em></dt>
<dt class="deffnx def-cmd-deffn" id="index-log-trap2-1"><span
class="category-def">Command: </span><strong class="strong">log trap2</strong>
<em class="emph"></em></dt>
@@ -5865,7 +5865,7 @@ ref</a>
</pre><dl class="ftable">
<dt id='index-a-5'><tt><em class="emph">a</em></tt></dt>
-<dd><pre class="example-preformatted"><a class="index-entry-anchor"
id="index-index-entry-between-item-and-itemx-2"></a></pre></dd>
+<dd><pre class="example-preformatted"><a class="index-entry-id"
id="index-index-entry-between-item-and-itemx-2"></a></pre></dd>
<dt id='index-b-2'><tt><em class="emph">b</em></tt></dt>
<dd><pre class="example-preformatted">l--ine
</pre></dd>
@@ -6031,7 +6031,7 @@ Invalid use of @':
</pre><dl class="ftable">
<dt id='index-a-6'><tt>a</tt></dt>
-<dd><pre class="example-preformatted"><a class="index-entry-anchor"
id="index-index-entry-between-item-and-itemx-3"></a></pre></dd>
+<dd><pre class="example-preformatted"><a class="index-entry-id"
id="index-index-entry-between-item-and-itemx-3"></a></pre></dd>
<dt id='index-b-3'><tt>b</tt></dt>
<dd><pre class="example-preformatted">l--ine
</pre></dd>
@@ -6090,38 +6090,38 @@ Invalid use of @':
</pre></div>
-<a class="index-entry-anchor" id="index-t_002d_002druc"></a>
-<a class="index-entry-anchor" id="index-T_002d_002druc"></a>
-<a class="index-entry-anchor" id="index-_002e"></a>
-<a class="index-entry-anchor" id="index-_003f"></a>
-<a class="index-entry-anchor" id="index-a"></a>
-<a class="index-entry-anchor" id="index-t_002d_002druc-1"></a>
-<a class="index-entry-anchor" id="index-T_002d_002druc-1"></a>
-<a class="index-entry-anchor" id="index-_002e-1"></a>
-<a class="index-entry-anchor" id="index-_003f-1"></a>
-<a class="index-entry-anchor" id="index-a-7"></a>
+<a class="index-entry-id" id="index-t_002d_002druc"></a>
+<a class="index-entry-id" id="index-T_002d_002druc"></a>
+<a class="index-entry-id" id="index-_002e"></a>
+<a class="index-entry-id" id="index-_003f"></a>
+<a class="index-entry-id" id="index-a"></a>
+<a class="index-entry-id" id="index-t_002d_002druc-1"></a>
+<a class="index-entry-id" id="index-T_002d_002druc-1"></a>
+<a class="index-entry-id" id="index-_002e-1"></a>
+<a class="index-entry-id" id="index-_003f-1"></a>
+<a class="index-entry-id" id="index-a-7"></a>
-<a class="index-entry-anchor" id="index-a_002d_002d_002da"></a>
-<a class="index-entry-anchor" id="index-b_002d_002d_002db"></a>
-<a class="index-entry-anchor" id="index-d_002d_002d_002ddd"></a>
-<a class="index-entry-anchor" id="index-g_002d_002d_002dgg"></a>
+<a class="index-entry-id" id="index-a_002d_002d_002da"></a>
+<a class="index-entry-id" id="index-b_002d_002d_002db"></a>
+<a class="index-entry-id" id="index-d_002d_002d_002ddd"></a>
+<a class="index-entry-id" id="index-g_002d_002d_002dgg"></a>
-<a class="index-entry-anchor" id="index-f_002d_002d_002daa"></a>
-<a class="index-entry-anchor" id="index-f_002d_002d_002dbb"></a>
-<a class="index-entry-anchor" id="index-f_002d_002d_002dddd"></a>
-<a class="index-entry-anchor" id="index-f_002d_002d_002dggg"></a>
+<a class="index-entry-id" id="index-f_002d_002d_002daa"></a>
+<a class="index-entry-id" id="index-f_002d_002d_002dbb"></a>
+<a class="index-entry-id" id="index-f_002d_002d_002dddd"></a>
+<a class="index-entry-id" id="index-f_002d_002d_002dggg"></a>
-<a class="index-entry-anchor" id="index-aaa"></a>
+<a class="index-entry-id" id="index-aaa"></a>
-<a class="index-entry-anchor" id="index-xxx"></a>
+<a class="index-entry-id" id="index-xxx"></a>
-<a class="index-entry-anchor" id="index-"></a>
+<a class="index-entry-id" id="index-"></a>
-<a class="index-entry-anchor"
id="index-a-index_002d_002d_002dentry-te-_002d_002d_002d-i"></a>
+<a class="index-entry-id"
id="index-a-index_002d_002d_002dentry-te-_002d_002d_002d-i"></a>
-<a class="index-entry-anchor" id="index-truc-4"></a>
+<a class="index-entry-id" id="index-truc-4"></a>
<p>Text<a class="footnote" id="DOCF9" href="#FOOT9"><sup>11</sup></a>
@@ -7329,13 +7329,13 @@ Menu comment
<p>in footnote2</p>
<h5><a id="FOOT9" href="#DOCF9">(11)</a></h5>
<p>in footnote
-<a class="index-entry-anchor" id="index-index-entry-in-footnote"></a>
+<a class="index-entry-id" id="index-index-entry-in-footnote"></a>
</p>
<p>Blah
</p>
<p>Blih
</p>
-<a class="index-entry-anchor" id="index-counting-entry"></a>
+<a class="index-entry-id" id="index-counting-entry"></a>
<h5><a id="FOOT10" href="#DOCF10">(12)</a></h5>
<p>in footnote</p>
</div><div class="element-contents" id="SEC_Contents">
diff --git
a/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/xhtml/chapter.xhtml
b/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/xhtml/chapter.xhtml
index de40c5548a..3d762ac7c9 100644
---
a/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/xhtml/chapter.xhtml
+++
b/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/xhtml/chapter.xhtml
@@ -859,10 +859,10 @@ kbd: <kbd
class="kbd">``simple-double--three---four----''</kbd> <br/>
</p>
<p>‘<!-- /@w -->‘simple-double-<!-- /@w
-->-three—four—-’<!-- /@w -->’<br/>
</p>
-<a class="index-entry-anchor" id="index-copying-_002d_002doption"></a>
-<a class="index-entry-anchor" id="index-copying-_0060_0060"></a>
-<a class="index-entry-anchor" id="index-copying-_0060_0060-1"></a>
-<a class="index-entry-anchor" id="index-copying-_002d_002dfoption"></a>
+<a class="index-entry-id" id="index-copying-_002d_002doption"></a>
+<a class="index-entry-id" id="index-copying-_0060_0060"></a>
+<a class="index-entry-id" id="index-copying-_0060_0060-1"></a>
+<a class="index-entry-id" id="index-copying-_002d_002dfoption"></a>
<p>@"u ü
@"{U} Ü
@@ -1221,7 +1221,7 @@ error→ ↦ − ★ ⊣ ⇒
</li></ul>
<ul class="itemize" style="list-style-type: '\2022 a\2013 n itemize line'">
-<li><a class="index-entry-anchor"
id="index-copying-index-entry-within-itemize"></a>
+<li><a class="index-entry-id"
id="index-copying-index-entry-within-itemize"></a>
i–tem 1
</li><li>i–tem 2
</li></ul>
@@ -1263,7 +1263,7 @@ i–tem 1
<thead><tr><th width="40%">mu–ltitable headitem</th><th
width="60%">another tab</th></tr></thead>
<tbody><tr><td width="40%">mu–ltitable item</td><td
width="60%">multitable tab</td></tr>
<tr><td width="40%">mu–ltitable item 2</td><td width="60%">multitable
tab 2
-<a class="index-entry-anchor"
id="index-copying-index-entry-within-multitable"></a></td></tr>
+<a class="index-entry-id"
id="index-copying-index-entry-within-multitable"></a></td></tr>
<tr><td width="40%">lone mu–ltitable item</td></tr>
</tbody>
</table>
@@ -1364,7 +1364,7 @@ f(x) = {1 \over \sigma \sqrt{2\pi}}e<sup class="sup">-{1
\over 2}\left({x-\mu \o
<dl class="first-deffn">
<dt class="deffn" id="index-copying-i"><span class="category-def">fset:
</span><strong class="strong"><var class="var">i</var></strong> <em
class="emph">a g</em></dt>
-<dd><a class="index-entry-anchor"
id="index-copying-index-entry-within-deffn"></a>
+<dd><a class="index-entry-id" id="index-copying-index-entry-within-deffn"></a>
</dd><dt class="deffnx def-cmd-deffn" id="index-copying-truc"><span
class="category-def">cmde: </span><strong class="strong">truc</strong> <em
class="emph"></em></dt>
<dt class="deffnx def-cmd-deffn" id="index-copying-log-trap"><span
class="category-def">Command: </span><strong class="strong">log trap</strong>
<em class="emph"></em></dt>
<dt class="deffnx def-cmd-deffn" id="index-copying-log-trap1"><span
class="category-def">Command: </span><strong class="strong">log trap1</strong>
<em class="emph"></em></dt>
@@ -1657,7 +1657,7 @@ ref</a>
<dl class="ftable">
<dt id='index-copying-a-1'><em class="emph">a</em></dt>
-<dd><a class="index-entry-anchor"
id="index-copying-index-entry-between-item-and-itemx"></a>
+<dd><a class="index-entry-id"
id="index-copying-index-entry-between-item-and-itemx"></a>
</dd>
<dt id='index-copying-b'><em class="emph">b</em></dt>
<dd><p>l–ine
@@ -1799,7 +1799,7 @@ html ''
<dl class="ftable">
<dt id='index-copying-a-2'>a</dt>
-<dd><a class="index-entry-anchor"
id="index-copying-index-entry-between-item-and-itemx-1"></a>
+<dd><a class="index-entry-id"
id="index-copying-index-entry-between-item-and-itemx-1"></a>
</dd>
<dt id='index-copying-b-1'>b</dt>
<dd><p>l–ine
@@ -1873,10 +1873,10 @@ kbd: <kbd
class="kbd">``simple-double--three---four----''</kbd> <br/>
</p>
<p>‘<!-- /@w -->‘simple-double-<!-- /@w
-->-three—four—-’<!-- /@w -->’<br/>
</p>
-<a class="index-entry-anchor" id="index-_002d_002doption"></a>
-<a class="index-entry-anchor" id="index-_0060_0060"></a>
-<a class="index-entry-anchor" id="index-_0060_0060-2"></a>
-<a class="index-entry-anchor" id="index-_002d_002dfoption"></a>
+<a class="index-entry-id" id="index-_002d_002doption"></a>
+<a class="index-entry-id" id="index-_0060_0060"></a>
+<a class="index-entry-id" id="index-_0060_0060-2"></a>
+<a class="index-entry-id" id="index-_002d_002dfoption"></a>
<p>@"u ü
@"{U} Ü
@@ -2235,7 +2235,7 @@ error→ ↦ − ★ ⊣ ⇒
</li></ul>
<ul class="itemize" style="list-style-type: '\2022 a\2013 n itemize line'">
-<li><a class="index-entry-anchor" id="index-index-entry-within-itemize"></a>
+<li><a class="index-entry-id" id="index-index-entry-within-itemize"></a>
i–tem 1
</li><li>i–tem 2
</li></ul>
@@ -2277,7 +2277,7 @@ i–tem 1
<thead><tr><th width="40%">mu–ltitable headitem</th><th
width="60%">another tab</th></tr></thead>
<tbody><tr><td width="40%">mu–ltitable item</td><td
width="60%">multitable tab</td></tr>
<tr><td width="40%">mu–ltitable item 2</td><td width="60%">multitable
tab 2
-<a class="index-entry-anchor"
id="index-index-entry-within-multitable"></a></td></tr>
+<a class="index-entry-id"
id="index-index-entry-within-multitable"></a></td></tr>
<tr><td width="40%">lone mu–ltitable item</td></tr>
</tbody>
</table>
@@ -2378,7 +2378,7 @@ f(x) = {1 \over \sigma \sqrt{2\pi}}e<sup class="sup">-{1
\over 2}\left({x-\mu \o
<dl class="first-deffn">
<dt class="deffn" id="index-i"><span class="category-def">fset: </span><strong
class="strong"><var class="var">i</var></strong> <em class="emph">a g</em></dt>
-<dd><a class="index-entry-anchor" id="index-index-entry-within-deffn"></a>
+<dd><a class="index-entry-id" id="index-index-entry-within-deffn"></a>
</dd><dt class="deffnx def-cmd-deffn" id="index-truc"><span
class="category-def">cmde: </span><strong class="strong">truc</strong> <em
class="emph"></em></dt>
<dt class="deffnx def-cmd-deffn" id="index-log-trap"><span
class="category-def">Command: </span><strong class="strong">log trap</strong>
<em class="emph"></em></dt>
<dt class="deffnx def-cmd-deffn" id="index-log-trap1"><span
class="category-def">Command: </span><strong class="strong">log trap1</strong>
<em class="emph"></em></dt>
@@ -2671,7 +2671,7 @@ ref</a>
<dl class="ftable">
<dt id='index-a-2'><em class="emph">a</em></dt>
-<dd><a class="index-entry-anchor"
id="index-index-entry-between-item-and-itemx"></a>
+<dd><a class="index-entry-id"
id="index-index-entry-between-item-and-itemx"></a>
</dd>
<dt id='index-b'><em class="emph">b</em></dt>
<dd><p>l–ine
@@ -2813,7 +2813,7 @@ html ''
<dl class="ftable">
<dt id='index-a-3'>a</dt>
-<dd><a class="index-entry-anchor"
id="index-index-entry-between-item-and-itemx-1"></a>
+<dd><a class="index-entry-id"
id="index-index-entry-between-item-and-itemx-1"></a>
</dd>
<dt id='index-b-1'>b</dt>
<dd><p>l–ine
@@ -2895,7 +2895,7 @@ kbd: <kbd
class="kbd">``simple-double--three---four----''</kbd>
`<!-- /@w -->`simple-double-<!-- /@w -->-three---four----'<!-- /@w -->'
-<a class="index-entry-anchor" id="index-_002d_002doption-1"></a><a
class="index-entry-anchor" id="index-_0060_0060-1"></a><a
class="index-entry-anchor" id="index-_0060_0060-3"></a><a
class="index-entry-anchor" id="index-_002d_002dfoption-1"></a>
+<a class="index-entry-id" id="index-_002d_002doption-1"></a><a
class="index-entry-id" id="index-_0060_0060-1"></a><a class="index-entry-id"
id="index-_0060_0060-3"></a><a class="index-entry-id"
id="index-_002d_002dfoption-1"></a>
@"u ü
@"{U} Ü
@~n ñ
@@ -3293,7 +3293,7 @@ error→ ↦ − ★ ⊣ ⇒
<pre class="example-preformatted">
</pre><ul class="itemize" style="list-style-type: '\2022 a\2013 n itemize
line'">
-<li><pre class="example-preformatted"><a class="index-entry-anchor"
id="index-index-entry-within-itemize-1"></a>i--tem 1
+<li><pre class="example-preformatted"><a class="index-entry-id"
id="index-index-entry-within-itemize-1"></a>i--tem 1
</pre></li><li><pre class="example-preformatted">i--tem 2
</pre></li></ul>
<pre class="example-preformatted">
@@ -3342,7 +3342,7 @@ error→ ↦ − ★ ⊣ ⇒
<thead><tr><th width="40%"><pre class="example-preformatted">mu--ltitable
headitem</pre></th><th width="60%"><pre class="example-preformatted">another
tab</pre></th></tr></thead>
<tbody><tr><td width="40%"><pre class="example-preformatted">mu--ltitable
item</pre></td><td width="60%"><pre class="example-preformatted">multitable
tab</pre></td></tr>
<tr><td width="40%"><pre class="example-preformatted">mu--ltitable item
2</pre></td><td width="60%"><pre class="example-preformatted">multitable tab 2
-<a class="index-entry-anchor"
id="index-index-entry-within-multitable-1"></a></pre></td></tr>
+<a class="index-entry-id"
id="index-index-entry-within-multitable-1"></a></pre></td></tr>
<tr><td width="40%"><pre class="example-preformatted">lone mu--ltitable
item</pre></td></tr>
</tbody>
</table>
@@ -3465,7 +3465,7 @@ f(x) = {1 \over \sigma \sqrt{2\pi}}e<sup class="sup">-{1
\over 2}\left({x-\mu \o
<pre class="example-preformatted">
</pre><dl class="first-deffn">
<dt class="deffn" id="index-i-2"><span class="category-def">fset:
</span><strong class="strong"><var class="var">i</var></strong> <em
class="emph">a g</em></dt>
-<dd><pre class="example-preformatted"><a class="index-entry-anchor"
id="index-index-entry-within-deffn-1"></a></pre></dd><dt class="deffnx
def-cmd-deffn" id="index-truc-2"><span class="category-def">cmde:
</span><strong class="strong">truc</strong> <em class="emph"></em></dt>
+<dd><pre class="example-preformatted"><a class="index-entry-id"
id="index-index-entry-within-deffn-1"></a></pre></dd><dt class="deffnx
def-cmd-deffn" id="index-truc-2"><span class="category-def">cmde:
</span><strong class="strong">truc</strong> <em class="emph"></em></dt>
<dt class="deffnx def-cmd-deffn" id="index-log-trap-1"><span
class="category-def">Command: </span><strong class="strong">log trap</strong>
<em class="emph"></em></dt>
<dt class="deffnx def-cmd-deffn" id="index-log-trap1-1"><span
class="category-def">Command: </span><strong class="strong">log trap1</strong>
<em class="emph"></em></dt>
<dt class="deffnx def-cmd-deffn" id="index-log-trap2-1"><span
class="category-def">Command: </span><strong class="strong">log trap2</strong>
<em class="emph"></em></dt>
@@ -3809,7 +3809,7 @@ ref</a>
</pre><dl class="ftable">
<dt id='index-a-5'><tt><em class="emph">a</em></tt></dt>
-<dd><pre class="example-preformatted"><a class="index-entry-anchor"
id="index-index-entry-between-item-and-itemx-2"></a></pre></dd>
+<dd><pre class="example-preformatted"><a class="index-entry-id"
id="index-index-entry-between-item-and-itemx-2"></a></pre></dd>
<dt id='index-b-2'><tt><em class="emph">b</em></tt></dt>
<dd><pre class="example-preformatted">l--ine
</pre></dd>
@@ -3975,7 +3975,7 @@ Invalid use of @':
</pre><dl class="ftable">
<dt id='index-a-6'><tt>a</tt></dt>
-<dd><pre class="example-preformatted"><a class="index-entry-anchor"
id="index-index-entry-between-item-and-itemx-3"></a></pre></dd>
+<dd><pre class="example-preformatted"><a class="index-entry-id"
id="index-index-entry-between-item-and-itemx-3"></a></pre></dd>
<dt id='index-b-3'><tt>b</tt></dt>
<dd><pre class="example-preformatted">l--ine
</pre></dd>
@@ -4034,38 +4034,38 @@ Invalid use of @':
</pre></div>
-<a class="index-entry-anchor" id="index-t_002d_002druc"></a>
-<a class="index-entry-anchor" id="index-T_002d_002druc"></a>
-<a class="index-entry-anchor" id="index-_002e"></a>
-<a class="index-entry-anchor" id="index-_003f"></a>
-<a class="index-entry-anchor" id="index-a"></a>
-<a class="index-entry-anchor" id="index-t_002d_002druc-1"></a>
-<a class="index-entry-anchor" id="index-T_002d_002druc-1"></a>
-<a class="index-entry-anchor" id="index-_002e-1"></a>
-<a class="index-entry-anchor" id="index-_003f-1"></a>
-<a class="index-entry-anchor" id="index-a-7"></a>
+<a class="index-entry-id" id="index-t_002d_002druc"></a>
+<a class="index-entry-id" id="index-T_002d_002druc"></a>
+<a class="index-entry-id" id="index-_002e"></a>
+<a class="index-entry-id" id="index-_003f"></a>
+<a class="index-entry-id" id="index-a"></a>
+<a class="index-entry-id" id="index-t_002d_002druc-1"></a>
+<a class="index-entry-id" id="index-T_002d_002druc-1"></a>
+<a class="index-entry-id" id="index-_002e-1"></a>
+<a class="index-entry-id" id="index-_003f-1"></a>
+<a class="index-entry-id" id="index-a-7"></a>
-<a class="index-entry-anchor" id="index-a_002d_002d_002da"></a>
-<a class="index-entry-anchor" id="index-b_002d_002d_002db"></a>
-<a class="index-entry-anchor" id="index-d_002d_002d_002ddd"></a>
-<a class="index-entry-anchor" id="index-g_002d_002d_002dgg"></a>
+<a class="index-entry-id" id="index-a_002d_002d_002da"></a>
+<a class="index-entry-id" id="index-b_002d_002d_002db"></a>
+<a class="index-entry-id" id="index-d_002d_002d_002ddd"></a>
+<a class="index-entry-id" id="index-g_002d_002d_002dgg"></a>
-<a class="index-entry-anchor" id="index-f_002d_002d_002daa"></a>
-<a class="index-entry-anchor" id="index-f_002d_002d_002dbb"></a>
-<a class="index-entry-anchor" id="index-f_002d_002d_002dddd"></a>
-<a class="index-entry-anchor" id="index-f_002d_002d_002dggg"></a>
+<a class="index-entry-id" id="index-f_002d_002d_002daa"></a>
+<a class="index-entry-id" id="index-f_002d_002d_002dbb"></a>
+<a class="index-entry-id" id="index-f_002d_002d_002dddd"></a>
+<a class="index-entry-id" id="index-f_002d_002d_002dggg"></a>
-<a class="index-entry-anchor" id="index-aaa"></a>
+<a class="index-entry-id" id="index-aaa"></a>
-<a class="index-entry-anchor" id="index-xxx"></a>
+<a class="index-entry-id" id="index-xxx"></a>
-<a class="index-entry-anchor" id="index-"></a>
+<a class="index-entry-id" id="index-"></a>
-<a class="index-entry-anchor"
id="index-a-index_002d_002d_002dentry-te-_002d_002d_002d-i"></a>
+<a class="index-entry-id"
id="index-a-index_002d_002d_002dentry-te-_002d_002d_002d-i"></a>
-<a class="index-entry-anchor" id="index-truc-4"></a>
+<a class="index-entry-id" id="index-truc-4"></a>
<p>Text<a class="footnote" id="DOCF9"
href="formatting_fot.xhtml#FOOT9"><sup>11</sup></a>
diff --git
a/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/xhtml/formatting.xhtml
b/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/xhtml/formatting.xhtml
index 30bc30021f..e9d9942c0c 100644
---
a/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/xhtml/formatting.xhtml
+++
b/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/xhtml/formatting.xhtml
@@ -850,10 +850,10 @@ kbd: <kbd
class="kbd">``simple-double--three---four----''</kbd> <br/>
</p>
<p>‘<!-- /@w -->‘simple-double-<!-- /@w
-->-three—four—-’<!-- /@w -->’<br/>
</p>
-<a class="index-entry-anchor" id="index-titlepage-_002d_002doption"></a>
-<a class="index-entry-anchor" id="index-titlepage-_0060_0060"></a>
-<a class="index-entry-anchor" id="index-titlepage-_0060_0060-1"></a>
-<a class="index-entry-anchor" id="index-titlepage-_002d_002dfoption"></a>
+<a class="index-entry-id" id="index-titlepage-_002d_002doption"></a>
+<a class="index-entry-id" id="index-titlepage-_0060_0060"></a>
+<a class="index-entry-id" id="index-titlepage-_0060_0060-1"></a>
+<a class="index-entry-id" id="index-titlepage-_002d_002dfoption"></a>
<p>@"u ü
@"{U} Ü
@@ -1213,7 +1213,7 @@ error→ ↦ − ★ ⊣ ⇒
</li></ul>
<ul class="itemize" style="list-style-type: '\2022 a\2013 n itemize line'">
-<li><a class="index-entry-anchor"
id="index-titlepage-index-entry-within-itemize"></a>
+<li><a class="index-entry-id"
id="index-titlepage-index-entry-within-itemize"></a>
i–tem 1
</li><li>i–tem 2
</li></ul>
@@ -1255,7 +1255,7 @@ i–tem 1
<thead><tr><th width="40%">mu–ltitable headitem</th><th
width="60%">another tab</th></tr></thead>
<tbody><tr><td width="40%">mu–ltitable item</td><td
width="60%">multitable tab</td></tr>
<tr><td width="40%">mu–ltitable item 2</td><td width="60%">multitable
tab 2
-<a class="index-entry-anchor"
id="index-titlepage-index-entry-within-multitable"></a></td></tr>
+<a class="index-entry-id"
id="index-titlepage-index-entry-within-multitable"></a></td></tr>
<tr><td width="40%">lone mu–ltitable item</td></tr>
</tbody>
</table>
@@ -1356,7 +1356,7 @@ f(x) = {1 \over \sigma \sqrt{2\pi}}e<sup class="sup">-{1
\over 2}\left({x-\mu \o
<dl class="first-deffn">
<dt class="deffn" id="index-titlepage-i"><span class="category-def">fset:
</span><strong class="strong"><var class="var">i</var></strong> <em
class="emph">a g</em></dt>
-<dd><a class="index-entry-anchor"
id="index-titlepage-index-entry-within-deffn"></a>
+<dd><a class="index-entry-id"
id="index-titlepage-index-entry-within-deffn"></a>
</dd><dt class="deffnx def-cmd-deffn" id="index-titlepage-truc"><span
class="category-def">cmde: </span><strong class="strong">truc</strong> <em
class="emph"></em></dt>
<dt class="deffnx def-cmd-deffn" id="index-titlepage-log-trap"><span
class="category-def">Command: </span><strong class="strong">log trap</strong>
<em class="emph"></em></dt>
<dt class="deffnx def-cmd-deffn" id="index-titlepage-log-trap1"><span
class="category-def">Command: </span><strong class="strong">log trap1</strong>
<em class="emph"></em></dt>
@@ -1649,7 +1649,7 @@ ref</a>
<dl class="ftable">
<dt id='index-titlepage-a-1'><em class="emph">a</em></dt>
-<dd><a class="index-entry-anchor"
id="index-titlepage-index-entry-between-item-and-itemx"></a>
+<dd><a class="index-entry-id"
id="index-titlepage-index-entry-between-item-and-itemx"></a>
</dd>
<dt id='index-titlepage-b'><em class="emph">b</em></dt>
<dd><p>l–ine
@@ -1791,7 +1791,7 @@ html ''
<dl class="ftable">
<dt id='index-titlepage-a-2'>a</dt>
-<dd><a class="index-entry-anchor"
id="index-titlepage-index-entry-between-item-and-itemx-1"></a>
+<dd><a class="index-entry-id"
id="index-titlepage-index-entry-between-item-and-itemx-1"></a>
</dd>
<dt id='index-titlepage-b-1'>b</dt>
<dd><p>l–ine
@@ -1866,10 +1866,10 @@ kbd: <kbd
class="kbd">``simple-double--three---four----''</kbd> <br/>
</p>
<p>‘<!-- /@w -->‘simple-double-<!-- /@w
-->-three—four—-’<!-- /@w -->’<br/>
</p>
-<a class="index-entry-anchor" id="index-copying-_002d_002doption"></a>
-<a class="index-entry-anchor" id="index-copying-_0060_0060"></a>
-<a class="index-entry-anchor" id="index-copying-_0060_0060-1"></a>
-<a class="index-entry-anchor" id="index-copying-_002d_002dfoption"></a>
+<a class="index-entry-id" id="index-copying-_002d_002doption"></a>
+<a class="index-entry-id" id="index-copying-_0060_0060"></a>
+<a class="index-entry-id" id="index-copying-_0060_0060-1"></a>
+<a class="index-entry-id" id="index-copying-_002d_002dfoption"></a>
<p>@"u ü
@"{U} Ü
@@ -2228,7 +2228,7 @@ error→ ↦ − ★ ⊣ ⇒
</li></ul>
<ul class="itemize" style="list-style-type: '\2022 a\2013 n itemize line'">
-<li><a class="index-entry-anchor"
id="index-copying-index-entry-within-itemize"></a>
+<li><a class="index-entry-id"
id="index-copying-index-entry-within-itemize"></a>
i–tem 1
</li><li>i–tem 2
</li></ul>
@@ -2270,7 +2270,7 @@ i–tem 1
<thead><tr><th width="40%">mu–ltitable headitem</th><th
width="60%">another tab</th></tr></thead>
<tbody><tr><td width="40%">mu–ltitable item</td><td
width="60%">multitable tab</td></tr>
<tr><td width="40%">mu–ltitable item 2</td><td width="60%">multitable
tab 2
-<a class="index-entry-anchor"
id="index-copying-index-entry-within-multitable"></a></td></tr>
+<a class="index-entry-id"
id="index-copying-index-entry-within-multitable"></a></td></tr>
<tr><td width="40%">lone mu–ltitable item</td></tr>
</tbody>
</table>
@@ -2371,7 +2371,7 @@ f(x) = {1 \over \sigma \sqrt{2\pi}}e<sup class="sup">-{1
\over 2}\left({x-\mu \o
<dl class="first-deffn">
<dt class="deffn" id="index-copying-i"><span class="category-def">fset:
</span><strong class="strong"><var class="var">i</var></strong> <em
class="emph">a g</em></dt>
-<dd><a class="index-entry-anchor"
id="index-copying-index-entry-within-deffn"></a>
+<dd><a class="index-entry-id" id="index-copying-index-entry-within-deffn"></a>
</dd><dt class="deffnx def-cmd-deffn" id="index-copying-truc"><span
class="category-def">cmde: </span><strong class="strong">truc</strong> <em
class="emph"></em></dt>
<dt class="deffnx def-cmd-deffn" id="index-copying-log-trap"><span
class="category-def">Command: </span><strong class="strong">log trap</strong>
<em class="emph"></em></dt>
<dt class="deffnx def-cmd-deffn" id="index-copying-log-trap1"><span
class="category-def">Command: </span><strong class="strong">log trap1</strong>
<em class="emph"></em></dt>
@@ -2664,7 +2664,7 @@ ref</a>
<dl class="ftable">
<dt id='index-copying-a-1'><em class="emph">a</em></dt>
-<dd><a class="index-entry-anchor"
id="index-copying-index-entry-between-item-and-itemx"></a>
+<dd><a class="index-entry-id"
id="index-copying-index-entry-between-item-and-itemx"></a>
</dd>
<dt id='index-copying-b'><em class="emph">b</em></dt>
<dd><p>l–ine
@@ -2806,7 +2806,7 @@ html ''
<dl class="ftable">
<dt id='index-copying-a-2'>a</dt>
-<dd><a class="index-entry-anchor"
id="index-copying-index-entry-between-item-and-itemx-1"></a>
+<dd><a class="index-entry-id"
id="index-copying-index-entry-between-item-and-itemx-1"></a>
</dd>
<dt id='index-copying-b-1'>b</dt>
<dd><p>l–ine
diff --git
a/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/xhtml/formatting_fot.xhtml
b/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/xhtml/formatting_fot.xhtml
index 6143840ee0..952fbea594 100644
---
a/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/xhtml/formatting_fot.xhtml
+++
b/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/xhtml/formatting_fot.xhtml
@@ -837,13 +837,13 @@ span.program-in-footer {font-size: smaller}
<p>in footnote2</p>
<h5><a id="FOOT9" href="chapter.xhtml#DOCF9">(11)</a></h5>
<p>in footnote
-<a class="index-entry-anchor" id="index-index-entry-in-footnote"></a>
+<a class="index-entry-id" id="index-index-entry-in-footnote"></a>
</p>
<p>Blah
</p>
<p>Blih
</p>
-<a class="index-entry-anchor" id="index-counting-entry"></a>
+<a class="index-entry-id" id="index-counting-entry"></a>
<h5><a id="FOOT10" href="chapter.xhtml#DOCF10">(12)</a></h5>
<p>in footnote</p>
</div><p>
diff --git a/tp/tests/layout/res_parser/formatting_exotic/chapter.html
b/tp/tests/layout/res_parser/formatting_exotic/chapter.html
index ab59a8f215..cb0f46fcd1 100644
--- a/tp/tests/layout/res_parser/formatting_exotic/chapter.html
+++ b/tp/tests/layout/res_parser/formatting_exotic/chapter.html
@@ -872,10 +872,10 @@ kbd: <kbd
class="kbd">``simple-double--three---four----''</kbd> <br>
</p>
<p>‘<!-- /@w -->‘simple-double-<!-- /@w
-->-three—four—-’<!-- /@w -->’<br>
</p>
-<a class="index-entry-anchor" id="index-copying-_002d_002doption"></a>
-<a class="index-entry-anchor" id="index-copying-_0060_0060"></a>
-<a class="index-entry-anchor" id="index-copying-_0060_0060-1"></a>
-<a class="index-entry-anchor" id="index-copying-_002d_002dfoption"></a>
+<a class="index-entry-id" id="index-copying-_002d_002doption"></a>
+<a class="index-entry-id" id="index-copying-_0060_0060"></a>
+<a class="index-entry-id" id="index-copying-_0060_0060-1"></a>
+<a class="index-entry-id" id="index-copying-_002d_002dfoption"></a>
<p>@"u ü
@"{U} Ü
@@ -1234,7 +1234,7 @@ error→ → - ∗ -| ⇒
</li></ul>
<ul class="itemize" style="list-style-type: '\2022 a\2013 n itemize line'">
-<li><a class="index-entry-anchor"
id="index-copying-index-entry-within-itemize"></a>
+<li><a class="index-entry-id"
id="index-copying-index-entry-within-itemize"></a>
i–tem 1
</li><li>i–tem 2
</li></ul>
@@ -1276,7 +1276,7 @@ i–tem 1
<thead><tr><th width="40%">mu–ltitable headitem</th><th
width="60%">another tab</th></tr></thead>
<tbody><tr><td width="40%">mu–ltitable item</td><td
width="60%">multitable tab</td></tr>
<tr><td width="40%">mu–ltitable item 2</td><td width="60%">multitable
tab 2
-<a class="index-entry-anchor"
id="index-copying-index-entry-within-multitable"></a></td></tr>
+<a class="index-entry-id"
id="index-copying-index-entry-within-multitable"></a></td></tr>
<tr><td width="40%">lone mu–ltitable item</td></tr>
</tbody>
</table>
@@ -1377,7 +1377,7 @@ f(x) = {1 \over \sigma \sqrt{2\pi}}e<sup class="sup">-{1
\over 2}\left({x-\mu \o
<table class="first-deffn" width="100%">
<tr class="deffn" id="index-copying-i"><td align="left"> <strong><var
class="var">i</var></strong><em> a g</em></td><td align="right">fset</td></tr>
-<tr><td colspan="2"><a class="index-entry-anchor"
id="index-copying-index-entry-within-deffn"></a>
+<tr><td colspan="2"><a class="index-entry-id"
id="index-copying-index-entry-within-deffn"></a>
</td></tr><tr class="deffnx def-cmd-deffn" id="index-copying-truc"><td
align="left"> <strong>truc</strong></td><td align="right">cmde</td></tr>
<tr class="deffnx def-cmd-deffn" id="index-copying-log-trap"><td align="left">
<strong>log trap</strong></td><td align="right">Command</td></tr>
<tr class="deffnx def-cmd-deffn" id="index-copying-log-trap1"><td
align="left"> <strong>log trap1</strong></td><td align="right">Command</td></tr>
@@ -1670,7 +1670,7 @@ ref</a>
<dl class="ftable">
<dt id='index-copying-a-1'><span><em class="emph">a</em><a
class="copiable-anchor" href='#index-copying-a-1'> ¶</a></span></dt>
-<dd><a class="index-entry-anchor"
id="index-copying-index-entry-between-item-and-itemx"></a>
+<dd><a class="index-entry-id"
id="index-copying-index-entry-between-item-and-itemx"></a>
</dd>
<dt id='index-copying-b'><span><em class="emph">b</em><a
class="copiable-anchor" href='#index-copying-b'> ¶</a></span></dt>
<dd><p>l–ine
@@ -1812,7 +1812,7 @@ html ''
<dl class="ftable">
<dt id='index-copying-a-2'><span>a<a class="copiable-anchor"
href='#index-copying-a-2'> ¶</a></span></dt>
-<dd><a class="index-entry-anchor"
id="index-copying-index-entry-between-item-and-itemx-1"></a>
+<dd><a class="index-entry-id"
id="index-copying-index-entry-between-item-and-itemx-1"></a>
</dd>
<dt id='index-copying-b-1'><span>b<a class="copiable-anchor"
href='#index-copying-b-1'> ¶</a></span></dt>
<dd><p>l–ine
@@ -1886,10 +1886,10 @@ kbd: <kbd
class="kbd">``simple-double--three---four----''</kbd> <br>
</p>
<p>‘<!-- /@w -->‘simple-double-<!-- /@w
-->-three—four—-’<!-- /@w -->’<br>
</p>
-<a class="index-entry-anchor" id="index-_002d_002doption"></a>
-<a class="index-entry-anchor" id="index-_0060_0060"></a>
-<a class="index-entry-anchor" id="index-_0060_0060-2"></a>
-<a class="index-entry-anchor" id="index-_002d_002dfoption"></a>
+<a class="index-entry-id" id="index-_002d_002doption"></a>
+<a class="index-entry-id" id="index-_0060_0060"></a>
+<a class="index-entry-id" id="index-_0060_0060-2"></a>
+<a class="index-entry-id" id="index-_002d_002dfoption"></a>
<p>@"u ü
@"{U} Ü
@@ -2248,7 +2248,7 @@ error→ → - ∗ -| ⇒
</li></ul>
<ul class="itemize" style="list-style-type: '\2022 a\2013 n itemize line'">
-<li><a class="index-entry-anchor" id="index-index-entry-within-itemize"></a>
+<li><a class="index-entry-id" id="index-index-entry-within-itemize"></a>
i–tem 1
</li><li>i–tem 2
</li></ul>
@@ -2290,7 +2290,7 @@ i–tem 1
<thead><tr><th width="40%">mu–ltitable headitem</th><th
width="60%">another tab</th></tr></thead>
<tbody><tr><td width="40%">mu–ltitable item</td><td
width="60%">multitable tab</td></tr>
<tr><td width="40%">mu–ltitable item 2</td><td width="60%">multitable
tab 2
-<a class="index-entry-anchor"
id="index-index-entry-within-multitable"></a></td></tr>
+<a class="index-entry-id"
id="index-index-entry-within-multitable"></a></td></tr>
<tr><td width="40%">lone mu–ltitable item</td></tr>
</tbody>
</table>
@@ -2391,7 +2391,7 @@ f(x) = {1 \over \sigma \sqrt{2\pi}}e<sup class="sup">-{1
\over 2}\left({x-\mu \o
<table class="first-deffn" width="100%">
<tr class="deffn" id="index-i"><td align="left"> <strong><var
class="var">i</var></strong><em> a g</em></td><td align="right">fset</td></tr>
-<tr><td colspan="2"><a class="index-entry-anchor"
id="index-index-entry-within-deffn"></a>
+<tr><td colspan="2"><a class="index-entry-id"
id="index-index-entry-within-deffn"></a>
</td></tr><tr class="deffnx def-cmd-deffn" id="index-truc"><td align="left">
<strong>truc</strong></td><td align="right">cmde</td></tr>
<tr class="deffnx def-cmd-deffn" id="index-log-trap"><td align="left">
<strong>log trap</strong></td><td align="right">Command</td></tr>
<tr class="deffnx def-cmd-deffn" id="index-log-trap1"><td align="left">
<strong>log trap1</strong></td><td align="right">Command</td></tr>
@@ -2684,7 +2684,7 @@ ref</a>
<dl class="ftable">
<dt id='index-a-2'><span><em class="emph">a</em><a class="copiable-anchor"
href='#index-a-2'> ¶</a></span></dt>
-<dd><a class="index-entry-anchor"
id="index-index-entry-between-item-and-itemx"></a>
+<dd><a class="index-entry-id"
id="index-index-entry-between-item-and-itemx"></a>
</dd>
<dt id='index-b'><span><em class="emph">b</em><a class="copiable-anchor"
href='#index-b'> ¶</a></span></dt>
<dd><p>l–ine
@@ -2826,7 +2826,7 @@ html ''
<dl class="ftable">
<dt id='index-a-3'><span>a<a class="copiable-anchor" href='#index-a-3'>
¶</a></span></dt>
-<dd><a class="index-entry-anchor"
id="index-index-entry-between-item-and-itemx-1"></a>
+<dd><a class="index-entry-id"
id="index-index-entry-between-item-and-itemx-1"></a>
</dd>
<dt id='index-b-1'><span>b<a class="copiable-anchor" href='#index-b-1'>
¶</a></span></dt>
<dd><p>l–ine
@@ -2908,7 +2908,7 @@ kbd: <kbd
class="kbd">``simple-double--three---four----''</kbd>
`<!-- /@w -->`simple-double-<!-- /@w -->-three---four----'<!-- /@w -->'
-<a class="index-entry-anchor" id="index-_002d_002doption-1"></a><a
class="index-entry-anchor" id="index-_0060_0060-1"></a><a
class="index-entry-anchor" id="index-_0060_0060-3"></a><a
class="index-entry-anchor" id="index-_002d_002dfoption-1"></a>
+<a class="index-entry-id" id="index-_002d_002doption-1"></a><a
class="index-entry-id" id="index-_0060_0060-1"></a><a class="index-entry-id"
id="index-_0060_0060-3"></a><a class="index-entry-id"
id="index-_002d_002dfoption-1"></a>
@"u ü
@"{U} Ü
@~n ñ
@@ -3306,7 +3306,7 @@ error→ → - ∗ -| ⇒
<pre class="example-preformatted">
</pre><ul class="itemize" style="list-style-type: '\2022 a\2013 n itemize
line'">
-<li><pre class="example-preformatted"><a class="index-entry-anchor"
id="index-index-entry-within-itemize-1"></a>i--tem 1
+<li><pre class="example-preformatted"><a class="index-entry-id"
id="index-index-entry-within-itemize-1"></a>i--tem 1
</pre></li><li><pre class="example-preformatted">i--tem 2
</pre></li></ul>
<pre class="example-preformatted">
@@ -3355,7 +3355,7 @@ error→ → - ∗ -| ⇒
<thead><tr><th width="40%"><pre class="example-preformatted">mu--ltitable
headitem</pre></th><th width="60%"><pre class="example-preformatted">another
tab</pre></th></tr></thead>
<tbody><tr><td width="40%"><pre class="example-preformatted">mu--ltitable
item</pre></td><td width="60%"><pre class="example-preformatted">multitable
tab</pre></td></tr>
<tr><td width="40%"><pre class="example-preformatted">mu--ltitable item
2</pre></td><td width="60%"><pre class="example-preformatted">multitable tab 2
-<a class="index-entry-anchor"
id="index-index-entry-within-multitable-1"></a></pre></td></tr>
+<a class="index-entry-id"
id="index-index-entry-within-multitable-1"></a></pre></td></tr>
<tr><td width="40%"><pre class="example-preformatted">lone mu--ltitable
item</pre></td></tr>
</tbody>
</table>
@@ -3478,7 +3478,7 @@ f(x) = {1 \over \sigma \sqrt{2\pi}}e<sup class="sup">-{1
\over 2}\left({x-\mu \o
<pre class="example-preformatted">
</pre><table class="first-deffn" width="100%">
<tr class="deffn" id="index-i-2"><td align="left"> <strong><var
class="var">i</var></strong><em> a g</em></td><td align="right">fset</td></tr>
-<tr><td colspan="2"><pre class="example-preformatted"><a
class="index-entry-anchor"
id="index-index-entry-within-deffn-1"></a></pre></td></tr><tr class="deffnx
def-cmd-deffn" id="index-truc-2"><td align="left">
<strong>truc</strong></td><td align="right">cmde</td></tr>
+<tr><td colspan="2"><pre class="example-preformatted"><a
class="index-entry-id"
id="index-index-entry-within-deffn-1"></a></pre></td></tr><tr class="deffnx
def-cmd-deffn" id="index-truc-2"><td align="left">
<strong>truc</strong></td><td align="right">cmde</td></tr>
<tr class="deffnx def-cmd-deffn" id="index-log-trap-1"><td align="left">
<strong>log trap</strong></td><td align="right">Command</td></tr>
<tr class="deffnx def-cmd-deffn" id="index-log-trap1-1"><td align="left">
<strong>log trap1</strong></td><td align="right">Command</td></tr>
<tr class="deffnx def-cmd-deffn" id="index-log-trap2-1"><td align="left">
<strong>log trap2</strong></td><td align="right">Command</td></tr>
@@ -3810,7 +3810,7 @@ ref</a>
</pre><dl class="ftable">
<dt id='index-a-5'><span><tt><em class="emph">a</em></tt><a
class="copiable-anchor" href='#index-a-5'> ¶</a></span></dt>
-<dd><pre class="example-preformatted"><a class="index-entry-anchor"
id="index-index-entry-between-item-and-itemx-2"></a></pre></dd>
+<dd><pre class="example-preformatted"><a class="index-entry-id"
id="index-index-entry-between-item-and-itemx-2"></a></pre></dd>
<dt id='index-b-2'><span><tt><em class="emph">b</em></tt><a
class="copiable-anchor" href='#index-b-2'> ¶</a></span></dt>
<dd><pre class="example-preformatted">l--ine
</pre></dd>
@@ -3976,7 +3976,7 @@ Invalid use of @':
</pre><dl class="ftable">
<dt id='index-a-6'><span><tt>a</tt><a class="copiable-anchor"
href='#index-a-6'> ¶</a></span></dt>
-<dd><pre class="example-preformatted"><a class="index-entry-anchor"
id="index-index-entry-between-item-and-itemx-3"></a></pre></dd>
+<dd><pre class="example-preformatted"><a class="index-entry-id"
id="index-index-entry-between-item-and-itemx-3"></a></pre></dd>
<dt id='index-b-3'><span><tt>b</tt><a class="copiable-anchor"
href='#index-b-3'> ¶</a></span></dt>
<dd><pre class="example-preformatted">l--ine
</pre></dd>
@@ -4035,38 +4035,38 @@ Invalid use of @':
</pre></div>
-<a class="index-entry-anchor" id="index-t_002d_002druc"></a>
-<a class="index-entry-anchor" id="index-T_002d_002druc"></a>
-<a class="index-entry-anchor" id="index-_002e"></a>
-<a class="index-entry-anchor" id="index-_003f"></a>
-<a class="index-entry-anchor" id="index-a"></a>
-<a class="index-entry-anchor" id="index-t_002d_002druc-1"></a>
-<a class="index-entry-anchor" id="index-T_002d_002druc-1"></a>
-<a class="index-entry-anchor" id="index-_002e-1"></a>
-<a class="index-entry-anchor" id="index-_003f-1"></a>
-<a class="index-entry-anchor" id="index-a-7"></a>
+<a class="index-entry-id" id="index-t_002d_002druc"></a>
+<a class="index-entry-id" id="index-T_002d_002druc"></a>
+<a class="index-entry-id" id="index-_002e"></a>
+<a class="index-entry-id" id="index-_003f"></a>
+<a class="index-entry-id" id="index-a"></a>
+<a class="index-entry-id" id="index-t_002d_002druc-1"></a>
+<a class="index-entry-id" id="index-T_002d_002druc-1"></a>
+<a class="index-entry-id" id="index-_002e-1"></a>
+<a class="index-entry-id" id="index-_003f-1"></a>
+<a class="index-entry-id" id="index-a-7"></a>
-<a class="index-entry-anchor" id="index-a_002d_002d_002da"></a>
-<a class="index-entry-anchor" id="index-b_002d_002d_002db"></a>
-<a class="index-entry-anchor" id="index-d_002d_002d_002ddd"></a>
-<a class="index-entry-anchor" id="index-g_002d_002d_002dgg"></a>
+<a class="index-entry-id" id="index-a_002d_002d_002da"></a>
+<a class="index-entry-id" id="index-b_002d_002d_002db"></a>
+<a class="index-entry-id" id="index-d_002d_002d_002ddd"></a>
+<a class="index-entry-id" id="index-g_002d_002d_002dgg"></a>
-<a class="index-entry-anchor" id="index-f_002d_002d_002daa"></a>
-<a class="index-entry-anchor" id="index-f_002d_002d_002dbb"></a>
-<a class="index-entry-anchor" id="index-f_002d_002d_002dddd"></a>
-<a class="index-entry-anchor" id="index-f_002d_002d_002dggg"></a>
+<a class="index-entry-id" id="index-f_002d_002d_002daa"></a>
+<a class="index-entry-id" id="index-f_002d_002d_002dbb"></a>
+<a class="index-entry-id" id="index-f_002d_002d_002dddd"></a>
+<a class="index-entry-id" id="index-f_002d_002d_002dggg"></a>
-<a class="index-entry-anchor" id="index-aaa"></a>
+<a class="index-entry-id" id="index-aaa"></a>
-<a class="index-entry-anchor" id="index-xxx"></a>
+<a class="index-entry-id" id="index-xxx"></a>
-<a class="index-entry-anchor" id="index-"></a>
+<a class="index-entry-id" id="index-"></a>
-<a class="index-entry-anchor"
id="index-a-index_002d_002d_002dentry-te-_002d_002d_002d-i"></a>
+<a class="index-entry-id"
id="index-a-index_002d_002d_002dentry-te-_002d_002d_002d-i"></a>
-<a class="index-entry-anchor" id="index-truc-4"></a>
+<a class="index-entry-id" id="index-truc-4"></a>
<p>Text<a class="footnote" id="DOCF9" href="#FOOT9"><sup>7</sup></a>
@@ -4687,13 +4687,13 @@ Invalid use of @':
<p>in footnote2</p>
<h5><a id="FOOT9" href="#DOCF9">(7)</a></h5>
<p>in footnote
-<a class="index-entry-anchor" id="index-index-entry-in-footnote"></a>
+<a class="index-entry-id" id="index-index-entry-in-footnote"></a>
</p>
<p>Blah
</p>
<p>Blih
</p>
-<a class="index-entry-anchor" id="index-counting-entry"></a>
+<a class="index-entry-id" id="index-counting-entry"></a>
<h5><a id="FOOT10" href="#DOCF10">(8)</a></h5>
<p>in footnote</p>
</div>
diff --git a/tp/tests/layout/res_parser/formatting_fr_icons/formatting.html
b/tp/tests/layout/res_parser/formatting_fr_icons/formatting.html
index c3721e5ce4..a91b91d2cf 100644
--- a/tp/tests/layout/res_parser/formatting_fr_icons/formatting.html
+++ b/tp/tests/layout/res_parser/formatting_fr_icons/formatting.html
@@ -853,10 +853,10 @@ kbd: <kbd
class="kbd">``simple-double--three---four----''</kbd> <br>
</p>
<p>‘<!-- /@w -->‘simple-double-<!-- /@w
-->-three—four—-’<!-- /@w -->’<br>
</p>
-<a class="index-entry-anchor" id="index-titlepage-_002d_002doption"></a>
-<a class="index-entry-anchor" id="index-titlepage-_0060_0060"></a>
-<a class="index-entry-anchor" id="index-titlepage-_0060_0060-1"></a>
-<a class="index-entry-anchor" id="index-titlepage-_002d_002dfoption"></a>
+<a class="index-entry-id" id="index-titlepage-_002d_002doption"></a>
+<a class="index-entry-id" id="index-titlepage-_0060_0060"></a>
+<a class="index-entry-id" id="index-titlepage-_0060_0060-1"></a>
+<a class="index-entry-id" id="index-titlepage-_002d_002dfoption"></a>
<p>@"u ü
@"{U} Ü
@@ -1216,7 +1216,7 @@ erreur→ → - ∗ -| ⇒
</li></ul>
<ul class="itemize" style="list-style-type: '\2022 a\2013 n itemize line'">
-<li><a class="index-entry-anchor"
id="index-titlepage-index-entry-within-itemize"></a>
+<li><a class="index-entry-id"
id="index-titlepage-index-entry-within-itemize"></a>
i–tem 1
</li><li>i–tem 2
</li></ul>
@@ -1258,7 +1258,7 @@ i–tem 1
<thead><tr><th width="40%">mu–ltitable headitem</th><th
width="60%">another tab</th></tr></thead>
<tbody><tr><td width="40%">mu–ltitable item</td><td
width="60%">multitable tab</td></tr>
<tr><td width="40%">mu–ltitable item 2</td><td width="60%">multitable
tab 2
-<a class="index-entry-anchor"
id="index-titlepage-index-entry-within-multitable"></a></td></tr>
+<a class="index-entry-id"
id="index-titlepage-index-entry-within-multitable"></a></td></tr>
<tr><td width="40%">lone mu–ltitable item</td></tr>
</tbody>
</table>
@@ -1359,7 +1359,7 @@ f(x) = {1 \over \sigma \sqrt{2\pi}}e<sup class="sup">-{1
\over 2}\left({x-\mu \o
<dl class="first-deffn">
<dt class="deffn" id="index-titlepage-i"><span
class="category-def">fset :</span><span><strong class="strong"><var
class="var">i</var></strong> <em class="emph">a g</em><a
class="copiable-anchor" href='#index-titlepage-i'> ¶</a></span></dt>
-<dd><a class="index-entry-anchor"
id="index-titlepage-index-entry-within-deffn"></a>
+<dd><a class="index-entry-id"
id="index-titlepage-index-entry-within-deffn"></a>
</dd><dt class="deffnx def-cmd-deffn" id="index-titlepage-truc"><span
class="category-def">cmde :</span><span><strong
class="strong">truc</strong> <em class="emph"></em><a class="copiable-anchor"
href='#index-titlepage-truc'> ¶</a></span></dt>
<dt class="deffnx def-cmd-deffn" id="index-titlepage-log-trap"><span
class="category-def">Command :</span><span><strong class="strong">log
trap</strong> <em class="emph"></em><a class="copiable-anchor"
href='#index-titlepage-log-trap'> ¶</a></span></dt>
<dt class="deffnx def-cmd-deffn" id="index-titlepage-log-trap1"><span
class="category-def">Command :</span><span><strong class="strong">log
trap1</strong> <em class="emph"></em><a class="copiable-anchor"
href='#index-titlepage-log-trap1'> ¶</a></span></dt>
@@ -1652,7 +1652,7 @@ ref</a>
<dl class="ftable">
<dt id='index-titlepage-a-1'><span><em class="emph">a</em><a
class="copiable-anchor" href='#index-titlepage-a-1'> ¶</a></span></dt>
-<dd><a class="index-entry-anchor"
id="index-titlepage-index-entry-between-item-and-itemx"></a>
+<dd><a class="index-entry-id"
id="index-titlepage-index-entry-between-item-and-itemx"></a>
</dd>
<dt id='index-titlepage-b'><span><em class="emph">b</em><a
class="copiable-anchor" href='#index-titlepage-b'> ¶</a></span></dt>
<dd><p>l–ine
@@ -1794,7 +1794,7 @@ html ''
<dl class="ftable">
<dt id='index-titlepage-a-2'><span>a<a class="copiable-anchor"
href='#index-titlepage-a-2'> ¶</a></span></dt>
-<dd><a class="index-entry-anchor"
id="index-titlepage-index-entry-between-item-and-itemx-1"></a>
+<dd><a class="index-entry-id"
id="index-titlepage-index-entry-between-item-and-itemx-1"></a>
</dd>
<dt id='index-titlepage-b-1'><span>b<a class="copiable-anchor"
href='#index-titlepage-b-1'> ¶</a></span></dt>
<dd><p>l–ine
@@ -1869,10 +1869,10 @@ kbd: <kbd
class="kbd">``simple-double--three---four----''</kbd> <br>
</p>
<p>‘<!-- /@w -->‘simple-double-<!-- /@w
-->-three—four—-’<!-- /@w -->’<br>
</p>
-<a class="index-entry-anchor" id="index-copying-_002d_002doption"></a>
-<a class="index-entry-anchor" id="index-copying-_0060_0060"></a>
-<a class="index-entry-anchor" id="index-copying-_0060_0060-1"></a>
-<a class="index-entry-anchor" id="index-copying-_002d_002dfoption"></a>
+<a class="index-entry-id" id="index-copying-_002d_002doption"></a>
+<a class="index-entry-id" id="index-copying-_0060_0060"></a>
+<a class="index-entry-id" id="index-copying-_0060_0060-1"></a>
+<a class="index-entry-id" id="index-copying-_002d_002dfoption"></a>
<p>@"u ü
@"{U} Ü
@@ -2231,7 +2231,7 @@ erreur→ → - ∗ -| ⇒
</li></ul>
<ul class="itemize" style="list-style-type: '\2022 a\2013 n itemize line'">
-<li><a class="index-entry-anchor"
id="index-copying-index-entry-within-itemize"></a>
+<li><a class="index-entry-id"
id="index-copying-index-entry-within-itemize"></a>
i–tem 1
</li><li>i–tem 2
</li></ul>
@@ -2273,7 +2273,7 @@ i–tem 1
<thead><tr><th width="40%">mu–ltitable headitem</th><th
width="60%">another tab</th></tr></thead>
<tbody><tr><td width="40%">mu–ltitable item</td><td
width="60%">multitable tab</td></tr>
<tr><td width="40%">mu–ltitable item 2</td><td width="60%">multitable
tab 2
-<a class="index-entry-anchor"
id="index-copying-index-entry-within-multitable"></a></td></tr>
+<a class="index-entry-id"
id="index-copying-index-entry-within-multitable"></a></td></tr>
<tr><td width="40%">lone mu–ltitable item</td></tr>
</tbody>
</table>
@@ -2374,7 +2374,7 @@ f(x) = {1 \over \sigma \sqrt{2\pi}}e<sup class="sup">-{1
\over 2}\left({x-\mu \o
<dl class="first-deffn">
<dt class="deffn" id="index-copying-i"><span
class="category-def">fset :</span><span><strong class="strong"><var
class="var">i</var></strong> <em class="emph">a g</em><a
class="copiable-anchor" href='#index-copying-i'> ¶</a></span></dt>
-<dd><a class="index-entry-anchor"
id="index-copying-index-entry-within-deffn"></a>
+<dd><a class="index-entry-id" id="index-copying-index-entry-within-deffn"></a>
</dd><dt class="deffnx def-cmd-deffn" id="index-copying-truc"><span
class="category-def">cmde :</span><span><strong
class="strong">truc</strong> <em class="emph"></em><a class="copiable-anchor"
href='#index-copying-truc'> ¶</a></span></dt>
<dt class="deffnx def-cmd-deffn" id="index-copying-log-trap"><span
class="category-def">Command :</span><span><strong class="strong">log
trap</strong> <em class="emph"></em><a class="copiable-anchor"
href='#index-copying-log-trap'> ¶</a></span></dt>
<dt class="deffnx def-cmd-deffn" id="index-copying-log-trap1"><span
class="category-def">Command :</span><span><strong class="strong">log
trap1</strong> <em class="emph"></em><a class="copiable-anchor"
href='#index-copying-log-trap1'> ¶</a></span></dt>
@@ -2667,7 +2667,7 @@ ref</a>
<dl class="ftable">
<dt id='index-copying-a-1'><span><em class="emph">a</em><a
class="copiable-anchor" href='#index-copying-a-1'> ¶</a></span></dt>
-<dd><a class="index-entry-anchor"
id="index-copying-index-entry-between-item-and-itemx"></a>
+<dd><a class="index-entry-id"
id="index-copying-index-entry-between-item-and-itemx"></a>
</dd>
<dt id='index-copying-b'><span><em class="emph">b</em><a
class="copiable-anchor" href='#index-copying-b'> ¶</a></span></dt>
<dd><p>l–ine
@@ -2809,7 +2809,7 @@ html ''
<dl class="ftable">
<dt id='index-copying-a-2'><span>a<a class="copiable-anchor"
href='#index-copying-a-2'> ¶</a></span></dt>
-<dd><a class="index-entry-anchor"
id="index-copying-index-entry-between-item-and-itemx-1"></a>
+<dd><a class="index-entry-id"
id="index-copying-index-entry-between-item-and-itemx-1"></a>
</dd>
<dt id='index-copying-b-1'><span>b<a class="copiable-anchor"
href='#index-copying-b-1'> ¶</a></span></dt>
<dd><p>l–ine
@@ -2940,10 +2940,10 @@ kbd: <kbd
class="kbd">``simple-double--three---four----''</kbd> <br>
</p>
<p>‘<!-- /@w -->‘simple-double-<!-- /@w
-->-three—four—-’<!-- /@w -->’<br>
</p>
-<a class="index-entry-anchor" id="index-copying-_002d_002doption"></a>
-<a class="index-entry-anchor" id="index-copying-_0060_0060"></a>
-<a class="index-entry-anchor" id="index-copying-_0060_0060-1"></a>
-<a class="index-entry-anchor" id="index-copying-_002d_002dfoption"></a>
+<a class="index-entry-id" id="index-copying-_002d_002doption"></a>
+<a class="index-entry-id" id="index-copying-_0060_0060"></a>
+<a class="index-entry-id" id="index-copying-_0060_0060-1"></a>
+<a class="index-entry-id" id="index-copying-_002d_002dfoption"></a>
<p>@"u ü
@"{U} Ü
@@ -3302,7 +3302,7 @@ erreur→ → - ∗ -| ⇒
</li></ul>
<ul class="itemize" style="list-style-type: '\2022 a\2013 n itemize line'">
-<li><a class="index-entry-anchor"
id="index-copying-index-entry-within-itemize"></a>
+<li><a class="index-entry-id"
id="index-copying-index-entry-within-itemize"></a>
i–tem 1
</li><li>i–tem 2
</li></ul>
@@ -3344,7 +3344,7 @@ i–tem 1
<thead><tr><th width="40%">mu–ltitable headitem</th><th
width="60%">another tab</th></tr></thead>
<tbody><tr><td width="40%">mu–ltitable item</td><td
width="60%">multitable tab</td></tr>
<tr><td width="40%">mu–ltitable item 2</td><td width="60%">multitable
tab 2
-<a class="index-entry-anchor"
id="index-copying-index-entry-within-multitable"></a></td></tr>
+<a class="index-entry-id"
id="index-copying-index-entry-within-multitable"></a></td></tr>
<tr><td width="40%">lone mu–ltitable item</td></tr>
</tbody>
</table>
@@ -3445,7 +3445,7 @@ f(x) = {1 \over \sigma \sqrt{2\pi}}e<sup class="sup">-{1
\over 2}\left({x-\mu \o
<dl class="first-deffn">
<dt class="deffn" id="index-copying-i"><span
class="category-def">fset :</span><span><strong class="strong"><var
class="var">i</var></strong> <em class="emph">a g</em><a
class="copiable-anchor" href='#index-copying-i'> ¶</a></span></dt>
-<dd><a class="index-entry-anchor"
id="index-copying-index-entry-within-deffn"></a>
+<dd><a class="index-entry-id" id="index-copying-index-entry-within-deffn"></a>
</dd><dt class="deffnx def-cmd-deffn" id="index-copying-truc"><span
class="category-def">cmde :</span><span><strong
class="strong">truc</strong> <em class="emph"></em><a class="copiable-anchor"
href='#index-copying-truc'> ¶</a></span></dt>
<dt class="deffnx def-cmd-deffn" id="index-copying-log-trap"><span
class="category-def">Command :</span><span><strong class="strong">log
trap</strong> <em class="emph"></em><a class="copiable-anchor"
href='#index-copying-log-trap'> ¶</a></span></dt>
<dt class="deffnx def-cmd-deffn" id="index-copying-log-trap1"><span
class="category-def">Command :</span><span><strong class="strong">log
trap1</strong> <em class="emph"></em><a class="copiable-anchor"
href='#index-copying-log-trap1'> ¶</a></span></dt>
@@ -3738,7 +3738,7 @@ ref</a>
<dl class="ftable">
<dt id='index-copying-a-1'><span><em class="emph">a</em><a
class="copiable-anchor" href='#index-copying-a-1'> ¶</a></span></dt>
-<dd><a class="index-entry-anchor"
id="index-copying-index-entry-between-item-and-itemx"></a>
+<dd><a class="index-entry-id"
id="index-copying-index-entry-between-item-and-itemx"></a>
</dd>
<dt id='index-copying-b'><span><em class="emph">b</em><a
class="copiable-anchor" href='#index-copying-b'> ¶</a></span></dt>
<dd><p>l–ine
@@ -3880,7 +3880,7 @@ html ''
<dl class="ftable">
<dt id='index-copying-a-2'><span>a<a class="copiable-anchor"
href='#index-copying-a-2'> ¶</a></span></dt>
-<dd><a class="index-entry-anchor"
id="index-copying-index-entry-between-item-and-itemx-1"></a>
+<dd><a class="index-entry-id"
id="index-copying-index-entry-between-item-and-itemx-1"></a>
</dd>
<dt id='index-copying-b-1'><span>b<a class="copiable-anchor"
href='#index-copying-b-1'> ¶</a></span></dt>
<dd><p>l–ine
@@ -3954,10 +3954,10 @@ kbd: <kbd
class="kbd">``simple-double--three---four----''</kbd> <br>
</p>
<p>‘<!-- /@w -->‘simple-double-<!-- /@w
-->-three—four—-’<!-- /@w -->’<br>
</p>
-<a class="index-entry-anchor" id="index-_002d_002doption"></a>
-<a class="index-entry-anchor" id="index-_0060_0060"></a>
-<a class="index-entry-anchor" id="index-_0060_0060-2"></a>
-<a class="index-entry-anchor" id="index-_002d_002dfoption"></a>
+<a class="index-entry-id" id="index-_002d_002doption"></a>
+<a class="index-entry-id" id="index-_0060_0060"></a>
+<a class="index-entry-id" id="index-_0060_0060-2"></a>
+<a class="index-entry-id" id="index-_002d_002dfoption"></a>
<p>@"u ü
@"{U} Ü
@@ -4316,7 +4316,7 @@ erreur→ → - ∗ -| ⇒
</li></ul>
<ul class="itemize" style="list-style-type: '\2022 a\2013 n itemize line'">
-<li><a class="index-entry-anchor" id="index-index-entry-within-itemize"></a>
+<li><a class="index-entry-id" id="index-index-entry-within-itemize"></a>
i–tem 1
</li><li>i–tem 2
</li></ul>
@@ -4358,7 +4358,7 @@ i–tem 1
<thead><tr><th width="40%">mu–ltitable headitem</th><th
width="60%">another tab</th></tr></thead>
<tbody><tr><td width="40%">mu–ltitable item</td><td
width="60%">multitable tab</td></tr>
<tr><td width="40%">mu–ltitable item 2</td><td width="60%">multitable
tab 2
-<a class="index-entry-anchor"
id="index-index-entry-within-multitable"></a></td></tr>
+<a class="index-entry-id"
id="index-index-entry-within-multitable"></a></td></tr>
<tr><td width="40%">lone mu–ltitable item</td></tr>
</tbody>
</table>
@@ -4459,7 +4459,7 @@ f(x) = {1 \over \sigma \sqrt{2\pi}}e<sup class="sup">-{1
\over 2}\left({x-\mu \o
<dl class="first-deffn">
<dt class="deffn" id="index-i"><span
class="category-def">fset :</span><span><strong class="strong"><var
class="var">i</var></strong> <em class="emph">a g</em><a
class="copiable-anchor" href='#index-i'> ¶</a></span></dt>
-<dd><a class="index-entry-anchor" id="index-index-entry-within-deffn"></a>
+<dd><a class="index-entry-id" id="index-index-entry-within-deffn"></a>
</dd><dt class="deffnx def-cmd-deffn" id="index-truc"><span
class="category-def">cmde :</span><span><strong
class="strong">truc</strong> <em class="emph"></em><a class="copiable-anchor"
href='#index-truc'> ¶</a></span></dt>
<dt class="deffnx def-cmd-deffn" id="index-log-trap"><span
class="category-def">Command :</span><span><strong class="strong">log
trap</strong> <em class="emph"></em><a class="copiable-anchor"
href='#index-log-trap'> ¶</a></span></dt>
<dt class="deffnx def-cmd-deffn" id="index-log-trap1"><span
class="category-def">Command :</span><span><strong class="strong">log
trap1</strong> <em class="emph"></em><a class="copiable-anchor"
href='#index-log-trap1'> ¶</a></span></dt>
@@ -4752,7 +4752,7 @@ ref</a>
<dl class="ftable">
<dt id='index-a-2'><span><em class="emph">a</em><a class="copiable-anchor"
href='#index-a-2'> ¶</a></span></dt>
-<dd><a class="index-entry-anchor"
id="index-index-entry-between-item-and-itemx"></a>
+<dd><a class="index-entry-id"
id="index-index-entry-between-item-and-itemx"></a>
</dd>
<dt id='index-b'><span><em class="emph">b</em><a class="copiable-anchor"
href='#index-b'> ¶</a></span></dt>
<dd><p>l–ine
@@ -4894,7 +4894,7 @@ html ''
<dl class="ftable">
<dt id='index-a-3'><span>a<a class="copiable-anchor" href='#index-a-3'>
¶</a></span></dt>
-<dd><a class="index-entry-anchor"
id="index-index-entry-between-item-and-itemx-1"></a>
+<dd><a class="index-entry-id"
id="index-index-entry-between-item-and-itemx-1"></a>
</dd>
<dt id='index-b-1'><span>b<a class="copiable-anchor" href='#index-b-1'>
¶</a></span></dt>
<dd><p>l–ine
@@ -4976,7 +4976,7 @@ kbd: <kbd
class="kbd">``simple-double--three---four----''</kbd>
`<!-- /@w -->`simple-double-<!-- /@w -->-three---four----'<!-- /@w -->'
-<a class="index-entry-anchor" id="index-_002d_002doption-1"></a><a
class="index-entry-anchor" id="index-_0060_0060-1"></a><a
class="index-entry-anchor" id="index-_0060_0060-3"></a><a
class="index-entry-anchor" id="index-_002d_002dfoption-1"></a>
+<a class="index-entry-id" id="index-_002d_002doption-1"></a><a
class="index-entry-id" id="index-_0060_0060-1"></a><a class="index-entry-id"
id="index-_0060_0060-3"></a><a class="index-entry-id"
id="index-_002d_002dfoption-1"></a>
@"u ü
@"{U} Ü
@~n ñ
@@ -5374,7 +5374,7 @@ erreur→ → - ∗ -| ⇒
<pre class="example-preformatted">
</pre><ul class="itemize" style="list-style-type: '\2022 a\2013 n itemize
line'">
-<li><pre class="example-preformatted"><a class="index-entry-anchor"
id="index-index-entry-within-itemize-1"></a>i--tem 1
+<li><pre class="example-preformatted"><a class="index-entry-id"
id="index-index-entry-within-itemize-1"></a>i--tem 1
</pre></li><li><pre class="example-preformatted">i--tem 2
</pre></li></ul>
<pre class="example-preformatted">
@@ -5423,7 +5423,7 @@ erreur→ → - ∗ -| ⇒
<thead><tr><th width="40%"><pre class="example-preformatted">mu--ltitable
headitem</pre></th><th width="60%"><pre class="example-preformatted">another
tab</pre></th></tr></thead>
<tbody><tr><td width="40%"><pre class="example-preformatted">mu--ltitable
item</pre></td><td width="60%"><pre class="example-preformatted">multitable
tab</pre></td></tr>
<tr><td width="40%"><pre class="example-preformatted">mu--ltitable item
2</pre></td><td width="60%"><pre class="example-preformatted">multitable tab 2
-<a class="index-entry-anchor"
id="index-index-entry-within-multitable-1"></a></pre></td></tr>
+<a class="index-entry-id"
id="index-index-entry-within-multitable-1"></a></pre></td></tr>
<tr><td width="40%"><pre class="example-preformatted">lone mu--ltitable
item</pre></td></tr>
</tbody>
</table>
@@ -5546,7 +5546,7 @@ f(x) = {1 \over \sigma \sqrt{2\pi}}e<sup class="sup">-{1
\over 2}\left({x-\mu \o
<pre class="example-preformatted">
</pre><dl class="first-deffn">
<dt class="deffn" id="index-i-2"><span
class="category-def">fset :</span><span><strong class="strong"><var
class="var">i</var></strong> <em class="emph">a g</em><a
class="copiable-anchor" href='#index-i-2'> ¶</a></span></dt>
-<dd><pre class="example-preformatted"><a class="index-entry-anchor"
id="index-index-entry-within-deffn-1"></a></pre></dd><dt class="deffnx
def-cmd-deffn" id="index-truc-2"><span
class="category-def">cmde :</span><span><strong
class="strong">truc</strong> <em class="emph"></em><a class="copiable-anchor"
href='#index-truc-2'> ¶</a></span></dt>
+<dd><pre class="example-preformatted"><a class="index-entry-id"
id="index-index-entry-within-deffn-1"></a></pre></dd><dt class="deffnx
def-cmd-deffn" id="index-truc-2"><span
class="category-def">cmde :</span><span><strong
class="strong">truc</strong> <em class="emph"></em><a class="copiable-anchor"
href='#index-truc-2'> ¶</a></span></dt>
<dt class="deffnx def-cmd-deffn" id="index-log-trap-1"><span
class="category-def">Command :</span><span><strong class="strong">log
trap</strong> <em class="emph"></em><a class="copiable-anchor"
href='#index-log-trap-1'> ¶</a></span></dt>
<dt class="deffnx def-cmd-deffn" id="index-log-trap1-1"><span
class="category-def">Command :</span><span><strong class="strong">log
trap1</strong> <em class="emph"></em><a class="copiable-anchor"
href='#index-log-trap1-1'> ¶</a></span></dt>
<dt class="deffnx def-cmd-deffn" id="index-log-trap2-1"><span
class="category-def">Command :</span><span><strong class="strong">log
trap2</strong> <em class="emph"></em><a class="copiable-anchor"
href='#index-log-trap2-1'> ¶</a></span></dt>
@@ -5890,7 +5890,7 @@ ref</a>
</pre><dl class="ftable">
<dt id='index-a-5'><span><tt><em class="emph">a</em></tt><a
class="copiable-anchor" href='#index-a-5'> ¶</a></span></dt>
-<dd><pre class="example-preformatted"><a class="index-entry-anchor"
id="index-index-entry-between-item-and-itemx-2"></a></pre></dd>
+<dd><pre class="example-preformatted"><a class="index-entry-id"
id="index-index-entry-between-item-and-itemx-2"></a></pre></dd>
<dt id='index-b-2'><span><tt><em class="emph">b</em></tt><a
class="copiable-anchor" href='#index-b-2'> ¶</a></span></dt>
<dd><pre class="example-preformatted">l--ine
</pre></dd>
@@ -6056,7 +6056,7 @@ Invalid use of @':
</pre><dl class="ftable">
<dt id='index-a-6'><span><tt>a</tt><a class="copiable-anchor"
href='#index-a-6'> ¶</a></span></dt>
-<dd><pre class="example-preformatted"><a class="index-entry-anchor"
id="index-index-entry-between-item-and-itemx-3"></a></pre></dd>
+<dd><pre class="example-preformatted"><a class="index-entry-id"
id="index-index-entry-between-item-and-itemx-3"></a></pre></dd>
<dt id='index-b-3'><span><tt>b</tt><a class="copiable-anchor"
href='#index-b-3'> ¶</a></span></dt>
<dd><pre class="example-preformatted">l--ine
</pre></dd>
@@ -6115,38 +6115,38 @@ Invalid use of @':
</pre></div>
-<a class="index-entry-anchor" id="index-t_002d_002druc"></a>
-<a class="index-entry-anchor" id="index-T_002d_002druc"></a>
-<a class="index-entry-anchor" id="index-_002e"></a>
-<a class="index-entry-anchor" id="index-_003f"></a>
-<a class="index-entry-anchor" id="index-a"></a>
-<a class="index-entry-anchor" id="index-t_002d_002druc-1"></a>
-<a class="index-entry-anchor" id="index-T_002d_002druc-1"></a>
-<a class="index-entry-anchor" id="index-_002e-1"></a>
-<a class="index-entry-anchor" id="index-_003f-1"></a>
-<a class="index-entry-anchor" id="index-a-7"></a>
+<a class="index-entry-id" id="index-t_002d_002druc"></a>
+<a class="index-entry-id" id="index-T_002d_002druc"></a>
+<a class="index-entry-id" id="index-_002e"></a>
+<a class="index-entry-id" id="index-_003f"></a>
+<a class="index-entry-id" id="index-a"></a>
+<a class="index-entry-id" id="index-t_002d_002druc-1"></a>
+<a class="index-entry-id" id="index-T_002d_002druc-1"></a>
+<a class="index-entry-id" id="index-_002e-1"></a>
+<a class="index-entry-id" id="index-_003f-1"></a>
+<a class="index-entry-id" id="index-a-7"></a>
-<a class="index-entry-anchor" id="index-a_002d_002d_002da"></a>
-<a class="index-entry-anchor" id="index-b_002d_002d_002db"></a>
-<a class="index-entry-anchor" id="index-d_002d_002d_002ddd"></a>
-<a class="index-entry-anchor" id="index-g_002d_002d_002dgg"></a>
+<a class="index-entry-id" id="index-a_002d_002d_002da"></a>
+<a class="index-entry-id" id="index-b_002d_002d_002db"></a>
+<a class="index-entry-id" id="index-d_002d_002d_002ddd"></a>
+<a class="index-entry-id" id="index-g_002d_002d_002dgg"></a>
-<a class="index-entry-anchor" id="index-f_002d_002d_002daa"></a>
-<a class="index-entry-anchor" id="index-f_002d_002d_002dbb"></a>
-<a class="index-entry-anchor" id="index-f_002d_002d_002dddd"></a>
-<a class="index-entry-anchor" id="index-f_002d_002d_002dggg"></a>
+<a class="index-entry-id" id="index-f_002d_002d_002daa"></a>
+<a class="index-entry-id" id="index-f_002d_002d_002dbb"></a>
+<a class="index-entry-id" id="index-f_002d_002d_002dddd"></a>
+<a class="index-entry-id" id="index-f_002d_002d_002dggg"></a>
-<a class="index-entry-anchor" id="index-aaa"></a>
+<a class="index-entry-id" id="index-aaa"></a>
-<a class="index-entry-anchor" id="index-xxx"></a>
+<a class="index-entry-id" id="index-xxx"></a>
-<a class="index-entry-anchor" id="index-"></a>
+<a class="index-entry-id" id="index-"></a>
-<a class="index-entry-anchor"
id="index-a-index_002d_002d_002dentry-te-_002d_002d_002d-i"></a>
+<a class="index-entry-id"
id="index-a-index_002d_002d_002dentry-te-_002d_002d_002d-i"></a>
-<a class="index-entry-anchor" id="index-truc-4"></a>
+<a class="index-entry-id" id="index-truc-4"></a>
<p>Text<a class="footnote" id="DOCF9" href="#FOOT9"><sup>11</sup></a>
@@ -7441,13 +7441,13 @@ Menu comment
<p>in footnote2</p>
<h5><a id="FOOT9" href="#DOCF9">(11)</a></h5>
<p>in footnote
-<a class="index-entry-anchor" id="index-index-entry-in-footnote"></a>
+<a class="index-entry-id" id="index-index-entry-in-footnote"></a>
</p>
<p>Blah
</p>
<p>Blih
</p>
-<a class="index-entry-anchor" id="index-counting-entry"></a>
+<a class="index-entry-id" id="index-counting-entry"></a>
<h5><a id="FOOT10" href="#DOCF10">(12)</a></h5>
<p>in footnote</p>
</div><hr>
diff --git a/tp/tests/layout/res_parser/formatting_html/formatting.html
b/tp/tests/layout/res_parser/formatting_html/formatting.html
index c2f2f3d141..c6cb09660b 100644
--- a/tp/tests/layout/res_parser/formatting_html/formatting.html
+++ b/tp/tests/layout/res_parser/formatting_html/formatting.html
@@ -853,10 +853,10 @@ kbd: <kbd
class="kbd">``simple-double--three---four----''</kbd> <br>
</p>
<p>‘<!-- /@w -->‘simple-double-<!-- /@w
-->-three—four—-’<!-- /@w -->’<br>
</p>
-<a class="index-entry-anchor" id="index-titlepage-_002d_002doption"></a>
-<a class="index-entry-anchor" id="index-titlepage-_0060_0060"></a>
-<a class="index-entry-anchor" id="index-titlepage-_0060_0060-1"></a>
-<a class="index-entry-anchor" id="index-titlepage-_002d_002dfoption"></a>
+<a class="index-entry-id" id="index-titlepage-_002d_002doption"></a>
+<a class="index-entry-id" id="index-titlepage-_0060_0060"></a>
+<a class="index-entry-id" id="index-titlepage-_0060_0060-1"></a>
+<a class="index-entry-id" id="index-titlepage-_002d_002dfoption"></a>
<p>@"u ü
@"{U} Ü
@@ -1216,7 +1216,7 @@ error→ → - ∗ -| ⇒
</li></ul>
<ul class="itemize" style="list-style-type: '\2022 a\2013 n itemize line'">
-<li><a class="index-entry-anchor"
id="index-titlepage-index-entry-within-itemize"></a>
+<li><a class="index-entry-id"
id="index-titlepage-index-entry-within-itemize"></a>
i–tem 1
</li><li>i–tem 2
</li></ul>
@@ -1258,7 +1258,7 @@ i–tem 1
<thead><tr><th width="40%">mu–ltitable headitem</th><th
width="60%">another tab</th></tr></thead>
<tbody><tr><td width="40%">mu–ltitable item</td><td
width="60%">multitable tab</td></tr>
<tr><td width="40%">mu–ltitable item 2</td><td width="60%">multitable
tab 2
-<a class="index-entry-anchor"
id="index-titlepage-index-entry-within-multitable"></a></td></tr>
+<a class="index-entry-id"
id="index-titlepage-index-entry-within-multitable"></a></td></tr>
<tr><td width="40%">lone mu–ltitable item</td></tr>
</tbody>
</table>
@@ -1359,7 +1359,7 @@ f(x) = {1 \over \sigma \sqrt{2\pi}}e<sup class="sup">-{1
\over 2}\left({x-\mu \o
<dl class="first-deffn">
<dt class="deffn" id="index-titlepage-i"><span class="category-def">fset:
</span><span><strong class="strong"><var class="var">i</var></strong> <em
class="emph">a g</em><a class="copiable-anchor" href='#index-titlepage-i'>
¶</a></span></dt>
-<dd><a class="index-entry-anchor"
id="index-titlepage-index-entry-within-deffn"></a>
+<dd><a class="index-entry-id"
id="index-titlepage-index-entry-within-deffn"></a>
</dd><dt class="deffnx def-cmd-deffn" id="index-titlepage-truc"><span
class="category-def">cmde: </span><span><strong class="strong">truc</strong>
<em class="emph"></em><a class="copiable-anchor" href='#index-titlepage-truc'>
¶</a></span></dt>
<dt class="deffnx def-cmd-deffn" id="index-titlepage-log-trap"><span
class="category-def">Command: </span><span><strong class="strong">log
trap</strong> <em class="emph"></em><a class="copiable-anchor"
href='#index-titlepage-log-trap'> ¶</a></span></dt>
<dt class="deffnx def-cmd-deffn" id="index-titlepage-log-trap1"><span
class="category-def">Command: </span><span><strong class="strong">log
trap1</strong> <em class="emph"></em><a class="copiable-anchor"
href='#index-titlepage-log-trap1'> ¶</a></span></dt>
@@ -1652,7 +1652,7 @@ ref</a>
<dl class="ftable">
<dt id='index-titlepage-a-1'><span><em class="emph">a</em><a
class="copiable-anchor" href='#index-titlepage-a-1'> ¶</a></span></dt>
-<dd><a class="index-entry-anchor"
id="index-titlepage-index-entry-between-item-and-itemx"></a>
+<dd><a class="index-entry-id"
id="index-titlepage-index-entry-between-item-and-itemx"></a>
</dd>
<dt id='index-titlepage-b'><span><em class="emph">b</em><a
class="copiable-anchor" href='#index-titlepage-b'> ¶</a></span></dt>
<dd><p>l–ine
@@ -1794,7 +1794,7 @@ html ''
<dl class="ftable">
<dt id='index-titlepage-a-2'><span>a<a class="copiable-anchor"
href='#index-titlepage-a-2'> ¶</a></span></dt>
-<dd><a class="index-entry-anchor"
id="index-titlepage-index-entry-between-item-and-itemx-1"></a>
+<dd><a class="index-entry-id"
id="index-titlepage-index-entry-between-item-and-itemx-1"></a>
</dd>
<dt id='index-titlepage-b-1'><span>b<a class="copiable-anchor"
href='#index-titlepage-b-1'> ¶</a></span></dt>
<dd><p>l–ine
@@ -1869,10 +1869,10 @@ kbd: <kbd
class="kbd">``simple-double--three---four----''</kbd> <br>
</p>
<p>‘<!-- /@w -->‘simple-double-<!-- /@w
-->-three—four—-’<!-- /@w -->’<br>
</p>
-<a class="index-entry-anchor" id="index-copying-_002d_002doption"></a>
-<a class="index-entry-anchor" id="index-copying-_0060_0060"></a>
-<a class="index-entry-anchor" id="index-copying-_0060_0060-1"></a>
-<a class="index-entry-anchor" id="index-copying-_002d_002dfoption"></a>
+<a class="index-entry-id" id="index-copying-_002d_002doption"></a>
+<a class="index-entry-id" id="index-copying-_0060_0060"></a>
+<a class="index-entry-id" id="index-copying-_0060_0060-1"></a>
+<a class="index-entry-id" id="index-copying-_002d_002dfoption"></a>
<p>@"u ü
@"{U} Ü
@@ -2231,7 +2231,7 @@ error→ → - ∗ -| ⇒
</li></ul>
<ul class="itemize" style="list-style-type: '\2022 a\2013 n itemize line'">
-<li><a class="index-entry-anchor"
id="index-copying-index-entry-within-itemize"></a>
+<li><a class="index-entry-id"
id="index-copying-index-entry-within-itemize"></a>
i–tem 1
</li><li>i–tem 2
</li></ul>
@@ -2273,7 +2273,7 @@ i–tem 1
<thead><tr><th width="40%">mu–ltitable headitem</th><th
width="60%">another tab</th></tr></thead>
<tbody><tr><td width="40%">mu–ltitable item</td><td
width="60%">multitable tab</td></tr>
<tr><td width="40%">mu–ltitable item 2</td><td width="60%">multitable
tab 2
-<a class="index-entry-anchor"
id="index-copying-index-entry-within-multitable"></a></td></tr>
+<a class="index-entry-id"
id="index-copying-index-entry-within-multitable"></a></td></tr>
<tr><td width="40%">lone mu–ltitable item</td></tr>
</tbody>
</table>
@@ -2374,7 +2374,7 @@ f(x) = {1 \over \sigma \sqrt{2\pi}}e<sup class="sup">-{1
\over 2}\left({x-\mu \o
<dl class="first-deffn">
<dt class="deffn" id="index-copying-i"><span class="category-def">fset:
</span><span><strong class="strong"><var class="var">i</var></strong> <em
class="emph">a g</em><a class="copiable-anchor" href='#index-copying-i'>
¶</a></span></dt>
-<dd><a class="index-entry-anchor"
id="index-copying-index-entry-within-deffn"></a>
+<dd><a class="index-entry-id" id="index-copying-index-entry-within-deffn"></a>
</dd><dt class="deffnx def-cmd-deffn" id="index-copying-truc"><span
class="category-def">cmde: </span><span><strong class="strong">truc</strong>
<em class="emph"></em><a class="copiable-anchor" href='#index-copying-truc'>
¶</a></span></dt>
<dt class="deffnx def-cmd-deffn" id="index-copying-log-trap"><span
class="category-def">Command: </span><span><strong class="strong">log
trap</strong> <em class="emph"></em><a class="copiable-anchor"
href='#index-copying-log-trap'> ¶</a></span></dt>
<dt class="deffnx def-cmd-deffn" id="index-copying-log-trap1"><span
class="category-def">Command: </span><span><strong class="strong">log
trap1</strong> <em class="emph"></em><a class="copiable-anchor"
href='#index-copying-log-trap1'> ¶</a></span></dt>
@@ -2667,7 +2667,7 @@ ref</a>
<dl class="ftable">
<dt id='index-copying-a-1'><span><em class="emph">a</em><a
class="copiable-anchor" href='#index-copying-a-1'> ¶</a></span></dt>
-<dd><a class="index-entry-anchor"
id="index-copying-index-entry-between-item-and-itemx"></a>
+<dd><a class="index-entry-id"
id="index-copying-index-entry-between-item-and-itemx"></a>
</dd>
<dt id='index-copying-b'><span><em class="emph">b</em><a
class="copiable-anchor" href='#index-copying-b'> ¶</a></span></dt>
<dd><p>l–ine
@@ -2809,7 +2809,7 @@ html ''
<dl class="ftable">
<dt id='index-copying-a-2'><span>a<a class="copiable-anchor"
href='#index-copying-a-2'> ¶</a></span></dt>
-<dd><a class="index-entry-anchor"
id="index-copying-index-entry-between-item-and-itemx-1"></a>
+<dd><a class="index-entry-id"
id="index-copying-index-entry-between-item-and-itemx-1"></a>
</dd>
<dt id='index-copying-b-1'><span>b<a class="copiable-anchor"
href='#index-copying-b-1'> ¶</a></span></dt>
<dd><p>l–ine
@@ -2940,10 +2940,10 @@ kbd: <kbd
class="kbd">``simple-double--three---four----''</kbd> <br>
</p>
<p>‘<!-- /@w -->‘simple-double-<!-- /@w
-->-three—four—-’<!-- /@w -->’<br>
</p>
-<a class="index-entry-anchor" id="index-copying-_002d_002doption"></a>
-<a class="index-entry-anchor" id="index-copying-_0060_0060"></a>
-<a class="index-entry-anchor" id="index-copying-_0060_0060-1"></a>
-<a class="index-entry-anchor" id="index-copying-_002d_002dfoption"></a>
+<a class="index-entry-id" id="index-copying-_002d_002doption"></a>
+<a class="index-entry-id" id="index-copying-_0060_0060"></a>
+<a class="index-entry-id" id="index-copying-_0060_0060-1"></a>
+<a class="index-entry-id" id="index-copying-_002d_002dfoption"></a>
<p>@"u ü
@"{U} Ü
@@ -3302,7 +3302,7 @@ error→ → - ∗ -| ⇒
</li></ul>
<ul class="itemize" style="list-style-type: '\2022 a\2013 n itemize line'">
-<li><a class="index-entry-anchor"
id="index-copying-index-entry-within-itemize"></a>
+<li><a class="index-entry-id"
id="index-copying-index-entry-within-itemize"></a>
i–tem 1
</li><li>i–tem 2
</li></ul>
@@ -3344,7 +3344,7 @@ i–tem 1
<thead><tr><th width="40%">mu–ltitable headitem</th><th
width="60%">another tab</th></tr></thead>
<tbody><tr><td width="40%">mu–ltitable item</td><td
width="60%">multitable tab</td></tr>
<tr><td width="40%">mu–ltitable item 2</td><td width="60%">multitable
tab 2
-<a class="index-entry-anchor"
id="index-copying-index-entry-within-multitable"></a></td></tr>
+<a class="index-entry-id"
id="index-copying-index-entry-within-multitable"></a></td></tr>
<tr><td width="40%">lone mu–ltitable item</td></tr>
</tbody>
</table>
@@ -3445,7 +3445,7 @@ f(x) = {1 \over \sigma \sqrt{2\pi}}e<sup class="sup">-{1
\over 2}\left({x-\mu \o
<dl class="first-deffn">
<dt class="deffn" id="index-copying-i"><span class="category-def">fset:
</span><span><strong class="strong"><var class="var">i</var></strong> <em
class="emph">a g</em><a class="copiable-anchor" href='#index-copying-i'>
¶</a></span></dt>
-<dd><a class="index-entry-anchor"
id="index-copying-index-entry-within-deffn"></a>
+<dd><a class="index-entry-id" id="index-copying-index-entry-within-deffn"></a>
</dd><dt class="deffnx def-cmd-deffn" id="index-copying-truc"><span
class="category-def">cmde: </span><span><strong class="strong">truc</strong>
<em class="emph"></em><a class="copiable-anchor" href='#index-copying-truc'>
¶</a></span></dt>
<dt class="deffnx def-cmd-deffn" id="index-copying-log-trap"><span
class="category-def">Command: </span><span><strong class="strong">log
trap</strong> <em class="emph"></em><a class="copiable-anchor"
href='#index-copying-log-trap'> ¶</a></span></dt>
<dt class="deffnx def-cmd-deffn" id="index-copying-log-trap1"><span
class="category-def">Command: </span><span><strong class="strong">log
trap1</strong> <em class="emph"></em><a class="copiable-anchor"
href='#index-copying-log-trap1'> ¶</a></span></dt>
@@ -3738,7 +3738,7 @@ ref</a>
<dl class="ftable">
<dt id='index-copying-a-1'><span><em class="emph">a</em><a
class="copiable-anchor" href='#index-copying-a-1'> ¶</a></span></dt>
-<dd><a class="index-entry-anchor"
id="index-copying-index-entry-between-item-and-itemx"></a>
+<dd><a class="index-entry-id"
id="index-copying-index-entry-between-item-and-itemx"></a>
</dd>
<dt id='index-copying-b'><span><em class="emph">b</em><a
class="copiable-anchor" href='#index-copying-b'> ¶</a></span></dt>
<dd><p>l–ine
@@ -3880,7 +3880,7 @@ html ''
<dl class="ftable">
<dt id='index-copying-a-2'><span>a<a class="copiable-anchor"
href='#index-copying-a-2'> ¶</a></span></dt>
-<dd><a class="index-entry-anchor"
id="index-copying-index-entry-between-item-and-itemx-1"></a>
+<dd><a class="index-entry-id"
id="index-copying-index-entry-between-item-and-itemx-1"></a>
</dd>
<dt id='index-copying-b-1'><span>b<a class="copiable-anchor"
href='#index-copying-b-1'> ¶</a></span></dt>
<dd><p>l–ine
@@ -3954,10 +3954,10 @@ kbd: <kbd
class="kbd">``simple-double--three---four----''</kbd> <br>
</p>
<p>‘<!-- /@w -->‘simple-double-<!-- /@w
-->-three—four—-’<!-- /@w -->’<br>
</p>
-<a class="index-entry-anchor" id="index-_002d_002doption"></a>
-<a class="index-entry-anchor" id="index-_0060_0060"></a>
-<a class="index-entry-anchor" id="index-_0060_0060-2"></a>
-<a class="index-entry-anchor" id="index-_002d_002dfoption"></a>
+<a class="index-entry-id" id="index-_002d_002doption"></a>
+<a class="index-entry-id" id="index-_0060_0060"></a>
+<a class="index-entry-id" id="index-_0060_0060-2"></a>
+<a class="index-entry-id" id="index-_002d_002dfoption"></a>
<p>@"u ü
@"{U} Ü
@@ -4316,7 +4316,7 @@ error→ → - ∗ -| ⇒
</li></ul>
<ul class="itemize" style="list-style-type: '\2022 a\2013 n itemize line'">
-<li><a class="index-entry-anchor" id="index-index-entry-within-itemize"></a>
+<li><a class="index-entry-id" id="index-index-entry-within-itemize"></a>
i–tem 1
</li><li>i–tem 2
</li></ul>
@@ -4358,7 +4358,7 @@ i–tem 1
<thead><tr><th width="40%">mu–ltitable headitem</th><th
width="60%">another tab</th></tr></thead>
<tbody><tr><td width="40%">mu–ltitable item</td><td
width="60%">multitable tab</td></tr>
<tr><td width="40%">mu–ltitable item 2</td><td width="60%">multitable
tab 2
-<a class="index-entry-anchor"
id="index-index-entry-within-multitable"></a></td></tr>
+<a class="index-entry-id"
id="index-index-entry-within-multitable"></a></td></tr>
<tr><td width="40%">lone mu–ltitable item</td></tr>
</tbody>
</table>
@@ -4459,7 +4459,7 @@ f(x) = {1 \over \sigma \sqrt{2\pi}}e<sup class="sup">-{1
\over 2}\left({x-\mu \o
<dl class="first-deffn">
<dt class="deffn" id="index-i"><span class="category-def">fset:
</span><span><strong class="strong"><var class="var">i</var></strong> <em
class="emph">a g</em><a class="copiable-anchor" href='#index-i'>
¶</a></span></dt>
-<dd><a class="index-entry-anchor" id="index-index-entry-within-deffn"></a>
+<dd><a class="index-entry-id" id="index-index-entry-within-deffn"></a>
</dd><dt class="deffnx def-cmd-deffn" id="index-truc"><span
class="category-def">cmde: </span><span><strong class="strong">truc</strong>
<em class="emph"></em><a class="copiable-anchor" href='#index-truc'>
¶</a></span></dt>
<dt class="deffnx def-cmd-deffn" id="index-log-trap"><span
class="category-def">Command: </span><span><strong class="strong">log
trap</strong> <em class="emph"></em><a class="copiable-anchor"
href='#index-log-trap'> ¶</a></span></dt>
<dt class="deffnx def-cmd-deffn" id="index-log-trap1"><span
class="category-def">Command: </span><span><strong class="strong">log
trap1</strong> <em class="emph"></em><a class="copiable-anchor"
href='#index-log-trap1'> ¶</a></span></dt>
@@ -4752,7 +4752,7 @@ ref</a>
<dl class="ftable">
<dt id='index-a-2'><span><em class="emph">a</em><a class="copiable-anchor"
href='#index-a-2'> ¶</a></span></dt>
-<dd><a class="index-entry-anchor"
id="index-index-entry-between-item-and-itemx"></a>
+<dd><a class="index-entry-id"
id="index-index-entry-between-item-and-itemx"></a>
</dd>
<dt id='index-b'><span><em class="emph">b</em><a class="copiable-anchor"
href='#index-b'> ¶</a></span></dt>
<dd><p>l–ine
@@ -4894,7 +4894,7 @@ html ''
<dl class="ftable">
<dt id='index-a-3'><span>a<a class="copiable-anchor" href='#index-a-3'>
¶</a></span></dt>
-<dd><a class="index-entry-anchor"
id="index-index-entry-between-item-and-itemx-1"></a>
+<dd><a class="index-entry-id"
id="index-index-entry-between-item-and-itemx-1"></a>
</dd>
<dt id='index-b-1'><span>b<a class="copiable-anchor" href='#index-b-1'>
¶</a></span></dt>
<dd><p>l–ine
@@ -4976,7 +4976,7 @@ kbd: <kbd
class="kbd">``simple-double--three---four----''</kbd>
`<!-- /@w -->`simple-double-<!-- /@w -->-three---four----'<!-- /@w -->'
-<a class="index-entry-anchor" id="index-_002d_002doption-1"></a><a
class="index-entry-anchor" id="index-_0060_0060-1"></a><a
class="index-entry-anchor" id="index-_0060_0060-3"></a><a
class="index-entry-anchor" id="index-_002d_002dfoption-1"></a>
+<a class="index-entry-id" id="index-_002d_002doption-1"></a><a
class="index-entry-id" id="index-_0060_0060-1"></a><a class="index-entry-id"
id="index-_0060_0060-3"></a><a class="index-entry-id"
id="index-_002d_002dfoption-1"></a>
@"u ü
@"{U} Ü
@~n ñ
@@ -5374,7 +5374,7 @@ error→ → - ∗ -| ⇒
<pre class="example-preformatted">
</pre><ul class="itemize" style="list-style-type: '\2022 a\2013 n itemize
line'">
-<li><pre class="example-preformatted"><a class="index-entry-anchor"
id="index-index-entry-within-itemize-1"></a>i--tem 1
+<li><pre class="example-preformatted"><a class="index-entry-id"
id="index-index-entry-within-itemize-1"></a>i--tem 1
</pre></li><li><pre class="example-preformatted">i--tem 2
</pre></li></ul>
<pre class="example-preformatted">
@@ -5423,7 +5423,7 @@ error→ → - ∗ -| ⇒
<thead><tr><th width="40%"><pre class="example-preformatted">mu--ltitable
headitem</pre></th><th width="60%"><pre class="example-preformatted">another
tab</pre></th></tr></thead>
<tbody><tr><td width="40%"><pre class="example-preformatted">mu--ltitable
item</pre></td><td width="60%"><pre class="example-preformatted">multitable
tab</pre></td></tr>
<tr><td width="40%"><pre class="example-preformatted">mu--ltitable item
2</pre></td><td width="60%"><pre class="example-preformatted">multitable tab 2
-<a class="index-entry-anchor"
id="index-index-entry-within-multitable-1"></a></pre></td></tr>
+<a class="index-entry-id"
id="index-index-entry-within-multitable-1"></a></pre></td></tr>
<tr><td width="40%"><pre class="example-preformatted">lone mu--ltitable
item</pre></td></tr>
</tbody>
</table>
@@ -5546,7 +5546,7 @@ f(x) = {1 \over \sigma \sqrt{2\pi}}e<sup class="sup">-{1
\over 2}\left({x-\mu \o
<pre class="example-preformatted">
</pre><dl class="first-deffn">
<dt class="deffn" id="index-i-2"><span class="category-def">fset:
</span><span><strong class="strong"><var class="var">i</var></strong> <em
class="emph">a g</em><a class="copiable-anchor" href='#index-i-2'>
¶</a></span></dt>
-<dd><pre class="example-preformatted"><a class="index-entry-anchor"
id="index-index-entry-within-deffn-1"></a></pre></dd><dt class="deffnx
def-cmd-deffn" id="index-truc-2"><span class="category-def">cmde:
</span><span><strong class="strong">truc</strong> <em class="emph"></em><a
class="copiable-anchor" href='#index-truc-2'> ¶</a></span></dt>
+<dd><pre class="example-preformatted"><a class="index-entry-id"
id="index-index-entry-within-deffn-1"></a></pre></dd><dt class="deffnx
def-cmd-deffn" id="index-truc-2"><span class="category-def">cmde:
</span><span><strong class="strong">truc</strong> <em class="emph"></em><a
class="copiable-anchor" href='#index-truc-2'> ¶</a></span></dt>
<dt class="deffnx def-cmd-deffn" id="index-log-trap-1"><span
class="category-def">Command: </span><span><strong class="strong">log
trap</strong> <em class="emph"></em><a class="copiable-anchor"
href='#index-log-trap-1'> ¶</a></span></dt>
<dt class="deffnx def-cmd-deffn" id="index-log-trap1-1"><span
class="category-def">Command: </span><span><strong class="strong">log
trap1</strong> <em class="emph"></em><a class="copiable-anchor"
href='#index-log-trap1-1'> ¶</a></span></dt>
<dt class="deffnx def-cmd-deffn" id="index-log-trap2-1"><span
class="category-def">Command: </span><span><strong class="strong">log
trap2</strong> <em class="emph"></em><a class="copiable-anchor"
href='#index-log-trap2-1'> ¶</a></span></dt>
@@ -5890,7 +5890,7 @@ ref</a>
</pre><dl class="ftable">
<dt id='index-a-5'><span><tt><em class="emph">a</em></tt><a
class="copiable-anchor" href='#index-a-5'> ¶</a></span></dt>
-<dd><pre class="example-preformatted"><a class="index-entry-anchor"
id="index-index-entry-between-item-and-itemx-2"></a></pre></dd>
+<dd><pre class="example-preformatted"><a class="index-entry-id"
id="index-index-entry-between-item-and-itemx-2"></a></pre></dd>
<dt id='index-b-2'><span><tt><em class="emph">b</em></tt><a
class="copiable-anchor" href='#index-b-2'> ¶</a></span></dt>
<dd><pre class="example-preformatted">l--ine
</pre></dd>
@@ -6056,7 +6056,7 @@ Invalid use of @':
</pre><dl class="ftable">
<dt id='index-a-6'><span><tt>a</tt><a class="copiable-anchor"
href='#index-a-6'> ¶</a></span></dt>
-<dd><pre class="example-preformatted"><a class="index-entry-anchor"
id="index-index-entry-between-item-and-itemx-3"></a></pre></dd>
+<dd><pre class="example-preformatted"><a class="index-entry-id"
id="index-index-entry-between-item-and-itemx-3"></a></pre></dd>
<dt id='index-b-3'><span><tt>b</tt><a class="copiable-anchor"
href='#index-b-3'> ¶</a></span></dt>
<dd><pre class="example-preformatted">l--ine
</pre></dd>
@@ -6115,38 +6115,38 @@ Invalid use of @':
</pre></div>
-<a class="index-entry-anchor" id="index-t_002d_002druc"></a>
-<a class="index-entry-anchor" id="index-T_002d_002druc"></a>
-<a class="index-entry-anchor" id="index-_002e"></a>
-<a class="index-entry-anchor" id="index-_003f"></a>
-<a class="index-entry-anchor" id="index-a"></a>
-<a class="index-entry-anchor" id="index-t_002d_002druc-1"></a>
-<a class="index-entry-anchor" id="index-T_002d_002druc-1"></a>
-<a class="index-entry-anchor" id="index-_002e-1"></a>
-<a class="index-entry-anchor" id="index-_003f-1"></a>
-<a class="index-entry-anchor" id="index-a-7"></a>
+<a class="index-entry-id" id="index-t_002d_002druc"></a>
+<a class="index-entry-id" id="index-T_002d_002druc"></a>
+<a class="index-entry-id" id="index-_002e"></a>
+<a class="index-entry-id" id="index-_003f"></a>
+<a class="index-entry-id" id="index-a"></a>
+<a class="index-entry-id" id="index-t_002d_002druc-1"></a>
+<a class="index-entry-id" id="index-T_002d_002druc-1"></a>
+<a class="index-entry-id" id="index-_002e-1"></a>
+<a class="index-entry-id" id="index-_003f-1"></a>
+<a class="index-entry-id" id="index-a-7"></a>
-<a class="index-entry-anchor" id="index-a_002d_002d_002da"></a>
-<a class="index-entry-anchor" id="index-b_002d_002d_002db"></a>
-<a class="index-entry-anchor" id="index-d_002d_002d_002ddd"></a>
-<a class="index-entry-anchor" id="index-g_002d_002d_002dgg"></a>
+<a class="index-entry-id" id="index-a_002d_002d_002da"></a>
+<a class="index-entry-id" id="index-b_002d_002d_002db"></a>
+<a class="index-entry-id" id="index-d_002d_002d_002ddd"></a>
+<a class="index-entry-id" id="index-g_002d_002d_002dgg"></a>
-<a class="index-entry-anchor" id="index-f_002d_002d_002daa"></a>
-<a class="index-entry-anchor" id="index-f_002d_002d_002dbb"></a>
-<a class="index-entry-anchor" id="index-f_002d_002d_002dddd"></a>
-<a class="index-entry-anchor" id="index-f_002d_002d_002dggg"></a>
+<a class="index-entry-id" id="index-f_002d_002d_002daa"></a>
+<a class="index-entry-id" id="index-f_002d_002d_002dbb"></a>
+<a class="index-entry-id" id="index-f_002d_002d_002dddd"></a>
+<a class="index-entry-id" id="index-f_002d_002d_002dggg"></a>
-<a class="index-entry-anchor" id="index-aaa"></a>
+<a class="index-entry-id" id="index-aaa"></a>
-<a class="index-entry-anchor" id="index-xxx"></a>
+<a class="index-entry-id" id="index-xxx"></a>
-<a class="index-entry-anchor" id="index-"></a>
+<a class="index-entry-id" id="index-"></a>
-<a class="index-entry-anchor"
id="index-a-index_002d_002d_002dentry-te-_002d_002d_002d-i"></a>
+<a class="index-entry-id"
id="index-a-index_002d_002d_002dentry-te-_002d_002d_002d-i"></a>
-<a class="index-entry-anchor" id="index-truc-4"></a>
+<a class="index-entry-id" id="index-truc-4"></a>
<p>Text<a class="footnote" id="DOCF9" href="#FOOT9"><sup>11</sup></a>
@@ -7441,13 +7441,13 @@ Menu comment
<p>in footnote2</p>
<h5><a id="FOOT9" href="#DOCF9">(11)</a></h5>
<p>in footnote
-<a class="index-entry-anchor" id="index-index-entry-in-footnote"></a>
+<a class="index-entry-id" id="index-index-entry-in-footnote"></a>
</p>
<p>Blah
</p>
<p>Blih
</p>
-<a class="index-entry-anchor" id="index-counting-entry"></a>
+<a class="index-entry-id" id="index-counting-entry"></a>
<h5><a id="FOOT10" href="#DOCF10">(12)</a></h5>
<p>in footnote</p>
</div><hr>
diff --git
a/tp/tests/layout/res_parser/formatting_html_no_texi2html/formatting.html
b/tp/tests/layout/res_parser/formatting_html_no_texi2html/formatting.html
index 1024fc0c58..fd11225bf0 100644
--- a/tp/tests/layout/res_parser/formatting_html_no_texi2html/formatting.html
+++ b/tp/tests/layout/res_parser/formatting_html_no_texi2html/formatting.html
@@ -912,10 +912,10 @@ kbd: <kbd
class="kbd">``simple-double--three---four----''</kbd> <br>
</p>
<p>‘<!-- /@w -->‘simple-double-<!-- /@w
-->-three—four—-’<!-- /@w -->’<br>
</p>
-<a class="index-entry-anchor" id="index-copying-_002d_002doption"></a>
-<a class="index-entry-anchor" id="index-copying-_0060_0060"></a>
-<a class="index-entry-anchor" id="index-copying-_0060_0060-1"></a>
-<a class="index-entry-anchor" id="index-copying-_002d_002dfoption"></a>
+<a class="index-entry-id" id="index-copying-_002d_002doption"></a>
+<a class="index-entry-id" id="index-copying-_0060_0060"></a>
+<a class="index-entry-id" id="index-copying-_0060_0060-1"></a>
+<a class="index-entry-id" id="index-copying-_002d_002dfoption"></a>
<p>@"u ü
@"{U} Ü
@@ -1274,7 +1274,7 @@ error→ → - ∗ -| ⇒
</li></ul>
<ul class="itemize" style="list-style-type: '\2022 a\2013 n itemize line'">
-<li><a class="index-entry-anchor"
id="index-copying-index-entry-within-itemize"></a>
+<li><a class="index-entry-id"
id="index-copying-index-entry-within-itemize"></a>
i–tem 1
</li><li>i–tem 2
</li></ul>
@@ -1316,7 +1316,7 @@ i–tem 1
<thead><tr><th width="40%">mu–ltitable headitem</th><th
width="60%">another tab</th></tr></thead>
<tbody><tr><td width="40%">mu–ltitable item</td><td
width="60%">multitable tab</td></tr>
<tr><td width="40%">mu–ltitable item 2</td><td width="60%">multitable
tab 2
-<a class="index-entry-anchor"
id="index-copying-index-entry-within-multitable"></a></td></tr>
+<a class="index-entry-id"
id="index-copying-index-entry-within-multitable"></a></td></tr>
<tr><td width="40%">lone mu–ltitable item</td></tr>
</tbody>
</table>
@@ -1417,7 +1417,7 @@ f(x) = {1 \over \sigma \sqrt{2\pi}}e<sup class="sup">-{1
\over 2}\left({x-\mu \o
<dl class="first-deffn">
<dt class="deffn" id="index-copying-i"><span class="category-def">fset:
</span><span><strong class="strong"><var class="var">i</var></strong> <em
class="emph">a g</em><a class="copiable-anchor" href='#index-copying-i'>
¶</a></span></dt>
-<dd><a class="index-entry-anchor"
id="index-copying-index-entry-within-deffn"></a>
+<dd><a class="index-entry-id" id="index-copying-index-entry-within-deffn"></a>
</dd><dt class="deffnx def-cmd-deffn" id="index-copying-truc"><span
class="category-def">cmde: </span><span><strong class="strong">truc</strong>
<em class="emph"></em><a class="copiable-anchor" href='#index-copying-truc'>
¶</a></span></dt>
<dt class="deffnx def-cmd-deffn" id="index-copying-log-trap"><span
class="category-def">Command: </span><span><strong class="strong">log
trap</strong> <em class="emph"></em><a class="copiable-anchor"
href='#index-copying-log-trap'> ¶</a></span></dt>
<dt class="deffnx def-cmd-deffn" id="index-copying-log-trap1"><span
class="category-def">Command: </span><span><strong class="strong">log
trap1</strong> <em class="emph"></em><a class="copiable-anchor"
href='#index-copying-log-trap1'> ¶</a></span></dt>
@@ -1710,7 +1710,7 @@ ref</a>
<dl class="ftable">
<dt id='index-copying-a-1'><span><em class="emph">a</em><a
class="copiable-anchor" href='#index-copying-a-1'> ¶</a></span></dt>
-<dd><a class="index-entry-anchor"
id="index-copying-index-entry-between-item-and-itemx"></a>
+<dd><a class="index-entry-id"
id="index-copying-index-entry-between-item-and-itemx"></a>
</dd>
<dt id='index-copying-b'><span><em class="emph">b</em><a
class="copiable-anchor" href='#index-copying-b'> ¶</a></span></dt>
<dd><p>l–ine
@@ -1852,7 +1852,7 @@ html ''
<dl class="ftable">
<dt id='index-copying-a-2'><span>a<a class="copiable-anchor"
href='#index-copying-a-2'> ¶</a></span></dt>
-<dd><a class="index-entry-anchor"
id="index-copying-index-entry-between-item-and-itemx-1"></a>
+<dd><a class="index-entry-id"
id="index-copying-index-entry-between-item-and-itemx-1"></a>
</dd>
<dt id='index-copying-b-1'><span>b<a class="copiable-anchor"
href='#index-copying-b-1'> ¶</a></span></dt>
<dd><p>l–ine
@@ -1926,10 +1926,10 @@ kbd: <kbd
class="kbd">``simple-double--three---four----''</kbd> <br>
</p>
<p>‘<!-- /@w -->‘simple-double-<!-- /@w
-->-three—four—-’<!-- /@w -->’<br>
</p>
-<a class="index-entry-anchor" id="index-_002d_002doption"></a>
-<a class="index-entry-anchor" id="index-_0060_0060"></a>
-<a class="index-entry-anchor" id="index-_0060_0060-2"></a>
-<a class="index-entry-anchor" id="index-_002d_002dfoption"></a>
+<a class="index-entry-id" id="index-_002d_002doption"></a>
+<a class="index-entry-id" id="index-_0060_0060"></a>
+<a class="index-entry-id" id="index-_0060_0060-2"></a>
+<a class="index-entry-id" id="index-_002d_002dfoption"></a>
<p>@"u ü
@"{U} Ü
@@ -2288,7 +2288,7 @@ error→ → - ∗ -| ⇒
</li></ul>
<ul class="itemize" style="list-style-type: '\2022 a\2013 n itemize line'">
-<li><a class="index-entry-anchor" id="index-index-entry-within-itemize"></a>
+<li><a class="index-entry-id" id="index-index-entry-within-itemize"></a>
i–tem 1
</li><li>i–tem 2
</li></ul>
@@ -2330,7 +2330,7 @@ i–tem 1
<thead><tr><th width="40%">mu–ltitable headitem</th><th
width="60%">another tab</th></tr></thead>
<tbody><tr><td width="40%">mu–ltitable item</td><td
width="60%">multitable tab</td></tr>
<tr><td width="40%">mu–ltitable item 2</td><td width="60%">multitable
tab 2
-<a class="index-entry-anchor"
id="index-index-entry-within-multitable"></a></td></tr>
+<a class="index-entry-id"
id="index-index-entry-within-multitable"></a></td></tr>
<tr><td width="40%">lone mu–ltitable item</td></tr>
</tbody>
</table>
@@ -2431,7 +2431,7 @@ f(x) = {1 \over \sigma \sqrt{2\pi}}e<sup class="sup">-{1
\over 2}\left({x-\mu \o
<dl class="first-deffn">
<dt class="deffn" id="index-i"><span class="category-def">fset:
</span><span><strong class="strong"><var class="var">i</var></strong> <em
class="emph">a g</em><a class="copiable-anchor" href='#index-i'>
¶</a></span></dt>
-<dd><a class="index-entry-anchor" id="index-index-entry-within-deffn"></a>
+<dd><a class="index-entry-id" id="index-index-entry-within-deffn"></a>
</dd><dt class="deffnx def-cmd-deffn" id="index-truc"><span
class="category-def">cmde: </span><span><strong class="strong">truc</strong>
<em class="emph"></em><a class="copiable-anchor" href='#index-truc'>
¶</a></span></dt>
<dt class="deffnx def-cmd-deffn" id="index-log-trap"><span
class="category-def">Command: </span><span><strong class="strong">log
trap</strong> <em class="emph"></em><a class="copiable-anchor"
href='#index-log-trap'> ¶</a></span></dt>
<dt class="deffnx def-cmd-deffn" id="index-log-trap1"><span
class="category-def">Command: </span><span><strong class="strong">log
trap1</strong> <em class="emph"></em><a class="copiable-anchor"
href='#index-log-trap1'> ¶</a></span></dt>
@@ -2724,7 +2724,7 @@ ref</a>
<dl class="ftable">
<dt id='index-a-2'><span><em class="emph">a</em><a class="copiable-anchor"
href='#index-a-2'> ¶</a></span></dt>
-<dd><a class="index-entry-anchor"
id="index-index-entry-between-item-and-itemx"></a>
+<dd><a class="index-entry-id"
id="index-index-entry-between-item-and-itemx"></a>
</dd>
<dt id='index-b'><span><em class="emph">b</em><a class="copiable-anchor"
href='#index-b'> ¶</a></span></dt>
<dd><p>l–ine
@@ -2866,7 +2866,7 @@ html ''
<dl class="ftable">
<dt id='index-a-3'><span>a<a class="copiable-anchor" href='#index-a-3'>
¶</a></span></dt>
-<dd><a class="index-entry-anchor"
id="index-index-entry-between-item-and-itemx-1"></a>
+<dd><a class="index-entry-id"
id="index-index-entry-between-item-and-itemx-1"></a>
</dd>
<dt id='index-b-1'><span>b<a class="copiable-anchor" href='#index-b-1'>
¶</a></span></dt>
<dd><p>l–ine
@@ -2948,7 +2948,7 @@ kbd: <kbd
class="kbd">``simple-double--three---four----''</kbd>
`<!-- /@w -->`simple-double-<!-- /@w -->-three---four----'<!-- /@w -->'
-<a class="index-entry-anchor" id="index-_002d_002doption-1"></a><a
class="index-entry-anchor" id="index-_0060_0060-1"></a><a
class="index-entry-anchor" id="index-_0060_0060-3"></a><a
class="index-entry-anchor" id="index-_002d_002dfoption-1"></a>
+<a class="index-entry-id" id="index-_002d_002doption-1"></a><a
class="index-entry-id" id="index-_0060_0060-1"></a><a class="index-entry-id"
id="index-_0060_0060-3"></a><a class="index-entry-id"
id="index-_002d_002dfoption-1"></a>
@"u ü
@"{U} Ü
@~n ñ
@@ -3346,7 +3346,7 @@ error→ → - ∗ -| ⇒
<pre class="example-preformatted">
</pre><ul class="itemize" style="list-style-type: '\2022 a\2013 n itemize
line'">
-<li><pre class="example-preformatted"><a class="index-entry-anchor"
id="index-index-entry-within-itemize-1"></a>i--tem 1
+<li><pre class="example-preformatted"><a class="index-entry-id"
id="index-index-entry-within-itemize-1"></a>i--tem 1
</pre></li><li><pre class="example-preformatted">i--tem 2
</pre></li></ul>
<pre class="example-preformatted">
@@ -3395,7 +3395,7 @@ error→ → - ∗ -| ⇒
<thead><tr><th width="40%"><pre class="example-preformatted">mu--ltitable
headitem</pre></th><th width="60%"><pre class="example-preformatted">another
tab</pre></th></tr></thead>
<tbody><tr><td width="40%"><pre class="example-preformatted">mu--ltitable
item</pre></td><td width="60%"><pre class="example-preformatted">multitable
tab</pre></td></tr>
<tr><td width="40%"><pre class="example-preformatted">mu--ltitable item
2</pre></td><td width="60%"><pre class="example-preformatted">multitable tab 2
-<a class="index-entry-anchor"
id="index-index-entry-within-multitable-1"></a></pre></td></tr>
+<a class="index-entry-id"
id="index-index-entry-within-multitable-1"></a></pre></td></tr>
<tr><td width="40%"><pre class="example-preformatted">lone mu--ltitable
item</pre></td></tr>
</tbody>
</table>
@@ -3518,7 +3518,7 @@ f(x) = {1 \over \sigma \sqrt{2\pi}}e<sup class="sup">-{1
\over 2}\left({x-\mu \o
<pre class="example-preformatted">
</pre><dl class="first-deffn">
<dt class="deffn" id="index-i-2"><span class="category-def">fset:
</span><span><strong class="strong"><var class="var">i</var></strong> <em
class="emph">a g</em><a class="copiable-anchor" href='#index-i-2'>
¶</a></span></dt>
-<dd><pre class="example-preformatted"><a class="index-entry-anchor"
id="index-index-entry-within-deffn-1"></a></pre></dd><dt class="deffnx
def-cmd-deffn" id="index-truc-2"><span class="category-def">cmde:
</span><span><strong class="strong">truc</strong> <em class="emph"></em><a
class="copiable-anchor" href='#index-truc-2'> ¶</a></span></dt>
+<dd><pre class="example-preformatted"><a class="index-entry-id"
id="index-index-entry-within-deffn-1"></a></pre></dd><dt class="deffnx
def-cmd-deffn" id="index-truc-2"><span class="category-def">cmde:
</span><span><strong class="strong">truc</strong> <em class="emph"></em><a
class="copiable-anchor" href='#index-truc-2'> ¶</a></span></dt>
<dt class="deffnx def-cmd-deffn" id="index-log-trap-1"><span
class="category-def">Command: </span><span><strong class="strong">log
trap</strong> <em class="emph"></em><a class="copiable-anchor"
href='#index-log-trap-1'> ¶</a></span></dt>
<dt class="deffnx def-cmd-deffn" id="index-log-trap1-1"><span
class="category-def">Command: </span><span><strong class="strong">log
trap1</strong> <em class="emph"></em><a class="copiable-anchor"
href='#index-log-trap1-1'> ¶</a></span></dt>
<dt class="deffnx def-cmd-deffn" id="index-log-trap2-1"><span
class="category-def">Command: </span><span><strong class="strong">log
trap2</strong> <em class="emph"></em><a class="copiable-anchor"
href='#index-log-trap2-1'> ¶</a></span></dt>
@@ -3862,7 +3862,7 @@ ref</a>
</pre><dl class="ftable">
<dt id='index-a-5'><span><tt><em class="emph">a</em></tt><a
class="copiable-anchor" href='#index-a-5'> ¶</a></span></dt>
-<dd><pre class="example-preformatted"><a class="index-entry-anchor"
id="index-index-entry-between-item-and-itemx-2"></a></pre></dd>
+<dd><pre class="example-preformatted"><a class="index-entry-id"
id="index-index-entry-between-item-and-itemx-2"></a></pre></dd>
<dt id='index-b-2'><span><tt><em class="emph">b</em></tt><a
class="copiable-anchor" href='#index-b-2'> ¶</a></span></dt>
<dd><pre class="example-preformatted">l--ine
</pre></dd>
@@ -4028,7 +4028,7 @@ Invalid use of @':
</pre><dl class="ftable">
<dt id='index-a-6'><span><tt>a</tt><a class="copiable-anchor"
href='#index-a-6'> ¶</a></span></dt>
-<dd><pre class="example-preformatted"><a class="index-entry-anchor"
id="index-index-entry-between-item-and-itemx-3"></a></pre></dd>
+<dd><pre class="example-preformatted"><a class="index-entry-id"
id="index-index-entry-between-item-and-itemx-3"></a></pre></dd>
<dt id='index-b-3'><span><tt>b</tt><a class="copiable-anchor"
href='#index-b-3'> ¶</a></span></dt>
<dd><pre class="example-preformatted">l--ine
</pre></dd>
@@ -4087,38 +4087,38 @@ Invalid use of @':
</pre></div>
-<a class="index-entry-anchor" id="index-t_002d_002druc"></a>
-<a class="index-entry-anchor" id="index-T_002d_002druc"></a>
-<a class="index-entry-anchor" id="index-_002e"></a>
-<a class="index-entry-anchor" id="index-_003f"></a>
-<a class="index-entry-anchor" id="index-a"></a>
-<a class="index-entry-anchor" id="index-t_002d_002druc-1"></a>
-<a class="index-entry-anchor" id="index-T_002d_002druc-1"></a>
-<a class="index-entry-anchor" id="index-_002e-1"></a>
-<a class="index-entry-anchor" id="index-_003f-1"></a>
-<a class="index-entry-anchor" id="index-a-7"></a>
+<a class="index-entry-id" id="index-t_002d_002druc"></a>
+<a class="index-entry-id" id="index-T_002d_002druc"></a>
+<a class="index-entry-id" id="index-_002e"></a>
+<a class="index-entry-id" id="index-_003f"></a>
+<a class="index-entry-id" id="index-a"></a>
+<a class="index-entry-id" id="index-t_002d_002druc-1"></a>
+<a class="index-entry-id" id="index-T_002d_002druc-1"></a>
+<a class="index-entry-id" id="index-_002e-1"></a>
+<a class="index-entry-id" id="index-_003f-1"></a>
+<a class="index-entry-id" id="index-a-7"></a>
-<a class="index-entry-anchor" id="index-a_002d_002d_002da"></a>
-<a class="index-entry-anchor" id="index-b_002d_002d_002db"></a>
-<a class="index-entry-anchor" id="index-d_002d_002d_002ddd"></a>
-<a class="index-entry-anchor" id="index-g_002d_002d_002dgg"></a>
+<a class="index-entry-id" id="index-a_002d_002d_002da"></a>
+<a class="index-entry-id" id="index-b_002d_002d_002db"></a>
+<a class="index-entry-id" id="index-d_002d_002d_002ddd"></a>
+<a class="index-entry-id" id="index-g_002d_002d_002dgg"></a>
-<a class="index-entry-anchor" id="index-f_002d_002d_002daa"></a>
-<a class="index-entry-anchor" id="index-f_002d_002d_002dbb"></a>
-<a class="index-entry-anchor" id="index-f_002d_002d_002dddd"></a>
-<a class="index-entry-anchor" id="index-f_002d_002d_002dggg"></a>
+<a class="index-entry-id" id="index-f_002d_002d_002daa"></a>
+<a class="index-entry-id" id="index-f_002d_002d_002dbb"></a>
+<a class="index-entry-id" id="index-f_002d_002d_002dddd"></a>
+<a class="index-entry-id" id="index-f_002d_002d_002dggg"></a>
-<a class="index-entry-anchor" id="index-aaa"></a>
+<a class="index-entry-id" id="index-aaa"></a>
-<a class="index-entry-anchor" id="index-xxx"></a>
+<a class="index-entry-id" id="index-xxx"></a>
-<a class="index-entry-anchor" id="index-"></a>
+<a class="index-entry-id" id="index-"></a>
-<a class="index-entry-anchor"
id="index-a-index_002d_002d_002dentry-te-_002d_002d_002d-i"></a>
+<a class="index-entry-id"
id="index-a-index_002d_002d_002dentry-te-_002d_002d_002d-i"></a>
-<a class="index-entry-anchor" id="index-truc-4"></a>
+<a class="index-entry-id" id="index-truc-4"></a>
<p>Text<a class="footnote" id="DOCF9" href="#FOOT9"><sup>7</sup></a>
@@ -5325,13 +5325,13 @@ Previous: <a href="#chapter" accesskey="p"
rel="prev">chapter</a>, Up: <a href="
<p>in footnote2</p>
<h5><a id="FOOT9" href="#DOCF9">(7)</a></h5>
<p>in footnote
-<a class="index-entry-anchor" id="index-index-entry-in-footnote"></a>
+<a class="index-entry-id" id="index-index-entry-in-footnote"></a>
</p>
<p>Blah
</p>
<p>Blih
</p>
-<a class="index-entry-anchor" id="index-counting-entry"></a>
+<a class="index-entry-id" id="index-counting-entry"></a>
<h5><a id="FOOT10" href="#DOCF10">(8)</a></h5>
<p>in footnote</p>
</div>
diff --git a/tp/tests/layout/res_parser/formatting_html_nodes/chapter.html
b/tp/tests/layout/res_parser/formatting_html_nodes/chapter.html
index dc0509575d..1ae29ebf36 100644
--- a/tp/tests/layout/res_parser/formatting_html_nodes/chapter.html
+++ b/tp/tests/layout/res_parser/formatting_html_nodes/chapter.html
@@ -874,10 +874,10 @@ kbd: <kbd
class="kbd">``simple-double--three---four----''</kbd> <br>
</p>
<p>‘<!-- /@w -->‘simple-double-<!-- /@w
-->-three—four—-’<!-- /@w -->’<br>
</p>
-<a class="index-entry-anchor" id="index-copying-_002d_002doption"></a>
-<a class="index-entry-anchor" id="index-copying-_0060_0060"></a>
-<a class="index-entry-anchor" id="index-copying-_0060_0060-1"></a>
-<a class="index-entry-anchor" id="index-copying-_002d_002dfoption"></a>
+<a class="index-entry-id" id="index-copying-_002d_002doption"></a>
+<a class="index-entry-id" id="index-copying-_0060_0060"></a>
+<a class="index-entry-id" id="index-copying-_0060_0060-1"></a>
+<a class="index-entry-id" id="index-copying-_002d_002dfoption"></a>
<p>@"u ü
@"{U} Ü
@@ -1236,7 +1236,7 @@ error→ → - ∗ -| ⇒
</li></ul>
<ul class="itemize" style="list-style-type: '\2022 a\2013 n itemize line'">
-<li><a class="index-entry-anchor"
id="index-copying-index-entry-within-itemize"></a>
+<li><a class="index-entry-id"
id="index-copying-index-entry-within-itemize"></a>
i–tem 1
</li><li>i–tem 2
</li></ul>
@@ -1278,7 +1278,7 @@ i–tem 1
<thead><tr><th width="40%">mu–ltitable headitem</th><th
width="60%">another tab</th></tr></thead>
<tbody><tr><td width="40%">mu–ltitable item</td><td
width="60%">multitable tab</td></tr>
<tr><td width="40%">mu–ltitable item 2</td><td width="60%">multitable
tab 2
-<a class="index-entry-anchor"
id="index-copying-index-entry-within-multitable"></a></td></tr>
+<a class="index-entry-id"
id="index-copying-index-entry-within-multitable"></a></td></tr>
<tr><td width="40%">lone mu–ltitable item</td></tr>
</tbody>
</table>
@@ -1379,7 +1379,7 @@ f(x) = {1 \over \sigma \sqrt{2\pi}}e<sup class="sup">-{1
\over 2}\left({x-\mu \o
<dl class="first-deffn">
<dt class="deffn" id="index-copying-i"><span class="category-def">fset:
</span><span><strong class="strong"><var class="var">i</var></strong> <em
class="emph">a g</em><a class="copiable-anchor" href='#index-copying-i'>
¶</a></span></dt>
-<dd><a class="index-entry-anchor"
id="index-copying-index-entry-within-deffn"></a>
+<dd><a class="index-entry-id" id="index-copying-index-entry-within-deffn"></a>
</dd><dt class="deffnx def-cmd-deffn" id="index-copying-truc"><span
class="category-def">cmde: </span><span><strong class="strong">truc</strong>
<em class="emph"></em><a class="copiable-anchor" href='#index-copying-truc'>
¶</a></span></dt>
<dt class="deffnx def-cmd-deffn" id="index-copying-log-trap"><span
class="category-def">Command: </span><span><strong class="strong">log
trap</strong> <em class="emph"></em><a class="copiable-anchor"
href='#index-copying-log-trap'> ¶</a></span></dt>
<dt class="deffnx def-cmd-deffn" id="index-copying-log-trap1"><span
class="category-def">Command: </span><span><strong class="strong">log
trap1</strong> <em class="emph"></em><a class="copiable-anchor"
href='#index-copying-log-trap1'> ¶</a></span></dt>
@@ -1672,7 +1672,7 @@ ref</a>
<dl class="ftable">
<dt id='index-copying-a-1'><span><em class="emph">a</em><a
class="copiable-anchor" href='#index-copying-a-1'> ¶</a></span></dt>
-<dd><a class="index-entry-anchor"
id="index-copying-index-entry-between-item-and-itemx"></a>
+<dd><a class="index-entry-id"
id="index-copying-index-entry-between-item-and-itemx"></a>
</dd>
<dt id='index-copying-b'><span><em class="emph">b</em><a
class="copiable-anchor" href='#index-copying-b'> ¶</a></span></dt>
<dd><p>l–ine
@@ -1814,7 +1814,7 @@ html ''
<dl class="ftable">
<dt id='index-copying-a-2'><span>a<a class="copiable-anchor"
href='#index-copying-a-2'> ¶</a></span></dt>
-<dd><a class="index-entry-anchor"
id="index-copying-index-entry-between-item-and-itemx-1"></a>
+<dd><a class="index-entry-id"
id="index-copying-index-entry-between-item-and-itemx-1"></a>
</dd>
<dt id='index-copying-b-1'><span>b<a class="copiable-anchor"
href='#index-copying-b-1'> ¶</a></span></dt>
<dd><p>l–ine
@@ -1888,10 +1888,10 @@ kbd: <kbd
class="kbd">``simple-double--three---four----''</kbd> <br>
</p>
<p>‘<!-- /@w -->‘simple-double-<!-- /@w
-->-three—four—-’<!-- /@w -->’<br>
</p>
-<a class="index-entry-anchor" id="index-_002d_002doption"></a>
-<a class="index-entry-anchor" id="index-_0060_0060"></a>
-<a class="index-entry-anchor" id="index-_0060_0060-2"></a>
-<a class="index-entry-anchor" id="index-_002d_002dfoption"></a>
+<a class="index-entry-id" id="index-_002d_002doption"></a>
+<a class="index-entry-id" id="index-_0060_0060"></a>
+<a class="index-entry-id" id="index-_0060_0060-2"></a>
+<a class="index-entry-id" id="index-_002d_002dfoption"></a>
<p>@"u ü
@"{U} Ü
@@ -2250,7 +2250,7 @@ error→ → - ∗ -| ⇒
</li></ul>
<ul class="itemize" style="list-style-type: '\2022 a\2013 n itemize line'">
-<li><a class="index-entry-anchor" id="index-index-entry-within-itemize"></a>
+<li><a class="index-entry-id" id="index-index-entry-within-itemize"></a>
i–tem 1
</li><li>i–tem 2
</li></ul>
@@ -2292,7 +2292,7 @@ i–tem 1
<thead><tr><th width="40%">mu–ltitable headitem</th><th
width="60%">another tab</th></tr></thead>
<tbody><tr><td width="40%">mu–ltitable item</td><td
width="60%">multitable tab</td></tr>
<tr><td width="40%">mu–ltitable item 2</td><td width="60%">multitable
tab 2
-<a class="index-entry-anchor"
id="index-index-entry-within-multitable"></a></td></tr>
+<a class="index-entry-id"
id="index-index-entry-within-multitable"></a></td></tr>
<tr><td width="40%">lone mu–ltitable item</td></tr>
</tbody>
</table>
@@ -2393,7 +2393,7 @@ f(x) = {1 \over \sigma \sqrt{2\pi}}e<sup class="sup">-{1
\over 2}\left({x-\mu \o
<dl class="first-deffn">
<dt class="deffn" id="index-i"><span class="category-def">fset:
</span><span><strong class="strong"><var class="var">i</var></strong> <em
class="emph">a g</em><a class="copiable-anchor" href='#index-i'>
¶</a></span></dt>
-<dd><a class="index-entry-anchor" id="index-index-entry-within-deffn"></a>
+<dd><a class="index-entry-id" id="index-index-entry-within-deffn"></a>
</dd><dt class="deffnx def-cmd-deffn" id="index-truc"><span
class="category-def">cmde: </span><span><strong class="strong">truc</strong>
<em class="emph"></em><a class="copiable-anchor" href='#index-truc'>
¶</a></span></dt>
<dt class="deffnx def-cmd-deffn" id="index-log-trap"><span
class="category-def">Command: </span><span><strong class="strong">log
trap</strong> <em class="emph"></em><a class="copiable-anchor"
href='#index-log-trap'> ¶</a></span></dt>
<dt class="deffnx def-cmd-deffn" id="index-log-trap1"><span
class="category-def">Command: </span><span><strong class="strong">log
trap1</strong> <em class="emph"></em><a class="copiable-anchor"
href='#index-log-trap1'> ¶</a></span></dt>
@@ -2686,7 +2686,7 @@ ref</a>
<dl class="ftable">
<dt id='index-a-2'><span><em class="emph">a</em><a class="copiable-anchor"
href='#index-a-2'> ¶</a></span></dt>
-<dd><a class="index-entry-anchor"
id="index-index-entry-between-item-and-itemx"></a>
+<dd><a class="index-entry-id"
id="index-index-entry-between-item-and-itemx"></a>
</dd>
<dt id='index-b'><span><em class="emph">b</em><a class="copiable-anchor"
href='#index-b'> ¶</a></span></dt>
<dd><p>l–ine
@@ -2828,7 +2828,7 @@ html ''
<dl class="ftable">
<dt id='index-a-3'><span>a<a class="copiable-anchor" href='#index-a-3'>
¶</a></span></dt>
-<dd><a class="index-entry-anchor"
id="index-index-entry-between-item-and-itemx-1"></a>
+<dd><a class="index-entry-id"
id="index-index-entry-between-item-and-itemx-1"></a>
</dd>
<dt id='index-b-1'><span>b<a class="copiable-anchor" href='#index-b-1'>
¶</a></span></dt>
<dd><p>l–ine
@@ -2910,7 +2910,7 @@ kbd: <kbd
class="kbd">``simple-double--three---four----''</kbd>
`<!-- /@w -->`simple-double-<!-- /@w -->-three---four----'<!-- /@w -->'
-<a class="index-entry-anchor" id="index-_002d_002doption-1"></a><a
class="index-entry-anchor" id="index-_0060_0060-1"></a><a
class="index-entry-anchor" id="index-_0060_0060-3"></a><a
class="index-entry-anchor" id="index-_002d_002dfoption-1"></a>
+<a class="index-entry-id" id="index-_002d_002doption-1"></a><a
class="index-entry-id" id="index-_0060_0060-1"></a><a class="index-entry-id"
id="index-_0060_0060-3"></a><a class="index-entry-id"
id="index-_002d_002dfoption-1"></a>
@"u ü
@"{U} Ü
@~n ñ
@@ -3308,7 +3308,7 @@ error→ → - ∗ -| ⇒
<pre class="example-preformatted">
</pre><ul class="itemize" style="list-style-type: '\2022 a\2013 n itemize
line'">
-<li><pre class="example-preformatted"><a class="index-entry-anchor"
id="index-index-entry-within-itemize-1"></a>i--tem 1
+<li><pre class="example-preformatted"><a class="index-entry-id"
id="index-index-entry-within-itemize-1"></a>i--tem 1
</pre></li><li><pre class="example-preformatted">i--tem 2
</pre></li></ul>
<pre class="example-preformatted">
@@ -3357,7 +3357,7 @@ error→ → - ∗ -| ⇒
<thead><tr><th width="40%"><pre class="example-preformatted">mu--ltitable
headitem</pre></th><th width="60%"><pre class="example-preformatted">another
tab</pre></th></tr></thead>
<tbody><tr><td width="40%"><pre class="example-preformatted">mu--ltitable
item</pre></td><td width="60%"><pre class="example-preformatted">multitable
tab</pre></td></tr>
<tr><td width="40%"><pre class="example-preformatted">mu--ltitable item
2</pre></td><td width="60%"><pre class="example-preformatted">multitable tab 2
-<a class="index-entry-anchor"
id="index-index-entry-within-multitable-1"></a></pre></td></tr>
+<a class="index-entry-id"
id="index-index-entry-within-multitable-1"></a></pre></td></tr>
<tr><td width="40%"><pre class="example-preformatted">lone mu--ltitable
item</pre></td></tr>
</tbody>
</table>
@@ -3480,7 +3480,7 @@ f(x) = {1 \over \sigma \sqrt{2\pi}}e<sup class="sup">-{1
\over 2}\left({x-\mu \o
<pre class="example-preformatted">
</pre><dl class="first-deffn">
<dt class="deffn" id="index-i-2"><span class="category-def">fset:
</span><span><strong class="strong"><var class="var">i</var></strong> <em
class="emph">a g</em><a class="copiable-anchor" href='#index-i-2'>
¶</a></span></dt>
-<dd><pre class="example-preformatted"><a class="index-entry-anchor"
id="index-index-entry-within-deffn-1"></a></pre></dd><dt class="deffnx
def-cmd-deffn" id="index-truc-2"><span class="category-def">cmde:
</span><span><strong class="strong">truc</strong> <em class="emph"></em><a
class="copiable-anchor" href='#index-truc-2'> ¶</a></span></dt>
+<dd><pre class="example-preformatted"><a class="index-entry-id"
id="index-index-entry-within-deffn-1"></a></pre></dd><dt class="deffnx
def-cmd-deffn" id="index-truc-2"><span class="category-def">cmde:
</span><span><strong class="strong">truc</strong> <em class="emph"></em><a
class="copiable-anchor" href='#index-truc-2'> ¶</a></span></dt>
<dt class="deffnx def-cmd-deffn" id="index-log-trap-1"><span
class="category-def">Command: </span><span><strong class="strong">log
trap</strong> <em class="emph"></em><a class="copiable-anchor"
href='#index-log-trap-1'> ¶</a></span></dt>
<dt class="deffnx def-cmd-deffn" id="index-log-trap1-1"><span
class="category-def">Command: </span><span><strong class="strong">log
trap1</strong> <em class="emph"></em><a class="copiable-anchor"
href='#index-log-trap1-1'> ¶</a></span></dt>
<dt class="deffnx def-cmd-deffn" id="index-log-trap2-1"><span
class="category-def">Command: </span><span><strong class="strong">log
trap2</strong> <em class="emph"></em><a class="copiable-anchor"
href='#index-log-trap2-1'> ¶</a></span></dt>
@@ -3824,7 +3824,7 @@ ref</a>
</pre><dl class="ftable">
<dt id='index-a-5'><span><tt><em class="emph">a</em></tt><a
class="copiable-anchor" href='#index-a-5'> ¶</a></span></dt>
-<dd><pre class="example-preformatted"><a class="index-entry-anchor"
id="index-index-entry-between-item-and-itemx-2"></a></pre></dd>
+<dd><pre class="example-preformatted"><a class="index-entry-id"
id="index-index-entry-between-item-and-itemx-2"></a></pre></dd>
<dt id='index-b-2'><span><tt><em class="emph">b</em></tt><a
class="copiable-anchor" href='#index-b-2'> ¶</a></span></dt>
<dd><pre class="example-preformatted">l--ine
</pre></dd>
@@ -3990,7 +3990,7 @@ Invalid use of @':
</pre><dl class="ftable">
<dt id='index-a-6'><span><tt>a</tt><a class="copiable-anchor"
href='#index-a-6'> ¶</a></span></dt>
-<dd><pre class="example-preformatted"><a class="index-entry-anchor"
id="index-index-entry-between-item-and-itemx-3"></a></pre></dd>
+<dd><pre class="example-preformatted"><a class="index-entry-id"
id="index-index-entry-between-item-and-itemx-3"></a></pre></dd>
<dt id='index-b-3'><span><tt>b</tt><a class="copiable-anchor"
href='#index-b-3'> ¶</a></span></dt>
<dd><pre class="example-preformatted">l--ine
</pre></dd>
@@ -4049,38 +4049,38 @@ Invalid use of @':
</pre></div>
-<a class="index-entry-anchor" id="index-t_002d_002druc"></a>
-<a class="index-entry-anchor" id="index-T_002d_002druc"></a>
-<a class="index-entry-anchor" id="index-_002e"></a>
-<a class="index-entry-anchor" id="index-_003f"></a>
-<a class="index-entry-anchor" id="index-a"></a>
-<a class="index-entry-anchor" id="index-t_002d_002druc-1"></a>
-<a class="index-entry-anchor" id="index-T_002d_002druc-1"></a>
-<a class="index-entry-anchor" id="index-_002e-1"></a>
-<a class="index-entry-anchor" id="index-_003f-1"></a>
-<a class="index-entry-anchor" id="index-a-7"></a>
+<a class="index-entry-id" id="index-t_002d_002druc"></a>
+<a class="index-entry-id" id="index-T_002d_002druc"></a>
+<a class="index-entry-id" id="index-_002e"></a>
+<a class="index-entry-id" id="index-_003f"></a>
+<a class="index-entry-id" id="index-a"></a>
+<a class="index-entry-id" id="index-t_002d_002druc-1"></a>
+<a class="index-entry-id" id="index-T_002d_002druc-1"></a>
+<a class="index-entry-id" id="index-_002e-1"></a>
+<a class="index-entry-id" id="index-_003f-1"></a>
+<a class="index-entry-id" id="index-a-7"></a>
-<a class="index-entry-anchor" id="index-a_002d_002d_002da"></a>
-<a class="index-entry-anchor" id="index-b_002d_002d_002db"></a>
-<a class="index-entry-anchor" id="index-d_002d_002d_002ddd"></a>
-<a class="index-entry-anchor" id="index-g_002d_002d_002dgg"></a>
+<a class="index-entry-id" id="index-a_002d_002d_002da"></a>
+<a class="index-entry-id" id="index-b_002d_002d_002db"></a>
+<a class="index-entry-id" id="index-d_002d_002d_002ddd"></a>
+<a class="index-entry-id" id="index-g_002d_002d_002dgg"></a>
-<a class="index-entry-anchor" id="index-f_002d_002d_002daa"></a>
-<a class="index-entry-anchor" id="index-f_002d_002d_002dbb"></a>
-<a class="index-entry-anchor" id="index-f_002d_002d_002dddd"></a>
-<a class="index-entry-anchor" id="index-f_002d_002d_002dggg"></a>
+<a class="index-entry-id" id="index-f_002d_002d_002daa"></a>
+<a class="index-entry-id" id="index-f_002d_002d_002dbb"></a>
+<a class="index-entry-id" id="index-f_002d_002d_002dddd"></a>
+<a class="index-entry-id" id="index-f_002d_002d_002dggg"></a>
-<a class="index-entry-anchor" id="index-aaa"></a>
+<a class="index-entry-id" id="index-aaa"></a>
-<a class="index-entry-anchor" id="index-xxx"></a>
+<a class="index-entry-id" id="index-xxx"></a>
-<a class="index-entry-anchor" id="index-"></a>
+<a class="index-entry-id" id="index-"></a>
-<a class="index-entry-anchor"
id="index-a-index_002d_002d_002dentry-te-_002d_002d_002d-i"></a>
+<a class="index-entry-id"
id="index-a-index_002d_002d_002dentry-te-_002d_002d_002d-i"></a>
-<a class="index-entry-anchor" id="index-truc-4"></a>
+<a class="index-entry-id" id="index-truc-4"></a>
<p>Text<a class="footnote" id="DOCF9"
href="formatting_fot.html#FOOT9"><sup>11</sup></a>
diff --git
a/tp/tests/layout/res_parser/formatting_html_nodes/formatting_fot.html
b/tp/tests/layout/res_parser/formatting_html_nodes/formatting_fot.html
index bb90d71a65..9dee57e574 100644
--- a/tp/tests/layout/res_parser/formatting_html_nodes/formatting_fot.html
+++ b/tp/tests/layout/res_parser/formatting_html_nodes/formatting_fot.html
@@ -841,13 +841,13 @@ span.program-in-footer {font-size: smaller}
<p>in footnote2</p>
<h5><a id="FOOT9" href="chapter.html#DOCF9">(11)</a></h5>
<p>in footnote
-<a class="index-entry-anchor" id="index-index-entry-in-footnote"></a>
+<a class="index-entry-id" id="index-index-entry-in-footnote"></a>
</p>
<p>Blah
</p>
<p>Blih
</p>
-<a class="index-entry-anchor" id="index-counting-entry"></a>
+<a class="index-entry-id" id="index-counting-entry"></a>
<h5><a id="FOOT10" href="chapter.html#DOCF10">(12)</a></h5>
<p>in footnote</p>
</div><hr>
diff --git a/tp/tests/layout/res_parser/formatting_html_nodes/index.html
b/tp/tests/layout/res_parser/formatting_html_nodes/index.html
index 40dd1595b4..83aa1bb72b 100644
--- a/tp/tests/layout/res_parser/formatting_html_nodes/index.html
+++ b/tp/tests/layout/res_parser/formatting_html_nodes/index.html
@@ -849,10 +849,10 @@ kbd: <kbd
class="kbd">``simple-double--three---four----''</kbd> <br>
</p>
<p>‘<!-- /@w -->‘simple-double-<!-- /@w
-->-three—four—-’<!-- /@w -->’<br>
</p>
-<a class="index-entry-anchor" id="index-titlepage-_002d_002doption"></a>
-<a class="index-entry-anchor" id="index-titlepage-_0060_0060"></a>
-<a class="index-entry-anchor" id="index-titlepage-_0060_0060-1"></a>
-<a class="index-entry-anchor" id="index-titlepage-_002d_002dfoption"></a>
+<a class="index-entry-id" id="index-titlepage-_002d_002doption"></a>
+<a class="index-entry-id" id="index-titlepage-_0060_0060"></a>
+<a class="index-entry-id" id="index-titlepage-_0060_0060-1"></a>
+<a class="index-entry-id" id="index-titlepage-_002d_002dfoption"></a>
<p>@"u ü
@"{U} Ü
@@ -1212,7 +1212,7 @@ error→ → - ∗ -| ⇒
</li></ul>
<ul class="itemize" style="list-style-type: '\2022 a\2013 n itemize line'">
-<li><a class="index-entry-anchor"
id="index-titlepage-index-entry-within-itemize"></a>
+<li><a class="index-entry-id"
id="index-titlepage-index-entry-within-itemize"></a>
i–tem 1
</li><li>i–tem 2
</li></ul>
@@ -1254,7 +1254,7 @@ i–tem 1
<thead><tr><th width="40%">mu–ltitable headitem</th><th
width="60%">another tab</th></tr></thead>
<tbody><tr><td width="40%">mu–ltitable item</td><td
width="60%">multitable tab</td></tr>
<tr><td width="40%">mu–ltitable item 2</td><td width="60%">multitable
tab 2
-<a class="index-entry-anchor"
id="index-titlepage-index-entry-within-multitable"></a></td></tr>
+<a class="index-entry-id"
id="index-titlepage-index-entry-within-multitable"></a></td></tr>
<tr><td width="40%">lone mu–ltitable item</td></tr>
</tbody>
</table>
@@ -1355,7 +1355,7 @@ f(x) = {1 \over \sigma \sqrt{2\pi}}e<sup class="sup">-{1
\over 2}\left({x-\mu \o
<dl class="first-deffn">
<dt class="deffn" id="index-titlepage-i"><span class="category-def">fset:
</span><span><strong class="strong"><var class="var">i</var></strong> <em
class="emph">a g</em><a class="copiable-anchor" href='#index-titlepage-i'>
¶</a></span></dt>
-<dd><a class="index-entry-anchor"
id="index-titlepage-index-entry-within-deffn"></a>
+<dd><a class="index-entry-id"
id="index-titlepage-index-entry-within-deffn"></a>
</dd><dt class="deffnx def-cmd-deffn" id="index-titlepage-truc"><span
class="category-def">cmde: </span><span><strong class="strong">truc</strong>
<em class="emph"></em><a class="copiable-anchor" href='#index-titlepage-truc'>
¶</a></span></dt>
<dt class="deffnx def-cmd-deffn" id="index-titlepage-log-trap"><span
class="category-def">Command: </span><span><strong class="strong">log
trap</strong> <em class="emph"></em><a class="copiable-anchor"
href='#index-titlepage-log-trap'> ¶</a></span></dt>
<dt class="deffnx def-cmd-deffn" id="index-titlepage-log-trap1"><span
class="category-def">Command: </span><span><strong class="strong">log
trap1</strong> <em class="emph"></em><a class="copiable-anchor"
href='#index-titlepage-log-trap1'> ¶</a></span></dt>
@@ -1648,7 +1648,7 @@ ref</a>
<dl class="ftable">
<dt id='index-titlepage-a-1'><span><em class="emph">a</em><a
class="copiable-anchor" href='#index-titlepage-a-1'> ¶</a></span></dt>
-<dd><a class="index-entry-anchor"
id="index-titlepage-index-entry-between-item-and-itemx"></a>
+<dd><a class="index-entry-id"
id="index-titlepage-index-entry-between-item-and-itemx"></a>
</dd>
<dt id='index-titlepage-b'><span><em class="emph">b</em><a
class="copiable-anchor" href='#index-titlepage-b'> ¶</a></span></dt>
<dd><p>l–ine
@@ -1790,7 +1790,7 @@ html ''
<dl class="ftable">
<dt id='index-titlepage-a-2'><span>a<a class="copiable-anchor"
href='#index-titlepage-a-2'> ¶</a></span></dt>
-<dd><a class="index-entry-anchor"
id="index-titlepage-index-entry-between-item-and-itemx-1"></a>
+<dd><a class="index-entry-id"
id="index-titlepage-index-entry-between-item-and-itemx-1"></a>
</dd>
<dt id='index-titlepage-b-1'><span>b<a class="copiable-anchor"
href='#index-titlepage-b-1'> ¶</a></span></dt>
<dd><p>l–ine
@@ -1865,10 +1865,10 @@ kbd: <kbd
class="kbd">``simple-double--three---four----''</kbd> <br>
</p>
<p>‘<!-- /@w -->‘simple-double-<!-- /@w
-->-three—four—-’<!-- /@w -->’<br>
</p>
-<a class="index-entry-anchor" id="index-copying-_002d_002doption"></a>
-<a class="index-entry-anchor" id="index-copying-_0060_0060"></a>
-<a class="index-entry-anchor" id="index-copying-_0060_0060-1"></a>
-<a class="index-entry-anchor" id="index-copying-_002d_002dfoption"></a>
+<a class="index-entry-id" id="index-copying-_002d_002doption"></a>
+<a class="index-entry-id" id="index-copying-_0060_0060"></a>
+<a class="index-entry-id" id="index-copying-_0060_0060-1"></a>
+<a class="index-entry-id" id="index-copying-_002d_002dfoption"></a>
<p>@"u ü
@"{U} Ü
@@ -2227,7 +2227,7 @@ error→ → - ∗ -| ⇒
</li></ul>
<ul class="itemize" style="list-style-type: '\2022 a\2013 n itemize line'">
-<li><a class="index-entry-anchor"
id="index-copying-index-entry-within-itemize"></a>
+<li><a class="index-entry-id"
id="index-copying-index-entry-within-itemize"></a>
i–tem 1
</li><li>i–tem 2
</li></ul>
@@ -2269,7 +2269,7 @@ i–tem 1
<thead><tr><th width="40%">mu–ltitable headitem</th><th
width="60%">another tab</th></tr></thead>
<tbody><tr><td width="40%">mu–ltitable item</td><td
width="60%">multitable tab</td></tr>
<tr><td width="40%">mu–ltitable item 2</td><td width="60%">multitable
tab 2
-<a class="index-entry-anchor"
id="index-copying-index-entry-within-multitable"></a></td></tr>
+<a class="index-entry-id"
id="index-copying-index-entry-within-multitable"></a></td></tr>
<tr><td width="40%">lone mu–ltitable item</td></tr>
</tbody>
</table>
@@ -2370,7 +2370,7 @@ f(x) = {1 \over \sigma \sqrt{2\pi}}e<sup class="sup">-{1
\over 2}\left({x-\mu \o
<dl class="first-deffn">
<dt class="deffn" id="index-copying-i"><span class="category-def">fset:
</span><span><strong class="strong"><var class="var">i</var></strong> <em
class="emph">a g</em><a class="copiable-anchor" href='#index-copying-i'>
¶</a></span></dt>
-<dd><a class="index-entry-anchor"
id="index-copying-index-entry-within-deffn"></a>
+<dd><a class="index-entry-id" id="index-copying-index-entry-within-deffn"></a>
</dd><dt class="deffnx def-cmd-deffn" id="index-copying-truc"><span
class="category-def">cmde: </span><span><strong class="strong">truc</strong>
<em class="emph"></em><a class="copiable-anchor" href='#index-copying-truc'>
¶</a></span></dt>
<dt class="deffnx def-cmd-deffn" id="index-copying-log-trap"><span
class="category-def">Command: </span><span><strong class="strong">log
trap</strong> <em class="emph"></em><a class="copiable-anchor"
href='#index-copying-log-trap'> ¶</a></span></dt>
<dt class="deffnx def-cmd-deffn" id="index-copying-log-trap1"><span
class="category-def">Command: </span><span><strong class="strong">log
trap1</strong> <em class="emph"></em><a class="copiable-anchor"
href='#index-copying-log-trap1'> ¶</a></span></dt>
@@ -2663,7 +2663,7 @@ ref</a>
<dl class="ftable">
<dt id='index-copying-a-1'><span><em class="emph">a</em><a
class="copiable-anchor" href='#index-copying-a-1'> ¶</a></span></dt>
-<dd><a class="index-entry-anchor"
id="index-copying-index-entry-between-item-and-itemx"></a>
+<dd><a class="index-entry-id"
id="index-copying-index-entry-between-item-and-itemx"></a>
</dd>
<dt id='index-copying-b'><span><em class="emph">b</em><a
class="copiable-anchor" href='#index-copying-b'> ¶</a></span></dt>
<dd><p>l–ine
@@ -2805,7 +2805,7 @@ html ''
<dl class="ftable">
<dt id='index-copying-a-2'><span>a<a class="copiable-anchor"
href='#index-copying-a-2'> ¶</a></span></dt>
-<dd><a class="index-entry-anchor"
id="index-copying-index-entry-between-item-and-itemx-1"></a>
+<dd><a class="index-entry-id"
id="index-copying-index-entry-between-item-and-itemx-1"></a>
</dd>
<dt id='index-copying-b-1'><span>b<a class="copiable-anchor"
href='#index-copying-b-1'> ¶</a></span></dt>
<dd><p>l–ine
diff --git a/tp/tests/layout/res_parser/formatting_inline_css/formatting.html
b/tp/tests/layout/res_parser/formatting_inline_css/formatting.html
index fc39196c8f..fb30536ddc 100644
--- a/tp/tests/layout/res_parser/formatting_inline_css/formatting.html
+++ b/tp/tests/layout/res_parser/formatting_inline_css/formatting.html
@@ -830,10 +830,10 @@ kbd: <kbd class="kbd" style="font-style:
oblique">``simple-double--three---four-
</p>
<p>‘<!-- /@w -->‘simple-double-<!-- /@w
-->-three—four—-’<!-- /@w -->’<br>
</p>
-<a class="index-entry-anchor" id="index-titlepage-_002d_002doption"></a>
-<a class="index-entry-anchor" id="index-titlepage-_0060_0060"></a>
-<a class="index-entry-anchor" id="index-titlepage-_0060_0060-1"></a>
-<a class="index-entry-anchor" id="index-titlepage-_002d_002dfoption"></a>
+<a class="index-entry-id" id="index-titlepage-_002d_002doption"></a>
+<a class="index-entry-id" id="index-titlepage-_0060_0060"></a>
+<a class="index-entry-id" id="index-titlepage-_0060_0060-1"></a>
+<a class="index-entry-id" id="index-titlepage-_002d_002dfoption"></a>
<p>@"u ü
@"{U} Ü
@@ -1193,7 +1193,7 @@ error→ → - ∗ -| ⇒
</li></ul>
<ul class="itemize" style="list-style-type: '\2022 a\2013 n itemize line'">
-<li><a class="index-entry-anchor"
id="index-titlepage-index-entry-within-itemize"></a>
+<li><a class="index-entry-id"
id="index-titlepage-index-entry-within-itemize"></a>
i–tem 1
</li><li>i–tem 2
</li></ul>
@@ -1235,7 +1235,7 @@ i–tem 1
<thead><tr><th width="40%">mu–ltitable headitem</th><th
width="60%">another tab</th></tr></thead>
<tbody><tr><td width="40%">mu–ltitable item</td><td
width="60%">multitable tab</td></tr>
<tr><td width="40%">mu–ltitable item 2</td><td width="60%">multitable
tab 2
-<a class="index-entry-anchor"
id="index-titlepage-index-entry-within-multitable"></a></td></tr>
+<a class="index-entry-id"
id="index-titlepage-index-entry-within-multitable"></a></td></tr>
<tr><td width="40%">lone mu–ltitable item</td></tr>
</tbody>
</table>
@@ -1336,7 +1336,7 @@ f(x) = {1 \over \sigma \sqrt{2\pi}}e<sup class="sup">-{1
\over 2}\left({x-\mu \o
<dl class="first-deffn">
<dt class="deffn" id="index-titlepage-i"><span class="category-def">fset:
</span><span><strong class="strong"><var class="var">i</var></strong> <em
class="emph">a g</em><a class="copiable-anchor" style="visibility: hidden;
text-decoration: none; line-height: 0em" href='#index-titlepage-i'>
¶</a></span></dt>
-<dd><a class="index-entry-anchor"
id="index-titlepage-index-entry-within-deffn"></a>
+<dd><a class="index-entry-id"
id="index-titlepage-index-entry-within-deffn"></a>
</dd><dt class="deffnx def-cmd-deffn" id="index-titlepage-truc"><span
class="category-def">cmde: </span><span><strong class="strong">truc</strong>
<em class="emph"></em><a class="copiable-anchor" style="visibility: hidden;
text-decoration: none; line-height: 0em" href='#index-titlepage-truc'>
¶</a></span></dt>
<dt class="deffnx def-cmd-deffn" id="index-titlepage-log-trap"><span
class="category-def">Command: </span><span><strong class="strong">log
trap</strong> <em class="emph"></em><a class="copiable-anchor"
style="visibility: hidden; text-decoration: none; line-height: 0em"
href='#index-titlepage-log-trap'> ¶</a></span></dt>
<dt class="deffnx def-cmd-deffn" id="index-titlepage-log-trap1"><span
class="category-def">Command: </span><span><strong class="strong">log
trap1</strong> <em class="emph"></em><a class="copiable-anchor"
style="visibility: hidden; text-decoration: none; line-height: 0em"
href='#index-titlepage-log-trap1'> ¶</a></span></dt>
@@ -1629,7 +1629,7 @@ ref</a>
<dl class="ftable">
<dt id='index-titlepage-a-1'><span><em class="emph">a</em><a
class="copiable-anchor" style="visibility: hidden; text-decoration: none;
line-height: 0em" href='#index-titlepage-a-1'> ¶</a></span></dt>
-<dd><a class="index-entry-anchor"
id="index-titlepage-index-entry-between-item-and-itemx"></a>
+<dd><a class="index-entry-id"
id="index-titlepage-index-entry-between-item-and-itemx"></a>
</dd>
<dt id='index-titlepage-b'><span><em class="emph">b</em><a
class="copiable-anchor" style="visibility: hidden; text-decoration: none;
line-height: 0em" href='#index-titlepage-b'> ¶</a></span></dt>
<dd><p>l–ine
@@ -1771,7 +1771,7 @@ html ''
<dl class="ftable">
<dt id='index-titlepage-a-2'><span>a<a class="copiable-anchor"
style="visibility: hidden; text-decoration: none; line-height: 0em"
href='#index-titlepage-a-2'> ¶</a></span></dt>
-<dd><a class="index-entry-anchor"
id="index-titlepage-index-entry-between-item-and-itemx-1"></a>
+<dd><a class="index-entry-id"
id="index-titlepage-index-entry-between-item-and-itemx-1"></a>
</dd>
<dt id='index-titlepage-b-1'><span>b<a class="copiable-anchor"
style="visibility: hidden; text-decoration: none; line-height: 0em"
href='#index-titlepage-b-1'> ¶</a></span></dt>
<dd><p>l–ine
@@ -1846,10 +1846,10 @@ kbd: <kbd class="kbd" style="font-style:
oblique">``simple-double--three---four-
</p>
<p>‘<!-- /@w -->‘simple-double-<!-- /@w
-->-three—four—-’<!-- /@w -->’<br>
</p>
-<a class="index-entry-anchor" id="index-copying-_002d_002doption"></a>
-<a class="index-entry-anchor" id="index-copying-_0060_0060"></a>
-<a class="index-entry-anchor" id="index-copying-_0060_0060-1"></a>
-<a class="index-entry-anchor" id="index-copying-_002d_002dfoption"></a>
+<a class="index-entry-id" id="index-copying-_002d_002doption"></a>
+<a class="index-entry-id" id="index-copying-_0060_0060"></a>
+<a class="index-entry-id" id="index-copying-_0060_0060-1"></a>
+<a class="index-entry-id" id="index-copying-_002d_002dfoption"></a>
<p>@"u ü
@"{U} Ü
@@ -2208,7 +2208,7 @@ error→ → - ∗ -| ⇒
</li></ul>
<ul class="itemize" style="list-style-type: '\2022 a\2013 n itemize line'">
-<li><a class="index-entry-anchor"
id="index-copying-index-entry-within-itemize"></a>
+<li><a class="index-entry-id"
id="index-copying-index-entry-within-itemize"></a>
i–tem 1
</li><li>i–tem 2
</li></ul>
@@ -2250,7 +2250,7 @@ i–tem 1
<thead><tr><th width="40%">mu–ltitable headitem</th><th
width="60%">another tab</th></tr></thead>
<tbody><tr><td width="40%">mu–ltitable item</td><td
width="60%">multitable tab</td></tr>
<tr><td width="40%">mu–ltitable item 2</td><td width="60%">multitable
tab 2
-<a class="index-entry-anchor"
id="index-copying-index-entry-within-multitable"></a></td></tr>
+<a class="index-entry-id"
id="index-copying-index-entry-within-multitable"></a></td></tr>
<tr><td width="40%">lone mu–ltitable item</td></tr>
</tbody>
</table>
@@ -2351,7 +2351,7 @@ f(x) = {1 \over \sigma \sqrt{2\pi}}e<sup class="sup">-{1
\over 2}\left({x-\mu \o
<dl class="first-deffn">
<dt class="deffn" id="index-copying-i"><span class="category-def">fset:
</span><span><strong class="strong"><var class="var">i</var></strong> <em
class="emph">a g</em><a class="copiable-anchor" style="visibility: hidden;
text-decoration: none; line-height: 0em" href='#index-copying-i'>
¶</a></span></dt>
-<dd><a class="index-entry-anchor"
id="index-copying-index-entry-within-deffn"></a>
+<dd><a class="index-entry-id" id="index-copying-index-entry-within-deffn"></a>
</dd><dt class="deffnx def-cmd-deffn" id="index-copying-truc"><span
class="category-def">cmde: </span><span><strong class="strong">truc</strong>
<em class="emph"></em><a class="copiable-anchor" style="visibility: hidden;
text-decoration: none; line-height: 0em" href='#index-copying-truc'>
¶</a></span></dt>
<dt class="deffnx def-cmd-deffn" id="index-copying-log-trap"><span
class="category-def">Command: </span><span><strong class="strong">log
trap</strong> <em class="emph"></em><a class="copiable-anchor"
style="visibility: hidden; text-decoration: none; line-height: 0em"
href='#index-copying-log-trap'> ¶</a></span></dt>
<dt class="deffnx def-cmd-deffn" id="index-copying-log-trap1"><span
class="category-def">Command: </span><span><strong class="strong">log
trap1</strong> <em class="emph"></em><a class="copiable-anchor"
style="visibility: hidden; text-decoration: none; line-height: 0em"
href='#index-copying-log-trap1'> ¶</a></span></dt>
@@ -2644,7 +2644,7 @@ ref</a>
<dl class="ftable">
<dt id='index-copying-a-1'><span><em class="emph">a</em><a
class="copiable-anchor" style="visibility: hidden; text-decoration: none;
line-height: 0em" href='#index-copying-a-1'> ¶</a></span></dt>
-<dd><a class="index-entry-anchor"
id="index-copying-index-entry-between-item-and-itemx"></a>
+<dd><a class="index-entry-id"
id="index-copying-index-entry-between-item-and-itemx"></a>
</dd>
<dt id='index-copying-b'><span><em class="emph">b</em><a
class="copiable-anchor" style="visibility: hidden; text-decoration: none;
line-height: 0em" href='#index-copying-b'> ¶</a></span></dt>
<dd><p>l–ine
@@ -2786,7 +2786,7 @@ html ''
<dl class="ftable">
<dt id='index-copying-a-2'><span>a<a class="copiable-anchor"
style="visibility: hidden; text-decoration: none; line-height: 0em"
href='#index-copying-a-2'> ¶</a></span></dt>
-<dd><a class="index-entry-anchor"
id="index-copying-index-entry-between-item-and-itemx-1"></a>
+<dd><a class="index-entry-id"
id="index-copying-index-entry-between-item-and-itemx-1"></a>
</dd>
<dt id='index-copying-b-1'><span>b<a class="copiable-anchor"
style="visibility: hidden; text-decoration: none; line-height: 0em"
href='#index-copying-b-1'> ¶</a></span></dt>
<dd><p>l–ine
@@ -2917,10 +2917,10 @@ kbd: <kbd class="kbd" style="font-style:
oblique">``simple-double--three---four-
</p>
<p>‘<!-- /@w -->‘simple-double-<!-- /@w
-->-three—four—-’<!-- /@w -->’<br>
</p>
-<a class="index-entry-anchor" id="index-copying-_002d_002doption"></a>
-<a class="index-entry-anchor" id="index-copying-_0060_0060"></a>
-<a class="index-entry-anchor" id="index-copying-_0060_0060-1"></a>
-<a class="index-entry-anchor" id="index-copying-_002d_002dfoption"></a>
+<a class="index-entry-id" id="index-copying-_002d_002doption"></a>
+<a class="index-entry-id" id="index-copying-_0060_0060"></a>
+<a class="index-entry-id" id="index-copying-_0060_0060-1"></a>
+<a class="index-entry-id" id="index-copying-_002d_002dfoption"></a>
<p>@"u ü
@"{U} Ü
@@ -3279,7 +3279,7 @@ error→ → - ∗ -| ⇒
</li></ul>
<ul class="itemize" style="list-style-type: '\2022 a\2013 n itemize line'">
-<li><a class="index-entry-anchor"
id="index-copying-index-entry-within-itemize"></a>
+<li><a class="index-entry-id"
id="index-copying-index-entry-within-itemize"></a>
i–tem 1
</li><li>i–tem 2
</li></ul>
@@ -3321,7 +3321,7 @@ i–tem 1
<thead><tr><th width="40%">mu–ltitable headitem</th><th
width="60%">another tab</th></tr></thead>
<tbody><tr><td width="40%">mu–ltitable item</td><td
width="60%">multitable tab</td></tr>
<tr><td width="40%">mu–ltitable item 2</td><td width="60%">multitable
tab 2
-<a class="index-entry-anchor"
id="index-copying-index-entry-within-multitable"></a></td></tr>
+<a class="index-entry-id"
id="index-copying-index-entry-within-multitable"></a></td></tr>
<tr><td width="40%">lone mu–ltitable item</td></tr>
</tbody>
</table>
@@ -3422,7 +3422,7 @@ f(x) = {1 \over \sigma \sqrt{2\pi}}e<sup class="sup">-{1
\over 2}\left({x-\mu \o
<dl class="first-deffn">
<dt class="deffn" id="index-copying-i"><span class="category-def">fset:
</span><span><strong class="strong"><var class="var">i</var></strong> <em
class="emph">a g</em><a class="copiable-anchor" style="visibility: hidden;
text-decoration: none; line-height: 0em" href='#index-copying-i'>
¶</a></span></dt>
-<dd><a class="index-entry-anchor"
id="index-copying-index-entry-within-deffn"></a>
+<dd><a class="index-entry-id" id="index-copying-index-entry-within-deffn"></a>
</dd><dt class="deffnx def-cmd-deffn" id="index-copying-truc"><span
class="category-def">cmde: </span><span><strong class="strong">truc</strong>
<em class="emph"></em><a class="copiable-anchor" style="visibility: hidden;
text-decoration: none; line-height: 0em" href='#index-copying-truc'>
¶</a></span></dt>
<dt class="deffnx def-cmd-deffn" id="index-copying-log-trap"><span
class="category-def">Command: </span><span><strong class="strong">log
trap</strong> <em class="emph"></em><a class="copiable-anchor"
style="visibility: hidden; text-decoration: none; line-height: 0em"
href='#index-copying-log-trap'> ¶</a></span></dt>
<dt class="deffnx def-cmd-deffn" id="index-copying-log-trap1"><span
class="category-def">Command: </span><span><strong class="strong">log
trap1</strong> <em class="emph"></em><a class="copiable-anchor"
style="visibility: hidden; text-decoration: none; line-height: 0em"
href='#index-copying-log-trap1'> ¶</a></span></dt>
@@ -3715,7 +3715,7 @@ ref</a>
<dl class="ftable">
<dt id='index-copying-a-1'><span><em class="emph">a</em><a
class="copiable-anchor" style="visibility: hidden; text-decoration: none;
line-height: 0em" href='#index-copying-a-1'> ¶</a></span></dt>
-<dd><a class="index-entry-anchor"
id="index-copying-index-entry-between-item-and-itemx"></a>
+<dd><a class="index-entry-id"
id="index-copying-index-entry-between-item-and-itemx"></a>
</dd>
<dt id='index-copying-b'><span><em class="emph">b</em><a
class="copiable-anchor" style="visibility: hidden; text-decoration: none;
line-height: 0em" href='#index-copying-b'> ¶</a></span></dt>
<dd><p>l–ine
@@ -3857,7 +3857,7 @@ html ''
<dl class="ftable">
<dt id='index-copying-a-2'><span>a<a class="copiable-anchor"
style="visibility: hidden; text-decoration: none; line-height: 0em"
href='#index-copying-a-2'> ¶</a></span></dt>
-<dd><a class="index-entry-anchor"
id="index-copying-index-entry-between-item-and-itemx-1"></a>
+<dd><a class="index-entry-id"
id="index-copying-index-entry-between-item-and-itemx-1"></a>
</dd>
<dt id='index-copying-b-1'><span>b<a class="copiable-anchor"
style="visibility: hidden; text-decoration: none; line-height: 0em"
href='#index-copying-b-1'> ¶</a></span></dt>
<dd><p>l–ine
@@ -3931,10 +3931,10 @@ kbd: <kbd class="kbd" style="font-style:
oblique">``simple-double--three---four-
</p>
<p>‘<!-- /@w -->‘simple-double-<!-- /@w
-->-three—four—-’<!-- /@w -->’<br>
</p>
-<a class="index-entry-anchor" id="index-_002d_002doption"></a>
-<a class="index-entry-anchor" id="index-_0060_0060"></a>
-<a class="index-entry-anchor" id="index-_0060_0060-2"></a>
-<a class="index-entry-anchor" id="index-_002d_002dfoption"></a>
+<a class="index-entry-id" id="index-_002d_002doption"></a>
+<a class="index-entry-id" id="index-_0060_0060"></a>
+<a class="index-entry-id" id="index-_0060_0060-2"></a>
+<a class="index-entry-id" id="index-_002d_002dfoption"></a>
<p>@"u ü
@"{U} Ü
@@ -4293,7 +4293,7 @@ error→ → - ∗ -| ⇒
</li></ul>
<ul class="itemize" style="list-style-type: '\2022 a\2013 n itemize line'">
-<li><a class="index-entry-anchor" id="index-index-entry-within-itemize"></a>
+<li><a class="index-entry-id" id="index-index-entry-within-itemize"></a>
i–tem 1
</li><li>i–tem 2
</li></ul>
@@ -4335,7 +4335,7 @@ i–tem 1
<thead><tr><th width="40%">mu–ltitable headitem</th><th
width="60%">another tab</th></tr></thead>
<tbody><tr><td width="40%">mu–ltitable item</td><td
width="60%">multitable tab</td></tr>
<tr><td width="40%">mu–ltitable item 2</td><td width="60%">multitable
tab 2
-<a class="index-entry-anchor"
id="index-index-entry-within-multitable"></a></td></tr>
+<a class="index-entry-id"
id="index-index-entry-within-multitable"></a></td></tr>
<tr><td width="40%">lone mu–ltitable item</td></tr>
</tbody>
</table>
@@ -4436,7 +4436,7 @@ f(x) = {1 \over \sigma \sqrt{2\pi}}e<sup class="sup">-{1
\over 2}\left({x-\mu \o
<dl class="first-deffn">
<dt class="deffn" id="index-i"><span class="category-def">fset:
</span><span><strong class="strong"><var class="var">i</var></strong> <em
class="emph">a g</em><a class="copiable-anchor" style="visibility: hidden;
text-decoration: none; line-height: 0em" href='#index-i'> ¶</a></span></dt>
-<dd><a class="index-entry-anchor" id="index-index-entry-within-deffn"></a>
+<dd><a class="index-entry-id" id="index-index-entry-within-deffn"></a>
</dd><dt class="deffnx def-cmd-deffn" id="index-truc"><span
class="category-def">cmde: </span><span><strong class="strong">truc</strong>
<em class="emph"></em><a class="copiable-anchor" style="visibility: hidden;
text-decoration: none; line-height: 0em" href='#index-truc'>
¶</a></span></dt>
<dt class="deffnx def-cmd-deffn" id="index-log-trap"><span
class="category-def">Command: </span><span><strong class="strong">log
trap</strong> <em class="emph"></em><a class="copiable-anchor"
style="visibility: hidden; text-decoration: none; line-height: 0em"
href='#index-log-trap'> ¶</a></span></dt>
<dt class="deffnx def-cmd-deffn" id="index-log-trap1"><span
class="category-def">Command: </span><span><strong class="strong">log
trap1</strong> <em class="emph"></em><a class="copiable-anchor"
style="visibility: hidden; text-decoration: none; line-height: 0em"
href='#index-log-trap1'> ¶</a></span></dt>
@@ -4729,7 +4729,7 @@ ref</a>
<dl class="ftable">
<dt id='index-a-2'><span><em class="emph">a</em><a class="copiable-anchor"
style="visibility: hidden; text-decoration: none; line-height: 0em"
href='#index-a-2'> ¶</a></span></dt>
-<dd><a class="index-entry-anchor"
id="index-index-entry-between-item-and-itemx"></a>
+<dd><a class="index-entry-id"
id="index-index-entry-between-item-and-itemx"></a>
</dd>
<dt id='index-b'><span><em class="emph">b</em><a class="copiable-anchor"
style="visibility: hidden; text-decoration: none; line-height: 0em"
href='#index-b'> ¶</a></span></dt>
<dd><p>l–ine
@@ -4871,7 +4871,7 @@ html ''
<dl class="ftable">
<dt id='index-a-3'><span>a<a class="copiable-anchor" style="visibility:
hidden; text-decoration: none; line-height: 0em" href='#index-a-3'>
¶</a></span></dt>
-<dd><a class="index-entry-anchor"
id="index-index-entry-between-item-and-itemx-1"></a>
+<dd><a class="index-entry-id"
id="index-index-entry-between-item-and-itemx-1"></a>
</dd>
<dt id='index-b-1'><span>b<a class="copiable-anchor" style="visibility:
hidden; text-decoration: none; line-height: 0em" href='#index-b-1'>
¶</a></span></dt>
<dd><p>l–ine
@@ -4953,7 +4953,7 @@ kbd: <kbd class="kbd" style="font-style:
oblique">``simple-double--three---four-
`<!-- /@w -->`simple-double-<!-- /@w -->-three---four----'<!-- /@w -->'
-<a class="index-entry-anchor" id="index-_002d_002doption-1"></a><a
class="index-entry-anchor" id="index-_0060_0060-1"></a><a
class="index-entry-anchor" id="index-_0060_0060-3"></a><a
class="index-entry-anchor" id="index-_002d_002dfoption-1"></a>
+<a class="index-entry-id" id="index-_002d_002doption-1"></a><a
class="index-entry-id" id="index-_0060_0060-1"></a><a class="index-entry-id"
id="index-_0060_0060-3"></a><a class="index-entry-id"
id="index-_002d_002dfoption-1"></a>
@"u ü
@"{U} Ü
@~n ñ
@@ -5351,7 +5351,7 @@ error→ → - ∗ -| ⇒
<pre class="example-preformatted">
</pre><ul class="itemize" style="list-style-type: '\2022 a\2013 n itemize
line'">
-<li><pre class="example-preformatted"><a class="index-entry-anchor"
id="index-index-entry-within-itemize-1"></a>i--tem 1
+<li><pre class="example-preformatted"><a class="index-entry-id"
id="index-index-entry-within-itemize-1"></a>i--tem 1
</pre></li><li><pre class="example-preformatted">i--tem 2
</pre></li></ul>
<pre class="example-preformatted">
@@ -5400,7 +5400,7 @@ error→ → - ∗ -| ⇒
<thead><tr><th width="40%"><pre class="example-preformatted">mu--ltitable
headitem</pre></th><th width="60%"><pre class="example-preformatted">another
tab</pre></th></tr></thead>
<tbody><tr><td width="40%"><pre class="example-preformatted">mu--ltitable
item</pre></td><td width="60%"><pre class="example-preformatted">multitable
tab</pre></td></tr>
<tr><td width="40%"><pre class="example-preformatted">mu--ltitable item
2</pre></td><td width="60%"><pre class="example-preformatted">multitable tab 2
-<a class="index-entry-anchor"
id="index-index-entry-within-multitable-1"></a></pre></td></tr>
+<a class="index-entry-id"
id="index-index-entry-within-multitable-1"></a></pre></td></tr>
<tr><td width="40%"><pre class="example-preformatted">lone mu--ltitable
item</pre></td></tr>
</tbody>
</table>
@@ -5523,7 +5523,7 @@ f(x) = {1 \over \sigma \sqrt{2\pi}}e<sup class="sup">-{1
\over 2}\left({x-\mu \o
<pre class="example-preformatted">
</pre><dl class="first-deffn">
<dt class="deffn" id="index-i-2"><span class="category-def">fset:
</span><span><strong class="strong"><var class="var">i</var></strong> <em
class="emph">a g</em><a class="copiable-anchor" style="visibility: hidden;
text-decoration: none; line-height: 0em" href='#index-i-2'>
¶</a></span></dt>
-<dd><pre class="example-preformatted"><a class="index-entry-anchor"
id="index-index-entry-within-deffn-1"></a></pre></dd><dt class="deffnx
def-cmd-deffn" id="index-truc-2"><span class="category-def">cmde:
</span><span><strong class="strong">truc</strong> <em class="emph"></em><a
class="copiable-anchor" style="visibility: hidden; text-decoration: none;
line-height: 0em" href='#index-truc-2'> ¶</a></span></dt>
+<dd><pre class="example-preformatted"><a class="index-entry-id"
id="index-index-entry-within-deffn-1"></a></pre></dd><dt class="deffnx
def-cmd-deffn" id="index-truc-2"><span class="category-def">cmde:
</span><span><strong class="strong">truc</strong> <em class="emph"></em><a
class="copiable-anchor" style="visibility: hidden; text-decoration: none;
line-height: 0em" href='#index-truc-2'> ¶</a></span></dt>
<dt class="deffnx def-cmd-deffn" id="index-log-trap-1"><span
class="category-def">Command: </span><span><strong class="strong">log
trap</strong> <em class="emph"></em><a class="copiable-anchor"
style="visibility: hidden; text-decoration: none; line-height: 0em"
href='#index-log-trap-1'> ¶</a></span></dt>
<dt class="deffnx def-cmd-deffn" id="index-log-trap1-1"><span
class="category-def">Command: </span><span><strong class="strong">log
trap1</strong> <em class="emph"></em><a class="copiable-anchor"
style="visibility: hidden; text-decoration: none; line-height: 0em"
href='#index-log-trap1-1'> ¶</a></span></dt>
<dt class="deffnx def-cmd-deffn" id="index-log-trap2-1"><span
class="category-def">Command: </span><span><strong class="strong">log
trap2</strong> <em class="emph"></em><a class="copiable-anchor"
style="visibility: hidden; text-decoration: none; line-height: 0em"
href='#index-log-trap2-1'> ¶</a></span></dt>
@@ -5867,7 +5867,7 @@ ref</a>
</pre><dl class="ftable">
<dt id='index-a-5'><span><tt><em class="emph">a</em></tt><a
class="copiable-anchor" style="visibility: hidden; text-decoration: none;
line-height: 0em" href='#index-a-5'> ¶</a></span></dt>
-<dd><pre class="example-preformatted"><a class="index-entry-anchor"
id="index-index-entry-between-item-and-itemx-2"></a></pre></dd>
+<dd><pre class="example-preformatted"><a class="index-entry-id"
id="index-index-entry-between-item-and-itemx-2"></a></pre></dd>
<dt id='index-b-2'><span><tt><em class="emph">b</em></tt><a
class="copiable-anchor" style="visibility: hidden; text-decoration: none;
line-height: 0em" href='#index-b-2'> ¶</a></span></dt>
<dd><pre class="example-preformatted">l--ine
</pre></dd>
@@ -6033,7 +6033,7 @@ Invalid use of @':
</pre><dl class="ftable">
<dt id='index-a-6'><span><tt>a</tt><a class="copiable-anchor"
style="visibility: hidden; text-decoration: none; line-height: 0em"
href='#index-a-6'> ¶</a></span></dt>
-<dd><pre class="example-preformatted"><a class="index-entry-anchor"
id="index-index-entry-between-item-and-itemx-3"></a></pre></dd>
+<dd><pre class="example-preformatted"><a class="index-entry-id"
id="index-index-entry-between-item-and-itemx-3"></a></pre></dd>
<dt id='index-b-3'><span><tt>b</tt><a class="copiable-anchor"
style="visibility: hidden; text-decoration: none; line-height: 0em"
href='#index-b-3'> ¶</a></span></dt>
<dd><pre class="example-preformatted">l--ine
</pre></dd>
@@ -6092,38 +6092,38 @@ Invalid use of @':
</pre></div>
-<a class="index-entry-anchor" id="index-t_002d_002druc"></a>
-<a class="index-entry-anchor" id="index-T_002d_002druc"></a>
-<a class="index-entry-anchor" id="index-_002e"></a>
-<a class="index-entry-anchor" id="index-_003f"></a>
-<a class="index-entry-anchor" id="index-a"></a>
-<a class="index-entry-anchor" id="index-t_002d_002druc-1"></a>
-<a class="index-entry-anchor" id="index-T_002d_002druc-1"></a>
-<a class="index-entry-anchor" id="index-_002e-1"></a>
-<a class="index-entry-anchor" id="index-_003f-1"></a>
-<a class="index-entry-anchor" id="index-a-7"></a>
+<a class="index-entry-id" id="index-t_002d_002druc"></a>
+<a class="index-entry-id" id="index-T_002d_002druc"></a>
+<a class="index-entry-id" id="index-_002e"></a>
+<a class="index-entry-id" id="index-_003f"></a>
+<a class="index-entry-id" id="index-a"></a>
+<a class="index-entry-id" id="index-t_002d_002druc-1"></a>
+<a class="index-entry-id" id="index-T_002d_002druc-1"></a>
+<a class="index-entry-id" id="index-_002e-1"></a>
+<a class="index-entry-id" id="index-_003f-1"></a>
+<a class="index-entry-id" id="index-a-7"></a>
-<a class="index-entry-anchor" id="index-a_002d_002d_002da"></a>
-<a class="index-entry-anchor" id="index-b_002d_002d_002db"></a>
-<a class="index-entry-anchor" id="index-d_002d_002d_002ddd"></a>
-<a class="index-entry-anchor" id="index-g_002d_002d_002dgg"></a>
+<a class="index-entry-id" id="index-a_002d_002d_002da"></a>
+<a class="index-entry-id" id="index-b_002d_002d_002db"></a>
+<a class="index-entry-id" id="index-d_002d_002d_002ddd"></a>
+<a class="index-entry-id" id="index-g_002d_002d_002dgg"></a>
-<a class="index-entry-anchor" id="index-f_002d_002d_002daa"></a>
-<a class="index-entry-anchor" id="index-f_002d_002d_002dbb"></a>
-<a class="index-entry-anchor" id="index-f_002d_002d_002dddd"></a>
-<a class="index-entry-anchor" id="index-f_002d_002d_002dggg"></a>
+<a class="index-entry-id" id="index-f_002d_002d_002daa"></a>
+<a class="index-entry-id" id="index-f_002d_002d_002dbb"></a>
+<a class="index-entry-id" id="index-f_002d_002d_002dddd"></a>
+<a class="index-entry-id" id="index-f_002d_002d_002dggg"></a>
-<a class="index-entry-anchor" id="index-aaa"></a>
+<a class="index-entry-id" id="index-aaa"></a>
-<a class="index-entry-anchor" id="index-xxx"></a>
+<a class="index-entry-id" id="index-xxx"></a>
-<a class="index-entry-anchor" id="index-"></a>
+<a class="index-entry-id" id="index-"></a>
-<a class="index-entry-anchor"
id="index-a-index_002d_002d_002dentry-te-_002d_002d_002d-i"></a>
+<a class="index-entry-id"
id="index-a-index_002d_002d_002dentry-te-_002d_002d_002d-i"></a>
-<a class="index-entry-anchor" id="index-truc-4"></a>
+<a class="index-entry-id" id="index-truc-4"></a>
<p>Text<a class="footnote" id="DOCF9" href="#FOOT9"><sup>11</sup></a>
@@ -7418,13 +7418,13 @@ Menu comment
<p>in footnote2</p>
<h5><a id="FOOT9" href="#DOCF9">(11)</a></h5>
<p>in footnote
-<a class="index-entry-anchor" id="index-index-entry-in-footnote"></a>
+<a class="index-entry-id" id="index-index-entry-in-footnote"></a>
</p>
<p>Blah
</p>
<p>Blih
</p>
-<a class="index-entry-anchor" id="index-counting-entry"></a>
+<a class="index-entry-id" id="index-counting-entry"></a>
<h5><a id="FOOT10" href="#DOCF10">(12)</a></h5>
<p>in footnote</p>
</div><hr>
diff --git a/tp/tests/layout/res_parser/formatting_mathjax/formatting.html
b/tp/tests/layout/res_parser/formatting_mathjax/formatting.html
index 6b4436d94c..2761256c86 100644
--- a/tp/tests/layout/res_parser/formatting_mathjax/formatting.html
+++ b/tp/tests/layout/res_parser/formatting_mathjax/formatting.html
@@ -863,10 +863,10 @@ kbd: <kbd
class="kbd">``simple-double--three---four----''</kbd> <br>
</p>
<p>‘<!-- /@w -->‘simple-double-<!-- /@w
-->-three—four—-’<!-- /@w -->’<br>
</p>
-<a class="index-entry-anchor" id="index-titlepage-_002d_002doption"></a>
-<a class="index-entry-anchor" id="index-titlepage-_0060_0060"></a>
-<a class="index-entry-anchor" id="index-titlepage-_0060_0060-1"></a>
-<a class="index-entry-anchor" id="index-titlepage-_002d_002dfoption"></a>
+<a class="index-entry-id" id="index-titlepage-_002d_002doption"></a>
+<a class="index-entry-id" id="index-titlepage-_0060_0060"></a>
+<a class="index-entry-id" id="index-titlepage-_0060_0060-1"></a>
+<a class="index-entry-id" id="index-titlepage-_002d_002dfoption"></a>
<p>@"u ü
@"{U} Ü
@@ -1226,7 +1226,7 @@ error→ → - ∗ -| ⇒
</li></ul>
<ul class="itemize" style="list-style-type: '\2022 a\2013 n itemize line'">
-<li><a class="index-entry-anchor"
id="index-titlepage-index-entry-within-itemize"></a>
+<li><a class="index-entry-id"
id="index-titlepage-index-entry-within-itemize"></a>
i–tem 1
</li><li>i–tem 2
</li></ul>
@@ -1268,7 +1268,7 @@ i–tem 1
<thead><tr><th width="40%">mu–ltitable headitem</th><th
width="60%">another tab</th></tr></thead>
<tbody><tr><td width="40%">mu–ltitable item</td><td
width="60%">multitable tab</td></tr>
<tr><td width="40%">mu–ltitable item 2</td><td width="60%">multitable
tab 2
-<a class="index-entry-anchor"
id="index-titlepage-index-entry-within-multitable"></a></td></tr>
+<a class="index-entry-id"
id="index-titlepage-index-entry-within-multitable"></a></td></tr>
<tr><td width="40%">lone mu–ltitable item</td></tr>
</tbody>
</table>
@@ -1369,7 +1369,7 @@ f(x) = {1 \over \sigma \sqrt{2\pi}}e<sup class="sup">-{1
\over 2}\left({x-\mu \o
<dl class="first-deffn">
<dt class="deffn" id="index-titlepage-i"><span class="category-def">fset:
</span><span><strong class="strong"><var class="var">i</var></strong> <em
class="emph">a g</em><a class="copiable-anchor" href='#index-titlepage-i'>
¶</a></span></dt>
-<dd><a class="index-entry-anchor"
id="index-titlepage-index-entry-within-deffn"></a>
+<dd><a class="index-entry-id"
id="index-titlepage-index-entry-within-deffn"></a>
</dd><dt class="deffnx def-cmd-deffn" id="index-titlepage-truc"><span
class="category-def">cmde: </span><span><strong class="strong">truc</strong>
<em class="emph"></em><a class="copiable-anchor" href='#index-titlepage-truc'>
¶</a></span></dt>
<dt class="deffnx def-cmd-deffn" id="index-titlepage-log-trap"><span
class="category-def">Command: </span><span><strong class="strong">log
trap</strong> <em class="emph"></em><a class="copiable-anchor"
href='#index-titlepage-log-trap'> ¶</a></span></dt>
<dt class="deffnx def-cmd-deffn" id="index-titlepage-log-trap1"><span
class="category-def">Command: </span><span><strong class="strong">log
trap1</strong> <em class="emph"></em><a class="copiable-anchor"
href='#index-titlepage-log-trap1'> ¶</a></span></dt>
@@ -1662,7 +1662,7 @@ ref</a>
<dl class="ftable">
<dt id='index-titlepage-a-1'><span><em class="emph">a</em><a
class="copiable-anchor" href='#index-titlepage-a-1'> ¶</a></span></dt>
-<dd><a class="index-entry-anchor"
id="index-titlepage-index-entry-between-item-and-itemx"></a>
+<dd><a class="index-entry-id"
id="index-titlepage-index-entry-between-item-and-itemx"></a>
</dd>
<dt id='index-titlepage-b'><span><em class="emph">b</em><a
class="copiable-anchor" href='#index-titlepage-b'> ¶</a></span></dt>
<dd><p>l–ine
@@ -1804,7 +1804,7 @@ html ''
<dl class="ftable">
<dt id='index-titlepage-a-2'><span>a<a class="copiable-anchor"
href='#index-titlepage-a-2'> ¶</a></span></dt>
-<dd><a class="index-entry-anchor"
id="index-titlepage-index-entry-between-item-and-itemx-1"></a>
+<dd><a class="index-entry-id"
id="index-titlepage-index-entry-between-item-and-itemx-1"></a>
</dd>
<dt id='index-titlepage-b-1'><span>b<a class="copiable-anchor"
href='#index-titlepage-b-1'> ¶</a></span></dt>
<dd><p>l–ine
@@ -1879,10 +1879,10 @@ kbd: <kbd
class="kbd">``simple-double--three---four----''</kbd> <br>
</p>
<p>‘<!-- /@w -->‘simple-double-<!-- /@w
-->-three—four—-’<!-- /@w -->’<br>
</p>
-<a class="index-entry-anchor" id="index-copying-_002d_002doption"></a>
-<a class="index-entry-anchor" id="index-copying-_0060_0060"></a>
-<a class="index-entry-anchor" id="index-copying-_0060_0060-1"></a>
-<a class="index-entry-anchor" id="index-copying-_002d_002dfoption"></a>
+<a class="index-entry-id" id="index-copying-_002d_002doption"></a>
+<a class="index-entry-id" id="index-copying-_0060_0060"></a>
+<a class="index-entry-id" id="index-copying-_0060_0060-1"></a>
+<a class="index-entry-id" id="index-copying-_002d_002dfoption"></a>
<p>@"u ü
@"{U} Ü
@@ -2241,7 +2241,7 @@ error→ → - ∗ -| ⇒
</li></ul>
<ul class="itemize" style="list-style-type: '\2022 a\2013 n itemize line'">
-<li><a class="index-entry-anchor"
id="index-copying-index-entry-within-itemize"></a>
+<li><a class="index-entry-id"
id="index-copying-index-entry-within-itemize"></a>
i–tem 1
</li><li>i–tem 2
</li></ul>
@@ -2283,7 +2283,7 @@ i–tem 1
<thead><tr><th width="40%">mu–ltitable headitem</th><th
width="60%">another tab</th></tr></thead>
<tbody><tr><td width="40%">mu–ltitable item</td><td
width="60%">multitable tab</td></tr>
<tr><td width="40%">mu–ltitable item 2</td><td width="60%">multitable
tab 2
-<a class="index-entry-anchor"
id="index-copying-index-entry-within-multitable"></a></td></tr>
+<a class="index-entry-id"
id="index-copying-index-entry-within-multitable"></a></td></tr>
<tr><td width="40%">lone mu–ltitable item</td></tr>
</tbody>
</table>
@@ -2384,7 +2384,7 @@ f(x) = {1 \over \sigma \sqrt{2\pi}}e<sup class="sup">-{1
\over 2}\left({x-\mu \o
<dl class="first-deffn">
<dt class="deffn" id="index-copying-i"><span class="category-def">fset:
</span><span><strong class="strong"><var class="var">i</var></strong> <em
class="emph">a g</em><a class="copiable-anchor" href='#index-copying-i'>
¶</a></span></dt>
-<dd><a class="index-entry-anchor"
id="index-copying-index-entry-within-deffn"></a>
+<dd><a class="index-entry-id" id="index-copying-index-entry-within-deffn"></a>
</dd><dt class="deffnx def-cmd-deffn" id="index-copying-truc"><span
class="category-def">cmde: </span><span><strong class="strong">truc</strong>
<em class="emph"></em><a class="copiable-anchor" href='#index-copying-truc'>
¶</a></span></dt>
<dt class="deffnx def-cmd-deffn" id="index-copying-log-trap"><span
class="category-def">Command: </span><span><strong class="strong">log
trap</strong> <em class="emph"></em><a class="copiable-anchor"
href='#index-copying-log-trap'> ¶</a></span></dt>
<dt class="deffnx def-cmd-deffn" id="index-copying-log-trap1"><span
class="category-def">Command: </span><span><strong class="strong">log
trap1</strong> <em class="emph"></em><a class="copiable-anchor"
href='#index-copying-log-trap1'> ¶</a></span></dt>
@@ -2677,7 +2677,7 @@ ref</a>
<dl class="ftable">
<dt id='index-copying-a-1'><span><em class="emph">a</em><a
class="copiable-anchor" href='#index-copying-a-1'> ¶</a></span></dt>
-<dd><a class="index-entry-anchor"
id="index-copying-index-entry-between-item-and-itemx"></a>
+<dd><a class="index-entry-id"
id="index-copying-index-entry-between-item-and-itemx"></a>
</dd>
<dt id='index-copying-b'><span><em class="emph">b</em><a
class="copiable-anchor" href='#index-copying-b'> ¶</a></span></dt>
<dd><p>l–ine
@@ -2819,7 +2819,7 @@ html ''
<dl class="ftable">
<dt id='index-copying-a-2'><span>a<a class="copiable-anchor"
href='#index-copying-a-2'> ¶</a></span></dt>
-<dd><a class="index-entry-anchor"
id="index-copying-index-entry-between-item-and-itemx-1"></a>
+<dd><a class="index-entry-id"
id="index-copying-index-entry-between-item-and-itemx-1"></a>
</dd>
<dt id='index-copying-b-1'><span>b<a class="copiable-anchor"
href='#index-copying-b-1'> ¶</a></span></dt>
<dd><p>l–ine
@@ -2950,10 +2950,10 @@ kbd: <kbd
class="kbd">``simple-double--three---four----''</kbd> <br>
</p>
<p>‘<!-- /@w -->‘simple-double-<!-- /@w
-->-three—four—-’<!-- /@w -->’<br>
</p>
-<a class="index-entry-anchor" id="index-copying-_002d_002doption"></a>
-<a class="index-entry-anchor" id="index-copying-_0060_0060"></a>
-<a class="index-entry-anchor" id="index-copying-_0060_0060-1"></a>
-<a class="index-entry-anchor" id="index-copying-_002d_002dfoption"></a>
+<a class="index-entry-id" id="index-copying-_002d_002doption"></a>
+<a class="index-entry-id" id="index-copying-_0060_0060"></a>
+<a class="index-entry-id" id="index-copying-_0060_0060-1"></a>
+<a class="index-entry-id" id="index-copying-_002d_002dfoption"></a>
<p>@"u ü
@"{U} Ü
@@ -3312,7 +3312,7 @@ error→ → - ∗ -| ⇒
</li></ul>
<ul class="itemize" style="list-style-type: '\2022 a\2013 n itemize line'">
-<li><a class="index-entry-anchor"
id="index-copying-index-entry-within-itemize"></a>
+<li><a class="index-entry-id"
id="index-copying-index-entry-within-itemize"></a>
i–tem 1
</li><li>i–tem 2
</li></ul>
@@ -3354,7 +3354,7 @@ i–tem 1
<thead><tr><th width="40%">mu–ltitable headitem</th><th
width="60%">another tab</th></tr></thead>
<tbody><tr><td width="40%">mu–ltitable item</td><td
width="60%">multitable tab</td></tr>
<tr><td width="40%">mu–ltitable item 2</td><td width="60%">multitable
tab 2
-<a class="index-entry-anchor"
id="index-copying-index-entry-within-multitable"></a></td></tr>
+<a class="index-entry-id"
id="index-copying-index-entry-within-multitable"></a></td></tr>
<tr><td width="40%">lone mu–ltitable item</td></tr>
</tbody>
</table>
@@ -3455,7 +3455,7 @@ f(x) = {1 \over \sigma \sqrt{2\pi}}e<sup class="sup">-{1
\over 2}\left({x-\mu \o
<dl class="first-deffn">
<dt class="deffn" id="index-copying-i"><span class="category-def">fset:
</span><span><strong class="strong"><var class="var">i</var></strong> <em
class="emph">a g</em><a class="copiable-anchor" href='#index-copying-i'>
¶</a></span></dt>
-<dd><a class="index-entry-anchor"
id="index-copying-index-entry-within-deffn"></a>
+<dd><a class="index-entry-id" id="index-copying-index-entry-within-deffn"></a>
</dd><dt class="deffnx def-cmd-deffn" id="index-copying-truc"><span
class="category-def">cmde: </span><span><strong class="strong">truc</strong>
<em class="emph"></em><a class="copiable-anchor" href='#index-copying-truc'>
¶</a></span></dt>
<dt class="deffnx def-cmd-deffn" id="index-copying-log-trap"><span
class="category-def">Command: </span><span><strong class="strong">log
trap</strong> <em class="emph"></em><a class="copiable-anchor"
href='#index-copying-log-trap'> ¶</a></span></dt>
<dt class="deffnx def-cmd-deffn" id="index-copying-log-trap1"><span
class="category-def">Command: </span><span><strong class="strong">log
trap1</strong> <em class="emph"></em><a class="copiable-anchor"
href='#index-copying-log-trap1'> ¶</a></span></dt>
@@ -3748,7 +3748,7 @@ ref</a>
<dl class="ftable">
<dt id='index-copying-a-1'><span><em class="emph">a</em><a
class="copiable-anchor" href='#index-copying-a-1'> ¶</a></span></dt>
-<dd><a class="index-entry-anchor"
id="index-copying-index-entry-between-item-and-itemx"></a>
+<dd><a class="index-entry-id"
id="index-copying-index-entry-between-item-and-itemx"></a>
</dd>
<dt id='index-copying-b'><span><em class="emph">b</em><a
class="copiable-anchor" href='#index-copying-b'> ¶</a></span></dt>
<dd><p>l–ine
@@ -3890,7 +3890,7 @@ html ''
<dl class="ftable">
<dt id='index-copying-a-2'><span>a<a class="copiable-anchor"
href='#index-copying-a-2'> ¶</a></span></dt>
-<dd><a class="index-entry-anchor"
id="index-copying-index-entry-between-item-and-itemx-1"></a>
+<dd><a class="index-entry-id"
id="index-copying-index-entry-between-item-and-itemx-1"></a>
</dd>
<dt id='index-copying-b-1'><span>b<a class="copiable-anchor"
href='#index-copying-b-1'> ¶</a></span></dt>
<dd><p>l–ine
@@ -3964,10 +3964,10 @@ kbd: <kbd
class="kbd">``simple-double--three---four----''</kbd> <br>
</p>
<p>‘<!-- /@w -->‘simple-double-<!-- /@w
-->-three—four—-’<!-- /@w -->’<br>
</p>
-<a class="index-entry-anchor" id="index-_002d_002doption"></a>
-<a class="index-entry-anchor" id="index-_0060_0060"></a>
-<a class="index-entry-anchor" id="index-_0060_0060-2"></a>
-<a class="index-entry-anchor" id="index-_002d_002dfoption"></a>
+<a class="index-entry-id" id="index-_002d_002doption"></a>
+<a class="index-entry-id" id="index-_0060_0060"></a>
+<a class="index-entry-id" id="index-_0060_0060-2"></a>
+<a class="index-entry-id" id="index-_002d_002dfoption"></a>
<p>@"u ü
@"{U} Ü
@@ -4326,7 +4326,7 @@ error→ → - ∗ -| ⇒
</li></ul>
<ul class="itemize" style="list-style-type: '\2022 a\2013 n itemize line'">
-<li><a class="index-entry-anchor" id="index-index-entry-within-itemize"></a>
+<li><a class="index-entry-id" id="index-index-entry-within-itemize"></a>
i–tem 1
</li><li>i–tem 2
</li></ul>
@@ -4368,7 +4368,7 @@ i–tem 1
<thead><tr><th width="40%">mu–ltitable headitem</th><th
width="60%">another tab</th></tr></thead>
<tbody><tr><td width="40%">mu–ltitable item</td><td
width="60%">multitable tab</td></tr>
<tr><td width="40%">mu–ltitable item 2</td><td width="60%">multitable
tab 2
-<a class="index-entry-anchor"
id="index-index-entry-within-multitable"></a></td></tr>
+<a class="index-entry-id"
id="index-index-entry-within-multitable"></a></td></tr>
<tr><td width="40%">lone mu–ltitable item</td></tr>
</tbody>
</table>
@@ -4469,7 +4469,7 @@ f(x) = {1 \over \sigma \sqrt{2\pi}}e<sup class="sup">-{1
\over 2}\left({x-\mu \o
<dl class="first-deffn">
<dt class="deffn" id="index-i"><span class="category-def">fset:
</span><span><strong class="strong"><var class="var">i</var></strong> <em
class="emph">a g</em><a class="copiable-anchor" href='#index-i'>
¶</a></span></dt>
-<dd><a class="index-entry-anchor" id="index-index-entry-within-deffn"></a>
+<dd><a class="index-entry-id" id="index-index-entry-within-deffn"></a>
</dd><dt class="deffnx def-cmd-deffn" id="index-truc"><span
class="category-def">cmde: </span><span><strong class="strong">truc</strong>
<em class="emph"></em><a class="copiable-anchor" href='#index-truc'>
¶</a></span></dt>
<dt class="deffnx def-cmd-deffn" id="index-log-trap"><span
class="category-def">Command: </span><span><strong class="strong">log
trap</strong> <em class="emph"></em><a class="copiable-anchor"
href='#index-log-trap'> ¶</a></span></dt>
<dt class="deffnx def-cmd-deffn" id="index-log-trap1"><span
class="category-def">Command: </span><span><strong class="strong">log
trap1</strong> <em class="emph"></em><a class="copiable-anchor"
href='#index-log-trap1'> ¶</a></span></dt>
@@ -4762,7 +4762,7 @@ ref</a>
<dl class="ftable">
<dt id='index-a-2'><span><em class="emph">a</em><a class="copiable-anchor"
href='#index-a-2'> ¶</a></span></dt>
-<dd><a class="index-entry-anchor"
id="index-index-entry-between-item-and-itemx"></a>
+<dd><a class="index-entry-id"
id="index-index-entry-between-item-and-itemx"></a>
</dd>
<dt id='index-b'><span><em class="emph">b</em><a class="copiable-anchor"
href='#index-b'> ¶</a></span></dt>
<dd><p>l–ine
@@ -4904,7 +4904,7 @@ html ''
<dl class="ftable">
<dt id='index-a-3'><span>a<a class="copiable-anchor" href='#index-a-3'>
¶</a></span></dt>
-<dd><a class="index-entry-anchor"
id="index-index-entry-between-item-and-itemx-1"></a>
+<dd><a class="index-entry-id"
id="index-index-entry-between-item-and-itemx-1"></a>
</dd>
<dt id='index-b-1'><span>b<a class="copiable-anchor" href='#index-b-1'>
¶</a></span></dt>
<dd><p>l–ine
@@ -4986,7 +4986,7 @@ kbd: <kbd
class="kbd">``simple-double--three---four----''</kbd>
`<!-- /@w -->`simple-double-<!-- /@w -->-three---four----'<!-- /@w -->'
-<a class="index-entry-anchor" id="index-_002d_002doption-1"></a><a
class="index-entry-anchor" id="index-_0060_0060-1"></a><a
class="index-entry-anchor" id="index-_0060_0060-3"></a><a
class="index-entry-anchor" id="index-_002d_002dfoption-1"></a>
+<a class="index-entry-id" id="index-_002d_002doption-1"></a><a
class="index-entry-id" id="index-_0060_0060-1"></a><a class="index-entry-id"
id="index-_0060_0060-3"></a><a class="index-entry-id"
id="index-_002d_002dfoption-1"></a>
@"u ü
@"{U} Ü
@~n ñ
@@ -5384,7 +5384,7 @@ error→ → - ∗ -| ⇒
<pre class="example-preformatted">
</pre><ul class="itemize" style="list-style-type: '\2022 a\2013 n itemize
line'">
-<li><pre class="example-preformatted"><a class="index-entry-anchor"
id="index-index-entry-within-itemize-1"></a>i--tem 1
+<li><pre class="example-preformatted"><a class="index-entry-id"
id="index-index-entry-within-itemize-1"></a>i--tem 1
</pre></li><li><pre class="example-preformatted">i--tem 2
</pre></li></ul>
<pre class="example-preformatted">
@@ -5433,7 +5433,7 @@ error→ → - ∗ -| ⇒
<thead><tr><th width="40%"><pre class="example-preformatted">mu--ltitable
headitem</pre></th><th width="60%"><pre class="example-preformatted">another
tab</pre></th></tr></thead>
<tbody><tr><td width="40%"><pre class="example-preformatted">mu--ltitable
item</pre></td><td width="60%"><pre class="example-preformatted">multitable
tab</pre></td></tr>
<tr><td width="40%"><pre class="example-preformatted">mu--ltitable item
2</pre></td><td width="60%"><pre class="example-preformatted">multitable tab 2
-<a class="index-entry-anchor"
id="index-index-entry-within-multitable-1"></a></pre></td></tr>
+<a class="index-entry-id"
id="index-index-entry-within-multitable-1"></a></pre></td></tr>
<tr><td width="40%"><pre class="example-preformatted">lone mu--ltitable
item</pre></td></tr>
</tbody>
</table>
@@ -5556,7 +5556,7 @@ f(x) = {1 \over \sigma \sqrt{2\pi}}e<sup class="sup">-{1
\over 2}\left({x-\mu \o
<pre class="example-preformatted">
</pre><dl class="first-deffn">
<dt class="deffn" id="index-i-2"><span class="category-def">fset:
</span><span><strong class="strong"><var class="var">i</var></strong> <em
class="emph">a g</em><a class="copiable-anchor" href='#index-i-2'>
¶</a></span></dt>
-<dd><pre class="example-preformatted"><a class="index-entry-anchor"
id="index-index-entry-within-deffn-1"></a></pre></dd><dt class="deffnx
def-cmd-deffn" id="index-truc-2"><span class="category-def">cmde:
</span><span><strong class="strong">truc</strong> <em class="emph"></em><a
class="copiable-anchor" href='#index-truc-2'> ¶</a></span></dt>
+<dd><pre class="example-preformatted"><a class="index-entry-id"
id="index-index-entry-within-deffn-1"></a></pre></dd><dt class="deffnx
def-cmd-deffn" id="index-truc-2"><span class="category-def">cmde:
</span><span><strong class="strong">truc</strong> <em class="emph"></em><a
class="copiable-anchor" href='#index-truc-2'> ¶</a></span></dt>
<dt class="deffnx def-cmd-deffn" id="index-log-trap-1"><span
class="category-def">Command: </span><span><strong class="strong">log
trap</strong> <em class="emph"></em><a class="copiable-anchor"
href='#index-log-trap-1'> ¶</a></span></dt>
<dt class="deffnx def-cmd-deffn" id="index-log-trap1-1"><span
class="category-def">Command: </span><span><strong class="strong">log
trap1</strong> <em class="emph"></em><a class="copiable-anchor"
href='#index-log-trap1-1'> ¶</a></span></dt>
<dt class="deffnx def-cmd-deffn" id="index-log-trap2-1"><span
class="category-def">Command: </span><span><strong class="strong">log
trap2</strong> <em class="emph"></em><a class="copiable-anchor"
href='#index-log-trap2-1'> ¶</a></span></dt>
@@ -5900,7 +5900,7 @@ ref</a>
</pre><dl class="ftable">
<dt id='index-a-5'><span><tt><em class="emph">a</em></tt><a
class="copiable-anchor" href='#index-a-5'> ¶</a></span></dt>
-<dd><pre class="example-preformatted"><a class="index-entry-anchor"
id="index-index-entry-between-item-and-itemx-2"></a></pre></dd>
+<dd><pre class="example-preformatted"><a class="index-entry-id"
id="index-index-entry-between-item-and-itemx-2"></a></pre></dd>
<dt id='index-b-2'><span><tt><em class="emph">b</em></tt><a
class="copiable-anchor" href='#index-b-2'> ¶</a></span></dt>
<dd><pre class="example-preformatted">l--ine
</pre></dd>
@@ -6066,7 +6066,7 @@ Invalid use of @':
</pre><dl class="ftable">
<dt id='index-a-6'><span><tt>a</tt><a class="copiable-anchor"
href='#index-a-6'> ¶</a></span></dt>
-<dd><pre class="example-preformatted"><a class="index-entry-anchor"
id="index-index-entry-between-item-and-itemx-3"></a></pre></dd>
+<dd><pre class="example-preformatted"><a class="index-entry-id"
id="index-index-entry-between-item-and-itemx-3"></a></pre></dd>
<dt id='index-b-3'><span><tt>b</tt><a class="copiable-anchor"
href='#index-b-3'> ¶</a></span></dt>
<dd><pre class="example-preformatted">l--ine
</pre></dd>
@@ -6125,38 +6125,38 @@ Invalid use of @':
</pre></div>
-<a class="index-entry-anchor" id="index-t_002d_002druc"></a>
-<a class="index-entry-anchor" id="index-T_002d_002druc"></a>
-<a class="index-entry-anchor" id="index-_002e"></a>
-<a class="index-entry-anchor" id="index-_003f"></a>
-<a class="index-entry-anchor" id="index-a"></a>
-<a class="index-entry-anchor" id="index-t_002d_002druc-1"></a>
-<a class="index-entry-anchor" id="index-T_002d_002druc-1"></a>
-<a class="index-entry-anchor" id="index-_002e-1"></a>
-<a class="index-entry-anchor" id="index-_003f-1"></a>
-<a class="index-entry-anchor" id="index-a-7"></a>
+<a class="index-entry-id" id="index-t_002d_002druc"></a>
+<a class="index-entry-id" id="index-T_002d_002druc"></a>
+<a class="index-entry-id" id="index-_002e"></a>
+<a class="index-entry-id" id="index-_003f"></a>
+<a class="index-entry-id" id="index-a"></a>
+<a class="index-entry-id" id="index-t_002d_002druc-1"></a>
+<a class="index-entry-id" id="index-T_002d_002druc-1"></a>
+<a class="index-entry-id" id="index-_002e-1"></a>
+<a class="index-entry-id" id="index-_003f-1"></a>
+<a class="index-entry-id" id="index-a-7"></a>
-<a class="index-entry-anchor" id="index-a_002d_002d_002da"></a>
-<a class="index-entry-anchor" id="index-b_002d_002d_002db"></a>
-<a class="index-entry-anchor" id="index-d_002d_002d_002ddd"></a>
-<a class="index-entry-anchor" id="index-g_002d_002d_002dgg"></a>
+<a class="index-entry-id" id="index-a_002d_002d_002da"></a>
+<a class="index-entry-id" id="index-b_002d_002d_002db"></a>
+<a class="index-entry-id" id="index-d_002d_002d_002ddd"></a>
+<a class="index-entry-id" id="index-g_002d_002d_002dgg"></a>
-<a class="index-entry-anchor" id="index-f_002d_002d_002daa"></a>
-<a class="index-entry-anchor" id="index-f_002d_002d_002dbb"></a>
-<a class="index-entry-anchor" id="index-f_002d_002d_002dddd"></a>
-<a class="index-entry-anchor" id="index-f_002d_002d_002dggg"></a>
+<a class="index-entry-id" id="index-f_002d_002d_002daa"></a>
+<a class="index-entry-id" id="index-f_002d_002d_002dbb"></a>
+<a class="index-entry-id" id="index-f_002d_002d_002dddd"></a>
+<a class="index-entry-id" id="index-f_002d_002d_002dggg"></a>
-<a class="index-entry-anchor" id="index-aaa"></a>
+<a class="index-entry-id" id="index-aaa"></a>
-<a class="index-entry-anchor" id="index-xxx"></a>
+<a class="index-entry-id" id="index-xxx"></a>
-<a class="index-entry-anchor" id="index-"></a>
+<a class="index-entry-id" id="index-"></a>
-<a class="index-entry-anchor"
id="index-a-index_002d_002d_002dentry-te-_002d_002d_002d-i"></a>
+<a class="index-entry-id"
id="index-a-index_002d_002d_002dentry-te-_002d_002d_002d-i"></a>
-<a class="index-entry-anchor" id="index-truc-4"></a>
+<a class="index-entry-id" id="index-truc-4"></a>
<p>Text<a class="footnote" id="DOCF9" href="#FOOT9"><sup>11</sup></a>
@@ -7451,13 +7451,13 @@ Menu comment
<p>in footnote2</p>
<h5><a id="FOOT9" href="#DOCF9">(11)</a></h5>
<p>in footnote
-<a class="index-entry-anchor" id="index-index-entry-in-footnote"></a>
+<a class="index-entry-id" id="index-index-entry-in-footnote"></a>
</p>
<p>Blah
</p>
<p>Blih
</p>
-<a class="index-entry-anchor" id="index-counting-entry"></a>
+<a class="index-entry-id" id="index-counting-entry"></a>
<h5><a id="FOOT10" href="#DOCF10">(12)</a></h5>
<p>in footnote</p>
</div><hr>
diff --git a/tp/tests/layout/res_parser/formatting_nodes/chapter.html
b/tp/tests/layout/res_parser/formatting_nodes/chapter.html
index dc0509575d..1ae29ebf36 100644
--- a/tp/tests/layout/res_parser/formatting_nodes/chapter.html
+++ b/tp/tests/layout/res_parser/formatting_nodes/chapter.html
@@ -874,10 +874,10 @@ kbd: <kbd
class="kbd">``simple-double--three---four----''</kbd> <br>
</p>
<p>‘<!-- /@w -->‘simple-double-<!-- /@w
-->-three—four—-’<!-- /@w -->’<br>
</p>
-<a class="index-entry-anchor" id="index-copying-_002d_002doption"></a>
-<a class="index-entry-anchor" id="index-copying-_0060_0060"></a>
-<a class="index-entry-anchor" id="index-copying-_0060_0060-1"></a>
-<a class="index-entry-anchor" id="index-copying-_002d_002dfoption"></a>
+<a class="index-entry-id" id="index-copying-_002d_002doption"></a>
+<a class="index-entry-id" id="index-copying-_0060_0060"></a>
+<a class="index-entry-id" id="index-copying-_0060_0060-1"></a>
+<a class="index-entry-id" id="index-copying-_002d_002dfoption"></a>
<p>@"u ü
@"{U} Ü
@@ -1236,7 +1236,7 @@ error→ → - ∗ -| ⇒
</li></ul>
<ul class="itemize" style="list-style-type: '\2022 a\2013 n itemize line'">
-<li><a class="index-entry-anchor"
id="index-copying-index-entry-within-itemize"></a>
+<li><a class="index-entry-id"
id="index-copying-index-entry-within-itemize"></a>
i–tem 1
</li><li>i–tem 2
</li></ul>
@@ -1278,7 +1278,7 @@ i–tem 1
<thead><tr><th width="40%">mu–ltitable headitem</th><th
width="60%">another tab</th></tr></thead>
<tbody><tr><td width="40%">mu–ltitable item</td><td
width="60%">multitable tab</td></tr>
<tr><td width="40%">mu–ltitable item 2</td><td width="60%">multitable
tab 2
-<a class="index-entry-anchor"
id="index-copying-index-entry-within-multitable"></a></td></tr>
+<a class="index-entry-id"
id="index-copying-index-entry-within-multitable"></a></td></tr>
<tr><td width="40%">lone mu–ltitable item</td></tr>
</tbody>
</table>
@@ -1379,7 +1379,7 @@ f(x) = {1 \over \sigma \sqrt{2\pi}}e<sup class="sup">-{1
\over 2}\left({x-\mu \o
<dl class="first-deffn">
<dt class="deffn" id="index-copying-i"><span class="category-def">fset:
</span><span><strong class="strong"><var class="var">i</var></strong> <em
class="emph">a g</em><a class="copiable-anchor" href='#index-copying-i'>
¶</a></span></dt>
-<dd><a class="index-entry-anchor"
id="index-copying-index-entry-within-deffn"></a>
+<dd><a class="index-entry-id" id="index-copying-index-entry-within-deffn"></a>
</dd><dt class="deffnx def-cmd-deffn" id="index-copying-truc"><span
class="category-def">cmde: </span><span><strong class="strong">truc</strong>
<em class="emph"></em><a class="copiable-anchor" href='#index-copying-truc'>
¶</a></span></dt>
<dt class="deffnx def-cmd-deffn" id="index-copying-log-trap"><span
class="category-def">Command: </span><span><strong class="strong">log
trap</strong> <em class="emph"></em><a class="copiable-anchor"
href='#index-copying-log-trap'> ¶</a></span></dt>
<dt class="deffnx def-cmd-deffn" id="index-copying-log-trap1"><span
class="category-def">Command: </span><span><strong class="strong">log
trap1</strong> <em class="emph"></em><a class="copiable-anchor"
href='#index-copying-log-trap1'> ¶</a></span></dt>
@@ -1672,7 +1672,7 @@ ref</a>
<dl class="ftable">
<dt id='index-copying-a-1'><span><em class="emph">a</em><a
class="copiable-anchor" href='#index-copying-a-1'> ¶</a></span></dt>
-<dd><a class="index-entry-anchor"
id="index-copying-index-entry-between-item-and-itemx"></a>
+<dd><a class="index-entry-id"
id="index-copying-index-entry-between-item-and-itemx"></a>
</dd>
<dt id='index-copying-b'><span><em class="emph">b</em><a
class="copiable-anchor" href='#index-copying-b'> ¶</a></span></dt>
<dd><p>l–ine
@@ -1814,7 +1814,7 @@ html ''
<dl class="ftable">
<dt id='index-copying-a-2'><span>a<a class="copiable-anchor"
href='#index-copying-a-2'> ¶</a></span></dt>
-<dd><a class="index-entry-anchor"
id="index-copying-index-entry-between-item-and-itemx-1"></a>
+<dd><a class="index-entry-id"
id="index-copying-index-entry-between-item-and-itemx-1"></a>
</dd>
<dt id='index-copying-b-1'><span>b<a class="copiable-anchor"
href='#index-copying-b-1'> ¶</a></span></dt>
<dd><p>l–ine
@@ -1888,10 +1888,10 @@ kbd: <kbd
class="kbd">``simple-double--three---four----''</kbd> <br>
</p>
<p>‘<!-- /@w -->‘simple-double-<!-- /@w
-->-three—four—-’<!-- /@w -->’<br>
</p>
-<a class="index-entry-anchor" id="index-_002d_002doption"></a>
-<a class="index-entry-anchor" id="index-_0060_0060"></a>
-<a class="index-entry-anchor" id="index-_0060_0060-2"></a>
-<a class="index-entry-anchor" id="index-_002d_002dfoption"></a>
+<a class="index-entry-id" id="index-_002d_002doption"></a>
+<a class="index-entry-id" id="index-_0060_0060"></a>
+<a class="index-entry-id" id="index-_0060_0060-2"></a>
+<a class="index-entry-id" id="index-_002d_002dfoption"></a>
<p>@"u ü
@"{U} Ü
@@ -2250,7 +2250,7 @@ error→ → - ∗ -| ⇒
</li></ul>
<ul class="itemize" style="list-style-type: '\2022 a\2013 n itemize line'">
-<li><a class="index-entry-anchor" id="index-index-entry-within-itemize"></a>
+<li><a class="index-entry-id" id="index-index-entry-within-itemize"></a>
i–tem 1
</li><li>i–tem 2
</li></ul>
@@ -2292,7 +2292,7 @@ i–tem 1
<thead><tr><th width="40%">mu–ltitable headitem</th><th
width="60%">another tab</th></tr></thead>
<tbody><tr><td width="40%">mu–ltitable item</td><td
width="60%">multitable tab</td></tr>
<tr><td width="40%">mu–ltitable item 2</td><td width="60%">multitable
tab 2
-<a class="index-entry-anchor"
id="index-index-entry-within-multitable"></a></td></tr>
+<a class="index-entry-id"
id="index-index-entry-within-multitable"></a></td></tr>
<tr><td width="40%">lone mu–ltitable item</td></tr>
</tbody>
</table>
@@ -2393,7 +2393,7 @@ f(x) = {1 \over \sigma \sqrt{2\pi}}e<sup class="sup">-{1
\over 2}\left({x-\mu \o
<dl class="first-deffn">
<dt class="deffn" id="index-i"><span class="category-def">fset:
</span><span><strong class="strong"><var class="var">i</var></strong> <em
class="emph">a g</em><a class="copiable-anchor" href='#index-i'>
¶</a></span></dt>
-<dd><a class="index-entry-anchor" id="index-index-entry-within-deffn"></a>
+<dd><a class="index-entry-id" id="index-index-entry-within-deffn"></a>
</dd><dt class="deffnx def-cmd-deffn" id="index-truc"><span
class="category-def">cmde: </span><span><strong class="strong">truc</strong>
<em class="emph"></em><a class="copiable-anchor" href='#index-truc'>
¶</a></span></dt>
<dt class="deffnx def-cmd-deffn" id="index-log-trap"><span
class="category-def">Command: </span><span><strong class="strong">log
trap</strong> <em class="emph"></em><a class="copiable-anchor"
href='#index-log-trap'> ¶</a></span></dt>
<dt class="deffnx def-cmd-deffn" id="index-log-trap1"><span
class="category-def">Command: </span><span><strong class="strong">log
trap1</strong> <em class="emph"></em><a class="copiable-anchor"
href='#index-log-trap1'> ¶</a></span></dt>
@@ -2686,7 +2686,7 @@ ref</a>
<dl class="ftable">
<dt id='index-a-2'><span><em class="emph">a</em><a class="copiable-anchor"
href='#index-a-2'> ¶</a></span></dt>
-<dd><a class="index-entry-anchor"
id="index-index-entry-between-item-and-itemx"></a>
+<dd><a class="index-entry-id"
id="index-index-entry-between-item-and-itemx"></a>
</dd>
<dt id='index-b'><span><em class="emph">b</em><a class="copiable-anchor"
href='#index-b'> ¶</a></span></dt>
<dd><p>l–ine
@@ -2828,7 +2828,7 @@ html ''
<dl class="ftable">
<dt id='index-a-3'><span>a<a class="copiable-anchor" href='#index-a-3'>
¶</a></span></dt>
-<dd><a class="index-entry-anchor"
id="index-index-entry-between-item-and-itemx-1"></a>
+<dd><a class="index-entry-id"
id="index-index-entry-between-item-and-itemx-1"></a>
</dd>
<dt id='index-b-1'><span>b<a class="copiable-anchor" href='#index-b-1'>
¶</a></span></dt>
<dd><p>l–ine
@@ -2910,7 +2910,7 @@ kbd: <kbd
class="kbd">``simple-double--three---four----''</kbd>
`<!-- /@w -->`simple-double-<!-- /@w -->-three---four----'<!-- /@w -->'
-<a class="index-entry-anchor" id="index-_002d_002doption-1"></a><a
class="index-entry-anchor" id="index-_0060_0060-1"></a><a
class="index-entry-anchor" id="index-_0060_0060-3"></a><a
class="index-entry-anchor" id="index-_002d_002dfoption-1"></a>
+<a class="index-entry-id" id="index-_002d_002doption-1"></a><a
class="index-entry-id" id="index-_0060_0060-1"></a><a class="index-entry-id"
id="index-_0060_0060-3"></a><a class="index-entry-id"
id="index-_002d_002dfoption-1"></a>
@"u ü
@"{U} Ü
@~n ñ
@@ -3308,7 +3308,7 @@ error→ → - ∗ -| ⇒
<pre class="example-preformatted">
</pre><ul class="itemize" style="list-style-type: '\2022 a\2013 n itemize
line'">
-<li><pre class="example-preformatted"><a class="index-entry-anchor"
id="index-index-entry-within-itemize-1"></a>i--tem 1
+<li><pre class="example-preformatted"><a class="index-entry-id"
id="index-index-entry-within-itemize-1"></a>i--tem 1
</pre></li><li><pre class="example-preformatted">i--tem 2
</pre></li></ul>
<pre class="example-preformatted">
@@ -3357,7 +3357,7 @@ error→ → - ∗ -| ⇒
<thead><tr><th width="40%"><pre class="example-preformatted">mu--ltitable
headitem</pre></th><th width="60%"><pre class="example-preformatted">another
tab</pre></th></tr></thead>
<tbody><tr><td width="40%"><pre class="example-preformatted">mu--ltitable
item</pre></td><td width="60%"><pre class="example-preformatted">multitable
tab</pre></td></tr>
<tr><td width="40%"><pre class="example-preformatted">mu--ltitable item
2</pre></td><td width="60%"><pre class="example-preformatted">multitable tab 2
-<a class="index-entry-anchor"
id="index-index-entry-within-multitable-1"></a></pre></td></tr>
+<a class="index-entry-id"
id="index-index-entry-within-multitable-1"></a></pre></td></tr>
<tr><td width="40%"><pre class="example-preformatted">lone mu--ltitable
item</pre></td></tr>
</tbody>
</table>
@@ -3480,7 +3480,7 @@ f(x) = {1 \over \sigma \sqrt{2\pi}}e<sup class="sup">-{1
\over 2}\left({x-\mu \o
<pre class="example-preformatted">
</pre><dl class="first-deffn">
<dt class="deffn" id="index-i-2"><span class="category-def">fset:
</span><span><strong class="strong"><var class="var">i</var></strong> <em
class="emph">a g</em><a class="copiable-anchor" href='#index-i-2'>
¶</a></span></dt>
-<dd><pre class="example-preformatted"><a class="index-entry-anchor"
id="index-index-entry-within-deffn-1"></a></pre></dd><dt class="deffnx
def-cmd-deffn" id="index-truc-2"><span class="category-def">cmde:
</span><span><strong class="strong">truc</strong> <em class="emph"></em><a
class="copiable-anchor" href='#index-truc-2'> ¶</a></span></dt>
+<dd><pre class="example-preformatted"><a class="index-entry-id"
id="index-index-entry-within-deffn-1"></a></pre></dd><dt class="deffnx
def-cmd-deffn" id="index-truc-2"><span class="category-def">cmde:
</span><span><strong class="strong">truc</strong> <em class="emph"></em><a
class="copiable-anchor" href='#index-truc-2'> ¶</a></span></dt>
<dt class="deffnx def-cmd-deffn" id="index-log-trap-1"><span
class="category-def">Command: </span><span><strong class="strong">log
trap</strong> <em class="emph"></em><a class="copiable-anchor"
href='#index-log-trap-1'> ¶</a></span></dt>
<dt class="deffnx def-cmd-deffn" id="index-log-trap1-1"><span
class="category-def">Command: </span><span><strong class="strong">log
trap1</strong> <em class="emph"></em><a class="copiable-anchor"
href='#index-log-trap1-1'> ¶</a></span></dt>
<dt class="deffnx def-cmd-deffn" id="index-log-trap2-1"><span
class="category-def">Command: </span><span><strong class="strong">log
trap2</strong> <em class="emph"></em><a class="copiable-anchor"
href='#index-log-trap2-1'> ¶</a></span></dt>
@@ -3824,7 +3824,7 @@ ref</a>
</pre><dl class="ftable">
<dt id='index-a-5'><span><tt><em class="emph">a</em></tt><a
class="copiable-anchor" href='#index-a-5'> ¶</a></span></dt>
-<dd><pre class="example-preformatted"><a class="index-entry-anchor"
id="index-index-entry-between-item-and-itemx-2"></a></pre></dd>
+<dd><pre class="example-preformatted"><a class="index-entry-id"
id="index-index-entry-between-item-and-itemx-2"></a></pre></dd>
<dt id='index-b-2'><span><tt><em class="emph">b</em></tt><a
class="copiable-anchor" href='#index-b-2'> ¶</a></span></dt>
<dd><pre class="example-preformatted">l--ine
</pre></dd>
@@ -3990,7 +3990,7 @@ Invalid use of @':
</pre><dl class="ftable">
<dt id='index-a-6'><span><tt>a</tt><a class="copiable-anchor"
href='#index-a-6'> ¶</a></span></dt>
-<dd><pre class="example-preformatted"><a class="index-entry-anchor"
id="index-index-entry-between-item-and-itemx-3"></a></pre></dd>
+<dd><pre class="example-preformatted"><a class="index-entry-id"
id="index-index-entry-between-item-and-itemx-3"></a></pre></dd>
<dt id='index-b-3'><span><tt>b</tt><a class="copiable-anchor"
href='#index-b-3'> ¶</a></span></dt>
<dd><pre class="example-preformatted">l--ine
</pre></dd>
@@ -4049,38 +4049,38 @@ Invalid use of @':
</pre></div>
-<a class="index-entry-anchor" id="index-t_002d_002druc"></a>
-<a class="index-entry-anchor" id="index-T_002d_002druc"></a>
-<a class="index-entry-anchor" id="index-_002e"></a>
-<a class="index-entry-anchor" id="index-_003f"></a>
-<a class="index-entry-anchor" id="index-a"></a>
-<a class="index-entry-anchor" id="index-t_002d_002druc-1"></a>
-<a class="index-entry-anchor" id="index-T_002d_002druc-1"></a>
-<a class="index-entry-anchor" id="index-_002e-1"></a>
-<a class="index-entry-anchor" id="index-_003f-1"></a>
-<a class="index-entry-anchor" id="index-a-7"></a>
+<a class="index-entry-id" id="index-t_002d_002druc"></a>
+<a class="index-entry-id" id="index-T_002d_002druc"></a>
+<a class="index-entry-id" id="index-_002e"></a>
+<a class="index-entry-id" id="index-_003f"></a>
+<a class="index-entry-id" id="index-a"></a>
+<a class="index-entry-id" id="index-t_002d_002druc-1"></a>
+<a class="index-entry-id" id="index-T_002d_002druc-1"></a>
+<a class="index-entry-id" id="index-_002e-1"></a>
+<a class="index-entry-id" id="index-_003f-1"></a>
+<a class="index-entry-id" id="index-a-7"></a>
-<a class="index-entry-anchor" id="index-a_002d_002d_002da"></a>
-<a class="index-entry-anchor" id="index-b_002d_002d_002db"></a>
-<a class="index-entry-anchor" id="index-d_002d_002d_002ddd"></a>
-<a class="index-entry-anchor" id="index-g_002d_002d_002dgg"></a>
+<a class="index-entry-id" id="index-a_002d_002d_002da"></a>
+<a class="index-entry-id" id="index-b_002d_002d_002db"></a>
+<a class="index-entry-id" id="index-d_002d_002d_002ddd"></a>
+<a class="index-entry-id" id="index-g_002d_002d_002dgg"></a>
-<a class="index-entry-anchor" id="index-f_002d_002d_002daa"></a>
-<a class="index-entry-anchor" id="index-f_002d_002d_002dbb"></a>
-<a class="index-entry-anchor" id="index-f_002d_002d_002dddd"></a>
-<a class="index-entry-anchor" id="index-f_002d_002d_002dggg"></a>
+<a class="index-entry-id" id="index-f_002d_002d_002daa"></a>
+<a class="index-entry-id" id="index-f_002d_002d_002dbb"></a>
+<a class="index-entry-id" id="index-f_002d_002d_002dddd"></a>
+<a class="index-entry-id" id="index-f_002d_002d_002dggg"></a>
-<a class="index-entry-anchor" id="index-aaa"></a>
+<a class="index-entry-id" id="index-aaa"></a>
-<a class="index-entry-anchor" id="index-xxx"></a>
+<a class="index-entry-id" id="index-xxx"></a>
-<a class="index-entry-anchor" id="index-"></a>
+<a class="index-entry-id" id="index-"></a>
-<a class="index-entry-anchor"
id="index-a-index_002d_002d_002dentry-te-_002d_002d_002d-i"></a>
+<a class="index-entry-id"
id="index-a-index_002d_002d_002dentry-te-_002d_002d_002d-i"></a>
-<a class="index-entry-anchor" id="index-truc-4"></a>
+<a class="index-entry-id" id="index-truc-4"></a>
<p>Text<a class="footnote" id="DOCF9"
href="formatting_fot.html#FOOT9"><sup>11</sup></a>
diff --git a/tp/tests/layout/res_parser/formatting_nodes/formatting_fot.html
b/tp/tests/layout/res_parser/formatting_nodes/formatting_fot.html
index bb90d71a65..9dee57e574 100644
--- a/tp/tests/layout/res_parser/formatting_nodes/formatting_fot.html
+++ b/tp/tests/layout/res_parser/formatting_nodes/formatting_fot.html
@@ -841,13 +841,13 @@ span.program-in-footer {font-size: smaller}
<p>in footnote2</p>
<h5><a id="FOOT9" href="chapter.html#DOCF9">(11)</a></h5>
<p>in footnote
-<a class="index-entry-anchor" id="index-index-entry-in-footnote"></a>
+<a class="index-entry-id" id="index-index-entry-in-footnote"></a>
</p>
<p>Blah
</p>
<p>Blih
</p>
-<a class="index-entry-anchor" id="index-counting-entry"></a>
+<a class="index-entry-id" id="index-counting-entry"></a>
<h5><a id="FOOT10" href="chapter.html#DOCF10">(12)</a></h5>
<p>in footnote</p>
</div><hr>
diff --git a/tp/tests/layout/res_parser/formatting_nodes/index.html
b/tp/tests/layout/res_parser/formatting_nodes/index.html
index 40dd1595b4..83aa1bb72b 100644
--- a/tp/tests/layout/res_parser/formatting_nodes/index.html
+++ b/tp/tests/layout/res_parser/formatting_nodes/index.html
@@ -849,10 +849,10 @@ kbd: <kbd
class="kbd">``simple-double--three---four----''</kbd> <br>
</p>
<p>‘<!-- /@w -->‘simple-double-<!-- /@w
-->-three—four—-’<!-- /@w -->’<br>
</p>
-<a class="index-entry-anchor" id="index-titlepage-_002d_002doption"></a>
-<a class="index-entry-anchor" id="index-titlepage-_0060_0060"></a>
-<a class="index-entry-anchor" id="index-titlepage-_0060_0060-1"></a>
-<a class="index-entry-anchor" id="index-titlepage-_002d_002dfoption"></a>
+<a class="index-entry-id" id="index-titlepage-_002d_002doption"></a>
+<a class="index-entry-id" id="index-titlepage-_0060_0060"></a>
+<a class="index-entry-id" id="index-titlepage-_0060_0060-1"></a>
+<a class="index-entry-id" id="index-titlepage-_002d_002dfoption"></a>
<p>@"u ü
@"{U} Ü
@@ -1212,7 +1212,7 @@ error→ → - ∗ -| ⇒
</li></ul>
<ul class="itemize" style="list-style-type: '\2022 a\2013 n itemize line'">
-<li><a class="index-entry-anchor"
id="index-titlepage-index-entry-within-itemize"></a>
+<li><a class="index-entry-id"
id="index-titlepage-index-entry-within-itemize"></a>
i–tem 1
</li><li>i–tem 2
</li></ul>
@@ -1254,7 +1254,7 @@ i–tem 1
<thead><tr><th width="40%">mu–ltitable headitem</th><th
width="60%">another tab</th></tr></thead>
<tbody><tr><td width="40%">mu–ltitable item</td><td
width="60%">multitable tab</td></tr>
<tr><td width="40%">mu–ltitable item 2</td><td width="60%">multitable
tab 2
-<a class="index-entry-anchor"
id="index-titlepage-index-entry-within-multitable"></a></td></tr>
+<a class="index-entry-id"
id="index-titlepage-index-entry-within-multitable"></a></td></tr>
<tr><td width="40%">lone mu–ltitable item</td></tr>
</tbody>
</table>
@@ -1355,7 +1355,7 @@ f(x) = {1 \over \sigma \sqrt{2\pi}}e<sup class="sup">-{1
\over 2}\left({x-\mu \o
<dl class="first-deffn">
<dt class="deffn" id="index-titlepage-i"><span class="category-def">fset:
</span><span><strong class="strong"><var class="var">i</var></strong> <em
class="emph">a g</em><a class="copiable-anchor" href='#index-titlepage-i'>
¶</a></span></dt>
-<dd><a class="index-entry-anchor"
id="index-titlepage-index-entry-within-deffn"></a>
+<dd><a class="index-entry-id"
id="index-titlepage-index-entry-within-deffn"></a>
</dd><dt class="deffnx def-cmd-deffn" id="index-titlepage-truc"><span
class="category-def">cmde: </span><span><strong class="strong">truc</strong>
<em class="emph"></em><a class="copiable-anchor" href='#index-titlepage-truc'>
¶</a></span></dt>
<dt class="deffnx def-cmd-deffn" id="index-titlepage-log-trap"><span
class="category-def">Command: </span><span><strong class="strong">log
trap</strong> <em class="emph"></em><a class="copiable-anchor"
href='#index-titlepage-log-trap'> ¶</a></span></dt>
<dt class="deffnx def-cmd-deffn" id="index-titlepage-log-trap1"><span
class="category-def">Command: </span><span><strong class="strong">log
trap1</strong> <em class="emph"></em><a class="copiable-anchor"
href='#index-titlepage-log-trap1'> ¶</a></span></dt>
@@ -1648,7 +1648,7 @@ ref</a>
<dl class="ftable">
<dt id='index-titlepage-a-1'><span><em class="emph">a</em><a
class="copiable-anchor" href='#index-titlepage-a-1'> ¶</a></span></dt>
-<dd><a class="index-entry-anchor"
id="index-titlepage-index-entry-between-item-and-itemx"></a>
+<dd><a class="index-entry-id"
id="index-titlepage-index-entry-between-item-and-itemx"></a>
</dd>
<dt id='index-titlepage-b'><span><em class="emph">b</em><a
class="copiable-anchor" href='#index-titlepage-b'> ¶</a></span></dt>
<dd><p>l–ine
@@ -1790,7 +1790,7 @@ html ''
<dl class="ftable">
<dt id='index-titlepage-a-2'><span>a<a class="copiable-anchor"
href='#index-titlepage-a-2'> ¶</a></span></dt>
-<dd><a class="index-entry-anchor"
id="index-titlepage-index-entry-between-item-and-itemx-1"></a>
+<dd><a class="index-entry-id"
id="index-titlepage-index-entry-between-item-and-itemx-1"></a>
</dd>
<dt id='index-titlepage-b-1'><span>b<a class="copiable-anchor"
href='#index-titlepage-b-1'> ¶</a></span></dt>
<dd><p>l–ine
@@ -1865,10 +1865,10 @@ kbd: <kbd
class="kbd">``simple-double--three---four----''</kbd> <br>
</p>
<p>‘<!-- /@w -->‘simple-double-<!-- /@w
-->-three—four—-’<!-- /@w -->’<br>
</p>
-<a class="index-entry-anchor" id="index-copying-_002d_002doption"></a>
-<a class="index-entry-anchor" id="index-copying-_0060_0060"></a>
-<a class="index-entry-anchor" id="index-copying-_0060_0060-1"></a>
-<a class="index-entry-anchor" id="index-copying-_002d_002dfoption"></a>
+<a class="index-entry-id" id="index-copying-_002d_002doption"></a>
+<a class="index-entry-id" id="index-copying-_0060_0060"></a>
+<a class="index-entry-id" id="index-copying-_0060_0060-1"></a>
+<a class="index-entry-id" id="index-copying-_002d_002dfoption"></a>
<p>@"u ü
@"{U} Ü
@@ -2227,7 +2227,7 @@ error→ → - ∗ -| ⇒
</li></ul>
<ul class="itemize" style="list-style-type: '\2022 a\2013 n itemize line'">
-<li><a class="index-entry-anchor"
id="index-copying-index-entry-within-itemize"></a>
+<li><a class="index-entry-id"
id="index-copying-index-entry-within-itemize"></a>
i–tem 1
</li><li>i–tem 2
</li></ul>
@@ -2269,7 +2269,7 @@ i–tem 1
<thead><tr><th width="40%">mu–ltitable headitem</th><th
width="60%">another tab</th></tr></thead>
<tbody><tr><td width="40%">mu–ltitable item</td><td
width="60%">multitable tab</td></tr>
<tr><td width="40%">mu–ltitable item 2</td><td width="60%">multitable
tab 2
-<a class="index-entry-anchor"
id="index-copying-index-entry-within-multitable"></a></td></tr>
+<a class="index-entry-id"
id="index-copying-index-entry-within-multitable"></a></td></tr>
<tr><td width="40%">lone mu–ltitable item</td></tr>
</tbody>
</table>
@@ -2370,7 +2370,7 @@ f(x) = {1 \over \sigma \sqrt{2\pi}}e<sup class="sup">-{1
\over 2}\left({x-\mu \o
<dl class="first-deffn">
<dt class="deffn" id="index-copying-i"><span class="category-def">fset:
</span><span><strong class="strong"><var class="var">i</var></strong> <em
class="emph">a g</em><a class="copiable-anchor" href='#index-copying-i'>
¶</a></span></dt>
-<dd><a class="index-entry-anchor"
id="index-copying-index-entry-within-deffn"></a>
+<dd><a class="index-entry-id" id="index-copying-index-entry-within-deffn"></a>
</dd><dt class="deffnx def-cmd-deffn" id="index-copying-truc"><span
class="category-def">cmde: </span><span><strong class="strong">truc</strong>
<em class="emph"></em><a class="copiable-anchor" href='#index-copying-truc'>
¶</a></span></dt>
<dt class="deffnx def-cmd-deffn" id="index-copying-log-trap"><span
class="category-def">Command: </span><span><strong class="strong">log
trap</strong> <em class="emph"></em><a class="copiable-anchor"
href='#index-copying-log-trap'> ¶</a></span></dt>
<dt class="deffnx def-cmd-deffn" id="index-copying-log-trap1"><span
class="category-def">Command: </span><span><strong class="strong">log
trap1</strong> <em class="emph"></em><a class="copiable-anchor"
href='#index-copying-log-trap1'> ¶</a></span></dt>
@@ -2663,7 +2663,7 @@ ref</a>
<dl class="ftable">
<dt id='index-copying-a-1'><span><em class="emph">a</em><a
class="copiable-anchor" href='#index-copying-a-1'> ¶</a></span></dt>
-<dd><a class="index-entry-anchor"
id="index-copying-index-entry-between-item-and-itemx"></a>
+<dd><a class="index-entry-id"
id="index-copying-index-entry-between-item-and-itemx"></a>
</dd>
<dt id='index-copying-b'><span><em class="emph">b</em><a
class="copiable-anchor" href='#index-copying-b'> ¶</a></span></dt>
<dd><p>l–ine
@@ -2805,7 +2805,7 @@ html ''
<dl class="ftable">
<dt id='index-copying-a-2'><span>a<a class="copiable-anchor"
href='#index-copying-a-2'> ¶</a></span></dt>
-<dd><a class="index-entry-anchor"
id="index-copying-index-entry-between-item-and-itemx-1"></a>
+<dd><a class="index-entry-id"
id="index-copying-index-entry-between-item-and-itemx-1"></a>
</dd>
<dt id='index-copying-b-1'><span>b<a class="copiable-anchor"
href='#index-copying-b-1'> ¶</a></span></dt>
<dd><p>l–ine
diff --git
a/tp/tests/layout/res_parser/formatting_numerical_entities/formatting.html
b/tp/tests/layout/res_parser/formatting_numerical_entities/formatting.html
index 72fdac69c2..b9fbd00b69 100644
--- a/tp/tests/layout/res_parser/formatting_numerical_entities/formatting.html
+++ b/tp/tests/layout/res_parser/formatting_numerical_entities/formatting.html
@@ -853,10 +853,10 @@ kbd: <kbd
class="kbd">``simple-double--three---four----''</kbd> <br>
</p>
<p>‘<!-- /@w -->‘simple-double-<!-- /@w
-->-three—four—-’<!-- /@w -->’<br>
</p>
-<a class="index-entry-anchor" id="index-titlepage-_002d_002doption"></a>
-<a class="index-entry-anchor" id="index-titlepage-_0060_0060"></a>
-<a class="index-entry-anchor" id="index-titlepage-_0060_0060-1"></a>
-<a class="index-entry-anchor" id="index-titlepage-_002d_002dfoption"></a>
+<a class="index-entry-id" id="index-titlepage-_002d_002doption"></a>
+<a class="index-entry-id" id="index-titlepage-_0060_0060"></a>
+<a class="index-entry-id" id="index-titlepage-_0060_0060-1"></a>
+<a class="index-entry-id" id="index-titlepage-_002d_002dfoption"></a>
<p>@"u ü
@"{U} Ü
@@ -1216,7 +1216,7 @@ error→ ↦ − ★ ⊣ ⇒
</li></ul>
<ul class="itemize" style="list-style-type: '\2022 a\2013 n itemize line'">
-<li><a class="index-entry-anchor"
id="index-titlepage-index-entry-within-itemize"></a>
+<li><a class="index-entry-id"
id="index-titlepage-index-entry-within-itemize"></a>
i–tem 1
</li><li>i–tem 2
</li></ul>
@@ -1258,7 +1258,7 @@ i–tem 1
<thead><tr><th width="40%">mu–ltitable headitem</th><th
width="60%">another tab</th></tr></thead>
<tbody><tr><td width="40%">mu–ltitable item</td><td
width="60%">multitable tab</td></tr>
<tr><td width="40%">mu–ltitable item 2</td><td width="60%">multitable
tab 2
-<a class="index-entry-anchor"
id="index-titlepage-index-entry-within-multitable"></a></td></tr>
+<a class="index-entry-id"
id="index-titlepage-index-entry-within-multitable"></a></td></tr>
<tr><td width="40%">lone mu–ltitable item</td></tr>
</tbody>
</table>
@@ -1359,7 +1359,7 @@ f(x) = {1 \over \sigma \sqrt{2\pi}}e<sup class="sup">-{1
\over 2}\left({x-\mu \o
<dl class="first-deffn">
<dt class="deffn" id="index-titlepage-i"><span class="category-def">fset:
</span><span><strong class="strong"><var class="var">i</var></strong> <em
class="emph">a g</em><a class="copiable-anchor" href='#index-titlepage-i'>
¶</a></span></dt>
-<dd><a class="index-entry-anchor"
id="index-titlepage-index-entry-within-deffn"></a>
+<dd><a class="index-entry-id"
id="index-titlepage-index-entry-within-deffn"></a>
</dd><dt class="deffnx def-cmd-deffn" id="index-titlepage-truc"><span
class="category-def">cmde: </span><span><strong class="strong">truc</strong>
<em class="emph"></em><a class="copiable-anchor" href='#index-titlepage-truc'>
¶</a></span></dt>
<dt class="deffnx def-cmd-deffn" id="index-titlepage-log-trap"><span
class="category-def">Command: </span><span><strong class="strong">log
trap</strong> <em class="emph"></em><a class="copiable-anchor"
href='#index-titlepage-log-trap'> ¶</a></span></dt>
<dt class="deffnx def-cmd-deffn" id="index-titlepage-log-trap1"><span
class="category-def">Command: </span><span><strong class="strong">log
trap1</strong> <em class="emph"></em><a class="copiable-anchor"
href='#index-titlepage-log-trap1'> ¶</a></span></dt>
@@ -1652,7 +1652,7 @@ ref</a>
<dl class="ftable">
<dt id='index-titlepage-a-1'><span><em class="emph">a</em><a
class="copiable-anchor" href='#index-titlepage-a-1'> ¶</a></span></dt>
-<dd><a class="index-entry-anchor"
id="index-titlepage-index-entry-between-item-and-itemx"></a>
+<dd><a class="index-entry-id"
id="index-titlepage-index-entry-between-item-and-itemx"></a>
</dd>
<dt id='index-titlepage-b'><span><em class="emph">b</em><a
class="copiable-anchor" href='#index-titlepage-b'> ¶</a></span></dt>
<dd><p>l–ine
@@ -1794,7 +1794,7 @@ html ''
<dl class="ftable">
<dt id='index-titlepage-a-2'><span>a<a class="copiable-anchor"
href='#index-titlepage-a-2'> ¶</a></span></dt>
-<dd><a class="index-entry-anchor"
id="index-titlepage-index-entry-between-item-and-itemx-1"></a>
+<dd><a class="index-entry-id"
id="index-titlepage-index-entry-between-item-and-itemx-1"></a>
</dd>
<dt id='index-titlepage-b-1'><span>b<a class="copiable-anchor"
href='#index-titlepage-b-1'> ¶</a></span></dt>
<dd><p>l–ine
@@ -1869,10 +1869,10 @@ kbd: <kbd
class="kbd">``simple-double--three---four----''</kbd> <br>
</p>
<p>‘<!-- /@w -->‘simple-double-<!-- /@w
-->-three—four—-’<!-- /@w -->’<br>
</p>
-<a class="index-entry-anchor" id="index-copying-_002d_002doption"></a>
-<a class="index-entry-anchor" id="index-copying-_0060_0060"></a>
-<a class="index-entry-anchor" id="index-copying-_0060_0060-1"></a>
-<a class="index-entry-anchor" id="index-copying-_002d_002dfoption"></a>
+<a class="index-entry-id" id="index-copying-_002d_002doption"></a>
+<a class="index-entry-id" id="index-copying-_0060_0060"></a>
+<a class="index-entry-id" id="index-copying-_0060_0060-1"></a>
+<a class="index-entry-id" id="index-copying-_002d_002dfoption"></a>
<p>@"u ü
@"{U} Ü
@@ -2231,7 +2231,7 @@ error→ ↦ − ★ ⊣ ⇒
</li></ul>
<ul class="itemize" style="list-style-type: '\2022 a\2013 n itemize line'">
-<li><a class="index-entry-anchor"
id="index-copying-index-entry-within-itemize"></a>
+<li><a class="index-entry-id"
id="index-copying-index-entry-within-itemize"></a>
i–tem 1
</li><li>i–tem 2
</li></ul>
@@ -2273,7 +2273,7 @@ i–tem 1
<thead><tr><th width="40%">mu–ltitable headitem</th><th
width="60%">another tab</th></tr></thead>
<tbody><tr><td width="40%">mu–ltitable item</td><td
width="60%">multitable tab</td></tr>
<tr><td width="40%">mu–ltitable item 2</td><td width="60%">multitable
tab 2
-<a class="index-entry-anchor"
id="index-copying-index-entry-within-multitable"></a></td></tr>
+<a class="index-entry-id"
id="index-copying-index-entry-within-multitable"></a></td></tr>
<tr><td width="40%">lone mu–ltitable item</td></tr>
</tbody>
</table>
@@ -2374,7 +2374,7 @@ f(x) = {1 \over \sigma \sqrt{2\pi}}e<sup class="sup">-{1
\over 2}\left({x-\mu \o
<dl class="first-deffn">
<dt class="deffn" id="index-copying-i"><span class="category-def">fset:
</span><span><strong class="strong"><var class="var">i</var></strong> <em
class="emph">a g</em><a class="copiable-anchor" href='#index-copying-i'>
¶</a></span></dt>
-<dd><a class="index-entry-anchor"
id="index-copying-index-entry-within-deffn"></a>
+<dd><a class="index-entry-id" id="index-copying-index-entry-within-deffn"></a>
</dd><dt class="deffnx def-cmd-deffn" id="index-copying-truc"><span
class="category-def">cmde: </span><span><strong class="strong">truc</strong>
<em class="emph"></em><a class="copiable-anchor" href='#index-copying-truc'>
¶</a></span></dt>
<dt class="deffnx def-cmd-deffn" id="index-copying-log-trap"><span
class="category-def">Command: </span><span><strong class="strong">log
trap</strong> <em class="emph"></em><a class="copiable-anchor"
href='#index-copying-log-trap'> ¶</a></span></dt>
<dt class="deffnx def-cmd-deffn" id="index-copying-log-trap1"><span
class="category-def">Command: </span><span><strong class="strong">log
trap1</strong> <em class="emph"></em><a class="copiable-anchor"
href='#index-copying-log-trap1'> ¶</a></span></dt>
@@ -2667,7 +2667,7 @@ ref</a>
<dl class="ftable">
<dt id='index-copying-a-1'><span><em class="emph">a</em><a
class="copiable-anchor" href='#index-copying-a-1'> ¶</a></span></dt>
-<dd><a class="index-entry-anchor"
id="index-copying-index-entry-between-item-and-itemx"></a>
+<dd><a class="index-entry-id"
id="index-copying-index-entry-between-item-and-itemx"></a>
</dd>
<dt id='index-copying-b'><span><em class="emph">b</em><a
class="copiable-anchor" href='#index-copying-b'> ¶</a></span></dt>
<dd><p>l–ine
@@ -2809,7 +2809,7 @@ html ''
<dl class="ftable">
<dt id='index-copying-a-2'><span>a<a class="copiable-anchor"
href='#index-copying-a-2'> ¶</a></span></dt>
-<dd><a class="index-entry-anchor"
id="index-copying-index-entry-between-item-and-itemx-1"></a>
+<dd><a class="index-entry-id"
id="index-copying-index-entry-between-item-and-itemx-1"></a>
</dd>
<dt id='index-copying-b-1'><span>b<a class="copiable-anchor"
href='#index-copying-b-1'> ¶</a></span></dt>
<dd><p>l–ine
@@ -2940,10 +2940,10 @@ kbd: <kbd
class="kbd">``simple-double--three---four----''</kbd> <br>
</p>
<p>‘<!-- /@w -->‘simple-double-<!-- /@w
-->-three—four—-’<!-- /@w -->’<br>
</p>
-<a class="index-entry-anchor" id="index-copying-_002d_002doption"></a>
-<a class="index-entry-anchor" id="index-copying-_0060_0060"></a>
-<a class="index-entry-anchor" id="index-copying-_0060_0060-1"></a>
-<a class="index-entry-anchor" id="index-copying-_002d_002dfoption"></a>
+<a class="index-entry-id" id="index-copying-_002d_002doption"></a>
+<a class="index-entry-id" id="index-copying-_0060_0060"></a>
+<a class="index-entry-id" id="index-copying-_0060_0060-1"></a>
+<a class="index-entry-id" id="index-copying-_002d_002dfoption"></a>
<p>@"u ü
@"{U} Ü
@@ -3302,7 +3302,7 @@ error→ ↦ − ★ ⊣ ⇒
</li></ul>
<ul class="itemize" style="list-style-type: '\2022 a\2013 n itemize line'">
-<li><a class="index-entry-anchor"
id="index-copying-index-entry-within-itemize"></a>
+<li><a class="index-entry-id"
id="index-copying-index-entry-within-itemize"></a>
i–tem 1
</li><li>i–tem 2
</li></ul>
@@ -3344,7 +3344,7 @@ i–tem 1
<thead><tr><th width="40%">mu–ltitable headitem</th><th
width="60%">another tab</th></tr></thead>
<tbody><tr><td width="40%">mu–ltitable item</td><td
width="60%">multitable tab</td></tr>
<tr><td width="40%">mu–ltitable item 2</td><td width="60%">multitable
tab 2
-<a class="index-entry-anchor"
id="index-copying-index-entry-within-multitable"></a></td></tr>
+<a class="index-entry-id"
id="index-copying-index-entry-within-multitable"></a></td></tr>
<tr><td width="40%">lone mu–ltitable item</td></tr>
</tbody>
</table>
@@ -3445,7 +3445,7 @@ f(x) = {1 \over \sigma \sqrt{2\pi}}e<sup class="sup">-{1
\over 2}\left({x-\mu \o
<dl class="first-deffn">
<dt class="deffn" id="index-copying-i"><span class="category-def">fset:
</span><span><strong class="strong"><var class="var">i</var></strong> <em
class="emph">a g</em><a class="copiable-anchor" href='#index-copying-i'>
¶</a></span></dt>
-<dd><a class="index-entry-anchor"
id="index-copying-index-entry-within-deffn"></a>
+<dd><a class="index-entry-id" id="index-copying-index-entry-within-deffn"></a>
</dd><dt class="deffnx def-cmd-deffn" id="index-copying-truc"><span
class="category-def">cmde: </span><span><strong class="strong">truc</strong>
<em class="emph"></em><a class="copiable-anchor" href='#index-copying-truc'>
¶</a></span></dt>
<dt class="deffnx def-cmd-deffn" id="index-copying-log-trap"><span
class="category-def">Command: </span><span><strong class="strong">log
trap</strong> <em class="emph"></em><a class="copiable-anchor"
href='#index-copying-log-trap'> ¶</a></span></dt>
<dt class="deffnx def-cmd-deffn" id="index-copying-log-trap1"><span
class="category-def">Command: </span><span><strong class="strong">log
trap1</strong> <em class="emph"></em><a class="copiable-anchor"
href='#index-copying-log-trap1'> ¶</a></span></dt>
@@ -3738,7 +3738,7 @@ ref</a>
<dl class="ftable">
<dt id='index-copying-a-1'><span><em class="emph">a</em><a
class="copiable-anchor" href='#index-copying-a-1'> ¶</a></span></dt>
-<dd><a class="index-entry-anchor"
id="index-copying-index-entry-between-item-and-itemx"></a>
+<dd><a class="index-entry-id"
id="index-copying-index-entry-between-item-and-itemx"></a>
</dd>
<dt id='index-copying-b'><span><em class="emph">b</em><a
class="copiable-anchor" href='#index-copying-b'> ¶</a></span></dt>
<dd><p>l–ine
@@ -3880,7 +3880,7 @@ html ''
<dl class="ftable">
<dt id='index-copying-a-2'><span>a<a class="copiable-anchor"
href='#index-copying-a-2'> ¶</a></span></dt>
-<dd><a class="index-entry-anchor"
id="index-copying-index-entry-between-item-and-itemx-1"></a>
+<dd><a class="index-entry-id"
id="index-copying-index-entry-between-item-and-itemx-1"></a>
</dd>
<dt id='index-copying-b-1'><span>b<a class="copiable-anchor"
href='#index-copying-b-1'> ¶</a></span></dt>
<dd><p>l–ine
@@ -3954,10 +3954,10 @@ kbd: <kbd
class="kbd">``simple-double--three---four----''</kbd> <br>
</p>
<p>‘<!-- /@w -->‘simple-double-<!-- /@w
-->-three—four—-’<!-- /@w -->’<br>
</p>
-<a class="index-entry-anchor" id="index-_002d_002doption"></a>
-<a class="index-entry-anchor" id="index-_0060_0060"></a>
-<a class="index-entry-anchor" id="index-_0060_0060-2"></a>
-<a class="index-entry-anchor" id="index-_002d_002dfoption"></a>
+<a class="index-entry-id" id="index-_002d_002doption"></a>
+<a class="index-entry-id" id="index-_0060_0060"></a>
+<a class="index-entry-id" id="index-_0060_0060-2"></a>
+<a class="index-entry-id" id="index-_002d_002dfoption"></a>
<p>@"u ü
@"{U} Ü
@@ -4316,7 +4316,7 @@ error→ ↦ − ★ ⊣ ⇒
</li></ul>
<ul class="itemize" style="list-style-type: '\2022 a\2013 n itemize line'">
-<li><a class="index-entry-anchor" id="index-index-entry-within-itemize"></a>
+<li><a class="index-entry-id" id="index-index-entry-within-itemize"></a>
i–tem 1
</li><li>i–tem 2
</li></ul>
@@ -4358,7 +4358,7 @@ i–tem 1
<thead><tr><th width="40%">mu–ltitable headitem</th><th
width="60%">another tab</th></tr></thead>
<tbody><tr><td width="40%">mu–ltitable item</td><td
width="60%">multitable tab</td></tr>
<tr><td width="40%">mu–ltitable item 2</td><td width="60%">multitable
tab 2
-<a class="index-entry-anchor"
id="index-index-entry-within-multitable"></a></td></tr>
+<a class="index-entry-id"
id="index-index-entry-within-multitable"></a></td></tr>
<tr><td width="40%">lone mu–ltitable item</td></tr>
</tbody>
</table>
@@ -4459,7 +4459,7 @@ f(x) = {1 \over \sigma \sqrt{2\pi}}e<sup class="sup">-{1
\over 2}\left({x-\mu \o
<dl class="first-deffn">
<dt class="deffn" id="index-i"><span class="category-def">fset:
</span><span><strong class="strong"><var class="var">i</var></strong> <em
class="emph">a g</em><a class="copiable-anchor" href='#index-i'>
¶</a></span></dt>
-<dd><a class="index-entry-anchor" id="index-index-entry-within-deffn"></a>
+<dd><a class="index-entry-id" id="index-index-entry-within-deffn"></a>
</dd><dt class="deffnx def-cmd-deffn" id="index-truc"><span
class="category-def">cmde: </span><span><strong class="strong">truc</strong>
<em class="emph"></em><a class="copiable-anchor" href='#index-truc'>
¶</a></span></dt>
<dt class="deffnx def-cmd-deffn" id="index-log-trap"><span
class="category-def">Command: </span><span><strong class="strong">log
trap</strong> <em class="emph"></em><a class="copiable-anchor"
href='#index-log-trap'> ¶</a></span></dt>
<dt class="deffnx def-cmd-deffn" id="index-log-trap1"><span
class="category-def">Command: </span><span><strong class="strong">log
trap1</strong> <em class="emph"></em><a class="copiable-anchor"
href='#index-log-trap1'> ¶</a></span></dt>
@@ -4752,7 +4752,7 @@ ref</a>
<dl class="ftable">
<dt id='index-a-2'><span><em class="emph">a</em><a class="copiable-anchor"
href='#index-a-2'> ¶</a></span></dt>
-<dd><a class="index-entry-anchor"
id="index-index-entry-between-item-and-itemx"></a>
+<dd><a class="index-entry-id"
id="index-index-entry-between-item-and-itemx"></a>
</dd>
<dt id='index-b'><span><em class="emph">b</em><a class="copiable-anchor"
href='#index-b'> ¶</a></span></dt>
<dd><p>l–ine
@@ -4894,7 +4894,7 @@ html ''
<dl class="ftable">
<dt id='index-a-3'><span>a<a class="copiable-anchor" href='#index-a-3'>
¶</a></span></dt>
-<dd><a class="index-entry-anchor"
id="index-index-entry-between-item-and-itemx-1"></a>
+<dd><a class="index-entry-id"
id="index-index-entry-between-item-and-itemx-1"></a>
</dd>
<dt id='index-b-1'><span>b<a class="copiable-anchor" href='#index-b-1'>
¶</a></span></dt>
<dd><p>l–ine
@@ -4976,7 +4976,7 @@ kbd: <kbd
class="kbd">``simple-double--three---four----''</kbd>
`<!-- /@w -->`simple-double-<!-- /@w -->-three---four----'<!-- /@w -->'
-<a class="index-entry-anchor" id="index-_002d_002doption-1"></a><a
class="index-entry-anchor" id="index-_0060_0060-1"></a><a
class="index-entry-anchor" id="index-_0060_0060-3"></a><a
class="index-entry-anchor" id="index-_002d_002dfoption-1"></a>
+<a class="index-entry-id" id="index-_002d_002doption-1"></a><a
class="index-entry-id" id="index-_0060_0060-1"></a><a class="index-entry-id"
id="index-_0060_0060-3"></a><a class="index-entry-id"
id="index-_002d_002dfoption-1"></a>
@"u ü
@"{U} Ü
@~n ñ
@@ -5374,7 +5374,7 @@ error→ ↦ − ★ ⊣ ⇒
<pre class="example-preformatted">
</pre><ul class="itemize" style="list-style-type: '\2022 a\2013 n itemize
line'">
-<li><pre class="example-preformatted"><a class="index-entry-anchor"
id="index-index-entry-within-itemize-1"></a>i--tem 1
+<li><pre class="example-preformatted"><a class="index-entry-id"
id="index-index-entry-within-itemize-1"></a>i--tem 1
</pre></li><li><pre class="example-preformatted">i--tem 2
</pre></li></ul>
<pre class="example-preformatted">
@@ -5423,7 +5423,7 @@ error→ ↦ − ★ ⊣ ⇒
<thead><tr><th width="40%"><pre class="example-preformatted">mu--ltitable
headitem</pre></th><th width="60%"><pre class="example-preformatted">another
tab</pre></th></tr></thead>
<tbody><tr><td width="40%"><pre class="example-preformatted">mu--ltitable
item</pre></td><td width="60%"><pre class="example-preformatted">multitable
tab</pre></td></tr>
<tr><td width="40%"><pre class="example-preformatted">mu--ltitable item
2</pre></td><td width="60%"><pre class="example-preformatted">multitable tab 2
-<a class="index-entry-anchor"
id="index-index-entry-within-multitable-1"></a></pre></td></tr>
+<a class="index-entry-id"
id="index-index-entry-within-multitable-1"></a></pre></td></tr>
<tr><td width="40%"><pre class="example-preformatted">lone mu--ltitable
item</pre></td></tr>
</tbody>
</table>
@@ -5546,7 +5546,7 @@ f(x) = {1 \over \sigma \sqrt{2\pi}}e<sup class="sup">-{1
\over 2}\left({x-\mu \o
<pre class="example-preformatted">
</pre><dl class="first-deffn">
<dt class="deffn" id="index-i-2"><span class="category-def">fset:
</span><span><strong class="strong"><var class="var">i</var></strong> <em
class="emph">a g</em><a class="copiable-anchor" href='#index-i-2'>
¶</a></span></dt>
-<dd><pre class="example-preformatted"><a class="index-entry-anchor"
id="index-index-entry-within-deffn-1"></a></pre></dd><dt class="deffnx
def-cmd-deffn" id="index-truc-2"><span class="category-def">cmde:
</span><span><strong class="strong">truc</strong> <em class="emph"></em><a
class="copiable-anchor" href='#index-truc-2'> ¶</a></span></dt>
+<dd><pre class="example-preformatted"><a class="index-entry-id"
id="index-index-entry-within-deffn-1"></a></pre></dd><dt class="deffnx
def-cmd-deffn" id="index-truc-2"><span class="category-def">cmde:
</span><span><strong class="strong">truc</strong> <em class="emph"></em><a
class="copiable-anchor" href='#index-truc-2'> ¶</a></span></dt>
<dt class="deffnx def-cmd-deffn" id="index-log-trap-1"><span
class="category-def">Command: </span><span><strong class="strong">log
trap</strong> <em class="emph"></em><a class="copiable-anchor"
href='#index-log-trap-1'> ¶</a></span></dt>
<dt class="deffnx def-cmd-deffn" id="index-log-trap1-1"><span
class="category-def">Command: </span><span><strong class="strong">log
trap1</strong> <em class="emph"></em><a class="copiable-anchor"
href='#index-log-trap1-1'> ¶</a></span></dt>
<dt class="deffnx def-cmd-deffn" id="index-log-trap2-1"><span
class="category-def">Command: </span><span><strong class="strong">log
trap2</strong> <em class="emph"></em><a class="copiable-anchor"
href='#index-log-trap2-1'> ¶</a></span></dt>
@@ -5890,7 +5890,7 @@ ref</a>
</pre><dl class="ftable">
<dt id='index-a-5'><span><tt><em class="emph">a</em></tt><a
class="copiable-anchor" href='#index-a-5'> ¶</a></span></dt>
-<dd><pre class="example-preformatted"><a class="index-entry-anchor"
id="index-index-entry-between-item-and-itemx-2"></a></pre></dd>
+<dd><pre class="example-preformatted"><a class="index-entry-id"
id="index-index-entry-between-item-and-itemx-2"></a></pre></dd>
<dt id='index-b-2'><span><tt><em class="emph">b</em></tt><a
class="copiable-anchor" href='#index-b-2'> ¶</a></span></dt>
<dd><pre class="example-preformatted">l--ine
</pre></dd>
@@ -6056,7 +6056,7 @@ Invalid use of @':
</pre><dl class="ftable">
<dt id='index-a-6'><span><tt>a</tt><a class="copiable-anchor"
href='#index-a-6'> ¶</a></span></dt>
-<dd><pre class="example-preformatted"><a class="index-entry-anchor"
id="index-index-entry-between-item-and-itemx-3"></a></pre></dd>
+<dd><pre class="example-preformatted"><a class="index-entry-id"
id="index-index-entry-between-item-and-itemx-3"></a></pre></dd>
<dt id='index-b-3'><span><tt>b</tt><a class="copiable-anchor"
href='#index-b-3'> ¶</a></span></dt>
<dd><pre class="example-preformatted">l--ine
</pre></dd>
@@ -6115,38 +6115,38 @@ Invalid use of @':
</pre></div>
-<a class="index-entry-anchor" id="index-t_002d_002druc"></a>
-<a class="index-entry-anchor" id="index-T_002d_002druc"></a>
-<a class="index-entry-anchor" id="index-_002e"></a>
-<a class="index-entry-anchor" id="index-_003f"></a>
-<a class="index-entry-anchor" id="index-a"></a>
-<a class="index-entry-anchor" id="index-t_002d_002druc-1"></a>
-<a class="index-entry-anchor" id="index-T_002d_002druc-1"></a>
-<a class="index-entry-anchor" id="index-_002e-1"></a>
-<a class="index-entry-anchor" id="index-_003f-1"></a>
-<a class="index-entry-anchor" id="index-a-7"></a>
+<a class="index-entry-id" id="index-t_002d_002druc"></a>
+<a class="index-entry-id" id="index-T_002d_002druc"></a>
+<a class="index-entry-id" id="index-_002e"></a>
+<a class="index-entry-id" id="index-_003f"></a>
+<a class="index-entry-id" id="index-a"></a>
+<a class="index-entry-id" id="index-t_002d_002druc-1"></a>
+<a class="index-entry-id" id="index-T_002d_002druc-1"></a>
+<a class="index-entry-id" id="index-_002e-1"></a>
+<a class="index-entry-id" id="index-_003f-1"></a>
+<a class="index-entry-id" id="index-a-7"></a>
-<a class="index-entry-anchor" id="index-a_002d_002d_002da"></a>
-<a class="index-entry-anchor" id="index-b_002d_002d_002db"></a>
-<a class="index-entry-anchor" id="index-d_002d_002d_002ddd"></a>
-<a class="index-entry-anchor" id="index-g_002d_002d_002dgg"></a>
+<a class="index-entry-id" id="index-a_002d_002d_002da"></a>
+<a class="index-entry-id" id="index-b_002d_002d_002db"></a>
+<a class="index-entry-id" id="index-d_002d_002d_002ddd"></a>
+<a class="index-entry-id" id="index-g_002d_002d_002dgg"></a>
-<a class="index-entry-anchor" id="index-f_002d_002d_002daa"></a>
-<a class="index-entry-anchor" id="index-f_002d_002d_002dbb"></a>
-<a class="index-entry-anchor" id="index-f_002d_002d_002dddd"></a>
-<a class="index-entry-anchor" id="index-f_002d_002d_002dggg"></a>
+<a class="index-entry-id" id="index-f_002d_002d_002daa"></a>
+<a class="index-entry-id" id="index-f_002d_002d_002dbb"></a>
+<a class="index-entry-id" id="index-f_002d_002d_002dddd"></a>
+<a class="index-entry-id" id="index-f_002d_002d_002dggg"></a>
-<a class="index-entry-anchor" id="index-aaa"></a>
+<a class="index-entry-id" id="index-aaa"></a>
-<a class="index-entry-anchor" id="index-xxx"></a>
+<a class="index-entry-id" id="index-xxx"></a>
-<a class="index-entry-anchor" id="index-"></a>
+<a class="index-entry-id" id="index-"></a>
-<a class="index-entry-anchor"
id="index-a-index_002d_002d_002dentry-te-_002d_002d_002d-i"></a>
+<a class="index-entry-id"
id="index-a-index_002d_002d_002dentry-te-_002d_002d_002d-i"></a>
-<a class="index-entry-anchor" id="index-truc-4"></a>
+<a class="index-entry-id" id="index-truc-4"></a>
<p>Text<a class="footnote" id="DOCF9" href="#FOOT9"><sup>11</sup></a>
@@ -7441,13 +7441,13 @@ Menu comment
<p>in footnote2</p>
<h5><a id="FOOT9" href="#DOCF9">(11)</a></h5>
<p>in footnote
-<a class="index-entry-anchor" id="index-index-entry-in-footnote"></a>
+<a class="index-entry-id" id="index-index-entry-in-footnote"></a>
</p>
<p>Blah
</p>
<p>Blih
</p>
-<a class="index-entry-anchor" id="index-counting-entry"></a>
+<a class="index-entry-id" id="index-counting-entry"></a>
<h5><a id="FOOT10" href="#DOCF10">(12)</a></h5>
<p>in footnote</p>
</div><hr>
diff --git
a/tp/tests/layout/res_parser/formatting_regions/formatting_regions.html
b/tp/tests/layout/res_parser/formatting_regions/formatting_regions.html
index 09dfe89626..75ae801d30 100644
--- a/tp/tests/layout/res_parser/formatting_regions/formatting_regions.html
+++ b/tp/tests/layout/res_parser/formatting_regions/formatting_regions.html
@@ -853,10 +853,10 @@ kbd: <kbd
class="kbd">``simple-double--three---four----''</kbd> <br>
</p>
<p>‘<!-- /@w -->‘simple-double-<!-- /@w
-->-three—four—-’<!-- /@w -->’<br>
</p>
-<a class="index-entry-anchor" id="index-titlepage-_002d_002doption"></a>
-<a class="index-entry-anchor" id="index-titlepage-_0060_0060"></a>
-<a class="index-entry-anchor" id="index-titlepage-_0060_0060-1"></a>
-<a class="index-entry-anchor" id="index-titlepage-_002d_002dfoption"></a>
+<a class="index-entry-id" id="index-titlepage-_002d_002doption"></a>
+<a class="index-entry-id" id="index-titlepage-_0060_0060"></a>
+<a class="index-entry-id" id="index-titlepage-_0060_0060-1"></a>
+<a class="index-entry-id" id="index-titlepage-_002d_002dfoption"></a>
<p>@"u ü
@"{U} Ü
@@ -1216,7 +1216,7 @@ error→ → - ∗ -| ⇒
</li></ul>
<ul class="itemize" style="list-style-type: '\2022 a\2013 n itemize line'">
-<li><a class="index-entry-anchor"
id="index-titlepage-index-entry-within-itemize"></a>
+<li><a class="index-entry-id"
id="index-titlepage-index-entry-within-itemize"></a>
i–tem 1
</li><li>i–tem 2
</li></ul>
@@ -1258,7 +1258,7 @@ i–tem 1
<thead><tr><th width="40%">mu–ltitable headitem</th><th
width="60%">another tab</th></tr></thead>
<tbody><tr><td width="40%">mu–ltitable item</td><td
width="60%">multitable tab</td></tr>
<tr><td width="40%">mu–ltitable item 2</td><td width="60%">multitable
tab 2
-<a class="index-entry-anchor"
id="index-titlepage-index-entry-within-multitable"></a></td></tr>
+<a class="index-entry-id"
id="index-titlepage-index-entry-within-multitable"></a></td></tr>
<tr><td width="40%">lone mu–ltitable item</td></tr>
</tbody>
</table>
@@ -1359,7 +1359,7 @@ f(x) = {1 \over \sigma \sqrt{2\pi}}e<sup class="sup">-{1
\over 2}\left({x-\mu \o
<dl class="first-deffn">
<dt class="deffn" id="index-titlepage-i"><span class="category-def">fset:
</span><span><strong class="strong"><var class="var">i</var></strong> <em
class="emph">a g</em><a class="copiable-anchor" href='#index-titlepage-i'>
¶</a></span></dt>
-<dd><a class="index-entry-anchor"
id="index-titlepage-index-entry-within-deffn"></a>
+<dd><a class="index-entry-id"
id="index-titlepage-index-entry-within-deffn"></a>
</dd><dt class="deffnx def-cmd-deffn" id="index-titlepage-truc"><span
class="category-def">cmde: </span><span><strong class="strong">truc</strong>
<em class="emph"></em><a class="copiable-anchor" href='#index-titlepage-truc'>
¶</a></span></dt>
<dt class="deffnx def-cmd-deffn" id="index-titlepage-log-trap"><span
class="category-def">Command: </span><span><strong class="strong">log
trap</strong> <em class="emph"></em><a class="copiable-anchor"
href='#index-titlepage-log-trap'> ¶</a></span></dt>
<dt class="deffnx def-cmd-deffn" id="index-titlepage-log-trap1"><span
class="category-def">Command: </span><span><strong class="strong">log
trap1</strong> <em class="emph"></em><a class="copiable-anchor"
href='#index-titlepage-log-trap1'> ¶</a></span></dt>
@@ -1652,7 +1652,7 @@ ref</a>
<dl class="ftable">
<dt id='index-titlepage-a-1'><span><em class="emph">a</em><a
class="copiable-anchor" href='#index-titlepage-a-1'> ¶</a></span></dt>
-<dd><a class="index-entry-anchor"
id="index-titlepage-index-entry-between-item-and-itemx"></a>
+<dd><a class="index-entry-id"
id="index-titlepage-index-entry-between-item-and-itemx"></a>
</dd>
<dt id='index-titlepage-b'><span><em class="emph">b</em><a
class="copiable-anchor" href='#index-titlepage-b'> ¶</a></span></dt>
<dd><p>l–ine
@@ -1794,7 +1794,7 @@ html ''
<dl class="ftable">
<dt id='index-titlepage-a-2'><span>a<a class="copiable-anchor"
href='#index-titlepage-a-2'> ¶</a></span></dt>
-<dd><a class="index-entry-anchor"
id="index-titlepage-index-entry-between-item-and-itemx-1"></a>
+<dd><a class="index-entry-id"
id="index-titlepage-index-entry-between-item-and-itemx-1"></a>
</dd>
<dt id='index-titlepage-b-1'><span>b<a class="copiable-anchor"
href='#index-titlepage-b-1'> ¶</a></span></dt>
<dd><p>l–ine
@@ -1868,10 +1868,10 @@ kbd: <kbd
class="kbd">``simple-double--three---four----''</kbd> <br>
</p>
<p>‘<!-- /@w -->‘simple-double-<!-- /@w
-->-three—four—-’<!-- /@w -->’<br>
</p>
-<a class="index-entry-anchor" id="index-copying-_002d_002doption"></a>
-<a class="index-entry-anchor" id="index-copying-_0060_0060"></a>
-<a class="index-entry-anchor" id="index-copying-_0060_0060-1"></a>
-<a class="index-entry-anchor" id="index-copying-_002d_002dfoption"></a>
+<a class="index-entry-id" id="index-copying-_002d_002doption"></a>
+<a class="index-entry-id" id="index-copying-_0060_0060"></a>
+<a class="index-entry-id" id="index-copying-_0060_0060-1"></a>
+<a class="index-entry-id" id="index-copying-_002d_002dfoption"></a>
<p>@"u ü
@"{U} Ü
@@ -2230,7 +2230,7 @@ error→ → - ∗ -| ⇒
</li></ul>
<ul class="itemize" style="list-style-type: '\2022 a\2013 n itemize line'">
-<li><a class="index-entry-anchor"
id="index-copying-index-entry-within-itemize"></a>
+<li><a class="index-entry-id"
id="index-copying-index-entry-within-itemize"></a>
i–tem 1
</li><li>i–tem 2
</li></ul>
@@ -2272,7 +2272,7 @@ i–tem 1
<thead><tr><th width="40%">mu–ltitable headitem</th><th
width="60%">another tab</th></tr></thead>
<tbody><tr><td width="40%">mu–ltitable item</td><td
width="60%">multitable tab</td></tr>
<tr><td width="40%">mu–ltitable item 2</td><td width="60%">multitable
tab 2
-<a class="index-entry-anchor"
id="index-copying-index-entry-within-multitable"></a></td></tr>
+<a class="index-entry-id"
id="index-copying-index-entry-within-multitable"></a></td></tr>
<tr><td width="40%">lone mu–ltitable item</td></tr>
</tbody>
</table>
@@ -2373,7 +2373,7 @@ f(x) = {1 \over \sigma \sqrt{2\pi}}e<sup class="sup">-{1
\over 2}\left({x-\mu \o
<dl class="first-deffn">
<dt class="deffn" id="index-copying-i"><span class="category-def">fset:
</span><span><strong class="strong"><var class="var">i</var></strong> <em
class="emph">a g</em><a class="copiable-anchor" href='#index-copying-i'>
¶</a></span></dt>
-<dd><a class="index-entry-anchor"
id="index-copying-index-entry-within-deffn"></a>
+<dd><a class="index-entry-id" id="index-copying-index-entry-within-deffn"></a>
</dd><dt class="deffnx def-cmd-deffn" id="index-copying-truc"><span
class="category-def">cmde: </span><span><strong class="strong">truc</strong>
<em class="emph"></em><a class="copiable-anchor" href='#index-copying-truc'>
¶</a></span></dt>
<dt class="deffnx def-cmd-deffn" id="index-copying-log-trap"><span
class="category-def">Command: </span><span><strong class="strong">log
trap</strong> <em class="emph"></em><a class="copiable-anchor"
href='#index-copying-log-trap'> ¶</a></span></dt>
<dt class="deffnx def-cmd-deffn" id="index-copying-log-trap1"><span
class="category-def">Command: </span><span><strong class="strong">log
trap1</strong> <em class="emph"></em><a class="copiable-anchor"
href='#index-copying-log-trap1'> ¶</a></span></dt>
@@ -2666,7 +2666,7 @@ ref</a>
<dl class="ftable">
<dt id='index-copying-a-1'><span><em class="emph">a</em><a
class="copiable-anchor" href='#index-copying-a-1'> ¶</a></span></dt>
-<dd><a class="index-entry-anchor"
id="index-copying-index-entry-between-item-and-itemx"></a>
+<dd><a class="index-entry-id"
id="index-copying-index-entry-between-item-and-itemx"></a>
</dd>
<dt id='index-copying-b'><span><em class="emph">b</em><a
class="copiable-anchor" href='#index-copying-b'> ¶</a></span></dt>
<dd><p>l–ine
@@ -2808,7 +2808,7 @@ html ''
<dl class="ftable">
<dt id='index-copying-a-2'><span>a<a class="copiable-anchor"
href='#index-copying-a-2'> ¶</a></span></dt>
-<dd><a class="index-entry-anchor"
id="index-copying-index-entry-between-item-and-itemx-1"></a>
+<dd><a class="index-entry-id"
id="index-copying-index-entry-between-item-and-itemx-1"></a>
</dd>
<dt id='index-copying-b-1'><span>b<a class="copiable-anchor"
href='#index-copying-b-1'> ¶</a></span></dt>
<dd><p>l–ine
@@ -2916,10 +2916,10 @@ kbd: <kbd
class="kbd">``simple-double--three---four----''</kbd> <br>
</p>
<p>‘<!-- /@w -->‘simple-double-<!-- /@w
-->-three—four—-’<!-- /@w -->’<br>
</p>
-<a class="index-entry-anchor" id="index-_002d_002doption"></a>
-<a class="index-entry-anchor" id="index-_0060_0060"></a>
-<a class="index-entry-anchor" id="index-_0060_0060-2"></a>
-<a class="index-entry-anchor" id="index-_002d_002dfoption"></a>
+<a class="index-entry-id" id="index-_002d_002doption"></a>
+<a class="index-entry-id" id="index-_0060_0060"></a>
+<a class="index-entry-id" id="index-_0060_0060-2"></a>
+<a class="index-entry-id" id="index-_002d_002dfoption"></a>
<p>@"u ü
@"{U} Ü
@@ -3278,7 +3278,7 @@ error→ → - ∗ -| ⇒
</li></ul>
<ul class="itemize" style="list-style-type: '\2022 a\2013 n itemize line'">
-<li><a class="index-entry-anchor" id="index-index-entry-within-itemize"></a>
+<li><a class="index-entry-id" id="index-index-entry-within-itemize"></a>
i–tem 1
</li><li>i–tem 2
</li></ul>
@@ -3320,7 +3320,7 @@ i–tem 1
<thead><tr><th width="40%">mu–ltitable headitem</th><th
width="60%">another tab</th></tr></thead>
<tbody><tr><td width="40%">mu–ltitable item</td><td
width="60%">multitable tab</td></tr>
<tr><td width="40%">mu–ltitable item 2</td><td width="60%">multitable
tab 2
-<a class="index-entry-anchor"
id="index-index-entry-within-multitable"></a></td></tr>
+<a class="index-entry-id"
id="index-index-entry-within-multitable"></a></td></tr>
<tr><td width="40%">lone mu–ltitable item</td></tr>
</tbody>
</table>
@@ -3421,7 +3421,7 @@ f(x) = {1 \over \sigma \sqrt{2\pi}}e<sup class="sup">-{1
\over 2}\left({x-\mu \o
<dl class="first-deffn">
<dt class="deffn" id="index-i"><span class="category-def">fset:
</span><span><strong class="strong"><var class="var">i</var></strong> <em
class="emph">a g</em><a class="copiable-anchor" href='#index-i'>
¶</a></span></dt>
-<dd><a class="index-entry-anchor" id="index-index-entry-within-deffn"></a>
+<dd><a class="index-entry-id" id="index-index-entry-within-deffn"></a>
</dd><dt class="deffnx def-cmd-deffn" id="index-truc"><span
class="category-def">cmde: </span><span><strong class="strong">truc</strong>
<em class="emph"></em><a class="copiable-anchor" href='#index-truc'>
¶</a></span></dt>
<dt class="deffnx def-cmd-deffn" id="index-log-trap"><span
class="category-def">Command: </span><span><strong class="strong">log
trap</strong> <em class="emph"></em><a class="copiable-anchor"
href='#index-log-trap'> ¶</a></span></dt>
<dt class="deffnx def-cmd-deffn" id="index-log-trap1"><span
class="category-def">Command: </span><span><strong class="strong">log
trap1</strong> <em class="emph"></em><a class="copiable-anchor"
href='#index-log-trap1'> ¶</a></span></dt>
@@ -3714,7 +3714,7 @@ ref</a>
<dl class="ftable">
<dt id='index-a-2'><span><em class="emph">a</em><a class="copiable-anchor"
href='#index-a-2'> ¶</a></span></dt>
-<dd><a class="index-entry-anchor"
id="index-index-entry-between-item-and-itemx"></a>
+<dd><a class="index-entry-id"
id="index-index-entry-between-item-and-itemx"></a>
</dd>
<dt id='index-b'><span><em class="emph">b</em><a class="copiable-anchor"
href='#index-b'> ¶</a></span></dt>
<dd><p>l–ine
@@ -3856,7 +3856,7 @@ html ''
<dl class="ftable">
<dt id='index-a-3'><span>a<a class="copiable-anchor" href='#index-a-3'>
¶</a></span></dt>
-<dd><a class="index-entry-anchor"
id="index-index-entry-between-item-and-itemx-1"></a>
+<dd><a class="index-entry-id"
id="index-index-entry-between-item-and-itemx-1"></a>
</dd>
<dt id='index-b-1'><span>b<a class="copiable-anchor" href='#index-b-1'>
¶</a></span></dt>
<dd><p>l–ine
@@ -3937,7 +3937,7 @@ kbd: <kbd
class="kbd">``simple-double--three---four----''</kbd>
`<!-- /@w -->`simple-double-<!-- /@w -->-three---four----'<!-- /@w -->'
-<a class="index-entry-anchor" id="index-_002d_002doption-1"></a><a
class="index-entry-anchor" id="index-_0060_0060-1"></a><a
class="index-entry-anchor" id="index-_0060_0060-3"></a><a
class="index-entry-anchor" id="index-_002d_002dfoption-1"></a>
+<a class="index-entry-id" id="index-_002d_002doption-1"></a><a
class="index-entry-id" id="index-_0060_0060-1"></a><a class="index-entry-id"
id="index-_0060_0060-3"></a><a class="index-entry-id"
id="index-_002d_002dfoption-1"></a>
@"u ü
@"{U} Ü
@~n ñ
@@ -4335,7 +4335,7 @@ error→ → - ∗ -| ⇒
<pre class="example-preformatted">
</pre><ul class="itemize" style="list-style-type: '\2022 a\2013 n itemize
line'">
-<li><pre class="example-preformatted"><a class="index-entry-anchor"
id="index-index-entry-within-itemize-1"></a>i--tem 1
+<li><pre class="example-preformatted"><a class="index-entry-id"
id="index-index-entry-within-itemize-1"></a>i--tem 1
</pre></li><li><pre class="example-preformatted">i--tem 2
</pre></li></ul>
<pre class="example-preformatted">
@@ -4384,7 +4384,7 @@ error→ → - ∗ -| ⇒
<thead><tr><th width="40%"><pre class="example-preformatted">mu--ltitable
headitem</pre></th><th width="60%"><pre class="example-preformatted">another
tab</pre></th></tr></thead>
<tbody><tr><td width="40%"><pre class="example-preformatted">mu--ltitable
item</pre></td><td width="60%"><pre class="example-preformatted">multitable
tab</pre></td></tr>
<tr><td width="40%"><pre class="example-preformatted">mu--ltitable item
2</pre></td><td width="60%"><pre class="example-preformatted">multitable tab 2
-<a class="index-entry-anchor"
id="index-index-entry-within-multitable-1"></a></pre></td></tr>
+<a class="index-entry-id"
id="index-index-entry-within-multitable-1"></a></pre></td></tr>
<tr><td width="40%"><pre class="example-preformatted">lone mu--ltitable
item</pre></td></tr>
</tbody>
</table>
@@ -4507,7 +4507,7 @@ f(x) = {1 \over \sigma \sqrt{2\pi}}e<sup class="sup">-{1
\over 2}\left({x-\mu \o
<pre class="example-preformatted">
</pre><dl class="first-deffn">
<dt class="deffn" id="index-i-2"><span class="category-def">fset:
</span><span><strong class="strong"><var class="var">i</var></strong> <em
class="emph">a g</em><a class="copiable-anchor" href='#index-i-2'>
¶</a></span></dt>
-<dd><pre class="example-preformatted"><a class="index-entry-anchor"
id="index-index-entry-within-deffn-1"></a></pre></dd><dt class="deffnx
def-cmd-deffn" id="index-truc-2"><span class="category-def">cmde:
</span><span><strong class="strong">truc</strong> <em class="emph"></em><a
class="copiable-anchor" href='#index-truc-2'> ¶</a></span></dt>
+<dd><pre class="example-preformatted"><a class="index-entry-id"
id="index-index-entry-within-deffn-1"></a></pre></dd><dt class="deffnx
def-cmd-deffn" id="index-truc-2"><span class="category-def">cmde:
</span><span><strong class="strong">truc</strong> <em class="emph"></em><a
class="copiable-anchor" href='#index-truc-2'> ¶</a></span></dt>
<dt class="deffnx def-cmd-deffn" id="index-log-trap-1"><span
class="category-def">Command: </span><span><strong class="strong">log
trap</strong> <em class="emph"></em><a class="copiable-anchor"
href='#index-log-trap-1'> ¶</a></span></dt>
<dt class="deffnx def-cmd-deffn" id="index-log-trap1-1"><span
class="category-def">Command: </span><span><strong class="strong">log
trap1</strong> <em class="emph"></em><a class="copiable-anchor"
href='#index-log-trap1-1'> ¶</a></span></dt>
<dt class="deffnx def-cmd-deffn" id="index-log-trap2-1"><span
class="category-def">Command: </span><span><strong class="strong">log
trap2</strong> <em class="emph"></em><a class="copiable-anchor"
href='#index-log-trap2-1'> ¶</a></span></dt>
@@ -4851,7 +4851,7 @@ ref</a>
</pre><dl class="ftable">
<dt id='index-a-5'><span><tt><em class="emph">a</em></tt><a
class="copiable-anchor" href='#index-a-5'> ¶</a></span></dt>
-<dd><pre class="example-preformatted"><a class="index-entry-anchor"
id="index-index-entry-between-item-and-itemx-2"></a></pre></dd>
+<dd><pre class="example-preformatted"><a class="index-entry-id"
id="index-index-entry-between-item-and-itemx-2"></a></pre></dd>
<dt id='index-b-2'><span><tt><em class="emph">b</em></tt><a
class="copiable-anchor" href='#index-b-2'> ¶</a></span></dt>
<dd><pre class="example-preformatted">l--ine
</pre></dd>
@@ -5017,7 +5017,7 @@ Invalid use of @':
</pre><dl class="ftable">
<dt id='index-a-6'><span><tt>a</tt><a class="copiable-anchor"
href='#index-a-6'> ¶</a></span></dt>
-<dd><pre class="example-preformatted"><a class="index-entry-anchor"
id="index-index-entry-between-item-and-itemx-3"></a></pre></dd>
+<dd><pre class="example-preformatted"><a class="index-entry-id"
id="index-index-entry-between-item-and-itemx-3"></a></pre></dd>
<dt id='index-b-3'><span><tt>b</tt><a class="copiable-anchor"
href='#index-b-3'> ¶</a></span></dt>
<dd><pre class="example-preformatted">l--ine
</pre></dd>
@@ -5093,10 +5093,10 @@ kbd: <kbd
class="kbd">``simple-double--three---four----''</kbd> <br>
</p>
<p>‘<!-- /@w -->‘simple-double-<!-- /@w
-->-three—four—-’<!-- /@w -->’<br>
</p>
-<a class="index-entry-anchor" id="index-copying-_002d_002doption"></a>
-<a class="index-entry-anchor" id="index-copying-_0060_0060"></a>
-<a class="index-entry-anchor" id="index-copying-_0060_0060-1"></a>
-<a class="index-entry-anchor" id="index-copying-_002d_002dfoption"></a>
+<a class="index-entry-id" id="index-copying-_002d_002doption"></a>
+<a class="index-entry-id" id="index-copying-_0060_0060"></a>
+<a class="index-entry-id" id="index-copying-_0060_0060-1"></a>
+<a class="index-entry-id" id="index-copying-_002d_002dfoption"></a>
<p>@"u ü
@"{U} Ü
@@ -5455,7 +5455,7 @@ error→ → - ∗ -| ⇒
</li></ul>
<ul class="itemize" style="list-style-type: '\2022 a\2013 n itemize line'">
-<li><a class="index-entry-anchor"
id="index-copying-index-entry-within-itemize"></a>
+<li><a class="index-entry-id"
id="index-copying-index-entry-within-itemize"></a>
i–tem 1
</li><li>i–tem 2
</li></ul>
@@ -5497,7 +5497,7 @@ i–tem 1
<thead><tr><th width="40%">mu–ltitable headitem</th><th
width="60%">another tab</th></tr></thead>
<tbody><tr><td width="40%">mu–ltitable item</td><td
width="60%">multitable tab</td></tr>
<tr><td width="40%">mu–ltitable item 2</td><td width="60%">multitable
tab 2
-<a class="index-entry-anchor"
id="index-copying-index-entry-within-multitable"></a></td></tr>
+<a class="index-entry-id"
id="index-copying-index-entry-within-multitable"></a></td></tr>
<tr><td width="40%">lone mu–ltitable item</td></tr>
</tbody>
</table>
@@ -5598,7 +5598,7 @@ f(x) = {1 \over \sigma \sqrt{2\pi}}e<sup class="sup">-{1
\over 2}\left({x-\mu \o
<dl class="first-deffn">
<dt class="deffn" id="index-copying-i"><span class="category-def">fset:
</span><span><strong class="strong"><var class="var">i</var></strong> <em
class="emph">a g</em><a class="copiable-anchor" href='#index-copying-i'>
¶</a></span></dt>
-<dd><a class="index-entry-anchor"
id="index-copying-index-entry-within-deffn"></a>
+<dd><a class="index-entry-id" id="index-copying-index-entry-within-deffn"></a>
</dd><dt class="deffnx def-cmd-deffn" id="index-copying-truc"><span
class="category-def">cmde: </span><span><strong class="strong">truc</strong>
<em class="emph"></em><a class="copiable-anchor" href='#index-copying-truc'>
¶</a></span></dt>
<dt class="deffnx def-cmd-deffn" id="index-copying-log-trap"><span
class="category-def">Command: </span><span><strong class="strong">log
trap</strong> <em class="emph"></em><a class="copiable-anchor"
href='#index-copying-log-trap'> ¶</a></span></dt>
<dt class="deffnx def-cmd-deffn" id="index-copying-log-trap1"><span
class="category-def">Command: </span><span><strong class="strong">log
trap1</strong> <em class="emph"></em><a class="copiable-anchor"
href='#index-copying-log-trap1'> ¶</a></span></dt>
@@ -5891,7 +5891,7 @@ ref</a>
<dl class="ftable">
<dt id='index-copying-a-1'><span><em class="emph">a</em><a
class="copiable-anchor" href='#index-copying-a-1'> ¶</a></span></dt>
-<dd><a class="index-entry-anchor"
id="index-copying-index-entry-between-item-and-itemx"></a>
+<dd><a class="index-entry-id"
id="index-copying-index-entry-between-item-and-itemx"></a>
</dd>
<dt id='index-copying-b'><span><em class="emph">b</em><a
class="copiable-anchor" href='#index-copying-b'> ¶</a></span></dt>
<dd><p>l–ine
@@ -6033,7 +6033,7 @@ html ''
<dl class="ftable">
<dt id='index-copying-a-2'><span>a<a class="copiable-anchor"
href='#index-copying-a-2'> ¶</a></span></dt>
-<dd><a class="index-entry-anchor"
id="index-copying-index-entry-between-item-and-itemx-1"></a>
+<dd><a class="index-entry-id"
id="index-copying-index-entry-between-item-and-itemx-1"></a>
</dd>
<dt id='index-copying-b-1'><span>b<a class="copiable-anchor"
href='#index-copying-b-1'> ¶</a></span></dt>
<dd><p>l–ine
@@ -6090,16 +6090,16 @@ html ''
</p>
-<a class="index-entry-anchor" id="index-t_002d_002druc"></a>
-<a class="index-entry-anchor" id="index-T_002d_002druc"></a>
-<a class="index-entry-anchor" id="index-_002e"></a>
-<a class="index-entry-anchor" id="index-_003f"></a>
-<a class="index-entry-anchor" id="index-a"></a>
-<a class="index-entry-anchor" id="index-t_002d_002druc-1"></a>
-<a class="index-entry-anchor" id="index-T_002d_002druc-1"></a>
-<a class="index-entry-anchor" id="index-_002e-1"></a>
-<a class="index-entry-anchor" id="index-_003f-1"></a>
-<a class="index-entry-anchor" id="index-a-7"></a>
+<a class="index-entry-id" id="index-t_002d_002druc"></a>
+<a class="index-entry-id" id="index-T_002d_002druc"></a>
+<a class="index-entry-id" id="index-_002e"></a>
+<a class="index-entry-id" id="index-_003f"></a>
+<a class="index-entry-id" id="index-a"></a>
+<a class="index-entry-id" id="index-t_002d_002druc-1"></a>
+<a class="index-entry-id" id="index-T_002d_002druc-1"></a>
+<a class="index-entry-id" id="index-_002e-1"></a>
+<a class="index-entry-id" id="index-_003f-1"></a>
+<a class="index-entry-id" id="index-a-7"></a>
<p>cp
diff --git a/tp/tests/layout/res_parser/formatting_weird_quotes/formatting.html
b/tp/tests/layout/res_parser/formatting_weird_quotes/formatting.html
index 414ec42e1f..546f3a1c34 100644
--- a/tp/tests/layout/res_parser/formatting_weird_quotes/formatting.html
+++ b/tp/tests/layout/res_parser/formatting_weird_quotes/formatting.html
@@ -853,10 +853,10 @@ kbd: <kbd
class="kbd">``simple-double--three---four----''</kbd> <br>
</p>
<p>‘<!-- /@w -->‘simple-double-<!-- /@w
-->-three—four—-’<!-- /@w -->’<br>
</p>
-<a class="index-entry-anchor" id="index-titlepage-_002d_002doption"></a>
-<a class="index-entry-anchor" id="index-titlepage-_0060_0060"></a>
-<a class="index-entry-anchor" id="index-titlepage-_0060_0060-1"></a>
-<a class="index-entry-anchor" id="index-titlepage-_002d_002dfoption"></a>
+<a class="index-entry-id" id="index-titlepage-_002d_002doption"></a>
+<a class="index-entry-id" id="index-titlepage-_0060_0060"></a>
+<a class="index-entry-id" id="index-titlepage-_0060_0060-1"></a>
+<a class="index-entry-id" id="index-titlepage-_002d_002dfoption"></a>
<p>@"u ü
@"{U} Ü
@@ -1216,7 +1216,7 @@ error→ → - ∗ -| ⇒
</li></ul>
<ul class="itemize" style="list-style-type: '\2022 a\2013 n itemize line'">
-<li><a class="index-entry-anchor"
id="index-titlepage-index-entry-within-itemize"></a>
+<li><a class="index-entry-id"
id="index-titlepage-index-entry-within-itemize"></a>
i–tem 1
</li><li>i–tem 2
</li></ul>
@@ -1258,7 +1258,7 @@ i–tem 1
<thead><tr><th width="40%">mu–ltitable headitem</th><th
width="60%">another tab</th></tr></thead>
<tbody><tr><td width="40%">mu–ltitable item</td><td
width="60%">multitable tab</td></tr>
<tr><td width="40%">mu–ltitable item 2</td><td width="60%">multitable
tab 2
-<a class="index-entry-anchor"
id="index-titlepage-index-entry-within-multitable"></a></td></tr>
+<a class="index-entry-id"
id="index-titlepage-index-entry-within-multitable"></a></td></tr>
<tr><td width="40%">lone mu–ltitable item</td></tr>
</tbody>
</table>
@@ -1359,7 +1359,7 @@ f(x) = {1 \over \sigma \sqrt{2\pi}}e<sup class="sup">-{1
\over 2}\left({x-\mu \o
<dl class="first-deffn">
<dt class="deffn" id="index-titlepage-i"><span class="category-def">fset:
</span><span><strong class="strong"><var class="var">i</var></strong> <em
class="emph">a g</em><a class="copiable-anchor" href='#index-titlepage-i'>
¶</a></span></dt>
-<dd><a class="index-entry-anchor"
id="index-titlepage-index-entry-within-deffn"></a>
+<dd><a class="index-entry-id"
id="index-titlepage-index-entry-within-deffn"></a>
</dd><dt class="deffnx def-cmd-deffn" id="index-titlepage-truc"><span
class="category-def">cmde: </span><span><strong class="strong">truc</strong>
<em class="emph"></em><a class="copiable-anchor" href='#index-titlepage-truc'>
¶</a></span></dt>
<dt class="deffnx def-cmd-deffn" id="index-titlepage-log-trap"><span
class="category-def">Command: </span><span><strong class="strong">log
trap</strong> <em class="emph"></em><a class="copiable-anchor"
href='#index-titlepage-log-trap'> ¶</a></span></dt>
<dt class="deffnx def-cmd-deffn" id="index-titlepage-log-trap1"><span
class="category-def">Command: </span><span><strong class="strong">log
trap1</strong> <em class="emph"></em><a class="copiable-anchor"
href='#index-titlepage-log-trap1'> ¶</a></span></dt>
@@ -1652,7 +1652,7 @@ ref</a>
<dl class="ftable">
<dt id='index-titlepage-a-1'><span><em class="emph">a</em><a
class="copiable-anchor" href='#index-titlepage-a-1'> ¶</a></span></dt>
-<dd><a class="index-entry-anchor"
id="index-titlepage-index-entry-between-item-and-itemx"></a>
+<dd><a class="index-entry-id"
id="index-titlepage-index-entry-between-item-and-itemx"></a>
</dd>
<dt id='index-titlepage-b'><span><em class="emph">b</em><a
class="copiable-anchor" href='#index-titlepage-b'> ¶</a></span></dt>
<dd><p>l–ine
@@ -1794,7 +1794,7 @@ html ''
<dl class="ftable">
<dt id='index-titlepage-a-2'><span>a<a class="copiable-anchor"
href='#index-titlepage-a-2'> ¶</a></span></dt>
-<dd><a class="index-entry-anchor"
id="index-titlepage-index-entry-between-item-and-itemx-1"></a>
+<dd><a class="index-entry-id"
id="index-titlepage-index-entry-between-item-and-itemx-1"></a>
</dd>
<dt id='index-titlepage-b-1'><span>b<a class="copiable-anchor"
href='#index-titlepage-b-1'> ¶</a></span></dt>
<dd><p>l–ine
@@ -1869,10 +1869,10 @@ kbd: <kbd
class="kbd">``simple-double--three---four----''</kbd> <br>
</p>
<p>‘<!-- /@w -->‘simple-double-<!-- /@w
-->-three—four—-’<!-- /@w -->’<br>
</p>
-<a class="index-entry-anchor" id="index-copying-_002d_002doption"></a>
-<a class="index-entry-anchor" id="index-copying-_0060_0060"></a>
-<a class="index-entry-anchor" id="index-copying-_0060_0060-1"></a>
-<a class="index-entry-anchor" id="index-copying-_002d_002dfoption"></a>
+<a class="index-entry-id" id="index-copying-_002d_002doption"></a>
+<a class="index-entry-id" id="index-copying-_0060_0060"></a>
+<a class="index-entry-id" id="index-copying-_0060_0060-1"></a>
+<a class="index-entry-id" id="index-copying-_002d_002dfoption"></a>
<p>@"u ü
@"{U} Ü
@@ -2231,7 +2231,7 @@ error→ → - ∗ -| ⇒
</li></ul>
<ul class="itemize" style="list-style-type: '\2022 a\2013 n itemize line'">
-<li><a class="index-entry-anchor"
id="index-copying-index-entry-within-itemize"></a>
+<li><a class="index-entry-id"
id="index-copying-index-entry-within-itemize"></a>
i–tem 1
</li><li>i–tem 2
</li></ul>
@@ -2273,7 +2273,7 @@ i–tem 1
<thead><tr><th width="40%">mu–ltitable headitem</th><th
width="60%">another tab</th></tr></thead>
<tbody><tr><td width="40%">mu–ltitable item</td><td
width="60%">multitable tab</td></tr>
<tr><td width="40%">mu–ltitable item 2</td><td width="60%">multitable
tab 2
-<a class="index-entry-anchor"
id="index-copying-index-entry-within-multitable"></a></td></tr>
+<a class="index-entry-id"
id="index-copying-index-entry-within-multitable"></a></td></tr>
<tr><td width="40%">lone mu–ltitable item</td></tr>
</tbody>
</table>
@@ -2374,7 +2374,7 @@ f(x) = {1 \over \sigma \sqrt{2\pi}}e<sup class="sup">-{1
\over 2}\left({x-\mu \o
<dl class="first-deffn">
<dt class="deffn" id="index-copying-i"><span class="category-def">fset:
</span><span><strong class="strong"><var class="var">i</var></strong> <em
class="emph">a g</em><a class="copiable-anchor" href='#index-copying-i'>
¶</a></span></dt>
-<dd><a class="index-entry-anchor"
id="index-copying-index-entry-within-deffn"></a>
+<dd><a class="index-entry-id" id="index-copying-index-entry-within-deffn"></a>
</dd><dt class="deffnx def-cmd-deffn" id="index-copying-truc"><span
class="category-def">cmde: </span><span><strong class="strong">truc</strong>
<em class="emph"></em><a class="copiable-anchor" href='#index-copying-truc'>
¶</a></span></dt>
<dt class="deffnx def-cmd-deffn" id="index-copying-log-trap"><span
class="category-def">Command: </span><span><strong class="strong">log
trap</strong> <em class="emph"></em><a class="copiable-anchor"
href='#index-copying-log-trap'> ¶</a></span></dt>
<dt class="deffnx def-cmd-deffn" id="index-copying-log-trap1"><span
class="category-def">Command: </span><span><strong class="strong">log
trap1</strong> <em class="emph"></em><a class="copiable-anchor"
href='#index-copying-log-trap1'> ¶</a></span></dt>
@@ -2667,7 +2667,7 @@ ref</a>
<dl class="ftable">
<dt id='index-copying-a-1'><span><em class="emph">a</em><a
class="copiable-anchor" href='#index-copying-a-1'> ¶</a></span></dt>
-<dd><a class="index-entry-anchor"
id="index-copying-index-entry-between-item-and-itemx"></a>
+<dd><a class="index-entry-id"
id="index-copying-index-entry-between-item-and-itemx"></a>
</dd>
<dt id='index-copying-b'><span><em class="emph">b</em><a
class="copiable-anchor" href='#index-copying-b'> ¶</a></span></dt>
<dd><p>l–ine
@@ -2809,7 +2809,7 @@ html ''
<dl class="ftable">
<dt id='index-copying-a-2'><span>a<a class="copiable-anchor"
href='#index-copying-a-2'> ¶</a></span></dt>
-<dd><a class="index-entry-anchor"
id="index-copying-index-entry-between-item-and-itemx-1"></a>
+<dd><a class="index-entry-id"
id="index-copying-index-entry-between-item-and-itemx-1"></a>
</dd>
<dt id='index-copying-b-1'><span>b<a class="copiable-anchor"
href='#index-copying-b-1'> ¶</a></span></dt>
<dd><p>l–ine
@@ -2940,10 +2940,10 @@ kbd: <kbd
class="kbd">``simple-double--three---four----''</kbd> <br>
</p>
<p>‘<!-- /@w -->‘simple-double-<!-- /@w
-->-three—four—-’<!-- /@w -->’<br>
</p>
-<a class="index-entry-anchor" id="index-copying-_002d_002doption"></a>
-<a class="index-entry-anchor" id="index-copying-_0060_0060"></a>
-<a class="index-entry-anchor" id="index-copying-_0060_0060-1"></a>
-<a class="index-entry-anchor" id="index-copying-_002d_002dfoption"></a>
+<a class="index-entry-id" id="index-copying-_002d_002doption"></a>
+<a class="index-entry-id" id="index-copying-_0060_0060"></a>
+<a class="index-entry-id" id="index-copying-_0060_0060-1"></a>
+<a class="index-entry-id" id="index-copying-_002d_002dfoption"></a>
<p>@"u ü
@"{U} Ü
@@ -3302,7 +3302,7 @@ error→ → - ∗ -| ⇒
</li></ul>
<ul class="itemize" style="list-style-type: '\2022 a\2013 n itemize line'">
-<li><a class="index-entry-anchor"
id="index-copying-index-entry-within-itemize"></a>
+<li><a class="index-entry-id"
id="index-copying-index-entry-within-itemize"></a>
i–tem 1
</li><li>i–tem 2
</li></ul>
@@ -3344,7 +3344,7 @@ i–tem 1
<thead><tr><th width="40%">mu–ltitable headitem</th><th
width="60%">another tab</th></tr></thead>
<tbody><tr><td width="40%">mu–ltitable item</td><td
width="60%">multitable tab</td></tr>
<tr><td width="40%">mu–ltitable item 2</td><td width="60%">multitable
tab 2
-<a class="index-entry-anchor"
id="index-copying-index-entry-within-multitable"></a></td></tr>
+<a class="index-entry-id"
id="index-copying-index-entry-within-multitable"></a></td></tr>
<tr><td width="40%">lone mu–ltitable item</td></tr>
</tbody>
</table>
@@ -3445,7 +3445,7 @@ f(x) = {1 \over \sigma \sqrt{2\pi}}e<sup class="sup">-{1
\over 2}\left({x-\mu \o
<dl class="first-deffn">
<dt class="deffn" id="index-copying-i"><span class="category-def">fset:
</span><span><strong class="strong"><var class="var">i</var></strong> <em
class="emph">a g</em><a class="copiable-anchor" href='#index-copying-i'>
¶</a></span></dt>
-<dd><a class="index-entry-anchor"
id="index-copying-index-entry-within-deffn"></a>
+<dd><a class="index-entry-id" id="index-copying-index-entry-within-deffn"></a>
</dd><dt class="deffnx def-cmd-deffn" id="index-copying-truc"><span
class="category-def">cmde: </span><span><strong class="strong">truc</strong>
<em class="emph"></em><a class="copiable-anchor" href='#index-copying-truc'>
¶</a></span></dt>
<dt class="deffnx def-cmd-deffn" id="index-copying-log-trap"><span
class="category-def">Command: </span><span><strong class="strong">log
trap</strong> <em class="emph"></em><a class="copiable-anchor"
href='#index-copying-log-trap'> ¶</a></span></dt>
<dt class="deffnx def-cmd-deffn" id="index-copying-log-trap1"><span
class="category-def">Command: </span><span><strong class="strong">log
trap1</strong> <em class="emph"></em><a class="copiable-anchor"
href='#index-copying-log-trap1'> ¶</a></span></dt>
@@ -3738,7 +3738,7 @@ ref</a>
<dl class="ftable">
<dt id='index-copying-a-1'><span><em class="emph">a</em><a
class="copiable-anchor" href='#index-copying-a-1'> ¶</a></span></dt>
-<dd><a class="index-entry-anchor"
id="index-copying-index-entry-between-item-and-itemx"></a>
+<dd><a class="index-entry-id"
id="index-copying-index-entry-between-item-and-itemx"></a>
</dd>
<dt id='index-copying-b'><span><em class="emph">b</em><a
class="copiable-anchor" href='#index-copying-b'> ¶</a></span></dt>
<dd><p>l–ine
@@ -3880,7 +3880,7 @@ html ''
<dl class="ftable">
<dt id='index-copying-a-2'><span>a<a class="copiable-anchor"
href='#index-copying-a-2'> ¶</a></span></dt>
-<dd><a class="index-entry-anchor"
id="index-copying-index-entry-between-item-and-itemx-1"></a>
+<dd><a class="index-entry-id"
id="index-copying-index-entry-between-item-and-itemx-1"></a>
</dd>
<dt id='index-copying-b-1'><span>b<a class="copiable-anchor"
href='#index-copying-b-1'> ¶</a></span></dt>
<dd><p>l–ine
@@ -3954,10 +3954,10 @@ kbd: <kbd
class="kbd">``simple-double--three---four----''</kbd> <br>
</p>
<p>‘<!-- /@w -->‘simple-double-<!-- /@w
-->-three—four—-’<!-- /@w -->’<br>
</p>
-<a class="index-entry-anchor" id="index-_002d_002doption"></a>
-<a class="index-entry-anchor" id="index-_0060_0060"></a>
-<a class="index-entry-anchor" id="index-_0060_0060-2"></a>
-<a class="index-entry-anchor" id="index-_002d_002dfoption"></a>
+<a class="index-entry-id" id="index-_002d_002doption"></a>
+<a class="index-entry-id" id="index-_0060_0060"></a>
+<a class="index-entry-id" id="index-_0060_0060-2"></a>
+<a class="index-entry-id" id="index-_002d_002dfoption"></a>
<p>@"u ü
@"{U} Ü
@@ -4316,7 +4316,7 @@ error→ → - ∗ -| ⇒
</li></ul>
<ul class="itemize" style="list-style-type: '\2022 a\2013 n itemize line'">
-<li><a class="index-entry-anchor" id="index-index-entry-within-itemize"></a>
+<li><a class="index-entry-id" id="index-index-entry-within-itemize"></a>
i–tem 1
</li><li>i–tem 2
</li></ul>
@@ -4358,7 +4358,7 @@ i–tem 1
<thead><tr><th width="40%">mu–ltitable headitem</th><th
width="60%">another tab</th></tr></thead>
<tbody><tr><td width="40%">mu–ltitable item</td><td
width="60%">multitable tab</td></tr>
<tr><td width="40%">mu–ltitable item 2</td><td width="60%">multitable
tab 2
-<a class="index-entry-anchor"
id="index-index-entry-within-multitable"></a></td></tr>
+<a class="index-entry-id"
id="index-index-entry-within-multitable"></a></td></tr>
<tr><td width="40%">lone mu–ltitable item</td></tr>
</tbody>
</table>
@@ -4459,7 +4459,7 @@ f(x) = {1 \over \sigma \sqrt{2\pi}}e<sup class="sup">-{1
\over 2}\left({x-\mu \o
<dl class="first-deffn">
<dt class="deffn" id="index-i"><span class="category-def">fset:
</span><span><strong class="strong"><var class="var">i</var></strong> <em
class="emph">a g</em><a class="copiable-anchor" href='#index-i'>
¶</a></span></dt>
-<dd><a class="index-entry-anchor" id="index-index-entry-within-deffn"></a>
+<dd><a class="index-entry-id" id="index-index-entry-within-deffn"></a>
</dd><dt class="deffnx def-cmd-deffn" id="index-truc"><span
class="category-def">cmde: </span><span><strong class="strong">truc</strong>
<em class="emph"></em><a class="copiable-anchor" href='#index-truc'>
¶</a></span></dt>
<dt class="deffnx def-cmd-deffn" id="index-log-trap"><span
class="category-def">Command: </span><span><strong class="strong">log
trap</strong> <em class="emph"></em><a class="copiable-anchor"
href='#index-log-trap'> ¶</a></span></dt>
<dt class="deffnx def-cmd-deffn" id="index-log-trap1"><span
class="category-def">Command: </span><span><strong class="strong">log
trap1</strong> <em class="emph"></em><a class="copiable-anchor"
href='#index-log-trap1'> ¶</a></span></dt>
@@ -4752,7 +4752,7 @@ ref</a>
<dl class="ftable">
<dt id='index-a-2'><span><em class="emph">a</em><a class="copiable-anchor"
href='#index-a-2'> ¶</a></span></dt>
-<dd><a class="index-entry-anchor"
id="index-index-entry-between-item-and-itemx"></a>
+<dd><a class="index-entry-id"
id="index-index-entry-between-item-and-itemx"></a>
</dd>
<dt id='index-b'><span><em class="emph">b</em><a class="copiable-anchor"
href='#index-b'> ¶</a></span></dt>
<dd><p>l–ine
@@ -4894,7 +4894,7 @@ html ''
<dl class="ftable">
<dt id='index-a-3'><span>a<a class="copiable-anchor" href='#index-a-3'>
¶</a></span></dt>
-<dd><a class="index-entry-anchor"
id="index-index-entry-between-item-and-itemx-1"></a>
+<dd><a class="index-entry-id"
id="index-index-entry-between-item-and-itemx-1"></a>
</dd>
<dt id='index-b-1'><span>b<a class="copiable-anchor" href='#index-b-1'>
¶</a></span></dt>
<dd><p>l–ine
@@ -4976,7 +4976,7 @@ kbd: <kbd
class="kbd">``simple-double--three---four----''</kbd>
`<!-- /@w -->`simple-double-<!-- /@w -->-three---four----'<!-- /@w -->'
-<a class="index-entry-anchor" id="index-_002d_002doption-1"></a><a
class="index-entry-anchor" id="index-_0060_0060-1"></a><a
class="index-entry-anchor" id="index-_0060_0060-3"></a><a
class="index-entry-anchor" id="index-_002d_002dfoption-1"></a>
+<a class="index-entry-id" id="index-_002d_002doption-1"></a><a
class="index-entry-id" id="index-_0060_0060-1"></a><a class="index-entry-id"
id="index-_0060_0060-3"></a><a class="index-entry-id"
id="index-_002d_002dfoption-1"></a>
@"u ü
@"{U} Ü
@~n ñ
@@ -5374,7 +5374,7 @@ error→ → - ∗ -| ⇒
<pre class="example-preformatted">
</pre><ul class="itemize" style="list-style-type: '\2022 a\2013 n itemize
line'">
-<li><pre class="example-preformatted"><a class="index-entry-anchor"
id="index-index-entry-within-itemize-1"></a>i--tem 1
+<li><pre class="example-preformatted"><a class="index-entry-id"
id="index-index-entry-within-itemize-1"></a>i--tem 1
</pre></li><li><pre class="example-preformatted">i--tem 2
</pre></li></ul>
<pre class="example-preformatted">
@@ -5423,7 +5423,7 @@ error→ → - ∗ -| ⇒
<thead><tr><th width="40%"><pre class="example-preformatted">mu--ltitable
headitem</pre></th><th width="60%"><pre class="example-preformatted">another
tab</pre></th></tr></thead>
<tbody><tr><td width="40%"><pre class="example-preformatted">mu--ltitable
item</pre></td><td width="60%"><pre class="example-preformatted">multitable
tab</pre></td></tr>
<tr><td width="40%"><pre class="example-preformatted">mu--ltitable item
2</pre></td><td width="60%"><pre class="example-preformatted">multitable tab 2
-<a class="index-entry-anchor"
id="index-index-entry-within-multitable-1"></a></pre></td></tr>
+<a class="index-entry-id"
id="index-index-entry-within-multitable-1"></a></pre></td></tr>
<tr><td width="40%"><pre class="example-preformatted">lone mu--ltitable
item</pre></td></tr>
</tbody>
</table>
@@ -5546,7 +5546,7 @@ f(x) = {1 \over \sigma \sqrt{2\pi}}e<sup class="sup">-{1
\over 2}\left({x-\mu \o
<pre class="example-preformatted">
</pre><dl class="first-deffn">
<dt class="deffn" id="index-i-2"><span class="category-def">fset:
</span><span><strong class="strong"><var class="var">i</var></strong> <em
class="emph">a g</em><a class="copiable-anchor" href='#index-i-2'>
¶</a></span></dt>
-<dd><pre class="example-preformatted"><a class="index-entry-anchor"
id="index-index-entry-within-deffn-1"></a></pre></dd><dt class="deffnx
def-cmd-deffn" id="index-truc-2"><span class="category-def">cmde:
</span><span><strong class="strong">truc</strong> <em class="emph"></em><a
class="copiable-anchor" href='#index-truc-2'> ¶</a></span></dt>
+<dd><pre class="example-preformatted"><a class="index-entry-id"
id="index-index-entry-within-deffn-1"></a></pre></dd><dt class="deffnx
def-cmd-deffn" id="index-truc-2"><span class="category-def">cmde:
</span><span><strong class="strong">truc</strong> <em class="emph"></em><a
class="copiable-anchor" href='#index-truc-2'> ¶</a></span></dt>
<dt class="deffnx def-cmd-deffn" id="index-log-trap-1"><span
class="category-def">Command: </span><span><strong class="strong">log
trap</strong> <em class="emph"></em><a class="copiable-anchor"
href='#index-log-trap-1'> ¶</a></span></dt>
<dt class="deffnx def-cmd-deffn" id="index-log-trap1-1"><span
class="category-def">Command: </span><span><strong class="strong">log
trap1</strong> <em class="emph"></em><a class="copiable-anchor"
href='#index-log-trap1-1'> ¶</a></span></dt>
<dt class="deffnx def-cmd-deffn" id="index-log-trap2-1"><span
class="category-def">Command: </span><span><strong class="strong">log
trap2</strong> <em class="emph"></em><a class="copiable-anchor"
href='#index-log-trap2-1'> ¶</a></span></dt>
@@ -5890,7 +5890,7 @@ ref</a>
</pre><dl class="ftable">
<dt id='index-a-5'><span><tt><em class="emph">a</em></tt><a
class="copiable-anchor" href='#index-a-5'> ¶</a></span></dt>
-<dd><pre class="example-preformatted"><a class="index-entry-anchor"
id="index-index-entry-between-item-and-itemx-2"></a></pre></dd>
+<dd><pre class="example-preformatted"><a class="index-entry-id"
id="index-index-entry-between-item-and-itemx-2"></a></pre></dd>
<dt id='index-b-2'><span><tt><em class="emph">b</em></tt><a
class="copiable-anchor" href='#index-b-2'> ¶</a></span></dt>
<dd><pre class="example-preformatted">l--ine
</pre></dd>
@@ -6056,7 +6056,7 @@ Invalid use of @':
</pre><dl class="ftable">
<dt id='index-a-6'><span><tt>a</tt><a class="copiable-anchor"
href='#index-a-6'> ¶</a></span></dt>
-<dd><pre class="example-preformatted"><a class="index-entry-anchor"
id="index-index-entry-between-item-and-itemx-3"></a></pre></dd>
+<dd><pre class="example-preformatted"><a class="index-entry-id"
id="index-index-entry-between-item-and-itemx-3"></a></pre></dd>
<dt id='index-b-3'><span><tt>b</tt><a class="copiable-anchor"
href='#index-b-3'> ¶</a></span></dt>
<dd><pre class="example-preformatted">l--ine
</pre></dd>
@@ -6115,38 +6115,38 @@ Invalid use of @':
</pre></div>
-<a class="index-entry-anchor" id="index-t_002d_002druc"></a>
-<a class="index-entry-anchor" id="index-T_002d_002druc"></a>
-<a class="index-entry-anchor" id="index-_002e"></a>
-<a class="index-entry-anchor" id="index-_003f"></a>
-<a class="index-entry-anchor" id="index-a"></a>
-<a class="index-entry-anchor" id="index-t_002d_002druc-1"></a>
-<a class="index-entry-anchor" id="index-T_002d_002druc-1"></a>
-<a class="index-entry-anchor" id="index-_002e-1"></a>
-<a class="index-entry-anchor" id="index-_003f-1"></a>
-<a class="index-entry-anchor" id="index-a-7"></a>
+<a class="index-entry-id" id="index-t_002d_002druc"></a>
+<a class="index-entry-id" id="index-T_002d_002druc"></a>
+<a class="index-entry-id" id="index-_002e"></a>
+<a class="index-entry-id" id="index-_003f"></a>
+<a class="index-entry-id" id="index-a"></a>
+<a class="index-entry-id" id="index-t_002d_002druc-1"></a>
+<a class="index-entry-id" id="index-T_002d_002druc-1"></a>
+<a class="index-entry-id" id="index-_002e-1"></a>
+<a class="index-entry-id" id="index-_003f-1"></a>
+<a class="index-entry-id" id="index-a-7"></a>
-<a class="index-entry-anchor" id="index-a_002d_002d_002da"></a>
-<a class="index-entry-anchor" id="index-b_002d_002d_002db"></a>
-<a class="index-entry-anchor" id="index-d_002d_002d_002ddd"></a>
-<a class="index-entry-anchor" id="index-g_002d_002d_002dgg"></a>
+<a class="index-entry-id" id="index-a_002d_002d_002da"></a>
+<a class="index-entry-id" id="index-b_002d_002d_002db"></a>
+<a class="index-entry-id" id="index-d_002d_002d_002ddd"></a>
+<a class="index-entry-id" id="index-g_002d_002d_002dgg"></a>
-<a class="index-entry-anchor" id="index-f_002d_002d_002daa"></a>
-<a class="index-entry-anchor" id="index-f_002d_002d_002dbb"></a>
-<a class="index-entry-anchor" id="index-f_002d_002d_002dddd"></a>
-<a class="index-entry-anchor" id="index-f_002d_002d_002dggg"></a>
+<a class="index-entry-id" id="index-f_002d_002d_002daa"></a>
+<a class="index-entry-id" id="index-f_002d_002d_002dbb"></a>
+<a class="index-entry-id" id="index-f_002d_002d_002dddd"></a>
+<a class="index-entry-id" id="index-f_002d_002d_002dggg"></a>
-<a class="index-entry-anchor" id="index-aaa"></a>
+<a class="index-entry-id" id="index-aaa"></a>
-<a class="index-entry-anchor" id="index-xxx"></a>
+<a class="index-entry-id" id="index-xxx"></a>
-<a class="index-entry-anchor" id="index-"></a>
+<a class="index-entry-id" id="index-"></a>
-<a class="index-entry-anchor"
id="index-a-index_002d_002d_002dentry-te-_002d_002d_002d-i"></a>
+<a class="index-entry-id"
id="index-a-index_002d_002d_002dentry-te-_002d_002d_002d-i"></a>
-<a class="index-entry-anchor" id="index-truc-4"></a>
+<a class="index-entry-id" id="index-truc-4"></a>
<p>Text<a class="footnote" id="DOCF9" href="#FOOT9"><sup>11</sup></a>
@@ -7441,13 +7441,13 @@ Menu comment
<p>in footnote2</p>
<h5><a id="FOOT9" href="#DOCF9">(11)</a></h5>
<p>in footnote
-<a class="index-entry-anchor" id="index-index-entry-in-footnote"></a>
+<a class="index-entry-id" id="index-index-entry-in-footnote"></a>
</p>
<p>Blah
</p>
<p>Blih
</p>
-<a class="index-entry-anchor" id="index-counting-entry"></a>
+<a class="index-entry-id" id="index-counting-entry"></a>
<h5><a id="FOOT10" href="#DOCF10">(12)</a></h5>
<p>in footnote</p>
</div><hr>
diff --git a/tp/tests/layout/res_parser/formatting_xhtml/formatting.html
b/tp/tests/layout/res_parser/formatting_xhtml/formatting.html
index 40baac6215..d34cbbd58c 100644
--- a/tp/tests/layout/res_parser/formatting_xhtml/formatting.html
+++ b/tp/tests/layout/res_parser/formatting_xhtml/formatting.html
@@ -853,10 +853,10 @@ kbd: <kbd
class="kbd">``simple-double--three---four----''</kbd> <br/>
</p>
<p>‘<!-- /@w -->‘simple-double-<!-- /@w
-->-three—four—-’<!-- /@w -->’<br/>
</p>
-<a class="index-entry-anchor" id="index-titlepage-_002d_002doption"></a>
-<a class="index-entry-anchor" id="index-titlepage-_0060_0060"></a>
-<a class="index-entry-anchor" id="index-titlepage-_0060_0060-1"></a>
-<a class="index-entry-anchor" id="index-titlepage-_002d_002dfoption"></a>
+<a class="index-entry-id" id="index-titlepage-_002d_002doption"></a>
+<a class="index-entry-id" id="index-titlepage-_0060_0060"></a>
+<a class="index-entry-id" id="index-titlepage-_0060_0060-1"></a>
+<a class="index-entry-id" id="index-titlepage-_002d_002dfoption"></a>
<p>@"u ü
@"{U} Ü
@@ -1216,7 +1216,7 @@ error→ → - ∗ -| ⇒
</li></ul>
<ul class="itemize" style="list-style-type: '\2022 a\2013 n itemize line'">
-<li><a class="index-entry-anchor"
id="index-titlepage-index-entry-within-itemize"></a>
+<li><a class="index-entry-id"
id="index-titlepage-index-entry-within-itemize"></a>
i–tem 1
</li><li>i–tem 2
</li></ul>
@@ -1258,7 +1258,7 @@ i–tem 1
<thead><tr><th width="40%">mu–ltitable headitem</th><th
width="60%">another tab</th></tr></thead>
<tbody><tr><td width="40%">mu–ltitable item</td><td
width="60%">multitable tab</td></tr>
<tr><td width="40%">mu–ltitable item 2</td><td width="60%">multitable
tab 2
-<a class="index-entry-anchor"
id="index-titlepage-index-entry-within-multitable"></a></td></tr>
+<a class="index-entry-id"
id="index-titlepage-index-entry-within-multitable"></a></td></tr>
<tr><td width="40%">lone mu–ltitable item</td></tr>
</tbody>
</table>
@@ -1359,7 +1359,7 @@ f(x) = {1 \over \sigma \sqrt{2\pi}}e<sup class="sup">-{1
\over 2}\left({x-\mu \o
<dl class="first-deffn">
<dt class="deffn" id="index-titlepage-i"><span class="category-def">fset:
</span><span><strong class="strong"><var class="var">i</var></strong> <em
class="emph">a g</em><a class="copiable-anchor" href='#index-titlepage-i'>
¶</a></span></dt>
-<dd><a class="index-entry-anchor"
id="index-titlepage-index-entry-within-deffn"></a>
+<dd><a class="index-entry-id"
id="index-titlepage-index-entry-within-deffn"></a>
</dd><dt class="deffnx def-cmd-deffn" id="index-titlepage-truc"><span
class="category-def">cmde: </span><span><strong class="strong">truc</strong>
<em class="emph"></em><a class="copiable-anchor" href='#index-titlepage-truc'>
¶</a></span></dt>
<dt class="deffnx def-cmd-deffn" id="index-titlepage-log-trap"><span
class="category-def">Command: </span><span><strong class="strong">log
trap</strong> <em class="emph"></em><a class="copiable-anchor"
href='#index-titlepage-log-trap'> ¶</a></span></dt>
<dt class="deffnx def-cmd-deffn" id="index-titlepage-log-trap1"><span
class="category-def">Command: </span><span><strong class="strong">log
trap1</strong> <em class="emph"></em><a class="copiable-anchor"
href='#index-titlepage-log-trap1'> ¶</a></span></dt>
@@ -1652,7 +1652,7 @@ ref</a>
<dl class="ftable">
<dt id='index-titlepage-a-1'><span><em class="emph">a</em><a
class="copiable-anchor" href='#index-titlepage-a-1'> ¶</a></span></dt>
-<dd><a class="index-entry-anchor"
id="index-titlepage-index-entry-between-item-and-itemx"></a>
+<dd><a class="index-entry-id"
id="index-titlepage-index-entry-between-item-and-itemx"></a>
</dd>
<dt id='index-titlepage-b'><span><em class="emph">b</em><a
class="copiable-anchor" href='#index-titlepage-b'> ¶</a></span></dt>
<dd><p>l–ine
@@ -1794,7 +1794,7 @@ html ''
<dl class="ftable">
<dt id='index-titlepage-a-2'><span>a<a class="copiable-anchor"
href='#index-titlepage-a-2'> ¶</a></span></dt>
-<dd><a class="index-entry-anchor"
id="index-titlepage-index-entry-between-item-and-itemx-1"></a>
+<dd><a class="index-entry-id"
id="index-titlepage-index-entry-between-item-and-itemx-1"></a>
</dd>
<dt id='index-titlepage-b-1'><span>b<a class="copiable-anchor"
href='#index-titlepage-b-1'> ¶</a></span></dt>
<dd><p>l–ine
@@ -1869,10 +1869,10 @@ kbd: <kbd
class="kbd">``simple-double--three---four----''</kbd> <br/>
</p>
<p>‘<!-- /@w -->‘simple-double-<!-- /@w
-->-three—four—-’<!-- /@w -->’<br/>
</p>
-<a class="index-entry-anchor" id="index-copying-_002d_002doption"></a>
-<a class="index-entry-anchor" id="index-copying-_0060_0060"></a>
-<a class="index-entry-anchor" id="index-copying-_0060_0060-1"></a>
-<a class="index-entry-anchor" id="index-copying-_002d_002dfoption"></a>
+<a class="index-entry-id" id="index-copying-_002d_002doption"></a>
+<a class="index-entry-id" id="index-copying-_0060_0060"></a>
+<a class="index-entry-id" id="index-copying-_0060_0060-1"></a>
+<a class="index-entry-id" id="index-copying-_002d_002dfoption"></a>
<p>@"u ü
@"{U} Ü
@@ -2231,7 +2231,7 @@ error→ → - ∗ -| ⇒
</li></ul>
<ul class="itemize" style="list-style-type: '\2022 a\2013 n itemize line'">
-<li><a class="index-entry-anchor"
id="index-copying-index-entry-within-itemize"></a>
+<li><a class="index-entry-id"
id="index-copying-index-entry-within-itemize"></a>
i–tem 1
</li><li>i–tem 2
</li></ul>
@@ -2273,7 +2273,7 @@ i–tem 1
<thead><tr><th width="40%">mu–ltitable headitem</th><th
width="60%">another tab</th></tr></thead>
<tbody><tr><td width="40%">mu–ltitable item</td><td
width="60%">multitable tab</td></tr>
<tr><td width="40%">mu–ltitable item 2</td><td width="60%">multitable
tab 2
-<a class="index-entry-anchor"
id="index-copying-index-entry-within-multitable"></a></td></tr>
+<a class="index-entry-id"
id="index-copying-index-entry-within-multitable"></a></td></tr>
<tr><td width="40%">lone mu–ltitable item</td></tr>
</tbody>
</table>
@@ -2374,7 +2374,7 @@ f(x) = {1 \over \sigma \sqrt{2\pi}}e<sup class="sup">-{1
\over 2}\left({x-\mu \o
<dl class="first-deffn">
<dt class="deffn" id="index-copying-i"><span class="category-def">fset:
</span><span><strong class="strong"><var class="var">i</var></strong> <em
class="emph">a g</em><a class="copiable-anchor" href='#index-copying-i'>
¶</a></span></dt>
-<dd><a class="index-entry-anchor"
id="index-copying-index-entry-within-deffn"></a>
+<dd><a class="index-entry-id" id="index-copying-index-entry-within-deffn"></a>
</dd><dt class="deffnx def-cmd-deffn" id="index-copying-truc"><span
class="category-def">cmde: </span><span><strong class="strong">truc</strong>
<em class="emph"></em><a class="copiable-anchor" href='#index-copying-truc'>
¶</a></span></dt>
<dt class="deffnx def-cmd-deffn" id="index-copying-log-trap"><span
class="category-def">Command: </span><span><strong class="strong">log
trap</strong> <em class="emph"></em><a class="copiable-anchor"
href='#index-copying-log-trap'> ¶</a></span></dt>
<dt class="deffnx def-cmd-deffn" id="index-copying-log-trap1"><span
class="category-def">Command: </span><span><strong class="strong">log
trap1</strong> <em class="emph"></em><a class="copiable-anchor"
href='#index-copying-log-trap1'> ¶</a></span></dt>
@@ -2667,7 +2667,7 @@ ref</a>
<dl class="ftable">
<dt id='index-copying-a-1'><span><em class="emph">a</em><a
class="copiable-anchor" href='#index-copying-a-1'> ¶</a></span></dt>
-<dd><a class="index-entry-anchor"
id="index-copying-index-entry-between-item-and-itemx"></a>
+<dd><a class="index-entry-id"
id="index-copying-index-entry-between-item-and-itemx"></a>
</dd>
<dt id='index-copying-b'><span><em class="emph">b</em><a
class="copiable-anchor" href='#index-copying-b'> ¶</a></span></dt>
<dd><p>l–ine
@@ -2809,7 +2809,7 @@ html ''
<dl class="ftable">
<dt id='index-copying-a-2'><span>a<a class="copiable-anchor"
href='#index-copying-a-2'> ¶</a></span></dt>
-<dd><a class="index-entry-anchor"
id="index-copying-index-entry-between-item-and-itemx-1"></a>
+<dd><a class="index-entry-id"
id="index-copying-index-entry-between-item-and-itemx-1"></a>
</dd>
<dt id='index-copying-b-1'><span>b<a class="copiable-anchor"
href='#index-copying-b-1'> ¶</a></span></dt>
<dd><p>l–ine
@@ -2940,10 +2940,10 @@ kbd: <kbd
class="kbd">``simple-double--three---four----''</kbd> <br/>
</p>
<p>‘<!-- /@w -->‘simple-double-<!-- /@w
-->-three—four—-’<!-- /@w -->’<br/>
</p>
-<a class="index-entry-anchor" id="index-copying-_002d_002doption"></a>
-<a class="index-entry-anchor" id="index-copying-_0060_0060"></a>
-<a class="index-entry-anchor" id="index-copying-_0060_0060-1"></a>
-<a class="index-entry-anchor" id="index-copying-_002d_002dfoption"></a>
+<a class="index-entry-id" id="index-copying-_002d_002doption"></a>
+<a class="index-entry-id" id="index-copying-_0060_0060"></a>
+<a class="index-entry-id" id="index-copying-_0060_0060-1"></a>
+<a class="index-entry-id" id="index-copying-_002d_002dfoption"></a>
<p>@"u ü
@"{U} Ü
@@ -3302,7 +3302,7 @@ error→ → - ∗ -| ⇒
</li></ul>
<ul class="itemize" style="list-style-type: '\2022 a\2013 n itemize line'">
-<li><a class="index-entry-anchor"
id="index-copying-index-entry-within-itemize"></a>
+<li><a class="index-entry-id"
id="index-copying-index-entry-within-itemize"></a>
i–tem 1
</li><li>i–tem 2
</li></ul>
@@ -3344,7 +3344,7 @@ i–tem 1
<thead><tr><th width="40%">mu–ltitable headitem</th><th
width="60%">another tab</th></tr></thead>
<tbody><tr><td width="40%">mu–ltitable item</td><td
width="60%">multitable tab</td></tr>
<tr><td width="40%">mu–ltitable item 2</td><td width="60%">multitable
tab 2
-<a class="index-entry-anchor"
id="index-copying-index-entry-within-multitable"></a></td></tr>
+<a class="index-entry-id"
id="index-copying-index-entry-within-multitable"></a></td></tr>
<tr><td width="40%">lone mu–ltitable item</td></tr>
</tbody>
</table>
@@ -3445,7 +3445,7 @@ f(x) = {1 \over \sigma \sqrt{2\pi}}e<sup class="sup">-{1
\over 2}\left({x-\mu \o
<dl class="first-deffn">
<dt class="deffn" id="index-copying-i"><span class="category-def">fset:
</span><span><strong class="strong"><var class="var">i</var></strong> <em
class="emph">a g</em><a class="copiable-anchor" href='#index-copying-i'>
¶</a></span></dt>
-<dd><a class="index-entry-anchor"
id="index-copying-index-entry-within-deffn"></a>
+<dd><a class="index-entry-id" id="index-copying-index-entry-within-deffn"></a>
</dd><dt class="deffnx def-cmd-deffn" id="index-copying-truc"><span
class="category-def">cmde: </span><span><strong class="strong">truc</strong>
<em class="emph"></em><a class="copiable-anchor" href='#index-copying-truc'>
¶</a></span></dt>
<dt class="deffnx def-cmd-deffn" id="index-copying-log-trap"><span
class="category-def">Command: </span><span><strong class="strong">log
trap</strong> <em class="emph"></em><a class="copiable-anchor"
href='#index-copying-log-trap'> ¶</a></span></dt>
<dt class="deffnx def-cmd-deffn" id="index-copying-log-trap1"><span
class="category-def">Command: </span><span><strong class="strong">log
trap1</strong> <em class="emph"></em><a class="copiable-anchor"
href='#index-copying-log-trap1'> ¶</a></span></dt>
@@ -3738,7 +3738,7 @@ ref</a>
<dl class="ftable">
<dt id='index-copying-a-1'><span><em class="emph">a</em><a
class="copiable-anchor" href='#index-copying-a-1'> ¶</a></span></dt>
-<dd><a class="index-entry-anchor"
id="index-copying-index-entry-between-item-and-itemx"></a>
+<dd><a class="index-entry-id"
id="index-copying-index-entry-between-item-and-itemx"></a>
</dd>
<dt id='index-copying-b'><span><em class="emph">b</em><a
class="copiable-anchor" href='#index-copying-b'> ¶</a></span></dt>
<dd><p>l–ine
@@ -3880,7 +3880,7 @@ html ''
<dl class="ftable">
<dt id='index-copying-a-2'><span>a<a class="copiable-anchor"
href='#index-copying-a-2'> ¶</a></span></dt>
-<dd><a class="index-entry-anchor"
id="index-copying-index-entry-between-item-and-itemx-1"></a>
+<dd><a class="index-entry-id"
id="index-copying-index-entry-between-item-and-itemx-1"></a>
</dd>
<dt id='index-copying-b-1'><span>b<a class="copiable-anchor"
href='#index-copying-b-1'> ¶</a></span></dt>
<dd><p>l–ine
@@ -3954,10 +3954,10 @@ kbd: <kbd
class="kbd">``simple-double--three---four----''</kbd> <br/>
</p>
<p>‘<!-- /@w -->‘simple-double-<!-- /@w
-->-three—four—-’<!-- /@w -->’<br/>
</p>
-<a class="index-entry-anchor" id="index-_002d_002doption"></a>
-<a class="index-entry-anchor" id="index-_0060_0060"></a>
-<a class="index-entry-anchor" id="index-_0060_0060-2"></a>
-<a class="index-entry-anchor" id="index-_002d_002dfoption"></a>
+<a class="index-entry-id" id="index-_002d_002doption"></a>
+<a class="index-entry-id" id="index-_0060_0060"></a>
+<a class="index-entry-id" id="index-_0060_0060-2"></a>
+<a class="index-entry-id" id="index-_002d_002dfoption"></a>
<p>@"u ü
@"{U} Ü
@@ -4316,7 +4316,7 @@ error→ → - ∗ -| ⇒
</li></ul>
<ul class="itemize" style="list-style-type: '\2022 a\2013 n itemize line'">
-<li><a class="index-entry-anchor" id="index-index-entry-within-itemize"></a>
+<li><a class="index-entry-id" id="index-index-entry-within-itemize"></a>
i–tem 1
</li><li>i–tem 2
</li></ul>
@@ -4358,7 +4358,7 @@ i–tem 1
<thead><tr><th width="40%">mu–ltitable headitem</th><th
width="60%">another tab</th></tr></thead>
<tbody><tr><td width="40%">mu–ltitable item</td><td
width="60%">multitable tab</td></tr>
<tr><td width="40%">mu–ltitable item 2</td><td width="60%">multitable
tab 2
-<a class="index-entry-anchor"
id="index-index-entry-within-multitable"></a></td></tr>
+<a class="index-entry-id"
id="index-index-entry-within-multitable"></a></td></tr>
<tr><td width="40%">lone mu–ltitable item</td></tr>
</tbody>
</table>
@@ -4459,7 +4459,7 @@ f(x) = {1 \over \sigma \sqrt{2\pi}}e<sup class="sup">-{1
\over 2}\left({x-\mu \o
<dl class="first-deffn">
<dt class="deffn" id="index-i"><span class="category-def">fset:
</span><span><strong class="strong"><var class="var">i</var></strong> <em
class="emph">a g</em><a class="copiable-anchor" href='#index-i'>
¶</a></span></dt>
-<dd><a class="index-entry-anchor" id="index-index-entry-within-deffn"></a>
+<dd><a class="index-entry-id" id="index-index-entry-within-deffn"></a>
</dd><dt class="deffnx def-cmd-deffn" id="index-truc"><span
class="category-def">cmde: </span><span><strong class="strong">truc</strong>
<em class="emph"></em><a class="copiable-anchor" href='#index-truc'>
¶</a></span></dt>
<dt class="deffnx def-cmd-deffn" id="index-log-trap"><span
class="category-def">Command: </span><span><strong class="strong">log
trap</strong> <em class="emph"></em><a class="copiable-anchor"
href='#index-log-trap'> ¶</a></span></dt>
<dt class="deffnx def-cmd-deffn" id="index-log-trap1"><span
class="category-def">Command: </span><span><strong class="strong">log
trap1</strong> <em class="emph"></em><a class="copiable-anchor"
href='#index-log-trap1'> ¶</a></span></dt>
@@ -4752,7 +4752,7 @@ ref</a>
<dl class="ftable">
<dt id='index-a-2'><span><em class="emph">a</em><a class="copiable-anchor"
href='#index-a-2'> ¶</a></span></dt>
-<dd><a class="index-entry-anchor"
id="index-index-entry-between-item-and-itemx"></a>
+<dd><a class="index-entry-id"
id="index-index-entry-between-item-and-itemx"></a>
</dd>
<dt id='index-b'><span><em class="emph">b</em><a class="copiable-anchor"
href='#index-b'> ¶</a></span></dt>
<dd><p>l–ine
@@ -4894,7 +4894,7 @@ html ''
<dl class="ftable">
<dt id='index-a-3'><span>a<a class="copiable-anchor" href='#index-a-3'>
¶</a></span></dt>
-<dd><a class="index-entry-anchor"
id="index-index-entry-between-item-and-itemx-1"></a>
+<dd><a class="index-entry-id"
id="index-index-entry-between-item-and-itemx-1"></a>
</dd>
<dt id='index-b-1'><span>b<a class="copiable-anchor" href='#index-b-1'>
¶</a></span></dt>
<dd><p>l–ine
@@ -4976,7 +4976,7 @@ kbd: <kbd
class="kbd">``simple-double--three---four----''</kbd>
`<!-- /@w -->`simple-double-<!-- /@w -->-three---four----'<!-- /@w -->'
-<a class="index-entry-anchor" id="index-_002d_002doption-1"></a><a
class="index-entry-anchor" id="index-_0060_0060-1"></a><a
class="index-entry-anchor" id="index-_0060_0060-3"></a><a
class="index-entry-anchor" id="index-_002d_002dfoption-1"></a>
+<a class="index-entry-id" id="index-_002d_002doption-1"></a><a
class="index-entry-id" id="index-_0060_0060-1"></a><a class="index-entry-id"
id="index-_0060_0060-3"></a><a class="index-entry-id"
id="index-_002d_002dfoption-1"></a>
@"u ü
@"{U} Ü
@~n ñ
@@ -5374,7 +5374,7 @@ error→ → - ∗ -| ⇒
<pre class="example-preformatted">
</pre><ul class="itemize" style="list-style-type: '\2022 a\2013 n itemize
line'">
-<li><pre class="example-preformatted"><a class="index-entry-anchor"
id="index-index-entry-within-itemize-1"></a>i--tem 1
+<li><pre class="example-preformatted"><a class="index-entry-id"
id="index-index-entry-within-itemize-1"></a>i--tem 1
</pre></li><li><pre class="example-preformatted">i--tem 2
</pre></li></ul>
<pre class="example-preformatted">
@@ -5423,7 +5423,7 @@ error→ → - ∗ -| ⇒
<thead><tr><th width="40%"><pre class="example-preformatted">mu--ltitable
headitem</pre></th><th width="60%"><pre class="example-preformatted">another
tab</pre></th></tr></thead>
<tbody><tr><td width="40%"><pre class="example-preformatted">mu--ltitable
item</pre></td><td width="60%"><pre class="example-preformatted">multitable
tab</pre></td></tr>
<tr><td width="40%"><pre class="example-preformatted">mu--ltitable item
2</pre></td><td width="60%"><pre class="example-preformatted">multitable tab 2
-<a class="index-entry-anchor"
id="index-index-entry-within-multitable-1"></a></pre></td></tr>
+<a class="index-entry-id"
id="index-index-entry-within-multitable-1"></a></pre></td></tr>
<tr><td width="40%"><pre class="example-preformatted">lone mu--ltitable
item</pre></td></tr>
</tbody>
</table>
@@ -5546,7 +5546,7 @@ f(x) = {1 \over \sigma \sqrt{2\pi}}e<sup class="sup">-{1
\over 2}\left({x-\mu \o
<pre class="example-preformatted">
</pre><dl class="first-deffn">
<dt class="deffn" id="index-i-2"><span class="category-def">fset:
</span><span><strong class="strong"><var class="var">i</var></strong> <em
class="emph">a g</em><a class="copiable-anchor" href='#index-i-2'>
¶</a></span></dt>
-<dd><pre class="example-preformatted"><a class="index-entry-anchor"
id="index-index-entry-within-deffn-1"></a></pre></dd><dt class="deffnx
def-cmd-deffn" id="index-truc-2"><span class="category-def">cmde:
</span><span><strong class="strong">truc</strong> <em class="emph"></em><a
class="copiable-anchor" href='#index-truc-2'> ¶</a></span></dt>
+<dd><pre class="example-preformatted"><a class="index-entry-id"
id="index-index-entry-within-deffn-1"></a></pre></dd><dt class="deffnx
def-cmd-deffn" id="index-truc-2"><span class="category-def">cmde:
</span><span><strong class="strong">truc</strong> <em class="emph"></em><a
class="copiable-anchor" href='#index-truc-2'> ¶</a></span></dt>
<dt class="deffnx def-cmd-deffn" id="index-log-trap-1"><span
class="category-def">Command: </span><span><strong class="strong">log
trap</strong> <em class="emph"></em><a class="copiable-anchor"
href='#index-log-trap-1'> ¶</a></span></dt>
<dt class="deffnx def-cmd-deffn" id="index-log-trap1-1"><span
class="category-def">Command: </span><span><strong class="strong">log
trap1</strong> <em class="emph"></em><a class="copiable-anchor"
href='#index-log-trap1-1'> ¶</a></span></dt>
<dt class="deffnx def-cmd-deffn" id="index-log-trap2-1"><span
class="category-def">Command: </span><span><strong class="strong">log
trap2</strong> <em class="emph"></em><a class="copiable-anchor"
href='#index-log-trap2-1'> ¶</a></span></dt>
@@ -5890,7 +5890,7 @@ ref</a>
</pre><dl class="ftable">
<dt id='index-a-5'><span><tt><em class="emph">a</em></tt><a
class="copiable-anchor" href='#index-a-5'> ¶</a></span></dt>
-<dd><pre class="example-preformatted"><a class="index-entry-anchor"
id="index-index-entry-between-item-and-itemx-2"></a></pre></dd>
+<dd><pre class="example-preformatted"><a class="index-entry-id"
id="index-index-entry-between-item-and-itemx-2"></a></pre></dd>
<dt id='index-b-2'><span><tt><em class="emph">b</em></tt><a
class="copiable-anchor" href='#index-b-2'> ¶</a></span></dt>
<dd><pre class="example-preformatted">l--ine
</pre></dd>
@@ -6056,7 +6056,7 @@ Invalid use of @':
</pre><dl class="ftable">
<dt id='index-a-6'><span><tt>a</tt><a class="copiable-anchor"
href='#index-a-6'> ¶</a></span></dt>
-<dd><pre class="example-preformatted"><a class="index-entry-anchor"
id="index-index-entry-between-item-and-itemx-3"></a></pre></dd>
+<dd><pre class="example-preformatted"><a class="index-entry-id"
id="index-index-entry-between-item-and-itemx-3"></a></pre></dd>
<dt id='index-b-3'><span><tt>b</tt><a class="copiable-anchor"
href='#index-b-3'> ¶</a></span></dt>
<dd><pre class="example-preformatted">l--ine
</pre></dd>
@@ -6115,38 +6115,38 @@ Invalid use of @':
</pre></div>
-<a class="index-entry-anchor" id="index-t_002d_002druc"></a>
-<a class="index-entry-anchor" id="index-T_002d_002druc"></a>
-<a class="index-entry-anchor" id="index-_002e"></a>
-<a class="index-entry-anchor" id="index-_003f"></a>
-<a class="index-entry-anchor" id="index-a"></a>
-<a class="index-entry-anchor" id="index-t_002d_002druc-1"></a>
-<a class="index-entry-anchor" id="index-T_002d_002druc-1"></a>
-<a class="index-entry-anchor" id="index-_002e-1"></a>
-<a class="index-entry-anchor" id="index-_003f-1"></a>
-<a class="index-entry-anchor" id="index-a-7"></a>
+<a class="index-entry-id" id="index-t_002d_002druc"></a>
+<a class="index-entry-id" id="index-T_002d_002druc"></a>
+<a class="index-entry-id" id="index-_002e"></a>
+<a class="index-entry-id" id="index-_003f"></a>
+<a class="index-entry-id" id="index-a"></a>
+<a class="index-entry-id" id="index-t_002d_002druc-1"></a>
+<a class="index-entry-id" id="index-T_002d_002druc-1"></a>
+<a class="index-entry-id" id="index-_002e-1"></a>
+<a class="index-entry-id" id="index-_003f-1"></a>
+<a class="index-entry-id" id="index-a-7"></a>
-<a class="index-entry-anchor" id="index-a_002d_002d_002da"></a>
-<a class="index-entry-anchor" id="index-b_002d_002d_002db"></a>
-<a class="index-entry-anchor" id="index-d_002d_002d_002ddd"></a>
-<a class="index-entry-anchor" id="index-g_002d_002d_002dgg"></a>
+<a class="index-entry-id" id="index-a_002d_002d_002da"></a>
+<a class="index-entry-id" id="index-b_002d_002d_002db"></a>
+<a class="index-entry-id" id="index-d_002d_002d_002ddd"></a>
+<a class="index-entry-id" id="index-g_002d_002d_002dgg"></a>
-<a class="index-entry-anchor" id="index-f_002d_002d_002daa"></a>
-<a class="index-entry-anchor" id="index-f_002d_002d_002dbb"></a>
-<a class="index-entry-anchor" id="index-f_002d_002d_002dddd"></a>
-<a class="index-entry-anchor" id="index-f_002d_002d_002dggg"></a>
+<a class="index-entry-id" id="index-f_002d_002d_002daa"></a>
+<a class="index-entry-id" id="index-f_002d_002d_002dbb"></a>
+<a class="index-entry-id" id="index-f_002d_002d_002dddd"></a>
+<a class="index-entry-id" id="index-f_002d_002d_002dggg"></a>
-<a class="index-entry-anchor" id="index-aaa"></a>
+<a class="index-entry-id" id="index-aaa"></a>
-<a class="index-entry-anchor" id="index-xxx"></a>
+<a class="index-entry-id" id="index-xxx"></a>
-<a class="index-entry-anchor" id="index-"></a>
+<a class="index-entry-id" id="index-"></a>
-<a class="index-entry-anchor"
id="index-a-index_002d_002d_002dentry-te-_002d_002d_002d-i"></a>
+<a class="index-entry-id"
id="index-a-index_002d_002d_002dentry-te-_002d_002d_002d-i"></a>
-<a class="index-entry-anchor" id="index-truc-4"></a>
+<a class="index-entry-id" id="index-truc-4"></a>
<p>Text<a class="footnote" id="DOCF9" href="#FOOT9"><sup>11</sup></a>
@@ -7441,13 +7441,13 @@ Menu comment
<p>in footnote2</p>
<h5><a id="FOOT9" href="#DOCF9">(11)</a></h5>
<p>in footnote
-<a class="index-entry-anchor" id="index-index-entry-in-footnote"></a>
+<a class="index-entry-id" id="index-index-entry-in-footnote"></a>
</p>
<p>Blah
</p>
<p>Blih
</p>
-<a class="index-entry-anchor" id="index-counting-entry"></a>
+<a class="index-entry-id" id="index-counting-entry"></a>
<h5><a id="FOOT10" href="#DOCF10">(12)</a></h5>
<p>in footnote</p>
</div><hr/>
diff --git
a/tp/tests/layout/res_parser/no_monolithic_only_toc_out/no_monolithic.html
b/tp/tests/layout/res_parser/no_monolithic_only_toc_out/no_monolithic.html
index 4836f549e1..fb2b34ad83 100644
--- a/tp/tests/layout/res_parser/no_monolithic_only_toc_out/no_monolithic.html
+++ b/tp/tests/layout/res_parser/no_monolithic_only_toc_out/no_monolithic.html
@@ -38,7 +38,7 @@ ul.toc-numbered-mark {list-style: none}
<p>Not monolitic manual<a class="footnote" id="DOCF1"
href="#FOOT1"><sup>1</sup></a>.
</p>
-<a class="index-entry-anchor" id="index-top"></a>
+<a class="index-entry-id" id="index-top"></a>
<table class="menu" border="0" cellspacing="0">
<tr><td align="left" valign="top"><a href="#chapter" rel="index">1
Chapter</a></td><td> </td><td align="left" valign="top">
diff --git
a/tp/tests/sectioning/res_parser/sectioning_directions/sectioning.html
b/tp/tests/sectioning/res_parser/sectioning_directions/sectioning.html
index 1a009e9e28..9e3095e950 100644
--- a/tp/tests/sectioning/res_parser/sectioning_directions/sectioning.html
+++ b/tp/tests/sectioning/res_parser/sectioning_directions/sectioning.html
@@ -131,7 +131,7 @@ ul.toc-numbered-mark {list-style: none}
<td valign="middle" align="left"></td>
<td valign="middle" align="left">|</td>
</tr></table>
-<a class="top-anchor" id="SEC_Top"></a><table class="menu" border="0"
cellspacing="0">
+<a class="top" id="SEC_Top"></a><table class="menu" border="0" cellspacing="0">
<tr><td align="left" valign="top"><a href="#First-node">1 first node
chapter</a></td><td> </td><td align="left" valign="top">node 1
explaination no heading ?
* and here ?
@@ -1190,7 +1190,7 @@ description here
</tr></table>
<h2 class="section" id="numbered-section">1.1 numbered section</h2>
-<a class="node-anchor" id="between-node"></a>
+<a class="node" id="between-node"></a>
<p>between node, node without sectioning node
</p>
<hr>
@@ -1424,7 +1424,7 @@ description here
<p>unnumbered chapter text.
</p>
-<a class="node-anchor" id="Last-node-no-description"></a>
+<a class="node" id="Last-node-no-description"></a>
<hr style="height: 6px;">
</div>
</div>
diff --git
a/tp/tests/sectioning/res_parser/sectioning_directions_split_chapter/First-node.html
b/tp/tests/sectioning/res_parser/sectioning_directions_split_chapter/First-node.html
index 4e08daabfa..c8847fbfaa 100644
---
a/tp/tests/sectioning/res_parser/sectioning_directions_split_chapter/First-node.html
+++
b/tp/tests/sectioning/res_parser/sectioning_directions_split_chapter/First-node.html
@@ -1984,7 +1984,7 @@ span.program-in-footer {font-size: smaller}
</tr></table>
<h2 class="section" id="numbered-section">1.1 numbered section</h2>
-<a class="node-anchor" id="between-node"></a>
+<a class="node" id="between-node"></a>
<p>between node, node without sectioning node
</p>
</div>
diff --git
a/tp/tests/sectioning/res_parser/sectioning_directions_split_chapter/Third-node-unnumbered.html
b/tp/tests/sectioning/res_parser/sectioning_directions_split_chapter/Third-node-unnumbered.html
index 68822ef018..9c73f1767f 100644
---
a/tp/tests/sectioning/res_parser/sectioning_directions_split_chapter/Third-node-unnumbered.html
+++
b/tp/tests/sectioning/res_parser/sectioning_directions_split_chapter/Third-node-unnumbered.html
@@ -238,7 +238,7 @@ span.program-in-footer {font-size: smaller}
<p>unnumbered chapter text.
</p>
-<a class="node-anchor" id="Last-node-no-description"></a>
+<a class="node" id="Last-node-no-description"></a>
</div>
<hr>
<table class="nav-header" cellpadding="1" cellspacing="1" border="0">
diff --git
a/tp/tests/sectioning/res_parser/sectioning_directions_split_chapter/index.html
b/tp/tests/sectioning/res_parser/sectioning_directions_split_chapter/index.html
index 70459ad86d..13991d9c6f 100644
---
a/tp/tests/sectioning/res_parser/sectioning_directions_split_chapter/index.html
+++
b/tp/tests/sectioning/res_parser/sectioning_directions_split_chapter/index.html
@@ -234,7 +234,7 @@ span.program-in-footer {font-size: smaller}
<td valign="middle" align="left"></td>
<td valign="middle" align="left">|</td>
</tr></table>
-<a class="top-anchor" id="SEC_Top"></a><table class="menu" border="0"
cellspacing="0">
+<a class="top" id="SEC_Top"></a><table class="menu" border="0" cellspacing="0">
<tr><td align="left" valign="top"><a href="First-node.html#First-node">1 first
node chapter</a></td><td> </td><td align="left" valign="top">node 1
explaination no heading ?
* and here ?
diff --git a/tp/tests/tex_html/res_parser/formatting_singular/chapter.html
b/tp/tests/tex_html/res_parser/formatting_singular/chapter.html
index 919dc67c5e..b387567f54 100644
--- a/tp/tests/tex_html/res_parser/formatting_singular/chapter.html
+++ b/tp/tests/tex_html/res_parser/formatting_singular/chapter.html
@@ -899,10 +899,10 @@ kbd: <kbd
class="kbd">``simple-double--three---four----''</kbd> <br>
</p>
<p>‘<!-- /@w -->‘simple-double-<!-- /@w
-->-three—four—-’<!-- /@w -->’<br>
</p>
-<a class="index-entry-anchor" id="index-copying-_002d_002doption"></a>
-<a class="index-entry-anchor" id="index-copying-_0060_0060"></a>
-<a class="index-entry-anchor" id="index-copying-_0060_0060-1"></a>
-<a class="index-entry-anchor" id="index-copying-_002d_002dfoption"></a>
+<a class="index-entry-id" id="index-copying-_002d_002doption"></a>
+<a class="index-entry-id" id="index-copying-_0060_0060"></a>
+<a class="index-entry-id" id="index-copying-_0060_0060-1"></a>
+<a class="index-entry-id" id="index-copying-_002d_002dfoption"></a>
<p>@"u ü
@"{U} Ü
@@ -1332,7 +1332,7 @@ $">
</li></ul>
<ul class="itemize" style="list-style-type: '\2022 a\2013 n itemize line'">
-<li><a class="index-entry-anchor"
id="index-copying-index-entry-within-itemize"></a>
+<li><a class="index-entry-id"
id="index-copying-index-entry-within-itemize"></a>
i–tem 1
</li><li>i–tem 2
</li></ul>
@@ -1374,7 +1374,7 @@ i–tem 1
<thead><tr><th width="40%">mu–ltitable headitem</th><th
width="60%">another tab</th></tr></thead>
<tbody><tr><td width="40%">mu–ltitable item</td><td
width="60%">multitable tab</td></tr>
<tr><td width="40%">mu–ltitable item 2</td><td width="60%">multitable
tab 2
-<a class="index-entry-anchor"
id="index-copying-index-entry-within-multitable"></a></td></tr>
+<a class="index-entry-id"
id="index-copying-index-entry-within-multitable"></a></td></tr>
<tr><td width="40%">lone mu–ltitable item</td></tr>
</tbody>
</table>
@@ -1487,7 +1487,7 @@ $">
<dl class="first-deffn">
<dt class="deffn" id="index-copying-i"><span class="category-def">fset:
</span><span><strong class="strong"><var class="var">i</var></strong> <em
class="emph">a g</em><a class="copiable-anchor" href='#index-copying-i'>
¶</a></span></dt>
-<dd><a class="index-entry-anchor"
id="index-copying-index-entry-within-deffn"></a>
+<dd><a class="index-entry-id" id="index-copying-index-entry-within-deffn"></a>
</dd><dt class="deffnx def-cmd-deffn" id="index-copying-truc"><span
class="category-def">cmde: </span><span><strong class="strong">truc</strong>
<em class="emph"></em><a class="copiable-anchor" href='#index-copying-truc'>
¶</a></span></dt>
<dt class="deffnx def-cmd-deffn" id="index-copying-log-trap"><span
class="category-def">Command: </span><span><strong class="strong">log
trap</strong> <em class="emph"></em><a class="copiable-anchor"
href='#index-copying-log-trap'> ¶</a></span></dt>
<dt class="deffnx def-cmd-deffn" id="index-copying-log-trap1"><span
class="category-def">Command: </span><span><strong class="strong">log
trap1</strong> <em class="emph"></em><a class="copiable-anchor"
href='#index-copying-log-trap1'> ¶</a></span></dt>
@@ -1780,7 +1780,7 @@ ref</a>
<dl class="ftable">
<dt id='index-copying-a-1'><span><em class="emph">a</em><a
class="copiable-anchor" href='#index-copying-a-1'> ¶</a></span></dt>
-<dd><a class="index-entry-anchor"
id="index-copying-index-entry-between-item-and-itemx"></a>
+<dd><a class="index-entry-id"
id="index-copying-index-entry-between-item-and-itemx"></a>
</dd>
<dt id='index-copying-b'><span><em class="emph">b</em><a
class="copiable-anchor" href='#index-copying-b'> ¶</a></span></dt>
<dd><p>l–ine
@@ -1939,7 +1939,7 @@ html ''
<dl class="ftable">
<dt id='index-copying-a-2'><span>a<a class="copiable-anchor"
href='#index-copying-a-2'> ¶</a></span></dt>
-<dd><a class="index-entry-anchor"
id="index-copying-index-entry-between-item-and-itemx-1"></a>
+<dd><a class="index-entry-id"
id="index-copying-index-entry-between-item-and-itemx-1"></a>
</dd>
<dt id='index-copying-b-1'><span>b<a class="copiable-anchor"
href='#index-copying-b-1'> ¶</a></span></dt>
<dd><p>l–ine
@@ -2013,10 +2013,10 @@ kbd: <kbd
class="kbd">``simple-double--three---four----''</kbd> <br>
</p>
<p>‘<!-- /@w -->‘simple-double-<!-- /@w
-->-three—four—-’<!-- /@w -->’<br>
</p>
-<a class="index-entry-anchor" id="index-_002d_002doption"></a>
-<a class="index-entry-anchor" id="index-_0060_0060"></a>
-<a class="index-entry-anchor" id="index-_0060_0060-2"></a>
-<a class="index-entry-anchor" id="index-_002d_002dfoption"></a>
+<a class="index-entry-id" id="index-_002d_002doption"></a>
+<a class="index-entry-id" id="index-_0060_0060"></a>
+<a class="index-entry-id" id="index-_0060_0060-2"></a>
+<a class="index-entry-id" id="index-_002d_002dfoption"></a>
<p>@"u ü
@"{U} Ü
@@ -2446,7 +2446,7 @@ $">
</li></ul>
<ul class="itemize" style="list-style-type: '\2022 a\2013 n itemize line'">
-<li><a class="index-entry-anchor" id="index-index-entry-within-itemize"></a>
+<li><a class="index-entry-id" id="index-index-entry-within-itemize"></a>
i–tem 1
</li><li>i–tem 2
</li></ul>
@@ -2488,7 +2488,7 @@ i–tem 1
<thead><tr><th width="40%">mu–ltitable headitem</th><th
width="60%">another tab</th></tr></thead>
<tbody><tr><td width="40%">mu–ltitable item</td><td
width="60%">multitable tab</td></tr>
<tr><td width="40%">mu–ltitable item 2</td><td width="60%">multitable
tab 2
-<a class="index-entry-anchor"
id="index-index-entry-within-multitable"></a></td></tr>
+<a class="index-entry-id"
id="index-index-entry-within-multitable"></a></td></tr>
<tr><td width="40%">lone mu–ltitable item</td></tr>
</tbody>
</table>
@@ -2601,7 +2601,7 @@ $">
<dl class="first-deffn">
<dt class="deffn" id="index-i"><span class="category-def">fset:
</span><span><strong class="strong"><var class="var">i</var></strong> <em
class="emph">a g</em><a class="copiable-anchor" href='#index-i'>
¶</a></span></dt>
-<dd><a class="index-entry-anchor" id="index-index-entry-within-deffn"></a>
+<dd><a class="index-entry-id" id="index-index-entry-within-deffn"></a>
</dd><dt class="deffnx def-cmd-deffn" id="index-truc"><span
class="category-def">cmde: </span><span><strong class="strong">truc</strong>
<em class="emph"></em><a class="copiable-anchor" href='#index-truc'>
¶</a></span></dt>
<dt class="deffnx def-cmd-deffn" id="index-log-trap"><span
class="category-def">Command: </span><span><strong class="strong">log
trap</strong> <em class="emph"></em><a class="copiable-anchor"
href='#index-log-trap'> ¶</a></span></dt>
<dt class="deffnx def-cmd-deffn" id="index-log-trap1"><span
class="category-def">Command: </span><span><strong class="strong">log
trap1</strong> <em class="emph"></em><a class="copiable-anchor"
href='#index-log-trap1'> ¶</a></span></dt>
@@ -2894,7 +2894,7 @@ ref</a>
<dl class="ftable">
<dt id='index-a-2'><span><em class="emph">a</em><a class="copiable-anchor"
href='#index-a-2'> ¶</a></span></dt>
-<dd><a class="index-entry-anchor"
id="index-index-entry-between-item-and-itemx"></a>
+<dd><a class="index-entry-id"
id="index-index-entry-between-item-and-itemx"></a>
</dd>
<dt id='index-b'><span><em class="emph">b</em><a class="copiable-anchor"
href='#index-b'> ¶</a></span></dt>
<dd><p>l–ine
@@ -3053,7 +3053,7 @@ html ''
<dl class="ftable">
<dt id='index-a-3'><span>a<a class="copiable-anchor" href='#index-a-3'>
¶</a></span></dt>
-<dd><a class="index-entry-anchor"
id="index-index-entry-between-item-and-itemx-1"></a>
+<dd><a class="index-entry-id"
id="index-index-entry-between-item-and-itemx-1"></a>
</dd>
<dt id='index-b-1'><span>b<a class="copiable-anchor" href='#index-b-1'>
¶</a></span></dt>
<dd><p>l–ine
@@ -3135,7 +3135,7 @@ kbd: <kbd
class="kbd">``simple-double--three---four----''</kbd>
`<!-- /@w -->`simple-double-<!-- /@w -->-three---four----'<!-- /@w -->'
-<a class="index-entry-anchor" id="index-_002d_002doption-1"></a><a
class="index-entry-anchor" id="index-_0060_0060-1"></a><a
class="index-entry-anchor" id="index-_0060_0060-3"></a><a
class="index-entry-anchor" id="index-_002d_002dfoption-1"></a>
+<a class="index-entry-id" id="index-_002d_002doption-1"></a><a
class="index-entry-id" id="index-_0060_0060-1"></a><a class="index-entry-id"
id="index-_0060_0060-3"></a><a class="index-entry-id"
id="index-_002d_002dfoption-1"></a>
@"u ü
@"{U} Ü
@~n ñ
@@ -3604,7 +3604,7 @@ $">
<pre class="example-preformatted">
</pre><ul class="itemize" style="list-style-type: '\2022 a\2013 n itemize
line'">
-<li><pre class="example-preformatted"><a class="index-entry-anchor"
id="index-index-entry-within-itemize-1"></a>i--tem 1
+<li><pre class="example-preformatted"><a class="index-entry-id"
id="index-index-entry-within-itemize-1"></a>i--tem 1
</pre></li><li><pre class="example-preformatted">i--tem 2
</pre></li></ul>
<pre class="example-preformatted">
@@ -3653,7 +3653,7 @@ $">
<thead><tr><th width="40%"><pre class="example-preformatted">mu--ltitable
headitem</pre></th><th width="60%"><pre class="example-preformatted">another
tab</pre></th></tr></thead>
<tbody><tr><td width="40%"><pre class="example-preformatted">mu--ltitable
item</pre></td><td width="60%"><pre class="example-preformatted">multitable
tab</pre></td></tr>
<tr><td width="40%"><pre class="example-preformatted">mu--ltitable item
2</pre></td><td width="60%"><pre class="example-preformatted">multitable tab 2
-<a class="index-entry-anchor"
id="index-index-entry-within-multitable-1"></a></pre></td></tr>
+<a class="index-entry-id"
id="index-index-entry-within-multitable-1"></a></pre></td></tr>
<tr><td width="40%"><pre class="example-preformatted">lone mu--ltitable
item</pre></td></tr>
</tbody>
</table>
@@ -3788,7 +3788,7 @@ $">
<pre class="example-preformatted">
</pre><dl class="first-deffn">
<dt class="deffn" id="index-i-2"><span class="category-def">fset:
</span><span><strong class="strong"><var class="var">i</var></strong> <em
class="emph">a g</em><a class="copiable-anchor" href='#index-i-2'>
¶</a></span></dt>
-<dd><pre class="example-preformatted"><a class="index-entry-anchor"
id="index-index-entry-within-deffn-1"></a></pre></dd><dt class="deffnx
def-cmd-deffn" id="index-truc-2"><span class="category-def">cmde:
</span><span><strong class="strong">truc</strong> <em class="emph"></em><a
class="copiable-anchor" href='#index-truc-2'> ¶</a></span></dt>
+<dd><pre class="example-preformatted"><a class="index-entry-id"
id="index-index-entry-within-deffn-1"></a></pre></dd><dt class="deffnx
def-cmd-deffn" id="index-truc-2"><span class="category-def">cmde:
</span><span><strong class="strong">truc</strong> <em class="emph"></em><a
class="copiable-anchor" href='#index-truc-2'> ¶</a></span></dt>
<dt class="deffnx def-cmd-deffn" id="index-log-trap-1"><span
class="category-def">Command: </span><span><strong class="strong">log
trap</strong> <em class="emph"></em><a class="copiable-anchor"
href='#index-log-trap-1'> ¶</a></span></dt>
<dt class="deffnx def-cmd-deffn" id="index-log-trap1-1"><span
class="category-def">Command: </span><span><strong class="strong">log
trap1</strong> <em class="emph"></em><a class="copiable-anchor"
href='#index-log-trap1-1'> ¶</a></span></dt>
<dt class="deffnx def-cmd-deffn" id="index-log-trap2-1"><span
class="category-def">Command: </span><span><strong class="strong">log
trap2</strong> <em class="emph"></em><a class="copiable-anchor"
href='#index-log-trap2-1'> ¶</a></span></dt>
@@ -4132,7 +4132,7 @@ ref</a>
</pre><dl class="ftable">
<dt id='index-a-5'><span><tt><em class="emph">a</em></tt><a
class="copiable-anchor" href='#index-a-5'> ¶</a></span></dt>
-<dd><pre class="example-preformatted"><a class="index-entry-anchor"
id="index-index-entry-between-item-and-itemx-2"></a></pre></dd>
+<dd><pre class="example-preformatted"><a class="index-entry-id"
id="index-index-entry-between-item-and-itemx-2"></a></pre></dd>
<dt id='index-b-2'><span><tt><em class="emph">b</em></tt><a
class="copiable-anchor" href='#index-b-2'> ¶</a></span></dt>
<dd><pre class="example-preformatted">l--ine
</pre></dd>
@@ -4315,7 +4315,7 @@ Invalid use of @':
</pre><dl class="ftable">
<dt id='index-a-6'><span><tt>a</tt><a class="copiable-anchor"
href='#index-a-6'> ¶</a></span></dt>
-<dd><pre class="example-preformatted"><a class="index-entry-anchor"
id="index-index-entry-between-item-and-itemx-3"></a></pre></dd>
+<dd><pre class="example-preformatted"><a class="index-entry-id"
id="index-index-entry-between-item-and-itemx-3"></a></pre></dd>
<dt id='index-b-3'><span><tt>b</tt><a class="copiable-anchor"
href='#index-b-3'> ¶</a></span></dt>
<dd><pre class="example-preformatted">l--ine
</pre></dd>
@@ -4374,38 +4374,38 @@ Invalid use of @':
</pre></div>
-<a class="index-entry-anchor" id="index-t_002d_002druc"></a>
-<a class="index-entry-anchor" id="index-T_002d_002druc"></a>
-<a class="index-entry-anchor" id="index-_002e"></a>
-<a class="index-entry-anchor" id="index-_003f"></a>
-<a class="index-entry-anchor" id="index-a"></a>
-<a class="index-entry-anchor" id="index-t_002d_002druc-1"></a>
-<a class="index-entry-anchor" id="index-T_002d_002druc-1"></a>
-<a class="index-entry-anchor" id="index-_002e-1"></a>
-<a class="index-entry-anchor" id="index-_003f-1"></a>
-<a class="index-entry-anchor" id="index-a-7"></a>
+<a class="index-entry-id" id="index-t_002d_002druc"></a>
+<a class="index-entry-id" id="index-T_002d_002druc"></a>
+<a class="index-entry-id" id="index-_002e"></a>
+<a class="index-entry-id" id="index-_003f"></a>
+<a class="index-entry-id" id="index-a"></a>
+<a class="index-entry-id" id="index-t_002d_002druc-1"></a>
+<a class="index-entry-id" id="index-T_002d_002druc-1"></a>
+<a class="index-entry-id" id="index-_002e-1"></a>
+<a class="index-entry-id" id="index-_003f-1"></a>
+<a class="index-entry-id" id="index-a-7"></a>
-<a class="index-entry-anchor" id="index-a_002d_002d_002da"></a>
-<a class="index-entry-anchor" id="index-b_002d_002d_002db"></a>
-<a class="index-entry-anchor" id="index-d_002d_002d_002ddd"></a>
-<a class="index-entry-anchor" id="index-g_002d_002d_002dgg"></a>
+<a class="index-entry-id" id="index-a_002d_002d_002da"></a>
+<a class="index-entry-id" id="index-b_002d_002d_002db"></a>
+<a class="index-entry-id" id="index-d_002d_002d_002ddd"></a>
+<a class="index-entry-id" id="index-g_002d_002d_002dgg"></a>
-<a class="index-entry-anchor" id="index-f_002d_002d_002daa"></a>
-<a class="index-entry-anchor" id="index-f_002d_002d_002dbb"></a>
-<a class="index-entry-anchor" id="index-f_002d_002d_002dddd"></a>
-<a class="index-entry-anchor" id="index-f_002d_002d_002dggg"></a>
+<a class="index-entry-id" id="index-f_002d_002d_002daa"></a>
+<a class="index-entry-id" id="index-f_002d_002d_002dbb"></a>
+<a class="index-entry-id" id="index-f_002d_002d_002dddd"></a>
+<a class="index-entry-id" id="index-f_002d_002d_002dggg"></a>
-<a class="index-entry-anchor" id="index-aaa"></a>
+<a class="index-entry-id" id="index-aaa"></a>
-<a class="index-entry-anchor" id="index-xxx"></a>
+<a class="index-entry-id" id="index-xxx"></a>
-<a class="index-entry-anchor" id="index-"></a>
+<a class="index-entry-id" id="index-"></a>
-<a class="index-entry-anchor"
id="index-a-index_002d_002d_002dentry-te-_002d_002d_002d-i"></a>
+<a class="index-entry-id"
id="index-a-index_002d_002d_002dentry-te-_002d_002d_002d-i"></a>
-<a class="index-entry-anchor" id="index-truc-4"></a>
+<a class="index-entry-id" id="index-truc-4"></a>
<p>Text<a class="footnote" id="DOCF9"
href="sing_fot.htm#FOOT9"><sup>7</sup></a>
diff --git a/tp/tests/tex_html/res_parser/formatting_singular/sing_fot.htm
b/tp/tests/tex_html/res_parser/formatting_singular/sing_fot.htm
index e26d366f92..95b46c8557 100644
--- a/tp/tests/tex_html/res_parser/formatting_singular/sing_fot.htm
+++ b/tp/tests/tex_html/res_parser/formatting_singular/sing_fot.htm
@@ -852,13 +852,13 @@ truc: after a deff item
<p>in footnote2</p>
<h5><a id="FOOT9" href="chapter.html#DOCF9">(7)</a></h5>
<p>in footnote
-<a class="index-entry-anchor" id="index-index-entry-in-footnote"></a>
+<a class="index-entry-id" id="index-index-entry-in-footnote"></a>
</p>
<p>Blah
</p>
<p>Blih
</p>
-<a class="index-entry-anchor" id="index-counting-entry"></a>
+<a class="index-entry-id" id="index-counting-entry"></a>
<h5><a id="FOOT10" href="chapter.html#DOCF10">(8)</a></h5>
<p>in footnote</p>
</div></td>
diff --git a/tp/tests/tex_html/res_parser/tex_not_closed/tex_not_closed.html
b/tp/tests/tex_html/res_parser/tex_not_closed/tex_not_closed.html
index fae15ff166..2a93c8f529 100644
--- a/tp/tests/tex_html/res_parser/tex_not_closed/tex_not_closed.html
+++ b/tp/tests/tex_html/res_parser/tex_not_closed/tex_not_closed.html
@@ -22,7 +22,7 @@ span.program-in-footer {font-size: smaller}
</head>
<body lang="en">
-<a class="node-anchor" id="Top"></a>
+<a class="node" id="Top"></a>
<p>texte
</p>
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- branch master updated: * tp/Texinfo/Convert/HTML.pm (_convert_heading_command): use command as class for anchors, as if it is a @node the heading has another class name, and for an empty @top, there are two classes as for sectioning commands. Move code around, change variable names, add comments for clarity and add FIXMEs.,
Patrice Dumas <=
- Prev by Date:
branch master updated: * tp/Texinfo/Convert/HTML.pm (%css_map, _protect_space): rename nolinebreak class as w-nolinebreak-text. Call html_attribute_class() only if the element will be substituted in the protected text.
- Next by Date:
branch master updated: * tp/Texinfo/Convert/HTML.pm (%css_map, _convert_titlefont_command) (_default_format_heading_text, _convert_heading_command) (_contents_inline_element, _default_format_titlepage, _print_title) (_convert_special_element_type, _convert_tree_unit_type) (_default_format_footnotes_text), tp/init/book.pm: pass the command name, possibly undef for special elements, and class to format_heading_text formatting.
- Previous by thread:
branch master updated: * tp/Texinfo/Convert/HTML.pm (%css_map, _protect_space): rename nolinebreak class as w-nolinebreak-text. Call html_attribute_class() only if the element will be substituted in the protected text.
- Next by thread:
branch master updated: * tp/Texinfo/Convert/HTML.pm (%css_map, _convert_titlefont_command) (_default_format_heading_text, _convert_heading_command) (_contents_inline_element, _default_format_titlepage, _print_title) (_convert_special_element_type, _convert_tree_unit_type) (_default_format_footnotes_text), tp/init/book.pm: pass the command name, possibly undef for special elements, and class to format_heading_text formatting.
- Index(es):