branch master updated: Add NO_TOP_NODE_OUTPUT to discard Top node for "book like" styles

[Patrice Dumas]

This is an automated email from the git hooks/post-receive script.

pertusus pushed a commit to branch master
in repository texinfo.

The following commit(s) were added to refs/heads/master by this push:
     new 8959304d23 Add NO_TOP_NODE_OUTPUT to discard Top node for "book like" 
styles
8959304d23 is described below

commit 8959304d2337df2c6730f5e43b4706871557f577
Author: Patrice Dumas <pertusus@free.fr>
AuthorDate: Thu Mar 10 02:46:15 2022 +0100

    Add NO_TOP_NODE_OUTPUT to discard Top node for "book like" styles
    
    * NEWS, doc/texinfo.texi (Other Customization Variables),
    tp/Texinfo/Common.pm (@variable_string_settables),
    tp/Texinfo/Convert/HTML.pm (%defaults, _convert_heading_command)
    (output), tp/init/book.pm, tp/init/epub3.pm: add NO_TOP_NODE_OUTPUT
    customization variable.  If set, the Top node content output is
    discarded.  If set and USE_TITLEPAGE_FOR_TITLE is undef (the default
    now), set USE_TITLEPAGE_FOR_TITLE.  Set NO_TOP_NODE_OUTPUT in
    tp/init/book.pm and tp/init/epub3.pm.
---
 ChangeLog                                          |  13 +++
 NEWS                                               |   1 +
 doc/texinfo.texi                                   |   8 +-
 tp/TODO                                            |   7 +-
 tp/Texinfo/Common.pm                               |   1 +
 tp/Texinfo/Convert/HTML.pm                         | 107 ++++++++++++++-------
 tp/init/book.pm                                    | 102 +++++++++++++++-----
 tp/init/epub3.pm                                   |   4 +
 .../double_contents_book/double_contents.html      |  11 +--
 .../EPUB/xhtml/os\303\251_utf8.xhtml"              |   6 +-
 .../EPUB/xhtml/formatting.xhtml                    |  17 +---
 .../EPUB/xhtml/formatting.xhtml                    |  17 +---
 12 files changed, 181 insertions(+), 113 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 2d082703b9..eafafa8682 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,16 @@
+2022-03-10  Patrice Dumas  <pertusus@free.fr>
+
+       Add NO_TOP_NODE_OUTPUT to discard Top node for "book like" styles
+
+       * NEWS, doc/texinfo.texi (Other Customization Variables),
+       tp/Texinfo/Common.pm (@variable_string_settables),
+       tp/Texinfo/Convert/HTML.pm (%defaults, _convert_heading_command)
+       (output), tp/init/book.pm, tp/init/epub3.pm: add NO_TOP_NODE_OUTPUT
+       customization variable.  If set, the Top node content output is
+       discarded.  If set and USE_TITLEPAGE_FOR_TITLE is undef (the default
+       now), set USE_TITLEPAGE_FOR_TITLE.  Set NO_TOP_NODE_OUTPUT in
+       tp/init/book.pm and tp/init/epub3.pm.
+
 2022-03-09  Gavin Smith  <gavinsmith0123@gmail.com>
 
        Document index node name requirement
diff --git a/NEWS b/NEWS
index 3f1dba16e8..52828fb0cf 100644
--- a/NEWS
+++ b/NEWS
@@ -19,6 +19,7 @@ See the manual for detailed information.
    LOCALE_OUTPUT_ENCODING_NAME, LOCALE_INPUT_FILE_NAME_ENCODING,
    LOCALE_OUTPUT_FILE_NAME_ENCODING, DOC_ENCODING_FOR_INPUT_FILE_NAME, and
    DOC_ENCODING_FOR_OUTPUT_FILE_NAME
