[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
branch master updated: * tp/Texinfo/ParserNonXS.pm (_gather_previous_ite
|
From: |
Gavin D. Smith |
|
Subject: |
branch master updated: * tp/Texinfo/ParserNonXS.pm (_gather_previous_item), * tp/Texinfo/XS/parsetexi/multitable.c (gather_previous_item): Include index entries in table_term element. * tp/Texinfo/Common.pm (_relate_index_entry_to_table_entry): Look for index command in table_term rather than table_item. |
|
Date: |
Tue, 22 Nov 2022 15:59:04 -0500 |
This is an automated email from the git hooks/post-receive script.
gavin pushed a commit to branch master
in repository texinfo.
The following commit(s) were added to refs/heads/master by this push:
new 63e79112c0 * tp/Texinfo/ParserNonXS.pm (_gather_previous_item), *
tp/Texinfo/XS/parsetexi/multitable.c (gather_previous_item): Include index
entries in table_term element. * tp/Texinfo/Common.pm
(_relate_index_entry_to_table_entry): Look for index command in table_term
rather than table_item.
63e79112c0 is described below
commit 63e79112c0f725e5e39615c0b00215bd0c5f23ab
Author: Gavin Smith <gavinsmith0123@gmail.com>
AuthorDate: Tue Nov 22 20:58:53 2022 +0000
* tp/Texinfo/ParserNonXS.pm (_gather_previous_item),
* tp/Texinfo/XS/parsetexi/multitable.c (gather_previous_item):
Include index entries in table_term element.
* tp/Texinfo/Common.pm (_relate_index_entry_to_table_entry):
Look for index command in table_term rather than table_item.
---
ChangeLog | 8 ++
tp/Texinfo/Common.pm | 25 +++---
tp/Texinfo/ParserNonXS.pm | 26 ++++---
tp/Texinfo/XS/parsetexi/multitable.c | 58 ++++++++------
.../results/xtable/inter_item_commands_in_table.pl | 89 +++++++++++-----------
.../indices_in_begin_tables_lists.html | 3 +-
.../layout/res_parser/formatting/formatting.html | 24 ++----
.../layout/res_parser/formatting_chm/chapter.html | 12 +--
.../res_parser/formatting_chm/formatting.html | 12 +--
.../formatting_enable_encoding/formatting.html | 24 ++----
.../EPUB/xhtml/chapter.xhtml | 12 +--
.../EPUB/xhtml/formatting.xhtml | 12 +--
.../EPUB/xhtml/chapter.xhtml | 12 +--
.../EPUB/xhtml/formatting.xhtml | 12 +--
.../res_parser/formatting_exotic/chapter.html | 12 +--
.../res_parser/formatting_fr_icons/formatting.html | 24 ++----
.../res_parser/formatting_html/formatting.html | 24 ++----
.../res_parser/formatting_html32/formatting.html | 24 ++----
.../formatting_html_no_texi2html/formatting.html | 12 +--
.../res_parser/formatting_html_nodes/chapter.html | 12 +--
.../res_parser/formatting_html_nodes/index.html | 12 +--
.../formatting_inline_css/formatting.html | 24 ++----
.../res_parser/formatting_mathjax/formatting.html | 24 ++----
.../res_parser/formatting_nodes/chapter.html | 12 +--
.../layout/res_parser/formatting_nodes/index.html | 12 +--
.../formatting_numerical_entities/formatting.html | 24 ++----
.../formatting_regions/formatting_regions.html | 24 ++----
.../formatting_sort_element_counts/formatting.html | 24 ++----
.../formatting_weird_quotes/formatting.html | 24 ++----
.../res_parser/formatting_xhtml/formatting.html | 24 ++----
30 files changed, 265 insertions(+), 376 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index e5d0f5ddb3..1a55ec4125 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2022-11-22 Gavin Smith <gavinsmith0123@gmail.com>
+
+ * tp/Texinfo/ParserNonXS.pm (_gather_previous_item),
+ * tp/Texinfo/XS/parsetexi/multitable.c (gather_previous_item):
+ Include index entries in table_term element.
+ * tp/Texinfo/Common.pm (_relate_index_entry_to_table_entry):
+ Look for index command in table_term rather than table_item.
+
2022-11-22 Patrice Dumas <pertusus@free.fr>
* tp/Texinfo/Convert/HTML.pm (command_text, _convert_xref_commands)
diff --git a/tp/Texinfo/Common.pm b/tp/Texinfo/Common.pm
index 607b61d5ca..0665a97dee 100644
--- a/tp/Texinfo/Common.pm
+++ b/tp/Texinfo/Common.pm
@@ -2204,15 +2204,22 @@ sub _relate_index_entry_to_table_entry($)
return if !$table_term or !$table_item or !$item;
- if ($table_item->{'contents'}
- and $table_item->{'contents'}->[0]
- and $table_item->{'contents'}->[0]->{'type'}
- and $table_item->{'contents'}->[0]->{'type'} eq 'index_entry_command') {
- my $index_command = shift @{$table_item->{'contents'}};
- delete $index_command->{'parent'};
- $item->{'extra'}->{'index_entry'}
- = $index_command->{'extra'}->{'index_entry'};
- $item->{'extra'}->{'index_entry'}->{'entry_element'} = $item;
+ my $index_command_offset;
+ my $contents_count = scalar(@{$table_term->{'contents'}});
+ for (my $i = 0; $i < $contents_count; $i++) {
+ my $element = $table_term->{'contents'}->[$i];
+ if ($element->{'type'} and $element->{'type'} eq 'index_entry_command') {
+ $index_command_offset = $i;
+ last;
+ }
+ }
+ if (defined($index_command_offset)) {
+ my $index_command = splice(@{$table_term->{'contents'}},
+ $index_command_offset, 1);
+ delete $index_command->{'parent'};
+ $item->{'extra'}->{'index_entry'}
+ = $index_command->{'extra'}->{'index_entry'};
+ $item->{'extra'}->{'index_entry'}->{'entry_element'} = $item;
}
}
diff --git a/tp/Texinfo/ParserNonXS.pm b/tp/Texinfo/ParserNonXS.pm
index e05754f448..8e29992e1d 100644
--- a/tp/Texinfo/ParserNonXS.pm
+++ b/tp/Texinfo/ParserNonXS.pm
@@ -1567,19 +1567,26 @@ sub _gather_previous_item($$;$$)
# remove everything that is not an @item/@itemx or before_item to
# put it in the table_item/inter_item
my $contents_count = scalar(@{$current->{'contents'}});
- my $item_idx;
+ my $splice_idx;
for (my $i = $contents_count - 1; $i >= 0; $i--) {
if ($current->{'contents'}->[$i]->{'cmdname'}
and ($current->{'contents'}->[$i]->{'cmdname'} eq 'item'
or ($current->{'contents'}->[$i]->{'cmdname'} eq 'itemx'))) {
- $item_idx = $i;
+ $splice_idx = $i;
last;
}
}
- $item_idx = -1 if !defined($item_idx);
+ $splice_idx = -1 if !defined($splice_idx);
+
+ # move forward past any index entries
+ for ($splice_idx++; $splice_idx < $contents_count; $splice_idx++) {
+ my $child = $current->{'contents'}->[$splice_idx];
+ last if (!$child->{'type'} or $child->{'type'} ne 'index_entry_command');
+ }
my $new_contents = [];
- @{$new_contents} = splice @{$current->{'contents'}}, $item_idx + 1;
+ @{$new_contents} = splice @{$current->{'contents'}}, $splice_idx;
+
my $table_after_terms = {'type' => $type,
'contents' => $new_contents};
for my $child (@{$new_contents}) {
@@ -1609,11 +1616,12 @@ sub _gather_previous_item($$;$$)
$item_content->{'parent'} = $table_term;
unshift @{$table_term->{'contents'}}, $item_content;
# debug
- if (! (($item_content->{'cmdname'}
- and ($item_content->{'cmdname'} eq 'itemx'
- or $item_content->{'cmdname'} eq 'item'))
- or ($item_content->{'type'}
- and $item_content->{'type'} eq 'inter_item'))) {
+ if (!(($item_content->{'cmdname'}
+ and ($item_content->{'cmdname'} eq 'itemx'
+ or $item_content->{'cmdname'} eq 'item'))
+ or ($item_content->{'type'}
+ and ($item_content->{'type'} eq 'inter_item'
+ or $item_content->{'type'} eq 'index_entry_command')))) {
$self->_bug_message("wrong element in table term", $source_info,
$item_content);
}
diff --git a/tp/Texinfo/XS/parsetexi/multitable.c
b/tp/Texinfo/XS/parsetexi/multitable.c
index 7f98377f15..24ab4817e7 100644
--- a/tp/Texinfo/XS/parsetexi/multitable.c
+++ b/tp/Texinfo/XS/parsetexi/multitable.c
@@ -1,4 +1,4 @@
-/* Copyright 2010-2019 Free Software Foundation, Inc.
+/* Copyright 2010-2022 Free Software Foundation, Inc.
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -62,9 +62,10 @@ item_multitable_parent (ELEMENT *current)
void
gather_previous_item (ELEMENT *current, enum command_id next_command)
{
- ELEMENT *gathered;
+ ELEMENT *table_after_terms;
enum element_type type;
- int i, contents_count;
+ int i, splice_index = -1, contents_count;
+ ELEMENT *e;
if (last_contents_child(current)
&& last_contents_child(current)->type == ET_before_item)
@@ -75,24 +76,35 @@ gather_previous_item (ELEMENT *current, enum command_id
next_command)
}
type = next_command != CM_itemx ? ET_table_item : ET_inter_item;
- gathered = new_element (type);
- /* Starting from the end, collect everything that is not a ET_item
- or ET_itemx and put it into the ET_table_item. */
contents_count = current->contents.number;
- for (i = 0; i < contents_count; i++)
+ for (i = contents_count - 1; i >= 0; i--)
{
- ELEMENT *e;
- if (last_contents_child(current)->cmd == CM_item
- || last_contents_child(current)->cmd == CM_itemx)
- break;
+ e = contents_child_by_index (current, i);
+ if (e->cmd == CM_item || e->cmd == CM_itemx)
+ {
+ splice_index = i;
+ break;
+ }
+ }
- e = pop_element_from_contents (current);
- insert_into_contents (gathered, e, 0);
+ /* move forward past any index entries */
+ for (splice_index++; splice_index < contents_count; splice_index++)
+ {
+ if (contents_child_by_index(current, splice_index)->type
+ != ET_index_entry_command)
+ break;
}
- /* TODO: A similar algorithm is is in gather_def_item in def.c. If
- speed is an issue then we could move all the elements at once instead
- of calling insert_into_contents multiple times. */
+
+ table_after_terms = new_element (type);
+
+ /* Move everything from splice_index onwards to be children of
+ table_after_terms. */
+ insert_slice_into_contents (table_after_terms, 0,
+ current, splice_index, current->contents.number);
+ current->contents.number = splice_index;
+ for (i = 0; i < table_after_terms->contents.number; i++)
+ contents_child_by_index(table_after_terms, i)->parent = table_after_terms;
if (type == ET_table_item)
{
@@ -116,21 +128,21 @@ gather_previous_item (ELEMENT *current, enum command_id
next_command)
add_to_element_contents (current, table_entry);
- if (gathered->contents.number > 0)
- add_to_element_contents (table_entry, gathered);
+ if (table_after_terms->contents.number > 0)
+ add_to_element_contents (table_entry, table_after_terms);
else
- destroy_element (gathered);
+ destroy_element (table_after_terms);
}
else /* Gathering ET_inter_item between @item and @itemx */
{
/* Text between @item and @itemx is only allowed in a few cases:
comments, empty lines, or index entries. */
- if (check_no_text (gathered))
+ if (check_no_text (table_after_terms))
line_error ("@itemx must follow @item");
- if (gathered->contents.number > 0)
- add_to_element_contents (current, gathered);
+ if (table_after_terms->contents.number > 0)
+ add_to_element_contents (current, table_after_terms);
else
- destroy_element (gathered);
+ destroy_element (table_after_terms);
}
}
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 93641dd467..c771edaaaf 100644
--- a/tp/t/results/xtable/inter_item_commands_in_table.pl
+++ b/tp/t/results/xtable/inter_item_commands_in_table.pl
@@ -561,47 +561,47 @@ $result_trees{'inter_item_commands_in_table'} = {
}
},
{
- 'contents' => [
+ 'args' => [
{
- 'args' => [
+ 'contents' => [
{
- 'contents' => [
- {
- 'text' => 'index entry between item and
itemx'
- }
- ],
- 'info' => {
- 'spaces_after_argument' => '
-'
- },
- 'type' => 'line_arg'
+ 'text' => 'index entry between item and itemx'
}
],
- 'cmdname' => 'cindex',
- 'extra' => {
- 'index_entry' => {
- 'content_normalized' => [],
- 'entry_content' => [],
- 'entry_element' => {},
- 'entry_node' => {},
- 'entry_number' => 1,
- 'in_code' => 0,
- 'index_at_command' => 'cindex',
- 'index_ignore_chars' => {},
- 'index_name' => 'cp',
- 'index_type_command' => 'cindex'
- }
- },
'info' => {
- 'spaces_before_argument' => ' '
- },
- 'source_info' => {
- 'file_name' => '',
- 'line_nr' => 22,
- 'macro' => ''
+ 'spaces_after_argument' => '
+'
},
- 'type' => 'index_entry_command'
- },
+ 'type' => 'line_arg'
+ }
+ ],
+ 'cmdname' => 'cindex',
+ 'extra' => {
+ 'index_entry' => {
+ 'content_normalized' => [],
+ 'entry_content' => [],
+ 'entry_element' => {},
+ 'entry_node' => {},
+ 'entry_number' => 1,
+ 'in_code' => 0,
+ 'index_at_command' => 'cindex',
+ 'index_ignore_chars' => {},
+ 'index_name' => 'cp',
+ 'index_type_command' => 'cindex'
+ }
+ },
+ 'info' => {
+ 'spaces_before_argument' => ' '
+ },
+ 'source_info' => {
+ 'file_name' => '',
+ 'line_nr' => 22,
+ 'macro' => ''
+ },
+ 'type' => 'index_entry_command'
+ },
+ {
+ 'contents' => [
{
'args' => [
{
@@ -2314,14 +2314,14 @@
$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[5]{'con
$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[5]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'entry_content'}
=
$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[5]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'};
$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[5]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
=
$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[5]{'contents'}[0]{'contents'}[0]{'contents'}[0];
$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[5]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'entry_node'}
= $result_trees{'inter_item_commands_in_table'}{'contents'}[3];
-$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[5]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}
=
$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[5]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'};
-$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[5]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'extra'}{'index_entry'}{'entry_content'}
=
$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[5]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'};
-$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[5]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
=
$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[5]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[0];
-$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[5]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'extra'}{'index_entry'}{'entry_node'}
= $result_trees{'inter_item_commands_in_table'}{'contents'}[3];
-$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[5]{'contents'}[0]{'contents'}[0]{'contents'}[2]{'extra'}{'index_entry'}{'content_normalized'}
=
$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[5]{'contents'}[0]{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'};
-$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[5]{'contents'}[0]{'contents'}[0]{'contents'}[2]{'extra'}{'index_entry'}{'entry_content'}
=
$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[5]{'contents'}[0]{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'};
-$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[5]{'contents'}[0]{'contents'}[0]{'contents'}[2]{'extra'}{'index_entry'}{'entry_element'}
=
$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[5]{'contents'}[0]{'contents'}[0]{'contents'}[2];
-$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[5]{'contents'}[0]{'contents'}[0]{'contents'}[2]{'extra'}{'index_entry'}{'entry_node'}
= $result_trees{'inter_item_commands_in_table'}{'contents'}[3];
+$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[5]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'extra'}{'index_entry'}{'content_normalized'}
=
$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[5]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'};
+$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[5]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'extra'}{'index_entry'}{'entry_content'}
=
$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[5]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'};
+$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[5]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'extra'}{'index_entry'}{'entry_element'}
=
$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[5]{'contents'}[0]{'contents'}[0]{'contents'}[1];
+$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[5]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'extra'}{'index_entry'}{'entry_node'}
= $result_trees{'inter_item_commands_in_table'}{'contents'}[3];
+$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[5]{'contents'}[0]{'contents'}[0]{'contents'}[3]{'extra'}{'index_entry'}{'content_normalized'}
=
$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[5]{'contents'}[0]{'contents'}[0]{'contents'}[3]{'args'}[0]{'contents'};
+$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[5]{'contents'}[0]{'contents'}[0]{'contents'}[3]{'extra'}{'index_entry'}{'entry_content'}
=
$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[5]{'contents'}[0]{'contents'}[0]{'contents'}[3]{'args'}[0]{'contents'};
+$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[5]{'contents'}[0]{'contents'}[0]{'contents'}[3]{'extra'}{'index_entry'}{'entry_element'}
=
$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[5]{'contents'}[0]{'contents'}[0]{'contents'}[3];
+$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[5]{'contents'}[0]{'contents'}[0]{'contents'}[3]{'extra'}{'index_entry'}{'entry_node'}
= $result_trees{'inter_item_commands_in_table'}{'contents'}[3];
$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[5]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}
=
$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[5]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'};
$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[5]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'entry_content'}
=
$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[5]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'};
$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[5]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
=
$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[5]{'contents'}[1]{'contents'}[0]{'contents'}[0];
@@ -2731,8 +2731,7 @@
$result_converted{'html_text'}->{'inter_item_commands_in_table'} = '<div class="
<dl class="ftable">
<dt id=\'index-avar_002d_002db\'><span><var class="var">avar–b</var><a
class="copiable-link" href=\'#index-avar_002d_002db\'> ¶</a></span></dt>
-<dd><a class="index-entry-id"
id="index-index-entry-between-item-and-itemx"></a>
-</dd>
+<a class="index-entry-id" id="index-index-entry-between-item-and-itemx"></a>
<dt id=\'index-b\'><span><var class="var">b</var><a class="copiable-link"
href=\'#index-b\'> ¶</a></span></dt>
<dd><p>l–ine
</p></dd>
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 b25af095f0..9422ecf157 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
@@ -132,8 +132,7 @@ enum
<dl class="ftable">
<dt id='index-avar_002d_002db'><span><var class="var">avar–b</var><a
class="copiable-link" href='#index-avar_002d_002db'> ¶</a></span></dt>
-<dd><a class="index-entry-id"
id="index-index-entry-between-item-and-itemx"></a>
-</dd>
+<a class="index-entry-id" id="index-index-entry-between-item-and-itemx"></a>
<dt id='index-b'><span><var class="var">b</var><a class="copiable-link"
href='#index-b'> ¶</a></span></dt>
<dd><p>l–ine
</p></dd>
diff --git a/tp/tests/layout/res_parser/formatting/formatting.html
b/tp/tests/layout/res_parser/formatting/formatting.html
index deaf84bee2..a5c40f63cb 100644
--- a/tp/tests/layout/res_parser/formatting/formatting.html
+++ b/tp/tests/layout/res_parser/formatting/formatting.html
@@ -1754,8 +1754,7 @@ ref</a>
<dl class="ftable">
<dt id='index-titlepage-a-1'><span><em class="emph">a</em><a
class="copiable-link" href='#index-titlepage-a-1'> ¶</a></span></dt>
-<dd><a class="index-entry-id"
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>
<dt id='index-titlepage-b'><span><em class="emph">b</em><a
class="copiable-link" href='#index-titlepage-b'> ¶</a></span></dt>
<dd><p>l–ine
</p></dd>
@@ -1922,8 +1921,7 @@ html ''
<dl class="ftable">
<dt id='index-titlepage-a-2'><span>a<a class="copiable-link"
href='#index-titlepage-a-2'> ¶</a></span></dt>
-<dd><a class="index-entry-id"
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>
<dt id='index-titlepage-b-1'><span>b<a class="copiable-link"
href='#index-titlepage-b-1'> ¶</a></span></dt>
<dd><p>l–ine
</p></dd>
@@ -2841,8 +2839,7 @@ ref</a>
<dl class="ftable">
<dt id='index-copying-a-1'><span><em class="emph">a</em><a
class="copiable-link" href='#index-copying-a-1'> ¶</a></span></dt>
-<dd><a class="index-entry-id"
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>
<dt id='index-copying-b'><span><em class="emph">b</em><a class="copiable-link"
href='#index-copying-b'> ¶</a></span></dt>
<dd><p>l–ine
</p></dd>
@@ -3008,8 +3005,7 @@ html ''
<dl class="ftable">
<dt id='index-copying-a-2'><span>a<a class="copiable-link"
href='#index-copying-a-2'> ¶</a></span></dt>
-<dd><a class="index-entry-id"
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>
<dt id='index-copying-b-1'><span>b<a class="copiable-link"
href='#index-copying-b-1'> ¶</a></span></dt>
<dd><p>l–ine
</p></dd>
@@ -3985,8 +3981,7 @@ ref</a>
<dl class="ftable">
<dt id='index-copying-a-1'><span><em class="emph">a</em><a
class="copiable-link" href='#index-copying-a-1'> ¶</a></span></dt>
-<dd><a class="index-entry-id"
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>
<dt id='index-copying-b'><span><em class="emph">b</em><a class="copiable-link"
href='#index-copying-b'> ¶</a></span></dt>
<dd><p>l–ine
</p></dd>
@@ -4152,8 +4147,7 @@ html ''
<dl class="ftable">
<dt id='index-copying-a-2'><span>a<a class="copiable-link"
href='#index-copying-a-2'> ¶</a></span></dt>
-<dd><a class="index-entry-id"
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>
<dt id='index-copying-b-1'><span>b<a class="copiable-link"
href='#index-copying-b-1'> ¶</a></span></dt>
<dd><p>l–ine
</p></dd>
@@ -5070,8 +5064,7 @@ ref</a>
<dl class="ftable">
<dt id='index-a-2'><span><em class="emph">a</em><a class="copiable-link"
href='#index-a-2'> ¶</a></span></dt>
-<dd><a class="index-entry-id"
id="index-index-entry-between-item-and-itemx"></a>
-</dd>
+<a class="index-entry-id" id="index-index-entry-between-item-and-itemx"></a>
<dt id='index-b'><span><em class="emph">b</em><a class="copiable-link"
href='#index-b'> ¶</a></span></dt>
<dd><p>l–ine
</p></dd>
@@ -5237,8 +5230,7 @@ html ''
<dl class="ftable">
<dt id='index-a-3'><span>a<a class="copiable-link" href='#index-a-3'>
¶</a></span></dt>
-<dd><a class="index-entry-id"
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>
<dt id='index-b-1'><span>b<a class="copiable-link" href='#index-b-1'>
¶</a></span></dt>
<dd><p>l–ine
</p></dd>
diff --git a/tp/tests/layout/res_parser/formatting_chm/chapter.html
b/tp/tests/layout/res_parser/formatting_chm/chapter.html
index 7db7933941..1b646a7872 100644
--- a/tp/tests/layout/res_parser/formatting_chm/chapter.html
+++ b/tp/tests/layout/res_parser/formatting_chm/chapter.html
@@ -1750,8 +1750,7 @@ ref</a>
<dl class="ftable">
<dt id='index-copying-a-1'><span><em class="emph">a</em><a
class="copiable-link" href='#index-copying-a-1'> ¶</a></span></dt>
-<dd><a class="index-entry-id"
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>
<dt id='index-copying-b'><span><em class="emph">b</em><a class="copiable-link"
href='#index-copying-b'> ¶</a></span></dt>
<dd><p>l–ine
</p></dd>
@@ -1917,8 +1916,7 @@ html ''
<dl class="ftable">
<dt id='index-copying-a-2'><span>a<a class="copiable-link"
href='#index-copying-a-2'> ¶</a></span></dt>
-<dd><a class="index-entry-id"
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>
<dt id='index-copying-b-1'><span>b<a class="copiable-link"
href='#index-copying-b-1'> ¶</a></span></dt>
<dd><p>l–ine
</p></dd>
@@ -2835,8 +2833,7 @@ ref</a>
<dl class="ftable">
<dt id='index-a-2'><span><em class="emph">a</em><a class="copiable-link"
href='#index-a-2'> ¶</a></span></dt>
-<dd><a class="index-entry-id"
id="index-index-entry-between-item-and-itemx"></a>
-</dd>
+<a class="index-entry-id" id="index-index-entry-between-item-and-itemx"></a>
<dt id='index-b'><span><em class="emph">b</em><a class="copiable-link"
href='#index-b'> ¶</a></span></dt>
<dd><p>l–ine
</p></dd>
@@ -3002,8 +2999,7 @@ html ''
<dl class="ftable">
<dt id='index-a-3'><span>a<a class="copiable-link" href='#index-a-3'>
¶</a></span></dt>
-<dd><a class="index-entry-id"
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>
<dt id='index-b-1'><span>b<a class="copiable-link" href='#index-b-1'>
¶</a></span></dt>
<dd><p>l–ine
</p></dd>
diff --git a/tp/tests/layout/res_parser/formatting_chm/formatting.html
b/tp/tests/layout/res_parser/formatting_chm/formatting.html
index ed5044c94e..76e320977c 100644
--- a/tp/tests/layout/res_parser/formatting_chm/formatting.html
+++ b/tp/tests/layout/res_parser/formatting_chm/formatting.html
@@ -1735,8 +1735,7 @@ ref</a>
<dl class="ftable">
<dt id='index-titlepage-a-1'><span><em class="emph">a</em><a
class="copiable-link" href='#index-titlepage-a-1'> ¶</a></span></dt>
-<dd><a class="index-entry-id"
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>
<dt id='index-titlepage-b'><span><em class="emph">b</em><a
class="copiable-link" href='#index-titlepage-b'> ¶</a></span></dt>
<dd><p>l–ine
</p></dd>
@@ -1903,8 +1902,7 @@ html ''
<dl class="ftable">
<dt id='index-titlepage-a-2'><span>a<a class="copiable-link"
href='#index-titlepage-a-2'> ¶</a></span></dt>
-<dd><a class="index-entry-id"
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>
<dt id='index-titlepage-b-1'><span>b<a class="copiable-link"
href='#index-titlepage-b-1'> ¶</a></span></dt>
<dd><p>l–ine
</p></dd>
@@ -2822,8 +2820,7 @@ ref</a>
<dl class="ftable">
<dt id='index-copying-a-1'><span><em class="emph">a</em><a
class="copiable-link" href='#index-copying-a-1'> ¶</a></span></dt>
-<dd><a class="index-entry-id"
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>
<dt id='index-copying-b'><span><em class="emph">b</em><a class="copiable-link"
href='#index-copying-b'> ¶</a></span></dt>
<dd><p>l–ine
</p></dd>
@@ -2989,8 +2986,7 @@ html ''
<dl class="ftable">
<dt id='index-copying-a-2'><span>a<a class="copiable-link"
href='#index-copying-a-2'> ¶</a></span></dt>
-<dd><a class="index-entry-id"
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>
<dt id='index-copying-b-1'><span>b<a class="copiable-link"
href='#index-copying-b-1'> ¶</a></span></dt>
<dd><p>l–ine
</p></dd>
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 9783a032bc..26e27d7730 100644
--- a/tp/tests/layout/res_parser/formatting_enable_encoding/formatting.html
+++ b/tp/tests/layout/res_parser/formatting_enable_encoding/formatting.html
@@ -1754,8 +1754,7 @@ ref</a>
<dl class="ftable">
<dt id='index-titlepage-a-1'><span><em class="emph">a</em><a
class="copiable-link" href='#index-titlepage-a-1'> ¶</a></span></dt>
-<dd><a class="index-entry-id"
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>
<dt id='index-titlepage-b'><span><em class="emph">b</em><a
class="copiable-link" href='#index-titlepage-b'> ¶</a></span></dt>
<dd><p>l–ine
</p></dd>
@@ -1922,8 +1921,7 @@ html ''
<dl class="ftable">
<dt id='index-titlepage-a-2'><span>a<a class="copiable-link"
href='#index-titlepage-a-2'> ¶</a></span></dt>
-<dd><a class="index-entry-id"
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>
<dt id='index-titlepage-b-1'><span>b<a class="copiable-link"
href='#index-titlepage-b-1'> ¶</a></span></dt>
<dd><p>l–ine
</p></dd>
@@ -2841,8 +2839,7 @@ ref</a>
<dl class="ftable">
<dt id='index-copying-a-1'><span><em class="emph">a</em><a
class="copiable-link" href='#index-copying-a-1'> ¶</a></span></dt>
-<dd><a class="index-entry-id"
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>
<dt id='index-copying-b'><span><em class="emph">b</em><a class="copiable-link"
href='#index-copying-b'> ¶</a></span></dt>
<dd><p>l–ine
</p></dd>
@@ -3008,8 +3005,7 @@ html ''
<dl class="ftable">
<dt id='index-copying-a-2'><span>a<a class="copiable-link"
href='#index-copying-a-2'> ¶</a></span></dt>
-<dd><a class="index-entry-id"
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>
<dt id='index-copying-b-1'><span>b<a class="copiable-link"
href='#index-copying-b-1'> ¶</a></span></dt>
<dd><p>l–ine
</p></dd>
@@ -3985,8 +3981,7 @@ ref</a>
<dl class="ftable">
<dt id='index-copying-a-1'><span><em class="emph">a</em><a
class="copiable-link" href='#index-copying-a-1'> ¶</a></span></dt>
-<dd><a class="index-entry-id"
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>
<dt id='index-copying-b'><span><em class="emph">b</em><a class="copiable-link"
href='#index-copying-b'> ¶</a></span></dt>
<dd><p>l–ine
</p></dd>
@@ -4152,8 +4147,7 @@ html ''
<dl class="ftable">
<dt id='index-copying-a-2'><span>a<a class="copiable-link"
href='#index-copying-a-2'> ¶</a></span></dt>
-<dd><a class="index-entry-id"
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>
<dt id='index-copying-b-1'><span>b<a class="copiable-link"
href='#index-copying-b-1'> ¶</a></span></dt>
<dd><p>l–ine
</p></dd>
@@ -5070,8 +5064,7 @@ ref</a>
<dl class="ftable">
<dt id='index-a-2'><span><em class="emph">a</em><a class="copiable-link"
href='#index-a-2'> ¶</a></span></dt>
-<dd><a class="index-entry-id"
id="index-index-entry-between-item-and-itemx"></a>
-</dd>
+<a class="index-entry-id" id="index-index-entry-between-item-and-itemx"></a>
<dt id='index-b'><span><em class="emph">b</em><a class="copiable-link"
href='#index-b'> ¶</a></span></dt>
<dd><p>l–ine
</p></dd>
@@ -5237,8 +5230,7 @@ html ''
<dl class="ftable">
<dt id='index-a-3'><span>a<a class="copiable-link" href='#index-a-3'>
¶</a></span></dt>
-<dd><a class="index-entry-id"
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>
<dt id='index-b-1'><span>b<a class="copiable-link" href='#index-b-1'>
¶</a></span></dt>
<dd><p>l–ine
</p></dd>
diff --git
a/tp/tests/layout/res_parser/formatting_epub/formatting_epub_package/EPUB/xhtml/chapter.xhtml
b/tp/tests/layout/res_parser/formatting_epub/formatting_epub_package/EPUB/xhtml/chapter.xhtml
index 50c7e95736..cdae3bc95f 100644
---
a/tp/tests/layout/res_parser/formatting_epub/formatting_epub_package/EPUB/xhtml/chapter.xhtml
+++
b/tp/tests/layout/res_parser/formatting_epub/formatting_epub_package/EPUB/xhtml/chapter.xhtml
@@ -1750,8 +1750,7 @@ ref</a>
<dl class="ftable">
<dt id='index-copying-a-1'><em class="emph">a</em></dt>
-<dd><a class="index-entry-id"
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>
<dt id='index-copying-b'><em class="emph">b</em></dt>
<dd><p>l–ine
</p></dd>
@@ -1917,8 +1916,7 @@ html ''
<dl class="ftable">
<dt id='index-copying-a-2'>a</dt>
-<dd><a class="index-entry-id"
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>
<dt id='index-copying-b-1'>b</dt>
<dd><p>l–ine
</p></dd>
@@ -2835,8 +2833,7 @@ ref</a>
<dl class="ftable">
<dt id='index-a-2'><em class="emph">a</em></dt>
-<dd><a class="index-entry-id"
id="index-index-entry-between-item-and-itemx"></a>
-</dd>
+<a class="index-entry-id" id="index-index-entry-between-item-and-itemx"></a>
<dt id='index-b'><em class="emph">b</em></dt>
<dd><p>l–ine
</p></dd>
@@ -3002,8 +2999,7 @@ html ''
<dl class="ftable">
<dt id='index-a-3'>a</dt>
-<dd><a class="index-entry-id"
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>
<dt id='index-b-1'>b</dt>
<dd><p>l–ine
</p></dd>
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 5ce530b920..9469d6fa89 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
@@ -1734,8 +1734,7 @@ ref</a>
<dl class="ftable">
<dt id='index-titlepage-a-1'><em class="emph">a</em></dt>
-<dd><a class="index-entry-id"
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>
<dt id='index-titlepage-b'><em class="emph">b</em></dt>
<dd><p>l–ine
</p></dd>
@@ -1902,8 +1901,7 @@ html ''
<dl class="ftable">
<dt id='index-titlepage-a-2'>a</dt>
-<dd><a class="index-entry-id"
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>
<dt id='index-titlepage-b-1'>b</dt>
<dd><p>l–ine
</p></dd>
@@ -2821,8 +2819,7 @@ ref</a>
<dl class="ftable">
<dt id='index-copying-a-1'><em class="emph">a</em></dt>
-<dd><a class="index-entry-id"
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>
<dt id='index-copying-b'><em class="emph">b</em></dt>
<dd><p>l–ine
</p></dd>
@@ -2988,8 +2985,7 @@ html ''
<dl class="ftable">
<dt id='index-copying-a-2'>a</dt>
-<dd><a class="index-entry-id"
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>
<dt id='index-copying-b-1'>b</dt>
<dd><p>l–ine
</p></dd>
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 4df0b318f1..367a96a684 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
@@ -1751,8 +1751,7 @@ ref</a>
<dl class="ftable">
<dt id='index-copying-a-1'><em class="emph">a</em></dt>
-<dd><a class="index-entry-id"
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>
<dt id='index-copying-b'><em class="emph">b</em></dt>
<dd><p>l–ine
</p></dd>
@@ -1918,8 +1917,7 @@ html ''
<dl class="ftable">
<dt id='index-copying-a-2'>a</dt>
-<dd><a class="index-entry-id"
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>
<dt id='index-copying-b-1'>b</dt>
<dd><p>l–ine
</p></dd>
@@ -2836,8 +2834,7 @@ ref</a>
<dl class="ftable">
<dt id='index-a-2'><em class="emph">a</em></dt>
-<dd><a class="index-entry-id"
id="index-index-entry-between-item-and-itemx"></a>
-</dd>
+<a class="index-entry-id" id="index-index-entry-between-item-and-itemx"></a>
<dt id='index-b'><em class="emph">b</em></dt>
<dd><p>l–ine
</p></dd>
@@ -3003,8 +3000,7 @@ html ''
<dl class="ftable">
<dt id='index-a-3'>a</dt>
-<dd><a class="index-entry-id"
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>
<dt id='index-b-1'>b</dt>
<dd><p>l–ine
</p></dd>
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 5a03c5f11e..6356bef4cd 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
@@ -1736,8 +1736,7 @@ ref</a>
<dl class="ftable">
<dt id='index-titlepage-a-1'><em class="emph">a</em></dt>
-<dd><a class="index-entry-id"
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>
<dt id='index-titlepage-b'><em class="emph">b</em></dt>
<dd><p>l–ine
</p></dd>
@@ -1904,8 +1903,7 @@ html ''
<dl class="ftable">
<dt id='index-titlepage-a-2'>a</dt>
-<dd><a class="index-entry-id"
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>
<dt id='index-titlepage-b-1'>b</dt>
<dd><p>l–ine
</p></dd>
@@ -2823,8 +2821,7 @@ ref</a>
<dl class="ftable">
<dt id='index-copying-a-1'><em class="emph">a</em></dt>
-<dd><a class="index-entry-id"
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>
<dt id='index-copying-b'><em class="emph">b</em></dt>
<dd><p>l–ine
</p></dd>
@@ -2990,8 +2987,7 @@ html ''
<dl class="ftable">
<dt id='index-copying-a-2'>a</dt>
-<dd><a class="index-entry-id"
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>
<dt id='index-copying-b-1'>b</dt>
<dd><p>l–ine
</p></dd>
diff --git a/tp/tests/layout/res_parser/formatting_exotic/chapter.html
b/tp/tests/layout/res_parser/formatting_exotic/chapter.html
index 6a5f741a7b..2e9de4fc3d 100644
--- a/tp/tests/layout/res_parser/formatting_exotic/chapter.html
+++ b/tp/tests/layout/res_parser/formatting_exotic/chapter.html
@@ -1769,8 +1769,7 @@ ref</a>
<dl class="ftable">
<dt id='index-copying-a-1'><span><em class="emph">a</em><a
class="copiable-link" href='#index-copying-a-1'> ¶</a></span></dt>
-<dd><a class="index-entry-id"
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>
<dt id='index-copying-b'><span><em class="emph">b</em><a class="copiable-link"
href='#index-copying-b'> ¶</a></span></dt>
<dd><p>l–ine
</p></dd>
@@ -1936,8 +1935,7 @@ html ''
<dl class="ftable">
<dt id='index-copying-a-2'><span>a<a class="copiable-link"
href='#index-copying-a-2'> ¶</a></span></dt>
-<dd><a class="index-entry-id"
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>
<dt id='index-copying-b-1'><span>b<a class="copiable-link"
href='#index-copying-b-1'> ¶</a></span></dt>
<dd><p>l–ine
</p></dd>
@@ -2854,8 +2852,7 @@ ref</a>
<dl class="ftable">
<dt id='index-a-2'><span><em class="emph">a</em><a class="copiable-link"
href='#index-a-2'> ¶</a></span></dt>
-<dd><a class="index-entry-id"
id="index-index-entry-between-item-and-itemx"></a>
-</dd>
+<a class="index-entry-id" id="index-index-entry-between-item-and-itemx"></a>
<dt id='index-b'><span><em class="emph">b</em><a class="copiable-link"
href='#index-b'> ¶</a></span></dt>
<dd><p>l–ine
</p></dd>
@@ -3021,8 +3018,7 @@ html ''
<dl class="ftable">
<dt id='index-a-3'><span>a<a class="copiable-link" href='#index-a-3'>
¶</a></span></dt>
-<dd><a class="index-entry-id"
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>
<dt id='index-b-1'><span>b<a class="copiable-link" href='#index-b-1'>
¶</a></span></dt>
<dd><p>l–ine
</p></dd>
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 5d8b1bf337..f857b629ab 100644
--- a/tp/tests/layout/res_parser/formatting_fr_icons/formatting.html
+++ b/tp/tests/layout/res_parser/formatting_fr_icons/formatting.html
@@ -1754,8 +1754,7 @@ ref</a>
<dl class="ftable">
<dt id='index-titlepage-a-1'><span><em class="emph">a</em><a
class="copiable-link" href='#index-titlepage-a-1'> ¶</a></span></dt>
-<dd><a class="index-entry-id"
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>
<dt id='index-titlepage-b'><span><em class="emph">b</em><a
class="copiable-link" href='#index-titlepage-b'> ¶</a></span></dt>
<dd><p>l–ine
</p></dd>
@@ -1922,8 +1921,7 @@ html ''
<dl class="ftable">
<dt id='index-titlepage-a-2'><span>a<a class="copiable-link"
href='#index-titlepage-a-2'> ¶</a></span></dt>
-<dd><a class="index-entry-id"
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>
<dt id='index-titlepage-b-1'><span>b<a class="copiable-link"
href='#index-titlepage-b-1'> ¶</a></span></dt>
<dd><p>l–ine
</p></dd>
@@ -2841,8 +2839,7 @@ ref</a>
<dl class="ftable">
<dt id='index-copying-a-1'><span><em class="emph">a</em><a
class="copiable-link" href='#index-copying-a-1'> ¶</a></span></dt>
-<dd><a class="index-entry-id"
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>
<dt id='index-copying-b'><span><em class="emph">b</em><a class="copiable-link"
href='#index-copying-b'> ¶</a></span></dt>
<dd><p>l–ine
</p></dd>
@@ -3008,8 +3005,7 @@ html ''
<dl class="ftable">
<dt id='index-copying-a-2'><span>a<a class="copiable-link"
href='#index-copying-a-2'> ¶</a></span></dt>
-<dd><a class="index-entry-id"
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>
<dt id='index-copying-b-1'><span>b<a class="copiable-link"
href='#index-copying-b-1'> ¶</a></span></dt>
<dd><p>l–ine
</p></dd>
@@ -3985,8 +3981,7 @@ ref</a>
<dl class="ftable">
<dt id='index-copying-a-1'><span><em class="emph">a</em><a
class="copiable-link" href='#index-copying-a-1'> ¶</a></span></dt>
-<dd><a class="index-entry-id"
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>
<dt id='index-copying-b'><span><em class="emph">b</em><a class="copiable-link"
href='#index-copying-b'> ¶</a></span></dt>
<dd><p>l–ine
</p></dd>
@@ -4152,8 +4147,7 @@ html ''
<dl class="ftable">
<dt id='index-copying-a-2'><span>a<a class="copiable-link"
href='#index-copying-a-2'> ¶</a></span></dt>
-<dd><a class="index-entry-id"
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>
<dt id='index-copying-b-1'><span>b<a class="copiable-link"
href='#index-copying-b-1'> ¶</a></span></dt>
<dd><p>l–ine
</p></dd>
@@ -5070,8 +5064,7 @@ ref</a>
<dl class="ftable">
<dt id='index-a-2'><span><em class="emph">a</em><a class="copiable-link"
href='#index-a-2'> ¶</a></span></dt>
-<dd><a class="index-entry-id"
id="index-index-entry-between-item-and-itemx"></a>
-</dd>
+<a class="index-entry-id" id="index-index-entry-between-item-and-itemx"></a>
<dt id='index-b'><span><em class="emph">b</em><a class="copiable-link"
href='#index-b'> ¶</a></span></dt>
<dd><p>l–ine
</p></dd>
@@ -5237,8 +5230,7 @@ html ''
<dl class="ftable">
<dt id='index-a-3'><span>a<a class="copiable-link" href='#index-a-3'>
¶</a></span></dt>
-<dd><a class="index-entry-id"
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>
<dt id='index-b-1'><span>b<a class="copiable-link" href='#index-b-1'>
¶</a></span></dt>
<dd><p>l–ine
</p></dd>
diff --git a/tp/tests/layout/res_parser/formatting_html/formatting.html
b/tp/tests/layout/res_parser/formatting_html/formatting.html
index deaf84bee2..a5c40f63cb 100644
--- a/tp/tests/layout/res_parser/formatting_html/formatting.html
+++ b/tp/tests/layout/res_parser/formatting_html/formatting.html
@@ -1754,8 +1754,7 @@ ref</a>
<dl class="ftable">
<dt id='index-titlepage-a-1'><span><em class="emph">a</em><a
class="copiable-link" href='#index-titlepage-a-1'> ¶</a></span></dt>
-<dd><a class="index-entry-id"
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>
<dt id='index-titlepage-b'><span><em class="emph">b</em><a
class="copiable-link" href='#index-titlepage-b'> ¶</a></span></dt>
<dd><p>l–ine
</p></dd>
@@ -1922,8 +1921,7 @@ html ''
<dl class="ftable">
<dt id='index-titlepage-a-2'><span>a<a class="copiable-link"
href='#index-titlepage-a-2'> ¶</a></span></dt>
-<dd><a class="index-entry-id"
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>
<dt id='index-titlepage-b-1'><span>b<a class="copiable-link"
href='#index-titlepage-b-1'> ¶</a></span></dt>
<dd><p>l–ine
</p></dd>
@@ -2841,8 +2839,7 @@ ref</a>
<dl class="ftable">
<dt id='index-copying-a-1'><span><em class="emph">a</em><a
class="copiable-link" href='#index-copying-a-1'> ¶</a></span></dt>
-<dd><a class="index-entry-id"
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>
<dt id='index-copying-b'><span><em class="emph">b</em><a class="copiable-link"
href='#index-copying-b'> ¶</a></span></dt>
<dd><p>l–ine
</p></dd>
@@ -3008,8 +3005,7 @@ html ''
<dl class="ftable">
<dt id='index-copying-a-2'><span>a<a class="copiable-link"
href='#index-copying-a-2'> ¶</a></span></dt>
-<dd><a class="index-entry-id"
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>
<dt id='index-copying-b-1'><span>b<a class="copiable-link"
href='#index-copying-b-1'> ¶</a></span></dt>
<dd><p>l–ine
</p></dd>
@@ -3985,8 +3981,7 @@ ref</a>
<dl class="ftable">
<dt id='index-copying-a-1'><span><em class="emph">a</em><a
class="copiable-link" href='#index-copying-a-1'> ¶</a></span></dt>
-<dd><a class="index-entry-id"
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>
<dt id='index-copying-b'><span><em class="emph">b</em><a class="copiable-link"
href='#index-copying-b'> ¶</a></span></dt>
<dd><p>l–ine
</p></dd>
@@ -4152,8 +4147,7 @@ html ''
<dl class="ftable">
<dt id='index-copying-a-2'><span>a<a class="copiable-link"
href='#index-copying-a-2'> ¶</a></span></dt>
-<dd><a class="index-entry-id"
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>
<dt id='index-copying-b-1'><span>b<a class="copiable-link"
href='#index-copying-b-1'> ¶</a></span></dt>
<dd><p>l–ine
</p></dd>
@@ -5070,8 +5064,7 @@ ref</a>
<dl class="ftable">
<dt id='index-a-2'><span><em class="emph">a</em><a class="copiable-link"
href='#index-a-2'> ¶</a></span></dt>
-<dd><a class="index-entry-id"
id="index-index-entry-between-item-and-itemx"></a>
-</dd>
+<a class="index-entry-id" id="index-index-entry-between-item-and-itemx"></a>
<dt id='index-b'><span><em class="emph">b</em><a class="copiable-link"
href='#index-b'> ¶</a></span></dt>
<dd><p>l–ine
</p></dd>
@@ -5237,8 +5230,7 @@ html ''
<dl class="ftable">
<dt id='index-a-3'><span>a<a class="copiable-link" href='#index-a-3'>
¶</a></span></dt>
-<dd><a class="index-entry-id"
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>
<dt id='index-b-1'><span>b<a class="copiable-link" href='#index-b-1'>
¶</a></span></dt>
<dd><p>l–ine
</p></dd>
diff --git a/tp/tests/layout/res_parser/formatting_html32/formatting.html
b/tp/tests/layout/res_parser/formatting_html32/formatting.html
index b0339f1131..0a05891670 100644
--- a/tp/tests/layout/res_parser/formatting_html32/formatting.html
+++ b/tp/tests/layout/res_parser/formatting_html32/formatting.html
@@ -1687,8 +1687,7 @@ ref</a>
<dl>
<dt id='index-titlepage-a-1'><em>a</em></dt>
-<dd><a name="index-titlepage-index-entry-between-item-and-itemx"></a>
-</dd>
+<a name="index-titlepage-index-entry-between-item-and-itemx"></a>
<dt id='index-titlepage-b'><em>b</em></dt>
<dd><p>l-ine
</p></dd>
@@ -1855,8 +1854,7 @@ html ''
<dl>
<dt id='index-titlepage-a-2'>a</dt>
-<dd><a name="index-titlepage-index-entry-between-item-and-itemx-1"></a>
-</dd>
+<a name="index-titlepage-index-entry-between-item-and-itemx-1"></a>
<dt id='index-titlepage-b-1'>b</dt>
<dd><p>l-ine
</p></dd>
@@ -2748,8 +2746,7 @@ ref</a>
<dl>
<dt id='index-copying-a-1'><em>a</em></dt>
-<dd><a name="index-copying-index-entry-between-item-and-itemx"></a>
-</dd>
+<a name="index-copying-index-entry-between-item-and-itemx"></a>
<dt id='index-copying-b'><em>b</em></dt>
<dd><p>l-ine
</p></dd>
@@ -2915,8 +2912,7 @@ html ''
<dl>
<dt id='index-copying-a-2'>a</dt>
-<dd><a name="index-copying-index-entry-between-item-and-itemx-1"></a>
-</dd>
+<a name="index-copying-index-entry-between-item-and-itemx-1"></a>
<dt id='index-copying-b-1'>b</dt>
<dd><p>l-ine
</p></dd>
@@ -3866,8 +3862,7 @@ ref</a>
<dl>
<dt id='index-copying-a-1'><em>a</em></dt>
-<dd><a name="index-copying-index-entry-between-item-and-itemx"></a>
-</dd>
+<a name="index-copying-index-entry-between-item-and-itemx"></a>
<dt id='index-copying-b'><em>b</em></dt>
<dd><p>l-ine
</p></dd>
@@ -4033,8 +4028,7 @@ html ''
<dl>
<dt id='index-copying-a-2'>a</dt>
-<dd><a name="index-copying-index-entry-between-item-and-itemx-1"></a>
-</dd>
+<a name="index-copying-index-entry-between-item-and-itemx-1"></a>
<dt id='index-copying-b-1'>b</dt>
<dd><p>l-ine
</p></dd>
@@ -4925,8 +4919,7 @@ ref</a>
<dl>
<dt id='index-a-2'><em>a</em></dt>
-<dd><a name="index-index-entry-between-item-and-itemx"></a>
-</dd>
+<a name="index-index-entry-between-item-and-itemx"></a>
<dt id='index-b'><em>b</em></dt>
<dd><p>l-ine
</p></dd>
@@ -5092,8 +5085,7 @@ html ''
<dl>
<dt id='index-a-3'>a</dt>
-<dd><a name="index-index-entry-between-item-and-itemx-1"></a>
-</dd>
+<a name="index-index-entry-between-item-and-itemx-1"></a>
<dt id='index-b-1'>b</dt>
<dd><p>l-ine
</p></dd>
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 b5a4868e09..209b1e600a 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
@@ -1809,8 +1809,7 @@ ref</a>
<dl class="ftable">
<dt id='index-copying-a-1'><span><em class="emph">a</em><a
class="copiable-link" href='#index-copying-a-1'> ¶</a></span></dt>
-<dd><a class="index-entry-id"
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>
<dt id='index-copying-b'><span><em class="emph">b</em><a class="copiable-link"
href='#index-copying-b'> ¶</a></span></dt>
<dd><p>l–ine
</p></dd>
@@ -1976,8 +1975,7 @@ html ''
<dl class="ftable">
<dt id='index-copying-a-2'><span>a<a class="copiable-link"
href='#index-copying-a-2'> ¶</a></span></dt>
-<dd><a class="index-entry-id"
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>
<dt id='index-copying-b-1'><span>b<a class="copiable-link"
href='#index-copying-b-1'> ¶</a></span></dt>
<dd><p>l–ine
</p></dd>
@@ -2894,8 +2892,7 @@ ref</a>
<dl class="ftable">
<dt id='index-a-2'><span><em class="emph">a</em><a class="copiable-link"
href='#index-a-2'> ¶</a></span></dt>
-<dd><a class="index-entry-id"
id="index-index-entry-between-item-and-itemx"></a>
-</dd>
+<a class="index-entry-id" id="index-index-entry-between-item-and-itemx"></a>
<dt id='index-b'><span><em class="emph">b</em><a class="copiable-link"
href='#index-b'> ¶</a></span></dt>
<dd><p>l–ine
</p></dd>
@@ -3061,8 +3058,7 @@ html ''
<dl class="ftable">
<dt id='index-a-3'><span>a<a class="copiable-link" href='#index-a-3'>
¶</a></span></dt>
-<dd><a class="index-entry-id"
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>
<dt id='index-b-1'><span>b<a class="copiable-link" href='#index-b-1'>
¶</a></span></dt>
<dd><p>l–ine
</p></dd>
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 49e800d5f8..0159ff0426 100644
--- a/tp/tests/layout/res_parser/formatting_html_nodes/chapter.html
+++ b/tp/tests/layout/res_parser/formatting_html_nodes/chapter.html
@@ -1770,8 +1770,7 @@ ref</a>
<dl class="ftable">
<dt id='index-copying-a-1'><span><em class="emph">a</em><a
class="copiable-link" href='#index-copying-a-1'> ¶</a></span></dt>
-<dd><a class="index-entry-id"
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>
<dt id='index-copying-b'><span><em class="emph">b</em><a class="copiable-link"
href='#index-copying-b'> ¶</a></span></dt>
<dd><p>l–ine
</p></dd>
@@ -1937,8 +1936,7 @@ html ''
<dl class="ftable">
<dt id='index-copying-a-2'><span>a<a class="copiable-link"
href='#index-copying-a-2'> ¶</a></span></dt>
-<dd><a class="index-entry-id"
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>
<dt id='index-copying-b-1'><span>b<a class="copiable-link"
href='#index-copying-b-1'> ¶</a></span></dt>
<dd><p>l–ine
</p></dd>
@@ -2855,8 +2853,7 @@ ref</a>
<dl class="ftable">
<dt id='index-a-2'><span><em class="emph">a</em><a class="copiable-link"
href='#index-a-2'> ¶</a></span></dt>
-<dd><a class="index-entry-id"
id="index-index-entry-between-item-and-itemx"></a>
-</dd>
+<a class="index-entry-id" id="index-index-entry-between-item-and-itemx"></a>
<dt id='index-b'><span><em class="emph">b</em><a class="copiable-link"
href='#index-b'> ¶</a></span></dt>
<dd><p>l–ine
</p></dd>
@@ -3022,8 +3019,7 @@ html ''
<dl class="ftable">
<dt id='index-a-3'><span>a<a class="copiable-link" href='#index-a-3'>
¶</a></span></dt>
-<dd><a class="index-entry-id"
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>
<dt id='index-b-1'><span>b<a class="copiable-link" href='#index-b-1'>
¶</a></span></dt>
<dd><p>l–ine
</p></dd>
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 550332cf32..73e0834955 100644
--- a/tp/tests/layout/res_parser/formatting_html_nodes/index.html
+++ b/tp/tests/layout/res_parser/formatting_html_nodes/index.html
@@ -1740,8 +1740,7 @@ ref</a>
<dl class="ftable">
<dt id='index-titlepage-a-1'><span><em class="emph">a</em><a
class="copiable-link" href='#index-titlepage-a-1'> ¶</a></span></dt>
-<dd><a class="index-entry-id"
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>
<dt id='index-titlepage-b'><span><em class="emph">b</em><a
class="copiable-link" href='#index-titlepage-b'> ¶</a></span></dt>
<dd><p>l–ine
</p></dd>
@@ -1908,8 +1907,7 @@ html ''
<dl class="ftable">
<dt id='index-titlepage-a-2'><span>a<a class="copiable-link"
href='#index-titlepage-a-2'> ¶</a></span></dt>
-<dd><a class="index-entry-id"
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>
<dt id='index-titlepage-b-1'><span>b<a class="copiable-link"
href='#index-titlepage-b-1'> ¶</a></span></dt>
<dd><p>l–ine
</p></dd>
@@ -2827,8 +2825,7 @@ ref</a>
<dl class="ftable">
<dt id='index-copying-a-1'><span><em class="emph">a</em><a
class="copiable-link" href='#index-copying-a-1'> ¶</a></span></dt>
-<dd><a class="index-entry-id"
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>
<dt id='index-copying-b'><span><em class="emph">b</em><a class="copiable-link"
href='#index-copying-b'> ¶</a></span></dt>
<dd><p>l–ine
</p></dd>
@@ -2994,8 +2991,7 @@ html ''
<dl class="ftable">
<dt id='index-copying-a-2'><span>a<a class="copiable-link"
href='#index-copying-a-2'> ¶</a></span></dt>
-<dd><a class="index-entry-id"
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>
<dt id='index-copying-b-1'><span>b<a class="copiable-link"
href='#index-copying-b-1'> ¶</a></span></dt>
<dd><p>l–ine
</p></dd>
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 8df2f68593..7db181956b 100644
--- a/tp/tests/layout/res_parser/formatting_inline_css/formatting.html
+++ b/tp/tests/layout/res_parser/formatting_inline_css/formatting.html
@@ -1713,8 +1713,7 @@ ref</a>
<dl class="ftable">
<dt id='index-titlepage-a-1'><span><em class="emph">a</em><a
class="copiable-link" style="visibility: hidden; text-decoration: none;
line-height: 0em" href='#index-titlepage-a-1'> ¶</a></span></dt>
-<dd><a class="index-entry-id"
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>
<dt id='index-titlepage-b'><span><em class="emph">b</em><a
class="copiable-link" style="visibility: hidden; text-decoration: none;
line-height: 0em" href='#index-titlepage-b'> ¶</a></span></dt>
<dd><p>l–ine
</p></dd>
@@ -1881,8 +1880,7 @@ html ''
<dl class="ftable">
<dt id='index-titlepage-a-2'><span>a<a class="copiable-link"
style="visibility: hidden; text-decoration: none; line-height: 0em"
href='#index-titlepage-a-2'> ¶</a></span></dt>
-<dd><a class="index-entry-id"
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>
<dt id='index-titlepage-b-1'><span>b<a class="copiable-link"
style="visibility: hidden; text-decoration: none; line-height: 0em"
href='#index-titlepage-b-1'> ¶</a></span></dt>
<dd><p>l–ine
</p></dd>
@@ -2800,8 +2798,7 @@ ref</a>
<dl class="ftable">
<dt id='index-copying-a-1'><span><em class="emph">a</em><a
class="copiable-link" style="visibility: hidden; text-decoration: none;
line-height: 0em" href='#index-copying-a-1'> ¶</a></span></dt>
-<dd><a class="index-entry-id"
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>
<dt id='index-copying-b'><span><em class="emph">b</em><a class="copiable-link"
style="visibility: hidden; text-decoration: none; line-height: 0em"
href='#index-copying-b'> ¶</a></span></dt>
<dd><p>l–ine
</p></dd>
@@ -2967,8 +2964,7 @@ html ''
<dl class="ftable">
<dt id='index-copying-a-2'><span>a<a class="copiable-link" style="visibility:
hidden; text-decoration: none; line-height: 0em" href='#index-copying-a-2'>
¶</a></span></dt>
-<dd><a class="index-entry-id"
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>
<dt id='index-copying-b-1'><span>b<a class="copiable-link" style="visibility:
hidden; text-decoration: none; line-height: 0em" href='#index-copying-b-1'>
¶</a></span></dt>
<dd><p>l–ine
</p></dd>
@@ -3944,8 +3940,7 @@ ref</a>
<dl class="ftable">
<dt id='index-copying-a-1'><span><em class="emph">a</em><a
class="copiable-link" style="visibility: hidden; text-decoration: none;
line-height: 0em" href='#index-copying-a-1'> ¶</a></span></dt>
-<dd><a class="index-entry-id"
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>
<dt id='index-copying-b'><span><em class="emph">b</em><a class="copiable-link"
style="visibility: hidden; text-decoration: none; line-height: 0em"
href='#index-copying-b'> ¶</a></span></dt>
<dd><p>l–ine
</p></dd>
@@ -4111,8 +4106,7 @@ html ''
<dl class="ftable">
<dt id='index-copying-a-2'><span>a<a class="copiable-link" style="visibility:
hidden; text-decoration: none; line-height: 0em" href='#index-copying-a-2'>
¶</a></span></dt>
-<dd><a class="index-entry-id"
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>
<dt id='index-copying-b-1'><span>b<a class="copiable-link" style="visibility:
hidden; text-decoration: none; line-height: 0em" href='#index-copying-b-1'>
¶</a></span></dt>
<dd><p>l–ine
</p></dd>
@@ -5029,8 +5023,7 @@ ref</a>
<dl class="ftable">
<dt id='index-a-2'><span><em class="emph">a</em><a class="copiable-link"
style="visibility: hidden; text-decoration: none; line-height: 0em"
href='#index-a-2'> ¶</a></span></dt>
-<dd><a class="index-entry-id"
id="index-index-entry-between-item-and-itemx"></a>
-</dd>
+<a class="index-entry-id" id="index-index-entry-between-item-and-itemx"></a>
<dt id='index-b'><span><em class="emph">b</em><a class="copiable-link"
style="visibility: hidden; text-decoration: none; line-height: 0em"
href='#index-b'> ¶</a></span></dt>
<dd><p>l–ine
</p></dd>
@@ -5196,8 +5189,7 @@ html ''
<dl class="ftable">
<dt id='index-a-3'><span>a<a class="copiable-link" style="visibility: hidden;
text-decoration: none; line-height: 0em" href='#index-a-3'>
¶</a></span></dt>
-<dd><a class="index-entry-id"
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>
<dt id='index-b-1'><span>b<a class="copiable-link" style="visibility: hidden;
text-decoration: none; line-height: 0em" href='#index-b-1'>
¶</a></span></dt>
<dd><p>l–ine
</p></dd>
diff --git a/tp/tests/layout/res_parser/formatting_mathjax/formatting.html
b/tp/tests/layout/res_parser/formatting_mathjax/formatting.html
index dd73f8770d..6f091288b9 100644
--- a/tp/tests/layout/res_parser/formatting_mathjax/formatting.html
+++ b/tp/tests/layout/res_parser/formatting_mathjax/formatting.html
@@ -1762,8 +1762,7 @@ ref</a>
<dl class="ftable">
<dt id='index-titlepage-a-1'><span><em class="emph">a</em><a
class="copiable-link" href='#index-titlepage-a-1'> ¶</a></span></dt>
-<dd><a class="index-entry-id"
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>
<dt id='index-titlepage-b'><span><em class="emph">b</em><a
class="copiable-link" href='#index-titlepage-b'> ¶</a></span></dt>
<dd><p>l–ine
</p></dd>
@@ -1930,8 +1929,7 @@ html ''
<dl class="ftable">
<dt id='index-titlepage-a-2'><span>a<a class="copiable-link"
href='#index-titlepage-a-2'> ¶</a></span></dt>
-<dd><a class="index-entry-id"
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>
<dt id='index-titlepage-b-1'><span>b<a class="copiable-link"
href='#index-titlepage-b-1'> ¶</a></span></dt>
<dd><p>l–ine
</p></dd>
@@ -2847,8 +2845,7 @@ ref</a>
<dl class="ftable">
<dt id='index-copying-a-1'><span><em class="emph">a</em><a
class="copiable-link" href='#index-copying-a-1'> ¶</a></span></dt>
-<dd><a class="index-entry-id"
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>
<dt id='index-copying-b'><span><em class="emph">b</em><a class="copiable-link"
href='#index-copying-b'> ¶</a></span></dt>
<dd><p>l–ine
</p></dd>
@@ -3014,8 +3011,7 @@ html ''
<dl class="ftable">
<dt id='index-copying-a-2'><span>a<a class="copiable-link"
href='#index-copying-a-2'> ¶</a></span></dt>
-<dd><a class="index-entry-id"
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>
<dt id='index-copying-b-1'><span>b<a class="copiable-link"
href='#index-copying-b-1'> ¶</a></span></dt>
<dd><p>l–ine
</p></dd>
@@ -3989,8 +3985,7 @@ ref</a>
<dl class="ftable">
<dt id='index-copying-a-1'><span><em class="emph">a</em><a
class="copiable-link" href='#index-copying-a-1'> ¶</a></span></dt>
-<dd><a class="index-entry-id"
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>
<dt id='index-copying-b'><span><em class="emph">b</em><a class="copiable-link"
href='#index-copying-b'> ¶</a></span></dt>
<dd><p>l–ine
</p></dd>
@@ -4156,8 +4151,7 @@ html ''
<dl class="ftable">
<dt id='index-copying-a-2'><span>a<a class="copiable-link"
href='#index-copying-a-2'> ¶</a></span></dt>
-<dd><a class="index-entry-id"
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>
<dt id='index-copying-b-1'><span>b<a class="copiable-link"
href='#index-copying-b-1'> ¶</a></span></dt>
<dd><p>l–ine
</p></dd>
@@ -5072,8 +5066,7 @@ ref</a>
<dl class="ftable">
<dt id='index-a-2'><span><em class="emph">a</em><a class="copiable-link"
href='#index-a-2'> ¶</a></span></dt>
-<dd><a class="index-entry-id"
id="index-index-entry-between-item-and-itemx"></a>
-</dd>
+<a class="index-entry-id" id="index-index-entry-between-item-and-itemx"></a>
<dt id='index-b'><span><em class="emph">b</em><a class="copiable-link"
href='#index-b'> ¶</a></span></dt>
<dd><p>l–ine
</p></dd>
@@ -5239,8 +5232,7 @@ html ''
<dl class="ftable">
<dt id='index-a-3'><span>a<a class="copiable-link" href='#index-a-3'>
¶</a></span></dt>
-<dd><a class="index-entry-id"
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>
<dt id='index-b-1'><span>b<a class="copiable-link" href='#index-b-1'>
¶</a></span></dt>
<dd><p>l–ine
</p></dd>
diff --git a/tp/tests/layout/res_parser/formatting_nodes/chapter.html
b/tp/tests/layout/res_parser/formatting_nodes/chapter.html
index 49e800d5f8..0159ff0426 100644
--- a/tp/tests/layout/res_parser/formatting_nodes/chapter.html
+++ b/tp/tests/layout/res_parser/formatting_nodes/chapter.html
@@ -1770,8 +1770,7 @@ ref</a>
<dl class="ftable">
<dt id='index-copying-a-1'><span><em class="emph">a</em><a
class="copiable-link" href='#index-copying-a-1'> ¶</a></span></dt>
-<dd><a class="index-entry-id"
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>
<dt id='index-copying-b'><span><em class="emph">b</em><a class="copiable-link"
href='#index-copying-b'> ¶</a></span></dt>
<dd><p>l–ine
</p></dd>
@@ -1937,8 +1936,7 @@ html ''
<dl class="ftable">
<dt id='index-copying-a-2'><span>a<a class="copiable-link"
href='#index-copying-a-2'> ¶</a></span></dt>
-<dd><a class="index-entry-id"
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>
<dt id='index-copying-b-1'><span>b<a class="copiable-link"
href='#index-copying-b-1'> ¶</a></span></dt>
<dd><p>l–ine
</p></dd>
@@ -2855,8 +2853,7 @@ ref</a>
<dl class="ftable">
<dt id='index-a-2'><span><em class="emph">a</em><a class="copiable-link"
href='#index-a-2'> ¶</a></span></dt>
-<dd><a class="index-entry-id"
id="index-index-entry-between-item-and-itemx"></a>
-</dd>
+<a class="index-entry-id" id="index-index-entry-between-item-and-itemx"></a>
<dt id='index-b'><span><em class="emph">b</em><a class="copiable-link"
href='#index-b'> ¶</a></span></dt>
<dd><p>l–ine
</p></dd>
@@ -3022,8 +3019,7 @@ html ''
<dl class="ftable">
<dt id='index-a-3'><span>a<a class="copiable-link" href='#index-a-3'>
¶</a></span></dt>
-<dd><a class="index-entry-id"
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>
<dt id='index-b-1'><span>b<a class="copiable-link" href='#index-b-1'>
¶</a></span></dt>
<dd><p>l–ine
</p></dd>
diff --git a/tp/tests/layout/res_parser/formatting_nodes/index.html
b/tp/tests/layout/res_parser/formatting_nodes/index.html
index 550332cf32..73e0834955 100644
--- a/tp/tests/layout/res_parser/formatting_nodes/index.html
+++ b/tp/tests/layout/res_parser/formatting_nodes/index.html
@@ -1740,8 +1740,7 @@ ref</a>
<dl class="ftable">
<dt id='index-titlepage-a-1'><span><em class="emph">a</em><a
class="copiable-link" href='#index-titlepage-a-1'> ¶</a></span></dt>
-<dd><a class="index-entry-id"
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>
<dt id='index-titlepage-b'><span><em class="emph">b</em><a
class="copiable-link" href='#index-titlepage-b'> ¶</a></span></dt>
<dd><p>l–ine
</p></dd>
@@ -1908,8 +1907,7 @@ html ''
<dl class="ftable">
<dt id='index-titlepage-a-2'><span>a<a class="copiable-link"
href='#index-titlepage-a-2'> ¶</a></span></dt>
-<dd><a class="index-entry-id"
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>
<dt id='index-titlepage-b-1'><span>b<a class="copiable-link"
href='#index-titlepage-b-1'> ¶</a></span></dt>
<dd><p>l–ine
</p></dd>
@@ -2827,8 +2825,7 @@ ref</a>
<dl class="ftable">
<dt id='index-copying-a-1'><span><em class="emph">a</em><a
class="copiable-link" href='#index-copying-a-1'> ¶</a></span></dt>
-<dd><a class="index-entry-id"
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>
<dt id='index-copying-b'><span><em class="emph">b</em><a class="copiable-link"
href='#index-copying-b'> ¶</a></span></dt>
<dd><p>l–ine
</p></dd>
@@ -2994,8 +2991,7 @@ html ''
<dl class="ftable">
<dt id='index-copying-a-2'><span>a<a class="copiable-link"
href='#index-copying-a-2'> ¶</a></span></dt>
-<dd><a class="index-entry-id"
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>
<dt id='index-copying-b-1'><span>b<a class="copiable-link"
href='#index-copying-b-1'> ¶</a></span></dt>
<dd><p>l–ine
</p></dd>
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 ef5c8ad820..3f89939c69 100644
--- a/tp/tests/layout/res_parser/formatting_numerical_entities/formatting.html
+++ b/tp/tests/layout/res_parser/formatting_numerical_entities/formatting.html
@@ -1754,8 +1754,7 @@ ref</a>
<dl class="ftable">
<dt id='index-titlepage-a-1'><span><em class="emph">a</em><a
class="copiable-link" href='#index-titlepage-a-1'> ¶</a></span></dt>
-<dd><a class="index-entry-id"
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>
<dt id='index-titlepage-b'><span><em class="emph">b</em><a
class="copiable-link" href='#index-titlepage-b'> ¶</a></span></dt>
<dd><p>l–ine
</p></dd>
@@ -1922,8 +1921,7 @@ html ''
<dl class="ftable">
<dt id='index-titlepage-a-2'><span>a<a class="copiable-link"
href='#index-titlepage-a-2'> ¶</a></span></dt>
-<dd><a class="index-entry-id"
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>
<dt id='index-titlepage-b-1'><span>b<a class="copiable-link"
href='#index-titlepage-b-1'> ¶</a></span></dt>
<dd><p>l–ine
</p></dd>
@@ -2841,8 +2839,7 @@ ref</a>
<dl class="ftable">
<dt id='index-copying-a-1'><span><em class="emph">a</em><a
class="copiable-link" href='#index-copying-a-1'> ¶</a></span></dt>
-<dd><a class="index-entry-id"
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>
<dt id='index-copying-b'><span><em class="emph">b</em><a class="copiable-link"
href='#index-copying-b'> ¶</a></span></dt>
<dd><p>l–ine
</p></dd>
@@ -3008,8 +3005,7 @@ html ''
<dl class="ftable">
<dt id='index-copying-a-2'><span>a<a class="copiable-link"
href='#index-copying-a-2'> ¶</a></span></dt>
-<dd><a class="index-entry-id"
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>
<dt id='index-copying-b-1'><span>b<a class="copiable-link"
href='#index-copying-b-1'> ¶</a></span></dt>
<dd><p>l–ine
</p></dd>
@@ -3985,8 +3981,7 @@ ref</a>
<dl class="ftable">
<dt id='index-copying-a-1'><span><em class="emph">a</em><a
class="copiable-link" href='#index-copying-a-1'> ¶</a></span></dt>
-<dd><a class="index-entry-id"
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>
<dt id='index-copying-b'><span><em class="emph">b</em><a class="copiable-link"
href='#index-copying-b'> ¶</a></span></dt>
<dd><p>l–ine
</p></dd>
@@ -4152,8 +4147,7 @@ html ''
<dl class="ftable">
<dt id='index-copying-a-2'><span>a<a class="copiable-link"
href='#index-copying-a-2'> ¶</a></span></dt>
-<dd><a class="index-entry-id"
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>
<dt id='index-copying-b-1'><span>b<a class="copiable-link"
href='#index-copying-b-1'> ¶</a></span></dt>
<dd><p>l–ine
</p></dd>
@@ -5070,8 +5064,7 @@ ref</a>
<dl class="ftable">
<dt id='index-a-2'><span><em class="emph">a</em><a class="copiable-link"
href='#index-a-2'> ¶</a></span></dt>
-<dd><a class="index-entry-id"
id="index-index-entry-between-item-and-itemx"></a>
-</dd>
+<a class="index-entry-id" id="index-index-entry-between-item-and-itemx"></a>
<dt id='index-b'><span><em class="emph">b</em><a class="copiable-link"
href='#index-b'> ¶</a></span></dt>
<dd><p>l–ine
</p></dd>
@@ -5237,8 +5230,7 @@ html ''
<dl class="ftable">
<dt id='index-a-3'><span>a<a class="copiable-link" href='#index-a-3'>
¶</a></span></dt>
-<dd><a class="index-entry-id"
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>
<dt id='index-b-1'><span>b<a class="copiable-link" href='#index-b-1'>
¶</a></span></dt>
<dd><p>l–ine
</p></dd>
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 907971a83e..25f9944758 100644
--- a/tp/tests/layout/res_parser/formatting_regions/formatting_regions.html
+++ b/tp/tests/layout/res_parser/formatting_regions/formatting_regions.html
@@ -1750,8 +1750,7 @@ ref</a>
<dl class="ftable">
<dt id='index-titlepage-a-1'><span><em class="emph">a</em><a
class="copiable-link" href='#index-titlepage-a-1'> ¶</a></span></dt>
-<dd><a class="index-entry-id"
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>
<dt id='index-titlepage-b'><span><em class="emph">b</em><a
class="copiable-link" href='#index-titlepage-b'> ¶</a></span></dt>
<dd><p>l–ine
</p></dd>
@@ -1918,8 +1917,7 @@ html ''
<dl class="ftable">
<dt id='index-titlepage-a-2'><span>a<a class="copiable-link"
href='#index-titlepage-a-2'> ¶</a></span></dt>
-<dd><a class="index-entry-id"
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>
<dt id='index-titlepage-b-1'><span>b<a class="copiable-link"
href='#index-titlepage-b-1'> ¶</a></span></dt>
<dd><p>l–ine
</p></dd>
@@ -2836,8 +2834,7 @@ ref</a>
<dl class="ftable">
<dt id='index-copying-a-1'><span><em class="emph">a</em><a
class="copiable-link" href='#index-copying-a-1'> ¶</a></span></dt>
-<dd><a class="index-entry-id"
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>
<dt id='index-copying-b'><span><em class="emph">b</em><a class="copiable-link"
href='#index-copying-b'> ¶</a></span></dt>
<dd><p>l–ine
</p></dd>
@@ -3003,8 +3000,7 @@ html ''
<dl class="ftable">
<dt id='index-copying-a-2'><span>a<a class="copiable-link"
href='#index-copying-a-2'> ¶</a></span></dt>
-<dd><a class="index-entry-id"
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>
<dt id='index-copying-b-1'><span>b<a class="copiable-link"
href='#index-copying-b-1'> ¶</a></span></dt>
<dd><p>l–ine
</p></dd>
@@ -3955,8 +3951,7 @@ ref</a>
<dl class="ftable">
<dt id='index-a-2'><span><em class="emph">a</em><a class="copiable-link"
href='#index-a-2'> ¶</a></span></dt>
-<dd><a class="index-entry-id"
id="index-index-entry-between-item-and-itemx"></a>
-</dd>
+<a class="index-entry-id" id="index-index-entry-between-item-and-itemx"></a>
<dt id='index-b'><span><em class="emph">b</em><a class="copiable-link"
href='#index-b'> ¶</a></span></dt>
<dd><p>l–ine
</p></dd>
@@ -4122,8 +4117,7 @@ html ''
<dl class="ftable">
<dt id='index-a-3'><span>a<a class="copiable-link" href='#index-a-3'>
¶</a></span></dt>
-<dd><a class="index-entry-id"
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>
<dt id='index-b-1'><span>b<a class="copiable-link" href='#index-b-1'>
¶</a></span></dt>
<dd><p>l–ine
</p></dd>
@@ -6279,8 +6273,7 @@ ref</a>
<dl class="ftable">
<dt id='index-copying-a-1'><span><em class="emph">a</em><a
class="copiable-link" href='#index-copying-a-1'> ¶</a></span></dt>
-<dd><a class="index-entry-id"
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>
<dt id='index-copying-b'><span><em class="emph">b</em><a class="copiable-link"
href='#index-copying-b'> ¶</a></span></dt>
<dd><p>l–ine
</p></dd>
@@ -6446,8 +6439,7 @@ html ''
<dl class="ftable">
<dt id='index-copying-a-2'><span>a<a class="copiable-link"
href='#index-copying-a-2'> ¶</a></span></dt>
-<dd><a class="index-entry-id"
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>
<dt id='index-copying-b-1'><span>b<a class="copiable-link"
href='#index-copying-b-1'> ¶</a></span></dt>
<dd><p>l–ine
</p></dd>
diff --git
a/tp/tests/layout/res_parser/formatting_sort_element_counts/formatting.html
b/tp/tests/layout/res_parser/formatting_sort_element_counts/formatting.html
index deaf84bee2..a5c40f63cb 100644
--- a/tp/tests/layout/res_parser/formatting_sort_element_counts/formatting.html
+++ b/tp/tests/layout/res_parser/formatting_sort_element_counts/formatting.html
@@ -1754,8 +1754,7 @@ ref</a>
<dl class="ftable">
<dt id='index-titlepage-a-1'><span><em class="emph">a</em><a
class="copiable-link" href='#index-titlepage-a-1'> ¶</a></span></dt>
-<dd><a class="index-entry-id"
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>
<dt id='index-titlepage-b'><span><em class="emph">b</em><a
class="copiable-link" href='#index-titlepage-b'> ¶</a></span></dt>
<dd><p>l–ine
</p></dd>
@@ -1922,8 +1921,7 @@ html ''
<dl class="ftable">
<dt id='index-titlepage-a-2'><span>a<a class="copiable-link"
href='#index-titlepage-a-2'> ¶</a></span></dt>
-<dd><a class="index-entry-id"
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>
<dt id='index-titlepage-b-1'><span>b<a class="copiable-link"
href='#index-titlepage-b-1'> ¶</a></span></dt>
<dd><p>l–ine
</p></dd>
@@ -2841,8 +2839,7 @@ ref</a>
<dl class="ftable">
<dt id='index-copying-a-1'><span><em class="emph">a</em><a
class="copiable-link" href='#index-copying-a-1'> ¶</a></span></dt>
-<dd><a class="index-entry-id"
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>
<dt id='index-copying-b'><span><em class="emph">b</em><a class="copiable-link"
href='#index-copying-b'> ¶</a></span></dt>
<dd><p>l–ine
</p></dd>
@@ -3008,8 +3005,7 @@ html ''
<dl class="ftable">
<dt id='index-copying-a-2'><span>a<a class="copiable-link"
href='#index-copying-a-2'> ¶</a></span></dt>
-<dd><a class="index-entry-id"
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>
<dt id='index-copying-b-1'><span>b<a class="copiable-link"
href='#index-copying-b-1'> ¶</a></span></dt>
<dd><p>l–ine
</p></dd>
@@ -3985,8 +3981,7 @@ ref</a>
<dl class="ftable">
<dt id='index-copying-a-1'><span><em class="emph">a</em><a
class="copiable-link" href='#index-copying-a-1'> ¶</a></span></dt>
-<dd><a class="index-entry-id"
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>
<dt id='index-copying-b'><span><em class="emph">b</em><a class="copiable-link"
href='#index-copying-b'> ¶</a></span></dt>
<dd><p>l–ine
</p></dd>
@@ -4152,8 +4147,7 @@ html ''
<dl class="ftable">
<dt id='index-copying-a-2'><span>a<a class="copiable-link"
href='#index-copying-a-2'> ¶</a></span></dt>
-<dd><a class="index-entry-id"
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>
<dt id='index-copying-b-1'><span>b<a class="copiable-link"
href='#index-copying-b-1'> ¶</a></span></dt>
<dd><p>l–ine
</p></dd>
@@ -5070,8 +5064,7 @@ ref</a>
<dl class="ftable">
<dt id='index-a-2'><span><em class="emph">a</em><a class="copiable-link"
href='#index-a-2'> ¶</a></span></dt>
-<dd><a class="index-entry-id"
id="index-index-entry-between-item-and-itemx"></a>
-</dd>
+<a class="index-entry-id" id="index-index-entry-between-item-and-itemx"></a>
<dt id='index-b'><span><em class="emph">b</em><a class="copiable-link"
href='#index-b'> ¶</a></span></dt>
<dd><p>l–ine
</p></dd>
@@ -5237,8 +5230,7 @@ html ''
<dl class="ftable">
<dt id='index-a-3'><span>a<a class="copiable-link" href='#index-a-3'>
¶</a></span></dt>
-<dd><a class="index-entry-id"
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>
<dt id='index-b-1'><span>b<a class="copiable-link" href='#index-b-1'>
¶</a></span></dt>
<dd><p>l–ine
</p></dd>
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 1a386dd4b6..ed1c23af5a 100644
--- a/tp/tests/layout/res_parser/formatting_weird_quotes/formatting.html
+++ b/tp/tests/layout/res_parser/formatting_weird_quotes/formatting.html
@@ -1754,8 +1754,7 @@ ref</a>
<dl class="ftable">
<dt id='index-titlepage-a-1'><span><em class="emph">a</em><a
class="copiable-link" href='#index-titlepage-a-1'> ¶</a></span></dt>
-<dd><a class="index-entry-id"
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>
<dt id='index-titlepage-b'><span><em class="emph">b</em><a
class="copiable-link" href='#index-titlepage-b'> ¶</a></span></dt>
<dd><p>l–ine
</p></dd>
@@ -1922,8 +1921,7 @@ html ''
<dl class="ftable">
<dt id='index-titlepage-a-2'><span>a<a class="copiable-link"
href='#index-titlepage-a-2'> ¶</a></span></dt>
-<dd><a class="index-entry-id"
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>
<dt id='index-titlepage-b-1'><span>b<a class="copiable-link"
href='#index-titlepage-b-1'> ¶</a></span></dt>
<dd><p>l–ine
</p></dd>
@@ -2841,8 +2839,7 @@ ref</a>
<dl class="ftable">
<dt id='index-copying-a-1'><span><em class="emph">a</em><a
class="copiable-link" href='#index-copying-a-1'> ¶</a></span></dt>
-<dd><a class="index-entry-id"
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>
<dt id='index-copying-b'><span><em class="emph">b</em><a class="copiable-link"
href='#index-copying-b'> ¶</a></span></dt>
<dd><p>l–ine
</p></dd>
@@ -3008,8 +3005,7 @@ html ''
<dl class="ftable">
<dt id='index-copying-a-2'><span>a<a class="copiable-link"
href='#index-copying-a-2'> ¶</a></span></dt>
-<dd><a class="index-entry-id"
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>
<dt id='index-copying-b-1'><span>b<a class="copiable-link"
href='#index-copying-b-1'> ¶</a></span></dt>
<dd><p>l–ine
</p></dd>
@@ -3985,8 +3981,7 @@ ref</a>
<dl class="ftable">
<dt id='index-copying-a-1'><span><em class="emph">a</em><a
class="copiable-link" href='#index-copying-a-1'> ¶</a></span></dt>
-<dd><a class="index-entry-id"
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>
<dt id='index-copying-b'><span><em class="emph">b</em><a class="copiable-link"
href='#index-copying-b'> ¶</a></span></dt>
<dd><p>l–ine
</p></dd>
@@ -4152,8 +4147,7 @@ html ''
<dl class="ftable">
<dt id='index-copying-a-2'><span>a<a class="copiable-link"
href='#index-copying-a-2'> ¶</a></span></dt>
-<dd><a class="index-entry-id"
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>
<dt id='index-copying-b-1'><span>b<a class="copiable-link"
href='#index-copying-b-1'> ¶</a></span></dt>
<dd><p>l–ine
</p></dd>
@@ -5070,8 +5064,7 @@ ref</a>
<dl class="ftable">
<dt id='index-a-2'><span><em class="emph">a</em><a class="copiable-link"
href='#index-a-2'> ¶</a></span></dt>
-<dd><a class="index-entry-id"
id="index-index-entry-between-item-and-itemx"></a>
-</dd>
+<a class="index-entry-id" id="index-index-entry-between-item-and-itemx"></a>
<dt id='index-b'><span><em class="emph">b</em><a class="copiable-link"
href='#index-b'> ¶</a></span></dt>
<dd><p>l–ine
</p></dd>
@@ -5237,8 +5230,7 @@ html ''
<dl class="ftable">
<dt id='index-a-3'><span>a<a class="copiable-link" href='#index-a-3'>
¶</a></span></dt>
-<dd><a class="index-entry-id"
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>
<dt id='index-b-1'><span>b<a class="copiable-link" href='#index-b-1'>
¶</a></span></dt>
<dd><p>l–ine
</p></dd>
diff --git a/tp/tests/layout/res_parser/formatting_xhtml/formatting.html
b/tp/tests/layout/res_parser/formatting_xhtml/formatting.html
index 309412581e..d28fbc529f 100644
--- a/tp/tests/layout/res_parser/formatting_xhtml/formatting.html
+++ b/tp/tests/layout/res_parser/formatting_xhtml/formatting.html
@@ -1754,8 +1754,7 @@ ref</a>
<dl class="ftable">
<dt id='index-titlepage-a-1'><span><em class="emph">a</em><a
class="copiable-link" href='#index-titlepage-a-1'> ¶</a></span></dt>
-<dd><a class="index-entry-id"
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>
<dt id='index-titlepage-b'><span><em class="emph">b</em><a
class="copiable-link" href='#index-titlepage-b'> ¶</a></span></dt>
<dd><p>l–ine
</p></dd>
@@ -1922,8 +1921,7 @@ html ''
<dl class="ftable">
<dt id='index-titlepage-a-2'><span>a<a class="copiable-link"
href='#index-titlepage-a-2'> ¶</a></span></dt>
-<dd><a class="index-entry-id"
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>
<dt id='index-titlepage-b-1'><span>b<a class="copiable-link"
href='#index-titlepage-b-1'> ¶</a></span></dt>
<dd><p>l–ine
</p></dd>
@@ -2841,8 +2839,7 @@ ref</a>
<dl class="ftable">
<dt id='index-copying-a-1'><span><em class="emph">a</em><a
class="copiable-link" href='#index-copying-a-1'> ¶</a></span></dt>
-<dd><a class="index-entry-id"
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>
<dt id='index-copying-b'><span><em class="emph">b</em><a class="copiable-link"
href='#index-copying-b'> ¶</a></span></dt>
<dd><p>l–ine
</p></dd>
@@ -3008,8 +3005,7 @@ html ''
<dl class="ftable">
<dt id='index-copying-a-2'><span>a<a class="copiable-link"
href='#index-copying-a-2'> ¶</a></span></dt>
-<dd><a class="index-entry-id"
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>
<dt id='index-copying-b-1'><span>b<a class="copiable-link"
href='#index-copying-b-1'> ¶</a></span></dt>
<dd><p>l–ine
</p></dd>
@@ -3985,8 +3981,7 @@ ref</a>
<dl class="ftable">
<dt id='index-copying-a-1'><span><em class="emph">a</em><a
class="copiable-link" href='#index-copying-a-1'> ¶</a></span></dt>
-<dd><a class="index-entry-id"
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>
<dt id='index-copying-b'><span><em class="emph">b</em><a class="copiable-link"
href='#index-copying-b'> ¶</a></span></dt>
<dd><p>l–ine
</p></dd>
@@ -4152,8 +4147,7 @@ html ''
<dl class="ftable">
<dt id='index-copying-a-2'><span>a<a class="copiable-link"
href='#index-copying-a-2'> ¶</a></span></dt>
-<dd><a class="index-entry-id"
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>
<dt id='index-copying-b-1'><span>b<a class="copiable-link"
href='#index-copying-b-1'> ¶</a></span></dt>
<dd><p>l–ine
</p></dd>
@@ -5070,8 +5064,7 @@ ref</a>
<dl class="ftable">
<dt id='index-a-2'><span><em class="emph">a</em><a class="copiable-link"
href='#index-a-2'> ¶</a></span></dt>
-<dd><a class="index-entry-id"
id="index-index-entry-between-item-and-itemx"></a>
-</dd>
+<a class="index-entry-id" id="index-index-entry-between-item-and-itemx"></a>
<dt id='index-b'><span><em class="emph">b</em><a class="copiable-link"
href='#index-b'> ¶</a></span></dt>
<dd><p>l–ine
</p></dd>
@@ -5237,8 +5230,7 @@ html ''
<dl class="ftable">
<dt id='index-a-3'><span>a<a class="copiable-link" href='#index-a-3'>
¶</a></span></dt>
-<dd><a class="index-entry-id"
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>
<dt id='index-b-1'><span>b<a class="copiable-link" href='#index-b-1'>
¶</a></span></dt>
<dd><p>l–ine
</p></dd>
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- branch master updated: * tp/Texinfo/ParserNonXS.pm (_gather_previous_item), * tp/Texinfo/XS/parsetexi/multitable.c (gather_previous_item): Include index entries in table_term element. * tp/Texinfo/Common.pm (_relate_index_entry_to_table_entry): Look for index command in table_term rather than table_item.,
Gavin D. Smith <=
- Prev by Date:
branch release/7.0 updated: * tp/Texinfo/Convert/HTML.pm (command_text, _convert_xref_commands) (_initialize_output_state): add 'referred_command_stack' to put commands that can be referred to being expanded, to catch if an @*ref refers to that command during the expansion, leading to an infinite recursion. In that case, use the node instead of the section, as with nodes only it is not possible to construct a an infinite recursion as the node must both be a reference target and refer to a specific target at the same [...]
- Next by Date:
[no subject]
- Previous by thread:
branch release/7.0 updated: * tp/Texinfo/Convert/HTML.pm (command_text, _convert_xref_commands) (_initialize_output_state): add 'referred_command_stack' to put commands that can be referred to being expanded, to catch if an @*ref refers to that command during the expansion, leading to an infinite recursion. In that case, use the node instead of the section, as with nodes only it is not possible to construct a an infinite recursion as the node must both be a reference target and refer to a specific target at the same [...]
- Next by thread:
branch texindex-unicode created (now 4cc6ebc49b)
- Index(es):