[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[no subject]
|
From: |
Patrice Dumas |
|
Date: |
Tue, 8 Nov 2022 03:29:28 -0500 (EST) |
branch: master
commit 76485d9ea1f8e411b6b4e4196babe1089d286a42
Author: Patrice Dumas <pertusus@free.fr>
AuthorDate: Fri Nov 4 21:26:18 2022 +0100
Format index entry with @seealso or @seeentry in HTML
* tp/Texinfo/Convert/HTML.pm (_convert_printindex_command):
format entry with @seealso or @seeentry similarly with Texinfo
TeX.
---
ChangeLog | 8 ++
tp/Texinfo/Convert/HTML.pm | 100 +++++++++++++++++++--
tp/t/results/indices/double_seeentry_seealso.pl | 38 ++++++++
.../multiple_index_text_sortas_seeentry_seealso.pl | 20 +++++
tp/t/results/indices/same_only_seealso_seeentry.pl | 32 +++++++
tp/t/results/indices/same_seealso_seeentry.pl | 30 +++++++
tp/t/results/indices/seeentry.pl | 32 +++++++
.../layout/res_parser/formatting/formatting.html | 12 +++
.../layout/res_parser/formatting_chm/chapter.html | 6 ++
.../layout/res_parser/formatting_chm/chapter2.html | 6 ++
.../formatting_enable_encoding/formatting.html | 12 +++
.../EPUB/xhtml/chapter.xhtml | 6 ++
.../EPUB/xhtml/chapter2.xhtml | 6 ++
.../EPUB/xhtml/chapter.xhtml | 6 ++
.../EPUB/xhtml/chapter2.xhtml | 6 ++
.../res_parser/formatting_exotic/chapter.html | 6 ++
.../res_parser/formatting_exotic/chapter2.html | 6 ++
.../res_parser/formatting_fr_icons/formatting.html | 12 +++
.../res_parser/formatting_html/formatting.html | 12 +++
.../res_parser/formatting_html32/formatting.html | 12 +++
.../formatting_html_no_texi2html/formatting.html | 12 +++
.../res_parser/formatting_html_nodes/chapter.html | 6 ++
.../res_parser/formatting_html_nodes/chapter2.html | 6 ++
.../formatting_inline_css/formatting.html | 12 +++
.../res_parser/formatting_mathjax/formatting.html | 12 +++
.../res_parser/formatting_nodes/chapter.html | 6 ++
.../res_parser/formatting_nodes/chapter2.html | 6 ++
.../formatting_numerical_entities/formatting.html | 12 +++
.../formatting_weird_quotes/formatting.html | 12 +++
.../res_parser/formatting_xhtml/formatting.html | 12 +++
.../res_parser/formatting_singular/chapter.html | 6 ++
.../res_parser/formatting_singular/chapter2.html | 6 ++
32 files changed, 470 insertions(+), 6 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 208442fc0a..03cd10e223 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2022-11-04 Patrice Dumas <pertusus@free.fr>
+
+ Format index entry with @seealso or @seeentry in HTML
+
+ * tp/Texinfo/Convert/HTML.pm (_convert_printindex_command):
+ format entry with @seealso or @seeentry similarly with Texinfo
+ TeX.
+
2022-11-04 Patrice Dumas <pertusus@free.fr>
Format @subentry in HTML similarly as in printed output
diff --git a/tp/Texinfo/Convert/HTML.pm b/tp/Texinfo/Convert/HTML.pm
index a8f3bff13d..9c2719e280 100644
--- a/tp/Texinfo/Convert/HTML.pm
+++ b/tp/Texinfo/Convert/HTML.pm
@@ -5296,10 +5296,6 @@ sub _convert_printindex_command($$$$)
# same for Texinfo TeX
my $normalized_entry_levels = [];
foreach my $index_entry_ref (@{$letter_entry->{'entries'}}) {
- # FIXME format instead of ignoring
- next if ($index_entry_ref->{'entry_element'}->{'extra'}
- and
($index_entry_ref->{'entry_element'}->{'extra'}->{'seeentry'}
- or
$index_entry_ref->{'entry_element'}->{'extra'}->{'seealso'}));
$entry_nr++;
next if ($self->get_conf('NO_TOP_NODE_OUTPUT')
and defined($index_entry_ref->{'entry_node'})
@@ -5316,14 +5312,106 @@ sub _convert_printindex_command($$$$)
$formatted_index_entries->{$index_entry_ref}++;
}
+ my $entry_ref_tree = {'contents' => $index_entry_ref->{'entry_content'}};
+ $entry_ref_tree->{'type'} = '_code' if ($index_entry_ref->{'in_code'});
+
+ # index entry with @seeentry or @seealso
+ if ($index_entry_ref->{'entry_element'}->{'extra'}
+ and ($index_entry_ref->{'entry_element'}->{'extra'}->{'seeentry'}
+ or $index_entry_ref->{'entry_element'}->{'extra'}->{'seealso'}))
{
+ my $referred_entry;
+ my $seenentry = 1;
+ if ($index_entry_ref->{'entry_element'}->{'extra'}->{'seeentry'}) {
+ $referred_entry
+ = $index_entry_ref->{'entry_element'}->{'extra'}->{'seeentry'};
+ } else {
+ $referred_entry
+ = $index_entry_ref->{'entry_element'}->{'extra'}->{'seealso'};
+ $seenentry = 0;
+ }
+ my @referred_contents;
+ if ($referred_entry->{'args'} and $referred_entry->{'args'}->[0]
+ and $referred_entry->{'args'}->[0]->{'contents'}) {
+ @referred_contents
+ = @{$referred_entry->{'args'}->[0]->{'contents'}};
+ }
+ my $referred_tree = {'contents' => \@referred_contents};
+ $referred_tree->{'type'} = '_code' if ($index_entry_ref->{'in_code'});
+ my $entry;
+ # for @seealso, to appear where chapter/node ususally appear
+ my $reference = '';
+ my $delimiter = '';
+ my $entry_class;
+ my $section_class;
+ if ($seenentry) {
+ my $result_tree;
+ if ($index_entry_ref->{'in_code'}) {
+ $result_tree
+ = $self->gdt('@code{{main_index_entry}}, @emph{See}
@code{{seenentry}}',
+ {'main_index_entry' => $entry_ref_tree,
+ 'seenentry' => $referred_tree});
+ } else {
+ $result_tree
+ = $self->gdt('{main_index_entry}, @emph{See} {seenentry}',
+ {'main_index_entry' => $entry_ref_tree,
+ 'seenentry' => $referred_tree});
+ }
+ if ($formatted_index_entries->{$index_entry_ref} > 1) {
+ # call with multiple_pass argument
+ $entry = $self->convert_tree_new_formatting_context($result_tree,
+ "index $index_name l $letter index entry $entry_nr seenentry",
+ "index formatted
$formatted_index_entries->{$index_entry_ref}")
+ } else {
+ $entry = $self->convert_tree($result_tree,
+ "index $index_name l $letter index entry $entry_nr
seenentry");
+ }
+ $entry_class = "$cmdname-index-see-entry";
+ $section_class = "$cmdname-index-see-entry-section";
+ } else {
+ my $reference_tree = $self->gdt('@emph{See also} {see_also_entry}',
+ {'see_also_entry' => $referred_tree});
+ if ($formatted_index_entries->{$index_entry_ref} > 1) {
+ # call with multiple_pass argument
+ $entry =
$self->convert_tree_new_formatting_context($entry_ref_tree,
+ "index $index_name l $letter index entry $entry_nr (with
seealso)",
+ "index formatted $formatted_index_entries->{$index_entry_ref}");
+ $reference
+ = $self->convert_tree_new_formatting_context($reference_tree,
+ "index $index_name l $letter index entry $entry_nr seealso",
+ "index formatted
$formatted_index_entries->{$index_entry_ref}");
+ } else {
+ $entry = $self->convert_tree($entry_ref_tree,
+ "index $index_name l $letter index entry $entry_nr (with
seealso)");
+ $reference
+ = $self->convert_tree_new_formatting_context($reference_tree,
+ "index $index_name l $letter index entry $entry_nr seealso");
+ }
+ $entry = '<code>' .$entry .'</code>' if
($index_entry_ref->{'in_code'});
+ $delimiter = $self->get_conf('INDEX_ENTRY_COLON');
+ # TODO add the information that it is associated with see also?
+ $entry_class = "$cmdname-index-entry";
+ $section_class = "$cmdname-index-see-also";
+ }
+
+ $entries_text .= '<tr><td></td>'
+ .$self->html_attribute_class('td', [$entry_class]).'>'
+ . $entry .
+ $delimiter .
+ '</td><td>'.$self->get_info('non_breaking_space').'</td>'
+ .$self->html_attribute_class('td', [$section_class]).'>';
+ $entries_text .= $reference;
+ $entries_text .= "</td></tr>\n";
+
+ $normalized_entry_levels = [];
+ next;
+ }
+
# determine the trees and normalized main entry and subentries, to be
# compared with the previous line normalized entries to determine
# what is already formatted as part of the previous lines and
# what levels should be added. The last level is always formatted.
my @new_normalized_entry_levels;
my @entry_trees;
- my $entry_ref_tree = {'contents' => $index_entry_ref->{'entry_content'}};
- $entry_ref_tree->{'type'} = '_code' if ($index_entry_ref->{'in_code'});
$new_normalized_entry_levels[0]
= uc(Texinfo::Convert::NodeNameNormalization::convert_to_normalized(
$entry_ref_tree));
diff --git a/tp/t/results/indices/double_seeentry_seealso.pl
b/tp/t/results/indices/double_seeentry_seealso.pl
index 7d582c7122..d5de750523 100644
--- a/tp/t/results/indices/double_seeentry_seealso.pl
+++ b/tp/t/results/indices/double_seeentry_seealso.pl
@@ -814,6 +814,44 @@
$result_converted{'html_text'}->{'double_seeentry_seealso'} = '<div class="top-l
<h2 class="chapter" id="Chapter-Index">1 Chapter Index</h2>
+<div class="printindex cp-printindex">
+<table class="cp-letters-header-printindex"><tr><th>Jump to:
</th><td><a class="summary-letter-printindex"
href="#t_i_cp_symbol-1"><b></b></a>
+
+<br>
+<a class="summary-letter-printindex" href="#t_i_cp_letter-A"><b>A</b></a>
+
+<a class="summary-letter-printindex" href="#t_i_cp_letter-D"><b>D</b></a>
+
+<a class="summary-letter-printindex" href="#t_i_cp_letter-G"><b>G</b></a>
+
+</td></tr></table>
+<table class="cp-entries-printindex" border="0">
+<tr><td></td><th class="entries-header-printindex">Index
Entry</th><td> </td><th class="sections-header-printindex">
Section</th></tr>
+<tr><td colspan="4"> <hr></td></tr>
+<tr><th id="t_i_cp_symbol-1"></th><td></td><td></td></tr>
+<tr><td></td><td class="printindex-index-entry">:</td><td> </td><td
class="printindex-index-see-also"><em class="emph">See also</em> fff</td></tr>
+<tr><td colspan="4"> <hr></td></tr>
+<tr><th id="t_i_cp_letter-A">A</th><td></td><td></td></tr>
+<tr><td></td><td class="printindex-index-see-entry">aaa, <em
class="emph">See</em> ccc</td><td> </td><td
class="printindex-index-see-entry-section"></td></tr>
+<tr><td colspan="4"> <hr></td></tr>
+<tr><th id="t_i_cp_letter-D">D</th><td></td><td></td></tr>
+<tr><td></td><td class="printindex-index-entry">ddd:</td><td> </td><td
class="printindex-index-see-also"><em class="emph">See also</em> eee</td></tr>
+<tr><td colspan="4"> <hr></td></tr>
+<tr><th id="t_i_cp_letter-G">G</th><td></td><td></td></tr>
+<tr><td></td><td class="printindex-index-see-entry">ggg, <em
class="emph">See</em> hhh</td><td> </td><td
class="printindex-index-see-entry-section"></td></tr>
+<tr><td colspan="4"> <hr></td></tr>
+</table>
+<table class="cp-letters-footer-printindex"><tr><th>Jump to:
</th><td><a class="summary-letter-printindex"
href="#t_i_cp_symbol-1"><b></b></a>
+
+<br>
+<a class="summary-letter-printindex" href="#t_i_cp_letter-A"><b>A</b></a>
+
+<a class="summary-letter-printindex" href="#t_i_cp_letter-D"><b>D</b></a>
+
+<a class="summary-letter-printindex" href="#t_i_cp_letter-G"><b>G</b></a>
+
+</td></tr></table>
+</div>
</div>
</div>
';
diff --git
a/tp/t/results/indices/multiple_index_text_sortas_seeentry_seealso.pl
b/tp/t/results/indices/multiple_index_text_sortas_seeentry_seealso.pl
index 87f0b2208d..fb48a9674e 100644
--- a/tp/t/results/indices/multiple_index_text_sortas_seeentry_seealso.pl
+++ b/tp/t/results/indices/multiple_index_text_sortas_seeentry_seealso.pl
@@ -665,13 +665,33 @@
$result_converted{'html_text'}->{'multiple_index_text_sortas_seeentry_seealso'}
<a class="index-entry-id" id="index-other-second"></a>
<div class="printindex cp-printindex">
+<table class="cp-letters-header-printindex"><tr><th>Jump to:
</th><td><a class="summary-letter-printindex"
href="#t_i_cp_letter-A"><b>A</b></a>
+
+<a class="summary-letter-printindex" href="#t_i_cp_letter-B"><b>B</b></a>
+
+<a class="summary-letter-printindex" href="#t_i_cp_letter-E"><b>E</b></a>
+
+</td></tr></table>
<table class="cp-entries-printindex" border="0">
<tr><td></td><th class="entries-header-printindex">Index
Entry</th><td> </td><th class="sections-header-printindex">
Section</th></tr>
<tr><td colspan="4"> <hr></td></tr>
+<tr><th id="t_i_cp_letter-A">A</th><td></td><td></td></tr>
+<tr><td></td><td class="printindex-index-see-entry">aaa continue aagain, <em
class="emph">See</em> other second</td><td> </td><td
class="printindex-index-see-entry-section"></td></tr>
+<tr><td colspan="4"> <hr></td></tr>
<tr><th id="t_i_cp_letter-B">B</th><td></td><td></td></tr>
<tr><td></td><td class="printindex-index-entry"><a
href="#index-other-second">other second</a>:</td><td> </td><td
class="printindex-index-section"><a href="#chapter-index">chapter
index</a></td></tr>
<tr><td colspan="4"> <hr></td></tr>
+<tr><th id="t_i_cp_letter-E">E</th><td></td><td></td></tr>
+<tr><td></td><td class="printindex-index-see-entry">entry secret, <em
class="emph">See</em> something else</td><td> </td><td
class="printindex-index-see-entry-section"></td></tr>
+<tr><td colspan="4"> <hr></td></tr>
</table>
+<table class="cp-letters-footer-printindex"><tr><th>Jump to:
</th><td><a class="summary-letter-printindex"
href="#t_i_cp_letter-A"><b>A</b></a>
+
+<a class="summary-letter-printindex" href="#t_i_cp_letter-B"><b>B</b></a>
+
+<a class="summary-letter-printindex" href="#t_i_cp_letter-E"><b>E</b></a>
+
+</td></tr></table>
</div>
</div>
</div>
diff --git a/tp/t/results/indices/same_only_seealso_seeentry.pl
b/tp/t/results/indices/same_only_seealso_seeentry.pl
index 9b5d02bdd8..d50520ef7f 100644
--- a/tp/t/results/indices/same_only_seealso_seeentry.pl
+++ b/tp/t/results/indices/same_only_seealso_seeentry.pl
@@ -806,6 +806,38 @@
$result_converted{'html_text'}->{'same_only_seealso_seeentry'} = '<div class="to
+<div class="printindex cp-printindex">
+<table class="cp-letters-header-printindex"><tr><th>Jump to:
</th><td><a class="summary-letter-printindex"
href="#t_i_cp_letter-A"><b>A</b></a>
+
+<a class="summary-letter-printindex" href="#t_i_cp_letter-B"><b>B</b></a>
+
+<a class="summary-letter-printindex" href="#t_i_cp_letter-C"><b>C</b></a>
+
+</td></tr></table>
+<table class="cp-entries-printindex" border="0">
+<tr><td></td><th class="entries-header-printindex">Index
Entry</th><td> </td><th class="sections-header-printindex">
Section</th></tr>
+<tr><td colspan="4"> <hr></td></tr>
+<tr><th id="t_i_cp_letter-A">A</th><td></td><td></td></tr>
+<tr><td></td><td class="printindex-index-entry">aaa:</td><td> </td><td
class="printindex-index-see-also"><em class="emph">See also</em> sss</td></tr>
+<tr><td></td><td class="printindex-index-entry">aaa:</td><td> </td><td
class="printindex-index-see-also"><em class="emph">See also</em> 123</td></tr>
+<tr><td colspan="4"> <hr></td></tr>
+<tr><th id="t_i_cp_letter-B">B</th><td></td><td></td></tr>
+<tr><td></td><td class="printindex-index-see-entry">bbb, <em
class="emph">See</em> yyy</td><td> </td><td
class="printindex-index-see-entry-section"></td></tr>
+<tr><td></td><td class="printindex-index-see-entry">bbb, <em
class="emph">See</em> ttt</td><td> </td><td
class="printindex-index-see-entry-section"></td></tr>
+<tr><td colspan="4"> <hr></td></tr>
+<tr><th id="t_i_cp_letter-C">C</th><td></td><td></td></tr>
+<tr><td></td><td class="printindex-index-entry">ccc:</td><td> </td><td
class="printindex-index-see-also"><em class="emph">See also</em> also</td></tr>
+<tr><td></td><td class="printindex-index-see-entry">ccc, <em
class="emph">See</em> entry</td><td> </td><td
class="printindex-index-see-entry-section"></td></tr>
+<tr><td colspan="4"> <hr></td></tr>
+</table>
+<table class="cp-letters-footer-printindex"><tr><th>Jump to:
</th><td><a class="summary-letter-printindex"
href="#t_i_cp_letter-A"><b>A</b></a>
+
+<a class="summary-letter-printindex" href="#t_i_cp_letter-B"><b>B</b></a>
+
+<a class="summary-letter-printindex" href="#t_i_cp_letter-C"><b>C</b></a>
+
+</td></tr></table>
+</div>
</div>
</div>
';
diff --git a/tp/t/results/indices/same_seealso_seeentry.pl
b/tp/t/results/indices/same_seealso_seeentry.pl
index 2caf802b98..b31402e6d9 100644
--- a/tp/t/results/indices/same_seealso_seeentry.pl
+++ b/tp/t/results/indices/same_seealso_seeentry.pl
@@ -869,13 +869,43 @@ $result_converted{'html_text'}->{'same_seealso_seeentry'}
= '<div class="top-lev
<a class="index-entry-id" id="index-entry"></a>
<div class="printindex cp-printindex">
+<table class="cp-letters-header-printindex"><tr><th>Jump to:
</th><td><a class="summary-letter-printindex"
href="#t_i_cp_letter-A"><b>A</b></a>
+
+<a class="summary-letter-printindex" href="#t_i_cp_letter-B"><b>B</b></a>
+
+<a class="summary-letter-printindex" href="#t_i_cp_letter-C"><b>C</b></a>
+
+<a class="summary-letter-printindex" href="#t_i_cp_letter-E"><b>E</b></a>
+
+</td></tr></table>
<table class="cp-entries-printindex" border="0">
<tr><td></td><th class="entries-header-printindex">Index
Entry</th><td> </td><th class="sections-header-printindex">
Section</th></tr>
<tr><td colspan="4"> <hr></td></tr>
+<tr><th id="t_i_cp_letter-A">A</th><td></td><td></td></tr>
+<tr><td></td><td class="printindex-index-entry">aaa:</td><td> </td><td
class="printindex-index-see-also"><em class="emph">See also</em> sss</td></tr>
+<tr><td></td><td class="printindex-index-entry">aaa:</td><td> </td><td
class="printindex-index-see-also"><em class="emph">See also</em> 123</td></tr>
+<tr><td colspan="4"> <hr></td></tr>
+<tr><th id="t_i_cp_letter-B">B</th><td></td><td></td></tr>
+<tr><td></td><td class="printindex-index-see-entry">bbb, <em
class="emph">See</em> yyy</td><td> </td><td
class="printindex-index-see-entry-section"></td></tr>
+<tr><td></td><td class="printindex-index-see-entry">bbb, <em
class="emph">See</em> ttt</td><td> </td><td
class="printindex-index-see-entry-section"></td></tr>
+<tr><td colspan="4"> <hr></td></tr>
+<tr><th id="t_i_cp_letter-C">C</th><td></td><td></td></tr>
+<tr><td></td><td class="printindex-index-entry">ccc:</td><td> </td><td
class="printindex-index-see-also"><em class="emph">See also</em> also</td></tr>
+<tr><td></td><td class="printindex-index-see-entry">ccc, <em
class="emph">See</em> entry</td><td> </td><td
class="printindex-index-see-entry-section"></td></tr>
+<tr><td colspan="4"> <hr></td></tr>
<tr><th id="t_i_cp_letter-E">E</th><td></td><td></td></tr>
<tr><td></td><td class="printindex-index-entry"><a
href="#index-entry">entry</a>:</td><td> </td><td
class="printindex-index-section"><a href="#node">node</a></td></tr>
<tr><td colspan="4"> <hr></td></tr>
</table>
+<table class="cp-letters-footer-printindex"><tr><th>Jump to:
</th><td><a class="summary-letter-printindex"
href="#t_i_cp_letter-A"><b>A</b></a>
+
+<a class="summary-letter-printindex" href="#t_i_cp_letter-B"><b>B</b></a>
+
+<a class="summary-letter-printindex" href="#t_i_cp_letter-C"><b>C</b></a>
+
+<a class="summary-letter-printindex" href="#t_i_cp_letter-E"><b>E</b></a>
+
+</td></tr></table>
</div>
</div>
</div>
diff --git a/tp/t/results/indices/seeentry.pl b/tp/t/results/indices/seeentry.pl
index d34ad68306..bcfd0cbf49 100644
--- a/tp/t/results/indices/seeentry.pl
+++ b/tp/t/results/indices/seeentry.pl
@@ -692,6 +692,38 @@ $result_converted{'html_text'}->{'seeentry'} = '<div
class="top-level-extent" id
+<div class="printindex cp-printindex">
+<table class="cp-letters-header-printindex"><tr><th>Jump to:
</th><td><a class="summary-letter-printindex"
href="#t_i_cp_letter-A"><b>A</b></a>
+
+<a class="summary-letter-printindex" href="#t_i_cp_letter-D"><b>D</b></a>
+
+</td></tr></table>
+<table class="cp-entries-printindex" border="0">
+<tr><td></td><th class="entries-header-printindex">Index
Entry</th><td> </td><th class="sections-header-printindex">
Section</th></tr>
+<tr><td colspan="4"> <hr></td></tr>
+<tr><th id="t_i_cp_letter-A">A</th><td></td><td></td></tr>
+<tr><td></td><td class="printindex-index-see-entry">aaa, <em
class="emph">See</em> bbb</td><td> </td><td
class="printindex-index-see-entry-section"></td></tr>
+<tr><td colspan="4"> <hr></td></tr>
+<tr><th id="t_i_cp_letter-D">D</th><td></td><td></td></tr>
+<tr><td></td><td class="printindex-index-entry">ddd:</td><td> </td><td
class="printindex-index-see-also"><em class="emph">See also</em> ccc</td></tr>
+<tr><td colspan="4"> <hr></td></tr>
+</table>
+<table class="cp-letters-footer-printindex"><tr><th>Jump to:
</th><td><a class="summary-letter-printindex"
href="#t_i_cp_letter-A"><b>A</b></a>
+
+<a class="summary-letter-printindex" href="#t_i_cp_letter-D"><b>D</b></a>
+
+</td></tr></table>
+</div>
+<div class="printindex fn-printindex">
+<table class="fn-entries-printindex" border="0">
+<tr><td></td><th class="entries-header-printindex">Index
Entry</th><td> </td><th class="sections-header-printindex">
Section</th></tr>
+<tr><td colspan="4"> <hr></td></tr>
+<tr><th id="t_i_fn_letter-F">F</th><td></td><td></td></tr>
+<tr><td></td><td class="printindex-index-see-entry"><code
class="code">f---aaa</code>, <em class="emph">See</em> <code
class="code">f---bbb</code></td><td> </td><td
class="printindex-index-see-entry-section"></td></tr>
+<tr><td></td><td
class="printindex-index-entry"><code>f---ddd</code>:</td><td> </td><td
class="printindex-index-see-also"><em class="emph">See also</em>
f---ccc</td></tr>
+<tr><td colspan="4"> <hr></td></tr>
+</table>
+</div>
</div>
</div>
';
diff --git a/tp/tests/layout/res_parser/formatting/formatting.html
b/tp/tests/layout/res_parser/formatting/formatting.html
index 86d9c314c2..fcdfe99143 100644
--- a/tp/tests/layout/res_parser/formatting/formatting.html
+++ b/tp/tests/layout/res_parser/formatting/formatting.html
@@ -6605,6 +6605,7 @@ Invalid use of @':
<tr><td></td><td class="printindex-index-entry"><a
href="#index-titlepage-a_002d_002dasis"><code>a--asis</code></a></td><td> </td><td
class="printindex-index-section"><a href="#Top">Top section</a></td></tr>
<tr><td></td><td class="printindex-index-entry"><a
href="#index-a_002d_002dasis"><code>a--asis</code></a></td><td> </td><td
class="printindex-index-section"><a href="#chapter">1 chapter</a></td></tr>
<tr><td></td><td class="printindex-index-entry"><a
href="#index-a_002d_002dasis-1"><code>a--asis</code></a></td><td> </td><td
class="printindex-index-section"><a href="#chapter">1 chapter</a></td></tr>
+<tr><td></td><td class="printindex-index-see-entry">aaa, <em
class="emph">See</em> bbb</td><td> </td><td
class="printindex-index-see-entry-section"></td></tr>
<tr><td colspan="4"> <hr></td></tr>
<tr><th id="chapter-1_cp_letter-B">B</th><td></td><td></td></tr>
<tr><td></td><td class="printindex-index-entry"><a
href="#index-copying-b-2"><code>b</code></a></td><td> </td><td
class="printindex-index-section"><a href="#Top">Top section</a></td></tr>
@@ -6677,6 +6678,8 @@ Invalid use of @':
<tr><td></td><td class="printindex-index-entry"><a
href="#index-titlepage-d_002d_002defvr_005fname"><code>d--efvr_name</code></a></td><td> </td><td
class="printindex-index-section"><a href="#Top">Top section</a></td></tr>
<tr><td></td><td class="printindex-index-entry"><a
href="#index-d_002d_002defvr_005fname"><code>d--efvr_name</code></a></td><td> </td><td
class="printindex-index-section"><a href="#chapter">1 chapter</a></td></tr>
<tr><td></td><td class="printindex-index-entry"><a
href="#index-d_002d_002defvr_005fname-1"><code>d--efvr_name</code></a></td><td> </td><td
class="printindex-index-section"><a href="#chapter">1 chapter</a></td></tr>
+<tr><td></td><td class="printindex-index-entry">ddd</td><td> </td><td
class="printindex-index-see-also"><em class="emph">See also</em> ccc</td></tr>
+<tr><td></td><td class="printindex-index-entry">ddd</td><td> </td><td
class="printindex-index-see-also"><em class="emph">See also</em> ccc</td></tr>
<tr><td colspan="4"> <hr></td></tr>
<tr><th id="chapter-1_cp_letter-G">G</th><td></td><td></td></tr>
<tr><td></td><td
class="printindex-index-entry">g—gg</td><td> </td><td
class="printindex-index-section"></td></tr>
@@ -6951,8 +6954,11 @@ Invalid use of @':
<tr><td colspan="4"> <hr></td></tr>
<tr><th id="chapter-1_fn_letter-F">F</th><td></td><td></td></tr>
<tr><td></td><td class="printindex-index-entry"><a
href="#index-f_002d_002d_002daa"><code>f---aa</code></a></td><td> </td><td
class="printindex-index-section"><a href="#chapter">1 chapter</a></td></tr>
+<tr><td></td><td class="printindex-index-see-entry"><code
class="code">f---aaa</code>, <em class="emph">See</em> <code
class="code">f---bbb</code></td><td> </td><td
class="printindex-index-see-entry-section"></td></tr>
<tr><td></td><td
class="printindex-index-entry"><code>f---bb</code></td><td> </td><td
class="printindex-index-section"></td></tr>
<tr><td></td><td class="printindex-index-entry"><a
href="#index-f_002d_002d_002dbb"><span
class="index-entry-level-1"><code>f---cc</code></span></a></td><td> </td><td
class="printindex-index-section"><a href="#chapter">1 chapter</a></td></tr>
+<tr><td></td><td
class="printindex-index-entry"><code>f---ddd</code></td><td> </td><td
class="printindex-index-see-also"><em class="emph">See also</em>
f---ccc</td></tr>
+<tr><td></td><td
class="printindex-index-entry"><code>f---ddd</code></td><td> </td><td
class="printindex-index-see-also"><em class="emph">See also</em>
f---ccc</td></tr>
<tr><td></td><td
class="printindex-index-entry"><code>f---ddd</code></td><td> </td><td
class="printindex-index-section"></td></tr>
<tr><td></td><td class="printindex-index-entry"><span
class="index-entry-level-1"><code>f---eee</code></span></td><td> </td><td
class="printindex-index-section"></td></tr>
<tr><td></td><td class="printindex-index-entry"><a
href="#index-f_002d_002d_002dddd"><span
class="index-entry-level-2"><code>ffff</code></span></a></td><td> </td><td
class="printindex-index-section"><a href="#chapter">1 chapter</a></td></tr>
@@ -7307,6 +7313,7 @@ Menu comment
<tr><td></td><td class="printindex-index-entry"><a
href="#index-titlepage-a_002d_002dasis"><code>a--asis</code></a></td><td> </td><td
class="printindex-index-section"><a href="#Top">Top section</a></td></tr>
<tr><td></td><td class="printindex-index-entry"><a
href="#index-a_002d_002dasis"><code>a--asis</code></a></td><td> </td><td
class="printindex-index-section"><a href="#chapter">1 chapter</a></td></tr>
<tr><td></td><td class="printindex-index-entry"><a
href="#index-a_002d_002dasis-1"><code>a--asis</code></a></td><td> </td><td
class="printindex-index-section"><a href="#chapter">1 chapter</a></td></tr>
+<tr><td></td><td class="printindex-index-see-entry">aaa, <em
class="emph">See</em> bbb</td><td> </td><td
class="printindex-index-see-entry-section"></td></tr>
<tr><td colspan="4"> <hr></td></tr>
<tr><th id="chapter-2_cp_letter-B">B</th><td></td><td></td></tr>
<tr><td></td><td class="printindex-index-entry"><a
href="#index-copying-b-2"><code>b</code></a></td><td> </td><td
class="printindex-index-section"><a href="#Top">Top section</a></td></tr>
@@ -7379,6 +7386,8 @@ Menu comment
<tr><td></td><td class="printindex-index-entry"><a
href="#index-titlepage-d_002d_002defvr_005fname"><code>d--efvr_name</code></a></td><td> </td><td
class="printindex-index-section"><a href="#Top">Top section</a></td></tr>
<tr><td></td><td class="printindex-index-entry"><a
href="#index-d_002d_002defvr_005fname"><code>d--efvr_name</code></a></td><td> </td><td
class="printindex-index-section"><a href="#chapter">1 chapter</a></td></tr>
<tr><td></td><td class="printindex-index-entry"><a
href="#index-d_002d_002defvr_005fname-1"><code>d--efvr_name</code></a></td><td> </td><td
class="printindex-index-section"><a href="#chapter">1 chapter</a></td></tr>
+<tr><td></td><td class="printindex-index-entry">ddd</td><td> </td><td
class="printindex-index-see-also"><em class="emph">See also</em> ccc</td></tr>
+<tr><td></td><td class="printindex-index-entry">ddd</td><td> </td><td
class="printindex-index-see-also"><em class="emph">See also</em> ccc</td></tr>
<tr><td colspan="4"> <hr></td></tr>
<tr><th id="chapter-2_cp_letter-G">G</th><td></td><td></td></tr>
<tr><td></td><td
class="printindex-index-entry">g—gg</td><td> </td><td
class="printindex-index-section"></td></tr>
@@ -7651,8 +7660,11 @@ Menu comment
<tr><td colspan="4"> <hr></td></tr>
<tr><th id="chapter-2_fn_letter-F">F</th><td></td><td></td></tr>
<tr><td></td><td class="printindex-index-entry"><a
href="#index-f_002d_002d_002daa"><code>f---aa</code></a></td><td> </td><td
class="printindex-index-section"><a href="#chapter">1 chapter</a></td></tr>
+<tr><td></td><td class="printindex-index-see-entry"><code
class="code">f---aaa</code>, <em class="emph">See</em> <code
class="code">f---bbb</code></td><td> </td><td
class="printindex-index-see-entry-section"></td></tr>
<tr><td></td><td
class="printindex-index-entry"><code>f---bb</code></td><td> </td><td
class="printindex-index-section"></td></tr>
<tr><td></td><td class="printindex-index-entry"><a
href="#index-f_002d_002d_002dbb"><span
class="index-entry-level-1"><code>f---cc</code></span></a></td><td> </td><td
class="printindex-index-section"><a href="#chapter">1 chapter</a></td></tr>
+<tr><td></td><td
class="printindex-index-entry"><code>f---ddd</code></td><td> </td><td
class="printindex-index-see-also"><em class="emph">See also</em>
f---ccc</td></tr>
+<tr><td></td><td
class="printindex-index-entry"><code>f---ddd</code></td><td> </td><td
class="printindex-index-see-also"><em class="emph">See also</em>
f---ccc</td></tr>
<tr><td></td><td
class="printindex-index-entry"><code>f---ddd</code></td><td> </td><td
class="printindex-index-section"></td></tr>
<tr><td></td><td class="printindex-index-entry"><span
class="index-entry-level-1"><code>f---eee</code></span></td><td> </td><td
class="printindex-index-section"></td></tr>
<tr><td></td><td class="printindex-index-entry"><a
href="#index-f_002d_002d_002dddd"><span
class="index-entry-level-2"><code>ffff</code></span></a></td><td> </td><td
class="printindex-index-section"><a href="#chapter">1 chapter</a></td></tr>
diff --git a/tp/tests/layout/res_parser/formatting_chm/chapter.html
b/tp/tests/layout/res_parser/formatting_chm/chapter.html
index 45e7cc17e1..7814f86855 100644
--- a/tp/tests/layout/res_parser/formatting_chm/chapter.html
+++ b/tp/tests/layout/res_parser/formatting_chm/chapter.html
@@ -4391,6 +4391,7 @@ Invalid use of @':
<tr><td></td><td class="printindex-index-entry"><a
href="formatting.html#index-titlepage-a_002d_002dasis"><code>a--asis</code></a></td><td> </td><td
class="printindex-index-section"><a href="formatting.html">Top
section</a></td></tr>
<tr><td></td><td class="printindex-index-entry"><a
href="#index-a_002d_002dasis"><code>a--asis</code></a></td><td> </td><td
class="printindex-index-section"><a href="#chapter">1 chapter</a></td></tr>
<tr><td></td><td class="printindex-index-entry"><a
href="#index-a_002d_002dasis-1"><code>a--asis</code></a></td><td> </td><td
class="printindex-index-section"><a href="#chapter">1 chapter</a></td></tr>
+<tr><td></td><td class="printindex-index-see-entry">aaa, <em
class="emph">See</em> bbb</td><td> </td><td
class="printindex-index-see-entry-section"></td></tr>
<tr><td colspan="4"> </td></tr>
<tr><th id="chapter-1_cp_letter-B">B</th><td></td><td></td></tr>
<tr><td></td><td class="printindex-index-entry"><a
href="formatting.html#index-copying-b-2"><code>b</code></a></td><td> </td><td
class="printindex-index-section"><a href="formatting.html">Top
section</a></td></tr>
@@ -4463,6 +4464,8 @@ Invalid use of @':
<tr><td></td><td class="printindex-index-entry"><a
href="formatting.html#index-titlepage-d_002d_002defvr_005fname"><code>d--efvr_name</code></a></td><td> </td><td
class="printindex-index-section"><a href="formatting.html">Top
section</a></td></tr>
<tr><td></td><td class="printindex-index-entry"><a
href="#index-d_002d_002defvr_005fname"><code>d--efvr_name</code></a></td><td> </td><td
class="printindex-index-section"><a href="#chapter">1 chapter</a></td></tr>
<tr><td></td><td class="printindex-index-entry"><a
href="#index-d_002d_002defvr_005fname-1"><code>d--efvr_name</code></a></td><td> </td><td
class="printindex-index-section"><a href="#chapter">1 chapter</a></td></tr>
+<tr><td></td><td class="printindex-index-entry">ddd</td><td> </td><td
class="printindex-index-see-also"><em class="emph">See also</em> ccc</td></tr>
+<tr><td></td><td class="printindex-index-entry">ddd</td><td> </td><td
class="printindex-index-see-also"><em class="emph">See also</em> ccc</td></tr>
<tr><td colspan="4"> </td></tr>
<tr><th id="chapter-1_cp_letter-G">G</th><td></td><td></td></tr>
<tr><td></td><td
class="printindex-index-entry">g—gg</td><td> </td><td
class="printindex-index-section"></td></tr>
@@ -4737,8 +4740,11 @@ Invalid use of @':
<tr><td colspan="4"> </td></tr>
<tr><th id="chapter-1_fn_letter-F">F</th><td></td><td></td></tr>
<tr><td></td><td class="printindex-index-entry"><a
href="#index-f_002d_002d_002daa"><code>f---aa</code></a></td><td> </td><td
class="printindex-index-section"><a href="#chapter">1 chapter</a></td></tr>
+<tr><td></td><td class="printindex-index-see-entry"><code
class="code">f---aaa</code>, <em class="emph">See</em> <code
class="code">f---bbb</code></td><td> </td><td
class="printindex-index-see-entry-section"></td></tr>
<tr><td></td><td
class="printindex-index-entry"><code>f---bb</code></td><td> </td><td
class="printindex-index-section"></td></tr>
<tr><td></td><td class="printindex-index-entry"><a
href="#index-f_002d_002d_002dbb"><span
class="index-entry-level-1"><code>f---cc</code></span></a></td><td> </td><td
class="printindex-index-section"><a href="#chapter">1 chapter</a></td></tr>
+<tr><td></td><td
class="printindex-index-entry"><code>f---ddd</code></td><td> </td><td
class="printindex-index-see-also"><em class="emph">See also</em>
f---ccc</td></tr>
+<tr><td></td><td
class="printindex-index-entry"><code>f---ddd</code></td><td> </td><td
class="printindex-index-see-also"><em class="emph">See also</em>
f---ccc</td></tr>
<tr><td></td><td
class="printindex-index-entry"><code>f---ddd</code></td><td> </td><td
class="printindex-index-section"></td></tr>
<tr><td></td><td class="printindex-index-entry"><span
class="index-entry-level-1"><code>f---eee</code></span></td><td> </td><td
class="printindex-index-section"></td></tr>
<tr><td></td><td class="printindex-index-entry"><a
href="#index-f_002d_002d_002dddd"><span
class="index-entry-level-2"><code>ffff</code></span></a></td><td> </td><td
class="printindex-index-section"><a href="#chapter">1 chapter</a></td></tr>
diff --git a/tp/tests/layout/res_parser/formatting_chm/chapter2.html
b/tp/tests/layout/res_parser/formatting_chm/chapter2.html
index 94975146c7..48381dd226 100644
--- a/tp/tests/layout/res_parser/formatting_chm/chapter2.html
+++ b/tp/tests/layout/res_parser/formatting_chm/chapter2.html
@@ -920,6 +920,7 @@ th.sections-header-printindex {text-align:left}
<tr><td></td><td class="printindex-index-entry"><a
href="formatting.html#index-titlepage-a_002d_002dasis"><code>a--asis</code></a></td><td> </td><td
class="printindex-index-section"><a href="formatting.html">Top
section</a></td></tr>
<tr><td></td><td class="printindex-index-entry"><a
href="chapter.html#index-a_002d_002dasis"><code>a--asis</code></a></td><td> </td><td
class="printindex-index-section"><a href="chapter.html">1 chapter</a></td></tr>
<tr><td></td><td class="printindex-index-entry"><a
href="chapter.html#index-a_002d_002dasis-1"><code>a--asis</code></a></td><td> </td><td
class="printindex-index-section"><a href="chapter.html">1 chapter</a></td></tr>
+<tr><td></td><td class="printindex-index-see-entry">aaa, <em
class="emph">See</em> bbb</td><td> </td><td
class="printindex-index-see-entry-section"></td></tr>
<tr><td colspan="4"> </td></tr>
<tr><th id="chapter-2_cp_letter-B">B</th><td></td><td></td></tr>
<tr><td></td><td class="printindex-index-entry"><a
href="formatting.html#index-copying-b-2"><code>b</code></a></td><td> </td><td
class="printindex-index-section"><a href="formatting.html">Top
section</a></td></tr>
@@ -992,6 +993,8 @@ th.sections-header-printindex {text-align:left}
<tr><td></td><td class="printindex-index-entry"><a
href="formatting.html#index-titlepage-d_002d_002defvr_005fname"><code>d--efvr_name</code></a></td><td> </td><td
class="printindex-index-section"><a href="formatting.html">Top
section</a></td></tr>
<tr><td></td><td class="printindex-index-entry"><a
href="chapter.html#index-d_002d_002defvr_005fname"><code>d--efvr_name</code></a></td><td> </td><td
class="printindex-index-section"><a href="chapter.html">1 chapter</a></td></tr>
<tr><td></td><td class="printindex-index-entry"><a
href="chapter.html#index-d_002d_002defvr_005fname-1"><code>d--efvr_name</code></a></td><td> </td><td
class="printindex-index-section"><a href="chapter.html">1 chapter</a></td></tr>
+<tr><td></td><td class="printindex-index-entry">ddd</td><td> </td><td
class="printindex-index-see-also"><em class="emph">See also</em> ccc</td></tr>
+<tr><td></td><td class="printindex-index-entry">ddd</td><td> </td><td
class="printindex-index-see-also"><em class="emph">See also</em> ccc</td></tr>
<tr><td colspan="4"> </td></tr>
<tr><th id="chapter-2_cp_letter-G">G</th><td></td><td></td></tr>
<tr><td></td><td
class="printindex-index-entry">g—gg</td><td> </td><td
class="printindex-index-section"></td></tr>
@@ -1264,8 +1267,11 @@ th.sections-header-printindex {text-align:left}
<tr><td colspan="4"> </td></tr>
<tr><th id="chapter-2_fn_letter-F">F</th><td></td><td></td></tr>
<tr><td></td><td class="printindex-index-entry"><a
href="chapter.html#index-f_002d_002d_002daa"><code>f---aa</code></a></td><td> </td><td
class="printindex-index-section"><a href="chapter.html">1 chapter</a></td></tr>
+<tr><td></td><td class="printindex-index-see-entry"><code
class="code">f---aaa</code>, <em class="emph">See</em> <code
class="code">f---bbb</code></td><td> </td><td
class="printindex-index-see-entry-section"></td></tr>
<tr><td></td><td
class="printindex-index-entry"><code>f---bb</code></td><td> </td><td
class="printindex-index-section"></td></tr>
<tr><td></td><td class="printindex-index-entry"><a
href="chapter.html#index-f_002d_002d_002dbb"><span
class="index-entry-level-1"><code>f---cc</code></span></a></td><td> </td><td
class="printindex-index-section"><a href="chapter.html">1 chapter</a></td></tr>
+<tr><td></td><td
class="printindex-index-entry"><code>f---ddd</code></td><td> </td><td
class="printindex-index-see-also"><em class="emph">See also</em>
f---ccc</td></tr>
+<tr><td></td><td
class="printindex-index-entry"><code>f---ddd</code></td><td> </td><td
class="printindex-index-see-also"><em class="emph">See also</em>
f---ccc</td></tr>
<tr><td></td><td
class="printindex-index-entry"><code>f---ddd</code></td><td> </td><td
class="printindex-index-section"></td></tr>
<tr><td></td><td class="printindex-index-entry"><span
class="index-entry-level-1"><code>f---eee</code></span></td><td> </td><td
class="printindex-index-section"></td></tr>
<tr><td></td><td class="printindex-index-entry"><a
href="chapter.html#index-f_002d_002d_002dddd"><span
class="index-entry-level-2"><code>ffff</code></span></a></td><td> </td><td
class="printindex-index-section"><a href="chapter.html">1 chapter</a></td></tr>
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 bea44f8235..6be5cf0d67 100644
--- a/tp/tests/layout/res_parser/formatting_enable_encoding/formatting.html
+++ b/tp/tests/layout/res_parser/formatting_enable_encoding/formatting.html
@@ -6605,6 +6605,7 @@ Invalid use of @':
<tr><td></td><td class="printindex-index-entry"><a
href="#index-titlepage-a_002d_002dasis"><code>a--asis</code></a></td><td>
</td><td class="printindex-index-section"><a href="#Top">Top
section</a></td></tr>
<tr><td></td><td class="printindex-index-entry"><a
href="#index-a_002d_002dasis"><code>a--asis</code></a></td><td> </td><td
class="printindex-index-section"><a href="#chapter">1 chapter</a></td></tr>
<tr><td></td><td class="printindex-index-entry"><a
href="#index-a_002d_002dasis-1"><code>a--asis</code></a></td><td> </td><td
class="printindex-index-section"><a href="#chapter">1 chapter</a></td></tr>
+<tr><td></td><td class="printindex-index-see-entry">aaa, <em
class="emph">See</em> bbb</td><td> </td><td
class="printindex-index-see-entry-section"></td></tr>
<tr><td colspan="4"> <hr></td></tr>
<tr><th id="chapter-1_cp_letter-B">B</th><td></td><td></td></tr>
<tr><td></td><td class="printindex-index-entry"><a
href="#index-copying-b-2"><code>b</code></a></td><td> </td><td
class="printindex-index-section"><a href="#Top">Top section</a></td></tr>
@@ -6677,6 +6678,8 @@ Invalid use of @':
<tr><td></td><td class="printindex-index-entry"><a
href="#index-titlepage-d_002d_002defvr_005fname"><code>d--efvr_name</code></a></td><td>
</td><td class="printindex-index-section"><a href="#Top">Top
section</a></td></tr>
<tr><td></td><td class="printindex-index-entry"><a
href="#index-d_002d_002defvr_005fname"><code>d--efvr_name</code></a></td><td>
</td><td class="printindex-index-section"><a href="#chapter">1
chapter</a></td></tr>
<tr><td></td><td class="printindex-index-entry"><a
href="#index-d_002d_002defvr_005fname-1"><code>d--efvr_name</code></a></td><td>
</td><td class="printindex-index-section"><a href="#chapter">1
chapter</a></td></tr>
+<tr><td></td><td class="printindex-index-entry">ddd</td><td> </td><td
class="printindex-index-see-also"><em class="emph">See also</em> ccc</td></tr>
+<tr><td></td><td class="printindex-index-entry">ddd</td><td> </td><td
class="printindex-index-see-also"><em class="emph">See also</em> ccc</td></tr>
<tr><td colspan="4"> <hr></td></tr>
<tr><th id="chapter-1_cp_letter-G">G</th><td></td><td></td></tr>
<tr><td></td><td class="printindex-index-entry">g—gg</td><td> </td><td
class="printindex-index-section"></td></tr>
@@ -6951,8 +6954,11 @@ Invalid use of @':
<tr><td colspan="4"> <hr></td></tr>
<tr><th id="chapter-1_fn_letter-F">F</th><td></td><td></td></tr>
<tr><td></td><td class="printindex-index-entry"><a
href="#index-f_002d_002d_002daa"><code>f---aa</code></a></td><td> </td><td
class="printindex-index-section"><a href="#chapter">1 chapter</a></td></tr>
+<tr><td></td><td class="printindex-index-see-entry"><code
class="code">f---aaa</code>, <em class="emph">See</em> <code
class="code">f---bbb</code></td><td> </td><td
class="printindex-index-see-entry-section"></td></tr>
<tr><td></td><td class="printindex-index-entry"><code>f---bb</code></td><td>
</td><td class="printindex-index-section"></td></tr>
<tr><td></td><td class="printindex-index-entry"><a
href="#index-f_002d_002d_002dbb"><span
class="index-entry-level-1"><code>f---cc</code></span></a></td><td> </td><td
class="printindex-index-section"><a href="#chapter">1 chapter</a></td></tr>
+<tr><td></td><td class="printindex-index-entry"><code>f---ddd</code></td><td>
</td><td class="printindex-index-see-also"><em class="emph">See also</em>
f---ccc</td></tr>
+<tr><td></td><td class="printindex-index-entry"><code>f---ddd</code></td><td>
</td><td class="printindex-index-see-also"><em class="emph">See also</em>
f---ccc</td></tr>
<tr><td></td><td class="printindex-index-entry"><code>f---ddd</code></td><td>
</td><td class="printindex-index-section"></td></tr>
<tr><td></td><td class="printindex-index-entry"><span
class="index-entry-level-1"><code>f---eee</code></span></td><td> </td><td
class="printindex-index-section"></td></tr>
<tr><td></td><td class="printindex-index-entry"><a
href="#index-f_002d_002d_002dddd"><span
class="index-entry-level-2"><code>ffff</code></span></a></td><td> </td><td
class="printindex-index-section"><a href="#chapter">1 chapter</a></td></tr>
@@ -7307,6 +7313,7 @@ Menu comment
<tr><td></td><td class="printindex-index-entry"><a
href="#index-titlepage-a_002d_002dasis"><code>a--asis</code></a></td><td>
</td><td class="printindex-index-section"><a href="#Top">Top
section</a></td></tr>
<tr><td></td><td class="printindex-index-entry"><a
href="#index-a_002d_002dasis"><code>a--asis</code></a></td><td> </td><td
class="printindex-index-section"><a href="#chapter">1 chapter</a></td></tr>
<tr><td></td><td class="printindex-index-entry"><a
href="#index-a_002d_002dasis-1"><code>a--asis</code></a></td><td> </td><td
class="printindex-index-section"><a href="#chapter">1 chapter</a></td></tr>
+<tr><td></td><td class="printindex-index-see-entry">aaa, <em
class="emph">See</em> bbb</td><td> </td><td
class="printindex-index-see-entry-section"></td></tr>
<tr><td colspan="4"> <hr></td></tr>
<tr><th id="chapter-2_cp_letter-B">B</th><td></td><td></td></tr>
<tr><td></td><td class="printindex-index-entry"><a
href="#index-copying-b-2"><code>b</code></a></td><td> </td><td
class="printindex-index-section"><a href="#Top">Top section</a></td></tr>
@@ -7379,6 +7386,8 @@ Menu comment
<tr><td></td><td class="printindex-index-entry"><a
href="#index-titlepage-d_002d_002defvr_005fname"><code>d--efvr_name</code></a></td><td>
</td><td class="printindex-index-section"><a href="#Top">Top
section</a></td></tr>
<tr><td></td><td class="printindex-index-entry"><a
href="#index-d_002d_002defvr_005fname"><code>d--efvr_name</code></a></td><td>
</td><td class="printindex-index-section"><a href="#chapter">1
chapter</a></td></tr>
<tr><td></td><td class="printindex-index-entry"><a
href="#index-d_002d_002defvr_005fname-1"><code>d--efvr_name</code></a></td><td>
</td><td class="printindex-index-section"><a href="#chapter">1
chapter</a></td></tr>
+<tr><td></td><td class="printindex-index-entry">ddd</td><td> </td><td
class="printindex-index-see-also"><em class="emph">See also</em> ccc</td></tr>
+<tr><td></td><td class="printindex-index-entry">ddd</td><td> </td><td
class="printindex-index-see-also"><em class="emph">See also</em> ccc</td></tr>
<tr><td colspan="4"> <hr></td></tr>
<tr><th id="chapter-2_cp_letter-G">G</th><td></td><td></td></tr>
<tr><td></td><td class="printindex-index-entry">g—gg</td><td> </td><td
class="printindex-index-section"></td></tr>
@@ -7651,8 +7660,11 @@ Menu comment
<tr><td colspan="4"> <hr></td></tr>
<tr><th id="chapter-2_fn_letter-F">F</th><td></td><td></td></tr>
<tr><td></td><td class="printindex-index-entry"><a
href="#index-f_002d_002d_002daa"><code>f---aa</code></a></td><td> </td><td
class="printindex-index-section"><a href="#chapter">1 chapter</a></td></tr>
+<tr><td></td><td class="printindex-index-see-entry"><code
class="code">f---aaa</code>, <em class="emph">See</em> <code
class="code">f---bbb</code></td><td> </td><td
class="printindex-index-see-entry-section"></td></tr>
<tr><td></td><td class="printindex-index-entry"><code>f---bb</code></td><td>
</td><td class="printindex-index-section"></td></tr>
<tr><td></td><td class="printindex-index-entry"><a
href="#index-f_002d_002d_002dbb"><span
class="index-entry-level-1"><code>f---cc</code></span></a></td><td> </td><td
class="printindex-index-section"><a href="#chapter">1 chapter</a></td></tr>
+<tr><td></td><td class="printindex-index-entry"><code>f---ddd</code></td><td>
</td><td class="printindex-index-see-also"><em class="emph">See also</em>
f---ccc</td></tr>
+<tr><td></td><td class="printindex-index-entry"><code>f---ddd</code></td><td>
</td><td class="printindex-index-see-also"><em class="emph">See also</em>
f---ccc</td></tr>
<tr><td></td><td class="printindex-index-entry"><code>f---ddd</code></td><td>
</td><td class="printindex-index-section"></td></tr>
<tr><td></td><td class="printindex-index-entry"><span
class="index-entry-level-1"><code>f---eee</code></span></td><td> </td><td
class="printindex-index-section"></td></tr>
<tr><td></td><td class="printindex-index-entry"><a
href="#index-f_002d_002d_002dddd"><span
class="index-entry-level-2"><code>ffff</code></span></a></td><td> </td><td
class="printindex-index-section"><a href="#chapter">1 chapter</a></td></tr>
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 b8fbc6f68d..92c2560256 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
@@ -4391,6 +4391,7 @@ Invalid use of @':
<tr><td></td><td class="printindex-index-entry"><a
href="formatting.xhtml#index-titlepage-a_002d_002dasis"><code>a--asis</code></a></td><td> </td><td
class="printindex-index-section"><a href="formatting.xhtml">Top
section</a></td></tr>
<tr><td></td><td class="printindex-index-entry"><a
href="#index-a_002d_002dasis"><code>a--asis</code></a></td><td> </td><td
class="printindex-index-section"><a href="#chapter">1 chapter</a></td></tr>
<tr><td></td><td class="printindex-index-entry"><a
href="#index-a_002d_002dasis-1"><code>a--asis</code></a></td><td> </td><td
class="printindex-index-section"><a href="#chapter">1 chapter</a></td></tr>
+<tr><td></td><td class="printindex-index-see-entry">aaa, <em
class="emph">See</em> bbb</td><td> </td><td
class="printindex-index-see-entry-section"></td></tr>
<tr><td colspan="4"> </td></tr>
<tr><th id="chapter-1_cp_letter-B">B</th><td></td><td></td></tr>
<tr><td></td><td class="printindex-index-entry"><a
href="formatting.xhtml#index-copying-b-2"><code>b</code></a></td><td> </td><td
class="printindex-index-section"><a href="formatting.xhtml">Top
section</a></td></tr>
@@ -4463,6 +4464,8 @@ Invalid use of @':
<tr><td></td><td class="printindex-index-entry"><a
href="formatting.xhtml#index-titlepage-d_002d_002defvr_005fname"><code>d--efvr_name</code></a></td><td> </td><td
class="printindex-index-section"><a href="formatting.xhtml">Top
section</a></td></tr>
<tr><td></td><td class="printindex-index-entry"><a
href="#index-d_002d_002defvr_005fname"><code>d--efvr_name</code></a></td><td> </td><td
class="printindex-index-section"><a href="#chapter">1 chapter</a></td></tr>
<tr><td></td><td class="printindex-index-entry"><a
href="#index-d_002d_002defvr_005fname-1"><code>d--efvr_name</code></a></td><td> </td><td
class="printindex-index-section"><a href="#chapter">1 chapter</a></td></tr>
+<tr><td></td><td class="printindex-index-entry">ddd</td><td> </td><td
class="printindex-index-see-also"><em class="emph">See also</em> ccc</td></tr>
+<tr><td></td><td class="printindex-index-entry">ddd</td><td> </td><td
class="printindex-index-see-also"><em class="emph">See also</em> ccc</td></tr>
<tr><td colspan="4"> </td></tr>
<tr><th id="chapter-1_cp_letter-G">G</th><td></td><td></td></tr>
<tr><td></td><td
class="printindex-index-entry">g—gg</td><td> </td><td
class="printindex-index-section"></td></tr>
@@ -4737,8 +4740,11 @@ Invalid use of @':
<tr><td colspan="4"> </td></tr>
<tr><th id="chapter-1_fn_letter-F">F</th><td></td><td></td></tr>
<tr><td></td><td class="printindex-index-entry"><a
href="#index-f_002d_002d_002daa"><code>f---aa</code></a></td><td> </td><td
class="printindex-index-section"><a href="#chapter">1 chapter</a></td></tr>
+<tr><td></td><td class="printindex-index-see-entry"><code
class="code">f---aaa</code>, <em class="emph">See</em> <code
class="code">f---bbb</code></td><td> </td><td
class="printindex-index-see-entry-section"></td></tr>
<tr><td></td><td
class="printindex-index-entry"><code>f---bb</code></td><td> </td><td
class="printindex-index-section"></td></tr>
<tr><td></td><td class="printindex-index-entry"><a
href="#index-f_002d_002d_002dbb"><span
class="index-entry-level-1"><code>f---cc</code></span></a></td><td> </td><td
class="printindex-index-section"><a href="#chapter">1 chapter</a></td></tr>
+<tr><td></td><td
class="printindex-index-entry"><code>f---ddd</code></td><td> </td><td
class="printindex-index-see-also"><em class="emph">See also</em>
f---ccc</td></tr>
+<tr><td></td><td
class="printindex-index-entry"><code>f---ddd</code></td><td> </td><td
class="printindex-index-see-also"><em class="emph">See also</em>
f---ccc</td></tr>
<tr><td></td><td
class="printindex-index-entry"><code>f---ddd</code></td><td> </td><td
class="printindex-index-section"></td></tr>
<tr><td></td><td class="printindex-index-entry"><span
class="index-entry-level-1"><code>f---eee</code></span></td><td> </td><td
class="printindex-index-section"></td></tr>
<tr><td></td><td class="printindex-index-entry"><a
href="#index-f_002d_002d_002dddd"><span
class="index-entry-level-2"><code>ffff</code></span></a></td><td> </td><td
class="printindex-index-section"><a href="#chapter">1 chapter</a></td></tr>
diff --git
a/tp/tests/layout/res_parser/formatting_epub/formatting_epub_package/EPUB/xhtml/chapter2.xhtml
b/tp/tests/layout/res_parser/formatting_epub/formatting_epub_package/EPUB/xhtml/chapter2.xhtml
index 7fb5b8149f..db69fbba7e 100644
---
a/tp/tests/layout/res_parser/formatting_epub/formatting_epub_package/EPUB/xhtml/chapter2.xhtml
+++
b/tp/tests/layout/res_parser/formatting_epub/formatting_epub_package/EPUB/xhtml/chapter2.xhtml
@@ -922,6 +922,7 @@ th.sections-header-printindex {text-align:left}
<tr><td></td><td class="printindex-index-entry"><a
href="formatting.xhtml#index-titlepage-a_002d_002dasis"><code>a--asis</code></a></td><td> </td><td
class="printindex-index-section"><a href="formatting.xhtml">Top
section</a></td></tr>
<tr><td></td><td class="printindex-index-entry"><a
href="chapter.xhtml#index-a_002d_002dasis"><code>a--asis</code></a></td><td> </td><td
class="printindex-index-section"><a href="chapter.xhtml#chapter">1
chapter</a></td></tr>
<tr><td></td><td class="printindex-index-entry"><a
href="chapter.xhtml#index-a_002d_002dasis-1"><code>a--asis</code></a></td><td> </td><td
class="printindex-index-section"><a href="chapter.xhtml#chapter">1
chapter</a></td></tr>
+<tr><td></td><td class="printindex-index-see-entry">aaa, <em
class="emph">See</em> bbb</td><td> </td><td
class="printindex-index-see-entry-section"></td></tr>
<tr><td colspan="4"> </td></tr>
<tr><th id="chapter-2_cp_letter-B">B</th><td></td><td></td></tr>
<tr><td></td><td class="printindex-index-entry"><a
href="formatting.xhtml#index-copying-b-2"><code>b</code></a></td><td> </td><td
class="printindex-index-section"><a href="formatting.xhtml">Top
section</a></td></tr>
@@ -994,6 +995,8 @@ th.sections-header-printindex {text-align:left}
<tr><td></td><td class="printindex-index-entry"><a
href="formatting.xhtml#index-titlepage-d_002d_002defvr_005fname"><code>d--efvr_name</code></a></td><td> </td><td
class="printindex-index-section"><a href="formatting.xhtml">Top
section</a></td></tr>
<tr><td></td><td class="printindex-index-entry"><a
href="chapter.xhtml#index-d_002d_002defvr_005fname"><code>d--efvr_name</code></a></td><td> </td><td
class="printindex-index-section"><a href="chapter.xhtml#chapter">1
chapter</a></td></tr>
<tr><td></td><td class="printindex-index-entry"><a
href="chapter.xhtml#index-d_002d_002defvr_005fname-1"><code>d--efvr_name</code></a></td><td> </td><td
class="printindex-index-section"><a href="chapter.xhtml#chapter">1
chapter</a></td></tr>
+<tr><td></td><td class="printindex-index-entry">ddd</td><td> </td><td
class="printindex-index-see-also"><em class="emph">See also</em> ccc</td></tr>
+<tr><td></td><td class="printindex-index-entry">ddd</td><td> </td><td
class="printindex-index-see-also"><em class="emph">See also</em> ccc</td></tr>
<tr><td colspan="4"> </td></tr>
<tr><th id="chapter-2_cp_letter-G">G</th><td></td><td></td></tr>
<tr><td></td><td
class="printindex-index-entry">g—gg</td><td> </td><td
class="printindex-index-section"></td></tr>
@@ -1266,8 +1269,11 @@ th.sections-header-printindex {text-align:left}
<tr><td colspan="4"> </td></tr>
<tr><th id="chapter-2_fn_letter-F">F</th><td></td><td></td></tr>
<tr><td></td><td class="printindex-index-entry"><a
href="chapter.xhtml#index-f_002d_002d_002daa"><code>f---aa</code></a></td><td> </td><td
class="printindex-index-section"><a href="chapter.xhtml#chapter">1
chapter</a></td></tr>
+<tr><td></td><td class="printindex-index-see-entry"><code
class="code">f---aaa</code>, <em class="emph">See</em> <code
class="code">f---bbb</code></td><td> </td><td
class="printindex-index-see-entry-section"></td></tr>
<tr><td></td><td
class="printindex-index-entry"><code>f---bb</code></td><td> </td><td
class="printindex-index-section"></td></tr>
<tr><td></td><td class="printindex-index-entry"><a
href="chapter.xhtml#index-f_002d_002d_002dbb"><span
class="index-entry-level-1"><code>f---cc</code></span></a></td><td> </td><td
class="printindex-index-section"><a href="chapter.xhtml#chapter">1
chapter</a></td></tr>
+<tr><td></td><td
class="printindex-index-entry"><code>f---ddd</code></td><td> </td><td
class="printindex-index-see-also"><em class="emph">See also</em>
f---ccc</td></tr>
+<tr><td></td><td
class="printindex-index-entry"><code>f---ddd</code></td><td> </td><td
class="printindex-index-see-also"><em class="emph">See also</em>
f---ccc</td></tr>
<tr><td></td><td
class="printindex-index-entry"><code>f---ddd</code></td><td> </td><td
class="printindex-index-section"></td></tr>
<tr><td></td><td class="printindex-index-entry"><span
class="index-entry-level-1"><code>f---eee</code></span></td><td> </td><td
class="printindex-index-section"></td></tr>
<tr><td></td><td class="printindex-index-entry"><a
href="chapter.xhtml#index-f_002d_002d_002dddd"><span
class="index-entry-level-2"><code>ffff</code></span></a></td><td> </td><td
class="printindex-index-section"><a href="chapter.xhtml#chapter">1
chapter</a></td></tr>
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 ce08946b67..d913902b11 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
@@ -4392,6 +4392,7 @@ Invalid use of @':
<tr><td></td><td class="printindex-index-entry"><a
href="formatting.xhtml#index-titlepage-a_002d_002dasis"><code>a--asis</code></a></td><td> </td><td
class="printindex-index-section"><a href="formatting.xhtml">Top
section</a></td></tr>
<tr><td></td><td class="printindex-index-entry"><a
href="#index-a_002d_002dasis"><code>a--asis</code></a></td><td> </td><td
class="printindex-index-section"><a href="#chapter">1 chapter</a></td></tr>
<tr><td></td><td class="printindex-index-entry"><a
href="#index-a_002d_002dasis-1"><code>a--asis</code></a></td><td> </td><td
class="printindex-index-section"><a href="#chapter">1 chapter</a></td></tr>
+<tr><td></td><td class="printindex-index-see-entry">aaa, <em
class="emph">See</em> bbb</td><td> </td><td
class="printindex-index-see-entry-section"></td></tr>
<tr><td colspan="4"> </td></tr>
<tr><th id="chapter-1_cp_letter-B">B</th><td></td><td></td></tr>
<tr><td></td><td class="printindex-index-entry"><a
href="formatting.xhtml#index-copying-b-2"><code>b</code></a></td><td> </td><td
class="printindex-index-section"><a href="formatting.xhtml">Top
section</a></td></tr>
@@ -4464,6 +4465,8 @@ Invalid use of @':
<tr><td></td><td class="printindex-index-entry"><a
href="formatting.xhtml#index-titlepage-d_002d_002defvr_005fname"><code>d--efvr_name</code></a></td><td> </td><td
class="printindex-index-section"><a href="formatting.xhtml">Top
section</a></td></tr>
<tr><td></td><td class="printindex-index-entry"><a
href="#index-d_002d_002defvr_005fname"><code>d--efvr_name</code></a></td><td> </td><td
class="printindex-index-section"><a href="#chapter">1 chapter</a></td></tr>
<tr><td></td><td class="printindex-index-entry"><a
href="#index-d_002d_002defvr_005fname-1"><code>d--efvr_name</code></a></td><td> </td><td
class="printindex-index-section"><a href="#chapter">1 chapter</a></td></tr>
+<tr><td></td><td class="printindex-index-entry">ddd</td><td> </td><td
class="printindex-index-see-also"><em class="emph">See also</em> ccc</td></tr>
+<tr><td></td><td class="printindex-index-entry">ddd</td><td> </td><td
class="printindex-index-see-also"><em class="emph">See also</em> ccc</td></tr>
<tr><td colspan="4"> </td></tr>
<tr><th id="chapter-1_cp_letter-G">G</th><td></td><td></td></tr>
<tr><td></td><td
class="printindex-index-entry">g—gg</td><td> </td><td
class="printindex-index-section"></td></tr>
@@ -4738,8 +4741,11 @@ Invalid use of @':
<tr><td colspan="4"> </td></tr>
<tr><th id="chapter-1_fn_letter-F">F</th><td></td><td></td></tr>
<tr><td></td><td class="printindex-index-entry"><a
href="#index-f_002d_002d_002daa"><code>f---aa</code></a></td><td> </td><td
class="printindex-index-section"><a href="#chapter">1 chapter</a></td></tr>
+<tr><td></td><td class="printindex-index-see-entry"><code
class="code">f---aaa</code>, <em class="emph">See</em> <code
class="code">f---bbb</code></td><td> </td><td
class="printindex-index-see-entry-section"></td></tr>
<tr><td></td><td
class="printindex-index-entry"><code>f---bb</code></td><td> </td><td
class="printindex-index-section"></td></tr>
<tr><td></td><td class="printindex-index-entry"><a
href="#index-f_002d_002d_002dbb"><span
class="index-entry-level-1"><code>f---cc</code></span></a></td><td> </td><td
class="printindex-index-section"><a href="#chapter">1 chapter</a></td></tr>
+<tr><td></td><td
class="printindex-index-entry"><code>f---ddd</code></td><td> </td><td
class="printindex-index-see-also"><em class="emph">See also</em>
f---ccc</td></tr>
+<tr><td></td><td
class="printindex-index-entry"><code>f---ddd</code></td><td> </td><td
class="printindex-index-see-also"><em class="emph">See also</em>
f---ccc</td></tr>
<tr><td></td><td
class="printindex-index-entry"><code>f---ddd</code></td><td> </td><td
class="printindex-index-section"></td></tr>
<tr><td></td><td class="printindex-index-entry"><span
class="index-entry-level-1"><code>f---eee</code></span></td><td> </td><td
class="printindex-index-section"></td></tr>
<tr><td></td><td class="printindex-index-entry"><a
href="#index-f_002d_002d_002dddd"><span
class="index-entry-level-2"><code>ffff</code></span></a></td><td> </td><td
class="printindex-index-section"><a href="#chapter">1 chapter</a></td></tr>
diff --git
a/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/xhtml/chapter2.xhtml
b/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/xhtml/chapter2.xhtml
index a9de8846e4..1c7311e221 100644
---
a/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/xhtml/chapter2.xhtml
+++
b/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/xhtml/chapter2.xhtml
@@ -923,6 +923,7 @@ th.sections-header-printindex {text-align:left}
<tr><td></td><td class="printindex-index-entry"><a
href="formatting.xhtml#index-titlepage-a_002d_002dasis"><code>a--asis</code></a></td><td> </td><td
class="printindex-index-section"><a href="formatting.xhtml">Top
section</a></td></tr>
<tr><td></td><td class="printindex-index-entry"><a
href="chapter.xhtml#index-a_002d_002dasis"><code>a--asis</code></a></td><td> </td><td
class="printindex-index-section"><a href="chapter.xhtml">1
chapter</a></td></tr>
<tr><td></td><td class="printindex-index-entry"><a
href="chapter.xhtml#index-a_002d_002dasis-1"><code>a--asis</code></a></td><td> </td><td
class="printindex-index-section"><a href="chapter.xhtml">1
chapter</a></td></tr>
+<tr><td></td><td class="printindex-index-see-entry">aaa, <em
class="emph">See</em> bbb</td><td> </td><td
class="printindex-index-see-entry-section"></td></tr>
<tr><td colspan="4"> </td></tr>
<tr><th id="chapter-2_cp_letter-B">B</th><td></td><td></td></tr>
<tr><td></td><td class="printindex-index-entry"><a
href="formatting.xhtml#index-copying-b-2"><code>b</code></a></td><td> </td><td
class="printindex-index-section"><a href="formatting.xhtml">Top
section</a></td></tr>
@@ -995,6 +996,8 @@ th.sections-header-printindex {text-align:left}
<tr><td></td><td class="printindex-index-entry"><a
href="formatting.xhtml#index-titlepage-d_002d_002defvr_005fname"><code>d--efvr_name</code></a></td><td> </td><td
class="printindex-index-section"><a href="formatting.xhtml">Top
section</a></td></tr>
<tr><td></td><td class="printindex-index-entry"><a
href="chapter.xhtml#index-d_002d_002defvr_005fname"><code>d--efvr_name</code></a></td><td> </td><td
class="printindex-index-section"><a href="chapter.xhtml">1
chapter</a></td></tr>
<tr><td></td><td class="printindex-index-entry"><a
href="chapter.xhtml#index-d_002d_002defvr_005fname-1"><code>d--efvr_name</code></a></td><td> </td><td
class="printindex-index-section"><a href="chapter.xhtml">1
chapter</a></td></tr>
+<tr><td></td><td class="printindex-index-entry">ddd</td><td> </td><td
class="printindex-index-see-also"><em class="emph">See also</em> ccc</td></tr>
+<tr><td></td><td class="printindex-index-entry">ddd</td><td> </td><td
class="printindex-index-see-also"><em class="emph">See also</em> ccc</td></tr>
<tr><td colspan="4"> </td></tr>
<tr><th id="chapter-2_cp_letter-G">G</th><td></td><td></td></tr>
<tr><td></td><td
class="printindex-index-entry">g—gg</td><td> </td><td
class="printindex-index-section"></td></tr>
@@ -1267,8 +1270,11 @@ th.sections-header-printindex {text-align:left}
<tr><td colspan="4"> </td></tr>
<tr><th id="chapter-2_fn_letter-F">F</th><td></td><td></td></tr>
<tr><td></td><td class="printindex-index-entry"><a
href="chapter.xhtml#index-f_002d_002d_002daa"><code>f---aa</code></a></td><td> </td><td
class="printindex-index-section"><a href="chapter.xhtml">1
chapter</a></td></tr>
+<tr><td></td><td class="printindex-index-see-entry"><code
class="code">f---aaa</code>, <em class="emph">See</em> <code
class="code">f---bbb</code></td><td> </td><td
class="printindex-index-see-entry-section"></td></tr>
<tr><td></td><td
class="printindex-index-entry"><code>f---bb</code></td><td> </td><td
class="printindex-index-section"></td></tr>
<tr><td></td><td class="printindex-index-entry"><a
href="chapter.xhtml#index-f_002d_002d_002dbb"><span
class="index-entry-level-1"><code>f---cc</code></span></a></td><td> </td><td
class="printindex-index-section"><a href="chapter.xhtml">1
chapter</a></td></tr>
+<tr><td></td><td
class="printindex-index-entry"><code>f---ddd</code></td><td> </td><td
class="printindex-index-see-also"><em class="emph">See also</em>
f---ccc</td></tr>
+<tr><td></td><td
class="printindex-index-entry"><code>f---ddd</code></td><td> </td><td
class="printindex-index-see-also"><em class="emph">See also</em>
f---ccc</td></tr>
<tr><td></td><td
class="printindex-index-entry"><code>f---ddd</code></td><td> </td><td
class="printindex-index-section"></td></tr>
<tr><td></td><td class="printindex-index-entry"><span
class="index-entry-level-1"><code>f---eee</code></span></td><td> </td><td
class="printindex-index-section"></td></tr>
<tr><td></td><td class="printindex-index-entry"><a
href="chapter.xhtml#index-f_002d_002d_002dddd"><span
class="index-entry-level-2"><code>ffff</code></span></a></td><td> </td><td
class="printindex-index-section"><a href="chapter.xhtml">1 chapter</a></td></tr>
diff --git a/tp/tests/layout/res_parser/formatting_exotic/chapter.html
b/tp/tests/layout/res_parser/formatting_exotic/chapter.html
index 52db0947a4..278b20fe00 100644
--- a/tp/tests/layout/res_parser/formatting_exotic/chapter.html
+++ b/tp/tests/layout/res_parser/formatting_exotic/chapter.html
@@ -4406,6 +4406,7 @@ Invalid use of @':
<tr><td></td><td class="printindex-index-entry"><a
href="index.html#index-titlepage-a_002d_002dasis"><code>a--asis</code></a></td><td> </td><td
class="printindex-index-section"><a href="index.html">Top section</a></td></tr>
<tr><td></td><td class="printindex-index-entry"><a
href="#index-a_002d_002dasis"><code>a--asis</code></a></td><td> </td><td
class="printindex-index-section"><a href="#chapter">chapter</a></td></tr>
<tr><td></td><td class="printindex-index-entry"><a
href="#index-a_002d_002dasis-1"><code>a--asis</code></a></td><td> </td><td
class="printindex-index-section"><a href="#chapter">chapter</a></td></tr>
+<tr><td></td><td class="printindex-index-see-entry">aaa, <em
class="emph">See</em> bbb</td><td> </td><td
class="printindex-index-see-entry-section"></td></tr>
<tr><td colspan="4"> <hr></td></tr>
<tr><th id="chapter-1_cp_letter-B">B</th><td></td><td></td></tr>
<tr><td></td><td class="printindex-index-entry"><a
href="#index-copying-b-2"><code>b</code></a></td><td> </td><td
class="printindex-index-section"><a href="#chapter">chapter</a></td></tr>
@@ -4478,6 +4479,8 @@ Invalid use of @':
<tr><td></td><td class="printindex-index-entry"><a
href="index.html#index-titlepage-d_002d_002defvr_005fname"><code>d--efvr_name</code></a></td><td> </td><td
class="printindex-index-section"><a href="index.html">Top section</a></td></tr>
<tr><td></td><td class="printindex-index-entry"><a
href="#index-d_002d_002defvr_005fname"><code>d--efvr_name</code></a></td><td> </td><td
class="printindex-index-section"><a href="#chapter">chapter</a></td></tr>
<tr><td></td><td class="printindex-index-entry"><a
href="#index-d_002d_002defvr_005fname-1"><code>d--efvr_name</code></a></td><td> </td><td
class="printindex-index-section"><a href="#chapter">chapter</a></td></tr>
+<tr><td></td><td class="printindex-index-entry">ddd</td><td> </td><td
class="printindex-index-see-also"><em class="emph">See also</em> ccc</td></tr>
+<tr><td></td><td class="printindex-index-entry">ddd</td><td> </td><td
class="printindex-index-see-also"><em class="emph">See also</em> ccc</td></tr>
<tr><td colspan="4"> <hr></td></tr>
<tr><th id="chapter-1_cp_letter-G">G</th><td></td><td></td></tr>
<tr><td></td><td
class="printindex-index-entry">g—gg</td><td> </td><td
class="printindex-index-section"></td></tr>
@@ -4752,8 +4755,11 @@ Invalid use of @':
<tr><td colspan="4"> <hr></td></tr>
<tr><th id="chapter-1_fn_letter-F">F</th><td></td><td></td></tr>
<tr><td></td><td class="printindex-index-entry"><a
href="#index-f_002d_002d_002daa"><code>f---aa</code></a></td><td> </td><td
class="printindex-index-section"><a href="#chapter">chapter</a></td></tr>
+<tr><td></td><td class="printindex-index-see-entry"><code
class="code">f---aaa</code>, <em class="emph">See</em> <code
class="code">f---bbb</code></td><td> </td><td
class="printindex-index-see-entry-section"></td></tr>
<tr><td></td><td
class="printindex-index-entry"><code>f---bb</code></td><td> </td><td
class="printindex-index-section"></td></tr>
<tr><td></td><td class="printindex-index-entry"><a
href="#index-f_002d_002d_002dbb"><span
class="index-entry-level-1"><code>f---cc</code></span></a></td><td> </td><td
class="printindex-index-section"><a href="#chapter">chapter</a></td></tr>
+<tr><td></td><td
class="printindex-index-entry"><code>f---ddd</code></td><td> </td><td
class="printindex-index-see-also"><em class="emph">See also</em>
f---ccc</td></tr>
+<tr><td></td><td
class="printindex-index-entry"><code>f---ddd</code></td><td> </td><td
class="printindex-index-see-also"><em class="emph">See also</em>
f---ccc</td></tr>
<tr><td></td><td
class="printindex-index-entry"><code>f---ddd</code></td><td> </td><td
class="printindex-index-section"></td></tr>
<tr><td></td><td class="printindex-index-entry"><span
class="index-entry-level-1"><code>f---eee</code></span></td><td> </td><td
class="printindex-index-section"></td></tr>
<tr><td></td><td class="printindex-index-entry"><a
href="#index-f_002d_002d_002dddd"><span
class="index-entry-level-2"><code>ffff</code></span></a></td><td> </td><td
class="printindex-index-section"><a href="#chapter">chapter</a></td></tr>
diff --git a/tp/tests/layout/res_parser/formatting_exotic/chapter2.html
b/tp/tests/layout/res_parser/formatting_exotic/chapter2.html
index fdc3634c4f..950f99f19e 100644
--- a/tp/tests/layout/res_parser/formatting_exotic/chapter2.html
+++ b/tp/tests/layout/res_parser/formatting_exotic/chapter2.html
@@ -937,6 +937,7 @@ th.sections-header-printindex {text-align:left}
<tr><td></td><td class="printindex-index-entry"><a
href="index.html#index-titlepage-a_002d_002dasis"><code>a--asis</code></a></td><td> </td><td
class="printindex-index-section"><a href="index.html">Top section</a></td></tr>
<tr><td></td><td class="printindex-index-entry"><a
href="chapter.html#index-a_002d_002dasis"><code>a--asis</code></a></td><td> </td><td
class="printindex-index-section"><a href="chapter.html">chapter</a></td></tr>
<tr><td></td><td class="printindex-index-entry"><a
href="chapter.html#index-a_002d_002dasis-1"><code>a--asis</code></a></td><td> </td><td
class="printindex-index-section"><a href="chapter.html">chapter</a></td></tr>
+<tr><td></td><td class="printindex-index-see-entry">aaa, <em
class="emph">See</em> bbb</td><td> </td><td
class="printindex-index-see-entry-section"></td></tr>
<tr><td colspan="4"> <hr></td></tr>
<tr><th id="chapter-2_cp_letter-B">B</th><td></td><td></td></tr>
<tr><td></td><td class="printindex-index-entry"><a
href="chapter.html#index-copying-b-2"><code>b</code></a></td><td> </td><td
class="printindex-index-section"><a href="chapter.html">chapter</a></td></tr>
@@ -1009,6 +1010,8 @@ th.sections-header-printindex {text-align:left}
<tr><td></td><td class="printindex-index-entry"><a
href="index.html#index-titlepage-d_002d_002defvr_005fname"><code>d--efvr_name</code></a></td><td> </td><td
class="printindex-index-section"><a href="index.html">Top section</a></td></tr>
<tr><td></td><td class="printindex-index-entry"><a
href="chapter.html#index-d_002d_002defvr_005fname"><code>d--efvr_name</code></a></td><td> </td><td
class="printindex-index-section"><a href="chapter.html">chapter</a></td></tr>
<tr><td></td><td class="printindex-index-entry"><a
href="chapter.html#index-d_002d_002defvr_005fname-1"><code>d--efvr_name</code></a></td><td> </td><td
class="printindex-index-section"><a href="chapter.html">chapter</a></td></tr>
+<tr><td></td><td class="printindex-index-entry">ddd</td><td> </td><td
class="printindex-index-see-also"><em class="emph">See also</em> ccc</td></tr>
+<tr><td></td><td class="printindex-index-entry">ddd</td><td> </td><td
class="printindex-index-see-also"><em class="emph">See also</em> ccc</td></tr>
<tr><td colspan="4"> <hr></td></tr>
<tr><th id="chapter-2_cp_letter-G">G</th><td></td><td></td></tr>
<tr><td></td><td
class="printindex-index-entry">g—gg</td><td> </td><td
class="printindex-index-section"></td></tr>
@@ -1281,8 +1284,11 @@ th.sections-header-printindex {text-align:left}
<tr><td colspan="4"> <hr></td></tr>
<tr><th id="chapter-2_fn_letter-F">F</th><td></td><td></td></tr>
<tr><td></td><td class="printindex-index-entry"><a
href="chapter.html#index-f_002d_002d_002daa"><code>f---aa</code></a></td><td> </td><td
class="printindex-index-section"><a href="chapter.html">chapter</a></td></tr>
+<tr><td></td><td class="printindex-index-see-entry"><code
class="code">f---aaa</code>, <em class="emph">See</em> <code
class="code">f---bbb</code></td><td> </td><td
class="printindex-index-see-entry-section"></td></tr>
<tr><td></td><td
class="printindex-index-entry"><code>f---bb</code></td><td> </td><td
class="printindex-index-section"></td></tr>
<tr><td></td><td class="printindex-index-entry"><a
href="chapter.html#index-f_002d_002d_002dbb"><span
class="index-entry-level-1"><code>f---cc</code></span></a></td><td> </td><td
class="printindex-index-section"><a href="chapter.html">chapter</a></td></tr>
+<tr><td></td><td
class="printindex-index-entry"><code>f---ddd</code></td><td> </td><td
class="printindex-index-see-also"><em class="emph">See also</em>
f---ccc</td></tr>
+<tr><td></td><td
class="printindex-index-entry"><code>f---ddd</code></td><td> </td><td
class="printindex-index-see-also"><em class="emph">See also</em>
f---ccc</td></tr>
<tr><td></td><td
class="printindex-index-entry"><code>f---ddd</code></td><td> </td><td
class="printindex-index-section"></td></tr>
<tr><td></td><td class="printindex-index-entry"><span
class="index-entry-level-1"><code>f---eee</code></span></td><td> </td><td
class="printindex-index-section"></td></tr>
<tr><td></td><td class="printindex-index-entry"><a
href="chapter.html#index-f_002d_002d_002dddd"><span
class="index-entry-level-2"><code>ffff</code></span></a></td><td> </td><td
class="printindex-index-section"><a href="chapter.html">chapter</a></td></tr>
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 db8a0d34ad..821f5dc33d 100644
--- a/tp/tests/layout/res_parser/formatting_fr_icons/formatting.html
+++ b/tp/tests/layout/res_parser/formatting_fr_icons/formatting.html
@@ -6605,6 +6605,7 @@ Invalid use of @':
<tr><td></td><td class="printindex-index-entry"><a
href="#index-titlepage-a_002d_002dasis"><code>a--asis</code></a></td><td> </td><td
class="printindex-index-section"><a href="#Top">Top section</a></td></tr>
<tr><td></td><td class="printindex-index-entry"><a
href="#index-a_002d_002dasis"><code>a--asis</code></a></td><td> </td><td
class="printindex-index-section"><a href="#chapter">1 chapter</a></td></tr>
<tr><td></td><td class="printindex-index-entry"><a
href="#index-a_002d_002dasis-1"><code>a--asis</code></a></td><td> </td><td
class="printindex-index-section"><a href="#chapter">1 chapter</a></td></tr>
+<tr><td></td><td class="printindex-index-see-entry">aaa, <em
class="emph">See</em> bbb</td><td> </td><td
class="printindex-index-see-entry-section"></td></tr>
<tr><td colspan="4"> <hr></td></tr>
<tr><th id="chapter-1_cp_letter-B">B</th><td></td><td></td></tr>
<tr><td></td><td class="printindex-index-entry"><a
href="#index-copying-b-2"><code>b</code></a></td><td> </td><td
class="printindex-index-section"><a href="#Top">Top section</a></td></tr>
@@ -6677,6 +6678,8 @@ Invalid use of @':
<tr><td></td><td class="printindex-index-entry"><a
href="#index-titlepage-d_002d_002defvr_005fname"><code>d--efvr_name</code></a></td><td> </td><td
class="printindex-index-section"><a href="#Top">Top section</a></td></tr>
<tr><td></td><td class="printindex-index-entry"><a
href="#index-d_002d_002defvr_005fname"><code>d--efvr_name</code></a></td><td> </td><td
class="printindex-index-section"><a href="#chapter">1 chapter</a></td></tr>
<tr><td></td><td class="printindex-index-entry"><a
href="#index-d_002d_002defvr_005fname-1"><code>d--efvr_name</code></a></td><td> </td><td
class="printindex-index-section"><a href="#chapter">1 chapter</a></td></tr>
+<tr><td></td><td class="printindex-index-entry">ddd</td><td> </td><td
class="printindex-index-see-also"><em class="emph">See also</em> ccc</td></tr>
+<tr><td></td><td class="printindex-index-entry">ddd</td><td> </td><td
class="printindex-index-see-also"><em class="emph">See also</em> ccc</td></tr>
<tr><td colspan="4"> <hr></td></tr>
<tr><th id="chapter-1_cp_letter-G">G</th><td></td><td></td></tr>
<tr><td></td><td
class="printindex-index-entry">g—gg</td><td> </td><td
class="printindex-index-section"></td></tr>
@@ -6951,8 +6954,11 @@ Invalid use of @':
<tr><td colspan="4"> <hr></td></tr>
<tr><th id="chapter-1_fn_letter-F">F</th><td></td><td></td></tr>
<tr><td></td><td class="printindex-index-entry"><a
href="#index-f_002d_002d_002daa"><code>f---aa</code></a></td><td> </td><td
class="printindex-index-section"><a href="#chapter">1 chapter</a></td></tr>
+<tr><td></td><td class="printindex-index-see-entry"><code
class="code">f---aaa</code>, <em class="emph">See</em> <code
class="code">f---bbb</code></td><td> </td><td
class="printindex-index-see-entry-section"></td></tr>
<tr><td></td><td
class="printindex-index-entry"><code>f---bb</code></td><td> </td><td
class="printindex-index-section"></td></tr>
<tr><td></td><td class="printindex-index-entry"><a
href="#index-f_002d_002d_002dbb"><span
class="index-entry-level-1"><code>f---cc</code></span></a></td><td> </td><td
class="printindex-index-section"><a href="#chapter">1 chapter</a></td></tr>
+<tr><td></td><td
class="printindex-index-entry"><code>f---ddd</code></td><td> </td><td
class="printindex-index-see-also"><em class="emph">See also</em>
f---ccc</td></tr>
+<tr><td></td><td
class="printindex-index-entry"><code>f---ddd</code></td><td> </td><td
class="printindex-index-see-also"><em class="emph">See also</em>
f---ccc</td></tr>
<tr><td></td><td
class="printindex-index-entry"><code>f---ddd</code></td><td> </td><td
class="printindex-index-section"></td></tr>
<tr><td></td><td class="printindex-index-entry"><span
class="index-entry-level-1"><code>f---eee</code></span></td><td> </td><td
class="printindex-index-section"></td></tr>
<tr><td></td><td class="printindex-index-entry"><a
href="#index-f_002d_002d_002dddd"><span
class="index-entry-level-2"><code>ffff</code></span></a></td><td> </td><td
class="printindex-index-section"><a href="#chapter">1 chapter</a></td></tr>
@@ -7307,6 +7313,7 @@ Menu comment
<tr><td></td><td class="printindex-index-entry"><a
href="#index-titlepage-a_002d_002dasis"><code>a--asis</code></a></td><td> </td><td
class="printindex-index-section"><a href="#Top">Top section</a></td></tr>
<tr><td></td><td class="printindex-index-entry"><a
href="#index-a_002d_002dasis"><code>a--asis</code></a></td><td> </td><td
class="printindex-index-section"><a href="#chapter">1 chapter</a></td></tr>
<tr><td></td><td class="printindex-index-entry"><a
href="#index-a_002d_002dasis-1"><code>a--asis</code></a></td><td> </td><td
class="printindex-index-section"><a href="#chapter">1 chapter</a></td></tr>
+<tr><td></td><td class="printindex-index-see-entry">aaa, <em
class="emph">See</em> bbb</td><td> </td><td
class="printindex-index-see-entry-section"></td></tr>
<tr><td colspan="4"> <hr></td></tr>
<tr><th id="chapter-2_cp_letter-B">B</th><td></td><td></td></tr>
<tr><td></td><td class="printindex-index-entry"><a
href="#index-copying-b-2"><code>b</code></a></td><td> </td><td
class="printindex-index-section"><a href="#Top">Top section</a></td></tr>
@@ -7379,6 +7386,8 @@ Menu comment
<tr><td></td><td class="printindex-index-entry"><a
href="#index-titlepage-d_002d_002defvr_005fname"><code>d--efvr_name</code></a></td><td> </td><td
class="printindex-index-section"><a href="#Top">Top section</a></td></tr>
<tr><td></td><td class="printindex-index-entry"><a
href="#index-d_002d_002defvr_005fname"><code>d--efvr_name</code></a></td><td> </td><td
class="printindex-index-section"><a href="#chapter">1 chapter</a></td></tr>
<tr><td></td><td class="printindex-index-entry"><a
href="#index-d_002d_002defvr_005fname-1"><code>d--efvr_name</code></a></td><td> </td><td
class="printindex-index-section"><a href="#chapter">1 chapter</a></td></tr>
+<tr><td></td><td class="printindex-index-entry">ddd</td><td> </td><td
class="printindex-index-see-also"><em class="emph">See also</em> ccc</td></tr>
+<tr><td></td><td class="printindex-index-entry">ddd</td><td> </td><td
class="printindex-index-see-also"><em class="emph">See also</em> ccc</td></tr>
<tr><td colspan="4"> <hr></td></tr>
<tr><th id="chapter-2_cp_letter-G">G</th><td></td><td></td></tr>
<tr><td></td><td
class="printindex-index-entry">g—gg</td><td> </td><td
class="printindex-index-section"></td></tr>
@@ -7651,8 +7660,11 @@ Menu comment
<tr><td colspan="4"> <hr></td></tr>
<tr><th id="chapter-2_fn_letter-F">F</th><td></td><td></td></tr>
<tr><td></td><td class="printindex-index-entry"><a
href="#index-f_002d_002d_002daa"><code>f---aa</code></a></td><td> </td><td
class="printindex-index-section"><a href="#chapter">1 chapter</a></td></tr>
+<tr><td></td><td class="printindex-index-see-entry"><code
class="code">f---aaa</code>, <em class="emph">See</em> <code
class="code">f---bbb</code></td><td> </td><td
class="printindex-index-see-entry-section"></td></tr>
<tr><td></td><td
class="printindex-index-entry"><code>f---bb</code></td><td> </td><td
class="printindex-index-section"></td></tr>
<tr><td></td><td class="printindex-index-entry"><a
href="#index-f_002d_002d_002dbb"><span
class="index-entry-level-1"><code>f---cc</code></span></a></td><td> </td><td
class="printindex-index-section"><a href="#chapter">1 chapter</a></td></tr>
+<tr><td></td><td
class="printindex-index-entry"><code>f---ddd</code></td><td> </td><td
class="printindex-index-see-also"><em class="emph">See also</em>
f---ccc</td></tr>
+<tr><td></td><td
class="printindex-index-entry"><code>f---ddd</code></td><td> </td><td
class="printindex-index-see-also"><em class="emph">See also</em>
f---ccc</td></tr>
<tr><td></td><td
class="printindex-index-entry"><code>f---ddd</code></td><td> </td><td
class="printindex-index-section"></td></tr>
<tr><td></td><td class="printindex-index-entry"><span
class="index-entry-level-1"><code>f---eee</code></span></td><td> </td><td
class="printindex-index-section"></td></tr>
<tr><td></td><td class="printindex-index-entry"><a
href="#index-f_002d_002d_002dddd"><span
class="index-entry-level-2"><code>ffff</code></span></a></td><td> </td><td
class="printindex-index-section"><a href="#chapter">1 chapter</a></td></tr>
diff --git a/tp/tests/layout/res_parser/formatting_html/formatting.html
b/tp/tests/layout/res_parser/formatting_html/formatting.html
index 86d9c314c2..fcdfe99143 100644
--- a/tp/tests/layout/res_parser/formatting_html/formatting.html
+++ b/tp/tests/layout/res_parser/formatting_html/formatting.html
@@ -6605,6 +6605,7 @@ Invalid use of @':
<tr><td></td><td class="printindex-index-entry"><a
href="#index-titlepage-a_002d_002dasis"><code>a--asis</code></a></td><td> </td><td
class="printindex-index-section"><a href="#Top">Top section</a></td></tr>
<tr><td></td><td class="printindex-index-entry"><a
href="#index-a_002d_002dasis"><code>a--asis</code></a></td><td> </td><td
class="printindex-index-section"><a href="#chapter">1 chapter</a></td></tr>
<tr><td></td><td class="printindex-index-entry"><a
href="#index-a_002d_002dasis-1"><code>a--asis</code></a></td><td> </td><td
class="printindex-index-section"><a href="#chapter">1 chapter</a></td></tr>
+<tr><td></td><td class="printindex-index-see-entry">aaa, <em
class="emph">See</em> bbb</td><td> </td><td
class="printindex-index-see-entry-section"></td></tr>
<tr><td colspan="4"> <hr></td></tr>
<tr><th id="chapter-1_cp_letter-B">B</th><td></td><td></td></tr>
<tr><td></td><td class="printindex-index-entry"><a
href="#index-copying-b-2"><code>b</code></a></td><td> </td><td
class="printindex-index-section"><a href="#Top">Top section</a></td></tr>
@@ -6677,6 +6678,8 @@ Invalid use of @':
<tr><td></td><td class="printindex-index-entry"><a
href="#index-titlepage-d_002d_002defvr_005fname"><code>d--efvr_name</code></a></td><td> </td><td
class="printindex-index-section"><a href="#Top">Top section</a></td></tr>
<tr><td></td><td class="printindex-index-entry"><a
href="#index-d_002d_002defvr_005fname"><code>d--efvr_name</code></a></td><td> </td><td
class="printindex-index-section"><a href="#chapter">1 chapter</a></td></tr>
<tr><td></td><td class="printindex-index-entry"><a
href="#index-d_002d_002defvr_005fname-1"><code>d--efvr_name</code></a></td><td> </td><td
class="printindex-index-section"><a href="#chapter">1 chapter</a></td></tr>
+<tr><td></td><td class="printindex-index-entry">ddd</td><td> </td><td
class="printindex-index-see-also"><em class="emph">See also</em> ccc</td></tr>
+<tr><td></td><td class="printindex-index-entry">ddd</td><td> </td><td
class="printindex-index-see-also"><em class="emph">See also</em> ccc</td></tr>
<tr><td colspan="4"> <hr></td></tr>
<tr><th id="chapter-1_cp_letter-G">G</th><td></td><td></td></tr>
<tr><td></td><td
class="printindex-index-entry">g—gg</td><td> </td><td
class="printindex-index-section"></td></tr>
@@ -6951,8 +6954,11 @@ Invalid use of @':
<tr><td colspan="4"> <hr></td></tr>
<tr><th id="chapter-1_fn_letter-F">F</th><td></td><td></td></tr>
<tr><td></td><td class="printindex-index-entry"><a
href="#index-f_002d_002d_002daa"><code>f---aa</code></a></td><td> </td><td
class="printindex-index-section"><a href="#chapter">1 chapter</a></td></tr>
+<tr><td></td><td class="printindex-index-see-entry"><code
class="code">f---aaa</code>, <em class="emph">See</em> <code
class="code">f---bbb</code></td><td> </td><td
class="printindex-index-see-entry-section"></td></tr>
<tr><td></td><td
class="printindex-index-entry"><code>f---bb</code></td><td> </td><td
class="printindex-index-section"></td></tr>
<tr><td></td><td class="printindex-index-entry"><a
href="#index-f_002d_002d_002dbb"><span
class="index-entry-level-1"><code>f---cc</code></span></a></td><td> </td><td
class="printindex-index-section"><a href="#chapter">1 chapter</a></td></tr>
+<tr><td></td><td
class="printindex-index-entry"><code>f---ddd</code></td><td> </td><td
class="printindex-index-see-also"><em class="emph">See also</em>
f---ccc</td></tr>
+<tr><td></td><td
class="printindex-index-entry"><code>f---ddd</code></td><td> </td><td
class="printindex-index-see-also"><em class="emph">See also</em>
f---ccc</td></tr>
<tr><td></td><td
class="printindex-index-entry"><code>f---ddd</code></td><td> </td><td
class="printindex-index-section"></td></tr>
<tr><td></td><td class="printindex-index-entry"><span
class="index-entry-level-1"><code>f---eee</code></span></td><td> </td><td
class="printindex-index-section"></td></tr>
<tr><td></td><td class="printindex-index-entry"><a
href="#index-f_002d_002d_002dddd"><span
class="index-entry-level-2"><code>ffff</code></span></a></td><td> </td><td
class="printindex-index-section"><a href="#chapter">1 chapter</a></td></tr>
@@ -7307,6 +7313,7 @@ Menu comment
<tr><td></td><td class="printindex-index-entry"><a
href="#index-titlepage-a_002d_002dasis"><code>a--asis</code></a></td><td> </td><td
class="printindex-index-section"><a href="#Top">Top section</a></td></tr>
<tr><td></td><td class="printindex-index-entry"><a
href="#index-a_002d_002dasis"><code>a--asis</code></a></td><td> </td><td
class="printindex-index-section"><a href="#chapter">1 chapter</a></td></tr>
<tr><td></td><td class="printindex-index-entry"><a
href="#index-a_002d_002dasis-1"><code>a--asis</code></a></td><td> </td><td
class="printindex-index-section"><a href="#chapter">1 chapter</a></td></tr>
+<tr><td></td><td class="printindex-index-see-entry">aaa, <em
class="emph">See</em> bbb</td><td> </td><td
class="printindex-index-see-entry-section"></td></tr>
<tr><td colspan="4"> <hr></td></tr>
<tr><th id="chapter-2_cp_letter-B">B</th><td></td><td></td></tr>
<tr><td></td><td class="printindex-index-entry"><a
href="#index-copying-b-2"><code>b</code></a></td><td> </td><td
class="printindex-index-section"><a href="#Top">Top section</a></td></tr>
@@ -7379,6 +7386,8 @@ Menu comment
<tr><td></td><td class="printindex-index-entry"><a
href="#index-titlepage-d_002d_002defvr_005fname"><code>d--efvr_name</code></a></td><td> </td><td
class="printindex-index-section"><a href="#Top">Top section</a></td></tr>
<tr><td></td><td class="printindex-index-entry"><a
href="#index-d_002d_002defvr_005fname"><code>d--efvr_name</code></a></td><td> </td><td
class="printindex-index-section"><a href="#chapter">1 chapter</a></td></tr>
<tr><td></td><td class="printindex-index-entry"><a
href="#index-d_002d_002defvr_005fname-1"><code>d--efvr_name</code></a></td><td> </td><td
class="printindex-index-section"><a href="#chapter">1 chapter</a></td></tr>
+<tr><td></td><td class="printindex-index-entry">ddd</td><td> </td><td
class="printindex-index-see-also"><em class="emph">See also</em> ccc</td></tr>
+<tr><td></td><td class="printindex-index-entry">ddd</td><td> </td><td
class="printindex-index-see-also"><em class="emph">See also</em> ccc</td></tr>
<tr><td colspan="4"> <hr></td></tr>
<tr><th id="chapter-2_cp_letter-G">G</th><td></td><td></td></tr>
<tr><td></td><td
class="printindex-index-entry">g—gg</td><td> </td><td
class="printindex-index-section"></td></tr>
@@ -7651,8 +7660,11 @@ Menu comment
<tr><td colspan="4"> <hr></td></tr>
<tr><th id="chapter-2_fn_letter-F">F</th><td></td><td></td></tr>
<tr><td></td><td class="printindex-index-entry"><a
href="#index-f_002d_002d_002daa"><code>f---aa</code></a></td><td> </td><td
class="printindex-index-section"><a href="#chapter">1 chapter</a></td></tr>
+<tr><td></td><td class="printindex-index-see-entry"><code
class="code">f---aaa</code>, <em class="emph">See</em> <code
class="code">f---bbb</code></td><td> </td><td
class="printindex-index-see-entry-section"></td></tr>
<tr><td></td><td
class="printindex-index-entry"><code>f---bb</code></td><td> </td><td
class="printindex-index-section"></td></tr>
<tr><td></td><td class="printindex-index-entry"><a
href="#index-f_002d_002d_002dbb"><span
class="index-entry-level-1"><code>f---cc</code></span></a></td><td> </td><td
class="printindex-index-section"><a href="#chapter">1 chapter</a></td></tr>
+<tr><td></td><td
class="printindex-index-entry"><code>f---ddd</code></td><td> </td><td
class="printindex-index-see-also"><em class="emph">See also</em>
f---ccc</td></tr>
+<tr><td></td><td
class="printindex-index-entry"><code>f---ddd</code></td><td> </td><td
class="printindex-index-see-also"><em class="emph">See also</em>
f---ccc</td></tr>
<tr><td></td><td
class="printindex-index-entry"><code>f---ddd</code></td><td> </td><td
class="printindex-index-section"></td></tr>
<tr><td></td><td class="printindex-index-entry"><span
class="index-entry-level-1"><code>f---eee</code></span></td><td> </td><td
class="printindex-index-section"></td></tr>
<tr><td></td><td class="printindex-index-entry"><a
href="#index-f_002d_002d_002dddd"><span
class="index-entry-level-2"><code>ffff</code></span></a></td><td> </td><td
class="printindex-index-section"><a href="#chapter">1 chapter</a></td></tr>
diff --git a/tp/tests/layout/res_parser/formatting_html32/formatting.html
b/tp/tests/layout/res_parser/formatting_html32/formatting.html
index 87acfda1ef..52bf9e0364 100644
--- a/tp/tests/layout/res_parser/formatting_html32/formatting.html
+++ b/tp/tests/layout/res_parser/formatting_html32/formatting.html
@@ -6434,6 +6434,7 @@ Invalid use of @':
<tr><td></td><td><a
href="#index-titlepage-a_002d_002dasis"><code>a--asis</code></a></td><td> </td><td><a
href="#Top">Top section</a></td></tr>
<tr><td></td><td><a
href="#index-a_002d_002dasis"><code>a--asis</code></a></td><td> </td><td><a
href="#chapter">1 chapter</a></td></tr>
<tr><td></td><td><a
href="#index-a_002d_002dasis-1"><code>a--asis</code></a></td><td> </td><td><a
href="#chapter">1 chapter</a></td></tr>
+<tr><td></td><td>aaa, <em>See</em> bbb</td><td> </td><td></td></tr>
<tr><td colspan="4"> <hr></td></tr>
<tr><th id="chapter-1_cp_letter-B">B</th><td></td><td></td></tr>
<tr><td></td><td><a
href="#index-copying-b-2"><code>b</code></a></td><td> </td><td><a
href="#Top">Top section</a></td></tr>
@@ -6506,6 +6507,8 @@ Invalid use of @':
<tr><td></td><td><a
href="#index-titlepage-d_002d_002defvr_005fname"><code>d--efvr_name</code></a></td><td> </td><td><a
href="#Top">Top section</a></td></tr>
<tr><td></td><td><a
href="#index-d_002d_002defvr_005fname"><code>d--efvr_name</code></a></td><td> </td><td><a
href="#chapter">1 chapter</a></td></tr>
<tr><td></td><td><a
href="#index-d_002d_002defvr_005fname-1"><code>d--efvr_name</code></a></td><td> </td><td><a
href="#chapter">1 chapter</a></td></tr>
+<tr><td></td><td>ddd</td><td> </td><td><em>See also</em> ccc</td></tr>
+<tr><td></td><td>ddd</td><td> </td><td><em>See also</em> ccc</td></tr>
<tr><td colspan="4"> <hr></td></tr>
<tr><th id="chapter-1_cp_letter-G">G</th><td></td><td></td></tr>
<tr><td></td><td>g--gg</td><td> </td><td></td></tr>
@@ -6780,8 +6783,11 @@ Invalid use of @':
<tr><td colspan="4"> <hr></td></tr>
<tr><th id="chapter-1_fn_letter-F">F</th><td></td><td></td></tr>
<tr><td></td><td><a
href="#index-f_002d_002d_002daa"><code>f---aa</code></a></td><td> </td><td><a
href="#chapter">1 chapter</a></td></tr>
+<tr><td></td><td><code>f---aaa</code>, <em>See</em>
<code>f---bbb</code></td><td> </td><td></td></tr>
<tr><td></td><td><code>f---bb</code></td><td> </td><td></td></tr>
<tr><td></td><td><a
href="#index-f_002d_002d_002dbb"><code>f---cc</code></a></td><td> </td><td><a
href="#chapter">1 chapter</a></td></tr>
+<tr><td></td><td><code>f---ddd</code></td><td> </td><td><em>See also</em>
f---ccc</td></tr>
+<tr><td></td><td><code>f---ddd</code></td><td> </td><td><em>See also</em>
f---ccc</td></tr>
<tr><td></td><td><code>f---ddd</code></td><td> </td><td></td></tr>
<tr><td></td><td><code>f---eee</code></td><td> </td><td></td></tr>
<tr><td></td><td><a
href="#index-f_002d_002d_002dddd"><code>ffff</code></a></td><td> </td><td><a
href="#chapter">1 chapter</a></td></tr>
@@ -7136,6 +7142,7 @@ Menu comment
<tr><td></td><td><a
href="#index-titlepage-a_002d_002dasis"><code>a--asis</code></a></td><td> </td><td><a
href="#Top">Top section</a></td></tr>
<tr><td></td><td><a
href="#index-a_002d_002dasis"><code>a--asis</code></a></td><td> </td><td><a
href="#chapter">1 chapter</a></td></tr>
<tr><td></td><td><a
href="#index-a_002d_002dasis-1"><code>a--asis</code></a></td><td> </td><td><a
href="#chapter">1 chapter</a></td></tr>
+<tr><td></td><td>aaa, <em>See</em> bbb</td><td> </td><td></td></tr>
<tr><td colspan="4"> <hr></td></tr>
<tr><th id="chapter-2_cp_letter-B">B</th><td></td><td></td></tr>
<tr><td></td><td><a
href="#index-copying-b-2"><code>b</code></a></td><td> </td><td><a
href="#Top">Top section</a></td></tr>
@@ -7208,6 +7215,8 @@ Menu comment
<tr><td></td><td><a
href="#index-titlepage-d_002d_002defvr_005fname"><code>d--efvr_name</code></a></td><td> </td><td><a
href="#Top">Top section</a></td></tr>
<tr><td></td><td><a
href="#index-d_002d_002defvr_005fname"><code>d--efvr_name</code></a></td><td> </td><td><a
href="#chapter">1 chapter</a></td></tr>
<tr><td></td><td><a
href="#index-d_002d_002defvr_005fname-1"><code>d--efvr_name</code></a></td><td> </td><td><a
href="#chapter">1 chapter</a></td></tr>
+<tr><td></td><td>ddd</td><td> </td><td><em>See also</em> ccc</td></tr>
+<tr><td></td><td>ddd</td><td> </td><td><em>See also</em> ccc</td></tr>
<tr><td colspan="4"> <hr></td></tr>
<tr><th id="chapter-2_cp_letter-G">G</th><td></td><td></td></tr>
<tr><td></td><td>g--gg</td><td> </td><td></td></tr>
@@ -7480,8 +7489,11 @@ Menu comment
<tr><td colspan="4"> <hr></td></tr>
<tr><th id="chapter-2_fn_letter-F">F</th><td></td><td></td></tr>
<tr><td></td><td><a
href="#index-f_002d_002d_002daa"><code>f---aa</code></a></td><td> </td><td><a
href="#chapter">1 chapter</a></td></tr>
+<tr><td></td><td><code>f---aaa</code>, <em>See</em>
<code>f---bbb</code></td><td> </td><td></td></tr>
<tr><td></td><td><code>f---bb</code></td><td> </td><td></td></tr>
<tr><td></td><td><a
href="#index-f_002d_002d_002dbb"><code>f---cc</code></a></td><td> </td><td><a
href="#chapter">1 chapter</a></td></tr>
+<tr><td></td><td><code>f---ddd</code></td><td> </td><td><em>See also</em>
f---ccc</td></tr>
+<tr><td></td><td><code>f---ddd</code></td><td> </td><td><em>See also</em>
f---ccc</td></tr>
<tr><td></td><td><code>f---ddd</code></td><td> </td><td></td></tr>
<tr><td></td><td><code>f---eee</code></td><td> </td><td></td></tr>
<tr><td></td><td><a
href="#index-f_002d_002d_002dddd"><code>ffff</code></a></td><td> </td><td><a
href="#chapter">1 chapter</a></td></tr>
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 5300ff9987..fba5833407 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
@@ -4449,6 +4449,7 @@ Invalid use of @':
<tr><td></td><td class="printindex-index-entry"><a
href="#index-titlepage-a_002d_002dasis"><code>a--asis</code></a>:</td><td> </td><td
class="printindex-index-section"><a href="#Top">Top</a></td></tr>
<tr><td></td><td class="printindex-index-entry"><a
href="#index-a_002d_002dasis"><code>a--asis</code></a>:</td><td> </td><td
class="printindex-index-section"><a href="#chapter">chapter</a></td></tr>
<tr><td></td><td class="printindex-index-entry"><a
href="#index-a_002d_002dasis-1"><code>a--asis</code></a>:</td><td> </td><td
class="printindex-index-section"><a href="#chapter">chapter</a></td></tr>
+<tr><td></td><td class="printindex-index-see-entry">aaa, <em
class="emph">See</em> bbb</td><td> </td><td
class="printindex-index-see-entry-section"></td></tr>
<tr><td colspan="4"> <hr></td></tr>
<tr><th id="chapter_cp_letter-B">B</th><td></td><td></td></tr>
<tr><td></td><td class="printindex-index-entry"><a
href="#index-copying-b-2"><code>b</code></a>:</td><td> </td><td
class="printindex-index-section"><a href="#chapter">chapter</a></td></tr>
@@ -4521,6 +4522,8 @@ Invalid use of @':
<tr><td></td><td class="printindex-index-entry"><a
href="#index-titlepage-d_002d_002defvr_005fname"><code>d--efvr_name</code></a>:</td><td> </td><td
class="printindex-index-section"><a href="#Top">Top</a></td></tr>
<tr><td></td><td class="printindex-index-entry"><a
href="#index-d_002d_002defvr_005fname"><code>d--efvr_name</code></a>:</td><td> </td><td
class="printindex-index-section"><a href="#chapter">chapter</a></td></tr>
<tr><td></td><td class="printindex-index-entry"><a
href="#index-d_002d_002defvr_005fname-1"><code>d--efvr_name</code></a>:</td><td> </td><td
class="printindex-index-section"><a href="#chapter">chapter</a></td></tr>
+<tr><td></td><td class="printindex-index-entry">ddd:</td><td> </td><td
class="printindex-index-see-also"><em class="emph">See also</em> ccc</td></tr>
+<tr><td></td><td class="printindex-index-entry">ddd:</td><td> </td><td
class="printindex-index-see-also"><em class="emph">See also</em> ccc</td></tr>
<tr><td colspan="4"> <hr></td></tr>
<tr><th id="chapter_cp_letter-G">G</th><td></td><td></td></tr>
<tr><td></td><td
class="printindex-index-entry">g—gg</td><td> </td><td
class="printindex-index-section"></td></tr>
@@ -4795,8 +4798,11 @@ Invalid use of @':
<tr><td colspan="4"> <hr></td></tr>
<tr><th id="chapter_fn_letter-F">F</th><td></td><td></td></tr>
<tr><td></td><td class="printindex-index-entry"><a
href="#index-f_002d_002d_002daa"><code>f---aa</code></a>:</td><td> </td><td
class="printindex-index-section"><a href="#chapter">chapter</a></td></tr>
+<tr><td></td><td class="printindex-index-see-entry"><code
class="code">f---aaa</code>, <em class="emph">See</em> <code
class="code">f---bbb</code></td><td> </td><td
class="printindex-index-see-entry-section"></td></tr>
<tr><td></td><td
class="printindex-index-entry"><code>f---bb</code></td><td> </td><td
class="printindex-index-section"></td></tr>
<tr><td></td><td class="printindex-index-entry"><a
href="#index-f_002d_002d_002dbb"><span
class="index-entry-level-1"><code>f---cc</code></span></a>:</td><td> </td><td
class="printindex-index-section"><a href="#chapter">chapter</a></td></tr>
+<tr><td></td><td
class="printindex-index-entry"><code>f---ddd</code>:</td><td> </td><td
class="printindex-index-see-also"><em class="emph">See also</em>
f---ccc</td></tr>
+<tr><td></td><td
class="printindex-index-entry"><code>f---ddd</code>:</td><td> </td><td
class="printindex-index-see-also"><em class="emph">See also</em>
f---ccc</td></tr>
<tr><td></td><td
class="printindex-index-entry"><code>f---ddd</code></td><td> </td><td
class="printindex-index-section"></td></tr>
<tr><td></td><td class="printindex-index-entry"><span
class="index-entry-level-1"><code>f---eee</code></span></td><td> </td><td
class="printindex-index-section"></td></tr>
<tr><td></td><td class="printindex-index-entry"><a
href="#index-f_002d_002d_002dddd"><span
class="index-entry-level-2"><code>ffff</code></span></a>:</td><td> </td><td
class="printindex-index-section"><a href="#chapter">chapter</a></td></tr>
@@ -5077,6 +5083,7 @@ Previous: <a href="#chapter" accesskey="p"
rel="prev">chapter</a>, Up: <a href="
<tr><td></td><td class="printindex-index-entry"><a
href="#index-titlepage-a_002d_002dasis"><code>a--asis</code></a>:</td><td> </td><td
class="printindex-index-section"><a href="#Top">Top</a></td></tr>
<tr><td></td><td class="printindex-index-entry"><a
href="#index-a_002d_002dasis"><code>a--asis</code></a>:</td><td> </td><td
class="printindex-index-section"><a href="#chapter">chapter</a></td></tr>
<tr><td></td><td class="printindex-index-entry"><a
href="#index-a_002d_002dasis-1"><code>a--asis</code></a>:</td><td> </td><td
class="printindex-index-section"><a href="#chapter">chapter</a></td></tr>
+<tr><td></td><td class="printindex-index-see-entry">aaa, <em
class="emph">See</em> bbb</td><td> </td><td
class="printindex-index-see-entry-section"></td></tr>
<tr><td colspan="4"> <hr></td></tr>
<tr><th id="chapter2_cp_letter-B">B</th><td></td><td></td></tr>
<tr><td></td><td class="printindex-index-entry"><a
href="#index-copying-b-2"><code>b</code></a>:</td><td> </td><td
class="printindex-index-section"><a href="#chapter">chapter</a></td></tr>
@@ -5149,6 +5156,8 @@ Previous: <a href="#chapter" accesskey="p"
rel="prev">chapter</a>, Up: <a href="
<tr><td></td><td class="printindex-index-entry"><a
href="#index-titlepage-d_002d_002defvr_005fname"><code>d--efvr_name</code></a>:</td><td> </td><td
class="printindex-index-section"><a href="#Top">Top</a></td></tr>
<tr><td></td><td class="printindex-index-entry"><a
href="#index-d_002d_002defvr_005fname"><code>d--efvr_name</code></a>:</td><td> </td><td
class="printindex-index-section"><a href="#chapter">chapter</a></td></tr>
<tr><td></td><td class="printindex-index-entry"><a
href="#index-d_002d_002defvr_005fname-1"><code>d--efvr_name</code></a>:</td><td> </td><td
class="printindex-index-section"><a href="#chapter">chapter</a></td></tr>
+<tr><td></td><td class="printindex-index-entry">ddd:</td><td> </td><td
class="printindex-index-see-also"><em class="emph">See also</em> ccc</td></tr>
+<tr><td></td><td class="printindex-index-entry">ddd:</td><td> </td><td
class="printindex-index-see-also"><em class="emph">See also</em> ccc</td></tr>
<tr><td colspan="4"> <hr></td></tr>
<tr><th id="chapter2_cp_letter-G">G</th><td></td><td></td></tr>
<tr><td></td><td
class="printindex-index-entry">g—gg</td><td> </td><td
class="printindex-index-section"></td></tr>
@@ -5421,8 +5430,11 @@ Previous: <a href="#chapter" accesskey="p"
rel="prev">chapter</a>, Up: <a href="
<tr><td colspan="4"> <hr></td></tr>
<tr><th id="chapter2_fn_letter-F">F</th><td></td><td></td></tr>
<tr><td></td><td class="printindex-index-entry"><a
href="#index-f_002d_002d_002daa"><code>f---aa</code></a>:</td><td> </td><td
class="printindex-index-section"><a href="#chapter">chapter</a></td></tr>
+<tr><td></td><td class="printindex-index-see-entry"><code
class="code">f---aaa</code>, <em class="emph">See</em> <code
class="code">f---bbb</code></td><td> </td><td
class="printindex-index-see-entry-section"></td></tr>
<tr><td></td><td
class="printindex-index-entry"><code>f---bb</code></td><td> </td><td
class="printindex-index-section"></td></tr>
<tr><td></td><td class="printindex-index-entry"><a
href="#index-f_002d_002d_002dbb"><span
class="index-entry-level-1"><code>f---cc</code></span></a>:</td><td> </td><td
class="printindex-index-section"><a href="#chapter">chapter</a></td></tr>
+<tr><td></td><td
class="printindex-index-entry"><code>f---ddd</code>:</td><td> </td><td
class="printindex-index-see-also"><em class="emph">See also</em>
f---ccc</td></tr>
+<tr><td></td><td
class="printindex-index-entry"><code>f---ddd</code>:</td><td> </td><td
class="printindex-index-see-also"><em class="emph">See also</em>
f---ccc</td></tr>
<tr><td></td><td
class="printindex-index-entry"><code>f---ddd</code></td><td> </td><td
class="printindex-index-section"></td></tr>
<tr><td></td><td class="printindex-index-entry"><span
class="index-entry-level-1"><code>f---eee</code></span></td><td> </td><td
class="printindex-index-section"></td></tr>
<tr><td></td><td class="printindex-index-entry"><a
href="#index-f_002d_002d_002dddd"><span
class="index-entry-level-2"><code>ffff</code></span></a>:</td><td> </td><td
class="printindex-index-section"><a href="#chapter">chapter</a></td></tr>
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 a84096efcc..8386e89a19 100644
--- a/tp/tests/layout/res_parser/formatting_html_nodes/chapter.html
+++ b/tp/tests/layout/res_parser/formatting_html_nodes/chapter.html
@@ -4411,6 +4411,7 @@ Invalid use of @':
<tr><td></td><td class="printindex-index-entry"><a
href="index.html#index-titlepage-a_002d_002dasis"><code>a--asis</code></a></td><td> </td><td
class="printindex-index-section"><a href="index.html">Top section</a></td></tr>
<tr><td></td><td class="printindex-index-entry"><a
href="#index-a_002d_002dasis"><code>a--asis</code></a></td><td> </td><td
class="printindex-index-section"><a href="#chapter">1 chapter</a></td></tr>
<tr><td></td><td class="printindex-index-entry"><a
href="#index-a_002d_002dasis-1"><code>a--asis</code></a></td><td> </td><td
class="printindex-index-section"><a href="#chapter">1 chapter</a></td></tr>
+<tr><td></td><td class="printindex-index-see-entry">aaa, <em
class="emph">See</em> bbb</td><td> </td><td
class="printindex-index-see-entry-section"></td></tr>
<tr><td colspan="4"> <hr></td></tr>
<tr><th id="chapter-1_cp_letter-B">B</th><td></td><td></td></tr>
<tr><td></td><td class="printindex-index-entry"><a
href="index.html#index-copying-b-2"><code>b</code></a></td><td> </td><td
class="printindex-index-section"><a href="index.html">Top section</a></td></tr>
@@ -4483,6 +4484,8 @@ Invalid use of @':
<tr><td></td><td class="printindex-index-entry"><a
href="index.html#index-titlepage-d_002d_002defvr_005fname"><code>d--efvr_name</code></a></td><td> </td><td
class="printindex-index-section"><a href="index.html">Top section</a></td></tr>
<tr><td></td><td class="printindex-index-entry"><a
href="#index-d_002d_002defvr_005fname"><code>d--efvr_name</code></a></td><td> </td><td
class="printindex-index-section"><a href="#chapter">1 chapter</a></td></tr>
<tr><td></td><td class="printindex-index-entry"><a
href="#index-d_002d_002defvr_005fname-1"><code>d--efvr_name</code></a></td><td> </td><td
class="printindex-index-section"><a href="#chapter">1 chapter</a></td></tr>
+<tr><td></td><td class="printindex-index-entry">ddd</td><td> </td><td
class="printindex-index-see-also"><em class="emph">See also</em> ccc</td></tr>
+<tr><td></td><td class="printindex-index-entry">ddd</td><td> </td><td
class="printindex-index-see-also"><em class="emph">See also</em> ccc</td></tr>
<tr><td colspan="4"> <hr></td></tr>
<tr><th id="chapter-1_cp_letter-G">G</th><td></td><td></td></tr>
<tr><td></td><td
class="printindex-index-entry">g—gg</td><td> </td><td
class="printindex-index-section"></td></tr>
@@ -4757,8 +4760,11 @@ Invalid use of @':
<tr><td colspan="4"> <hr></td></tr>
<tr><th id="chapter-1_fn_letter-F">F</th><td></td><td></td></tr>
<tr><td></td><td class="printindex-index-entry"><a
href="#index-f_002d_002d_002daa"><code>f---aa</code></a></td><td> </td><td
class="printindex-index-section"><a href="#chapter">1 chapter</a></td></tr>
+<tr><td></td><td class="printindex-index-see-entry"><code
class="code">f---aaa</code>, <em class="emph">See</em> <code
class="code">f---bbb</code></td><td> </td><td
class="printindex-index-see-entry-section"></td></tr>
<tr><td></td><td
class="printindex-index-entry"><code>f---bb</code></td><td> </td><td
class="printindex-index-section"></td></tr>
<tr><td></td><td class="printindex-index-entry"><a
href="#index-f_002d_002d_002dbb"><span
class="index-entry-level-1"><code>f---cc</code></span></a></td><td> </td><td
class="printindex-index-section"><a href="#chapter">1 chapter</a></td></tr>
+<tr><td></td><td
class="printindex-index-entry"><code>f---ddd</code></td><td> </td><td
class="printindex-index-see-also"><em class="emph">See also</em>
f---ccc</td></tr>
+<tr><td></td><td
class="printindex-index-entry"><code>f---ddd</code></td><td> </td><td
class="printindex-index-see-also"><em class="emph">See also</em>
f---ccc</td></tr>
<tr><td></td><td
class="printindex-index-entry"><code>f---ddd</code></td><td> </td><td
class="printindex-index-section"></td></tr>
<tr><td></td><td class="printindex-index-entry"><span
class="index-entry-level-1"><code>f---eee</code></span></td><td> </td><td
class="printindex-index-section"></td></tr>
<tr><td></td><td class="printindex-index-entry"><a
href="#index-f_002d_002d_002dddd"><span
class="index-entry-level-2"><code>ffff</code></span></a></td><td> </td><td
class="printindex-index-section"><a href="#chapter">1 chapter</a></td></tr>
diff --git a/tp/tests/layout/res_parser/formatting_html_nodes/chapter2.html
b/tp/tests/layout/res_parser/formatting_html_nodes/chapter2.html
index 66ae42f3cf..9a51e354be 100644
--- a/tp/tests/layout/res_parser/formatting_html_nodes/chapter2.html
+++ b/tp/tests/layout/res_parser/formatting_html_nodes/chapter2.html
@@ -937,6 +937,7 @@ th.sections-header-printindex {text-align:left}
<tr><td></td><td class="printindex-index-entry"><a
href="index.html#index-titlepage-a_002d_002dasis"><code>a--asis</code></a></td><td> </td><td
class="printindex-index-section"><a href="index.html">Top section</a></td></tr>
<tr><td></td><td class="printindex-index-entry"><a
href="chapter.html#index-a_002d_002dasis"><code>a--asis</code></a></td><td> </td><td
class="printindex-index-section"><a href="chapter.html">1 chapter</a></td></tr>
<tr><td></td><td class="printindex-index-entry"><a
href="chapter.html#index-a_002d_002dasis-1"><code>a--asis</code></a></td><td> </td><td
class="printindex-index-section"><a href="chapter.html">1 chapter</a></td></tr>
+<tr><td></td><td class="printindex-index-see-entry">aaa, <em
class="emph">See</em> bbb</td><td> </td><td
class="printindex-index-see-entry-section"></td></tr>
<tr><td colspan="4"> <hr></td></tr>
<tr><th id="chapter-2_cp_letter-B">B</th><td></td><td></td></tr>
<tr><td></td><td class="printindex-index-entry"><a
href="index.html#index-copying-b-2"><code>b</code></a></td><td> </td><td
class="printindex-index-section"><a href="index.html">Top section</a></td></tr>
@@ -1009,6 +1010,8 @@ th.sections-header-printindex {text-align:left}
<tr><td></td><td class="printindex-index-entry"><a
href="index.html#index-titlepage-d_002d_002defvr_005fname"><code>d--efvr_name</code></a></td><td> </td><td
class="printindex-index-section"><a href="index.html">Top section</a></td></tr>
<tr><td></td><td class="printindex-index-entry"><a
href="chapter.html#index-d_002d_002defvr_005fname"><code>d--efvr_name</code></a></td><td> </td><td
class="printindex-index-section"><a href="chapter.html">1 chapter</a></td></tr>
<tr><td></td><td class="printindex-index-entry"><a
href="chapter.html#index-d_002d_002defvr_005fname-1"><code>d--efvr_name</code></a></td><td> </td><td
class="printindex-index-section"><a href="chapter.html">1 chapter</a></td></tr>
+<tr><td></td><td class="printindex-index-entry">ddd</td><td> </td><td
class="printindex-index-see-also"><em class="emph">See also</em> ccc</td></tr>
+<tr><td></td><td class="printindex-index-entry">ddd</td><td> </td><td
class="printindex-index-see-also"><em class="emph">See also</em> ccc</td></tr>
<tr><td colspan="4"> <hr></td></tr>
<tr><th id="chapter-2_cp_letter-G">G</th><td></td><td></td></tr>
<tr><td></td><td
class="printindex-index-entry">g—gg</td><td> </td><td
class="printindex-index-section"></td></tr>
@@ -1281,8 +1284,11 @@ th.sections-header-printindex {text-align:left}
<tr><td colspan="4"> <hr></td></tr>
<tr><th id="chapter-2_fn_letter-F">F</th><td></td><td></td></tr>
<tr><td></td><td class="printindex-index-entry"><a
href="chapter.html#index-f_002d_002d_002daa"><code>f---aa</code></a></td><td> </td><td
class="printindex-index-section"><a href="chapter.html">1 chapter</a></td></tr>
+<tr><td></td><td class="printindex-index-see-entry"><code
class="code">f---aaa</code>, <em class="emph">See</em> <code
class="code">f---bbb</code></td><td> </td><td
class="printindex-index-see-entry-section"></td></tr>
<tr><td></td><td
class="printindex-index-entry"><code>f---bb</code></td><td> </td><td
class="printindex-index-section"></td></tr>
<tr><td></td><td class="printindex-index-entry"><a
href="chapter.html#index-f_002d_002d_002dbb"><span
class="index-entry-level-1"><code>f---cc</code></span></a></td><td> </td><td
class="printindex-index-section"><a href="chapter.html">1 chapter</a></td></tr>
+<tr><td></td><td
class="printindex-index-entry"><code>f---ddd</code></td><td> </td><td
class="printindex-index-see-also"><em class="emph">See also</em>
f---ccc</td></tr>
+<tr><td></td><td
class="printindex-index-entry"><code>f---ddd</code></td><td> </td><td
class="printindex-index-see-also"><em class="emph">See also</em>
f---ccc</td></tr>
<tr><td></td><td
class="printindex-index-entry"><code>f---ddd</code></td><td> </td><td
class="printindex-index-section"></td></tr>
<tr><td></td><td class="printindex-index-entry"><span
class="index-entry-level-1"><code>f---eee</code></span></td><td> </td><td
class="printindex-index-section"></td></tr>
<tr><td></td><td class="printindex-index-entry"><a
href="chapter.html#index-f_002d_002d_002dddd"><span
class="index-entry-level-2"><code>ffff</code></span></a></td><td> </td><td
class="printindex-index-section"><a href="chapter.html">1 chapter</a></td></tr>
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 536945a49f..b0e8afe961 100644
--- a/tp/tests/layout/res_parser/formatting_inline_css/formatting.html
+++ b/tp/tests/layout/res_parser/formatting_inline_css/formatting.html
@@ -6565,6 +6565,7 @@ Invalid use of @':
<tr><td></td><td class="printindex-index-entry" style="vertical-align: top"><a
href="#index-titlepage-a_002d_002dasis"><code>a--asis</code></a></td><td> </td><td
class="printindex-index-section" style="vertical-align: top"><a
href="#Top">Top section</a></td></tr>
<tr><td></td><td class="printindex-index-entry" style="vertical-align: top"><a
href="#index-a_002d_002dasis"><code>a--asis</code></a></td><td> </td><td
class="printindex-index-section" style="vertical-align: top"><a
href="#chapter">1 chapter</a></td></tr>
<tr><td></td><td class="printindex-index-entry" style="vertical-align: top"><a
href="#index-a_002d_002dasis-1"><code>a--asis</code></a></td><td> </td><td
class="printindex-index-section" style="vertical-align: top"><a
href="#chapter">1 chapter</a></td></tr>
+<tr><td></td><td class="printindex-index-see-entry">aaa, <em
class="emph">See</em> bbb</td><td> </td><td
class="printindex-index-see-entry-section"></td></tr>
<tr><td colspan="4"> <hr></td></tr>
<tr><th id="chapter-1_cp_letter-B">B</th><td></td><td></td></tr>
<tr><td></td><td class="printindex-index-entry" style="vertical-align: top"><a
href="#index-copying-b-2"><code>b</code></a></td><td> </td><td
class="printindex-index-section" style="vertical-align: top"><a href="#Top">Top
section</a></td></tr>
@@ -6637,6 +6638,8 @@ Invalid use of @':
<tr><td></td><td class="printindex-index-entry" style="vertical-align: top"><a
href="#index-titlepage-d_002d_002defvr_005fname"><code>d--efvr_name</code></a></td><td> </td><td
class="printindex-index-section" style="vertical-align: top"><a
href="#Top">Top section</a></td></tr>
<tr><td></td><td class="printindex-index-entry" style="vertical-align: top"><a
href="#index-d_002d_002defvr_005fname"><code>d--efvr_name</code></a></td><td> </td><td
class="printindex-index-section" style="vertical-align: top"><a
href="#chapter">1 chapter</a></td></tr>
<tr><td></td><td class="printindex-index-entry" style="vertical-align: top"><a
href="#index-d_002d_002defvr_005fname-1"><code>d--efvr_name</code></a></td><td> </td><td
class="printindex-index-section" style="vertical-align: top"><a
href="#chapter">1 chapter</a></td></tr>
+<tr><td></td><td class="printindex-index-entry" style="vertical-align:
top">ddd</td><td> </td><td class="printindex-index-see-also"><em
class="emph">See also</em> ccc</td></tr>
+<tr><td></td><td class="printindex-index-entry" style="vertical-align:
top">ddd</td><td> </td><td class="printindex-index-see-also"><em
class="emph">See also</em> ccc</td></tr>
<tr><td colspan="4"> <hr></td></tr>
<tr><th id="chapter-1_cp_letter-G">G</th><td></td><td></td></tr>
<tr><td></td><td class="printindex-index-entry" style="vertical-align:
top">g—gg</td><td> </td><td class="printindex-index-section"
style="vertical-align: top"></td></tr>
@@ -6911,8 +6914,11 @@ Invalid use of @':
<tr><td colspan="4"> <hr></td></tr>
<tr><th id="chapter-1_fn_letter-F">F</th><td></td><td></td></tr>
<tr><td></td><td class="printindex-index-entry" style="vertical-align: top"><a
href="#index-f_002d_002d_002daa"><code>f---aa</code></a></td><td> </td><td
class="printindex-index-section" style="vertical-align: top"><a
href="#chapter">1 chapter</a></td></tr>
+<tr><td></td><td class="printindex-index-see-entry"><code
class="code">f---aaa</code>, <em class="emph">See</em> <code
class="code">f---bbb</code></td><td> </td><td
class="printindex-index-see-entry-section"></td></tr>
<tr><td></td><td class="printindex-index-entry" style="vertical-align:
top"><code>f---bb</code></td><td> </td><td
class="printindex-index-section" style="vertical-align: top"></td></tr>
<tr><td></td><td class="printindex-index-entry" style="vertical-align: top"><a
href="#index-f_002d_002d_002dbb"><span class="index-entry-level-1"
style="margin-left:
0.5em"><code>f---cc</code></span></a></td><td> </td><td
class="printindex-index-section" style="vertical-align: top"><a
href="#chapter">1 chapter</a></td></tr>
+<tr><td></td><td class="printindex-index-entry" style="vertical-align:
top"><code>f---ddd</code></td><td> </td><td
class="printindex-index-see-also"><em class="emph">See also</em>
f---ccc</td></tr>
+<tr><td></td><td class="printindex-index-entry" style="vertical-align:
top"><code>f---ddd</code></td><td> </td><td
class="printindex-index-see-also"><em class="emph">See also</em>
f---ccc</td></tr>
<tr><td></td><td class="printindex-index-entry" style="vertical-align:
top"><code>f---ddd</code></td><td> </td><td
class="printindex-index-section" style="vertical-align: top"></td></tr>
<tr><td></td><td class="printindex-index-entry" style="vertical-align:
top"><span class="index-entry-level-1" style="margin-left:
0.5em"><code>f---eee</code></span></td><td> </td><td
class="printindex-index-section" style="vertical-align: top"></td></tr>
<tr><td></td><td class="printindex-index-entry" style="vertical-align: top"><a
href="#index-f_002d_002d_002dddd"><span class="index-entry-level-2"
style="margin-left: 1.0em"><code>ffff</code></span></a></td><td> </td><td
class="printindex-index-section" style="vertical-align: top"><a
href="#chapter">1 chapter</a></td></tr>
@@ -7267,6 +7273,7 @@ Menu comment
<tr><td></td><td class="printindex-index-entry" style="vertical-align: top"><a
href="#index-titlepage-a_002d_002dasis"><code>a--asis</code></a></td><td> </td><td
class="printindex-index-section" style="vertical-align: top"><a
href="#Top">Top section</a></td></tr>
<tr><td></td><td class="printindex-index-entry" style="vertical-align: top"><a
href="#index-a_002d_002dasis"><code>a--asis</code></a></td><td> </td><td
class="printindex-index-section" style="vertical-align: top"><a
href="#chapter">1 chapter</a></td></tr>
<tr><td></td><td class="printindex-index-entry" style="vertical-align: top"><a
href="#index-a_002d_002dasis-1"><code>a--asis</code></a></td><td> </td><td
class="printindex-index-section" style="vertical-align: top"><a
href="#chapter">1 chapter</a></td></tr>
+<tr><td></td><td class="printindex-index-see-entry">aaa, <em
class="emph">See</em> bbb</td><td> </td><td
class="printindex-index-see-entry-section"></td></tr>
<tr><td colspan="4"> <hr></td></tr>
<tr><th id="chapter-2_cp_letter-B">B</th><td></td><td></td></tr>
<tr><td></td><td class="printindex-index-entry" style="vertical-align: top"><a
href="#index-copying-b-2"><code>b</code></a></td><td> </td><td
class="printindex-index-section" style="vertical-align: top"><a href="#Top">Top
section</a></td></tr>
@@ -7339,6 +7346,8 @@ Menu comment
<tr><td></td><td class="printindex-index-entry" style="vertical-align: top"><a
href="#index-titlepage-d_002d_002defvr_005fname"><code>d--efvr_name</code></a></td><td> </td><td
class="printindex-index-section" style="vertical-align: top"><a
href="#Top">Top section</a></td></tr>
<tr><td></td><td class="printindex-index-entry" style="vertical-align: top"><a
href="#index-d_002d_002defvr_005fname"><code>d--efvr_name</code></a></td><td> </td><td
class="printindex-index-section" style="vertical-align: top"><a
href="#chapter">1 chapter</a></td></tr>
<tr><td></td><td class="printindex-index-entry" style="vertical-align: top"><a
href="#index-d_002d_002defvr_005fname-1"><code>d--efvr_name</code></a></td><td> </td><td
class="printindex-index-section" style="vertical-align: top"><a
href="#chapter">1 chapter</a></td></tr>
+<tr><td></td><td class="printindex-index-entry" style="vertical-align:
top">ddd</td><td> </td><td class="printindex-index-see-also"><em
class="emph">See also</em> ccc</td></tr>
+<tr><td></td><td class="printindex-index-entry" style="vertical-align:
top">ddd</td><td> </td><td class="printindex-index-see-also"><em
class="emph">See also</em> ccc</td></tr>
<tr><td colspan="4"> <hr></td></tr>
<tr><th id="chapter-2_cp_letter-G">G</th><td></td><td></td></tr>
<tr><td></td><td class="printindex-index-entry" style="vertical-align:
top">g—gg</td><td> </td><td class="printindex-index-section"
style="vertical-align: top"></td></tr>
@@ -7611,8 +7620,11 @@ Menu comment
<tr><td colspan="4"> <hr></td></tr>
<tr><th id="chapter-2_fn_letter-F">F</th><td></td><td></td></tr>
<tr><td></td><td class="printindex-index-entry" style="vertical-align: top"><a
href="#index-f_002d_002d_002daa"><code>f---aa</code></a></td><td> </td><td
class="printindex-index-section" style="vertical-align: top"><a
href="#chapter">1 chapter</a></td></tr>
+<tr><td></td><td class="printindex-index-see-entry"><code
class="code">f---aaa</code>, <em class="emph">See</em> <code
class="code">f---bbb</code></td><td> </td><td
class="printindex-index-see-entry-section"></td></tr>
<tr><td></td><td class="printindex-index-entry" style="vertical-align:
top"><code>f---bb</code></td><td> </td><td
class="printindex-index-section" style="vertical-align: top"></td></tr>
<tr><td></td><td class="printindex-index-entry" style="vertical-align: top"><a
href="#index-f_002d_002d_002dbb"><span class="index-entry-level-1"
style="margin-left:
0.5em"><code>f---cc</code></span></a></td><td> </td><td
class="printindex-index-section" style="vertical-align: top"><a
href="#chapter">1 chapter</a></td></tr>
+<tr><td></td><td class="printindex-index-entry" style="vertical-align:
top"><code>f---ddd</code></td><td> </td><td
class="printindex-index-see-also"><em class="emph">See also</em>
f---ccc</td></tr>
+<tr><td></td><td class="printindex-index-entry" style="vertical-align:
top"><code>f---ddd</code></td><td> </td><td
class="printindex-index-see-also"><em class="emph">See also</em>
f---ccc</td></tr>
<tr><td></td><td class="printindex-index-entry" style="vertical-align:
top"><code>f---ddd</code></td><td> </td><td
class="printindex-index-section" style="vertical-align: top"></td></tr>
<tr><td></td><td class="printindex-index-entry" style="vertical-align:
top"><span class="index-entry-level-1" style="margin-left:
0.5em"><code>f---eee</code></span></td><td> </td><td
class="printindex-index-section" style="vertical-align: top"></td></tr>
<tr><td></td><td class="printindex-index-entry" style="vertical-align: top"><a
href="#index-f_002d_002d_002dddd"><span class="index-entry-level-2"
style="margin-left: 1.0em"><code>ffff</code></span></a></td><td> </td><td
class="printindex-index-section" style="vertical-align: top"><a
href="#chapter">1 chapter</a></td></tr>
diff --git a/tp/tests/layout/res_parser/formatting_mathjax/formatting.html
b/tp/tests/layout/res_parser/formatting_mathjax/formatting.html
index 86c3361c07..19dab8e908 100644
--- a/tp/tests/layout/res_parser/formatting_mathjax/formatting.html
+++ b/tp/tests/layout/res_parser/formatting_mathjax/formatting.html
@@ -6605,6 +6605,7 @@ Invalid use of @':
<tr><td></td><td class="printindex-index-entry"><a
href="#index-titlepage-a_002d_002dasis"><code>a--asis</code></a></td><td> </td><td
class="printindex-index-section"><a href="#Top">Top section</a></td></tr>
<tr><td></td><td class="printindex-index-entry"><a
href="#index-a_002d_002dasis"><code>a--asis</code></a></td><td> </td><td
class="printindex-index-section"><a href="#chapter">1 chapter</a></td></tr>
<tr><td></td><td class="printindex-index-entry"><a
href="#index-a_002d_002dasis-1"><code>a--asis</code></a></td><td> </td><td
class="printindex-index-section"><a href="#chapter">1 chapter</a></td></tr>
+<tr><td></td><td class="printindex-index-see-entry">aaa, <em
class="emph">See</em> bbb</td><td> </td><td
class="printindex-index-see-entry-section"></td></tr>
<tr><td colspan="4"> <hr></td></tr>
<tr><th id="chapter-1_cp_letter-B">B</th><td></td><td></td></tr>
<tr><td></td><td class="printindex-index-entry"><a
href="#index-copying-b-2"><code>b</code></a></td><td> </td><td
class="printindex-index-section"><a href="#Top">Top section</a></td></tr>
@@ -6677,6 +6678,8 @@ Invalid use of @':
<tr><td></td><td class="printindex-index-entry"><a
href="#index-titlepage-d_002d_002defvr_005fname"><code>d--efvr_name</code></a></td><td> </td><td
class="printindex-index-section"><a href="#Top">Top section</a></td></tr>
<tr><td></td><td class="printindex-index-entry"><a
href="#index-d_002d_002defvr_005fname"><code>d--efvr_name</code></a></td><td> </td><td
class="printindex-index-section"><a href="#chapter">1 chapter</a></td></tr>
<tr><td></td><td class="printindex-index-entry"><a
href="#index-d_002d_002defvr_005fname-1"><code>d--efvr_name</code></a></td><td> </td><td
class="printindex-index-section"><a href="#chapter">1 chapter</a></td></tr>
+<tr><td></td><td class="printindex-index-entry">ddd</td><td> </td><td
class="printindex-index-see-also"><em class="emph">See also</em> ccc</td></tr>
+<tr><td></td><td class="printindex-index-entry">ddd</td><td> </td><td
class="printindex-index-see-also"><em class="emph">See also</em> ccc</td></tr>
<tr><td colspan="4"> <hr></td></tr>
<tr><th id="chapter-1_cp_letter-G">G</th><td></td><td></td></tr>
<tr><td></td><td
class="printindex-index-entry">g—gg</td><td> </td><td
class="printindex-index-section"></td></tr>
@@ -6951,8 +6954,11 @@ Invalid use of @':
<tr><td colspan="4"> <hr></td></tr>
<tr><th id="chapter-1_fn_letter-F">F</th><td></td><td></td></tr>
<tr><td></td><td class="printindex-index-entry"><a
href="#index-f_002d_002d_002daa"><code>f---aa</code></a></td><td> </td><td
class="printindex-index-section"><a href="#chapter">1 chapter</a></td></tr>
+<tr><td></td><td class="printindex-index-see-entry"><code
class="code">f---aaa</code>, <em class="emph">See</em> <code
class="code">f---bbb</code></td><td> </td><td
class="printindex-index-see-entry-section"></td></tr>
<tr><td></td><td
class="printindex-index-entry"><code>f---bb</code></td><td> </td><td
class="printindex-index-section"></td></tr>
<tr><td></td><td class="printindex-index-entry"><a
href="#index-f_002d_002d_002dbb"><span
class="index-entry-level-1"><code>f---cc</code></span></a></td><td> </td><td
class="printindex-index-section"><a href="#chapter">1 chapter</a></td></tr>
+<tr><td></td><td
class="printindex-index-entry"><code>f---ddd</code></td><td> </td><td
class="printindex-index-see-also"><em class="emph">See also</em>
f---ccc</td></tr>
+<tr><td></td><td
class="printindex-index-entry"><code>f---ddd</code></td><td> </td><td
class="printindex-index-see-also"><em class="emph">See also</em>
f---ccc</td></tr>
<tr><td></td><td
class="printindex-index-entry"><code>f---ddd</code></td><td> </td><td
class="printindex-index-section"></td></tr>
<tr><td></td><td class="printindex-index-entry"><span
class="index-entry-level-1"><code>f---eee</code></span></td><td> </td><td
class="printindex-index-section"></td></tr>
<tr><td></td><td class="printindex-index-entry"><a
href="#index-f_002d_002d_002dddd"><span
class="index-entry-level-2"><code>ffff</code></span></a></td><td> </td><td
class="printindex-index-section"><a href="#chapter">1 chapter</a></td></tr>
@@ -7307,6 +7313,7 @@ Menu comment
<tr><td></td><td class="printindex-index-entry"><a
href="#index-titlepage-a_002d_002dasis"><code>a--asis</code></a></td><td> </td><td
class="printindex-index-section"><a href="#Top">Top section</a></td></tr>
<tr><td></td><td class="printindex-index-entry"><a
href="#index-a_002d_002dasis"><code>a--asis</code></a></td><td> </td><td
class="printindex-index-section"><a href="#chapter">1 chapter</a></td></tr>
<tr><td></td><td class="printindex-index-entry"><a
href="#index-a_002d_002dasis-1"><code>a--asis</code></a></td><td> </td><td
class="printindex-index-section"><a href="#chapter">1 chapter</a></td></tr>
+<tr><td></td><td class="printindex-index-see-entry">aaa, <em
class="emph">See</em> bbb</td><td> </td><td
class="printindex-index-see-entry-section"></td></tr>
<tr><td colspan="4"> <hr></td></tr>
<tr><th id="chapter-2_cp_letter-B">B</th><td></td><td></td></tr>
<tr><td></td><td class="printindex-index-entry"><a
href="#index-copying-b-2"><code>b</code></a></td><td> </td><td
class="printindex-index-section"><a href="#Top">Top section</a></td></tr>
@@ -7379,6 +7386,8 @@ Menu comment
<tr><td></td><td class="printindex-index-entry"><a
href="#index-titlepage-d_002d_002defvr_005fname"><code>d--efvr_name</code></a></td><td> </td><td
class="printindex-index-section"><a href="#Top">Top section</a></td></tr>
<tr><td></td><td class="printindex-index-entry"><a
href="#index-d_002d_002defvr_005fname"><code>d--efvr_name</code></a></td><td> </td><td
class="printindex-index-section"><a href="#chapter">1 chapter</a></td></tr>
<tr><td></td><td class="printindex-index-entry"><a
href="#index-d_002d_002defvr_005fname-1"><code>d--efvr_name</code></a></td><td> </td><td
class="printindex-index-section"><a href="#chapter">1 chapter</a></td></tr>
+<tr><td></td><td class="printindex-index-entry">ddd</td><td> </td><td
class="printindex-index-see-also"><em class="emph">See also</em> ccc</td></tr>
+<tr><td></td><td class="printindex-index-entry">ddd</td><td> </td><td
class="printindex-index-see-also"><em class="emph">See also</em> ccc</td></tr>
<tr><td colspan="4"> <hr></td></tr>
<tr><th id="chapter-2_cp_letter-G">G</th><td></td><td></td></tr>
<tr><td></td><td
class="printindex-index-entry">g—gg</td><td> </td><td
class="printindex-index-section"></td></tr>
@@ -7651,8 +7660,11 @@ Menu comment
<tr><td colspan="4"> <hr></td></tr>
<tr><th id="chapter-2_fn_letter-F">F</th><td></td><td></td></tr>
<tr><td></td><td class="printindex-index-entry"><a
href="#index-f_002d_002d_002daa"><code>f---aa</code></a></td><td> </td><td
class="printindex-index-section"><a href="#chapter">1 chapter</a></td></tr>
+<tr><td></td><td class="printindex-index-see-entry"><code
class="code">f---aaa</code>, <em class="emph">See</em> <code
class="code">f---bbb</code></td><td> </td><td
class="printindex-index-see-entry-section"></td></tr>
<tr><td></td><td
class="printindex-index-entry"><code>f---bb</code></td><td> </td><td
class="printindex-index-section"></td></tr>
<tr><td></td><td class="printindex-index-entry"><a
href="#index-f_002d_002d_002dbb"><span
class="index-entry-level-1"><code>f---cc</code></span></a></td><td> </td><td
class="printindex-index-section"><a href="#chapter">1 chapter</a></td></tr>
+<tr><td></td><td
class="printindex-index-entry"><code>f---ddd</code></td><td> </td><td
class="printindex-index-see-also"><em class="emph">See also</em>
f---ccc</td></tr>
+<tr><td></td><td
class="printindex-index-entry"><code>f---ddd</code></td><td> </td><td
class="printindex-index-see-also"><em class="emph">See also</em>
f---ccc</td></tr>
<tr><td></td><td
class="printindex-index-entry"><code>f---ddd</code></td><td> </td><td
class="printindex-index-section"></td></tr>
<tr><td></td><td class="printindex-index-entry"><span
class="index-entry-level-1"><code>f---eee</code></span></td><td> </td><td
class="printindex-index-section"></td></tr>
<tr><td></td><td class="printindex-index-entry"><a
href="#index-f_002d_002d_002dddd"><span
class="index-entry-level-2"><code>ffff</code></span></a></td><td> </td><td
class="printindex-index-section"><a href="#chapter">1 chapter</a></td></tr>
diff --git a/tp/tests/layout/res_parser/formatting_nodes/chapter.html
b/tp/tests/layout/res_parser/formatting_nodes/chapter.html
index a84096efcc..8386e89a19 100644
--- a/tp/tests/layout/res_parser/formatting_nodes/chapter.html
+++ b/tp/tests/layout/res_parser/formatting_nodes/chapter.html
@@ -4411,6 +4411,7 @@ Invalid use of @':
<tr><td></td><td class="printindex-index-entry"><a
href="index.html#index-titlepage-a_002d_002dasis"><code>a--asis</code></a></td><td> </td><td
class="printindex-index-section"><a href="index.html">Top section</a></td></tr>
<tr><td></td><td class="printindex-index-entry"><a
href="#index-a_002d_002dasis"><code>a--asis</code></a></td><td> </td><td
class="printindex-index-section"><a href="#chapter">1 chapter</a></td></tr>
<tr><td></td><td class="printindex-index-entry"><a
href="#index-a_002d_002dasis-1"><code>a--asis</code></a></td><td> </td><td
class="printindex-index-section"><a href="#chapter">1 chapter</a></td></tr>
+<tr><td></td><td class="printindex-index-see-entry">aaa, <em
class="emph">See</em> bbb</td><td> </td><td
class="printindex-index-see-entry-section"></td></tr>
<tr><td colspan="4"> <hr></td></tr>
<tr><th id="chapter-1_cp_letter-B">B</th><td></td><td></td></tr>
<tr><td></td><td class="printindex-index-entry"><a
href="index.html#index-copying-b-2"><code>b</code></a></td><td> </td><td
class="printindex-index-section"><a href="index.html">Top section</a></td></tr>
@@ -4483,6 +4484,8 @@ Invalid use of @':
<tr><td></td><td class="printindex-index-entry"><a
href="index.html#index-titlepage-d_002d_002defvr_005fname"><code>d--efvr_name</code></a></td><td> </td><td
class="printindex-index-section"><a href="index.html">Top section</a></td></tr>
<tr><td></td><td class="printindex-index-entry"><a
href="#index-d_002d_002defvr_005fname"><code>d--efvr_name</code></a></td><td> </td><td
class="printindex-index-section"><a href="#chapter">1 chapter</a></td></tr>
<tr><td></td><td class="printindex-index-entry"><a
href="#index-d_002d_002defvr_005fname-1"><code>d--efvr_name</code></a></td><td> </td><td
class="printindex-index-section"><a href="#chapter">1 chapter</a></td></tr>
+<tr><td></td><td class="printindex-index-entry">ddd</td><td> </td><td
class="printindex-index-see-also"><em class="emph">See also</em> ccc</td></tr>
+<tr><td></td><td class="printindex-index-entry">ddd</td><td> </td><td
class="printindex-index-see-also"><em class="emph">See also</em> ccc</td></tr>
<tr><td colspan="4"> <hr></td></tr>
<tr><th id="chapter-1_cp_letter-G">G</th><td></td><td></td></tr>
<tr><td></td><td
class="printindex-index-entry">g—gg</td><td> </td><td
class="printindex-index-section"></td></tr>
@@ -4757,8 +4760,11 @@ Invalid use of @':
<tr><td colspan="4"> <hr></td></tr>
<tr><th id="chapter-1_fn_letter-F">F</th><td></td><td></td></tr>
<tr><td></td><td class="printindex-index-entry"><a
href="#index-f_002d_002d_002daa"><code>f---aa</code></a></td><td> </td><td
class="printindex-index-section"><a href="#chapter">1 chapter</a></td></tr>
+<tr><td></td><td class="printindex-index-see-entry"><code
class="code">f---aaa</code>, <em class="emph">See</em> <code
class="code">f---bbb</code></td><td> </td><td
class="printindex-index-see-entry-section"></td></tr>
<tr><td></td><td
class="printindex-index-entry"><code>f---bb</code></td><td> </td><td
class="printindex-index-section"></td></tr>
<tr><td></td><td class="printindex-index-entry"><a
href="#index-f_002d_002d_002dbb"><span
class="index-entry-level-1"><code>f---cc</code></span></a></td><td> </td><td
class="printindex-index-section"><a href="#chapter">1 chapter</a></td></tr>
+<tr><td></td><td
class="printindex-index-entry"><code>f---ddd</code></td><td> </td><td
class="printindex-index-see-also"><em class="emph">See also</em>
f---ccc</td></tr>
+<tr><td></td><td
class="printindex-index-entry"><code>f---ddd</code></td><td> </td><td
class="printindex-index-see-also"><em class="emph">See also</em>
f---ccc</td></tr>
<tr><td></td><td
class="printindex-index-entry"><code>f---ddd</code></td><td> </td><td
class="printindex-index-section"></td></tr>
<tr><td></td><td class="printindex-index-entry"><span
class="index-entry-level-1"><code>f---eee</code></span></td><td> </td><td
class="printindex-index-section"></td></tr>
<tr><td></td><td class="printindex-index-entry"><a
href="#index-f_002d_002d_002dddd"><span
class="index-entry-level-2"><code>ffff</code></span></a></td><td> </td><td
class="printindex-index-section"><a href="#chapter">1 chapter</a></td></tr>
diff --git a/tp/tests/layout/res_parser/formatting_nodes/chapter2.html
b/tp/tests/layout/res_parser/formatting_nodes/chapter2.html
index 66ae42f3cf..9a51e354be 100644
--- a/tp/tests/layout/res_parser/formatting_nodes/chapter2.html
+++ b/tp/tests/layout/res_parser/formatting_nodes/chapter2.html
@@ -937,6 +937,7 @@ th.sections-header-printindex {text-align:left}
<tr><td></td><td class="printindex-index-entry"><a
href="index.html#index-titlepage-a_002d_002dasis"><code>a--asis</code></a></td><td> </td><td
class="printindex-index-section"><a href="index.html">Top section</a></td></tr>
<tr><td></td><td class="printindex-index-entry"><a
href="chapter.html#index-a_002d_002dasis"><code>a--asis</code></a></td><td> </td><td
class="printindex-index-section"><a href="chapter.html">1 chapter</a></td></tr>
<tr><td></td><td class="printindex-index-entry"><a
href="chapter.html#index-a_002d_002dasis-1"><code>a--asis</code></a></td><td> </td><td
class="printindex-index-section"><a href="chapter.html">1 chapter</a></td></tr>
+<tr><td></td><td class="printindex-index-see-entry">aaa, <em
class="emph">See</em> bbb</td><td> </td><td
class="printindex-index-see-entry-section"></td></tr>
<tr><td colspan="4"> <hr></td></tr>
<tr><th id="chapter-2_cp_letter-B">B</th><td></td><td></td></tr>
<tr><td></td><td class="printindex-index-entry"><a
href="index.html#index-copying-b-2"><code>b</code></a></td><td> </td><td
class="printindex-index-section"><a href="index.html">Top section</a></td></tr>
@@ -1009,6 +1010,8 @@ th.sections-header-printindex {text-align:left}
<tr><td></td><td class="printindex-index-entry"><a
href="index.html#index-titlepage-d_002d_002defvr_005fname"><code>d--efvr_name</code></a></td><td> </td><td
class="printindex-index-section"><a href="index.html">Top section</a></td></tr>
<tr><td></td><td class="printindex-index-entry"><a
href="chapter.html#index-d_002d_002defvr_005fname"><code>d--efvr_name</code></a></td><td> </td><td
class="printindex-index-section"><a href="chapter.html">1 chapter</a></td></tr>
<tr><td></td><td class="printindex-index-entry"><a
href="chapter.html#index-d_002d_002defvr_005fname-1"><code>d--efvr_name</code></a></td><td> </td><td
class="printindex-index-section"><a href="chapter.html">1 chapter</a></td></tr>
+<tr><td></td><td class="printindex-index-entry">ddd</td><td> </td><td
class="printindex-index-see-also"><em class="emph">See also</em> ccc</td></tr>
+<tr><td></td><td class="printindex-index-entry">ddd</td><td> </td><td
class="printindex-index-see-also"><em class="emph">See also</em> ccc</td></tr>
<tr><td colspan="4"> <hr></td></tr>
<tr><th id="chapter-2_cp_letter-G">G</th><td></td><td></td></tr>
<tr><td></td><td
class="printindex-index-entry">g—gg</td><td> </td><td
class="printindex-index-section"></td></tr>
@@ -1281,8 +1284,11 @@ th.sections-header-printindex {text-align:left}
<tr><td colspan="4"> <hr></td></tr>
<tr><th id="chapter-2_fn_letter-F">F</th><td></td><td></td></tr>
<tr><td></td><td class="printindex-index-entry"><a
href="chapter.html#index-f_002d_002d_002daa"><code>f---aa</code></a></td><td> </td><td
class="printindex-index-section"><a href="chapter.html">1 chapter</a></td></tr>
+<tr><td></td><td class="printindex-index-see-entry"><code
class="code">f---aaa</code>, <em class="emph">See</em> <code
class="code">f---bbb</code></td><td> </td><td
class="printindex-index-see-entry-section"></td></tr>
<tr><td></td><td
class="printindex-index-entry"><code>f---bb</code></td><td> </td><td
class="printindex-index-section"></td></tr>
<tr><td></td><td class="printindex-index-entry"><a
href="chapter.html#index-f_002d_002d_002dbb"><span
class="index-entry-level-1"><code>f---cc</code></span></a></td><td> </td><td
class="printindex-index-section"><a href="chapter.html">1 chapter</a></td></tr>
+<tr><td></td><td
class="printindex-index-entry"><code>f---ddd</code></td><td> </td><td
class="printindex-index-see-also"><em class="emph">See also</em>
f---ccc</td></tr>
+<tr><td></td><td
class="printindex-index-entry"><code>f---ddd</code></td><td> </td><td
class="printindex-index-see-also"><em class="emph">See also</em>
f---ccc</td></tr>
<tr><td></td><td
class="printindex-index-entry"><code>f---ddd</code></td><td> </td><td
class="printindex-index-section"></td></tr>
<tr><td></td><td class="printindex-index-entry"><span
class="index-entry-level-1"><code>f---eee</code></span></td><td> </td><td
class="printindex-index-section"></td></tr>
<tr><td></td><td class="printindex-index-entry"><a
href="chapter.html#index-f_002d_002d_002dddd"><span
class="index-entry-level-2"><code>ffff</code></span></a></td><td> </td><td
class="printindex-index-section"><a href="chapter.html">1 chapter</a></td></tr>
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 bb9c42236d..675f255e2c 100644
--- a/tp/tests/layout/res_parser/formatting_numerical_entities/formatting.html
+++ b/tp/tests/layout/res_parser/formatting_numerical_entities/formatting.html
@@ -6605,6 +6605,7 @@ Invalid use of @':
<tr><td></td><td class="printindex-index-entry"><a
href="#index-titlepage-a_002d_002dasis"><code>a--asis</code></a></td><td> </td><td
class="printindex-index-section"><a href="#Top">Top section</a></td></tr>
<tr><td></td><td class="printindex-index-entry"><a
href="#index-a_002d_002dasis"><code>a--asis</code></a></td><td> </td><td
class="printindex-index-section"><a href="#chapter">1 chapter</a></td></tr>
<tr><td></td><td class="printindex-index-entry"><a
href="#index-a_002d_002dasis-1"><code>a--asis</code></a></td><td> </td><td
class="printindex-index-section"><a href="#chapter">1 chapter</a></td></tr>
+<tr><td></td><td class="printindex-index-see-entry">aaa, <em
class="emph">See</em> bbb</td><td> </td><td
class="printindex-index-see-entry-section"></td></tr>
<tr><td colspan="4"> <hr></td></tr>
<tr><th id="chapter-1_cp_letter-B">B</th><td></td><td></td></tr>
<tr><td></td><td class="printindex-index-entry"><a
href="#index-copying-b-2"><code>b</code></a></td><td> </td><td
class="printindex-index-section"><a href="#Top">Top section</a></td></tr>
@@ -6677,6 +6678,8 @@ Invalid use of @':
<tr><td></td><td class="printindex-index-entry"><a
href="#index-titlepage-d_002d_002defvr_005fname"><code>d--efvr_name</code></a></td><td> </td><td
class="printindex-index-section"><a href="#Top">Top section</a></td></tr>
<tr><td></td><td class="printindex-index-entry"><a
href="#index-d_002d_002defvr_005fname"><code>d--efvr_name</code></a></td><td> </td><td
class="printindex-index-section"><a href="#chapter">1 chapter</a></td></tr>
<tr><td></td><td class="printindex-index-entry"><a
href="#index-d_002d_002defvr_005fname-1"><code>d--efvr_name</code></a></td><td> </td><td
class="printindex-index-section"><a href="#chapter">1 chapter</a></td></tr>
+<tr><td></td><td class="printindex-index-entry">ddd</td><td> </td><td
class="printindex-index-see-also"><em class="emph">See also</em> ccc</td></tr>
+<tr><td></td><td class="printindex-index-entry">ddd</td><td> </td><td
class="printindex-index-see-also"><em class="emph">See also</em> ccc</td></tr>
<tr><td colspan="4"> <hr></td></tr>
<tr><th id="chapter-1_cp_letter-G">G</th><td></td><td></td></tr>
<tr><td></td><td
class="printindex-index-entry">g—gg</td><td> </td><td
class="printindex-index-section"></td></tr>
@@ -6951,8 +6954,11 @@ Invalid use of @':
<tr><td colspan="4"> <hr></td></tr>
<tr><th id="chapter-1_fn_letter-F">F</th><td></td><td></td></tr>
<tr><td></td><td class="printindex-index-entry"><a
href="#index-f_002d_002d_002daa"><code>f---aa</code></a></td><td> </td><td
class="printindex-index-section"><a href="#chapter">1 chapter</a></td></tr>
+<tr><td></td><td class="printindex-index-see-entry"><code
class="code">f---aaa</code>, <em class="emph">See</em> <code
class="code">f---bbb</code></td><td> </td><td
class="printindex-index-see-entry-section"></td></tr>
<tr><td></td><td
class="printindex-index-entry"><code>f---bb</code></td><td> </td><td
class="printindex-index-section"></td></tr>
<tr><td></td><td class="printindex-index-entry"><a
href="#index-f_002d_002d_002dbb"><span
class="index-entry-level-1"><code>f---cc</code></span></a></td><td> </td><td
class="printindex-index-section"><a href="#chapter">1 chapter</a></td></tr>
+<tr><td></td><td
class="printindex-index-entry"><code>f---ddd</code></td><td> </td><td
class="printindex-index-see-also"><em class="emph">See also</em>
f---ccc</td></tr>
+<tr><td></td><td
class="printindex-index-entry"><code>f---ddd</code></td><td> </td><td
class="printindex-index-see-also"><em class="emph">See also</em>
f---ccc</td></tr>
<tr><td></td><td
class="printindex-index-entry"><code>f---ddd</code></td><td> </td><td
class="printindex-index-section"></td></tr>
<tr><td></td><td class="printindex-index-entry"><span
class="index-entry-level-1"><code>f---eee</code></span></td><td> </td><td
class="printindex-index-section"></td></tr>
<tr><td></td><td class="printindex-index-entry"><a
href="#index-f_002d_002d_002dddd"><span
class="index-entry-level-2"><code>ffff</code></span></a></td><td> </td><td
class="printindex-index-section"><a href="#chapter">1 chapter</a></td></tr>
@@ -7307,6 +7313,7 @@ Menu comment
<tr><td></td><td class="printindex-index-entry"><a
href="#index-titlepage-a_002d_002dasis"><code>a--asis</code></a></td><td> </td><td
class="printindex-index-section"><a href="#Top">Top section</a></td></tr>
<tr><td></td><td class="printindex-index-entry"><a
href="#index-a_002d_002dasis"><code>a--asis</code></a></td><td> </td><td
class="printindex-index-section"><a href="#chapter">1 chapter</a></td></tr>
<tr><td></td><td class="printindex-index-entry"><a
href="#index-a_002d_002dasis-1"><code>a--asis</code></a></td><td> </td><td
class="printindex-index-section"><a href="#chapter">1 chapter</a></td></tr>
+<tr><td></td><td class="printindex-index-see-entry">aaa, <em
class="emph">See</em> bbb</td><td> </td><td
class="printindex-index-see-entry-section"></td></tr>
<tr><td colspan="4"> <hr></td></tr>
<tr><th id="chapter-2_cp_letter-B">B</th><td></td><td></td></tr>
<tr><td></td><td class="printindex-index-entry"><a
href="#index-copying-b-2"><code>b</code></a></td><td> </td><td
class="printindex-index-section"><a href="#Top">Top section</a></td></tr>
@@ -7379,6 +7386,8 @@ Menu comment
<tr><td></td><td class="printindex-index-entry"><a
href="#index-titlepage-d_002d_002defvr_005fname"><code>d--efvr_name</code></a></td><td> </td><td
class="printindex-index-section"><a href="#Top">Top section</a></td></tr>
<tr><td></td><td class="printindex-index-entry"><a
href="#index-d_002d_002defvr_005fname"><code>d--efvr_name</code></a></td><td> </td><td
class="printindex-index-section"><a href="#chapter">1 chapter</a></td></tr>
<tr><td></td><td class="printindex-index-entry"><a
href="#index-d_002d_002defvr_005fname-1"><code>d--efvr_name</code></a></td><td> </td><td
class="printindex-index-section"><a href="#chapter">1 chapter</a></td></tr>
+<tr><td></td><td class="printindex-index-entry">ddd</td><td> </td><td
class="printindex-index-see-also"><em class="emph">See also</em> ccc</td></tr>
+<tr><td></td><td class="printindex-index-entry">ddd</td><td> </td><td
class="printindex-index-see-also"><em class="emph">See also</em> ccc</td></tr>
<tr><td colspan="4"> <hr></td></tr>
<tr><th id="chapter-2_cp_letter-G">G</th><td></td><td></td></tr>
<tr><td></td><td
class="printindex-index-entry">g—gg</td><td> </td><td
class="printindex-index-section"></td></tr>
@@ -7651,8 +7660,11 @@ Menu comment
<tr><td colspan="4"> <hr></td></tr>
<tr><th id="chapter-2_fn_letter-F">F</th><td></td><td></td></tr>
<tr><td></td><td class="printindex-index-entry"><a
href="#index-f_002d_002d_002daa"><code>f---aa</code></a></td><td> </td><td
class="printindex-index-section"><a href="#chapter">1 chapter</a></td></tr>
+<tr><td></td><td class="printindex-index-see-entry"><code
class="code">f---aaa</code>, <em class="emph">See</em> <code
class="code">f---bbb</code></td><td> </td><td
class="printindex-index-see-entry-section"></td></tr>
<tr><td></td><td
class="printindex-index-entry"><code>f---bb</code></td><td> </td><td
class="printindex-index-section"></td></tr>
<tr><td></td><td class="printindex-index-entry"><a
href="#index-f_002d_002d_002dbb"><span
class="index-entry-level-1"><code>f---cc</code></span></a></td><td> </td><td
class="printindex-index-section"><a href="#chapter">1 chapter</a></td></tr>
+<tr><td></td><td
class="printindex-index-entry"><code>f---ddd</code></td><td> </td><td
class="printindex-index-see-also"><em class="emph">See also</em>
f---ccc</td></tr>
+<tr><td></td><td
class="printindex-index-entry"><code>f---ddd</code></td><td> </td><td
class="printindex-index-see-also"><em class="emph">See also</em>
f---ccc</td></tr>
<tr><td></td><td
class="printindex-index-entry"><code>f---ddd</code></td><td> </td><td
class="printindex-index-section"></td></tr>
<tr><td></td><td class="printindex-index-entry"><span
class="index-entry-level-1"><code>f---eee</code></span></td><td> </td><td
class="printindex-index-section"></td></tr>
<tr><td></td><td class="printindex-index-entry"><a
href="#index-f_002d_002d_002dddd"><span
class="index-entry-level-2"><code>ffff</code></span></a></td><td> </td><td
class="printindex-index-section"><a href="#chapter">1 chapter</a></td></tr>
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 a254bfffc0..1dd5ee4a5d 100644
--- a/tp/tests/layout/res_parser/formatting_weird_quotes/formatting.html
+++ b/tp/tests/layout/res_parser/formatting_weird_quotes/formatting.html
@@ -6605,6 +6605,7 @@ Invalid use of @':
<tr><td></td><td class="printindex-index-entry"><a
href="#index-titlepage-a_002d_002dasis"><code>a--asis</code></a></td><td> </td><td
class="printindex-index-section"><a href="#Top">Top section</a></td></tr>
<tr><td></td><td class="printindex-index-entry"><a
href="#index-a_002d_002dasis"><code>a--asis</code></a></td><td> </td><td
class="printindex-index-section"><a href="#chapter">1 chapter</a></td></tr>
<tr><td></td><td class="printindex-index-entry"><a
href="#index-a_002d_002dasis-1"><code>a--asis</code></a></td><td> </td><td
class="printindex-index-section"><a href="#chapter">1 chapter</a></td></tr>
+<tr><td></td><td class="printindex-index-see-entry">aaa, <em
class="emph">See</em> bbb</td><td> </td><td
class="printindex-index-see-entry-section"></td></tr>
<tr><td colspan="4"> <hr></td></tr>
<tr><th id="chapter-1_cp_letter-B">B</th><td></td><td></td></tr>
<tr><td></td><td class="printindex-index-entry"><a
href="#index-copying-b-2"><code>b</code></a></td><td> </td><td
class="printindex-index-section"><a href="#Top">Top section</a></td></tr>
@@ -6677,6 +6678,8 @@ Invalid use of @':
<tr><td></td><td class="printindex-index-entry"><a
href="#index-titlepage-d_002d_002defvr_005fname"><code>d--efvr_name</code></a></td><td> </td><td
class="printindex-index-section"><a href="#Top">Top section</a></td></tr>
<tr><td></td><td class="printindex-index-entry"><a
href="#index-d_002d_002defvr_005fname"><code>d--efvr_name</code></a></td><td> </td><td
class="printindex-index-section"><a href="#chapter">1 chapter</a></td></tr>
<tr><td></td><td class="printindex-index-entry"><a
href="#index-d_002d_002defvr_005fname-1"><code>d--efvr_name</code></a></td><td> </td><td
class="printindex-index-section"><a href="#chapter">1 chapter</a></td></tr>
+<tr><td></td><td class="printindex-index-entry">ddd</td><td> </td><td
class="printindex-index-see-also"><em class="emph">See also</em> ccc</td></tr>
+<tr><td></td><td class="printindex-index-entry">ddd</td><td> </td><td
class="printindex-index-see-also"><em class="emph">See also</em> ccc</td></tr>
<tr><td colspan="4"> <hr></td></tr>
<tr><th id="chapter-1_cp_letter-G">G</th><td></td><td></td></tr>
<tr><td></td><td
class="printindex-index-entry">g—gg</td><td> </td><td
class="printindex-index-section"></td></tr>
@@ -6951,8 +6954,11 @@ Invalid use of @':
<tr><td colspan="4"> <hr></td></tr>
<tr><th id="chapter-1_fn_letter-F">F</th><td></td><td></td></tr>
<tr><td></td><td class="printindex-index-entry"><a
href="#index-f_002d_002d_002daa"><code>f---aa</code></a></td><td> </td><td
class="printindex-index-section"><a href="#chapter">1 chapter</a></td></tr>
+<tr><td></td><td class="printindex-index-see-entry"><code
class="code">f---aaa</code>, <em class="emph">See</em> <code
class="code">f---bbb</code></td><td> </td><td
class="printindex-index-see-entry-section"></td></tr>
<tr><td></td><td
class="printindex-index-entry"><code>f---bb</code></td><td> </td><td
class="printindex-index-section"></td></tr>
<tr><td></td><td class="printindex-index-entry"><a
href="#index-f_002d_002d_002dbb"><span
class="index-entry-level-1"><code>f---cc</code></span></a></td><td> </td><td
class="printindex-index-section"><a href="#chapter">1 chapter</a></td></tr>
+<tr><td></td><td
class="printindex-index-entry"><code>f---ddd</code></td><td> </td><td
class="printindex-index-see-also"><em class="emph">See also</em>
f---ccc</td></tr>
+<tr><td></td><td
class="printindex-index-entry"><code>f---ddd</code></td><td> </td><td
class="printindex-index-see-also"><em class="emph">See also</em>
f---ccc</td></tr>
<tr><td></td><td
class="printindex-index-entry"><code>f---ddd</code></td><td> </td><td
class="printindex-index-section"></td></tr>
<tr><td></td><td class="printindex-index-entry"><span
class="index-entry-level-1"><code>f---eee</code></span></td><td> </td><td
class="printindex-index-section"></td></tr>
<tr><td></td><td class="printindex-index-entry"><a
href="#index-f_002d_002d_002dddd"><span
class="index-entry-level-2"><code>ffff</code></span></a></td><td> </td><td
class="printindex-index-section"><a href="#chapter">1 chapter</a></td></tr>
@@ -7307,6 +7313,7 @@ Menu comment
<tr><td></td><td class="printindex-index-entry"><a
href="#index-titlepage-a_002d_002dasis"><code>a--asis</code></a></td><td> </td><td
class="printindex-index-section"><a href="#Top">Top section</a></td></tr>
<tr><td></td><td class="printindex-index-entry"><a
href="#index-a_002d_002dasis"><code>a--asis</code></a></td><td> </td><td
class="printindex-index-section"><a href="#chapter">1 chapter</a></td></tr>
<tr><td></td><td class="printindex-index-entry"><a
href="#index-a_002d_002dasis-1"><code>a--asis</code></a></td><td> </td><td
class="printindex-index-section"><a href="#chapter">1 chapter</a></td></tr>
+<tr><td></td><td class="printindex-index-see-entry">aaa, <em
class="emph">See</em> bbb</td><td> </td><td
class="printindex-index-see-entry-section"></td></tr>
<tr><td colspan="4"> <hr></td></tr>
<tr><th id="chapter-2_cp_letter-B">B</th><td></td><td></td></tr>
<tr><td></td><td class="printindex-index-entry"><a
href="#index-copying-b-2"><code>b</code></a></td><td> </td><td
class="printindex-index-section"><a href="#Top">Top section</a></td></tr>
@@ -7379,6 +7386,8 @@ Menu comment
<tr><td></td><td class="printindex-index-entry"><a
href="#index-titlepage-d_002d_002defvr_005fname"><code>d--efvr_name</code></a></td><td> </td><td
class="printindex-index-section"><a href="#Top">Top section</a></td></tr>
<tr><td></td><td class="printindex-index-entry"><a
href="#index-d_002d_002defvr_005fname"><code>d--efvr_name</code></a></td><td> </td><td
class="printindex-index-section"><a href="#chapter">1 chapter</a></td></tr>
<tr><td></td><td class="printindex-index-entry"><a
href="#index-d_002d_002defvr_005fname-1"><code>d--efvr_name</code></a></td><td> </td><td
class="printindex-index-section"><a href="#chapter">1 chapter</a></td></tr>
+<tr><td></td><td class="printindex-index-entry">ddd</td><td> </td><td
class="printindex-index-see-also"><em class="emph">See also</em> ccc</td></tr>
+<tr><td></td><td class="printindex-index-entry">ddd</td><td> </td><td
class="printindex-index-see-also"><em class="emph">See also</em> ccc</td></tr>
<tr><td colspan="4"> <hr></td></tr>
<tr><th id="chapter-2_cp_letter-G">G</th><td></td><td></td></tr>
<tr><td></td><td
class="printindex-index-entry">g—gg</td><td> </td><td
class="printindex-index-section"></td></tr>
@@ -7651,8 +7660,11 @@ Menu comment
<tr><td colspan="4"> <hr></td></tr>
<tr><th id="chapter-2_fn_letter-F">F</th><td></td><td></td></tr>
<tr><td></td><td class="printindex-index-entry"><a
href="#index-f_002d_002d_002daa"><code>f---aa</code></a></td><td> </td><td
class="printindex-index-section"><a href="#chapter">1 chapter</a></td></tr>
+<tr><td></td><td class="printindex-index-see-entry"><code
class="code">f---aaa</code>, <em class="emph">See</em> <code
class="code">f---bbb</code></td><td> </td><td
class="printindex-index-see-entry-section"></td></tr>
<tr><td></td><td
class="printindex-index-entry"><code>f---bb</code></td><td> </td><td
class="printindex-index-section"></td></tr>
<tr><td></td><td class="printindex-index-entry"><a
href="#index-f_002d_002d_002dbb"><span
class="index-entry-level-1"><code>f---cc</code></span></a></td><td> </td><td
class="printindex-index-section"><a href="#chapter">1 chapter</a></td></tr>
+<tr><td></td><td
class="printindex-index-entry"><code>f---ddd</code></td><td> </td><td
class="printindex-index-see-also"><em class="emph">See also</em>
f---ccc</td></tr>
+<tr><td></td><td
class="printindex-index-entry"><code>f---ddd</code></td><td> </td><td
class="printindex-index-see-also"><em class="emph">See also</em>
f---ccc</td></tr>
<tr><td></td><td
class="printindex-index-entry"><code>f---ddd</code></td><td> </td><td
class="printindex-index-section"></td></tr>
<tr><td></td><td class="printindex-index-entry"><span
class="index-entry-level-1"><code>f---eee</code></span></td><td> </td><td
class="printindex-index-section"></td></tr>
<tr><td></td><td class="printindex-index-entry"><a
href="#index-f_002d_002d_002dddd"><span
class="index-entry-level-2"><code>ffff</code></span></a></td><td> </td><td
class="printindex-index-section"><a href="#chapter">1 chapter</a></td></tr>
diff --git a/tp/tests/layout/res_parser/formatting_xhtml/formatting.html
b/tp/tests/layout/res_parser/formatting_xhtml/formatting.html
index fdb621c436..adccbfef5c 100644
--- a/tp/tests/layout/res_parser/formatting_xhtml/formatting.html
+++ b/tp/tests/layout/res_parser/formatting_xhtml/formatting.html
@@ -6605,6 +6605,7 @@ Invalid use of @':
<tr><td></td><td class="printindex-index-entry"><a
href="#index-titlepage-a_002d_002dasis"><code>a--asis</code></a></td><td> </td><td
class="printindex-index-section"><a href="#Top">Top section</a></td></tr>
<tr><td></td><td class="printindex-index-entry"><a
href="#index-a_002d_002dasis"><code>a--asis</code></a></td><td> </td><td
class="printindex-index-section"><a href="#chapter">1 chapter</a></td></tr>
<tr><td></td><td class="printindex-index-entry"><a
href="#index-a_002d_002dasis-1"><code>a--asis</code></a></td><td> </td><td
class="printindex-index-section"><a href="#chapter">1 chapter</a></td></tr>
+<tr><td></td><td class="printindex-index-see-entry">aaa, <em
class="emph">See</em> bbb</td><td> </td><td
class="printindex-index-see-entry-section"></td></tr>
<tr><td colspan="4"> <hr/></td></tr>
<tr><th id="chapter-1_cp_letter-B">B</th><td></td><td></td></tr>
<tr><td></td><td class="printindex-index-entry"><a
href="#index-copying-b-2"><code>b</code></a></td><td> </td><td
class="printindex-index-section"><a href="#Top">Top section</a></td></tr>
@@ -6677,6 +6678,8 @@ Invalid use of @':
<tr><td></td><td class="printindex-index-entry"><a
href="#index-titlepage-d_002d_002defvr_005fname"><code>d--efvr_name</code></a></td><td> </td><td
class="printindex-index-section"><a href="#Top">Top section</a></td></tr>
<tr><td></td><td class="printindex-index-entry"><a
href="#index-d_002d_002defvr_005fname"><code>d--efvr_name</code></a></td><td> </td><td
class="printindex-index-section"><a href="#chapter">1 chapter</a></td></tr>
<tr><td></td><td class="printindex-index-entry"><a
href="#index-d_002d_002defvr_005fname-1"><code>d--efvr_name</code></a></td><td> </td><td
class="printindex-index-section"><a href="#chapter">1 chapter</a></td></tr>
+<tr><td></td><td class="printindex-index-entry">ddd</td><td> </td><td
class="printindex-index-see-also"><em class="emph">See also</em> ccc</td></tr>
+<tr><td></td><td class="printindex-index-entry">ddd</td><td> </td><td
class="printindex-index-see-also"><em class="emph">See also</em> ccc</td></tr>
<tr><td colspan="4"> <hr/></td></tr>
<tr><th id="chapter-1_cp_letter-G">G</th><td></td><td></td></tr>
<tr><td></td><td
class="printindex-index-entry">g—gg</td><td> </td><td
class="printindex-index-section"></td></tr>
@@ -6951,8 +6954,11 @@ Invalid use of @':
<tr><td colspan="4"> <hr/></td></tr>
<tr><th id="chapter-1_fn_letter-F">F</th><td></td><td></td></tr>
<tr><td></td><td class="printindex-index-entry"><a
href="#index-f_002d_002d_002daa"><code>f---aa</code></a></td><td> </td><td
class="printindex-index-section"><a href="#chapter">1 chapter</a></td></tr>
+<tr><td></td><td class="printindex-index-see-entry"><code
class="code">f---aaa</code>, <em class="emph">See</em> <code
class="code">f---bbb</code></td><td> </td><td
class="printindex-index-see-entry-section"></td></tr>
<tr><td></td><td
class="printindex-index-entry"><code>f---bb</code></td><td> </td><td
class="printindex-index-section"></td></tr>
<tr><td></td><td class="printindex-index-entry"><a
href="#index-f_002d_002d_002dbb"><span
class="index-entry-level-1"><code>f---cc</code></span></a></td><td> </td><td
class="printindex-index-section"><a href="#chapter">1 chapter</a></td></tr>
+<tr><td></td><td
class="printindex-index-entry"><code>f---ddd</code></td><td> </td><td
class="printindex-index-see-also"><em class="emph">See also</em>
f---ccc</td></tr>
+<tr><td></td><td
class="printindex-index-entry"><code>f---ddd</code></td><td> </td><td
class="printindex-index-see-also"><em class="emph">See also</em>
f---ccc</td></tr>
<tr><td></td><td
class="printindex-index-entry"><code>f---ddd</code></td><td> </td><td
class="printindex-index-section"></td></tr>
<tr><td></td><td class="printindex-index-entry"><span
class="index-entry-level-1"><code>f---eee</code></span></td><td> </td><td
class="printindex-index-section"></td></tr>
<tr><td></td><td class="printindex-index-entry"><a
href="#index-f_002d_002d_002dddd"><span
class="index-entry-level-2"><code>ffff</code></span></a></td><td> </td><td
class="printindex-index-section"><a href="#chapter">1 chapter</a></td></tr>
@@ -7307,6 +7313,7 @@ Menu comment
<tr><td></td><td class="printindex-index-entry"><a
href="#index-titlepage-a_002d_002dasis"><code>a--asis</code></a></td><td> </td><td
class="printindex-index-section"><a href="#Top">Top section</a></td></tr>
<tr><td></td><td class="printindex-index-entry"><a
href="#index-a_002d_002dasis"><code>a--asis</code></a></td><td> </td><td
class="printindex-index-section"><a href="#chapter">1 chapter</a></td></tr>
<tr><td></td><td class="printindex-index-entry"><a
href="#index-a_002d_002dasis-1"><code>a--asis</code></a></td><td> </td><td
class="printindex-index-section"><a href="#chapter">1 chapter</a></td></tr>
+<tr><td></td><td class="printindex-index-see-entry">aaa, <em
class="emph">See</em> bbb</td><td> </td><td
class="printindex-index-see-entry-section"></td></tr>
<tr><td colspan="4"> <hr/></td></tr>
<tr><th id="chapter-2_cp_letter-B">B</th><td></td><td></td></tr>
<tr><td></td><td class="printindex-index-entry"><a
href="#index-copying-b-2"><code>b</code></a></td><td> </td><td
class="printindex-index-section"><a href="#Top">Top section</a></td></tr>
@@ -7379,6 +7386,8 @@ Menu comment
<tr><td></td><td class="printindex-index-entry"><a
href="#index-titlepage-d_002d_002defvr_005fname"><code>d--efvr_name</code></a></td><td> </td><td
class="printindex-index-section"><a href="#Top">Top section</a></td></tr>
<tr><td></td><td class="printindex-index-entry"><a
href="#index-d_002d_002defvr_005fname"><code>d--efvr_name</code></a></td><td> </td><td
class="printindex-index-section"><a href="#chapter">1 chapter</a></td></tr>
<tr><td></td><td class="printindex-index-entry"><a
href="#index-d_002d_002defvr_005fname-1"><code>d--efvr_name</code></a></td><td> </td><td
class="printindex-index-section"><a href="#chapter">1 chapter</a></td></tr>
+<tr><td></td><td class="printindex-index-entry">ddd</td><td> </td><td
class="printindex-index-see-also"><em class="emph">See also</em> ccc</td></tr>
+<tr><td></td><td class="printindex-index-entry">ddd</td><td> </td><td
class="printindex-index-see-also"><em class="emph">See also</em> ccc</td></tr>
<tr><td colspan="4"> <hr/></td></tr>
<tr><th id="chapter-2_cp_letter-G">G</th><td></td><td></td></tr>
<tr><td></td><td
class="printindex-index-entry">g—gg</td><td> </td><td
class="printindex-index-section"></td></tr>
@@ -7651,8 +7660,11 @@ Menu comment
<tr><td colspan="4"> <hr/></td></tr>
<tr><th id="chapter-2_fn_letter-F">F</th><td></td><td></td></tr>
<tr><td></td><td class="printindex-index-entry"><a
href="#index-f_002d_002d_002daa"><code>f---aa</code></a></td><td> </td><td
class="printindex-index-section"><a href="#chapter">1 chapter</a></td></tr>
+<tr><td></td><td class="printindex-index-see-entry"><code
class="code">f---aaa</code>, <em class="emph">See</em> <code
class="code">f---bbb</code></td><td> </td><td
class="printindex-index-see-entry-section"></td></tr>
<tr><td></td><td
class="printindex-index-entry"><code>f---bb</code></td><td> </td><td
class="printindex-index-section"></td></tr>
<tr><td></td><td class="printindex-index-entry"><a
href="#index-f_002d_002d_002dbb"><span
class="index-entry-level-1"><code>f---cc</code></span></a></td><td> </td><td
class="printindex-index-section"><a href="#chapter">1 chapter</a></td></tr>
+<tr><td></td><td
class="printindex-index-entry"><code>f---ddd</code></td><td> </td><td
class="printindex-index-see-also"><em class="emph">See also</em>
f---ccc</td></tr>
+<tr><td></td><td
class="printindex-index-entry"><code>f---ddd</code></td><td> </td><td
class="printindex-index-see-also"><em class="emph">See also</em>
f---ccc</td></tr>
<tr><td></td><td
class="printindex-index-entry"><code>f---ddd</code></td><td> </td><td
class="printindex-index-section"></td></tr>
<tr><td></td><td class="printindex-index-entry"><span
class="index-entry-level-1"><code>f---eee</code></span></td><td> </td><td
class="printindex-index-section"></td></tr>
<tr><td></td><td class="printindex-index-entry"><a
href="#index-f_002d_002d_002dddd"><span
class="index-entry-level-2"><code>ffff</code></span></a></td><td> </td><td
class="printindex-index-section"><a href="#chapter">1 chapter</a></td></tr>
diff --git a/tp/tests/tex_html/res_parser/formatting_singular/chapter.html
b/tp/tests/tex_html/res_parser/formatting_singular/chapter.html
index 59821f5495..f01f1c97fd 100644
--- a/tp/tests/tex_html/res_parser/formatting_singular/chapter.html
+++ b/tp/tests/tex_html/res_parser/formatting_singular/chapter.html
@@ -4844,6 +4844,7 @@ $">
<tr><td></td><td class="printindex-index-entry"><a
href="index.htm#index-titlepage-a_002d_002dasis"><code>a--asis</code></a></td><td> </td><td
class="printindex-index-section"><a href="index.htm">Top section</a></td></tr>
<tr><td></td><td class="printindex-index-entry"><a
href="#index-a_002d_002dasis"><code>a--asis</code></a></td><td> </td><td
class="printindex-index-section"><a href="#chapter">1 chapter</a></td></tr>
<tr><td></td><td class="printindex-index-entry"><a
href="#index-a_002d_002dasis-1"><code>a--asis</code></a></td><td> </td><td
class="printindex-index-section"><a href="#chapter">1 chapter</a></td></tr>
+<tr><td></td><td class="printindex-index-see-entry">aaa, <em
class="emph">See</em> bbb</td><td> </td><td
class="printindex-index-see-entry-section"></td></tr>
<tr><td colspan="4"> <hr></td></tr>
<tr><th id="chapter-1_cp_letter-B">B</th><td></td><td></td></tr>
<tr><td></td><td class="printindex-index-entry"><a
href="#index-copying-b-2"><code>b</code></a></td><td> </td><td
class="printindex-index-section"><a href="#chapter">1 chapter</a></td></tr>
@@ -4916,6 +4917,8 @@ $">
<tr><td></td><td class="printindex-index-entry"><a
href="index.htm#index-titlepage-d_002d_002defvr_005fname"><code>d--efvr_name</code></a></td><td> </td><td
class="printindex-index-section"><a href="index.htm">Top section</a></td></tr>
<tr><td></td><td class="printindex-index-entry"><a
href="#index-d_002d_002defvr_005fname"><code>d--efvr_name</code></a></td><td> </td><td
class="printindex-index-section"><a href="#chapter">1 chapter</a></td></tr>
<tr><td></td><td class="printindex-index-entry"><a
href="#index-d_002d_002defvr_005fname-1"><code>d--efvr_name</code></a></td><td> </td><td
class="printindex-index-section"><a href="#chapter">1 chapter</a></td></tr>
+<tr><td></td><td class="printindex-index-entry">ddd</td><td> </td><td
class="printindex-index-see-also"><em class="emph">See also</em> ccc</td></tr>
+<tr><td></td><td class="printindex-index-entry">ddd</td><td> </td><td
class="printindex-index-see-also"><em class="emph">See also</em> ccc</td></tr>
<tr><td colspan="4"> <hr></td></tr>
<tr><th id="chapter-1_cp_letter-G">G</th><td></td><td></td></tr>
<tr><td></td><td
class="printindex-index-entry">g—gg</td><td> </td><td
class="printindex-index-section"></td></tr>
@@ -5190,8 +5193,11 @@ $">
<tr><td colspan="4"> <hr></td></tr>
<tr><th id="chapter-1_fn_letter-F">F</th><td></td><td></td></tr>
<tr><td></td><td class="printindex-index-entry"><a
href="#index-f_002d_002d_002daa"><code>f---aa</code></a></td><td> </td><td
class="printindex-index-section"><a href="#chapter">1 chapter</a></td></tr>
+<tr><td></td><td class="printindex-index-see-entry"><code
class="code">f---aaa</code>, <em class="emph">See</em> <code
class="code">f---bbb</code></td><td> </td><td
class="printindex-index-see-entry-section"></td></tr>
<tr><td></td><td
class="printindex-index-entry"><code>f---bb</code></td><td> </td><td
class="printindex-index-section"></td></tr>
<tr><td></td><td class="printindex-index-entry"><a
href="#index-f_002d_002d_002dbb"><span
class="index-entry-level-1"><code>f---cc</code></span></a></td><td> </td><td
class="printindex-index-section"><a href="#chapter">1 chapter</a></td></tr>
+<tr><td></td><td
class="printindex-index-entry"><code>f---ddd</code></td><td> </td><td
class="printindex-index-see-also"><em class="emph">See also</em>
f---ccc</td></tr>
+<tr><td></td><td
class="printindex-index-entry"><code>f---ddd</code></td><td> </td><td
class="printindex-index-see-also"><em class="emph">See also</em>
f---ccc</td></tr>
<tr><td></td><td
class="printindex-index-entry"><code>f---ddd</code></td><td> </td><td
class="printindex-index-section"></td></tr>
<tr><td></td><td class="printindex-index-entry"><span
class="index-entry-level-1"><code>f---eee</code></span></td><td> </td><td
class="printindex-index-section"></td></tr>
<tr><td></td><td class="printindex-index-entry"><a
href="#index-f_002d_002d_002dddd"><span
class="index-entry-level-2"><code>ffff</code></span></a></td><td> </td><td
class="printindex-index-section"><a href="#chapter">1 chapter</a></td></tr>
diff --git a/tp/tests/tex_html/res_parser/formatting_singular/chapter2.html
b/tp/tests/tex_html/res_parser/formatting_singular/chapter2.html
index c0c4bb9c44..7ade535d8a 100644
--- a/tp/tests/tex_html/res_parser/formatting_singular/chapter2.html
+++ b/tp/tests/tex_html/res_parser/formatting_singular/chapter2.html
@@ -962,6 +962,7 @@ th.sections-header-printindex {text-align:left}
<tr><td></td><td class="printindex-index-entry"><a
href="index.htm#index-titlepage-a_002d_002dasis"><code>a--asis</code></a></td><td> </td><td
class="printindex-index-section"><a href="index.htm">Top section</a></td></tr>
<tr><td></td><td class="printindex-index-entry"><a
href="chapter.html#index-a_002d_002dasis"><code>a--asis</code></a></td><td> </td><td
class="printindex-index-section"><a href="chapter.html">1 chapter</a></td></tr>
<tr><td></td><td class="printindex-index-entry"><a
href="chapter.html#index-a_002d_002dasis-1"><code>a--asis</code></a></td><td> </td><td
class="printindex-index-section"><a href="chapter.html">1 chapter</a></td></tr>
+<tr><td></td><td class="printindex-index-see-entry">aaa, <em
class="emph">See</em> bbb</td><td> </td><td
class="printindex-index-see-entry-section"></td></tr>
<tr><td colspan="4"> <hr></td></tr>
<tr><th id="chapter-2_cp_letter-B">B</th><td></td><td></td></tr>
<tr><td></td><td class="printindex-index-entry"><a
href="chapter.html#index-copying-b-2"><code>b</code></a></td><td> </td><td
class="printindex-index-section"><a href="chapter.html">1 chapter</a></td></tr>
@@ -1034,6 +1035,8 @@ th.sections-header-printindex {text-align:left}
<tr><td></td><td class="printindex-index-entry"><a
href="index.htm#index-titlepage-d_002d_002defvr_005fname"><code>d--efvr_name</code></a></td><td> </td><td
class="printindex-index-section"><a href="index.htm">Top section</a></td></tr>
<tr><td></td><td class="printindex-index-entry"><a
href="chapter.html#index-d_002d_002defvr_005fname"><code>d--efvr_name</code></a></td><td> </td><td
class="printindex-index-section"><a href="chapter.html">1 chapter</a></td></tr>
<tr><td></td><td class="printindex-index-entry"><a
href="chapter.html#index-d_002d_002defvr_005fname-1"><code>d--efvr_name</code></a></td><td> </td><td
class="printindex-index-section"><a href="chapter.html">1 chapter</a></td></tr>
+<tr><td></td><td class="printindex-index-entry">ddd</td><td> </td><td
class="printindex-index-see-also"><em class="emph">See also</em> ccc</td></tr>
+<tr><td></td><td class="printindex-index-entry">ddd</td><td> </td><td
class="printindex-index-see-also"><em class="emph">See also</em> ccc</td></tr>
<tr><td colspan="4"> <hr></td></tr>
<tr><th id="chapter-2_cp_letter-G">G</th><td></td><td></td></tr>
<tr><td></td><td
class="printindex-index-entry">g—gg</td><td> </td><td
class="printindex-index-section"></td></tr>
@@ -1306,8 +1309,11 @@ th.sections-header-printindex {text-align:left}
<tr><td colspan="4"> <hr></td></tr>
<tr><th id="chapter-2_fn_letter-F">F</th><td></td><td></td></tr>
<tr><td></td><td class="printindex-index-entry"><a
href="chapter.html#index-f_002d_002d_002daa"><code>f---aa</code></a></td><td> </td><td
class="printindex-index-section"><a href="chapter.html">1 chapter</a></td></tr>
+<tr><td></td><td class="printindex-index-see-entry"><code
class="code">f---aaa</code>, <em class="emph">See</em> <code
class="code">f---bbb</code></td><td> </td><td
class="printindex-index-see-entry-section"></td></tr>
<tr><td></td><td
class="printindex-index-entry"><code>f---bb</code></td><td> </td><td
class="printindex-index-section"></td></tr>
<tr><td></td><td class="printindex-index-entry"><a
href="chapter.html#index-f_002d_002d_002dbb"><span
class="index-entry-level-1"><code>f---cc</code></span></a></td><td> </td><td
class="printindex-index-section"><a href="chapter.html">1 chapter</a></td></tr>
+<tr><td></td><td
class="printindex-index-entry"><code>f---ddd</code></td><td> </td><td
class="printindex-index-see-also"><em class="emph">See also</em>
f---ccc</td></tr>
+<tr><td></td><td
class="printindex-index-entry"><code>f---ddd</code></td><td> </td><td
class="printindex-index-see-also"><em class="emph">See also</em>
f---ccc</td></tr>
<tr><td></td><td
class="printindex-index-entry"><code>f---ddd</code></td><td> </td><td
class="printindex-index-section"></td></tr>
<tr><td></td><td class="printindex-index-entry"><span
class="index-entry-level-1"><code>f---eee</code></span></td><td> </td><td
class="printindex-index-section"></td></tr>
<tr><td></td><td class="printindex-index-entry"><a
href="chapter.html#index-f_002d_002d_002dddd"><span
class="index-entry-level-2"><code>ffff</code></span></a></td><td> </td><td
class="printindex-index-section"><a href="chapter.html">1 chapter</a></td></tr>
- [no subject], (continued)
- [no subject], Patrice Dumas, 2022/11/08
- [no subject], Patrice Dumas, 2022/11/08
- [no subject], Patrice Dumas, 2022/11/08
- [no subject], Patrice Dumas, 2022/11/08
- [no subject], Patrice Dumas, 2022/11/08
- [no subject], Patrice Dumas, 2022/11/08
- [no subject], Patrice Dumas, 2022/11/08
- [no subject], Patrice Dumas, 2022/11/08
- [no subject], Patrice Dumas, 2022/11/08
- [no subject], Patrice Dumas, 2022/11/08
- [no subject],
Patrice Dumas <=
- [no subject], Patrice Dumas, 2022/11/08
- [no subject], Patrice Dumas, 2022/11/08
- [no subject], Patrice Dumas, 2022/11/08
- [no subject], Patrice Dumas, 2022/11/08
- [no subject], Patrice Dumas, 2022/11/08
- [no subject], Patrice Dumas, 2022/11/08
- [no subject], Patrice Dumas, 2022/11/08