+ . new customization variable NO_TOP_NODE_OUTPUT
  . rename COPIABLE_ANCHORS as COPIABLE_LINKS
  . L2H customization variable removed.  Replaced by HTML_MATH set to l2h.
  . Meaning of USE_NUMERIC_ENTITY changed to be using numeric entities in
diff --git a/doc/texinfo.texi b/doc/texinfo.texi
index 29f0043a23..5cad1b719a 100644
--- a/doc/texinfo.texi
+++ b/doc/texinfo.texi
@@ -16836,6 +16836,11 @@ The maximal number of recursive calls of @@-commands 
defined through
 @code{@@rmacro}; default 100000.  The purpose of this variable is to
 avoid infinite recursions.
 
+@item NO_TOP_NODE_OUTPUT
+If set do not output the Top node content.  The Top node is still
+parsed, but the content is discarded.  Not set in the default case
+for HTML.
+
 @item NO_USE_SETFILENAME
 If set, do not use @code{@@setfilename} to set the document name;
 instead, base the output document name only on the input file name.
@@ -17027,7 +17032,8 @@ the extension.  You should not need to explicitly set 
this variable.
 
 @item USE_TITLEPAGE_FOR_TITLE
 Use the full @code{@@titlepage} as the title, not a simple title string;
-default false.
+default @samp{undef}.  If set to @samp{undef}, setting
+@code{NO_TOP_NODE_OUTPUT} also sets @code{USE_TITLEPAGE_FOR_TITLE}.
 
 @item USE_UNIDECODE
 @pindex Text::Unidecode
diff --git a/tp/TODO b/tp/TODO
index 57d4cc5747..878fd07901 100644
--- a/tp/TODO
+++ b/tp/TODO
@@ -405,11 +405,11 @@ from the utf8 encoding, and the encoding inside is utf8
 consistent with the document encoding.
 
 ./texi2any.pl --force -I tests/ -o encodé/raw.txt -c 
TEXINFO_OUTPUT_FORMAT=rawtext tests/formatting/os*_utf8.texi
-encodé/raw.txt encoded in latin1, and the encoding inside is utf8
+encodé/raw.txt file name encoded in latin1, and the encoding inside is utf8
 consistent with the document encoding.
 
 ./texi2any.pl --force -I tests/ -c TEXINFO_OUTPUT_FORMAT=rawtext -c 
'SUBDIR=subdîr' tests/formatting/os*_utf8.texi
-subdîr/osé_utf8.txt encoded in latin1, and the encoding inside is utf8
+subdîr/osé_utf8.txt file name encoded in latin1, and the encoding inside is 
utf8
 consistent with the document encoding.
 
 ./texi2any.pl --set TEXINFO_OUTPUT_FORMAT=debugtree --set USE_NODES=0 -o 
résultat/encodé.txt ./t/input_files/simplest_no_node_section.texi
@@ -421,7 +421,8 @@ char_latin1_latin1_in_refs_tree.txt content encoded in 
latin1
 utf8 encoded manual name and latex2html in latin1 locale
 ./texi2any.pl --verbose -c 'DATA_INPUT_ENCODING_NAME=utf-8' --html --init 
init/latex2html.pm -c 'L2H_CLEAN 0' tests/tex_html/tex_encod*_utf8.texi
 DATA_INPUT_ENCODING_NAME=utf-8 is required in order to have the
-input file name correctly decoded as the document_name
+input file name correctly decoded as document_name which is used
+in init file to set the file names.
 
 latin1 encoded manual name and latex2html in latin1 locale
 cp tests/tex_html/tex_encode_latin1.texi tex_encodé_latin1.texi
