texinfo-commits
[Top][All Lists]
Advanced
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

branch master updated: * tp/t/95moreindices.t: do not set TEXI2HTML, in

From: Patrice Dumas
Subject: branch master updated: * tp/t/95moreindices.t: do not set TEXI2HTML, instead set specific customization variable relevant for the test.
Date: Fri, 30 Dec 2022 09:22:02 -0500 
This is an automated email from the git hooks/post-receive script.

pertusus pushed a commit to branch master
in repository texinfo.

The following commit(s) were added to refs/heads/master by this push:
     new 981ee5e1f2 * tp/t/95moreindices.t: do not set TEXI2HTML, instead set 
specific customization variable relevant for the test.
981ee5e1f2 is described below

commit 981ee5e1f2e54a08b44a9d84b84e3239981000a8
Author: Patrice Dumas <pertusus@free.fr>
AuthorDate: Fri Dec 30 15:21:47 2022 +0100

    * tp/t/95moreindices.t: do not set TEXI2HTML, instead set specific
    customization variable relevant for the test.
    
    * tp/tests/indices/nodes_before_top_and_sections.texi: correct
    @setfilename.
---
 ChangeLog                                          |   7 +
 tp/t/95moreindices.t                               |  16 +-
 .../res_html/double_index_entry.html               |  12 +-
 .../index_no_node/res_html/Chapter-2.html          |  47 ++----
 .../index_no_node/res_html/Chapter.html            |  43 ++---
 .../moreindices/index_no_node/res_html/index.html  |  62 +++----
 .../index_no_node/res_html/index_no_node_abt.html  | 148 -----------------
 .../index_no_node/res_html/unnumbered.html         |  43 ++---
 .../moreindices/index_split/res_html/first.html    | 182 ++++++--------------
 .../moreindices/index_split/res_html/index.html    |  44 ++---
 .../index_split/res_html/index_split_abt.html      | 148 -----------------
 .../index_split/res_html/second-chapter.html       |  49 ++----
 .../index_split_nodes/res_html/first.html          |  69 +++-----
 .../index_split_nodes/res_html/index.html          |  44 ++---
 .../res_html/index_split_abt.html                  | 149 -----------------
 .../res_html/node-2-in-section-3.html              |  46 ++----
 .../res_html/node-3-in-section-3.html              |  34 +---
 .../res_html/node-in-section-3.html                |  35 ++--
 .../index_split_nodes/res_html/second-chapter.html |  35 ++--
 .../index_split_nodes/res_html/section-1.html      |  59 ++-----
 .../index_split_nodes/res_html/section-2.html      |  36 ++--
 .../index_split_nodes/res_html/section-3.html      |  47 ++----
 .../index_split_nodes/res_html/subsection-1.html   |  35 ++--
 .../index_split_nodes/res_html/subsection-2.html   |  46 ++----
 .../res_html/first-before-top.html                 | 170 +++++--------------
 .../nodes_before_top/res_html/index.html           |  36 ++--
 .../res_html/nodes_before_top_abt.html             | 148 -----------------
 .../res_html/nodes_before_top_and_sections.html    | 184 ++-------------------
 .../nodes_before_top_no_nodes/res_html/index.html  |  30 +---
 .../nodes_before_top_nodes/res_html/a-node.html    |  47 ++----
 .../nodes_before_top_nodes/res_html/another.html   |  35 ++--
 .../res_html/first-before-top.html                 |  37 ++---
 .../nodes_before_top_nodes/res_html/first.html     |  37 ++---
 .../nodes_before_top_nodes/res_html/index.html     |  36 ++--
 .../res_html/node-in-menu-before-top.html          |  30 +---
 .../res_html/nodes_before_top_abt.html             | 149 -----------------
 .../nodes_before_top_nodes/res_html/second.html    |  38 +----
 .../split_chapter_index/res_html/first.html        | 105 ++++--------
 .../split_chapter_index/res_html/index.html        |  43 ++---
 .../res_html/split_chapter_index_abt.html          | 148 -----------------
 .../indices/nodes_before_top_and_sections.texi     |   2 +-
 41 files changed, 467 insertions(+), 2244 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 9abc218200..619c4dc21a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2022-12-30  Patrice Dumas  <pertusus@free.fr>
+
+       * tp/t/95moreindices.t: do not set TEXI2HTML, instead set specific
+       customization variable relevant for the test.
+
+       * tp/tests/indices/nodes_before_top_and_sections.texi: correct
+       @setfilename.
 2022-12-29  Patrice Dumas  <pertusus@free.fr>
 
        * tp/t/test_utils.pl (test): update tree transformation names
