texinfo-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[no subject]


From: Patrice Dumas
Date: Wed, 4 Jan 2023 04:47:58 -0500 (EST)

branch: master
commit ffe4745934b4522442b8a6a1691e5697d910ab7c
Author: Patrice Dumas <pertusus@free.fr>
AuthorDate: Wed Jan 4 10:47:36 2023 +0100

    * tp/ext/epub3.pm: set USE_NODES to 0 in order to have section names
    used in printindex output.
    
    * tp/tests/README, tp/tests/run_parser_all.sh: do not set texi2html
    style for the default empty format.
    
    * tp/tests/tex_html/math_not_closed.texi: remove @setfilename.
---
 ChangeLog                                          |  10 +
 tp/TODO                                            |   2 +
 tp/ext/epub3.pm                                    |   7 +
 tp/t/results/html_tests/no_content.pl              | 488 ++++++++++
 .../html_tests/no_content/res_html/no_content.html |  50 ++
 tp/t/results/html_tests/no_content_do_contents.pl  | 488 ++++++++++
 .../res_html/no_content.html                       |  63 ++
 .../html_tests/no_content_do_contents_inline.pl    | 488 ++++++++++
 .../res_html/no_content.html                       |  50 ++
 .../no_content_do_contents_separate_element.pl     | 488 ++++++++++
 .../res_html/no_content.html                       |  70 ++
 tp/t/results/html_tests/no_content_inline.pl       | 488 ++++++++++
 .../no_content_inline/res_html/no_content.html     |  50 ++
 .../html_tests/no_content_separate_element.pl      | 488 ++++++++++
 .../res_html/no_content.html                       |  50 ++
 tp/tests/README                                    |  13 +-
 .../EPUB/xhtml/Chapteur.xhtml"                     |   5 +-
 .../EPUB/xhtml/os\303\251_utf8.xhtml"              |   2 +
 .../EPUB/xhtml/os\303\251_utf8_abt.xhtml"          | 133 ---
 .../EPUB/xhtml/chapter.xhtml                       |  75 +-
 .../EPUB/xhtml/chapter2.xhtml                      |  13 +-
 .../EPUB/xhtml/formatting.xhtml                    |  74 +-
 .../EPUB/xhtml/formatting_abt.xhtml                | 978 --------------------
 .../EPUB/xhtml/formatting_fot.xhtml                | 904 -------------------
 .../EPUB/xhtml/formatting_ovr.xhtml                | 884 -------------------
 .../EPUB/xhtml/formatting_toc.xhtml                | 895 -------------------
 .../EPUB/xhtml/chapter.xhtml                       |  71 +-
 .../EPUB/xhtml/chapter2.xhtml                      |  13 +-
 .../EPUB/xhtml/formatting.xhtml                    |  74 +-
 .../EPUB/xhtml/formatting_abt.xhtml                | 980 ---------------------
 .../EPUB/xhtml/formatting_fot.xhtml                | 906 -------------------
 .../EPUB/xhtml/formatting_ovr.xhtml                | 886 -------------------
 .../EPUB/xhtml/formatting_toc.xhtml                | 897 -------------------
 .../EPUB/xhtml/s_002d_002dect_002cion.xhtml        |   6 +-
 .../EPUB/xhtml/subsection.xhtml                    |   6 +-
 ...ion-_0060_0060simple_002ddouble_002d_002d.xhtml |   5 +
 ...2d_002dfour_002d_002d_002d_002d_0027_0027.xhtml |   5 +
 tp/tests/run_parser_all.sh                         |   2 -
 tp/tests/tex_html/math_not_closed.texi             |   2 -
 .../res_parser/block_EOL_tex/block_EOL.html        |  17 +-
 .../res_parser/math_not_closed/math_not_closed.2   |   8 +-
 .../math_not_closed/math_not_closed.html           |  16 +-
 .../res_parser/simplest_httex/simplest.html        | 149 +---
 tp/tests/tex_html/res_parser/tex/tex.html          |  11 +-
 .../res_parser/tex_accents_httex/tex_accents.html  |   6 +-
 .../res_parser/tex_accents_l2h/tex_accents.html    |  10 +-
 .../res_parser/tex_complex_httex/tex_complex.html  |  25 +-
 .../res_parser/tex_complex_l2h/tex_complex.html    |  36 +-
 .../tex_encode_latin1.html                         | 155 +---
 .../tex_encoded_latin1_l2h/tex_encode_latin1.html  | 159 +---
 .../tex_encod\303\251_utf8.html"                   | 155 +---
 .../tex_encod\303\251_utf8.html"                   | 159 +---
 .../res_parser/tex_eqalign_httex/tex_eqalign.html  |   7 +-
 .../res_parser/tex_eqalign_l2h/tex_eqalign.html    |  11 +-
 .../res_parser/tex_gdef_httex/tex_gdef.html        |   7 +-
 .../tex_html/res_parser/tex_gdef_l2h/tex_gdef.html |  11 +-
 .../res_parser/tex_gdef_mathjax/tex_gdef.html      |  11 +-
 tp/tests/tex_html/res_parser/tex_httex/tex.html    |   7 +-
 .../tex_html/res_parser/tex_httex_latex/tex.html   |   7 +-
 .../res_parser/tex_httex_latex_math/tex.html       |   7 +-
 .../res_parser/tex_httex_tex_latex/tex.html        |   7 +-
 .../res_parser/tex_httex_tex_latex_math/tex.html   |   7 +-
 .../res_parser/tex_in_copying/tex_in_copying.html  | 165 +---
 .../tex_html/res_parser/tex_l2h_latex/tex.html     |  11 +-
 .../tex_html/res_parser/tex_l2h_tex_latex/tex.html |  11 +-
 tp/tests/tex_html/res_parser/tex_mathjax/tex.html  |  11 +-
 .../res_parser/tex_not_closed/tex_not_closed.html  |  14 +-
 tp/tests/tex_html/res_parser/tex_notex/tex.html    |  11 +-
 68 files changed, 3693 insertions(+), 8627 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 72e3536860..6fe3471c9e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2023-01-04  Patrice Dumas  <pertusus@free.fr>
+
+       * tp/ext/epub3.pm: set USE_NODES to 0 in order to have section names
+       used in printindex output.
+
+       * tp/tests/README, tp/tests/run_parser_all.sh: do not set texi2html
+       style for the default empty format.
+
+       * tp/tests/tex_html/math_not_closed.texi: remove @setfilename.
+
 2023-01-04  Patrice Dumas  <pertusus@free.fr>
 
        * tp/tests/tex_html/list-of-tests: add explicit options when texi2html
diff --git a/tp/TODO b/tp/TODO
index d0102ec300..3d1b512c67 100644
--- a/tp/TODO
+++ b/tp/TODO
@@ -15,6 +15,8 @@ Bugs
 
 Add about button to default navigation
 
+epub, if there are special elements, add the files to the guide?
+
 HTML API
 ========
 
diff --git a/tp/ext/epub3.pm b/tp/ext/epub3.pm
index dec1659d45..73e6947e10 100644
--- a/tp/ext/epub3.pm
+++ b/tp/ext/epub3.pm
@@ -142,6 +142,13 @@ texinfo_set_from_init_file('NO_TOP_NODE_OUTPUT', 1);
 # no mini_toc nor menus in the default case, to be more like a book.
 texinfo_set_from_init_file('FORMAT_MENU', 'nomenu');
 
+# use sections in printindex
+# unsetting NODE_NAME_IN_INDEX is not sufficient, as in that case the
+# element is used to determine the name used, which will still be the
+# node in the default case
+texinfo_set_from_init_file('USE_NODES', 0);
+#texinfo_set_from_init_file('NODE_NAME_IN_INDEX', 0);
+
 # a footer gets in the way of navigation.  It is not set in the default
 # case anyway, but it is set in texi2html style.
 texinfo_set_from_init_file('PROGRAM_NAME_IN_FOOTER', 0);
diff --git a/tp/t/results/html_tests/no_content.pl 
b/tp/t/results/html_tests/no_content.pl
new file mode 100644
index 0000000000..0410776b2b
--- /dev/null
+++ b/tp/t/results/html_tests/no_content.pl
@@ -0,0 +1,488 @@
+use vars qw(%result_texis %result_texts %result_trees %result_errors 
+   %result_indices %result_sectioning %result_nodes %result_menus
+   %result_floats %result_converted %result_converted_errors 
+   %result_elements %result_directions_text %result_indices_sort_strings);
+
+use utf8;
+
+$result_trees{'no_content'} = {
+  'contents' => [
+    {
+      'contents' => [
+        {
+          'contents' => [
+            {
+              'text' => '\\input texinfo @c -*-texinfo-*-
+',
+              'type' => 'text_before_beginning'
+            },
+            {
+              'text' => '
+',
+              'type' => 'text_before_beginning'
+            }
+          ],
+          'type' => 'preamble_before_beginning'
+        },
+        {
+          'contents' => [],
+          'type' => 'preamble_before_content'
+        }
+      ],
+      'type' => 'before_node_section'
+    },
+    {
+      'args' => [
+        {
+          'contents' => [
+            {
+              'text' => 'Top'
+            }
+          ],
+          'info' => {
+            'spaces_after_argument' => '
+'
+          },
+          'type' => 'line_arg'
+        }
+      ],
+      'cmdname' => 'node',
+      'extra' => {
+        'node_content' => [
+          {}
+        ],
+        'nodes_manuals' => [
+          {
+            'node_content' => [
+              {}
+            ],
+            'normalized' => 'Top'
+          }
+        ],
+        'normalized' => 'Top'
+      },
+      'info' => {
+        'spaces_before_argument' => ' '
+      },
+      'source_info' => {
+        'file_name' => 'no_content.texi',
+        'line_nr' => 3,
+        'macro' => ''
+      }
+    },
+    {
+      'args' => [
+        {
+          'contents' => [
+            {
+              'text' => 'No ccontent'
+            }
+          ],
+          'info' => {
+            'spaces_after_argument' => '
+'
+          },
+          'type' => 'line_arg'
+        }
+      ],
+      'cmdname' => 'top',
+      'contents' => [
+        {
+          'text' => '
+',
+          'type' => 'empty_line'
+        },
+        {
+          'contents' => [
+            {
+              'text' => 'No content.
+'
+            }
+          ],
+          'type' => 'paragraph'
+        },
+        {
+          'text' => '
+',
+          'type' => 'empty_line'
+        },
+        {
+          'args' => [
+            {
+              'info' => {
+                'spaces_after_argument' => ' 
+'
+              },
+              'type' => 'block_line_arg'
+            }
+          ],
+          'cmdname' => 'menu',
+          'contents' => [
+            {
+              'args' => [
+                {
+                  'text' => '* ',
+                  'type' => 'menu_entry_leading_text'
+                },
+                {
+                  'contents' => [
+                    {
+                      'text' => 'chapter'
+                    }
+                  ],
+                  'type' => 'menu_entry_node'
+                },
+                {
+                  'text' => '::',
+                  'type' => 'menu_entry_separator'
+                },
+                {
+                  'contents' => [
+                    {
+                      'contents' => [
+                        {
+                          'text' => '
+'
+                        }
+                      ],
+                      'type' => 'preformatted'
+                    }
+                  ],
+                  'type' => 'menu_entry_description'
+                }
+              ],
+              'extra' => {
+                'menu_entry_description' => {},
+                'menu_entry_node' => {
+                  'node_content' => [
+                    {}
+                  ],
+                  'normalized' => 'chapter'
+                }
+              },
+              'source_info' => {
+                'file_name' => 'no_content.texi',
+                'line_nr' => 9,
+                'macro' => ''
+              },
+              'type' => 'menu_entry'
+            },
+            {
+              'args' => [
+                {
+                  'contents' => [
+                    {
+                      'text' => 'menu'
+                    }
+                  ],
+                  'info' => {
+                    'spaces_after_argument' => '
+'
+                  },
+                  'type' => 'line_arg'
+                }
+              ],
+              'cmdname' => 'end',
+              'extra' => {
+                'text_arg' => 'menu'
+              },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
+              'source_info' => {
+                'file_name' => 'no_content.texi',
+                'line_nr' => 10,
+                'macro' => ''
+              }
+            }
+          ],
+          'source_info' => {
+            'file_name' => 'no_content.texi',
+            'line_nr' => 8,
+            'macro' => ''
+          }
+        },
+        {
+          'text' => '
+',
+          'type' => 'empty_line'
+        }
+      ],
+      'extra' => {},
+      'info' => {
+        'spaces_before_argument' => ' '
+      },
+      'source_info' => {
+        'file_name' => 'no_content.texi',
+        'line_nr' => 4,
+        'macro' => ''
+      }
+    },
+    {
+      'args' => [
+        {
+          'contents' => [
+            {
+              'text' => 'chapter'
+            }
+          ],
+          'info' => {
+            'spaces_after_argument' => '
+'
+          },
+          'type' => 'line_arg'
+        }
+      ],
+      'cmdname' => 'node',
+      'extra' => {
+        'node_content' => [
+          {}
+        ],
+        'nodes_manuals' => [
+          {
+            'node_content' => [
+              {}
+            ],
+            'normalized' => 'chapter'
+          }
+        ],
+        'normalized' => 'chapter'
+      },
+      'info' => {
+        'spaces_before_argument' => ' '
+      },
+      'source_info' => {
+        'file_name' => 'no_content.texi',
+        'line_nr' => 12,
+        'macro' => ''
+      }
+    },
+    {
+      'args' => [
+        {
+          'contents' => [
+            {
+              'text' => 'Chapter 1'
+            }
+          ],
+          'info' => {
+            'spaces_after_argument' => '
+'
+          },
+          'type' => 'line_arg'
+        }
+      ],
+      'cmdname' => 'chapter',
+      'contents' => [
+        {
+          'text' => '
+',
+          'type' => 'empty_line'
+        },
+        {
+          'contents' => [
+            {
+              'text' => 'The chapter
+'
+            }
+          ],
+          'type' => 'paragraph'
+        },
+        {
+          'text' => '
+',
+          'type' => 'empty_line'
+        }
+      ],
+      'extra' => {},
+      'info' => {
+        'spaces_before_argument' => ' '
+      },
+      'source_info' => {
+        'file_name' => 'no_content.texi',
+        'line_nr' => 13,
+        'macro' => ''
+      }
+    },
+    {
+      'args' => [
+        {
+          'text' => '
+',
+          'type' => 'misc_arg'
+        }
+      ],
+      'cmdname' => 'bye'
+    }
+  ],
+  'type' => 'document_root'
+};
+$result_trees{'no_content'}{'contents'}[1]{'extra'}{'node_content'}[0] = 
$result_trees{'no_content'}{'contents'}[1]{'args'}[0]{'contents'}[0];
+$result_trees{'no_content'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = $result_trees{'no_content'}{'contents'}[1]{'args'}[0]{'contents'}[0];
+$result_trees{'no_content'}{'contents'}[2]{'contents'}[3]{'contents'}[0]{'extra'}{'menu_entry_description'}
 = 
$result_trees{'no_content'}{'contents'}[2]{'contents'}[3]{'contents'}[0]{'args'}[3];
+$result_trees{'no_content'}{'contents'}[2]{'contents'}[3]{'contents'}[0]{'extra'}{'menu_entry_node'}{'node_content'}[0]
 = 
$result_trees{'no_content'}{'contents'}[2]{'contents'}[3]{'contents'}[0]{'args'}[1]{'contents'}[0];
+$result_trees{'no_content'}{'contents'}[3]{'extra'}{'node_content'}[0] = 
$result_trees{'no_content'}{'contents'}[3]{'args'}[0]{'contents'}[0];
+$result_trees{'no_content'}{'contents'}[3]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = $result_trees{'no_content'}{'contents'}[3]{'args'}[0]{'contents'}[0];
+
+$result_texis{'no_content'} = '\\input texinfo @c -*-texinfo-*-
+
+@node Top
+@top No ccontent
+
+No content.
+
+@menu 
+* chapter::
+@end menu
+
+@node chapter
+@chapter Chapter 1
+
+The chapter
+
+@bye
+';
+
+
+$result_texts{'no_content'} = 'No ccontent
+***********
+
+No content.
+
+* chapter::
+
+1 Chapter 1
+***********
+
+The chapter
+
+';
+
+$result_sectioning{'no_content'} = {
+  'structure' => {
+    'section_childs' => [
+      {
+        'cmdname' => 'top',
+        'extra' => {
+          'associated_node' => {
+            'cmdname' => 'node',
+            'extra' => {
+              'normalized' => 'Top'
+            },
+            'info' => {},
+            'structure' => {}
+          }
+        },
+        'info' => {},
+        'structure' => {
+          'section_childs' => [
+            {
+              'cmdname' => 'chapter',
+              'extra' => {
+                'associated_node' => {
+                  'cmdname' => 'node',
+                  'extra' => {
+                    'normalized' => 'chapter'
+                  },
+                  'info' => {},
+                  'structure' => {}
+                }
+              },
+              'info' => {},
+              'structure' => {
+                'section_level' => 1,
+                'section_number' => 1,
+                'section_up' => {},
+                'toplevel_prev' => {},
+                'toplevel_up' => {}
+              }
+            }
+          ],
+          'section_level' => 0,
+          'section_up' => {}
+        }
+      }
+    ],
+    'section_level' => -1
+  }
+};
+$result_sectioning{'no_content'}{'structure'}{'section_childs'}[0]{'structure'}{'section_childs'}[0]{'structure'}{'section_up'}
 = $result_sectioning{'no_content'}{'structure'}{'section_childs'}[0];
+$result_sectioning{'no_content'}{'structure'}{'section_childs'}[0]{'structure'}{'section_childs'}[0]{'structure'}{'toplevel_prev'}
 = $result_sectioning{'no_content'}{'structure'}{'section_childs'}[0];
+$result_sectioning{'no_content'}{'structure'}{'section_childs'}[0]{'structure'}{'section_childs'}[0]{'structure'}{'toplevel_up'}
 = $result_sectioning{'no_content'}{'structure'}{'section_childs'}[0];
+$result_sectioning{'no_content'}{'structure'}{'section_childs'}[0]{'structure'}{'section_up'}
 = $result_sectioning{'no_content'};
+
+$result_nodes{'no_content'} = {
+  'cmdname' => 'node',
+  'extra' => {
+    'associated_section' => {
+      'cmdname' => 'top',
+      'extra' => {},
+      'info' => {},
+      'structure' => {}
+    },
+    'menus' => [
+      {
+        'cmdname' => 'menu'
+      }
+    ],
+    'normalized' => 'Top'
+  },
+  'info' => {},
+  'structure' => {
+    'menu_child' => {
+      'cmdname' => 'node',
+      'extra' => {
+        'associated_section' => {
+          'cmdname' => 'chapter',
+          'extra' => {},
+          'info' => {},
+          'structure' => {
+            'section_number' => 1
+          }
+        },
+        'normalized' => 'chapter'
+      },
+      'info' => {},
+      'structure' => {
+        'node_prev' => {},
+        'node_up' => {}
+      }
+    },
+    'node_next' => {}
+  }
+};
+$result_nodes{'no_content'}{'structure'}{'menu_child'}{'structure'}{'node_prev'}
 = $result_nodes{'no_content'};
+$result_nodes{'no_content'}{'structure'}{'menu_child'}{'structure'}{'node_up'} 
= $result_nodes{'no_content'};
+$result_nodes{'no_content'}{'structure'}{'node_next'} = 
$result_nodes{'no_content'}{'structure'}{'menu_child'};
+
+$result_menus{'no_content'} = {
+  'cmdname' => 'node',
+  'extra' => {
+    'normalized' => 'Top'
+  },
+  'info' => {},
+  'structure' => {
+    'menu_child' => {
+      'cmdname' => 'node',
+      'extra' => {
+        'normalized' => 'chapter'
+      },
+      'info' => {},
+      'structure' => {
+        'menu_up' => {},
+        'menu_up_hash' => {
+          'Top' => 1
+        }
+      }
+    }
+  }
+};
+$result_menus{'no_content'}{'structure'}{'menu_child'}{'structure'}{'menu_up'} 
= $result_menus{'no_content'};
+
+$result_errors{'no_content'} = [];
+
+
+$result_floats{'no_content'} = {};
+
+
+1;
diff --git a/tp/t/results/html_tests/no_content/res_html/no_content.html 
b/tp/t/results/html_tests/no_content/res_html/no_content.html
new file mode 100644
index 0000000000..07ab46874e
--- /dev/null
+++ b/tp/t/results/html_tests/no_content/res_html/no_content.html
@@ -0,0 +1,50 @@
+<!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>No ccontent</title>
+
+<meta name="description" content="No ccontent">
+<meta name="keywords" content="No ccontent">
+<meta name="resource-type" content="document">
+<meta name="distribution" content="global">
+<meta name="viewport" content="width=device-width,initial-scale=1">
+
+<link href="#Top" rel="start" title="Top">
+<link href="#chapter" rel="next" title="chapter">
+
+
+</head>
+
+<body lang="en">
+<div class="top-level-extent" id="Top">
+<div class="nav-panel">
+<p>
+Next: <a href="#chapter" accesskey="n" rel="next">Chapter 1</a> &nbsp; </p>
+</div>
+<h1 class="top" id="No-ccontent">No ccontent</h1>
+
+<p>No content.
+</p>
+
+<ul class="mini-toc">
+<li><a href="#chapter" accesskey="1">Chapter 1</a></li>
+</ul>
+<hr style="height: 6px;">
+<div class="chapter-level-extent" id="chapter">
+<div class="nav-panel">
+<p>
+Previous: <a href="#Top" accesskey="p" rel="prev">No ccontent</a>, Up: <a 
href="#Top" accesskey="u" rel="up">No ccontent</a> &nbsp; </p>
+</div>
+<h2 class="chapter" id="Chapter-1">1 Chapter 1</h2>
+
+<p>The chapter
+</p>
+</div>
+</div>
+
+
+
+</body>
+</html>
diff --git a/tp/t/results/html_tests/no_content_do_contents.pl 
b/tp/t/results/html_tests/no_content_do_contents.pl
new file mode 100644
index 0000000000..81cd8fc82e
--- /dev/null
+++ b/tp/t/results/html_tests/no_content_do_contents.pl
@@ -0,0 +1,488 @@
+use vars qw(%result_texis %result_texts %result_trees %result_errors 
+   %result_indices %result_sectioning %result_nodes %result_menus
+   %result_floats %result_converted %result_converted_errors 
+   %result_elements %result_directions_text %result_indices_sort_strings);
+
+use utf8;
+
+$result_trees{'no_content_do_contents'} = {
+  'contents' => [
+    {
+      'contents' => [
+        {
+          'contents' => [
+            {
+              'text' => '\\input texinfo @c -*-texinfo-*-
+',
+              'type' => 'text_before_beginning'
+            },
+            {
+              'text' => '
+',
+              'type' => 'text_before_beginning'
+            }
+          ],
+          'type' => 'preamble_before_beginning'
+        },
+        {
+          'contents' => [],
+          'type' => 'preamble_before_content'
+        }
+      ],
+      'type' => 'before_node_section'
+    },
+    {
+      'args' => [
+        {
+          'contents' => [
+            {
+              'text' => 'Top'
+            }
+          ],
+          'info' => {
+            'spaces_after_argument' => '
+'
+          },
+          'type' => 'line_arg'
+        }
+      ],
+      'cmdname' => 'node',
+      'extra' => {
+        'node_content' => [
+          {}
+        ],
+        'nodes_manuals' => [
+          {
+            'node_content' => [
+              {}
+            ],
+            'normalized' => 'Top'
+          }
+        ],
+        'normalized' => 'Top'
+      },
+      'info' => {
+        'spaces_before_argument' => ' '
+      },
+      'source_info' => {
+        'file_name' => 'no_content.texi',
+        'line_nr' => 3,
+        'macro' => ''
+      }
+    },
+    {
+      'args' => [
+        {
+          'contents' => [
+            {
+              'text' => 'No ccontent'
+            }
+          ],
+          'info' => {
+            'spaces_after_argument' => '
+'
+          },
+          'type' => 'line_arg'
+        }
+      ],
+      'cmdname' => 'top',
+      'contents' => [
+        {
+          'text' => '
+',
+          'type' => 'empty_line'
+        },
+        {
+          'contents' => [
+            {
+              'text' => 'No content.
+'
+            }
+          ],
+          'type' => 'paragraph'
+        },
+        {
+          'text' => '
+',
+          'type' => 'empty_line'
+        },
+        {
+          'args' => [
+            {
+              'info' => {
+                'spaces_after_argument' => ' 
+'
+              },
+              'type' => 'block_line_arg'
+            }
+          ],
+          'cmdname' => 'menu',
+          'contents' => [
+            {
+              'args' => [
+                {
+                  'text' => '* ',
+                  'type' => 'menu_entry_leading_text'
+                },
+                {
+                  'contents' => [
+                    {
+                      'text' => 'chapter'
+                    }
+                  ],
+                  'type' => 'menu_entry_node'
+                },
+                {
+                  'text' => '::',
+                  'type' => 'menu_entry_separator'
+                },
+                {
+                  'contents' => [
+                    {
+                      'contents' => [
+                        {
+                          'text' => '
+'
+                        }
+                      ],
+                      'type' => 'preformatted'
+                    }
+                  ],
+                  'type' => 'menu_entry_description'
+                }
+              ],
+              'extra' => {
+                'menu_entry_description' => {},
+                'menu_entry_node' => {
+                  'node_content' => [
+                    {}
+                  ],
+                  'normalized' => 'chapter'
+                }
+              },
+              'source_info' => {
+                'file_name' => 'no_content.texi',
+                'line_nr' => 9,
+                'macro' => ''
+              },
+              'type' => 'menu_entry'
+            },
+            {
+              'args' => [
+                {
+                  'contents' => [
+                    {
+                      'text' => 'menu'
+                    }
+                  ],
+                  'info' => {
+                    'spaces_after_argument' => '
+'
+                  },
+                  'type' => 'line_arg'
+                }
+              ],
+              'cmdname' => 'end',
+              'extra' => {
+                'text_arg' => 'menu'
+              },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
+              'source_info' => {
+                'file_name' => 'no_content.texi',
+                'line_nr' => 10,
+                'macro' => ''
+              }
+            }
+          ],
+          'source_info' => {
+            'file_name' => 'no_content.texi',
+            'line_nr' => 8,
+            'macro' => ''
+          }
+        },
+        {
+          'text' => '
+',
+          'type' => 'empty_line'
+        }
+      ],
+      'extra' => {},
+      'info' => {
+        'spaces_before_argument' => ' '
+      },
+      'source_info' => {
+        'file_name' => 'no_content.texi',
+        'line_nr' => 4,
+        'macro' => ''
+      }
+    },
+    {
+      'args' => [
+        {
+          'contents' => [
+            {
+              'text' => 'chapter'
+            }
+          ],
+          'info' => {
+            'spaces_after_argument' => '
+'
+          },
+          'type' => 'line_arg'
+        }
+      ],
+      'cmdname' => 'node',
+      'extra' => {
+        'node_content' => [
+          {}
+        ],
+        'nodes_manuals' => [
+          {
+            'node_content' => [
+              {}
+            ],
+            'normalized' => 'chapter'
+          }
+        ],
+        'normalized' => 'chapter'
+      },
+      'info' => {
+        'spaces_before_argument' => ' '
+      },
+      'source_info' => {
+        'file_name' => 'no_content.texi',
+        'line_nr' => 12,
+        'macro' => ''
+      }
+    },
+    {
+      'args' => [
+        {
+          'contents' => [
+            {
+              'text' => 'Chapter 1'
+            }
+          ],
+          'info' => {
+            'spaces_after_argument' => '
+'
+          },
+          'type' => 'line_arg'
+        }
+      ],
+      'cmdname' => 'chapter',
+      'contents' => [
+        {
+          'text' => '
+',
+          'type' => 'empty_line'
+        },
+        {
+          'contents' => [
+            {
+              'text' => 'The chapter
+'
+            }
+          ],
+          'type' => 'paragraph'
+        },
+        {
+          'text' => '
+',
+          'type' => 'empty_line'
+        }
+      ],
+      'extra' => {},
+      'info' => {
+        'spaces_before_argument' => ' '
+      },
+      'source_info' => {
+        'file_name' => 'no_content.texi',
+        'line_nr' => 13,
+        'macro' => ''
+      }
+    },
+    {
+      'args' => [
+        {
+          'text' => '
+',
+          'type' => 'misc_arg'
+        }
+      ],
+      'cmdname' => 'bye'
+    }
+  ],
+  'type' => 'document_root'
+};
+$result_trees{'no_content_do_contents'}{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'no_content_do_contents'}{'contents'}[1]{'args'}[0]{'contents'}[0];
+$result_trees{'no_content_do_contents'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'no_content_do_contents'}{'contents'}[1]{'args'}[0]{'contents'}[0];
+$result_trees{'no_content_do_contents'}{'contents'}[2]{'contents'}[3]{'contents'}[0]{'extra'}{'menu_entry_description'}
 = 
$result_trees{'no_content_do_contents'}{'contents'}[2]{'contents'}[3]{'contents'}[0]{'args'}[3];
+$result_trees{'no_content_do_contents'}{'contents'}[2]{'contents'}[3]{'contents'}[0]{'extra'}{'menu_entry_node'}{'node_content'}[0]
 = 
$result_trees{'no_content_do_contents'}{'contents'}[2]{'contents'}[3]{'contents'}[0]{'args'}[1]{'contents'}[0];
+$result_trees{'no_content_do_contents'}{'contents'}[3]{'extra'}{'node_content'}[0]
 = 
$result_trees{'no_content_do_contents'}{'contents'}[3]{'args'}[0]{'contents'}[0];
+$result_trees{'no_content_do_contents'}{'contents'}[3]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'no_content_do_contents'}{'contents'}[3]{'args'}[0]{'contents'}[0];
+
+$result_texis{'no_content_do_contents'} = '\\input texinfo @c -*-texinfo-*-
+
+@node Top
+@top No ccontent
+
+No content.
+
+@menu 
+* chapter::
+@end menu
+
+@node chapter
+@chapter Chapter 1
+
+The chapter
+
+@bye
+';
+
+
+$result_texts{'no_content_do_contents'} = 'No ccontent
+***********
+
+No content.
+
+* chapter::
+
+1 Chapter 1
+***********
+
+The chapter
+
+';
+
+$result_sectioning{'no_content_do_contents'} = {
+  'structure' => {
+    'section_childs' => [
+      {
+        'cmdname' => 'top',
+        'extra' => {
+          'associated_node' => {
+            'cmdname' => 'node',
+            'extra' => {
+              'normalized' => 'Top'
+            },
+            'info' => {},
+            'structure' => {}
+          }
+        },
+        'info' => {},
+        'structure' => {
+          'section_childs' => [
+            {
+              'cmdname' => 'chapter',
+              'extra' => {
+                'associated_node' => {
+                  'cmdname' => 'node',
+                  'extra' => {
+                    'normalized' => 'chapter'
+                  },
+                  'info' => {},
+                  'structure' => {}
+                }
+              },
+              'info' => {},
+              'structure' => {
+                'section_level' => 1,
+                'section_number' => 1,
+                'section_up' => {},
+                'toplevel_prev' => {},
+                'toplevel_up' => {}
+              }
+            }
+          ],
+          'section_level' => 0,
+          'section_up' => {}
+        }
+      }
+    ],
+    'section_level' => -1
+  }
+};
+$result_sectioning{'no_content_do_contents'}{'structure'}{'section_childs'}[0]{'structure'}{'section_childs'}[0]{'structure'}{'section_up'}
 = 
$result_sectioning{'no_content_do_contents'}{'structure'}{'section_childs'}[0];
+$result_sectioning{'no_content_do_contents'}{'structure'}{'section_childs'}[0]{'structure'}{'section_childs'}[0]{'structure'}{'toplevel_prev'}
 = 
$result_sectioning{'no_content_do_contents'}{'structure'}{'section_childs'}[0];
+$result_sectioning{'no_content_do_contents'}{'structure'}{'section_childs'}[0]{'structure'}{'section_childs'}[0]{'structure'}{'toplevel_up'}
 = 
$result_sectioning{'no_content_do_contents'}{'structure'}{'section_childs'}[0];
+$result_sectioning{'no_content_do_contents'}{'structure'}{'section_childs'}[0]{'structure'}{'section_up'}
 = $result_sectioning{'no_content_do_contents'};
+
+$result_nodes{'no_content_do_contents'} = {
+  'cmdname' => 'node',
+  'extra' => {
+    'associated_section' => {
+      'cmdname' => 'top',
+      'extra' => {},
+      'info' => {},
+      'structure' => {}
+    },
+    'menus' => [
+      {
+        'cmdname' => 'menu'
+      }
+    ],
+    'normalized' => 'Top'
+  },
+  'info' => {},
+  'structure' => {
+    'menu_child' => {
+      'cmdname' => 'node',
+      'extra' => {
+        'associated_section' => {
+          'cmdname' => 'chapter',
+          'extra' => {},
+          'info' => {},
+          'structure' => {
+            'section_number' => 1
+          }
+        },
+        'normalized' => 'chapter'
+      },
+      'info' => {},
+      'structure' => {
+        'node_prev' => {},
+        'node_up' => {}
+      }
+    },
+    'node_next' => {}
+  }
+};
+$result_nodes{'no_content_do_contents'}{'structure'}{'menu_child'}{'structure'}{'node_prev'}
 = $result_nodes{'no_content_do_contents'};
+$result_nodes{'no_content_do_contents'}{'structure'}{'menu_child'}{'structure'}{'node_up'}
 = $result_nodes{'no_content_do_contents'};
+$result_nodes{'no_content_do_contents'}{'structure'}{'node_next'} = 
$result_nodes{'no_content_do_contents'}{'structure'}{'menu_child'};
+
+$result_menus{'no_content_do_contents'} = {
+  'cmdname' => 'node',
+  'extra' => {
+    'normalized' => 'Top'
+  },
+  'info' => {},
+  'structure' => {
+    'menu_child' => {
+      'cmdname' => 'node',
+      'extra' => {
+        'normalized' => 'chapter'
+      },
+      'info' => {},
+      'structure' => {
+        'menu_up' => {},
+        'menu_up_hash' => {
+          'Top' => 1
+        }
+      }
+    }
+  }
+};
+$result_menus{'no_content_do_contents'}{'structure'}{'menu_child'}{'structure'}{'menu_up'}
 = $result_menus{'no_content_do_contents'};
+
+$result_errors{'no_content_do_contents'} = [];
+
+
+$result_floats{'no_content_do_contents'} = {};
+
+
+1;
diff --git 
a/tp/t/results/html_tests/no_content_do_contents/res_html/no_content.html 
b/tp/t/results/html_tests/no_content_do_contents/res_html/no_content.html
new file mode 100644
index 0000000000..c16a1b0df4
--- /dev/null
+++ b/tp/t/results/html_tests/no_content_do_contents/res_html/no_content.html
@@ -0,0 +1,63 @@
+<!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>No ccontent</title>
+
+<meta name="description" content="No ccontent">
+<meta name="keywords" content="No ccontent">
+<meta name="resource-type" content="document">
+<meta name="distribution" content="global">
+<meta name="viewport" content="width=device-width,initial-scale=1">
+
+<link href="#Top" rel="start" title="Top">
+<link href="#SEC_Contents" rel="contents" title="Table of Contents">
+<link href="#chapter" rel="next" title="chapter">
+<style type="text/css">
+<!--
+ul.toc-numbered-mark {list-style: none}
+-->
+</style>
+
+
+</head>
+
+<body lang="en">
+<div class="top-level-extent" id="Top">
+<div class="nav-panel">
+<p>
+Next: <a href="#chapter" accesskey="n" rel="next">Chapter 1</a> &nbsp; [<a 
href="#SEC_Contents" title="Table of contents" rel="contents">Contents</a>]</p>
+</div>
+<h1 class="top" id="No-ccontent">No ccontent</h1>
+
+<p>No content.
+</p>
+
+<div class="element-contents" id="SEC_Contents">
+<h2 class="contents-heading">Table of Contents</h2>
+
+<div class="contents">
+
+<ul class="toc-numbered-mark">
+  <li><a id="toc-Chapter-1" href="#chapter">1 Chapter 1</a></li>
+</ul>
+</div>
+</div>
+<hr style="height: 6px;">
+<div class="chapter-level-extent" id="chapter">
+<div class="nav-panel">
+<p>
+Previous: <a href="#Top" accesskey="p" rel="prev">No ccontent</a>, Up: <a 
href="#Top" accesskey="u" rel="up">No ccontent</a> &nbsp; [<a 
href="#SEC_Contents" title="Table of contents" rel="contents">Contents</a>]</p>
+</div>
+<h2 class="chapter" id="Chapter-1">1 Chapter 1</h2>
+
+<p>The chapter
+</p>
+</div>
+</div>
+
+
+
+</body>
+</html>
diff --git a/tp/t/results/html_tests/no_content_do_contents_inline.pl 
b/tp/t/results/html_tests/no_content_do_contents_inline.pl
new file mode 100644
index 0000000000..eddea0baa8
--- /dev/null
+++ b/tp/t/results/html_tests/no_content_do_contents_inline.pl
@@ -0,0 +1,488 @@
+use vars qw(%result_texis %result_texts %result_trees %result_errors 
+   %result_indices %result_sectioning %result_nodes %result_menus
+   %result_floats %result_converted %result_converted_errors 
+   %result_elements %result_directions_text %result_indices_sort_strings);
+
+use utf8;
+
+$result_trees{'no_content_do_contents_inline'} = {
+  'contents' => [
+    {
+      'contents' => [
+        {
+          'contents' => [
+            {
+              'text' => '\\input texinfo @c -*-texinfo-*-
+',
+              'type' => 'text_before_beginning'
+            },
+            {
+              'text' => '
+',
+              'type' => 'text_before_beginning'
+            }
+          ],
+          'type' => 'preamble_before_beginning'
+        },
+        {
+          'contents' => [],
+          'type' => 'preamble_before_content'
+        }
+      ],
+      'type' => 'before_node_section'
+    },
+    {
+      'args' => [
+        {
+          'contents' => [
+            {
+              'text' => 'Top'
+            }
+          ],
+          'info' => {
+            'spaces_after_argument' => '
+'
+          },
+          'type' => 'line_arg'
+        }
+      ],
+      'cmdname' => 'node',
+      'extra' => {
+        'node_content' => [
+          {}
+        ],
+        'nodes_manuals' => [
+          {
+            'node_content' => [
+              {}
+            ],
+            'normalized' => 'Top'
+          }
+        ],
+        'normalized' => 'Top'
+      },
+      'info' => {
+        'spaces_before_argument' => ' '
+      },
+      'source_info' => {
+        'file_name' => 'no_content.texi',
+        'line_nr' => 3,
+        'macro' => ''
+      }
+    },
+    {
+      'args' => [
+        {
+          'contents' => [
+            {
+              'text' => 'No ccontent'
+            }
+          ],
+          'info' => {
+            'spaces_after_argument' => '
+'
+          },
+          'type' => 'line_arg'
+        }
+      ],
+      'cmdname' => 'top',
+      'contents' => [
+        {
+          'text' => '
+',
+          'type' => 'empty_line'
+        },
+        {
+          'contents' => [
+            {
+              'text' => 'No content.
+'
+            }
+          ],
+          'type' => 'paragraph'
+        },
+        {
+          'text' => '
+',
+          'type' => 'empty_line'
+        },
+        {
+          'args' => [
+            {
+              'info' => {
+                'spaces_after_argument' => ' 
+'
+              },
+              'type' => 'block_line_arg'
+            }
+          ],
+          'cmdname' => 'menu',
+          'contents' => [
+            {
+              'args' => [
+                {
+                  'text' => '* ',
+                  'type' => 'menu_entry_leading_text'
+                },
+                {
+                  'contents' => [
+                    {
+                      'text' => 'chapter'
+                    }
+                  ],
+                  'type' => 'menu_entry_node'
+                },
+                {
+                  'text' => '::',
+                  'type' => 'menu_entry_separator'
+                },
+                {
+                  'contents' => [
+                    {
+                      'contents' => [
+                        {
+                          'text' => '
+'
+                        }
+                      ],
+                      'type' => 'preformatted'
+                    }
+                  ],
+                  'type' => 'menu_entry_description'
+                }
+              ],
+              'extra' => {
+                'menu_entry_description' => {},
+                'menu_entry_node' => {
+                  'node_content' => [
+                    {}
+                  ],
+                  'normalized' => 'chapter'
+                }
+              },
+              'source_info' => {
+                'file_name' => 'no_content.texi',
+                'line_nr' => 9,
+                'macro' => ''
+              },
+              'type' => 'menu_entry'
+            },
+            {
+              'args' => [
+                {
+                  'contents' => [
+                    {
+                      'text' => 'menu'
+                    }
+                  ],
+                  'info' => {
+                    'spaces_after_argument' => '
+'
+                  },
+                  'type' => 'line_arg'
+                }
+              ],
+              'cmdname' => 'end',
+              'extra' => {
+                'text_arg' => 'menu'
+              },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
+              'source_info' => {
+                'file_name' => 'no_content.texi',
+                'line_nr' => 10,
+                'macro' => ''
+              }
+            }
+          ],
+          'source_info' => {
+            'file_name' => 'no_content.texi',
+            'line_nr' => 8,
+            'macro' => ''
+          }
+        },
+        {
+          'text' => '
+',
+          'type' => 'empty_line'
+        }
+      ],
+      'extra' => {},
+      'info' => {
+        'spaces_before_argument' => ' '
+      },
+      'source_info' => {
+        'file_name' => 'no_content.texi',
+        'line_nr' => 4,
+        'macro' => ''
+      }
+    },
+    {
+      'args' => [
+        {
+          'contents' => [
+            {
+              'text' => 'chapter'
+            }
+          ],
+          'info' => {
+            'spaces_after_argument' => '
+'
+          },
+          'type' => 'line_arg'
+        }
+      ],
+      'cmdname' => 'node',
+      'extra' => {
+        'node_content' => [
+          {}
+        ],
+        'nodes_manuals' => [
+          {
+            'node_content' => [
+              {}
+            ],
+            'normalized' => 'chapter'
+          }
+        ],
+        'normalized' => 'chapter'
+      },
+      'info' => {
+        'spaces_before_argument' => ' '
+      },
+      'source_info' => {
+        'file_name' => 'no_content.texi',
+        'line_nr' => 12,
+        'macro' => ''
+      }
+    },
+    {
+      'args' => [
+        {
+          'contents' => [
+            {
+              'text' => 'Chapter 1'
+            }
+          ],
+          'info' => {
+            'spaces_after_argument' => '
+'
+          },
+          'type' => 'line_arg'
+        }
+      ],
+      'cmdname' => 'chapter',
+      'contents' => [
+        {
+          'text' => '
+',
+          'type' => 'empty_line'
+        },
+        {
+          'contents' => [
+            {
+              'text' => 'The chapter
+'
+            }
+          ],
+          'type' => 'paragraph'
+        },
+        {
+          'text' => '
+',
+          'type' => 'empty_line'
+        }
+      ],
+      'extra' => {},
+      'info' => {
+        'spaces_before_argument' => ' '
+      },
+      'source_info' => {
+        'file_name' => 'no_content.texi',
+        'line_nr' => 13,
+        'macro' => ''
+      }
+    },
+    {
+      'args' => [
+        {
+          'text' => '
+',
+          'type' => 'misc_arg'
+        }
+      ],
+      'cmdname' => 'bye'
+    }
+  ],
+  'type' => 'document_root'
+};
+$result_trees{'no_content_do_contents_inline'}{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'no_content_do_contents_inline'}{'contents'}[1]{'args'}[0]{'contents'}[0];
+$result_trees{'no_content_do_contents_inline'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'no_content_do_contents_inline'}{'contents'}[1]{'args'}[0]{'contents'}[0];
+$result_trees{'no_content_do_contents_inline'}{'contents'}[2]{'contents'}[3]{'contents'}[0]{'extra'}{'menu_entry_description'}
 = 
$result_trees{'no_content_do_contents_inline'}{'contents'}[2]{'contents'}[3]{'contents'}[0]{'args'}[3];
+$result_trees{'no_content_do_contents_inline'}{'contents'}[2]{'contents'}[3]{'contents'}[0]{'extra'}{'menu_entry_node'}{'node_content'}[0]
 = 
$result_trees{'no_content_do_contents_inline'}{'contents'}[2]{'contents'}[3]{'contents'}[0]{'args'}[1]{'contents'}[0];
+$result_trees{'no_content_do_contents_inline'}{'contents'}[3]{'extra'}{'node_content'}[0]
 = 
$result_trees{'no_content_do_contents_inline'}{'contents'}[3]{'args'}[0]{'contents'}[0];
+$result_trees{'no_content_do_contents_inline'}{'contents'}[3]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'no_content_do_contents_inline'}{'contents'}[3]{'args'}[0]{'contents'}[0];
+
+$result_texis{'no_content_do_contents_inline'} = '\\input texinfo @c 
-*-texinfo-*-
+
+@node Top
+@top No ccontent
+
+No content.
+
+@menu 
+* chapter::
+@end menu
+
+@node chapter
+@chapter Chapter 1
+
+The chapter
+
+@bye
+';
+
+
+$result_texts{'no_content_do_contents_inline'} = 'No ccontent
+***********
+
+No content.
+
+* chapter::
+
+1 Chapter 1
+***********
+
+The chapter
+
+';
+
+$result_sectioning{'no_content_do_contents_inline'} = {
+  'structure' => {
+    'section_childs' => [
+      {
+        'cmdname' => 'top',
+        'extra' => {
+          'associated_node' => {
+            'cmdname' => 'node',
+            'extra' => {
+              'normalized' => 'Top'
+            },
+            'info' => {},
+            'structure' => {}
+          }
+        },
+        'info' => {},
+        'structure' => {
+          'section_childs' => [
+            {
+              'cmdname' => 'chapter',
+              'extra' => {
+                'associated_node' => {
+                  'cmdname' => 'node',
+                  'extra' => {
+                    'normalized' => 'chapter'
+                  },
+                  'info' => {},
+                  'structure' => {}
+                }
+              },
+              'info' => {},
+              'structure' => {
+                'section_level' => 1,
+                'section_number' => 1,
+                'section_up' => {},
+                'toplevel_prev' => {},
+                'toplevel_up' => {}
+              }
+            }
+          ],
+          'section_level' => 0,
+          'section_up' => {}
+        }
+      }
+    ],
+    'section_level' => -1
+  }
+};
+$result_sectioning{'no_content_do_contents_inline'}{'structure'}{'section_childs'}[0]{'structure'}{'section_childs'}[0]{'structure'}{'section_up'}
 = 
$result_sectioning{'no_content_do_contents_inline'}{'structure'}{'section_childs'}[0];
+$result_sectioning{'no_content_do_contents_inline'}{'structure'}{'section_childs'}[0]{'structure'}{'section_childs'}[0]{'structure'}{'toplevel_prev'}
 = 
$result_sectioning{'no_content_do_contents_inline'}{'structure'}{'section_childs'}[0];
+$result_sectioning{'no_content_do_contents_inline'}{'structure'}{'section_childs'}[0]{'structure'}{'section_childs'}[0]{'structure'}{'toplevel_up'}
 = 
$result_sectioning{'no_content_do_contents_inline'}{'structure'}{'section_childs'}[0];
+$result_sectioning{'no_content_do_contents_inline'}{'structure'}{'section_childs'}[0]{'structure'}{'section_up'}
 = $result_sectioning{'no_content_do_contents_inline'};
+
+$result_nodes{'no_content_do_contents_inline'} = {
+  'cmdname' => 'node',
+  'extra' => {
+    'associated_section' => {
+      'cmdname' => 'top',
+      'extra' => {},
+      'info' => {},
+      'structure' => {}
+    },
+    'menus' => [
+      {
+        'cmdname' => 'menu'
+      }
+    ],
+    'normalized' => 'Top'
+  },
+  'info' => {},
+  'structure' => {
+    'menu_child' => {
+      'cmdname' => 'node',
+      'extra' => {
+        'associated_section' => {
+          'cmdname' => 'chapter',
+          'extra' => {},
+          'info' => {},
+          'structure' => {
+            'section_number' => 1
+          }
+        },
+        'normalized' => 'chapter'
+      },
+      'info' => {},
+      'structure' => {
+        'node_prev' => {},
+        'node_up' => {}
+      }
+    },
+    'node_next' => {}
+  }
+};
+$result_nodes{'no_content_do_contents_inline'}{'structure'}{'menu_child'}{'structure'}{'node_prev'}
 = $result_nodes{'no_content_do_contents_inline'};
+$result_nodes{'no_content_do_contents_inline'}{'structure'}{'menu_child'}{'structure'}{'node_up'}
 = $result_nodes{'no_content_do_contents_inline'};
+$result_nodes{'no_content_do_contents_inline'}{'structure'}{'node_next'} = 
$result_nodes{'no_content_do_contents_inline'}{'structure'}{'menu_child'};
+
+$result_menus{'no_content_do_contents_inline'} = {
+  'cmdname' => 'node',
+  'extra' => {
+    'normalized' => 'Top'
+  },
+  'info' => {},
+  'structure' => {
+    'menu_child' => {
+      'cmdname' => 'node',
+      'extra' => {
+        'normalized' => 'chapter'
+      },
+      'info' => {},
+      'structure' => {
+        'menu_up' => {},
+        'menu_up_hash' => {
+          'Top' => 1
+        }
+      }
+    }
+  }
+};
+$result_menus{'no_content_do_contents_inline'}{'structure'}{'menu_child'}{'structure'}{'menu_up'}
 = $result_menus{'no_content_do_contents_inline'};
+
+$result_errors{'no_content_do_contents_inline'} = [];
+
+
+$result_floats{'no_content_do_contents_inline'} = {};
+
+
+1;
diff --git 
a/tp/t/results/html_tests/no_content_do_contents_inline/res_html/no_content.html
 
b/tp/t/results/html_tests/no_content_do_contents_inline/res_html/no_content.html
new file mode 100644
index 0000000000..07ab46874e
--- /dev/null
+++ 
b/tp/t/results/html_tests/no_content_do_contents_inline/res_html/no_content.html
@@ -0,0 +1,50 @@
+<!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>No ccontent</title>
+
+<meta name="description" content="No ccontent">
+<meta name="keywords" content="No ccontent">
+<meta name="resource-type" content="document">
+<meta name="distribution" content="global">
+<meta name="viewport" content="width=device-width,initial-scale=1">
+
+<link href="#Top" rel="start" title="Top">
+<link href="#chapter" rel="next" title="chapter">
+
+
+</head>
+
+<body lang="en">
+<div class="top-level-extent" id="Top">
+<div class="nav-panel">
+<p>
+Next: <a href="#chapter" accesskey="n" rel="next">Chapter 1</a> &nbsp; </p>
+</div>
+<h1 class="top" id="No-ccontent">No ccontent</h1>
+
+<p>No content.
+</p>
+
+<ul class="mini-toc">
+<li><a href="#chapter" accesskey="1">Chapter 1</a></li>
+</ul>
+<hr style="height: 6px;">
+<div class="chapter-level-extent" id="chapter">
+<div class="nav-panel">
+<p>
+Previous: <a href="#Top" accesskey="p" rel="prev">No ccontent</a>, Up: <a 
href="#Top" accesskey="u" rel="up">No ccontent</a> &nbsp; </p>
+</div>
+<h2 class="chapter" id="Chapter-1">1 Chapter 1</h2>
+
+<p>The chapter
+</p>
+</div>
+</div>
+
+
+
+</body>
+</html>
diff --git a/tp/t/results/html_tests/no_content_do_contents_separate_element.pl 
b/tp/t/results/html_tests/no_content_do_contents_separate_element.pl
new file mode 100644
index 0000000000..dcdbca8a95
--- /dev/null
+++ b/tp/t/results/html_tests/no_content_do_contents_separate_element.pl
@@ -0,0 +1,488 @@
+use vars qw(%result_texis %result_texts %result_trees %result_errors 
+   %result_indices %result_sectioning %result_nodes %result_menus
+   %result_floats %result_converted %result_converted_errors 
+   %result_elements %result_directions_text %result_indices_sort_strings);
+
+use utf8;
+
+$result_trees{'no_content_do_contents_separate_element'} = {
+  'contents' => [
+    {
+      'contents' => [
+        {
+          'contents' => [
+            {
+              'text' => '\\input texinfo @c -*-texinfo-*-
+',
+              'type' => 'text_before_beginning'
+            },
+            {
+              'text' => '
+',
+              'type' => 'text_before_beginning'
+            }
+          ],
+          'type' => 'preamble_before_beginning'
+        },
+        {
+          'contents' => [],
+          'type' => 'preamble_before_content'
+        }
+      ],
+      'type' => 'before_node_section'
+    },
+    {
+      'args' => [
+        {
+          'contents' => [
+            {
+              'text' => 'Top'
+            }
+          ],
+          'info' => {
+            'spaces_after_argument' => '
+'
+          },
+          'type' => 'line_arg'
+        }
+      ],
+      'cmdname' => 'node',
+      'extra' => {
+        'node_content' => [
+          {}
+        ],
+        'nodes_manuals' => [
+          {
+            'node_content' => [
+              {}
+            ],
+            'normalized' => 'Top'
+          }
+        ],
+        'normalized' => 'Top'
+      },
+      'info' => {
+        'spaces_before_argument' => ' '
+      },
+      'source_info' => {
+        'file_name' => 'no_content.texi',
+        'line_nr' => 3,
+        'macro' => ''
+      }
+    },
+    {
+      'args' => [
+        {
+          'contents' => [
+            {
+              'text' => 'No ccontent'
+            }
+          ],
+          'info' => {
+            'spaces_after_argument' => '
+'
+          },
+          'type' => 'line_arg'
+        }
+      ],
+      'cmdname' => 'top',
+      'contents' => [
+        {
+          'text' => '
+',
+          'type' => 'empty_line'
+        },
+        {
+          'contents' => [
+            {
+              'text' => 'No content.
+'
+            }
+          ],
+          'type' => 'paragraph'
+        },
+        {
+          'text' => '
+',
+          'type' => 'empty_line'
+        },
+        {
+          'args' => [
+            {
+              'info' => {
+                'spaces_after_argument' => ' 
+'
+              },
+              'type' => 'block_line_arg'
+            }
+          ],
+          'cmdname' => 'menu',
+          'contents' => [
+            {
+              'args' => [
+                {
+                  'text' => '* ',
+                  'type' => 'menu_entry_leading_text'
+                },
+                {
+                  'contents' => [
+                    {
+                      'text' => 'chapter'
+                    }
+                  ],
+                  'type' => 'menu_entry_node'
+                },
+                {
+                  'text' => '::',
+                  'type' => 'menu_entry_separator'
+                },
+                {
+                  'contents' => [
+                    {
+                      'contents' => [
+                        {
+                          'text' => '
+'
+                        }
+                      ],
+                      'type' => 'preformatted'
+                    }
+                  ],
+                  'type' => 'menu_entry_description'
+                }
+              ],
+              'extra' => {
+                'menu_entry_description' => {},
+                'menu_entry_node' => {
+                  'node_content' => [
+                    {}
+                  ],
+                  'normalized' => 'chapter'
+                }
+              },
+              'source_info' => {
+                'file_name' => 'no_content.texi',
+                'line_nr' => 9,
+                'macro' => ''
+              },
+              'type' => 'menu_entry'
+            },
+            {
+              'args' => [
+                {
+                  'contents' => [
+                    {
+                      'text' => 'menu'
+                    }
+                  ],
+                  'info' => {
+                    'spaces_after_argument' => '
+'
+                  },
+                  'type' => 'line_arg'
+                }
+              ],
+              'cmdname' => 'end',
+              'extra' => {
+                'text_arg' => 'menu'
+              },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
+              'source_info' => {
+                'file_name' => 'no_content.texi',
+                'line_nr' => 10,
+                'macro' => ''
+              }
+            }
+          ],
+          'source_info' => {
+            'file_name' => 'no_content.texi',
+            'line_nr' => 8,
+            'macro' => ''
+          }
+        },
+        {
+          'text' => '
+',
+          'type' => 'empty_line'
+        }
+      ],
+      'extra' => {},
+      'info' => {
+        'spaces_before_argument' => ' '
+      },
+      'source_info' => {
+        'file_name' => 'no_content.texi',
+        'line_nr' => 4,
+        'macro' => ''
+      }
+    },
+    {
+      'args' => [
+        {
+          'contents' => [
+            {
+              'text' => 'chapter'
+            }
+          ],
+          'info' => {
+            'spaces_after_argument' => '
+'
+          },
+          'type' => 'line_arg'
+        }
+      ],
+      'cmdname' => 'node',
+      'extra' => {
+        'node_content' => [
+          {}
+        ],
+        'nodes_manuals' => [
+          {
+            'node_content' => [
+              {}
+            ],
+            'normalized' => 'chapter'
+          }
+        ],
+        'normalized' => 'chapter'
+      },
+      'info' => {
+        'spaces_before_argument' => ' '
+      },
+      'source_info' => {
+        'file_name' => 'no_content.texi',
+        'line_nr' => 12,
+        'macro' => ''
+      }
+    },
+    {
+      'args' => [
+        {
+          'contents' => [
+            {
+              'text' => 'Chapter 1'
+            }
+          ],
+          'info' => {
+            'spaces_after_argument' => '
+'
+          },
+          'type' => 'line_arg'
+        }
+      ],
+      'cmdname' => 'chapter',
+      'contents' => [
+        {
+          'text' => '
+',
+          'type' => 'empty_line'
+        },
+        {
+          'contents' => [
+            {
+              'text' => 'The chapter
+'
+            }
+          ],
+          'type' => 'paragraph'
+        },
+        {
+          'text' => '
+',
+          'type' => 'empty_line'
+        }
+      ],
+      'extra' => {},
+      'info' => {
+        'spaces_before_argument' => ' '
+      },
+      'source_info' => {
+        'file_name' => 'no_content.texi',
+        'line_nr' => 13,
+        'macro' => ''
+      }
+    },
+    {
+      'args' => [
+        {
+          'text' => '
+',
+          'type' => 'misc_arg'
+        }
+      ],
+      'cmdname' => 'bye'
+    }
+  ],
+  'type' => 'document_root'
+};
+$result_trees{'no_content_do_contents_separate_element'}{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'no_content_do_contents_separate_element'}{'contents'}[1]{'args'}[0]{'contents'}[0];
+$result_trees{'no_content_do_contents_separate_element'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'no_content_do_contents_separate_element'}{'contents'}[1]{'args'}[0]{'contents'}[0];
+$result_trees{'no_content_do_contents_separate_element'}{'contents'}[2]{'contents'}[3]{'contents'}[0]{'extra'}{'menu_entry_description'}
 = 
$result_trees{'no_content_do_contents_separate_element'}{'contents'}[2]{'contents'}[3]{'contents'}[0]{'args'}[3];
+$result_trees{'no_content_do_contents_separate_element'}{'contents'}[2]{'contents'}[3]{'contents'}[0]{'extra'}{'menu_entry_node'}{'node_content'}[0]
 = 
$result_trees{'no_content_do_contents_separate_element'}{'contents'}[2]{'contents'}[3]{'contents'}[0]{'args'}[1]{'contents'}[0];
+$result_trees{'no_content_do_contents_separate_element'}{'contents'}[3]{'extra'}{'node_content'}[0]
 = 
$result_trees{'no_content_do_contents_separate_element'}{'contents'}[3]{'args'}[0]{'contents'}[0];
+$result_trees{'no_content_do_contents_separate_element'}{'contents'}[3]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'no_content_do_contents_separate_element'}{'contents'}[3]{'args'}[0]{'contents'}[0];
+
+$result_texis{'no_content_do_contents_separate_element'} = '\\input texinfo @c 
-*-texinfo-*-
+
+@node Top
+@top No ccontent
+
+No content.
+
+@menu 
+* chapter::
+@end menu
+
+@node chapter
+@chapter Chapter 1
+
+The chapter
+
+@bye
+';
+
+
+$result_texts{'no_content_do_contents_separate_element'} = 'No ccontent
+***********
+
+No content.
+
+* chapter::
+
+1 Chapter 1
+***********
+
+The chapter
+
+';
+
+$result_sectioning{'no_content_do_contents_separate_element'} = {
+  'structure' => {
+    'section_childs' => [
+      {
+        'cmdname' => 'top',
+        'extra' => {
+          'associated_node' => {
+            'cmdname' => 'node',
+            'extra' => {
+              'normalized' => 'Top'
+            },
+            'info' => {},
+            'structure' => {}
+          }
+        },
+        'info' => {},
+        'structure' => {
+          'section_childs' => [
+            {
+              'cmdname' => 'chapter',
+              'extra' => {
+                'associated_node' => {
+                  'cmdname' => 'node',
+                  'extra' => {
+                    'normalized' => 'chapter'
+                  },
+                  'info' => {},
+                  'structure' => {}
+                }
+              },
+              'info' => {},
+              'structure' => {
+                'section_level' => 1,
+                'section_number' => 1,
+                'section_up' => {},
+                'toplevel_prev' => {},
+                'toplevel_up' => {}
+              }
+            }
+          ],
+          'section_level' => 0,
+          'section_up' => {}
+        }
+      }
+    ],
+    'section_level' => -1
+  }
+};
+$result_sectioning{'no_content_do_contents_separate_element'}{'structure'}{'section_childs'}[0]{'structure'}{'section_childs'}[0]{'structure'}{'section_up'}
 = 
$result_sectioning{'no_content_do_contents_separate_element'}{'structure'}{'section_childs'}[0];
+$result_sectioning{'no_content_do_contents_separate_element'}{'structure'}{'section_childs'}[0]{'structure'}{'section_childs'}[0]{'structure'}{'toplevel_prev'}
 = 
$result_sectioning{'no_content_do_contents_separate_element'}{'structure'}{'section_childs'}[0];
+$result_sectioning{'no_content_do_contents_separate_element'}{'structure'}{'section_childs'}[0]{'structure'}{'section_childs'}[0]{'structure'}{'toplevel_up'}
 = 
$result_sectioning{'no_content_do_contents_separate_element'}{'structure'}{'section_childs'}[0];
+$result_sectioning{'no_content_do_contents_separate_element'}{'structure'}{'section_childs'}[0]{'structure'}{'section_up'}
 = $result_sectioning{'no_content_do_contents_separate_element'};
+
+$result_nodes{'no_content_do_contents_separate_element'} = {
+  'cmdname' => 'node',
+  'extra' => {
+    'associated_section' => {
+      'cmdname' => 'top',
+      'extra' => {},
+      'info' => {},
+      'structure' => {}
+    },
+    'menus' => [
+      {
+        'cmdname' => 'menu'
+      }
+    ],
+    'normalized' => 'Top'
+  },
+  'info' => {},
+  'structure' => {
+    'menu_child' => {
+      'cmdname' => 'node',
+      'extra' => {
+        'associated_section' => {
+          'cmdname' => 'chapter',
+          'extra' => {},
+          'info' => {},
+          'structure' => {
+            'section_number' => 1
+          }
+        },
+        'normalized' => 'chapter'
+      },
+      'info' => {},
+      'structure' => {
+        'node_prev' => {},
+        'node_up' => {}
+      }
+    },
+    'node_next' => {}
+  }
+};
+$result_nodes{'no_content_do_contents_separate_element'}{'structure'}{'menu_child'}{'structure'}{'node_prev'}
 = $result_nodes{'no_content_do_contents_separate_element'};
+$result_nodes{'no_content_do_contents_separate_element'}{'structure'}{'menu_child'}{'structure'}{'node_up'}
 = $result_nodes{'no_content_do_contents_separate_element'};
+$result_nodes{'no_content_do_contents_separate_element'}{'structure'}{'node_next'}
 = 
$result_nodes{'no_content_do_contents_separate_element'}{'structure'}{'menu_child'};
+
+$result_menus{'no_content_do_contents_separate_element'} = {
+  'cmdname' => 'node',
+  'extra' => {
+    'normalized' => 'Top'
+  },
+  'info' => {},
+  'structure' => {
+    'menu_child' => {
+      'cmdname' => 'node',
+      'extra' => {
+        'normalized' => 'chapter'
+      },
+      'info' => {},
+      'structure' => {
+        'menu_up' => {},
+        'menu_up_hash' => {
+          'Top' => 1
+        }
+      }
+    }
+  }
+};
+$result_menus{'no_content_do_contents_separate_element'}{'structure'}{'menu_child'}{'structure'}{'menu_up'}
 = $result_menus{'no_content_do_contents_separate_element'};
+
+$result_errors{'no_content_do_contents_separate_element'} = [];
+
+
+$result_floats{'no_content_do_contents_separate_element'} = {};
+
+
+1;
diff --git 
a/tp/t/results/html_tests/no_content_do_contents_separate_element/res_html/no_content.html
 
b/tp/t/results/html_tests/no_content_do_contents_separate_element/res_html/no_content.html
new file mode 100644
index 0000000000..d066e59873
--- /dev/null
+++ 
b/tp/t/results/html_tests/no_content_do_contents_separate_element/res_html/no_content.html
@@ -0,0 +1,70 @@
+<!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>No ccontent</title>
+
+<meta name="description" content="No ccontent">
+<meta name="keywords" content="No ccontent">
+<meta name="resource-type" content="document">
+<meta name="distribution" content="global">
+<meta name="viewport" content="width=device-width,initial-scale=1">
+
+<link href="#Top" rel="start" title="Top">
+<link href="#SEC_Contents" rel="contents" title="Table of Contents">
+<link href="#chapter" rel="next" title="chapter">
+<style type="text/css">
+<!--
+ul.toc-numbered-mark {list-style: none}
+-->
+</style>
+
+
+</head>
+
+<body lang="en">
+<div class="top-level-extent" id="Top">
+<div class="nav-panel">
+<p>
+Next: <a href="#chapter" accesskey="n" rel="next">Chapter 1</a> &nbsp; [<a 
href="#SEC_Contents" title="Table of contents" rel="contents">Contents</a>]</p>
+</div>
+<h1 class="top" id="No-ccontent">No ccontent</h1>
+
+<p>No content.
+</p>
+
+<ul class="mini-toc">
+<li><a href="#chapter" accesskey="1">Chapter 1</a></li>
+</ul>
+<hr style="height: 6px;">
+<div class="chapter-level-extent" id="chapter">
+<div class="nav-panel">
+<p>
+Previous: <a href="#Top" accesskey="p" rel="prev">No ccontent</a>, Up: <a 
href="#Top" accesskey="u" rel="up">No ccontent</a> &nbsp; [<a 
href="#SEC_Contents" title="Table of contents" rel="contents">Contents</a>]</p>
+</div>
+<h2 class="chapter" id="Chapter-1">1 Chapter 1</h2>
+
+<p>The chapter
+</p>
+<hr style="height: 6px;">
+</div>
+</div>
+<div class="element-contents" id="SEC_Contents">
+<div class="nav-panel">
+<p>
+ &nbsp; [<a href="#SEC_Contents" title="Table of contents" 
rel="contents">Contents</a>]</p>
+</div>
+<h2 class="contents-heading">Table of Contents</h2>
+
+<div class="contents">
+
+<ul class="toc-numbered-mark">
+  <li><a id="toc-Chapter-1" href="#chapter">1 Chapter 1</a></li>
+</ul>
+</div>
+</div>
+
+
+</body>
+</html>
diff --git a/tp/t/results/html_tests/no_content_inline.pl 
b/tp/t/results/html_tests/no_content_inline.pl
new file mode 100644
index 0000000000..bd59bdc6a1
--- /dev/null
+++ b/tp/t/results/html_tests/no_content_inline.pl
@@ -0,0 +1,488 @@
+use vars qw(%result_texis %result_texts %result_trees %result_errors 
+   %result_indices %result_sectioning %result_nodes %result_menus
+   %result_floats %result_converted %result_converted_errors 
+   %result_elements %result_directions_text %result_indices_sort_strings);
+
+use utf8;
+
+$result_trees{'no_content_inline'} = {
+  'contents' => [
+    {
+      'contents' => [
+        {
+          'contents' => [
+            {
+              'text' => '\\input texinfo @c -*-texinfo-*-
+',
+              'type' => 'text_before_beginning'
+            },
+            {
+              'text' => '
+',
+              'type' => 'text_before_beginning'
+            }
+          ],
+          'type' => 'preamble_before_beginning'
+        },
+        {
+          'contents' => [],
+          'type' => 'preamble_before_content'
+        }
+      ],
+      'type' => 'before_node_section'
+    },
+    {
+      'args' => [
+        {
+          'contents' => [
+            {
+              'text' => 'Top'
+            }
+          ],
+          'info' => {
+            'spaces_after_argument' => '
+'
+          },
+          'type' => 'line_arg'
+        }
+      ],
+      'cmdname' => 'node',
+      'extra' => {
+        'node_content' => [
+          {}
+        ],
+        'nodes_manuals' => [
+          {
+            'node_content' => [
+              {}
+            ],
+            'normalized' => 'Top'
+          }
+        ],
+        'normalized' => 'Top'
+      },
+      'info' => {
+        'spaces_before_argument' => ' '
+      },
+      'source_info' => {
+        'file_name' => 'no_content.texi',
+        'line_nr' => 3,
+        'macro' => ''
+      }
+    },
+    {
+      'args' => [
+        {
+          'contents' => [
+            {
+              'text' => 'No ccontent'
+            }
+          ],
+          'info' => {
+            'spaces_after_argument' => '
+'
+          },
+          'type' => 'line_arg'
+        }
+      ],
+      'cmdname' => 'top',
+      'contents' => [
+        {
+          'text' => '
+',
+          'type' => 'empty_line'
+        },
+        {
+          'contents' => [
+            {
+              'text' => 'No content.
+'
+            }
+          ],
+          'type' => 'paragraph'
+        },
+        {
+          'text' => '
+',
+          'type' => 'empty_line'
+        },
+        {
+          'args' => [
+            {
+              'info' => {
+                'spaces_after_argument' => ' 
+'
+              },
+              'type' => 'block_line_arg'
+            }
+          ],
+          'cmdname' => 'menu',
+          'contents' => [
+            {
+              'args' => [
+                {
+                  'text' => '* ',
+                  'type' => 'menu_entry_leading_text'
+                },
+                {
+                  'contents' => [
+                    {
+                      'text' => 'chapter'
+                    }
+                  ],
+                  'type' => 'menu_entry_node'
+                },
+                {
+                  'text' => '::',
+                  'type' => 'menu_entry_separator'
+                },
+                {
+                  'contents' => [
+                    {
+                      'contents' => [
+                        {
+                          'text' => '
+'
+                        }
+                      ],
+                      'type' => 'preformatted'
+                    }
+                  ],
+                  'type' => 'menu_entry_description'
+                }
+              ],
+              'extra' => {
+                'menu_entry_description' => {},
+                'menu_entry_node' => {
+                  'node_content' => [
+                    {}
+                  ],
+                  'normalized' => 'chapter'
+                }
+              },
+              'source_info' => {
+                'file_name' => 'no_content.texi',
+                'line_nr' => 9,
+                'macro' => ''
+              },
+              'type' => 'menu_entry'
+            },
+            {
+              'args' => [
+                {
+                  'contents' => [
+                    {
+                      'text' => 'menu'
+                    }
+                  ],
+                  'info' => {
+                    'spaces_after_argument' => '
+'
+                  },
+                  'type' => 'line_arg'
+                }
+              ],
+              'cmdname' => 'end',
+              'extra' => {
+                'text_arg' => 'menu'
+              },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
+              'source_info' => {
+                'file_name' => 'no_content.texi',
+                'line_nr' => 10,
+                'macro' => ''
+              }
+            }
+          ],
+          'source_info' => {
+            'file_name' => 'no_content.texi',
+            'line_nr' => 8,
+            'macro' => ''
+          }
+        },
+        {
+          'text' => '
+',
+          'type' => 'empty_line'
+        }
+      ],
+      'extra' => {},
+      'info' => {
+        'spaces_before_argument' => ' '
+      },
+      'source_info' => {
+        'file_name' => 'no_content.texi',
+        'line_nr' => 4,
+        'macro' => ''
+      }
+    },
+    {
+      'args' => [
+        {
+          'contents' => [
+            {
+              'text' => 'chapter'
+            }
+          ],
+          'info' => {
+            'spaces_after_argument' => '
+'
+          },
+          'type' => 'line_arg'
+        }
+      ],
+      'cmdname' => 'node',
+      'extra' => {
+        'node_content' => [
+          {}
+        ],
+        'nodes_manuals' => [
+          {
+            'node_content' => [
+              {}
+            ],
+            'normalized' => 'chapter'
+          }
+        ],
+        'normalized' => 'chapter'
+      },
+      'info' => {
+        'spaces_before_argument' => ' '
+      },
+      'source_info' => {
+        'file_name' => 'no_content.texi',
+        'line_nr' => 12,
+        'macro' => ''
+      }
+    },
+    {
+      'args' => [
+        {
+          'contents' => [
+            {
+              'text' => 'Chapter 1'
+            }
+          ],
+          'info' => {
+            'spaces_after_argument' => '
+'
+          },
+          'type' => 'line_arg'
+        }
+      ],
+      'cmdname' => 'chapter',
+      'contents' => [
+        {
+          'text' => '
+',
+          'type' => 'empty_line'
+        },
+        {
+          'contents' => [
+            {
+              'text' => 'The chapter
+'
+            }
+          ],
+          'type' => 'paragraph'
+        },
+        {
+          'text' => '
+',
+          'type' => 'empty_line'
+        }
+      ],
+      'extra' => {},
+      'info' => {
+        'spaces_before_argument' => ' '
+      },
+      'source_info' => {
+        'file_name' => 'no_content.texi',
+        'line_nr' => 13,
+        'macro' => ''
+      }
+    },
+    {
+      'args' => [
+        {
+          'text' => '
+',
+          'type' => 'misc_arg'
+        }
+      ],
+      'cmdname' => 'bye'
+    }
+  ],
+  'type' => 'document_root'
+};
+$result_trees{'no_content_inline'}{'contents'}[1]{'extra'}{'node_content'}[0] 
= $result_trees{'no_content_inline'}{'contents'}[1]{'args'}[0]{'contents'}[0];
+$result_trees{'no_content_inline'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = $result_trees{'no_content_inline'}{'contents'}[1]{'args'}[0]{'contents'}[0];
+$result_trees{'no_content_inline'}{'contents'}[2]{'contents'}[3]{'contents'}[0]{'extra'}{'menu_entry_description'}
 = 
$result_trees{'no_content_inline'}{'contents'}[2]{'contents'}[3]{'contents'}[0]{'args'}[3];
+$result_trees{'no_content_inline'}{'contents'}[2]{'contents'}[3]{'contents'}[0]{'extra'}{'menu_entry_node'}{'node_content'}[0]
 = 
$result_trees{'no_content_inline'}{'contents'}[2]{'contents'}[3]{'contents'}[0]{'args'}[1]{'contents'}[0];
+$result_trees{'no_content_inline'}{'contents'}[3]{'extra'}{'node_content'}[0] 
= $result_trees{'no_content_inline'}{'contents'}[3]{'args'}[0]{'contents'}[0];
+$result_trees{'no_content_inline'}{'contents'}[3]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = $result_trees{'no_content_inline'}{'contents'}[3]{'args'}[0]{'contents'}[0];
+
+$result_texis{'no_content_inline'} = '\\input texinfo @c -*-texinfo-*-
+
+@node Top
+@top No ccontent
+
+No content.
+
+@menu 
+* chapter::
+@end menu
+
+@node chapter
+@chapter Chapter 1
+
+The chapter
+
+@bye
+';
+
+
+$result_texts{'no_content_inline'} = 'No ccontent
+***********
+
+No content.
+
+* chapter::
+
+1 Chapter 1
+***********
+
+The chapter
+
+';
+
+$result_sectioning{'no_content_inline'} = {
+  'structure' => {
+    'section_childs' => [
+      {
+        'cmdname' => 'top',
+        'extra' => {
+          'associated_node' => {
+            'cmdname' => 'node',
+            'extra' => {
+              'normalized' => 'Top'
+            },
+            'info' => {},
+            'structure' => {}
+          }
+        },
+        'info' => {},
+        'structure' => {
+          'section_childs' => [
+            {
+              'cmdname' => 'chapter',
+              'extra' => {
+                'associated_node' => {
+                  'cmdname' => 'node',
+                  'extra' => {
+                    'normalized' => 'chapter'
+                  },
+                  'info' => {},
+                  'structure' => {}
+                }
+              },
+              'info' => {},
+              'structure' => {
+                'section_level' => 1,
+                'section_number' => 1,
+                'section_up' => {},
+                'toplevel_prev' => {},
+                'toplevel_up' => {}
+              }
+            }
+          ],
+          'section_level' => 0,
+          'section_up' => {}
+        }
+      }
+    ],
+    'section_level' => -1
+  }
+};
+$result_sectioning{'no_content_inline'}{'structure'}{'section_childs'}[0]{'structure'}{'section_childs'}[0]{'structure'}{'section_up'}
 = $result_sectioning{'no_content_inline'}{'structure'}{'section_childs'}[0];
+$result_sectioning{'no_content_inline'}{'structure'}{'section_childs'}[0]{'structure'}{'section_childs'}[0]{'structure'}{'toplevel_prev'}
 = $result_sectioning{'no_content_inline'}{'structure'}{'section_childs'}[0];
+$result_sectioning{'no_content_inline'}{'structure'}{'section_childs'}[0]{'structure'}{'section_childs'}[0]{'structure'}{'toplevel_up'}
 = $result_sectioning{'no_content_inline'}{'structure'}{'section_childs'}[0];
+$result_sectioning{'no_content_inline'}{'structure'}{'section_childs'}[0]{'structure'}{'section_up'}
 = $result_sectioning{'no_content_inline'};
+
+$result_nodes{'no_content_inline'} = {
+  'cmdname' => 'node',
+  'extra' => {
+    'associated_section' => {
+      'cmdname' => 'top',
+      'extra' => {},
+      'info' => {},
+      'structure' => {}
+    },
+    'menus' => [
+      {
+        'cmdname' => 'menu'
+      }
+    ],
+    'normalized' => 'Top'
+  },
+  'info' => {},
+  'structure' => {
+    'menu_child' => {
+      'cmdname' => 'node',
+      'extra' => {
+        'associated_section' => {
+          'cmdname' => 'chapter',
+          'extra' => {},
+          'info' => {},
+          'structure' => {
+            'section_number' => 1
+          }
+        },
+        'normalized' => 'chapter'
+      },
+      'info' => {},
+      'structure' => {
+        'node_prev' => {},
+        'node_up' => {}
+      }
+    },
+    'node_next' => {}
+  }
+};
+$result_nodes{'no_content_inline'}{'structure'}{'menu_child'}{'structure'}{'node_prev'}
 = $result_nodes{'no_content_inline'};
+$result_nodes{'no_content_inline'}{'structure'}{'menu_child'}{'structure'}{'node_up'}
 = $result_nodes{'no_content_inline'};
+$result_nodes{'no_content_inline'}{'structure'}{'node_next'} = 
$result_nodes{'no_content_inline'}{'structure'}{'menu_child'};
+
+$result_menus{'no_content_inline'} = {
+  'cmdname' => 'node',
+  'extra' => {
+    'normalized' => 'Top'
+  },
+  'info' => {},
+  'structure' => {
+    'menu_child' => {
+      'cmdname' => 'node',
+      'extra' => {
+        'normalized' => 'chapter'
+      },
+      'info' => {},
+      'structure' => {
+        'menu_up' => {},
+        'menu_up_hash' => {
+          'Top' => 1
+        }
+      }
+    }
+  }
+};
+$result_menus{'no_content_inline'}{'structure'}{'menu_child'}{'structure'}{'menu_up'}
 = $result_menus{'no_content_inline'};
+
+$result_errors{'no_content_inline'} = [];
+
+
+$result_floats{'no_content_inline'} = {};
+
+
+1;
diff --git a/tp/t/results/html_tests/no_content_inline/res_html/no_content.html 
b/tp/t/results/html_tests/no_content_inline/res_html/no_content.html
new file mode 100644
index 0000000000..07ab46874e
--- /dev/null
+++ b/tp/t/results/html_tests/no_content_inline/res_html/no_content.html
@@ -0,0 +1,50 @@
+<!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>No ccontent</title>
+
+<meta name="description" content="No ccontent">
+<meta name="keywords" content="No ccontent">
+<meta name="resource-type" content="document">
+<meta name="distribution" content="global">
+<meta name="viewport" content="width=device-width,initial-scale=1">
+
+<link href="#Top" rel="start" title="Top">
+<link href="#chapter" rel="next" title="chapter">
+
+
+</head>
+
+<body lang="en">
+<div class="top-level-extent" id="Top">
+<div class="nav-panel">
+<p>
+Next: <a href="#chapter" accesskey="n" rel="next">Chapter 1</a> &nbsp; </p>
+</div>
+<h1 class="top" id="No-ccontent">No ccontent</h1>
+
+<p>No content.
+</p>
+
+<ul class="mini-toc">
+<li><a href="#chapter" accesskey="1">Chapter 1</a></li>
+</ul>
+<hr style="height: 6px;">
+<div class="chapter-level-extent" id="chapter">
+<div class="nav-panel">
+<p>
+Previous: <a href="#Top" accesskey="p" rel="prev">No ccontent</a>, Up: <a 
href="#Top" accesskey="u" rel="up">No ccontent</a> &nbsp; </p>
+</div>
+<h2 class="chapter" id="Chapter-1">1 Chapter 1</h2>
+
+<p>The chapter
+</p>
+</div>
+</div>
+
+
+
+</body>
+</html>
diff --git a/tp/t/results/html_tests/no_content_separate_element.pl 
b/tp/t/results/html_tests/no_content_separate_element.pl
new file mode 100644
index 0000000000..ed74b8c180
--- /dev/null
+++ b/tp/t/results/html_tests/no_content_separate_element.pl
@@ -0,0 +1,488 @@
+use vars qw(%result_texis %result_texts %result_trees %result_errors 
+   %result_indices %result_sectioning %result_nodes %result_menus
+   %result_floats %result_converted %result_converted_errors 
+   %result_elements %result_directions_text %result_indices_sort_strings);
+
+use utf8;
+
+$result_trees{'no_content_separate_element'} = {
+  'contents' => [
+    {
+      'contents' => [
+        {
+          'contents' => [
+            {
+              'text' => '\\input texinfo @c -*-texinfo-*-
+',
+              'type' => 'text_before_beginning'
+            },
+            {
+              'text' => '
+',
+              'type' => 'text_before_beginning'
+            }
+          ],
+          'type' => 'preamble_before_beginning'
+        },
+        {
+          'contents' => [],
+          'type' => 'preamble_before_content'
+        }
+      ],
+      'type' => 'before_node_section'
+    },
+    {
+      'args' => [
+        {
+          'contents' => [
+            {
+              'text' => 'Top'
+            }
+          ],
+          'info' => {
+            'spaces_after_argument' => '
+'
+          },
+          'type' => 'line_arg'
+        }
+      ],
+      'cmdname' => 'node',
+      'extra' => {
+        'node_content' => [
+          {}
+        ],
+        'nodes_manuals' => [
+          {
+            'node_content' => [
+              {}
+            ],
+            'normalized' => 'Top'
+          }
+        ],
+        'normalized' => 'Top'
+      },
+      'info' => {
+        'spaces_before_argument' => ' '
+      },
+      'source_info' => {
+        'file_name' => 'no_content.texi',
+        'line_nr' => 3,
+        'macro' => ''
+      }
+    },
+    {
+      'args' => [
+        {
+          'contents' => [
+            {
+              'text' => 'No ccontent'
+            }
+          ],
+          'info' => {
+            'spaces_after_argument' => '
+'
+          },
+          'type' => 'line_arg'
+        }
+      ],
+      'cmdname' => 'top',
+      'contents' => [
+        {
+          'text' => '
+',
+          'type' => 'empty_line'
+        },
+        {
+          'contents' => [
+            {
+              'text' => 'No content.
+'
+            }
+          ],
+          'type' => 'paragraph'
+        },
+        {
+          'text' => '
+',
+          'type' => 'empty_line'
+        },
+        {
+          'args' => [
+            {
+              'info' => {
+                'spaces_after_argument' => ' 
+'
+              },
+              'type' => 'block_line_arg'
+            }
+          ],
+          'cmdname' => 'menu',
+          'contents' => [
+            {
+              'args' => [
+                {
+                  'text' => '* ',
+                  'type' => 'menu_entry_leading_text'
+                },
+                {
+                  'contents' => [
+                    {
+                      'text' => 'chapter'
+                    }
+                  ],
+                  'type' => 'menu_entry_node'
+                },
+                {
+                  'text' => '::',
+                  'type' => 'menu_entry_separator'
+                },
+                {
+                  'contents' => [
+                    {
+                      'contents' => [
+                        {
+                          'text' => '
+'
+                        }
+                      ],
+                      'type' => 'preformatted'
+                    }
+                  ],
+                  'type' => 'menu_entry_description'
+                }
+              ],
+              'extra' => {
+                'menu_entry_description' => {},
+                'menu_entry_node' => {
+                  'node_content' => [
+                    {}
+                  ],
+                  'normalized' => 'chapter'
+                }
+              },
+              'source_info' => {
+                'file_name' => 'no_content.texi',
+                'line_nr' => 9,
+                'macro' => ''
+              },
+              'type' => 'menu_entry'
+            },
+            {
+              'args' => [
+                {
+                  'contents' => [
+                    {
+                      'text' => 'menu'
+                    }
+                  ],
+                  'info' => {
+                    'spaces_after_argument' => '
+'
+                  },
+                  'type' => 'line_arg'
+                }
+              ],
+              'cmdname' => 'end',
+              'extra' => {
+                'text_arg' => 'menu'
+              },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
+              'source_info' => {
+                'file_name' => 'no_content.texi',
+                'line_nr' => 10,
+                'macro' => ''
+              }
+            }
+          ],
+          'source_info' => {
+            'file_name' => 'no_content.texi',
+            'line_nr' => 8,
+            'macro' => ''
+          }
+        },
+        {
+          'text' => '
+',
+          'type' => 'empty_line'
+        }
+      ],
+      'extra' => {},
+      'info' => {
+        'spaces_before_argument' => ' '
+      },
+      'source_info' => {
+        'file_name' => 'no_content.texi',
+        'line_nr' => 4,
+        'macro' => ''
+      }
+    },
+    {
+      'args' => [
+        {
+          'contents' => [
+            {
+              'text' => 'chapter'
+            }
+          ],
+          'info' => {
+            'spaces_after_argument' => '
+'
+          },
+          'type' => 'line_arg'
+        }
+      ],
+      'cmdname' => 'node',
+      'extra' => {
+        'node_content' => [
+          {}
+        ],
+        'nodes_manuals' => [
+          {
+            'node_content' => [
+              {}
+            ],
+            'normalized' => 'chapter'
+          }
+        ],
+        'normalized' => 'chapter'
+      },
+      'info' => {
+        'spaces_before_argument' => ' '
+      },
+      'source_info' => {
+        'file_name' => 'no_content.texi',
+        'line_nr' => 12,
+        'macro' => ''
+      }
+    },
+    {
+      'args' => [
+        {
+          'contents' => [
+            {
+              'text' => 'Chapter 1'
+            }
+          ],
+          'info' => {
+            'spaces_after_argument' => '
+'
+          },
+          'type' => 'line_arg'
+        }
+      ],
+      'cmdname' => 'chapter',
+      'contents' => [
+        {
+          'text' => '
+',
+          'type' => 'empty_line'
+        },
+        {
+          'contents' => [
+            {
+              'text' => 'The chapter
+'
+            }
+          ],
+          'type' => 'paragraph'
+        },
+        {
+          'text' => '
+',
+          'type' => 'empty_line'
+        }
+      ],
+      'extra' => {},
+      'info' => {
+        'spaces_before_argument' => ' '
+      },
+      'source_info' => {
+        'file_name' => 'no_content.texi',
+        'line_nr' => 13,
+        'macro' => ''
+      }
+    },
+    {
+      'args' => [
+        {
+          'text' => '
+',
+          'type' => 'misc_arg'
+        }
+      ],
+      'cmdname' => 'bye'
+    }
+  ],
+  'type' => 'document_root'
+};
+$result_trees{'no_content_separate_element'}{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'no_content_separate_element'}{'contents'}[1]{'args'}[0]{'contents'}[0];
+$result_trees{'no_content_separate_element'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'no_content_separate_element'}{'contents'}[1]{'args'}[0]{'contents'}[0];
+$result_trees{'no_content_separate_element'}{'contents'}[2]{'contents'}[3]{'contents'}[0]{'extra'}{'menu_entry_description'}
 = 
$result_trees{'no_content_separate_element'}{'contents'}[2]{'contents'}[3]{'contents'}[0]{'args'}[3];
+$result_trees{'no_content_separate_element'}{'contents'}[2]{'contents'}[3]{'contents'}[0]{'extra'}{'menu_entry_node'}{'node_content'}[0]
 = 
$result_trees{'no_content_separate_element'}{'contents'}[2]{'contents'}[3]{'contents'}[0]{'args'}[1]{'contents'}[0];
+$result_trees{'no_content_separate_element'}{'contents'}[3]{'extra'}{'node_content'}[0]
 = 
$result_trees{'no_content_separate_element'}{'contents'}[3]{'args'}[0]{'contents'}[0];
+$result_trees{'no_content_separate_element'}{'contents'}[3]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'no_content_separate_element'}{'contents'}[3]{'args'}[0]{'contents'}[0];
+
+$result_texis{'no_content_separate_element'} = '\\input texinfo @c 
-*-texinfo-*-
+
+@node Top
+@top No ccontent
+
+No content.
+
+@menu 
+* chapter::
+@end menu
+
+@node chapter
+@chapter Chapter 1
+
+The chapter
+
+@bye
+';
+
+
+$result_texts{'no_content_separate_element'} = 'No ccontent
+***********
+
+No content.
+
+* chapter::
+
+1 Chapter 1
+***********
+
+The chapter
+
+';
+
+$result_sectioning{'no_content_separate_element'} = {
+  'structure' => {
+    'section_childs' => [
+      {
+        'cmdname' => 'top',
+        'extra' => {
+          'associated_node' => {
+            'cmdname' => 'node',
+            'extra' => {
+              'normalized' => 'Top'
+            },
+            'info' => {},
+            'structure' => {}
+          }
+        },
+        'info' => {},
+        'structure' => {
+          'section_childs' => [
+            {
+              'cmdname' => 'chapter',
+              'extra' => {
+                'associated_node' => {
+                  'cmdname' => 'node',
+                  'extra' => {
+                    'normalized' => 'chapter'
+                  },
+                  'info' => {},
+                  'structure' => {}
+                }
+              },
+              'info' => {},
+              'structure' => {
+                'section_level' => 1,
+                'section_number' => 1,
+                'section_up' => {},
+                'toplevel_prev' => {},
+                'toplevel_up' => {}
+              }
+            }
+          ],
+          'section_level' => 0,
+          'section_up' => {}
+        }
+      }
+    ],
+    'section_level' => -1
+  }
+};
+$result_sectioning{'no_content_separate_element'}{'structure'}{'section_childs'}[0]{'structure'}{'section_childs'}[0]{'structure'}{'section_up'}
 = 
$result_sectioning{'no_content_separate_element'}{'structure'}{'section_childs'}[0];
+$result_sectioning{'no_content_separate_element'}{'structure'}{'section_childs'}[0]{'structure'}{'section_childs'}[0]{'structure'}{'toplevel_prev'}
 = 
$result_sectioning{'no_content_separate_element'}{'structure'}{'section_childs'}[0];
+$result_sectioning{'no_content_separate_element'}{'structure'}{'section_childs'}[0]{'structure'}{'section_childs'}[0]{'structure'}{'toplevel_up'}
 = 
$result_sectioning{'no_content_separate_element'}{'structure'}{'section_childs'}[0];
+$result_sectioning{'no_content_separate_element'}{'structure'}{'section_childs'}[0]{'structure'}{'section_up'}
 = $result_sectioning{'no_content_separate_element'};
+
+$result_nodes{'no_content_separate_element'} = {
+  'cmdname' => 'node',
+  'extra' => {
+    'associated_section' => {
+      'cmdname' => 'top',
+      'extra' => {},
+      'info' => {},
+      'structure' => {}
+    },
+    'menus' => [
+      {
+        'cmdname' => 'menu'
+      }
+    ],
+    'normalized' => 'Top'
+  },
+  'info' => {},
+  'structure' => {
+    'menu_child' => {
+      'cmdname' => 'node',
+      'extra' => {
+        'associated_section' => {
+          'cmdname' => 'chapter',
+          'extra' => {},
+          'info' => {},
+          'structure' => {
+            'section_number' => 1
+          }
+        },
+        'normalized' => 'chapter'
+      },
+      'info' => {},
+      'structure' => {
+        'node_prev' => {},
+        'node_up' => {}
+      }
+    },
+    'node_next' => {}
+  }
+};
+$result_nodes{'no_content_separate_element'}{'structure'}{'menu_child'}{'structure'}{'node_prev'}
 = $result_nodes{'no_content_separate_element'};
+$result_nodes{'no_content_separate_element'}{'structure'}{'menu_child'}{'structure'}{'node_up'}
 = $result_nodes{'no_content_separate_element'};
+$result_nodes{'no_content_separate_element'}{'structure'}{'node_next'} = 
$result_nodes{'no_content_separate_element'}{'structure'}{'menu_child'};
+
+$result_menus{'no_content_separate_element'} = {
+  'cmdname' => 'node',
+  'extra' => {
+    'normalized' => 'Top'
+  },
+  'info' => {},
+  'structure' => {
+    'menu_child' => {
+      'cmdname' => 'node',
+      'extra' => {
+        'normalized' => 'chapter'
+      },
+      'info' => {},
+      'structure' => {
+        'menu_up' => {},
+        'menu_up_hash' => {
+          'Top' => 1
+        }
+      }
+    }
+  }
+};
+$result_menus{'no_content_separate_element'}{'structure'}{'menu_child'}{'structure'}{'menu_up'}
 = $result_menus{'no_content_separate_element'};
+
+$result_errors{'no_content_separate_element'} = [];
+
+
+$result_floats{'no_content_separate_element'} = {};
+
+
+1;
diff --git 
a/tp/t/results/html_tests/no_content_separate_element/res_html/no_content.html 
b/tp/t/results/html_tests/no_content_separate_element/res_html/no_content.html
new file mode 100644
index 0000000000..07ab46874e
--- /dev/null
+++ 
b/tp/t/results/html_tests/no_content_separate_element/res_html/no_content.html
@@ -0,0 +1,50 @@
+<!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>No ccontent</title>
+
+<meta name="description" content="No ccontent">
+<meta name="keywords" content="No ccontent">
+<meta name="resource-type" content="document">
+<meta name="distribution" content="global">
+<meta name="viewport" content="width=device-width,initial-scale=1">
+
+<link href="#Top" rel="start" title="Top">
+<link href="#chapter" rel="next" title="chapter">
+
+
+</head>
+
+<body lang="en">
+<div class="top-level-extent" id="Top">
+<div class="nav-panel">
+<p>
+Next: <a href="#chapter" accesskey="n" rel="next">Chapter 1</a> &nbsp; </p>
+</div>
+<h1 class="top" id="No-ccontent">No ccontent</h1>
+
+<p>No content.
+</p>
+
+<ul class="mini-toc">
+<li><a href="#chapter" accesskey="1">Chapter 1</a></li>
+</ul>
+<hr style="height: 6px;">
+<div class="chapter-level-extent" id="chapter">
+<div class="nav-panel">
+<p>
+Previous: <a href="#Top" accesskey="p" rel="prev">No ccontent</a>, Up: <a 
href="#Top" accesskey="u" rel="up">No ccontent</a> &nbsp; </p>
+</div>
+<h2 class="chapter" id="Chapter-1">1 Chapter 1</h2>
+
+<p>The chapter
+</p>
+</div>
+</div>
+
+
+
+</body>
+</html>
diff --git a/tp/tests/README b/tp/tests/README
index bdbfa259ea..95b23ffe2c 100644
--- a/tp/tests/README
+++ b/tp/tests/README
@@ -36,8 +36,8 @@ Checking test results
 ---------------------
 The test results are in the out_parser directories; the reference
 results are in res_parser directories.  There can be these pairs.
-- out_parser/ and res_parser/ for html output in texi2html style;
-- out_parser_html/ and res_parser_html/ for html output in texi2any style;
+- out_parser/ and res_parser/ for the default setting;
+- out_parser_html/ and res_parser_html/ for html output;
 - out_parser_info/ and res_parser_info/ for info results;
 and diffs are put in the diffs/ subdir.
 
@@ -53,7 +53,7 @@ Also look in the layout/diffs directory.
 If the test results are as expected, copy the output files onto the 
 reference files.  Otherwise, if they need more investigation, see "Tests 
 specification" below, to find out what input file, etc. was used for the 
-test.  Sometimes you need to use "makeinfo -F" to force an output file 
+test.  Sometimes you need to use "texi2any -F" to force an output file 
 to be created.
 
 When running tests via parser_tests.sh or run_parser_all.sh, then
@@ -165,14 +165,13 @@ The very first comment line of the file can be special, 
with
 # formats :_html
 which says which formats to generate.  If no format is specified, like
 # formats :
-texi2html style is assumed, -c TEXI2HTML is passed, which sets html
-to be output and some formatting options.  Multiple formats can be
+no format is set on the command line.  Multiple formats can be
 specified, like
 # formats : :_info
-in which texi2html html style and info are both generated.  If no format is
+in which no format and info are both generated.  If no format is
 specified on the first line, the default formats specification which is
 # formats :
-is used, which means a texi2html style html format generation.
+is used.
 
 Otherwise, each non-empty non-comment line describes a test.  The first
 word on the line is the test name which corresponds also with the
diff --git 
"a/tp/tests/formatting/res_parser/non_ascii_test_epub/os\303\251_utf8_epub_package/EPUB/xhtml/Chapteur.xhtml"
 
"b/tp/tests/formatting/res_parser/non_ascii_test_epub/os\303\251_utf8_epub_package/EPUB/xhtml/Chapteur.xhtml"
index f91eecaa76..64b6479b31 100644
--- 
"a/tp/tests/formatting/res_parser/non_ascii_test_epub/os\303\251_utf8_epub_package/EPUB/xhtml/Chapteur.xhtml"
+++ 
"b/tp/tests/formatting/res_parser/non_ascii_test_epub/os\303\251_utf8_epub_package/EPUB/xhtml/Chapteur.xhtml"
@@ -13,6 +13,9 @@
 <meta name="Generator" content="texi2any"/>
 <meta name="viewport" content="width=device-width,initial-scale=1"/>
 
+<link href="osé_utf8.xhtml" rel="start" title="Tôp"/>
+<link href="osé_utf8.xhtml" rel="up" title="Tôp"/>
+<link href="osé_utf8.xhtml" rel="prev" title="Tôp"/>
 
 
 </head>
@@ -20,7 +23,7 @@
 <body lang="en">
 <div class="chapter-level-extent" id="Chapt_00eaur">
 
-<h1 class="chapter" id="Chapteur">1 Chapteùr</h1>
+<h2 class="chapter" id="Chapteur">1 Chapteùr</h2>
 
 
 <p>value vùr {No value for &#8216;vùr&#8217;}.
diff --git 
"a/tp/tests/formatting/res_parser/non_ascii_test_epub/os\303\251_utf8_epub_package/EPUB/xhtml/os\303\251_utf8.xhtml"
 
"b/tp/tests/formatting/res_parser/non_ascii_test_epub/os\303\251_utf8_epub_package/EPUB/xhtml/os\303\251_utf8.xhtml"
index 76fa3fa6e0..06bda09b4e 100644
--- 
"a/tp/tests/formatting/res_parser/non_ascii_test_epub/os\303\251_utf8_epub_package/EPUB/xhtml/os\303\251_utf8.xhtml"
+++ 
"b/tp/tests/formatting/res_parser/non_ascii_test_epub/os\303\251_utf8_epub_package/EPUB/xhtml/os\303\251_utf8.xhtml"
@@ -13,6 +13,8 @@
 <meta name="Generator" content="texi2any"/>
 <meta name="viewport" content="width=device-width,initial-scale=1"/>
 
+<link href="#Top" rel="start" title="Tôp"/>
+<link href="Chapteur.xhtml" rel="next" title="1 Chapteùr"/>
 
 
 </head>
diff --git 
"a/tp/tests/formatting/res_parser/non_ascii_test_epub/os\303\251_utf8_epub_package/EPUB/xhtml/os\303\251_utf8_abt.xhtml"
 
"b/tp/tests/formatting/res_parser/non_ascii_test_epub/os\303\251_utf8_epub_package/EPUB/xhtml/os\303\251_utf8_abt.xhtml"
deleted file mode 100644
index 8fff867fca..0000000000
--- 
"a/tp/tests/formatting/res_parser/non_ascii_test_epub/os\303\251_utf8_epub_package/EPUB/xhtml/os\303\251_utf8_abt.xhtml"
+++ /dev/null
@@ -1,133 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html>
-<html xmlns="http://www.w3.org/1999/xhtml";>
-<!-- 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 (Tôp)</title>
-
-<meta name="description" content="About This Document (Tôp)"/>
-<meta name="keywords" content="About This Document (Tôp)"/>
-<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">
-<!--
-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">
-<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> &#160; </td>
-  </tr>
-  <tr>
-    <td class="button-direction-about"> [Contents] </td>
-    <td class="name-direction-about">Contents</td>
-    <td>Table of contents</td>
-    <td> &#160; </td>
-  </tr>
-  <tr>
-    <td class="button-direction-about"> [Index] </td>
-    <td class="name-direction-about">Index</td>
-    <td>Index</td>
-    <td> &#160; </td>
-  </tr>
-  <tr>
-    <td class="button-direction-about"> [ ? ] </td>
-    <td class="name-direction-about">About</td>
-    <td>About (help)</td>
-    <td> &#160; </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 &#160; &#160;
-            <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>
-
-
-</body>
-</html>
diff --git 
a/tp/tests/layout/res_parser/formatting_epub/formatting_epub_package/EPUB/xhtml/chapter.xhtml
 
b/tp/tests/layout/res_parser/formatting_epub/formatting_epub_package/EPUB/xhtml/chapter.xhtml
index ea7177e659..b7ab3e8352 100644
--- 
a/tp/tests/layout/res_parser/formatting_epub/formatting_epub_package/EPUB/xhtml/chapter.xhtml
+++ 
b/tp/tests/layout/res_parser/formatting_epub/formatting_epub_package/EPUB/xhtml/chapter.xhtml
@@ -858,6 +858,12 @@ g-roupe
 <meta name="Generator" content="texi2any"/>
 <meta name="viewport" content="width=device-width,initial-scale=1"/>
 
+<link href="formatting.xhtml" rel="start" title="Top section"/>
+<link href="#chapter" rel="index" title="1 chapter"/>
+<link href="formatting.xhtml#SEC_Contents" rel="contents" title="Table of 
Contents"/>
+<link href="formatting.xhtml" rel="up" title="Top section"/>
+<link href="chapter2.xhtml" rel="next" title="chapter 2"/>
+<link href="formatting.xhtml" rel="prev" title="Top section"/>
 <style type="text/css">
 <!--
 a.summary-letter-printindex {text-decoration: none}
@@ -892,7 +898,7 @@ ul.mark-none {list-style-type: none}
 <body lang="en">
 <div class="chapter-level-extent" id="chapter">
 
-<h1 class="chapter" id="chapter-1">1 chapter</h1>
+<h2 class="chapter" id="chapter-1">1 chapter</h2>
 
 <p>First para
 </p>
@@ -1102,8 +1108,8 @@ but , ,
 <code class="code">@verb{:a  &lt; &amp; @ % &quot; --    b:}</code> <code 
class="verb">a&#160;&#160;&lt;&#160;&amp;&#160;@&#160;%&#160;&quot;&#160;--&#160;&#160;&#160;&#160;b</code>
 <code class="code">@w{a a a a a a a a a a a a a a a a a a a a a a a a a a a a 
a a a a a a a}</code> 
a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a<!--
 /@w -->
 <code class="code">a@sup{h}@sub{l}</code> a<sup class="sup">h</sup><sub 
class="sub">l</sub>
-<code class="code">@footnote{in footnote}</code> <a class="footnote" 
id="DOCF1_5" href="formatting_fot.xhtml#FOOT1_5"><sup>5</sup></a>
-<code class="code">@footnote{in footnote2}</code> <a class="footnote" 
id="DOCF2_6" href="formatting_fot.xhtml#FOOT2_6"><sup>6</sup></a>
+<code class="code">@footnote{in footnote}</code> <a class="footnote" 
id="DOCF1_5" href="#FOOT1_5"><sup>5</sup></a>
+<code class="code">@footnote{in footnote2}</code> <a class="footnote" 
id="DOCF2_6" href="#FOOT2_6"><sup>6</sup></a>
 </p>
 <p><code class="code">@sp 2</code><br/>
 </p><br/>
@@ -1819,13 +1825,13 @@ html ''
 
 
 
-<h1 class="majorheading" id="majorheading-1">majorheading</h1>
+<h2 class="majorheading" id="majorheading-1">majorheading</h2>
 
-<h1 class="chapheading" id="chapheading-1">chapheading</h1>
+<h2 class="chapheading" id="chapheading-1">chapheading</h2>
 
-<h2 class="heading" id="heading-1">heading</h2>
+<h3 class="heading" id="heading-1">heading</h3>
 
-<h3 class="subheading" id="subheading-1">subheading</h3>
+<h4 class="subheading" id="subheading-1">subheading</h4>
 
 <h4 class="subsubheading" id="subsubheading-1">subsubheading</h4>
 
@@ -2193,8 +2199,8 @@ but , ,
 <code class="code">@verb{:a  &lt; &amp; @ % &quot; --    b:}</code> <code 
class="verb">a&#160;&#160;&lt;&#160;&amp;&#160;@&#160;%&#160;&quot;&#160;--&#160;&#160;&#160;&#160;b</code>
 <code class="code">@w{a a a a a a a a a a a a a a a a a a a a a a a a a a a a 
a a a a a a a}</code> 
a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a<!--
 /@w -->
 <code class="code">a@sup{h}@sub{l}</code> a<sup class="sup">h</sup><sub 
class="sub">l</sub>
-<code class="code">@footnote{in footnote}</code> <a class="footnote" 
id="DOCF5" href="formatting_fot.xhtml#FOOT5"><sup>7</sup></a>
-<code class="code">@footnote{in footnote2}</code> <a class="footnote" 
id="DOCF6" href="formatting_fot.xhtml#FOOT6"><sup>8</sup></a>
+<code class="code">@footnote{in footnote}</code> <a class="footnote" 
id="DOCF5" href="#FOOT5"><sup>7</sup></a>
+<code class="code">@footnote{in footnote2}</code> <a class="footnote" 
id="DOCF6" href="#FOOT6"><sup>8</sup></a>
 </p>
 <p><code class="code">@sp 2</code><br/>
 </p><br/>
@@ -2910,13 +2916,13 @@ html ''
 
 
 
-<h1 class="majorheading" id="majorheading-2">majorheading</h1>
+<h2 class="majorheading" id="majorheading-2">majorheading</h2>
 
-<h1 class="chapheading" id="chapheading-2">chapheading</h1>
+<h2 class="chapheading" id="chapheading-2">chapheading</h2>
 
-<h2 class="heading" id="heading-2">heading</h2>
+<h3 class="heading" id="heading-2">heading</h3>
 
-<h3 class="subheading" id="subheading-2">subheading</h3>
+<h4 class="subheading" id="subheading-2">subheading</h4>
 
 <h4 class="subsubheading" id="subsubheading-2">subsubheading</h4>
 
@@ -3291,8 +3297,8 @@ but , ,
 <code class="code">@verb{:a  &lt; &amp; @ % &quot; --    b:}</code> <code 
class="verb">a  &lt; &amp; @ % &quot; --    b</code>
 <code class="code">@w{a a a a a a a a a a a a a a a a a a a a a a a a a a a a 
a a a a a a a}</code> a a a a a a a a a a a a a a a a a a a a a a a a a a a a a 
a a a a a a<!-- /@w -->
 <code class="code">a@sup{h}@sub{l}</code> a<sup class="sup">h</sup><sub 
class="sub">l</sub>
-<code class="code">@footnote{in footnote}</code> <a class="footnote" 
id="DOCF7" href="formatting_fot.xhtml#FOOT7">(9)</a>
-<code class="code">@footnote{in footnote2}</code> <a class="footnote" 
id="DOCF8" href="formatting_fot.xhtml#FOOT8">(10)</a>
+<code class="code">@footnote{in footnote}</code> <a class="footnote" 
id="DOCF7" href="#FOOT7">(9)</a>
+<code class="code">@footnote{in footnote2}</code> <a class="footnote" 
id="DOCF8" href="#FOOT8">(10)</a>
 
 <code class="code">@sp 2</code>
 
@@ -4371,7 +4377,7 @@ Invalid use of @':
 
 
 
-<p>Text<a class="footnote" id="DOCF9" 
href="formatting_fot.xhtml#FOOT9"><sup>11</sup></a>
+<p>Text<a class="footnote" id="DOCF9" href="#FOOT9"><sup>11</sup></a>
 </p>
 <p>truc
 </p>
@@ -4466,7 +4472,7 @@ Invalid use of @':
 <tr><td></td><td class="printindex-index-entry index-entry-level-1"><a 
href="#index-b_002d_002d_002db-c_002d_002d_002dc">c&#8212;c</a></td><td 
class="printindex-index-section"><a href="#chapter">1 chapter</a></td></tr>
 <tr><td colspan="3"></td></tr>
 <tr><th id="chapter-1_cp_letter-C">C</th></tr>
-<tr><td></td><td class="printindex-index-entry"><a 
href="formatting_fot.xhtml#index-counting-entry">counting entry</a></td><td 
class="printindex-index-section"><a href="#chapter">1 chapter</a></td></tr>
+<tr><td></td><td class="printindex-index-entry"><a 
href="#index-counting-entry">counting entry</a></td><td 
class="printindex-index-section"><a href="#chapter">1 chapter</a></td></tr>
 <tr><td colspan="3"></td></tr>
 <tr><th id="chapter-1_cp_letter-D">D</th></tr>
 <tr><td></td><td class="printindex-index-entry">d&#8212;dd</td><td></td></tr>
@@ -4545,7 +4551,7 @@ Invalid use of @':
 <tr><td></td><td class="printindex-index-entry"><a 
href="#index-index-entry-between-item-and-itemx-1">index entry between item and 
itemx</a></td><td class="printindex-index-section"><a href="#chapter">1 
chapter</a></td></tr>
 <tr><td></td><td class="printindex-index-entry"><a 
href="#index-index-entry-between-item-and-itemx-2">index entry between item and 
itemx</a></td><td class="printindex-index-section"><a href="#chapter">1 
chapter</a></td></tr>
 <tr><td></td><td class="printindex-index-entry"><a 
href="#index-index-entry-between-item-and-itemx-3">index entry between item and 
itemx</a></td><td class="printindex-index-section"><a href="#chapter">1 
chapter</a></td></tr>
-<tr><td></td><td class="printindex-index-entry"><a 
href="formatting_fot.xhtml#index-index-entry-in-footnote">index entry in 
footnote</a></td><td class="printindex-index-section"><a href="#chapter">1 
chapter</a></td></tr>
+<tr><td></td><td class="printindex-index-entry"><a 
href="#index-index-entry-in-footnote">index entry in footnote</a></td><td 
class="printindex-index-section"><a href="#chapter">1 chapter</a></td></tr>
 <tr><td></td><td class="printindex-index-entry"><a 
href="formatting.xhtml#index-copying-index-entry-within-deffn">index entry 
within deffn</a></td><td class="printindex-index-section"><a 
href="formatting.xhtml">Top section</a></td></tr>
 <tr><td></td><td class="printindex-index-entry"><a 
href="formatting.xhtml#index-titlepage-index-entry-within-deffn">index entry 
within deffn</a></td><td class="printindex-index-section"><a 
href="formatting.xhtml">Top section</a></td></tr>
 <tr><td></td><td class="printindex-index-entry"><a 
href="#index-index-entry-within-deffn">index entry within deffn</a></td><td 
class="printindex-index-section"><a href="#chapter">1 chapter</a></td></tr>
@@ -4971,15 +4977,15 @@ Invalid use of @':
 
 
 
-<p><a class="footnote" id="DOCF10" 
href="formatting_fot.xhtml#FOOT10"><sup>12</sup></a>
+<p><a class="footnote" id="DOCF10" href="#FOOT10"><sup>12</sup></a>
 </p>
 
 <div class="section-level-extent" id="s_002d_002dect_002cion">
-<h2 class="section" id="A-section">1.1 A section</h2>
+<h3 class="section" id="A-section">1.1 A section</h3>
 
 
 <div class="subsection-level-extent" id="subsection">
-<h3 class="subsection" id="subsection-1">1.1.1 subsection</h3>
+<h4 class="subsection" id="subsection-1">1.1.1 subsection</h4>
 
 
 <a class="anchor" id="anchor"></a>
@@ -4994,6 +5000,33 @@ Invalid use of @':
 </div>
 </div>
 </div>
+<div class="footnotes-segment">
+<h4 class="footnotes-heading">Footnotes</h4>
+
+<h5 class="footnote-body-heading"><a id="FOOT1_5" href="#DOCF1_5">(5)</a></h5>
+<p>in footnote</p>
+<h5 class="footnote-body-heading"><a id="FOOT2_6" href="#DOCF2_6">(6)</a></h5>
+<p>in footnote2</p>
+<h5 class="footnote-body-heading"><a id="FOOT5" href="#DOCF5">(7)</a></h5>
+<p>in footnote</p>
+<h5 class="footnote-body-heading"><a id="FOOT6" href="#DOCF6">(8)</a></h5>
+<p>in footnote2</p>
+<h5 class="footnote-body-heading"><a id="FOOT7" href="#DOCF7">(9)</a></h5>
+<p>in footnote</p>
+<h5 class="footnote-body-heading"><a id="FOOT8" href="#DOCF8">(10)</a></h5>
+<p>in footnote2</p>
+<h5 class="footnote-body-heading"><a id="FOOT9" href="#DOCF9">(11)</a></h5>
+<p>in footnote
+<a class="index-entry-id" id="index-index-entry-in-footnote"></a>
+</p>
+<p>Blah
+</p>
+<p>Blih
+</p>
+<a class="index-entry-id" id="index-counting-entry"></a>
+<h5 class="footnote-body-heading"><a id="FOOT10" href="#DOCF10">(12)</a></h5>
+<p>in footnote</p>
+</div>
 
 
 
diff --git 
a/tp/tests/layout/res_parser/formatting_epub/formatting_epub_package/EPUB/xhtml/chapter2.xhtml
 
b/tp/tests/layout/res_parser/formatting_epub/formatting_epub_package/EPUB/xhtml/chapter2.xhtml
index e572bd0b4d..c71f83fa17 100644
--- 
a/tp/tests/layout/res_parser/formatting_epub/formatting_epub_package/EPUB/xhtml/chapter2.xhtml
+++ 
b/tp/tests/layout/res_parser/formatting_epub/formatting_epub_package/EPUB/xhtml/chapter2.xhtml
@@ -858,10 +858,15 @@ g-roupe
 <meta name="Generator" content="texi2any"/>
 <meta name="viewport" content="width=device-width,initial-scale=1"/>
 
+<link href="formatting.xhtml" rel="start" title="Top section"/>
+<link href="chapter.xhtml#chapter" rel="index" title="1 chapter"/>
+<link href="formatting.xhtml#SEC_Contents" rel="contents" title="Table of 
Contents"/>
+<link href="formatting.xhtml" rel="up" title="Top section"/>
+<link href="chapter.xhtml#chapter" rel="prev" title="1 chapter"/>
 <style type="text/css">
 <!--
 a.summary-letter-printindex {text-decoration: none}
-h1.centerchap {text-align:center}
+h2.centerchap {text-align:center}
 td.index-entry-level-1 {padding-left: 1.5em}
 td.index-entry-level-2 {padding-left: 3.0em}
 td.printindex-index-entry {vertical-align: top}
@@ -878,7 +883,7 @@ th.sections-header-printindex {text-align:left; 
padding-left: 1em}
 <body lang="en">
 <div class="centerchap-level-extent" id="chapter2">
 
-<h1 class="centerchap" id="chapter-2">chapter 2</h1>
+<h2 class="centerchap" id="chapter-2">chapter 2</h2>
 
 <div class="printindex cp-printindex">
 <table class="cp-letters-header-printindex"><tr><th>Jump to: &#160; 
</th><td><a class="summary-letter-printindex" 
href="#chapter-2_cp_symbol-1"><b>-</b></a>
@@ -948,7 +953,7 @@ th.sections-header-printindex {text-align:left; 
padding-left: 1em}
 <tr><td></td><td class="printindex-index-entry index-entry-level-1"><a 
href="chapter.xhtml#index-b_002d_002d_002db-c_002d_002d_002dc">c&#8212;c</a></td><td
 class="printindex-index-section"><a href="chapter.xhtml#chapter">1 
chapter</a></td></tr>
 <tr><td colspan="3"></td></tr>
 <tr><th id="chapter-2_cp_letter-C">C</th></tr>
-<tr><td></td><td class="printindex-index-entry"><a 
href="formatting_fot.xhtml#index-counting-entry">counting entry</a></td><td 
class="printindex-index-section"><a href="chapter.xhtml#chapter">1 
chapter</a></td></tr>
+<tr><td></td><td class="printindex-index-entry"><a 
href="chapter.xhtml#index-counting-entry">counting entry</a></td><td 
class="printindex-index-section"><a href="chapter.xhtml#chapter">1 
chapter</a></td></tr>
 <tr><td colspan="3"></td></tr>
 <tr><th id="chapter-2_cp_letter-D">D</th></tr>
 <tr><td></td><td class="printindex-index-entry">d&#8212;dd</td><td></td></tr>
@@ -1027,7 +1032,7 @@ th.sections-header-printindex {text-align:left; 
padding-left: 1em}
 <tr><td></td><td class="printindex-index-entry"><a 
href="chapter.xhtml#index-index-entry-between-item-and-itemx-1">index entry 
between item and itemx</a></td><td class="printindex-index-section"><a 
href="chapter.xhtml#chapter">1 chapter</a></td></tr>
 <tr><td></td><td class="printindex-index-entry"><a 
href="chapter.xhtml#index-index-entry-between-item-and-itemx-2">index entry 
between item and itemx</a></td><td class="printindex-index-section"><a 
href="chapter.xhtml#chapter">1 chapter</a></td></tr>
 <tr><td></td><td class="printindex-index-entry"><a 
href="chapter.xhtml#index-index-entry-between-item-and-itemx-3">index entry 
between item and itemx</a></td><td class="printindex-index-section"><a 
href="chapter.xhtml#chapter">1 chapter</a></td></tr>
-<tr><td></td><td class="printindex-index-entry"><a 
href="formatting_fot.xhtml#index-index-entry-in-footnote">index entry in 
footnote</a></td><td class="printindex-index-section"><a 
href="chapter.xhtml#chapter">1 chapter</a></td></tr>
+<tr><td></td><td class="printindex-index-entry"><a 
href="chapter.xhtml#index-index-entry-in-footnote">index entry in 
footnote</a></td><td class="printindex-index-section"><a 
href="chapter.xhtml#chapter">1 chapter</a></td></tr>
 <tr><td></td><td class="printindex-index-entry"><a 
href="formatting.xhtml#index-copying-index-entry-within-deffn">index entry 
within deffn</a></td><td class="printindex-index-section"><a 
href="formatting.xhtml">Top section</a></td></tr>
 <tr><td></td><td class="printindex-index-entry"><a 
href="formatting.xhtml#index-titlepage-index-entry-within-deffn">index entry 
within deffn</a></td><td class="printindex-index-section"><a 
href="formatting.xhtml">Top section</a></td></tr>
 <tr><td></td><td class="printindex-index-entry"><a 
href="chapter.xhtml#index-index-entry-within-deffn">index entry within 
deffn</a></td><td class="printindex-index-section"><a 
href="chapter.xhtml#chapter">1 chapter</a></td></tr>
diff --git 
a/tp/tests/layout/res_parser/formatting_epub/formatting_epub_package/EPUB/xhtml/formatting.xhtml
 
b/tp/tests/layout/res_parser/formatting_epub/formatting_epub_package/EPUB/xhtml/formatting.xhtml
index a64a22818b..b23a76ea05 100644
--- 
a/tp/tests/layout/res_parser/formatting_epub/formatting_epub_package/EPUB/xhtml/formatting.xhtml
+++ 
b/tp/tests/layout/res_parser/formatting_epub/formatting_epub_package/EPUB/xhtml/formatting.xhtml
@@ -858,6 +858,10 @@ g-roupe
 <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="chapter.xhtml#chapter" rel="index" title="1 chapter"/>
+<link href="#SEC_Contents" rel="contents" title="Table of Contents"/>
+<link href="chapter.xhtml#chapter" rel="next" title="1 chapter"/>
 <style type="text/css">
 <!--
 div.center {text-align:center}
@@ -876,6 +880,7 @@ strong.def-name {font-family: monospace; font-weight: bold; 
font-size: larger}
 ul.mark-bullet {list-style-type: disc}
 ul.mark-minus {list-style-type: "\2212"}
 ul.mark-none {list-style-type: none}
+ul.toc-numbered-mark {list-style: none}
 -->
 </style>
 
@@ -1086,8 +1091,8 @@ but , ,
 <code class="code">@verb{:a  &lt; &amp; @ % &quot; --    b:}</code> <code 
class="verb">a&#160;&#160;&lt;&#160;&amp;&#160;@&#160;%&#160;&quot;&#160;--&#160;&#160;&#160;&#160;b</code>
 <code class="code">@w{a a a a a a a a a a a a a a a a a a a a a a a a a a a a 
a a a a a a a}</code> 
a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a<!--
 /@w -->
 <code class="code">a@sup{h}@sub{l}</code> a<sup class="sup">h</sup><sub 
class="sub">l</sub>
-<code class="code">@footnote{in footnote}</code> <a class="footnote" 
id="DOCF3" href="formatting_fot.xhtml#FOOT3"><sup>1</sup></a>
-<code class="code">@footnote{in footnote2}</code> <a class="footnote" 
id="DOCF4" href="formatting_fot.xhtml#FOOT4"><sup>2</sup></a>
+<code class="code">@footnote{in footnote}</code> <a class="footnote" 
id="DOCF3" href="#FOOT3"><sup>1</sup></a>
+<code class="code">@footnote{in footnote2}</code> <a class="footnote" 
id="DOCF4" href="#FOOT4"><sup>2</sup></a>
 </p>
 <p><code class="code">@sp 2</code><br/>
 </p><br/>
@@ -1803,13 +1808,13 @@ html ''
 
 
 
-<h1 class="majorheading" id="majorheading">majorheading</h1>
+<h2 class="majorheading" id="majorheading">majorheading</h2>
 
-<h1 class="chapheading" id="chapheading">chapheading</h1>
+<h2 class="chapheading" id="chapheading">chapheading</h2>
 
-<h2 class="heading" id="heading">heading</h2>
+<h3 class="heading" id="heading">heading</h3>
 
-<h3 class="subheading" id="subheading">subheading</h3>
+<h4 class="subheading" id="subheading">subheading</h4>
 
 <h4 class="subsubheading" id="subsubheading">subsubheading</h4>
 
@@ -2179,8 +2184,8 @@ but , ,
 <code class="code">@verb{:a  &lt; &amp; @ % &quot; --    b:}</code> <code 
class="verb">a&#160;&#160;&lt;&#160;&amp;&#160;@&#160;%&#160;&quot;&#160;--&#160;&#160;&#160;&#160;b</code>
 <code class="code">@w{a a a a a a a a a a a a a a a a a a a a a a a a a a a a 
a a a a a a a}</code> 
a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a<!--
 /@w -->
 <code class="code">a@sup{h}@sub{l}</code> a<sup class="sup">h</sup><sub 
class="sub">l</sub>
-<code class="code">@footnote{in footnote}</code> <a class="footnote" 
id="DOCF1" href="formatting_fot.xhtml#FOOT1"><sup>3</sup></a>
-<code class="code">@footnote{in footnote2}</code> <a class="footnote" 
id="DOCF2" href="formatting_fot.xhtml#FOOT2"><sup>4</sup></a>
+<code class="code">@footnote{in footnote}</code> <a class="footnote" 
id="DOCF1" href="#FOOT1"><sup>3</sup></a>
+<code class="code">@footnote{in footnote2}</code> <a class="footnote" 
id="DOCF2" href="#FOOT2"><sup>4</sup></a>
 </p>
 <p><code class="code">@sp 2</code><br/>
 </p><br/>
@@ -2896,13 +2901,13 @@ html ''
 
 
 
-<h1 class="majorheading" id="majorheading-1">majorheading</h1>
+<h2 class="majorheading" id="majorheading-1">majorheading</h2>
 
-<h1 class="chapheading" id="chapheading-1">chapheading</h1>
+<h2 class="chapheading" id="chapheading-1">chapheading</h2>
 
-<h2 class="heading" id="heading-1">heading</h2>
+<h3 class="heading" id="heading-1">heading</h3>
 
-<h3 class="subheading" id="subheading-1">subheading</h3>
+<h4 class="subheading" id="subheading-1">subheading</h4>
 
 <h4 class="subsubheading" id="subsubheading-1">subsubheading</h4>
 
@@ -3080,7 +3085,50 @@ html ''
 
 
 
-<a class="node" id="Top"></a><a class="top" id="Top-section"></a>
+<a class="node" id="Top"></a><a class="top" id="Top-section"></a><div 
class="element-contents" id="SEC_Contents">
+<h2 class="contents-heading">Table of Contents</h2>
+
+<div class="contents">
+
+<ul class="toc-numbered-mark">
+  <li><a id="toc-chapter-1" href="chapter.xhtml#chapter" rel="index">1 
chapter</a>
+  <ul class="toc-numbered-mark">
+    <li><a id="toc-A-section" href="chapter.xhtml#s_002d_002dect_002cion">1.1 
A section</a>
+    <ul class="toc-numbered-mark">
+      <li><a id="toc-subsection-1" href="chapter.xhtml#subsection">1.1.1 
subsection</a>
+      <ul class="toc-numbered-mark">
+        <li><a id="toc-subsubsection-_0060_0060simple_002ddouble_002d_002d-1" 
href="chapter.xhtml#subsubsection-_0060_0060simple_002ddouble_002d_002d">1.1.1.1
 subsubsection &#8220;simple-double&#8211;</a></li>
+        <li><a id="toc-three_002d_002d_002dfour_002d_002d_002d_002d_0027_0027" 
href="chapter.xhtml#subsubsection-three_002d_002d_002dfour_002d_002d_002d_002d_0027_0027">1.1.1.2
 three&#8212;four&#8212;-&#8221;</a></li>
+      </ul></li>
+    </ul></li>
+  </ul></li>
+  <li><a id="toc-chapter-2" href="chapter2.xhtml" rel="index">chapter 
2</a></li>
+</ul>
+</div>
+</div>
+<div class="element-shortcontents" id="SEC_Shortcontents">
+<h2 class="shortcontents-heading">Short Table of Contents</h2>
+
+<div class="shortcontents">
+<ul class="toc-numbered-mark">
+<li><a id="stoc-chapter-1" href="#toc-chapter-1" rel="index">1 chapter</a></li>
+<li><a id="stoc-chapter-2" href="#toc-chapter-2" rel="index">chapter 2</a></li>
+</ul>
+</div>
+</div>
+<div class="footnotes-segment">
+<h4 class="footnotes-heading">Footnotes</h4>
+
+<h5 class="footnote-body-heading"><a id="FOOT3" href="#DOCF3">(1)</a></h5>
+<p>in footnote</p>
+<h5 class="footnote-body-heading"><a id="FOOT4" href="#DOCF4">(2)</a></h5>
+<p>in footnote2</p>
+<h5 class="footnote-body-heading"><a id="FOOT1" href="#DOCF1">(3)</a></h5>
+<p>in footnote</p>
+<h5 class="footnote-body-heading"><a id="FOOT2" href="#DOCF2">(4)</a></h5>
+<p>in footnote2</p>
+</div>
+
 
 
 </body>
diff --git 
a/tp/tests/layout/res_parser/formatting_epub/formatting_epub_package/EPUB/xhtml/formatting_abt.xhtml
 
b/tp/tests/layout/res_parser/formatting_epub/formatting_epub_package/EPUB/xhtml/formatting_abt.xhtml
deleted file mode 100644
index 2f19e52b34..0000000000
--- 
a/tp/tests/layout/res_parser/formatting_epub/formatting_epub_package/EPUB/xhtml/formatting_abt.xhtml
+++ /dev/null
@@ -1,978 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html>
-<html xmlns="http://www.w3.org/1999/xhtml";>
-<!-- Created by texinfo, http://www.gnu.org/software/texinfo/ -->
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
-<!-- In copying
-
-<
->
-"
-&
-'
-`
-
-"simple-double-three-four-"
-
-code: ``simple-double-three-four-'' 
-
-asis: "simple-double-three-four-" 
-
-strong: "simple-double-three-four-" 
-
-kbd: ``simple-double-three-four-'' 
-
-
-``simple-double-three-four-''
-
-
-
-@"u ü (ü)
-@"{U} Ü (Ü) 
-@~n ñ (ñ)
-@^a â (â)
-@'e é (é)
-@=o ō (ō)
-@`i ì (ì)
-@'{e} é (é)
-@'{@dotless{i}} í (í)
-@dotless{i} ı (ı)
-@dotless{j} ȷ (ȷ)
-@H{a} a̋
-@dotaccent{a} ȧ (ȧ)
-@ringaccent{a} å (å)
-@tieaccent{a} a͡
-@u{a} ă (ă)
-@ubaraccent{a} a̲
-@udotaccent{a} ạ (ạ)
-@v{a} ǎ (ǎ)
-@,c ç (ç)
-@,{c} ç (ç)
-@ogonek{a} ą (ą)
-
-@`{@=E} Ḕ
-@l{} ł
-@,{@'C} Ḉ
-@,c@"u çü 
-
-
-@H{-a} -a̋
-@dotaccent{-a} -ȧ
-@ringaccent{-a} -å
-@tieaccent{-a} -a͡
-@u{-a} -ă
-@ubaraccent{-a} -a̲
-@udotaccent{-a} -ạ
-@v{-a} -ǎ
-@,{-c} -ç
-@ogonek{-a} -ą
-
-@U{0075} 0075
-
-@* 
-
-@ followed by a space
- 
-@ followed by a tab
- 
-@ followed by a new line
- @- 
-@: 
-@! !
-@? ?
-@. .
-@& &
-@@ @
-@} }
-@{ {
-@/ 
-
-foo vs. bar. 
-colon :And something else.
-semi colon ;.
-And ? ?.
-Now ! !@
-but , ,
-
-@ampchar & (&)
-@atchar @ (@)
-@backslashchar \ (\)
-@hashchar # (#)
-@lbracechar { ({)
-@rbracechar } (})
-
-@TeX TeX
-@LaTeX LaTeX
-@bullet • (•)
-@copyright © (©)
-@dots … (…)
-@enddots ...
-@equiv ≡ (≡)
-@error error→
-@expansion ↦ (↦)
-@minus − (−)
-@point ⋆ (⋆)
-@print ⊣ (⊣)
-@result ⇒ (⇒)
-@today a sunny day
-
-@aa å (å)
-@AA Å (Å)
-@ae æ (æ)
-@oe œ (œ)
-@AE Æ (Æ)
-@OE Œ (Œ)
-@o ø (ø)
-@O Ø (Ø)
-@ss ß (ß)
-@l ł (ł)
-@L Ł (Ł)
-@DH Ð (Ð)
-@TH Þ (Þ)
-@dh ð (ð)
-@th þ (þ)
-
-@exclamdown ¡ (¡)
-@questiondown ¿ (¿)
-@pounds £ (£)
-@registeredsymbol ® (®)
-@ordf ª (ª)
-@ordm º (º)
-@comma , (,)
-@quotedblleft “ (“)
-@quotedblright ” (”)
-@quoteleft ‘ (‘)
-@quoteright ’ (’)
-@quotedblbase „ („)
-@quotesinglbase ‚ (‚)
-@guillemetleft « («)
-@guillemetright » (»)
-@guillemotleft « («)
-@guillemotright » (»)
-@guilsinglleft ‹ (‹)
-@guilsinglright › (›)
-
-@textdegree ° (°)
-@euro € (€)
-@arrow → (→)
-@leq ≤ (≤)
-@geq ≥ (≥)
-@tie a b
-
-@acronym{-a,an accronym} -a (an accronym)
-@acronym{-a} -a
-@abbr{@'E-. @comma{}A., @'Etude Autonome } É-. ,A. (Étude Autonome)
-@abbr{@'E-. @comma{}A.} É-. ,A.
-@asis{-a} -a
-@b{-a} -a
-@cite{-a} -a
-@code{-a} -a
-@command{-a} -a
-@dfn{-a} -a
-@dmn{-a} -a
-@email{-a,-b} -b
-@email{,-b} -b
-@email{-a} -a
-@emph{-a} -a
-@env{-a} -a
-@file{-a} -a
-@i{-a} -a
-@kbd{-a} -a
-@key{-a} -a
-@math{-a {\frac{1}{2}} @minus{}} -a {\frac{1}{2}} −
-@option{-a} -a
-@r{-a} -a
-@samp{-a} -a
-@sc{-a} -A
-@strong{-a} -a
-@t{-a} -a
-@sansserif{-a} -a
-@slanted{-a} -a
-@titlefont{-a} -a
-@indicateurl{-a} -a
-@uref{-a,-b} -a (-b)
-@uref{-a} -a
-@uref{,-b}  (-b)
-@uref{-a,-b,-c} -c
-@uref{,-b,-c} -c
-@uref{-a,,-c} -c
-@uref{,,-c} -c
-@url{-a,-b} -a (-b)
-@url{-a,} -a
-@url{,-b}  (-b)
-@var{-a} -a
-@verb{:-a:} -a
-@verb{:a  < & @ % " -    b:} a  < & @ % " -    b
-@w{a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a} a a 
a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a
-a@sup{h}@sub{l} ahl
-@footnote{in footnote} 
-@footnote{in footnote2} 
-
-@sp 2
-
-
-
-@page
-
-
-
-need 1002
-
-@clicksequence{click @click{} A} click → A
-After clickstyle ⇒
-@clicksequence{click @click{} A} click ⇒ A
-
-
-disp-laymath
-f(x) = {1 \over \sigma \sqrt{2\pi}}e-{1 \over 2}\left({x-\mu \over 
\sigma}\right)^2
-
-``simple-double-three-four-'' aa
-``simple-double-three-four-''
-
-
-ı ȷ
-ł ç
-a̲ ạ ą ahl
-
-       ! @ } { 
-a sunny day
-
-→
-0075
-• © … ... ≡
-error→ ↦ − ⊣ ⇒
-Å æ œ Æ Œ ø Ø ß ł Ł Ð
-Þ ð þ ¡ ¿ £
-ª º , 
-
-“ ” 
-‘ ’ „ ‚ «
-» « » ‹
-› € → ≤ ≥
-
-b i r SC sansserif slanted
-
-default kbdinputstyle
-vtable i-tem default kbdinputstyle
-in example default kbdinputstyle
-vtable i-tem in example default kbdinputstyle
-
-code kbdinputstyle
-vtable i-tem code kbdinputstyle
-in example code kbdinputstyle
-vtable i-tem in example code kbdinputstyle
-
-example kbdinputstyle
-vtable i-tem example kbdinputstyle
-in example example kbdinputstyle
-vtable i-tem in example example kbdinputstyle
-
-distinct kbdinputstyle
-vtable i-tem distinct kbdinputstyle
-in example distinct kbdinputstyle
-vtable i-tem in example distinct kbdinputstyle
-
-A quot-ation
-
-Note
-A Note
-
-note
-A note
-
-Caution
-Caution
-
-Important
-Important
-
-Tip
-a Tip
-
-Warning
-a Warning.
-
-something é TeX
-The something é TeX is here.
-
-@ at the end of line  
-A @ at the end of the @quotation line.
-
-something, other thing
-something, other thing
-
-Note, the note
-Note, the note
-
-
-Empty
-
-
-
-aaa quotation author
-quotation
-
-indent in quotation
-
-exdented quotation line   and dash - in quotation
-
-Not exdented followed by exdented
-exdented quotation line
-
-exdented quotation line
-Followed by not exdented 
-
-quotation1
-in exdented protected eol  
-following
-in exdented a @* 
- and following
-after exdented
-
-A small quot-ation
-
-Note
-A small Note
-
-something, other thing
-something, other thing
-
-i-temize
-
-i-tem +
-
-b-ullet
-
-minu-s
-
-e-mph item
-
-i-tem 1
-i-tem 2
-
-with w a-b
-with w c-d
-
-line w a-b
-line with w c-d
-
-1. e-numerate
-
-3. first third
-4. second third
-
-a. e-numerate
-
-c. first c
-d. second c
-
-mu-ltitable headitem another tab
-mu-ltitable item multitable tab
-mu-ltitable item 2 multitable tab 2
-lone mu-ltitable item
-
-truc bidule
-
-e-xample  some
-   text
-
-example one arg
-
-example two args
-
-example three args
-
-example four args
-
-example five args
-
-The something é TeX is here.
-
-A @ at the end of the @example line.
-
-example with empty args
-
-example with empty and non empty args mix
-
-Exam-ple
-
-Other li-ne
-not exdented
-
-exdented  and dash - in example
-Not exdented one
-exdented two
-Not exdented two
-
-Example   Hoho.
-Nested Other line
-exdented nested other line
-
-s-mallexample
-
-@noindent after smallexample.
-$ wget 
'http://savannah.gnu.org/cgi-bin/viewcvs/config/config/config.guess?rev=HEAD&content-type=text/plain'
-$ wget 
'http://savannah.gnu.org/cgi-bin/viewcvs/config/config/config.sub?rev=HEAD&content-type=text/plain'
-Less recent versions are also present.
-
-d-isplay
-
-s-malldisplay
-
-l-isp
-
-s-malllisp
-
-f-ormat
-
-s-mallformat
-
-c-ategory: d-effn_name a-rguments...
-d-effn
-
-cate-gory: de-ffn_name ar-guments    more args 
- even more so
-def-fn
- 
-fset: i a g
-cmde: truc 
-Command: log trap 
-Command: log trap1 
-Command: log trap2 
-cmde: id ule truc
-cmde2: id i ule truc
-: 
-: machin
-: bidule machin
-truc: machin
-truc: 
-truc: followed by a comment
-: 
-truc: a b c d e f g h i
-truc: deffnx before end deffn
-
-
-empty: deffn
-
-empty: deffn with deffnx
-empty: deffnx
-
-fset: i a g
-cmde: truc 
-text in def item for second def item
-
-
-c-ategory: d-efvr_name
-d-efvr
-
-c-ategory: n-ame a-rguments...
-d-effn
-
-c-ategory: n-ame
-d-effn no arg
-
-c-ategory: t-ype d-eftypefn_name a-rguments...
-d-eftypefn
-
-c-ategory: t-ype d-eftypefn_name
-d-eftypefn no arg
-
-c-ategory on c-lass: t-ype d-eftypeop_name a-rguments...
-d-eftypeop
-
-c-ategory on c-lass: t-ype d-eftypeop_name
-d-eftypeop no arg
-
-c-ategory: t-ype d-eftypevr_name
-d-eftypevr
-
-c-ategory of c-lass: d-efcv_name
-d-efcv
-
-c-ategory of c-lass: d-efcv_name a-rguments...
-d-efcv with arguments
-
-c-ategory of c-lass: t-ype d-eftypecv_name
-d-eftypecv
-
-c-ategory of c-lass: t-ype d-eftypecv_name a-rguments...
-d-eftypecv with arguments
-
-c-ategory on c-lass: d-efop_name a-rguments...
-d-efop
-
-c-ategory on c-lass: d-efop_name
-d-efop no arg
-
-c-ategory: d-eftp_name a-ttributes...
-d-eftp
-
-Function: d-efun_name a-rguments...
-d-efun
-
-Macro: d-efmac_name a-rguments...
-d-efmac
-
-Special Form: d-efspec_name a-rguments...
-d-efspec
-
-Variable: d-efvar_name
-d-efvar
-
-Variable: d-efvar_name arg-var arg-var1
-d-efvar with args
-
-User Option: d-efopt_name
-d-efopt
-
-Function: t-ype d-eftypefun_name a-rguments...
-d-eftypefun
-
-Variable: t-ype d-eftypevar_name
-d-eftypevar
-
-Instance Variable of c-lass: d-efivar_name
-d-efivar
-
-Instance Variable of c-lass: t-ype d-eftypeivar_name
-d-eftypeivar
-
-Method on c-lass: d-efmethod_name a-rguments...
-d-efmethod
-
-Method on c-lass: t-ype d-eftypemethod_name a-rguments...
-d-eftypemethod
-
-
-Function: data-type2 name2 arguments2...
-aaa2
-
-c-ategory2: t-ype2 d-eftypefn_name2
-d-eftypefn no arg2
-
-c-ategory2 on c-lass2: t-ype2 d-eftypeop_name2 a-rguments2...
-d-eftypeop2
-
-c-ategory2 on c-lass2: t-ype2 d-eftypeop_name2
-d-eftypeop no arg2
-
-c-ategory2 of c-lass2: t-ype2 d-eftypecv_name2
-d-eftypecv2
-
-c-ategory2 of c-lass2: t-ype2 d-eftypecv_name2 a-rguments2...
-d-eftypecv with arguments2
-
-fun2: arg2
-fff2
-
-
-@xref{c-hapter@@, cross r-ef name@@, t-itle@@, file n-ame@@, ma-nual@@} 
c-hapter@.
-@ref{chapter, cross ref name, title, file name, manual} chapter
-@pxref{chapter, cross ref name, title, file name, manual} chapter
-@inforef{chapter, cross ref name, file name} chapter
-
-@ref{chapter} chapter
-@xref{chapter} chapter.
-@pxref{chapter} chapter
-@ref{s-ect@comma{}ion} s-ect,ion
-
-@ref{s-ect@comma{}ion, a @comma{} in cross
-ref, a comma@comma{} in title, a comma@comma{} in file, a @comma{} in manual 
name }
-s-ect,ion
-
-@ref{chapter,cross ref name} chapter
-@ref{chapter,,title} chapter
-@ref{chapter,,,file name} chapter
-@ref{chapter,,,,manual} chapter
-@ref{chapter,cross ref name,title,} chapter
-@ref{chapter,cross ref name,,file name} chapter
-@ref{chapter,cross ref name,,,manual} chapter
-@ref{chapter,cross ref name,title,file name} chapter
-@ref{chapter,cross ref name,title,,manual} chapter
-@ref{chapter,cross ref name,title, file name, manual} chapter
-@ref{chapter,,title,file name} chapter
-@ref{chapter,,title,,manual} chapter
-@ref{chapter,,title, file name, manual} chapter
-@ref{chapter,,,file name,manual} chapter
-
-
-@ref{(pman)anode,cross ref name} (pman)anode
-@ref{(pman)anode,,title} (pman)anode
-@ref{(pman)anode,,,file name} (pman)anode
-@ref{(pman)anode,,,,manual} (pman)anode
-@ref{(pman)anode,cross ref name,title,} (pman)anode
-@ref{(pman)anode,cross ref name,,file name} (pman)anode
-@ref{(pman)anode,cross ref name,,,manual} (pman)anode
-@ref{(pman)anode,cross ref name,title,file name} (pman)anode
-@ref{(pman)anode,cross ref name,title,,manual} (pman)anode
-@ref{(pman)anode,cross ref name,title, file name, manual} (pman)anode
-@ref{(pman)anode,,title,file name} (pman)anode
-@ref{(pman)anode,,title,,manual} (pman)anode
-@ref{(pman)anode,,title, file name, manual} (pman)anode
-@ref{(pman)anode,,,file name,manual} (pman)anode
-
-
-@inforef{chapter, cross ref name, file name} chapter
-@inforef{chapter} chapter
-@inforef{chapter, cross ref name} chapter
-@inforef{chapter,,file name} chapter
-@inforef{node, cross ref name, file name} node
-@inforef{node} node
-@inforef{node, cross ref name} node
-@inforef{node,,file name} node
-@inforef{chapter, cross ref name, file name, spurious arg} chapter
-
-@inforef{s-ect@comma{}ion, a @comma{} in cross
-ref, a comma@comma{} in file}
-s-ect,ion
-
-chapter.
-
-ext
-chapter
-
-a-strong
-l-ine
-
-a-asis
-b
-l-ine
-
-a
-b
-l-ine
-
-Title
-a-code
-Value-table code
-
-Title
-a-samp
-a2-samp
-Value-table samp
-
-c-artouche
-
-Tit-le of box
-With title c-artouche
-
-f-lushleft
-more text
-
-f-lushright
-more text
-
-ce-ntered line
-
-r-raggedright
-more text
-
-\input texinfo @c -*-texinfo-*-
-
-@c this file is used in tests in @verbatiminclude but not converted
-
-@setfilename simplest.info
-
-@node Top
-
-This is a very simple texi manual @  <>.
-
-@bye
-
-in verbatim ''
-
-
-html ''
-
-
-
-
-majorheading
-************
-
-chapheading
-***********
-
-heading
-=======
-
-subheading
--
-
-subsubheading
-.............
-
-
-@acronym{-a,an accronym @comma{} @enddots{}} -a (an accronym , ...)
-@abbr{@'E-. @comma{}A., @'Etude-@comma{} @b{Autonome} } É-. ,A. (Étude-, 
Autonome)
-@abbr{@'E-. @comma{}A.} É-. ,A.
-
-@math{-a@minus{} {\frac{1}{2}}} -a− {\frac{1}{2}}
-
-
-
-
-Somehow invalid use of @,:
-
-@, ̧
-
-@,@"u ̧ü
-
-Invalid use of @':
-
-@' ́
-
-@'@"u ́ü
-
-@| 
-
-@dotless{truc} truc
-@dotless{ij} ij
-@dotless{-a} -a
-@dotless{a} a
-
-@U, without braces @U{}, with empty arg 
-@U{z}, with non-hex arg z
-@U{abc}, with <4 hex digits abc
-@U{FFFFFFFFFFFFFF}, value much too large FFFFFFFFFFFFFF
-@U{110000}, value just beyond Unicode 110000
-
-@TeX, but without brace TeX
-@# #
-
-@w{-a} -a
-
-@image{,1-xt} 
-@image{,,2-xt} 
-@image{,,,3-xt} 
-
-@image{f-ile,aze,,a-lt} f-ile
-@image{f-ile,,,alt@verb{:jk _" %}} f-ile
-
-@image{f-ile} f-ile
-@image{f-ile,,,alt} f-ile
-@image{f-ile,,,,.e-d-xt} f-ile
-@image{f-ile,l-i} f-ile
-@image{f-ile,,l-e} f-ile
-@image{f-ile,aze,az,alt,.e-xt} f-ile
-@image{f-ile,aze,az,alt, f-ile
-@image{@file{f-ile}@@@.,aze,az,alt,@file{.file ext} e-xt@} f-ile@.
-
-@image{f-ile,aze,az,@verb{:jk _" %@:} @b{in b "},e-xt} f-ile
-@image{file@verb{:jk _" %@:},,,alt@verb{:jk _" %@:}} filejk _" %@
-
-
-author
-
-ü Ü ñ â é ō ì é Ḕ
-Ḉ Ḉ a̋ ȧ å a͡
-ă ǎ
- ? .
-
-TeX LaTeX ⋆ å ® ° 
-
-t 
-
-e-mph item
-
-e-mph item
-
-i-tem 1
-i-tem 2
-
-without brace w a-b
-without brace w c-d
-
-a
-l-ine
-
-a-missing style formatting
-l-ine
-
-a
-b
-l-ine
-
-fun: 
-truc: machin bidule chose and
-truc: machin bidule chose and  after
-truc: machin bidule chose and 
-truc: machin bidule chose and and after
-truc: followed by a comment
-Various deff lines
-truc: after a deff item
-
-fsetinv: invalid a g
-id i ule: 
-aaa: 
-: 
-truc: 
-
-g-roupe
-
-@ref{node} node
-
-@ref{,cross ref name} 
-@ref{,,title} 
-@ref{,,,file name} 
-@ref{,,,,manual} 
-@ref{node,cross ref name} node
-@ref{node,,title} node
-@ref{node,,,file name} node
-@ref{node,,,,manual} node
-@ref{node,cross ref name,title,} node
-@ref{node,cross ref name,,file name} node
-@ref{node,cross ref name,,,manual} node
-@ref{node,cross ref name,title,file name} node
-@ref{node,cross ref name,title,,manual} node
-@ref{node,cross ref name,title, file name, manual} node
-@ref{node,,title,file name} node
-@ref{node,,title,,manual} node
-@ref{chapter,,title, file name, manual} chapter
-@ref{node,,title, file name, manual} node
-@ref{node,,,file name,manual} node
-@ref{,cross ref name,title,} 
-@ref{,cross ref name,,file name} 
-@ref{,cross ref name,,,manual} 
-@ref{,cross ref name,title,file name} 
-@ref{,cross ref name,title,,manual} 
-@ref{,cross ref name,title, file name, manual} 
-@ref{,,title,file name} 
-@ref{,,title,,manual} 
-@ref{,,title, file name, manual} 
-@ref{,,,file name,manual} 
-
-@inforef{,cross ref name } 
-@inforef{,,file name} 
-@inforef{,cross ref name, file name} 
-@inforef{} 
-
- -->
-<title>About This Document (title &#8211;a)</title>
-
-<meta name="description" content="About This Document (title &#8211;a)"/>
-<meta name="keywords" content="About This Document (title &#8211;a)"/>
-<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">
-<!--
-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">
-<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> &#160; </td>
-  </tr>
-  <tr>
-    <td class="button-direction-about"> [Contents] </td>
-    <td class="name-direction-about">Contents</td>
-    <td>Table of contents</td>
-    <td> &#160; </td>
-  </tr>
-  <tr>
-    <td class="button-direction-about"> [Index] </td>
-    <td class="name-direction-about">Index</td>
-    <td>Index</td>
-    <td> &#160; </td>
-  </tr>
-  <tr>
-    <td class="button-direction-about"> [ ? ] </td>
-    <td class="name-direction-about">About</td>
-    <td>About (help)</td>
-    <td> &#160; </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 &#160; &#160;
-            <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>
-
-
-</body>
-</html>
diff --git 
a/tp/tests/layout/res_parser/formatting_epub/formatting_epub_package/EPUB/xhtml/formatting_fot.xhtml
 
b/tp/tests/layout/res_parser/formatting_epub/formatting_epub_package/EPUB/xhtml/formatting_fot.xhtml
deleted file mode 100644
index 774614a706..0000000000
--- 
a/tp/tests/layout/res_parser/formatting_epub/formatting_epub_package/EPUB/xhtml/formatting_fot.xhtml
+++ /dev/null
@@ -1,904 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html>
-<html xmlns="http://www.w3.org/1999/xhtml";>
-<!-- Created by texinfo, http://www.gnu.org/software/texinfo/ -->
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
-<!-- In copying
-
-<
->
-"
-&
-'
-`
-
-"simple-double-three-four-"
-
-code: ``simple-double-three-four-'' 
-
-asis: "simple-double-three-four-" 
-
-strong: "simple-double-three-four-" 
-
-kbd: ``simple-double-three-four-'' 
-
-
-``simple-double-three-four-''
-
-
-
-@"u ü (ü)
-@"{U} Ü (Ü) 
-@~n ñ (ñ)
-@^a â (â)
-@'e é (é)
-@=o ō (ō)
-@`i ì (ì)
-@'{e} é (é)
-@'{@dotless{i}} í (í)
-@dotless{i} ı (ı)
-@dotless{j} ȷ (ȷ)
-@H{a} a̋
-@dotaccent{a} ȧ (ȧ)
-@ringaccent{a} å (å)
-@tieaccent{a} a͡
-@u{a} ă (ă)
-@ubaraccent{a} a̲
-@udotaccent{a} ạ (ạ)
-@v{a} ǎ (ǎ)
-@,c ç (ç)
-@,{c} ç (ç)
-@ogonek{a} ą (ą)
-
-@`{@=E} Ḕ
-@l{} ł
-@,{@'C} Ḉ
-@,c@"u çü 
-
-
-@H{-a} -a̋
-@dotaccent{-a} -ȧ
-@ringaccent{-a} -å
-@tieaccent{-a} -a͡
-@u{-a} -ă
-@ubaraccent{-a} -a̲
-@udotaccent{-a} -ạ
-@v{-a} -ǎ
-@,{-c} -ç
-@ogonek{-a} -ą
-
-@U{0075} 0075
-
-@* 
-
-@ followed by a space
- 
-@ followed by a tab
- 
-@ followed by a new line
- @- 
-@: 
-@! !
-@? ?
-@. .
-@& &
-@@ @
-@} }
-@{ {
-@/ 
-
-foo vs. bar. 
-colon :And something else.
-semi colon ;.
-And ? ?.
-Now ! !@
-but , ,
-
-@ampchar & (&)
-@atchar @ (@)
-@backslashchar \ (\)
-@hashchar # (#)
-@lbracechar { ({)
-@rbracechar } (})
-
-@TeX TeX
-@LaTeX LaTeX
-@bullet • (•)
-@copyright © (©)
-@dots … (…)
-@enddots ...
-@equiv ≡ (≡)
-@error error→
-@expansion ↦ (↦)
-@minus − (−)
-@point ⋆ (⋆)
-@print ⊣ (⊣)
-@result ⇒ (⇒)
-@today a sunny day
-
-@aa å (å)
-@AA Å (Å)
-@ae æ (æ)
-@oe œ (œ)
-@AE Æ (Æ)
-@OE Œ (Œ)
-@o ø (ø)
-@O Ø (Ø)
-@ss ß (ß)
-@l ł (ł)
-@L Ł (Ł)
-@DH Ð (Ð)
-@TH Þ (Þ)
-@dh ð (ð)
-@th þ (þ)
-
-@exclamdown ¡ (¡)
-@questiondown ¿ (¿)
-@pounds £ (£)
-@registeredsymbol ® (®)
-@ordf ª (ª)
-@ordm º (º)
-@comma , (,)
-@quotedblleft “ (“)
-@quotedblright ” (”)
-@quoteleft ‘ (‘)
-@quoteright ’ (’)
-@quotedblbase „ („)
-@quotesinglbase ‚ (‚)
-@guillemetleft « («)
-@guillemetright » (»)
-@guillemotleft « («)
-@guillemotright » (»)
-@guilsinglleft ‹ (‹)
-@guilsinglright › (›)
-
-@textdegree ° (°)
-@euro € (€)
-@arrow → (→)
-@leq ≤ (≤)
-@geq ≥ (≥)
-@tie a b
-
-@acronym{-a,an accronym} -a (an accronym)
-@acronym{-a} -a
-@abbr{@'E-. @comma{}A., @'Etude Autonome } É-. ,A. (Étude Autonome)
-@abbr{@'E-. @comma{}A.} É-. ,A.
-@asis{-a} -a
-@b{-a} -a
-@cite{-a} -a
-@code{-a} -a
-@command{-a} -a
-@dfn{-a} -a
-@dmn{-a} -a
-@email{-a,-b} -b
-@email{,-b} -b
-@email{-a} -a
-@emph{-a} -a
-@env{-a} -a
-@file{-a} -a
-@i{-a} -a
-@kbd{-a} -a
-@key{-a} -a
-@math{-a {\frac{1}{2}} @minus{}} -a {\frac{1}{2}} −
-@option{-a} -a
-@r{-a} -a
-@samp{-a} -a
-@sc{-a} -A
-@strong{-a} -a
-@t{-a} -a
-@sansserif{-a} -a
-@slanted{-a} -a
-@titlefont{-a} -a
-@indicateurl{-a} -a
-@uref{-a,-b} -a (-b)
-@uref{-a} -a
-@uref{,-b}  (-b)
-@uref{-a,-b,-c} -c
-@uref{,-b,-c} -c
-@uref{-a,,-c} -c
-@uref{,,-c} -c
-@url{-a,-b} -a (-b)
-@url{-a,} -a
-@url{,-b}  (-b)
-@var{-a} -a
-@verb{:-a:} -a
-@verb{:a  < & @ % " -    b:} a  < & @ % " -    b
-@w{a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a} a a 
a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a
-a@sup{h}@sub{l} ahl
-@footnote{in footnote} 
-@footnote{in footnote2} 
-
-@sp 2
-
-
-
-@page
-
-
-
-need 1002
-
-@clicksequence{click @click{} A} click → A
-After clickstyle ⇒
-@clicksequence{click @click{} A} click ⇒ A
-
-
-disp-laymath
-f(x) = {1 \over \sigma \sqrt{2\pi}}e-{1 \over 2}\left({x-\mu \over 
\sigma}\right)^2
-
-``simple-double-three-four-'' aa
-``simple-double-three-four-''
-
-
-ı ȷ
-ł ç
-a̲ ạ ą ahl
-
-       ! @ } { 
-a sunny day
-
-→
-0075
-• © … ... ≡
-error→ ↦ − ⊣ ⇒
-Å æ œ Æ Œ ø Ø ß ł Ł Ð
-Þ ð þ ¡ ¿ £
-ª º , 
-
-“ ” 
-‘ ’ „ ‚ «
-» « » ‹
-› € → ≤ ≥
-
-b i r SC sansserif slanted
-
-default kbdinputstyle
-vtable i-tem default kbdinputstyle
-in example default kbdinputstyle
-vtable i-tem in example default kbdinputstyle
-
-code kbdinputstyle
-vtable i-tem code kbdinputstyle
-in example code kbdinputstyle
-vtable i-tem in example code kbdinputstyle
-
-example kbdinputstyle
-vtable i-tem example kbdinputstyle
-in example example kbdinputstyle
-vtable i-tem in example example kbdinputstyle
-
-distinct kbdinputstyle
-vtable i-tem distinct kbdinputstyle
-in example distinct kbdinputstyle
-vtable i-tem in example distinct kbdinputstyle
-
-A quot-ation
-
-Note
-A Note
-
-note
-A note
-
-Caution
-Caution
-
-Important
-Important
-
-Tip
-a Tip
-
-Warning
-a Warning.
-
-something é TeX
-The something é TeX is here.
-
-@ at the end of line  
-A @ at the end of the @quotation line.
-
-something, other thing
-something, other thing
-
-Note, the note
-Note, the note
-
-
-Empty
-
-
-
-aaa quotation author
-quotation
-
-indent in quotation
-
-exdented quotation line   and dash - in quotation
-
-Not exdented followed by exdented
-exdented quotation line
-
-exdented quotation line
-Followed by not exdented 
-
-quotation1
-in exdented protected eol  
-following
-in exdented a @* 
- and following
-after exdented
-
-A small quot-ation
-
-Note
-A small Note
-
-something, other thing
-something, other thing
-
-i-temize
-
-i-tem +
-
-b-ullet
-
-minu-s
-
-e-mph item
-
-i-tem 1
-i-tem 2
-
-with w a-b
-with w c-d
-
-line w a-b
-line with w c-d
-
-1. e-numerate
-
-3. first third
-4. second third
-
-a. e-numerate
-
-c. first c
-d. second c
-
-mu-ltitable headitem another tab
-mu-ltitable item multitable tab
-mu-ltitable item 2 multitable tab 2
-lone mu-ltitable item
-
-truc bidule
-
-e-xample  some
-   text
-
-example one arg
-
-example two args
-
-example three args
-
-example four args
-
-example five args
-
-The something é TeX is here.
-
-A @ at the end of the @example line.
-
-example with empty args
-
-example with empty and non empty args mix
-
-Exam-ple
-
-Other li-ne
-not exdented
-
-exdented  and dash - in example
-Not exdented one
-exdented two
-Not exdented two
-
-Example   Hoho.
-Nested Other line
-exdented nested other line
-
-s-mallexample
-
-@noindent after smallexample.
-$ wget 
'http://savannah.gnu.org/cgi-bin/viewcvs/config/config/config.guess?rev=HEAD&content-type=text/plain'
-$ wget 
'http://savannah.gnu.org/cgi-bin/viewcvs/config/config/config.sub?rev=HEAD&content-type=text/plain'
-Less recent versions are also present.
-
-d-isplay
-
-s-malldisplay
-
-l-isp
-
-s-malllisp
-
-f-ormat
-
-s-mallformat
-
-c-ategory: d-effn_name a-rguments...
-d-effn
-
-cate-gory: de-ffn_name ar-guments    more args 
- even more so
-def-fn
- 
-fset: i a g
-cmde: truc 
-Command: log trap 
-Command: log trap1 
-Command: log trap2 
-cmde: id ule truc
-cmde2: id i ule truc
-: 
-: machin
-: bidule machin
-truc: machin
-truc: 
-truc: followed by a comment
-: 
-truc: a b c d e f g h i
-truc: deffnx before end deffn
-
-
-empty: deffn
-
-empty: deffn with deffnx
-empty: deffnx
-
-fset: i a g
-cmde: truc 
-text in def item for second def item
-
-
-c-ategory: d-efvr_name
-d-efvr
-
-c-ategory: n-ame a-rguments...
-d-effn
-
-c-ategory: n-ame
-d-effn no arg
-
-c-ategory: t-ype d-eftypefn_name a-rguments...
-d-eftypefn
-
-c-ategory: t-ype d-eftypefn_name
-d-eftypefn no arg
-
-c-ategory on c-lass: t-ype d-eftypeop_name a-rguments...
-d-eftypeop
-
-c-ategory on c-lass: t-ype d-eftypeop_name
-d-eftypeop no arg
-
-c-ategory: t-ype d-eftypevr_name
-d-eftypevr
-
-c-ategory of c-lass: d-efcv_name
-d-efcv
-
-c-ategory of c-lass: d-efcv_name a-rguments...
-d-efcv with arguments
-
-c-ategory of c-lass: t-ype d-eftypecv_name
-d-eftypecv
-
-c-ategory of c-lass: t-ype d-eftypecv_name a-rguments...
-d-eftypecv with arguments
-
-c-ategory on c-lass: d-efop_name a-rguments...
-d-efop
-
-c-ategory on c-lass: d-efop_name
-d-efop no arg
-
-c-ategory: d-eftp_name a-ttributes...
-d-eftp
-
-Function: d-efun_name a-rguments...
-d-efun
-
-Macro: d-efmac_name a-rguments...
-d-efmac
-
-Special Form: d-efspec_name a-rguments...
-d-efspec
-
-Variable: d-efvar_name
-d-efvar
-
-Variable: d-efvar_name arg-var arg-var1
-d-efvar with args
-
-User Option: d-efopt_name
-d-efopt
-
-Function: t-ype d-eftypefun_name a-rguments...
-d-eftypefun
-
-Variable: t-ype d-eftypevar_name
-d-eftypevar
-
-Instance Variable of c-lass: d-efivar_name
-d-efivar
-
-Instance Variable of c-lass: t-ype d-eftypeivar_name
-d-eftypeivar
-
-Method on c-lass: d-efmethod_name a-rguments...
-d-efmethod
-
-Method on c-lass: t-ype d-eftypemethod_name a-rguments...
-d-eftypemethod
-
-
-Function: data-type2 name2 arguments2...
-aaa2
-
-c-ategory2: t-ype2 d-eftypefn_name2
-d-eftypefn no arg2
-
-c-ategory2 on c-lass2: t-ype2 d-eftypeop_name2 a-rguments2...
-d-eftypeop2
-
-c-ategory2 on c-lass2: t-ype2 d-eftypeop_name2
-d-eftypeop no arg2
-
-c-ategory2 of c-lass2: t-ype2 d-eftypecv_name2
-d-eftypecv2
-
-c-ategory2 of c-lass2: t-ype2 d-eftypecv_name2 a-rguments2...
-d-eftypecv with arguments2
-
-fun2: arg2
-fff2
-
-
-@xref{c-hapter@@, cross r-ef name@@, t-itle@@, file n-ame@@, ma-nual@@} 
c-hapter@.
-@ref{chapter, cross ref name, title, file name, manual} chapter
-@pxref{chapter, cross ref name, title, file name, manual} chapter
-@inforef{chapter, cross ref name, file name} chapter
-
-@ref{chapter} chapter
-@xref{chapter} chapter.
-@pxref{chapter} chapter
-@ref{s-ect@comma{}ion} s-ect,ion
-
-@ref{s-ect@comma{}ion, a @comma{} in cross
-ref, a comma@comma{} in title, a comma@comma{} in file, a @comma{} in manual 
name }
-s-ect,ion
-
-@ref{chapter,cross ref name} chapter
-@ref{chapter,,title} chapter
-@ref{chapter,,,file name} chapter
-@ref{chapter,,,,manual} chapter
-@ref{chapter,cross ref name,title,} chapter
-@ref{chapter,cross ref name,,file name} chapter
-@ref{chapter,cross ref name,,,manual} chapter
-@ref{chapter,cross ref name,title,file name} chapter
-@ref{chapter,cross ref name,title,,manual} chapter
-@ref{chapter,cross ref name,title, file name, manual} chapter
-@ref{chapter,,title,file name} chapter
-@ref{chapter,,title,,manual} chapter
-@ref{chapter,,title, file name, manual} chapter
-@ref{chapter,,,file name,manual} chapter
-
-
-@ref{(pman)anode,cross ref name} (pman)anode
-@ref{(pman)anode,,title} (pman)anode
-@ref{(pman)anode,,,file name} (pman)anode
-@ref{(pman)anode,,,,manual} (pman)anode
-@ref{(pman)anode,cross ref name,title,} (pman)anode
-@ref{(pman)anode,cross ref name,,file name} (pman)anode
-@ref{(pman)anode,cross ref name,,,manual} (pman)anode
-@ref{(pman)anode,cross ref name,title,file name} (pman)anode
-@ref{(pman)anode,cross ref name,title,,manual} (pman)anode
-@ref{(pman)anode,cross ref name,title, file name, manual} (pman)anode
-@ref{(pman)anode,,title,file name} (pman)anode
-@ref{(pman)anode,,title,,manual} (pman)anode
-@ref{(pman)anode,,title, file name, manual} (pman)anode
-@ref{(pman)anode,,,file name,manual} (pman)anode
-
-
-@inforef{chapter, cross ref name, file name} chapter
-@inforef{chapter} chapter
-@inforef{chapter, cross ref name} chapter
-@inforef{chapter,,file name} chapter
-@inforef{node, cross ref name, file name} node
-@inforef{node} node
-@inforef{node, cross ref name} node
-@inforef{node,,file name} node
-@inforef{chapter, cross ref name, file name, spurious arg} chapter
-
-@inforef{s-ect@comma{}ion, a @comma{} in cross
-ref, a comma@comma{} in file}
-s-ect,ion
-
-chapter.
-
-ext
-chapter
-
-a-strong
-l-ine
-
-a-asis
-b
-l-ine
-
-a
-b
-l-ine
-
-Title
-a-code
-Value-table code
-
-Title
-a-samp
-a2-samp
-Value-table samp
-
-c-artouche
-
-Tit-le of box
-With title c-artouche
-
-f-lushleft
-more text
-
-f-lushright
-more text
-
-ce-ntered line
-
-r-raggedright
-more text
-
-\input texinfo @c -*-texinfo-*-
-
-@c this file is used in tests in @verbatiminclude but not converted
-
-@setfilename simplest.info
-
-@node Top
-
-This is a very simple texi manual @  <>.
-
-@bye
-
-in verbatim ''
-
-
-html ''
-
-
-
-
-majorheading
-************
-
-chapheading
-***********
-
-heading
-=======
-
-subheading
--
-
-subsubheading
-.............
-
-
-@acronym{-a,an accronym @comma{} @enddots{}} -a (an accronym , ...)
-@abbr{@'E-. @comma{}A., @'Etude-@comma{} @b{Autonome} } É-. ,A. (Étude-, 
Autonome)
-@abbr{@'E-. @comma{}A.} É-. ,A.
-
-@math{-a@minus{} {\frac{1}{2}}} -a− {\frac{1}{2}}
-
-
-
-
-Somehow invalid use of @,:
-
-@, ̧
-
-@,@"u ̧ü
-
-Invalid use of @':
-
-@' ́
-
-@'@"u ́ü
-
-@| 
-
-@dotless{truc} truc
-@dotless{ij} ij
-@dotless{-a} -a
-@dotless{a} a
-
-@U, without braces @U{}, with empty arg 
-@U{z}, with non-hex arg z
-@U{abc}, with <4 hex digits abc
-@U{FFFFFFFFFFFFFF}, value much too large FFFFFFFFFFFFFF
-@U{110000}, value just beyond Unicode 110000
-
-@TeX, but without brace TeX
-@# #
-
-@w{-a} -a
-
-@image{,1-xt} 
-@image{,,2-xt} 
-@image{,,,3-xt} 
-
-@image{f-ile,aze,,a-lt} f-ile
-@image{f-ile,,,alt@verb{:jk _" %}} f-ile
-
-@image{f-ile} f-ile
-@image{f-ile,,,alt} f-ile
-@image{f-ile,,,,.e-d-xt} f-ile
-@image{f-ile,l-i} f-ile
-@image{f-ile,,l-e} f-ile
-@image{f-ile,aze,az,alt,.e-xt} f-ile
-@image{f-ile,aze,az,alt, f-ile
-@image{@file{f-ile}@@@.,aze,az,alt,@file{.file ext} e-xt@} f-ile@.
-
-@image{f-ile,aze,az,@verb{:jk _" %@:} @b{in b "},e-xt} f-ile
-@image{file@verb{:jk _" %@:},,,alt@verb{:jk _" %@:}} filejk _" %@
-
-
-author
-
-ü Ü ñ â é ō ì é Ḕ
-Ḉ Ḉ a̋ ȧ å a͡
-ă ǎ
- ? .
-
-TeX LaTeX ⋆ å ® ° 
-
-t 
-
-e-mph item
-
-e-mph item
-
-i-tem 1
-i-tem 2
-
-without brace w a-b
-without brace w c-d
-
-a
-l-ine
-
-a-missing style formatting
-l-ine
-
-a
-b
-l-ine
-
-fun: 
-truc: machin bidule chose and
-truc: machin bidule chose and  after
-truc: machin bidule chose and 
-truc: machin bidule chose and and after
-truc: followed by a comment
-Various deff lines
-truc: after a deff item
-
-fsetinv: invalid a g
-id i ule: 
-aaa: 
-: 
-truc: 
-
-g-roupe
-
-@ref{node} node
-
-@ref{,cross ref name} 
-@ref{,,title} 
-@ref{,,,file name} 
-@ref{,,,,manual} 
-@ref{node,cross ref name} node
-@ref{node,,title} node
-@ref{node,,,file name} node
-@ref{node,,,,manual} node
-@ref{node,cross ref name,title,} node
-@ref{node,cross ref name,,file name} node
-@ref{node,cross ref name,,,manual} node
-@ref{node,cross ref name,title,file name} node
-@ref{node,cross ref name,title,,manual} node
-@ref{node,cross ref name,title, file name, manual} node
-@ref{node,,title,file name} node
-@ref{node,,title,,manual} node
-@ref{chapter,,title, file name, manual} chapter
-@ref{node,,title, file name, manual} node
-@ref{node,,,file name,manual} node
-@ref{,cross ref name,title,} 
-@ref{,cross ref name,,file name} 
-@ref{,cross ref name,,,manual} 
-@ref{,cross ref name,title,file name} 
-@ref{,cross ref name,title,,manual} 
-@ref{,cross ref name,title, file name, manual} 
-@ref{,,title,file name} 
-@ref{,,title,,manual} 
-@ref{,,title, file name, manual} 
-@ref{,,,file name,manual} 
-
-@inforef{,cross ref name } 
-@inforef{,,file name} 
-@inforef{,cross ref name, file name} 
-@inforef{} 
-
- -->
-<title>Footnotes (title &#8211;a)</title>
-
-<meta name="description" content="Footnotes (title &#8211;a)"/>
-<meta name="keywords" content="Footnotes (title &#8211;a)"/>
-<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"/>
-
-
-
-</head>
-
-<body lang="en">
-<div class="element-footnotes" id="SEC_Footnotes">
-<h1 class="footnotes-heading">Footnotes</h1>
-
-<h5 class="footnote-body-heading"><a id="FOOT3" 
href="formatting.xhtml#DOCF3">(1)</a></h5>
-<p>in footnote</p>
-<h5 class="footnote-body-heading"><a id="FOOT4" 
href="formatting.xhtml#DOCF4">(2)</a></h5>
-<p>in footnote2</p>
-<h5 class="footnote-body-heading"><a id="FOOT1" 
href="formatting.xhtml#DOCF1">(3)</a></h5>
-<p>in footnote</p>
-<h5 class="footnote-body-heading"><a id="FOOT2" 
href="formatting.xhtml#DOCF2">(4)</a></h5>
-<p>in footnote2</p>
-<h5 class="footnote-body-heading"><a id="FOOT1_5" 
href="chapter.xhtml#DOCF1_5">(5)</a></h5>
-<p>in footnote</p>
-<h5 class="footnote-body-heading"><a id="FOOT2_6" 
href="chapter.xhtml#DOCF2_6">(6)</a></h5>
-<p>in footnote2</p>
-<h5 class="footnote-body-heading"><a id="FOOT5" 
href="chapter.xhtml#DOCF5">(7)</a></h5>
-<p>in footnote</p>
-<h5 class="footnote-body-heading"><a id="FOOT6" 
href="chapter.xhtml#DOCF6">(8)</a></h5>
-<p>in footnote2</p>
-<h5 class="footnote-body-heading"><a id="FOOT7" 
href="chapter.xhtml#DOCF7">(9)</a></h5>
-<p>in footnote</p>
-<h5 class="footnote-body-heading"><a id="FOOT8" 
href="chapter.xhtml#DOCF8">(10)</a></h5>
-<p>in footnote2</p>
-<h5 class="footnote-body-heading"><a id="FOOT9" 
href="chapter.xhtml#DOCF9">(11)</a></h5>
-<p>in footnote
-<a class="index-entry-id" id="index-index-entry-in-footnote"></a>
-</p>
-<p>Blah
-</p>
-<p>Blih
-</p>
-<a class="index-entry-id" id="index-counting-entry"></a>
-<h5 class="footnote-body-heading"><a id="FOOT10" 
href="chapter.xhtml#DOCF10">(12)</a></h5>
-<p>in footnote</p>
-</div>
-
-
-</body>
-</html>
diff --git 
a/tp/tests/layout/res_parser/formatting_epub/formatting_epub_package/EPUB/xhtml/formatting_ovr.xhtml
 
b/tp/tests/layout/res_parser/formatting_epub/formatting_epub_package/EPUB/xhtml/formatting_ovr.xhtml
deleted file mode 100644
index 1c31e9c337..0000000000
--- 
a/tp/tests/layout/res_parser/formatting_epub/formatting_epub_package/EPUB/xhtml/formatting_ovr.xhtml
+++ /dev/null
@@ -1,884 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html>
-<html xmlns="http://www.w3.org/1999/xhtml";>
-<!-- Created by texinfo, http://www.gnu.org/software/texinfo/ -->
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
-<!-- In copying
-
-<
->
-"
-&
-'
-`
-
-"simple-double-three-four-"
-
-code: ``simple-double-three-four-'' 
-
-asis: "simple-double-three-four-" 
-
-strong: "simple-double-three-four-" 
-
-kbd: ``simple-double-three-four-'' 
-
-
-``simple-double-three-four-''
-
-
-
-@"u ü (ü)
-@"{U} Ü (Ü) 
-@~n ñ (ñ)
-@^a â (â)
-@'e é (é)
-@=o ō (ō)
-@`i ì (ì)
-@'{e} é (é)
-@'{@dotless{i}} í (í)
-@dotless{i} ı (ı)
-@dotless{j} ȷ (ȷ)
-@H{a} a̋
-@dotaccent{a} ȧ (ȧ)
-@ringaccent{a} å (å)
-@tieaccent{a} a͡
-@u{a} ă (ă)
-@ubaraccent{a} a̲
-@udotaccent{a} ạ (ạ)
-@v{a} ǎ (ǎ)
-@,c ç (ç)
-@,{c} ç (ç)
-@ogonek{a} ą (ą)
-
-@`{@=E} Ḕ
-@l{} ł
-@,{@'C} Ḉ
-@,c@"u çü 
-
-
-@H{-a} -a̋
-@dotaccent{-a} -ȧ
-@ringaccent{-a} -å
-@tieaccent{-a} -a͡
-@u{-a} -ă
-@ubaraccent{-a} -a̲
-@udotaccent{-a} -ạ
-@v{-a} -ǎ
-@,{-c} -ç
-@ogonek{-a} -ą
-
-@U{0075} 0075
-
-@* 
-
-@ followed by a space
- 
-@ followed by a tab
- 
-@ followed by a new line
- @- 
-@: 
-@! !
-@? ?
-@. .
-@& &
-@@ @
-@} }
-@{ {
-@/ 
-
-foo vs. bar. 
-colon :And something else.
-semi colon ;.
-And ? ?.
-Now ! !@
-but , ,
-
-@ampchar & (&)
-@atchar @ (@)
-@backslashchar \ (\)
-@hashchar # (#)
-@lbracechar { ({)
-@rbracechar } (})
-
-@TeX TeX
-@LaTeX LaTeX
-@bullet • (•)
-@copyright © (©)
-@dots … (…)
-@enddots ...
-@equiv ≡ (≡)
-@error error→
-@expansion ↦ (↦)
-@minus − (−)
-@point ⋆ (⋆)
-@print ⊣ (⊣)
-@result ⇒ (⇒)
-@today a sunny day
-
-@aa å (å)
-@AA Å (Å)
-@ae æ (æ)
-@oe œ (œ)
-@AE Æ (Æ)
-@OE Œ (Œ)
-@o ø (ø)
-@O Ø (Ø)
-@ss ß (ß)
-@l ł (ł)
-@L Ł (Ł)
-@DH Ð (Ð)
-@TH Þ (Þ)
-@dh ð (ð)
-@th þ (þ)
-
-@exclamdown ¡ (¡)
-@questiondown ¿ (¿)
-@pounds £ (£)
-@registeredsymbol ® (®)
-@ordf ª (ª)
-@ordm º (º)
-@comma , (,)
-@quotedblleft “ (“)
-@quotedblright ” (”)
-@quoteleft ‘ (‘)
-@quoteright ’ (’)
-@quotedblbase „ („)
-@quotesinglbase ‚ (‚)
-@guillemetleft « («)
-@guillemetright » (»)
-@guillemotleft « («)
-@guillemotright » (»)
-@guilsinglleft ‹ (‹)
-@guilsinglright › (›)
-
-@textdegree ° (°)
-@euro € (€)
-@arrow → (→)
-@leq ≤ (≤)
-@geq ≥ (≥)
-@tie a b
-
-@acronym{-a,an accronym} -a (an accronym)
-@acronym{-a} -a
-@abbr{@'E-. @comma{}A., @'Etude Autonome } É-. ,A. (Étude Autonome)
-@abbr{@'E-. @comma{}A.} É-. ,A.
-@asis{-a} -a
-@b{-a} -a
-@cite{-a} -a
-@code{-a} -a
-@command{-a} -a
-@dfn{-a} -a
-@dmn{-a} -a
-@email{-a,-b} -b
-@email{,-b} -b
-@email{-a} -a
-@emph{-a} -a
-@env{-a} -a
-@file{-a} -a
-@i{-a} -a
-@kbd{-a} -a
-@key{-a} -a
-@math{-a {\frac{1}{2}} @minus{}} -a {\frac{1}{2}} −
-@option{-a} -a
-@r{-a} -a
-@samp{-a} -a
-@sc{-a} -A
-@strong{-a} -a
-@t{-a} -a
-@sansserif{-a} -a
-@slanted{-a} -a
-@titlefont{-a} -a
-@indicateurl{-a} -a
-@uref{-a,-b} -a (-b)
-@uref{-a} -a
-@uref{,-b}  (-b)
-@uref{-a,-b,-c} -c
-@uref{,-b,-c} -c
-@uref{-a,,-c} -c
-@uref{,,-c} -c
-@url{-a,-b} -a (-b)
-@url{-a,} -a
-@url{,-b}  (-b)
-@var{-a} -a
-@verb{:-a:} -a
-@verb{:a  < & @ % " -    b:} a  < & @ % " -    b
-@w{a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a} a a 
a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a
-a@sup{h}@sub{l} ahl
-@footnote{in footnote} 
-@footnote{in footnote2} 
-
-@sp 2
-
-
-
-@page
-
-
-
-need 1002
-
-@clicksequence{click @click{} A} click → A
-After clickstyle ⇒
-@clicksequence{click @click{} A} click ⇒ A
-
-
-disp-laymath
-f(x) = {1 \over \sigma \sqrt{2\pi}}e-{1 \over 2}\left({x-\mu \over 
\sigma}\right)^2
-
-``simple-double-three-four-'' aa
-``simple-double-three-four-''
-
-
-ı ȷ
-ł ç
-a̲ ạ ą ahl
-
-       ! @ } { 
-a sunny day
-
-→
-0075
-• © … ... ≡
-error→ ↦ − ⊣ ⇒
-Å æ œ Æ Œ ø Ø ß ł Ł Ð
-Þ ð þ ¡ ¿ £
-ª º , 
-
-“ ” 
-‘ ’ „ ‚ «
-» « » ‹
-› € → ≤ ≥
-
-b i r SC sansserif slanted
-
-default kbdinputstyle
-vtable i-tem default kbdinputstyle
-in example default kbdinputstyle
-vtable i-tem in example default kbdinputstyle
-
-code kbdinputstyle
-vtable i-tem code kbdinputstyle
-in example code kbdinputstyle
-vtable i-tem in example code kbdinputstyle
-
-example kbdinputstyle
-vtable i-tem example kbdinputstyle
-in example example kbdinputstyle
-vtable i-tem in example example kbdinputstyle
-
-distinct kbdinputstyle
-vtable i-tem distinct kbdinputstyle
-in example distinct kbdinputstyle
-vtable i-tem in example distinct kbdinputstyle
-
-A quot-ation
-
-Note
-A Note
-
-note
-A note
-
-Caution
-Caution
-
-Important
-Important
-
-Tip
-a Tip
-
-Warning
-a Warning.
-
-something é TeX
-The something é TeX is here.
-
-@ at the end of line  
-A @ at the end of the @quotation line.
-
-something, other thing
-something, other thing
-
-Note, the note
-Note, the note
-
-
-Empty
-
-
-
-aaa quotation author
-quotation
-
-indent in quotation
-
-exdented quotation line   and dash - in quotation
-
-Not exdented followed by exdented
-exdented quotation line
-
-exdented quotation line
-Followed by not exdented 
-
-quotation1
-in exdented protected eol  
-following
-in exdented a @* 
- and following
-after exdented
-
-A small quot-ation
-
-Note
-A small Note
-
-something, other thing
-something, other thing
-
-i-temize
-
-i-tem +
-
-b-ullet
-
-minu-s
-
-e-mph item
-
-i-tem 1
-i-tem 2
-
-with w a-b
-with w c-d
-
-line w a-b
-line with w c-d
-
-1. e-numerate
-
-3. first third
-4. second third
-
-a. e-numerate
-
-c. first c
-d. second c
-
-mu-ltitable headitem another tab
-mu-ltitable item multitable tab
-mu-ltitable item 2 multitable tab 2
-lone mu-ltitable item
-
-truc bidule
-
-e-xample  some
-   text
-
-example one arg
-
-example two args
-
-example three args
-
-example four args
-
-example five args
-
-The something é TeX is here.
-
-A @ at the end of the @example line.
-
-example with empty args
-
-example with empty and non empty args mix
-
-Exam-ple
-
-Other li-ne
-not exdented
-
-exdented  and dash - in example
-Not exdented one
-exdented two
-Not exdented two
-
-Example   Hoho.
-Nested Other line
-exdented nested other line
-
-s-mallexample
-
-@noindent after smallexample.
-$ wget 
'http://savannah.gnu.org/cgi-bin/viewcvs/config/config/config.guess?rev=HEAD&content-type=text/plain'
-$ wget 
'http://savannah.gnu.org/cgi-bin/viewcvs/config/config/config.sub?rev=HEAD&content-type=text/plain'
-Less recent versions are also present.
-
-d-isplay
-
-s-malldisplay
-
-l-isp
-
-s-malllisp
-
-f-ormat
-
-s-mallformat
-
-c-ategory: d-effn_name a-rguments...
-d-effn
-
-cate-gory: de-ffn_name ar-guments    more args 
- even more so
-def-fn
- 
-fset: i a g
-cmde: truc 
-Command: log trap 
-Command: log trap1 
-Command: log trap2 
-cmde: id ule truc
-cmde2: id i ule truc
-: 
-: machin
-: bidule machin
-truc: machin
-truc: 
-truc: followed by a comment
-: 
-truc: a b c d e f g h i
-truc: deffnx before end deffn
-
-
-empty: deffn
-
-empty: deffn with deffnx
-empty: deffnx
-
-fset: i a g
-cmde: truc 
-text in def item for second def item
-
-
-c-ategory: d-efvr_name
-d-efvr
-
-c-ategory: n-ame a-rguments...
-d-effn
-
-c-ategory: n-ame
-d-effn no arg
-
-c-ategory: t-ype d-eftypefn_name a-rguments...
-d-eftypefn
-
-c-ategory: t-ype d-eftypefn_name
-d-eftypefn no arg
-
-c-ategory on c-lass: t-ype d-eftypeop_name a-rguments...
-d-eftypeop
-
-c-ategory on c-lass: t-ype d-eftypeop_name
-d-eftypeop no arg
-
-c-ategory: t-ype d-eftypevr_name
-d-eftypevr
-
-c-ategory of c-lass: d-efcv_name
-d-efcv
-
-c-ategory of c-lass: d-efcv_name a-rguments...
-d-efcv with arguments
-
-c-ategory of c-lass: t-ype d-eftypecv_name
-d-eftypecv
-
-c-ategory of c-lass: t-ype d-eftypecv_name a-rguments...
-d-eftypecv with arguments
-
-c-ategory on c-lass: d-efop_name a-rguments...
-d-efop
-
-c-ategory on c-lass: d-efop_name
-d-efop no arg
-
-c-ategory: d-eftp_name a-ttributes...
-d-eftp
-
-Function: d-efun_name a-rguments...
-d-efun
-
-Macro: d-efmac_name a-rguments...
-d-efmac
-
-Special Form: d-efspec_name a-rguments...
-d-efspec
-
-Variable: d-efvar_name
-d-efvar
-
-Variable: d-efvar_name arg-var arg-var1
-d-efvar with args
-
-User Option: d-efopt_name
-d-efopt
-
-Function: t-ype d-eftypefun_name a-rguments...
-d-eftypefun
-
-Variable: t-ype d-eftypevar_name
-d-eftypevar
-
-Instance Variable of c-lass: d-efivar_name
-d-efivar
-
-Instance Variable of c-lass: t-ype d-eftypeivar_name
-d-eftypeivar
-
-Method on c-lass: d-efmethod_name a-rguments...
-d-efmethod
-
-Method on c-lass: t-ype d-eftypemethod_name a-rguments...
-d-eftypemethod
-
-
-Function: data-type2 name2 arguments2...
-aaa2
-
-c-ategory2: t-ype2 d-eftypefn_name2
-d-eftypefn no arg2
-
-c-ategory2 on c-lass2: t-ype2 d-eftypeop_name2 a-rguments2...
-d-eftypeop2
-
-c-ategory2 on c-lass2: t-ype2 d-eftypeop_name2
-d-eftypeop no arg2
-
-c-ategory2 of c-lass2: t-ype2 d-eftypecv_name2
-d-eftypecv2
-
-c-ategory2 of c-lass2: t-ype2 d-eftypecv_name2 a-rguments2...
-d-eftypecv with arguments2
-
-fun2: arg2
-fff2
-
-
-@xref{c-hapter@@, cross r-ef name@@, t-itle@@, file n-ame@@, ma-nual@@} 
c-hapter@.
-@ref{chapter, cross ref name, title, file name, manual} chapter
-@pxref{chapter, cross ref name, title, file name, manual} chapter
-@inforef{chapter, cross ref name, file name} chapter
-
-@ref{chapter} chapter
-@xref{chapter} chapter.
-@pxref{chapter} chapter
-@ref{s-ect@comma{}ion} s-ect,ion
-
-@ref{s-ect@comma{}ion, a @comma{} in cross
-ref, a comma@comma{} in title, a comma@comma{} in file, a @comma{} in manual 
name }
-s-ect,ion
-
-@ref{chapter,cross ref name} chapter
-@ref{chapter,,title} chapter
-@ref{chapter,,,file name} chapter
-@ref{chapter,,,,manual} chapter
-@ref{chapter,cross ref name,title,} chapter
-@ref{chapter,cross ref name,,file name} chapter
-@ref{chapter,cross ref name,,,manual} chapter
-@ref{chapter,cross ref name,title,file name} chapter
-@ref{chapter,cross ref name,title,,manual} chapter
-@ref{chapter,cross ref name,title, file name, manual} chapter
-@ref{chapter,,title,file name} chapter
-@ref{chapter,,title,,manual} chapter
-@ref{chapter,,title, file name, manual} chapter
-@ref{chapter,,,file name,manual} chapter
-
-
-@ref{(pman)anode,cross ref name} (pman)anode
-@ref{(pman)anode,,title} (pman)anode
-@ref{(pman)anode,,,file name} (pman)anode
-@ref{(pman)anode,,,,manual} (pman)anode
-@ref{(pman)anode,cross ref name,title,} (pman)anode
-@ref{(pman)anode,cross ref name,,file name} (pman)anode
-@ref{(pman)anode,cross ref name,,,manual} (pman)anode
-@ref{(pman)anode,cross ref name,title,file name} (pman)anode
-@ref{(pman)anode,cross ref name,title,,manual} (pman)anode
-@ref{(pman)anode,cross ref name,title, file name, manual} (pman)anode
-@ref{(pman)anode,,title,file name} (pman)anode
-@ref{(pman)anode,,title,,manual} (pman)anode
-@ref{(pman)anode,,title, file name, manual} (pman)anode
-@ref{(pman)anode,,,file name,manual} (pman)anode
-
-
-@inforef{chapter, cross ref name, file name} chapter
-@inforef{chapter} chapter
-@inforef{chapter, cross ref name} chapter
-@inforef{chapter,,file name} chapter
-@inforef{node, cross ref name, file name} node
-@inforef{node} node
-@inforef{node, cross ref name} node
-@inforef{node,,file name} node
-@inforef{chapter, cross ref name, file name, spurious arg} chapter
-
-@inforef{s-ect@comma{}ion, a @comma{} in cross
-ref, a comma@comma{} in file}
-s-ect,ion
-
-chapter.
-
-ext
-chapter
-
-a-strong
-l-ine
-
-a-asis
-b
-l-ine
-
-a
-b
-l-ine
-
-Title
-a-code
-Value-table code
-
-Title
-a-samp
-a2-samp
-Value-table samp
-
-c-artouche
-
-Tit-le of box
-With title c-artouche
-
-f-lushleft
-more text
-
-f-lushright
-more text
-
-ce-ntered line
-
-r-raggedright
-more text
-
-\input texinfo @c -*-texinfo-*-
-
-@c this file is used in tests in @verbatiminclude but not converted
-
-@setfilename simplest.info
-
-@node Top
-
-This is a very simple texi manual @  <>.
-
-@bye
-
-in verbatim ''
-
-
-html ''
-
-
-
-
-majorheading
-************
-
-chapheading
-***********
-
-heading
-=======
-
-subheading
--
-
-subsubheading
-.............
-
-
-@acronym{-a,an accronym @comma{} @enddots{}} -a (an accronym , ...)
-@abbr{@'E-. @comma{}A., @'Etude-@comma{} @b{Autonome} } É-. ,A. (Étude-, 
Autonome)
-@abbr{@'E-. @comma{}A.} É-. ,A.
-
-@math{-a@minus{} {\frac{1}{2}}} -a− {\frac{1}{2}}
-
-
-
-
-Somehow invalid use of @,:
-
-@, ̧
-
-@,@"u ̧ü
-
-Invalid use of @':
-
-@' ́
-
-@'@"u ́ü
-
-@| 
-
-@dotless{truc} truc
-@dotless{ij} ij
-@dotless{-a} -a
-@dotless{a} a
-
-@U, without braces @U{}, with empty arg 
-@U{z}, with non-hex arg z
-@U{abc}, with <4 hex digits abc
-@U{FFFFFFFFFFFFFF}, value much too large FFFFFFFFFFFFFF
-@U{110000}, value just beyond Unicode 110000
-
-@TeX, but without brace TeX
-@# #
-
-@w{-a} -a
-
-@image{,1-xt} 
-@image{,,2-xt} 
-@image{,,,3-xt} 
-
-@image{f-ile,aze,,a-lt} f-ile
-@image{f-ile,,,alt@verb{:jk _" %}} f-ile
-
-@image{f-ile} f-ile
-@image{f-ile,,,alt} f-ile
-@image{f-ile,,,,.e-d-xt} f-ile
-@image{f-ile,l-i} f-ile
-@image{f-ile,,l-e} f-ile
-@image{f-ile,aze,az,alt,.e-xt} f-ile
-@image{f-ile,aze,az,alt, f-ile
-@image{@file{f-ile}@@@.,aze,az,alt,@file{.file ext} e-xt@} f-ile@.
-
-@image{f-ile,aze,az,@verb{:jk _" %@:} @b{in b "},e-xt} f-ile
-@image{file@verb{:jk _" %@:},,,alt@verb{:jk _" %@:}} filejk _" %@
-
-
-author
-
-ü Ü ñ â é ō ì é Ḕ
-Ḉ Ḉ a̋ ȧ å a͡
-ă ǎ
- ? .
-
-TeX LaTeX ⋆ å ® ° 
-
-t 
-
-e-mph item
-
-e-mph item
-
-i-tem 1
-i-tem 2
-
-without brace w a-b
-without brace w c-d
-
-a
-l-ine
-
-a-missing style formatting
-l-ine
-
-a
-b
-l-ine
-
-fun: 
-truc: machin bidule chose and
-truc: machin bidule chose and  after
-truc: machin bidule chose and 
-truc: machin bidule chose and and after
-truc: followed by a comment
-Various deff lines
-truc: after a deff item
-
-fsetinv: invalid a g
-id i ule: 
-aaa: 
-: 
-truc: 
-
-g-roupe
-
-@ref{node} node
-
-@ref{,cross ref name} 
-@ref{,,title} 
-@ref{,,,file name} 
-@ref{,,,,manual} 
-@ref{node,cross ref name} node
-@ref{node,,title} node
-@ref{node,,,file name} node
-@ref{node,,,,manual} node
-@ref{node,cross ref name,title,} node
-@ref{node,cross ref name,,file name} node
-@ref{node,cross ref name,,,manual} node
-@ref{node,cross ref name,title,file name} node
-@ref{node,cross ref name,title,,manual} node
-@ref{node,cross ref name,title, file name, manual} node
-@ref{node,,title,file name} node
-@ref{node,,title,,manual} node
-@ref{chapter,,title, file name, manual} chapter
-@ref{node,,title, file name, manual} node
-@ref{node,,,file name,manual} node
-@ref{,cross ref name,title,} 
-@ref{,cross ref name,,file name} 
-@ref{,cross ref name,,,manual} 
-@ref{,cross ref name,title,file name} 
-@ref{,cross ref name,title,,manual} 
-@ref{,cross ref name,title, file name, manual} 
-@ref{,,title,file name} 
-@ref{,,title,,manual} 
-@ref{,,title, file name, manual} 
-@ref{,,,file name,manual} 
-
-@inforef{,cross ref name } 
-@inforef{,,file name} 
-@inforef{,cross ref name, file name} 
-@inforef{} 
-
- -->
-<title>Short Table of Contents (title &#8211;a)</title>
-
-<meta name="description" content="Short Table of Contents (title &#8211;a)"/>
-<meta name="keywords" content="Short Table of Contents (title &#8211;a)"/>
-<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">
-<!--
-ul.toc-numbered-mark {list-style: none}
--->
-</style>
-
-
-</head>
-
-<body lang="en">
-<div class="element-shortcontents" id="SEC_Shortcontents">
-<h1 class="shortcontents-heading">Short Table of Contents</h1>
-
-<div class="shortcontents">
-<ul class="toc-numbered-mark">
-<li><a id="stoc-chapter-1" href="chapter.xhtml#chapter" rel="index">1 
chapter</a></li>
-<li><a id="stoc-chapter-2" href="chapter2.xhtml" rel="index">chapter 2</a></li>
-</ul>
-</div>
-</div>
-
-
-</body>
-</html>
diff --git 
a/tp/tests/layout/res_parser/formatting_epub/formatting_epub_package/EPUB/xhtml/formatting_toc.xhtml
 
b/tp/tests/layout/res_parser/formatting_epub/formatting_epub_package/EPUB/xhtml/formatting_toc.xhtml
deleted file mode 100644
index e00ccd191b..0000000000
--- 
a/tp/tests/layout/res_parser/formatting_epub/formatting_epub_package/EPUB/xhtml/formatting_toc.xhtml
+++ /dev/null
@@ -1,895 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html>
-<html xmlns="http://www.w3.org/1999/xhtml";>
-<!-- Created by texinfo, http://www.gnu.org/software/texinfo/ -->
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
-<!-- In copying
-
-<
->
-"
-&
-'
-`
-
-"simple-double-three-four-"
-
-code: ``simple-double-three-four-'' 
-
-asis: "simple-double-three-four-" 
-
-strong: "simple-double-three-four-" 
-
-kbd: ``simple-double-three-four-'' 
-
-
-``simple-double-three-four-''
-
-
-
-@"u ü (ü)
-@"{U} Ü (Ü) 
-@~n ñ (ñ)
-@^a â (â)
-@'e é (é)
-@=o ō (ō)
-@`i ì (ì)
-@'{e} é (é)
-@'{@dotless{i}} í (í)
-@dotless{i} ı (ı)
-@dotless{j} ȷ (ȷ)
-@H{a} a̋
-@dotaccent{a} ȧ (ȧ)
-@ringaccent{a} å (å)
-@tieaccent{a} a͡
-@u{a} ă (ă)
-@ubaraccent{a} a̲
-@udotaccent{a} ạ (ạ)
-@v{a} ǎ (ǎ)
-@,c ç (ç)
-@,{c} ç (ç)
-@ogonek{a} ą (ą)
-
-@`{@=E} Ḕ
-@l{} ł
-@,{@'C} Ḉ
-@,c@"u çü 
-
-
-@H{-a} -a̋
-@dotaccent{-a} -ȧ
-@ringaccent{-a} -å
-@tieaccent{-a} -a͡
-@u{-a} -ă
-@ubaraccent{-a} -a̲
-@udotaccent{-a} -ạ
-@v{-a} -ǎ
-@,{-c} -ç
-@ogonek{-a} -ą
-
-@U{0075} 0075
-
-@* 
-
-@ followed by a space
- 
-@ followed by a tab
- 
-@ followed by a new line
- @- 
-@: 
-@! !
-@? ?
-@. .
-@& &
-@@ @
-@} }
-@{ {
-@/ 
-
-foo vs. bar. 
-colon :And something else.
-semi colon ;.
-And ? ?.
-Now ! !@
-but , ,
-
-@ampchar & (&)
-@atchar @ (@)
-@backslashchar \ (\)
-@hashchar # (#)
-@lbracechar { ({)
-@rbracechar } (})
-
-@TeX TeX
-@LaTeX LaTeX
-@bullet • (•)
-@copyright © (©)
-@dots … (…)
-@enddots ...
-@equiv ≡ (≡)
-@error error→
-@expansion ↦ (↦)
-@minus − (−)
-@point ⋆ (⋆)
-@print ⊣ (⊣)
-@result ⇒ (⇒)
-@today a sunny day
-
-@aa å (å)
-@AA Å (Å)
-@ae æ (æ)
-@oe œ (œ)
-@AE Æ (Æ)
-@OE Œ (Œ)
-@o ø (ø)
-@O Ø (Ø)
-@ss ß (ß)
-@l ł (ł)
-@L Ł (Ł)
-@DH Ð (Ð)
-@TH Þ (Þ)
-@dh ð (ð)
-@th þ (þ)
-
-@exclamdown ¡ (¡)
-@questiondown ¿ (¿)
-@pounds £ (£)
-@registeredsymbol ® (®)
-@ordf ª (ª)
-@ordm º (º)
-@comma , (,)
-@quotedblleft “ (“)
-@quotedblright ” (”)
-@quoteleft ‘ (‘)
-@quoteright ’ (’)
-@quotedblbase „ („)
-@quotesinglbase ‚ (‚)
-@guillemetleft « («)
-@guillemetright » (»)
-@guillemotleft « («)
-@guillemotright » (»)
-@guilsinglleft ‹ (‹)
-@guilsinglright › (›)
-
-@textdegree ° (°)
-@euro € (€)
-@arrow → (→)
-@leq ≤ (≤)
-@geq ≥ (≥)
-@tie a b
-
-@acronym{-a,an accronym} -a (an accronym)
-@acronym{-a} -a
-@abbr{@'E-. @comma{}A., @'Etude Autonome } É-. ,A. (Étude Autonome)
-@abbr{@'E-. @comma{}A.} É-. ,A.
-@asis{-a} -a
-@b{-a} -a
-@cite{-a} -a
-@code{-a} -a
-@command{-a} -a
-@dfn{-a} -a
-@dmn{-a} -a
-@email{-a,-b} -b
-@email{,-b} -b
-@email{-a} -a
-@emph{-a} -a
-@env{-a} -a
-@file{-a} -a
-@i{-a} -a
-@kbd{-a} -a
-@key{-a} -a
-@math{-a {\frac{1}{2}} @minus{}} -a {\frac{1}{2}} −
-@option{-a} -a
-@r{-a} -a
-@samp{-a} -a
-@sc{-a} -A
-@strong{-a} -a
-@t{-a} -a
-@sansserif{-a} -a
-@slanted{-a} -a
-@titlefont{-a} -a
-@indicateurl{-a} -a
-@uref{-a,-b} -a (-b)
-@uref{-a} -a
-@uref{,-b}  (-b)
-@uref{-a,-b,-c} -c
-@uref{,-b,-c} -c
-@uref{-a,,-c} -c
-@uref{,,-c} -c
-@url{-a,-b} -a (-b)
-@url{-a,} -a
-@url{,-b}  (-b)
-@var{-a} -a
-@verb{:-a:} -a
-@verb{:a  < & @ % " -    b:} a  < & @ % " -    b
-@w{a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a} a a 
a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a
-a@sup{h}@sub{l} ahl
-@footnote{in footnote} 
-@footnote{in footnote2} 
-
-@sp 2
-
-
-
-@page
-
-
-
-need 1002
-
-@clicksequence{click @click{} A} click → A
-After clickstyle ⇒
-@clicksequence{click @click{} A} click ⇒ A
-
-
-disp-laymath
-f(x) = {1 \over \sigma \sqrt{2\pi}}e-{1 \over 2}\left({x-\mu \over 
\sigma}\right)^2
-
-``simple-double-three-four-'' aa
-``simple-double-three-four-''
-
-
-ı ȷ
-ł ç
-a̲ ạ ą ahl
-
-       ! @ } { 
-a sunny day
-
-→
-0075
-• © … ... ≡
-error→ ↦ − ⊣ ⇒
-Å æ œ Æ Œ ø Ø ß ł Ł Ð
-Þ ð þ ¡ ¿ £
-ª º , 
-
-“ ” 
-‘ ’ „ ‚ «
-» « » ‹
-› € → ≤ ≥
-
-b i r SC sansserif slanted
-
-default kbdinputstyle
-vtable i-tem default kbdinputstyle
-in example default kbdinputstyle
-vtable i-tem in example default kbdinputstyle
-
-code kbdinputstyle
-vtable i-tem code kbdinputstyle
-in example code kbdinputstyle
-vtable i-tem in example code kbdinputstyle
-
-example kbdinputstyle
-vtable i-tem example kbdinputstyle
-in example example kbdinputstyle
-vtable i-tem in example example kbdinputstyle
-
-distinct kbdinputstyle
-vtable i-tem distinct kbdinputstyle
-in example distinct kbdinputstyle
-vtable i-tem in example distinct kbdinputstyle
-
-A quot-ation
-
-Note
-A Note
-
-note
-A note
-
-Caution
-Caution
-
-Important
-Important
-
-Tip
-a Tip
-
-Warning
-a Warning.
-
-something é TeX
-The something é TeX is here.
-
-@ at the end of line  
-A @ at the end of the @quotation line.
-
-something, other thing
-something, other thing
-
-Note, the note
-Note, the note
-
-
-Empty
-
-
-
-aaa quotation author
-quotation
-
-indent in quotation
-
-exdented quotation line   and dash - in quotation
-
-Not exdented followed by exdented
-exdented quotation line
-
-exdented quotation line
-Followed by not exdented 
-
-quotation1
-in exdented protected eol  
-following
-in exdented a @* 
- and following
-after exdented
-
-A small quot-ation
-
-Note
-A small Note
-
-something, other thing
-something, other thing
-
-i-temize
-
-i-tem +
-
-b-ullet
-
-minu-s
-
-e-mph item
-
-i-tem 1
-i-tem 2
-
-with w a-b
-with w c-d
-
-line w a-b
-line with w c-d
-
-1. e-numerate
-
-3. first third
-4. second third
-
-a. e-numerate
-
-c. first c
-d. second c
-
-mu-ltitable headitem another tab
-mu-ltitable item multitable tab
-mu-ltitable item 2 multitable tab 2
-lone mu-ltitable item
-
-truc bidule
-
-e-xample  some
-   text
-
-example one arg
-
-example two args
-
-example three args
-
-example four args
-
-example five args
-
-The something é TeX is here.
-
-A @ at the end of the @example line.
-
-example with empty args
-
-example with empty and non empty args mix
-
-Exam-ple
-
-Other li-ne
-not exdented
-
-exdented  and dash - in example
-Not exdented one
-exdented two
-Not exdented two
-
-Example   Hoho.
-Nested Other line
-exdented nested other line
-
-s-mallexample
-
-@noindent after smallexample.
-$ wget 
'http://savannah.gnu.org/cgi-bin/viewcvs/config/config/config.guess?rev=HEAD&content-type=text/plain'
-$ wget 
'http://savannah.gnu.org/cgi-bin/viewcvs/config/config/config.sub?rev=HEAD&content-type=text/plain'
-Less recent versions are also present.
-
-d-isplay
-
-s-malldisplay
-
-l-isp
-
-s-malllisp
-
-f-ormat
-
-s-mallformat
-
-c-ategory: d-effn_name a-rguments...
-d-effn
-
-cate-gory: de-ffn_name ar-guments    more args 
- even more so
-def-fn
- 
-fset: i a g
-cmde: truc 
-Command: log trap 
-Command: log trap1 
-Command: log trap2 
-cmde: id ule truc
-cmde2: id i ule truc
-: 
-: machin
-: bidule machin
-truc: machin
-truc: 
-truc: followed by a comment
-: 
-truc: a b c d e f g h i
-truc: deffnx before end deffn
-
-
-empty: deffn
-
-empty: deffn with deffnx
-empty: deffnx
-
-fset: i a g
-cmde: truc 
-text in def item for second def item
-
-
-c-ategory: d-efvr_name
-d-efvr
-
-c-ategory: n-ame a-rguments...
-d-effn
-
-c-ategory: n-ame
-d-effn no arg
-
-c-ategory: t-ype d-eftypefn_name a-rguments...
-d-eftypefn
-
-c-ategory: t-ype d-eftypefn_name
-d-eftypefn no arg
-
-c-ategory on c-lass: t-ype d-eftypeop_name a-rguments...
-d-eftypeop
-
-c-ategory on c-lass: t-ype d-eftypeop_name
-d-eftypeop no arg
-
-c-ategory: t-ype d-eftypevr_name
-d-eftypevr
-
-c-ategory of c-lass: d-efcv_name
-d-efcv
-
-c-ategory of c-lass: d-efcv_name a-rguments...
-d-efcv with arguments
-
-c-ategory of c-lass: t-ype d-eftypecv_name
-d-eftypecv
-
-c-ategory of c-lass: t-ype d-eftypecv_name a-rguments...
-d-eftypecv with arguments
-
-c-ategory on c-lass: d-efop_name a-rguments...
-d-efop
-
-c-ategory on c-lass: d-efop_name
-d-efop no arg
-
-c-ategory: d-eftp_name a-ttributes...
-d-eftp
-
-Function: d-efun_name a-rguments...
-d-efun
-
-Macro: d-efmac_name a-rguments...
-d-efmac
-
-Special Form: d-efspec_name a-rguments...
-d-efspec
-
-Variable: d-efvar_name
-d-efvar
-
-Variable: d-efvar_name arg-var arg-var1
-d-efvar with args
-
-User Option: d-efopt_name
-d-efopt
-
-Function: t-ype d-eftypefun_name a-rguments...
-d-eftypefun
-
-Variable: t-ype d-eftypevar_name
-d-eftypevar
-
-Instance Variable of c-lass: d-efivar_name
-d-efivar
-
-Instance Variable of c-lass: t-ype d-eftypeivar_name
-d-eftypeivar
-
-Method on c-lass: d-efmethod_name a-rguments...
-d-efmethod
-
-Method on c-lass: t-ype d-eftypemethod_name a-rguments...
-d-eftypemethod
-
-
-Function: data-type2 name2 arguments2...
-aaa2
-
-c-ategory2: t-ype2 d-eftypefn_name2
-d-eftypefn no arg2
-
-c-ategory2 on c-lass2: t-ype2 d-eftypeop_name2 a-rguments2...
-d-eftypeop2
-
-c-ategory2 on c-lass2: t-ype2 d-eftypeop_name2
-d-eftypeop no arg2
-
-c-ategory2 of c-lass2: t-ype2 d-eftypecv_name2
-d-eftypecv2
-
-c-ategory2 of c-lass2: t-ype2 d-eftypecv_name2 a-rguments2...
-d-eftypecv with arguments2
-
-fun2: arg2
-fff2
-
-
-@xref{c-hapter@@, cross r-ef name@@, t-itle@@, file n-ame@@, ma-nual@@} 
c-hapter@.
-@ref{chapter, cross ref name, title, file name, manual} chapter
-@pxref{chapter, cross ref name, title, file name, manual} chapter
-@inforef{chapter, cross ref name, file name} chapter
-
-@ref{chapter} chapter
-@xref{chapter} chapter.
-@pxref{chapter} chapter
-@ref{s-ect@comma{}ion} s-ect,ion
-
-@ref{s-ect@comma{}ion, a @comma{} in cross
-ref, a comma@comma{} in title, a comma@comma{} in file, a @comma{} in manual 
name }
-s-ect,ion
-
-@ref{chapter,cross ref name} chapter
-@ref{chapter,,title} chapter
-@ref{chapter,,,file name} chapter
-@ref{chapter,,,,manual} chapter
-@ref{chapter,cross ref name,title,} chapter
-@ref{chapter,cross ref name,,file name} chapter
-@ref{chapter,cross ref name,,,manual} chapter
-@ref{chapter,cross ref name,title,file name} chapter
-@ref{chapter,cross ref name,title,,manual} chapter
-@ref{chapter,cross ref name,title, file name, manual} chapter
-@ref{chapter,,title,file name} chapter
-@ref{chapter,,title,,manual} chapter
-@ref{chapter,,title, file name, manual} chapter
-@ref{chapter,,,file name,manual} chapter
-
-
-@ref{(pman)anode,cross ref name} (pman)anode
-@ref{(pman)anode,,title} (pman)anode
-@ref{(pman)anode,,,file name} (pman)anode
-@ref{(pman)anode,,,,manual} (pman)anode
-@ref{(pman)anode,cross ref name,title,} (pman)anode
-@ref{(pman)anode,cross ref name,,file name} (pman)anode
-@ref{(pman)anode,cross ref name,,,manual} (pman)anode
-@ref{(pman)anode,cross ref name,title,file name} (pman)anode
-@ref{(pman)anode,cross ref name,title,,manual} (pman)anode
-@ref{(pman)anode,cross ref name,title, file name, manual} (pman)anode
-@ref{(pman)anode,,title,file name} (pman)anode
-@ref{(pman)anode,,title,,manual} (pman)anode
-@ref{(pman)anode,,title, file name, manual} (pman)anode
-@ref{(pman)anode,,,file name,manual} (pman)anode
-
-
-@inforef{chapter, cross ref name, file name} chapter
-@inforef{chapter} chapter
-@inforef{chapter, cross ref name} chapter
-@inforef{chapter,,file name} chapter
-@inforef{node, cross ref name, file name} node
-@inforef{node} node
-@inforef{node, cross ref name} node
-@inforef{node,,file name} node
-@inforef{chapter, cross ref name, file name, spurious arg} chapter
-
-@inforef{s-ect@comma{}ion, a @comma{} in cross
-ref, a comma@comma{} in file}
-s-ect,ion
-
-chapter.
-
-ext
-chapter
-
-a-strong
-l-ine
-
-a-asis
-b
-l-ine
-
-a
-b
-l-ine
-
-Title
-a-code
-Value-table code
-
-Title
-a-samp
-a2-samp
-Value-table samp
-
-c-artouche
-
-Tit-le of box
-With title c-artouche
-
-f-lushleft
-more text
-
-f-lushright
-more text
-
-ce-ntered line
-
-r-raggedright
-more text
-
-\input texinfo @c -*-texinfo-*-
-
-@c this file is used in tests in @verbatiminclude but not converted
-
-@setfilename simplest.info
-
-@node Top
-
-This is a very simple texi manual @  <>.
-
-@bye
-
-in verbatim ''
-
-
-html ''
-
-
-
-
-majorheading
-************
-
-chapheading
-***********
-
-heading
-=======
-
-subheading
--
-
-subsubheading
-.............
-
-
-@acronym{-a,an accronym @comma{} @enddots{}} -a (an accronym , ...)
-@abbr{@'E-. @comma{}A., @'Etude-@comma{} @b{Autonome} } É-. ,A. (Étude-, 
Autonome)
-@abbr{@'E-. @comma{}A.} É-. ,A.
-
-@math{-a@minus{} {\frac{1}{2}}} -a− {\frac{1}{2}}
-
-
-
-
-Somehow invalid use of @,:
-
-@, ̧
-
-@,@"u ̧ü
-
-Invalid use of @':
-
-@' ́
-
-@'@"u ́ü
-
-@| 
-
-@dotless{truc} truc
-@dotless{ij} ij
-@dotless{-a} -a
-@dotless{a} a
-
-@U, without braces @U{}, with empty arg 
-@U{z}, with non-hex arg z
-@U{abc}, with <4 hex digits abc
-@U{FFFFFFFFFFFFFF}, value much too large FFFFFFFFFFFFFF
-@U{110000}, value just beyond Unicode 110000
-
-@TeX, but without brace TeX
-@# #
-
-@w{-a} -a
-
-@image{,1-xt} 
-@image{,,2-xt} 
-@image{,,,3-xt} 
-
-@image{f-ile,aze,,a-lt} f-ile
-@image{f-ile,,,alt@verb{:jk _" %}} f-ile
-
-@image{f-ile} f-ile
-@image{f-ile,,,alt} f-ile
-@image{f-ile,,,,.e-d-xt} f-ile
-@image{f-ile,l-i} f-ile
-@image{f-ile,,l-e} f-ile
-@image{f-ile,aze,az,alt,.e-xt} f-ile
-@image{f-ile,aze,az,alt, f-ile
-@image{@file{f-ile}@@@.,aze,az,alt,@file{.file ext} e-xt@} f-ile@.
-
-@image{f-ile,aze,az,@verb{:jk _" %@:} @b{in b "},e-xt} f-ile
-@image{file@verb{:jk _" %@:},,,alt@verb{:jk _" %@:}} filejk _" %@
-
-
-author
-
-ü Ü ñ â é ō ì é Ḕ
-Ḉ Ḉ a̋ ȧ å a͡
-ă ǎ
- ? .
-
-TeX LaTeX ⋆ å ® ° 
-
-t 
-
-e-mph item
-
-e-mph item
-
-i-tem 1
-i-tem 2
-
-without brace w a-b
-without brace w c-d
-
-a
-l-ine
-
-a-missing style formatting
-l-ine
-
-a
-b
-l-ine
-
-fun: 
-truc: machin bidule chose and
-truc: machin bidule chose and  after
-truc: machin bidule chose and 
-truc: machin bidule chose and and after
-truc: followed by a comment
-Various deff lines
-truc: after a deff item
-
-fsetinv: invalid a g
-id i ule: 
-aaa: 
-: 
-truc: 
-
-g-roupe
-
-@ref{node} node
-
-@ref{,cross ref name} 
-@ref{,,title} 
-@ref{,,,file name} 
-@ref{,,,,manual} 
-@ref{node,cross ref name} node
-@ref{node,,title} node
-@ref{node,,,file name} node
-@ref{node,,,,manual} node
-@ref{node,cross ref name,title,} node
-@ref{node,cross ref name,,file name} node
-@ref{node,cross ref name,,,manual} node
-@ref{node,cross ref name,title,file name} node
-@ref{node,cross ref name,title,,manual} node
-@ref{node,cross ref name,title, file name, manual} node
-@ref{node,,title,file name} node
-@ref{node,,title,,manual} node
-@ref{chapter,,title, file name, manual} chapter
-@ref{node,,title, file name, manual} node
-@ref{node,,,file name,manual} node
-@ref{,cross ref name,title,} 
-@ref{,cross ref name,,file name} 
-@ref{,cross ref name,,,manual} 
-@ref{,cross ref name,title,file name} 
-@ref{,cross ref name,title,,manual} 
-@ref{,cross ref name,title, file name, manual} 
-@ref{,,title,file name} 
-@ref{,,title,,manual} 
-@ref{,,title, file name, manual} 
-@ref{,,,file name,manual} 
-
-@inforef{,cross ref name } 
-@inforef{,,file name} 
-@inforef{,cross ref name, file name} 
-@inforef{} 
-
- -->
-<title>Table of Contents (title &#8211;a)</title>
-
-<meta name="description" content="Table of Contents (title &#8211;a)"/>
-<meta name="keywords" content="Table of Contents (title &#8211;a)"/>
-<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">
-<!--
-ul.toc-numbered-mark {list-style: none}
--->
-</style>
-
-
-</head>
-
-<body lang="en">
-<div class="element-contents" id="SEC_Contents">
-<h1 class="contents-heading">Table of Contents</h1>
-
-<div class="contents">
-
-<ul class="toc-numbered-mark">
-  <li><a id="toc-chapter-1" href="chapter.xhtml#chapter" rel="index">1 
chapter</a>
-  <ul class="toc-numbered-mark">
-    <li><a id="toc-A-section" href="chapter.xhtml#s_002d_002dect_002cion">1.1 
A section</a>
-    <ul class="toc-numbered-mark">
-      <li><a id="toc-subsection-1" href="chapter.xhtml#subsection">1.1.1 
subsection</a>
-      <ul class="toc-numbered-mark">
-        <li><a id="toc-subsubsection-_0060_0060simple_002ddouble_002d_002d-1" 
href="chapter.xhtml#subsubsection-_0060_0060simple_002ddouble_002d_002d">1.1.1.1
 subsubsection &#8220;simple-double&#8211;</a></li>
-        <li><a id="toc-three_002d_002d_002dfour_002d_002d_002d_002d_0027_0027" 
href="chapter.xhtml#subsubsection-three_002d_002d_002dfour_002d_002d_002d_002d_0027_0027">1.1.1.2
 three&#8212;four&#8212;-&#8221;</a></li>
-      </ul></li>
-    </ul></li>
-  </ul></li>
-  <li><a id="toc-chapter-2" href="chapter2.xhtml" rel="index">chapter 
2</a></li>
-</ul>
-</div>
-</div>
-
-
-</body>
-</html>
diff --git 
a/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/xhtml/chapter.xhtml
 
b/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/xhtml/chapter.xhtml
index f6078fbcfb..82aff5f6dc 100644
--- 
a/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/xhtml/chapter.xhtml
+++ 
b/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/xhtml/chapter.xhtml
@@ -858,6 +858,12 @@ g-roupe
 <meta name="Generator" content="texi2any"/>
 <meta name="viewport" content="width=device-width,initial-scale=1"/>
 
+<link href="formatting.xhtml" rel="start" title="Top section"/>
+<link href="#chapter" rel="index" title="1 chapter"/>
+<link href="formatting.xhtml#SEC_Contents" rel="contents" title="Table of 
Contents"/>
+<link href="formatting.xhtml" rel="up" title="Top section"/>
+<link href="chapter2.xhtml" rel="next" title="chapter 2"/>
+<link href="formatting.xhtml" rel="prev" title="Top section"/>
 <style type="text/css">
 <!--
 a.summary-letter-printindex {text-decoration: none}
@@ -893,7 +899,7 @@ ul.mark-none {list-style-type: none}
 
 <body lang="en">
 <div class="chapter-level-extent" id="chapter">
-<h1 class="chapter" id="chapter-1">1 chapter</h1>
+<h2 class="chapter" id="chapter-1">1 chapter</h2>
 
 <p>First para
 </p>
@@ -1103,8 +1109,8 @@ but , ,
 <code class="code">@verb{:a  &lt; &amp; @ % &quot; --    b:}</code> <code 
class="verb">a&#160;&#160;&lt;&#160;&amp;&#160;@&#160;%&#160;&quot;&#160;--&#160;&#160;&#160;&#160;b</code>
 <code class="code">@w{a a a a a a a a a a a a a a a a a a a a a a a a a a a a 
a a a a a a a}</code> 
a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a<!--
 /@w -->
 <code class="code">a@sup{h}@sub{l}</code> a<sup class="sup">h</sup><sub 
class="sub">l</sub>
-<code class="code">@footnote{in footnote}</code> <a class="footnote" 
id="DOCF1_5" href="formatting_fot.xhtml#FOOT1_5"><sup>5</sup></a>
-<code class="code">@footnote{in footnote2}</code> <a class="footnote" 
id="DOCF2_6" href="formatting_fot.xhtml#FOOT2_6"><sup>6</sup></a>
+<code class="code">@footnote{in footnote}</code> <a class="footnote" 
id="DOCF1_5" href="#FOOT1_5"><sup>5</sup></a>
+<code class="code">@footnote{in footnote2}</code> <a class="footnote" 
id="DOCF2_6" href="#FOOT2_6"><sup>6</sup></a>
 </p>
 <p><code class="code">@sp 2</code><br/>
 </p><br/>
@@ -1820,13 +1826,13 @@ html ''
 
 
 
-<h1 class="majorheading" id="majorheading-1">majorheading</h1>
+<h2 class="majorheading" id="majorheading-1">majorheading</h2>
 
-<h1 class="chapheading" id="chapheading-1">chapheading</h1>
+<h2 class="chapheading" id="chapheading-1">chapheading</h2>
 
-<h2 class="heading" id="heading-1">heading</h2>
+<h3 class="heading" id="heading-1">heading</h3>
 
-<h3 class="subheading" id="subheading-1">subheading</h3>
+<h4 class="subheading" id="subheading-1">subheading</h4>
 
 <h4 class="subsubheading" id="subsubheading-1">subsubheading</h4>
 
@@ -2194,8 +2200,8 @@ but , ,
 <code class="code">@verb{:a  &lt; &amp; @ % &quot; --    b:}</code> <code 
class="verb">a&#160;&#160;&lt;&#160;&amp;&#160;@&#160;%&#160;&quot;&#160;--&#160;&#160;&#160;&#160;b</code>
 <code class="code">@w{a a a a a a a a a a a a a a a a a a a a a a a a a a a a 
a a a a a a a}</code> 
a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a<!--
 /@w -->
 <code class="code">a@sup{h}@sub{l}</code> a<sup class="sup">h</sup><sub 
class="sub">l</sub>
-<code class="code">@footnote{in footnote}</code> <a class="footnote" 
id="DOCF5" href="formatting_fot.xhtml#FOOT5"><sup>7</sup></a>
-<code class="code">@footnote{in footnote2}</code> <a class="footnote" 
id="DOCF6" href="formatting_fot.xhtml#FOOT6"><sup>8</sup></a>
+<code class="code">@footnote{in footnote}</code> <a class="footnote" 
id="DOCF5" href="#FOOT5"><sup>7</sup></a>
+<code class="code">@footnote{in footnote2}</code> <a class="footnote" 
id="DOCF6" href="#FOOT6"><sup>8</sup></a>
 </p>
 <p><code class="code">@sp 2</code><br/>
 </p><br/>
@@ -2911,13 +2917,13 @@ html ''
 
 
 
-<h1 class="majorheading" id="majorheading-2">majorheading</h1>
+<h2 class="majorheading" id="majorheading-2">majorheading</h2>
 
-<h1 class="chapheading" id="chapheading-2">chapheading</h1>
+<h2 class="chapheading" id="chapheading-2">chapheading</h2>
 
-<h2 class="heading" id="heading-2">heading</h2>
+<h3 class="heading" id="heading-2">heading</h3>
 
-<h3 class="subheading" id="subheading-2">subheading</h3>
+<h4 class="subheading" id="subheading-2">subheading</h4>
 
 <h4 class="subsubheading" id="subsubheading-2">subsubheading</h4>
 
@@ -3292,8 +3298,8 @@ but , ,
 <code class="code">@verb{:a  &lt; &amp; @ % &quot; --    b:}</code> <code 
class="verb">a  &lt; &amp; @ % &quot; --    b</code>
 <code class="code">@w{a a a a a a a a a a a a a a a a a a a a a a a a a a a a 
a a a a a a a}</code> a a a a a a a a a a a a a a a a a a a a a a a a a a a a a 
a a a a a a<!-- /@w -->
 <code class="code">a@sup{h}@sub{l}</code> a<sup class="sup">h</sup><sub 
class="sub">l</sub>
-<code class="code">@footnote{in footnote}</code> <a class="footnote" 
id="DOCF7" href="formatting_fot.xhtml#FOOT7">(9)</a>
-<code class="code">@footnote{in footnote2}</code> <a class="footnote" 
id="DOCF8" href="formatting_fot.xhtml#FOOT8">(10)</a>
+<code class="code">@footnote{in footnote}</code> <a class="footnote" 
id="DOCF7" href="#FOOT7">(9)</a>
+<code class="code">@footnote{in footnote2}</code> <a class="footnote" 
id="DOCF8" href="#FOOT8">(10)</a>
 
 <code class="code">@sp 2</code>
 
@@ -4372,7 +4378,7 @@ Invalid use of @':
 
 
 
-<p>Text<a class="footnote" id="DOCF9" 
href="formatting_fot.xhtml#FOOT9"><sup>11</sup></a>
+<p>Text<a class="footnote" id="DOCF9" href="#FOOT9"><sup>11</sup></a>
 </p>
 <p>truc
 </p>
@@ -4467,7 +4473,7 @@ Invalid use of @':
 <tr><td></td><td class="printindex-index-entry index-entry-level-1"><a 
href="#index-b_002d_002d_002db-c_002d_002d_002dc">c&#8212;c</a></td><td 
class="printindex-index-section"><a href="#chapter">1 chapter</a></td></tr>
 <tr><td colspan="3"></td></tr>
 <tr><th id="chapter-1_cp_letter-C">C</th></tr>
-<tr><td></td><td class="printindex-index-entry"><a 
href="formatting_fot.xhtml#index-counting-entry">counting entry</a></td><td 
class="printindex-index-section"><a href="#chapter">1 chapter</a></td></tr>
+<tr><td></td><td class="printindex-index-entry"><a 
href="#index-counting-entry">counting entry</a></td><td 
class="printindex-index-section"><a href="#chapter">1 chapter</a></td></tr>
 <tr><td colspan="3"></td></tr>
 <tr><th id="chapter-1_cp_letter-D">D</th></tr>
 <tr><td></td><td class="printindex-index-entry">d&#8212;dd</td><td></td></tr>
@@ -4546,7 +4552,7 @@ Invalid use of @':
 <tr><td></td><td class="printindex-index-entry"><a 
href="#index-index-entry-between-item-and-itemx-1">index entry between item and 
itemx</a></td><td class="printindex-index-section"><a href="#chapter">1 
chapter</a></td></tr>
 <tr><td></td><td class="printindex-index-entry"><a 
href="#index-index-entry-between-item-and-itemx-2">index entry between item and 
itemx</a></td><td class="printindex-index-section"><a href="#chapter">1 
chapter</a></td></tr>
 <tr><td></td><td class="printindex-index-entry"><a 
href="#index-index-entry-between-item-and-itemx-3">index entry between item and 
itemx</a></td><td class="printindex-index-section"><a href="#chapter">1 
chapter</a></td></tr>
-<tr><td></td><td class="printindex-index-entry"><a 
href="formatting_fot.xhtml#index-index-entry-in-footnote">index entry in 
footnote</a></td><td class="printindex-index-section"><a href="#chapter">1 
chapter</a></td></tr>
+<tr><td></td><td class="printindex-index-entry"><a 
href="#index-index-entry-in-footnote">index entry in footnote</a></td><td 
class="printindex-index-section"><a href="#chapter">1 chapter</a></td></tr>
 <tr><td></td><td class="printindex-index-entry"><a 
href="formatting.xhtml#index-copying-index-entry-within-deffn">index entry 
within deffn</a></td><td class="printindex-index-section"><a 
href="formatting.xhtml">Top section</a></td></tr>
 <tr><td></td><td class="printindex-index-entry"><a 
href="formatting.xhtml#index-titlepage-index-entry-within-deffn">index entry 
within deffn</a></td><td class="printindex-index-section"><a 
href="formatting.xhtml">Top section</a></td></tr>
 <tr><td></td><td class="printindex-index-entry"><a 
href="#index-index-entry-within-deffn">index entry within deffn</a></td><td 
class="printindex-index-section"><a href="#chapter">1 chapter</a></td></tr>
@@ -4972,10 +4978,37 @@ Invalid use of @':
 
 
 
-<p><a class="footnote" id="DOCF10" 
href="formatting_fot.xhtml#FOOT10"><sup>12</sup></a>
+<p><a class="footnote" id="DOCF10" href="#FOOT10"><sup>12</sup></a>
 </p>
 
 </div>
+<div class="footnotes-segment">
+<h4 class="footnotes-heading">Footnotes</h4>
+
+<h5 class="footnote-body-heading"><a id="FOOT1_5" href="#DOCF1_5">(5)</a></h5>
+<p>in footnote</p>
+<h5 class="footnote-body-heading"><a id="FOOT2_6" href="#DOCF2_6">(6)</a></h5>
+<p>in footnote2</p>
+<h5 class="footnote-body-heading"><a id="FOOT5" href="#DOCF5">(7)</a></h5>
+<p>in footnote</p>
+<h5 class="footnote-body-heading"><a id="FOOT6" href="#DOCF6">(8)</a></h5>
+<p>in footnote2</p>
+<h5 class="footnote-body-heading"><a id="FOOT7" href="#DOCF7">(9)</a></h5>
+<p>in footnote</p>
+<h5 class="footnote-body-heading"><a id="FOOT8" href="#DOCF8">(10)</a></h5>
+<p>in footnote2</p>
+<h5 class="footnote-body-heading"><a id="FOOT9" href="#DOCF9">(11)</a></h5>
+<p>in footnote
+<a class="index-entry-id" id="index-index-entry-in-footnote"></a>
+</p>
+<p>Blah
+</p>
+<p>Blih
+</p>
+<a class="index-entry-id" id="index-counting-entry"></a>
+<h5 class="footnote-body-heading"><a id="FOOT10" href="#DOCF10">(12)</a></h5>
+<p>in footnote</p>
+</div>
 
 
 <a href="js_licenses.xhtml" rel="jslicense"><small>JavaScript license 
information</small></a>
diff --git 
a/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/xhtml/chapter2.xhtml
 
b/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/xhtml/chapter2.xhtml
index d64a801719..4910c104f1 100644
--- 
a/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/xhtml/chapter2.xhtml
+++ 
b/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/xhtml/chapter2.xhtml
@@ -858,10 +858,15 @@ g-roupe
 <meta name="Generator" content="texi2any"/>
 <meta name="viewport" content="width=device-width,initial-scale=1"/>
 
+<link href="formatting.xhtml" rel="start" title="Top section"/>
+<link href="chapter.xhtml" rel="index" title="1 chapter"/>
+<link href="formatting.xhtml#SEC_Contents" rel="contents" title="Table of 
Contents"/>
+<link href="formatting.xhtml" rel="up" title="Top section"/>
+<link href="chapter.xhtml" rel="prev" title="1 chapter"/>
 <style type="text/css">
 <!--
 a.summary-letter-printindex {text-decoration: none}
-h1.centerchap {text-align:center}
+h2.centerchap {text-align:center}
 td.index-entry-level-1 {padding-left: 1.5em}
 td.index-entry-level-2 {padding-left: 3.0em}
 td.printindex-index-entry {vertical-align: top}
@@ -879,7 +884,7 @@ th.sections-header-printindex {text-align:left; 
padding-left: 1em}
 
 <body lang="en">
 <div class="centerchap-level-extent" id="chapter2">
-<h1 class="centerchap" id="chapter-2">chapter 2</h1>
+<h2 class="centerchap" id="chapter-2">chapter 2</h2>
 
 <div class="printindex cp-printindex">
 <table class="cp-letters-header-printindex"><tr><th>Jump to: &#160; 
</th><td><a class="summary-letter-printindex" 
href="#chapter-2_cp_symbol-1"><b>-</b></a>
@@ -949,7 +954,7 @@ th.sections-header-printindex {text-align:left; 
padding-left: 1em}
 <tr><td></td><td class="printindex-index-entry index-entry-level-1"><a 
href="chapter.xhtml#index-b_002d_002d_002db-c_002d_002d_002dc">c&#8212;c</a></td><td
 class="printindex-index-section"><a href="chapter.xhtml">1 
chapter</a></td></tr>
 <tr><td colspan="3"></td></tr>
 <tr><th id="chapter-2_cp_letter-C">C</th></tr>
-<tr><td></td><td class="printindex-index-entry"><a 
href="formatting_fot.xhtml#index-counting-entry">counting entry</a></td><td 
class="printindex-index-section"><a href="chapter.xhtml">1 chapter</a></td></tr>
+<tr><td></td><td class="printindex-index-entry"><a 
href="chapter.xhtml#index-counting-entry">counting entry</a></td><td 
class="printindex-index-section"><a href="chapter.xhtml">1 chapter</a></td></tr>
 <tr><td colspan="3"></td></tr>
 <tr><th id="chapter-2_cp_letter-D">D</th></tr>
 <tr><td></td><td class="printindex-index-entry">d&#8212;dd</td><td></td></tr>
@@ -1028,7 +1033,7 @@ th.sections-header-printindex {text-align:left; 
padding-left: 1em}
 <tr><td></td><td class="printindex-index-entry"><a 
href="chapter.xhtml#index-index-entry-between-item-and-itemx-1">index entry 
between item and itemx</a></td><td class="printindex-index-section"><a 
href="chapter.xhtml">1 chapter</a></td></tr>
 <tr><td></td><td class="printindex-index-entry"><a 
href="chapter.xhtml#index-index-entry-between-item-and-itemx-2">index entry 
between item and itemx</a></td><td class="printindex-index-section"><a 
href="chapter.xhtml">1 chapter</a></td></tr>
 <tr><td></td><td class="printindex-index-entry"><a 
href="chapter.xhtml#index-index-entry-between-item-and-itemx-3">index entry 
between item and itemx</a></td><td class="printindex-index-section"><a 
href="chapter.xhtml">1 chapter</a></td></tr>
-<tr><td></td><td class="printindex-index-entry"><a 
href="formatting_fot.xhtml#index-index-entry-in-footnote">index entry in 
footnote</a></td><td class="printindex-index-section"><a href="chapter.xhtml">1 
chapter</a></td></tr>
+<tr><td></td><td class="printindex-index-entry"><a 
href="chapter.xhtml#index-index-entry-in-footnote">index entry in 
footnote</a></td><td class="printindex-index-section"><a href="chapter.xhtml">1 
chapter</a></td></tr>
 <tr><td></td><td class="printindex-index-entry"><a 
href="formatting.xhtml#index-copying-index-entry-within-deffn">index entry 
within deffn</a></td><td class="printindex-index-section"><a 
href="formatting.xhtml">Top section</a></td></tr>
 <tr><td></td><td class="printindex-index-entry"><a 
href="formatting.xhtml#index-titlepage-index-entry-within-deffn">index entry 
within deffn</a></td><td class="printindex-index-section"><a 
href="formatting.xhtml">Top section</a></td></tr>
 <tr><td></td><td class="printindex-index-entry"><a 
href="chapter.xhtml#index-index-entry-within-deffn">index entry within 
deffn</a></td><td class="printindex-index-section"><a href="chapter.xhtml">1 
chapter</a></td></tr>
diff --git 
a/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/xhtml/formatting.xhtml
 
b/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/xhtml/formatting.xhtml
index abd5892988..a16bc7a681 100644
--- 
a/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/xhtml/formatting.xhtml
+++ 
b/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/xhtml/formatting.xhtml
@@ -858,6 +858,10 @@ g-roupe
 <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="chapter.xhtml" rel="index" title="1 chapter"/>
+<link href="#SEC_Contents" rel="contents" title="Table of Contents"/>
+<link href="chapter.xhtml" rel="next" title="1 chapter"/>
 <style type="text/css">
 <!--
 div.center {text-align:center}
@@ -876,6 +880,7 @@ strong.def-name {font-family: monospace; font-weight: bold; 
font-size: larger}
 ul.mark-bullet {list-style-type: disc}
 ul.mark-minus {list-style-type: "\2212"}
 ul.mark-none {list-style-type: none}
+ul.toc-numbered-mark {list-style: none}
 -->
 </style>
 
@@ -1088,8 +1093,8 @@ but , ,
 <code class="code">@verb{:a  &lt; &amp; @ % &quot; --    b:}</code> <code 
class="verb">a&#160;&#160;&lt;&#160;&amp;&#160;@&#160;%&#160;&quot;&#160;--&#160;&#160;&#160;&#160;b</code>
 <code class="code">@w{a a a a a a a a a a a a a a a a a a a a a a a a a a a a 
a a a a a a a}</code> 
a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a<!--
 /@w -->
 <code class="code">a@sup{h}@sub{l}</code> a<sup class="sup">h</sup><sub 
class="sub">l</sub>
-<code class="code">@footnote{in footnote}</code> <a class="footnote" 
id="DOCF3" href="formatting_fot.xhtml#FOOT3"><sup>1</sup></a>
-<code class="code">@footnote{in footnote2}</code> <a class="footnote" 
id="DOCF4" href="formatting_fot.xhtml#FOOT4"><sup>2</sup></a>
+<code class="code">@footnote{in footnote}</code> <a class="footnote" 
id="DOCF3" href="#FOOT3"><sup>1</sup></a>
+<code class="code">@footnote{in footnote2}</code> <a class="footnote" 
id="DOCF4" href="#FOOT4"><sup>2</sup></a>
 </p>
 <p><code class="code">@sp 2</code><br/>
 </p><br/>
@@ -1805,13 +1810,13 @@ html ''
 
 
 
-<h1 class="majorheading" id="majorheading">majorheading</h1>
+<h2 class="majorheading" id="majorheading">majorheading</h2>
 
-<h1 class="chapheading" id="chapheading">chapheading</h1>
+<h2 class="chapheading" id="chapheading">chapheading</h2>
 
-<h2 class="heading" id="heading">heading</h2>
+<h3 class="heading" id="heading">heading</h3>
 
-<h3 class="subheading" id="subheading">subheading</h3>
+<h4 class="subheading" id="subheading">subheading</h4>
 
 <h4 class="subsubheading" id="subsubheading">subsubheading</h4>
 
@@ -2181,8 +2186,8 @@ but , ,
 <code class="code">@verb{:a  &lt; &amp; @ % &quot; --    b:}</code> <code 
class="verb">a&#160;&#160;&lt;&#160;&amp;&#160;@&#160;%&#160;&quot;&#160;--&#160;&#160;&#160;&#160;b</code>
 <code class="code">@w{a a a a a a a a a a a a a a a a a a a a a a a a a a a a 
a a a a a a a}</code> 
a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a<!--
 /@w -->
 <code class="code">a@sup{h}@sub{l}</code> a<sup class="sup">h</sup><sub 
class="sub">l</sub>
-<code class="code">@footnote{in footnote}</code> <a class="footnote" 
id="DOCF1" href="formatting_fot.xhtml#FOOT1"><sup>3</sup></a>
-<code class="code">@footnote{in footnote2}</code> <a class="footnote" 
id="DOCF2" href="formatting_fot.xhtml#FOOT2"><sup>4</sup></a>
+<code class="code">@footnote{in footnote}</code> <a class="footnote" 
id="DOCF1" href="#FOOT1"><sup>3</sup></a>
+<code class="code">@footnote{in footnote2}</code> <a class="footnote" 
id="DOCF2" href="#FOOT2"><sup>4</sup></a>
 </p>
 <p><code class="code">@sp 2</code><br/>
 </p><br/>
@@ -2898,13 +2903,13 @@ html ''
 
 
 
-<h1 class="majorheading" id="majorheading-1">majorheading</h1>
+<h2 class="majorheading" id="majorheading-1">majorheading</h2>
 
-<h1 class="chapheading" id="chapheading-1">chapheading</h1>
+<h2 class="chapheading" id="chapheading-1">chapheading</h2>
 
-<h2 class="heading" id="heading-1">heading</h2>
+<h3 class="heading" id="heading-1">heading</h3>
 
-<h3 class="subheading" id="subheading-1">subheading</h3>
+<h4 class="subheading" id="subheading-1">subheading</h4>
 
 <h4 class="subsubheading" id="subsubheading-1">subsubheading</h4>
 
@@ -3082,7 +3087,50 @@ html ''
 
 
 
-<a class="node" id="Top"></a><a class="top" id="Top-section"></a>
+<a class="node" id="Top"></a><a class="top" id="Top-section"></a><div 
class="element-contents" id="SEC_Contents">
+<h2 class="contents-heading">Table of Contents</h2>
+
+<div class="contents">
+
+<ul class="toc-numbered-mark">
+  <li><a id="toc-chapter-1" href="chapter.xhtml" rel="index">1 chapter</a>
+  <ul class="toc-numbered-mark">
+    <li><a id="toc-A-section" href="s_002d_002dect_002cion.xhtml">1.1 A 
section</a>
+    <ul class="toc-numbered-mark">
+      <li><a id="toc-subsection-1" href="subsection.xhtml">1.1.1 subsection</a>
+      <ul class="toc-numbered-mark">
+        <li><a id="toc-subsubsection-_0060_0060simple_002ddouble_002d_002d-1" 
href="subsubsection-_0060_0060simple_002ddouble_002d_002d.xhtml">1.1.1.1 
subsubsection &#8220;simple-double&#8211;</a></li>
+        <li><a id="toc-three_002d_002d_002dfour_002d_002d_002d_002d_0027_0027" 
href="subsubsection-three_002d_002d_002dfour_002d_002d_002d_002d_0027_0027.xhtml">1.1.1.2
 three&#8212;four&#8212;-&#8221;</a></li>
+      </ul></li>
+    </ul></li>
+  </ul></li>
+  <li><a id="toc-chapter-2" href="chapter2.xhtml" rel="index">chapter 
2</a></li>
+</ul>
+</div>
+</div>
+<div class="element-shortcontents" id="SEC_Shortcontents">
+<h2 class="shortcontents-heading">Short Table of Contents</h2>
+
+<div class="shortcontents">
+<ul class="toc-numbered-mark">
+<li><a id="stoc-chapter-1" href="#toc-chapter-1" rel="index">1 chapter</a></li>
+<li><a id="stoc-chapter-2" href="#toc-chapter-2" rel="index">chapter 2</a></li>
+</ul>
+</div>
+</div>
+<div class="footnotes-segment">
+<h4 class="footnotes-heading">Footnotes</h4>
+
+<h5 class="footnote-body-heading"><a id="FOOT3" href="#DOCF3">(1)</a></h5>
+<p>in footnote</p>
+<h5 class="footnote-body-heading"><a id="FOOT4" href="#DOCF4">(2)</a></h5>
+<p>in footnote2</p>
+<h5 class="footnote-body-heading"><a id="FOOT1" href="#DOCF1">(3)</a></h5>
+<p>in footnote</p>
+<h5 class="footnote-body-heading"><a id="FOOT2" href="#DOCF2">(4)</a></h5>
+<p>in footnote2</p>
+</div>
+
 
 <a href="js_licenses.xhtml" rel="jslicense"><small>JavaScript license 
information</small></a>
 </body>
diff --git 
a/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/xhtml/formatting_abt.xhtml
 
b/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/xhtml/formatting_abt.xhtml
deleted file mode 100644
index 4aefd917fb..0000000000
--- 
a/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/xhtml/formatting_abt.xhtml
+++ /dev/null
@@ -1,980 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html>
-<html xmlns="http://www.w3.org/1999/xhtml";>
-<!-- Created by texinfo, http://www.gnu.org/software/texinfo/ -->
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
-<!-- In copying
-
-<
->
-"
-&
-'
-`
-
-"simple-double-three-four-"
-
-code: ``simple-double-three-four-'' 
-
-asis: "simple-double-three-four-" 
-
-strong: "simple-double-three-four-" 
-
-kbd: ``simple-double-three-four-'' 
-
-
-``simple-double-three-four-''
-
-
-
-@"u ü (ü)
-@"{U} Ü (Ü) 
-@~n ñ (ñ)
-@^a â (â)
-@'e é (é)
-@=o ō (ō)
-@`i ì (ì)
-@'{e} é (é)
-@'{@dotless{i}} í (í)
-@dotless{i} ı (ı)
-@dotless{j} ȷ (ȷ)
-@H{a} a̋
-@dotaccent{a} ȧ (ȧ)
-@ringaccent{a} å (å)
-@tieaccent{a} a͡
-@u{a} ă (ă)
-@ubaraccent{a} a̲
-@udotaccent{a} ạ (ạ)
-@v{a} ǎ (ǎ)
-@,c ç (ç)
-@,{c} ç (ç)
-@ogonek{a} ą (ą)
-
-@`{@=E} Ḕ
-@l{} ł
-@,{@'C} Ḉ
-@,c@"u çü 
-
-
-@H{-a} -a̋
-@dotaccent{-a} -ȧ
-@ringaccent{-a} -å
-@tieaccent{-a} -a͡
-@u{-a} -ă
-@ubaraccent{-a} -a̲
-@udotaccent{-a} -ạ
-@v{-a} -ǎ
-@,{-c} -ç
-@ogonek{-a} -ą
-
-@U{0075} 0075
-
-@* 
-
-@ followed by a space
- 
-@ followed by a tab
- 
-@ followed by a new line
- @- 
-@: 
-@! !
-@? ?
-@. .
-@& &
-@@ @
-@} }
-@{ {
-@/ 
-
-foo vs. bar. 
-colon :And something else.
-semi colon ;.
-And ? ?.
-Now ! !@
-but , ,
-
-@ampchar & (&)
-@atchar @ (@)
-@backslashchar \ (\)
-@hashchar # (#)
-@lbracechar { ({)
-@rbracechar } (})
-
-@TeX TeX
-@LaTeX LaTeX
-@bullet • (•)
-@copyright © (©)
-@dots … (…)
-@enddots ...
-@equiv ≡ (≡)
-@error error→
-@expansion ↦ (↦)
-@minus − (−)
-@point ⋆ (⋆)
-@print ⊣ (⊣)
-@result ⇒ (⇒)
-@today a sunny day
-
-@aa å (å)
-@AA Å (Å)
-@ae æ (æ)
-@oe œ (œ)
-@AE Æ (Æ)
-@OE Œ (Œ)
-@o ø (ø)
-@O Ø (Ø)
-@ss ß (ß)
-@l ł (ł)
-@L Ł (Ł)
-@DH Ð (Ð)
-@TH Þ (Þ)
-@dh ð (ð)
-@th þ (þ)
-
-@exclamdown ¡ (¡)
-@questiondown ¿ (¿)
-@pounds £ (£)
-@registeredsymbol ® (®)
-@ordf ª (ª)
-@ordm º (º)
-@comma , (,)
-@quotedblleft “ (“)
-@quotedblright ” (”)
-@quoteleft ‘ (‘)
-@quoteright ’ (’)
-@quotedblbase „ („)
-@quotesinglbase ‚ (‚)
-@guillemetleft « («)
-@guillemetright » (»)
-@guillemotleft « («)
-@guillemotright » (»)
-@guilsinglleft ‹ (‹)
-@guilsinglright › (›)
-
-@textdegree ° (°)
-@euro € (€)
-@arrow → (→)
-@leq ≤ (≤)
-@geq ≥ (≥)
-@tie a b
-
-@acronym{-a,an accronym} -a (an accronym)
-@acronym{-a} -a
-@abbr{@'E-. @comma{}A., @'Etude Autonome } É-. ,A. (Étude Autonome)
-@abbr{@'E-. @comma{}A.} É-. ,A.
-@asis{-a} -a
-@b{-a} -a
-@cite{-a} -a
-@code{-a} -a
-@command{-a} -a
-@dfn{-a} -a
-@dmn{-a} -a
-@email{-a,-b} -b
-@email{,-b} -b
-@email{-a} -a
-@emph{-a} -a
-@env{-a} -a
-@file{-a} -a
-@i{-a} -a
-@kbd{-a} -a
-@key{-a} -a
-@math{-a {\frac{1}{2}} @minus{}} -a {\frac{1}{2}} −
-@option{-a} -a
-@r{-a} -a
-@samp{-a} -a
-@sc{-a} -A
-@strong{-a} -a
-@t{-a} -a
-@sansserif{-a} -a
-@slanted{-a} -a
-@titlefont{-a} -a
-@indicateurl{-a} -a
-@uref{-a,-b} -a (-b)
-@uref{-a} -a
-@uref{,-b}  (-b)
-@uref{-a,-b,-c} -c
-@uref{,-b,-c} -c
-@uref{-a,,-c} -c
-@uref{,,-c} -c
-@url{-a,-b} -a (-b)
-@url{-a,} -a
-@url{,-b}  (-b)
-@var{-a} -a
-@verb{:-a:} -a
-@verb{:a  < & @ % " -    b:} a  < & @ % " -    b
-@w{a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a} a a 
a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a
-a@sup{h}@sub{l} ahl
-@footnote{in footnote} 
-@footnote{in footnote2} 
-
-@sp 2
-
-
-
-@page
-
-
-
-need 1002
-
-@clicksequence{click @click{} A} click → A
-After clickstyle ⇒
-@clicksequence{click @click{} A} click ⇒ A
-
-
-disp-laymath
-f(x) = {1 \over \sigma \sqrt{2\pi}}e-{1 \over 2}\left({x-\mu \over 
\sigma}\right)^2
-
-``simple-double-three-four-'' aa
-``simple-double-three-four-''
-
-
-ı ȷ
-ł ç
-a̲ ạ ą ahl
-
-       ! @ } { 
-a sunny day
-
-→
-0075
-• © … ... ≡
-error→ ↦ − ⊣ ⇒
-Å æ œ Æ Œ ø Ø ß ł Ł Ð
-Þ ð þ ¡ ¿ £
-ª º , 
-
-“ ” 
-‘ ’ „ ‚ «
-» « » ‹
-› € → ≤ ≥
-
-b i r SC sansserif slanted
-
-default kbdinputstyle
-vtable i-tem default kbdinputstyle
-in example default kbdinputstyle
-vtable i-tem in example default kbdinputstyle
-
-code kbdinputstyle
-vtable i-tem code kbdinputstyle
-in example code kbdinputstyle
-vtable i-tem in example code kbdinputstyle
-
-example kbdinputstyle
-vtable i-tem example kbdinputstyle
-in example example kbdinputstyle
-vtable i-tem in example example kbdinputstyle
-
-distinct kbdinputstyle
-vtable i-tem distinct kbdinputstyle
-in example distinct kbdinputstyle
-vtable i-tem in example distinct kbdinputstyle
-
-A quot-ation
-
-Note
-A Note
-
-note
-A note
-
-Caution
-Caution
-
-Important
-Important
-
-Tip
-a Tip
-
-Warning
-a Warning.
-
-something é TeX
-The something é TeX is here.
-
-@ at the end of line  
-A @ at the end of the @quotation line.
-
-something, other thing
-something, other thing
-
-Note, the note
-Note, the note
-
-
-Empty
-
-
-
-aaa quotation author
-quotation
-
-indent in quotation
-
-exdented quotation line   and dash - in quotation
-
-Not exdented followed by exdented
-exdented quotation line
-
-exdented quotation line
-Followed by not exdented 
-
-quotation1
-in exdented protected eol  
-following
-in exdented a @* 
- and following
-after exdented
-
-A small quot-ation
-
-Note
-A small Note
-
-something, other thing
-something, other thing
-
-i-temize
-
-i-tem +
-
-b-ullet
-
-minu-s
-
-e-mph item
-
-i-tem 1
-i-tem 2
-
-with w a-b
-with w c-d
-
-line w a-b
-line with w c-d
-
-1. e-numerate
-
-3. first third
-4. second third
-
-a. e-numerate
-
-c. first c
-d. second c
-
-mu-ltitable headitem another tab
-mu-ltitable item multitable tab
-mu-ltitable item 2 multitable tab 2
-lone mu-ltitable item
-
-truc bidule
-
-e-xample  some
-   text
-
-example one arg
-
-example two args
-
-example three args
-
-example four args
-
-example five args
-
-The something é TeX is here.
-
-A @ at the end of the @example line.
-
-example with empty args
-
-example with empty and non empty args mix
-
-Exam-ple
-
-Other li-ne
-not exdented
-
-exdented  and dash - in example
-Not exdented one
-exdented two
-Not exdented two
-
-Example   Hoho.
-Nested Other line
-exdented nested other line
-
-s-mallexample
-
-@noindent after smallexample.
-$ wget 
'http://savannah.gnu.org/cgi-bin/viewcvs/config/config/config.guess?rev=HEAD&content-type=text/plain'
-$ wget 
'http://savannah.gnu.org/cgi-bin/viewcvs/config/config/config.sub?rev=HEAD&content-type=text/plain'
-Less recent versions are also present.
-
-d-isplay
-
-s-malldisplay
-
-l-isp
-
-s-malllisp
-
-f-ormat
-
-s-mallformat
-
-c-ategory: d-effn_name a-rguments...
-d-effn
-
-cate-gory: de-ffn_name ar-guments    more args 
- even more so
-def-fn
- 
-fset: i a g
-cmde: truc 
-Command: log trap 
-Command: log trap1 
-Command: log trap2 
-cmde: id ule truc
-cmde2: id i ule truc
-: 
-: machin
-: bidule machin
-truc: machin
-truc: 
-truc: followed by a comment
-: 
-truc: a b c d e f g h i
-truc: deffnx before end deffn
-
-
-empty: deffn
-
-empty: deffn with deffnx
-empty: deffnx
-
-fset: i a g
-cmde: truc 
-text in def item for second def item
-
-
-c-ategory: d-efvr_name
-d-efvr
-
-c-ategory: n-ame a-rguments...
-d-effn
-
-c-ategory: n-ame
-d-effn no arg
-
-c-ategory: t-ype d-eftypefn_name a-rguments...
-d-eftypefn
-
-c-ategory: t-ype d-eftypefn_name
-d-eftypefn no arg
-
-c-ategory on c-lass: t-ype d-eftypeop_name a-rguments...
-d-eftypeop
-
-c-ategory on c-lass: t-ype d-eftypeop_name
-d-eftypeop no arg
-
-c-ategory: t-ype d-eftypevr_name
-d-eftypevr
-
-c-ategory of c-lass: d-efcv_name
-d-efcv
-
-c-ategory of c-lass: d-efcv_name a-rguments...
-d-efcv with arguments
-
-c-ategory of c-lass: t-ype d-eftypecv_name
-d-eftypecv
-
-c-ategory of c-lass: t-ype d-eftypecv_name a-rguments...
-d-eftypecv with arguments
-
-c-ategory on c-lass: d-efop_name a-rguments...
-d-efop
-
-c-ategory on c-lass: d-efop_name
-d-efop no arg
-
-c-ategory: d-eftp_name a-ttributes...
-d-eftp
-
-Function: d-efun_name a-rguments...
-d-efun
-
-Macro: d-efmac_name a-rguments...
-d-efmac
-
-Special Form: d-efspec_name a-rguments...
-d-efspec
-
-Variable: d-efvar_name
-d-efvar
-
-Variable: d-efvar_name arg-var arg-var1
-d-efvar with args
-
-User Option: d-efopt_name
-d-efopt
-
-Function: t-ype d-eftypefun_name a-rguments...
-d-eftypefun
-
-Variable: t-ype d-eftypevar_name
-d-eftypevar
-
-Instance Variable of c-lass: d-efivar_name
-d-efivar
-
-Instance Variable of c-lass: t-ype d-eftypeivar_name
-d-eftypeivar
-
-Method on c-lass: d-efmethod_name a-rguments...
-d-efmethod
-
-Method on c-lass: t-ype d-eftypemethod_name a-rguments...
-d-eftypemethod
-
-
-Function: data-type2 name2 arguments2...
-aaa2
-
-c-ategory2: t-ype2 d-eftypefn_name2
-d-eftypefn no arg2
-
-c-ategory2 on c-lass2: t-ype2 d-eftypeop_name2 a-rguments2...
-d-eftypeop2
-
-c-ategory2 on c-lass2: t-ype2 d-eftypeop_name2
-d-eftypeop no arg2
-
-c-ategory2 of c-lass2: t-ype2 d-eftypecv_name2
-d-eftypecv2
-
-c-ategory2 of c-lass2: t-ype2 d-eftypecv_name2 a-rguments2...
-d-eftypecv with arguments2
-
-fun2: arg2
-fff2
-
-
-@xref{c-hapter@@, cross r-ef name@@, t-itle@@, file n-ame@@, ma-nual@@} 
c-hapter@.
-@ref{chapter, cross ref name, title, file name, manual} chapter
-@pxref{chapter, cross ref name, title, file name, manual} chapter
-@inforef{chapter, cross ref name, file name} chapter
-
-@ref{chapter} chapter
-@xref{chapter} chapter.
-@pxref{chapter} chapter
-@ref{s-ect@comma{}ion} s-ect,ion
-
-@ref{s-ect@comma{}ion, a @comma{} in cross
-ref, a comma@comma{} in title, a comma@comma{} in file, a @comma{} in manual 
name }
-s-ect,ion
-
-@ref{chapter,cross ref name} chapter
-@ref{chapter,,title} chapter
-@ref{chapter,,,file name} chapter
-@ref{chapter,,,,manual} chapter
-@ref{chapter,cross ref name,title,} chapter
-@ref{chapter,cross ref name,,file name} chapter
-@ref{chapter,cross ref name,,,manual} chapter
-@ref{chapter,cross ref name,title,file name} chapter
-@ref{chapter,cross ref name,title,,manual} chapter
-@ref{chapter,cross ref name,title, file name, manual} chapter
-@ref{chapter,,title,file name} chapter
-@ref{chapter,,title,,manual} chapter
-@ref{chapter,,title, file name, manual} chapter
-@ref{chapter,,,file name,manual} chapter
-
-
-@ref{(pman)anode,cross ref name} (pman)anode
-@ref{(pman)anode,,title} (pman)anode
-@ref{(pman)anode,,,file name} (pman)anode
-@ref{(pman)anode,,,,manual} (pman)anode
-@ref{(pman)anode,cross ref name,title,} (pman)anode
-@ref{(pman)anode,cross ref name,,file name} (pman)anode
-@ref{(pman)anode,cross ref name,,,manual} (pman)anode
-@ref{(pman)anode,cross ref name,title,file name} (pman)anode
-@ref{(pman)anode,cross ref name,title,,manual} (pman)anode
-@ref{(pman)anode,cross ref name,title, file name, manual} (pman)anode
-@ref{(pman)anode,,title,file name} (pman)anode
-@ref{(pman)anode,,title,,manual} (pman)anode
-@ref{(pman)anode,,title, file name, manual} (pman)anode
-@ref{(pman)anode,,,file name,manual} (pman)anode
-
-
-@inforef{chapter, cross ref name, file name} chapter
-@inforef{chapter} chapter
-@inforef{chapter, cross ref name} chapter
-@inforef{chapter,,file name} chapter
-@inforef{node, cross ref name, file name} node
-@inforef{node} node
-@inforef{node, cross ref name} node
-@inforef{node,,file name} node
-@inforef{chapter, cross ref name, file name, spurious arg} chapter
-
-@inforef{s-ect@comma{}ion, a @comma{} in cross
-ref, a comma@comma{} in file}
-s-ect,ion
-
-chapter.
-
-ext
-chapter
-
-a-strong
-l-ine
-
-a-asis
-b
-l-ine
-
-a
-b
-l-ine
-
-Title
-a-code
-Value-table code
-
-Title
-a-samp
-a2-samp
-Value-table samp
-
-c-artouche
-
-Tit-le of box
-With title c-artouche
-
-f-lushleft
-more text
-
-f-lushright
-more text
-
-ce-ntered line
-
-r-raggedright
-more text
-
-\input texinfo @c -*-texinfo-*-
-
-@c this file is used in tests in @verbatiminclude but not converted
-
-@setfilename simplest.info
-
-@node Top
-
-This is a very simple texi manual @  <>.
-
-@bye
-
-in verbatim ''
-
-
-html ''
-
-
-
-
-majorheading
-************
-
-chapheading
-***********
-
-heading
-=======
-
-subheading
--
-
-subsubheading
-.............
-
-
-@acronym{-a,an accronym @comma{} @enddots{}} -a (an accronym , ...)
-@abbr{@'E-. @comma{}A., @'Etude-@comma{} @b{Autonome} } É-. ,A. (Étude-, 
Autonome)
-@abbr{@'E-. @comma{}A.} É-. ,A.
-
-@math{-a@minus{} {\frac{1}{2}}} -a− {\frac{1}{2}}
-
-
-
-
-Somehow invalid use of @,:
-
-@, ̧
-
-@,@"u ̧ü
-
-Invalid use of @':
-
-@' ́
-
-@'@"u ́ü
-
-@| 
-
-@dotless{truc} truc
-@dotless{ij} ij
-@dotless{-a} -a
-@dotless{a} a
-
-@U, without braces @U{}, with empty arg 
-@U{z}, with non-hex arg z
-@U{abc}, with <4 hex digits abc
-@U{FFFFFFFFFFFFFF}, value much too large FFFFFFFFFFFFFF
-@U{110000}, value just beyond Unicode 110000
-
-@TeX, but without brace TeX
-@# #
-
-@w{-a} -a
-
-@image{,1-xt} 
-@image{,,2-xt} 
-@image{,,,3-xt} 
-
-@image{f-ile,aze,,a-lt} f-ile
-@image{f-ile,,,alt@verb{:jk _" %}} f-ile
-
-@image{f-ile} f-ile
-@image{f-ile,,,alt} f-ile
-@image{f-ile,,,,.e-d-xt} f-ile
-@image{f-ile,l-i} f-ile
-@image{f-ile,,l-e} f-ile
-@image{f-ile,aze,az,alt,.e-xt} f-ile
-@image{f-ile,aze,az,alt, f-ile
-@image{@file{f-ile}@@@.,aze,az,alt,@file{.file ext} e-xt@} f-ile@.
-
-@image{f-ile,aze,az,@verb{:jk _" %@:} @b{in b "},e-xt} f-ile
-@image{file@verb{:jk _" %@:},,,alt@verb{:jk _" %@:}} filejk _" %@
-
-
-author
-
-ü Ü ñ â é ō ì é Ḕ
-Ḉ Ḉ a̋ ȧ å a͡
-ă ǎ
- ? .
-
-TeX LaTeX ⋆ å ® ° 
-
-t 
-
-e-mph item
-
-e-mph item
-
-i-tem 1
-i-tem 2
-
-without brace w a-b
-without brace w c-d
-
-a
-l-ine
-
-a-missing style formatting
-l-ine
-
-a
-b
-l-ine
-
-fun: 
-truc: machin bidule chose and
-truc: machin bidule chose and  after
-truc: machin bidule chose and 
-truc: machin bidule chose and and after
-truc: followed by a comment
-Various deff lines
-truc: after a deff item
-
-fsetinv: invalid a g
-id i ule: 
-aaa: 
-: 
-truc: 
-
-g-roupe
-
-@ref{node} node
-
-@ref{,cross ref name} 
-@ref{,,title} 
-@ref{,,,file name} 
-@ref{,,,,manual} 
-@ref{node,cross ref name} node
-@ref{node,,title} node
-@ref{node,,,file name} node
-@ref{node,,,,manual} node
-@ref{node,cross ref name,title,} node
-@ref{node,cross ref name,,file name} node
-@ref{node,cross ref name,,,manual} node
-@ref{node,cross ref name,title,file name} node
-@ref{node,cross ref name,title,,manual} node
-@ref{node,cross ref name,title, file name, manual} node
-@ref{node,,title,file name} node
-@ref{node,,title,,manual} node
-@ref{chapter,,title, file name, manual} chapter
-@ref{node,,title, file name, manual} node
-@ref{node,,,file name,manual} node
-@ref{,cross ref name,title,} 
-@ref{,cross ref name,,file name} 
-@ref{,cross ref name,,,manual} 
-@ref{,cross ref name,title,file name} 
-@ref{,cross ref name,title,,manual} 
-@ref{,cross ref name,title, file name, manual} 
-@ref{,,title,file name} 
-@ref{,,title,,manual} 
-@ref{,,title, file name, manual} 
-@ref{,,,file name,manual} 
-
-@inforef{,cross ref name } 
-@inforef{,,file name} 
-@inforef{,cross ref name, file name} 
-@inforef{} 
-
- -->
-<title>About This Document (title &#8211;a)</title>
-
-<meta name="description" content="About This Document (title &#8211;a)"/>
-<meta name="keywords" content="About This Document (title &#8211;a)"/>
-<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">
-<!--
-td.button-direction-about {text-align:center}
-td.name-direction-about {text-align:center}
--->
-</style>
-
-<link rel="stylesheet" type="text/css" href="../js/info.css"/>
-<script src="../js/modernizr.js" type="text/javascript"></script>
-<script src="../js/info.js" type="text/javascript"></script>
-</head>
-
-<body lang="en">
-<div class="element-about" id="SEC_About">
-<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> &#160; </td>
-  </tr>
-  <tr>
-    <td class="button-direction-about"> [Contents] </td>
-    <td class="name-direction-about">Contents</td>
-    <td>Table of contents</td>
-    <td> &#160; </td>
-  </tr>
-  <tr>
-    <td class="button-direction-about"> [Index] </td>
-    <td class="name-direction-about">Index</td>
-    <td>Index</td>
-    <td> &#160; </td>
-  </tr>
-  <tr>
-    <td class="button-direction-about"> [ ? ] </td>
-    <td class="name-direction-about">About</td>
-    <td>About (help)</td>
-    <td> &#160; </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 &#160; &#160;
-            <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>
-
-<a href="js_licenses.xhtml" rel="jslicense"><small>JavaScript license 
information</small></a>
-</body>
-</html>
diff --git 
a/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/xhtml/formatting_fot.xhtml
 
b/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/xhtml/formatting_fot.xhtml
deleted file mode 100644
index ac26790d6e..0000000000
--- 
a/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/xhtml/formatting_fot.xhtml
+++ /dev/null
@@ -1,906 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html>
-<html xmlns="http://www.w3.org/1999/xhtml";>
-<!-- Created by texinfo, http://www.gnu.org/software/texinfo/ -->
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
-<!-- In copying
-
-<
->
-"
-&
-'
-`
-
-"simple-double-three-four-"
-
-code: ``simple-double-three-four-'' 
-
-asis: "simple-double-three-four-" 
-
-strong: "simple-double-three-four-" 
-
-kbd: ``simple-double-three-four-'' 
-
-
-``simple-double-three-four-''
-
-
-
-@"u ü (ü)
-@"{U} Ü (Ü) 
-@~n ñ (ñ)
-@^a â (â)
-@'e é (é)
-@=o ō (ō)
-@`i ì (ì)
-@'{e} é (é)
-@'{@dotless{i}} í (í)
-@dotless{i} ı (ı)
-@dotless{j} ȷ (ȷ)
-@H{a} a̋
-@dotaccent{a} ȧ (ȧ)
-@ringaccent{a} å (å)
-@tieaccent{a} a͡
-@u{a} ă (ă)
-@ubaraccent{a} a̲
-@udotaccent{a} ạ (ạ)
-@v{a} ǎ (ǎ)
-@,c ç (ç)
-@,{c} ç (ç)
-@ogonek{a} ą (ą)
-
-@`{@=E} Ḕ
-@l{} ł
-@,{@'C} Ḉ
-@,c@"u çü 
-
-
-@H{-a} -a̋
-@dotaccent{-a} -ȧ
-@ringaccent{-a} -å
-@tieaccent{-a} -a͡
-@u{-a} -ă
-@ubaraccent{-a} -a̲
-@udotaccent{-a} -ạ
-@v{-a} -ǎ
-@,{-c} -ç
-@ogonek{-a} -ą
-
-@U{0075} 0075
-
-@* 
-
-@ followed by a space
- 
-@ followed by a tab
- 
-@ followed by a new line
- @- 
-@: 
-@! !
-@? ?
-@. .
-@& &
-@@ @
-@} }
-@{ {
-@/ 
-
-foo vs. bar. 
-colon :And something else.
-semi colon ;.
-And ? ?.
-Now ! !@
-but , ,
-
-@ampchar & (&)
-@atchar @ (@)
-@backslashchar \ (\)
-@hashchar # (#)
-@lbracechar { ({)
-@rbracechar } (})
-
-@TeX TeX
-@LaTeX LaTeX
-@bullet • (•)
-@copyright © (©)
-@dots … (…)
-@enddots ...
-@equiv ≡ (≡)
-@error error→
-@expansion ↦ (↦)
-@minus − (−)
-@point ⋆ (⋆)
-@print ⊣ (⊣)
-@result ⇒ (⇒)
-@today a sunny day
-
-@aa å (å)
-@AA Å (Å)
-@ae æ (æ)
-@oe œ (œ)
-@AE Æ (Æ)
-@OE Œ (Œ)
-@o ø (ø)
-@O Ø (Ø)
-@ss ß (ß)
-@l ł (ł)
-@L Ł (Ł)
-@DH Ð (Ð)
-@TH Þ (Þ)
-@dh ð (ð)
-@th þ (þ)
-
-@exclamdown ¡ (¡)
-@questiondown ¿ (¿)
-@pounds £ (£)
-@registeredsymbol ® (®)
-@ordf ª (ª)
-@ordm º (º)
-@comma , (,)
-@quotedblleft “ (“)
-@quotedblright ” (”)
-@quoteleft ‘ (‘)
-@quoteright ’ (’)
-@quotedblbase „ („)
-@quotesinglbase ‚ (‚)
-@guillemetleft « («)
-@guillemetright » (»)
-@guillemotleft « («)
-@guillemotright » (»)
-@guilsinglleft ‹ (‹)
-@guilsinglright › (›)
-
-@textdegree ° (°)
-@euro € (€)
-@arrow → (→)
-@leq ≤ (≤)
-@geq ≥ (≥)
-@tie a b
-
-@acronym{-a,an accronym} -a (an accronym)
-@acronym{-a} -a
-@abbr{@'E-. @comma{}A., @'Etude Autonome } É-. ,A. (Étude Autonome)
-@abbr{@'E-. @comma{}A.} É-. ,A.
-@asis{-a} -a
-@b{-a} -a
-@cite{-a} -a
-@code{-a} -a
-@command{-a} -a
-@dfn{-a} -a
-@dmn{-a} -a
-@email{-a,-b} -b
-@email{,-b} -b
-@email{-a} -a
-@emph{-a} -a
-@env{-a} -a
-@file{-a} -a
-@i{-a} -a
-@kbd{-a} -a
-@key{-a} -a
-@math{-a {\frac{1}{2}} @minus{}} -a {\frac{1}{2}} −
-@option{-a} -a
-@r{-a} -a
-@samp{-a} -a
-@sc{-a} -A
-@strong{-a} -a
-@t{-a} -a
-@sansserif{-a} -a
-@slanted{-a} -a
-@titlefont{-a} -a
-@indicateurl{-a} -a
-@uref{-a,-b} -a (-b)
-@uref{-a} -a
-@uref{,-b}  (-b)
-@uref{-a,-b,-c} -c
-@uref{,-b,-c} -c
-@uref{-a,,-c} -c
-@uref{,,-c} -c
-@url{-a,-b} -a (-b)
-@url{-a,} -a
-@url{,-b}  (-b)
-@var{-a} -a
-@verb{:-a:} -a
-@verb{:a  < & @ % " -    b:} a  < & @ % " -    b
-@w{a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a} a a 
a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a
-a@sup{h}@sub{l} ahl
-@footnote{in footnote} 
-@footnote{in footnote2} 
-
-@sp 2
-
-
-
-@page
-
-
-
-need 1002
-
-@clicksequence{click @click{} A} click → A
-After clickstyle ⇒
-@clicksequence{click @click{} A} click ⇒ A
-
-
-disp-laymath
-f(x) = {1 \over \sigma \sqrt{2\pi}}e-{1 \over 2}\left({x-\mu \over 
\sigma}\right)^2
-
-``simple-double-three-four-'' aa
-``simple-double-three-four-''
-
-
-ı ȷ
-ł ç
-a̲ ạ ą ahl
-
-       ! @ } { 
-a sunny day
-
-→
-0075
-• © … ... ≡
-error→ ↦ − ⊣ ⇒
-Å æ œ Æ Œ ø Ø ß ł Ł Ð
-Þ ð þ ¡ ¿ £
-ª º , 
-
-“ ” 
-‘ ’ „ ‚ «
-» « » ‹
-› € → ≤ ≥
-
-b i r SC sansserif slanted
-
-default kbdinputstyle
-vtable i-tem default kbdinputstyle
-in example default kbdinputstyle
-vtable i-tem in example default kbdinputstyle
-
-code kbdinputstyle
-vtable i-tem code kbdinputstyle
-in example code kbdinputstyle
-vtable i-tem in example code kbdinputstyle
-
-example kbdinputstyle
-vtable i-tem example kbdinputstyle
-in example example kbdinputstyle
-vtable i-tem in example example kbdinputstyle
-
-distinct kbdinputstyle
-vtable i-tem distinct kbdinputstyle
-in example distinct kbdinputstyle
-vtable i-tem in example distinct kbdinputstyle
-
-A quot-ation
-
-Note
-A Note
-
-note
-A note
-
-Caution
-Caution
-
-Important
-Important
-
-Tip
-a Tip
-
-Warning
-a Warning.
-
-something é TeX
-The something é TeX is here.
-
-@ at the end of line  
-A @ at the end of the @quotation line.
-
-something, other thing
-something, other thing
-
-Note, the note
-Note, the note
-
-
-Empty
-
-
-
-aaa quotation author
-quotation
-
-indent in quotation
-
-exdented quotation line   and dash - in quotation
-
-Not exdented followed by exdented
-exdented quotation line
-
-exdented quotation line
-Followed by not exdented 
-
-quotation1
-in exdented protected eol  
-following
-in exdented a @* 
- and following
-after exdented
-
-A small quot-ation
-
-Note
-A small Note
-
-something, other thing
-something, other thing
-
-i-temize
-
-i-tem +
-
-b-ullet
-
-minu-s
-
-e-mph item
-
-i-tem 1
-i-tem 2
-
-with w a-b
-with w c-d
-
-line w a-b
-line with w c-d
-
-1. e-numerate
-
-3. first third
-4. second third
-
-a. e-numerate
-
-c. first c
-d. second c
-
-mu-ltitable headitem another tab
-mu-ltitable item multitable tab
-mu-ltitable item 2 multitable tab 2
-lone mu-ltitable item
-
-truc bidule
-
-e-xample  some
-   text
-
-example one arg
-
-example two args
-
-example three args
-
-example four args
-
-example five args
-
-The something é TeX is here.
-
-A @ at the end of the @example line.
-
-example with empty args
-
-example with empty and non empty args mix
-
-Exam-ple
-
-Other li-ne
-not exdented
-
-exdented  and dash - in example
-Not exdented one
-exdented two
-Not exdented two
-
-Example   Hoho.
-Nested Other line
-exdented nested other line
-
-s-mallexample
-
-@noindent after smallexample.
-$ wget 
'http://savannah.gnu.org/cgi-bin/viewcvs/config/config/config.guess?rev=HEAD&content-type=text/plain'
-$ wget 
'http://savannah.gnu.org/cgi-bin/viewcvs/config/config/config.sub?rev=HEAD&content-type=text/plain'
-Less recent versions are also present.
-
-d-isplay
-
-s-malldisplay
-
-l-isp
-
-s-malllisp
-
-f-ormat
-
-s-mallformat
-
-c-ategory: d-effn_name a-rguments...
-d-effn
-
-cate-gory: de-ffn_name ar-guments    more args 
- even more so
-def-fn
- 
-fset: i a g
-cmde: truc 
-Command: log trap 
-Command: log trap1 
-Command: log trap2 
-cmde: id ule truc
-cmde2: id i ule truc
-: 
-: machin
-: bidule machin
-truc: machin
-truc: 
-truc: followed by a comment
-: 
-truc: a b c d e f g h i
-truc: deffnx before end deffn
-
-
-empty: deffn
-
-empty: deffn with deffnx
-empty: deffnx
-
-fset: i a g
-cmde: truc 
-text in def item for second def item
-
-
-c-ategory: d-efvr_name
-d-efvr
-
-c-ategory: n-ame a-rguments...
-d-effn
-
-c-ategory: n-ame
-d-effn no arg
-
-c-ategory: t-ype d-eftypefn_name a-rguments...
-d-eftypefn
-
-c-ategory: t-ype d-eftypefn_name
-d-eftypefn no arg
-
-c-ategory on c-lass: t-ype d-eftypeop_name a-rguments...
-d-eftypeop
-
-c-ategory on c-lass: t-ype d-eftypeop_name
-d-eftypeop no arg
-
-c-ategory: t-ype d-eftypevr_name
-d-eftypevr
-
-c-ategory of c-lass: d-efcv_name
-d-efcv
-
-c-ategory of c-lass: d-efcv_name a-rguments...
-d-efcv with arguments
-
-c-ategory of c-lass: t-ype d-eftypecv_name
-d-eftypecv
-
-c-ategory of c-lass: t-ype d-eftypecv_name a-rguments...
-d-eftypecv with arguments
-
-c-ategory on c-lass: d-efop_name a-rguments...
-d-efop
-
-c-ategory on c-lass: d-efop_name
-d-efop no arg
-
-c-ategory: d-eftp_name a-ttributes...
-d-eftp
-
-Function: d-efun_name a-rguments...
-d-efun
-
-Macro: d-efmac_name a-rguments...
-d-efmac
-
-Special Form: d-efspec_name a-rguments...
-d-efspec
-
-Variable: d-efvar_name
-d-efvar
-
-Variable: d-efvar_name arg-var arg-var1
-d-efvar with args
-
-User Option: d-efopt_name
-d-efopt
-
-Function: t-ype d-eftypefun_name a-rguments...
-d-eftypefun
-
-Variable: t-ype d-eftypevar_name
-d-eftypevar
-
-Instance Variable of c-lass: d-efivar_name
-d-efivar
-
-Instance Variable of c-lass: t-ype d-eftypeivar_name
-d-eftypeivar
-
-Method on c-lass: d-efmethod_name a-rguments...
-d-efmethod
-
-Method on c-lass: t-ype d-eftypemethod_name a-rguments...
-d-eftypemethod
-
-
-Function: data-type2 name2 arguments2...
-aaa2
-
-c-ategory2: t-ype2 d-eftypefn_name2
-d-eftypefn no arg2
-
-c-ategory2 on c-lass2: t-ype2 d-eftypeop_name2 a-rguments2...
-d-eftypeop2
-
-c-ategory2 on c-lass2: t-ype2 d-eftypeop_name2
-d-eftypeop no arg2
-
-c-ategory2 of c-lass2: t-ype2 d-eftypecv_name2
-d-eftypecv2
-
-c-ategory2 of c-lass2: t-ype2 d-eftypecv_name2 a-rguments2...
-d-eftypecv with arguments2
-
-fun2: arg2
-fff2
-
-
-@xref{c-hapter@@, cross r-ef name@@, t-itle@@, file n-ame@@, ma-nual@@} 
c-hapter@.
-@ref{chapter, cross ref name, title, file name, manual} chapter
-@pxref{chapter, cross ref name, title, file name, manual} chapter
-@inforef{chapter, cross ref name, file name} chapter
-
-@ref{chapter} chapter
-@xref{chapter} chapter.
-@pxref{chapter} chapter
-@ref{s-ect@comma{}ion} s-ect,ion
-
-@ref{s-ect@comma{}ion, a @comma{} in cross
-ref, a comma@comma{} in title, a comma@comma{} in file, a @comma{} in manual 
name }
-s-ect,ion
-
-@ref{chapter,cross ref name} chapter
-@ref{chapter,,title} chapter
-@ref{chapter,,,file name} chapter
-@ref{chapter,,,,manual} chapter
-@ref{chapter,cross ref name,title,} chapter
-@ref{chapter,cross ref name,,file name} chapter
-@ref{chapter,cross ref name,,,manual} chapter
-@ref{chapter,cross ref name,title,file name} chapter
-@ref{chapter,cross ref name,title,,manual} chapter
-@ref{chapter,cross ref name,title, file name, manual} chapter
-@ref{chapter,,title,file name} chapter
-@ref{chapter,,title,,manual} chapter
-@ref{chapter,,title, file name, manual} chapter
-@ref{chapter,,,file name,manual} chapter
-
-
-@ref{(pman)anode,cross ref name} (pman)anode
-@ref{(pman)anode,,title} (pman)anode
-@ref{(pman)anode,,,file name} (pman)anode
-@ref{(pman)anode,,,,manual} (pman)anode
-@ref{(pman)anode,cross ref name,title,} (pman)anode
-@ref{(pman)anode,cross ref name,,file name} (pman)anode
-@ref{(pman)anode,cross ref name,,,manual} (pman)anode
-@ref{(pman)anode,cross ref name,title,file name} (pman)anode
-@ref{(pman)anode,cross ref name,title,,manual} (pman)anode
-@ref{(pman)anode,cross ref name,title, file name, manual} (pman)anode
-@ref{(pman)anode,,title,file name} (pman)anode
-@ref{(pman)anode,,title,,manual} (pman)anode
-@ref{(pman)anode,,title, file name, manual} (pman)anode
-@ref{(pman)anode,,,file name,manual} (pman)anode
-
-
-@inforef{chapter, cross ref name, file name} chapter
-@inforef{chapter} chapter
-@inforef{chapter, cross ref name} chapter
-@inforef{chapter,,file name} chapter
-@inforef{node, cross ref name, file name} node
-@inforef{node} node
-@inforef{node, cross ref name} node
-@inforef{node,,file name} node
-@inforef{chapter, cross ref name, file name, spurious arg} chapter
-
-@inforef{s-ect@comma{}ion, a @comma{} in cross
-ref, a comma@comma{} in file}
-s-ect,ion
-
-chapter.
-
-ext
-chapter
-
-a-strong
-l-ine
-
-a-asis
-b
-l-ine
-
-a
-b
-l-ine
-
-Title
-a-code
-Value-table code
-
-Title
-a-samp
-a2-samp
-Value-table samp
-
-c-artouche
-
-Tit-le of box
-With title c-artouche
-
-f-lushleft
-more text
-
-f-lushright
-more text
-
-ce-ntered line
-
-r-raggedright
-more text
-
-\input texinfo @c -*-texinfo-*-
-
-@c this file is used in tests in @verbatiminclude but not converted
-
-@setfilename simplest.info
-
-@node Top
-
-This is a very simple texi manual @  <>.
-
-@bye
-
-in verbatim ''
-
-
-html ''
-
-
-
-
-majorheading
-************
-
-chapheading
-***********
-
-heading
-=======
-
-subheading
--
-
-subsubheading
-.............
-
-
-@acronym{-a,an accronym @comma{} @enddots{}} -a (an accronym , ...)
-@abbr{@'E-. @comma{}A., @'Etude-@comma{} @b{Autonome} } É-. ,A. (Étude-, 
Autonome)
-@abbr{@'E-. @comma{}A.} É-. ,A.
-
-@math{-a@minus{} {\frac{1}{2}}} -a− {\frac{1}{2}}
-
-
-
-
-Somehow invalid use of @,:
-
-@, ̧
-
-@,@"u ̧ü
-
-Invalid use of @':
-
-@' ́
-
-@'@"u ́ü
-
-@| 
-
-@dotless{truc} truc
-@dotless{ij} ij
-@dotless{-a} -a
-@dotless{a} a
-
-@U, without braces @U{}, with empty arg 
-@U{z}, with non-hex arg z
-@U{abc}, with <4 hex digits abc
-@U{FFFFFFFFFFFFFF}, value much too large FFFFFFFFFFFFFF
-@U{110000}, value just beyond Unicode 110000
-
-@TeX, but without brace TeX
-@# #
-
-@w{-a} -a
-
-@image{,1-xt} 
-@image{,,2-xt} 
-@image{,,,3-xt} 
-
-@image{f-ile,aze,,a-lt} f-ile
-@image{f-ile,,,alt@verb{:jk _" %}} f-ile
-
-@image{f-ile} f-ile
-@image{f-ile,,,alt} f-ile
-@image{f-ile,,,,.e-d-xt} f-ile
-@image{f-ile,l-i} f-ile
-@image{f-ile,,l-e} f-ile
-@image{f-ile,aze,az,alt,.e-xt} f-ile
-@image{f-ile,aze,az,alt, f-ile
-@image{@file{f-ile}@@@.,aze,az,alt,@file{.file ext} e-xt@} f-ile@.
-
-@image{f-ile,aze,az,@verb{:jk _" %@:} @b{in b "},e-xt} f-ile
-@image{file@verb{:jk _" %@:},,,alt@verb{:jk _" %@:}} filejk _" %@
-
-
-author
-
-ü Ü ñ â é ō ì é Ḕ
-Ḉ Ḉ a̋ ȧ å a͡
-ă ǎ
- ? .
-
-TeX LaTeX ⋆ å ® ° 
-
-t 
-
-e-mph item
-
-e-mph item
-
-i-tem 1
-i-tem 2
-
-without brace w a-b
-without brace w c-d
-
-a
-l-ine
-
-a-missing style formatting
-l-ine
-
-a
-b
-l-ine
-
-fun: 
-truc: machin bidule chose and
-truc: machin bidule chose and  after
-truc: machin bidule chose and 
-truc: machin bidule chose and and after
-truc: followed by a comment
-Various deff lines
-truc: after a deff item
-
-fsetinv: invalid a g
-id i ule: 
-aaa: 
-: 
-truc: 
-
-g-roupe
-
-@ref{node} node
-
-@ref{,cross ref name} 
-@ref{,,title} 
-@ref{,,,file name} 
-@ref{,,,,manual} 
-@ref{node,cross ref name} node
-@ref{node,,title} node
-@ref{node,,,file name} node
-@ref{node,,,,manual} node
-@ref{node,cross ref name,title,} node
-@ref{node,cross ref name,,file name} node
-@ref{node,cross ref name,,,manual} node
-@ref{node,cross ref name,title,file name} node
-@ref{node,cross ref name,title,,manual} node
-@ref{node,cross ref name,title, file name, manual} node
-@ref{node,,title,file name} node
-@ref{node,,title,,manual} node
-@ref{chapter,,title, file name, manual} chapter
-@ref{node,,title, file name, manual} node
-@ref{node,,,file name,manual} node
-@ref{,cross ref name,title,} 
-@ref{,cross ref name,,file name} 
-@ref{,cross ref name,,,manual} 
-@ref{,cross ref name,title,file name} 
-@ref{,cross ref name,title,,manual} 
-@ref{,cross ref name,title, file name, manual} 
-@ref{,,title,file name} 
-@ref{,,title,,manual} 
-@ref{,,title, file name, manual} 
-@ref{,,,file name,manual} 
-
-@inforef{,cross ref name } 
-@inforef{,,file name} 
-@inforef{,cross ref name, file name} 
-@inforef{} 
-
- -->
-<title>Footnotes (title &#8211;a)</title>
-
-<meta name="description" content="Footnotes (title &#8211;a)"/>
-<meta name="keywords" content="Footnotes (title &#8211;a)"/>
-<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"/>
-
-
-<link rel="stylesheet" type="text/css" href="../js/info.css"/>
-<script src="../js/modernizr.js" type="text/javascript"></script>
-<script src="../js/info.js" type="text/javascript"></script>
-</head>
-
-<body lang="en">
-<div class="element-footnotes" id="SEC_Footnotes">
-<h1 class="footnotes-heading">Footnotes</h1>
-
-<h5 class="footnote-body-heading"><a id="FOOT3" 
href="formatting.xhtml#DOCF3">(1)</a></h5>
-<p>in footnote</p>
-<h5 class="footnote-body-heading"><a id="FOOT4" 
href="formatting.xhtml#DOCF4">(2)</a></h5>
-<p>in footnote2</p>
-<h5 class="footnote-body-heading"><a id="FOOT1" 
href="formatting.xhtml#DOCF1">(3)</a></h5>
-<p>in footnote</p>
-<h5 class="footnote-body-heading"><a id="FOOT2" 
href="formatting.xhtml#DOCF2">(4)</a></h5>
-<p>in footnote2</p>
-<h5 class="footnote-body-heading"><a id="FOOT1_5" 
href="chapter.xhtml#DOCF1_5">(5)</a></h5>
-<p>in footnote</p>
-<h5 class="footnote-body-heading"><a id="FOOT2_6" 
href="chapter.xhtml#DOCF2_6">(6)</a></h5>
-<p>in footnote2</p>
-<h5 class="footnote-body-heading"><a id="FOOT5" 
href="chapter.xhtml#DOCF5">(7)</a></h5>
-<p>in footnote</p>
-<h5 class="footnote-body-heading"><a id="FOOT6" 
href="chapter.xhtml#DOCF6">(8)</a></h5>
-<p>in footnote2</p>
-<h5 class="footnote-body-heading"><a id="FOOT7" 
href="chapter.xhtml#DOCF7">(9)</a></h5>
-<p>in footnote</p>
-<h5 class="footnote-body-heading"><a id="FOOT8" 
href="chapter.xhtml#DOCF8">(10)</a></h5>
-<p>in footnote2</p>
-<h5 class="footnote-body-heading"><a id="FOOT9" 
href="chapter.xhtml#DOCF9">(11)</a></h5>
-<p>in footnote
-<a class="index-entry-id" id="index-index-entry-in-footnote"></a>
-</p>
-<p>Blah
-</p>
-<p>Blih
-</p>
-<a class="index-entry-id" id="index-counting-entry"></a>
-<h5 class="footnote-body-heading"><a id="FOOT10" 
href="chapter.xhtml#DOCF10">(12)</a></h5>
-<p>in footnote</p>
-</div>
-
-<a href="js_licenses.xhtml" rel="jslicense"><small>JavaScript license 
information</small></a>
-</body>
-</html>
diff --git 
a/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/xhtml/formatting_ovr.xhtml
 
b/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/xhtml/formatting_ovr.xhtml
deleted file mode 100644
index 0a297fa703..0000000000
--- 
a/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/xhtml/formatting_ovr.xhtml
+++ /dev/null
@@ -1,886 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html>
-<html xmlns="http://www.w3.org/1999/xhtml";>
-<!-- Created by texinfo, http://www.gnu.org/software/texinfo/ -->
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
-<!-- In copying
-
-<
->
-"
-&
-'
-`
-
-"simple-double-three-four-"
-
-code: ``simple-double-three-four-'' 
-
-asis: "simple-double-three-four-" 
-
-strong: "simple-double-three-four-" 
-
-kbd: ``simple-double-three-four-'' 
-
-
-``simple-double-three-four-''
-
-
-
-@"u ü (ü)
-@"{U} Ü (Ü) 
-@~n ñ (ñ)
-@^a â (â)
-@'e é (é)
-@=o ō (ō)
-@`i ì (ì)
-@'{e} é (é)
-@'{@dotless{i}} í (í)
-@dotless{i} ı (ı)
-@dotless{j} ȷ (ȷ)
-@H{a} a̋
-@dotaccent{a} ȧ (ȧ)
-@ringaccent{a} å (å)
-@tieaccent{a} a͡
-@u{a} ă (ă)
-@ubaraccent{a} a̲
-@udotaccent{a} ạ (ạ)
-@v{a} ǎ (ǎ)
-@,c ç (ç)
-@,{c} ç (ç)
-@ogonek{a} ą (ą)
-
-@`{@=E} Ḕ
-@l{} ł
-@,{@'C} Ḉ
-@,c@"u çü 
-
-
-@H{-a} -a̋
-@dotaccent{-a} -ȧ
-@ringaccent{-a} -å
-@tieaccent{-a} -a͡
-@u{-a} -ă
-@ubaraccent{-a} -a̲
-@udotaccent{-a} -ạ
-@v{-a} -ǎ
-@,{-c} -ç
-@ogonek{-a} -ą
-
-@U{0075} 0075
-
-@* 
-
-@ followed by a space
- 
-@ followed by a tab
- 
-@ followed by a new line
- @- 
-@: 
-@! !
-@? ?
-@. .
-@& &
-@@ @
-@} }
-@{ {
-@/ 
-
-foo vs. bar. 
-colon :And something else.
-semi colon ;.
-And ? ?.
-Now ! !@
-but , ,
-
-@ampchar & (&)
-@atchar @ (@)
-@backslashchar \ (\)
-@hashchar # (#)
-@lbracechar { ({)
-@rbracechar } (})
-
-@TeX TeX
-@LaTeX LaTeX
-@bullet • (•)
-@copyright © (©)
-@dots … (…)
-@enddots ...
-@equiv ≡ (≡)
-@error error→
-@expansion ↦ (↦)
-@minus − (−)
-@point ⋆ (⋆)
-@print ⊣ (⊣)
-@result ⇒ (⇒)
-@today a sunny day
-
-@aa å (å)
-@AA Å (Å)
-@ae æ (æ)
-@oe œ (œ)
-@AE Æ (Æ)
-@OE Œ (Œ)
-@o ø (ø)
-@O Ø (Ø)
-@ss ß (ß)
-@l ł (ł)
-@L Ł (Ł)
-@DH Ð (Ð)
-@TH Þ (Þ)
-@dh ð (ð)
-@th þ (þ)
-
-@exclamdown ¡ (¡)
-@questiondown ¿ (¿)
-@pounds £ (£)
-@registeredsymbol ® (®)
-@ordf ª (ª)
-@ordm º (º)
-@comma , (,)
-@quotedblleft “ (“)
-@quotedblright ” (”)
-@quoteleft ‘ (‘)
-@quoteright ’ (’)
-@quotedblbase „ („)
-@quotesinglbase ‚ (‚)
-@guillemetleft « («)
-@guillemetright » (»)
-@guillemotleft « («)
-@guillemotright » (»)
-@guilsinglleft ‹ (‹)
-@guilsinglright › (›)
-
-@textdegree ° (°)
-@euro € (€)
-@arrow → (→)
-@leq ≤ (≤)
-@geq ≥ (≥)
-@tie a b
-
-@acronym{-a,an accronym} -a (an accronym)
-@acronym{-a} -a
-@abbr{@'E-. @comma{}A., @'Etude Autonome } É-. ,A. (Étude Autonome)
-@abbr{@'E-. @comma{}A.} É-. ,A.
-@asis{-a} -a
-@b{-a} -a
-@cite{-a} -a
-@code{-a} -a
-@command{-a} -a
-@dfn{-a} -a
-@dmn{-a} -a
-@email{-a,-b} -b
-@email{,-b} -b
-@email{-a} -a
-@emph{-a} -a
-@env{-a} -a
-@file{-a} -a
-@i{-a} -a
-@kbd{-a} -a
-@key{-a} -a
-@math{-a {\frac{1}{2}} @minus{}} -a {\frac{1}{2}} −
-@option{-a} -a
-@r{-a} -a
-@samp{-a} -a
-@sc{-a} -A
-@strong{-a} -a
-@t{-a} -a
-@sansserif{-a} -a
-@slanted{-a} -a
-@titlefont{-a} -a
-@indicateurl{-a} -a
-@uref{-a,-b} -a (-b)
-@uref{-a} -a
-@uref{,-b}  (-b)
-@uref{-a,-b,-c} -c
-@uref{,-b,-c} -c
-@uref{-a,,-c} -c
-@uref{,,-c} -c
-@url{-a,-b} -a (-b)
-@url{-a,} -a
-@url{,-b}  (-b)
-@var{-a} -a
-@verb{:-a:} -a
-@verb{:a  < & @ % " -    b:} a  < & @ % " -    b
-@w{a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a} a a 
a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a
-a@sup{h}@sub{l} ahl
-@footnote{in footnote} 
-@footnote{in footnote2} 
-
-@sp 2
-
-
-
-@page
-
-
-
-need 1002
-
-@clicksequence{click @click{} A} click → A
-After clickstyle ⇒
-@clicksequence{click @click{} A} click ⇒ A
-
-
-disp-laymath
-f(x) = {1 \over \sigma \sqrt{2\pi}}e-{1 \over 2}\left({x-\mu \over 
\sigma}\right)^2
-
-``simple-double-three-four-'' aa
-``simple-double-three-four-''
-
-
-ı ȷ
-ł ç
-a̲ ạ ą ahl
-
-       ! @ } { 
-a sunny day
-
-→
-0075
-• © … ... ≡
-error→ ↦ − ⊣ ⇒
-Å æ œ Æ Œ ø Ø ß ł Ł Ð
-Þ ð þ ¡ ¿ £
-ª º , 
-
-“ ” 
-‘ ’ „ ‚ «
-» « » ‹
-› € → ≤ ≥
-
-b i r SC sansserif slanted
-
-default kbdinputstyle
-vtable i-tem default kbdinputstyle
-in example default kbdinputstyle
-vtable i-tem in example default kbdinputstyle
-
-code kbdinputstyle
-vtable i-tem code kbdinputstyle
-in example code kbdinputstyle
-vtable i-tem in example code kbdinputstyle
-
-example kbdinputstyle
-vtable i-tem example kbdinputstyle
-in example example kbdinputstyle
-vtable i-tem in example example kbdinputstyle
-
-distinct kbdinputstyle
-vtable i-tem distinct kbdinputstyle
-in example distinct kbdinputstyle
-vtable i-tem in example distinct kbdinputstyle
-
-A quot-ation
-
-Note
-A Note
-
-note
-A note
-
-Caution
-Caution
-
-Important
-Important
-
-Tip
-a Tip
-
-Warning
-a Warning.
-
-something é TeX
-The something é TeX is here.
-
-@ at the end of line  
-A @ at the end of the @quotation line.
-
-something, other thing
-something, other thing
-
-Note, the note
-Note, the note
-
-
-Empty
-
-
-
-aaa quotation author
-quotation
-
-indent in quotation
-
-exdented quotation line   and dash - in quotation
-
-Not exdented followed by exdented
-exdented quotation line
-
-exdented quotation line
-Followed by not exdented 
-
-quotation1
-in exdented protected eol  
-following
-in exdented a @* 
- and following
-after exdented
-
-A small quot-ation
-
-Note
-A small Note
-
-something, other thing
-something, other thing
-
-i-temize
-
-i-tem +
-
-b-ullet
-
-minu-s
-
-e-mph item
-
-i-tem 1
-i-tem 2
-
-with w a-b
-with w c-d
-
-line w a-b
-line with w c-d
-
-1. e-numerate
-
-3. first third
-4. second third
-
-a. e-numerate
-
-c. first c
-d. second c
-
-mu-ltitable headitem another tab
-mu-ltitable item multitable tab
-mu-ltitable item 2 multitable tab 2
-lone mu-ltitable item
-
-truc bidule
-
-e-xample  some
-   text
-
-example one arg
-
-example two args
-
-example three args
-
-example four args
-
-example five args
-
-The something é TeX is here.
-
-A @ at the end of the @example line.
-
-example with empty args
-
-example with empty and non empty args mix
-
-Exam-ple
-
-Other li-ne
-not exdented
-
-exdented  and dash - in example
-Not exdented one
-exdented two
-Not exdented two
-
-Example   Hoho.
-Nested Other line
-exdented nested other line
-
-s-mallexample
-
-@noindent after smallexample.
-$ wget 
'http://savannah.gnu.org/cgi-bin/viewcvs/config/config/config.guess?rev=HEAD&content-type=text/plain'
-$ wget 
'http://savannah.gnu.org/cgi-bin/viewcvs/config/config/config.sub?rev=HEAD&content-type=text/plain'
-Less recent versions are also present.
-
-d-isplay
-
-s-malldisplay
-
-l-isp
-
-s-malllisp
-
-f-ormat
-
-s-mallformat
-
-c-ategory: d-effn_name a-rguments...
-d-effn
-
-cate-gory: de-ffn_name ar-guments    more args 
- even more so
-def-fn
- 
-fset: i a g
-cmde: truc 
-Command: log trap 
-Command: log trap1 
-Command: log trap2 
-cmde: id ule truc
-cmde2: id i ule truc
-: 
-: machin
-: bidule machin
-truc: machin
-truc: 
-truc: followed by a comment
-: 
-truc: a b c d e f g h i
-truc: deffnx before end deffn
-
-
-empty: deffn
-
-empty: deffn with deffnx
-empty: deffnx
-
-fset: i a g
-cmde: truc 
-text in def item for second def item
-
-
-c-ategory: d-efvr_name
-d-efvr
-
-c-ategory: n-ame a-rguments...
-d-effn
-
-c-ategory: n-ame
-d-effn no arg
-
-c-ategory: t-ype d-eftypefn_name a-rguments...
-d-eftypefn
-
-c-ategory: t-ype d-eftypefn_name
-d-eftypefn no arg
-
-c-ategory on c-lass: t-ype d-eftypeop_name a-rguments...
-d-eftypeop
-
-c-ategory on c-lass: t-ype d-eftypeop_name
-d-eftypeop no arg
-
-c-ategory: t-ype d-eftypevr_name
-d-eftypevr
-
-c-ategory of c-lass: d-efcv_name
-d-efcv
-
-c-ategory of c-lass: d-efcv_name a-rguments...
-d-efcv with arguments
-
-c-ategory of c-lass: t-ype d-eftypecv_name
-d-eftypecv
-
-c-ategory of c-lass: t-ype d-eftypecv_name a-rguments...
-d-eftypecv with arguments
-
-c-ategory on c-lass: d-efop_name a-rguments...
-d-efop
-
-c-ategory on c-lass: d-efop_name
-d-efop no arg
-
-c-ategory: d-eftp_name a-ttributes...
-d-eftp
-
-Function: d-efun_name a-rguments...
-d-efun
-
-Macro: d-efmac_name a-rguments...
-d-efmac
-
-Special Form: d-efspec_name a-rguments...
-d-efspec
-
-Variable: d-efvar_name
-d-efvar
-
-Variable: d-efvar_name arg-var arg-var1
-d-efvar with args
-
-User Option: d-efopt_name
-d-efopt
-
-Function: t-ype d-eftypefun_name a-rguments...
-d-eftypefun
-
-Variable: t-ype d-eftypevar_name
-d-eftypevar
-
-Instance Variable of c-lass: d-efivar_name
-d-efivar
-
-Instance Variable of c-lass: t-ype d-eftypeivar_name
-d-eftypeivar
-
-Method on c-lass: d-efmethod_name a-rguments...
-d-efmethod
-
-Method on c-lass: t-ype d-eftypemethod_name a-rguments...
-d-eftypemethod
-
-
-Function: data-type2 name2 arguments2...
-aaa2
-
-c-ategory2: t-ype2 d-eftypefn_name2
-d-eftypefn no arg2
-
-c-ategory2 on c-lass2: t-ype2 d-eftypeop_name2 a-rguments2...
-d-eftypeop2
-
-c-ategory2 on c-lass2: t-ype2 d-eftypeop_name2
-d-eftypeop no arg2
-
-c-ategory2 of c-lass2: t-ype2 d-eftypecv_name2
-d-eftypecv2
-
-c-ategory2 of c-lass2: t-ype2 d-eftypecv_name2 a-rguments2...
-d-eftypecv with arguments2
-
-fun2: arg2
-fff2
-
-
-@xref{c-hapter@@, cross r-ef name@@, t-itle@@, file n-ame@@, ma-nual@@} 
c-hapter@.
-@ref{chapter, cross ref name, title, file name, manual} chapter
-@pxref{chapter, cross ref name, title, file name, manual} chapter
-@inforef{chapter, cross ref name, file name} chapter
-
-@ref{chapter} chapter
-@xref{chapter} chapter.
-@pxref{chapter} chapter
-@ref{s-ect@comma{}ion} s-ect,ion
-
-@ref{s-ect@comma{}ion, a @comma{} in cross
-ref, a comma@comma{} in title, a comma@comma{} in file, a @comma{} in manual 
name }
-s-ect,ion
-
-@ref{chapter,cross ref name} chapter
-@ref{chapter,,title} chapter
-@ref{chapter,,,file name} chapter
-@ref{chapter,,,,manual} chapter
-@ref{chapter,cross ref name,title,} chapter
-@ref{chapter,cross ref name,,file name} chapter
-@ref{chapter,cross ref name,,,manual} chapter
-@ref{chapter,cross ref name,title,file name} chapter
-@ref{chapter,cross ref name,title,,manual} chapter
-@ref{chapter,cross ref name,title, file name, manual} chapter
-@ref{chapter,,title,file name} chapter
-@ref{chapter,,title,,manual} chapter
-@ref{chapter,,title, file name, manual} chapter
-@ref{chapter,,,file name,manual} chapter
-
-
-@ref{(pman)anode,cross ref name} (pman)anode
-@ref{(pman)anode,,title} (pman)anode
-@ref{(pman)anode,,,file name} (pman)anode
-@ref{(pman)anode,,,,manual} (pman)anode
-@ref{(pman)anode,cross ref name,title,} (pman)anode
-@ref{(pman)anode,cross ref name,,file name} (pman)anode
-@ref{(pman)anode,cross ref name,,,manual} (pman)anode
-@ref{(pman)anode,cross ref name,title,file name} (pman)anode
-@ref{(pman)anode,cross ref name,title,,manual} (pman)anode
-@ref{(pman)anode,cross ref name,title, file name, manual} (pman)anode
-@ref{(pman)anode,,title,file name} (pman)anode
-@ref{(pman)anode,,title,,manual} (pman)anode
-@ref{(pman)anode,,title, file name, manual} (pman)anode
-@ref{(pman)anode,,,file name,manual} (pman)anode
-
-
-@inforef{chapter, cross ref name, file name} chapter
-@inforef{chapter} chapter
-@inforef{chapter, cross ref name} chapter
-@inforef{chapter,,file name} chapter
-@inforef{node, cross ref name, file name} node
-@inforef{node} node
-@inforef{node, cross ref name} node
-@inforef{node,,file name} node
-@inforef{chapter, cross ref name, file name, spurious arg} chapter
-
-@inforef{s-ect@comma{}ion, a @comma{} in cross
-ref, a comma@comma{} in file}
-s-ect,ion
-
-chapter.
-
-ext
-chapter
-
-a-strong
-l-ine
-
-a-asis
-b
-l-ine
-
-a
-b
-l-ine
-
-Title
-a-code
-Value-table code
-
-Title
-a-samp
-a2-samp
-Value-table samp
-
-c-artouche
-
-Tit-le of box
-With title c-artouche
-
-f-lushleft
-more text
-
-f-lushright
-more text
-
-ce-ntered line
-
-r-raggedright
-more text
-
-\input texinfo @c -*-texinfo-*-
-
-@c this file is used in tests in @verbatiminclude but not converted
-
-@setfilename simplest.info
-
-@node Top
-
-This is a very simple texi manual @  <>.
-
-@bye
-
-in verbatim ''
-
-
-html ''
-
-
-
-
-majorheading
-************
-
-chapheading
-***********
-
-heading
-=======
-
-subheading
--
-
-subsubheading
-.............
-
-
-@acronym{-a,an accronym @comma{} @enddots{}} -a (an accronym , ...)
-@abbr{@'E-. @comma{}A., @'Etude-@comma{} @b{Autonome} } É-. ,A. (Étude-, 
Autonome)
-@abbr{@'E-. @comma{}A.} É-. ,A.
-
-@math{-a@minus{} {\frac{1}{2}}} -a− {\frac{1}{2}}
-
-
-
-
-Somehow invalid use of @,:
-
-@, ̧
-
-@,@"u ̧ü
-
-Invalid use of @':
-
-@' ́
-
-@'@"u ́ü
-
-@| 
-
-@dotless{truc} truc
-@dotless{ij} ij
-@dotless{-a} -a
-@dotless{a} a
-
-@U, without braces @U{}, with empty arg 
-@U{z}, with non-hex arg z
-@U{abc}, with <4 hex digits abc
-@U{FFFFFFFFFFFFFF}, value much too large FFFFFFFFFFFFFF
-@U{110000}, value just beyond Unicode 110000
-
-@TeX, but without brace TeX
-@# #
-
-@w{-a} -a
-
-@image{,1-xt} 
-@image{,,2-xt} 
-@image{,,,3-xt} 
-
-@image{f-ile,aze,,a-lt} f-ile
-@image{f-ile,,,alt@verb{:jk _" %}} f-ile
-
-@image{f-ile} f-ile
-@image{f-ile,,,alt} f-ile
-@image{f-ile,,,,.e-d-xt} f-ile
-@image{f-ile,l-i} f-ile
-@image{f-ile,,l-e} f-ile
-@image{f-ile,aze,az,alt,.e-xt} f-ile
-@image{f-ile,aze,az,alt, f-ile
-@image{@file{f-ile}@@@.,aze,az,alt,@file{.file ext} e-xt@} f-ile@.
-
-@image{f-ile,aze,az,@verb{:jk _" %@:} @b{in b "},e-xt} f-ile
-@image{file@verb{:jk _" %@:},,,alt@verb{:jk _" %@:}} filejk _" %@
-
-
-author
-
-ü Ü ñ â é ō ì é Ḕ
-Ḉ Ḉ a̋ ȧ å a͡
-ă ǎ
- ? .
-
-TeX LaTeX ⋆ å ® ° 
-
-t 
-
-e-mph item
-
-e-mph item
-
-i-tem 1
-i-tem 2
-
-without brace w a-b
-without brace w c-d
-
-a
-l-ine
-
-a-missing style formatting
-l-ine
-
-a
-b
-l-ine
-
-fun: 
-truc: machin bidule chose and
-truc: machin bidule chose and  after
-truc: machin bidule chose and 
-truc: machin bidule chose and and after
-truc: followed by a comment
-Various deff lines
-truc: after a deff item
-
-fsetinv: invalid a g
-id i ule: 
-aaa: 
-: 
-truc: 
-
-g-roupe
-
-@ref{node} node
-
-@ref{,cross ref name} 
-@ref{,,title} 
-@ref{,,,file name} 
-@ref{,,,,manual} 
-@ref{node,cross ref name} node
-@ref{node,,title} node
-@ref{node,,,file name} node
-@ref{node,,,,manual} node
-@ref{node,cross ref name,title,} node
-@ref{node,cross ref name,,file name} node
-@ref{node,cross ref name,,,manual} node
-@ref{node,cross ref name,title,file name} node
-@ref{node,cross ref name,title,,manual} node
-@ref{node,cross ref name,title, file name, manual} node
-@ref{node,,title,file name} node
-@ref{node,,title,,manual} node
-@ref{chapter,,title, file name, manual} chapter
-@ref{node,,title, file name, manual} node
-@ref{node,,,file name,manual} node
-@ref{,cross ref name,title,} 
-@ref{,cross ref name,,file name} 
-@ref{,cross ref name,,,manual} 
-@ref{,cross ref name,title,file name} 
-@ref{,cross ref name,title,,manual} 
-@ref{,cross ref name,title, file name, manual} 
-@ref{,,title,file name} 
-@ref{,,title,,manual} 
-@ref{,,title, file name, manual} 
-@ref{,,,file name,manual} 
-
-@inforef{,cross ref name } 
-@inforef{,,file name} 
-@inforef{,cross ref name, file name} 
-@inforef{} 
-
- -->
-<title>Short Table of Contents (title &#8211;a)</title>
-
-<meta name="description" content="Short Table of Contents (title &#8211;a)"/>
-<meta name="keywords" content="Short Table of Contents (title &#8211;a)"/>
-<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">
-<!--
-ul.toc-numbered-mark {list-style: none}
--->
-</style>
-
-<link rel="stylesheet" type="text/css" href="../js/info.css"/>
-<script src="../js/modernizr.js" type="text/javascript"></script>
-<script src="../js/info.js" type="text/javascript"></script>
-</head>
-
-<body lang="en">
-<div class="element-shortcontents" id="SEC_Shortcontents">
-<h1 class="shortcontents-heading">Short Table of Contents</h1>
-
-<div class="shortcontents">
-<ul class="toc-numbered-mark">
-<li><a id="stoc-chapter-1" href="chapter.xhtml" rel="index">1 chapter</a></li>
-<li><a id="stoc-chapter-2" href="chapter2.xhtml" rel="index">chapter 2</a></li>
-</ul>
-</div>
-</div>
-
-<a href="js_licenses.xhtml" rel="jslicense"><small>JavaScript license 
information</small></a>
-</body>
-</html>
diff --git 
a/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/xhtml/formatting_toc.xhtml
 
b/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/xhtml/formatting_toc.xhtml
deleted file mode 100644
index c2208f8907..0000000000
--- 
a/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/xhtml/formatting_toc.xhtml
+++ /dev/null
@@ -1,897 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html>
-<html xmlns="http://www.w3.org/1999/xhtml";>
-<!-- Created by texinfo, http://www.gnu.org/software/texinfo/ -->
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
-<!-- In copying
-
-<
->
-"
-&
-'
-`
-
-"simple-double-three-four-"
-
-code: ``simple-double-three-four-'' 
-
-asis: "simple-double-three-four-" 
-
-strong: "simple-double-three-four-" 
-
-kbd: ``simple-double-three-four-'' 
-
-
-``simple-double-three-four-''
-
-
-
-@"u ü (ü)
-@"{U} Ü (Ü) 
-@~n ñ (ñ)
-@^a â (â)
-@'e é (é)
-@=o ō (ō)
-@`i ì (ì)
-@'{e} é (é)
-@'{@dotless{i}} í (í)
-@dotless{i} ı (ı)
-@dotless{j} ȷ (ȷ)
-@H{a} a̋
-@dotaccent{a} ȧ (ȧ)
-@ringaccent{a} å (å)
-@tieaccent{a} a͡
-@u{a} ă (ă)
-@ubaraccent{a} a̲
-@udotaccent{a} ạ (ạ)
-@v{a} ǎ (ǎ)
-@,c ç (ç)
-@,{c} ç (ç)
-@ogonek{a} ą (ą)
-
-@`{@=E} Ḕ
-@l{} ł
-@,{@'C} Ḉ
-@,c@"u çü 
-
-
-@H{-a} -a̋
-@dotaccent{-a} -ȧ
-@ringaccent{-a} -å
-@tieaccent{-a} -a͡
-@u{-a} -ă
-@ubaraccent{-a} -a̲
-@udotaccent{-a} -ạ
-@v{-a} -ǎ
-@,{-c} -ç
-@ogonek{-a} -ą
-
-@U{0075} 0075
-
-@* 
-
-@ followed by a space
- 
-@ followed by a tab
- 
-@ followed by a new line
- @- 
-@: 
-@! !
-@? ?
-@. .
-@& &
-@@ @
-@} }
-@{ {
-@/ 
-
-foo vs. bar. 
-colon :And something else.
-semi colon ;.
-And ? ?.
-Now ! !@
-but , ,
-
-@ampchar & (&)
-@atchar @ (@)
-@backslashchar \ (\)
-@hashchar # (#)
-@lbracechar { ({)
-@rbracechar } (})
-
-@TeX TeX
-@LaTeX LaTeX
-@bullet • (•)
-@copyright © (©)
-@dots … (…)
-@enddots ...
-@equiv ≡ (≡)
-@error error→
-@expansion ↦ (↦)
-@minus − (−)
-@point ⋆ (⋆)
-@print ⊣ (⊣)
-@result ⇒ (⇒)
-@today a sunny day
-
-@aa å (å)
-@AA Å (Å)
-@ae æ (æ)
-@oe œ (œ)
-@AE Æ (Æ)
-@OE Œ (Œ)
-@o ø (ø)
-@O Ø (Ø)
-@ss ß (ß)
-@l ł (ł)
-@L Ł (Ł)
-@DH Ð (Ð)
-@TH Þ (Þ)
-@dh ð (ð)
-@th þ (þ)
-
-@exclamdown ¡ (¡)
-@questiondown ¿ (¿)
-@pounds £ (£)
-@registeredsymbol ® (®)
-@ordf ª (ª)
-@ordm º (º)
-@comma , (,)
-@quotedblleft “ (“)
-@quotedblright ” (”)
-@quoteleft ‘ (‘)
-@quoteright ’ (’)
-@quotedblbase „ („)
-@quotesinglbase ‚ (‚)
-@guillemetleft « («)
-@guillemetright » (»)
-@guillemotleft « («)
-@guillemotright » (»)
-@guilsinglleft ‹ (‹)
-@guilsinglright › (›)
-
-@textdegree ° (°)
-@euro € (€)
-@arrow → (→)
-@leq ≤ (≤)
-@geq ≥ (≥)
-@tie a b
-
-@acronym{-a,an accronym} -a (an accronym)
-@acronym{-a} -a
-@abbr{@'E-. @comma{}A., @'Etude Autonome } É-. ,A. (Étude Autonome)
-@abbr{@'E-. @comma{}A.} É-. ,A.
-@asis{-a} -a
-@b{-a} -a
-@cite{-a} -a
-@code{-a} -a
-@command{-a} -a
-@dfn{-a} -a
-@dmn{-a} -a
-@email{-a,-b} -b
-@email{,-b} -b
-@email{-a} -a
-@emph{-a} -a
-@env{-a} -a
-@file{-a} -a
-@i{-a} -a
-@kbd{-a} -a
-@key{-a} -a
-@math{-a {\frac{1}{2}} @minus{}} -a {\frac{1}{2}} −
-@option{-a} -a
-@r{-a} -a
-@samp{-a} -a
-@sc{-a} -A
-@strong{-a} -a
-@t{-a} -a
-@sansserif{-a} -a
-@slanted{-a} -a
-@titlefont{-a} -a
-@indicateurl{-a} -a
-@uref{-a,-b} -a (-b)
-@uref{-a} -a
-@uref{,-b}  (-b)
-@uref{-a,-b,-c} -c
-@uref{,-b,-c} -c
-@uref{-a,,-c} -c
-@uref{,,-c} -c
-@url{-a,-b} -a (-b)
-@url{-a,} -a
-@url{,-b}  (-b)
-@var{-a} -a
-@verb{:-a:} -a
-@verb{:a  < & @ % " -    b:} a  < & @ % " -    b
-@w{a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a} a a 
a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a
-a@sup{h}@sub{l} ahl
-@footnote{in footnote} 
-@footnote{in footnote2} 
-
-@sp 2
-
-
-
-@page
-
-
-
-need 1002
-
-@clicksequence{click @click{} A} click → A
-After clickstyle ⇒
-@clicksequence{click @click{} A} click ⇒ A
-
-
-disp-laymath
-f(x) = {1 \over \sigma \sqrt{2\pi}}e-{1 \over 2}\left({x-\mu \over 
\sigma}\right)^2
-
-``simple-double-three-four-'' aa
-``simple-double-three-four-''
-
-
-ı ȷ
-ł ç
-a̲ ạ ą ahl
-
-       ! @ } { 
-a sunny day
-
-→
-0075
-• © … ... ≡
-error→ ↦ − ⊣ ⇒
-Å æ œ Æ Œ ø Ø ß ł Ł Ð
-Þ ð þ ¡ ¿ £
-ª º , 
-
-“ ” 
-‘ ’ „ ‚ «
-» « » ‹
-› € → ≤ ≥
-
-b i r SC sansserif slanted
-
-default kbdinputstyle
-vtable i-tem default kbdinputstyle
-in example default kbdinputstyle
-vtable i-tem in example default kbdinputstyle
-
-code kbdinputstyle
-vtable i-tem code kbdinputstyle
-in example code kbdinputstyle
-vtable i-tem in example code kbdinputstyle
-
-example kbdinputstyle
-vtable i-tem example kbdinputstyle
-in example example kbdinputstyle
-vtable i-tem in example example kbdinputstyle
-
-distinct kbdinputstyle
-vtable i-tem distinct kbdinputstyle
-in example distinct kbdinputstyle
-vtable i-tem in example distinct kbdinputstyle
-
-A quot-ation
-
-Note
-A Note
-
-note
-A note
-
-Caution
-Caution
-
-Important
-Important
-
-Tip
-a Tip
-
-Warning
-a Warning.
-
-something é TeX
-The something é TeX is here.
-
-@ at the end of line  
-A @ at the end of the @quotation line.
-
-something, other thing
-something, other thing
-
-Note, the note
-Note, the note
-
-
-Empty
-
-
-
-aaa quotation author
-quotation
-
-indent in quotation
-
-exdented quotation line   and dash - in quotation
-
-Not exdented followed by exdented
-exdented quotation line
-
-exdented quotation line
-Followed by not exdented 
-
-quotation1
-in exdented protected eol  
-following
-in exdented a @* 
- and following
-after exdented
-
-A small quot-ation
-
-Note
-A small Note
-
-something, other thing
-something, other thing
-
-i-temize
-
-i-tem +
-
-b-ullet
-
-minu-s
-
-e-mph item
-
-i-tem 1
-i-tem 2
-
-with w a-b
-with w c-d
-
-line w a-b
-line with w c-d
-
-1. e-numerate
-
-3. first third
-4. second third
-
-a. e-numerate
-
-c. first c
-d. second c
-
-mu-ltitable headitem another tab
-mu-ltitable item multitable tab
-mu-ltitable item 2 multitable tab 2
-lone mu-ltitable item
-
-truc bidule
-
-e-xample  some
-   text
-
-example one arg
-
-example two args
-
-example three args
-
-example four args
-
-example five args
-
-The something é TeX is here.
-
-A @ at the end of the @example line.
-
-example with empty args
-
-example with empty and non empty args mix
-
-Exam-ple
-
-Other li-ne
-not exdented
-
-exdented  and dash - in example
-Not exdented one
-exdented two
-Not exdented two
-
-Example   Hoho.
-Nested Other line
-exdented nested other line
-
-s-mallexample
-
-@noindent after smallexample.
-$ wget 
'http://savannah.gnu.org/cgi-bin/viewcvs/config/config/config.guess?rev=HEAD&content-type=text/plain'
-$ wget 
'http://savannah.gnu.org/cgi-bin/viewcvs/config/config/config.sub?rev=HEAD&content-type=text/plain'
-Less recent versions are also present.
-
-d-isplay
-
-s-malldisplay
-
-l-isp
-
-s-malllisp
-
-f-ormat
-
-s-mallformat
-
-c-ategory: d-effn_name a-rguments...
-d-effn
-
-cate-gory: de-ffn_name ar-guments    more args 
- even more so
-def-fn
- 
-fset: i a g
-cmde: truc 
-Command: log trap 
-Command: log trap1 
-Command: log trap2 
-cmde: id ule truc
-cmde2: id i ule truc
-: 
-: machin
-: bidule machin
-truc: machin
-truc: 
-truc: followed by a comment
-: 
-truc: a b c d e f g h i
-truc: deffnx before end deffn
-
-
-empty: deffn
-
-empty: deffn with deffnx
-empty: deffnx
-
-fset: i a g
-cmde: truc 
-text in def item for second def item
-
-
-c-ategory: d-efvr_name
-d-efvr
-
-c-ategory: n-ame a-rguments...
-d-effn
-
-c-ategory: n-ame
-d-effn no arg
-
-c-ategory: t-ype d-eftypefn_name a-rguments...
-d-eftypefn
-
-c-ategory: t-ype d-eftypefn_name
-d-eftypefn no arg
-
-c-ategory on c-lass: t-ype d-eftypeop_name a-rguments...
-d-eftypeop
-
-c-ategory on c-lass: t-ype d-eftypeop_name
-d-eftypeop no arg
-
-c-ategory: t-ype d-eftypevr_name
-d-eftypevr
-
-c-ategory of c-lass: d-efcv_name
-d-efcv
-
-c-ategory of c-lass: d-efcv_name a-rguments...
-d-efcv with arguments
-
-c-ategory of c-lass: t-ype d-eftypecv_name
-d-eftypecv
-
-c-ategory of c-lass: t-ype d-eftypecv_name a-rguments...
-d-eftypecv with arguments
-
-c-ategory on c-lass: d-efop_name a-rguments...
-d-efop
-
-c-ategory on c-lass: d-efop_name
-d-efop no arg
-
-c-ategory: d-eftp_name a-ttributes...
-d-eftp
-
-Function: d-efun_name a-rguments...
-d-efun
-
-Macro: d-efmac_name a-rguments...
-d-efmac
-
-Special Form: d-efspec_name a-rguments...
-d-efspec
-
-Variable: d-efvar_name
-d-efvar
-
-Variable: d-efvar_name arg-var arg-var1
-d-efvar with args
-
-User Option: d-efopt_name
-d-efopt
-
-Function: t-ype d-eftypefun_name a-rguments...
-d-eftypefun
-
-Variable: t-ype d-eftypevar_name
-d-eftypevar
-
-Instance Variable of c-lass: d-efivar_name
-d-efivar
-
-Instance Variable of c-lass: t-ype d-eftypeivar_name
-d-eftypeivar
-
-Method on c-lass: d-efmethod_name a-rguments...
-d-efmethod
-
-Method on c-lass: t-ype d-eftypemethod_name a-rguments...
-d-eftypemethod
-
-
-Function: data-type2 name2 arguments2...
-aaa2
-
-c-ategory2: t-ype2 d-eftypefn_name2
-d-eftypefn no arg2
-
-c-ategory2 on c-lass2: t-ype2 d-eftypeop_name2 a-rguments2...
-d-eftypeop2
-
-c-ategory2 on c-lass2: t-ype2 d-eftypeop_name2
-d-eftypeop no arg2
-
-c-ategory2 of c-lass2: t-ype2 d-eftypecv_name2
-d-eftypecv2
-
-c-ategory2 of c-lass2: t-ype2 d-eftypecv_name2 a-rguments2...
-d-eftypecv with arguments2
-
-fun2: arg2
-fff2
-
-
-@xref{c-hapter@@, cross r-ef name@@, t-itle@@, file n-ame@@, ma-nual@@} 
c-hapter@.
-@ref{chapter, cross ref name, title, file name, manual} chapter
-@pxref{chapter, cross ref name, title, file name, manual} chapter
-@inforef{chapter, cross ref name, file name} chapter
-
-@ref{chapter} chapter
-@xref{chapter} chapter.
-@pxref{chapter} chapter
-@ref{s-ect@comma{}ion} s-ect,ion
-
-@ref{s-ect@comma{}ion, a @comma{} in cross
-ref, a comma@comma{} in title, a comma@comma{} in file, a @comma{} in manual 
name }
-s-ect,ion
-
-@ref{chapter,cross ref name} chapter
-@ref{chapter,,title} chapter
-@ref{chapter,,,file name} chapter
-@ref{chapter,,,,manual} chapter
-@ref{chapter,cross ref name,title,} chapter
-@ref{chapter,cross ref name,,file name} chapter
-@ref{chapter,cross ref name,,,manual} chapter
-@ref{chapter,cross ref name,title,file name} chapter
-@ref{chapter,cross ref name,title,,manual} chapter
-@ref{chapter,cross ref name,title, file name, manual} chapter
-@ref{chapter,,title,file name} chapter
-@ref{chapter,,title,,manual} chapter
-@ref{chapter,,title, file name, manual} chapter
-@ref{chapter,,,file name,manual} chapter
-
-
-@ref{(pman)anode,cross ref name} (pman)anode
-@ref{(pman)anode,,title} (pman)anode
-@ref{(pman)anode,,,file name} (pman)anode
-@ref{(pman)anode,,,,manual} (pman)anode
-@ref{(pman)anode,cross ref name,title,} (pman)anode
-@ref{(pman)anode,cross ref name,,file name} (pman)anode
-@ref{(pman)anode,cross ref name,,,manual} (pman)anode
-@ref{(pman)anode,cross ref name,title,file name} (pman)anode
-@ref{(pman)anode,cross ref name,title,,manual} (pman)anode
-@ref{(pman)anode,cross ref name,title, file name, manual} (pman)anode
-@ref{(pman)anode,,title,file name} (pman)anode
-@ref{(pman)anode,,title,,manual} (pman)anode
-@ref{(pman)anode,,title, file name, manual} (pman)anode
-@ref{(pman)anode,,,file name,manual} (pman)anode
-
-
-@inforef{chapter, cross ref name, file name} chapter
-@inforef{chapter} chapter
-@inforef{chapter, cross ref name} chapter
-@inforef{chapter,,file name} chapter
-@inforef{node, cross ref name, file name} node
-@inforef{node} node
-@inforef{node, cross ref name} node
-@inforef{node,,file name} node
-@inforef{chapter, cross ref name, file name, spurious arg} chapter
-
-@inforef{s-ect@comma{}ion, a @comma{} in cross
-ref, a comma@comma{} in file}
-s-ect,ion
-
-chapter.
-
-ext
-chapter
-
-a-strong
-l-ine
-
-a-asis
-b
-l-ine
-
-a
-b
-l-ine
-
-Title
-a-code
-Value-table code
-
-Title
-a-samp
-a2-samp
-Value-table samp
-
-c-artouche
-
-Tit-le of box
-With title c-artouche
-
-f-lushleft
-more text
-
-f-lushright
-more text
-
-ce-ntered line
-
-r-raggedright
-more text
-
-\input texinfo @c -*-texinfo-*-
-
-@c this file is used in tests in @verbatiminclude but not converted
-
-@setfilename simplest.info
-
-@node Top
-
-This is a very simple texi manual @  <>.
-
-@bye
-
-in verbatim ''
-
-
-html ''
-
-
-
-
-majorheading
-************
-
-chapheading
-***********
-
-heading
-=======
-
-subheading
--
-
-subsubheading
-.............
-
-
-@acronym{-a,an accronym @comma{} @enddots{}} -a (an accronym , ...)
-@abbr{@'E-. @comma{}A., @'Etude-@comma{} @b{Autonome} } É-. ,A. (Étude-, 
Autonome)
-@abbr{@'E-. @comma{}A.} É-. ,A.
-
-@math{-a@minus{} {\frac{1}{2}}} -a− {\frac{1}{2}}
-
-
-
-
-Somehow invalid use of @,:
-
-@, ̧
-
-@,@"u ̧ü
-
-Invalid use of @':
-
-@' ́
-
-@'@"u ́ü
-
-@| 
-
-@dotless{truc} truc
-@dotless{ij} ij
-@dotless{-a} -a
-@dotless{a} a
-
-@U, without braces @U{}, with empty arg 
-@U{z}, with non-hex arg z
-@U{abc}, with <4 hex digits abc
-@U{FFFFFFFFFFFFFF}, value much too large FFFFFFFFFFFFFF
-@U{110000}, value just beyond Unicode 110000
-
-@TeX, but without brace TeX
-@# #
-
-@w{-a} -a
-
-@image{,1-xt} 
-@image{,,2-xt} 
-@image{,,,3-xt} 
-
-@image{f-ile,aze,,a-lt} f-ile
-@image{f-ile,,,alt@verb{:jk _" %}} f-ile
-
-@image{f-ile} f-ile
-@image{f-ile,,,alt} f-ile
-@image{f-ile,,,,.e-d-xt} f-ile
-@image{f-ile,l-i} f-ile
-@image{f-ile,,l-e} f-ile
-@image{f-ile,aze,az,alt,.e-xt} f-ile
-@image{f-ile,aze,az,alt, f-ile
-@image{@file{f-ile}@@@.,aze,az,alt,@file{.file ext} e-xt@} f-ile@.
-
-@image{f-ile,aze,az,@verb{:jk _" %@:} @b{in b "},e-xt} f-ile
-@image{file@verb{:jk _" %@:},,,alt@verb{:jk _" %@:}} filejk _" %@
-
-
-author
-
-ü Ü ñ â é ō ì é Ḕ
-Ḉ Ḉ a̋ ȧ å a͡
-ă ǎ
- ? .
-
-TeX LaTeX ⋆ å ® ° 
-
-t 
-
-e-mph item
-
-e-mph item
-
-i-tem 1
-i-tem 2
-
-without brace w a-b
-without brace w c-d
-
-a
-l-ine
-
-a-missing style formatting
-l-ine
-
-a
-b
-l-ine
-
-fun: 
-truc: machin bidule chose and
-truc: machin bidule chose and  after
-truc: machin bidule chose and 
-truc: machin bidule chose and and after
-truc: followed by a comment
-Various deff lines
-truc: after a deff item
-
-fsetinv: invalid a g
-id i ule: 
-aaa: 
-: 
-truc: 
-
-g-roupe
-
-@ref{node} node
-
-@ref{,cross ref name} 
-@ref{,,title} 
-@ref{,,,file name} 
-@ref{,,,,manual} 
-@ref{node,cross ref name} node
-@ref{node,,title} node
-@ref{node,,,file name} node
-@ref{node,,,,manual} node
-@ref{node,cross ref name,title,} node
-@ref{node,cross ref name,,file name} node
-@ref{node,cross ref name,,,manual} node
-@ref{node,cross ref name,title,file name} node
-@ref{node,cross ref name,title,,manual} node
-@ref{node,cross ref name,title, file name, manual} node
-@ref{node,,title,file name} node
-@ref{node,,title,,manual} node
-@ref{chapter,,title, file name, manual} chapter
-@ref{node,,title, file name, manual} node
-@ref{node,,,file name,manual} node
-@ref{,cross ref name,title,} 
-@ref{,cross ref name,,file name} 
-@ref{,cross ref name,,,manual} 
-@ref{,cross ref name,title,file name} 
-@ref{,cross ref name,title,,manual} 
-@ref{,cross ref name,title, file name, manual} 
-@ref{,,title,file name} 
-@ref{,,title,,manual} 
-@ref{,,title, file name, manual} 
-@ref{,,,file name,manual} 
-
-@inforef{,cross ref name } 
-@inforef{,,file name} 
-@inforef{,cross ref name, file name} 
-@inforef{} 
-
- -->
-<title>Table of Contents (title &#8211;a)</title>
-
-<meta name="description" content="Table of Contents (title &#8211;a)"/>
-<meta name="keywords" content="Table of Contents (title &#8211;a)"/>
-<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">
-<!--
-ul.toc-numbered-mark {list-style: none}
--->
-</style>
-
-<link rel="stylesheet" type="text/css" href="../js/info.css"/>
-<script src="../js/modernizr.js" type="text/javascript"></script>
-<script src="../js/info.js" type="text/javascript"></script>
-</head>
-
-<body lang="en">
-<div class="element-contents" id="SEC_Contents">
-<h1 class="contents-heading">Table of Contents</h1>
-
-<div class="contents">
-
-<ul class="toc-numbered-mark">
-  <li><a id="toc-chapter-1" href="chapter.xhtml" rel="index">1 chapter</a>
-  <ul class="toc-numbered-mark">
-    <li><a id="toc-A-section" href="s_002d_002dect_002cion.xhtml">1.1 A 
section</a>
-    <ul class="toc-numbered-mark">
-      <li><a id="toc-subsection-1" href="subsection.xhtml">1.1.1 subsection</a>
-      <ul class="toc-numbered-mark">
-        <li><a id="toc-subsubsection-_0060_0060simple_002ddouble_002d_002d-1" 
href="subsubsection-_0060_0060simple_002ddouble_002d_002d.xhtml">1.1.1.1 
subsubsection &#8220;simple-double&#8211;</a></li>
-        <li><a id="toc-three_002d_002d_002dfour_002d_002d_002d_002d_0027_0027" 
href="subsubsection-three_002d_002d_002dfour_002d_002d_002d_002d_0027_0027.xhtml">1.1.1.2
 three&#8212;four&#8212;-&#8221;</a></li>
-      </ul></li>
-    </ul></li>
-  </ul></li>
-  <li><a id="toc-chapter-2" href="chapter2.xhtml" rel="index">chapter 
2</a></li>
-</ul>
-</div>
-</div>
-
-<a href="js_licenses.xhtml" rel="jslicense"><small>JavaScript license 
information</small></a>
-</body>
-</html>
diff --git 
a/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/xhtml/s_002d_002dect_002cion.xhtml
 
b/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/xhtml/s_002d_002dect_002cion.xhtml
index 8c8688c82c..3f55de4cf9 100644
--- 
a/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/xhtml/s_002d_002dect_002cion.xhtml
+++ 
b/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/xhtml/s_002d_002dect_002cion.xhtml
@@ -858,6 +858,10 @@ g-roupe
 <meta name="Generator" content="texi2any"/>
 <meta name="viewport" content="width=device-width,initial-scale=1"/>
 
+<link href="formatting.xhtml" rel="start" title="Top section"/>
+<link href="chapter.xhtml" rel="index" title="1 chapter"/>
+<link href="formatting.xhtml#SEC_Contents" rel="contents" title="Table of 
Contents"/>
+<link href="chapter.xhtml" rel="up" title="1 chapter"/>
 
 <link rel="stylesheet" type="text/css" href="../js/info.css"/>
 <script src="../js/modernizr.js" type="text/javascript"></script>
@@ -866,7 +870,7 @@ g-roupe
 
 <body lang="en">
 <div class="section-level-extent" id="s_002d_002dect_002cion">
-<h2 class="section" id="A-section">1.1 A section</h2>
+<h3 class="section" id="A-section">1.1 A section</h3>
 
 
 </div>
diff --git 
a/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/xhtml/subsection.xhtml
 
b/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/xhtml/subsection.xhtml
index cff81978ef..5e5a068472 100644
--- 
a/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/xhtml/subsection.xhtml
+++ 
b/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/xhtml/subsection.xhtml
@@ -858,6 +858,10 @@ g-roupe
 <meta name="Generator" content="texi2any"/>
 <meta name="viewport" content="width=device-width,initial-scale=1"/>
 
+<link href="formatting.xhtml" rel="start" title="Top section"/>
+<link href="chapter.xhtml" rel="index" title="1 chapter"/>
+<link href="formatting.xhtml#SEC_Contents" rel="contents" title="Table of 
Contents"/>
+<link href="s_002d_002dect_002cion.xhtml" rel="up" title="1.1 A section"/>
 
 <link rel="stylesheet" type="text/css" href="../js/info.css"/>
 <script src="../js/modernizr.js" type="text/javascript"></script>
@@ -866,7 +870,7 @@ g-roupe
 
 <body lang="en">
 <div class="subsection-level-extent" id="subsection">
-<h3 class="subsection" id="subsection-1">1.1.1 subsection</h3>
+<h4 class="subsection" id="subsection-1">1.1.1 subsection</h4>
 
 
 <a class="anchor" id="anchor"></a>
diff --git 
a/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/xhtml/subsubsection-_0060_0060simple_002ddouble_002d_002d.xhtml
 
b/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/xhtml/subsubsection-_0060_0060simple_002ddouble_002d_002d.xhtml
index bd658353f8..f697bbd356 100644
--- 
a/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/xhtml/subsubsection-_0060_0060simple_002ddouble_002d_002d.xhtml
+++ 
b/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/xhtml/subsubsection-_0060_0060simple_002ddouble_002d_002d.xhtml
@@ -858,6 +858,11 @@ g-roupe
 <meta name="Generator" content="texi2any"/>
 <meta name="viewport" content="width=device-width,initial-scale=1"/>
 
+<link href="formatting.xhtml" rel="start" title="Top section"/>
+<link href="chapter.xhtml" rel="index" title="1 chapter"/>
+<link href="formatting.xhtml#SEC_Contents" rel="contents" title="Table of 
Contents"/>
+<link href="subsection.xhtml" rel="up" title="1.1.1 subsection"/>
+<link 
href="subsubsection-three_002d_002d_002dfour_002d_002d_002d_002d_0027_0027.xhtml"
 rel="next" title="1.1.1.2 three&#8212;four&#8212;-&#8221;"/>
 
 <link rel="stylesheet" type="text/css" href="../js/info.css"/>
 <script src="../js/modernizr.js" type="text/javascript"></script>
diff --git 
a/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/xhtml/subsubsection-three_002d_002d_002dfour_002d_002d_002d_002d_0027_0027.xhtml
 
b/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/xhtml/subsubsection-three_002d_002d_002dfour_002d_002d_002d_002d_0027_0027.xhtml
index 47dab4e43e..e49067ebd9 100644
--- 
a/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/xhtml/subsubsection-three_002d_002d_002dfour_002d_002d_002d_002d_0027_0027.xhtml
+++ 
b/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/xhtml/subsubsection-three_002d_002d_002dfour_002d_002d_002d_002d_0027_0027.xhtml
@@ -858,6 +858,11 @@ g-roupe
 <meta name="Generator" content="texi2any"/>
 <meta name="viewport" content="width=device-width,initial-scale=1"/>
 
+<link href="formatting.xhtml" rel="start" title="Top section"/>
+<link href="chapter.xhtml" rel="index" title="1 chapter"/>
+<link href="formatting.xhtml#SEC_Contents" rel="contents" title="Table of 
Contents"/>
+<link href="subsection.xhtml" rel="up" title="1.1.1 subsection"/>
+<link href="subsubsection-_0060_0060simple_002ddouble_002d_002d.xhtml" 
rel="prev" title="1.1.1.1 subsubsection &#8220;simple-double&#8211;"/>
 
 <link rel="stylesheet" type="text/css" href="../js/info.css"/>
 <script src="../js/modernizr.js" type="text/javascript"></script>
diff --git a/tp/tests/run_parser_all.sh b/tp/tests/run_parser_all.sh
index 17cd5d8939..59ec52a2a2 100755
--- a/tp/tests/run_parser_all.sh
+++ b/tp/tests/run_parser_all.sh
@@ -372,8 +372,6 @@ while read line; do
       command=$main_command
       if test -n "$format"; then
         format_option="--$format"
-      else
-        format_option="-c TEXI2HTML"
       fi
     fi
     command_run=
diff --git a/tp/tests/tex_html/math_not_closed.texi 
b/tp/tests/tex_html/math_not_closed.texi
index 916e521bf0..1cb88d4f05 100644
--- a/tp/tests/tex_html/math_not_closed.texi
+++ b/tp/tests/tex_html/math_not_closed.texi
@@ -1,7 +1,5 @@
 \input texinfo @c -*-texinfo-*-
 
-@setfilename math_no_closed.info
-
 @node Top
 
 @math{\delta + 2
diff --git a/tp/tests/tex_html/res_parser/block_EOL_tex/block_EOL.html 
b/tp/tests/tex_html/res_parser/block_EOL_tex/block_EOL.html
index f34bc22542..b2d7647605 100644
--- a/tp/tests/tex_html/res_parser/block_EOL_tex/block_EOL.html
+++ b/tp/tests/tex_html/res_parser/block_EOL_tex/block_EOL.html
@@ -12,11 +12,7 @@
 <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="#Top" rel="start" title="Top">
 
 
 </head>
@@ -26,7 +22,7 @@ span.program-in-footer {font-size: smaller}
 <div class="top-level-extent" id="Top">
 <h1 class="top" id="Test-for-end-of-lines-and-block-commands">Test for end of 
lines and block commands</h1>
 
-<h2 class="heading" id="html">html</h2>
+<h3 class="heading" id="html">html</h3>
 
 Surrounded by empty lines.
 
@@ -50,7 +46,7 @@ end commands on a line.
 </p>
 <p>Before the opening command in block
 </p>
-<h2 class="heading" id="tex">tex</h2>
+<h3 class="heading" id="tex">tex</h3>
 
 Surrounded by empty lines.
 
@@ -69,7 +65,7 @@ end commands on a line.
 <p>Before the opening command in block
 </p>
 
-<h2 class="heading" id="verbatim">verbatim</h2>
+<h3 class="heading" id="verbatim">verbatim</h3>
 
 <pre class="verbatim">Surrounded by empty lines.
 </pre>
@@ -87,11 +83,8 @@ end commands on a line.
 </p>
 <p>Before the opening command </p><pre class="verbatim">in block
 </pre>
-<hr>
 </div>
-<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/tests/tex_html/res_parser/math_not_closed/math_not_closed.2 
b/tp/tests/tex_html/res_parser/math_not_closed/math_not_closed.2
index 9040b4474d..d7ad891717 100644
--- a/tp/tests/tex_html/res_parser/math_not_closed/math_not_closed.2
+++ b/tp/tests/tex_html/res_parser/math_not_closed/math_not_closed.2
@@ -1,6 +1,6 @@
-math_not_closed.texi:8: warning: @chapter should not appear in @math
-math_not_closed.texi:7: @chapter seen before @math closing brace
-math_not_closed.texi:11: warning: @bye should not appear in @math
-math_not_closed.texi:10: @bye seen before @math closing brace
+math_not_closed.texi:6: warning: @chapter should not appear in @math
+math_not_closed.texi:5: @chapter seen before @math closing brace
+math_not_closed.texi:9: warning: @bye should not appear in @math
+math_not_closed.texi:8: @bye seen before @math closing brace
 texexpand 
 math_not_closed.texi: warning: must specify a title with a title command or 
@top
diff --git a/tp/tests/tex_html/res_parser/math_not_closed/math_not_closed.html 
b/tp/tests/tex_html/res_parser/math_not_closed/math_not_closed.html
index 481b550ec2..b1e97852e1 100644
--- a/tp/tests/tex_html/res_parser/math_not_closed/math_not_closed.html
+++ b/tp/tests/tex_html/res_parser/math_not_closed/math_not_closed.html
@@ -12,32 +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="#Top" rel="start" title="Top">
 
 
 </head>
 
 <body lang="en">
-
 <div class="chapter-level-extent" id="Top">
 
 <p><SPAN CLASS="MATH"><IMG
  STYLE="height: 2.03ex; vertical-align: -0.31ex; " SRC="math_not_closed_1.svg"
  ALT="$\delta + 2
-$"></SPAN></p><h1 class="chapter" id="Chapter">1 Chapter</h1>
+$"></SPAN></p><h2 class="chapter" id="Chapter">1 Chapter</h2>
 
 <p><SPAN CLASS="MATH"><IMG
  STYLE="height: 2.03ex; vertical-align: -0.31ex; " SRC="math_not_closed_2.svg"
  ALT="$3\delta + 2
-$"></SPAN></p><hr>
-</div>
-<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>
+$"></SPAN></p></div>
+
 
 
 </body>
diff --git a/tp/tests/tex_html/res_parser/simplest_httex/simplest.html 
b/tp/tests/tex_html/res_parser/simplest_httex/simplest.html
index ef94c0eb9a..05c5233a97 100644
--- a/tp/tests/tex_html/res_parser/simplest_httex/simplest.html
+++ b/tp/tests/tex_html/res_parser/simplest_httex/simplest.html
@@ -12,13 +12,7 @@
 <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>
+<link href="#Top" rel="start" title="Top">
 
 
 </head>
@@ -26,152 +20,19 @@ td.name-direction-about {text-align:center}
 <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="#Chapter" title="Next section in reading order"> &gt; </a>]</td>
-<td> &nbsp; </td>
-<td>[Contents]</td>
-<td>[Index]</td>
-<td>[<a href="#SEC_About" title="About (help)"> ? </a>]</td>
-</tr></table>
 <h1 class="top" id="top-section">top section</h1>
 
-<hr style="height: 6px;">
+<ul class="mini-toc">
+<li><a href="#Chapter" accesskey="1">Chapter</a></li>
+</ul>
 <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>[Index]</td>
-<td>[<a href="#SEC_About" title="About (help)"> ? </a>]</td>
-</tr></table>
-<h1 class="chapter">1 Chapter</h1>
+<h2 class="chapter">1 Chapter</h2>
 
 <p>This is a very simple texi manual &nbsp; &lt;&gt;.
 </p>
-<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>[Index]</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/tests/tex_html/res_parser/tex/tex.html 
b/tp/tests/tex_html/res_parser/tex/tex.html
index 7828163b1c..24d1a5a00e 100644
--- a/tp/tests/tex_html/res_parser/tex/tex.html
+++ b/tp/tests/tex_html/res_parser/tex/tex.html
@@ -12,11 +12,7 @@
 <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="#Top" rel="start" title="Top">
 
 
 </head>
@@ -115,11 +111,8 @@ Here some <!-- MATH
 $">
 </DIV>
 
-<hr>
 </div>
-<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/tests/tex_html/res_parser/tex_accents_httex/tex_accents.html 
b/tp/tests/tex_html/res_parser/tex_accents_httex/tex_accents.html
index 625803be43..a1f6327a5f 100644
--- a/tp/tests/tex_html/res_parser/tex_accents_httex/tex_accents.html
+++ b/tp/tests/tex_html/res_parser/tex_accents_httex/tex_accents.html
@@ -16,7 +16,6 @@
 <!--
 @import "tex_accents_tex4ht_tex.css";
 
-span.program-in-footer {font-size: smaller}
 -->
 </style>
 
@@ -25,10 +24,7 @@ span.program-in-footer {font-size: smaller}
 
 <body lang="en">
  Tét  
-<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/tests/tex_html/res_parser/tex_accents_l2h/tex_accents.html 
b/tp/tests/tex_html/res_parser/tex_accents_l2h/tex_accents.html
index 78d75baf09..47549cf843 100644
--- a/tp/tests/tex_html/res_parser/tex_accents_l2h/tex_accents.html
+++ b/tp/tests/tex_html/res_parser/tex_accents_l2h/tex_accents.html
@@ -12,21 +12,13 @@
 <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>
 
 
 </head>
 
 <body lang="en">
 Tét
-<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/tests/tex_html/res_parser/tex_complex_httex/tex_complex.html 
b/tp/tests/tex_html/res_parser/tex_complex_httex/tex_complex.html
index 703428e14c..65cc51d35b 100644
--- a/tp/tests/tex_html/res_parser/tex_complex_httex/tex_complex.html
+++ b/tp/tests/tex_html/res_parser/tex_complex_httex/tex_complex.html
@@ -16,11 +16,11 @@ Some (I-D) \varphi(t) math. -->
 <meta name="Generator" content="texi2any">
 <meta name="viewport" content="width=device-width,initial-scale=1">
 
+<link href="#Top" rel="start" title="Top">
 <style type="text/css">
 <!--
 @import "tex_complex_tex4ht_tex.css";
 
-span.program-in-footer {font-size: smaller}
 -->
 </style>
 
@@ -28,22 +28,6 @@ span.program-in-footer {font-size: smaller}
 </head>
 
 <body lang="en">
-<h1 class="title">The title</h1>
-
-
-    <div class="math-display" >
-<img 
-src="tex_complex_tex4ht_tex0x.png" 
alt="&#x2202;&#x03B7;g(&#x03B7;(t),&#x03C6;(t));
-" class="math-display" ></div>
-<!--l. 6--><p class="indent" >     
-
-<p>Some (<span 
-class="cmmi-10">I </span><span 
-class="cmsy-10">- </span><span 
-class="cmmi-10">D</span>)<span 
-class="cmmi-10">&#x03C6;</span>(<span 
-class="cmmi-10">t</span>) math.
-</p><hr>
 
 
 <div class="top-level-extent" id="Top">
@@ -80,7 +64,7 @@ class="cmmi-7">t</span></sup>.
 </p>
 <div class="footnotes-segment">
 <hr>
-<h3 class="footnotes-heading">Footnotes</h3>
+<h4 class="footnotes-heading">Footnotes</h4>
 
 <h5 class="footnote-body-heading"><a id="FOOT1" href="#DOCF1">(1)</a></h5>
 
@@ -96,11 +80,8 @@ src="tex_complex_tex4ht_tex3x.png" alt="&#x03C8;&#x02D9;"  
class="dot" ><sup><sp
 class="cmmi-7">&#x03D5;</span></sup>.
 </p>
 </div>
-<hr>
 </div>
-<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/tests/tex_html/res_parser/tex_complex_l2h/tex_complex.html 
b/tp/tests/tex_html/res_parser/tex_complex_l2h/tex_complex.html
index fc17222083..8bbefb5eb5 100644
--- a/tp/tests/tex_html/res_parser/tex_complex_l2h/tex_complex.html
+++ b/tp/tests/tex_html/res_parser/tex_complex_l2h/tex_complex.html
@@ -16,39 +16,12 @@ Some (I-D) \varphi(t) math. -->
 <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="#Top" rel="start" title="Top">
 
 
 </head>
 
 <body lang="en">
-<h1 class="title">The title</h1>
-
-<DIV CLASS="displaymath">
-<!-- MATH
- \begin{displaymath}
-\partial_{\eta} g(\eta(t),\varphi(t));
-\end{displaymath}
- -->
-
-<IMG
- STYLE="height: 2.63ex; vertical-align: -0.78ex; " SRC="tex_complex_1.svg"
- ALT="$\displaystyle \partial_{\eta} g(\eta(t),\varphi(t));
-$">
-</DIV>
-
-
-<p>Some <!-- MATH
- $(I-D) \varphi(t)$
- -->
-<SPAN CLASS="MATH"><IMG
- STYLE="height: 2.55ex; vertical-align: -0.70ex; " SRC="tex_complex_2.svg"
- ALT="$(I-D) \varphi(t)$"></SPAN> math.
-</p><hr>
 
 
 <div class="top-level-extent" id="Top">
@@ -98,7 +71,7 @@ $">
 </p>
 <div class="footnotes-segment">
 <hr>
-<h3 class="footnotes-heading">Footnotes</h3>
+<h4 class="footnotes-heading">Footnotes</h4>
 
 <h5 class="footnote-body-heading"><a id="FOOT1" href="#DOCF1">(1)</a></h5>
 <DIV CLASS="displaymath">
@@ -123,11 +96,8 @@ $">
  ALT="$h \dot \psi^\phi$"></SPAN>.
 </p>
 </div>
-<hr>
 </div>
-<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/tests/tex_html/res_parser/tex_encoded_latin1_httex/tex_encode_latin1.html 
b/tp/tests/tex_html/res_parser/tex_encoded_latin1_httex/tex_encode_latin1.html
index 05bd492642..4f220b69bc 100644
--- 
a/tp/tests/tex_html/res_parser/tex_encoded_latin1_httex/tex_encode_latin1.html
+++ 
b/tp/tests/tex_html/res_parser/tex_encoded_latin1_httex/tex_encode_latin1.html
@@ -12,13 +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="#Chapter" rel="next" title="Chapter">
 <style type="text/css">
 <!--
 @import "tex_encode_latin1_tex4ht_tex.css";
 
-span.program-in-footer {font-size: smaller}
-td.button-direction-about {text-align:center}
-td.name-direction-about {text-align:center}
 -->
 </style>
 
@@ -28,34 +27,22 @@ td.name-direction-about {text-align:center}
 <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="#Chapter" title="Next section in reading order"> &gt; </a>]</td>
-<td> &nbsp; </td>
-<td>[Contents]</td>
-<td>[Index]</td>
-<td>[<a href="#SEC_About" title="About (help)"> ? </a>]</td>
-</tr></table>
+<div class="nav-panel">
+<p>
+Next: <a href="#Chapter" accesskey="n" rel="next">chap</a> &nbsp; </p>
+</div>
 <h1 class="top" id="top">top</h1>
 
-<hr style="height: 6px;">
+<ul class="mini-toc">
+<li><a href="#Chapter" accesskey="1">chap</a></li>
+</ul>
+<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>[Index]</td>
-<td>[<a href="#SEC_About" title="About (help)"> ? </a>]</td>
-</tr></table>
-<h1 class="chapter" id="chap">1 chap</h1>
+<div class="nav-panel">
+<p>
+Previous: <a href="#Top" accesskey="p" rel="prev">top</a>, Up: <a href="#Top" 
accesskey="u" rel="up">top</a> &nbsp; </p>
+</div>
+<h2 class="chapter" id="chap">1 chap</h2>
 
 
     <div class="math-display" >
@@ -79,121 +66,9 @@ src="tex_encode_latin1_tex4ht_tex1x.png" alt="&#x222B;
 " class="math-display" ></div>
 <!--l. 14--><p class="indent" >     
 
-<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>[Index]</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/tests/tex_html/res_parser/tex_encoded_latin1_l2h/tex_encode_latin1.html 
b/tp/tests/tex_html/res_parser/tex_encoded_latin1_l2h/tex_encode_latin1.html
index 4391b69798..d77d6a7fb3 100644
--- a/tp/tests/tex_html/res_parser/tex_encoded_latin1_l2h/tex_encode_latin1.html
+++ b/tp/tests/tex_html/res_parser/tex_encoded_latin1_l2h/tex_encode_latin1.html
@@ -12,13 +12,8 @@
 <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>
+<link href="#Top" rel="start" title="Top">
+<link href="#Chapter" rel="next" title="Chapter">
 
 
 </head>
@@ -26,34 +21,22 @@ td.name-direction-about {text-align:center}
 <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="#Chapter" title="Next section in reading order"> &gt; </a>]</td>
-<td> &nbsp; </td>
-<td>[Contents]</td>
-<td>[Index]</td>
-<td>[<a href="#SEC_About" title="About (help)"> ? </a>]</td>
-</tr></table>
+<div class="nav-panel">
+<p>
+Next: <a href="#Chapter" accesskey="n" rel="next">chap</a> &nbsp; </p>
+</div>
 <h1 class="top" id="top">top</h1>
 
-<hr style="height: 6px;">
+<ul class="mini-toc">
+<li><a href="#Chapter" accesskey="1">chap</a></li>
+</ul>
+<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>[Index]</td>
-<td>[<a href="#SEC_About" title="About (help)"> ? </a>]</td>
-</tr></table>
-<h1 class="chapter" id="chap">1 chap</h1>
+<div class="nav-panel">
+<p>
+Previous: <a href="#Top" accesskey="p" rel="prev">top</a>, Up: <a href="#Top" 
accesskey="u" rel="up">top</a> &nbsp; </p>
+</div>
+<h2 class="chapter" id="chap">1 chap</h2>
 
 <DIV CLASS="displaymath">
 <!-- MATH
@@ -89,121 +72,9 @@ $">
 $">
 </DIV>
 
-<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>[Index]</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/tests/tex_html/res_parser/tex_encoded_utf8_httex/tex_encod\303\251_utf8.html"
 
"b/tp/tests/tex_html/res_parser/tex_encoded_utf8_httex/tex_encod\303\251_utf8.html"
index cea19bc99e..6d9e4f08e3 100644
--- 
"a/tp/tests/tex_html/res_parser/tex_encoded_utf8_httex/tex_encod\303\251_utf8.html"
+++ 
"b/tp/tests/tex_html/res_parser/tex_encoded_utf8_httex/tex_encod\303\251_utf8.html"
@@ -12,13 +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="#Chapter" rel="next" title="Chapter">
 <style type="text/css">
 <!--
 @import "tex_encodé_utf8_tex4ht_tex.css";
 
-span.program-in-footer {font-size: smaller}
-td.button-direction-about {text-align:center}
-td.name-direction-about {text-align:center}
 -->
 </style>
 
@@ -27,34 +26,22 @@ td.name-direction-about {text-align:center}
 
 <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="#Chapter" title="Next section in reading order"> &gt; </a>]</td>
-<td> &nbsp; </td>
-<td>[Contents]</td>
-<td>[Index]</td>
-<td>[<a href="#SEC_About" title="About (help)"> ? </a>]</td>
-</tr></table>
+<div class="nav-panel">
+<p>
+Next: <a href="#Chapter" accesskey="n" rel="next">chap</a> &nbsp; </p>
+</div>
 <h1 class="top" id="top">top</h1>
 
-<hr style="height: 6px;">
+<ul class="mini-toc">
+<li><a href="#Chapter" accesskey="1">chap</a></li>
+</ul>
+<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>[Index]</td>
-<td>[<a href="#SEC_About" title="About (help)"> ? </a>]</td>
-</tr></table>
-<h1 class="chapter" id="chap">1 chap</h1>
+<div class="nav-panel">
+<p>
+Previous: <a href="#Top" accesskey="p" rel="prev">top</a>, Up: <a href="#Top" 
accesskey="u" rel="up">top</a> &nbsp; </p>
+</div>
+<h2 class="chapter" id="chap">1 chap</h2>
 
 
     <div class="math-display" >
@@ -78,121 +65,9 @@ src="tex_encodé_utf8_tex4ht_tex1x.png" alt="&#x222B;
 " class="math-display" ></div>
 <!--l. 14--><p class="indent" >     
 
-<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>[Index]</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/tests/tex_html/res_parser/tex_encoded_utf8_l2h/tex_encod\303\251_utf8.html"
 
"b/tp/tests/tex_html/res_parser/tex_encoded_utf8_l2h/tex_encod\303\251_utf8.html"
index ce7393dbf0..c9b1dfcd3a 100644
--- 
"a/tp/tests/tex_html/res_parser/tex_encoded_utf8_l2h/tex_encod\303\251_utf8.html"
+++ 
"b/tp/tests/tex_html/res_parser/tex_encoded_utf8_l2h/tex_encod\303\251_utf8.html"
@@ -12,47 +12,30 @@
 <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>
+<link href="#Top" rel="start" title="Top">
+<link href="#Chapter" rel="next" title="Chapter">
 
 
 </head>
 
 <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="#Chapter" title="Next section in reading order"> &gt; </a>]</td>
-<td> &nbsp; </td>
-<td>[Contents]</td>
-<td>[Index]</td>
-<td>[<a href="#SEC_About" title="About (help)"> ? </a>]</td>
-</tr></table>
+<div class="nav-panel">
+<p>
+Next: <a href="#Chapter" accesskey="n" rel="next">chap</a> &nbsp; </p>
+</div>
 <h1 class="top" id="top">top</h1>
 
-<hr style="height: 6px;">
+<ul class="mini-toc">
+<li><a href="#Chapter" accesskey="1">chap</a></li>
+</ul>
+<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>[Index]</td>
-<td>[<a href="#SEC_About" title="About (help)"> ? </a>]</td>
-</tr></table>
-<h1 class="chapter" id="chap">1 chap</h1>
+<div class="nav-panel">
+<p>
+Previous: <a href="#Top" accesskey="p" rel="prev">top</a>, Up: <a href="#Top" 
accesskey="u" rel="up">top</a> &nbsp; </p>
+</div>
+<h2 class="chapter" id="chap">1 chap</h2>
 
 <DIV CLASS="displaymath">
 <!-- MATH
@@ -88,121 +71,9 @@ $">
 $">
 </DIV>
 
-<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>[Index]</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/tests/tex_html/res_parser/tex_eqalign_httex/tex_eqalign.html 
b/tp/tests/tex_html/res_parser/tex_eqalign_httex/tex_eqalign.html
index 0ed8e07c23..77b89d3e4c 100644
--- a/tp/tests/tex_html/res_parser/tex_eqalign_httex/tex_eqalign.html
+++ b/tp/tests/tex_html/res_parser/tex_eqalign_httex/tex_eqalign.html
@@ -12,11 +12,11 @@
 <meta name="Generator" content="texi2any">
 <meta name="viewport" content="width=device-width,initial-scale=1">
 
+<link href="#Top" rel="start" title="Top">
 <style type="text/css">
 <!--
 @import "tex_eqalign_tex4ht_tex.css";
 
-span.program-in-footer {font-size: smaller}
 -->
 </style>
 
@@ -48,11 +48,8 @@ src="tex_eqalign_tex4ht_tex1x.png" alt="                     
               &#x2
 " class="math-display" ></div>
 <!--l. 16--><p class="indent" >     
 
-<hr>
 </div>
-<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/tests/tex_html/res_parser/tex_eqalign_l2h/tex_eqalign.html 
b/tp/tests/tex_html/res_parser/tex_eqalign_l2h/tex_eqalign.html
index 310147d157..80c8622e2d 100644
--- a/tp/tests/tex_html/res_parser/tex_eqalign_l2h/tex_eqalign.html
+++ b/tp/tests/tex_html/res_parser/tex_eqalign_l2h/tex_eqalign.html
@@ -12,11 +12,7 @@
 <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="#Top" rel="start" title="Top">
 
 
 </head>
@@ -64,11 +60,8 @@ $">
 </DIV>
 
 
-<hr>
 </div>
-<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/tests/tex_html/res_parser/tex_gdef_httex/tex_gdef.html 
b/tp/tests/tex_html/res_parser/tex_gdef_httex/tex_gdef.html
index 6c288efe81..0fc25651c5 100644
--- a/tp/tests/tex_html/res_parser/tex_gdef_httex/tex_gdef.html
+++ b/tp/tests/tex_html/res_parser/tex_gdef_httex/tex_gdef.html
@@ -12,11 +12,11 @@
 <meta name="Generator" content="texi2any">
 <meta name="viewport" content="width=device-width,initial-scale=1">
 
+<link href="#Top" rel="start" title="Top">
 <style type="text/css">
 <!--
 @import "tex_gdef_tex4ht_tex.css";
 
-span.program-in-footer {font-size: smaller}
 -->
 </style>
 
@@ -49,11 +49,8 @@ de&#x2261;fa &#x2261; b 64
 " class="math-display" ></div>
 <!--l. 16--><p class="indent" >     
 
-<hr>
 </div>
-<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/tests/tex_html/res_parser/tex_gdef_l2h/tex_gdef.html 
b/tp/tests/tex_html/res_parser/tex_gdef_l2h/tex_gdef.html
index bffdacb0e5..51b3c05dd6 100644
--- a/tp/tests/tex_html/res_parser/tex_gdef_l2h/tex_gdef.html
+++ b/tp/tests/tex_html/res_parser/tex_gdef_l2h/tex_gdef.html
@@ -12,11 +12,7 @@
 <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="#Top" rel="start" title="Top">
 
 
 </head>
@@ -50,11 +46,8 @@ span.program-in-footer {font-size: smaller}
  ALT="$\displaystyle \buildrel \rm def \over \equiv a \equiv b\sqrt{64}$">
 </DIV>
 
-<hr>
 </div>
-<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/tests/tex_html/res_parser/tex_gdef_mathjax/tex_gdef.html 
b/tp/tests/tex_html/res_parser/tex_gdef_mathjax/tex_gdef.html
index bd24b25279..f4e5ca27e3 100644
--- a/tp/tests/tex_html/res_parser/tex_gdef_mathjax/tex_gdef.html
+++ b/tp/tests/tex_html/res_parser/tex_gdef_mathjax/tex_gdef.html
@@ -12,11 +12,7 @@
 <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="#Top" rel="start" title="Top">
 
 <script type='text/javascript'>
 MathJax = {
@@ -45,11 +41,8 @@ MathJax = {
 </p>
 <div class="displaymath"><em class="tex2jax_process">\[ \Desig \testmacro 
\otest
 \]</em></div>
-<hr>
 </div>
-<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>
+
 
 <a href="js_licenses.html" rel="jslicense"><small>JavaScript license 
information</small></a>
 </body>
diff --git a/tp/tests/tex_html/res_parser/tex_httex/tex.html 
b/tp/tests/tex_html/res_parser/tex_httex/tex.html
index 048c731e21..1330c44537 100644
--- a/tp/tests/tex_html/res_parser/tex_httex/tex.html
+++ b/tp/tests/tex_html/res_parser/tex_httex/tex.html
@@ -12,11 +12,11 @@
 <meta name="Generator" content="texi2any">
 <meta name="viewport" content="width=device-width,initial-scale=1">
 
+<link href="#Top" rel="start" title="Top">
 <style type="text/css">
 <!--
 @import "tex_tex4ht_tex.css";
 
-span.program-in-footer {font-size: smaller}
 -->
 </style>
 
@@ -101,11 +101,8 @@ src="tex_tex4ht_tex1x.png" alt="                        (  
    )
 " class="math-display" ></div>
 <!--l. 29--><p class="indent" >     
 
-<hr>
 </div>
-<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/tests/tex_html/res_parser/tex_httex_latex/tex.html 
b/tp/tests/tex_html/res_parser/tex_httex_latex/tex.html
index 9525dcd14d..087764a122 100644
--- a/tp/tests/tex_html/res_parser/tex_httex_latex/tex.html
+++ b/tp/tests/tex_html/res_parser/tex_httex_latex/tex.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">
 <style type="text/css">
 <!--
 @import "tex_tex4ht_latex.css";
 @import "tex_tex4ht_tex.css";
 
-span.program-in-footer {font-size: smaller}
 -->
 </style>
 
@@ -100,11 +100,8 @@ src="tex_tex4ht_tex0x.png" alt="                        (  
    )2
 " class="math-display" ></div>
 <!--l. 17--><p class="indent" >     
 
-<hr>
 </div>
-<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/tests/tex_html/res_parser/tex_httex_latex_math/tex.html 
b/tp/tests/tex_html/res_parser/tex_httex_latex_math/tex.html
index b2f25ea32c..7e54abd9ff 100644
--- a/tp/tests/tex_html/res_parser/tex_httex_latex_math/tex.html
+++ b/tp/tests/tex_html/res_parser/tex_httex_latex_math/tex.html
@@ -12,11 +12,11 @@
 <meta name="Generator" content="texi2any">
 <meta name="viewport" content="width=device-width,initial-scale=1">
 
+<link href="#Top" rel="start" title="Top">
 <style type="text/css">
 <!--
 @import "tex_tex4ht_latex.css";
 
-span.program-in-footer {font-size: smaller}
 -->
 </style>
 
@@ -96,11 +96,8 @@ src="tex_tex4ht_latex1x.png" alt="- - f (x) =-&#x221A;1--e- 
12(x-&#x03C3;&#x03BC
 " class="par-math-display" ></div>
 <!--l. 23--><p class="nopar" >  
 
-<hr>
 </div>
-<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/tests/tex_html/res_parser/tex_httex_tex_latex/tex.html 
b/tp/tests/tex_html/res_parser/tex_httex_tex_latex/tex.html
index 16c46bf0e2..8ab3ab9203 100644
--- a/tp/tests/tex_html/res_parser/tex_httex_tex_latex/tex.html
+++ b/tp/tests/tex_html/res_parser/tex_httex_tex_latex/tex.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">
 <style type="text/css">
 <!--
 @import "tex_tex4ht_latex.css";
 @import "tex_tex4ht_tex.css";
 
-span.program-in-footer {font-size: smaller}
 -->
 </style>
 
@@ -111,11 +111,8 @@ src="tex_tex4ht_tex1x.png" alt="                        (  
    )
 " class="math-display" ></div>
 <!--l. 29--><p class="indent" >     
 
-<hr>
 </div>
-<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/tests/tex_html/res_parser/tex_httex_tex_latex_math/tex.html 
b/tp/tests/tex_html/res_parser/tex_httex_tex_latex_math/tex.html
index 7bcef02395..2d4bd9f75d 100644
--- a/tp/tests/tex_html/res_parser/tex_httex_tex_latex_math/tex.html
+++ b/tp/tests/tex_html/res_parser/tex_httex_tex_latex_math/tex.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">
 <style type="text/css">
 <!--
 @import "tex_tex4ht_latex.css";
 @import "tex_tex4ht_tex.css";
 
-span.program-in-footer {font-size: smaller}
 -->
 </style>
 
@@ -108,11 +108,8 @@ src="tex_tex4ht_latex1x.png" alt="- - f (x) 
=-&#x221A;1--e- 12(x-&#x03C3;&#x03BC
 " class="par-math-display" ></div>
 <!--l. 23--><p class="nopar" >  
 
-<hr>
 </div>
-<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/tests/tex_html/res_parser/tex_in_copying/tex_in_copying.html 
b/tp/tests/tex_html/res_parser/tex_in_copying/tex_in_copying.html
index e7e0a7f878..3fb31b0647 100644
--- a/tp/tests/tex_html/res_parser/tex_in_copying/tex_in_copying.html
+++ b/tp/tests/tex_html/res_parser/tex_in_copying/tex_in_copying.html
@@ -19,15 +19,8 @@ $$
 <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.menu-entry-description {vertical-align: top}
-td.menu-entry-destination {vertical-align: top}
-td.name-direction-about {text-align:center}
--->
-</style>
+<link href="#Top" rel="start" title="Top">
+<link href="#chapter" rel="next" title="chapter">
 
 
 </head>
@@ -37,14 +30,10 @@ td.name-direction-about {text-align:center}
 
 
 <div class="top-level-extent" id="Top">
-<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>[Index]</td>
-<td>[<a href="#SEC_About" title="About (help)"> ? </a>]</td>
-</tr></table>
+<div class="nav-panel">
+<p>
+Next: <a href="#chapter" accesskey="n" rel="next">chapter</a> &nbsp; </p>
+</div>
 <h1 class="top" id="Top-node">Top node</h1>
 
 <p>Some equation is indeed needed to understand the copyright of
@@ -65,10 +54,6 @@ $">
 
 </p>
 
-<table class="menu" border="0" cellspacing="0">
-<tr><td class="menu-entry-destination"><a href="#chapter">1 
chapter</a></td><td>&nbsp;&nbsp;</td><td class="menu-entry-description">
-</td></tr>
-</table>
 
 <p>Some equation is indeed needed to understand the copyright of
 that file
@@ -88,24 +73,16 @@ $">
 
 </p>
 
-<hr style="height: 6px;">
+<ul class="mini-toc">
+<li><a href="#chapter" accesskey="1">chapter</a></li>
+</ul>
+<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>[Index]</td>
-<td>[<a href="#SEC_About" title="About (help)"> ? </a>]</td>
-</tr></table>
-<h1 class="chapter" id="chapter-1">1 chapter</h1>
+<div class="nav-panel">
+<p>
+Previous: <a href="#Top" accesskey="p" rel="prev">Top node</a>, Up: <a 
href="#Top" accesskey="u" rel="up">Top node</a> &nbsp; </p>
+</div>
+<h2 class="chapter" id="chapter-1">1 chapter</h2>
 
 <p>The fundamental equation is
 <DIV CLASS="displaymath">
@@ -141,121 +118,9 @@ $">
 </p>
 
 
-<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>[Index]</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/tests/tex_html/res_parser/tex_l2h_latex/tex.html 
b/tp/tests/tex_html/res_parser/tex_l2h_latex/tex.html
index b02830fe9c..d381bcb1f9 100644
--- a/tp/tests/tex_html/res_parser/tex_l2h_latex/tex.html
+++ b/tp/tests/tex_html/res_parser/tex_l2h_latex/tex.html
@@ -12,11 +12,7 @@
 <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="#Top" rel="start" title="Top">
 
 
 </head>
@@ -123,11 +119,8 @@ Here some <!-- MATH
 $">
 </DIV>
 
-<hr>
 </div>
-<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/tests/tex_html/res_parser/tex_l2h_tex_latex/tex.html 
b/tp/tests/tex_html/res_parser/tex_l2h_tex_latex/tex.html
index 6f8f905b38..768b93bdb4 100644
--- a/tp/tests/tex_html/res_parser/tex_l2h_tex_latex/tex.html
+++ b/tp/tests/tex_html/res_parser/tex_l2h_tex_latex/tex.html
@@ -12,11 +12,7 @@
 <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="#Top" rel="start" title="Top">
 
 
 </head>
@@ -144,11 +140,8 @@ Here some <!-- MATH
 $">
 </DIV>
 
-<hr>
 </div>
-<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/tests/tex_html/res_parser/tex_mathjax/tex.html 
b/tp/tests/tex_html/res_parser/tex_mathjax/tex.html
index 99c1a50682..d94b9fe5c2 100644
--- a/tp/tests/tex_html/res_parser/tex_mathjax/tex.html
+++ b/tp/tests/tex_html/res_parser/tex_mathjax/tex.html
@@ -12,11 +12,7 @@
 <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="#Top" rel="start" title="Top">
 
 <script type='text/javascript'>
 MathJax = {
@@ -76,11 +72,8 @@ Here some <em class="math tex2jax_process">\({x^i}\over{\tan 
y}\)</em>.
 <p>Displaymath
 </p><div class="displaymath"><em class="tex2jax_process">\[-- f(x) = {1 \over 
\sigma \sqrt{2\pi}}e^{-{1 \over 2}\left({x-\mu \over \sigma}\right)^2}
 \]</em></div>
-<hr>
 </div>
-<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>
+
 
 <a href="js_licenses.html" rel="jslicense"><small>JavaScript license 
information</small></a>
 </body>
diff --git a/tp/tests/tex_html/res_parser/tex_not_closed/tex_not_closed.html 
b/tp/tests/tex_html/res_parser/tex_not_closed/tex_not_closed.html
index 2a93c8f529..e3ca44fd24 100644
--- a/tp/tests/tex_html/res_parser/tex_not_closed/tex_not_closed.html
+++ b/tp/tests/tex_html/res_parser/tex_not_closed/tex_not_closed.html
@@ -12,26 +12,20 @@
 <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="#Top" rel="start" title="Top">
 
 
 </head>
 
 <body lang="en">
-<a class="node" id="Top"></a>
+<h1 class="node" id="Top">Top</h1>
+
 <p>texte
 </p>
 
 <P>
 This is some <SPAN 
CLASS="logo,LaTeX">L<SUP><SMALL>A</SMALL></SUP>T<SMALL>E</SMALL>X</SPAN>
-<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/tests/tex_html/res_parser/tex_notex/tex.html 
b/tp/tests/tex_html/res_parser/tex_notex/tex.html
index 7616b86373..0299b2abd4 100644
--- a/tp/tests/tex_html/res_parser/tex_notex/tex.html
+++ b/tp/tests/tex_html/res_parser/tex_notex/tex.html
@@ -12,11 +12,7 @@
 <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="#Top" rel="start" title="Top">
 
 
 </head>
@@ -58,11 +54,8 @@ Here some <em class="math">{x^i}\over{\tan y}</em>.
 <p>Displaymath
 </p><div class="displaymath"><em>-- f(x) = {1 \over \sigma \sqrt{2\pi}}e<sup 
class="sup">-{1 \over 2}\left({x-\mu \over \sigma}\right)^2</sup>
 </em></div>
-<hr>
 </div>
-<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>



reply via email to

[Prev in Thread] Current Thread [Next in Thread]