diff --git a/tp/Texinfo/Common.pm b/tp/Texinfo/Common.pm
index bc0a24d973..bb2b70924f 100644
--- a/tp/Texinfo/Common.pm
+++ b/tp/Texinfo/Common.pm
@@ -343,6 +343,7 @@ my @variable_string_settables = (
 'NODE_FILE_EXTENSION',
 'NODE_NAME_IN_INDEX',
 'NODE_NAME_IN_MENU',
+'NO_TOP_NODE_OUTPUT',
 'NO_USE_SETFILENAME',
 'OPEN_QUOTE_SYMBOL',
 'OUTPUT_ENCODING_NAME',
diff --git a/tp/Texinfo/Convert/HTML.pm b/tp/Texinfo/Convert/HTML.pm
index 9414e12bf1..89dd74dd28 100644
--- a/tp/Texinfo/Convert/HTML.pm
+++ b/tp/Texinfo/Convert/HTML.pm
@@ -1791,7 +1791,7 @@ my %defaults = (
   'xrefautomaticsectiontitle' => 'on',
   'SHOW_TITLE'           => 1,
   'SECTION_NAME_IN_TITLE' => 0,
-  'USE_TITLEPAGE_FOR_TITLE' => 0,
+  'USE_TITLEPAGE_FOR_TITLE' => undef,
   'MONOLITHIC'           => 1,
   'CHAPTER_HEADER_LEVEL' => 2,
   'MAX_HEADER_LEVEL'     => 4,
@@ -3549,6 +3549,68 @@ sub _convert_heading_command($$$$$)
 
   my $element_id = $self->command_id($element);
 
+  print STDERR "CONVERT elt heading $element "
+        
.Texinfo::Convert::Texinfo::root_heading_command_to_texinfo($element)."\n"
+          if ($self->get_conf('DEBUG'));
+  my $tree_unit;
+  if ($Texinfo::Common::root_commands{$element->{'cmdname'}}
+      and $element->{'structure'}->{'associated_unit'}) {
+    $tree_unit = $element->{'structure'}->{'associated_unit'};
+  }
+  my $element_header = '';
+  if ($tree_unit) {
+    $element_header = &{$self->formatting_function('format_element_header')}(
+                                        $self, $cmdname, $element, $tree_unit);
+  }
+
+  my $tables_of_contents = '';
+  my $structuring = $self->get_info('structuring');
+  if ($self->get_conf('CONTENTS_OUTPUT_LOCATION') eq 'after_top'
+      and $cmdname eq 'top'
+      and $structuring and $structuring->{'sectioning_root'}
+      and scalar(@{$structuring->{'sections_list'}}) > 1) {
+    foreach my $content_command_name ('contents', 'shortcontents') {
+      if ($self->get_conf($content_command_name)) {
+        my $contents_text
+          = $self->_contents_inline_element($content_command_name, undef);
+        if ($contents_text ne '') {
+          $tables_of_contents .= $contents_text;
+        }
+      }
+    }
+  }
+
+  my $mini_toc = '';
+  if ($tables_of_contents eq ''
+      and $self->get_conf('FORMAT_MENU') eq 'sectiontoc'
+      and $Texinfo::Common::sectioning_heading_commands{$cmdname}) {
+    $mini_toc = _mini_toc($self, $element);
+  }
+
+  if ($self->get_conf('NO_TOP_NODE_OUTPUT')
+      and $Texinfo::Common::root_commands{$cmdname}) {
+    my $in_skipped_node_top
+      = $self->shared_conversion_state('in_skipped_node_top', 0);
+    if ($cmdname eq 'node') {
+      if ($$in_skipped_node_top == 0
+          and $element->{'extra'}
+          and $element->{'extra'}->{'normalized'} eq 'Top') {
+        $$in_skipped_node_top = 1;
+      } elsif ($$in_skipped_node_top == 1) {
+        $$in_skipped_node_top = -1;
+      }
+    }
+    if ($$in_skipped_node_top == 1) {
+      my $id_class = $cmdname;
+      $result .= &{$self->formatting_function('format_separate_anchor')}($self,
+                                                        $element_id, 
$id_class);
+      $result .= $element_header;
+      $result .= $tables_of_contents;
+      $result .= $mini_toc;
+      return $result;
+    }
+  }
+
   my @heading_classes;
   my $level_corrected_cmdname = $cmdname;
   if (defined $element->{'structure'}->{'section_level'}) {
@@ -3579,20 +3641,6 @@ sub _convert_heading_command($$$$$)
     $level_corrected_opening_section_cmdname = $level_corrected_cmdname;
   }
 
-  print STDERR "CONVERT elt heading $element "
-        
.Texinfo::Convert::Texinfo::root_heading_command_to_texinfo($element)."\n"
-          if ($self->get_conf('DEBUG'));
-  my $tree_unit;
-  if ($Texinfo::Common::root_commands{$element->{'cmdname'}}
-      and $element->{'structure'}->{'associated_unit'}) {
-    $tree_unit = $element->{'structure'}->{'associated_unit'};
-  }
-  my $element_header = '';
-  if ($tree_unit) {
-    $element_header = &{$self->formatting_function('format_element_header')}(
-                                        $self, $cmdname, $element, $tree_unit);
-  }
-
   # $heading not defined may happen if the command is a @node, for example
   # if there is an error in the node.
   my $heading = $self->command_text($element);
@@ -3690,28 +3738,8 @@ sub _convert_heading_command($$$$$)
   }
   $result .= $content if (defined($content));
 
-  my $table_of_contents_was_output = 0.;
-  my $structuring = $self->get_info('structuring');
-  if ($self->get_conf('CONTENTS_OUTPUT_LOCATION') eq 'after_top'
-      and $cmdname eq 'top'
-      and $structuring and $structuring->{'sectioning_root'}
-      and scalar(@{$structuring->{'sections_list'}}) > 1) {
-    foreach my $content_command_name ('contents', 'shortcontents') {
-      if ($self->get_conf($content_command_name)) {
-        my $contents_text
-          = $self->_contents_inline_element($content_command_name, undef);
-        if ($contents_text ne '') {
-          $result .= $contents_text;
-          $table_of_contents_was_output = 1;
-        }
-      }
-    }
-  }
-  if (not $table_of_contents_was_output
-      and $self->get_conf('FORMAT_MENU') eq 'sectiontoc'
-      and $Texinfo::Common::sectioning_heading_commands{$cmdname}) {
-    $result .= _mini_toc($self, $element);
-  }
+  $result .= $tables_of_contents;
+  $result .= $mini_toc;
   return $result;
 }
 