diff --git a/tp/t/95moreindices.t b/tp/t/95moreindices.t
index 676c6191bb..eb3183a87c 100644
--- a/tp/t/95moreindices.t
+++ b/tp/t/95moreindices.t
@@ -12,11 +12,12 @@ my @test_cases = (
 ['double_index_entry',
   undef,
   {'test_file' => 'double_index_entry.texi' },
+  {'SPLIT' => '', 'USE_NODES' => 0, 'NODE_NAME_IN_INDEX', 0}
 ],
 ['split_chapter_index',
   undef,
   {'test_file' => 'split_chapter_index.texi' },
-  {'SPLIT' => 'chapter'}
+  {'SPLIT' => 'chapter', 'USE_NODES' => 0, 'NODE_NAME_IN_INDEX', 0}
 ],
 ['index_split',
   undef,
@@ -25,36 +26,35 @@ my @test_cases = (
   # It also tests for node with directions after section which is
   # also in 96moresectioning.t
   {'test_file' => 'index_split.texi', 'CHECK_NORMAL_MENU_STRUCTURE' => 1},
-  {'SPLIT' => 'chapter'}
+  {'SPLIT' => 'chapter', 'USE_NODES' => 0, 'NODE_NAME_IN_INDEX', 0}
 ],
 ['index_split_nodes',
   undef,
   {'test_file' => 'index_split.texi' },
-  {'USE_NODES' => 1, 'SPLIT' => 'nodes'}
 ],
 ['index_no_node',
   undef,
   {'test_file' => 'index_no_node.texi' },
-  {'SPLIT' => 'chapter'}
+  {'SPLIT' => 'chapter', 'USE_NODES' => 0, 'NODE_NAME_IN_INDEX', 0}
 ],
 ['nodes_before_top',
   undef,
   {'test_file' => 'nodes_before_top.texi' },
-  {'USE_NODES' => 1, 'SPLIT' => 'chapter'}
+  {'USE_NODES' => 1, 'SPLIT' => 'chapter', 'NODE_NAME_IN_INDEX', 0}
 ],
 ['nodes_before_top_nodes',
   undef,
   {'test_file' => 'nodes_before_top.texi' },
-  {'USE_NODES' => 1, 'SPLIT' => 'node'}
 ],
 ['nodes_before_top_no_nodes',
   undef,
   {'test_file' => 'nodes_before_top.texi' },
-  {'SPLIT' => 'chapter'}
+  {'SPLIT' => 'chapter', 'USE_NODES' => 0, 'NODE_NAME_IN_INDEX', 0}
 ],
 ['nodes_before_top_and_sections',
   undef,
   {'test_file' => 'nodes_before_top_and_sections.texi' },
+  {'SPLIT' => '', 'USE_NODES' => 0, 'NODE_NAME_IN_INDEX', 0}
 ],
 );
 
@@ -62,8 +62,6 @@ foreach my $test (@test_cases) {
   if (!$test->[2]->{'test_formats'}) {
     push @{$test->[2]->{'test_formats'}}, 'file_html';
   }
-  $test->[3]->{'TEXI2HTML'} = 1;
-  $test->[3]->{'TEST'} = 1;
   $test->[3]->{'PROGRAM'} = 'texi2any';
   $test->[3]->{'PACKAGE_URL'} = 'http://www.gnu.org/software/texinfo/';
 }
diff --git 
a/tp/t/results/moreindices/double_index_entry/res_html/double_index_entry.html 
b/tp/t/results/moreindices/double_index_entry/res_html/double_index_entry.html
index 4603928720..fc6d4ce1d2 100644
--- 
a/tp/t/results/moreindices/double_index_entry/res_html/double_index_entry.html
+++ 
b/tp/t/results/moreindices/double_index_entry/res_html/double_index_entry.html
@@ -15,9 +15,6 @@
 <style type="text/css">
 <!--
 a.summary-letter-printindex {text-decoration: none}
-span.program-in-footer {font-size: smaller}
-td.menu-entry-description {vertical-align: top}
-td.menu-entry-destination {vertical-align: top}
 td.printindex-index-entry {vertical-align: top}
 td.printindex-index-section {vertical-align: top; padding-left: 1em}
 th.entries-header-printindex {text-align:left}
@@ -36,10 +33,6 @@ th.sections-header-printindex {text-align:left; 
padding-left: 1em}
 </p>
 <a class="index-entry-id" id="index-aaa-1"></a>
 
-<table class="menu" border="0" cellspacing="0">
-<tr><td class="menu-entry-destination">&bull; <a href="#other-node" 
rel="index">other node</a></td><td>&nbsp;&nbsp;</td><td 
class="menu-entry-description">
-</td></tr>
-</table>
 
 <a class="node" id="other-node"></a>
 <a class="index-entry-id" id="index-aaa-2"></a>
@@ -56,10 +49,7 @@ th.sections-header-printindex {text-align:left; 
padding-left: 1em}
 </table>
 </div>
 
-<hr>
-<p>
-  <span class="program-in-footer">This document was generated on <em 
class="emph">a sunny day</em> using <a class="uref" 
href="http://www.gnu.org/software/texinfo/";><em 
class="emph">texi2any</em></a>.</span>
-</p>
+
 
 
 </body>
diff --git a/tp/t/results/moreindices/index_no_node/res_html/Chapter-2.html 
b/tp/t/results/moreindices/index_no_node/res_html/Chapter-2.html
index 83a43c2096..8e6b60e502 100644
--- a/tp/t/results/moreindices/index_no_node/res_html/Chapter-2.html
+++ b/tp/t/results/moreindices/index_no_node/res_html/Chapter-2.html
@@ -12,54 +12,29 @@
 <meta name="Generator" content="texi2any">
 <meta name="viewport" content="width=device-width,initial-scale=1">
 
-<style type="text/css">
-<!--
-span.program-in-footer {font-size: smaller}
--->
-</style>
+<link href="index.html#top-section" rel="start" title="top section">
+<link href="unnumbered.html" rel="index" title="unnumbered">
 
 
 </head>
 
 <body lang="en">
 <div class="chapter-level-extent" id="Chapter-2">
-<table class="nav-panel" cellpadding="1" cellspacing="1" border="0">
-<tr><td>[<a href="Chapter.html" title="Beginning of this chapter or previous 
chapter"> &lt;&lt; </a>]</td>
-<td>[<a href="Chapter.html" title="Previous section in reading order"> &lt; 
</a>]</td>
-<td>[ Up ]</td>
-<td>[ &gt; ]</td>
-<td>[ &gt;&gt; ]</td>
-<td> &nbsp; </td>
-<td> &nbsp; </td>
-<td> &nbsp; </td>
-<td> &nbsp; </td>
-<td>[<a href="index.html#top-section" title="Cover (top) of 
document">Top</a>]</td>
-<td>[Contents]</td>
-<td>[<a href="unnumbered.html" title="Index">Index</a>]</td>
-<td>[<a href="index_no_node_abt.html#SEC_About" title="About (help)"> ? 
</a>]</td>
-</tr></table>
-<h1 class="chapter">2 Chapter 2</h1>
+<div class="nav-panel">
+<p>
+Prev: <a href="Chapter.html" accesskey="p" rel="prev">Chapter</a> &nbsp; [<a 
href="unnumbered.html" title="Index" rel="index">Index</a>]</p>
+</div>
+<h2 class="chapter">2 Chapter 2</h2>
 
 <p>In chapter 2
 </p>
 </div>
 <hr>
-<table class="nav-panel" cellpadding="1" cellspacing="1" border="0">
-<tr><td>[<a href="Chapter.html" title="Beginning of this chapter or previous 
chapter"> &lt;&lt; </a>]</td>
-<td>[ &gt;&gt; ]</td>
-<td> &nbsp; </td>
-<td> &nbsp; </td>
-<td> &nbsp; </td>
-<td> &nbsp; </td>
-<td> &nbsp; </td>
-<td>[<a href="index.html#top-section" title="Cover (top) of 
document">Top</a>]</td>
-<td>[Contents]</td>
-<td>[<a href="unnumbered.html" title="Index">Index</a>]</td>
-<td>[<a href="index_no_node_abt.html#SEC_About" title="About (help)"> ? 
</a>]</td>
-</tr></table>
+<div class="nav-panel">
 <p>
-  <span class="program-in-footer">This document was generated on <em 
class="emph">a sunny day</em> using <a class="uref" 
href="http://www.gnu.org/software/texinfo/";><em 
class="emph">texi2any</em></a>.</span>
-</p>
+Prev: <a href="Chapter.html" accesskey="p" rel="prev">Chapter</a> &nbsp; [<a 
href="unnumbered.html" title="Index" rel="index">Index</a>]</p>
+</div>
+
 
 
 </body>
diff --git a/tp/t/results/moreindices/index_no_node/res_html/Chapter.html 
b/tp/t/results/moreindices/index_no_node/res_html/Chapter.html
index d43173b1b3..c6fa3055dc 100644
--- a/tp/t/results/moreindices/index_no_node/res_html/Chapter.html
+++ b/tp/t/results/moreindices/index_no_node/res_html/Chapter.html
@@ -12,10 +12,11 @@
 <meta name="Generator" content="texi2any">
 <meta name="viewport" content="width=device-width,initial-scale=1">
 
+<link href="index.html#top-section" rel="start" title="top section">
+<link href="unnumbered.html" rel="index" title="unnumbered">
 <style type="text/css">
 <!--
 a.summary-letter-printindex {text-decoration: none}
-span.program-in-footer {font-size: smaller}
 td.printindex-index-entry {vertical-align: top}
 td.printindex-index-section {vertical-align: top; padding-left: 1em}
 th.entries-header-printindex {text-align:left}
@@ -28,22 +29,11 @@ th.sections-header-printindex {text-align:left; 
padding-left: 1em}
 
 <body lang="en">
 <div class="chapter-level-extent" id="Chapter">
-<table class="nav-panel" cellpadding="1" cellspacing="1" border="0">
-<tr><td>[<a href="index.html#top-section" title="Beginning of this chapter or 
previous chapter"> &lt;&lt; </a>]</td>
-<td>[<a href="index.html#second" title="Previous section in reading order"> 
&lt; </a>]</td>
-<td>[ Up ]</td>
-<td>[<a href="Chapter-2.html" title="Next section in reading order"> &gt; 
</a>]</td>
-<td>[<a href="Chapter-2.html" title="Next chapter"> &gt;&gt; </a>]</td>
-<td> &nbsp; </td>
-<td> &nbsp; </td>
-<td> &nbsp; </td>
-<td> &nbsp; </td>
-<td>[<a href="index.html#top-section" title="Cover (top) of 
document">Top</a>]</td>
-<td>[Contents]</td>
-<td>[<a href="unnumbered.html" title="Index">Index</a>]</td>
-<td>[<a href="index_no_node_abt.html#SEC_About" title="About (help)"> ? 
</a>]</td>
-</tr></table>
-<h1 class="chapter">1 Chapter</h1>
+<div class="nav-panel">
+<p>
+Next: <a href="Chapter-2.html" accesskey="n" rel="next">Chapter 2</a>, Prev: 
<a href="index.html#top-section" accesskey="p" rel="prev">top section</a> 
&nbsp; [<a href="unnumbered.html" title="Index" rel="index">Index</a>]</p>
+</div>
+<h2 class="chapter">1 Chapter</h2>
 <a class="index-entry-id" id="index-chapter"></a>
 
 <div class="printindex cp-printindex">
@@ -97,22 +87,11 @@ th.sections-header-printindex {text-align:left; 
padding-left: 1em}
 </p>
 </div>
 <hr>
-<table class="nav-panel" cellpadding="1" cellspacing="1" border="0">
-<tr><td>[<a href="index.html#top-section" title="Beginning of this chapter or 
previous chapter"> &lt;&lt; </a>]</td>
-<td>[<a href="Chapter-2.html" title="Next chapter"> &gt;&gt; </a>]</td>
-<td> &nbsp; </td>
-<td> &nbsp; </td>
-<td> &nbsp; </td>
-<td> &nbsp; </td>
-<td> &nbsp; </td>
-<td>[<a href="index.html#top-section" title="Cover (top) of 
document">Top</a>]</td>
-<td>[Contents]</td>
-<td>[<a href="unnumbered.html" title="Index">Index</a>]</td>
-<td>[<a href="index_no_node_abt.html#SEC_About" title="About (help)"> ? 
</a>]</td>
-</tr></table>
+<div class="nav-panel">
 <p>
-  <span class="program-in-footer">This document was generated on <em 
class="emph">a sunny day</em> using <a class="uref" 
href="http://www.gnu.org/software/texinfo/";><em 
class="emph">texi2any</em></a>.</span>
-</p>
+Next: <a href="Chapter-2.html" accesskey="n" rel="next">Chapter 2</a>, Prev: 
<a href="index.html#top-section" accesskey="p" rel="prev">top section</a> 
&nbsp; [<a href="unnumbered.html" title="Index" rel="index">Index</a>]</p>
+</div>
+
 
 
 </body>
diff --git a/tp/t/results/moreindices/index_no_node/res_html/index.html 
b/tp/t/results/moreindices/index_no_node/res_html/index.html
index 05179cf163..d8421a1933 100644
--- a/tp/t/results/moreindices/index_no_node/res_html/index.html
+++ b/tp/t/results/moreindices/index_no_node/res_html/index.html
@@ -12,10 +12,11 @@
 <meta name="Generator" content="texi2any">
 <meta name="viewport" content="width=device-width,initial-scale=1">
 
+<link href="#top-section" rel="start" title="top section">
+<link href="unnumbered.html" rel="index" title="unnumbered">
 <style type="text/css">
 <!--
 a.summary-letter-printindex {text-decoration: none}
-span.program-in-footer {font-size: smaller}
 td.printindex-index-entry {vertical-align: top}
 td.printindex-index-section {vertical-align: top; padding-left: 1em}
 th.entries-header-printindex {text-align:left}
@@ -28,15 +29,11 @@ th.sections-header-printindex {text-align:left; 
padding-left: 1em}
 
 <body lang="en">
 <div class="unnumbered-level-extent" id="top-section">
-<table class="nav-panel" cellpadding="1" cellspacing="1" border="0">
-<tr><td>[<a href="unnumbered.html" title="Previous section in reading order"> 
&lt; </a>]</td>
-<td>[<a href="#second" title="Next section in reading order"> &gt; </a>]</td>
-<td> &nbsp; </td>
-<td>[Contents]</td>
-<td>[<a href="unnumbered.html" title="Index">Index</a>]</td>
-<td>[<a href="index_no_node_abt.html#SEC_About" title="About (help)"> ? 
</a>]</td>
-</tr></table>
-<h1 class="unnumbered top-level-set-unnumbered">top section</h1>
+<div class="nav-panel">
+<p>
+Next: <a href="Chapter.html" accesskey="n" rel="next">Chapter</a>, Prev: <a 
href="unnumbered.html" accesskey="p" rel="prev">unnumbered</a> &nbsp; [<a 
href="unnumbered.html" title="Index" rel="index">Index</a>]</p>
+</div>
+<h2 class="unnumbered top-level-set-unnumbered">top section</h2>
 
 <a class="index-entry-id" id="index-top-section"></a>
 <a class="index-entry-id" id="index-top-section-1"></a>
@@ -96,24 +93,16 @@ th.sections-header-printindex {text-align:left; 
padding-left: 1em}
 <a class="index-entry-id" id="index-top-section1"></a>
 
 
-<hr style="height: 6px;">
+<ul class="mini-toc">
+<li><a href="#second" accesskey="1">second</a></li>
+</ul>
+<hr>
 <div class="section-level-extent" id="second">
-<table class="nav-panel" cellpadding="1" cellspacing="1" border="0">
-<tr><td>[<a href="#top-section" title="Beginning of this chapter or previous 
chapter"> &lt;&lt; </a>]</td>
-<td>[<a href="#top-section" title="Previous section in reading order"> &lt; 
</a>]</td>
-<td>[<a href="#top-section" title="Up section"> Up </a>]</td>
-<td>[<a href="Chapter.html" title="Next section in reading order"> &gt; 
</a>]</td>
-<td>[<a href="Chapter.html" title="Next chapter"> &gt;&gt; </a>]</td>
-<td> &nbsp; </td>
-<td> &nbsp; </td>
-<td> &nbsp; </td>
-<td> &nbsp; </td>
-<td>[<a href="#top-section" title="Cover (top) of document">Top</a>]</td>
-<td>[Contents]</td>
-<td>[<a href="unnumbered.html" title="Index">Index</a>]</td>
-<td>[<a href="index_no_node_abt.html#SEC_About" title="About (help)"> ? 
</a>]</td>
-</tr></table>
-<h2 class="section">second</h2>
+<div class="nav-panel">
+<p>
+ Up : <a href="#top-section" accesskey="u" rel="up">top section</a> &nbsp; [<a 
href="unnumbered.html" title="Index" rel="index">Index</a>]</p>
+</div>
+<h3 class="section">second</h3>
 
 <div class="printindex cp-printindex">
 <table class="cp-letters-header-printindex"><tr><th>Jump to: &nbsp; 
</th><td><a class="summary-letter-printindex" 
href="#second_cp_letter-C"><b>C</b></a>
@@ -214,22 +203,11 @@ th.sections-header-printindex {text-align:left; 
padding-left: 1em}
 </div>
 </div>
 <hr>
-<table class="nav-panel" cellpadding="1" cellspacing="1" border="0">
-<tr><td>[<a href="#top-section" title="Beginning of this chapter or previous 
chapter"> &lt;&lt; </a>]</td>
-<td>[<a href="Chapter.html" title="Next chapter"> &gt;&gt; </a>]</td>
-<td> &nbsp; </td>
-<td> &nbsp; </td>
-<td> &nbsp; </td>
-<td> &nbsp; </td>
-<td> &nbsp; </td>
-<td>[<a href="#top-section" title="Cover (top) of document">Top</a>]</td>
-<td>[Contents]</td>
-<td>[<a href="unnumbered.html" title="Index">Index</a>]</td>
-<td>[<a href="index_no_node_abt.html#SEC_About" title="About (help)"> ? 
</a>]</td>
-</tr></table>
+<div class="nav-panel">
 <p>
-  <span class="program-in-footer">This document was generated on <em 
class="emph">a sunny day</em> using <a class="uref" 
href="http://www.gnu.org/software/texinfo/";><em 
class="emph">texi2any</em></a>.</span>
-</p>
+Next: <a href="Chapter.html" accesskey="n" rel="next">Chapter</a>, Prev: <a 
href="unnumbered.html" accesskey="p" rel="prev">unnumbered</a> &nbsp; [<a 
href="unnumbered.html" title="Index" rel="index">Index</a>]</p>
+</div>
+
 
 
 </body>
diff --git 
a/tp/t/results/moreindices/index_no_node/res_html/index_no_node_abt.html 
b/tp/t/results/moreindices/index_no_node/res_html/index_no_node_abt.html
deleted file mode 100644
index e7b2f54ce6..0000000000
--- a/tp/t/results/moreindices/index_no_node/res_html/index_no_node_abt.html
+++ /dev/null
@@ -1,148 +0,0 @@
-<!DOCTYPE html>
-<html>
-<!-- Created by texinfo, http://www.gnu.org/software/texinfo/ -->
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-<title>About This Document (top section)</title>
-
-<meta name="description" content="About This Document (top section)">
-<meta name="keywords" content="About This Document (top section)">
-<meta name="resource-type" content="document">
-<meta name="distribution" content="global">
-<meta name="Generator" content="texi2any">
-<meta name="viewport" content="width=device-width,initial-scale=1">
-
-<style type="text/css">
-<!--
-span.program-in-footer {font-size: smaller}
-td.button-direction-about {text-align:center}
-td.name-direction-about {text-align:center}
--->
-</style>
-
-
-</head>
-
-<body lang="en">
-<div class="element-about" id="SEC_About">
-<table class="nav-panel" cellpadding="1" cellspacing="1" border="0">
-<tr><td>[<a href="index.html#top-section" title="Cover (top) of 
document">Top</a>]</td>
-<td>[Contents]</td>
-<td>[<a href="unnumbered.html" title="Index">Index</a>]</td>
-<td>[<a href="#SEC_About" title="About (help)"> ? </a>]</td>
-</tr></table>
-<h1 class="about-heading">About This Document</h1>
-
-<p>
-  This document was generated on <em class="emph">a sunny day</em> using <a 
class="uref" href="http://www.gnu.org/software/texinfo/";><em 
class="emph">texi2any</em></a>.
-</p>
-<p>
-  The buttons in the navigation panels have the following meaning:
-</p>
-<table border="1">
-  <tr>
-    <th> Button </th>
-    <th> Name </th>
-    <th> Go to </th>
-    <th> From 1.2.3 go to</th>
-  </tr>
-  <tr>
-    <td class="button-direction-about"> [ &lt;&lt; ] </td>
-    <td class="name-direction-about">FastBack</td>
-    <td>Beginning of this chapter or previous chapter</td>
-    <td>1</td>
-  </tr>
-  <tr>
-    <td class="button-direction-about"> [ &lt; ] </td>
-    <td class="name-direction-about">Back</td>
-    <td>Previous section in reading order</td>
-    <td>1.2.2</td>
-  </tr>
-  <tr>
-    <td class="button-direction-about"> [ Up ] </td>
-    <td class="name-direction-about">Up</td>
-    <td>Up section</td>
-    <td>1.2</td>
-  </tr>
-  <tr>
-    <td class="button-direction-about"> [ &gt; ] </td>
-    <td class="name-direction-about">Forward</td>
-    <td>Next section in reading order</td>
-    <td>1.2.4</td>
-  </tr>
-  <tr>
-    <td class="button-direction-about"> [ &gt;&gt; ] </td>
-    <td class="name-direction-about">FastForward</td>
-    <td>Next chapter</td>
-    <td>2</td>
-  </tr>
-  <tr>
-    <td class="button-direction-about"> [Top] </td>
-    <td class="name-direction-about">Top</td>
-    <td>Cover (top) of document</td>
-    <td> &nbsp; </td>
-  </tr>
-  <tr>
-    <td class="button-direction-about"> [Contents] </td>
-    <td class="name-direction-about">Contents</td>
-    <td>Table of contents</td>
-    <td> &nbsp; </td>
-  </tr>
-  <tr>
-    <td class="button-direction-about"> [Index] </td>
-    <td class="name-direction-about">Index</td>
-    <td>Index</td>
-    <td> &nbsp; </td>
-  </tr>
-  <tr>
-    <td class="button-direction-about"> [ ? ] </td>
-    <td class="name-direction-about">About</td>
-    <td>About (help)</td>
-    <td> &nbsp; </td>
-  </tr>
-</table>
-
-<p>
-  where the <strong class="strong"> Example </strong> assumes that the current 
position is at <strong class="strong"> Subsubsection One-Two-Three </strong> of 
a document of the following structure:
-</p>
-
-<ul>
-  <li> 1. Section One
-    <ul>
-      <li>1.1 Subsection One-One
-        <ul>
-          <li>...</li>
-        </ul>
-      </li>
-      <li>1.2 Subsection One-Two
-        <ul>
-          <li>1.2.1 Subsubsection One-Two-One</li>
-          <li>1.2.2 Subsubsection One-Two-Two</li>
-          <li>1.2.3 Subsubsection One-Two-Three &nbsp; &nbsp;
-            <strong>&lt;== Current Position </strong></li>
-          <li>1.2.4 Subsubsection One-Two-Four</li>
-        </ul>
-      </li>
-      <li>1.3 Subsection One-Three
-        <ul>
-          <li>...</li>
-        </ul>
-      </li>
-      <li>1.4 Subsection One-Four</li>
-    </ul>
-  </li>
-</ul>
-</div><hr>
-<table class="nav-panel" cellpadding="1" cellspacing="1" border="0">
-<tr><td>[<a href="index.html#top-section" title="Cover (top) of 
document">Top</a>]</td>
-<td>[Contents]</td>
-<td>[<a href="unnumbered.html" title="Index">Index</a>]</td>
-<td>[<a href="#SEC_About" title="About (help)"> ? </a>]</td>
-</tr></table>
-<p>
-  <span class="program-in-footer">This document was generated on <em 
class="emph">a sunny day</em> using <a class="uref" 
href="http://www.gnu.org/software/texinfo/";><em 
class="emph">texi2any</em></a>.</span>
-</p>
-
-
-</body>
-</html>
diff --git a/tp/t/results/moreindices/index_no_node/res_html/unnumbered.html 
b/tp/t/results/moreindices/index_no_node/res_html/unnumbered.html
index 68959efa6c..ddb29ce784 100644
--- a/tp/t/results/moreindices/index_no_node/res_html/unnumbered.html
+++ b/tp/t/results/moreindices/index_no_node/res_html/unnumbered.html
@@ -12,10 +12,11 @@
 <meta name="Generator" content="texi2any">
 <meta name="viewport" content="width=device-width,initial-scale=1">
 
+<link href="index.html#top-section" rel="start" title="top section">
+<link href="#unnumbered" rel="index" title="unnumbered">
 <style type="text/css">
 <!--
 a.summary-letter-printindex {text-decoration: none}
-span.program-in-footer {font-size: smaller}
 td.printindex-index-entry {vertical-align: top}
 td.printindex-index-section {vertical-align: top; padding-left: 1em}
 th.entries-header-printindex {text-align:left}
@@ -79,22 +80,11 @@ th.sections-header-printindex {text-align:left; 
padding-left: 1em}
 
 
 <div class="unnumbered-level-extent" id="unnumbered">
-<table class="nav-panel" cellpadding="1" cellspacing="1" border="0">
-<tr><td>[ &lt;&lt; ]</td>
-<td>[ &lt; ]</td>
-<td>[ Up ]</td>
-<td>[<a href="index.html#top-section" title="Next section in reading order"> 
&gt; </a>]</td>
-<td>[<a href="index.html#top-section" title="Next chapter"> &gt;&gt; </a>]</td>
-<td> &nbsp; </td>
-<td> &nbsp; </td>
-<td> &nbsp; </td>
-<td> &nbsp; </td>
-<td>[<a href="index.html#top-section" title="Cover (top) of 
document">Top</a>]</td>
-<td>[Contents]</td>
-<td>[<a href="#unnumbered" title="Index">Index</a>]</td>
-<td>[<a href="index_no_node_abt.html#SEC_About" title="About (help)"> ? 
</a>]</td>
-</tr></table>
-<h1 class="unnumbered">unnumbered</h1>
+<div class="nav-panel">
+<p>
+Next: <a href="index.html#top-section" accesskey="n" rel="next">top 
section</a> &nbsp; [<a href="#unnumbered" title="Index" 
rel="index">Index</a>]</p>
+</div>
+<h2 class="unnumbered">unnumbered</h2>
 
 <a class="index-entry-id" id="index-unnumbered"></a>
 <p>in unnumbered
@@ -149,22 +139,11 @@ th.sections-header-printindex {text-align:left; 
padding-left: 1em}
 
 </div>
 <hr>
-<table class="nav-panel" cellpadding="1" cellspacing="1" border="0">
-<tr><td>[ &lt;&lt; ]</td>
-<td>[<a href="index.html#top-section" title="Next chapter"> &gt;&gt; </a>]</td>
-<td> &nbsp; </td>
-<td> &nbsp; </td>
-<td> &nbsp; </td>
-<td> &nbsp; </td>
-<td> &nbsp; </td>
-<td>[<a href="index.html#top-section" title="Cover (top) of 
document">Top</a>]</td>
-<td>[Contents]</td>
-<td>[<a href="#unnumbered" title="Index">Index</a>]</td>
-<td>[<a href="index_no_node_abt.html#SEC_About" title="About (help)"> ? 
</a>]</td>
-</tr></table>
+<div class="nav-panel">
 <p>
-  <span class="program-in-footer">This document was generated on <em 
class="emph">a sunny day</em> using <a class="uref" 
href="http://www.gnu.org/software/texinfo/";><em 
class="emph">texi2any</em></a>.</span>
-</p>
+Next: <a href="index.html#top-section" accesskey="n" rel="next">top 
section</a> &nbsp; [<a href="#unnumbered" title="Index" 
rel="index">Index</a>]</p>
+</div>
+
 
 
 </body>
diff --git a/tp/t/results/moreindices/index_split/res_html/first.html 
b/tp/t/results/moreindices/index_split/res_html/first.html
index 5209ce1c1c..432199763a 100644
--- a/tp/t/results/moreindices/index_split/res_html/first.html
+++ b/tp/t/results/moreindices/index_split/res_html/first.html
@@ -12,12 +12,14 @@
 <meta name="Generator" content="texi2any">
 <meta name="viewport" content="width=device-width,initial-scale=1">
 
+<link href="index.html" rel="start" title="split indices">
+<link href="index.html" rel="index" title="split indices">
+<link href="index.html" rel="up" title="split indices">
+<link href="second-chapter.html" rel="next" title="2 Second chapter">
+<link href="index.html" rel="prev" title="split indices">
 <style type="text/css">
 <!--
 a.summary-letter-printindex {text-decoration: none}
-span.program-in-footer {font-size: smaller}
-td.menu-entry-description {vertical-align: top}
-td.menu-entry-destination {vertical-align: top}
 td.printindex-index-entry {vertical-align: top}
 td.printindex-index-section {vertical-align: top; padding-left: 1em}
 th.entries-header-printindex {text-align:left}
@@ -30,21 +32,10 @@ th.sections-header-printindex {text-align:left; 
padding-left: 1em}
 
 <body lang="en">
 <div class="chapter-level-extent" id="first">
-<table class="nav-panel" cellpadding="1" cellspacing="1" border="0">
-<tr><td>[<a href="index.html" title="Beginning of this chapter or previous 
chapter"> &lt;&lt; </a>]</td>
-<td>[<a href="index.html" title="Previous section in reading order"> &lt; 
</a>]</td>
-<td>[<a href="index.html" title="Up section"> Up </a>]</td>
-<td>[<a href="#section-1" title="Next section in reading order"> &gt; 
</a>]</td>
-<td>[<a href="second-chapter.html" title="Next chapter"> &gt;&gt; </a>]</td>
-<td> &nbsp; </td>
-<td> &nbsp; </td>
-<td> &nbsp; </td>
-<td> &nbsp; </td>
-<td>[<a href="index.html" title="Cover (top) of document">Top</a>]</td>
-<td>[Contents]</td>
-<td>[<a href="index.html" title="Index">Index</a>]</td>
-<td>[<a href="index_split_abt.html#SEC_About" title="About (help)"> ? 
</a>]</td>
-</tr></table>
+<div class="nav-panel">
+<p>
+Next: <a href="second-chapter.html" accesskey="n" rel="next">Second 
chapter</a>,  Up : <a href="index.html" accesskey="u" rel="up">split 
indices</a> &nbsp; [<a href="index.html" title="Index" 
rel="index">Index</a>]</p>
+</div>
 
 <p>Text and then index entries
 <a class="index-entry-id" id="index-entry-in-node"></a>
@@ -153,53 +144,27 @@ th.sections-header-printindex {text-align:left; 
padding-left: 1em}
 
 <a class="index-entry-id" id="index-entry-after-printindex"></a>
 
-<h1 class="chapter" id="First-chapter">1 First chapter</h1>
+<h2 class="chapter" id="First-chapter">1 First chapter</h2>
 <a class="index-entry-id" id="index-a-function"></a>
 <a class="index-entry-id" id="index-a-concept-in-first"></a>
 <a class="index-entry-id" id="index-somewhere"></a>
 
-<table class="menu" border="0" cellspacing="0">
-<tr><td class="menu-entry-destination"><a href="#section-1" rel="index">1.1 
Section 1</a></td><td>&nbsp;&nbsp;</td><td class="menu-entry-description">
-</td></tr>
-<tr><td class="menu-entry-destination"><a href="#section-2">1.2 Section 
2</a></td><td>&nbsp;&nbsp;</td><td class="menu-entry-description">
-</td></tr>
-<tr><td class="menu-entry-destination"><a href="#section-3" rel="index">1.3 
Section 3</a></td><td>&nbsp;&nbsp;</td><td class="menu-entry-description">
-</td></tr>
-<tr><td class="menu-entry-destination">&bull; <a 
href="#node-in-section-3">node in section 3</a></td><td>&nbsp;&nbsp;</td><td 
class="menu-entry-description">
-</td></tr>
-<tr><td class="menu-entry-destination">&bull; <a href="#node-2-in-section-3" 
rel="index">node 2 in section 3</a></td><td>&nbsp;&nbsp;</td><td 
class="menu-entry-description">
-</td></tr>
-<tr><td class="menu-entry-destination">&bull; <a 
href="#node-3-in-section-3">node 3 in section 
3</a></td><td>&nbsp;&nbsp;</td><td class="menu-entry-description">
-</td></tr>
-</table>
 
+<ul class="mini-toc">
+<li><a href="#section-1" accesskey="1">Section 1</a></li>
+<li><a href="#section-2" accesskey="2">Section 2</a></li>
+<li><a href="#section-3" accesskey="3">Section 3</a></li>
+</ul>
 <hr>
 <div class="section-level-extent" id="section-1">
-<table class="nav-panel" cellpadding="1" cellspacing="1" border="0">
-<tr><td>[<a href="#first" title="Beginning of this chapter or previous 
chapter"> &lt;&lt; </a>]</td>
-<td>[<a href="#first" title="Previous section in reading order"> &lt; 
</a>]</td>
-<td>[<a href="#first" title="Up section"> Up </a>]</td>
-<td>[<a href="#subsection-1" title="Next section in reading order"> &gt; 
</a>]</td>
-<td>[<a href="second-chapter.html" title="Next chapter"> &gt;&gt; </a>]</td>
-<td> &nbsp; </td>
-<td> &nbsp; </td>
-<td> &nbsp; </td>
-<td> &nbsp; </td>
-<td>[<a href="index.html" title="Cover (top) of document">Top</a>]</td>
-<td>[Contents]</td>
-<td>[<a href="index.html" title="Index">Index</a>]</td>
-<td>[<a href="index_split_abt.html#SEC_About" title="About (help)"> ? 
</a>]</td>
-</tr></table>
-<h2 class="section" id="Section-1">1.1 Section 1</h2>
+<div class="nav-panel">
+<p>
+Next: <a href="#section-2" accesskey="n" rel="next">Section 2</a>,  Up : <a 
href="#first" accesskey="u" rel="up">First chapter</a> &nbsp; [<a 
href="index.html" title="Index" rel="index">Index</a>]</p>
+</div>
+<h3 class="section" id="Section-1">1.1 Section 1</h3>
 
 <a class="index-entry-id" id="index-something"></a>
 
-<table class="menu" border="0" cellspacing="0">
-<tr><td class="menu-entry-destination"><a href="#subsection-1">1.1.1 
Subsection 1</a></td><td>&nbsp;&nbsp;</td><td class="menu-entry-description">
-</td></tr>
-<tr><td class="menu-entry-destination"><a href="#subsection-2" 
rel="index">1.1.2 Subsection 2</a></td><td>&nbsp;&nbsp;</td><td 
class="menu-entry-description">
-</td></tr>
-</table>
 <p>The index once more
 </p>
 <div class="printindex cp-printindex">
@@ -273,46 +238,28 @@ th.sections-header-printindex {text-align:left; 
padding-left: 1em}
 
 <a class="index-entry-id" id="index-another"></a>
 
+<ul class="mini-toc">
+<li><a href="#subsection-1" accesskey="1">Subsection 1</a></li>
+<li><a href="#subsection-2" accesskey="2">Subsection 2</a></li>
+</ul>
 <hr>
 <div class="subsection-level-extent" id="subsection-1">
-<table class="nav-panel" cellpadding="1" cellspacing="1" border="0">
-<tr><td>[<a href="#first" title="Beginning of this chapter or previous 
chapter"> &lt;&lt; </a>]</td>
-<td>[<a href="#section-1" title="Previous section in reading order"> &lt; 
</a>]</td>
-<td>[<a href="#section-1" title="Up section"> Up </a>]</td>
-<td>[<a href="#subsection-2" title="Next section in reading order"> &gt; 
</a>]</td>
-<td>[<a href="second-chapter.html" title="Next chapter"> &gt;&gt; </a>]</td>
-<td> &nbsp; </td>
-<td> &nbsp; </td>
-<td> &nbsp; </td>
-<td> &nbsp; </td>
-<td>[<a href="index.html" title="Cover (top) of document">Top</a>]</td>
-<td>[Contents]</td>
-<td>[<a href="index.html" title="Index">Index</a>]</td>
-<td>[<a href="index_split_abt.html#SEC_About" title="About (help)"> ? 
</a>]</td>
-</tr></table>
-<h3 class="subsection" id="Subsection-1">1.1.1 Subsection 1</h3>
+<div class="nav-panel">
+<p>
+Next: <a href="#subsection-2" accesskey="n" rel="next">Subsection 2</a>,  Up : 
<a href="#section-1" accesskey="u" rel="up">Section 1</a> &nbsp; [<a 
href="index.html" title="Index" rel="index">Index</a>]</p>
+</div>
+<h4 class="subsection" id="Subsection-1">1.1.1 Subsection 1</h4>
 
 <p>In subsection 1
 </p>
 <hr>
 </div>
 <div class="subsection-level-extent" id="subsection-2">
-<table class="nav-panel" cellpadding="1" cellspacing="1" border="0">
-<tr><td>[<a href="#first" title="Beginning of this chapter or previous 
chapter"> &lt;&lt; </a>]</td>
-<td>[<a href="#subsection-1" title="Previous section in reading order"> &lt; 
</a>]</td>
-<td>[<a href="#section-1" title="Up section"> Up </a>]</td>
-<td>[<a href="#section-2" title="Next section in reading order"> &gt; 
</a>]</td>
-<td>[<a href="second-chapter.html" title="Next chapter"> &gt;&gt; </a>]</td>
-<td> &nbsp; </td>
-<td> &nbsp; </td>
-<td> &nbsp; </td>
-<td> &nbsp; </td>
-<td>[<a href="index.html" title="Cover (top) of document">Top</a>]</td>
-<td>[Contents]</td>
-<td>[<a href="index.html" title="Index">Index</a>]</td>
-<td>[<a href="index_split_abt.html#SEC_About" title="About (help)"> ? 
</a>]</td>
-</tr></table>
-<h3 class="subsection" id="Subsection-2">1.1.2 Subsection 2</h3>
+<div class="nav-panel">
+<p>
+Prev: <a href="#subsection-1" accesskey="p" rel="prev">Subsection 1</a>,  Up : 
<a href="#section-1" accesskey="u" rel="up">Section 1</a> &nbsp; [<a 
href="index.html" title="Index" rel="index">Index</a>]</p>
+</div>
+<h4 class="subsection" id="Subsection-2">1.1.2 Subsection 2</h4>
 
 <p>index in subsction 2
 </p>
@@ -393,44 +340,22 @@ th.sections-header-printindex {text-align:left; 
padding-left: 1em}
 </div>
 </div>
 <div class="section-level-extent" id="section-2">
-<table class="nav-panel" cellpadding="1" cellspacing="1" border="0">
-<tr><td>[<a href="#first" title="Beginning of this chapter or previous 
chapter"> &lt;&lt; </a>]</td>
-<td>[<a href="#subsection-2" title="Previous section in reading order"> &lt; 
</a>]</td>
-<td>[<a href="#first" title="Up section"> Up </a>]</td>
-<td>[<a href="#section-3" title="Next section in reading order"> &gt; 
</a>]</td>
-<td>[<a href="second-chapter.html" title="Next chapter"> &gt;&gt; </a>]</td>
-<td> &nbsp; </td>
-<td> &nbsp; </td>
-<td> &nbsp; </td>
-<td> &nbsp; </td>
-<td>[<a href="index.html" title="Cover (top) of document">Top</a>]</td>
-<td>[Contents]</td>
-<td>[<a href="index.html" title="Index">Index</a>]</td>
-<td>[<a href="index_split_abt.html#SEC_About" title="About (help)"> ? 
</a>]</td>
-</tr></table>
-<h2 class="section" id="Section-2">1.2 Section 2</h2>
+<div class="nav-panel">
+<p>
+Next: <a href="#section-3" accesskey="n" rel="next">Section 3</a>, Prev: <a 
href="#section-1" accesskey="p" rel="prev">Section 1</a>,  Up : <a 
href="#first" accesskey="u" rel="up">First chapter</a> &nbsp; [<a 
href="index.html" title="Index" rel="index">Index</a>]</p>
+</div>
+<h3 class="section" id="Section-2">1.2 Section 2</h3>
 
 <p>Section 2
 </p>
 <hr>
 </div>
 <div class="section-level-extent" id="section-3">
-<table class="nav-panel" cellpadding="1" cellspacing="1" border="0">
-<tr><td>[<a href="#first" title="Beginning of this chapter or previous 
chapter"> &lt;&lt; </a>]</td>
-<td>[<a href="#section-2" title="Previous section in reading order"> &lt; 
</a>]</td>
-<td>[<a href="#first" title="Up section"> Up </a>]</td>
-<td>[<a href="second-chapter.html" title="Next section in reading order"> &gt; 
</a>]</td>
-<td>[<a href="second-chapter.html" title="Next chapter"> &gt;&gt; </a>]</td>
-<td> &nbsp; </td>
-<td> &nbsp; </td>
-<td> &nbsp; </td>
-<td> &nbsp; </td>
-<td>[<a href="index.html" title="Cover (top) of document">Top</a>]</td>
-<td>[Contents]</td>
-<td>[<a href="index.html" title="Index">Index</a>]</td>
-<td>[<a href="index_split_abt.html#SEC_About" title="About (help)"> ? 
</a>]</td>
-</tr></table>
-<h2 class="section" id="Section-3">1.3 Section 3</h2>
+<div class="nav-panel">
+<p>
+Prev: <a href="#section-2" accesskey="p" rel="prev">Section 2</a>,  Up : <a 
href="#first" accesskey="u" rel="up">First chapter</a> &nbsp; [<a 
href="index.html" title="Index" rel="index">Index</a>]</p>
+</div>
+<h3 class="section" id="Section-3">1.3 Section 3</h3>
 
 <a class="index-entry-id" id="index-section-3"></a>
 
@@ -659,22 +584,11 @@ th.sections-header-printindex {text-align:left; 
padding-left: 1em}
 </div>
 </div>
 <hr>
-<table class="nav-panel" cellpadding="1" cellspacing="1" border="0">
-<tr><td>[<a href="#first" title="Beginning of this chapter or previous 
chapter"> &lt;&lt; </a>]</td>
-<td>[<a href="second-chapter.html" title="Next chapter"> &gt;&gt; </a>]</td>
-<td> &nbsp; </td>
-<td> &nbsp; </td>
-<td> &nbsp; </td>
-<td> &nbsp; </td>
-<td> &nbsp; </td>
-<td>[<a href="index.html" title="Cover (top) of document">Top</a>]</td>
-<td>[Contents]</td>
-<td>[<a href="index.html" title="Index">Index</a>]</td>
-<td>[<a href="index_split_abt.html#SEC_About" title="About (help)"> ? 
</a>]</td>
-</tr></table>
+<div class="nav-panel">
 <p>
-  <span class="program-in-footer">This document was generated on <em 
class="emph">a sunny day</em> using <a class="uref" 
href="http://www.gnu.org/software/texinfo/";><em 
class="emph">texi2any</em></a>.</span>
-</p>
+Next: <a href="second-chapter.html" accesskey="n" rel="next">Second 
chapter</a>,  Up : <a href="index.html" accesskey="u" rel="up">split 
indices</a> &nbsp; [<a href="index.html" title="Index" 
rel="index">Index</a>]</p>
+</div>
+
 
 
 </body>
diff --git a/tp/t/results/moreindices/index_split/res_html/index.html 
b/tp/t/results/moreindices/index_split/res_html/index.html
index 23aa73b3c6..b8bb13b254 100644
--- a/tp/t/results/moreindices/index_split/res_html/index.html
+++ b/tp/t/results/moreindices/index_split/res_html/index.html
@@ -12,12 +12,12 @@
 <meta name="Generator" content="texi2any">
 <meta name="viewport" content="width=device-width,initial-scale=1">
 
+<link href="#Top" rel="start" title="split indices">
+<link href="#Top" rel="index" title="split indices">
+<link href="first.html#first" rel="next" title="1 First chapter">
 <style type="text/css">
 <!--
 a.summary-letter-printindex {text-decoration: none}
-span.program-in-footer {font-size: smaller}
-td.menu-entry-description {vertical-align: top}
-td.menu-entry-destination {vertical-align: top}
 td.printindex-index-entry {vertical-align: top}
 td.printindex-index-section {vertical-align: top; padding-left: 1em}
 th.entries-header-printindex {text-align:left}
@@ -30,14 +30,10 @@ th.sections-header-printindex {text-align:left; 
padding-left: 1em}
 
 <body lang="en">
 <div class="top-level-extent" id="Top">
-<table class="nav-panel" cellpadding="1" cellspacing="1" border="0">
-<tr><td>[ &lt; ]</td>
-<td>[<a href="first.html#first" title="Next section in reading order"> &gt; 
</a>]</td>
-<td> &nbsp; </td>
-<td>[Contents]</td>
-<td>[<a href="#Top" title="Index">Index</a>]</td>
-<td>[<a href="index_split_abt.html#SEC_About" title="About (help)"> ? 
</a>]</td>
-</tr></table>
+<div class="nav-panel">
+<p>
+ &nbsp; [<a href="#Top" title="Index" rel="index">Index</a>]</p>
+</div>
 <h1 class="top" id="split-indices">split indices</h1>
 <a class="index-entry-id" id="index-entry-a"></a>
 
@@ -211,28 +207,18 @@ th.sections-header-printindex {text-align:left; 
padding-left: 1em}
 </td></tr></table>
 </div>
 
-<table class="menu" border="0" cellspacing="0">
-<tr><td class="menu-entry-destination"><a href="#Top" rel="index">split 
indices</a></td><td>&nbsp;&nbsp;</td><td class="menu-entry-description">back to 
the current top node
-</td></tr>
-<tr><td class="menu-entry-destination"><a href="first.html#first" 
rel="index">1 First chapter</a></td><td>&nbsp;&nbsp;</td><td 
class="menu-entry-description">
-</td></tr>
-<tr><td class="menu-entry-destination"><a href="second-chapter.html">2 Second 
chapter</a></td><td>&nbsp;&nbsp;</td><td class="menu-entry-description">
-</td></tr>
-</table>
 
+<ul class="mini-toc">
+<li><a href="first.html#first" accesskey="1">First chapter</a></li>
+<li><a href="second-chapter.html" accesskey="2">Second chapter</a></li>
+</ul>
 </div>
 <hr>
-<table class="nav-panel" cellpadding="1" cellspacing="1" border="0">
-<tr><td>[ &lt; ]</td>
-<td>[<a href="first.html#first" title="Next section in reading order"> &gt; 
</a>]</td>
-<td> &nbsp; </td>
-<td>[Contents]</td>
-<td>[<a href="#Top" title="Index">Index</a>]</td>
-<td>[<a href="index_split_abt.html#SEC_About" title="About (help)"> ? 
</a>]</td>
-</tr></table>
+<div class="nav-panel">
 <p>
-  <span class="program-in-footer">This document was generated on <em 
class="emph">a sunny day</em> using <a class="uref" 
href="http://www.gnu.org/software/texinfo/";><em 
class="emph">texi2any</em></a>.</span>
-</p>
+ &nbsp; [<a href="#Top" title="Index" rel="index">Index</a>]</p>
+</div>
+
 
 
 </body>
diff --git a/tp/t/results/moreindices/index_split/res_html/index_split_abt.html 
b/tp/t/results/moreindices/index_split/res_html/index_split_abt.html
deleted file mode 100644
index bddda00f8b..0000000000
--- a/tp/t/results/moreindices/index_split/res_html/index_split_abt.html
+++ /dev/null
@@ -1,148 +0,0 @@
-<!DOCTYPE html>
-<html>
-<!-- Created by texinfo, http://www.gnu.org/software/texinfo/ -->
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-<title>About This Document (split indices)</title>
-
-<meta name="description" content="About This Document (split indices)">
-<meta name="keywords" content="About This Document (split indices)">
-<meta name="resource-type" content="document">
-<meta name="distribution" content="global">
-<meta name="Generator" content="texi2any">
-<meta name="viewport" content="width=device-width,initial-scale=1">
-
-<style type="text/css">
-<!--
-span.program-in-footer {font-size: smaller}
-td.button-direction-about {text-align:center}
-td.name-direction-about {text-align:center}
--->
-</style>
-
-
-</head>
-
-<body lang="en">
-<div class="element-about" id="SEC_About">
-<table class="nav-panel" cellpadding="1" cellspacing="1" border="0">
-<tr><td>[<a href="index.html" title="Cover (top) of document">Top</a>]</td>
-<td>[Contents]</td>
-<td>[<a href="index.html" title="Index">Index</a>]</td>
-<td>[<a href="#SEC_About" title="About (help)"> ? </a>]</td>
-</tr></table>
-<h1 class="about-heading">About This Document</h1>
-
-<p>
-  This document was generated on <em class="emph">a sunny day</em> using <a 
class="uref" href="http://www.gnu.org/software/texinfo/";><em 
class="emph">texi2any</em></a>.
-</p>
-<p>
-  The buttons in the navigation panels have the following meaning:
-</p>
-<table border="1">
-  <tr>
-    <th> Button </th>
-    <th> Name </th>
-    <th> Go to </th>
-    <th> From 1.2.3 go to</th>
-  </tr>
-  <tr>
-    <td class="button-direction-about"> [ &lt;&lt; ] </td>
-    <td class="name-direction-about">FastBack</td>
-    <td>Beginning of this chapter or previous chapter</td>
-    <td>1</td>
-  </tr>
-  <tr>
-    <td class="button-direction-about"> [ &lt; ] </td>
-    <td class="name-direction-about">Back</td>
-    <td>Previous section in reading order</td>
-    <td>1.2.2</td>
-  </tr>
-  <tr>
-    <td class="button-direction-about"> [ Up ] </td>
-    <td class="name-direction-about">Up</td>
-    <td>Up section</td>
-    <td>1.2</td>
-  </tr>
-  <tr>
-    <td class="button-direction-about"> [ &gt; ] </td>
-    <td class="name-direction-about">Forward</td>
-    <td>Next section in reading order</td>
-    <td>1.2.4</td>
-  </tr>
-  <tr>
-    <td class="button-direction-about"> [ &gt;&gt; ] </td>
-    <td class="name-direction-about">FastForward</td>
-    <td>Next chapter</td>
-    <td>2</td>
-  </tr>
-  <tr>
-    <td class="button-direction-about"> [Top] </td>
-    <td class="name-direction-about">Top</td>
-    <td>Cover (top) of document</td>
-    <td> &nbsp; </td>
-  </tr>
-  <tr>
-    <td class="button-direction-about"> [Contents] </td>
-    <td class="name-direction-about">Contents</td>
-    <td>Table of contents</td>
-    <td> &nbsp; </td>
-  </tr>
-  <tr>
-    <td class="button-direction-about"> [Index] </td>
-    <td class="name-direction-about">Index</td>
-    <td>Index</td>
-    <td> &nbsp; </td>
-  </tr>
-  <tr>
-    <td class="button-direction-about"> [ ? ] </td>
-    <td class="name-direction-about">About</td>
-    <td>About (help)</td>
-    <td> &nbsp; </td>
-  </tr>
-</table>
-
-<p>
-  where the <strong class="strong"> Example </strong> assumes that the current 
position is at <strong class="strong"> Subsubsection One-Two-Three </strong> of 
a document of the following structure:
-</p>
-
-<ul>
-  <li> 1. Section One
-    <ul>
-      <li>1.1 Subsection One-One
-        <ul>
-          <li>...</li>
-        </ul>
-      </li>
-      <li>1.2 Subsection One-Two
-        <ul>
-          <li>1.2.1 Subsubsection One-Two-One</li>
-          <li>1.2.2 Subsubsection One-Two-Two</li>
-          <li>1.2.3 Subsubsection One-Two-Three &nbsp; &nbsp;
-            <strong>&lt;== Current Position </strong></li>
-          <li>1.2.4 Subsubsection One-Two-Four</li>
-        </ul>
-      </li>
-      <li>1.3 Subsection One-Three
-        <ul>
-          <li>...</li>
-        </ul>
-      </li>
-      <li>1.4 Subsection One-Four</li>
-    </ul>
-  </li>
-</ul>
-</div><hr>
-<table class="nav-panel" cellpadding="1" cellspacing="1" border="0">
-<tr><td>[<a href="index.html" title="Cover (top) of document">Top</a>]</td>
-<td>[Contents]</td>
-<td>[<a href="index.html" title="Index">Index</a>]</td>
-<td>[<a href="#SEC_About" title="About (help)"> ? </a>]</td>
-</tr></table>
-<p>
-  <span class="program-in-footer">This document was generated on <em 
class="emph">a sunny day</em> using <a class="uref" 
href="http://www.gnu.org/software/texinfo/";><em 
class="emph">texi2any</em></a>.</span>
-</p>
-
-
-</body>
-</html>
diff --git a/tp/t/results/moreindices/index_split/res_html/second-chapter.html 
b/tp/t/results/moreindices/index_split/res_html/second-chapter.html
index 52152c2b6e..aea58ee368 100644
--- a/tp/t/results/moreindices/index_split/res_html/second-chapter.html
+++ b/tp/t/results/moreindices/index_split/res_html/second-chapter.html
@@ -12,54 +12,31 @@
 <meta name="Generator" content="texi2any">
 <meta name="viewport" content="width=device-width,initial-scale=1">
 
-<style type="text/css">
-<!--
-span.program-in-footer {font-size: smaller}
--->
-</style>
+<link href="index.html" rel="start" title="split indices">
+<link href="index.html" rel="index" title="split indices">
+<link href="index.html" rel="up" title="split indices">
+<link href="first.html#first" rel="prev" title="1 First chapter">
 
 
 </head>
 
 <body lang="en">
 <div class="chapter-level-extent" id="second-chapter">
-<table class="nav-panel" cellpadding="1" cellspacing="1" border="0">
-<tr><td>[<a href="first.html#first" title="Beginning of this chapter or 
previous chapter"> &lt;&lt; </a>]</td>
-<td>[<a href="first.html#section-3" title="Previous section in reading order"> 
&lt; </a>]</td>
-<td>[<a href="index.html" title="Up section"> Up </a>]</td>
-<td>[ &gt; ]</td>
-<td>[ &gt;&gt; ]</td>
-<td> &nbsp; </td>
-<td> &nbsp; </td>
-<td> &nbsp; </td>
-<td> &nbsp; </td>
-<td>[<a href="index.html" title="Cover (top) of document">Top</a>]</td>
-<td>[Contents]</td>
-<td>[<a href="index.html" title="Index">Index</a>]</td>
-<td>[<a href="index_split_abt.html#SEC_About" title="About (help)"> ? 
</a>]</td>
-</tr></table>
-<h1 class="chapter" id="Second-chapter">2 Second chapter</h1>
+<div class="nav-panel">
+<p>
+Prev: <a href="first.html#first" accesskey="p" rel="prev">First chapter</a>,  
Up : <a href="index.html" accesskey="u" rel="up">split indices</a> &nbsp; [<a 
href="index.html" title="Index" rel="index">Index</a>]</p>
+</div>
+<h2 class="chapter" id="Second-chapter">2 Second chapter</h2>
 
 <p>Second chapter
 </p>
 </div>
 <hr>
-<table class="nav-panel" cellpadding="1" cellspacing="1" border="0">
-<tr><td>[<a href="first.html#first" title="Beginning of this chapter or 
previous chapter"> &lt;&lt; </a>]</td>
-<td>[ &gt;&gt; ]</td>
-<td> &nbsp; </td>
-<td> &nbsp; </td>
-<td> &nbsp; </td>
-<td> &nbsp; </td>
-<td> &nbsp; </td>
-<td>[<a href="index.html" title="Cover (top) of document">Top</a>]</td>
-<td>[Contents]</td>
-<td>[<a href="index.html" title="Index">Index</a>]</td>
-<td>[<a href="index_split_abt.html#SEC_About" title="About (help)"> ? 
</a>]</td>
-</tr></table>
+<div class="nav-panel">
 <p>
-  <span class="program-in-footer">This document was generated on <em 
class="emph">a sunny day</em> using <a class="uref" 
href="http://www.gnu.org/software/texinfo/";><em 
class="emph">texi2any</em></a>.</span>
-</p>
+Prev: <a href="first.html#first" accesskey="p" rel="prev">First chapter</a>,  
Up : <a href="index.html" accesskey="u" rel="up">split indices</a> &nbsp; [<a 
href="index.html" title="Index" rel="index">Index</a>]</p>
+</div>
+
 
 
 </body>
diff --git a/tp/t/results/moreindices/index_split_nodes/res_html/first.html 
b/tp/t/results/moreindices/index_split_nodes/res_html/first.html
index b90579f34f..82e69cb988 100644
--- a/tp/t/results/moreindices/index_split_nodes/res_html/first.html
+++ b/tp/t/results/moreindices/index_split_nodes/res_html/first.html
@@ -12,12 +12,14 @@
 <meta name="Generator" content="texi2any">
 <meta name="viewport" content="width=device-width,initial-scale=1">
 
+<link href="index.html" rel="start" title="Top">
+<link href="index.html" rel="index" title="Top">
+<link href="index.html" rel="up" title="Top">
+<link href="second-chapter.html" rel="next" title="second chapter">
+<link href="index.html" rel="prev" title="Top">
 <style type="text/css">
 <!--
 a.summary-letter-printindex {text-decoration: none}
-span.program-in-footer {font-size: smaller}
-td.menu-entry-description {vertical-align: top}
-td.menu-entry-destination {vertical-align: top}
 td.printindex-index-entry {vertical-align: top}
 td.printindex-index-section {vertical-align: top; padding-left: 1em}
 th.entries-header-printindex {text-align:left}
@@ -30,21 +32,10 @@ th.sections-header-printindex {text-align:left; 
padding-left: 1em}
 
 <body lang="en">
 <div class="chapter-level-extent" id="first">
-<table class="nav-panel" cellpadding="1" cellspacing="1" border="0">
-<tr><td>[<a href="index.html" title="Beginning of this chapter or previous 
chapter"> &lt;&lt; </a>]</td>
-<td>[<a href="index.html" title="Previous section in reading order"> &lt; 
</a>]</td>
-<td>[<a href="index.html" title="Up section"> Up </a>]</td>
-<td>[<a href="section-1.html" title="Next section in reading order"> &gt; 
</a>]</td>
-<td>[<a href="second-chapter.html" title="Next chapter"> &gt;&gt; </a>]</td>
-<td> &nbsp; </td>
-<td> &nbsp; </td>
-<td> &nbsp; </td>
-<td> &nbsp; </td>
-<td>[<a href="index.html" title="Cover (top) of document">Top</a>]</td>
-<td>[Contents]</td>
-<td>[<a href="index.html" title="Index">Index</a>]</td>
-<td>[<a href="index_split_abt.html#SEC_About" title="About (help)"> ? 
</a>]</td>
-</tr></table>
+<div class="nav-panel">
+<p>
+Next: <a href="second-chapter.html" accesskey="n" rel="next">Second 
chapter</a>, Previous: <a href="index.html" accesskey="p" rel="prev">split 
indices</a>, Up: <a href="index.html" accesskey="u" rel="up">split indices</a> 
&nbsp; [<a href="index.html" title="Index" rel="index">Index</a>]</p>
+</div>
 <hr>
 
 <p>Text and then index entries
@@ -154,46 +145,24 @@ th.sections-header-printindex {text-align:left; 
padding-left: 1em}
 
 <a class="index-entry-id" id="index-entry-after-printindex"></a>
 
-<h1 class="chapter" id="First-chapter">1 First chapter</h1>
+<h2 class="chapter" id="First-chapter">1 First chapter</h2>
 <a class="index-entry-id" id="index-a-function"></a>
 <a class="index-entry-id" id="index-a-concept-in-first"></a>
 <a class="index-entry-id" id="index-somewhere"></a>
 
-<table class="menu" border="0" cellspacing="0">
-<tr><td class="menu-entry-destination">&bull; <a href="section-1.html" 
rel="index">section 1</a></td><td>&nbsp;&nbsp;</td><td 
class="menu-entry-description">
-</td></tr>
-<tr><td class="menu-entry-destination">&bull; <a href="section-2.html">section 
2</a></td><td>&nbsp;&nbsp;</td><td class="menu-entry-description">
-</td></tr>
-<tr><td class="menu-entry-destination">&bull; <a href="section-3.html" 
rel="index">section 3</a></td><td>&nbsp;&nbsp;</td><td 
class="menu-entry-description">
-</td></tr>
-<tr><td class="menu-entry-destination">&bull; <a 
href="node-in-section-3.html">node in section 
3</a></td><td>&nbsp;&nbsp;</td><td class="menu-entry-description">
-</td></tr>
-<tr><td class="menu-entry-destination">&bull; <a 
href="node-2-in-section-3.html" rel="index">node 2 in section 
3</a></td><td>&nbsp;&nbsp;</td><td class="menu-entry-description">
-</td></tr>
-<tr><td class="menu-entry-destination">&bull; <a 
href="node-3-in-section-3.html">node 3 in section 
3</a></td><td>&nbsp;&nbsp;</td><td class="menu-entry-description">
-</td></tr>
-</table>
 
+<ul class="mini-toc">
+<li><a href="section-1.html" accesskey="1">Section 1</a></li>
+<li><a href="section-2.html" accesskey="2">Section 2</a></li>
+<li><a href="section-3.html" accesskey="3">Section 3</a></li>
+</ul>
 </div>
 <hr>
-<table class="nav-panel" cellpadding="1" cellspacing="1" border="0">
-<tr><td>[<a href="index.html" title="Beginning of this chapter or previous 
chapter"> &lt;&lt; </a>]</td>
-<td>[<a href="index.html" title="Previous section in reading order"> &lt; 
</a>]</td>
-<td>[<a href="index.html" title="Up section"> Up </a>]</td>
-<td>[<a href="section-1.html" title="Next section in reading order"> &gt; 
</a>]</td>
-<td>[<a href="second-chapter.html" title="Next chapter"> &gt;&gt; </a>]</td>
-<td> &nbsp; </td>
-<td> &nbsp; </td>
-<td> &nbsp; </td>
-<td> &nbsp; </td>
-<td>[<a href="index.html" title="Cover (top) of document">Top</a>]</td>
-<td>[Contents]</td>
-<td>[<a href="index.html" title="Index">Index</a>]</td>
-<td>[<a href="index_split_abt.html#SEC_About" title="About (help)"> ? 
</a>]</td>
-</tr></table>
+<div class="nav-panel">
 <p>
-  <span class="program-in-footer">This document was generated on <em 
class="emph">a sunny day</em> using <a class="uref" 
href="http://www.gnu.org/software/texinfo/";><em 
class="emph">texi2any</em></a>.</span>
-</p>
+Next: <a href="second-chapter.html">Second chapter</a>, Previous: <a 
href="index.html">split indices</a>, Up: <a href="index.html">split indices</a> 
&nbsp; [<a href="index.html" title="Index" rel="index">Index</a>]</p>
+</div>
+
 
 
 </body>
diff --git a/tp/t/results/moreindices/index_split_nodes/res_html/index.html 
b/tp/t/results/moreindices/index_split_nodes/res_html/index.html
index bd5debfa71..bfdd066435 100644
--- a/tp/t/results/moreindices/index_split_nodes/res_html/index.html
+++ b/tp/t/results/moreindices/index_split_nodes/res_html/index.html
@@ -12,12 +12,12 @@
 <meta name="Generator" content="texi2any">
 <meta name="viewport" content="width=device-width,initial-scale=1">
 
+<link href="#Top" rel="start" title="Top">
+<link href="#Top" rel="index" title="Top">
+<link href="first.html" rel="next" title="first">
 <style type="text/css">
 <!--
 a.summary-letter-printindex {text-decoration: none}
-span.program-in-footer {font-size: smaller}
-td.menu-entry-description {vertical-align: top}
-td.menu-entry-destination {vertical-align: top}
 td.printindex-index-entry {vertical-align: top}
 td.printindex-index-section {vertical-align: top; padding-left: 1em}
 th.entries-header-printindex {text-align:left}
@@ -30,14 +30,10 @@ th.sections-header-printindex {text-align:left; 
padding-left: 1em}
 
 <body lang="en">
 <div class="top-level-extent" id="Top">
-<table class="nav-panel" cellpadding="1" cellspacing="1" border="0">
-<tr><td>[ &lt; ]</td>
-<td>[<a href="first.html" title="Next section in reading order"> &gt; 
</a>]</td>
-<td> &nbsp; </td>
-<td>[Contents]</td>
-<td>[<a href="#Top" title="Index">Index</a>]</td>
-<td>[<a href="index_split_abt.html#SEC_About" title="About (help)"> ? 
</a>]</td>
-</tr></table>
+<div class="nav-panel">
+<p>
+Next: <a href="first.html" accesskey="n" rel="next">First chapter</a> &nbsp; 
[<a href="#Top" title="Index" rel="index">Index</a>]</p>
+</div>
 <hr>
 <h1 class="top" id="split-indices">split indices</h1>
 <a class="index-entry-id" id="index-entry-a"></a>
@@ -212,28 +208,18 @@ th.sections-header-printindex {text-align:left; 
padding-left: 1em}
 </td></tr></table>
 </div>
 
-<table class="menu" border="0" cellspacing="0">
-<tr><td class="menu-entry-destination">&bull; <a href="#Top" 
rel="index">Top</a></td><td>&nbsp;&nbsp;</td><td 
class="menu-entry-description">back to the current top node
-</td></tr>
-<tr><td class="menu-entry-destination">&bull; <a href="first.html" 
rel="index">first</a></td><td>&nbsp;&nbsp;</td><td 
class="menu-entry-description">
-</td></tr>
-<tr><td class="menu-entry-destination">&bull; <a 
href="second-chapter.html">second chapter</a></td><td>&nbsp;&nbsp;</td><td 
class="menu-entry-description">
-</td></tr>
-</table>
 
+<ul class="mini-toc">
+<li><a href="first.html" accesskey="1">First chapter</a></li>
+<li><a href="second-chapter.html" accesskey="2">Second chapter</a></li>
+</ul>
 </div>
 <hr>
-<table class="nav-panel" cellpadding="1" cellspacing="1" border="0">
-<tr><td>[ &lt; ]</td>
-<td>[<a href="first.html" title="Next section in reading order"> &gt; 
</a>]</td>
-<td> &nbsp; </td>
-<td>[Contents]</td>
-<td>[<a href="#Top" title="Index">Index</a>]</td>
-<td>[<a href="index_split_abt.html#SEC_About" title="About (help)"> ? 
</a>]</td>
-</tr></table>
+<div class="nav-panel">
 <p>
-  <span class="program-in-footer">This document was generated on <em 
class="emph">a sunny day</em> using <a class="uref" 
href="http://www.gnu.org/software/texinfo/";><em 
class="emph">texi2any</em></a>.</span>
-</p>
+Next: <a href="first.html" accesskey="n" rel="next">First chapter</a> &nbsp; 
[<a href="#Top" title="Index" rel="index">Index</a>]</p>
+</div>
+
 
 
 </body>
diff --git 
a/tp/t/results/moreindices/index_split_nodes/res_html/index_split_abt.html 
b/tp/t/results/moreindices/index_split_nodes/res_html/index_split_abt.html
deleted file mode 100644
index 1e1795090a..0000000000
--- a/tp/t/results/moreindices/index_split_nodes/res_html/index_split_abt.html
+++ /dev/null
@@ -1,149 +0,0 @@
-<!DOCTYPE html>
-<html>
-<!-- Created by texinfo, http://www.gnu.org/software/texinfo/ -->
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-<title>About This Document (split indices)</title>
-
-<meta name="description" content="About This Document (split indices)">
-<meta name="keywords" content="About This Document (split indices)">
-<meta name="resource-type" content="document">
-<meta name="distribution" content="global">
-<meta name="Generator" content="texi2any">
-<meta name="viewport" content="width=device-width,initial-scale=1">
-
-<style type="text/css">
-<!--
-span.program-in-footer {font-size: smaller}
-td.button-direction-about {text-align:center}
-td.name-direction-about {text-align:center}
--->
-</style>
-
-
-</head>
-
-<body lang="en">
-<div class="element-about" id="SEC_About">
-<table class="nav-panel" cellpadding="1" cellspacing="1" border="0">
-<tr><td>[<a href="index.html" title="Cover (top) of document">Top</a>]</td>
-<td>[Contents]</td>
-<td>[<a href="index.html" title="Index">Index</a>]</td>
-<td>[<a href="#SEC_About" title="About (help)"> ? </a>]</td>
-</tr></table>
-<hr>
-<h1 class="about-heading">About This Document</h1>
-
-<p>
-  This document was generated on <em class="emph">a sunny day</em> using <a 
class="uref" href="http://www.gnu.org/software/texinfo/";><em 
class="emph">texi2any</em></a>.
-</p>
-<p>
-  The buttons in the navigation panels have the following meaning:
-</p>
-<table border="1">
-  <tr>
-    <th> Button </th>
-    <th> Name </th>
-    <th> Go to </th>
-    <th> From 1.2.3 go to</th>
-  </tr>
-  <tr>
-    <td class="button-direction-about"> [ &lt;&lt; ] </td>
-    <td class="name-direction-about">FastBack</td>
-    <td>Beginning of this chapter or previous chapter</td>
-    <td>1</td>
-  </tr>
-  <tr>
-    <td class="button-direction-about"> [ &lt; ] </td>
-    <td class="name-direction-about">Back</td>
-    <td>Previous section in reading order</td>
-    <td>1.2.2</td>
-  </tr>
-  <tr>
-    <td class="button-direction-about"> [ Up ] </td>
-    <td class="name-direction-about">Up</td>
-    <td>Up section</td>
-    <td>1.2</td>
-  </tr>
-  <tr>
-    <td class="button-direction-about"> [ &gt; ] </td>
-    <td class="name-direction-about">Forward</td>
-    <td>Next section in reading order</td>
-    <td>1.2.4</td>
-  </tr>
-  <tr>
-    <td class="button-direction-about"> [ &gt;&gt; ] </td>
-    <td class="name-direction-about">FastForward</td>
-    <td>Next chapter</td>
-    <td>2</td>
-  </tr>
-  <tr>
-    <td class="button-direction-about"> [Top] </td>
-    <td class="name-direction-about">Top</td>
-    <td>Cover (top) of document</td>
-    <td> &nbsp; </td>
-  </tr>
-  <tr>
-    <td class="button-direction-about"> [Contents] </td>
-    <td class="name-direction-about">Contents</td>
-    <td>Table of contents</td>
-    <td> &nbsp; </td>
-  </tr>
-  <tr>
-    <td class="button-direction-about"> [Index] </td>
-    <td class="name-direction-about">Index</td>
-    <td>Index</td>
-    <td> &nbsp; </td>
-  </tr>
-  <tr>
-    <td class="button-direction-about"> [ ? ] </td>
-    <td class="name-direction-about">About</td>
-    <td>About (help)</td>
-    <td> &nbsp; </td>
-  </tr>
-</table>
-
-<p>
-  where the <strong class="strong"> Example </strong> assumes that the current 
position is at <strong class="strong"> Subsubsection One-Two-Three </strong> of 
a document of the following structure:
-</p>
-
-<ul>
-  <li> 1. Section One
-    <ul>
-      <li>1.1 Subsection One-One
-        <ul>
-          <li>...</li>
-        </ul>
-      </li>
-      <li>1.2 Subsection One-Two
-        <ul>
-          <li>1.2.1 Subsubsection One-Two-One</li>
-          <li>1.2.2 Subsubsection One-Two-Two</li>
-          <li>1.2.3 Subsubsection One-Two-Three &nbsp; &nbsp;
-            <strong>&lt;== Current Position </strong></li>
-          <li>1.2.4 Subsubsection One-Two-Four</li>
-        </ul>
-      </li>
-      <li>1.3 Subsection One-Three
-        <ul>
-          <li>...</li>
-        </ul>
-      </li>
-      <li>1.4 Subsection One-Four</li>
-    </ul>
-  </li>
-</ul>
-</div><hr>
-<table class="nav-panel" cellpadding="1" cellspacing="1" border="0">
-<tr><td>[<a href="index.html" title="Cover (top) of document">Top</a>]</td>
-<td>[Contents]</td>
-<td>[<a href="index.html" title="Index">Index</a>]</td>
-<td>[<a href="#SEC_About" title="About (help)"> ? </a>]</td>
-</tr></table>
-<p>
-  <span class="program-in-footer">This document was generated on <em 
class="emph">a sunny day</em> using <a class="uref" 
href="http://www.gnu.org/software/texinfo/";><em 
class="emph">texi2any</em></a>.</span>
-</p>
-
-
-</body>
-</html>
diff --git 
a/tp/t/results/moreindices/index_split_nodes/res_html/node-2-in-section-3.html 
b/tp/t/results/moreindices/index_split_nodes/res_html/node-2-in-section-3.html
index 456aa46d05..4b07be50bf 100644
--- 
a/tp/t/results/moreindices/index_split_nodes/res_html/node-2-in-section-3.html
+++ 
b/tp/t/results/moreindices/index_split_nodes/res_html/node-2-in-section-3.html
@@ -12,10 +12,12 @@
 <meta name="Generator" content="texi2any">
 <meta name="viewport" content="width=device-width,initial-scale=1">
 
+<link href="index.html" rel="start" title="Top">
+<link href="index.html" rel="index" title="Top">
+<link href="first.html" rel="up" title="first">
 <style type="text/css">
 <!--
 a.summary-letter-printindex {text-decoration: none}
-span.program-in-footer {font-size: smaller}
 td.printindex-index-entry {vertical-align: top}
 td.printindex-index-section {vertical-align: top; padding-left: 1em}
 th.entries-header-printindex {text-align:left}
@@ -27,23 +29,12 @@ th.sections-header-printindex {text-align:left; 
padding-left: 1em}
 </head>
 
 <body lang="en">
-<a class="node-id" id="node-2-in-section-3"></a><table class="nav-panel" 
cellpadding="1" cellspacing="1" border="0">
-<tr><td>[ &lt;&lt; ]</td>
-<td>[<a href="node-in-section-3.html" title="Previous section in reading 
order"> &lt; </a>]</td>
-<td>[<a href="first.html" title="Up section"> Up </a>]</td>
-<td>[<a href="node-3-in-section-3.html" title="Next section in reading order"> 
&gt; </a>]</td>
-<td>[<a href="second-chapter.html" title="Next chapter"> &gt;&gt; </a>]</td>
-<td> &nbsp; </td>
-<td> &nbsp; </td>
-<td> &nbsp; </td>
-<td> &nbsp; </td>
-<td>[<a href="index.html" title="Cover (top) of document">Top</a>]</td>
-<td>[Contents]</td>
-<td>[<a href="index.html" title="Index">Index</a>]</td>
-<td>[<a href="index_split_abt.html#SEC_About" title="About (help)"> ? 
</a>]</td>
-</tr></table>
+<a class="node-id" id="node-2-in-section-3"></a><div class="nav-panel">
+<p>
+Up: <a href="first.html" accesskey="u" rel="up">First chapter</a> &nbsp; [<a 
href="index.html" title="Index" rel="index">Index</a>]</p>
+</div>
 <hr>
-<h3 class="node">node 2 in section 3</h3>
+<h4 class="node">node 2 in section 3</h4>
 
 <a class="index-entry-id" id="index-node-2-in-section-3"></a>
 <p>Text for the node 2 in section 3
@@ -191,24 +182,11 @@ th.sections-header-printindex {text-align:left; 
padding-left: 1em}
 <a class="index-entry-id" 
id="index-after-second-printindex-node-in-section-3"></a>
 
 <hr>
-<table class="nav-panel" cellpadding="1" cellspacing="1" border="0">
-<tr><td>[ &lt;&lt; ]</td>
-<td>[<a href="node-in-section-3.html" title="Previous section in reading 
order"> &lt; </a>]</td>
-<td>[<a href="first.html" title="Up section"> Up </a>]</td>
-<td>[<a href="node-3-in-section-3.html" title="Next section in reading order"> 
&gt; </a>]</td>
-<td>[<a href="second-chapter.html" title="Next chapter"> &gt;&gt; </a>]</td>
-<td> &nbsp; </td>
-<td> &nbsp; </td>
-<td> &nbsp; </td>
-<td> &nbsp; </td>
-<td>[<a href="index.html" title="Cover (top) of document">Top</a>]</td>
-<td>[Contents]</td>
-<td>[<a href="index.html" title="Index">Index</a>]</td>
-<td>[<a href="index_split_abt.html#SEC_About" title="About (help)"> ? 
</a>]</td>
-</tr></table>
+<div class="nav-panel">
 <p>
-  <span class="program-in-footer">This document was generated on <em 
class="emph">a sunny day</em> using <a class="uref" 
href="http://www.gnu.org/software/texinfo/";><em 
class="emph">texi2any</em></a>.</span>
-</p>
+Up: <a href="first.html">First chapter</a> &nbsp; [<a href="index.html" 
title="Index" rel="index">Index</a>]</p>
+</div>
+
 
 
 </body>
diff --git 
a/tp/t/results/moreindices/index_split_nodes/res_html/node-3-in-section-3.html 
b/tp/t/results/moreindices/index_split_nodes/res_html/node-3-in-section-3.html
index 111a4d24b3..a1ed3ff993 100644
--- 
a/tp/t/results/moreindices/index_split_nodes/res_html/node-3-in-section-3.html
+++ 
b/tp/t/results/moreindices/index_split_nodes/res_html/node-3-in-section-3.html
@@ -12,40 +12,24 @@
 <meta name="Generator" content="texi2any">
 <meta name="viewport" content="width=device-width,initial-scale=1">
 
-<style type="text/css">
-<!--
-span.program-in-footer {font-size: smaller}
--->
-</style>
+<link href="index.html" rel="start" title="Top">
+<link href="index.html" rel="index" title="Top">
+<link href="first.html" rel="up" title="first">
 
 
 </head>
 
 <body lang="en">
-<a class="node-id" id="node-3-in-section-3"></a><table class="nav-panel" 
cellpadding="1" cellspacing="1" border="0">
-<tr><td>[ &lt;&lt; ]</td>
-<td>[<a href="node-2-in-section-3.html" title="Previous section in reading 
order"> &lt; </a>]</td>
-<td>[<a href="first.html" title="Up section"> Up </a>]</td>
-<td>[<a href="second-chapter.html" title="Next section in reading order"> &gt; 
</a>]</td>
-<td>[<a href="second-chapter.html" title="Next chapter"> &gt;&gt; </a>]</td>
-<td> &nbsp; </td>
-<td> &nbsp; </td>
-<td> &nbsp; </td>
-<td> &nbsp; </td>
-<td>[<a href="index.html" title="Cover (top) of document">Top</a>]</td>
-<td>[Contents]</td>
-<td>[<a href="index.html" title="Index">Index</a>]</td>
-<td>[<a href="index_split_abt.html#SEC_About" title="About (help)"> ? 
</a>]</td>
-</tr></table>
+<a class="node-id" id="node-3-in-section-3"></a><div class="nav-panel">
+<p>
+Up: <a href="first.html" accesskey="u" rel="up">First chapter</a> &nbsp; [<a 
href="index.html" title="Index" rel="index">Index</a>]</p>
+</div>
 <hr>
-<h3 class="node">node 3 in section 3</h3>
+<h4 class="node">node 3 in section 3</h4>
 
 <a class="index-entry-id" id="index-node-3-in-section-3"></a>
 
-<hr>
-<p>
-  <span class="program-in-footer">This document was generated on <em 
class="emph">a sunny day</em> using <a class="uref" 
href="http://www.gnu.org/software/texinfo/";><em 
class="emph">texi2any</em></a>.</span>
-</p>
+
 
 
 </body>
diff --git 
a/tp/t/results/moreindices/index_split_nodes/res_html/node-in-section-3.html 
b/tp/t/results/moreindices/index_split_nodes/res_html/node-in-section-3.html
index 059a148b89..dac4843683 100644
--- a/tp/t/results/moreindices/index_split_nodes/res_html/node-in-section-3.html
+++ b/tp/t/results/moreindices/index_split_nodes/res_html/node-in-section-3.html
@@ -12,41 +12,26 @@
 <meta name="Generator" content="texi2any">
 <meta name="viewport" content="width=device-width,initial-scale=1">
 
-<style type="text/css">
-<!--
-span.program-in-footer {font-size: smaller}
--->
-</style>
+<link href="index.html" rel="start" title="Top">
+<link href="index.html" rel="index" title="Top">
+<link href="first.html" rel="up" title="first">
+<link href="section-3.html" rel="prev" title="section 3">
 
 
 </head>
 
 <body lang="en">
-<a class="node-id" id="node-in-section-3"></a><table class="nav-panel" 
cellpadding="1" cellspacing="1" border="0">
-<tr><td>[ &lt;&lt; ]</td>
-<td>[<a href="section-3.html" title="Previous section in reading order"> &lt; 
</a>]</td>
-<td>[<a href="first.html" title="Up section"> Up </a>]</td>
-<td>[<a href="node-2-in-section-3.html" title="Next section in reading order"> 
&gt; </a>]</td>
-<td>[<a href="second-chapter.html" title="Next chapter"> &gt;&gt; </a>]</td>
-<td> &nbsp; </td>
-<td> &nbsp; </td>
-<td> &nbsp; </td>
-<td> &nbsp; </td>
-<td>[<a href="index.html" title="Cover (top) of document">Top</a>]</td>
-<td>[Contents]</td>
-<td>[<a href="index.html" title="Index">Index</a>]</td>
-<td>[<a href="index_split_abt.html#SEC_About" title="About (help)"> ? 
</a>]</td>
-</tr></table>
+<a class="node-id" id="node-in-section-3"></a><div class="nav-panel">
+<p>
+Previous: <a href="section-3.html" accesskey="p" rel="prev">Section 3</a>, Up: 
<a href="first.html" accesskey="u" rel="up">First chapter</a> &nbsp; [<a 
href="index.html" title="Index" rel="index">Index</a>]</p>
+</div>
 <hr>
-<h3 class="node">node in section 3</h3>
+<h4 class="node">node in section 3</h4>
 
 <a class="index-entry-id" id="index-node-in-section-3"></a>
 <p>Text for the node in section 3
 </p>
-<hr>
-<p>
-  <span class="program-in-footer">This document was generated on <em 
class="emph">a sunny day</em> using <a class="uref" 
href="http://www.gnu.org/software/texinfo/";><em 
class="emph">texi2any</em></a>.</span>
-</p>
+
 
 
 </body>
diff --git 
a/tp/t/results/moreindices/index_split_nodes/res_html/second-chapter.html 
b/tp/t/results/moreindices/index_split_nodes/res_html/second-chapter.html
index b4473fc92d..e0cb6ea7a2 100644
--- a/tp/t/results/moreindices/index_split_nodes/res_html/second-chapter.html
+++ b/tp/t/results/moreindices/index_split_nodes/res_html/second-chapter.html
@@ -12,42 +12,27 @@
 <meta name="Generator" content="texi2any">
 <meta name="viewport" content="width=device-width,initial-scale=1">
 
-<style type="text/css">
-<!--
-span.program-in-footer {font-size: smaller}
--->
-</style>
+<link href="index.html" rel="start" title="Top">
+<link href="index.html" rel="index" title="Top">
+<link href="index.html" rel="up" title="Top">
+<link href="first.html" rel="prev" title="first">
 
 
 </head>
 
 <body lang="en">
 <div class="chapter-level-extent" id="second-chapter">
-<table class="nav-panel" cellpadding="1" cellspacing="1" border="0">
-<tr><td>[<a href="first.html" title="Beginning of this chapter or previous 
chapter"> &lt;&lt; </a>]</td>
-<td>[<a href="node-3-in-section-3.html" title="Previous section in reading 
order"> &lt; </a>]</td>
-<td>[<a href="index.html" title="Up section"> Up </a>]</td>
-<td>[ &gt; ]</td>
-<td>[ &gt;&gt; ]</td>
-<td> &nbsp; </td>
-<td> &nbsp; </td>
-<td> &nbsp; </td>
-<td> &nbsp; </td>
-<td>[<a href="index.html" title="Cover (top) of document">Top</a>]</td>
-<td>[Contents]</td>
-<td>[<a href="index.html" title="Index">Index</a>]</td>
-<td>[<a href="index_split_abt.html#SEC_About" title="About (help)"> ? 
</a>]</td>
-</tr></table>
+<div class="nav-panel">
+<p>
+Previous: <a href="first.html" accesskey="p" rel="prev">First chapter</a>, Up: 
<a href="index.html" accesskey="u" rel="up">split indices</a> &nbsp; [<a 
href="index.html" title="Index" rel="index">Index</a>]</p>
+</div>
 <hr>
-<h1 class="chapter" id="Second-chapter">2 Second chapter</h1>
+<h2 class="chapter" id="Second-chapter">2 Second chapter</h2>
 
 <p>Second chapter
 </p>
 </div>
-<hr>
-<p>
-  <span class="program-in-footer">This document was generated on <em 
class="emph">a sunny day</em> using <a class="uref" 
href="http://www.gnu.org/software/texinfo/";><em 
class="emph">texi2any</em></a>.</span>
-</p>
+
 
 
 </body>
diff --git a/tp/t/results/moreindices/index_split_nodes/res_html/section-1.html 
b/tp/t/results/moreindices/index_split_nodes/res_html/section-1.html
index 9dad181d47..44f325d68f 100644
--- a/tp/t/results/moreindices/index_split_nodes/res_html/section-1.html
+++ b/tp/t/results/moreindices/index_split_nodes/res_html/section-1.html
@@ -12,12 +12,13 @@
 <meta name="Generator" content="texi2any">
 <meta name="viewport" content="width=device-width,initial-scale=1">
 
+<link href="index.html" rel="start" title="Top">
+<link href="index.html" rel="index" title="Top">
+<link href="first.html" rel="up" title="first">
+<link href="section-2.html" rel="next" title="section 2">
 <style type="text/css">
 <!--
 a.summary-letter-printindex {text-decoration: none}
-span.program-in-footer {font-size: smaller}
-td.menu-entry-description {vertical-align: top}
-td.menu-entry-destination {vertical-align: top}
 td.printindex-index-entry {vertical-align: top}
 td.printindex-index-section {vertical-align: top; padding-left: 1em}
 th.entries-header-printindex {text-align:left}
@@ -30,32 +31,15 @@ th.sections-header-printindex {text-align:left; 
padding-left: 1em}
 
 <body lang="en">
 <div class="section-level-extent" id="section-1">
-<table class="nav-panel" cellpadding="1" cellspacing="1" border="0">
-<tr><td>[<a href="first.html" title="Beginning of this chapter or previous 
chapter"> &lt;&lt; </a>]</td>
-<td>[<a href="first.html" title="Previous section in reading order"> &lt; 
</a>]</td>
-<td>[<a href="first.html" title="Up section"> Up </a>]</td>
-<td>[<a href="subsection-1.html" title="Next section in reading order"> &gt; 
</a>]</td>
-<td>[<a href="second-chapter.html" title="Next chapter"> &gt;&gt; </a>]</td>
-<td> &nbsp; </td>
-<td> &nbsp; </td>
-<td> &nbsp; </td>
-<td> &nbsp; </td>
-<td>[<a href="index.html" title="Cover (top) of document">Top</a>]</td>
-<td>[Contents]</td>
-<td>[<a href="index.html" title="Index">Index</a>]</td>
-<td>[<a href="index_split_abt.html#SEC_About" title="About (help)"> ? 
</a>]</td>
-</tr></table>
+<div class="nav-panel">
+<p>
+Next: <a href="section-2.html" accesskey="n" rel="next">Section 2</a>, Up: <a 
href="first.html" accesskey="u" rel="up">First chapter</a> &nbsp; [<a 
href="index.html" title="Index" rel="index">Index</a>]</p>
+</div>
 <hr>
-<h2 class="section" id="Section-1">1.1 Section 1</h2>
+<h3 class="section" id="Section-1">1.1 Section 1</h3>
 
 <a class="index-entry-id" id="index-something"></a>
 
-<table class="menu" border="0" cellspacing="0">
-<tr><td class="menu-entry-destination">&bull; <a 
href="subsection-1.html">subsection 1</a></td><td>&nbsp;&nbsp;</td><td 
class="menu-entry-description">
-</td></tr>
-<tr><td class="menu-entry-destination">&bull; <a href="subsection-2.html" 
rel="index">subsection 2</a></td><td>&nbsp;&nbsp;</td><td 
class="menu-entry-description">
-</td></tr>
-</table>
 <p>The index once more
 </p>
 <div class="printindex cp-printindex">
@@ -129,26 +113,17 @@ th.sections-header-printindex {text-align:left; 
padding-left: 1em}
 
 <a class="index-entry-id" id="index-another"></a>
 
+<ul class="mini-toc">
+<li><a href="subsection-1.html" accesskey="1">Subsection 1</a></li>
+<li><a href="subsection-2.html" accesskey="2">Subsection 2</a></li>
+</ul>
 </div>
 <hr>
-<table class="nav-panel" cellpadding="1" cellspacing="1" border="0">
-<tr><td>[<a href="first.html" title="Beginning of this chapter or previous 
chapter"> &lt;&lt; </a>]</td>
-<td>[<a href="first.html" title="Previous section in reading order"> &lt; 
</a>]</td>
-<td>[<a href="first.html" title="Up section"> Up </a>]</td>
-<td>[<a href="subsection-1.html" title="Next section in reading order"> &gt; 
</a>]</td>
-<td>[<a href="second-chapter.html" title="Next chapter"> &gt;&gt; </a>]</td>
-<td> &nbsp; </td>
-<td> &nbsp; </td>
-<td> &nbsp; </td>
-<td> &nbsp; </td>
-<td>[<a href="index.html" title="Cover (top) of document">Top</a>]</td>
-<td>[Contents]</td>
-<td>[<a href="index.html" title="Index">Index</a>]</td>
-<td>[<a href="index_split_abt.html#SEC_About" title="About (help)"> ? 
</a>]</td>
-</tr></table>
+<div class="nav-panel">
 <p>
-  <span class="program-in-footer">This document was generated on <em 
class="emph">a sunny day</em> using <a class="uref" 
href="http://www.gnu.org/software/texinfo/";><em 
class="emph">texi2any</em></a>.</span>
-</p>
+Next: <a href="section-2.html">Section 2</a>, Up: <a href="first.html">First 
chapter</a> &nbsp; [<a href="index.html" title="Index" 
rel="index">Index</a>]</p>
+</div>
+
 
 
 </body>
diff --git a/tp/t/results/moreindices/index_split_nodes/res_html/section-2.html 
b/tp/t/results/moreindices/index_split_nodes/res_html/section-2.html
index d14f472b79..ff1ab9d7bb 100644
--- a/tp/t/results/moreindices/index_split_nodes/res_html/section-2.html
+++ b/tp/t/results/moreindices/index_split_nodes/res_html/section-2.html
@@ -12,42 +12,28 @@
 <meta name="Generator" content="texi2any">
 <meta name="viewport" content="width=device-width,initial-scale=1">
 
-<style type="text/css">
-<!--
-span.program-in-footer {font-size: smaller}
--->
-</style>
+<link href="index.html" rel="start" title="Top">
+<link href="index.html" rel="index" title="Top">
+<link href="first.html" rel="up" title="first">
+<link href="section-3.html" rel="next" title="section 3">
+<link href="section-1.html" rel="prev" title="section 1">
 
 
 </head>
 
 <body lang="en">
 <div class="section-level-extent" id="section-2">
-<table class="nav-panel" cellpadding="1" cellspacing="1" border="0">
-<tr><td>[<a href="first.html" title="Beginning of this chapter or previous 
chapter"> &lt;&lt; </a>]</td>
-<td>[<a href="subsection-2.html" title="Previous section in reading order"> 
&lt; </a>]</td>
-<td>[<a href="first.html" title="Up section"> Up </a>]</td>
-<td>[<a href="section-3.html" title="Next section in reading order"> &gt; 
</a>]</td>
-<td>[<a href="second-chapter.html" title="Next chapter"> &gt;&gt; </a>]</td>
-<td> &nbsp; </td>
-<td> &nbsp; </td>
-<td> &nbsp; </td>
-<td> &nbsp; </td>
-<td>[<a href="index.html" title="Cover (top) of document">Top</a>]</td>
-<td>[Contents]</td>
-<td>[<a href="index.html" title="Index">Index</a>]</td>
-<td>[<a href="index_split_abt.html#SEC_About" title="About (help)"> ? 
</a>]</td>
-</tr></table>
+<div class="nav-panel">
+<p>
+Next: <a href="section-3.html" accesskey="n" rel="next">Section 3</a>, 
Previous: <a href="section-1.html" accesskey="p" rel="prev">Section 1</a>, Up: 
<a href="first.html" accesskey="u" rel="up">First chapter</a> &nbsp; [<a 
href="index.html" title="Index" rel="index">Index</a>]</p>
+</div>
 <hr>
-<h2 class="section" id="Section-2">1.2 Section 2</h2>
+<h3 class="section" id="Section-2">1.2 Section 2</h3>
 
 <p>Section 2
 </p>
 </div>
-<hr>
-<p>
-  <span class="program-in-footer">This document was generated on <em 
class="emph">a sunny day</em> using <a class="uref" 
href="http://www.gnu.org/software/texinfo/";><em 
class="emph">texi2any</em></a>.</span>
-</p>
+
 
 
 </body>
diff --git a/tp/t/results/moreindices/index_split_nodes/res_html/section-3.html 
b/tp/t/results/moreindices/index_split_nodes/res_html/section-3.html
index 6f9bf18364..cde21e12ec 100644
--- a/tp/t/results/moreindices/index_split_nodes/res_html/section-3.html
+++ b/tp/t/results/moreindices/index_split_nodes/res_html/section-3.html
@@ -12,10 +12,14 @@
 <meta name="Generator" content="texi2any">
 <meta name="viewport" content="width=device-width,initial-scale=1">
 
+<link href="index.html" rel="start" title="Top">
+<link href="index.html" rel="index" title="Top">
+<link href="first.html" rel="up" title="first">
+<link href="node-in-section-3.html" rel="next" title="node in section 3">
+<link href="section-2.html" rel="prev" title="section 2">
 <style type="text/css">
 <!--
 a.summary-letter-printindex {text-decoration: none}
-span.program-in-footer {font-size: smaller}
 td.printindex-index-entry {vertical-align: top}
 td.printindex-index-section {vertical-align: top; padding-left: 1em}
 th.entries-header-printindex {text-align:left}
@@ -28,23 +32,12 @@ th.sections-header-printindex {text-align:left; 
padding-left: 1em}
 
 <body lang="en">
 <div class="section-level-extent" id="section-3">
-<table class="nav-panel" cellpadding="1" cellspacing="1" border="0">
-<tr><td>[<a href="first.html" title="Beginning of this chapter or previous 
chapter"> &lt;&lt; </a>]</td>
-<td>[<a href="section-2.html" title="Previous section in reading order"> &lt; 
</a>]</td>
-<td>[<a href="first.html" title="Up section"> Up </a>]</td>
-<td>[<a href="node-in-section-3.html" title="Next section in reading order"> 
&gt; </a>]</td>
-<td>[<a href="second-chapter.html" title="Next chapter"> &gt;&gt; </a>]</td>
-<td> &nbsp; </td>
-<td> &nbsp; </td>
-<td> &nbsp; </td>
-<td> &nbsp; </td>
-<td>[<a href="index.html" title="Cover (top) of document">Top</a>]</td>
-<td>[Contents]</td>
-<td>[<a href="index.html" title="Index">Index</a>]</td>
-<td>[<a href="index_split_abt.html#SEC_About" title="About (help)"> ? 
</a>]</td>
-</tr></table>
+<div class="nav-panel">
+<p>
+Next: <a href="node-in-section-3.html" accesskey="n" rel="next">node in 
section 3</a>, Previous: <a href="section-2.html" accesskey="p" 
rel="prev">Section 2</a>, Up: <a href="first.html" accesskey="u" rel="up">First 
chapter</a> &nbsp; [<a href="index.html" title="Index" 
rel="index">Index</a>]</p>
+</div>
 <hr>
-<h2 class="section" id="Section-3">1.3 Section 3</h2>
+<h3 class="section" id="Section-3">1.3 Section 3</h3>
 
 <a class="index-entry-id" id="index-section-3"></a>
 
@@ -118,25 +111,7 @@ th.sections-header-printindex {text-align:left; 
padding-left: 1em}
 </div>
 
 </div>
-<hr>
-<table class="nav-panel" cellpadding="1" cellspacing="1" border="0">
-<tr><td>[<a href="first.html" title="Beginning of this chapter or previous 
chapter"> &lt;&lt; </a>]</td>
-<td>[<a href="section-2.html" title="Previous section in reading order"> &lt; 
</a>]</td>
-<td>[<a href="first.html" title="Up section"> Up </a>]</td>
-<td>[<a href="node-in-section-3.html" title="Next section in reading order"> 
&gt; </a>]</td>
-<td>[<a href="second-chapter.html" title="Next chapter"> &gt;&gt; </a>]</td>
-<td> &nbsp; </td>
-<td> &nbsp; </td>
-<td> &nbsp; </td>
-<td> &nbsp; </td>
-<td>[<a href="index.html" title="Cover (top) of document">Top</a>]</td>
-<td>[Contents]</td>
-<td>[<a href="index.html" title="Index">Index</a>]</td>
-<td>[<a href="index_split_abt.html#SEC_About" title="About (help)"> ? 
</a>]</td>
-</tr></table>
-<p>
-  <span class="program-in-footer">This document was generated on <em 
class="emph">a sunny day</em> using <a class="uref" 
href="http://www.gnu.org/software/texinfo/";><em 
class="emph">texi2any</em></a>.</span>
-</p>
+
 
 
 </body>
diff --git 
a/tp/t/results/moreindices/index_split_nodes/res_html/subsection-1.html 
b/tp/t/results/moreindices/index_split_nodes/res_html/subsection-1.html
index f6bce6a256..a257ffaff9 100644
--- a/tp/t/results/moreindices/index_split_nodes/res_html/subsection-1.html
+++ b/tp/t/results/moreindices/index_split_nodes/res_html/subsection-1.html
@@ -12,42 +12,27 @@
 <meta name="Generator" content="texi2any">
 <meta name="viewport" content="width=device-width,initial-scale=1">
 
-<style type="text/css">
-<!--
-span.program-in-footer {font-size: smaller}
--->
-</style>
+<link href="index.html" rel="start" title="Top">
+<link href="index.html" rel="index" title="Top">
+<link href="section-1.html" rel="up" title="section 1">
+<link href="subsection-2.html" rel="next" title="subsection 2">
 
 
 </head>
 
 <body lang="en">
 <div class="subsection-level-extent" id="subsection-1">
-<table class="nav-panel" cellpadding="1" cellspacing="1" border="0">
-<tr><td>[<a href="first.html" title="Beginning of this chapter or previous 
chapter"> &lt;&lt; </a>]</td>
-<td>[<a href="section-1.html" title="Previous section in reading order"> &lt; 
</a>]</td>
-<td>[<a href="section-1.html" title="Up section"> Up </a>]</td>
-<td>[<a href="subsection-2.html" title="Next section in reading order"> &gt; 
</a>]</td>
-<td>[<a href="second-chapter.html" title="Next chapter"> &gt;&gt; </a>]</td>
-<td> &nbsp; </td>
-<td> &nbsp; </td>
-<td> &nbsp; </td>
-<td> &nbsp; </td>
-<td>[<a href="index.html" title="Cover (top) of document">Top</a>]</td>
-<td>[Contents]</td>
-<td>[<a href="index.html" title="Index">Index</a>]</td>
-<td>[<a href="index_split_abt.html#SEC_About" title="About (help)"> ? 
</a>]</td>
-</tr></table>
+<div class="nav-panel">
+<p>
+Next: <a href="subsection-2.html" accesskey="n" rel="next">Subsection 2</a>, 
Up: <a href="section-1.html" accesskey="u" rel="up">Section 1</a> &nbsp; [<a 
href="index.html" title="Index" rel="index">Index</a>]</p>
+</div>
 <hr>
-<h3 class="subsection" id="Subsection-1">1.1.1 Subsection 1</h3>
+<h4 class="subsection" id="Subsection-1">1.1.1 Subsection 1</h4>
 
 <p>In subsection 1
 </p>
 </div>
-<hr>
-<p>
-  <span class="program-in-footer">This document was generated on <em 
class="emph">a sunny day</em> using <a class="uref" 
href="http://www.gnu.org/software/texinfo/";><em 
class="emph">texi2any</em></a>.</span>
-</p>
+
 
 
 </body>
diff --git 
a/tp/t/results/moreindices/index_split_nodes/res_html/subsection-2.html 
b/tp/t/results/moreindices/index_split_nodes/res_html/subsection-2.html
index 9474f40717..7df1eea029 100644
--- a/tp/t/results/moreindices/index_split_nodes/res_html/subsection-2.html
+++ b/tp/t/results/moreindices/index_split_nodes/res_html/subsection-2.html
@@ -12,10 +12,13 @@
 <meta name="Generator" content="texi2any">
 <meta name="viewport" content="width=device-width,initial-scale=1">
 
+<link href="index.html" rel="start" title="Top">
+<link href="index.html" rel="index" title="Top">
+<link href="section-1.html" rel="up" title="section 1">
+<link href="subsection-1.html" rel="prev" title="subsection 1">
 <style type="text/css">
 <!--
 a.summary-letter-printindex {text-decoration: none}
-span.program-in-footer {font-size: smaller}
 td.printindex-index-entry {vertical-align: top}
 td.printindex-index-section {vertical-align: top; padding-left: 1em}
 th.entries-header-printindex {text-align:left}
@@ -28,23 +31,12 @@ th.sections-header-printindex {text-align:left; 
padding-left: 1em}
 
 <body lang="en">
 <div class="subsection-level-extent" id="subsection-2">
-<table class="nav-panel" cellpadding="1" cellspacing="1" border="0">
-<tr><td>[<a href="first.html" title="Beginning of this chapter or previous 
chapter"> &lt;&lt; </a>]</td>
-<td>[<a href="subsection-1.html" title="Previous section in reading order"> 
&lt; </a>]</td>
-<td>[<a href="section-1.html" title="Up section"> Up </a>]</td>
-<td>[<a href="section-2.html" title="Next section in reading order"> &gt; 
</a>]</td>
-<td>[<a href="second-chapter.html" title="Next chapter"> &gt;&gt; </a>]</td>
-<td> &nbsp; </td>
-<td> &nbsp; </td>
-<td> &nbsp; </td>
-<td> &nbsp; </td>
-<td>[<a href="index.html" title="Cover (top) of document">Top</a>]</td>
-<td>[Contents]</td>
-<td>[<a href="index.html" title="Index">Index</a>]</td>
-<td>[<a href="index_split_abt.html#SEC_About" title="About (help)"> ? 
</a>]</td>
-</tr></table>
+<div class="nav-panel">
+<p>
+Previous: <a href="subsection-1.html" accesskey="p" rel="prev">Subsection 
1</a>, Up: <a href="section-1.html" accesskey="u" rel="up">Section 1</a> &nbsp; 
[<a href="index.html" title="Index" rel="index">Index</a>]</p>
+</div>
 <hr>
-<h3 class="subsection" id="Subsection-2">1.1.2 Subsection 2</h3>
+<h4 class="subsection" id="Subsection-2">1.1.2 Subsection 2</h4>
 
 <p>index in subsction 2
 </p>
@@ -122,25 +114,7 @@ th.sections-header-printindex {text-align:left; 
padding-left: 1em}
 <a class="index-entry-id" id="index-printindex-subsection-2"></a>
 
 </div>
-<hr>
-<table class="nav-panel" cellpadding="1" cellspacing="1" border="0">
-<tr><td>[<a href="first.html" title="Beginning of this chapter or previous 
chapter"> &lt;&lt; </a>]</td>
-<td>[<a href="subsection-1.html" title="Previous section in reading order"> 
&lt; </a>]</td>
-<td>[<a href="section-1.html" title="Up section"> Up </a>]</td>
-<td>[<a href="section-2.html" title="Next section in reading order"> &gt; 
</a>]</td>
-<td>[<a href="second-chapter.html" title="Next chapter"> &gt;&gt; </a>]</td>
-<td> &nbsp; </td>
-<td> &nbsp; </td>
-<td> &nbsp; </td>
-<td> &nbsp; </td>
-<td>[<a href="index.html" title="Cover (top) of document">Top</a>]</td>
-<td>[Contents]</td>
-<td>[<a href="index.html" title="Index">Index</a>]</td>
-<td>[<a href="index_split_abt.html#SEC_About" title="About (help)"> ? 
</a>]</td>
-</tr></table>
-<p>
-  <span class="program-in-footer">This document was generated on <em 
class="emph">a sunny day</em> using <a class="uref" 
href="http://www.gnu.org/software/texinfo/";><em 
class="emph">texi2any</em></a>.</span>
-</p>
+
 
 
 </body>
diff --git 
a/tp/t/results/moreindices/nodes_before_top/res_html/first-before-top.html 
b/tp/t/results/moreindices/nodes_before_top/res_html/first-before-top.html
index 736758289a..d42ad80289 100644
--- a/tp/t/results/moreindices/nodes_before_top/res_html/first-before-top.html
+++ b/tp/t/results/moreindices/nodes_before_top/res_html/first-before-top.html
@@ -12,12 +12,13 @@
 <meta name="Generator" content="texi2any">
 <meta name="viewport" content="width=device-width,initial-scale=1">
 
+<link href="index.html" rel="start" title="Top">
+<link href="#first-before-top" rel="index" title="first before top">
+<link href="../dir_html/index.html" rel="up" title="(dir)">
+<link href="index.html" rel="next" title="Top">
 <style type="text/css">
 <!--
 a.summary-letter-printindex {text-decoration: none}
-span.program-in-footer {font-size: smaller}
-td.menu-entry-description {vertical-align: top}
-td.menu-entry-destination {vertical-align: top}
 td.printindex-index-entry {vertical-align: top}
 td.printindex-index-section {vertical-align: top; padding-left: 1em}
 th.entries-header-printindex {text-align:left}
@@ -31,22 +32,11 @@ th.sections-header-printindex {text-align:left; 
padding-left: 1em}
 <body lang="en">
 
 
-<a class="node-id" id="first-before-top"></a><table class="nav-panel" 
cellpadding="1" cellspacing="1" border="0">
-<tr><td>[ &lt;&lt; ]</td>
-<td>[ &lt; ]</td>
-<td>[<a href="../dir_html/index.html" title="Up section"> Up </a>]</td>
-<td>[<a href="#node-in-menu-before-top" title="Next section in reading order"> 
&gt; </a>]</td>
-<td>[ &gt;&gt; ]</td>
-<td> &nbsp; </td>
-<td> &nbsp; </td>
-<td> &nbsp; </td>
-<td> &nbsp; </td>
-<td>[<a href="index.html" title="Cover (top) of document">Top</a>]</td>
-<td>[Contents]</td>
-<td>[<a href="#first-before-top" title="Index">Index</a>]</td>
-<td>[<a href="nodes_before_top_abt.html#SEC_About" title="About (help)"> ? 
</a>]</td>
-</tr></table>
-<h3 class="node">first before top</h3>
+<a class="node-id" id="first-before-top"></a><div class="nav-panel">
+<p>
+Next: <a href="index.html" accesskey="n" rel="next">Top</a>, Up: <a 
href="../dir_html/index.html" accesskey="u" rel="up">(dir)</a> &nbsp; [<a 
href="#first-before-top" title="Index" rel="index">Index</a>]</p>
+</div>
+<h4 class="node">first before top</h4>
 <a class="index-entry-id" id="index-first-before-top"></a>
 <div class="printindex cp-printindex">
 <table class="cp-letters-header-printindex"><tr><th>Jump to: &nbsp; 
</th><td><a class="summary-letter-printindex" 
href="#first-before-top_cp_symbol-1"><b>!</b></a>
@@ -111,28 +101,13 @@ th.sections-header-printindex {text-align:left; 
padding-left: 1em}
 </td></tr></table>
 </div>
 <p>in first node
-</p><table class="menu" border="0" cellspacing="0">
-<tr><td class="menu-entry-destination">&bull; <a 
href="#node-in-menu-before-top" rel="index">node in menu before 
top</a></td><td>&nbsp;&nbsp;</td><td class="menu-entry-description">
-</td></tr>
-</table>
-
+</p>
 <hr>
-<a class="node-id" id="node-in-menu-before-top"></a><table class="nav-panel" 
cellpadding="1" cellspacing="1" border="0">
-<tr><td>[ &lt;&lt; ]</td>
-<td>[<a href="#first-before-top" title="Previous section in reading order"> 
&lt; </a>]</td>
-<td>[<a href="#first-before-top" title="Up section"> Up </a>]</td>
-<td>[<a href="index.html" title="Next section in reading order"> &gt; 
</a>]</td>
-<td>[ &gt;&gt; ]</td>
-<td> &nbsp; </td>
-<td> &nbsp; </td>
-<td> &nbsp; </td>
-<td> &nbsp; </td>
-<td>[<a href="index.html" title="Cover (top) of document">Top</a>]</td>
-<td>[Contents]</td>
-<td>[<a href="#first-before-top" title="Index">Index</a>]</td>
-<td>[<a href="nodes_before_top_abt.html#SEC_About" title="About (help)"> ? 
</a>]</td>
-</tr></table>
-<h3 class="node">node in menu before top</h3>
+<a class="node-id" id="node-in-menu-before-top"></a><div class="nav-panel">
+<p>
+Up: <a href="#first-before-top" accesskey="u" rel="up">first before top</a> 
&nbsp; [<a href="#first-before-top" title="Index" rel="index">Index</a>]</p>
+</div>
+<h4 class="node">node in menu before top</h4>
 
 <a class="index-entry-id" id="index-node-in-menu-before-top"></a>
 <div class="printindex cp-printindex">
@@ -202,23 +177,12 @@ th.sections-header-printindex {text-align:left; 
padding-left: 1em}
 <a class="index-entry-id" id="index-printindex-node-in-menu-before-top"></a>
 
 
-<hr style="height: 6px;">
-<a class="node-id" id="first"></a><table class="nav-panel" cellpadding="1" 
cellspacing="1" border="0">
-<tr><td>[ &lt;&lt; ]</td>
-<td>[<a href="index.html" title="Previous section in reading order"> &lt; 
</a>]</td>
-<td>[<a href="index.html" title="Up section"> Up </a>]</td>
-<td>[<a href="#second" title="Next section in reading order"> &gt; </a>]</td>
-<td>[ &gt;&gt; ]</td>
-<td> &nbsp; </td>
-<td> &nbsp; </td>
-<td> &nbsp; </td>
-<td> &nbsp; </td>
-<td>[<a href="index.html" title="Cover (top) of document">Top</a>]</td>
-<td>[Contents]</td>
-<td>[<a href="#first-before-top" title="Index">Index</a>]</td>
-<td>[<a href="nodes_before_top_abt.html#SEC_About" title="About (help)"> ? 
</a>]</td>
-</tr></table>
-<h3 class="node">first</h3>
+<hr>
+<a class="node-id" id="first"></a><div class="nav-panel">
+<p>
+Previous: <a href="index.html" accesskey="p" rel="prev">Top</a>, Up: <a 
href="index.html" accesskey="u" rel="up">Top</a> &nbsp; [<a 
href="#first-before-top" title="Index" rel="index">Index</a>]</p>
+</div>
+<h4 class="node">first</h4>
 <p>Text and then index entries
 <a class="index-entry-id" id="index-_0021-entry-in-node"></a>
 <a class="index-entry-id" id="index-fun-in-node"></a>
@@ -287,34 +251,13 @@ th.sections-header-printindex {text-align:left; 
padding-left: 1em}
 </td></tr></table>
 </div>
 
-<table class="menu" border="0" cellspacing="0">
-<tr><td class="menu-entry-destination">&bull; <a href="#second" 
rel="index">second</a></td><td>&nbsp;&nbsp;</td><td 
class="menu-entry-description">
-</td></tr>
-</table>
 
 <hr>
-<a class="node-id" id="second"></a><table class="nav-panel" cellpadding="1" 
cellspacing="1" border="0">
-<tr><td>[ &lt;&lt; ]</td>
-<td>[<a href="#first" title="Previous section in reading order"> &lt; 
</a>]</td>
-<td>[<a href="#first" title="Up section"> Up </a>]</td>
-<td>[<a href="#another" title="Next section in reading order"> &gt; </a>]</td>
-<td>[ &gt;&gt; ]</td>
-<td> &nbsp; </td>
-<td> &nbsp; </td>
-<td> &nbsp; </td>
-<td> &nbsp; </td>
-<td>[<a href="index.html" title="Cover (top) of document">Top</a>]</td>
-<td>[Contents]</td>
-<td>[<a href="#first-before-top" title="Index">Index</a>]</td>
-<td>[<a href="nodes_before_top_abt.html#SEC_About" title="About (help)"> ? 
</a>]</td>
-</tr></table>
-<h3 class="node">second</h3>
-<table class="menu" border="0" cellspacing="0">
-<tr><td class="menu-entry-destination">&bull; <a href="#a-node" rel="index">a 
node</a></td><td>&nbsp;&nbsp;</td><td class="menu-entry-description">
-</td></tr>
-<tr><td class="menu-entry-destination">&bull; <a 
href="#another">another</a></td><td>&nbsp;&nbsp;</td><td 
class="menu-entry-description">
-</td></tr>
-</table>
+<a class="node-id" id="second"></a><div class="nav-panel">
+<p>
+Up: <a href="#first" accesskey="u" rel="up">first</a> &nbsp; [<a 
href="#first-before-top" title="Index" rel="index">Index</a>]</p>
+</div>
+<h4 class="node">second</h4>
 
 <div class="printindex fn-printindex">
 <table class="fn-letters-header-printindex"><tr><th>Jump to: &nbsp; 
</th><td><a class="summary-letter-printindex" 
href="#second_fn_letter-A"><b>A</b></a>
@@ -347,44 +290,22 @@ th.sections-header-printindex {text-align:left; 
padding-left: 1em}
 </div>
 
 <hr>
-<a class="node-id" id="another"></a><table class="nav-panel" cellpadding="1" 
cellspacing="1" border="0">
-<tr><td>[ &lt;&lt; ]</td>
-<td>[<a href="#second" title="Previous section in reading order"> &lt; 
</a>]</td>
-<td>[<a href="#second" title="Up section"> Up </a>]</td>
-<td>[<a href="#a-node" title="Next section in reading order"> &gt; </a>]</td>
-<td>[ &gt;&gt; ]</td>
-<td> &nbsp; </td>
-<td> &nbsp; </td>
-<td> &nbsp; </td>
-<td> &nbsp; </td>
-<td>[<a href="index.html" title="Cover (top) of document">Top</a>]</td>
-<td>[Contents]</td>
-<td>[<a href="#first-before-top" title="Index">Index</a>]</td>
-<td>[<a href="nodes_before_top_abt.html#SEC_About" title="About (help)"> ? 
</a>]</td>
-</tr></table>
-<h3 class="node">another</h3>
+<a class="node-id" id="another"></a><div class="nav-panel">
+<p>
+Previous: <a href="#a-node" accesskey="p" rel="prev">a node</a>, Up: <a 
href="#second" accesskey="u" rel="up">second</a> &nbsp; [<a 
href="#first-before-top" title="Index" rel="index">Index</a>]</p>
+</div>
+<h4 class="node">another</h4>
 
 <a class="index-entry-id" id="index-something"></a>
 <a class="index-entry-id" id="index-somewhere"></a>
 <a class="index-entry-id" id="index-another"></a>
 
 <hr>
-<a class="node-id" id="a-node"></a><table class="nav-panel" cellpadding="1" 
cellspacing="1" border="0">
-<tr><td>[ &lt;&lt; ]</td>
-<td>[<a href="#another" title="Previous section in reading order"> &lt; 
</a>]</td>
-<td>[<a href="#second" title="Up section"> Up </a>]</td>
-<td>[ &gt; ]</td>
-<td>[ &gt;&gt; ]</td>
-<td> &nbsp; </td>
-<td> &nbsp; </td>
-<td> &nbsp; </td>
-<td> &nbsp; </td>
-<td>[<a href="index.html" title="Cover (top) of document">Top</a>]</td>
-<td>[Contents]</td>
-<td>[<a href="#first-before-top" title="Index">Index</a>]</td>
-<td>[<a href="nodes_before_top_abt.html#SEC_About" title="About (help)"> ? 
</a>]</td>
-</tr></table>
-<h3 class="node">a node</h3>
+<a class="node-id" id="a-node"></a><div class="nav-panel">
+<p>
+Next: <a href="#another" accesskey="n" rel="next">another</a>, Up: <a 
href="#second" accesskey="u" rel="up">second</a> &nbsp; [<a 
href="#first-before-top" title="Index" rel="index">Index</a>]</p>
+</div>
+<h4 class="node">a node</h4>
 <a class="index-entry-id" id="index-entry-after-printindex"></a>
 
 <div class="printindex cp-printindex">
@@ -517,22 +438,11 @@ th.sections-header-printindex {text-align:left; 
padding-left: 1em}
 </div>
 
 <hr>
-<table class="nav-panel" cellpadding="1" cellspacing="1" border="0">
-<tr><td>[ &lt;&lt; ]</td>
-<td>[ &gt;&gt; ]</td>
-<td> &nbsp; </td>
-<td> &nbsp; </td>
-<td> &nbsp; </td>
-<td> &nbsp; </td>
-<td> &nbsp; </td>
-<td>[<a href="index.html" title="Cover (top) of document">Top</a>]</td>
-<td>[Contents]</td>
-<td>[<a href="#first-before-top" title="Index">Index</a>]</td>
-<td>[<a href="nodes_before_top_abt.html#SEC_About" title="About (help)"> ? 
</a>]</td>
-</tr></table>
+<div class="nav-panel">
 <p>
-  <span class="program-in-footer">This document was generated on <em 
class="emph">a sunny day</em> using <a class="uref" 
href="http://www.gnu.org/software/texinfo/";><em 
class="emph">texi2any</em></a>.</span>
-</p>
+Previous: <a href="index.html" accesskey="p" rel="prev">Top</a>, Up: <a 
href="index.html" accesskey="u" rel="up">Top</a> &nbsp; [<a 
href="#first-before-top" title="Index" rel="index">Index</a>]</p>
+</div>
+
 
 
 </body>
diff --git a/tp/t/results/moreindices/nodes_before_top/res_html/index.html 
b/tp/t/results/moreindices/nodes_before_top/res_html/index.html
index 0da1efacd8..ddc37ec207 100644
--- a/tp/t/results/moreindices/nodes_before_top/res_html/index.html
+++ b/tp/t/results/moreindices/nodes_before_top/res_html/index.html
@@ -12,12 +12,12 @@
 <meta name="Generator" content="texi2any">
 <meta name="viewport" content="width=device-width,initial-scale=1">
 
+<link href="#Top" rel="start" title="Top">
+<link href="first-before-top.html#first-before-top" rel="index" title="first 
before top">
+<link href="first-before-top.html#first-before-top" rel="prev" title="first 
before top">
 <style type="text/css">
 <!--
 a.summary-letter-printindex {text-decoration: none}
-span.program-in-footer {font-size: smaller}
-td.menu-entry-description {vertical-align: top}
-td.menu-entry-destination {vertical-align: top}
 td.printindex-index-entry {vertical-align: top}
 td.printindex-index-section {vertical-align: top; padding-left: 1em}
 th.entries-header-printindex {text-align:left}
@@ -29,14 +29,10 @@ th.sections-header-printindex {text-align:left; 
padding-left: 1em}
 </head>
 
 <body lang="en">
-<a class="node-id" id="Top"></a><table class="nav-panel" cellpadding="1" 
cellspacing="1" border="0">
-<tr><td>[<a href="first-before-top.html#node-in-menu-before-top" 
title="Previous section in reading order"> &lt; </a>]</td>
-<td>[<a href="first-before-top.html#first" title="Next section in reading 
order"> &gt; </a>]</td>
-<td> &nbsp; </td>
-<td>[Contents]</td>
-<td>[<a href="first-before-top.html#first-before-top" 
title="Index">Index</a>]</td>
-<td>[<a href="nodes_before_top_abt.html#SEC_About" title="About (help)"> ? 
</a>]</td>
-</tr></table>
+<a class="node-id" id="Top"></a><div class="nav-panel">
+<p>
+Previous: <a href="first-before-top.html#first-before-top" accesskey="p" 
rel="prev">first before top</a> &nbsp; [<a 
href="first-before-top.html#first-before-top" title="Index" 
rel="index">Index</a>]</p>
+</div>
 <h1 class="node">Top</h1>
 <a class="index-entry-id" id="index-entry-a"></a>
 
@@ -198,23 +194,13 @@ th.sections-header-printindex {text-align:left; 
padding-left: 1em}
 </td></tr></table>
 </div>
 
-<table class="menu" border="0" cellspacing="0">
-<tr><td class="menu-entry-destination">&bull; <a 
href="first-before-top.html#first" 
rel="index">first</a></td><td>&nbsp;&nbsp;</td><td 
class="menu-entry-description">
-</td></tr>
-</table>
 
 <hr>
-<table class="nav-panel" cellpadding="1" cellspacing="1" border="0">
-<tr><td>[<a href="first-before-top.html#node-in-menu-before-top" 
title="Previous section in reading order"> &lt; </a>]</td>
-<td>[<a href="first-before-top.html#first" title="Next section in reading 
order"> &gt; </a>]</td>
-<td> &nbsp; </td>
-<td>[Contents]</td>
-<td>[<a href="first-before-top.html#first-before-top" 
title="Index">Index</a>]</td>
-<td>[<a href="nodes_before_top_abt.html#SEC_About" title="About (help)"> ? 
</a>]</td>
-</tr></table>
+<div class="nav-panel">
 <p>
-  <span class="program-in-footer">This document was generated on <em 
class="emph">a sunny day</em> using <a class="uref" 
href="http://www.gnu.org/software/texinfo/";><em 
class="emph">texi2any</em></a>.</span>
-</p>
+Previous: <a href="first-before-top.html#first-before-top" accesskey="p" 
rel="prev">first before top</a> &nbsp; [<a 
href="first-before-top.html#first-before-top" title="Index" 
rel="index">Index</a>]</p>
+</div>
+
 
 
 </body>
diff --git 
a/tp/t/results/moreindices/nodes_before_top/res_html/nodes_before_top_abt.html 
b/tp/t/results/moreindices/nodes_before_top/res_html/nodes_before_top_abt.html
deleted file mode 100644
index f4fa88034e..0000000000
--- 
a/tp/t/results/moreindices/nodes_before_top/res_html/nodes_before_top_abt.html
+++ /dev/null
@@ -1,148 +0,0 @@
-<!DOCTYPE html>
-<html>
-<!-- Created by texinfo, http://www.gnu.org/software/texinfo/ -->
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-<title>About This Document (Untitled Document)</title>
-
-<meta name="description" content="About This Document (Untitled Document)">
-<meta name="keywords" content="About This Document (Untitled Document)">
-<meta name="resource-type" content="document">
-<meta name="distribution" content="global">
-<meta name="Generator" content="texi2any">
-<meta name="viewport" content="width=device-width,initial-scale=1">
-
-<style type="text/css">
-<!--
-span.program-in-footer {font-size: smaller}
-td.button-direction-about {text-align:center}
-td.name-direction-about {text-align:center}
--->
-</style>
-
-
-</head>
-
-<body lang="en">
-<div class="element-about" id="SEC_About">
-<table class="nav-panel" cellpadding="1" cellspacing="1" border="0">
-<tr><td>[<a href="index.html" title="Cover (top) of document">Top</a>]</td>
-<td>[Contents]</td>
-<td>[<a href="first-before-top.html#first-before-top" 
title="Index">Index</a>]</td>
-<td>[<a href="#SEC_About" title="About (help)"> ? </a>]</td>
-</tr></table>
-<h1 class="about-heading">About This Document</h1>
-
-<p>
-  This document was generated on <em class="emph">a sunny day</em> using <a 
class="uref" href="http://www.gnu.org/software/texinfo/";><em 
class="emph">texi2any</em></a>.
-</p>
-<p>
-  The buttons in the navigation panels have the following meaning:
-</p>
-<table border="1">
-  <tr>
-    <th> Button </th>
-    <th> Name </th>
-    <th> Go to </th>
-    <th> From 1.2.3 go to</th>
-  </tr>
-  <tr>
-    <td class="button-direction-about"> [ &lt;&lt; ] </td>
-    <td class="name-direction-about">FastBack</td>
-    <td>Beginning of this chapter or previous chapter</td>
-    <td>1</td>
-  </tr>
-  <tr>
-    <td class="button-direction-about"> [ &lt; ] </td>
-    <td class="name-direction-about">Back</td>
-    <td>Previous section in reading order</td>
-    <td>1.2.2</td>
-  </tr>
-  <tr>
-    <td class="button-direction-about"> [ Up ] </td>
-    <td class="name-direction-about">Up</td>
-    <td>Up section</td>
-    <td>1.2</td>
-  </tr>
-  <tr>
-    <td class="button-direction-about"> [ &gt; ] </td>
-    <td class="name-direction-about">Forward</td>
-    <td>Next section in reading order</td>
-    <td>1.2.4</td>
-  </tr>
-  <tr>
-    <td class="button-direction-about"> [ &gt;&gt; ] </td>
-    <td class="name-direction-about">FastForward</td>
-    <td>Next chapter</td>
-    <td>2</td>
-  </tr>
-  <tr>
-    <td class="button-direction-about"> [Top] </td>
-    <td class="name-direction-about">Top</td>
-    <td>Cover (top) of document</td>
-    <td> &nbsp; </td>
-  </tr>
-  <tr>
-    <td class="button-direction-about"> [Contents] </td>
-    <td class="name-direction-about">Contents</td>
-    <td>Table of contents</td>
-    <td> &nbsp; </td>
-  </tr>
-  <tr>
-    <td class="button-direction-about"> [Index] </td>
-    <td class="name-direction-about">Index</td>
-    <td>Index</td>
-    <td> &nbsp; </td>
-  </tr>
-  <tr>
-    <td class="button-direction-about"> [ ? ] </td>
-    <td class="name-direction-about">About</td>
-    <td>About (help)</td>
-    <td> &nbsp; </td>
-  </tr>
-</table>
-
-<p>
-  where the <strong class="strong"> Example </strong> assumes that the current 
position is at <strong class="strong"> Subsubsection One-Two-Three </strong> of 
a document of the following structure:
-</p>
-
-<ul>
-  <li> 1. Section One
-    <ul>
-      <li>1.1 Subsection One-One
-        <ul>
-          <li>...</li>
-        </ul>
-      </li>
-      <li>1.2 Subsection One-Two
-        <ul>
-          <li>1.2.1 Subsubsection One-Two-One</li>
-          <li>1.2.2 Subsubsection One-Two-Two</li>
-          <li>1.2.3 Subsubsection One-Two-Three &nbsp; &nbsp;
-            <strong>&lt;== Current Position </strong></li>
-          <li>1.2.4 Subsubsection One-Two-Four</li>
-        </ul>
-      </li>
-      <li>1.3 Subsection One-Three
-        <ul>
-          <li>...</li>
-        </ul>
-      </li>
-      <li>1.4 Subsection One-Four</li>
-    </ul>
-  </li>
-</ul>
-</div><hr>
-<table class="nav-panel" cellpadding="1" cellspacing="1" border="0">
-<tr><td>[<a href="index.html" title="Cover (top) of document">Top</a>]</td>
-<td>[Contents]</td>
-<td>[<a href="first-before-top.html#first-before-top" 
title="Index">Index</a>]</td>
-<td>[<a href="#SEC_About" title="About (help)"> ? </a>]</td>
-</tr></table>
-<p>
-  <span class="program-in-footer">This document was generated on <em 
class="emph">a sunny day</em> using <a class="uref" 
href="http://www.gnu.org/software/texinfo/";><em 
class="emph">texi2any</em></a>.</span>
-</p>
-
-
-</body>
-</html>
diff --git 
a/tp/t/results/moreindices/nodes_before_top_and_sections/res_html/nodes_before_top_and_sections.html
 
b/tp/t/results/moreindices/nodes_before_top_and_sections/res_html/nodes_before_top_and_sections.html
index 970375c356..f9c05b2868 100644
--- 
a/tp/t/results/moreindices/nodes_before_top_and_sections/res_html/nodes_before_top_and_sections.html
+++ 
b/tp/t/results/moreindices/nodes_before_top_and_sections/res_html/nodes_before_top_and_sections.html
@@ -12,14 +12,12 @@
 <meta name="Generator" content="texi2any">
 <meta name="viewport" content="width=device-width,initial-scale=1">
 
+<link href="#Top" rel="start" title="top section">
+<link href="#Top" rel="index" title="top section">
+<link href="#Top" rel="prev" title="top section">
 <style type="text/css">
 <!--
 a.summary-letter-printindex {text-decoration: none}
-span.program-in-footer {font-size: smaller}
-td.button-direction-about {text-align:center}
-td.menu-entry-description {vertical-align: top}
-td.menu-entry-destination {vertical-align: top}
-td.name-direction-about {text-align:center}
 td.printindex-index-entry {vertical-align: top}
 td.printindex-index-section {vertical-align: top; padding-left: 1em}
 th.entries-header-printindex {text-align:left}
@@ -33,14 +31,10 @@ th.sections-header-printindex {text-align:left; 
padding-left: 1em}
 <body lang="en">
 
 
-<a class="node" id="first-before-top"></a><table class="nav-panel" 
cellpadding="1" cellspacing="1" border="0">
-<tr><td>[ &lt; ]</td>
-<td>[<a href="#chapter" title="Next section in reading order"> &gt; </a>]</td>
-<td> &nbsp; </td>
-<td>[Contents]</td>
-<td>[<a href="#Top" title="Index">Index</a>]</td>
-<td>[<a href="#SEC_About" title="About (help)"> ? </a>]</td>
-</tr></table>
+<a class="node" id="first-before-top"></a><div class="nav-panel">
+<p>
+ &nbsp; [<a href="#Top" title="Index" rel="index">Index</a>]</p>
+</div>
 <a class="index-entry-id" id="index-first-before-top"></a>
 
 <p>in first node before printindex
@@ -186,11 +180,7 @@ th.sections-header-printindex {text-align:left; 
padding-left: 1em}
 </td></tr></table>
 </div>
 <p>after second printindex in first node
-</p><table class="menu" border="0" cellspacing="0">
-<tr><td class="menu-entry-destination">&bull; <a 
href="#node-in-menu-before-top" rel="index">node in menu before 
top</a></td><td>&nbsp;&nbsp;</td><td class="menu-entry-description">
-</td></tr>
-</table>
-
+</p>
 <a class="node" id="node-in-menu-before-top"></a>
 <a class="index-entry-id" id="index-node-in-menu-before-top"></a>
 <p>between node in menu before top and printindex
@@ -451,15 +441,10 @@ th.sections-header-printindex {text-align:left; 
padding-left: 1em}
 
 <p>in top section
 </p>
-<table class="menu" border="0" cellspacing="0">
-<tr><td class="menu-entry-destination">&bull; <a href="#first" 
rel="index">first</a></td><td>&nbsp;&nbsp;</td><td 
class="menu-entry-description">
-</td></tr>
-<tr><td class="menu-entry-destination"><a href="#chapter" rel="index">1 A 
chapter</a></td><td>&nbsp;&nbsp;</td><td class="menu-entry-description">
-</td></tr>
-<tr><td class="menu-entry-destination">&bull; <a href="#node-in-chapter">node 
in chapter</a></td><td>&nbsp;&nbsp;</td><td class="menu-entry-description">
-</td></tr>
-</table>
 
+<ul class="mini-toc">
+<li><a href="#chapter" accesskey="1">A chapter</a></li>
+</ul>
 <a class="node" id="first"></a><p>Text and then index entries
 <a class="index-entry-id" id="index-_0021-entry-in-node"></a>
 <a class="index-entry-id" id="index-fun-in-node"></a>
@@ -536,18 +521,8 @@ th.sections-header-printindex {text-align:left; 
padding-left: 1em}
 </td></tr></table>
 </div>
 
-<table class="menu" border="0" cellspacing="0">
-<tr><td class="menu-entry-destination">&bull; <a href="#second" 
rel="index">second</a></td><td>&nbsp;&nbsp;</td><td 
class="menu-entry-description">
-</td></tr>
-</table>
-
-<a class="node" id="second"></a><table class="menu" border="0" cellspacing="0">
-<tr><td class="menu-entry-destination">&bull; <a href="#a-node" rel="index">a 
node</a></td><td>&nbsp;&nbsp;</td><td class="menu-entry-description">
-</td></tr>
-<tr><td class="menu-entry-destination">&bull; <a 
href="#another">another</a></td><td>&nbsp;&nbsp;</td><td 
class="menu-entry-description">
-</td></tr>
-</table>
 
+<a class="node" id="second"></a>
 <div class="printindex fn-printindex">
 <table class="fn-letters-header-printindex"><tr><th>Jump to: &nbsp; 
</th><td><a class="summary-letter-printindex" 
href="#top-section_fn_letter-A"><b>A</b></a>
  &nbsp; 
@@ -730,24 +705,13 @@ th.sections-header-printindex {text-align:left; 
padding-left: 1em}
 </td></tr></table>
 </div>
 
-<hr style="height: 6px;">
+<hr>
 <div class="chapter-level-extent" id="chapter">
-<table class="nav-panel" cellpadding="1" cellspacing="1" border="0">
-<tr><td>[<a href="#Top" title="Beginning of this chapter or previous chapter"> 
&lt;&lt; </a>]</td>
-<td>[<a href="#Top" title="Previous section in reading order"> &lt; </a>]</td>
-<td>[<a href="#Top" title="Up section"> Up </a>]</td>
-<td>[ &gt; ]</td>
-<td>[ &gt;&gt; ]</td>
-<td> &nbsp; </td>
-<td> &nbsp; </td>
-<td> &nbsp; </td>
-<td> &nbsp; </td>
-<td>[<a href="#Top" title="Cover (top) of document">Top</a>]</td>
-<td>[Contents]</td>
-<td>[<a href="#Top" title="Index">Index</a>]</td>
-<td>[<a href="#SEC_About" title="About (help)"> ? </a>]</td>
-</tr></table>
-<h1 class="chapter" id="A-chapter">1 A chapter</h1>
+<div class="nav-panel">
+<p>
+ Up : <a href="#Top" accesskey="u" rel="up">top section</a> &nbsp; [<a 
href="#Top" title="Index" rel="index">Index</a>]</p>
+</div>
+<h2 class="chapter" id="A-chapter">1 A chapter</h2>
 
 <div class="printindex cp-printindex">
 <table class="cp-letters-header-printindex"><tr><th>Jump to: &nbsp; 
</th><td><a class="summary-letter-printindex" 
href="#A-chapter_cp_symbol-1"><b>!</b></a>
@@ -823,121 +787,9 @@ th.sections-header-printindex {text-align:left; 
padding-left: 1em}
 <a class="node" id="node-in-chapter"></a>
 <a class="index-entry-id" id="index-node-in-chapter"></a>
 
-<hr style="height: 6px;">
 </div>
 </div>
-<div class="element-about" id="SEC_About">
-<table class="nav-panel" cellpadding="1" cellspacing="1" border="0">
-<tr><td>[<a href="#Top" title="Cover (top) of document">Top</a>]</td>
-<td>[Contents]</td>
-<td>[<a href="#Top" title="Index">Index</a>]</td>
-<td>[<a href="#SEC_About" title="About (help)"> ? </a>]</td>
-</tr></table>
-<h1 class="about-heading">About This Document</h1>
 
-<p>
-  This document was generated on <em class="emph">a sunny day</em> using <a 
class="uref" href="http://www.gnu.org/software/texinfo/";><em 
class="emph">texi2any</em></a>.
-</p>
-<p>
-  The buttons in the navigation panels have the following meaning:
-</p>
-<table border="1">
-  <tr>
-    <th> Button </th>
-    <th> Name </th>
-    <th> Go to </th>
-    <th> From 1.2.3 go to</th>
-  </tr>
-  <tr>
-    <td class="button-direction-about"> [ &lt;&lt; ] </td>
-    <td class="name-direction-about">FastBack</td>
-    <td>Beginning of this chapter or previous chapter</td>
-    <td>1</td>
-  </tr>
-  <tr>
-    <td class="button-direction-about"> [ &lt; ] </td>
-    <td class="name-direction-about">Back</td>
-    <td>Previous section in reading order</td>
-    <td>1.2.2</td>
-  </tr>
-  <tr>
-    <td class="button-direction-about"> [ Up ] </td>
-    <td class="name-direction-about">Up</td>
-    <td>Up section</td>
-    <td>1.2</td>
-  </tr>
-  <tr>
-    <td class="button-direction-about"> [ &gt; ] </td>
-    <td class="name-direction-about">Forward</td>
-    <td>Next section in reading order</td>
-    <td>1.2.4</td>
-  </tr>
-  <tr>
-    <td class="button-direction-about"> [ &gt;&gt; ] </td>
-    <td class="name-direction-about">FastForward</td>
-    <td>Next chapter</td>
-    <td>2</td>
-  </tr>
-  <tr>
-    <td class="button-direction-about"> [Top] </td>
-    <td class="name-direction-about">Top</td>
-    <td>Cover (top) of document</td>
-    <td> &nbsp; </td>
-  </tr>
-  <tr>
-    <td class="button-direction-about"> [Contents] </td>
-    <td class="name-direction-about">Contents</td>
-    <td>Table of contents</td>
-    <td> &nbsp; </td>
-  </tr>
-  <tr>
-    <td class="button-direction-about"> [Index] </td>
-    <td class="name-direction-about">Index</td>
-    <td>Index</td>
-    <td> &nbsp; </td>
-  </tr>
-  <tr>
-    <td class="button-direction-about"> [ ? ] </td>
-    <td class="name-direction-about">About</td>
-    <td>About (help)</td>
-    <td> &nbsp; </td>
-  </tr>
-</table>
-
-<p>
-  where the <strong class="strong"> Example </strong> assumes that the current 
position is at <strong class="strong"> Subsubsection One-Two-Three </strong> of 
a document of the following structure:
-</p>
-
-<ul>
-  <li> 1. Section One
-    <ul>
-      <li>1.1 Subsection One-One
-        <ul>
-          <li>...</li>
-        </ul>
-      </li>
-      <li>1.2 Subsection One-Two
-        <ul>
-          <li>1.2.1 Subsubsection One-Two-One</li>
-          <li>1.2.2 Subsubsection One-Two-Two</li>
-          <li>1.2.3 Subsubsection One-Two-Three &nbsp; &nbsp;
-            <strong>&lt;== Current Position </strong></li>
-          <li>1.2.4 Subsubsection One-Two-Four</li>
-        </ul>
-      </li>
-      <li>1.3 Subsection One-Three
-        <ul>
-          <li>...</li>
-        </ul>
-      </li>
-      <li>1.4 Subsection One-Four</li>
-    </ul>
-  </li>
-</ul>
-</div><hr>
-<p>
-  <span class="program-in-footer">This document was generated on <em 
class="emph">a sunny day</em> using <a class="uref" 
href="http://www.gnu.org/software/texinfo/";><em 
class="emph">texi2any</em></a>.</span>
-</p>
 
 
 </body>
diff --git 
a/tp/t/results/moreindices/nodes_before_top_no_nodes/res_html/index.html 
b/tp/t/results/moreindices/nodes_before_top_no_nodes/res_html/index.html
index 38fedfbb07..94dfb7570b 100644
--- a/tp/t/results/moreindices/nodes_before_top_no_nodes/res_html/index.html
+++ b/tp/t/results/moreindices/nodes_before_top_no_nodes/res_html/index.html
@@ -15,9 +15,6 @@
 <style type="text/css">
 <!--
 a.summary-letter-printindex {text-decoration: none}
-span.program-in-footer {font-size: smaller}
-td.menu-entry-description {vertical-align: top}
-td.menu-entry-destination {vertical-align: top}
 td.printindex-index-entry {vertical-align: top}
 td.printindex-index-section {vertical-align: top; padding-left: 1em}
 th.entries-header-printindex {text-align:left}
@@ -95,11 +92,7 @@ th.sections-header-printindex {text-align:left; 
padding-left: 1em}
 </td></tr></table>
 </div>
 <p>in first node
-</p><table class="menu" border="0" cellspacing="0">
-<tr><td class="menu-entry-destination">&bull; <a 
href="#node-in-menu-before-top" rel="index">node in menu before 
top</a></td><td>&nbsp;&nbsp;</td><td class="menu-entry-description">
-</td></tr>
-</table>
-
+</p>
 <a class="node" id="node-in-menu-before-top"></a>
 <a class="index-entry-id" id="index-node-in-menu-before-top"></a>
 <div class="printindex cp-printindex">
@@ -329,10 +322,6 @@ th.sections-header-printindex {text-align:left; 
padding-left: 1em}
 </td></tr></table>
 </div>
 
-<table class="menu" border="0" cellspacing="0">
-<tr><td class="menu-entry-destination">&bull; <a href="#first" 
rel="index">first</a></td><td>&nbsp;&nbsp;</td><td 
class="menu-entry-description">
-</td></tr>
-</table>
 
 <a class="node" id="first"></a><p>Text and then index entries
 <a class="index-entry-id" id="index-_0021-entry-in-node"></a>
@@ -402,18 +391,8 @@ th.sections-header-printindex {text-align:left; 
padding-left: 1em}
 </td></tr></table>
 </div>
 
-<table class="menu" border="0" cellspacing="0">
-<tr><td class="menu-entry-destination">&bull; <a href="#second" 
rel="index">second</a></td><td>&nbsp;&nbsp;</td><td 
class="menu-entry-description">
-</td></tr>
-</table>
-
-<a class="node" id="second"></a><table class="menu" border="0" cellspacing="0">
-<tr><td class="menu-entry-destination">&bull; <a href="#a-node" rel="index">a 
node</a></td><td>&nbsp;&nbsp;</td><td class="menu-entry-description">
-</td></tr>
-<tr><td class="menu-entry-destination">&bull; <a 
href="#another">another</a></td><td>&nbsp;&nbsp;</td><td 
class="menu-entry-description">
-</td></tr>
-</table>
 
+<a class="node" id="second"></a>
 <div class="printindex fn-printindex">
 <table class="fn-letters-header-printindex"><tr><th>Jump to: &nbsp; 
</th><td><a class="summary-letter-printindex" 
href="#t_i_fn_letter-A"><b>A</b></a>
  &nbsp; 
@@ -580,10 +559,7 @@ th.sections-header-printindex {text-align:left; 
padding-left: 1em}
 </td></tr></table>
 </div>
 
-<hr>
-<p>
-  <span class="program-in-footer">This document was generated on <em 
class="emph">a sunny day</em> using <a class="uref" 
href="http://www.gnu.org/software/texinfo/";><em 
class="emph">texi2any</em></a>.</span>
-</p>
+
 
 
 </body>
diff --git 
a/tp/t/results/moreindices/nodes_before_top_nodes/res_html/a-node.html 
b/tp/t/results/moreindices/nodes_before_top_nodes/res_html/a-node.html
index ac64f41149..761ea7cd58 100644
--- a/tp/t/results/moreindices/nodes_before_top_nodes/res_html/a-node.html
+++ b/tp/t/results/moreindices/nodes_before_top_nodes/res_html/a-node.html
@@ -12,10 +12,13 @@
 <meta name="Generator" content="texi2any">
 <meta name="viewport" content="width=device-width,initial-scale=1">
 
+<link href="index.html" rel="start" title="Top">
+<link href="first-before-top.html" rel="index" title="first before top">
+<link href="second.html" rel="up" title="second">
+<link href="another.html" rel="next" title="another">
 <style type="text/css">
 <!--
 a.summary-letter-printindex {text-decoration: none}
-span.program-in-footer {font-size: smaller}
 td.printindex-index-entry {vertical-align: top}
 td.printindex-index-section {vertical-align: top; padding-left: 1em}
 th.entries-header-printindex {text-align:left}
@@ -27,23 +30,12 @@ th.sections-header-printindex {text-align:left; 
padding-left: 1em}
 </head>
 
 <body lang="en">
-<a class="node-id" id="a-node"></a><table class="nav-panel" cellpadding="1" 
cellspacing="1" border="0">
-<tr><td>[ &lt;&lt; ]</td>
-<td>[<a href="another.html" title="Previous section in reading order"> &lt; 
</a>]</td>
-<td>[<a href="second.html" title="Up section"> Up </a>]</td>
-<td>[ &gt; ]</td>
-<td>[ &gt;&gt; ]</td>
-<td> &nbsp; </td>
-<td> &nbsp; </td>
-<td> &nbsp; </td>
-<td> &nbsp; </td>
-<td>[<a href="index.html" title="Cover (top) of document">Top</a>]</td>
-<td>[Contents]</td>
-<td>[<a href="first-before-top.html" title="Index">Index</a>]</td>
-<td>[<a href="nodes_before_top_abt.html#SEC_About" title="About (help)"> ? 
</a>]</td>
-</tr></table>
+<a class="node-id" id="a-node"></a><div class="nav-panel">
+<p>
+Next: <a href="another.html" accesskey="n" rel="next">another</a>, Up: <a 
href="second.html" accesskey="u" rel="up">second</a> &nbsp; [<a 
href="first-before-top.html" title="Index" rel="index">Index</a>]</p>
+</div>
 <hr>
-<h3 class="node">a node</h3>
+<h4 class="node">a node</h4>
 <a class="index-entry-id" id="index-entry-after-printindex"></a>
 
 <div class="printindex cp-printindex">
@@ -176,24 +168,11 @@ th.sections-header-printindex {text-align:left; 
padding-left: 1em}
 </div>
 
 <hr>
-<table class="nav-panel" cellpadding="1" cellspacing="1" border="0">
-<tr><td>[ &lt;&lt; ]</td>
-<td>[<a href="another.html" title="Previous section in reading order"> &lt; 
</a>]</td>
-<td>[<a href="second.html" title="Up section"> Up </a>]</td>
-<td>[ &gt; ]</td>
-<td>[ &gt;&gt; ]</td>
-<td> &nbsp; </td>
-<td> &nbsp; </td>
-<td> &nbsp; </td>
-<td> &nbsp; </td>
-<td>[<a href="index.html" title="Cover (top) of document">Top</a>]</td>
-<td>[Contents]</td>
-<td>[<a href="first-before-top.html" title="Index">Index</a>]</td>
-<td>[<a href="nodes_before_top_abt.html#SEC_About" title="About (help)"> ? 
</a>]</td>
-</tr></table>
+<div class="nav-panel">
 <p>
-  <span class="program-in-footer">This document was generated on <em 
class="emph">a sunny day</em> using <a class="uref" 
href="http://www.gnu.org/software/texinfo/";><em 
class="emph">texi2any</em></a>.</span>
-</p>
+Next: <a href="another.html">another</a>, Up: <a href="second.html">second</a> 
&nbsp; [<a href="first-before-top.html" title="Index" rel="index">Index</a>]</p>
+</div>
+
 
 
 </body>
diff --git 
a/tp/t/results/moreindices/nodes_before_top_nodes/res_html/another.html 
b/tp/t/results/moreindices/nodes_before_top_nodes/res_html/another.html
index 9bc2c71508..c63192e2c8 100644
--- a/tp/t/results/moreindices/nodes_before_top_nodes/res_html/another.html
+++ b/tp/t/results/moreindices/nodes_before_top_nodes/res_html/another.html
@@ -12,42 +12,27 @@
 <meta name="Generator" content="texi2any">
 <meta name="viewport" content="width=device-width,initial-scale=1">
 
-<style type="text/css">
-<!--
-span.program-in-footer {font-size: smaller}
--->
-</style>
+<link href="index.html" rel="start" title="Top">
+<link href="first-before-top.html" rel="index" title="first before top">
+<link href="second.html" rel="up" title="second">
+<link href="a-node.html" rel="prev" title="a node">
 
 
 </head>
 
 <body lang="en">
-<a class="node-id" id="another"></a><table class="nav-panel" cellpadding="1" 
cellspacing="1" border="0">
-<tr><td>[ &lt;&lt; ]</td>
-<td>[<a href="second.html" title="Previous section in reading order"> &lt; 
</a>]</td>
-<td>[<a href="second.html" title="Up section"> Up </a>]</td>
-<td>[<a href="a-node.html" title="Next section in reading order"> &gt; 
</a>]</td>
-<td>[ &gt;&gt; ]</td>
-<td> &nbsp; </td>
-<td> &nbsp; </td>
-<td> &nbsp; </td>
-<td> &nbsp; </td>
-<td>[<a href="index.html" title="Cover (top) of document">Top</a>]</td>
-<td>[Contents]</td>
-<td>[<a href="first-before-top.html" title="Index">Index</a>]</td>
-<td>[<a href="nodes_before_top_abt.html#SEC_About" title="About (help)"> ? 
</a>]</td>
-</tr></table>
+<a class="node-id" id="another"></a><div class="nav-panel">
+<p>
+Previous: <a href="a-node.html" accesskey="p" rel="prev">a node</a>, Up: <a 
href="second.html" accesskey="u" rel="up">second</a> &nbsp; [<a 
href="first-before-top.html" title="Index" rel="index">Index</a>]</p>
+</div>
 <hr>
-<h3 class="node">another</h3>
+<h4 class="node">another</h4>
 
 <a class="index-entry-id" id="index-something"></a>
 <a class="index-entry-id" id="index-somewhere"></a>
 <a class="index-entry-id" id="index-another"></a>
 
-<hr>
-<p>
-  <span class="program-in-footer">This document was generated on <em 
class="emph">a sunny day</em> using <a class="uref" 
href="http://www.gnu.org/software/texinfo/";><em 
class="emph">texi2any</em></a>.</span>
-</p>
+
 
 
 </body>
diff --git 
a/tp/t/results/moreindices/nodes_before_top_nodes/res_html/first-before-top.html
 
b/tp/t/results/moreindices/nodes_before_top_nodes/res_html/first-before-top.html
index 6bc768b453..01393a3afb 100644
--- 
a/tp/t/results/moreindices/nodes_before_top_nodes/res_html/first-before-top.html
+++ 
b/tp/t/results/moreindices/nodes_before_top_nodes/res_html/first-before-top.html
@@ -12,12 +12,13 @@
 <meta name="Generator" content="texi2any">
 <meta name="viewport" content="width=device-width,initial-scale=1">
 
+<link href="index.html" rel="start" title="Top">
+<link href="#first-before-top" rel="index" title="first before top">
+<link href="../dir_html/index.html" rel="up" title="(dir)">
+<link href="index.html" rel="next" title="Top">
 <style type="text/css">
 <!--
 a.summary-letter-printindex {text-decoration: none}
-span.program-in-footer {font-size: smaller}
-td.menu-entry-description {vertical-align: top}
-td.menu-entry-destination {vertical-align: top}
 td.printindex-index-entry {vertical-align: top}
 td.printindex-index-section {vertical-align: top; padding-left: 1em}
 th.entries-header-printindex {text-align:left}
@@ -31,23 +32,12 @@ th.sections-header-printindex {text-align:left; 
padding-left: 1em}
 <body lang="en">
 
 
-<a class="node-id" id="first-before-top"></a><table class="nav-panel" 
cellpadding="1" cellspacing="1" border="0">
-<tr><td>[ &lt;&lt; ]</td>
-<td>[ &lt; ]</td>
-<td>[<a href="../dir_html/index.html" title="Up section"> Up </a>]</td>
-<td>[<a href="node-in-menu-before-top.html" title="Next section in reading 
order"> &gt; </a>]</td>
-<td>[ &gt;&gt; ]</td>
-<td> &nbsp; </td>
-<td> &nbsp; </td>
-<td> &nbsp; </td>
-<td> &nbsp; </td>
-<td>[<a href="index.html" title="Cover (top) of document">Top</a>]</td>
-<td>[Contents]</td>
-<td>[<a href="#first-before-top" title="Index">Index</a>]</td>
-<td>[<a href="nodes_before_top_abt.html#SEC_About" title="About (help)"> ? 
</a>]</td>
-</tr></table>
+<a class="node-id" id="first-before-top"></a><div class="nav-panel">
+<p>
+Next: <a href="index.html" accesskey="n" rel="next">Top</a>, Up: <a 
href="../dir_html/index.html" accesskey="u" rel="up">(dir)</a> &nbsp; [<a 
href="#first-before-top" title="Index" rel="index">Index</a>]</p>
+</div>
 <hr>
-<h3 class="node">first before top</h3>
+<h4 class="node">first before top</h4>
 <a class="index-entry-id" id="index-first-before-top"></a>
 <div class="printindex cp-printindex">
 <table class="cp-letters-header-printindex"><tr><th>Jump to: &nbsp; 
</th><td><a class="summary-letter-printindex" 
href="#first-before-top_cp_symbol-1"><b>!</b></a>
@@ -112,16 +102,9 @@ th.sections-header-printindex {text-align:left; 
padding-left: 1em}
 </td></tr></table>
 </div>
 <p>in first node
-</p><table class="menu" border="0" cellspacing="0">
-<tr><td class="menu-entry-destination">&bull; <a 
href="node-in-menu-before-top.html" rel="index">node in menu before 
top</a></td><td>&nbsp;&nbsp;</td><td class="menu-entry-description">
-</td></tr>
-</table>
-
-<hr>
-<p>
-  <span class="program-in-footer">This document was generated on <em 
class="emph">a sunny day</em> using <a class="uref" 
href="http://www.gnu.org/software/texinfo/";><em 
class="emph">texi2any</em></a>.</span>
 </p>
 
 
+
 </body>
 </html>
diff --git 
a/tp/t/results/moreindices/nodes_before_top_nodes/res_html/first.html 
b/tp/t/results/moreindices/nodes_before_top_nodes/res_html/first.html
index e1f773f546..4b31354eaa 100644
--- a/tp/t/results/moreindices/nodes_before_top_nodes/res_html/first.html
+++ b/tp/t/results/moreindices/nodes_before_top_nodes/res_html/first.html
@@ -12,12 +12,13 @@
 <meta name="Generator" content="texi2any">
 <meta name="viewport" content="width=device-width,initial-scale=1">
 
+<link href="index.html" rel="start" title="Top">
+<link href="first-before-top.html" rel="index" title="first before top">
+<link href="index.html" rel="up" title="Top">
+<link href="index.html" rel="prev" title="Top">
 <style type="text/css">
 <!--
 a.summary-letter-printindex {text-decoration: none}
-span.program-in-footer {font-size: smaller}
-td.menu-entry-description {vertical-align: top}
-td.menu-entry-destination {vertical-align: top}
 td.printindex-index-entry {vertical-align: top}
 td.printindex-index-section {vertical-align: top; padding-left: 1em}
 th.entries-header-printindex {text-align:left}
@@ -29,23 +30,12 @@ th.sections-header-printindex {text-align:left; 
padding-left: 1em}
 </head>
 
 <body lang="en">
-<a class="node-id" id="first"></a><table class="nav-panel" cellpadding="1" 
cellspacing="1" border="0">
-<tr><td>[ &lt;&lt; ]</td>
-<td>[<a href="index.html" title="Previous section in reading order"> &lt; 
</a>]</td>
-<td>[<a href="index.html" title="Up section"> Up </a>]</td>
-<td>[<a href="second.html" title="Next section in reading order"> &gt; 
</a>]</td>
-<td>[ &gt;&gt; ]</td>
-<td> &nbsp; </td>
-<td> &nbsp; </td>
-<td> &nbsp; </td>
-<td> &nbsp; </td>
-<td>[<a href="index.html" title="Cover (top) of document">Top</a>]</td>
-<td>[Contents]</td>
-<td>[<a href="first-before-top.html" title="Index">Index</a>]</td>
-<td>[<a href="nodes_before_top_abt.html#SEC_About" title="About (help)"> ? 
</a>]</td>
-</tr></table>
+<a class="node-id" id="first"></a><div class="nav-panel">
+<p>
+Previous: <a href="index.html" accesskey="p" rel="prev">Top</a>, Up: <a 
href="index.html" accesskey="u" rel="up">Top</a> &nbsp; [<a 
href="first-before-top.html" title="Index" rel="index">Index</a>]</p>
+</div>
 <hr>
-<h3 class="node">first</h3>
+<h4 class="node">first</h4>
 <p>Text and then index entries
 <a class="index-entry-id" id="index-_0021-entry-in-node"></a>
 <a class="index-entry-id" id="index-fun-in-node"></a>
@@ -114,15 +104,8 @@ th.sections-header-printindex {text-align:left; 
padding-left: 1em}
 </td></tr></table>
 </div>
 
-<table class="menu" border="0" cellspacing="0">
-<tr><td class="menu-entry-destination">&bull; <a href="second.html" 
rel="index">second</a></td><td>&nbsp;&nbsp;</td><td 
class="menu-entry-description">
-</td></tr>
-</table>
 
-<hr>
-<p>
-  <span class="program-in-footer">This document was generated on <em 
class="emph">a sunny day</em> using <a class="uref" 
href="http://www.gnu.org/software/texinfo/";><em 
class="emph">texi2any</em></a>.</span>
-</p>
+
 
 
 </body>
diff --git 
a/tp/t/results/moreindices/nodes_before_top_nodes/res_html/index.html 
b/tp/t/results/moreindices/nodes_before_top_nodes/res_html/index.html
index a6aa654bca..8d9d8b43cb 100644
--- a/tp/t/results/moreindices/nodes_before_top_nodes/res_html/index.html
+++ b/tp/t/results/moreindices/nodes_before_top_nodes/res_html/index.html
@@ -12,12 +12,12 @@
 <meta name="Generator" content="texi2any">
 <meta name="viewport" content="width=device-width,initial-scale=1">
 
+<link href="#Top" rel="start" title="Top">
+<link href="first-before-top.html" rel="index" title="first before top">
+<link href="first-before-top.html" rel="prev" title="first before top">
 <style type="text/css">
 <!--
 a.summary-letter-printindex {text-decoration: none}
-span.program-in-footer {font-size: smaller}
-td.menu-entry-description {vertical-align: top}
-td.menu-entry-destination {vertical-align: top}
 td.printindex-index-entry {vertical-align: top}
 td.printindex-index-section {vertical-align: top; padding-left: 1em}
 th.entries-header-printindex {text-align:left}
@@ -29,14 +29,10 @@ th.sections-header-printindex {text-align:left; 
padding-left: 1em}
 </head>
 
 <body lang="en">
-<a class="node-id" id="Top"></a><table class="nav-panel" cellpadding="1" 
cellspacing="1" border="0">
-<tr><td>[<a href="node-in-menu-before-top.html" title="Previous section in 
reading order"> &lt; </a>]</td>
-<td>[<a href="first.html" title="Next section in reading order"> &gt; 
</a>]</td>
-<td> &nbsp; </td>
-<td>[Contents]</td>
-<td>[<a href="first-before-top.html" title="Index">Index</a>]</td>
-<td>[<a href="nodes_before_top_abt.html#SEC_About" title="About (help)"> ? 
</a>]</td>
-</tr></table>
+<a class="node-id" id="Top"></a><div class="nav-panel">
+<p>
+Previous: <a href="first-before-top.html" accesskey="p" rel="prev">first 
before top</a> &nbsp; [<a href="first-before-top.html" title="Index" 
rel="index">Index</a>]</p>
+</div>
 <hr>
 <h1 class="node">Top</h1>
 <a class="index-entry-id" id="index-entry-a"></a>
@@ -199,23 +195,13 @@ th.sections-header-printindex {text-align:left; 
padding-left: 1em}
 </td></tr></table>
 </div>
 
-<table class="menu" border="0" cellspacing="0">
-<tr><td class="menu-entry-destination">&bull; <a href="first.html" 
rel="index">first</a></td><td>&nbsp;&nbsp;</td><td 
class="menu-entry-description">
-</td></tr>
-</table>
 
 <hr>
-<table class="nav-panel" cellpadding="1" cellspacing="1" border="0">
-<tr><td>[<a href="node-in-menu-before-top.html" title="Previous section in 
reading order"> &lt; </a>]</td>
-<td>[<a href="first.html" title="Next section in reading order"> &gt; 
</a>]</td>
-<td> &nbsp; </td>
-<td>[Contents]</td>
-<td>[<a href="first-before-top.html" title="Index">Index</a>]</td>
-<td>[<a href="nodes_before_top_abt.html#SEC_About" title="About (help)"> ? 
</a>]</td>
-</tr></table>
+<div class="nav-panel">
 <p>
-  <span class="program-in-footer">This document was generated on <em 
class="emph">a sunny day</em> using <a class="uref" 
href="http://www.gnu.org/software/texinfo/";><em 
class="emph">texi2any</em></a>.</span>
-</p>
+Previous: <a href="first-before-top.html" accesskey="p" rel="prev">first 
before top</a> &nbsp; [<a href="first-before-top.html" title="Index" 
rel="index">Index</a>]</p>
+</div>
+
 
 
 </body>
diff --git 
a/tp/t/results/moreindices/nodes_before_top_nodes/res_html/node-in-menu-before-top.html
 
b/tp/t/results/moreindices/nodes_before_top_nodes/res_html/node-in-menu-before-top.html
index fc99520051..0d8f79e646 100644
--- 
a/tp/t/results/moreindices/nodes_before_top_nodes/res_html/node-in-menu-before-top.html
+++ 
b/tp/t/results/moreindices/nodes_before_top_nodes/res_html/node-in-menu-before-top.html
@@ -12,10 +12,12 @@
 <meta name="Generator" content="texi2any">
 <meta name="viewport" content="width=device-width,initial-scale=1">
 
+<link href="index.html" rel="start" title="Top">
+<link href="first-before-top.html" rel="index" title="first before top">
+<link href="first-before-top.html" rel="up" title="first before top">
 <style type="text/css">
 <!--
 a.summary-letter-printindex {text-decoration: none}
-span.program-in-footer {font-size: smaller}
 td.printindex-index-entry {vertical-align: top}
 td.printindex-index-section {vertical-align: top; padding-left: 1em}
 th.entries-header-printindex {text-align:left}
@@ -27,23 +29,12 @@ th.sections-header-printindex {text-align:left; 
padding-left: 1em}
 </head>
 
 <body lang="en">
-<a class="node-id" id="node-in-menu-before-top"></a><table class="nav-panel" 
cellpadding="1" cellspacing="1" border="0">
-<tr><td>[ &lt;&lt; ]</td>
-<td>[<a href="first-before-top.html" title="Previous section in reading 
order"> &lt; </a>]</td>
-<td>[<a href="first-before-top.html" title="Up section"> Up </a>]</td>
-<td>[<a href="index.html" title="Next section in reading order"> &gt; 
</a>]</td>
-<td>[ &gt;&gt; ]</td>
-<td> &nbsp; </td>
-<td> &nbsp; </td>
-<td> &nbsp; </td>
-<td> &nbsp; </td>
-<td>[<a href="index.html" title="Cover (top) of document">Top</a>]</td>
-<td>[Contents]</td>
-<td>[<a href="first-before-top.html" title="Index">Index</a>]</td>
-<td>[<a href="nodes_before_top_abt.html#SEC_About" title="About (help)"> ? 
</a>]</td>
-</tr></table>
+<a class="node-id" id="node-in-menu-before-top"></a><div class="nav-panel">
+<p>
+Up: <a href="first-before-top.html" accesskey="u" rel="up">first before 
top</a> &nbsp; [<a href="first-before-top.html" title="Index" 
rel="index">Index</a>]</p>
+</div>
 <hr>
-<h3 class="node">node in menu before top</h3>
+<h4 class="node">node in menu before top</h4>
 
 <a class="index-entry-id" id="index-node-in-menu-before-top"></a>
 <div class="printindex cp-printindex">
@@ -113,10 +104,7 @@ th.sections-header-printindex {text-align:left; 
padding-left: 1em}
 <a class="index-entry-id" id="index-printindex-node-in-menu-before-top"></a>
 
 
-<hr>
-<p>
-  <span class="program-in-footer">This document was generated on <em 
class="emph">a sunny day</em> using <a class="uref" 
href="http://www.gnu.org/software/texinfo/";><em 
class="emph">texi2any</em></a>.</span>
-</p>
+
 
 
 </body>
diff --git 
a/tp/t/results/moreindices/nodes_before_top_nodes/res_html/nodes_before_top_abt.html
 
b/tp/t/results/moreindices/nodes_before_top_nodes/res_html/nodes_before_top_abt.html
deleted file mode 100644
index 73c90c5318..0000000000
--- 
a/tp/t/results/moreindices/nodes_before_top_nodes/res_html/nodes_before_top_abt.html
+++ /dev/null
@@ -1,149 +0,0 @@
-<!DOCTYPE html>
-<html>
-<!-- Created by texinfo, http://www.gnu.org/software/texinfo/ -->
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-<title>About This Document (Untitled Document)</title>
-
-<meta name="description" content="About This Document (Untitled Document)">
-<meta name="keywords" content="About This Document (Untitled Document)">
-<meta name="resource-type" content="document">
-<meta name="distribution" content="global">
-<meta name="Generator" content="texi2any">
-<meta name="viewport" content="width=device-width,initial-scale=1">
-
-<style type="text/css">
-<!--
-span.program-in-footer {font-size: smaller}
-td.button-direction-about {text-align:center}
-td.name-direction-about {text-align:center}
--->
-</style>
-
-
-</head>
-
-<body lang="en">
-<div class="element-about" id="SEC_About">
-<table class="nav-panel" cellpadding="1" cellspacing="1" border="0">
-<tr><td>[<a href="index.html" title="Cover (top) of document">Top</a>]</td>
-<td>[Contents]</td>
-<td>[<a href="first-before-top.html" title="Index">Index</a>]</td>
-<td>[<a href="#SEC_About" title="About (help)"> ? </a>]</td>
-</tr></table>
-<hr>
-<h1 class="about-heading">About This Document</h1>
-
-<p>
-  This document was generated on <em class="emph">a sunny day</em> using <a 
class="uref" href="http://www.gnu.org/software/texinfo/";><em 
class="emph">texi2any</em></a>.
-</p>
-<p>
-  The buttons in the navigation panels have the following meaning:
-</p>
-<table border="1">
-  <tr>
-    <th> Button </th>
-    <th> Name </th>
-    <th> Go to </th>
-    <th> From 1.2.3 go to</th>
-  </tr>
-  <tr>
-    <td class="button-direction-about"> [ &lt;&lt; ] </td>
-    <td class="name-direction-about">FastBack</td>
-    <td>Beginning of this chapter or previous chapter</td>
-    <td>1</td>
-  </tr>
-  <tr>
-    <td class="button-direction-about"> [ &lt; ] </td>
-    <td class="name-direction-about">Back</td>
-    <td>Previous section in reading order</td>
-    <td>1.2.2</td>
-  </tr>
-  <tr>
-    <td class="button-direction-about"> [ Up ] </td>
-    <td class="name-direction-about">Up</td>
-    <td>Up section</td>
-    <td>1.2</td>
-  </tr>
-  <tr>
-    <td class="button-direction-about"> [ &gt; ] </td>
-    <td class="name-direction-about">Forward</td>
-    <td>Next section in reading order</td>
-    <td>1.2.4</td>
-  </tr>
-  <tr>
-    <td class="button-direction-about"> [ &gt;&gt; ] </td>
-    <td class="name-direction-about">FastForward</td>
-    <td>Next chapter</td>
-    <td>2</td>
-  </tr>
-  <tr>
-    <td class="button-direction-about"> [Top] </td>
-    <td class="name-direction-about">Top</td>
-    <td>Cover (top) of document</td>
-    <td> &nbsp; </td>
-  </tr>
-  <tr>
-    <td class="button-direction-about"> [Contents] </td>
-    <td class="name-direction-about">Contents</td>
-    <td>Table of contents</td>
-    <td> &nbsp; </td>
-  </tr>
-  <tr>
-    <td class="button-direction-about"> [Index] </td>
-    <td class="name-direction-about">Index</td>
-    <td>Index</td>
-    <td> &nbsp; </td>
-  </tr>
-  <tr>
-    <td class="button-direction-about"> [ ? ] </td>
-    <td class="name-direction-about">About</td>
-    <td>About (help)</td>
-    <td> &nbsp; </td>
-  </tr>
-</table>
-
-<p>
-  where the <strong class="strong"> Example </strong> assumes that the current 
position is at <strong class="strong"> Subsubsection One-Two-Three </strong> of 
a document of the following structure:
-</p>
-
-<ul>
-  <li> 1. Section One
-    <ul>
-      <li>1.1 Subsection One-One
-        <ul>
-          <li>...</li>
-        </ul>
-      </li>
-      <li>1.2 Subsection One-Two
-        <ul>
-          <li>1.2.1 Subsubsection One-Two-One</li>
-          <li>1.2.2 Subsubsection One-Two-Two</li>
-          <li>1.2.3 Subsubsection One-Two-Three &nbsp; &nbsp;
-            <strong>&lt;== Current Position </strong></li>
-          <li>1.2.4 Subsubsection One-Two-Four</li>
-        </ul>
-      </li>
-      <li>1.3 Subsection One-Three
-        <ul>
-          <li>...</li>
-        </ul>
-      </li>
-      <li>1.4 Subsection One-Four</li>
-    </ul>
-  </li>
-</ul>
-</div><hr>
-<table class="nav-panel" cellpadding="1" cellspacing="1" border="0">
-<tr><td>[<a href="index.html" title="Cover (top) of document">Top</a>]</td>
-<td>[Contents]</td>
-<td>[<a href="first-before-top.html" title="Index">Index</a>]</td>
-<td>[<a href="#SEC_About" title="About (help)"> ? </a>]</td>
-</tr></table>
-<p>
-  <span class="program-in-footer">This document was generated on <em 
class="emph">a sunny day</em> using <a class="uref" 
href="http://www.gnu.org/software/texinfo/";><em 
class="emph">texi2any</em></a>.</span>
-</p>
-
-
-</body>
-</html>
diff --git 
a/tp/t/results/moreindices/nodes_before_top_nodes/res_html/second.html 
b/tp/t/results/moreindices/nodes_before_top_nodes/res_html/second.html
index 9f90c026f0..93de60f887 100644
--- a/tp/t/results/moreindices/nodes_before_top_nodes/res_html/second.html
+++ b/tp/t/results/moreindices/nodes_before_top_nodes/res_html/second.html
@@ -12,12 +12,12 @@
 <meta name="Generator" content="texi2any">
 <meta name="viewport" content="width=device-width,initial-scale=1">
 
+<link href="index.html" rel="start" title="Top">
+<link href="first-before-top.html" rel="index" title="first before top">
+<link href="first.html" rel="up" title="first">
 <style type="text/css">
 <!--
 a.summary-letter-printindex {text-decoration: none}
-span.program-in-footer {font-size: smaller}
-td.menu-entry-description {vertical-align: top}
-td.menu-entry-destination {vertical-align: top}
 td.printindex-index-entry {vertical-align: top}
 td.printindex-index-section {vertical-align: top; padding-left: 1em}
 th.entries-header-printindex {text-align:left}
@@ -29,29 +29,12 @@ th.sections-header-printindex {text-align:left; 
padding-left: 1em}
 </head>
 
 <body lang="en">
-<a class="node-id" id="second"></a><table class="nav-panel" cellpadding="1" 
cellspacing="1" border="0">
-<tr><td>[ &lt;&lt; ]</td>
-<td>[<a href="first.html" title="Previous section in reading order"> &lt; 
</a>]</td>
-<td>[<a href="first.html" title="Up section"> Up </a>]</td>
-<td>[<a href="another.html" title="Next section in reading order"> &gt; 
</a>]</td>
-<td>[ &gt;&gt; ]</td>
-<td> &nbsp; </td>
-<td> &nbsp; </td>
-<td> &nbsp; </td>
-<td> &nbsp; </td>
-<td>[<a href="index.html" title="Cover (top) of document">Top</a>]</td>
-<td>[Contents]</td>
-<td>[<a href="first-before-top.html" title="Index">Index</a>]</td>
-<td>[<a href="nodes_before_top_abt.html#SEC_About" title="About (help)"> ? 
</a>]</td>
-</tr></table>
+<a class="node-id" id="second"></a><div class="nav-panel">
+<p>
+Up: <a href="first.html" accesskey="u" rel="up">first</a> &nbsp; [<a 
href="first-before-top.html" title="Index" rel="index">Index</a>]</p>
+</div>
 <hr>
-<h3 class="node">second</h3>
-<table class="menu" border="0" cellspacing="0">
-<tr><td class="menu-entry-destination">&bull; <a href="a-node.html" 
rel="index">a node</a></td><td>&nbsp;&nbsp;</td><td 
class="menu-entry-description">
-</td></tr>
-<tr><td class="menu-entry-destination">&bull; <a 
href="another.html">another</a></td><td>&nbsp;&nbsp;</td><td 
class="menu-entry-description">
-</td></tr>
-</table>
+<h4 class="node">second</h4>
 
 <div class="printindex fn-printindex">
 <table class="fn-letters-header-printindex"><tr><th>Jump to: &nbsp; 
</th><td><a class="summary-letter-printindex" 
href="#second_fn_letter-A"><b>A</b></a>
@@ -83,10 +66,7 @@ th.sections-header-printindex {text-align:left; 
padding-left: 1em}
 </td></tr></table>
 </div>
 
-<hr>
-<p>
-  <span class="program-in-footer">This document was generated on <em 
class="emph">a sunny day</em> using <a class="uref" 
href="http://www.gnu.org/software/texinfo/";><em 
class="emph">texi2any</em></a>.</span>
-</p>
+
 
 
 </body>
diff --git a/tp/t/results/moreindices/split_chapter_index/res_html/first.html 
b/tp/t/results/moreindices/split_chapter_index/res_html/first.html
index 6a3acba937..5f48870545 100644
--- a/tp/t/results/moreindices/split_chapter_index/res_html/first.html
+++ b/tp/t/results/moreindices/split_chapter_index/res_html/first.html
@@ -12,12 +12,13 @@
 <meta name="Generator" content="texi2any">
 <meta name="viewport" content="width=device-width,initial-scale=1">
 
+<link href="index.html" rel="start" title="split indices">
+<link href="#first" rel="index" title="1 First chapter">
+<link href="index.html" rel="up" title="split indices">
+<link href="index.html" rel="prev" title="split indices">
 <style type="text/css">
 <!--
 a.summary-letter-printindex {text-decoration: none}
-span.program-in-footer {font-size: smaller}
-td.menu-entry-description {vertical-align: top}
-td.menu-entry-destination {vertical-align: top}
 td.printindex-index-entry {vertical-align: top}
 td.printindex-index-section {vertical-align: top; padding-left: 1em}
 th.entries-header-printindex {text-align:left}
@@ -30,22 +31,11 @@ th.sections-header-printindex {text-align:left; 
padding-left: 1em}
 
 <body lang="en">
 <div class="chapter-level-extent" id="first">
-<table class="nav-panel" cellpadding="1" cellspacing="1" border="0">
-<tr><td>[<a href="index.html" title="Beginning of this chapter or previous 
chapter"> &lt;&lt; </a>]</td>
-<td>[<a href="index.html" title="Previous section in reading order"> &lt; 
</a>]</td>
-<td>[<a href="index.html" title="Up section"> Up </a>]</td>
-<td>[<a href="#section-1" title="Next section in reading order"> &gt; 
</a>]</td>
-<td>[ &gt;&gt; ]</td>
-<td> &nbsp; </td>
-<td> &nbsp; </td>
-<td> &nbsp; </td>
-<td> &nbsp; </td>
-<td>[<a href="index.html" title="Cover (top) of document">Top</a>]</td>
-<td>[Contents]</td>
-<td>[<a href="#first" title="Index">Index</a>]</td>
-<td>[<a href="split_chapter_index_abt.html#SEC_About" title="About (help)"> ? 
</a>]</td>
-</tr></table>
-<h1 class="chapter" id="First-chapter">1 First chapter</h1>
+<div class="nav-panel">
+<p>
+ Up : <a href="index.html" accesskey="u" rel="up">split indices</a> &nbsp; [<a 
href="#first" title="Index" rel="index">Index</a>]</p>
+</div>
+<h2 class="chapter" id="First-chapter">1 First chapter</h2>
 
 <p>Text and then index entries
 <a class="index-entry-id" id="index-entry-in-node"></a>
@@ -109,57 +99,33 @@ th.sections-header-printindex {text-align:left; 
padding-left: 1em}
 <a class="index-entry-id" id="index-a-concept-in-first"></a>
 <a class="index-entry-id" id="index-somewhere"></a>
 
-<table class="menu" border="0" cellspacing="0">
-<tr><td class="menu-entry-destination"><a href="#section-1">1.1 Section 
1</a></td><td>&nbsp;&nbsp;</td><td class="menu-entry-description">
-</td></tr>
-</table>
 
+<ul class="mini-toc">
+<li><a href="#section-1" accesskey="1">Section 1</a></li>
+</ul>
 <hr>
 <div class="section-level-extent" id="section-1">
-<table class="nav-panel" cellpadding="1" cellspacing="1" border="0">
-<tr><td>[<a href="#first" title="Beginning of this chapter or previous 
chapter"> &lt;&lt; </a>]</td>
-<td>[<a href="#first" title="Previous section in reading order"> &lt; 
</a>]</td>
-<td>[<a href="#first" title="Up section"> Up </a>]</td>
-<td>[<a href="#subsection-1" title="Next section in reading order"> &gt; 
</a>]</td>
-<td>[ &gt;&gt; ]</td>
-<td> &nbsp; </td>
-<td> &nbsp; </td>
-<td> &nbsp; </td>
-<td> &nbsp; </td>
-<td>[<a href="index.html" title="Cover (top) of document">Top</a>]</td>
-<td>[Contents]</td>
-<td>[<a href="#first" title="Index">Index</a>]</td>
-<td>[<a href="split_chapter_index_abt.html#SEC_About" title="About (help)"> ? 
</a>]</td>
-</tr></table>
-<h2 class="section" id="Section-1">1.1 Section 1</h2>
-
-<table class="menu" border="0" cellspacing="0">
-<tr><td class="menu-entry-destination"><a href="#subsection-1">1.1.1 
Subsection 1</a></td><td>&nbsp;&nbsp;</td><td class="menu-entry-description">
-</td></tr>
-</table>
+<div class="nav-panel">
+<p>
+ Up : <a href="#first" accesskey="u" rel="up">First chapter</a> &nbsp; [<a 
href="#first" title="Index" rel="index">Index</a>]</p>
+</div>
+<h3 class="section" id="Section-1">1.1 Section 1</h3>
+
 
 <a class="index-entry-id" id="index-something"></a>
 
 <a class="index-entry-id" id="index-another"></a>
 
+<ul class="mini-toc">
+<li><a href="#subsection-1" accesskey="1">Subsection 1</a></li>
+</ul>
 <hr>
 <div class="subsection-level-extent" id="subsection-1">
-<table class="nav-panel" cellpadding="1" cellspacing="1" border="0">
-<tr><td>[<a href="#first" title="Beginning of this chapter or previous 
chapter"> &lt;&lt; </a>]</td>
-<td>[<a href="#section-1" title="Previous section in reading order"> &lt; 
</a>]</td>
-<td>[<a href="#section-1" title="Up section"> Up </a>]</td>
-<td>[ &gt; ]</td>
-<td>[ &gt;&gt; ]</td>
-<td> &nbsp; </td>
-<td> &nbsp; </td>
-<td> &nbsp; </td>
-<td> &nbsp; </td>
-<td>[<a href="index.html" title="Cover (top) of document">Top</a>]</td>
-<td>[Contents]</td>
-<td>[<a href="#first" title="Index">Index</a>]</td>
-<td>[<a href="split_chapter_index_abt.html#SEC_About" title="About (help)"> ? 
</a>]</td>
-</tr></table>
-<h3 class="subsection" id="Subsection-1">1.1.1 Subsection 1</h3>
+<div class="nav-panel">
+<p>
+ Up : <a href="#section-1" accesskey="u" rel="up">Section 1</a> &nbsp; [<a 
href="#first" title="Index" rel="index">Index</a>]</p>
+</div>
+<h4 class="subsection" id="Subsection-1">1.1.1 Subsection 1</h4>
 
 <p>In subsection 1
 </p>
@@ -169,22 +135,11 @@ th.sections-header-printindex {text-align:left; 
padding-left: 1em}
 </div>
 </div>
 <hr>
-<table class="nav-panel" cellpadding="1" cellspacing="1" border="0">
-<tr><td>[<a href="#first" title="Beginning of this chapter or previous 
chapter"> &lt;&lt; </a>]</td>
-<td>[ &gt;&gt; ]</td>
-<td> &nbsp; </td>
-<td> &nbsp; </td>
-<td> &nbsp; </td>
-<td> &nbsp; </td>
-<td> &nbsp; </td>
-<td>[<a href="index.html" title="Cover (top) of document">Top</a>]</td>
-<td>[Contents]</td>
-<td>[<a href="#first" title="Index">Index</a>]</td>
-<td>[<a href="split_chapter_index_abt.html#SEC_About" title="About (help)"> ? 
</a>]</td>
-</tr></table>
+<div class="nav-panel">
 <p>
-  <span class="program-in-footer">This document was generated on <em 
class="emph">a sunny day</em> using <a class="uref" 
href="http://www.gnu.org/software/texinfo/";><em 
class="emph">texi2any</em></a>.</span>
-</p>
+ Up : <a href="index.html" accesskey="u" rel="up">split indices</a> &nbsp; [<a 
href="#first" title="Index" rel="index">Index</a>]</p>
+</div>
+
 
 
 </body>
diff --git a/tp/t/results/moreindices/split_chapter_index/res_html/index.html 
b/tp/t/results/moreindices/split_chapter_index/res_html/index.html
index e4c383058e..680c70a21a 100644
--- a/tp/t/results/moreindices/split_chapter_index/res_html/index.html
+++ b/tp/t/results/moreindices/split_chapter_index/res_html/index.html
@@ -12,13 +12,9 @@
 <meta name="Generator" content="texi2any">
 <meta name="viewport" content="width=device-width,initial-scale=1">
 
-<style type="text/css">
-<!--
-span.program-in-footer {font-size: smaller}
-td.menu-entry-description {vertical-align: top}
-td.menu-entry-destination {vertical-align: top}
--->
-</style>
+<link href="#Top" rel="start" title="split indices">
+<link href="first.html#first" rel="index" title="1 First chapter">
+<link href="first.html#first" rel="next" title="1 First chapter">
 
 
 </head>
@@ -26,38 +22,27 @@ td.menu-entry-destination {vertical-align: top}
 <body lang="en">
 
 <div class="top-level-extent" id="Top">
-<table class="nav-panel" cellpadding="1" cellspacing="1" border="0">
-<tr><td>[ &lt; ]</td>
-<td>[<a href="first.html#first" title="Next section in reading order"> &gt; 
</a>]</td>
-<td> &nbsp; </td>
-<td>[Contents]</td>
-<td>[<a href="first.html#first" title="Index">Index</a>]</td>
-<td>[<a href="split_chapter_index_abt.html#SEC_About" title="About (help)"> ? 
</a>]</td>
-</tr></table>
+<div class="nav-panel">
+<p>
+ &nbsp; [<a href="first.html#first" title="Index" rel="index">Index</a>]</p>
+</div>
 <h1 class="top" id="split-indices">split indices</h1>
 <a class="index-entry-id" id="index-entry-a"></a>
 
 <p>Text in top.
 </p>
 
-<table class="menu" border="0" cellspacing="0">
-<tr><td class="menu-entry-destination"><a href="first.html#first" 
rel="index">1 First chapter</a></td><td>&nbsp;&nbsp;</td><td 
class="menu-entry-description">
-</td></tr>
-</table>
 
+<ul class="mini-toc">
+<li><a href="first.html#first" accesskey="1">First chapter</a></li>
+</ul>
 </div>
 <hr>
-<table class="nav-panel" cellpadding="1" cellspacing="1" border="0">
-<tr><td>[ &lt; ]</td>
-<td>[<a href="first.html#first" title="Next section in reading order"> &gt; 
</a>]</td>
-<td> &nbsp; </td>
-<td>[Contents]</td>
-<td>[<a href="first.html#first" title="Index">Index</a>]</td>
-<td>[<a href="split_chapter_index_abt.html#SEC_About" title="About (help)"> ? 
</a>]</td>
-</tr></table>
+<div class="nav-panel">
 <p>
-  <span class="program-in-footer">This document was generated on <em 
class="emph">a sunny day</em> using <a class="uref" 
href="http://www.gnu.org/software/texinfo/";><em 
class="emph">texi2any</em></a>.</span>
-</p>
+ &nbsp; [<a href="first.html#first" title="Index" rel="index">Index</a>]</p>
+</div>
+
 
 
 </body>
diff --git 
a/tp/t/results/moreindices/split_chapter_index/res_html/split_chapter_index_abt.html
 
b/tp/t/results/moreindices/split_chapter_index/res_html/split_chapter_index_abt.html
deleted file mode 100644
index 678a12370a..0000000000
--- 
a/tp/t/results/moreindices/split_chapter_index/res_html/split_chapter_index_abt.html
+++ /dev/null
@@ -1,148 +0,0 @@
-<!DOCTYPE html>
-<html>
-<!-- Created by texinfo, http://www.gnu.org/software/texinfo/ -->
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-<title>About This Document (split indices)</title>
-
-<meta name="description" content="About This Document (split indices)">
-<meta name="keywords" content="About This Document (split indices)">
-<meta name="resource-type" content="document">
-<meta name="distribution" content="global">
-<meta name="Generator" content="texi2any">
-<meta name="viewport" content="width=device-width,initial-scale=1">
-
-<style type="text/css">
-<!--
-span.program-in-footer {font-size: smaller}
-td.button-direction-about {text-align:center}
-td.name-direction-about {text-align:center}
--->
-</style>
-
-
-</head>
-
-<body lang="en">
-<div class="element-about" id="SEC_About">
-<table class="nav-panel" cellpadding="1" cellspacing="1" border="0">
-<tr><td>[<a href="index.html" title="Cover (top) of document">Top</a>]</td>
-<td>[Contents]</td>
-<td>[<a href="first.html#first" title="Index">Index</a>]</td>
-<td>[<a href="#SEC_About" title="About (help)"> ? </a>]</td>
-</tr></table>
-<h1 class="about-heading">About This Document</h1>
-
-<p>
-  This document was generated on <em class="emph">a sunny day</em> using <a 
class="uref" href="http://www.gnu.org/software/texinfo/";><em 
class="emph">texi2any</em></a>.
-</p>
-<p>
-  The buttons in the navigation panels have the following meaning:
-</p>
-<table border="1">
-  <tr>
-    <th> Button </th>
-    <th> Name </th>
-    <th> Go to </th>
-    <th> From 1.2.3 go to</th>
-  </tr>
-  <tr>
-    <td class="button-direction-about"> [ &lt;&lt; ] </td>
-    <td class="name-direction-about">FastBack</td>
-    <td>Beginning of this chapter or previous chapter</td>
-    <td>1</td>
-  </tr>
-  <tr>
-    <td class="button-direction-about"> [ &lt; ] </td>
-    <td class="name-direction-about">Back</td>
-    <td>Previous section in reading order</td>
-    <td>1.2.2</td>
-  </tr>
-  <tr>
-    <td class="button-direction-about"> [ Up ] </td>
-    <td class="name-direction-about">Up</td>
-    <td>Up section</td>
-    <td>1.2</td>
-  </tr>
-  <tr>
-    <td class="button-direction-about"> [ &gt; ] </td>
-    <td class="name-direction-about">Forward</td>
-    <td>Next section in reading order</td>
-    <td>1.2.4</td>
-  </tr>
-  <tr>
-    <td class="button-direction-about"> [ &gt;&gt; ] </td>
-    <td class="name-direction-about">FastForward</td>
-    <td>Next chapter</td>
-    <td>2</td>
-  </tr>
-  <tr>
-    <td class="button-direction-about"> [Top] </td>
-    <td class="name-direction-about">Top</td>
-    <td>Cover (top) of document</td>
-    <td> &nbsp; </td>
-  </tr>
-  <tr>
-    <td class="button-direction-about"> [Contents] </td>
-    <td class="name-direction-about">Contents</td>
-    <td>Table of contents</td>
-    <td> &nbsp; </td>
-  </tr>
-  <tr>
-    <td class="button-direction-about"> [Index] </td>
-    <td class="name-direction-about">Index</td>
-    <td>Index</td>
-    <td> &nbsp; </td>
-  </tr>
-  <tr>
-    <td class="button-direction-about"> [ ? ] </td>
-    <td class="name-direction-about">About</td>
-    <td>About (help)</td>
-    <td> &nbsp; </td>
-  </tr>
-</table>
-
-<p>
-  where the <strong class="strong"> Example </strong> assumes that the current 
position is at <strong class="strong"> Subsubsection One-Two-Three </strong> of 
a document of the following structure:
-</p>
-
-<ul>
-  <li> 1. Section One
-    <ul>
-      <li>1.1 Subsection One-One
-        <ul>
-          <li>...</li>
-        </ul>
-      </li>
-      <li>1.2 Subsection One-Two
-        <ul>
-          <li>1.2.1 Subsubsection One-Two-One</li>
-          <li>1.2.2 Subsubsection One-Two-Two</li>
-          <li>1.2.3 Subsubsection One-Two-Three &nbsp; &nbsp;
-            <strong>&lt;== Current Position </strong></li>
-          <li>1.2.4 Subsubsection One-Two-Four</li>
-        </ul>
-      </li>
-      <li>1.3 Subsection One-Three
-        <ul>
-          <li>...</li>
-        </ul>
-      </li>
-      <li>1.4 Subsection One-Four</li>
-    </ul>
-  </li>
-</ul>
-</div><hr>
-<table class="nav-panel" cellpadding="1" cellspacing="1" border="0">
-<tr><td>[<a href="index.html" title="Cover (top) of document">Top</a>]</td>
-<td>[Contents]</td>
-<td>[<a href="first.html#first" title="Index">Index</a>]</td>
-<td>[<a href="#SEC_About" title="About (help)"> ? </a>]</td>
-</tr></table>
-<p>
-  <span class="program-in-footer">This document was generated on <em 
class="emph">a sunny day</em> using <a class="uref" 
href="http://www.gnu.org/software/texinfo/";><em 
class="emph">texi2any</em></a>.</span>
-</p>
-
-
-</body>
-</html>
diff --git a/tp/tests/indices/nodes_before_top_and_sections.texi 
b/tp/tests/indices/nodes_before_top_and_sections.texi
index 329473585b..d44831d591 100644
--- a/tp/tests/indices/nodes_before_top_and_sections.texi
+++ b/tp/tests/indices/nodes_before_top_and_sections.texi
@@ -1,6 +1,6 @@
 \input texinfo @c -*-texinfo-*-
 
-@setfilename more_before_top_section
+@setfilename nodes_before_top_and_sections.info
 
 
 @node first before top, Top, ,(dir)
reply via email to
[Prev in Thread] Current Thread [Next in Thread]