@@ -9288,6 +9316,11 @@ sub output($$)
      = { 
Texinfo::Convert::LaTeX::copy_options_for_convert_to_latex_math($self) };
   }
 
+  if ($self->get_conf('NO_TOP_NODE_OUTPUT')
+      and not defined($self->get_conf('USE_TITLEPAGE_FOR_TITLE'))) {
+    $self->set_conf('USE_TITLEPAGE_FOR_TITLE', 1);
+  }
+
   # the configuration has potentially been modified for
   # this output file especially.  Set a corresponding initial
   # configuration.
diff --git a/tp/init/book.pm b/tp/init/book.pm
index 7bb16f5029..7ea33cd92a 100644
--- a/tp/init/book.pm
+++ b/tp/init/book.pm
@@ -27,7 +27,8 @@ use Texinfo::Structuring;
 
 texinfo_set_from_init_file('contents', 1);
 texinfo_set_from_init_file('CONTENTS_OUTPUT_LOCATION', 'inline');
-texinfo_set_from_init_file('USE_TITLEPAGE_FOR_TITLE', 1);
+texinfo_set_from_init_file('NO_TOP_NODE_OUTPUT', 1);
+#texinfo_set_from_init_file('USE_TITLEPAGE_FOR_TITLE', 1);
 
 my @book_buttons = ('Back', 'Forward', ' ', 'Contents', 'Index', 'About');
 
@@ -182,6 +183,74 @@ sub book_convert_heading_command($$$$$)
 
   my $element_id = $self->command_id($element);
 
+  print STDERR "CONVERT elt heading $element "
+        
.Texinfo::Convert::Texinfo::root_heading_command_to_texinfo($element)."\n"
+          if ($self->get_conf('DEBUG'));
+  my $tree_unit;
+  if ($Texinfo::Common::root_commands{$element->{'cmdname'}}
+      and $element->{'structure'}->{'associated_unit'}) {
+    $tree_unit = $element->{'structure'}->{'associated_unit'};
+  }
+  my $element_header = '';
+  if ($tree_unit) {
+    $element_header = &{$self->formatting_function('format_element_header')}(
+                                        $self, $cmdname, $element, $tree_unit);
+  }
+
+  my $tables_of_contents = '';
+  my $structuring = $self->get_info('structuring');
+  if ($self->get_conf('CONTENTS_OUTPUT_LOCATION') eq 'after_top'
+      and $cmdname eq 'top'
+      and $structuring and $structuring->{'sectioning_root'}
+      and scalar(@{$structuring->{'sections_list'}}) > 1) {
+    foreach my $content_command_name ('contents', 'shortcontents') {
+      if ($self->get_conf($content_command_name)) {
+        my $contents_text
+          = $self->_contents_inline_element($content_command_name, undef);
+        if ($contents_text ne '') {
+          $tables_of_contents .= $contents_text;
+        }
+      }
+    }
+  }
+
+  my $sub_toc = '';
+  if ($tables_of_contents eq ''
+      and $element->{'structure'}->{'section_childs'}
+      and @{$element->{'structure'}->{'section_childs'}}
+      # FIXME why not @top?
+      and $cmdname ne 'top'
+      and $Texinfo::Common::sectioning_heading_commands{$cmdname}) {
+    $sub_toc .= $self->html_attribute_class('ul', 
[$toc_numbered_mark_class]).">\n";
+    $sub_toc .= book_print_sub_toc($self, $element,
+                                  
$element->{'structure'}->{'section_childs'}->[0]);
+    $sub_toc .= "</ul>\n";
+  }
+
+  if ($self->get_conf('NO_TOP_NODE_OUTPUT')
+      and $Texinfo::Common::root_commands{$cmdname}) {
+    my $in_skipped_node_top
+      = $self->shared_conversion_state('in_skipped_node_top', 0);
+    if ($cmdname eq 'node') {
+      if ($$in_skipped_node_top == 0
+          and $element->{'extra'}
+          and $element->{'extra'}->{'normalized'} eq 'Top') {
+        $$in_skipped_node_top = 1;
+      } elsif ($$in_skipped_node_top == 1) {
+        $$in_skipped_node_top = -1;
+      }
+    }
+    if ($$in_skipped_node_top == 1) {
+      my $id_class = $cmdname;
+      $result .= &{$self->formatting_function('format_separate_anchor')}($self,
+                                                        $element_id, 
$id_class);
+      $result .= $element_header;
+      $result .= $tables_of_contents;
+      $result .= $sub_toc;
+      return $result;
+    }
+  }
+
   my @heading_classes;
   my $level_corrected_cmdname = $cmdname;
   if (defined $element->{'structure'}->{'section_level'}) {
@@ -212,20 +281,6 @@ sub book_convert_heading_command($$$$$)
     $level_corrected_opening_section_cmdname = $level_corrected_cmdname;
   }
 
-  print STDERR "CONVERT elt heading $element "
-        
.Texinfo::Convert::Texinfo::root_heading_command_to_texinfo($element)."\n"
-          if ($self->get_conf('DEBUG'));
-  my $tree_unit;
-  if ($Texinfo::Common::root_commands{$element->{'cmdname'}}
-      and $element->{'structure'}->{'associated_unit'}) {
-    $tree_unit = $element->{'structure'}->{'associated_unit'};
-  }
-  my $element_header = '';
-  if ($tree_unit) {
-    $element_header = &{$self->formatting_function('format_element_header')}(
-                                        $self, $cmdname, $element, $tree_unit);
-  }
-
   # $heading not defined may happen if the command is a @node, for example
   # if there is an error in the node.
   my $heading = $self->command_text($element);
@@ -295,13 +350,13 @@ sub book_convert_heading_command($$$$$)
     if ($self->get_conf('TOC_LINKS')
         and $Texinfo::Common::root_commands{$cmdname}
         and $Texinfo::Common::sectioning_heading_commands{$cmdname}) {
-      my $content_href = $self->command_contents_href($element, 'contents',
-                                        $self->{'current_filename'});
-      if ($content_href) {
+      my $content_href = $self->command_contents_href($element, 'contents');
+      if ($content_href ne '') {
         $heading = "<a href=\"$content_href\">$heading</a>";
       }
     }
 
+
     my $heading_class = $level_corrected_cmdname;
     unshift @heading_classes, $heading_class;
     if ($self->in_preformatted()) {
@@ -323,15 +378,10 @@ sub book_convert_heading_command($$$$$)
                                                        $heading_id, $cmdname);
   }
 
-  if ($element->{'structure'}->{'section_childs'}
-      and @{$element->{'structure'}->{'section_childs'}}
-      and $cmdname ne 'top') {
-    $result .= $self->html_attribute_class('ul', 
[$toc_numbered_mark_class]).">\n";
-    $result .= book_print_sub_toc($self, $element,
-                                  
$element->{'structure'}->{'section_childs'}->[0]);
-    $result .= "</ul>\n";
-  }
+  $result .= $tables_of_contents;
+  $result .= $sub_toc;
   $result .= $content if (defined($content));
+
   return $result;
 }
 
diff --git a/tp/init/epub3.pm b/tp/init/epub3.pm
index 65a390bbee..791fc2e80f 100644
--- a/tp/init/epub3.pm
+++ b/tp/init/epub3.pm
@@ -86,6 +86,10 @@ 
texinfo_set_from_init_file('DOC_ENCODING_FOR_OUTPUT_FILE_NAME', 0);
 # As a conséquence, the epub file file name is also always utf-8 encoded.
 texinfo_set_from_init_file('LOCALE_OUTPUT_FILE_NAME_ENCODING', 'utf-8');
 
+# a "book like" output is most likely expected for epub.  So we set
+# NO_TOP_NODE_OUTPUT, which in turn sets titlepage to be used
+# if not specified.
+texinfo_set_from_init_file('NO_TOP_NODE_OUTPUT', 1);
 
 # the copiable anchor paragraph sign is always present and no link is
 # shown in the calibre epub reader.  Since it looks strange, unset.
diff --git 
a/tp/tests/contents/res_parser/double_contents_book/double_contents.html 
b/tp/tests/contents/res_parser/double_contents_book/double_contents.html
index 752fd9af8a..006274590f 100644
--- a/tp/tests/contents/res_parser/double_contents_book/double_contents.html
+++ b/tp/tests/contents/res_parser/double_contents_book/double_contents.html
@@ -38,8 +38,7 @@ ul.toc-numbered-mark {list-style: none}
 </div>
 </div>
 
-<div class="top-level-extent" id="Top">
-<table class="nav-panel" cellpadding="1" cellspacing="1" border="0">
+<a class="node" id="Top"></a><table class="nav-panel" cellpadding="1" 
cellspacing="1" border="0">
 <tr><td valign="middle" align="left">[ &lt; ]</td>
 <td valign="middle" align="left">[<a href="#chapter" title="Next section in 
reading order"> &gt; </a>]</td>
 <td valign="middle" align="left"> &nbsp; </td>
@@ -47,12 +46,7 @@ ul.toc-numbered-mark {list-style: none}
 <td valign="middle" align="left">[Index]</td>
 <td valign="middle" align="left">[<a href="#SEC_About" title="About (help)"> ? 
</a>]</td>
 </tr></table>
-<h1 class="top" id="Double-contents">Double contents</h1>
-
-<p>Double contents.
-</p>
-
-<hr>
+<a class="top" id="Double-contents"></a><hr>
 <div class="chapter-level-extent" id="chapter">
 <table class="nav-panel" cellpadding="1" cellspacing="1" border="0">
 <tr><td valign="middle" align="left">[<a href="#Top" title="Previous section 
in reading order"> &lt; </a>]</td>
@@ -111,7 +105,6 @@ ul.toc-numbered-mark {list-style: none}
 <hr>
 </div>
 </div>
-</div>
 <div class="element-about" id="SEC_About">
 <table class="nav-panel" cellpadding="1" cellspacing="1" border="0">
 <tr><td valign="middle" align="left">[<a href="#SEC_Contents" title="Table of 
contents">Contents</a>]</td>
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 93c0b7ded3..7561be605c 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"
@@ -24,10 +24,7 @@ span.program-in-footer {font-size: smaller}
 
 <body lang="en">
 
-<div class="top-level-extent" id="Top">
-<h1 class="top" id="Top-1">Tôp</h1>
-
-<div class="chapter-level-extent" id="Chapt_00eaur">
+<a class="node" id="Top"></a><a class="top" id="Top-1"></a><div 
class="chapter-level-extent" id="Chapt_00eaur">
 <h1 class="chapter" id="Chapteur">1 Chapteùr</h1>
 
 
@@ -43,7 +40,6 @@ span.program-in-footer {font-size: smaller}
 <pre class="verbatim">In included téxt.
 </pre>
 </div>
-</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>
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 8c64de1c90..59f3c87bef 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
@@ -2989,21 +2989,7 @@ html ''
 
 
 
-<div class="top-level-extent" id="Top">
-<h1 class="top" id="Top-section">Top section</h1>
-
-<table class="menu" border="0" cellspacing="0">
-<tr><td align="left" valign="top"><a href="#chapter" rel="index">1 
chapter</a></td><td>&#160;&#160;</td><td align="left" valign="top"></td></tr>
-<tr><th colspan="3" align="left" valign="top"><pre 
class="menu-comment-preformatted">
-
-Menu comment
-
-</pre></th></tr><tr><td align="left" valign="top"><a href="#chapter2" 
rel="index">chapter 2</a></td><td>&#160;&#160;</td><td align="left" 
valign="top">Chapter 2
-</td></tr>
-</table>
-
-
-<div class="chapter-level-extent" id="chapter">
+<a class="node" id="Top"></a><a class="top" id="Top-section"></a><div 
class="chapter-level-extent" id="chapter">
 <h1 class="chapter" id="chapter-1">1 chapter</h1>
 
 <p>First para
@@ -7561,7 +7547,6 @@ Menu comment
 </td></tr></table>
 </div>
 
-</div>
 </div>
 <div class="element-footnotes" id="SEC_Footnotes">
 <h1 class="footnotes-heading">Footnotes</h1>
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 4649b27849..192cd46067 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
@@ -2986,22 +2986,7 @@ html ''
 
 
 
-<div class="top-level-extent" id="Top">
-<h1 class="top" id="Top-section">Top section</h1>
-
-<table class="menu" border="0" cellspacing="0">
-<tr><td align="left" valign="top"><a href="chapter.xhtml" rel="index">1 
chapter</a></td><td>&#160;&#160;</td><td align="left" valign="top"></td></tr>
-<tr><th colspan="3" align="left" valign="top"><pre 
class="menu-comment-preformatted">
-
-Menu comment
-
-</pre></th></tr><tr><td align="left" valign="top"><a href="chapter2.xhtml" 
rel="index">chapter 2</a></td><td>&#160;&#160;</td><td align="left" 
valign="top">Chapter 2
-</td></tr>
-</table>
-
-
-</div>
-<p>
+<a class="node" id="Top"></a><a class="top" id="Top-section"></a><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>