texinfo-commits
[Top][All Lists]
Advanced

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

branch master updated: * tp/Makefile.tres, tp/t/converters_tests.t: add


From: Patrice Dumas
Subject: branch master updated: * tp/Makefile.tres, tp/t/converters_tests.t: add setfilename_no_extension test.
Date: Wed, 15 Feb 2023 18:19:12 -0500

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

pertusus pushed a commit to branch master
in repository texinfo.

The following commit(s) were added to refs/heads/master by this push:
     new e61c67aa65 * tp/Makefile.tres, tp/t/converters_tests.t: add 
setfilename_no_extension test.
e61c67aa65 is described below

commit e61c67aa6587d7eb0b044be714c7d36a1c7d8f68
Author: Patrice Dumas <pertusus@free.fr>
AuthorDate: Thu Feb 16 00:19:02 2023 +0100

    * tp/Makefile.tres, tp/t/converters_tests.t: add
    setfilename_no_extension test.
    
    * tp/t/30sectioning.t, tp/t/input_files/*.texi,
    tp/tests/formatting/*.texi: remove some @setfilename,
    when it is not useful for the test, for file that are used in more
    than one test.
---
 ChangeLog                                          |  10 +
 tp/Makefile.tres                                   |   6 +
 tp/maintain/check_back_xml_forth_texi_t.sh         |   4 +-
 tp/t/30sectioning.t                                |  30 +--
 tp/t/converters_tests.t                            |  10 +
 tp/t/input_files/delcomment.texi                   |   1 -
 tp/t/input_files/index_no_node_no_top.texi         |   2 -
 tp/t/input_files/index_nodes.texi                  |   2 -
 tp/t/input_files/index_special_region.texi         |   2 -
 tp/t/input_files/no_monolithic.texi                |   2 -
 .../input_files/nodes_before_top_and_sections.texi |   3 -
 .../indices_in_begin_tables_lists.pl               | 274 +++++++++------------
 .../res_html/indices_in_begin_tables_lists.html    |   1 -
 .../res_latex/indices_in_begin_tables_lists.tex    |   1 -
 .../res_xml/indices_in_begin_tables_lists.xml      |   3 +-
 ...ces_in_begin_tables_lists_entries_after_item.pl | 274 +++++++++------------
 .../res_html/indices_in_begin_tables_lists.html    |   1 -
 .../res_latex/indices_in_begin_tables_lists.tex    |   1 -
 .../res_xml/indices_in_begin_tables_lists.xml      |   3 +-
 .../setfilename_no_extension.pl}                   | 175 ++++++-------
 .../res_docbook/setfilename_no_extension.xml       |  10 +
 .../setfilename_no_extension/res_html/chap.html    |  39 +++
 .../setfilename_no_extension/res_html/index.html   |  46 ++++
 .../res_info/setfilename_no_extension              |  24 ++
 .../res_latex/setfilename_no_extension.tex}        |   3 +-
 .../res_xml/setfilename_no_extension.xml           |  14 ++
 tp/t/results/coverage/delcomment.pl                |  55 +----
 tp/t/results/indices/index_no_node_no_top.pl       | 186 +++++---------
 .../indices/index_no_node_no_top_no_node.pl        | 186 +++++---------
 tp/t/results/indices/index_nodes.pl                | 126 +++-------
 .../indices/index_nodes/res_html/index.html        |   1 -
 .../res_info/{index_nodes => index_nodes.info}     | Bin 4166 -> 4196 bytes
 .../indices/index_nodes_no_split_no_use_nodes.pl   | 126 +++-------
 .../res_html/index_nodes.html                      |   1 -
 tp/t/results/indices/index_special_region.pl       | 209 ++++++----------
 .../index_special_region/res_html/index.html       |   1 -
 .../index_special_region_no_titlepage_no_nodes.pl  | 205 ++++++---------
 .../res_html/index.html                            |   1 -
 .../index_special_region_titlepage_no_nodes.pl     | 209 ++++++----------
 .../res_html/index.html                            |   1 -
 ..._region_titlepage_no_nodes_footnotes_default.pl | 205 ++++++---------
 .../res_html/index.html                            |   1 -
 .../nodes_before_top_and_sections_chapter.pl       | 171 +++++--------
 .../res_html/first-before-top.html                 |   2 -
 ...odes_before_top_and_sections_chapter_no_node.pl | 171 +++++--------
 .../res_html/index.html                            |   2 -
 ...des_before_top_and_sections_unsplit_no_nodes.pl | 171 +++++--------
 .../res_html/nodes_before_top_and_sections.html    |   2 -
 tp/t/results/languages/documentlanguage.pl         |  82 ++----
 tp/t/results/languages/documentlanguage_option.pl  |  82 ++----
 tp/t/results/languages/documentlanguage_unknown.pl |  82 ++----
 tp/t/results/layout/no_monolithic.pl               |  86 ++-----
 .../no_monolithic/res_html/no_monolithic.html      |   1 -
 tp/t/results/layout/no_monolithic_only_toc_out.pl  |  86 ++-----
 .../res_html/no_monolithic.html                    |   1 -
 tp/t/results/sectioning/lone_Top_node.pl           |  62 +----
 .../lone_Top_node/res_latex/lone_Top_node.tex      |   1 -
 tp/t/results/sectioning/loop_nodes.pl              |  80 ++----
 .../sectioning/loop_nodes/res_latex/loop_nodes.tex |   1 -
 .../node_sectop_before_chapter_no_node.pl          |  57 +----
 .../node_sectop_before_chapter_no_node.tex         |   1 -
 .../sectioning/node_sectop_before_lone_node_Top.pl |  61 +----
 .../res_latex/node_sectop_before_lone_node_Top.tex |   1 -
 tp/t/results/sectioning/nodes_before_after_top.pl  |  64 +----
 .../res_latex/nodes_before_after_top.tex           |   1 -
 tp/t/results/sectioning/nodes_before_top.pl        |  72 ++----
 .../res_latex/nodes_before_top.tex                 |   1 -
 tp/tests/formatting/documentlanguage.texi          |   1 -
 .../formatting/indices_in_begin_tables_lists.texi  |   1 -
 .../indices_in_begin_tables_lists.html             |   1 -
 .../indices_in_begin_tables_lists.tex              |   1 -
 71 files changed, 1384 insertions(+), 2415 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 57bdf35cc7..01f3e5b12a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2023-02-15  Patrice Dumas  <pertusus@free.fr>
+
+       * tp/Makefile.tres, tp/t/converters_tests.t: add
+       setfilename_no_extension test.
+
+       * tp/t/30sectioning.t, tp/t/input_files/*.texi,
+       tp/tests/formatting/*.texi: remove some @setfilename,
+       when it is not useful for the test, for file that are used in more
+       than one test.
+
 2023-02-15  Patrice Dumas  <pertusus@free.fr>
 
        * tp/t/converters_tests.t: change node names to avoid warnings.
diff --git a/tp/Makefile.tres b/tp/Makefile.tres
index cf04198604..16719b4f17 100644
--- a/tp/Makefile.tres
+++ b/tp/Makefile.tres
@@ -226,6 +226,12 @@ test_files_generated_list = 
$(test_tap_files_generated_list) \
   t/results/converters_tests/references_to_top_no_top_output/res_html \
   t/results/converters_tests/references_to_top_no_top_output/res_latex \
   t/results/converters_tests/refs_formatting.pl \
+  t/results/converters_tests/setfilename_no_extension.pl \
+  t/results/converters_tests/setfilename_no_extension/res_docbook \
+  t/results/converters_tests/setfilename_no_extension/res_html \
+  t/results/converters_tests/setfilename_no_extension/res_info \
+  t/results/converters_tests/setfilename_no_extension/res_latex \
+  t/results/converters_tests/setfilename_no_extension/res_xml \
   t/results/converters_tests/simplest_no_node_section.pl \
   t/results/converters_tests/simplest_no_node_section/res_docbook \
   t/results/converters_tests/simplest_no_node_section/res_html \
diff --git a/tp/maintain/check_back_xml_forth_texi_t.sh 
b/tp/maintain/check_back_xml_forth_texi_t.sh
index 584e2fc967..6770540480 100755
--- a/tp/maintain/check_back_xml_forth_texi_t.sh
+++ b/tp/maintain/check_back_xml_forth_texi_t.sh
@@ -85,8 +85,8 @@ for dir in `find t_texis/ -type d` ; do
     echo "    -> $file: plaintexinfo"
     # Either the output file or the output directory can be specified.
     # The conversion to Texinfo XML below uses the directory.
-    # Specifying the file allows, as a side effect, to check the consistency
-    # of test name and output file name.
+    # Note that the file name obtained with plaintexinfo should match with the
+    # test name otherwise the diff is not possible.
     # Even with specifying the directory in both cases, the file names may
     # not be exactly the same when there are specific values for @setfilename.
     # This concerns a few files only, and those files are more or less
diff --git a/tp/t/30sectioning.t b/tp/t/30sectioning.t
index 79198426a8..4e5c8f9203 100644
--- a/tp/t/30sectioning.t
+++ b/tp/t/30sectioning.t
@@ -276,9 +276,7 @@ $nodes_after_top_before_chapter_text
 ,{}, {'USE_NODE_DIRECTIONS' => 0}
 ],
 ['node_sectop_before_chapter_no_node',
-'@setfilename node_sectop_before_chapter_no_node.info
-
-@node Top
+'@node Top
 @top top section
 
 @chapter chap
@@ -289,9 +287,7 @@ $nodes_after_top_before_chapter_text
 # node before node is obtained with toplevel next which is
 # the node associated with the chapter, after the Top node!
 ['node_sectop_before_lone_node_Top',
-'@setfilename node_sectop_before_lone_node_Top.info
-
-@node node before
+'@node node before
 @top top sectionning
 
 in node before
@@ -1081,9 +1077,7 @@ second node.
 @xref{unknown ref}.
 '],
 ['loop_nodes',
-'@setfilename loop_nodes.info
-
-@node Top
+'@node Top
 @top top
 
 @menu
@@ -1130,9 +1124,7 @@ Second top.
 @subsection the subsection
 '],
 ['lone_Top_node',
-'@setfilename lone_Top_node.info
-
-@node Top
+'@node Top
 
 @menu
 * First::
@@ -1181,9 +1173,7 @@ Second top.
 @section Sub3
 ', {'CHECK_NORMAL_MENU_STRUCTURE' => 1}],
 ['nodes_before_top',
-'@setfilename nodes_before_top.info
-
-@node first, Top, ,(dir)
+'@node first, Top, ,(dir)
 
 @menu
 * node in menu before top::
@@ -1202,9 +1192,7 @@ Second top.
 @chapter a chapter
 '],
 ['nodes_before_after_top',
-'@setfilename nodes_before_after_top.info
-
-@node node before
+'@node node before
 
 In node before
 
@@ -1389,8 +1377,10 @@ foreach my $test (@tests_converted) {
     if (grep {$_ eq $test->[0]} @docbook_tests_converted_tests);
   push @{$test->[2]->{'test_formats'}}, 'latex_text'
     if (grep {$_ eq $test->[0]} @latex_tests_converted_tests);
-  push @{$test->[2]->{'test_formats'}}, 'file_latex'
-    if (grep {$_ eq $test->[0]} @file_latex_tests_converted_tests);
+  if (grep {$_ eq $test->[0]} @file_latex_tests_converted_tests) {
+    push @{$test->[2]->{'test_formats'}}, 'file_latex';
+    $test->[2]->{'test_input_file_name'} = $test->[0] . '.texi';
+  }
 
   $test->[2]->{'full_document'} = 1 unless 
(exists($test->[2]->{'full_document'}));
 }
diff --git a/tp/t/converters_tests.t b/tp/t/converters_tests.t
index 5db7dc2525..ce18396c40 100644
--- a/tp/t/converters_tests.t
+++ b/tp/t/converters_tests.t
@@ -1159,6 +1159,16 @@ In Main
 );
 
 my @file_tests = (
+['setfilename_no_extension',
+'@setfilename setfilename_no_extension
+
+@node Top
+@top top
+
+@node chap
+
+Text.
+'],
 ['simplest_no_node_section',
 undef, {'test_file' => 'simplest_no_node_section.texi'}],
 ['minimal_empty_with_bye',
diff --git a/tp/t/input_files/delcomment.texi b/tp/t/input_files/delcomment.texi
index fa0502b0fc..83e5cdef8d 100644
--- a/tp/t/input_files/delcomment.texi
+++ b/tp/t/input_files/delcomment.texi
@@ -1,5 +1,4 @@
 \input texinfo
-@setfilename delcomment.info
 
 @c this tests both the del comment and a file without
 @c element.
diff --git a/tp/t/input_files/index_no_node_no_top.texi 
b/tp/t/input_files/index_no_node_no_top.texi
index c7eae3e391..40316c6ec1 100644
--- a/tp/t/input_files/index_no_node_no_top.texi
+++ b/tp/t/input_files/index_no_node_no_top.texi
@@ -1,7 +1,5 @@
 \input texinfo @c -*-texinfo-*-
 
-@setfilename index_no_node_no_top.info
-
 @cindex truc
 Garbage
 @printindex cp
diff --git a/tp/t/input_files/index_nodes.texi 
b/tp/t/input_files/index_nodes.texi
index ebe0e5963a..ceb53d5a55 100644
--- a/tp/t/input_files/index_nodes.texi
+++ b/tp/t/input_files/index_nodes.texi
@@ -1,7 +1,5 @@
 \input texinfo @c -*-texinfo-*-
 
-@setfilename index_nodes
-
 @node Top
 @cindex entry a
 
diff --git a/tp/t/input_files/index_special_region.texi 
b/tp/t/input_files/index_special_region.texi
index be0ca2d513..9b6f776d19 100644
--- a/tp/t/input_files/index_special_region.texi
+++ b/tp/t/input_files/index_special_region.texi
@@ -1,7 +1,5 @@
 \input texinfo @c -*-texinfo-*-
 
-@setfilename index_special_region.info
-
 @copying 
 
 @cindex Copying this document
diff --git a/tp/t/input_files/no_monolithic.texi 
b/tp/t/input_files/no_monolithic.texi
index 2240064021..7144180708 100644
--- a/tp/t/input_files/no_monolithic.texi
+++ b/tp/t/input_files/no_monolithic.texi
@@ -1,7 +1,5 @@
 \input texinfo @c -*-texinfo-*-
 
-@setfilename no_monolithic.info
-
 @node Top
 @top Not monolithic
 
diff --git a/tp/t/input_files/nodes_before_top_and_sections.texi 
b/tp/t/input_files/nodes_before_top_and_sections.texi
index d44831d591..225ae7349a 100644
--- a/tp/t/input_files/nodes_before_top_and_sections.texi
+++ b/tp/t/input_files/nodes_before_top_and_sections.texi
@@ -1,8 +1,5 @@
 \input texinfo @c -*-texinfo-*-
 
-@setfilename nodes_before_top_and_sections.info
-
-
 @node first before top, Top, ,(dir)
 @cindex first before top
 
diff --git a/tp/t/results/converters_tests/indices_in_begin_tables_lists.pl 
b/tp/t/results/converters_tests/indices_in_begin_tables_lists.pl
index 9aa247eea0..60abb38f3d 100644
--- a/tp/t/results/converters_tests/indices_in_begin_tables_lists.pl
+++ b/tp/t/results/converters_tests/indices_in_begin_tables_lists.pl
@@ -12,58 +12,20 @@ $result_trees{'indices_in_begin_tables_lists'} = {
         {
           'contents' => [
             {
-              'contents' => [
-                {
-                  'text' => '\\input texinfo.tex
+              'text' => '\\input texinfo.tex
 ',
-                  'type' => 'text_before_beginning'
-                }
-              ],
-              'type' => 'preamble_before_beginning'
-            }
-          ],
-          'type' => 'preamble_before_setfilename'
-        },
-        {
-          'contents' => [
-            {
-              'args' => [
-                {
-                  'contents' => [
-                    {
-                      'text' => 'indices_in_begin_tables_lists.info'
-                    }
-                  ],
-                  'info' => {
-                    'spaces_after_argument' => {
-                      'text' => '
-'
-                    }
-                  },
-                  'type' => 'line_arg'
-                }
-              ],
-              'cmdname' => 'setfilename',
-              'extra' => {
-                'text_arg' => 'indices_in_begin_tables_lists.info'
-              },
-              'info' => {
-                'spaces_before_argument' => {
-                  'text' => ' '
-                }
-              },
-              'source_info' => {
-                'file_name' => 'indices_in_begin_tables_lists.texi',
-                'line_nr' => 2,
-                'macro' => ''
-              }
+              'type' => 'text_before_beginning'
             },
             {
               'text' => '
 ',
-              'type' => 'empty_line'
+              'type' => 'text_before_beginning'
             }
           ],
+          'type' => 'preamble_before_beginning'
+        },
+        {
+          'contents' => [],
           'type' => 'preamble_before_content'
         }
       ],
@@ -108,7 +70,7 @@ $result_trees{'indices_in_begin_tables_lists'} = {
       },
       'source_info' => {
         'file_name' => 'indices_in_begin_tables_lists.texi',
-        'line_nr' => 4,
+        'line_nr' => 3,
         'macro' => ''
       }
     },
@@ -145,7 +107,7 @@ $result_trees{'indices_in_begin_tables_lists'} = {
       },
       'source_info' => {
         'file_name' => 'indices_in_begin_tables_lists.texi',
-        'line_nr' => 5,
+        'line_nr' => 4,
         'macro' => ''
       }
     },
@@ -188,7 +150,7 @@ $result_trees{'indices_in_begin_tables_lists'} = {
       },
       'source_info' => {
         'file_name' => 'indices_in_begin_tables_lists.texi',
-        'line_nr' => 7,
+        'line_nr' => 6,
         'macro' => ''
       }
     },
@@ -224,7 +186,7 @@ $result_trees{'indices_in_begin_tables_lists'} = {
                   'cmdname' => 'minus',
                   'source_info' => {
                     'file_name' => 'indices_in_begin_tables_lists.texi',
-                    'line_nr' => 10,
+                    'line_nr' => 9,
                     'macro' => ''
                   },
                   'type' => 'command_as_argument'
@@ -298,7 +260,7 @@ $result_trees{'indices_in_begin_tables_lists'} = {
                   },
                   'source_info' => {
                     'file_name' => 'indices_in_begin_tables_lists.texi',
-                    'line_nr' => 12,
+                    'line_nr' => 11,
                     'macro' => ''
                   },
                   'type' => 'index_entry_command'
@@ -328,7 +290,7 @@ $result_trees{'indices_in_begin_tables_lists'} = {
               },
               'source_info' => {
                 'file_name' => 'indices_in_begin_tables_lists.texi',
-                'line_nr' => 13,
+                'line_nr' => 12,
                 'macro' => ''
               }
             },
@@ -360,7 +322,7 @@ $result_trees{'indices_in_begin_tables_lists'} = {
               },
               'source_info' => {
                 'file_name' => 'indices_in_begin_tables_lists.texi',
-                'line_nr' => 14,
+                'line_nr' => 13,
                 'macro' => ''
               }
             }
@@ -375,7 +337,7 @@ $result_trees{'indices_in_begin_tables_lists'} = {
           },
           'source_info' => {
             'file_name' => 'indices_in_begin_tables_lists.texi',
-            'line_nr' => 10,
+            'line_nr' => 9,
             'macro' => ''
           }
         },
@@ -392,7 +354,7 @@ $result_trees{'indices_in_begin_tables_lists'} = {
                   'cmdname' => 'bullet',
                   'source_info' => {
                     'file_name' => 'indices_in_begin_tables_lists.texi',
-                    'line_nr' => 16,
+                    'line_nr' => 15,
                     'macro' => ''
                   },
                   'type' => 'command_as_argument'
@@ -450,7 +412,7 @@ $result_trees{'indices_in_begin_tables_lists'} = {
                   },
                   'source_info' => {
                     'file_name' => 'indices_in_begin_tables_lists.texi',
-                    'line_nr' => 17,
+                    'line_nr' => 16,
                     'macro' => ''
                   },
                   'type' => 'index_entry_command'
@@ -480,7 +442,7 @@ $result_trees{'indices_in_begin_tables_lists'} = {
               },
               'source_info' => {
                 'file_name' => 'indices_in_begin_tables_lists.texi',
-                'line_nr' => 18,
+                'line_nr' => 17,
                 'macro' => ''
               }
             },
@@ -536,7 +498,7 @@ $result_trees{'indices_in_begin_tables_lists'} = {
                   },
                   'source_info' => {
                     'file_name' => 'indices_in_begin_tables_lists.texi',
-                    'line_nr' => 19,
+                    'line_nr' => 18,
                     'macro' => ''
                   },
                   'type' => 'index_entry_command'
@@ -556,7 +518,7 @@ $result_trees{'indices_in_begin_tables_lists'} = {
               },
               'source_info' => {
                 'file_name' => 'indices_in_begin_tables_lists.texi',
-                'line_nr' => 19,
+                'line_nr' => 18,
                 'macro' => ''
               }
             },
@@ -588,7 +550,7 @@ $result_trees{'indices_in_begin_tables_lists'} = {
               },
               'source_info' => {
                 'file_name' => 'indices_in_begin_tables_lists.texi',
-                'line_nr' => 21,
+                'line_nr' => 20,
                 'macro' => ''
               }
             }
@@ -603,7 +565,7 @@ $result_trees{'indices_in_begin_tables_lists'} = {
           },
           'source_info' => {
             'file_name' => 'indices_in_begin_tables_lists.texi',
-            'line_nr' => 16,
+            'line_nr' => 15,
             'macro' => ''
           }
         },
@@ -695,7 +657,7 @@ $result_trees{'indices_in_begin_tables_lists'} = {
                       },
                       'source_info' => {
                         'file_name' => 'indices_in_begin_tables_lists.texi',
-                        'line_nr' => 26,
+                        'line_nr' => 25,
                         'macro' => ''
                       },
                       'type' => 'index_entry_command'
@@ -728,7 +690,7 @@ $result_trees{'indices_in_begin_tables_lists'} = {
               },
               'source_info' => {
                 'file_name' => 'indices_in_begin_tables_lists.texi',
-                'line_nr' => 27,
+                'line_nr' => 26,
                 'macro' => ''
               }
             },
@@ -760,7 +722,7 @@ $result_trees{'indices_in_begin_tables_lists'} = {
               },
               'source_info' => {
                 'file_name' => 'indices_in_begin_tables_lists.texi',
-                'line_nr' => 28,
+                'line_nr' => 27,
                 'macro' => ''
               }
             }
@@ -770,7 +732,7 @@ $result_trees{'indices_in_begin_tables_lists'} = {
           },
           'source_info' => {
             'file_name' => 'indices_in_begin_tables_lists.texi',
-            'line_nr' => 23,
+            'line_nr' => 22,
             'macro' => ''
           }
         },
@@ -841,7 +803,7 @@ $result_trees{'indices_in_begin_tables_lists'} = {
               },
               'source_info' => {
                 'file_name' => 'indices_in_begin_tables_lists.texi',
-                'line_nr' => 33,
+                'line_nr' => 32,
                 'macro' => ''
               }
             },
@@ -873,7 +835,7 @@ $result_trees{'indices_in_begin_tables_lists'} = {
               },
               'source_info' => {
                 'file_name' => 'indices_in_begin_tables_lists.texi',
-                'line_nr' => 34,
+                'line_nr' => 33,
                 'macro' => ''
               }
             }
@@ -883,7 +845,7 @@ $result_trees{'indices_in_begin_tables_lists'} = {
           },
           'source_info' => {
             'file_name' => 'indices_in_begin_tables_lists.texi',
-            'line_nr' => 30,
+            'line_nr' => 29,
             'macro' => ''
           }
         },
@@ -952,7 +914,7 @@ $result_trees{'indices_in_begin_tables_lists'} = {
                   },
                   'source_info' => {
                     'file_name' => 'indices_in_begin_tables_lists.texi',
-                    'line_nr' => 38,
+                    'line_nr' => 37,
                     'macro' => ''
                   },
                   'type' => 'index_entry_command'
@@ -987,7 +949,7 @@ $result_trees{'indices_in_begin_tables_lists'} = {
               },
               'source_info' => {
                 'file_name' => 'indices_in_begin_tables_lists.texi',
-                'line_nr' => 40,
+                'line_nr' => 39,
                 'macro' => ''
               }
             },
@@ -1019,7 +981,7 @@ $result_trees{'indices_in_begin_tables_lists'} = {
               },
               'source_info' => {
                 'file_name' => 'indices_in_begin_tables_lists.texi',
-                'line_nr' => 41,
+                'line_nr' => 40,
                 'macro' => ''
               }
             }
@@ -1029,7 +991,7 @@ $result_trees{'indices_in_begin_tables_lists'} = {
           },
           'source_info' => {
             'file_name' => 'indices_in_begin_tables_lists.texi',
-            'line_nr' => 36,
+            'line_nr' => 35,
             'macro' => ''
           }
         },
@@ -1098,7 +1060,7 @@ $result_trees{'indices_in_begin_tables_lists'} = {
                   },
                   'source_info' => {
                     'file_name' => 'indices_in_begin_tables_lists.texi',
-                    'line_nr' => 45,
+                    'line_nr' => 44,
                     'macro' => ''
                   },
                   'type' => 'index_entry_command'
@@ -1128,7 +1090,7 @@ $result_trees{'indices_in_begin_tables_lists'} = {
               },
               'source_info' => {
                 'file_name' => 'indices_in_begin_tables_lists.texi',
-                'line_nr' => 46,
+                'line_nr' => 45,
                 'macro' => ''
               }
             },
@@ -1160,7 +1122,7 @@ $result_trees{'indices_in_begin_tables_lists'} = {
               },
               'source_info' => {
                 'file_name' => 'indices_in_begin_tables_lists.texi',
-                'line_nr' => 47,
+                'line_nr' => 46,
                 'macro' => ''
               }
             }
@@ -1170,7 +1132,7 @@ $result_trees{'indices_in_begin_tables_lists'} = {
           },
           'source_info' => {
             'file_name' => 'indices_in_begin_tables_lists.texi',
-            'line_nr' => 43,
+            'line_nr' => 42,
             'macro' => ''
           }
         },
@@ -1234,7 +1196,7 @@ $result_trees{'indices_in_begin_tables_lists'} = {
                   },
                   'source_info' => {
                     'file_name' => 'indices_in_begin_tables_lists.texi',
-                    'line_nr' => 50,
+                    'line_nr' => 49,
                     'macro' => ''
                   },
                   'type' => 'index_entry_command'
@@ -1269,7 +1231,7 @@ $result_trees{'indices_in_begin_tables_lists'} = {
               },
               'source_info' => {
                 'file_name' => 'indices_in_begin_tables_lists.texi',
-                'line_nr' => 52,
+                'line_nr' => 51,
                 'macro' => ''
               }
             },
@@ -1301,7 +1263,7 @@ $result_trees{'indices_in_begin_tables_lists'} = {
               },
               'source_info' => {
                 'file_name' => 'indices_in_begin_tables_lists.texi',
-                'line_nr' => 53,
+                'line_nr' => 52,
                 'macro' => ''
               }
             }
@@ -1311,7 +1273,7 @@ $result_trees{'indices_in_begin_tables_lists'} = {
           },
           'source_info' => {
             'file_name' => 'indices_in_begin_tables_lists.texi',
-            'line_nr' => 49,
+            'line_nr' => 48,
             'macro' => ''
           }
         },
@@ -1381,7 +1343,7 @@ $result_trees{'indices_in_begin_tables_lists'} = {
                       },
                       'source_info' => {
                         'file_name' => 'indices_in_begin_tables_lists.texi',
-                        'line_nr' => 57,
+                        'line_nr' => 56,
                         'macro' => ''
                       },
                       'type' => 'index_entry_command'
@@ -1414,7 +1376,7 @@ $result_trees{'indices_in_begin_tables_lists'} = {
               },
               'source_info' => {
                 'file_name' => 'indices_in_begin_tables_lists.texi',
-                'line_nr' => 58,
+                'line_nr' => 57,
                 'macro' => ''
               }
             },
@@ -1446,7 +1408,7 @@ $result_trees{'indices_in_begin_tables_lists'} = {
               },
               'source_info' => {
                 'file_name' => 'indices_in_begin_tables_lists.texi',
-                'line_nr' => 59,
+                'line_nr' => 58,
                 'macro' => ''
               }
             }
@@ -1456,7 +1418,7 @@ $result_trees{'indices_in_begin_tables_lists'} = {
           },
           'source_info' => {
             'file_name' => 'indices_in_begin_tables_lists.texi',
-            'line_nr' => 55,
+            'line_nr' => 54,
             'macro' => ''
           }
         },
@@ -1520,7 +1482,7 @@ $result_trees{'indices_in_begin_tables_lists'} = {
                   },
                   'source_info' => {
                     'file_name' => 'indices_in_begin_tables_lists.texi',
-                    'line_nr' => 62,
+                    'line_nr' => 61,
                     'macro' => ''
                   },
                   'type' => 'index_entry_command'
@@ -1580,7 +1542,7 @@ $result_trees{'indices_in_begin_tables_lists'} = {
                   },
                   'source_info' => {
                     'file_name' => 'indices_in_begin_tables_lists.texi',
-                    'line_nr' => 64,
+                    'line_nr' => 63,
                     'macro' => ''
                   },
                   'type' => 'index_entry_command'
@@ -1624,7 +1586,7 @@ $result_trees{'indices_in_begin_tables_lists'} = {
                   },
                   'source_info' => {
                     'file_name' => 'indices_in_begin_tables_lists.texi',
-                    'line_nr' => 65,
+                    'line_nr' => 64,
                     'macro' => ''
                   },
                   'type' => 'index_entry_command'
@@ -1654,7 +1616,7 @@ $result_trees{'indices_in_begin_tables_lists'} = {
               },
               'source_info' => {
                 'file_name' => 'indices_in_begin_tables_lists.texi',
-                'line_nr' => 66,
+                'line_nr' => 65,
                 'macro' => ''
               }
             },
@@ -1686,7 +1648,7 @@ $result_trees{'indices_in_begin_tables_lists'} = {
               },
               'source_info' => {
                 'file_name' => 'indices_in_begin_tables_lists.texi',
-                'line_nr' => 67,
+                'line_nr' => 66,
                 'macro' => ''
               }
             }
@@ -1696,7 +1658,7 @@ $result_trees{'indices_in_begin_tables_lists'} = {
           },
           'source_info' => {
             'file_name' => 'indices_in_begin_tables_lists.texi',
-            'line_nr' => 61,
+            'line_nr' => 60,
             'macro' => ''
           }
         },
@@ -1713,7 +1675,7 @@ $result_trees{'indices_in_begin_tables_lists'} = {
                   'cmdname' => 'code',
                   'source_info' => {
                     'file_name' => 'indices_in_begin_tables_lists.texi',
-                    'line_nr' => 69,
+                    'line_nr' => 68,
                     'macro' => ''
                   },
                   'type' => 'command_as_argument'
@@ -1789,7 +1751,7 @@ $result_trees{'indices_in_begin_tables_lists'} = {
                       },
                       'source_info' => {
                         'file_name' => 'indices_in_begin_tables_lists.texi',
-                        'line_nr' => 71,
+                        'line_nr' => 70,
                         'macro' => ''
                       }
                     }
@@ -1841,7 +1803,7 @@ $result_trees{'indices_in_begin_tables_lists'} = {
               },
               'source_info' => {
                 'file_name' => 'indices_in_begin_tables_lists.texi',
-                'line_nr' => 73,
+                'line_nr' => 72,
                 'macro' => ''
               }
             }
@@ -1856,7 +1818,7 @@ $result_trees{'indices_in_begin_tables_lists'} = {
           },
           'source_info' => {
             'file_name' => 'indices_in_begin_tables_lists.texi',
-            'line_nr' => 69,
+            'line_nr' => 68,
             'macro' => ''
           }
         },
@@ -1873,7 +1835,7 @@ $result_trees{'indices_in_begin_tables_lists'} = {
                   'cmdname' => 'asis',
                   'source_info' => {
                     'file_name' => 'indices_in_begin_tables_lists.texi',
-                    'line_nr' => 75,
+                    'line_nr' => 74,
                     'macro' => ''
                   },
                   'type' => 'command_as_argument'
@@ -1933,7 +1895,7 @@ $result_trees{'indices_in_begin_tables_lists'} = {
                       },
                       'source_info' => {
                         'file_name' => 'indices_in_begin_tables_lists.texi',
-                        'line_nr' => 76,
+                        'line_nr' => 75,
                         'macro' => ''
                       }
                     },
@@ -1997,7 +1959,7 @@ $result_trees{'indices_in_begin_tables_lists'} = {
                       },
                       'source_info' => {
                         'file_name' => 'indices_in_begin_tables_lists.texi',
-                        'line_nr' => 78,
+                        'line_nr' => 77,
                         'macro' => ''
                       }
                     }
@@ -2049,7 +2011,7 @@ $result_trees{'indices_in_begin_tables_lists'} = {
               },
               'source_info' => {
                 'file_name' => 'indices_in_begin_tables_lists.texi',
-                'line_nr' => 80,
+                'line_nr' => 79,
                 'macro' => ''
               }
             }
@@ -2064,7 +2026,7 @@ $result_trees{'indices_in_begin_tables_lists'} = {
           },
           'source_info' => {
             'file_name' => 'indices_in_begin_tables_lists.texi',
-            'line_nr' => 75,
+            'line_nr' => 74,
             'macro' => ''
           }
         },
@@ -2081,7 +2043,7 @@ $result_trees{'indices_in_begin_tables_lists'} = {
                   'cmdname' => 'var',
                   'source_info' => {
                     'file_name' => 'indices_in_begin_tables_lists.texi',
-                    'line_nr' => 82,
+                    'line_nr' => 81,
                     'macro' => ''
                   },
                   'type' => 'command_as_argument'
@@ -2141,7 +2103,7 @@ $result_trees{'indices_in_begin_tables_lists'} = {
                       },
                       'source_info' => {
                         'file_name' => 'indices_in_begin_tables_lists.texi',
-                        'line_nr' => 83,
+                        'line_nr' => 82,
                         'macro' => ''
                       }
                     },
@@ -2186,7 +2148,7 @@ $result_trees{'indices_in_begin_tables_lists'} = {
                           },
                           'source_info' => {
                             'file_name' => 
'indices_in_begin_tables_lists.texi',
-                            'line_nr' => 84,
+                            'line_nr' => 83,
                             'macro' => ''
                           },
                           'type' => 'index_entry_command'
@@ -2265,7 +2227,7 @@ $result_trees{'indices_in_begin_tables_lists'} = {
                       },
                       'source_info' => {
                         'file_name' => 'indices_in_begin_tables_lists.texi',
-                        'line_nr' => 87,
+                        'line_nr' => 86,
                         'macro' => ''
                       }
                     }
@@ -2332,7 +2294,7 @@ $result_trees{'indices_in_begin_tables_lists'} = {
                       },
                       'source_info' => {
                         'file_name' => 'indices_in_begin_tables_lists.texi',
-                        'line_nr' => 89,
+                        'line_nr' => 88,
                         'macro' => ''
                       }
                     },
@@ -2406,7 +2368,7 @@ $result_trees{'indices_in_begin_tables_lists'} = {
                       },
                       'source_info' => {
                         'file_name' => 'indices_in_begin_tables_lists.texi',
-                        'line_nr' => 93,
+                        'line_nr' => 92,
                         'macro' => ''
                       }
                     }
@@ -2470,7 +2432,7 @@ $result_trees{'indices_in_begin_tables_lists'} = {
               },
               'source_info' => {
                 'file_name' => 'indices_in_begin_tables_lists.texi',
-                'line_nr' => 96,
+                'line_nr' => 95,
                 'macro' => ''
               }
             }
@@ -2485,7 +2447,7 @@ $result_trees{'indices_in_begin_tables_lists'} = {
           },
           'source_info' => {
             'file_name' => 'indices_in_begin_tables_lists.texi',
-            'line_nr' => 82,
+            'line_nr' => 81,
             'macro' => ''
           }
         },
@@ -2502,7 +2464,7 @@ $result_trees{'indices_in_begin_tables_lists'} = {
                   'cmdname' => 'code',
                   'source_info' => {
                     'file_name' => 'indices_in_begin_tables_lists.texi',
-                    'line_nr' => 98,
+                    'line_nr' => 97,
                     'macro' => ''
                   },
                   'type' => 'command_as_argument'
@@ -2562,7 +2524,7 @@ $result_trees{'indices_in_begin_tables_lists'} = {
                       },
                       'source_info' => {
                         'file_name' => 'indices_in_begin_tables_lists.texi',
-                        'line_nr' => 99,
+                        'line_nr' => 98,
                         'macro' => ''
                       },
                       'type' => 'index_entry_command'
@@ -2608,7 +2570,7 @@ $result_trees{'indices_in_begin_tables_lists'} = {
                       },
                       'source_info' => {
                         'file_name' => 'indices_in_begin_tables_lists.texi',
-                        'line_nr' => 101,
+                        'line_nr' => 100,
                         'macro' => ''
                       }
                     }
@@ -2660,7 +2622,7 @@ $result_trees{'indices_in_begin_tables_lists'} = {
               },
               'source_info' => {
                 'file_name' => 'indices_in_begin_tables_lists.texi',
-                'line_nr' => 103,
+                'line_nr' => 102,
                 'macro' => ''
               }
             }
@@ -2675,7 +2637,7 @@ $result_trees{'indices_in_begin_tables_lists'} = {
           },
           'source_info' => {
             'file_name' => 'indices_in_begin_tables_lists.texi',
-            'line_nr' => 98,
+            'line_nr' => 97,
             'macro' => ''
           }
         },
@@ -2692,7 +2654,7 @@ $result_trees{'indices_in_begin_tables_lists'} = {
                   'cmdname' => 'code',
                   'source_info' => {
                     'file_name' => 'indices_in_begin_tables_lists.texi',
-                    'line_nr' => 105,
+                    'line_nr' => 104,
                     'macro' => ''
                   },
                   'type' => 'command_as_argument'
@@ -2750,7 +2712,7 @@ $result_trees{'indices_in_begin_tables_lists'} = {
                   },
                   'source_info' => {
                     'file_name' => 'indices_in_begin_tables_lists.texi',
-                    'line_nr' => 106,
+                    'line_nr' => 105,
                     'macro' => ''
                   },
                   'type' => 'index_entry_command'
@@ -2796,7 +2758,7 @@ $result_trees{'indices_in_begin_tables_lists'} = {
                       },
                       'source_info' => {
                         'file_name' => 'indices_in_begin_tables_lists.texi',
-                        'line_nr' => 108,
+                        'line_nr' => 107,
                         'macro' => ''
                       }
                     }
@@ -2834,7 +2796,7 @@ $result_trees{'indices_in_begin_tables_lists'} = {
               },
               'source_info' => {
                 'file_name' => 'indices_in_begin_tables_lists.texi',
-                'line_nr' => 109,
+                'line_nr' => 108,
                 'macro' => ''
               }
             }
@@ -2849,7 +2811,7 @@ $result_trees{'indices_in_begin_tables_lists'} = {
           },
           'source_info' => {
             'file_name' => 'indices_in_begin_tables_lists.texi',
-            'line_nr' => 105,
+            'line_nr' => 104,
             'macro' => ''
           }
         },
@@ -2866,7 +2828,7 @@ $result_trees{'indices_in_begin_tables_lists'} = {
                   'cmdname' => 'samp',
                   'source_info' => {
                     'file_name' => 'indices_in_begin_tables_lists.texi',
-                    'line_nr' => 111,
+                    'line_nr' => 110,
                     'macro' => ''
                   },
                   'type' => 'command_as_argument'
@@ -2926,7 +2888,7 @@ $result_trees{'indices_in_begin_tables_lists'} = {
                       },
                       'source_info' => {
                         'file_name' => 'indices_in_begin_tables_lists.texi',
-                        'line_nr' => 112,
+                        'line_nr' => 111,
                         'macro' => ''
                       },
                       'type' => 'index_entry_command'
@@ -2972,7 +2934,7 @@ $result_trees{'indices_in_begin_tables_lists'} = {
                       },
                       'source_info' => {
                         'file_name' => 'indices_in_begin_tables_lists.texi',
-                        'line_nr' => 114,
+                        'line_nr' => 113,
                         'macro' => ''
                       }
                     }
@@ -3024,7 +2986,7 @@ $result_trees{'indices_in_begin_tables_lists'} = {
               },
               'source_info' => {
                 'file_name' => 'indices_in_begin_tables_lists.texi',
-                'line_nr' => 116,
+                'line_nr' => 115,
                 'macro' => ''
               }
             }
@@ -3039,7 +3001,7 @@ $result_trees{'indices_in_begin_tables_lists'} = {
           },
           'source_info' => {
             'file_name' => 'indices_in_begin_tables_lists.texi',
-            'line_nr' => 111,
+            'line_nr' => 110,
             'macro' => ''
           }
         },
@@ -3056,7 +3018,7 @@ $result_trees{'indices_in_begin_tables_lists'} = {
                   'cmdname' => 'samp',
                   'source_info' => {
                     'file_name' => 'indices_in_begin_tables_lists.texi',
-                    'line_nr' => 118,
+                    'line_nr' => 117,
                     'macro' => ''
                   },
                   'type' => 'command_as_argument'
@@ -3114,7 +3076,7 @@ $result_trees{'indices_in_begin_tables_lists'} = {
                   },
                   'source_info' => {
                     'file_name' => 'indices_in_begin_tables_lists.texi',
-                    'line_nr' => 119,
+                    'line_nr' => 118,
                     'macro' => ''
                   },
                   'type' => 'index_entry_command'
@@ -3160,7 +3122,7 @@ $result_trees{'indices_in_begin_tables_lists'} = {
                       },
                       'source_info' => {
                         'file_name' => 'indices_in_begin_tables_lists.texi',
-                        'line_nr' => 121,
+                        'line_nr' => 120,
                         'macro' => ''
                       }
                     }
@@ -3198,7 +3160,7 @@ $result_trees{'indices_in_begin_tables_lists'} = {
               },
               'source_info' => {
                 'file_name' => 'indices_in_begin_tables_lists.texi',
-                'line_nr' => 122,
+                'line_nr' => 121,
                 'macro' => ''
               }
             }
@@ -3213,7 +3175,7 @@ $result_trees{'indices_in_begin_tables_lists'} = {
           },
           'source_info' => {
             'file_name' => 'indices_in_begin_tables_lists.texi',
-            'line_nr' => 118,
+            'line_nr' => 117,
             'macro' => ''
           }
         },
@@ -3230,7 +3192,7 @@ $result_trees{'indices_in_begin_tables_lists'} = {
                   'cmdname' => 'samp',
                   'source_info' => {
                     'file_name' => 'indices_in_begin_tables_lists.texi',
-                    'line_nr' => 124,
+                    'line_nr' => 123,
                     'macro' => ''
                   },
                   'type' => 'command_as_argument'
@@ -3293,7 +3255,7 @@ $result_trees{'indices_in_begin_tables_lists'} = {
                   },
                   'source_info' => {
                     'file_name' => 'indices_in_begin_tables_lists.texi',
-                    'line_nr' => 126,
+                    'line_nr' => 125,
                     'macro' => ''
                   },
                   'type' => 'index_entry_command'
@@ -3335,7 +3297,7 @@ $result_trees{'indices_in_begin_tables_lists'} = {
                       },
                       'source_info' => {
                         'file_name' => 'indices_in_begin_tables_lists.texi',
-                        'line_nr' => 128,
+                        'line_nr' => 127,
                         'macro' => ''
                       }
                     }
@@ -3373,7 +3335,7 @@ $result_trees{'indices_in_begin_tables_lists'} = {
               },
               'source_info' => {
                 'file_name' => 'indices_in_begin_tables_lists.texi',
-                'line_nr' => 129,
+                'line_nr' => 128,
                 'macro' => ''
               }
             }
@@ -3388,7 +3350,7 @@ $result_trees{'indices_in_begin_tables_lists'} = {
           },
           'source_info' => {
             'file_name' => 'indices_in_begin_tables_lists.texi',
-            'line_nr' => 124,
+            'line_nr' => 123,
             'macro' => ''
           }
         },
@@ -3405,7 +3367,7 @@ $result_trees{'indices_in_begin_tables_lists'} = {
                   'cmdname' => 'samp',
                   'source_info' => {
                     'file_name' => 'indices_in_begin_tables_lists.texi',
-                    'line_nr' => 131,
+                    'line_nr' => 130,
                     'macro' => ''
                   },
                   'type' => 'command_as_argument'
@@ -3463,7 +3425,7 @@ $result_trees{'indices_in_begin_tables_lists'} = {
                   },
                   'source_info' => {
                     'file_name' => 'indices_in_begin_tables_lists.texi',
-                    'line_nr' => 132,
+                    'line_nr' => 131,
                     'macro' => ''
                   },
                   'type' => 'index_entry_command'
@@ -3505,7 +3467,7 @@ $result_trees{'indices_in_begin_tables_lists'} = {
                       },
                       'source_info' => {
                         'file_name' => 'indices_in_begin_tables_lists.texi',
-                        'line_nr' => 134,
+                        'line_nr' => 133,
                         'macro' => ''
                       }
                     }
@@ -3543,7 +3505,7 @@ $result_trees{'indices_in_begin_tables_lists'} = {
               },
               'source_info' => {
                 'file_name' => 'indices_in_begin_tables_lists.texi',
-                'line_nr' => 135,
+                'line_nr' => 134,
                 'macro' => ''
               }
             }
@@ -3558,7 +3520,7 @@ $result_trees{'indices_in_begin_tables_lists'} = {
           },
           'source_info' => {
             'file_name' => 'indices_in_begin_tables_lists.texi',
-            'line_nr' => 131,
+            'line_nr' => 130,
             'macro' => ''
           }
         },
@@ -3575,7 +3537,7 @@ $result_trees{'indices_in_begin_tables_lists'} = {
                   'cmdname' => 'samp',
                   'source_info' => {
                     'file_name' => 'indices_in_begin_tables_lists.texi',
-                    'line_nr' => 137,
+                    'line_nr' => 136,
                     'macro' => ''
                   },
                   'type' => 'command_as_argument'
@@ -3645,7 +3607,7 @@ $result_trees{'indices_in_begin_tables_lists'} = {
                       },
                       'source_info' => {
                         'file_name' => 'indices_in_begin_tables_lists.texi',
-                        'line_nr' => 139,
+                        'line_nr' => 138,
                         'macro' => ''
                       },
                       'type' => 'index_entry_command'
@@ -3675,7 +3637,7 @@ $result_trees{'indices_in_begin_tables_lists'} = {
                       },
                       'source_info' => {
                         'file_name' => 'indices_in_begin_tables_lists.texi',
-                        'line_nr' => 140,
+                        'line_nr' => 139,
                         'macro' => ''
                       }
                     }
@@ -3713,7 +3675,7 @@ $result_trees{'indices_in_begin_tables_lists'} = {
               },
               'source_info' => {
                 'file_name' => 'indices_in_begin_tables_lists.texi',
-                'line_nr' => 141,
+                'line_nr' => 140,
                 'macro' => ''
               }
             }
@@ -3728,7 +3690,7 @@ $result_trees{'indices_in_begin_tables_lists'} = {
           },
           'source_info' => {
             'file_name' => 'indices_in_begin_tables_lists.texi',
-            'line_nr' => 137,
+            'line_nr' => 136,
             'macro' => ''
           }
         },
@@ -3745,7 +3707,7 @@ $result_trees{'indices_in_begin_tables_lists'} = {
                   'cmdname' => 'samp',
                   'source_info' => {
                     'file_name' => 'indices_in_begin_tables_lists.texi',
-                    'line_nr' => 143,
+                    'line_nr' => 142,
                     'macro' => ''
                   },
                   'type' => 'command_as_argument'
@@ -3805,7 +3767,7 @@ $result_trees{'indices_in_begin_tables_lists'} = {
                       },
                       'source_info' => {
                         'file_name' => 'indices_in_begin_tables_lists.texi',
-                        'line_nr' => 144,
+                        'line_nr' => 143,
                         'macro' => ''
                       },
                       'type' => 'index_entry_command'
@@ -3865,7 +3827,7 @@ $result_trees{'indices_in_begin_tables_lists'} = {
                       },
                       'source_info' => {
                         'file_name' => 'indices_in_begin_tables_lists.texi',
-                        'line_nr' => 146,
+                        'line_nr' => 145,
                         'macro' => ''
                       },
                       'type' => 'index_entry_command'
@@ -3909,7 +3871,7 @@ $result_trees{'indices_in_begin_tables_lists'} = {
                       },
                       'source_info' => {
                         'file_name' => 'indices_in_begin_tables_lists.texi',
-                        'line_nr' => 147,
+                        'line_nr' => 146,
                         'macro' => ''
                       },
                       'type' => 'index_entry_command'
@@ -3939,7 +3901,7 @@ $result_trees{'indices_in_begin_tables_lists'} = {
                       },
                       'source_info' => {
                         'file_name' => 'indices_in_begin_tables_lists.texi',
-                        'line_nr' => 148,
+                        'line_nr' => 147,
                         'macro' => ''
                       }
                     }
@@ -3977,7 +3939,7 @@ $result_trees{'indices_in_begin_tables_lists'} = {
               },
               'source_info' => {
                 'file_name' => 'indices_in_begin_tables_lists.texi',
-                'line_nr' => 149,
+                'line_nr' => 148,
                 'macro' => ''
               }
             }
@@ -3992,7 +3954,7 @@ $result_trees{'indices_in_begin_tables_lists'} = {
           },
           'source_info' => {
             'file_name' => 'indices_in_begin_tables_lists.texi',
-            'line_nr' => 143,
+            'line_nr' => 142,
             'macro' => ''
           }
         },
@@ -4010,7 +3972,7 @@ $result_trees{'indices_in_begin_tables_lists'} = {
       },
       'source_info' => {
         'file_name' => 'indices_in_begin_tables_lists.texi',
-        'line_nr' => 8,
+        'line_nr' => 7,
         'macro' => ''
       }
     },
@@ -4054,7 +4016,7 @@ $result_trees{'indices_in_begin_tables_lists'} = {
       },
       'source_info' => {
         'file_name' => 'indices_in_begin_tables_lists.texi',
-        'line_nr' => 151,
+        'line_nr' => 150,
         'macro' => ''
       }
     },
@@ -4112,7 +4074,7 @@ $result_trees{'indices_in_begin_tables_lists'} = {
           },
           'source_info' => {
             'file_name' => 'indices_in_begin_tables_lists.texi',
-            'line_nr' => 154,
+            'line_nr' => 153,
             'macro' => ''
           }
         },
@@ -4151,7 +4113,7 @@ $result_trees{'indices_in_begin_tables_lists'} = {
           },
           'source_info' => {
             'file_name' => 'indices_in_begin_tables_lists.texi',
-            'line_nr' => 156,
+            'line_nr' => 155,
             'macro' => ''
           }
         },
@@ -4190,7 +4152,7 @@ $result_trees{'indices_in_begin_tables_lists'} = {
           },
           'source_info' => {
             'file_name' => 'indices_in_begin_tables_lists.texi',
-            'line_nr' => 158,
+            'line_nr' => 157,
             'macro' => ''
           }
         },
@@ -4208,7 +4170,7 @@ $result_trees{'indices_in_begin_tables_lists'} = {
       },
       'source_info' => {
         'file_name' => 'indices_in_begin_tables_lists.texi',
-        'line_nr' => 152,
+        'line_nr' => 151,
         'macro' => ''
       }
     },
@@ -4363,7 +4325,6 @@ 
$result_trees{'indices_in_begin_tables_lists'}{'contents'}[5]{'extra'}{'node_con
 
$result_trees{'indices_in_begin_tables_lists'}{'contents'}[5]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'indices_in_begin_tables_lists'}{'contents'}[5]{'args'}[0]{'contents'}[0];
 
 $result_texis{'indices_in_begin_tables_lists'} = '\\input texinfo.tex
-@setfilename indices_in_begin_tables_lists.info
 
 @node Top
 @top top
@@ -4525,8 +4486,7 @@ Texte before first item samp.
 ';
 
 
-$result_texts{'indices_in_begin_tables_lists'} = '
-top
+$result_texts{'indices_in_begin_tables_lists'} = 'top
 ***
 
 1 chap
diff --git 
a/tp/t/results/converters_tests/indices_in_begin_tables_lists/res_html/indices_in_begin_tables_lists.html
 
b/tp/t/results/converters_tests/indices_in_begin_tables_lists/res_html/indices_in_begin_tables_lists.html
index 527d5feadb..ffbf331146 100644
--- 
a/tp/t/results/converters_tests/indices_in_begin_tables_lists/res_html/indices_in_begin_tables_lists.html
+++ 
b/tp/t/results/converters_tests/indices_in_begin_tables_lists/res_html/indices_in_begin_tables_lists.html
@@ -32,7 +32,6 @@ ul.mark-minus {list-style-type: "\2212"}
 </head>
 
 <body lang="en">
-
 <div class="top-level-extent" id="Top">
 <div class="nav-panel">
 <p>
diff --git 
a/tp/t/results/converters_tests/indices_in_begin_tables_lists/res_latex/indices_in_begin_tables_lists.tex
 
b/tp/t/results/converters_tests/indices_in_begin_tables_lists/res_latex/indices_in_begin_tables_lists.tex
index 07bf9bd456..4fdc497ec1 100644
--- 
a/tp/t/results/converters_tests/indices_in_begin_tables_lists/res_latex/indices_in_begin_tables_lists.tex
+++ 
b/tp/t/results/converters_tests/indices_in_begin_tables_lists/res_latex/indices_in_begin_tables_lists.tex
@@ -60,7 +60,6 @@
 \makeatother
 \pagestyle{single}%
 
-
 \begin{document}
 \label{anchor:Top}%
 \chapter{{chap}}
diff --git 
a/tp/t/results/converters_tests/indices_in_begin_tables_lists/res_xml/indices_in_begin_tables_lists.xml
 
b/tp/t/results/converters_tests/indices_in_begin_tables_lists/res_xml/indices_in_begin_tables_lists.xml
index 146a240757..48f3b2365f 100644
--- 
a/tp/t/results/converters_tests/indices_in_begin_tables_lists/res_xml/indices_in_begin_tables_lists.xml
+++ 
b/tp/t/results/converters_tests/indices_in_begin_tables_lists/res_xml/indices_in_begin_tables_lists.xml
@@ -3,9 +3,8 @@
 <texinfo>
 <filename file="indices_in_begin_tables_lists.xml"></filename>
 <preamblebeforebeginning>\input texinfo.tex
-</preamblebeforebeginning><setfilename 
file="indices_in_begin_tables_lists.info" spaces=" 
">indices_in_begin_tables_lists.info</setfilename>
 
-<node name="Top" spaces=" "><nodename>Top</nodename><nodenext 
automatic="on">chapter</nodenext></node>
+</preamblebeforebeginning><node name="Top" spaces=" 
"><nodename>Top</nodename><nodenext automatic="on">chapter</nodenext></node>
 <top spaces=" "><sectiontitle>top</sectiontitle>
 
 </top>
diff --git 
a/tp/t/results/converters_tests/indices_in_begin_tables_lists_entries_after_item.pl
 
b/tp/t/results/converters_tests/indices_in_begin_tables_lists_entries_after_item.pl
index ce397f6831..365b95f21f 100644
--- 
a/tp/t/results/converters_tests/indices_in_begin_tables_lists_entries_after_item.pl
+++ 
b/tp/t/results/converters_tests/indices_in_begin_tables_lists_entries_after_item.pl
@@ -12,58 +12,20 @@ 
$result_trees{'indices_in_begin_tables_lists_entries_after_item'} = {
         {
           'contents' => [
             {
-              'contents' => [
-                {
-                  'text' => '\\input texinfo.tex
+              'text' => '\\input texinfo.tex
 ',
-                  'type' => 'text_before_beginning'
-                }
-              ],
-              'type' => 'preamble_before_beginning'
-            }
-          ],
-          'type' => 'preamble_before_setfilename'
-        },
-        {
-          'contents' => [
-            {
-              'args' => [
-                {
-                  'contents' => [
-                    {
-                      'text' => 'indices_in_begin_tables_lists.info'
-                    }
-                  ],
-                  'info' => {
-                    'spaces_after_argument' => {
-                      'text' => '
-'
-                    }
-                  },
-                  'type' => 'line_arg'
-                }
-              ],
-              'cmdname' => 'setfilename',
-              'extra' => {
-                'text_arg' => 'indices_in_begin_tables_lists.info'
-              },
-              'info' => {
-                'spaces_before_argument' => {
-                  'text' => ' '
-                }
-              },
-              'source_info' => {
-                'file_name' => 'indices_in_begin_tables_lists.texi',
-                'line_nr' => 2,
-                'macro' => ''
-              }
+              'type' => 'text_before_beginning'
             },
             {
               'text' => '
 ',
-              'type' => 'empty_line'
+              'type' => 'text_before_beginning'
             }
           ],
+          'type' => 'preamble_before_beginning'
+        },
+        {
+          'contents' => [],
           'type' => 'preamble_before_content'
         }
       ],
@@ -108,7 +70,7 @@ 
$result_trees{'indices_in_begin_tables_lists_entries_after_item'} = {
       },
       'source_info' => {
         'file_name' => 'indices_in_begin_tables_lists.texi',
-        'line_nr' => 4,
+        'line_nr' => 3,
         'macro' => ''
       }
     },
@@ -145,7 +107,7 @@ 
$result_trees{'indices_in_begin_tables_lists_entries_after_item'} = {
       },
       'source_info' => {
         'file_name' => 'indices_in_begin_tables_lists.texi',
-        'line_nr' => 5,
+        'line_nr' => 4,
         'macro' => ''
       }
     },
@@ -188,7 +150,7 @@ 
$result_trees{'indices_in_begin_tables_lists_entries_after_item'} = {
       },
       'source_info' => {
         'file_name' => 'indices_in_begin_tables_lists.texi',
-        'line_nr' => 7,
+        'line_nr' => 6,
         'macro' => ''
       }
     },
@@ -224,7 +186,7 @@ 
$result_trees{'indices_in_begin_tables_lists_entries_after_item'} = {
                   'cmdname' => 'minus',
                   'source_info' => {
                     'file_name' => 'indices_in_begin_tables_lists.texi',
-                    'line_nr' => 10,
+                    'line_nr' => 9,
                     'macro' => ''
                   },
                   'type' => 'command_as_argument'
@@ -309,7 +271,7 @@ 
$result_trees{'indices_in_begin_tables_lists_entries_after_item'} = {
                   },
                   'source_info' => {
                     'file_name' => 'indices_in_begin_tables_lists.texi',
-                    'line_nr' => 12,
+                    'line_nr' => 11,
                     'macro' => ''
                   },
                   'type' => 'index_entry_command'
@@ -329,7 +291,7 @@ 
$result_trees{'indices_in_begin_tables_lists_entries_after_item'} = {
               },
               'source_info' => {
                 'file_name' => 'indices_in_begin_tables_lists.texi',
-                'line_nr' => 13,
+                'line_nr' => 12,
                 'macro' => ''
               }
             },
@@ -361,7 +323,7 @@ 
$result_trees{'indices_in_begin_tables_lists_entries_after_item'} = {
               },
               'source_info' => {
                 'file_name' => 'indices_in_begin_tables_lists.texi',
-                'line_nr' => 14,
+                'line_nr' => 13,
                 'macro' => ''
               }
             }
@@ -376,7 +338,7 @@ 
$result_trees{'indices_in_begin_tables_lists_entries_after_item'} = {
           },
           'source_info' => {
             'file_name' => 'indices_in_begin_tables_lists.texi',
-            'line_nr' => 10,
+            'line_nr' => 9,
             'macro' => ''
           }
         },
@@ -393,7 +355,7 @@ 
$result_trees{'indices_in_begin_tables_lists_entries_after_item'} = {
                   'cmdname' => 'bullet',
                   'source_info' => {
                     'file_name' => 'indices_in_begin_tables_lists.texi',
-                    'line_nr' => 16,
+                    'line_nr' => 15,
                     'macro' => ''
                   },
                   'type' => 'command_as_argument'
@@ -461,7 +423,7 @@ 
$result_trees{'indices_in_begin_tables_lists_entries_after_item'} = {
                   },
                   'source_info' => {
                     'file_name' => 'indices_in_begin_tables_lists.texi',
-                    'line_nr' => 17,
+                    'line_nr' => 16,
                     'macro' => ''
                   },
                   'type' => 'index_entry_command'
@@ -481,7 +443,7 @@ 
$result_trees{'indices_in_begin_tables_lists_entries_after_item'} = {
               },
               'source_info' => {
                 'file_name' => 'indices_in_begin_tables_lists.texi',
-                'line_nr' => 18,
+                'line_nr' => 17,
                 'macro' => ''
               }
             },
@@ -537,7 +499,7 @@ 
$result_trees{'indices_in_begin_tables_lists_entries_after_item'} = {
                   },
                   'source_info' => {
                     'file_name' => 'indices_in_begin_tables_lists.texi',
-                    'line_nr' => 19,
+                    'line_nr' => 18,
                     'macro' => ''
                   },
                   'type' => 'index_entry_command'
@@ -557,7 +519,7 @@ 
$result_trees{'indices_in_begin_tables_lists_entries_after_item'} = {
               },
               'source_info' => {
                 'file_name' => 'indices_in_begin_tables_lists.texi',
-                'line_nr' => 19,
+                'line_nr' => 18,
                 'macro' => ''
               }
             },
@@ -589,7 +551,7 @@ 
$result_trees{'indices_in_begin_tables_lists_entries_after_item'} = {
               },
               'source_info' => {
                 'file_name' => 'indices_in_begin_tables_lists.texi',
-                'line_nr' => 21,
+                'line_nr' => 20,
                 'macro' => ''
               }
             }
@@ -604,7 +566,7 @@ 
$result_trees{'indices_in_begin_tables_lists_entries_after_item'} = {
           },
           'source_info' => {
             'file_name' => 'indices_in_begin_tables_lists.texi',
-            'line_nr' => 16,
+            'line_nr' => 15,
             'macro' => ''
           }
         },
@@ -710,7 +672,7 @@ 
$result_trees{'indices_in_begin_tables_lists_entries_after_item'} = {
                   },
                   'source_info' => {
                     'file_name' => 'indices_in_begin_tables_lists.texi',
-                    'line_nr' => 26,
+                    'line_nr' => 25,
                     'macro' => ''
                   },
                   'type' => 'index_entry_command'
@@ -730,7 +692,7 @@ 
$result_trees{'indices_in_begin_tables_lists_entries_after_item'} = {
               },
               'source_info' => {
                 'file_name' => 'indices_in_begin_tables_lists.texi',
-                'line_nr' => 27,
+                'line_nr' => 26,
                 'macro' => ''
               }
             },
@@ -762,7 +724,7 @@ 
$result_trees{'indices_in_begin_tables_lists_entries_after_item'} = {
               },
               'source_info' => {
                 'file_name' => 'indices_in_begin_tables_lists.texi',
-                'line_nr' => 28,
+                'line_nr' => 27,
                 'macro' => ''
               }
             }
@@ -772,7 +734,7 @@ 
$result_trees{'indices_in_begin_tables_lists_entries_after_item'} = {
           },
           'source_info' => {
             'file_name' => 'indices_in_begin_tables_lists.texi',
-            'line_nr' => 23,
+            'line_nr' => 22,
             'macro' => ''
           }
         },
@@ -843,7 +805,7 @@ 
$result_trees{'indices_in_begin_tables_lists_entries_after_item'} = {
               },
               'source_info' => {
                 'file_name' => 'indices_in_begin_tables_lists.texi',
-                'line_nr' => 33,
+                'line_nr' => 32,
                 'macro' => ''
               }
             },
@@ -875,7 +837,7 @@ 
$result_trees{'indices_in_begin_tables_lists_entries_after_item'} = {
               },
               'source_info' => {
                 'file_name' => 'indices_in_begin_tables_lists.texi',
-                'line_nr' => 34,
+                'line_nr' => 33,
                 'macro' => ''
               }
             }
@@ -885,7 +847,7 @@ 
$result_trees{'indices_in_begin_tables_lists_entries_after_item'} = {
           },
           'source_info' => {
             'file_name' => 'indices_in_begin_tables_lists.texi',
-            'line_nr' => 30,
+            'line_nr' => 29,
             'macro' => ''
           }
         },
@@ -954,7 +916,7 @@ 
$result_trees{'indices_in_begin_tables_lists_entries_after_item'} = {
                   },
                   'source_info' => {
                     'file_name' => 'indices_in_begin_tables_lists.texi',
-                    'line_nr' => 38,
+                    'line_nr' => 37,
                     'macro' => ''
                   },
                   'type' => 'index_entry_command'
@@ -989,7 +951,7 @@ 
$result_trees{'indices_in_begin_tables_lists_entries_after_item'} = {
               },
               'source_info' => {
                 'file_name' => 'indices_in_begin_tables_lists.texi',
-                'line_nr' => 40,
+                'line_nr' => 39,
                 'macro' => ''
               }
             },
@@ -1021,7 +983,7 @@ 
$result_trees{'indices_in_begin_tables_lists_entries_after_item'} = {
               },
               'source_info' => {
                 'file_name' => 'indices_in_begin_tables_lists.texi',
-                'line_nr' => 41,
+                'line_nr' => 40,
                 'macro' => ''
               }
             }
@@ -1031,7 +993,7 @@ 
$result_trees{'indices_in_begin_tables_lists_entries_after_item'} = {
           },
           'source_info' => {
             'file_name' => 'indices_in_begin_tables_lists.texi',
-            'line_nr' => 36,
+            'line_nr' => 35,
             'macro' => ''
           }
         },
@@ -1111,7 +1073,7 @@ 
$result_trees{'indices_in_begin_tables_lists_entries_after_item'} = {
                   },
                   'source_info' => {
                     'file_name' => 'indices_in_begin_tables_lists.texi',
-                    'line_nr' => 45,
+                    'line_nr' => 44,
                     'macro' => ''
                   },
                   'type' => 'index_entry_command'
@@ -1131,7 +1093,7 @@ 
$result_trees{'indices_in_begin_tables_lists_entries_after_item'} = {
               },
               'source_info' => {
                 'file_name' => 'indices_in_begin_tables_lists.texi',
-                'line_nr' => 46,
+                'line_nr' => 45,
                 'macro' => ''
               }
             },
@@ -1163,7 +1125,7 @@ 
$result_trees{'indices_in_begin_tables_lists_entries_after_item'} = {
               },
               'source_info' => {
                 'file_name' => 'indices_in_begin_tables_lists.texi',
-                'line_nr' => 47,
+                'line_nr' => 46,
                 'macro' => ''
               }
             }
@@ -1173,7 +1135,7 @@ 
$result_trees{'indices_in_begin_tables_lists_entries_after_item'} = {
           },
           'source_info' => {
             'file_name' => 'indices_in_begin_tables_lists.texi',
-            'line_nr' => 43,
+            'line_nr' => 42,
             'macro' => ''
           }
         },
@@ -1237,7 +1199,7 @@ 
$result_trees{'indices_in_begin_tables_lists_entries_after_item'} = {
                   },
                   'source_info' => {
                     'file_name' => 'indices_in_begin_tables_lists.texi',
-                    'line_nr' => 50,
+                    'line_nr' => 49,
                     'macro' => ''
                   },
                   'type' => 'index_entry_command'
@@ -1272,7 +1234,7 @@ 
$result_trees{'indices_in_begin_tables_lists_entries_after_item'} = {
               },
               'source_info' => {
                 'file_name' => 'indices_in_begin_tables_lists.texi',
-                'line_nr' => 52,
+                'line_nr' => 51,
                 'macro' => ''
               }
             },
@@ -1304,7 +1266,7 @@ 
$result_trees{'indices_in_begin_tables_lists_entries_after_item'} = {
               },
               'source_info' => {
                 'file_name' => 'indices_in_begin_tables_lists.texi',
-                'line_nr' => 53,
+                'line_nr' => 52,
                 'macro' => ''
               }
             }
@@ -1314,7 +1276,7 @@ 
$result_trees{'indices_in_begin_tables_lists_entries_after_item'} = {
           },
           'source_info' => {
             'file_name' => 'indices_in_begin_tables_lists.texi',
-            'line_nr' => 49,
+            'line_nr' => 48,
             'macro' => ''
           }
         },
@@ -1398,7 +1360,7 @@ 
$result_trees{'indices_in_begin_tables_lists_entries_after_item'} = {
                   },
                   'source_info' => {
                     'file_name' => 'indices_in_begin_tables_lists.texi',
-                    'line_nr' => 57,
+                    'line_nr' => 56,
                     'macro' => ''
                   },
                   'type' => 'index_entry_command'
@@ -1418,7 +1380,7 @@ 
$result_trees{'indices_in_begin_tables_lists_entries_after_item'} = {
               },
               'source_info' => {
                 'file_name' => 'indices_in_begin_tables_lists.texi',
-                'line_nr' => 58,
+                'line_nr' => 57,
                 'macro' => ''
               }
             },
@@ -1450,7 +1412,7 @@ 
$result_trees{'indices_in_begin_tables_lists_entries_after_item'} = {
               },
               'source_info' => {
                 'file_name' => 'indices_in_begin_tables_lists.texi',
-                'line_nr' => 59,
+                'line_nr' => 58,
                 'macro' => ''
               }
             }
@@ -1460,7 +1422,7 @@ 
$result_trees{'indices_in_begin_tables_lists_entries_after_item'} = {
           },
           'source_info' => {
             'file_name' => 'indices_in_begin_tables_lists.texi',
-            'line_nr' => 55,
+            'line_nr' => 54,
             'macro' => ''
           }
         },
@@ -1534,7 +1496,7 @@ 
$result_trees{'indices_in_begin_tables_lists_entries_after_item'} = {
                   },
                   'source_info' => {
                     'file_name' => 'indices_in_begin_tables_lists.texi',
-                    'line_nr' => 62,
+                    'line_nr' => 61,
                     'macro' => ''
                   },
                   'type' => 'index_entry_command'
@@ -1594,7 +1556,7 @@ 
$result_trees{'indices_in_begin_tables_lists_entries_after_item'} = {
                   },
                   'source_info' => {
                     'file_name' => 'indices_in_begin_tables_lists.texi',
-                    'line_nr' => 64,
+                    'line_nr' => 63,
                     'macro' => ''
                   },
                   'type' => 'index_entry_command'
@@ -1638,7 +1600,7 @@ 
$result_trees{'indices_in_begin_tables_lists_entries_after_item'} = {
                   },
                   'source_info' => {
                     'file_name' => 'indices_in_begin_tables_lists.texi',
-                    'line_nr' => 65,
+                    'line_nr' => 64,
                     'macro' => ''
                   },
                   'type' => 'index_entry_command'
@@ -1658,7 +1620,7 @@ 
$result_trees{'indices_in_begin_tables_lists_entries_after_item'} = {
               },
               'source_info' => {
                 'file_name' => 'indices_in_begin_tables_lists.texi',
-                'line_nr' => 66,
+                'line_nr' => 65,
                 'macro' => ''
               }
             },
@@ -1690,7 +1652,7 @@ 
$result_trees{'indices_in_begin_tables_lists_entries_after_item'} = {
               },
               'source_info' => {
                 'file_name' => 'indices_in_begin_tables_lists.texi',
-                'line_nr' => 67,
+                'line_nr' => 66,
                 'macro' => ''
               }
             }
@@ -1700,7 +1662,7 @@ 
$result_trees{'indices_in_begin_tables_lists_entries_after_item'} = {
           },
           'source_info' => {
             'file_name' => 'indices_in_begin_tables_lists.texi',
-            'line_nr' => 61,
+            'line_nr' => 60,
             'macro' => ''
           }
         },
@@ -1717,7 +1679,7 @@ 
$result_trees{'indices_in_begin_tables_lists_entries_after_item'} = {
                   'cmdname' => 'code',
                   'source_info' => {
                     'file_name' => 'indices_in_begin_tables_lists.texi',
-                    'line_nr' => 69,
+                    'line_nr' => 68,
                     'macro' => ''
                   },
                   'type' => 'command_as_argument'
@@ -1793,7 +1755,7 @@ 
$result_trees{'indices_in_begin_tables_lists_entries_after_item'} = {
                       },
                       'source_info' => {
                         'file_name' => 'indices_in_begin_tables_lists.texi',
-                        'line_nr' => 71,
+                        'line_nr' => 70,
                         'macro' => ''
                       }
                     }
@@ -1845,7 +1807,7 @@ 
$result_trees{'indices_in_begin_tables_lists_entries_after_item'} = {
               },
               'source_info' => {
                 'file_name' => 'indices_in_begin_tables_lists.texi',
-                'line_nr' => 73,
+                'line_nr' => 72,
                 'macro' => ''
               }
             }
@@ -1860,7 +1822,7 @@ 
$result_trees{'indices_in_begin_tables_lists_entries_after_item'} = {
           },
           'source_info' => {
             'file_name' => 'indices_in_begin_tables_lists.texi',
-            'line_nr' => 69,
+            'line_nr' => 68,
             'macro' => ''
           }
         },
@@ -1877,7 +1839,7 @@ 
$result_trees{'indices_in_begin_tables_lists_entries_after_item'} = {
                   'cmdname' => 'asis',
                   'source_info' => {
                     'file_name' => 'indices_in_begin_tables_lists.texi',
-                    'line_nr' => 75,
+                    'line_nr' => 74,
                     'macro' => ''
                   },
                   'type' => 'command_as_argument'
@@ -1937,7 +1899,7 @@ 
$result_trees{'indices_in_begin_tables_lists_entries_after_item'} = {
                       },
                       'source_info' => {
                         'file_name' => 'indices_in_begin_tables_lists.texi',
-                        'line_nr' => 76,
+                        'line_nr' => 75,
                         'macro' => ''
                       }
                     },
@@ -2001,7 +1963,7 @@ 
$result_trees{'indices_in_begin_tables_lists_entries_after_item'} = {
                       },
                       'source_info' => {
                         'file_name' => 'indices_in_begin_tables_lists.texi',
-                        'line_nr' => 78,
+                        'line_nr' => 77,
                         'macro' => ''
                       }
                     }
@@ -2053,7 +2015,7 @@ 
$result_trees{'indices_in_begin_tables_lists_entries_after_item'} = {
               },
               'source_info' => {
                 'file_name' => 'indices_in_begin_tables_lists.texi',
-                'line_nr' => 80,
+                'line_nr' => 79,
                 'macro' => ''
               }
             }
@@ -2068,7 +2030,7 @@ 
$result_trees{'indices_in_begin_tables_lists_entries_after_item'} = {
           },
           'source_info' => {
             'file_name' => 'indices_in_begin_tables_lists.texi',
-            'line_nr' => 75,
+            'line_nr' => 74,
             'macro' => ''
           }
         },
@@ -2085,7 +2047,7 @@ 
$result_trees{'indices_in_begin_tables_lists_entries_after_item'} = {
                   'cmdname' => 'var',
                   'source_info' => {
                     'file_name' => 'indices_in_begin_tables_lists.texi',
-                    'line_nr' => 82,
+                    'line_nr' => 81,
                     'macro' => ''
                   },
                   'type' => 'command_as_argument'
@@ -2145,7 +2107,7 @@ 
$result_trees{'indices_in_begin_tables_lists_entries_after_item'} = {
                       },
                       'source_info' => {
                         'file_name' => 'indices_in_begin_tables_lists.texi',
-                        'line_nr' => 83,
+                        'line_nr' => 82,
                         'macro' => ''
                       }
                     },
@@ -2190,7 +2152,7 @@ 
$result_trees{'indices_in_begin_tables_lists_entries_after_item'} = {
                           },
                           'source_info' => {
                             'file_name' => 
'indices_in_begin_tables_lists.texi',
-                            'line_nr' => 84,
+                            'line_nr' => 83,
                             'macro' => ''
                           },
                           'type' => 'index_entry_command'
@@ -2269,7 +2231,7 @@ 
$result_trees{'indices_in_begin_tables_lists_entries_after_item'} = {
                       },
                       'source_info' => {
                         'file_name' => 'indices_in_begin_tables_lists.texi',
-                        'line_nr' => 87,
+                        'line_nr' => 86,
                         'macro' => ''
                       }
                     }
@@ -2336,7 +2298,7 @@ 
$result_trees{'indices_in_begin_tables_lists_entries_after_item'} = {
                       },
                       'source_info' => {
                         'file_name' => 'indices_in_begin_tables_lists.texi',
-                        'line_nr' => 89,
+                        'line_nr' => 88,
                         'macro' => ''
                       }
                     },
@@ -2410,7 +2372,7 @@ 
$result_trees{'indices_in_begin_tables_lists_entries_after_item'} = {
                       },
                       'source_info' => {
                         'file_name' => 'indices_in_begin_tables_lists.texi',
-                        'line_nr' => 93,
+                        'line_nr' => 92,
                         'macro' => ''
                       }
                     }
@@ -2474,7 +2436,7 @@ 
$result_trees{'indices_in_begin_tables_lists_entries_after_item'} = {
               },
               'source_info' => {
                 'file_name' => 'indices_in_begin_tables_lists.texi',
-                'line_nr' => 96,
+                'line_nr' => 95,
                 'macro' => ''
               }
             }
@@ -2489,7 +2451,7 @@ 
$result_trees{'indices_in_begin_tables_lists_entries_after_item'} = {
           },
           'source_info' => {
             'file_name' => 'indices_in_begin_tables_lists.texi',
-            'line_nr' => 82,
+            'line_nr' => 81,
             'macro' => ''
           }
         },
@@ -2506,7 +2468,7 @@ 
$result_trees{'indices_in_begin_tables_lists_entries_after_item'} = {
                   'cmdname' => 'code',
                   'source_info' => {
                     'file_name' => 'indices_in_begin_tables_lists.texi',
-                    'line_nr' => 98,
+                    'line_nr' => 97,
                     'macro' => ''
                   },
                   'type' => 'command_as_argument'
@@ -2566,7 +2528,7 @@ 
$result_trees{'indices_in_begin_tables_lists_entries_after_item'} = {
                       },
                       'source_info' => {
                         'file_name' => 'indices_in_begin_tables_lists.texi',
-                        'line_nr' => 99,
+                        'line_nr' => 98,
                         'macro' => ''
                       },
                       'type' => 'index_entry_command'
@@ -2612,7 +2574,7 @@ 
$result_trees{'indices_in_begin_tables_lists_entries_after_item'} = {
                       },
                       'source_info' => {
                         'file_name' => 'indices_in_begin_tables_lists.texi',
-                        'line_nr' => 101,
+                        'line_nr' => 100,
                         'macro' => ''
                       }
                     }
@@ -2664,7 +2626,7 @@ 
$result_trees{'indices_in_begin_tables_lists_entries_after_item'} = {
               },
               'source_info' => {
                 'file_name' => 'indices_in_begin_tables_lists.texi',
-                'line_nr' => 103,
+                'line_nr' => 102,
                 'macro' => ''
               }
             }
@@ -2679,7 +2641,7 @@ 
$result_trees{'indices_in_begin_tables_lists_entries_after_item'} = {
           },
           'source_info' => {
             'file_name' => 'indices_in_begin_tables_lists.texi',
-            'line_nr' => 98,
+            'line_nr' => 97,
             'macro' => ''
           }
         },
@@ -2696,7 +2658,7 @@ 
$result_trees{'indices_in_begin_tables_lists_entries_after_item'} = {
                   'cmdname' => 'code',
                   'source_info' => {
                     'file_name' => 'indices_in_begin_tables_lists.texi',
-                    'line_nr' => 105,
+                    'line_nr' => 104,
                     'macro' => ''
                   },
                   'type' => 'command_as_argument'
@@ -2754,7 +2716,7 @@ 
$result_trees{'indices_in_begin_tables_lists_entries_after_item'} = {
                   },
                   'source_info' => {
                     'file_name' => 'indices_in_begin_tables_lists.texi',
-                    'line_nr' => 106,
+                    'line_nr' => 105,
                     'macro' => ''
                   },
                   'type' => 'index_entry_command'
@@ -2800,7 +2762,7 @@ 
$result_trees{'indices_in_begin_tables_lists_entries_after_item'} = {
                       },
                       'source_info' => {
                         'file_name' => 'indices_in_begin_tables_lists.texi',
-                        'line_nr' => 108,
+                        'line_nr' => 107,
                         'macro' => ''
                       }
                     }
@@ -2838,7 +2800,7 @@ 
$result_trees{'indices_in_begin_tables_lists_entries_after_item'} = {
               },
               'source_info' => {
                 'file_name' => 'indices_in_begin_tables_lists.texi',
-                'line_nr' => 109,
+                'line_nr' => 108,
                 'macro' => ''
               }
             }
@@ -2853,7 +2815,7 @@ 
$result_trees{'indices_in_begin_tables_lists_entries_after_item'} = {
           },
           'source_info' => {
             'file_name' => 'indices_in_begin_tables_lists.texi',
-            'line_nr' => 105,
+            'line_nr' => 104,
             'macro' => ''
           }
         },
@@ -2870,7 +2832,7 @@ 
$result_trees{'indices_in_begin_tables_lists_entries_after_item'} = {
                   'cmdname' => 'samp',
                   'source_info' => {
                     'file_name' => 'indices_in_begin_tables_lists.texi',
-                    'line_nr' => 111,
+                    'line_nr' => 110,
                     'macro' => ''
                   },
                   'type' => 'command_as_argument'
@@ -2930,7 +2892,7 @@ 
$result_trees{'indices_in_begin_tables_lists_entries_after_item'} = {
                       },
                       'source_info' => {
                         'file_name' => 'indices_in_begin_tables_lists.texi',
-                        'line_nr' => 112,
+                        'line_nr' => 111,
                         'macro' => ''
                       },
                       'type' => 'index_entry_command'
@@ -2976,7 +2938,7 @@ 
$result_trees{'indices_in_begin_tables_lists_entries_after_item'} = {
                       },
                       'source_info' => {
                         'file_name' => 'indices_in_begin_tables_lists.texi',
-                        'line_nr' => 114,
+                        'line_nr' => 113,
                         'macro' => ''
                       }
                     }
@@ -3028,7 +2990,7 @@ 
$result_trees{'indices_in_begin_tables_lists_entries_after_item'} = {
               },
               'source_info' => {
                 'file_name' => 'indices_in_begin_tables_lists.texi',
-                'line_nr' => 116,
+                'line_nr' => 115,
                 'macro' => ''
               }
             }
@@ -3043,7 +3005,7 @@ 
$result_trees{'indices_in_begin_tables_lists_entries_after_item'} = {
           },
           'source_info' => {
             'file_name' => 'indices_in_begin_tables_lists.texi',
-            'line_nr' => 111,
+            'line_nr' => 110,
             'macro' => ''
           }
         },
@@ -3060,7 +3022,7 @@ 
$result_trees{'indices_in_begin_tables_lists_entries_after_item'} = {
                   'cmdname' => 'samp',
                   'source_info' => {
                     'file_name' => 'indices_in_begin_tables_lists.texi',
-                    'line_nr' => 118,
+                    'line_nr' => 117,
                     'macro' => ''
                   },
                   'type' => 'command_as_argument'
@@ -3118,7 +3080,7 @@ 
$result_trees{'indices_in_begin_tables_lists_entries_after_item'} = {
                   },
                   'source_info' => {
                     'file_name' => 'indices_in_begin_tables_lists.texi',
-                    'line_nr' => 119,
+                    'line_nr' => 118,
                     'macro' => ''
                   },
                   'type' => 'index_entry_command'
@@ -3164,7 +3126,7 @@ 
$result_trees{'indices_in_begin_tables_lists_entries_after_item'} = {
                       },
                       'source_info' => {
                         'file_name' => 'indices_in_begin_tables_lists.texi',
-                        'line_nr' => 121,
+                        'line_nr' => 120,
                         'macro' => ''
                       }
                     }
@@ -3202,7 +3164,7 @@ 
$result_trees{'indices_in_begin_tables_lists_entries_after_item'} = {
               },
               'source_info' => {
                 'file_name' => 'indices_in_begin_tables_lists.texi',
-                'line_nr' => 122,
+                'line_nr' => 121,
                 'macro' => ''
               }
             }
@@ -3217,7 +3179,7 @@ 
$result_trees{'indices_in_begin_tables_lists_entries_after_item'} = {
           },
           'source_info' => {
             'file_name' => 'indices_in_begin_tables_lists.texi',
-            'line_nr' => 118,
+            'line_nr' => 117,
             'macro' => ''
           }
         },
@@ -3234,7 +3196,7 @@ 
$result_trees{'indices_in_begin_tables_lists_entries_after_item'} = {
                   'cmdname' => 'samp',
                   'source_info' => {
                     'file_name' => 'indices_in_begin_tables_lists.texi',
-                    'line_nr' => 124,
+                    'line_nr' => 123,
                     'macro' => ''
                   },
                   'type' => 'command_as_argument'
@@ -3297,7 +3259,7 @@ 
$result_trees{'indices_in_begin_tables_lists_entries_after_item'} = {
                   },
                   'source_info' => {
                     'file_name' => 'indices_in_begin_tables_lists.texi',
-                    'line_nr' => 126,
+                    'line_nr' => 125,
                     'macro' => ''
                   },
                   'type' => 'index_entry_command'
@@ -3339,7 +3301,7 @@ 
$result_trees{'indices_in_begin_tables_lists_entries_after_item'} = {
                       },
                       'source_info' => {
                         'file_name' => 'indices_in_begin_tables_lists.texi',
-                        'line_nr' => 128,
+                        'line_nr' => 127,
                         'macro' => ''
                       }
                     }
@@ -3377,7 +3339,7 @@ 
$result_trees{'indices_in_begin_tables_lists_entries_after_item'} = {
               },
               'source_info' => {
                 'file_name' => 'indices_in_begin_tables_lists.texi',
-                'line_nr' => 129,
+                'line_nr' => 128,
                 'macro' => ''
               }
             }
@@ -3392,7 +3354,7 @@ 
$result_trees{'indices_in_begin_tables_lists_entries_after_item'} = {
           },
           'source_info' => {
             'file_name' => 'indices_in_begin_tables_lists.texi',
-            'line_nr' => 124,
+            'line_nr' => 123,
             'macro' => ''
           }
         },
@@ -3409,7 +3371,7 @@ 
$result_trees{'indices_in_begin_tables_lists_entries_after_item'} = {
                   'cmdname' => 'samp',
                   'source_info' => {
                     'file_name' => 'indices_in_begin_tables_lists.texi',
-                    'line_nr' => 131,
+                    'line_nr' => 130,
                     'macro' => ''
                   },
                   'type' => 'command_as_argument'
@@ -3467,7 +3429,7 @@ 
$result_trees{'indices_in_begin_tables_lists_entries_after_item'} = {
                   },
                   'source_info' => {
                     'file_name' => 'indices_in_begin_tables_lists.texi',
-                    'line_nr' => 132,
+                    'line_nr' => 131,
                     'macro' => ''
                   },
                   'type' => 'index_entry_command'
@@ -3509,7 +3471,7 @@ 
$result_trees{'indices_in_begin_tables_lists_entries_after_item'} = {
                       },
                       'source_info' => {
                         'file_name' => 'indices_in_begin_tables_lists.texi',
-                        'line_nr' => 134,
+                        'line_nr' => 133,
                         'macro' => ''
                       }
                     }
@@ -3547,7 +3509,7 @@ 
$result_trees{'indices_in_begin_tables_lists_entries_after_item'} = {
               },
               'source_info' => {
                 'file_name' => 'indices_in_begin_tables_lists.texi',
-                'line_nr' => 135,
+                'line_nr' => 134,
                 'macro' => ''
               }
             }
@@ -3562,7 +3524,7 @@ 
$result_trees{'indices_in_begin_tables_lists_entries_after_item'} = {
           },
           'source_info' => {
             'file_name' => 'indices_in_begin_tables_lists.texi',
-            'line_nr' => 131,
+            'line_nr' => 130,
             'macro' => ''
           }
         },
@@ -3579,7 +3541,7 @@ 
$result_trees{'indices_in_begin_tables_lists_entries_after_item'} = {
                   'cmdname' => 'samp',
                   'source_info' => {
                     'file_name' => 'indices_in_begin_tables_lists.texi',
-                    'line_nr' => 137,
+                    'line_nr' => 136,
                     'macro' => ''
                   },
                   'type' => 'command_as_argument'
@@ -3649,7 +3611,7 @@ 
$result_trees{'indices_in_begin_tables_lists_entries_after_item'} = {
                       },
                       'source_info' => {
                         'file_name' => 'indices_in_begin_tables_lists.texi',
-                        'line_nr' => 139,
+                        'line_nr' => 138,
                         'macro' => ''
                       },
                       'type' => 'index_entry_command'
@@ -3679,7 +3641,7 @@ 
$result_trees{'indices_in_begin_tables_lists_entries_after_item'} = {
                       },
                       'source_info' => {
                         'file_name' => 'indices_in_begin_tables_lists.texi',
-                        'line_nr' => 140,
+                        'line_nr' => 139,
                         'macro' => ''
                       }
                     }
@@ -3717,7 +3679,7 @@ 
$result_trees{'indices_in_begin_tables_lists_entries_after_item'} = {
               },
               'source_info' => {
                 'file_name' => 'indices_in_begin_tables_lists.texi',
-                'line_nr' => 141,
+                'line_nr' => 140,
                 'macro' => ''
               }
             }
@@ -3732,7 +3694,7 @@ 
$result_trees{'indices_in_begin_tables_lists_entries_after_item'} = {
           },
           'source_info' => {
             'file_name' => 'indices_in_begin_tables_lists.texi',
-            'line_nr' => 137,
+            'line_nr' => 136,
             'macro' => ''
           }
         },
@@ -3749,7 +3711,7 @@ 
$result_trees{'indices_in_begin_tables_lists_entries_after_item'} = {
                   'cmdname' => 'samp',
                   'source_info' => {
                     'file_name' => 'indices_in_begin_tables_lists.texi',
-                    'line_nr' => 143,
+                    'line_nr' => 142,
                     'macro' => ''
                   },
                   'type' => 'command_as_argument'
@@ -3809,7 +3771,7 @@ 
$result_trees{'indices_in_begin_tables_lists_entries_after_item'} = {
                       },
                       'source_info' => {
                         'file_name' => 'indices_in_begin_tables_lists.texi',
-                        'line_nr' => 144,
+                        'line_nr' => 143,
                         'macro' => ''
                       },
                       'type' => 'index_entry_command'
@@ -3869,7 +3831,7 @@ 
$result_trees{'indices_in_begin_tables_lists_entries_after_item'} = {
                       },
                       'source_info' => {
                         'file_name' => 'indices_in_begin_tables_lists.texi',
-                        'line_nr' => 146,
+                        'line_nr' => 145,
                         'macro' => ''
                       },
                       'type' => 'index_entry_command'
@@ -3913,7 +3875,7 @@ 
$result_trees{'indices_in_begin_tables_lists_entries_after_item'} = {
                       },
                       'source_info' => {
                         'file_name' => 'indices_in_begin_tables_lists.texi',
-                        'line_nr' => 147,
+                        'line_nr' => 146,
                         'macro' => ''
                       },
                       'type' => 'index_entry_command'
@@ -3943,7 +3905,7 @@ 
$result_trees{'indices_in_begin_tables_lists_entries_after_item'} = {
                       },
                       'source_info' => {
                         'file_name' => 'indices_in_begin_tables_lists.texi',
-                        'line_nr' => 148,
+                        'line_nr' => 147,
                         'macro' => ''
                       }
                     }
@@ -3981,7 +3943,7 @@ 
$result_trees{'indices_in_begin_tables_lists_entries_after_item'} = {
               },
               'source_info' => {
                 'file_name' => 'indices_in_begin_tables_lists.texi',
-                'line_nr' => 149,
+                'line_nr' => 148,
                 'macro' => ''
               }
             }
@@ -3996,7 +3958,7 @@ 
$result_trees{'indices_in_begin_tables_lists_entries_after_item'} = {
           },
           'source_info' => {
             'file_name' => 'indices_in_begin_tables_lists.texi',
-            'line_nr' => 143,
+            'line_nr' => 142,
             'macro' => ''
           }
         },
@@ -4014,7 +3976,7 @@ 
$result_trees{'indices_in_begin_tables_lists_entries_after_item'} = {
       },
       'source_info' => {
         'file_name' => 'indices_in_begin_tables_lists.texi',
-        'line_nr' => 8,
+        'line_nr' => 7,
         'macro' => ''
       }
     },
@@ -4058,7 +4020,7 @@ 
$result_trees{'indices_in_begin_tables_lists_entries_after_item'} = {
       },
       'source_info' => {
         'file_name' => 'indices_in_begin_tables_lists.texi',
-        'line_nr' => 151,
+        'line_nr' => 150,
         'macro' => ''
       }
     },
@@ -4116,7 +4078,7 @@ 
$result_trees{'indices_in_begin_tables_lists_entries_after_item'} = {
           },
           'source_info' => {
             'file_name' => 'indices_in_begin_tables_lists.texi',
-            'line_nr' => 154,
+            'line_nr' => 153,
             'macro' => ''
           }
         },
@@ -4155,7 +4117,7 @@ 
$result_trees{'indices_in_begin_tables_lists_entries_after_item'} = {
           },
           'source_info' => {
             'file_name' => 'indices_in_begin_tables_lists.texi',
-            'line_nr' => 156,
+            'line_nr' => 155,
             'macro' => ''
           }
         },
@@ -4194,7 +4156,7 @@ 
$result_trees{'indices_in_begin_tables_lists_entries_after_item'} = {
           },
           'source_info' => {
             'file_name' => 'indices_in_begin_tables_lists.texi',
-            'line_nr' => 158,
+            'line_nr' => 157,
             'macro' => ''
           }
         },
@@ -4212,7 +4174,7 @@ 
$result_trees{'indices_in_begin_tables_lists_entries_after_item'} = {
       },
       'source_info' => {
         'file_name' => 'indices_in_begin_tables_lists.texi',
-        'line_nr' => 152,
+        'line_nr' => 151,
         'macro' => ''
       }
     },
@@ -4367,7 +4329,6 @@ 
$result_trees{'indices_in_begin_tables_lists_entries_after_item'}{'contents'}[5]
 
$result_trees{'indices_in_begin_tables_lists_entries_after_item'}{'contents'}[5]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'indices_in_begin_tables_lists_entries_after_item'}{'contents'}[5]{'args'}[0]{'contents'}[0];
 
 $result_texis{'indices_in_begin_tables_lists_entries_after_item'} = '\\input 
texinfo.tex
-@setfilename indices_in_begin_tables_lists.info
 
 @node Top
 @top top
@@ -4535,8 +4496,7 @@ Texte before first item samp.
 ';
 
 
-$result_texts{'indices_in_begin_tables_lists_entries_after_item'} = '
-top
+$result_texts{'indices_in_begin_tables_lists_entries_after_item'} = 'top
 ***
 
 1 chap
diff --git 
a/tp/t/results/converters_tests/indices_in_begin_tables_lists_entries_after_item/res_html/indices_in_begin_tables_lists.html
 
b/tp/t/results/converters_tests/indices_in_begin_tables_lists_entries_after_item/res_html/indices_in_begin_tables_lists.html
index ffcfe6a91b..c1cce0eaa5 100644
--- 
a/tp/t/results/converters_tests/indices_in_begin_tables_lists_entries_after_item/res_html/indices_in_begin_tables_lists.html
+++ 
b/tp/t/results/converters_tests/indices_in_begin_tables_lists_entries_after_item/res_html/indices_in_begin_tables_lists.html
@@ -32,7 +32,6 @@ ul.mark-minus {list-style-type: "\2212"}
 </head>
 
 <body lang="en">
-
 <div class="top-level-extent" id="Top">
 <div class="nav-panel">
 <p>
diff --git 
a/tp/t/results/converters_tests/indices_in_begin_tables_lists_entries_after_item/res_latex/indices_in_begin_tables_lists.tex
 
b/tp/t/results/converters_tests/indices_in_begin_tables_lists_entries_after_item/res_latex/indices_in_begin_tables_lists.tex
index 396b047495..d9ae3075f5 100644
--- 
a/tp/t/results/converters_tests/indices_in_begin_tables_lists_entries_after_item/res_latex/indices_in_begin_tables_lists.tex
+++ 
b/tp/t/results/converters_tests/indices_in_begin_tables_lists_entries_after_item/res_latex/indices_in_begin_tables_lists.tex
@@ -60,7 +60,6 @@
 \makeatother
 \pagestyle{single}%
 
-
 \begin{document}
 \label{anchor:Top}%
 \chapter{{chap}}
diff --git 
a/tp/t/results/converters_tests/indices_in_begin_tables_lists_entries_after_item/res_xml/indices_in_begin_tables_lists.xml
 
b/tp/t/results/converters_tests/indices_in_begin_tables_lists_entries_after_item/res_xml/indices_in_begin_tables_lists.xml
index ec9565b53b..3e448f0fde 100644
--- 
a/tp/t/results/converters_tests/indices_in_begin_tables_lists_entries_after_item/res_xml/indices_in_begin_tables_lists.xml
+++ 
b/tp/t/results/converters_tests/indices_in_begin_tables_lists_entries_after_item/res_xml/indices_in_begin_tables_lists.xml
@@ -3,9 +3,8 @@
 <texinfo>
 <filename file="indices_in_begin_tables_lists.xml"></filename>
 <preamblebeforebeginning>\input texinfo.tex
-</preamblebeforebeginning><setfilename 
file="indices_in_begin_tables_lists.info" spaces=" 
">indices_in_begin_tables_lists.info</setfilename>
 
-<node name="Top" spaces=" "><nodename>Top</nodename><nodenext 
automatic="on">chapter</nodenext></node>
+</preamblebeforebeginning><node name="Top" spaces=" 
"><nodename>Top</nodename><nodenext automatic="on">chapter</nodenext></node>
 <top spaces=" "><sectiontitle>top</sectiontitle>
 
 </top>
diff --git a/tp/t/results/sectioning/node_sectop_before_chapter_no_node.pl 
b/tp/t/results/converters_tests/setfilename_no_extension.pl
similarity index 50%
copy from tp/t/results/sectioning/node_sectop_before_chapter_no_node.pl
copy to tp/t/results/converters_tests/setfilename_no_extension.pl
index a700598260..328966b253 100644
--- a/tp/t/results/sectioning/node_sectop_before_chapter_no_node.pl
+++ b/tp/t/results/converters_tests/setfilename_no_extension.pl
@@ -5,7 +5,7 @@ use vars qw(%result_texis %result_texts %result_trees 
%result_errors
 
 use utf8;
 
-$result_trees{'node_sectop_before_chapter_no_node'} = {
+$result_trees{'setfilename_no_extension'} = {
   'contents' => [
     {
       'contents' => [
@@ -16,7 +16,7 @@ $result_trees{'node_sectop_before_chapter_no_node'} = {
                 {
                   'contents' => [
                     {
-                      'text' => 'node_sectop_before_chapter_no_node.info'
+                      'text' => 'setfilename_no_extension'
                     }
                   ],
                   'info' => {
@@ -30,7 +30,7 @@ $result_trees{'node_sectop_before_chapter_no_node'} = {
               ],
               'cmdname' => 'setfilename',
               'extra' => {
-                'text_arg' => 'node_sectop_before_chapter_no_node.info'
+                'text_arg' => 'setfilename_no_extension'
               },
               'info' => {
                 'spaces_before_argument' => {
@@ -102,7 +102,7 @@ $result_trees{'node_sectop_before_chapter_no_node'} = {
         {
           'contents' => [
             {
-              'text' => 'top section'
+              'text' => 'top'
             }
           ],
           'info' => {
@@ -151,7 +151,37 @@ $result_trees{'node_sectop_before_chapter_no_node'} = {
           'type' => 'line_arg'
         }
       ],
-      'cmdname' => 'chapter',
+      'cmdname' => 'node',
+      'contents' => [
+        {
+          'text' => '
+',
+          'type' => 'empty_line'
+        },
+        {
+          'contents' => [
+            {
+              'text' => 'Text.
+'
+            }
+          ],
+          'type' => 'paragraph'
+        }
+      ],
+      'extra' => {
+        'node_content' => [
+          {}
+        ],
+        'nodes_manuals' => [
+          {
+            'node_content' => [
+              {}
+            ],
+            'normalized' => 'chap'
+          }
+        ],
+        'normalized' => 'chap'
+      },
       'info' => {
         'spaces_before_argument' => {
           'text' => ' '
@@ -166,27 +196,31 @@ $result_trees{'node_sectop_before_chapter_no_node'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'node_sectop_before_chapter_no_node'}{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'node_sectop_before_chapter_no_node'}{'contents'}[1]{'args'}[0]{'contents'}[0];
-$result_trees{'node_sectop_before_chapter_no_node'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'node_sectop_before_chapter_no_node'}{'contents'}[1]{'args'}[0]{'contents'}[0];
+$result_trees{'setfilename_no_extension'}{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'setfilename_no_extension'}{'contents'}[1]{'args'}[0]{'contents'}[0];
+$result_trees{'setfilename_no_extension'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'setfilename_no_extension'}{'contents'}[1]{'args'}[0]{'contents'}[0];
+$result_trees{'setfilename_no_extension'}{'contents'}[3]{'extra'}{'node_content'}[0]
 = 
$result_trees{'setfilename_no_extension'}{'contents'}[3]{'args'}[0]{'contents'}[0];
+$result_trees{'setfilename_no_extension'}{'contents'}[3]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'setfilename_no_extension'}{'contents'}[3]{'args'}[0]{'contents'}[0];
 
-$result_texis{'node_sectop_before_chapter_no_node'} = '@setfilename 
node_sectop_before_chapter_no_node.info
+$result_texis{'setfilename_no_extension'} = '@setfilename 
setfilename_no_extension
 
 @node Top
-@top top section
+@top top
+
+@node chap
 
-@chapter chap
+Text.
 ';
 
 
-$result_texts{'node_sectop_before_chapter_no_node'} = '
-top section
-***********
+$result_texts{'setfilename_no_extension'} = '
+top
+***
 
-1 chap
-******
+
+Text.
 ';
 
-$result_sectioning{'node_sectop_before_chapter_no_node'} = {
+$result_sectioning{'setfilename_no_extension'} = {
   'structure' => {
     'section_childs' => [
       {
@@ -197,24 +231,12 @@ $result_sectioning{'node_sectop_before_chapter_no_node'} 
= {
             'extra' => {
               'normalized' => 'Top'
             },
-            'info' => {}
+            'info' => {},
+            'structure' => {}
           }
         },
         'info' => {},
         'structure' => {
-          'section_childs' => [
-            {
-              'cmdname' => 'chapter',
-              'info' => {},
-              'structure' => {
-                'section_level' => 1,
-                'section_number' => 1,
-                'section_up' => {},
-                'toplevel_prev' => {},
-                'toplevel_up' => {}
-              }
-            }
-          ],
           'section_level' => 0,
           'section_up' => {}
         }
@@ -223,12 +245,9 @@ $result_sectioning{'node_sectop_before_chapter_no_node'} = 
{
     'section_level' => -1
   }
 };
-$result_sectioning{'node_sectop_before_chapter_no_node'}{'structure'}{'section_childs'}[0]{'structure'}{'section_childs'}[0]{'structure'}{'section_up'}
 = 
$result_sectioning{'node_sectop_before_chapter_no_node'}{'structure'}{'section_childs'}[0];
-$result_sectioning{'node_sectop_before_chapter_no_node'}{'structure'}{'section_childs'}[0]{'structure'}{'section_childs'}[0]{'structure'}{'toplevel_prev'}
 = 
$result_sectioning{'node_sectop_before_chapter_no_node'}{'structure'}{'section_childs'}[0];
-$result_sectioning{'node_sectop_before_chapter_no_node'}{'structure'}{'section_childs'}[0]{'structure'}{'section_childs'}[0]{'structure'}{'toplevel_up'}
 = 
$result_sectioning{'node_sectop_before_chapter_no_node'}{'structure'}{'section_childs'}[0];
-$result_sectioning{'node_sectop_before_chapter_no_node'}{'structure'}{'section_childs'}[0]{'structure'}{'section_up'}
 = $result_sectioning{'node_sectop_before_chapter_no_node'};
+$result_sectioning{'setfilename_no_extension'}{'structure'}{'section_childs'}[0]{'structure'}{'section_up'}
 = $result_sectioning{'setfilename_no_extension'};
 
-$result_nodes{'node_sectop_before_chapter_no_node'} = {
+$result_nodes{'setfilename_no_extension'} = {
   'cmdname' => 'node',
   'extra' => {
     'associated_section' => {
@@ -239,83 +258,35 @@ $result_nodes{'node_sectop_before_chapter_no_node'} = {
     },
     'normalized' => 'Top'
   },
-  'info' => {}
+  'info' => {},
+  'structure' => {
+    'node_next' => {
+      'cmdname' => 'node',
+      'extra' => {
+        'normalized' => 'chap'
+      },
+      'info' => {},
+      'structure' => {
+        'node_prev' => {}
+      }
+    }
+  }
 };
+$result_nodes{'setfilename_no_extension'}{'structure'}{'node_next'}{'structure'}{'node_prev'}
 = $result_nodes{'setfilename_no_extension'};
 
-$result_menus{'node_sectop_before_chapter_no_node'} = {
+$result_menus{'setfilename_no_extension'} = {
   'cmdname' => 'node',
   'extra' => {
     'normalized' => 'Top'
   },
-  'info' => {}
+  'info' => {},
+  'structure' => {}
 };
 
-$result_errors{'node_sectop_before_chapter_no_node'} = [];
-
-
-$result_floats{'node_sectop_before_chapter_no_node'} = {};
-
-
-
-$result_converted{'plaintext'}->{'node_sectop_before_chapter_no_node'} = 'top 
section
-***********
-
-1 chap
-******
-
-';
-
-
-$result_converted{'html'}->{'node_sectop_before_chapter_no_node'} = '<!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>top section</title>
-
-<meta name="description" content="top section">
-<meta name="keywords" content="top section">
-<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">
-<style type="text/css">
-<!--
-a.copiable-link {visibility: hidden; text-decoration: none; line-height: 0em}
-span:hover a.copiable-link {visibility: visible}
--->
-</style>
-
-
-</head>
-
-<body lang="en">
+$result_errors{'setfilename_no_extension'} = [];
 
-<div class="top-level-extent" id="Top">
-<h1 class="top" id="top-section"><span>top section<a class="copiable-link" 
href="#top-section"> &para;</a></span></h1>
 
-<ul class="mini-toc">
-<li><a href="#chap" accesskey="1">chap</a></li>
-</ul>
-<div class="chapter-level-extent" id="chap">
-<h2 class="chapter"><span>1 chap<a class="copiable-link" href="#chap"> 
&para;</a></span></h2>
-</div>
-</div>
+$result_floats{'setfilename_no_extension'} = {};
 
 
-
-</body>
-</html>
-';
-
-
-$result_converted{'docbook'}->{'node_sectop_before_chapter_no_node'} = '';
-
-
-$result_converted{'latex_text'}->{'node_sectop_before_chapter_no_node'} = '
-\\begin{document}
-\\label{anchor:Top}%
-';
-
 1;
diff --git 
a/tp/t/results/converters_tests/setfilename_no_extension/res_docbook/setfilename_no_extension.xml
 
b/tp/t/results/converters_tests/setfilename_no_extension/res_docbook/setfilename_no_extension.xml
new file mode 100644
index 0000000000..b2d7486ff1
--- /dev/null
+++ 
b/tp/t/results/converters_tests/setfilename_no_extension/res_docbook/setfilename_no_extension.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0"?>
+<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" 
"http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd"; [
+  <!ENTITY tex "TeX">
+  <!ENTITY latex "LaTeX">
+]>
+<book id="setfilename_no_extension.xml" lang="">
+<anchor id="chap"/>
+
+<para>Text.
+</para></book>
diff --git 
a/tp/t/results/converters_tests/setfilename_no_extension/res_html/chap.html 
b/tp/t/results/converters_tests/setfilename_no_extension/res_html/chap.html
new file mode 100644
index 0000000000..1bdb5ddf16
--- /dev/null
+++ b/tp/t/results/converters_tests/setfilename_no_extension/res_html/chap.html
@@ -0,0 +1,39 @@
+<!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>chap (top)</title>
+
+<meta name="description" content="chap (top)">
+<meta name="keywords" content="chap (top)">
+<meta name="resource-type" content="document">
+<meta name="distribution" content="global">
+<meta name="viewport" content="width=device-width,initial-scale=1">
+
+<link href="index.html" rel="start" title="Top">
+<link href="index.html" rel="prev" title="Top">
+<style type="text/css">
+<!--
+a.copiable-link {visibility: hidden; text-decoration: none; line-height: 0em}
+span:hover a.copiable-link {visibility: visible}
+-->
+</style>
+
+
+</head>
+
+<body lang="en">
+<a class="node-id" id="chap"></a><div class="nav-panel">
+<p>
+Previous: <a href="index.html" accesskey="p" rel="prev">top</a> &nbsp; </p>
+</div>
+<hr>
+<h4 class="node"><span>chap<a class="copiable-link" href="#chap"> 
&para;</a></span></h4>
+
+<p>Text.
+</p>
+
+
+</body>
+</html>
diff --git 
a/tp/t/results/converters_tests/setfilename_no_extension/res_html/index.html 
b/tp/t/results/converters_tests/setfilename_no_extension/res_html/index.html
new file mode 100644
index 0000000000..29d3094cb2
--- /dev/null
+++ b/tp/t/results/converters_tests/setfilename_no_extension/res_html/index.html
@@ -0,0 +1,46 @@
+<!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>Top (top)</title>
+
+<meta name="description" content="Top (top)">
+<meta name="keywords" content="Top (top)">
+<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="chap.html" rel="next" title="chap">
+<style type="text/css">
+<!--
+a.copiable-link {visibility: hidden; text-decoration: none; line-height: 0em}
+span:hover a.copiable-link {visibility: visible}
+-->
+</style>
+
+
+</head>
+
+<body lang="en">
+
+<div class="top-level-extent" id="Top">
+<div class="nav-panel">
+<p>
+Next: <a href="chap.html" accesskey="n" rel="next">chap</a> &nbsp; </p>
+</div>
+<hr>
+<h1 class="top" id="top"><span>top<a class="copiable-link" href="#top"> 
&para;</a></span></h1>
+
+</div>
+<hr>
+<div class="nav-panel">
+<p>
+Next: <a href="chap.html" accesskey="n" rel="next">chap</a> &nbsp; </p>
+</div>
+
+
+
+</body>
+</html>
diff --git 
a/tp/t/results/converters_tests/setfilename_no_extension/res_info/setfilename_no_extension
 
b/tp/t/results/converters_tests/setfilename_no_extension/res_info/setfilename_no_extension
new file mode 100644
index 0000000000..a66a4ef13b
--- /dev/null
+++ 
b/tp/t/results/converters_tests/setfilename_no_extension/res_info/setfilename_no_extension
@@ -0,0 +1,24 @@
+This is setfilename_no_extension, produced from .
+
+
+File: setfilename_no_extension,  Node: Top,  Next: chap,  Up: (dir)
+
+top
+***
+
+
+File: setfilename_no_extension,  Node: chap,  Prev: Top
+
+Text.
+
+
+Tag Table:
+Node: Top51
+Node: chap131
+
+End Tag Table
+
+
+Local Variables:
+coding: utf-8
+End:
diff --git 
a/tp/t/results/sectioning/node_sectop_before_chapter_no_node/res_latex/node_sectop_before_chapter_no_node.tex
 
b/tp/t/results/converters_tests/setfilename_no_extension/res_latex/setfilename_no_extension.tex
similarity index 98%
copy from 
tp/t/results/sectioning/node_sectop_before_chapter_no_node/res_latex/node_sectop_before_chapter_no_node.tex
copy to 
tp/t/results/converters_tests/setfilename_no_extension/res_latex/setfilename_no_extension.tex
index cd0cc5671f..8f616e6251 100644
--- 
a/tp/t/results/sectioning/node_sectop_before_chapter_no_node/res_latex/node_sectop_before_chapter_no_node.tex
+++ 
b/tp/t/results/converters_tests/setfilename_no_extension/res_latex/setfilename_no_extension.tex
@@ -44,6 +44,7 @@
 
 \begin{document}
 \label{anchor:Top}%
+\label{anchor:chap}%
 
-(`Top' node ignored)
+Text.
 \end{document}
diff --git 
a/tp/t/results/converters_tests/setfilename_no_extension/res_xml/setfilename_no_extension.xml
 
b/tp/t/results/converters_tests/setfilename_no_extension/res_xml/setfilename_no_extension.xml
new file mode 100644
index 0000000000..6491700d35
--- /dev/null
+++ 
b/tp/t/results/converters_tests/setfilename_no_extension/res_xml/setfilename_no_extension.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0"?>
+<!DOCTYPE texinfo PUBLIC "-//GNU//DTD TexinfoML V7.1//EN" 
"http://www.gnu.org/software/texinfo/dtd/7.1/texinfo.dtd";>
+<texinfo>
+<filename file="setfilename_no_extension.xml"></filename>
+<setfilename file="setfilename_no_extension" spaces=" 
">setfilename_no_extension</setfilename>
+
+<node name="Top" spaces=" "><nodename>Top</nodename><nodenext 
automatic="on">chap</nodenext></node>
+<top spaces=" "><sectiontitle>top</sectiontitle>
+
+</top>
+<node name="chap" spaces=" "><nodename>chap</nodename><nodeprev 
automatic="on">Top</nodeprev></node>
+
+<para>Text.
+</para></texinfo>
diff --git a/tp/t/results/coverage/delcomment.pl 
b/tp/t/results/coverage/delcomment.pl
index 70196d58d5..ebf66ae3be 100644
--- a/tp/t/results/coverage/delcomment.pl
+++ b/tp/t/results/coverage/delcomment.pl
@@ -12,57 +12,20 @@ $result_trees{'delcomment'} = {
         {
           'contents' => [
             {
-              'contents' => [
-                {
-                  'text' => '\\input texinfo
+              'text' => '\\input texinfo
 ',
-                  'type' => 'text_before_beginning'
-                }
-              ],
-              'type' => 'preamble_before_beginning'
+              'type' => 'text_before_beginning'
+            },
+            {
+              'text' => '
+',
+              'type' => 'text_before_beginning'
             }
           ],
-          'type' => 'preamble_before_setfilename'
+          'type' => 'preamble_before_beginning'
         },
         {
           'contents' => [
-            {
-              'args' => [
-                {
-                  'contents' => [
-                    {
-                      'text' => 'delcomment.info'
-                    }
-                  ],
-                  'info' => {
-                    'spaces_after_argument' => {
-                      'text' => '
-'
-                    }
-                  },
-                  'type' => 'line_arg'
-                }
-              ],
-              'cmdname' => 'setfilename',
-              'extra' => {
-                'text_arg' => 'delcomment.info'
-              },
-              'info' => {
-                'spaces_before_argument' => {
-                  'text' => ' '
-                }
-              },
-              'source_info' => {
-                'file_name' => 'delcomment.texi',
-                'line_nr' => 2,
-                'macro' => ''
-              }
-            },
-            {
-              'text' => '
-',
-              'type' => 'empty_line'
-            },
             {
               'args' => [
                 {
@@ -148,7 +111,6 @@ $result_trees{'delcomment'} = {
 };
 
 $result_texis{'delcomment'} = '\\input texinfo
-@setfilename delcomment.info
 
 @c this tests both the del comment and a file without
 @c element.
@@ -162,7 +124,6 @@ This line is the only output.
 
 $result_texts{'delcomment'} = '
 
-
 This line is the only output.
 
 ';
diff --git a/tp/t/results/indices/index_no_node_no_top.pl 
b/tp/t/results/indices/index_no_node_no_top.pl
index 3ae5c4cb91..105f3ad6be 100644
--- a/tp/t/results/indices/index_no_node_no_top.pl
+++ b/tp/t/results/indices/index_no_node_no_top.pl
@@ -12,63 +12,20 @@ $result_trees{'index_no_node_no_top'} = {
         {
           'contents' => [
             {
-              'contents' => [
-                {
-                  'text' => '\\input texinfo @c -*-texinfo-*-
-',
-                  'type' => 'text_before_beginning'
-                },
-                {
-                  'text' => '
+              'text' => '\\input texinfo @c -*-texinfo-*-
 ',
-                  'type' => 'text_before_beginning'
-                }
-              ],
-              'type' => 'preamble_before_beginning'
-            }
-          ],
-          'type' => 'preamble_before_setfilename'
-        },
-        {
-          'contents' => [
-            {
-              'args' => [
-                {
-                  'contents' => [
-                    {
-                      'text' => 'index_no_node_no_top.info'
-                    }
-                  ],
-                  'info' => {
-                    'spaces_after_argument' => {
-                      'text' => '
-'
-                    }
-                  },
-                  'type' => 'line_arg'
-                }
-              ],
-              'cmdname' => 'setfilename',
-              'extra' => {
-                'text_arg' => 'index_no_node_no_top.info'
-              },
-              'info' => {
-                'spaces_before_argument' => {
-                  'text' => ' '
-                }
-              },
-              'source_info' => {
-                'file_name' => 'index_no_node_no_top.texi',
-                'line_nr' => 3,
-                'macro' => ''
-              }
+              'type' => 'text_before_beginning'
             },
             {
               'text' => '
 ',
-              'type' => 'empty_line'
+              'type' => 'text_before_beginning'
             }
           ],
+          'type' => 'preamble_before_beginning'
+        },
+        {
+          'contents' => [],
           'type' => 'preamble_before_content'
         },
         {
@@ -109,7 +66,7 @@ $result_trees{'index_no_node_no_top'} = {
           },
           'source_info' => {
             'file_name' => 'index_no_node_no_top.texi',
-            'line_nr' => 5,
+            'line_nr' => 3,
             'macro' => ''
           },
           'type' => 'index_entry_command'
@@ -153,7 +110,7 @@ $result_trees{'index_no_node_no_top'} = {
           },
           'source_info' => {
             'file_name' => 'index_no_node_no_top.texi',
-            'line_nr' => 7,
+            'line_nr' => 5,
             'macro' => ''
           }
         },
@@ -214,7 +171,7 @@ $result_trees{'index_no_node_no_top'} = {
           },
           'source_info' => {
             'file_name' => 'index_no_node_no_top.texi',
-            'line_nr' => 11,
+            'line_nr' => 9,
             'macro' => ''
           }
         },
@@ -261,7 +218,7 @@ $result_trees{'index_no_node_no_top'} = {
           },
           'source_info' => {
             'file_name' => 'index_no_node_no_top.texi',
-            'line_nr' => 13,
+            'line_nr' => 11,
             'macro' => ''
           },
           'type' => 'index_entry_command'
@@ -310,7 +267,7 @@ $result_trees{'index_no_node_no_top'} = {
               },
               'source_info' => {
                 'file_name' => 'index_no_node_no_top.texi',
-                'line_nr' => 15,
+                'line_nr' => 13,
                 'macro' => ''
               },
               'type' => 'index_entry_command'
@@ -353,7 +310,7 @@ $result_trees{'index_no_node_no_top'} = {
           },
           'source_info' => {
             'file_name' => 'index_no_node_no_top.texi',
-            'line_nr' => 17,
+            'line_nr' => 15,
             'macro' => ''
           }
         },
@@ -370,7 +327,7 @@ $result_trees{'index_no_node_no_top'} = {
       },
       'source_info' => {
         'file_name' => 'index_no_node_no_top.texi',
-        'line_nr' => 10,
+        'line_nr' => 8,
         'macro' => ''
       }
     },
@@ -436,7 +393,7 @@ $result_trees{'index_no_node_no_top'} = {
           },
           'source_info' => {
             'file_name' => 'index_no_node_no_top.texi',
-            'line_nr' => 21,
+            'line_nr' => 19,
             'macro' => ''
           },
           'type' => 'index_entry_command'
@@ -479,7 +436,7 @@ $result_trees{'index_no_node_no_top'} = {
           },
           'source_info' => {
             'file_name' => 'index_no_node_no_top.texi',
-            'line_nr' => 22,
+            'line_nr' => 20,
             'macro' => ''
           },
           'type' => 'index_entry_command'
@@ -522,7 +479,7 @@ $result_trees{'index_no_node_no_top'} = {
           },
           'source_info' => {
             'file_name' => 'index_no_node_no_top.texi',
-            'line_nr' => 23,
+            'line_nr' => 21,
             'macro' => ''
           },
           'type' => 'index_entry_command'
@@ -565,7 +522,7 @@ $result_trees{'index_no_node_no_top'} = {
           },
           'source_info' => {
             'file_name' => 'index_no_node_no_top.texi',
-            'line_nr' => 24,
+            'line_nr' => 22,
             'macro' => ''
           },
           'type' => 'index_entry_command'
@@ -608,7 +565,7 @@ $result_trees{'index_no_node_no_top'} = {
           },
           'source_info' => {
             'file_name' => 'index_no_node_no_top.texi',
-            'line_nr' => 25,
+            'line_nr' => 23,
             'macro' => ''
           },
           'type' => 'index_entry_command'
@@ -651,7 +608,7 @@ $result_trees{'index_no_node_no_top'} = {
           },
           'source_info' => {
             'file_name' => 'index_no_node_no_top.texi',
-            'line_nr' => 26,
+            'line_nr' => 24,
             'macro' => ''
           },
           'type' => 'index_entry_command'
@@ -700,7 +657,7 @@ $result_trees{'index_no_node_no_top'} = {
           },
           'source_info' => {
             'file_name' => 'index_no_node_no_top.texi',
-            'line_nr' => 29,
+            'line_nr' => 27,
             'macro' => ''
           }
         },
@@ -747,7 +704,7 @@ $result_trees{'index_no_node_no_top'} = {
           },
           'source_info' => {
             'file_name' => 'index_no_node_no_top.texi',
-            'line_nr' => 31,
+            'line_nr' => 29,
             'macro' => ''
           },
           'type' => 'index_entry_command'
@@ -770,7 +727,7 @@ $result_trees{'index_no_node_no_top'} = {
       },
       'source_info' => {
         'file_name' => 'index_no_node_no_top.texi',
-        'line_nr' => 19,
+        'line_nr' => 17,
         'macro' => ''
       }
     },
@@ -828,7 +785,7 @@ $result_trees{'index_no_node_no_top'} = {
           },
           'source_info' => {
             'file_name' => 'index_no_node_no_top.texi',
-            'line_nr' => 36,
+            'line_nr' => 34,
             'macro' => ''
           }
         },
@@ -870,7 +827,7 @@ $result_trees{'index_no_node_no_top'} = {
           },
           'source_info' => {
             'file_name' => 'index_no_node_no_top.texi',
-            'line_nr' => 37,
+            'line_nr' => 35,
             'macro' => ''
           },
           'type' => 'index_entry_command'
@@ -919,7 +876,7 @@ $result_trees{'index_no_node_no_top'} = {
               },
               'source_info' => {
                 'file_name' => 'index_no_node_no_top.texi',
-                'line_nr' => 39,
+                'line_nr' => 37,
                 'macro' => ''
               },
               'type' => 'index_entry_command'
@@ -962,7 +919,7 @@ $result_trees{'index_no_node_no_top'} = {
           },
           'source_info' => {
             'file_name' => 'index_no_node_no_top.texi',
-            'line_nr' => 41,
+            'line_nr' => 39,
             'macro' => ''
           }
         }
@@ -974,7 +931,7 @@ $result_trees{'index_no_node_no_top'} = {
       },
       'source_info' => {
         'file_name' => 'index_no_node_no_top.texi',
-        'line_nr' => 34,
+        'line_nr' => 32,
         'macro' => ''
       }
     },
@@ -1035,7 +992,7 @@ $result_trees{'index_no_node_no_top'} = {
           },
           'source_info' => {
             'file_name' => 'index_no_node_no_top.texi',
-            'line_nr' => 43,
+            'line_nr' => 41,
             'macro' => ''
           },
           'type' => 'index_entry_command'
@@ -1075,7 +1032,7 @@ $result_trees{'index_no_node_no_top'} = {
           },
           'source_info' => {
             'file_name' => 'index_no_node_no_top.texi',
-            'line_nr' => 45,
+            'line_nr' => 43,
             'macro' => ''
           }
         },
@@ -1123,7 +1080,7 @@ $result_trees{'index_no_node_no_top'} = {
               },
               'source_info' => {
                 'file_name' => 'index_no_node_no_top.texi',
-                'line_nr' => 47,
+                'line_nr' => 45,
                 'macro' => ''
               },
               'type' => 'index_entry_command'
@@ -1144,7 +1101,7 @@ $result_trees{'index_no_node_no_top'} = {
       },
       'source_info' => {
         'file_name' => 'index_no_node_no_top.texi',
-        'line_nr' => 42,
+        'line_nr' => 40,
         'macro' => ''
       }
     },
@@ -1194,7 +1151,7 @@ $result_trees{'index_no_node_no_top'} = {
       },
       'source_info' => {
         'file_name' => 'index_no_node_no_top.texi',
-        'line_nr' => 49,
+        'line_nr' => 47,
         'macro' => ''
       }
     },
@@ -1256,8 +1213,6 @@ 
$result_trees{'index_no_node_no_top'}{'contents'}[4]{'contents'}[3]{'contents'}[
 
 $result_texis{'index_no_node_no_top'} = '\\input texinfo @c -*-texinfo-*-
 
-@setfilename index_no_node_no_top.info
-
 @cindex truc
 Garbage
 @printindex cp
@@ -1310,8 +1265,7 @@ In chapter 2
 ';
 
 
-$result_texts{'index_no_node_no_top'} = '
-Garbage
+$result_texts{'index_no_node_no_top'} = 'Garbage
 
 
 unnumbered
@@ -1419,7 +1373,7 @@ $result_errors{'index_no_node_no_top'} = [
     'error_line' => 'warning: entry for index `cp\' outside of any node
 ',
     'file_name' => 'index_no_node_no_top.texi',
-    'line_nr' => 5,
+    'line_nr' => 3,
     'macro' => '',
     'text' => 'entry for index `cp\' outside of any node',
     'type' => 'warning'
@@ -1428,7 +1382,7 @@ $result_errors{'index_no_node_no_top'} = [
     'error_line' => 'warning: printindex before document beginning: 
@printindex cp
 ',
     'file_name' => 'index_no_node_no_top.texi',
-    'line_nr' => 7,
+    'line_nr' => 5,
     'macro' => '',
     'text' => 'printindex before document beginning: @printindex cp',
     'type' => 'warning'
@@ -1437,7 +1391,7 @@ $result_errors{'index_no_node_no_top'} = [
     'error_line' => 'unknown index `bidule\' in @printindex
 ',
     'file_name' => 'index_no_node_no_top.texi',
-    'line_nr' => 11,
+    'line_nr' => 9,
     'macro' => '',
     'text' => 'unknown index `bidule\' in @printindex',
     'type' => 'error'
@@ -1469,8 +1423,7 @@ $result_indices_sort_strings{'index_no_node_no_top'} = {
 
 
 
-$result_converted{'info'}->{'index_no_node_no_top'} = 'This is 
index_no_node_no_top.info, produced from
-index_no_node_no_top.texi.
+$result_converted{'info'}->{'index_no_node_no_top'} = 'This is , produced from 
index_no_node_no_top.texi.
 
 Garbage
 
@@ -1631,7 +1584,7 @@ 
$result_converted_errors{'info'}->{'index_no_node_no_top'} = [
     'error_line' => 'warning: entry for index `cp\' outside of any node
 ',
     'file_name' => 'index_no_node_no_top.texi',
-    'line_nr' => 43,
+    'line_nr' => 41,
     'macro' => '',
     'text' => 'entry for index `cp\' outside of any node',
     'type' => 'warning'
@@ -1640,7 +1593,7 @@ 
$result_converted_errors{'info'}->{'index_no_node_no_top'} = [
     'error_line' => 'warning: entry for index `cp\' outside of any node
 ',
     'file_name' => 'index_no_node_no_top.texi',
-    'line_nr' => 47,
+    'line_nr' => 45,
     'macro' => '',
     'text' => 'entry for index `cp\' outside of any node',
     'type' => 'warning'
@@ -1649,7 +1602,7 @@ 
$result_converted_errors{'info'}->{'index_no_node_no_top'} = [
     'error_line' => 'warning: entry for index `cp\' outside of any node
 ',
     'file_name' => 'index_no_node_no_top.texi',
-    'line_nr' => 37,
+    'line_nr' => 35,
     'macro' => '',
     'text' => 'entry for index `cp\' outside of any node',
     'type' => 'warning'
@@ -1658,7 +1611,7 @@ 
$result_converted_errors{'info'}->{'index_no_node_no_top'} = [
     'error_line' => 'warning: entry for index `cp\' outside of any node
 ',
     'file_name' => 'index_no_node_no_top.texi',
-    'line_nr' => 39,
+    'line_nr' => 37,
     'macro' => '',
     'text' => 'entry for index `cp\' outside of any node',
     'type' => 'warning'
@@ -1667,7 +1620,7 @@ 
$result_converted_errors{'info'}->{'index_no_node_no_top'} = [
     'error_line' => 'warning: entry for index `cp\' outside of any node
 ',
     'file_name' => 'index_no_node_no_top.texi',
-    'line_nr' => 21,
+    'line_nr' => 19,
     'macro' => '',
     'text' => 'entry for index `cp\' outside of any node',
     'type' => 'warning'
@@ -1676,7 +1629,7 @@ 
$result_converted_errors{'info'}->{'index_no_node_no_top'} = [
     'error_line' => 'warning: entry for index `cp\' outside of any node
 ',
     'file_name' => 'index_no_node_no_top.texi',
-    'line_nr' => 22,
+    'line_nr' => 20,
     'macro' => '',
     'text' => 'entry for index `cp\' outside of any node',
     'type' => 'warning'
@@ -1685,7 +1638,7 @@ 
$result_converted_errors{'info'}->{'index_no_node_no_top'} = [
     'error_line' => 'warning: entry for index `cp\' outside of any node
 ',
     'file_name' => 'index_no_node_no_top.texi',
-    'line_nr' => 23,
+    'line_nr' => 21,
     'macro' => '',
     'text' => 'entry for index `cp\' outside of any node',
     'type' => 'warning'
@@ -1694,7 +1647,7 @@ 
$result_converted_errors{'info'}->{'index_no_node_no_top'} = [
     'error_line' => 'warning: entry for index `cp\' outside of any node
 ',
     'file_name' => 'index_no_node_no_top.texi',
-    'line_nr' => 24,
+    'line_nr' => 22,
     'macro' => '',
     'text' => 'entry for index `cp\' outside of any node',
     'type' => 'warning'
@@ -1703,7 +1656,7 @@ 
$result_converted_errors{'info'}->{'index_no_node_no_top'} = [
     'error_line' => 'warning: entry for index `cp\' outside of any node
 ',
     'file_name' => 'index_no_node_no_top.texi',
-    'line_nr' => 25,
+    'line_nr' => 23,
     'macro' => '',
     'text' => 'entry for index `cp\' outside of any node',
     'type' => 'warning'
@@ -1712,7 +1665,7 @@ 
$result_converted_errors{'info'}->{'index_no_node_no_top'} = [
     'error_line' => 'warning: entry for index `cp\' outside of any node
 ',
     'file_name' => 'index_no_node_no_top.texi',
-    'line_nr' => 26,
+    'line_nr' => 24,
     'macro' => '',
     'text' => 'entry for index `cp\' outside of any node',
     'type' => 'warning'
@@ -1721,7 +1674,7 @@ 
$result_converted_errors{'info'}->{'index_no_node_no_top'} = [
     'error_line' => 'warning: entry for index `cp\' outside of any node
 ',
     'file_name' => 'index_no_node_no_top.texi',
-    'line_nr' => 31,
+    'line_nr' => 29,
     'macro' => '',
     'text' => 'entry for index `cp\' outside of any node',
     'type' => 'warning'
@@ -1730,7 +1683,7 @@ 
$result_converted_errors{'info'}->{'index_no_node_no_top'} = [
     'error_line' => 'warning: entry for index `cp\' outside of any node
 ',
     'file_name' => 'index_no_node_no_top.texi',
-    'line_nr' => 5,
+    'line_nr' => 3,
     'macro' => '',
     'text' => 'entry for index `cp\' outside of any node',
     'type' => 'warning'
@@ -1739,7 +1692,7 @@ 
$result_converted_errors{'info'}->{'index_no_node_no_top'} = [
     'error_line' => 'warning: entry for index `cp\' outside of any node
 ',
     'file_name' => 'index_no_node_no_top.texi',
-    'line_nr' => 13,
+    'line_nr' => 11,
     'macro' => '',
     'text' => 'entry for index `cp\' outside of any node',
     'type' => 'warning'
@@ -1748,7 +1701,7 @@ 
$result_converted_errors{'info'}->{'index_no_node_no_top'} = [
     'error_line' => 'warning: entry for index `cp\' outside of any node
 ',
     'file_name' => 'index_no_node_no_top.texi',
-    'line_nr' => 15,
+    'line_nr' => 13,
     'macro' => '',
     'text' => 'entry for index `cp\' outside of any node',
     'type' => 'warning'
@@ -1893,7 +1846,7 @@ 
$result_converted_errors{'plaintext'}->{'index_no_node_no_top'} = [
     'error_line' => 'warning: entry for index `cp\' outside of any node
 ',
     'file_name' => 'index_no_node_no_top.texi',
-    'line_nr' => 43,
+    'line_nr' => 41,
     'macro' => '',
     'text' => 'entry for index `cp\' outside of any node',
     'type' => 'warning'
@@ -1902,7 +1855,7 @@ 
$result_converted_errors{'plaintext'}->{'index_no_node_no_top'} = [
     'error_line' => 'warning: entry for index `cp\' outside of any node
 ',
     'file_name' => 'index_no_node_no_top.texi',
-    'line_nr' => 47,
+    'line_nr' => 45,
     'macro' => '',
     'text' => 'entry for index `cp\' outside of any node',
     'type' => 'warning'
@@ -1911,7 +1864,7 @@ 
$result_converted_errors{'plaintext'}->{'index_no_node_no_top'} = [
     'error_line' => 'warning: entry for index `cp\' outside of any node
 ',
     'file_name' => 'index_no_node_no_top.texi',
-    'line_nr' => 37,
+    'line_nr' => 35,
     'macro' => '',
     'text' => 'entry for index `cp\' outside of any node',
     'type' => 'warning'
@@ -1920,7 +1873,7 @@ 
$result_converted_errors{'plaintext'}->{'index_no_node_no_top'} = [
     'error_line' => 'warning: entry for index `cp\' outside of any node
 ',
     'file_name' => 'index_no_node_no_top.texi',
-    'line_nr' => 39,
+    'line_nr' => 37,
     'macro' => '',
     'text' => 'entry for index `cp\' outside of any node',
     'type' => 'warning'
@@ -1929,7 +1882,7 @@ 
$result_converted_errors{'plaintext'}->{'index_no_node_no_top'} = [
     'error_line' => 'warning: entry for index `cp\' outside of any node
 ',
     'file_name' => 'index_no_node_no_top.texi',
-    'line_nr' => 21,
+    'line_nr' => 19,
     'macro' => '',
     'text' => 'entry for index `cp\' outside of any node',
     'type' => 'warning'
@@ -1938,7 +1891,7 @@ 
$result_converted_errors{'plaintext'}->{'index_no_node_no_top'} = [
     'error_line' => 'warning: entry for index `cp\' outside of any node
 ',
     'file_name' => 'index_no_node_no_top.texi',
-    'line_nr' => 22,
+    'line_nr' => 20,
     'macro' => '',
     'text' => 'entry for index `cp\' outside of any node',
     'type' => 'warning'
@@ -1947,7 +1900,7 @@ 
$result_converted_errors{'plaintext'}->{'index_no_node_no_top'} = [
     'error_line' => 'warning: entry for index `cp\' outside of any node
 ',
     'file_name' => 'index_no_node_no_top.texi',
-    'line_nr' => 23,
+    'line_nr' => 21,
     'macro' => '',
     'text' => 'entry for index `cp\' outside of any node',
     'type' => 'warning'
@@ -1956,7 +1909,7 @@ 
$result_converted_errors{'plaintext'}->{'index_no_node_no_top'} = [
     'error_line' => 'warning: entry for index `cp\' outside of any node
 ',
     'file_name' => 'index_no_node_no_top.texi',
-    'line_nr' => 24,
+    'line_nr' => 22,
     'macro' => '',
     'text' => 'entry for index `cp\' outside of any node',
     'type' => 'warning'
@@ -1965,7 +1918,7 @@ 
$result_converted_errors{'plaintext'}->{'index_no_node_no_top'} = [
     'error_line' => 'warning: entry for index `cp\' outside of any node
 ',
     'file_name' => 'index_no_node_no_top.texi',
-    'line_nr' => 25,
+    'line_nr' => 23,
     'macro' => '',
     'text' => 'entry for index `cp\' outside of any node',
     'type' => 'warning'
@@ -1974,7 +1927,7 @@ 
$result_converted_errors{'plaintext'}->{'index_no_node_no_top'} = [
     'error_line' => 'warning: entry for index `cp\' outside of any node
 ',
     'file_name' => 'index_no_node_no_top.texi',
-    'line_nr' => 26,
+    'line_nr' => 24,
     'macro' => '',
     'text' => 'entry for index `cp\' outside of any node',
     'type' => 'warning'
@@ -1983,7 +1936,7 @@ 
$result_converted_errors{'plaintext'}->{'index_no_node_no_top'} = [
     'error_line' => 'warning: entry for index `cp\' outside of any node
 ',
     'file_name' => 'index_no_node_no_top.texi',
-    'line_nr' => 31,
+    'line_nr' => 29,
     'macro' => '',
     'text' => 'entry for index `cp\' outside of any node',
     'type' => 'warning'
@@ -1992,7 +1945,7 @@ 
$result_converted_errors{'plaintext'}->{'index_no_node_no_top'} = [
     'error_line' => 'warning: entry for index `cp\' outside of any node
 ',
     'file_name' => 'index_no_node_no_top.texi',
-    'line_nr' => 5,
+    'line_nr' => 3,
     'macro' => '',
     'text' => 'entry for index `cp\' outside of any node',
     'type' => 'warning'
@@ -2001,7 +1954,7 @@ 
$result_converted_errors{'plaintext'}->{'index_no_node_no_top'} = [
     'error_line' => 'warning: entry for index `cp\' outside of any node
 ',
     'file_name' => 'index_no_node_no_top.texi',
-    'line_nr' => 13,
+    'line_nr' => 11,
     'macro' => '',
     'text' => 'entry for index `cp\' outside of any node',
     'type' => 'warning'
@@ -2010,7 +1963,7 @@ 
$result_converted_errors{'plaintext'}->{'index_no_node_no_top'} = [
     'error_line' => 'warning: entry for index `cp\' outside of any node
 ',
     'file_name' => 'index_no_node_no_top.texi',
-    'line_nr' => 15,
+    'line_nr' => 13,
     'macro' => '',
     'text' => 'entry for index `cp\' outside of any node',
     'type' => 'warning'
@@ -2019,8 +1972,7 @@ 
$result_converted_errors{'plaintext'}->{'index_no_node_no_top'} = [
 
 
 
-$result_converted{'html_text'}->{'index_no_node_no_top'} = '
-<a class="index-entry-id" id="index-truc"></a>
+$result_converted{'html_text'}->{'index_no_node_no_top'} = '<a 
class="index-entry-id" id="index-truc"></a>
 <p>Garbage
 </p><div class="printindex cp-printindex">
 <table class="cp-letters-header-printindex"><tr><th>Jump to: &nbsp; 
</th><td><a class="summary-letter-printindex" 
href="#t_i_cp_letter-C"><b>C</b></a>
@@ -2355,9 +2307,7 @@ $result_converted{'html_text'}->{'index_no_node_no_top'} 
= '
 
 $result_converted{'xml'}->{'index_no_node_no_top'} = 
'<preamblebeforebeginning>\\input texinfo @c -*-texinfo-*-
 
-</preamblebeforebeginning><setfilename file="index_no_node_no_top.info" 
spaces=" ">index_no_node_no_top.info</setfilename>
-
-<cindex index="cp" spaces=" "><indexterm index="cp" 
number="1">truc</indexterm></cindex>
+</preamblebeforebeginning><cindex index="cp" spaces=" "><indexterm index="cp" 
number="1">truc</indexterm></cindex>
 <para>Garbage
 </para><printindex spaces=" " value="cp" line="cp"></printindex>
 
diff --git a/tp/t/results/indices/index_no_node_no_top_no_node.pl 
b/tp/t/results/indices/index_no_node_no_top_no_node.pl
index 3ea526cb49..abda0cbe83 100644
--- a/tp/t/results/indices/index_no_node_no_top_no_node.pl
+++ b/tp/t/results/indices/index_no_node_no_top_no_node.pl
@@ -12,63 +12,20 @@ $result_trees{'index_no_node_no_top_no_node'} = {
         {
           'contents' => [
             {
-              'contents' => [
-                {
-                  'text' => '\\input texinfo @c -*-texinfo-*-
-',
-                  'type' => 'text_before_beginning'
-                },
-                {
-                  'text' => '
+              'text' => '\\input texinfo @c -*-texinfo-*-
 ',
-                  'type' => 'text_before_beginning'
-                }
-              ],
-              'type' => 'preamble_before_beginning'
-            }
-          ],
-          'type' => 'preamble_before_setfilename'
-        },
-        {
-          'contents' => [
-            {
-              'args' => [
-                {
-                  'contents' => [
-                    {
-                      'text' => 'index_no_node_no_top.info'
-                    }
-                  ],
-                  'info' => {
-                    'spaces_after_argument' => {
-                      'text' => '
-'
-                    }
-                  },
-                  'type' => 'line_arg'
-                }
-              ],
-              'cmdname' => 'setfilename',
-              'extra' => {
-                'text_arg' => 'index_no_node_no_top.info'
-              },
-              'info' => {
-                'spaces_before_argument' => {
-                  'text' => ' '
-                }
-              },
-              'source_info' => {
-                'file_name' => 'index_no_node_no_top.texi',
-                'line_nr' => 3,
-                'macro' => ''
-              }
+              'type' => 'text_before_beginning'
             },
             {
               'text' => '
 ',
-              'type' => 'empty_line'
+              'type' => 'text_before_beginning'
             }
           ],
+          'type' => 'preamble_before_beginning'
+        },
+        {
+          'contents' => [],
           'type' => 'preamble_before_content'
         },
         {
@@ -109,7 +66,7 @@ $result_trees{'index_no_node_no_top_no_node'} = {
           },
           'source_info' => {
             'file_name' => 'index_no_node_no_top.texi',
-            'line_nr' => 5,
+            'line_nr' => 3,
             'macro' => ''
           },
           'type' => 'index_entry_command'
@@ -153,7 +110,7 @@ $result_trees{'index_no_node_no_top_no_node'} = {
           },
           'source_info' => {
             'file_name' => 'index_no_node_no_top.texi',
-            'line_nr' => 7,
+            'line_nr' => 5,
             'macro' => ''
           }
         },
@@ -214,7 +171,7 @@ $result_trees{'index_no_node_no_top_no_node'} = {
           },
           'source_info' => {
             'file_name' => 'index_no_node_no_top.texi',
-            'line_nr' => 11,
+            'line_nr' => 9,
             'macro' => ''
           }
         },
@@ -261,7 +218,7 @@ $result_trees{'index_no_node_no_top_no_node'} = {
           },
           'source_info' => {
             'file_name' => 'index_no_node_no_top.texi',
-            'line_nr' => 13,
+            'line_nr' => 11,
             'macro' => ''
           },
           'type' => 'index_entry_command'
@@ -310,7 +267,7 @@ $result_trees{'index_no_node_no_top_no_node'} = {
               },
               'source_info' => {
                 'file_name' => 'index_no_node_no_top.texi',
-                'line_nr' => 15,
+                'line_nr' => 13,
                 'macro' => ''
               },
               'type' => 'index_entry_command'
@@ -353,7 +310,7 @@ $result_trees{'index_no_node_no_top_no_node'} = {
           },
           'source_info' => {
             'file_name' => 'index_no_node_no_top.texi',
-            'line_nr' => 17,
+            'line_nr' => 15,
             'macro' => ''
           }
         },
@@ -370,7 +327,7 @@ $result_trees{'index_no_node_no_top_no_node'} = {
       },
       'source_info' => {
         'file_name' => 'index_no_node_no_top.texi',
-        'line_nr' => 10,
+        'line_nr' => 8,
         'macro' => ''
       }
     },
@@ -436,7 +393,7 @@ $result_trees{'index_no_node_no_top_no_node'} = {
           },
           'source_info' => {
             'file_name' => 'index_no_node_no_top.texi',
-            'line_nr' => 21,
+            'line_nr' => 19,
             'macro' => ''
           },
           'type' => 'index_entry_command'
@@ -479,7 +436,7 @@ $result_trees{'index_no_node_no_top_no_node'} = {
           },
           'source_info' => {
             'file_name' => 'index_no_node_no_top.texi',
-            'line_nr' => 22,
+            'line_nr' => 20,
             'macro' => ''
           },
           'type' => 'index_entry_command'
@@ -522,7 +479,7 @@ $result_trees{'index_no_node_no_top_no_node'} = {
           },
           'source_info' => {
             'file_name' => 'index_no_node_no_top.texi',
-            'line_nr' => 23,
+            'line_nr' => 21,
             'macro' => ''
           },
           'type' => 'index_entry_command'
@@ -565,7 +522,7 @@ $result_trees{'index_no_node_no_top_no_node'} = {
           },
           'source_info' => {
             'file_name' => 'index_no_node_no_top.texi',
-            'line_nr' => 24,
+            'line_nr' => 22,
             'macro' => ''
           },
           'type' => 'index_entry_command'
@@ -608,7 +565,7 @@ $result_trees{'index_no_node_no_top_no_node'} = {
           },
           'source_info' => {
             'file_name' => 'index_no_node_no_top.texi',
-            'line_nr' => 25,
+            'line_nr' => 23,
             'macro' => ''
           },
           'type' => 'index_entry_command'
@@ -651,7 +608,7 @@ $result_trees{'index_no_node_no_top_no_node'} = {
           },
           'source_info' => {
             'file_name' => 'index_no_node_no_top.texi',
-            'line_nr' => 26,
+            'line_nr' => 24,
             'macro' => ''
           },
           'type' => 'index_entry_command'
@@ -700,7 +657,7 @@ $result_trees{'index_no_node_no_top_no_node'} = {
           },
           'source_info' => {
             'file_name' => 'index_no_node_no_top.texi',
-            'line_nr' => 29,
+            'line_nr' => 27,
             'macro' => ''
           }
         },
@@ -747,7 +704,7 @@ $result_trees{'index_no_node_no_top_no_node'} = {
           },
           'source_info' => {
             'file_name' => 'index_no_node_no_top.texi',
-            'line_nr' => 31,
+            'line_nr' => 29,
             'macro' => ''
           },
           'type' => 'index_entry_command'
@@ -770,7 +727,7 @@ $result_trees{'index_no_node_no_top_no_node'} = {
       },
       'source_info' => {
         'file_name' => 'index_no_node_no_top.texi',
-        'line_nr' => 19,
+        'line_nr' => 17,
         'macro' => ''
       }
     },
@@ -828,7 +785,7 @@ $result_trees{'index_no_node_no_top_no_node'} = {
           },
           'source_info' => {
             'file_name' => 'index_no_node_no_top.texi',
-            'line_nr' => 36,
+            'line_nr' => 34,
             'macro' => ''
           }
         },
@@ -870,7 +827,7 @@ $result_trees{'index_no_node_no_top_no_node'} = {
           },
           'source_info' => {
             'file_name' => 'index_no_node_no_top.texi',
-            'line_nr' => 37,
+            'line_nr' => 35,
             'macro' => ''
           },
           'type' => 'index_entry_command'
@@ -919,7 +876,7 @@ $result_trees{'index_no_node_no_top_no_node'} = {
               },
               'source_info' => {
                 'file_name' => 'index_no_node_no_top.texi',
-                'line_nr' => 39,
+                'line_nr' => 37,
                 'macro' => ''
               },
               'type' => 'index_entry_command'
@@ -962,7 +919,7 @@ $result_trees{'index_no_node_no_top_no_node'} = {
           },
           'source_info' => {
             'file_name' => 'index_no_node_no_top.texi',
-            'line_nr' => 41,
+            'line_nr' => 39,
             'macro' => ''
           }
         }
@@ -974,7 +931,7 @@ $result_trees{'index_no_node_no_top_no_node'} = {
       },
       'source_info' => {
         'file_name' => 'index_no_node_no_top.texi',
-        'line_nr' => 34,
+        'line_nr' => 32,
         'macro' => ''
       }
     },
@@ -1035,7 +992,7 @@ $result_trees{'index_no_node_no_top_no_node'} = {
           },
           'source_info' => {
             'file_name' => 'index_no_node_no_top.texi',
-            'line_nr' => 43,
+            'line_nr' => 41,
             'macro' => ''
           },
           'type' => 'index_entry_command'
@@ -1075,7 +1032,7 @@ $result_trees{'index_no_node_no_top_no_node'} = {
           },
           'source_info' => {
             'file_name' => 'index_no_node_no_top.texi',
-            'line_nr' => 45,
+            'line_nr' => 43,
             'macro' => ''
           }
         },
@@ -1123,7 +1080,7 @@ $result_trees{'index_no_node_no_top_no_node'} = {
               },
               'source_info' => {
                 'file_name' => 'index_no_node_no_top.texi',
-                'line_nr' => 47,
+                'line_nr' => 45,
                 'macro' => ''
               },
               'type' => 'index_entry_command'
@@ -1144,7 +1101,7 @@ $result_trees{'index_no_node_no_top_no_node'} = {
       },
       'source_info' => {
         'file_name' => 'index_no_node_no_top.texi',
-        'line_nr' => 42,
+        'line_nr' => 40,
         'macro' => ''
       }
     },
@@ -1194,7 +1151,7 @@ $result_trees{'index_no_node_no_top_no_node'} = {
       },
       'source_info' => {
         'file_name' => 'index_no_node_no_top.texi',
-        'line_nr' => 49,
+        'line_nr' => 47,
         'macro' => ''
       }
     },
@@ -1256,8 +1213,6 @@ 
$result_trees{'index_no_node_no_top_no_node'}{'contents'}[4]{'contents'}[3]{'con
 
 $result_texis{'index_no_node_no_top_no_node'} = '\\input texinfo @c 
-*-texinfo-*-
 
-@setfilename index_no_node_no_top.info
-
 @cindex truc
 Garbage
 @printindex cp
@@ -1310,8 +1265,7 @@ In chapter 2
 ';
 
 
-$result_texts{'index_no_node_no_top_no_node'} = '
-Garbage
+$result_texts{'index_no_node_no_top_no_node'} = 'Garbage
 
 
 unnumbered
@@ -1419,7 +1373,7 @@ $result_errors{'index_no_node_no_top_no_node'} = [
     'error_line' => 'warning: entry for index `cp\' outside of any node
 ',
     'file_name' => 'index_no_node_no_top.texi',
-    'line_nr' => 5,
+    'line_nr' => 3,
     'macro' => '',
     'text' => 'entry for index `cp\' outside of any node',
     'type' => 'warning'
@@ -1428,7 +1382,7 @@ $result_errors{'index_no_node_no_top_no_node'} = [
     'error_line' => 'warning: printindex before document beginning: 
@printindex cp
 ',
     'file_name' => 'index_no_node_no_top.texi',
-    'line_nr' => 7,
+    'line_nr' => 5,
     'macro' => '',
     'text' => 'printindex before document beginning: @printindex cp',
     'type' => 'warning'
@@ -1437,7 +1391,7 @@ $result_errors{'index_no_node_no_top_no_node'} = [
     'error_line' => 'unknown index `bidule\' in @printindex
 ',
     'file_name' => 'index_no_node_no_top.texi',
-    'line_nr' => 11,
+    'line_nr' => 9,
     'macro' => '',
     'text' => 'unknown index `bidule\' in @printindex',
     'type' => 'error'
@@ -1469,8 +1423,7 @@ 
$result_indices_sort_strings{'index_no_node_no_top_no_node'} = {
 
 
 
-$result_converted{'info'}->{'index_no_node_no_top_no_node'} = 'This is 
index_no_node_no_top.info, produced from
-index_no_node_no_top.texi.
+$result_converted{'info'}->{'index_no_node_no_top_no_node'} = 'This is , 
produced from index_no_node_no_top.texi.
 
 Garbage
 
@@ -1631,7 +1584,7 @@ 
$result_converted_errors{'info'}->{'index_no_node_no_top_no_node'} = [
     'error_line' => 'warning: entry for index `cp\' outside of any node
 ',
     'file_name' => 'index_no_node_no_top.texi',
-    'line_nr' => 43,
+    'line_nr' => 41,
     'macro' => '',
     'text' => 'entry for index `cp\' outside of any node',
     'type' => 'warning'
@@ -1640,7 +1593,7 @@ 
$result_converted_errors{'info'}->{'index_no_node_no_top_no_node'} = [
     'error_line' => 'warning: entry for index `cp\' outside of any node
 ',
     'file_name' => 'index_no_node_no_top.texi',
-    'line_nr' => 47,
+    'line_nr' => 45,
     'macro' => '',
     'text' => 'entry for index `cp\' outside of any node',
     'type' => 'warning'
@@ -1649,7 +1602,7 @@ 
$result_converted_errors{'info'}->{'index_no_node_no_top_no_node'} = [
     'error_line' => 'warning: entry for index `cp\' outside of any node
 ',
     'file_name' => 'index_no_node_no_top.texi',
-    'line_nr' => 37,
+    'line_nr' => 35,
     'macro' => '',
     'text' => 'entry for index `cp\' outside of any node',
     'type' => 'warning'
@@ -1658,7 +1611,7 @@ 
$result_converted_errors{'info'}->{'index_no_node_no_top_no_node'} = [
     'error_line' => 'warning: entry for index `cp\' outside of any node
 ',
     'file_name' => 'index_no_node_no_top.texi',
-    'line_nr' => 39,
+    'line_nr' => 37,
     'macro' => '',
     'text' => 'entry for index `cp\' outside of any node',
     'type' => 'warning'
@@ -1667,7 +1620,7 @@ 
$result_converted_errors{'info'}->{'index_no_node_no_top_no_node'} = [
     'error_line' => 'warning: entry for index `cp\' outside of any node
 ',
     'file_name' => 'index_no_node_no_top.texi',
-    'line_nr' => 21,
+    'line_nr' => 19,
     'macro' => '',
     'text' => 'entry for index `cp\' outside of any node',
     'type' => 'warning'
@@ -1676,7 +1629,7 @@ 
$result_converted_errors{'info'}->{'index_no_node_no_top_no_node'} = [
     'error_line' => 'warning: entry for index `cp\' outside of any node
 ',
     'file_name' => 'index_no_node_no_top.texi',
-    'line_nr' => 22,
+    'line_nr' => 20,
     'macro' => '',
     'text' => 'entry for index `cp\' outside of any node',
     'type' => 'warning'
@@ -1685,7 +1638,7 @@ 
$result_converted_errors{'info'}->{'index_no_node_no_top_no_node'} = [
     'error_line' => 'warning: entry for index `cp\' outside of any node
 ',
     'file_name' => 'index_no_node_no_top.texi',
-    'line_nr' => 23,
+    'line_nr' => 21,
     'macro' => '',
     'text' => 'entry for index `cp\' outside of any node',
     'type' => 'warning'
@@ -1694,7 +1647,7 @@ 
$result_converted_errors{'info'}->{'index_no_node_no_top_no_node'} = [
     'error_line' => 'warning: entry for index `cp\' outside of any node
 ',
     'file_name' => 'index_no_node_no_top.texi',
-    'line_nr' => 24,
+    'line_nr' => 22,
     'macro' => '',
     'text' => 'entry for index `cp\' outside of any node',
     'type' => 'warning'
@@ -1703,7 +1656,7 @@ 
$result_converted_errors{'info'}->{'index_no_node_no_top_no_node'} = [
     'error_line' => 'warning: entry for index `cp\' outside of any node
 ',
     'file_name' => 'index_no_node_no_top.texi',
-    'line_nr' => 25,
+    'line_nr' => 23,
     'macro' => '',
     'text' => 'entry for index `cp\' outside of any node',
     'type' => 'warning'
@@ -1712,7 +1665,7 @@ 
$result_converted_errors{'info'}->{'index_no_node_no_top_no_node'} = [
     'error_line' => 'warning: entry for index `cp\' outside of any node
 ',
     'file_name' => 'index_no_node_no_top.texi',
-    'line_nr' => 26,
+    'line_nr' => 24,
     'macro' => '',
     'text' => 'entry for index `cp\' outside of any node',
     'type' => 'warning'
@@ -1721,7 +1674,7 @@ 
$result_converted_errors{'info'}->{'index_no_node_no_top_no_node'} = [
     'error_line' => 'warning: entry for index `cp\' outside of any node
 ',
     'file_name' => 'index_no_node_no_top.texi',
-    'line_nr' => 31,
+    'line_nr' => 29,
     'macro' => '',
     'text' => 'entry for index `cp\' outside of any node',
     'type' => 'warning'
@@ -1730,7 +1683,7 @@ 
$result_converted_errors{'info'}->{'index_no_node_no_top_no_node'} = [
     'error_line' => 'warning: entry for index `cp\' outside of any node
 ',
     'file_name' => 'index_no_node_no_top.texi',
-    'line_nr' => 5,
+    'line_nr' => 3,
     'macro' => '',
     'text' => 'entry for index `cp\' outside of any node',
     'type' => 'warning'
@@ -1739,7 +1692,7 @@ 
$result_converted_errors{'info'}->{'index_no_node_no_top_no_node'} = [
     'error_line' => 'warning: entry for index `cp\' outside of any node
 ',
     'file_name' => 'index_no_node_no_top.texi',
-    'line_nr' => 13,
+    'line_nr' => 11,
     'macro' => '',
     'text' => 'entry for index `cp\' outside of any node',
     'type' => 'warning'
@@ -1748,7 +1701,7 @@ 
$result_converted_errors{'info'}->{'index_no_node_no_top_no_node'} = [
     'error_line' => 'warning: entry for index `cp\' outside of any node
 ',
     'file_name' => 'index_no_node_no_top.texi',
-    'line_nr' => 15,
+    'line_nr' => 13,
     'macro' => '',
     'text' => 'entry for index `cp\' outside of any node',
     'type' => 'warning'
@@ -1893,7 +1846,7 @@ 
$result_converted_errors{'plaintext'}->{'index_no_node_no_top_no_node'} = [
     'error_line' => 'warning: entry for index `cp\' outside of any node
 ',
     'file_name' => 'index_no_node_no_top.texi',
-    'line_nr' => 43,
+    'line_nr' => 41,
     'macro' => '',
     'text' => 'entry for index `cp\' outside of any node',
     'type' => 'warning'
@@ -1902,7 +1855,7 @@ 
$result_converted_errors{'plaintext'}->{'index_no_node_no_top_no_node'} = [
     'error_line' => 'warning: entry for index `cp\' outside of any node
 ',
     'file_name' => 'index_no_node_no_top.texi',
-    'line_nr' => 47,
+    'line_nr' => 45,
     'macro' => '',
     'text' => 'entry for index `cp\' outside of any node',
     'type' => 'warning'
@@ -1911,7 +1864,7 @@ 
$result_converted_errors{'plaintext'}->{'index_no_node_no_top_no_node'} = [
     'error_line' => 'warning: entry for index `cp\' outside of any node
 ',
     'file_name' => 'index_no_node_no_top.texi',
-    'line_nr' => 37,
+    'line_nr' => 35,
     'macro' => '',
     'text' => 'entry for index `cp\' outside of any node',
     'type' => 'warning'
@@ -1920,7 +1873,7 @@ 
$result_converted_errors{'plaintext'}->{'index_no_node_no_top_no_node'} = [
     'error_line' => 'warning: entry for index `cp\' outside of any node
 ',
     'file_name' => 'index_no_node_no_top.texi',
-    'line_nr' => 39,
+    'line_nr' => 37,
     'macro' => '',
     'text' => 'entry for index `cp\' outside of any node',
     'type' => 'warning'
@@ -1929,7 +1882,7 @@ 
$result_converted_errors{'plaintext'}->{'index_no_node_no_top_no_node'} = [
     'error_line' => 'warning: entry for index `cp\' outside of any node
 ',
     'file_name' => 'index_no_node_no_top.texi',
-    'line_nr' => 21,
+    'line_nr' => 19,
     'macro' => '',
     'text' => 'entry for index `cp\' outside of any node',
     'type' => 'warning'
@@ -1938,7 +1891,7 @@ 
$result_converted_errors{'plaintext'}->{'index_no_node_no_top_no_node'} = [
     'error_line' => 'warning: entry for index `cp\' outside of any node
 ',
     'file_name' => 'index_no_node_no_top.texi',
-    'line_nr' => 22,
+    'line_nr' => 20,
     'macro' => '',
     'text' => 'entry for index `cp\' outside of any node',
     'type' => 'warning'
@@ -1947,7 +1900,7 @@ 
$result_converted_errors{'plaintext'}->{'index_no_node_no_top_no_node'} = [
     'error_line' => 'warning: entry for index `cp\' outside of any node
 ',
     'file_name' => 'index_no_node_no_top.texi',
-    'line_nr' => 23,
+    'line_nr' => 21,
     'macro' => '',
     'text' => 'entry for index `cp\' outside of any node',
     'type' => 'warning'
@@ -1956,7 +1909,7 @@ 
$result_converted_errors{'plaintext'}->{'index_no_node_no_top_no_node'} = [
     'error_line' => 'warning: entry for index `cp\' outside of any node
 ',
     'file_name' => 'index_no_node_no_top.texi',
-    'line_nr' => 24,
+    'line_nr' => 22,
     'macro' => '',
     'text' => 'entry for index `cp\' outside of any node',
     'type' => 'warning'
@@ -1965,7 +1918,7 @@ 
$result_converted_errors{'plaintext'}->{'index_no_node_no_top_no_node'} = [
     'error_line' => 'warning: entry for index `cp\' outside of any node
 ',
     'file_name' => 'index_no_node_no_top.texi',
-    'line_nr' => 25,
+    'line_nr' => 23,
     'macro' => '',
     'text' => 'entry for index `cp\' outside of any node',
     'type' => 'warning'
@@ -1974,7 +1927,7 @@ 
$result_converted_errors{'plaintext'}->{'index_no_node_no_top_no_node'} = [
     'error_line' => 'warning: entry for index `cp\' outside of any node
 ',
     'file_name' => 'index_no_node_no_top.texi',
-    'line_nr' => 26,
+    'line_nr' => 24,
     'macro' => '',
     'text' => 'entry for index `cp\' outside of any node',
     'type' => 'warning'
@@ -1983,7 +1936,7 @@ 
$result_converted_errors{'plaintext'}->{'index_no_node_no_top_no_node'} = [
     'error_line' => 'warning: entry for index `cp\' outside of any node
 ',
     'file_name' => 'index_no_node_no_top.texi',
-    'line_nr' => 31,
+    'line_nr' => 29,
     'macro' => '',
     'text' => 'entry for index `cp\' outside of any node',
     'type' => 'warning'
@@ -1992,7 +1945,7 @@ 
$result_converted_errors{'plaintext'}->{'index_no_node_no_top_no_node'} = [
     'error_line' => 'warning: entry for index `cp\' outside of any node
 ',
     'file_name' => 'index_no_node_no_top.texi',
-    'line_nr' => 5,
+    'line_nr' => 3,
     'macro' => '',
     'text' => 'entry for index `cp\' outside of any node',
     'type' => 'warning'
@@ -2001,7 +1954,7 @@ 
$result_converted_errors{'plaintext'}->{'index_no_node_no_top_no_node'} = [
     'error_line' => 'warning: entry for index `cp\' outside of any node
 ',
     'file_name' => 'index_no_node_no_top.texi',
-    'line_nr' => 13,
+    'line_nr' => 11,
     'macro' => '',
     'text' => 'entry for index `cp\' outside of any node',
     'type' => 'warning'
@@ -2010,7 +1963,7 @@ 
$result_converted_errors{'plaintext'}->{'index_no_node_no_top_no_node'} = [
     'error_line' => 'warning: entry for index `cp\' outside of any node
 ',
     'file_name' => 'index_no_node_no_top.texi',
-    'line_nr' => 15,
+    'line_nr' => 13,
     'macro' => '',
     'text' => 'entry for index `cp\' outside of any node',
     'type' => 'warning'
@@ -2019,8 +1972,7 @@ 
$result_converted_errors{'plaintext'}->{'index_no_node_no_top_no_node'} = [
 
 
 
-$result_converted{'html_text'}->{'index_no_node_no_top_no_node'} = '
-<a class="index-entry-id" id="index-truc"></a>
+$result_converted{'html_text'}->{'index_no_node_no_top_no_node'} = '<a 
class="index-entry-id" id="index-truc"></a>
 <p>Garbage
 </p><div class="printindex cp-printindex">
 <table class="cp-letters-header-printindex"><tr><th>Jump to: &nbsp; 
</th><td><a class="summary-letter-printindex" 
href="#t_i_cp_letter-C"><b>C</b></a>
@@ -2379,9 +2331,7 @@ 
$result_converted{'html_text'}->{'index_no_node_no_top_no_node'} = '
 
 $result_converted{'xml'}->{'index_no_node_no_top_no_node'} = 
'<preamblebeforebeginning>\\input texinfo @c -*-texinfo-*-
 
-</preamblebeforebeginning><setfilename file="index_no_node_no_top.info" 
spaces=" ">index_no_node_no_top.info</setfilename>
-
-<cindex index="cp" spaces=" "><indexterm index="cp" 
number="1">truc</indexterm></cindex>
+</preamblebeforebeginning><cindex index="cp" spaces=" "><indexterm index="cp" 
number="1">truc</indexterm></cindex>
 <para>Garbage
 </para><printindex spaces=" " value="cp" line="cp"></printindex>
 
diff --git a/tp/t/results/indices/index_nodes.pl 
b/tp/t/results/indices/index_nodes.pl
index 6fb852a514..8a60a0cbb5 100644
--- a/tp/t/results/indices/index_nodes.pl
+++ b/tp/t/results/indices/index_nodes.pl
@@ -12,63 +12,20 @@ $result_trees{'index_nodes'} = {
         {
           'contents' => [
             {
-              'contents' => [
-                {
-                  'text' => '\\input texinfo @c -*-texinfo-*-
+              'text' => '\\input texinfo @c -*-texinfo-*-
 ',
-                  'type' => 'text_before_beginning'
-                },
-                {
-                  'text' => '
-',
-                  'type' => 'text_before_beginning'
-                }
-              ],
-              'type' => 'preamble_before_beginning'
-            }
-          ],
-          'type' => 'preamble_before_setfilename'
-        },
-        {
-          'contents' => [
-            {
-              'args' => [
-                {
-                  'contents' => [
-                    {
-                      'text' => 'index_nodes'
-                    }
-                  ],
-                  'info' => {
-                    'spaces_after_argument' => {
-                      'text' => '
-'
-                    }
-                  },
-                  'type' => 'line_arg'
-                }
-              ],
-              'cmdname' => 'setfilename',
-              'extra' => {
-                'text_arg' => 'index_nodes'
-              },
-              'info' => {
-                'spaces_before_argument' => {
-                  'text' => ' '
-                }
-              },
-              'source_info' => {
-                'file_name' => 'index_nodes.texi',
-                'line_nr' => 3,
-                'macro' => ''
-              }
+              'type' => 'text_before_beginning'
             },
             {
               'text' => '
 ',
-              'type' => 'empty_line'
+              'type' => 'text_before_beginning'
             }
           ],
+          'type' => 'preamble_before_beginning'
+        },
+        {
+          'contents' => [],
           'type' => 'preamble_before_content'
         }
       ],
@@ -132,7 +89,7 @@ $result_trees{'index_nodes'} = {
           },
           'source_info' => {
             'file_name' => 'index_nodes.texi',
-            'line_nr' => 6,
+            'line_nr' => 4,
             'macro' => ''
           },
           'type' => 'index_entry_command'
@@ -172,7 +129,7 @@ $result_trees{'index_nodes'} = {
           },
           'source_info' => {
             'file_name' => 'index_nodes.texi',
-            'line_nr' => 8,
+            'line_nr' => 6,
             'macro' => ''
           }
         },
@@ -211,7 +168,7 @@ $result_trees{'index_nodes'} = {
           },
           'source_info' => {
             'file_name' => 'index_nodes.texi',
-            'line_nr' => 10,
+            'line_nr' => 8,
             'macro' => ''
           }
         },
@@ -264,7 +221,7 @@ $result_trees{'index_nodes'} = {
           },
           'source_info' => {
             'file_name' => 'index_nodes.texi',
-            'line_nr' => 14,
+            'line_nr' => 12,
             'macro' => ''
           }
         },
@@ -330,7 +287,7 @@ $result_trees{'index_nodes'} = {
               },
               'source_info' => {
                 'file_name' => 'index_nodes.texi',
-                'line_nr' => 17,
+                'line_nr' => 15,
                 'macro' => ''
               },
               'type' => 'menu_entry'
@@ -363,14 +320,14 @@ $result_trees{'index_nodes'} = {
               },
               'source_info' => {
                 'file_name' => 'index_nodes.texi',
-                'line_nr' => 18,
+                'line_nr' => 16,
                 'macro' => ''
               }
             }
           ],
           'source_info' => {
             'file_name' => 'index_nodes.texi',
-            'line_nr' => 16,
+            'line_nr' => 14,
             'macro' => ''
           }
         },
@@ -402,7 +359,7 @@ $result_trees{'index_nodes'} = {
       },
       'source_info' => {
         'file_name' => 'index_nodes.texi',
-        'line_nr' => 5,
+        'line_nr' => 3,
         'macro' => ''
       }
     },
@@ -492,7 +449,7 @@ $result_trees{'index_nodes'} = {
               },
               'source_info' => {
                 'file_name' => 'index_nodes.texi',
-                'line_nr' => 22,
+                'line_nr' => 20,
                 'macro' => ''
               },
               'type' => 'index_entry_command'
@@ -536,7 +493,7 @@ $result_trees{'index_nodes'} = {
               },
               'source_info' => {
                 'file_name' => 'index_nodes.texi',
-                'line_nr' => 23,
+                'line_nr' => 21,
                 'macro' => ''
               },
               'type' => 'index_entry_command'
@@ -580,7 +537,7 @@ $result_trees{'index_nodes'} = {
               },
               'source_info' => {
                 'file_name' => 'index_nodes.texi',
-                'line_nr' => 24,
+                'line_nr' => 22,
                 'macro' => ''
               },
               'type' => 'index_entry_command'
@@ -624,7 +581,7 @@ $result_trees{'index_nodes'} = {
               },
               'source_info' => {
                 'file_name' => 'index_nodes.texi',
-                'line_nr' => 25,
+                'line_nr' => 23,
                 'macro' => ''
               },
               'type' => 'index_entry_command'
@@ -667,7 +624,7 @@ $result_trees{'index_nodes'} = {
           },
           'source_info' => {
             'file_name' => 'index_nodes.texi',
-            'line_nr' => 27,
+            'line_nr' => 25,
             'macro' => ''
           }
         },
@@ -733,7 +690,7 @@ $result_trees{'index_nodes'} = {
               },
               'source_info' => {
                 'file_name' => 'index_nodes.texi',
-                'line_nr' => 30,
+                'line_nr' => 28,
                 'macro' => ''
               },
               'type' => 'menu_entry'
@@ -766,14 +723,14 @@ $result_trees{'index_nodes'} = {
               },
               'source_info' => {
                 'file_name' => 'index_nodes.texi',
-                'line_nr' => 31,
+                'line_nr' => 29,
                 'macro' => ''
               }
             }
           ],
           'source_info' => {
             'file_name' => 'index_nodes.texi',
-            'line_nr' => 29,
+            'line_nr' => 27,
             'macro' => ''
           }
         },
@@ -818,7 +775,7 @@ $result_trees{'index_nodes'} = {
       },
       'source_info' => {
         'file_name' => 'index_nodes.texi',
-        'line_nr' => 20,
+        'line_nr' => 18,
         'macro' => ''
       }
     },
@@ -912,7 +869,7 @@ $result_trees{'index_nodes'} = {
               },
               'source_info' => {
                 'file_name' => 'index_nodes.texi',
-                'line_nr' => 35,
+                'line_nr' => 33,
                 'macro' => ''
               },
               'type' => 'menu_entry'
@@ -960,7 +917,7 @@ $result_trees{'index_nodes'} = {
               },
               'source_info' => {
                 'file_name' => 'index_nodes.texi',
-                'line_nr' => 36,
+                'line_nr' => 34,
                 'macro' => ''
               },
               'type' => 'menu_entry'
@@ -993,14 +950,14 @@ $result_trees{'index_nodes'} = {
               },
               'source_info' => {
                 'file_name' => 'index_nodes.texi',
-                'line_nr' => 37,
+                'line_nr' => 35,
                 'macro' => ''
               }
             }
           ],
           'source_info' => {
             'file_name' => 'index_nodes.texi',
-            'line_nr' => 34,
+            'line_nr' => 32,
             'macro' => ''
           }
         },
@@ -1039,7 +996,7 @@ $result_trees{'index_nodes'} = {
           },
           'source_info' => {
             'file_name' => 'index_nodes.texi',
-            'line_nr' => 39,
+            'line_nr' => 37,
             'macro' => ''
           }
         },
@@ -1079,7 +1036,7 @@ $result_trees{'index_nodes'} = {
       },
       'source_info' => {
         'file_name' => 'index_nodes.texi',
-        'line_nr' => 33,
+        'line_nr' => 31,
         'macro' => ''
       }
     },
@@ -1178,7 +1135,7 @@ $result_trees{'index_nodes'} = {
           },
           'source_info' => {
             'file_name' => 'index_nodes.texi',
-            'line_nr' => 43,
+            'line_nr' => 41,
             'macro' => ''
           },
           'type' => 'index_entry_command'
@@ -1222,7 +1179,7 @@ $result_trees{'index_nodes'} = {
           },
           'source_info' => {
             'file_name' => 'index_nodes.texi',
-            'line_nr' => 44,
+            'line_nr' => 42,
             'macro' => ''
           },
           'type' => 'index_entry_command'
@@ -1266,7 +1223,7 @@ $result_trees{'index_nodes'} = {
           },
           'source_info' => {
             'file_name' => 'index_nodes.texi',
-            'line_nr' => 45,
+            'line_nr' => 43,
             'macro' => ''
           },
           'type' => 'index_entry_command'
@@ -1311,7 +1268,7 @@ $result_trees{'index_nodes'} = {
       },
       'source_info' => {
         'file_name' => 'index_nodes.texi',
-        'line_nr' => 41,
+        'line_nr' => 39,
         'macro' => ''
       }
     },
@@ -1402,7 +1359,7 @@ $result_trees{'index_nodes'} = {
           },
           'source_info' => {
             'file_name' => 'index_nodes.texi',
-            'line_nr' => 48,
+            'line_nr' => 46,
             'macro' => ''
           },
           'type' => 'index_entry_command'
@@ -1442,7 +1399,7 @@ $result_trees{'index_nodes'} = {
           },
           'source_info' => {
             'file_name' => 'index_nodes.texi',
-            'line_nr' => 50,
+            'line_nr' => 48,
             'macro' => ''
           }
         },
@@ -1490,7 +1447,7 @@ $result_trees{'index_nodes'} = {
           },
           'source_info' => {
             'file_name' => 'index_nodes.texi',
-            'line_nr' => 52,
+            'line_nr' => 50,
             'macro' => ''
           },
           'type' => 'index_entry_command'
@@ -1534,7 +1491,7 @@ $result_trees{'index_nodes'} = {
           },
           'source_info' => {
             'file_name' => 'index_nodes.texi',
-            'line_nr' => 53,
+            'line_nr' => 51,
             'macro' => ''
           },
           'type' => 'index_entry_command'
@@ -1574,7 +1531,7 @@ $result_trees{'index_nodes'} = {
           },
           'source_info' => {
             'file_name' => 'index_nodes.texi',
-            'line_nr' => 55,
+            'line_nr' => 53,
             'macro' => ''
           }
         },
@@ -1619,7 +1576,7 @@ $result_trees{'index_nodes'} = {
       },
       'source_info' => {
         'file_name' => 'index_nodes.texi',
-        'line_nr' => 47,
+        'line_nr' => 45,
         'macro' => ''
       }
     },
@@ -1704,8 +1661,6 @@ 
$result_trees{'index_nodes'}{'contents'}[5]{'extra'}{'nodes_manuals'}[3]{'node_c
 
 $result_texis{'index_nodes'} = '\\input texinfo @c -*-texinfo-*-
 
-@setfilename index_nodes
-
 @node Top
 @cindex entry a
 
@@ -1765,7 +1720,6 @@ Text and then index entries
 $result_texts{'index_nodes'} = '
 
 
-
 And one one more index
 
 
diff --git a/tp/t/results/indices/index_nodes/res_html/index.html 
b/tp/t/results/indices/index_nodes/res_html/index.html
index 9a620488a4..43019afe79 100644
--- a/tp/t/results/indices/index_nodes/res_html/index.html
+++ b/tp/t/results/indices/index_nodes/res_html/index.html
@@ -30,7 +30,6 @@ th.sections-header-printindex {text-align:left; padding-left: 
1em}
 </head>
 
 <body lang="en">
-
 <a class="node-id" id="Top"></a><div class="nav-panel">
 <p>
 Next: <a href="chap-first.html" accesskey="n" rel="next">chap first</a> &nbsp; 
[<a href="#Top" title="Index" rel="index">Index</a>]</p>
diff --git a/tp/t/results/indices/index_nodes/res_info/index_nodes 
b/tp/t/results/indices/index_nodes/res_info/index_nodes.info
similarity index 88%
rename from tp/t/results/indices/index_nodes/res_info/index_nodes
rename to tp/t/results/indices/index_nodes/res_info/index_nodes.info
index 052a6dd8fb..5953973337 100644
Binary files a/tp/t/results/indices/index_nodes/res_info/index_nodes and 
b/tp/t/results/indices/index_nodes/res_info/index_nodes.info differ
diff --git a/tp/t/results/indices/index_nodes_no_split_no_use_nodes.pl 
b/tp/t/results/indices/index_nodes_no_split_no_use_nodes.pl
index 6809c30f47..a3a2de3664 100644
--- a/tp/t/results/indices/index_nodes_no_split_no_use_nodes.pl
+++ b/tp/t/results/indices/index_nodes_no_split_no_use_nodes.pl
@@ -12,63 +12,20 @@ $result_trees{'index_nodes_no_split_no_use_nodes'} = {
         {
           'contents' => [
             {
-              'contents' => [
-                {
-                  'text' => '\\input texinfo @c -*-texinfo-*-
+              'text' => '\\input texinfo @c -*-texinfo-*-
 ',
-                  'type' => 'text_before_beginning'
-                },
-                {
-                  'text' => '
-',
-                  'type' => 'text_before_beginning'
-                }
-              ],
-              'type' => 'preamble_before_beginning'
-            }
-          ],
-          'type' => 'preamble_before_setfilename'
-        },
-        {
-          'contents' => [
-            {
-              'args' => [
-                {
-                  'contents' => [
-                    {
-                      'text' => 'index_nodes'
-                    }
-                  ],
-                  'info' => {
-                    'spaces_after_argument' => {
-                      'text' => '
-'
-                    }
-                  },
-                  'type' => 'line_arg'
-                }
-              ],
-              'cmdname' => 'setfilename',
-              'extra' => {
-                'text_arg' => 'index_nodes'
-              },
-              'info' => {
-                'spaces_before_argument' => {
-                  'text' => ' '
-                }
-              },
-              'source_info' => {
-                'file_name' => 'index_nodes.texi',
-                'line_nr' => 3,
-                'macro' => ''
-              }
+              'type' => 'text_before_beginning'
             },
             {
               'text' => '
 ',
-              'type' => 'empty_line'
+              'type' => 'text_before_beginning'
             }
           ],
+          'type' => 'preamble_before_beginning'
+        },
+        {
+          'contents' => [],
           'type' => 'preamble_before_content'
         }
       ],
@@ -132,7 +89,7 @@ $result_trees{'index_nodes_no_split_no_use_nodes'} = {
           },
           'source_info' => {
             'file_name' => 'index_nodes.texi',
-            'line_nr' => 6,
+            'line_nr' => 4,
             'macro' => ''
           },
           'type' => 'index_entry_command'
@@ -172,7 +129,7 @@ $result_trees{'index_nodes_no_split_no_use_nodes'} = {
           },
           'source_info' => {
             'file_name' => 'index_nodes.texi',
-            'line_nr' => 8,
+            'line_nr' => 6,
             'macro' => ''
           }
         },
@@ -211,7 +168,7 @@ $result_trees{'index_nodes_no_split_no_use_nodes'} = {
           },
           'source_info' => {
             'file_name' => 'index_nodes.texi',
-            'line_nr' => 10,
+            'line_nr' => 8,
             'macro' => ''
           }
         },
@@ -264,7 +221,7 @@ $result_trees{'index_nodes_no_split_no_use_nodes'} = {
           },
           'source_info' => {
             'file_name' => 'index_nodes.texi',
-            'line_nr' => 14,
+            'line_nr' => 12,
             'macro' => ''
           }
         },
@@ -330,7 +287,7 @@ $result_trees{'index_nodes_no_split_no_use_nodes'} = {
               },
               'source_info' => {
                 'file_name' => 'index_nodes.texi',
-                'line_nr' => 17,
+                'line_nr' => 15,
                 'macro' => ''
               },
               'type' => 'menu_entry'
@@ -363,14 +320,14 @@ $result_trees{'index_nodes_no_split_no_use_nodes'} = {
               },
               'source_info' => {
                 'file_name' => 'index_nodes.texi',
-                'line_nr' => 18,
+                'line_nr' => 16,
                 'macro' => ''
               }
             }
           ],
           'source_info' => {
             'file_name' => 'index_nodes.texi',
-            'line_nr' => 16,
+            'line_nr' => 14,
             'macro' => ''
           }
         },
@@ -402,7 +359,7 @@ $result_trees{'index_nodes_no_split_no_use_nodes'} = {
       },
       'source_info' => {
         'file_name' => 'index_nodes.texi',
-        'line_nr' => 5,
+        'line_nr' => 3,
         'macro' => ''
       }
     },
@@ -492,7 +449,7 @@ $result_trees{'index_nodes_no_split_no_use_nodes'} = {
               },
               'source_info' => {
                 'file_name' => 'index_nodes.texi',
-                'line_nr' => 22,
+                'line_nr' => 20,
                 'macro' => ''
               },
               'type' => 'index_entry_command'
@@ -536,7 +493,7 @@ $result_trees{'index_nodes_no_split_no_use_nodes'} = {
               },
               'source_info' => {
                 'file_name' => 'index_nodes.texi',
-                'line_nr' => 23,
+                'line_nr' => 21,
                 'macro' => ''
               },
               'type' => 'index_entry_command'
@@ -580,7 +537,7 @@ $result_trees{'index_nodes_no_split_no_use_nodes'} = {
               },
               'source_info' => {
                 'file_name' => 'index_nodes.texi',
-                'line_nr' => 24,
+                'line_nr' => 22,
                 'macro' => ''
               },
               'type' => 'index_entry_command'
@@ -624,7 +581,7 @@ $result_trees{'index_nodes_no_split_no_use_nodes'} = {
               },
               'source_info' => {
                 'file_name' => 'index_nodes.texi',
-                'line_nr' => 25,
+                'line_nr' => 23,
                 'macro' => ''
               },
               'type' => 'index_entry_command'
@@ -667,7 +624,7 @@ $result_trees{'index_nodes_no_split_no_use_nodes'} = {
           },
           'source_info' => {
             'file_name' => 'index_nodes.texi',
-            'line_nr' => 27,
+            'line_nr' => 25,
             'macro' => ''
           }
         },
@@ -733,7 +690,7 @@ $result_trees{'index_nodes_no_split_no_use_nodes'} = {
               },
               'source_info' => {
                 'file_name' => 'index_nodes.texi',
-                'line_nr' => 30,
+                'line_nr' => 28,
                 'macro' => ''
               },
               'type' => 'menu_entry'
@@ -766,14 +723,14 @@ $result_trees{'index_nodes_no_split_no_use_nodes'} = {
               },
               'source_info' => {
                 'file_name' => 'index_nodes.texi',
-                'line_nr' => 31,
+                'line_nr' => 29,
                 'macro' => ''
               }
             }
           ],
           'source_info' => {
             'file_name' => 'index_nodes.texi',
-            'line_nr' => 29,
+            'line_nr' => 27,
             'macro' => ''
           }
         },
@@ -818,7 +775,7 @@ $result_trees{'index_nodes_no_split_no_use_nodes'} = {
       },
       'source_info' => {
         'file_name' => 'index_nodes.texi',
-        'line_nr' => 20,
+        'line_nr' => 18,
         'macro' => ''
       }
     },
@@ -912,7 +869,7 @@ $result_trees{'index_nodes_no_split_no_use_nodes'} = {
               },
               'source_info' => {
                 'file_name' => 'index_nodes.texi',
-                'line_nr' => 35,
+                'line_nr' => 33,
                 'macro' => ''
               },
               'type' => 'menu_entry'
@@ -960,7 +917,7 @@ $result_trees{'index_nodes_no_split_no_use_nodes'} = {
               },
               'source_info' => {
                 'file_name' => 'index_nodes.texi',
-                'line_nr' => 36,
+                'line_nr' => 34,
                 'macro' => ''
               },
               'type' => 'menu_entry'
@@ -993,14 +950,14 @@ $result_trees{'index_nodes_no_split_no_use_nodes'} = {
               },
               'source_info' => {
                 'file_name' => 'index_nodes.texi',
-                'line_nr' => 37,
+                'line_nr' => 35,
                 'macro' => ''
               }
             }
           ],
           'source_info' => {
             'file_name' => 'index_nodes.texi',
-            'line_nr' => 34,
+            'line_nr' => 32,
             'macro' => ''
           }
         },
@@ -1039,7 +996,7 @@ $result_trees{'index_nodes_no_split_no_use_nodes'} = {
           },
           'source_info' => {
             'file_name' => 'index_nodes.texi',
-            'line_nr' => 39,
+            'line_nr' => 37,
             'macro' => ''
           }
         },
@@ -1079,7 +1036,7 @@ $result_trees{'index_nodes_no_split_no_use_nodes'} = {
       },
       'source_info' => {
         'file_name' => 'index_nodes.texi',
-        'line_nr' => 33,
+        'line_nr' => 31,
         'macro' => ''
       }
     },
@@ -1178,7 +1135,7 @@ $result_trees{'index_nodes_no_split_no_use_nodes'} = {
           },
           'source_info' => {
             'file_name' => 'index_nodes.texi',
-            'line_nr' => 43,
+            'line_nr' => 41,
             'macro' => ''
           },
           'type' => 'index_entry_command'
@@ -1222,7 +1179,7 @@ $result_trees{'index_nodes_no_split_no_use_nodes'} = {
           },
           'source_info' => {
             'file_name' => 'index_nodes.texi',
-            'line_nr' => 44,
+            'line_nr' => 42,
             'macro' => ''
           },
           'type' => 'index_entry_command'
@@ -1266,7 +1223,7 @@ $result_trees{'index_nodes_no_split_no_use_nodes'} = {
           },
           'source_info' => {
             'file_name' => 'index_nodes.texi',
-            'line_nr' => 45,
+            'line_nr' => 43,
             'macro' => ''
           },
           'type' => 'index_entry_command'
@@ -1311,7 +1268,7 @@ $result_trees{'index_nodes_no_split_no_use_nodes'} = {
       },
       'source_info' => {
         'file_name' => 'index_nodes.texi',
-        'line_nr' => 41,
+        'line_nr' => 39,
         'macro' => ''
       }
     },
@@ -1402,7 +1359,7 @@ $result_trees{'index_nodes_no_split_no_use_nodes'} = {
           },
           'source_info' => {
             'file_name' => 'index_nodes.texi',
-            'line_nr' => 48,
+            'line_nr' => 46,
             'macro' => ''
           },
           'type' => 'index_entry_command'
@@ -1442,7 +1399,7 @@ $result_trees{'index_nodes_no_split_no_use_nodes'} = {
           },
           'source_info' => {
             'file_name' => 'index_nodes.texi',
-            'line_nr' => 50,
+            'line_nr' => 48,
             'macro' => ''
           }
         },
@@ -1490,7 +1447,7 @@ $result_trees{'index_nodes_no_split_no_use_nodes'} = {
           },
           'source_info' => {
             'file_name' => 'index_nodes.texi',
-            'line_nr' => 52,
+            'line_nr' => 50,
             'macro' => ''
           },
           'type' => 'index_entry_command'
@@ -1534,7 +1491,7 @@ $result_trees{'index_nodes_no_split_no_use_nodes'} = {
           },
           'source_info' => {
             'file_name' => 'index_nodes.texi',
-            'line_nr' => 53,
+            'line_nr' => 51,
             'macro' => ''
           },
           'type' => 'index_entry_command'
@@ -1574,7 +1531,7 @@ $result_trees{'index_nodes_no_split_no_use_nodes'} = {
           },
           'source_info' => {
             'file_name' => 'index_nodes.texi',
-            'line_nr' => 55,
+            'line_nr' => 53,
             'macro' => ''
           }
         },
@@ -1619,7 +1576,7 @@ $result_trees{'index_nodes_no_split_no_use_nodes'} = {
       },
       'source_info' => {
         'file_name' => 'index_nodes.texi',
-        'line_nr' => 47,
+        'line_nr' => 45,
         'macro' => ''
       }
     },
@@ -1704,8 +1661,6 @@ 
$result_trees{'index_nodes_no_split_no_use_nodes'}{'contents'}[5]{'extra'}{'node
 
 $result_texis{'index_nodes_no_split_no_use_nodes'} = '\\input texinfo @c 
-*-texinfo-*-
 
-@setfilename index_nodes
-
 @node Top
 @cindex entry a
 
@@ -1765,7 +1720,6 @@ Text and then index entries
 $result_texts{'index_nodes_no_split_no_use_nodes'} = '
 
 
-
 And one one more index
 
 
diff --git 
a/tp/t/results/indices/index_nodes_no_split_no_use_nodes/res_html/index_nodes.html
 
b/tp/t/results/indices/index_nodes_no_split_no_use_nodes/res_html/index_nodes.html
index 1398c7e94d..836cc015f5 100644
--- 
a/tp/t/results/indices/index_nodes_no_split_no_use_nodes/res_html/index_nodes.html
+++ 
b/tp/t/results/indices/index_nodes_no_split_no_use_nodes/res_html/index_nodes.html
@@ -25,7 +25,6 @@ th.sections-header-printindex {text-align:left; padding-left: 
1em}
 </head>
 
 <body lang="en">
-
 <a class="node" id="Top"></a><a class="index-entry-id" id="index-entry-a"></a>
 
 <div class="printindex cp-printindex">
diff --git a/tp/t/results/indices/index_special_region.pl 
b/tp/t/results/indices/index_special_region.pl
index cd5a3ee218..d4fa8a22db 100644
--- a/tp/t/results/indices/index_special_region.pl
+++ b/tp/t/results/indices/index_special_region.pl
@@ -12,62 +12,20 @@ $result_trees{'index_special_region'} = {
         {
           'contents' => [
             {
-              'contents' => [
-                {
-                  'text' => '\\input texinfo @c -*-texinfo-*-
+              'text' => '\\input texinfo @c -*-texinfo-*-
 ',
-                  'type' => 'text_before_beginning'
-                },
-                {
-                  'text' => '
+              'type' => 'text_before_beginning'
+            },
+            {
+              'text' => '
 ',
-                  'type' => 'text_before_beginning'
-                }
-              ],
-              'type' => 'preamble_before_beginning'
+              'type' => 'text_before_beginning'
             }
           ],
-          'type' => 'preamble_before_setfilename'
+          'type' => 'preamble_before_beginning'
         },
         {
           'contents' => [
-            {
-              'args' => [
-                {
-                  'contents' => [
-                    {
-                      'text' => 'index_special_region.info'
-                    }
-                  ],
-                  'info' => {
-                    'spaces_after_argument' => {
-                      'text' => '
-'
-                    }
-                  },
-                  'type' => 'line_arg'
-                }
-              ],
-              'cmdname' => 'setfilename',
-              'extra' => {
-                'text_arg' => 'index_special_region.info'
-              },
-              'info' => {
-                'spaces_before_argument' => {
-                  'text' => ' '
-                }
-              },
-              'source_info' => {
-                'file_name' => 'index_special_region.texi',
-                'line_nr' => 3,
-                'macro' => ''
-              }
-            },
-            {
-              'text' => '
-',
-              'type' => 'empty_line'
-            },
             {
               'args' => [
                 {
@@ -126,7 +84,7 @@ $result_trees{'index_special_region'} = {
                   },
                   'source_info' => {
                     'file_name' => 'index_special_region.texi',
-                    'line_nr' => 7,
+                    'line_nr' => 5,
                     'macro' => ''
                   },
                   'type' => 'index_entry_command'
@@ -154,7 +112,7 @@ $result_trees{'index_special_region'} = {
                   },
                   'source_info' => {
                     'file_name' => 'index_special_region.texi',
-                    'line_nr' => 8,
+                    'line_nr' => 6,
                     'macro' => ''
                   }
                 },
@@ -204,7 +162,7 @@ $result_trees{'index_special_region'} = {
                               },
                               'source_info' => {
                                 'file_name' => 'index_special_region.texi',
-                                'line_nr' => 11,
+                                'line_nr' => 9,
                                 'macro' => ''
                               }
                             },
@@ -269,7 +227,7 @@ $result_trees{'index_special_region'} = {
                               },
                               'source_info' => {
                                 'file_name' => 'index_special_region.texi',
-                                'line_nr' => 14,
+                                'line_nr' => 12,
                                 'macro' => ''
                               },
                               'type' => 'index_entry_command'
@@ -281,7 +239,7 @@ $result_trees{'index_special_region'} = {
                       'cmdname' => 'footnote',
                       'source_info' => {
                         'file_name' => 'index_special_region.texi',
-                        'line_nr' => 11,
+                        'line_nr' => 9,
                         'macro' => ''
                       }
                     },
@@ -327,7 +285,7 @@ $result_trees{'index_special_region'} = {
                   },
                   'source_info' => {
                     'file_name' => 'index_special_region.texi',
-                    'line_nr' => 17,
+                    'line_nr' => 15,
                     'macro' => ''
                   }
                 },
@@ -364,14 +322,14 @@ $result_trees{'index_special_region'} = {
                   },
                   'source_info' => {
                     'file_name' => 'index_special_region.texi',
-                    'line_nr' => 19,
+                    'line_nr' => 17,
                     'macro' => ''
                   }
                 }
               ],
               'source_info' => {
                 'file_name' => 'index_special_region.texi',
-                'line_nr' => 5,
+                'line_nr' => 3,
                 'macro' => ''
               }
             },
@@ -438,7 +396,7 @@ $result_trees{'index_special_region'} = {
                   },
                   'source_info' => {
                     'file_name' => 'index_special_region.texi',
-                    'line_nr' => 23,
+                    'line_nr' => 21,
                     'macro' => ''
                   },
                   'type' => 'index_entry_command'
@@ -466,7 +424,7 @@ $result_trees{'index_special_region'} = {
                   },
                   'source_info' => {
                     'file_name' => 'index_special_region.texi',
-                    'line_nr' => 24,
+                    'line_nr' => 22,
                     'macro' => ''
                   }
                 },
@@ -512,7 +470,7 @@ $result_trees{'index_special_region'} = {
                               },
                               'source_info' => {
                                 'file_name' => 'index_special_region.texi',
-                                'line_nr' => 26,
+                                'line_nr' => 24,
                                 'macro' => ''
                               }
                             },
@@ -574,7 +532,7 @@ $result_trees{'index_special_region'} = {
                               },
                               'source_info' => {
                                 'file_name' => 'index_special_region.texi',
-                                'line_nr' => 29,
+                                'line_nr' => 27,
                                 'macro' => ''
                               },
                               'type' => 'index_entry_command'
@@ -586,7 +544,7 @@ $result_trees{'index_special_region'} = {
                       'cmdname' => 'footnote',
                       'source_info' => {
                         'file_name' => 'index_special_region.texi',
-                        'line_nr' => 26,
+                        'line_nr' => 24,
                         'macro' => ''
                       }
                     },
@@ -613,7 +571,7 @@ $result_trees{'index_special_region'} = {
                   'cmdname' => 'insertcopying',
                   'source_info' => {
                     'file_name' => 'index_special_region.texi',
-                    'line_nr' => 32,
+                    'line_nr' => 30,
                     'macro' => ''
                   }
                 },
@@ -645,14 +603,14 @@ $result_trees{'index_special_region'} = {
                   },
                   'source_info' => {
                     'file_name' => 'index_special_region.texi',
-                    'line_nr' => 33,
+                    'line_nr' => 31,
                     'macro' => ''
                   }
                 }
               ],
               'source_info' => {
                 'file_name' => 'index_special_region.texi',
-                'line_nr' => 21,
+                'line_nr' => 19,
                 'macro' => ''
               }
             },
@@ -706,7 +664,7 @@ $result_trees{'index_special_region'} = {
       },
       'source_info' => {
         'file_name' => 'index_special_region.texi',
-        'line_nr' => 35,
+        'line_nr' => 33,
         'macro' => ''
       }
     },
@@ -736,7 +694,7 @@ $result_trees{'index_special_region'} = {
       },
       'source_info' => {
         'file_name' => 'index_special_region.texi',
-        'line_nr' => 36,
+        'line_nr' => 34,
         'macro' => ''
       }
     },
@@ -775,7 +733,7 @@ $result_trees{'index_special_region'} = {
           'cmdname' => 'insertcopying',
           'source_info' => {
             'file_name' => 'index_special_region.texi',
-            'line_nr' => 39,
+            'line_nr' => 37,
             'macro' => ''
           }
         },
@@ -853,7 +811,7 @@ $result_trees{'index_special_region'} = {
           },
           'source_info' => {
             'file_name' => 'index_special_region.texi',
-            'line_nr' => 44,
+            'line_nr' => 42,
             'macro' => ''
           },
           'type' => 'index_entry_command'
@@ -881,7 +839,7 @@ $result_trees{'index_special_region'} = {
           },
           'source_info' => {
             'file_name' => 'index_special_region.texi',
-            'line_nr' => 46,
+            'line_nr' => 44,
             'macro' => ''
           }
         },
@@ -903,7 +861,7 @@ $result_trees{'index_special_region'} = {
                       },
                       'source_info' => {
                         'file_name' => 'index_special_region.texi',
-                        'line_nr' => 47,
+                        'line_nr' => 45,
                         'macro' => ''
                       },
                       'type' => 'bracketed_def_content'
@@ -926,7 +884,7 @@ $result_trees{'index_special_region'} = {
                       },
                       'source_info' => {
                         'file_name' => 'index_special_region.texi',
-                        'line_nr' => 47,
+                        'line_nr' => 45,
                         'macro' => ''
                       },
                       'type' => 'bracketed_def_content'
@@ -951,7 +909,7 @@ $result_trees{'index_special_region'} = {
               },
               'source_info' => {
                 'file_name' => 'index_special_region.texi',
-                'line_nr' => 47,
+                'line_nr' => 45,
                 'macro' => ''
               },
               'type' => 'def_line'
@@ -971,7 +929,7 @@ $result_trees{'index_special_region'} = {
                       },
                       'source_info' => {
                         'file_name' => 'index_special_region.texi',
-                        'line_nr' => 48,
+                        'line_nr' => 46,
                         'macro' => ''
                       },
                       'type' => 'bracketed_def_content'
@@ -996,7 +954,7 @@ $result_trees{'index_special_region'} = {
               },
               'source_info' => {
                 'file_name' => 'index_special_region.texi',
-                'line_nr' => 48,
+                'line_nr' => 46,
                 'macro' => ''
               },
               'type' => 'def_line'
@@ -1011,7 +969,7 @@ $result_trees{'index_special_region'} = {
                       },
                       'source_info' => {
                         'file_name' => 'index_special_region.texi',
-                        'line_nr' => 49,
+                        'line_nr' => 47,
                         'macro' => ''
                       },
                       'type' => 'bracketed_def_content'
@@ -1029,7 +987,7 @@ $result_trees{'index_special_region'} = {
                       },
                       'source_info' => {
                         'file_name' => 'index_special_region.texi',
-                        'line_nr' => 49,
+                        'line_nr' => 47,
                         'macro' => ''
                       },
                       'type' => 'bracketed_def_content'
@@ -1055,7 +1013,7 @@ $result_trees{'index_special_region'} = {
               },
               'source_info' => {
                 'file_name' => 'index_special_region.texi',
-                'line_nr' => 49,
+                'line_nr' => 47,
                 'macro' => ''
               },
               'type' => 'def_line'
@@ -1088,14 +1046,14 @@ $result_trees{'index_special_region'} = {
               },
               'source_info' => {
                 'file_name' => 'index_special_region.texi',
-                'line_nr' => 50,
+                'line_nr' => 48,
                 'macro' => ''
               }
             }
           ],
           'source_info' => {
             'file_name' => 'index_special_region.texi',
-            'line_nr' => 47,
+            'line_nr' => 45,
             'macro' => ''
           }
         },
@@ -1144,7 +1102,7 @@ $result_trees{'index_special_region'} = {
                       },
                       'source_info' => {
                         'file_name' => 'index_special_region.texi',
-                        'line_nr' => 53,
+                        'line_nr' => 51,
                         'macro' => ''
                       }
                     }
@@ -1197,7 +1155,7 @@ $result_trees{'index_special_region'} = {
                       },
                       'source_info' => {
                         'file_name' => 'index_special_region.texi',
-                        'line_nr' => 54,
+                        'line_nr' => 52,
                         'macro' => ''
                       }
                     }
@@ -1235,7 +1193,7 @@ $result_trees{'index_special_region'} = {
               },
               'source_info' => {
                 'file_name' => 'index_special_region.texi',
-                'line_nr' => 55,
+                'line_nr' => 53,
                 'macro' => ''
               }
             }
@@ -1245,7 +1203,7 @@ $result_trees{'index_special_region'} = {
           },
           'source_info' => {
             'file_name' => 'index_special_region.texi',
-            'line_nr' => 52,
+            'line_nr' => 50,
             'macro' => ''
           }
         },
@@ -1311,7 +1269,7 @@ $result_trees{'index_special_region'} = {
               },
               'source_info' => {
                 'file_name' => 'index_special_region.texi',
-                'line_nr' => 58,
+                'line_nr' => 56,
                 'macro' => ''
               },
               'type' => 'menu_entry'
@@ -1344,14 +1302,14 @@ $result_trees{'index_special_region'} = {
               },
               'source_info' => {
                 'file_name' => 'index_special_region.texi',
-                'line_nr' => 59,
+                'line_nr' => 57,
                 'macro' => ''
               }
             }
           ],
           'source_info' => {
             'file_name' => 'index_special_region.texi',
-            'line_nr' => 57,
+            'line_nr' => 55,
             'macro' => ''
           }
         },
@@ -1368,7 +1326,7 @@ $result_trees{'index_special_region'} = {
       },
       'source_info' => {
         'file_name' => 'index_special_region.texi',
-        'line_nr' => 37,
+        'line_nr' => 35,
         'macro' => ''
       }
     },
@@ -1412,7 +1370,7 @@ $result_trees{'index_special_region'} = {
       },
       'source_info' => {
         'file_name' => 'index_special_region.texi',
-        'line_nr' => 61,
+        'line_nr' => 59,
         'macro' => ''
       }
     },
@@ -1493,7 +1451,7 @@ $result_trees{'index_special_region'} = {
           },
           'source_info' => {
             'file_name' => 'index_special_region.texi',
-            'line_nr' => 66,
+            'line_nr' => 64,
             'macro' => ''
           },
           'type' => 'index_entry_command'
@@ -1542,7 +1500,7 @@ $result_trees{'index_special_region'} = {
           },
           'source_info' => {
             'file_name' => 'index_special_region.texi',
-            'line_nr' => 68,
+            'line_nr' => 66,
             'macro' => ''
           },
           'type' => 'index_entry_command'
@@ -1577,7 +1535,7 @@ $result_trees{'index_special_region'} = {
               },
               'source_info' => {
                 'file_name' => 'index_special_region.texi',
-                'line_nr' => 70,
+                'line_nr' => 68,
                 'macro' => ''
               }
             },
@@ -1608,7 +1566,7 @@ $result_trees{'index_special_region'} = {
               },
               'source_info' => {
                 'file_name' => 'index_special_region.texi',
-                'line_nr' => 71,
+                'line_nr' => 69,
                 'macro' => ''
               }
             },
@@ -1649,7 +1607,7 @@ $result_trees{'index_special_region'} = {
               },
               'source_info' => {
                 'file_name' => 'index_special_region.texi',
-                'line_nr' => 73,
+                'line_nr' => 71,
                 'macro' => ''
               }
             },
@@ -1680,7 +1638,7 @@ $result_trees{'index_special_region'} = {
               },
               'source_info' => {
                 'file_name' => 'index_special_region.texi',
-                'line_nr' => 74,
+                'line_nr' => 72,
                 'macro' => ''
               }
             },
@@ -1707,7 +1665,7 @@ $result_trees{'index_special_region'} = {
           'cmdname' => 'insertcopying',
           'source_info' => {
             'file_name' => 'index_special_region.texi',
-            'line_nr' => 76,
+            'line_nr' => 74,
             'macro' => ''
           }
         },
@@ -1746,7 +1704,7 @@ $result_trees{'index_special_region'} = {
           },
           'source_info' => {
             'file_name' => 'index_special_region.texi',
-            'line_nr' => 78,
+            'line_nr' => 76,
             'macro' => ''
           }
         },
@@ -1780,7 +1738,7 @@ $result_trees{'index_special_region'} = {
           },
           'source_info' => {
             'file_name' => 'index_special_region.texi',
-            'line_nr' => 79,
+            'line_nr' => 77,
             'macro' => ''
           }
         },
@@ -1800,7 +1758,7 @@ $result_trees{'index_special_region'} = {
           'cmdname' => 'contents',
           'source_info' => {
             'file_name' => 'index_special_region.texi',
-            'line_nr' => 81,
+            'line_nr' => 79,
             'macro' => ''
           }
         }
@@ -1813,7 +1771,7 @@ $result_trees{'index_special_region'} = {
       },
       'source_info' => {
         'file_name' => 'index_special_region.texi',
-        'line_nr' => 62,
+        'line_nr' => 60,
         'macro' => ''
       }
     },
@@ -1830,22 +1788,22 @@ $result_trees{'index_special_region'} = {
   ],
   'type' => 'document_root'
 };
+$result_trees{'index_special_region'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'index_special_region'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'};
+$result_trees{'index_special_region'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'index_special_region'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'};
+$result_trees{'index_special_region'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'index_special_region'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[1];
+$result_trees{'index_special_region'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[2]{'extra'}{'node_content'}[0]
 = 
$result_trees{'index_special_region'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0];
+$result_trees{'index_special_region'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[5]{'contents'}[2]{'args'}[0]{'contents'}[0]{'extra'}{'node_content'}[0]
 = 
$result_trees{'index_special_region'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[5]{'contents'}[2]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0];
+$result_trees{'index_special_region'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[5]{'contents'}[2]{'args'}[0]{'contents'}[4]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'index_special_region'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[5]{'contents'}[2]{'args'}[0]{'contents'}[4]{'args'}[0]{'contents'};
+$result_trees{'index_special_region'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[5]{'contents'}[2]{'args'}[0]{'contents'}[4]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'index_special_region'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[5]{'contents'}[2]{'args'}[0]{'contents'}[4]{'args'}[0]{'contents'};
+$result_trees{'index_special_region'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[5]{'contents'}[2]{'args'}[0]{'contents'}[4]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'index_special_region'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[5]{'contents'}[2]{'args'}[0]{'contents'}[4];
 
$result_trees{'index_special_region'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'index_special_region'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'args'}[0]{'contents'};
 
$result_trees{'index_special_region'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'index_special_region'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'args'}[0]{'contents'};
 
$result_trees{'index_special_region'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'index_special_region'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'contents'}[1];
 
$result_trees{'index_special_region'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'contents'}[2]{'extra'}{'node_content'}[0]
 = 
$result_trees{'index_special_region'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'contents'}[2]{'args'}[0]{'contents'}[0];
-$result_trees{'index_special_region'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'contents'}[5]{'contents'}[2]{'args'}[0]{'contents'}[0]{'extra'}{'node_content'}[0]
 = 
$result_trees{'index_special_region'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'contents'}[5]{'contents'}[2]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0];
-$result_trees{'index_special_region'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'contents'}[5]{'contents'}[2]{'args'}[0]{'contents'}[4]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'index_special_region'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'contents'}[5]{'contents'}[2]{'args'}[0]{'contents'}[4]{'args'}[0]{'contents'};
-$result_trees{'index_special_region'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'contents'}[5]{'contents'}[2]{'args'}[0]{'contents'}[4]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'index_special_region'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'contents'}[5]{'contents'}[2]{'args'}[0]{'contents'}[4]{'args'}[0]{'contents'};
-$result_trees{'index_special_region'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'contents'}[5]{'contents'}[2]{'args'}[0]{'contents'}[4]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'index_special_region'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'contents'}[5]{'contents'}[2]{'args'}[0]{'contents'}[4];
-$result_trees{'index_special_region'}{'contents'}[0]{'contents'}[1]{'contents'}[4]{'contents'}[1]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'index_special_region'}{'contents'}[0]{'contents'}[1]{'contents'}[4]{'contents'}[1]{'args'}[0]{'contents'};
-$result_trees{'index_special_region'}{'contents'}[0]{'contents'}[1]{'contents'}[4]{'contents'}[1]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'index_special_region'}{'contents'}[0]{'contents'}[1]{'contents'}[4]{'contents'}[1]{'args'}[0]{'contents'};
-$result_trees{'index_special_region'}{'contents'}[0]{'contents'}[1]{'contents'}[4]{'contents'}[1]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'index_special_region'}{'contents'}[0]{'contents'}[1]{'contents'}[4]{'contents'}[1];
-$result_trees{'index_special_region'}{'contents'}[0]{'contents'}[1]{'contents'}[4]{'contents'}[2]{'extra'}{'node_content'}[0]
 = 
$result_trees{'index_special_region'}{'contents'}[0]{'contents'}[1]{'contents'}[4]{'contents'}[2]{'args'}[0]{'contents'}[0];
-$result_trees{'index_special_region'}{'contents'}[0]{'contents'}[1]{'contents'}[4]{'contents'}[5]{'contents'}[1]{'args'}[0]{'contents'}[0]{'extra'}{'node_content'}[0]
 = 
$result_trees{'index_special_region'}{'contents'}[0]{'contents'}[1]{'contents'}[4]{'contents'}[5]{'contents'}[1]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0];
-$result_trees{'index_special_region'}{'contents'}[0]{'contents'}[1]{'contents'}[4]{'contents'}[5]{'contents'}[1]{'args'}[0]{'contents'}[4]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'index_special_region'}{'contents'}[0]{'contents'}[1]{'contents'}[4]{'contents'}[5]{'contents'}[1]{'args'}[0]{'contents'}[4]{'args'}[0]{'contents'};
-$result_trees{'index_special_region'}{'contents'}[0]{'contents'}[1]{'contents'}[4]{'contents'}[5]{'contents'}[1]{'args'}[0]{'contents'}[4]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'index_special_region'}{'contents'}[0]{'contents'}[1]{'contents'}[4]{'contents'}[5]{'contents'}[1]{'args'}[0]{'contents'}[4]{'args'}[0]{'contents'};
-$result_trees{'index_special_region'}{'contents'}[0]{'contents'}[1]{'contents'}[4]{'contents'}[5]{'contents'}[1]{'args'}[0]{'contents'}[4]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'index_special_region'}{'contents'}[0]{'contents'}[1]{'contents'}[4]{'contents'}[5]{'contents'}[1]{'args'}[0]{'contents'}[4];
+$result_trees{'index_special_region'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'contents'}[5]{'contents'}[1]{'args'}[0]{'contents'}[0]{'extra'}{'node_content'}[0]
 = 
$result_trees{'index_special_region'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'contents'}[5]{'contents'}[1]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0];
+$result_trees{'index_special_region'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'contents'}[5]{'contents'}[1]{'args'}[0]{'contents'}[4]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'index_special_region'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'contents'}[5]{'contents'}[1]{'args'}[0]{'contents'}[4]{'args'}[0]{'contents'};
+$result_trees{'index_special_region'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'contents'}[5]{'contents'}[1]{'args'}[0]{'contents'}[4]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'index_special_region'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'contents'}[5]{'contents'}[1]{'args'}[0]{'contents'}[4]{'args'}[0]{'contents'};
+$result_trees{'index_special_region'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'contents'}[5]{'contents'}[1]{'args'}[0]{'contents'}[4]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'index_special_region'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'contents'}[5]{'contents'}[1]{'args'}[0]{'contents'}[4];
 
$result_trees{'index_special_region'}{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'index_special_region'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'index_special_region'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'index_special_region'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'index_special_region'}{'contents'}[3]{'contents'}[5]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'index_special_region'}{'contents'}[3]{'contents'}[5]{'args'}[0]{'contents'};
@@ -1873,19 +1831,17 @@ 
$result_trees{'index_special_region'}{'contents'}[5]{'contents'}[5]{'extra'}{'in
 
$result_trees{'index_special_region'}{'contents'}[5]{'contents'}[5]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'index_special_region'}{'contents'}[5]{'contents'}[5]{'args'}[0]{'contents'};
 
$result_trees{'index_special_region'}{'contents'}[5]{'contents'}[5]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'index_special_region'}{'contents'}[5]{'contents'}[5];
 
$result_trees{'index_special_region'}{'contents'}[5]{'contents'}[5]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'index_special_region'}{'contents'}[4];
-$result_trees{'index_special_region'}{'contents'}[5]{'contents'}[7]{'contents'}[0]{'extra'}{'label'}
 = 
$result_trees{'index_special_region'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'contents'}[2];
+$result_trees{'index_special_region'}{'contents'}[5]{'contents'}[7]{'contents'}[0]{'extra'}{'label'}
 = 
$result_trees{'index_special_region'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[2];
 
$result_trees{'index_special_region'}{'contents'}[5]{'contents'}[7]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[0]
 = 
$result_trees{'index_special_region'}{'contents'}[5]{'contents'}[7]{'contents'}[0]{'args'}[0]{'contents'}[0];
-$result_trees{'index_special_region'}{'contents'}[5]{'contents'}[7]{'contents'}[2]{'extra'}{'label'}
 = 
$result_trees{'index_special_region'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'contents'}[5]{'contents'}[2]{'args'}[0]{'contents'}[0];
+$result_trees{'index_special_region'}{'contents'}[5]{'contents'}[7]{'contents'}[2]{'extra'}{'label'}
 = 
$result_trees{'index_special_region'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[5]{'contents'}[2]{'args'}[0]{'contents'}[0];
 
$result_trees{'index_special_region'}{'contents'}[5]{'contents'}[7]{'contents'}[2]{'extra'}{'node_argument'}{'node_content'}[0]
 = 
$result_trees{'index_special_region'}{'contents'}[5]{'contents'}[7]{'contents'}[2]{'args'}[0]{'contents'}[0];
-$result_trees{'index_special_region'}{'contents'}[5]{'contents'}[9]{'contents'}[0]{'extra'}{'label'}
 = 
$result_trees{'index_special_region'}{'contents'}[0]{'contents'}[1]{'contents'}[4]{'contents'}[2];
+$result_trees{'index_special_region'}{'contents'}[5]{'contents'}[9]{'contents'}[0]{'extra'}{'label'}
 = 
$result_trees{'index_special_region'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'contents'}[2];
 
$result_trees{'index_special_region'}{'contents'}[5]{'contents'}[9]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[0]
 = 
$result_trees{'index_special_region'}{'contents'}[5]{'contents'}[9]{'contents'}[0]{'args'}[0]{'contents'}[0];
-$result_trees{'index_special_region'}{'contents'}[5]{'contents'}[9]{'contents'}[2]{'extra'}{'label'}
 = 
$result_trees{'index_special_region'}{'contents'}[0]{'contents'}[1]{'contents'}[4]{'contents'}[5]{'contents'}[1]{'args'}[0]{'contents'}[0];
+$result_trees{'index_special_region'}{'contents'}[5]{'contents'}[9]{'contents'}[2]{'extra'}{'label'}
 = 
$result_trees{'index_special_region'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'contents'}[5]{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'index_special_region'}{'contents'}[5]{'contents'}[9]{'contents'}[2]{'extra'}{'node_argument'}{'node_content'}[0]
 = 
$result_trees{'index_special_region'}{'contents'}[5]{'contents'}[9]{'contents'}[2]{'args'}[0]{'contents'}[0];
 
 $result_texis{'index_special_region'} = '\\input texinfo @c -*-texinfo-*-
 
-@setfilename index_special_region.info
-
 @copying 
 
 @cindex Copying this document
@@ -1969,7 +1925,6 @@ In the appendix, we print the indices and references.
 
 $result_texts{'index_special_region'} = '
 
-
 Top
 ***
 1 Chapter
@@ -2151,7 +2106,7 @@ $result_errors{'index_special_region'} = [
     'error_line' => 'warning: @cindex missing argument
 ',
     'file_name' => 'index_special_region.texi',
-    'line_nr' => 46,
+    'line_nr' => 44,
     'macro' => '',
     'text' => '@cindex missing argument',
     'type' => 'warning'
@@ -2160,7 +2115,7 @@ $result_errors{'index_special_region'} = [
     'error_line' => 'warning: missing name for @deffn
 ',
     'file_name' => 'index_special_region.texi',
-    'line_nr' => 47,
+    'line_nr' => 45,
     'macro' => '',
     'text' => 'missing name for @deffn',
     'type' => 'warning'
@@ -2169,7 +2124,7 @@ $result_errors{'index_special_region'} = [
     'error_line' => 'warning: missing name for @deffnx
 ',
     'file_name' => 'index_special_region.texi',
-    'line_nr' => 48,
+    'line_nr' => 46,
     'macro' => '',
     'text' => 'missing name for @deffnx',
     'type' => 'warning'
@@ -2178,7 +2133,7 @@ $result_errors{'index_special_region'} = [
     'error_line' => 'warning: missing name for @deffnx
 ',
     'file_name' => 'index_special_region.texi',
-    'line_nr' => 49,
+    'line_nr' => 47,
     'macro' => '',
     'text' => 'missing name for @deffnx',
     'type' => 'warning'
@@ -2187,7 +2142,7 @@ $result_errors{'index_special_region'} = [
     'error_line' => 'missing @ftable argument
 ',
     'file_name' => 'index_special_region.texi',
-    'line_nr' => 52,
+    'line_nr' => 50,
     'macro' => '',
     'text' => 'missing @ftable argument',
     'type' => 'error'
@@ -2196,7 +2151,7 @@ $result_errors{'index_special_region'} = [
     'error_line' => 'warning: @item missing argument
 ',
     'file_name' => 'index_special_region.texi',
-    'line_nr' => 53,
+    'line_nr' => 51,
     'macro' => '',
     'text' => '@item missing argument',
     'type' => 'warning'
@@ -2228,7 +2183,7 @@ 
$result_converted_errors{'file_info'}->{'index_special_region'} = [
     'error_line' => '@anchor output more than once: Copying information
 ',
     'file_name' => 'index_special_region.texi',
-    'line_nr' => 8,
+    'line_nr' => 6,
     'macro' => '',
     'text' => '@anchor output more than once: Copying information',
     'type' => 'error'
@@ -2237,7 +2192,7 @@ 
$result_converted_errors{'file_info'}->{'index_special_region'} = [
     'error_line' => '@anchor output more than once: Public domain reference
 ',
     'file_name' => 'index_special_region.texi',
-    'line_nr' => 11,
+    'line_nr' => 9,
     'macro' => '',
     'text' => '@anchor output more than once: Public domain reference',
     'type' => 'error'
diff --git a/tp/t/results/indices/index_special_region/res_html/index.html 
b/tp/t/results/indices/index_special_region/res_html/index.html
index 270c1ef8da..702cb5b7aa 100644
--- a/tp/t/results/indices/index_special_region/res_html/index.html
+++ b/tp/t/results/indices/index_special_region/res_html/index.html
@@ -41,7 +41,6 @@ ul.toc-numbered-mark {list-style: none}
 <body lang="en">
 
 
-
 <div class="top-level-extent" id="Top">
 <div class="nav-panel">
 <p>
diff --git a/tp/t/results/indices/index_special_region_no_titlepage_no_nodes.pl 
b/tp/t/results/indices/index_special_region_no_titlepage_no_nodes.pl
index 99e5ffa2fa..af7580b20e 100644
--- a/tp/t/results/indices/index_special_region_no_titlepage_no_nodes.pl
+++ b/tp/t/results/indices/index_special_region_no_titlepage_no_nodes.pl
@@ -12,62 +12,20 @@ $result_trees{'index_special_region_no_titlepage_no_nodes'} 
= {
         {
           'contents' => [
             {
-              'contents' => [
-                {
-                  'text' => '\\input texinfo @c -*-texinfo-*-
+              'text' => '\\input texinfo @c -*-texinfo-*-
 ',
-                  'type' => 'text_before_beginning'
-                },
-                {
-                  'text' => '
+              'type' => 'text_before_beginning'
+            },
+            {
+              'text' => '
 ',
-                  'type' => 'text_before_beginning'
-                }
-              ],
-              'type' => 'preamble_before_beginning'
+              'type' => 'text_before_beginning'
             }
           ],
-          'type' => 'preamble_before_setfilename'
+          'type' => 'preamble_before_beginning'
         },
         {
           'contents' => [
-            {
-              'args' => [
-                {
-                  'contents' => [
-                    {
-                      'text' => 'index_special_region.info'
-                    }
-                  ],
-                  'info' => {
-                    'spaces_after_argument' => {
-                      'text' => '
-'
-                    }
-                  },
-                  'type' => 'line_arg'
-                }
-              ],
-              'cmdname' => 'setfilename',
-              'extra' => {
-                'text_arg' => 'index_special_region.info'
-              },
-              'info' => {
-                'spaces_before_argument' => {
-                  'text' => ' '
-                }
-              },
-              'source_info' => {
-                'file_name' => 'index_special_region.texi',
-                'line_nr' => 3,
-                'macro' => ''
-              }
-            },
-            {
-              'text' => '
-',
-              'type' => 'empty_line'
-            },
             {
               'args' => [
                 {
@@ -126,7 +84,7 @@ $result_trees{'index_special_region_no_titlepage_no_nodes'} 
= {
                   },
                   'source_info' => {
                     'file_name' => 'index_special_region.texi',
-                    'line_nr' => 7,
+                    'line_nr' => 5,
                     'macro' => ''
                   },
                   'type' => 'index_entry_command'
@@ -154,7 +112,7 @@ $result_trees{'index_special_region_no_titlepage_no_nodes'} 
= {
                   },
                   'source_info' => {
                     'file_name' => 'index_special_region.texi',
-                    'line_nr' => 8,
+                    'line_nr' => 6,
                     'macro' => ''
                   }
                 },
@@ -204,7 +162,7 @@ $result_trees{'index_special_region_no_titlepage_no_nodes'} 
= {
                               },
                               'source_info' => {
                                 'file_name' => 'index_special_region.texi',
-                                'line_nr' => 11,
+                                'line_nr' => 9,
                                 'macro' => ''
                               }
                             },
@@ -269,7 +227,7 @@ $result_trees{'index_special_region_no_titlepage_no_nodes'} 
= {
                               },
                               'source_info' => {
                                 'file_name' => 'index_special_region.texi',
-                                'line_nr' => 14,
+                                'line_nr' => 12,
                                 'macro' => ''
                               },
                               'type' => 'index_entry_command'
@@ -281,7 +239,7 @@ $result_trees{'index_special_region_no_titlepage_no_nodes'} 
= {
                       'cmdname' => 'footnote',
                       'source_info' => {
                         'file_name' => 'index_special_region.texi',
-                        'line_nr' => 11,
+                        'line_nr' => 9,
                         'macro' => ''
                       }
                     },
@@ -327,7 +285,7 @@ $result_trees{'index_special_region_no_titlepage_no_nodes'} 
= {
                   },
                   'source_info' => {
                     'file_name' => 'index_special_region.texi',
-                    'line_nr' => 17,
+                    'line_nr' => 15,
                     'macro' => ''
                   }
                 },
@@ -364,14 +322,14 @@ 
$result_trees{'index_special_region_no_titlepage_no_nodes'} = {
                   },
                   'source_info' => {
                     'file_name' => 'index_special_region.texi',
-                    'line_nr' => 19,
+                    'line_nr' => 17,
                     'macro' => ''
                   }
                 }
               ],
               'source_info' => {
                 'file_name' => 'index_special_region.texi',
-                'line_nr' => 5,
+                'line_nr' => 3,
                 'macro' => ''
               }
             },
@@ -438,7 +396,7 @@ $result_trees{'index_special_region_no_titlepage_no_nodes'} 
= {
                   },
                   'source_info' => {
                     'file_name' => 'index_special_region.texi',
-                    'line_nr' => 23,
+                    'line_nr' => 21,
                     'macro' => ''
                   },
                   'type' => 'index_entry_command'
@@ -466,7 +424,7 @@ $result_trees{'index_special_region_no_titlepage_no_nodes'} 
= {
                   },
                   'source_info' => {
                     'file_name' => 'index_special_region.texi',
-                    'line_nr' => 24,
+                    'line_nr' => 22,
                     'macro' => ''
                   }
                 },
@@ -512,7 +470,7 @@ $result_trees{'index_special_region_no_titlepage_no_nodes'} 
= {
                               },
                               'source_info' => {
                                 'file_name' => 'index_special_region.texi',
-                                'line_nr' => 26,
+                                'line_nr' => 24,
                                 'macro' => ''
                               }
                             },
@@ -574,7 +532,7 @@ $result_trees{'index_special_region_no_titlepage_no_nodes'} 
= {
                               },
                               'source_info' => {
                                 'file_name' => 'index_special_region.texi',
-                                'line_nr' => 29,
+                                'line_nr' => 27,
                                 'macro' => ''
                               },
                               'type' => 'index_entry_command'
@@ -586,7 +544,7 @@ $result_trees{'index_special_region_no_titlepage_no_nodes'} 
= {
                       'cmdname' => 'footnote',
                       'source_info' => {
                         'file_name' => 'index_special_region.texi',
-                        'line_nr' => 26,
+                        'line_nr' => 24,
                         'macro' => ''
                       }
                     },
@@ -613,7 +571,7 @@ $result_trees{'index_special_region_no_titlepage_no_nodes'} 
= {
                   'cmdname' => 'insertcopying',
                   'source_info' => {
                     'file_name' => 'index_special_region.texi',
-                    'line_nr' => 32,
+                    'line_nr' => 30,
                     'macro' => ''
                   }
                 },
@@ -645,14 +603,14 @@ 
$result_trees{'index_special_region_no_titlepage_no_nodes'} = {
                   },
                   'source_info' => {
                     'file_name' => 'index_special_region.texi',
-                    'line_nr' => 33,
+                    'line_nr' => 31,
                     'macro' => ''
                   }
                 }
               ],
               'source_info' => {
                 'file_name' => 'index_special_region.texi',
-                'line_nr' => 21,
+                'line_nr' => 19,
                 'macro' => ''
               }
             },
@@ -706,7 +664,7 @@ $result_trees{'index_special_region_no_titlepage_no_nodes'} 
= {
       },
       'source_info' => {
         'file_name' => 'index_special_region.texi',
-        'line_nr' => 35,
+        'line_nr' => 33,
         'macro' => ''
       }
     },
@@ -736,7 +694,7 @@ $result_trees{'index_special_region_no_titlepage_no_nodes'} 
= {
       },
       'source_info' => {
         'file_name' => 'index_special_region.texi',
-        'line_nr' => 36,
+        'line_nr' => 34,
         'macro' => ''
       }
     },
@@ -775,7 +733,7 @@ $result_trees{'index_special_region_no_titlepage_no_nodes'} 
= {
           'cmdname' => 'insertcopying',
           'source_info' => {
             'file_name' => 'index_special_region.texi',
-            'line_nr' => 39,
+            'line_nr' => 37,
             'macro' => ''
           }
         },
@@ -853,7 +811,7 @@ $result_trees{'index_special_region_no_titlepage_no_nodes'} 
= {
           },
           'source_info' => {
             'file_name' => 'index_special_region.texi',
-            'line_nr' => 44,
+            'line_nr' => 42,
             'macro' => ''
           },
           'type' => 'index_entry_command'
@@ -881,7 +839,7 @@ $result_trees{'index_special_region_no_titlepage_no_nodes'} 
= {
           },
           'source_info' => {
             'file_name' => 'index_special_region.texi',
-            'line_nr' => 46,
+            'line_nr' => 44,
             'macro' => ''
           }
         },
@@ -903,7 +861,7 @@ $result_trees{'index_special_region_no_titlepage_no_nodes'} 
= {
                       },
                       'source_info' => {
                         'file_name' => 'index_special_region.texi',
-                        'line_nr' => 47,
+                        'line_nr' => 45,
                         'macro' => ''
                       },
                       'type' => 'bracketed_def_content'
@@ -926,7 +884,7 @@ $result_trees{'index_special_region_no_titlepage_no_nodes'} 
= {
                       },
                       'source_info' => {
                         'file_name' => 'index_special_region.texi',
-                        'line_nr' => 47,
+                        'line_nr' => 45,
                         'macro' => ''
                       },
                       'type' => 'bracketed_def_content'
@@ -951,7 +909,7 @@ $result_trees{'index_special_region_no_titlepage_no_nodes'} 
= {
               },
               'source_info' => {
                 'file_name' => 'index_special_region.texi',
-                'line_nr' => 47,
+                'line_nr' => 45,
                 'macro' => ''
               },
               'type' => 'def_line'
@@ -971,7 +929,7 @@ $result_trees{'index_special_region_no_titlepage_no_nodes'} 
= {
                       },
                       'source_info' => {
                         'file_name' => 'index_special_region.texi',
-                        'line_nr' => 48,
+                        'line_nr' => 46,
                         'macro' => ''
                       },
                       'type' => 'bracketed_def_content'
@@ -996,7 +954,7 @@ $result_trees{'index_special_region_no_titlepage_no_nodes'} 
= {
               },
               'source_info' => {
                 'file_name' => 'index_special_region.texi',
-                'line_nr' => 48,
+                'line_nr' => 46,
                 'macro' => ''
               },
               'type' => 'def_line'
@@ -1011,7 +969,7 @@ 
$result_trees{'index_special_region_no_titlepage_no_nodes'} = {
                       },
                       'source_info' => {
                         'file_name' => 'index_special_region.texi',
-                        'line_nr' => 49,
+                        'line_nr' => 47,
                         'macro' => ''
                       },
                       'type' => 'bracketed_def_content'
@@ -1029,7 +987,7 @@ 
$result_trees{'index_special_region_no_titlepage_no_nodes'} = {
                       },
                       'source_info' => {
                         'file_name' => 'index_special_region.texi',
-                        'line_nr' => 49,
+                        'line_nr' => 47,
                         'macro' => ''
                       },
                       'type' => 'bracketed_def_content'
@@ -1055,7 +1013,7 @@ 
$result_trees{'index_special_region_no_titlepage_no_nodes'} = {
               },
               'source_info' => {
                 'file_name' => 'index_special_region.texi',
-                'line_nr' => 49,
+                'line_nr' => 47,
                 'macro' => ''
               },
               'type' => 'def_line'
@@ -1088,14 +1046,14 @@ 
$result_trees{'index_special_region_no_titlepage_no_nodes'} = {
               },
               'source_info' => {
                 'file_name' => 'index_special_region.texi',
-                'line_nr' => 50,
+                'line_nr' => 48,
                 'macro' => ''
               }
             }
           ],
           'source_info' => {
             'file_name' => 'index_special_region.texi',
-            'line_nr' => 47,
+            'line_nr' => 45,
             'macro' => ''
           }
         },
@@ -1144,7 +1102,7 @@ 
$result_trees{'index_special_region_no_titlepage_no_nodes'} = {
                       },
                       'source_info' => {
                         'file_name' => 'index_special_region.texi',
-                        'line_nr' => 53,
+                        'line_nr' => 51,
                         'macro' => ''
                       }
                     }
@@ -1197,7 +1155,7 @@ 
$result_trees{'index_special_region_no_titlepage_no_nodes'} = {
                       },
                       'source_info' => {
                         'file_name' => 'index_special_region.texi',
-                        'line_nr' => 54,
+                        'line_nr' => 52,
                         'macro' => ''
                       }
                     }
@@ -1235,7 +1193,7 @@ 
$result_trees{'index_special_region_no_titlepage_no_nodes'} = {
               },
               'source_info' => {
                 'file_name' => 'index_special_region.texi',
-                'line_nr' => 55,
+                'line_nr' => 53,
                 'macro' => ''
               }
             }
@@ -1245,7 +1203,7 @@ 
$result_trees{'index_special_region_no_titlepage_no_nodes'} = {
           },
           'source_info' => {
             'file_name' => 'index_special_region.texi',
-            'line_nr' => 52,
+            'line_nr' => 50,
             'macro' => ''
           }
         },
@@ -1311,7 +1269,7 @@ 
$result_trees{'index_special_region_no_titlepage_no_nodes'} = {
               },
               'source_info' => {
                 'file_name' => 'index_special_region.texi',
-                'line_nr' => 58,
+                'line_nr' => 56,
                 'macro' => ''
               },
               'type' => 'menu_entry'
@@ -1344,14 +1302,14 @@ 
$result_trees{'index_special_region_no_titlepage_no_nodes'} = {
               },
               'source_info' => {
                 'file_name' => 'index_special_region.texi',
-                'line_nr' => 59,
+                'line_nr' => 57,
                 'macro' => ''
               }
             }
           ],
           'source_info' => {
             'file_name' => 'index_special_region.texi',
-            'line_nr' => 57,
+            'line_nr' => 55,
             'macro' => ''
           }
         },
@@ -1368,7 +1326,7 @@ 
$result_trees{'index_special_region_no_titlepage_no_nodes'} = {
       },
       'source_info' => {
         'file_name' => 'index_special_region.texi',
-        'line_nr' => 37,
+        'line_nr' => 35,
         'macro' => ''
       }
     },
@@ -1412,7 +1370,7 @@ 
$result_trees{'index_special_region_no_titlepage_no_nodes'} = {
       },
       'source_info' => {
         'file_name' => 'index_special_region.texi',
-        'line_nr' => 61,
+        'line_nr' => 59,
         'macro' => ''
       }
     },
@@ -1493,7 +1451,7 @@ 
$result_trees{'index_special_region_no_titlepage_no_nodes'} = {
           },
           'source_info' => {
             'file_name' => 'index_special_region.texi',
-            'line_nr' => 66,
+            'line_nr' => 64,
             'macro' => ''
           },
           'type' => 'index_entry_command'
@@ -1542,7 +1500,7 @@ 
$result_trees{'index_special_region_no_titlepage_no_nodes'} = {
           },
           'source_info' => {
             'file_name' => 'index_special_region.texi',
-            'line_nr' => 68,
+            'line_nr' => 66,
             'macro' => ''
           },
           'type' => 'index_entry_command'
@@ -1577,7 +1535,7 @@ 
$result_trees{'index_special_region_no_titlepage_no_nodes'} = {
               },
               'source_info' => {
                 'file_name' => 'index_special_region.texi',
-                'line_nr' => 70,
+                'line_nr' => 68,
                 'macro' => ''
               }
             },
@@ -1608,7 +1566,7 @@ 
$result_trees{'index_special_region_no_titlepage_no_nodes'} = {
               },
               'source_info' => {
                 'file_name' => 'index_special_region.texi',
-                'line_nr' => 71,
+                'line_nr' => 69,
                 'macro' => ''
               }
             },
@@ -1649,7 +1607,7 @@ 
$result_trees{'index_special_region_no_titlepage_no_nodes'} = {
               },
               'source_info' => {
                 'file_name' => 'index_special_region.texi',
-                'line_nr' => 73,
+                'line_nr' => 71,
                 'macro' => ''
               }
             },
@@ -1680,7 +1638,7 @@ 
$result_trees{'index_special_region_no_titlepage_no_nodes'} = {
               },
               'source_info' => {
                 'file_name' => 'index_special_region.texi',
-                'line_nr' => 74,
+                'line_nr' => 72,
                 'macro' => ''
               }
             },
@@ -1707,7 +1665,7 @@ 
$result_trees{'index_special_region_no_titlepage_no_nodes'} = {
           'cmdname' => 'insertcopying',
           'source_info' => {
             'file_name' => 'index_special_region.texi',
-            'line_nr' => 76,
+            'line_nr' => 74,
             'macro' => ''
           }
         },
@@ -1746,7 +1704,7 @@ 
$result_trees{'index_special_region_no_titlepage_no_nodes'} = {
           },
           'source_info' => {
             'file_name' => 'index_special_region.texi',
-            'line_nr' => 78,
+            'line_nr' => 76,
             'macro' => ''
           }
         },
@@ -1780,7 +1738,7 @@ 
$result_trees{'index_special_region_no_titlepage_no_nodes'} = {
           },
           'source_info' => {
             'file_name' => 'index_special_region.texi',
-            'line_nr' => 79,
+            'line_nr' => 77,
             'macro' => ''
           }
         },
@@ -1800,7 +1758,7 @@ 
$result_trees{'index_special_region_no_titlepage_no_nodes'} = {
           'cmdname' => 'contents',
           'source_info' => {
             'file_name' => 'index_special_region.texi',
-            'line_nr' => 81,
+            'line_nr' => 79,
             'macro' => ''
           }
         }
@@ -1813,7 +1771,7 @@ 
$result_trees{'index_special_region_no_titlepage_no_nodes'} = {
       },
       'source_info' => {
         'file_name' => 'index_special_region.texi',
-        'line_nr' => 62,
+        'line_nr' => 60,
         'macro' => ''
       }
     },
@@ -1830,22 +1788,22 @@ 
$result_trees{'index_special_region_no_titlepage_no_nodes'} = {
   ],
   'type' => 'document_root'
 };
+$result_trees{'index_special_region_no_titlepage_no_nodes'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'index_special_region_no_titlepage_no_nodes'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'};
+$result_trees{'index_special_region_no_titlepage_no_nodes'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'index_special_region_no_titlepage_no_nodes'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'};
+$result_trees{'index_special_region_no_titlepage_no_nodes'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'index_special_region_no_titlepage_no_nodes'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[1];
+$result_trees{'index_special_region_no_titlepage_no_nodes'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[2]{'extra'}{'node_content'}[0]
 = 
$result_trees{'index_special_region_no_titlepage_no_nodes'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0];
+$result_trees{'index_special_region_no_titlepage_no_nodes'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[5]{'contents'}[2]{'args'}[0]{'contents'}[0]{'extra'}{'node_content'}[0]
 = 
$result_trees{'index_special_region_no_titlepage_no_nodes'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[5]{'contents'}[2]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0];
+$result_trees{'index_special_region_no_titlepage_no_nodes'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[5]{'contents'}[2]{'args'}[0]{'contents'}[4]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'index_special_region_no_titlepage_no_nodes'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[5]{'contents'}[2]{'args'}[0]{'contents'}[4]{'args'}[0]{'contents'};
+$result_trees{'index_special_region_no_titlepage_no_nodes'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[5]{'contents'}[2]{'args'}[0]{'contents'}[4]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'index_special_region_no_titlepage_no_nodes'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[5]{'contents'}[2]{'args'}[0]{'contents'}[4]{'args'}[0]{'contents'};
+$result_trees{'index_special_region_no_titlepage_no_nodes'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[5]{'contents'}[2]{'args'}[0]{'contents'}[4]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'index_special_region_no_titlepage_no_nodes'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[5]{'contents'}[2]{'args'}[0]{'contents'}[4];
 
$result_trees{'index_special_region_no_titlepage_no_nodes'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'index_special_region_no_titlepage_no_nodes'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'args'}[0]{'contents'};
 
$result_trees{'index_special_region_no_titlepage_no_nodes'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'index_special_region_no_titlepage_no_nodes'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'args'}[0]{'contents'};
 
$result_trees{'index_special_region_no_titlepage_no_nodes'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'index_special_region_no_titlepage_no_nodes'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'contents'}[1];
 
$result_trees{'index_special_region_no_titlepage_no_nodes'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'contents'}[2]{'extra'}{'node_content'}[0]
 = 
$result_trees{'index_special_region_no_titlepage_no_nodes'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'contents'}[2]{'args'}[0]{'contents'}[0];
-$result_trees{'index_special_region_no_titlepage_no_nodes'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'contents'}[5]{'contents'}[2]{'args'}[0]{'contents'}[0]{'extra'}{'node_content'}[0]
 = 
$result_trees{'index_special_region_no_titlepage_no_nodes'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'contents'}[5]{'contents'}[2]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0];
-$result_trees{'index_special_region_no_titlepage_no_nodes'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'contents'}[5]{'contents'}[2]{'args'}[0]{'contents'}[4]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'index_special_region_no_titlepage_no_nodes'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'contents'}[5]{'contents'}[2]{'args'}[0]{'contents'}[4]{'args'}[0]{'contents'};
-$result_trees{'index_special_region_no_titlepage_no_nodes'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'contents'}[5]{'contents'}[2]{'args'}[0]{'contents'}[4]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'index_special_region_no_titlepage_no_nodes'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'contents'}[5]{'contents'}[2]{'args'}[0]{'contents'}[4]{'args'}[0]{'contents'};
-$result_trees{'index_special_region_no_titlepage_no_nodes'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'contents'}[5]{'contents'}[2]{'args'}[0]{'contents'}[4]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'index_special_region_no_titlepage_no_nodes'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'contents'}[5]{'contents'}[2]{'args'}[0]{'contents'}[4];
-$result_trees{'index_special_region_no_titlepage_no_nodes'}{'contents'}[0]{'contents'}[1]{'contents'}[4]{'contents'}[1]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'index_special_region_no_titlepage_no_nodes'}{'contents'}[0]{'contents'}[1]{'contents'}[4]{'contents'}[1]{'args'}[0]{'contents'};
-$result_trees{'index_special_region_no_titlepage_no_nodes'}{'contents'}[0]{'contents'}[1]{'contents'}[4]{'contents'}[1]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'index_special_region_no_titlepage_no_nodes'}{'contents'}[0]{'contents'}[1]{'contents'}[4]{'contents'}[1]{'args'}[0]{'contents'};
-$result_trees{'index_special_region_no_titlepage_no_nodes'}{'contents'}[0]{'contents'}[1]{'contents'}[4]{'contents'}[1]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'index_special_region_no_titlepage_no_nodes'}{'contents'}[0]{'contents'}[1]{'contents'}[4]{'contents'}[1];
-$result_trees{'index_special_region_no_titlepage_no_nodes'}{'contents'}[0]{'contents'}[1]{'contents'}[4]{'contents'}[2]{'extra'}{'node_content'}[0]
 = 
$result_trees{'index_special_region_no_titlepage_no_nodes'}{'contents'}[0]{'contents'}[1]{'contents'}[4]{'contents'}[2]{'args'}[0]{'contents'}[0];
-$result_trees{'index_special_region_no_titlepage_no_nodes'}{'contents'}[0]{'contents'}[1]{'contents'}[4]{'contents'}[5]{'contents'}[1]{'args'}[0]{'contents'}[0]{'extra'}{'node_content'}[0]
 = 
$result_trees{'index_special_region_no_titlepage_no_nodes'}{'contents'}[0]{'contents'}[1]{'contents'}[4]{'contents'}[5]{'contents'}[1]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0];
-$result_trees{'index_special_region_no_titlepage_no_nodes'}{'contents'}[0]{'contents'}[1]{'contents'}[4]{'contents'}[5]{'contents'}[1]{'args'}[0]{'contents'}[4]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'index_special_region_no_titlepage_no_nodes'}{'contents'}[0]{'contents'}[1]{'contents'}[4]{'contents'}[5]{'contents'}[1]{'args'}[0]{'contents'}[4]{'args'}[0]{'contents'};
-$result_trees{'index_special_region_no_titlepage_no_nodes'}{'contents'}[0]{'contents'}[1]{'contents'}[4]{'contents'}[5]{'contents'}[1]{'args'}[0]{'contents'}[4]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'index_special_region_no_titlepage_no_nodes'}{'contents'}[0]{'contents'}[1]{'contents'}[4]{'contents'}[5]{'contents'}[1]{'args'}[0]{'contents'}[4]{'args'}[0]{'contents'};
-$result_trees{'index_special_region_no_titlepage_no_nodes'}{'contents'}[0]{'contents'}[1]{'contents'}[4]{'contents'}[5]{'contents'}[1]{'args'}[0]{'contents'}[4]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'index_special_region_no_titlepage_no_nodes'}{'contents'}[0]{'contents'}[1]{'contents'}[4]{'contents'}[5]{'contents'}[1]{'args'}[0]{'contents'}[4];
+$result_trees{'index_special_region_no_titlepage_no_nodes'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'contents'}[5]{'contents'}[1]{'args'}[0]{'contents'}[0]{'extra'}{'node_content'}[0]
 = 
$result_trees{'index_special_region_no_titlepage_no_nodes'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'contents'}[5]{'contents'}[1]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0];
+$result_trees{'index_special_region_no_titlepage_no_nodes'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'contents'}[5]{'contents'}[1]{'args'}[0]{'contents'}[4]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'index_special_region_no_titlepage_no_nodes'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'contents'}[5]{'contents'}[1]{'args'}[0]{'contents'}[4]{'args'}[0]{'contents'};
+$result_trees{'index_special_region_no_titlepage_no_nodes'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'contents'}[5]{'contents'}[1]{'args'}[0]{'contents'}[4]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'index_special_region_no_titlepage_no_nodes'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'contents'}[5]{'contents'}[1]{'args'}[0]{'contents'}[4]{'args'}[0]{'contents'};
+$result_trees{'index_special_region_no_titlepage_no_nodes'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'contents'}[5]{'contents'}[1]{'args'}[0]{'contents'}[4]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'index_special_region_no_titlepage_no_nodes'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'contents'}[5]{'contents'}[1]{'args'}[0]{'contents'}[4];
 
$result_trees{'index_special_region_no_titlepage_no_nodes'}{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'index_special_region_no_titlepage_no_nodes'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'index_special_region_no_titlepage_no_nodes'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'index_special_region_no_titlepage_no_nodes'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'index_special_region_no_titlepage_no_nodes'}{'contents'}[3]{'contents'}[5]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'index_special_region_no_titlepage_no_nodes'}{'contents'}[3]{'contents'}[5]{'args'}[0]{'contents'};
@@ -1873,19 +1831,17 @@ 
$result_trees{'index_special_region_no_titlepage_no_nodes'}{'contents'}[5]{'cont
 
$result_trees{'index_special_region_no_titlepage_no_nodes'}{'contents'}[5]{'contents'}[5]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'index_special_region_no_titlepage_no_nodes'}{'contents'}[5]{'contents'}[5]{'args'}[0]{'contents'};
 
$result_trees{'index_special_region_no_titlepage_no_nodes'}{'contents'}[5]{'contents'}[5]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'index_special_region_no_titlepage_no_nodes'}{'contents'}[5]{'contents'}[5];
 
$result_trees{'index_special_region_no_titlepage_no_nodes'}{'contents'}[5]{'contents'}[5]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'index_special_region_no_titlepage_no_nodes'}{'contents'}[4];
-$result_trees{'index_special_region_no_titlepage_no_nodes'}{'contents'}[5]{'contents'}[7]{'contents'}[0]{'extra'}{'label'}
 = 
$result_trees{'index_special_region_no_titlepage_no_nodes'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'contents'}[2];
+$result_trees{'index_special_region_no_titlepage_no_nodes'}{'contents'}[5]{'contents'}[7]{'contents'}[0]{'extra'}{'label'}
 = 
$result_trees{'index_special_region_no_titlepage_no_nodes'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[2];
 
$result_trees{'index_special_region_no_titlepage_no_nodes'}{'contents'}[5]{'contents'}[7]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[0]
 = 
$result_trees{'index_special_region_no_titlepage_no_nodes'}{'contents'}[5]{'contents'}[7]{'contents'}[0]{'args'}[0]{'contents'}[0];
-$result_trees{'index_special_region_no_titlepage_no_nodes'}{'contents'}[5]{'contents'}[7]{'contents'}[2]{'extra'}{'label'}
 = 
$result_trees{'index_special_region_no_titlepage_no_nodes'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'contents'}[5]{'contents'}[2]{'args'}[0]{'contents'}[0];
+$result_trees{'index_special_region_no_titlepage_no_nodes'}{'contents'}[5]{'contents'}[7]{'contents'}[2]{'extra'}{'label'}
 = 
$result_trees{'index_special_region_no_titlepage_no_nodes'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[5]{'contents'}[2]{'args'}[0]{'contents'}[0];
 
$result_trees{'index_special_region_no_titlepage_no_nodes'}{'contents'}[5]{'contents'}[7]{'contents'}[2]{'extra'}{'node_argument'}{'node_content'}[0]
 = 
$result_trees{'index_special_region_no_titlepage_no_nodes'}{'contents'}[5]{'contents'}[7]{'contents'}[2]{'args'}[0]{'contents'}[0];
-$result_trees{'index_special_region_no_titlepage_no_nodes'}{'contents'}[5]{'contents'}[9]{'contents'}[0]{'extra'}{'label'}
 = 
$result_trees{'index_special_region_no_titlepage_no_nodes'}{'contents'}[0]{'contents'}[1]{'contents'}[4]{'contents'}[2];
+$result_trees{'index_special_region_no_titlepage_no_nodes'}{'contents'}[5]{'contents'}[9]{'contents'}[0]{'extra'}{'label'}
 = 
$result_trees{'index_special_region_no_titlepage_no_nodes'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'contents'}[2];
 
$result_trees{'index_special_region_no_titlepage_no_nodes'}{'contents'}[5]{'contents'}[9]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[0]
 = 
$result_trees{'index_special_region_no_titlepage_no_nodes'}{'contents'}[5]{'contents'}[9]{'contents'}[0]{'args'}[0]{'contents'}[0];
-$result_trees{'index_special_region_no_titlepage_no_nodes'}{'contents'}[5]{'contents'}[9]{'contents'}[2]{'extra'}{'label'}
 = 
$result_trees{'index_special_region_no_titlepage_no_nodes'}{'contents'}[0]{'contents'}[1]{'contents'}[4]{'contents'}[5]{'contents'}[1]{'args'}[0]{'contents'}[0];
+$result_trees{'index_special_region_no_titlepage_no_nodes'}{'contents'}[5]{'contents'}[9]{'contents'}[2]{'extra'}{'label'}
 = 
$result_trees{'index_special_region_no_titlepage_no_nodes'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'contents'}[5]{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'index_special_region_no_titlepage_no_nodes'}{'contents'}[5]{'contents'}[9]{'contents'}[2]{'extra'}{'node_argument'}{'node_content'}[0]
 = 
$result_trees{'index_special_region_no_titlepage_no_nodes'}{'contents'}[5]{'contents'}[9]{'contents'}[2]{'args'}[0]{'contents'}[0];
 
 $result_texis{'index_special_region_no_titlepage_no_nodes'} = '\\input texinfo 
@c -*-texinfo-*-
 
-@setfilename index_special_region.info
-
 @copying 
 
 @cindex Copying this document
@@ -1969,7 +1925,6 @@ In the appendix, we print the indices and references.
 
 $result_texts{'index_special_region_no_titlepage_no_nodes'} = '
 
-
 Top
 ***
 1 Chapter
@@ -2151,7 +2106,7 @@ 
$result_errors{'index_special_region_no_titlepage_no_nodes'} = [
     'error_line' => 'warning: @cindex missing argument
 ',
     'file_name' => 'index_special_region.texi',
-    'line_nr' => 46,
+    'line_nr' => 44,
     'macro' => '',
     'text' => '@cindex missing argument',
     'type' => 'warning'
@@ -2160,7 +2115,7 @@ 
$result_errors{'index_special_region_no_titlepage_no_nodes'} = [
     'error_line' => 'warning: missing name for @deffn
 ',
     'file_name' => 'index_special_region.texi',
-    'line_nr' => 47,
+    'line_nr' => 45,
     'macro' => '',
     'text' => 'missing name for @deffn',
     'type' => 'warning'
@@ -2169,7 +2124,7 @@ 
$result_errors{'index_special_region_no_titlepage_no_nodes'} = [
     'error_line' => 'warning: missing name for @deffnx
 ',
     'file_name' => 'index_special_region.texi',
-    'line_nr' => 48,
+    'line_nr' => 46,
     'macro' => '',
     'text' => 'missing name for @deffnx',
     'type' => 'warning'
@@ -2178,7 +2133,7 @@ 
$result_errors{'index_special_region_no_titlepage_no_nodes'} = [
     'error_line' => 'warning: missing name for @deffnx
 ',
     'file_name' => 'index_special_region.texi',
-    'line_nr' => 49,
+    'line_nr' => 47,
     'macro' => '',
     'text' => 'missing name for @deffnx',
     'type' => 'warning'
@@ -2187,7 +2142,7 @@ 
$result_errors{'index_special_region_no_titlepage_no_nodes'} = [
     'error_line' => 'missing @ftable argument
 ',
     'file_name' => 'index_special_region.texi',
-    'line_nr' => 52,
+    'line_nr' => 50,
     'macro' => '',
     'text' => 'missing @ftable argument',
     'type' => 'error'
@@ -2196,7 +2151,7 @@ 
$result_errors{'index_special_region_no_titlepage_no_nodes'} = [
     'error_line' => 'warning: @item missing argument
 ',
     'file_name' => 'index_special_region.texi',
-    'line_nr' => 53,
+    'line_nr' => 51,
     'macro' => '',
     'text' => '@item missing argument',
     'type' => 'warning'
diff --git 
a/tp/t/results/indices/index_special_region_no_titlepage_no_nodes/res_html/index.html
 
b/tp/t/results/indices/index_special_region_no_titlepage_no_nodes/res_html/index.html
index 019dd813fc..33355d3973 100644
--- 
a/tp/t/results/indices/index_special_region_no_titlepage_no_nodes/res_html/index.html
+++ 
b/tp/t/results/indices/index_special_region_no_titlepage_no_nodes/res_html/index.html
@@ -34,7 +34,6 @@ span:hover a.copiable-link {visibility: visible}
 <body lang="en">
 
 
-
 <div class="top-level-extent" id="Top">
 <div class="nav-panel">
 <p>
diff --git a/tp/t/results/indices/index_special_region_titlepage_no_nodes.pl 
b/tp/t/results/indices/index_special_region_titlepage_no_nodes.pl
index 66e52dece4..8bdf31f7be 100644
--- a/tp/t/results/indices/index_special_region_titlepage_no_nodes.pl
+++ b/tp/t/results/indices/index_special_region_titlepage_no_nodes.pl
@@ -12,62 +12,20 @@ $result_trees{'index_special_region_titlepage_no_nodes'} = {
         {
           'contents' => [
             {
-              'contents' => [
-                {
-                  'text' => '\\input texinfo @c -*-texinfo-*-
+              'text' => '\\input texinfo @c -*-texinfo-*-
 ',
-                  'type' => 'text_before_beginning'
-                },
-                {
-                  'text' => '
+              'type' => 'text_before_beginning'
+            },
+            {
+              'text' => '
 ',
-                  'type' => 'text_before_beginning'
-                }
-              ],
-              'type' => 'preamble_before_beginning'
+              'type' => 'text_before_beginning'
             }
           ],
-          'type' => 'preamble_before_setfilename'
+          'type' => 'preamble_before_beginning'
         },
         {
           'contents' => [
-            {
-              'args' => [
-                {
-                  'contents' => [
-                    {
-                      'text' => 'index_special_region.info'
-                    }
-                  ],
-                  'info' => {
-                    'spaces_after_argument' => {
-                      'text' => '
-'
-                    }
-                  },
-                  'type' => 'line_arg'
-                }
-              ],
-              'cmdname' => 'setfilename',
-              'extra' => {
-                'text_arg' => 'index_special_region.info'
-              },
-              'info' => {
-                'spaces_before_argument' => {
-                  'text' => ' '
-                }
-              },
-              'source_info' => {
-                'file_name' => 'index_special_region.texi',
-                'line_nr' => 3,
-                'macro' => ''
-              }
-            },
-            {
-              'text' => '
-',
-              'type' => 'empty_line'
-            },
             {
               'args' => [
                 {
@@ -126,7 +84,7 @@ $result_trees{'index_special_region_titlepage_no_nodes'} = {
                   },
                   'source_info' => {
                     'file_name' => 'index_special_region.texi',
-                    'line_nr' => 7,
+                    'line_nr' => 5,
                     'macro' => ''
                   },
                   'type' => 'index_entry_command'
@@ -154,7 +112,7 @@ $result_trees{'index_special_region_titlepage_no_nodes'} = {
                   },
                   'source_info' => {
                     'file_name' => 'index_special_region.texi',
-                    'line_nr' => 8,
+                    'line_nr' => 6,
                     'macro' => ''
                   }
                 },
@@ -204,7 +162,7 @@ $result_trees{'index_special_region_titlepage_no_nodes'} = {
                               },
                               'source_info' => {
                                 'file_name' => 'index_special_region.texi',
-                                'line_nr' => 11,
+                                'line_nr' => 9,
                                 'macro' => ''
                               }
                             },
@@ -269,7 +227,7 @@ $result_trees{'index_special_region_titlepage_no_nodes'} = {
                               },
                               'source_info' => {
                                 'file_name' => 'index_special_region.texi',
-                                'line_nr' => 14,
+                                'line_nr' => 12,
                                 'macro' => ''
                               },
                               'type' => 'index_entry_command'
@@ -281,7 +239,7 @@ $result_trees{'index_special_region_titlepage_no_nodes'} = {
                       'cmdname' => 'footnote',
                       'source_info' => {
                         'file_name' => 'index_special_region.texi',
-                        'line_nr' => 11,
+                        'line_nr' => 9,
                         'macro' => ''
                       }
                     },
@@ -327,7 +285,7 @@ $result_trees{'index_special_region_titlepage_no_nodes'} = {
                   },
                   'source_info' => {
                     'file_name' => 'index_special_region.texi',
-                    'line_nr' => 17,
+                    'line_nr' => 15,
                     'macro' => ''
                   }
                 },
@@ -364,14 +322,14 @@ $result_trees{'index_special_region_titlepage_no_nodes'} 
= {
                   },
                   'source_info' => {
                     'file_name' => 'index_special_region.texi',
-                    'line_nr' => 19,
+                    'line_nr' => 17,
                     'macro' => ''
                   }
                 }
               ],
               'source_info' => {
                 'file_name' => 'index_special_region.texi',
-                'line_nr' => 5,
+                'line_nr' => 3,
                 'macro' => ''
               }
             },
@@ -438,7 +396,7 @@ $result_trees{'index_special_region_titlepage_no_nodes'} = {
                   },
                   'source_info' => {
                     'file_name' => 'index_special_region.texi',
-                    'line_nr' => 23,
+                    'line_nr' => 21,
                     'macro' => ''
                   },
                   'type' => 'index_entry_command'
@@ -466,7 +424,7 @@ $result_trees{'index_special_region_titlepage_no_nodes'} = {
                   },
                   'source_info' => {
                     'file_name' => 'index_special_region.texi',
-                    'line_nr' => 24,
+                    'line_nr' => 22,
                     'macro' => ''
                   }
                 },
@@ -512,7 +470,7 @@ $result_trees{'index_special_region_titlepage_no_nodes'} = {
                               },
                               'source_info' => {
                                 'file_name' => 'index_special_region.texi',
-                                'line_nr' => 26,
+                                'line_nr' => 24,
                                 'macro' => ''
                               }
                             },
@@ -574,7 +532,7 @@ $result_trees{'index_special_region_titlepage_no_nodes'} = {
                               },
                               'source_info' => {
                                 'file_name' => 'index_special_region.texi',
-                                'line_nr' => 29,
+                                'line_nr' => 27,
                                 'macro' => ''
                               },
                               'type' => 'index_entry_command'
@@ -586,7 +544,7 @@ $result_trees{'index_special_region_titlepage_no_nodes'} = {
                       'cmdname' => 'footnote',
                       'source_info' => {
                         'file_name' => 'index_special_region.texi',
-                        'line_nr' => 26,
+                        'line_nr' => 24,
                         'macro' => ''
                       }
                     },
@@ -613,7 +571,7 @@ $result_trees{'index_special_region_titlepage_no_nodes'} = {
                   'cmdname' => 'insertcopying',
                   'source_info' => {
                     'file_name' => 'index_special_region.texi',
-                    'line_nr' => 32,
+                    'line_nr' => 30,
                     'macro' => ''
                   }
                 },
@@ -645,14 +603,14 @@ $result_trees{'index_special_region_titlepage_no_nodes'} 
= {
                   },
                   'source_info' => {
                     'file_name' => 'index_special_region.texi',
-                    'line_nr' => 33,
+                    'line_nr' => 31,
                     'macro' => ''
                   }
                 }
               ],
               'source_info' => {
                 'file_name' => 'index_special_region.texi',
-                'line_nr' => 21,
+                'line_nr' => 19,
                 'macro' => ''
               }
             },
@@ -706,7 +664,7 @@ $result_trees{'index_special_region_titlepage_no_nodes'} = {
       },
       'source_info' => {
         'file_name' => 'index_special_region.texi',
-        'line_nr' => 35,
+        'line_nr' => 33,
         'macro' => ''
       }
     },
@@ -736,7 +694,7 @@ $result_trees{'index_special_region_titlepage_no_nodes'} = {
       },
       'source_info' => {
         'file_name' => 'index_special_region.texi',
-        'line_nr' => 36,
+        'line_nr' => 34,
         'macro' => ''
       }
     },
@@ -775,7 +733,7 @@ $result_trees{'index_special_region_titlepage_no_nodes'} = {
           'cmdname' => 'insertcopying',
           'source_info' => {
             'file_name' => 'index_special_region.texi',
-            'line_nr' => 39,
+            'line_nr' => 37,
             'macro' => ''
           }
         },
@@ -853,7 +811,7 @@ $result_trees{'index_special_region_titlepage_no_nodes'} = {
           },
           'source_info' => {
             'file_name' => 'index_special_region.texi',
-            'line_nr' => 44,
+            'line_nr' => 42,
             'macro' => ''
           },
           'type' => 'index_entry_command'
@@ -881,7 +839,7 @@ $result_trees{'index_special_region_titlepage_no_nodes'} = {
           },
           'source_info' => {
             'file_name' => 'index_special_region.texi',
-            'line_nr' => 46,
+            'line_nr' => 44,
             'macro' => ''
           }
         },
@@ -903,7 +861,7 @@ $result_trees{'index_special_region_titlepage_no_nodes'} = {
                       },
                       'source_info' => {
                         'file_name' => 'index_special_region.texi',
-                        'line_nr' => 47,
+                        'line_nr' => 45,
                         'macro' => ''
                       },
                       'type' => 'bracketed_def_content'
@@ -926,7 +884,7 @@ $result_trees{'index_special_region_titlepage_no_nodes'} = {
                       },
                       'source_info' => {
                         'file_name' => 'index_special_region.texi',
-                        'line_nr' => 47,
+                        'line_nr' => 45,
                         'macro' => ''
                       },
                       'type' => 'bracketed_def_content'
@@ -951,7 +909,7 @@ $result_trees{'index_special_region_titlepage_no_nodes'} = {
               },
               'source_info' => {
                 'file_name' => 'index_special_region.texi',
-                'line_nr' => 47,
+                'line_nr' => 45,
                 'macro' => ''
               },
               'type' => 'def_line'
@@ -971,7 +929,7 @@ $result_trees{'index_special_region_titlepage_no_nodes'} = {
                       },
                       'source_info' => {
                         'file_name' => 'index_special_region.texi',
-                        'line_nr' => 48,
+                        'line_nr' => 46,
                         'macro' => ''
                       },
                       'type' => 'bracketed_def_content'
@@ -996,7 +954,7 @@ $result_trees{'index_special_region_titlepage_no_nodes'} = {
               },
               'source_info' => {
                 'file_name' => 'index_special_region.texi',
-                'line_nr' => 48,
+                'line_nr' => 46,
                 'macro' => ''
               },
               'type' => 'def_line'
@@ -1011,7 +969,7 @@ $result_trees{'index_special_region_titlepage_no_nodes'} = 
{
                       },
                       'source_info' => {
                         'file_name' => 'index_special_region.texi',
-                        'line_nr' => 49,
+                        'line_nr' => 47,
                         'macro' => ''
                       },
                       'type' => 'bracketed_def_content'
@@ -1029,7 +987,7 @@ $result_trees{'index_special_region_titlepage_no_nodes'} = 
{
                       },
                       'source_info' => {
                         'file_name' => 'index_special_region.texi',
-                        'line_nr' => 49,
+                        'line_nr' => 47,
                         'macro' => ''
                       },
                       'type' => 'bracketed_def_content'
@@ -1055,7 +1013,7 @@ $result_trees{'index_special_region_titlepage_no_nodes'} 
= {
               },
               'source_info' => {
                 'file_name' => 'index_special_region.texi',
-                'line_nr' => 49,
+                'line_nr' => 47,
                 'macro' => ''
               },
               'type' => 'def_line'
@@ -1088,14 +1046,14 @@ 
$result_trees{'index_special_region_titlepage_no_nodes'} = {
               },
               'source_info' => {
                 'file_name' => 'index_special_region.texi',
-                'line_nr' => 50,
+                'line_nr' => 48,
                 'macro' => ''
               }
             }
           ],
           'source_info' => {
             'file_name' => 'index_special_region.texi',
-            'line_nr' => 47,
+            'line_nr' => 45,
             'macro' => ''
           }
         },
@@ -1144,7 +1102,7 @@ $result_trees{'index_special_region_titlepage_no_nodes'} 
= {
                       },
                       'source_info' => {
                         'file_name' => 'index_special_region.texi',
-                        'line_nr' => 53,
+                        'line_nr' => 51,
                         'macro' => ''
                       }
                     }
@@ -1197,7 +1155,7 @@ $result_trees{'index_special_region_titlepage_no_nodes'} 
= {
                       },
                       'source_info' => {
                         'file_name' => 'index_special_region.texi',
-                        'line_nr' => 54,
+                        'line_nr' => 52,
                         'macro' => ''
                       }
                     }
@@ -1235,7 +1193,7 @@ $result_trees{'index_special_region_titlepage_no_nodes'} 
= {
               },
               'source_info' => {
                 'file_name' => 'index_special_region.texi',
-                'line_nr' => 55,
+                'line_nr' => 53,
                 'macro' => ''
               }
             }
@@ -1245,7 +1203,7 @@ $result_trees{'index_special_region_titlepage_no_nodes'} 
= {
           },
           'source_info' => {
             'file_name' => 'index_special_region.texi',
-            'line_nr' => 52,
+            'line_nr' => 50,
             'macro' => ''
           }
         },
@@ -1311,7 +1269,7 @@ $result_trees{'index_special_region_titlepage_no_nodes'} 
= {
               },
               'source_info' => {
                 'file_name' => 'index_special_region.texi',
-                'line_nr' => 58,
+                'line_nr' => 56,
                 'macro' => ''
               },
               'type' => 'menu_entry'
@@ -1344,14 +1302,14 @@ 
$result_trees{'index_special_region_titlepage_no_nodes'} = {
               },
               'source_info' => {
                 'file_name' => 'index_special_region.texi',
-                'line_nr' => 59,
+                'line_nr' => 57,
                 'macro' => ''
               }
             }
           ],
           'source_info' => {
             'file_name' => 'index_special_region.texi',
-            'line_nr' => 57,
+            'line_nr' => 55,
             'macro' => ''
           }
         },
@@ -1368,7 +1326,7 @@ $result_trees{'index_special_region_titlepage_no_nodes'} 
= {
       },
       'source_info' => {
         'file_name' => 'index_special_region.texi',
-        'line_nr' => 37,
+        'line_nr' => 35,
         'macro' => ''
       }
     },
@@ -1412,7 +1370,7 @@ $result_trees{'index_special_region_titlepage_no_nodes'} 
= {
       },
       'source_info' => {
         'file_name' => 'index_special_region.texi',
-        'line_nr' => 61,
+        'line_nr' => 59,
         'macro' => ''
       }
     },
@@ -1493,7 +1451,7 @@ $result_trees{'index_special_region_titlepage_no_nodes'} 
= {
           },
           'source_info' => {
             'file_name' => 'index_special_region.texi',
-            'line_nr' => 66,
+            'line_nr' => 64,
             'macro' => ''
           },
           'type' => 'index_entry_command'
@@ -1542,7 +1500,7 @@ $result_trees{'index_special_region_titlepage_no_nodes'} 
= {
           },
           'source_info' => {
             'file_name' => 'index_special_region.texi',
-            'line_nr' => 68,
+            'line_nr' => 66,
             'macro' => ''
           },
           'type' => 'index_entry_command'
@@ -1577,7 +1535,7 @@ $result_trees{'index_special_region_titlepage_no_nodes'} 
= {
               },
               'source_info' => {
                 'file_name' => 'index_special_region.texi',
-                'line_nr' => 70,
+                'line_nr' => 68,
                 'macro' => ''
               }
             },
@@ -1608,7 +1566,7 @@ $result_trees{'index_special_region_titlepage_no_nodes'} 
= {
               },
               'source_info' => {
                 'file_name' => 'index_special_region.texi',
-                'line_nr' => 71,
+                'line_nr' => 69,
                 'macro' => ''
               }
             },
@@ -1649,7 +1607,7 @@ $result_trees{'index_special_region_titlepage_no_nodes'} 
= {
               },
               'source_info' => {
                 'file_name' => 'index_special_region.texi',
-                'line_nr' => 73,
+                'line_nr' => 71,
                 'macro' => ''
               }
             },
@@ -1680,7 +1638,7 @@ $result_trees{'index_special_region_titlepage_no_nodes'} 
= {
               },
               'source_info' => {
                 'file_name' => 'index_special_region.texi',
-                'line_nr' => 74,
+                'line_nr' => 72,
                 'macro' => ''
               }
             },
@@ -1707,7 +1665,7 @@ $result_trees{'index_special_region_titlepage_no_nodes'} 
= {
           'cmdname' => 'insertcopying',
           'source_info' => {
             'file_name' => 'index_special_region.texi',
-            'line_nr' => 76,
+            'line_nr' => 74,
             'macro' => ''
           }
         },
@@ -1746,7 +1704,7 @@ $result_trees{'index_special_region_titlepage_no_nodes'} 
= {
           },
           'source_info' => {
             'file_name' => 'index_special_region.texi',
-            'line_nr' => 78,
+            'line_nr' => 76,
             'macro' => ''
           }
         },
@@ -1780,7 +1738,7 @@ $result_trees{'index_special_region_titlepage_no_nodes'} 
= {
           },
           'source_info' => {
             'file_name' => 'index_special_region.texi',
-            'line_nr' => 79,
+            'line_nr' => 77,
             'macro' => ''
           }
         },
@@ -1800,7 +1758,7 @@ $result_trees{'index_special_region_titlepage_no_nodes'} 
= {
           'cmdname' => 'contents',
           'source_info' => {
             'file_name' => 'index_special_region.texi',
-            'line_nr' => 81,
+            'line_nr' => 79,
             'macro' => ''
           }
         }
@@ -1813,7 +1771,7 @@ $result_trees{'index_special_region_titlepage_no_nodes'} 
= {
       },
       'source_info' => {
         'file_name' => 'index_special_region.texi',
-        'line_nr' => 62,
+        'line_nr' => 60,
         'macro' => ''
       }
     },
@@ -1830,22 +1788,22 @@ 
$result_trees{'index_special_region_titlepage_no_nodes'} = {
   ],
   'type' => 'document_root'
 };
+$result_trees{'index_special_region_titlepage_no_nodes'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'index_special_region_titlepage_no_nodes'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'};
+$result_trees{'index_special_region_titlepage_no_nodes'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'index_special_region_titlepage_no_nodes'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'};
+$result_trees{'index_special_region_titlepage_no_nodes'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'index_special_region_titlepage_no_nodes'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[1];
+$result_trees{'index_special_region_titlepage_no_nodes'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[2]{'extra'}{'node_content'}[0]
 = 
$result_trees{'index_special_region_titlepage_no_nodes'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0];
+$result_trees{'index_special_region_titlepage_no_nodes'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[5]{'contents'}[2]{'args'}[0]{'contents'}[0]{'extra'}{'node_content'}[0]
 = 
$result_trees{'index_special_region_titlepage_no_nodes'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[5]{'contents'}[2]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0];
+$result_trees{'index_special_region_titlepage_no_nodes'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[5]{'contents'}[2]{'args'}[0]{'contents'}[4]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'index_special_region_titlepage_no_nodes'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[5]{'contents'}[2]{'args'}[0]{'contents'}[4]{'args'}[0]{'contents'};
+$result_trees{'index_special_region_titlepage_no_nodes'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[5]{'contents'}[2]{'args'}[0]{'contents'}[4]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'index_special_region_titlepage_no_nodes'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[5]{'contents'}[2]{'args'}[0]{'contents'}[4]{'args'}[0]{'contents'};
+$result_trees{'index_special_region_titlepage_no_nodes'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[5]{'contents'}[2]{'args'}[0]{'contents'}[4]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'index_special_region_titlepage_no_nodes'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[5]{'contents'}[2]{'args'}[0]{'contents'}[4];
 
$result_trees{'index_special_region_titlepage_no_nodes'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'index_special_region_titlepage_no_nodes'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'args'}[0]{'contents'};
 
$result_trees{'index_special_region_titlepage_no_nodes'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'index_special_region_titlepage_no_nodes'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'args'}[0]{'contents'};
 
$result_trees{'index_special_region_titlepage_no_nodes'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'index_special_region_titlepage_no_nodes'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'contents'}[1];
 
$result_trees{'index_special_region_titlepage_no_nodes'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'contents'}[2]{'extra'}{'node_content'}[0]
 = 
$result_trees{'index_special_region_titlepage_no_nodes'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'contents'}[2]{'args'}[0]{'contents'}[0];
-$result_trees{'index_special_region_titlepage_no_nodes'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'contents'}[5]{'contents'}[2]{'args'}[0]{'contents'}[0]{'extra'}{'node_content'}[0]
 = 
$result_trees{'index_special_region_titlepage_no_nodes'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'contents'}[5]{'contents'}[2]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0];
-$result_trees{'index_special_region_titlepage_no_nodes'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'contents'}[5]{'contents'}[2]{'args'}[0]{'contents'}[4]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'index_special_region_titlepage_no_nodes'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'contents'}[5]{'contents'}[2]{'args'}[0]{'contents'}[4]{'args'}[0]{'contents'};
-$result_trees{'index_special_region_titlepage_no_nodes'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'contents'}[5]{'contents'}[2]{'args'}[0]{'contents'}[4]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'index_special_region_titlepage_no_nodes'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'contents'}[5]{'contents'}[2]{'args'}[0]{'contents'}[4]{'args'}[0]{'contents'};
-$result_trees{'index_special_region_titlepage_no_nodes'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'contents'}[5]{'contents'}[2]{'args'}[0]{'contents'}[4]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'index_special_region_titlepage_no_nodes'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'contents'}[5]{'contents'}[2]{'args'}[0]{'contents'}[4];
-$result_trees{'index_special_region_titlepage_no_nodes'}{'contents'}[0]{'contents'}[1]{'contents'}[4]{'contents'}[1]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'index_special_region_titlepage_no_nodes'}{'contents'}[0]{'contents'}[1]{'contents'}[4]{'contents'}[1]{'args'}[0]{'contents'};
-$result_trees{'index_special_region_titlepage_no_nodes'}{'contents'}[0]{'contents'}[1]{'contents'}[4]{'contents'}[1]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'index_special_region_titlepage_no_nodes'}{'contents'}[0]{'contents'}[1]{'contents'}[4]{'contents'}[1]{'args'}[0]{'contents'};
-$result_trees{'index_special_region_titlepage_no_nodes'}{'contents'}[0]{'contents'}[1]{'contents'}[4]{'contents'}[1]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'index_special_region_titlepage_no_nodes'}{'contents'}[0]{'contents'}[1]{'contents'}[4]{'contents'}[1];
-$result_trees{'index_special_region_titlepage_no_nodes'}{'contents'}[0]{'contents'}[1]{'contents'}[4]{'contents'}[2]{'extra'}{'node_content'}[0]
 = 
$result_trees{'index_special_region_titlepage_no_nodes'}{'contents'}[0]{'contents'}[1]{'contents'}[4]{'contents'}[2]{'args'}[0]{'contents'}[0];
-$result_trees{'index_special_region_titlepage_no_nodes'}{'contents'}[0]{'contents'}[1]{'contents'}[4]{'contents'}[5]{'contents'}[1]{'args'}[0]{'contents'}[0]{'extra'}{'node_content'}[0]
 = 
$result_trees{'index_special_region_titlepage_no_nodes'}{'contents'}[0]{'contents'}[1]{'contents'}[4]{'contents'}[5]{'contents'}[1]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0];
-$result_trees{'index_special_region_titlepage_no_nodes'}{'contents'}[0]{'contents'}[1]{'contents'}[4]{'contents'}[5]{'contents'}[1]{'args'}[0]{'contents'}[4]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'index_special_region_titlepage_no_nodes'}{'contents'}[0]{'contents'}[1]{'contents'}[4]{'contents'}[5]{'contents'}[1]{'args'}[0]{'contents'}[4]{'args'}[0]{'contents'};
-$result_trees{'index_special_region_titlepage_no_nodes'}{'contents'}[0]{'contents'}[1]{'contents'}[4]{'contents'}[5]{'contents'}[1]{'args'}[0]{'contents'}[4]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'index_special_region_titlepage_no_nodes'}{'contents'}[0]{'contents'}[1]{'contents'}[4]{'contents'}[5]{'contents'}[1]{'args'}[0]{'contents'}[4]{'args'}[0]{'contents'};
-$result_trees{'index_special_region_titlepage_no_nodes'}{'contents'}[0]{'contents'}[1]{'contents'}[4]{'contents'}[5]{'contents'}[1]{'args'}[0]{'contents'}[4]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'index_special_region_titlepage_no_nodes'}{'contents'}[0]{'contents'}[1]{'contents'}[4]{'contents'}[5]{'contents'}[1]{'args'}[0]{'contents'}[4];
+$result_trees{'index_special_region_titlepage_no_nodes'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'contents'}[5]{'contents'}[1]{'args'}[0]{'contents'}[0]{'extra'}{'node_content'}[0]
 = 
$result_trees{'index_special_region_titlepage_no_nodes'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'contents'}[5]{'contents'}[1]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0];
+$result_trees{'index_special_region_titlepage_no_nodes'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'contents'}[5]{'contents'}[1]{'args'}[0]{'contents'}[4]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'index_special_region_titlepage_no_nodes'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'contents'}[5]{'contents'}[1]{'args'}[0]{'contents'}[4]{'args'}[0]{'contents'};
+$result_trees{'index_special_region_titlepage_no_nodes'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'contents'}[5]{'contents'}[1]{'args'}[0]{'contents'}[4]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'index_special_region_titlepage_no_nodes'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'contents'}[5]{'contents'}[1]{'args'}[0]{'contents'}[4]{'args'}[0]{'contents'};
+$result_trees{'index_special_region_titlepage_no_nodes'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'contents'}[5]{'contents'}[1]{'args'}[0]{'contents'}[4]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'index_special_region_titlepage_no_nodes'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'contents'}[5]{'contents'}[1]{'args'}[0]{'contents'}[4];
 
$result_trees{'index_special_region_titlepage_no_nodes'}{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'index_special_region_titlepage_no_nodes'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'index_special_region_titlepage_no_nodes'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'index_special_region_titlepage_no_nodes'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'index_special_region_titlepage_no_nodes'}{'contents'}[3]{'contents'}[5]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'index_special_region_titlepage_no_nodes'}{'contents'}[3]{'contents'}[5]{'args'}[0]{'contents'};
@@ -1873,19 +1831,17 @@ 
$result_trees{'index_special_region_titlepage_no_nodes'}{'contents'}[5]{'content
 
$result_trees{'index_special_region_titlepage_no_nodes'}{'contents'}[5]{'contents'}[5]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'index_special_region_titlepage_no_nodes'}{'contents'}[5]{'contents'}[5]{'args'}[0]{'contents'};
 
$result_trees{'index_special_region_titlepage_no_nodes'}{'contents'}[5]{'contents'}[5]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'index_special_region_titlepage_no_nodes'}{'contents'}[5]{'contents'}[5];
 
$result_trees{'index_special_region_titlepage_no_nodes'}{'contents'}[5]{'contents'}[5]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'index_special_region_titlepage_no_nodes'}{'contents'}[4];
-$result_trees{'index_special_region_titlepage_no_nodes'}{'contents'}[5]{'contents'}[7]{'contents'}[0]{'extra'}{'label'}
 = 
$result_trees{'index_special_region_titlepage_no_nodes'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'contents'}[2];
+$result_trees{'index_special_region_titlepage_no_nodes'}{'contents'}[5]{'contents'}[7]{'contents'}[0]{'extra'}{'label'}
 = 
$result_trees{'index_special_region_titlepage_no_nodes'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[2];
 
$result_trees{'index_special_region_titlepage_no_nodes'}{'contents'}[5]{'contents'}[7]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[0]
 = 
$result_trees{'index_special_region_titlepage_no_nodes'}{'contents'}[5]{'contents'}[7]{'contents'}[0]{'args'}[0]{'contents'}[0];
-$result_trees{'index_special_region_titlepage_no_nodes'}{'contents'}[5]{'contents'}[7]{'contents'}[2]{'extra'}{'label'}
 = 
$result_trees{'index_special_region_titlepage_no_nodes'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'contents'}[5]{'contents'}[2]{'args'}[0]{'contents'}[0];
+$result_trees{'index_special_region_titlepage_no_nodes'}{'contents'}[5]{'contents'}[7]{'contents'}[2]{'extra'}{'label'}
 = 
$result_trees{'index_special_region_titlepage_no_nodes'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[5]{'contents'}[2]{'args'}[0]{'contents'}[0];
 
$result_trees{'index_special_region_titlepage_no_nodes'}{'contents'}[5]{'contents'}[7]{'contents'}[2]{'extra'}{'node_argument'}{'node_content'}[0]
 = 
$result_trees{'index_special_region_titlepage_no_nodes'}{'contents'}[5]{'contents'}[7]{'contents'}[2]{'args'}[0]{'contents'}[0];
-$result_trees{'index_special_region_titlepage_no_nodes'}{'contents'}[5]{'contents'}[9]{'contents'}[0]{'extra'}{'label'}
 = 
$result_trees{'index_special_region_titlepage_no_nodes'}{'contents'}[0]{'contents'}[1]{'contents'}[4]{'contents'}[2];
+$result_trees{'index_special_region_titlepage_no_nodes'}{'contents'}[5]{'contents'}[9]{'contents'}[0]{'extra'}{'label'}
 = 
$result_trees{'index_special_region_titlepage_no_nodes'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'contents'}[2];
 
$result_trees{'index_special_region_titlepage_no_nodes'}{'contents'}[5]{'contents'}[9]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[0]
 = 
$result_trees{'index_special_region_titlepage_no_nodes'}{'contents'}[5]{'contents'}[9]{'contents'}[0]{'args'}[0]{'contents'}[0];
-$result_trees{'index_special_region_titlepage_no_nodes'}{'contents'}[5]{'contents'}[9]{'contents'}[2]{'extra'}{'label'}
 = 
$result_trees{'index_special_region_titlepage_no_nodes'}{'contents'}[0]{'contents'}[1]{'contents'}[4]{'contents'}[5]{'contents'}[1]{'args'}[0]{'contents'}[0];
+$result_trees{'index_special_region_titlepage_no_nodes'}{'contents'}[5]{'contents'}[9]{'contents'}[2]{'extra'}{'label'}
 = 
$result_trees{'index_special_region_titlepage_no_nodes'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'contents'}[5]{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'index_special_region_titlepage_no_nodes'}{'contents'}[5]{'contents'}[9]{'contents'}[2]{'extra'}{'node_argument'}{'node_content'}[0]
 = 
$result_trees{'index_special_region_titlepage_no_nodes'}{'contents'}[5]{'contents'}[9]{'contents'}[2]{'args'}[0]{'contents'}[0];
 
 $result_texis{'index_special_region_titlepage_no_nodes'} = '\\input texinfo @c 
-*-texinfo-*-
 
-@setfilename index_special_region.info
-
 @copying 
 
 @cindex Copying this document
@@ -1969,7 +1925,6 @@ In the appendix, we print the indices and references.
 
 $result_texts{'index_special_region_titlepage_no_nodes'} = '
 
-
 Top
 ***
 1 Chapter
@@ -2151,7 +2106,7 @@ $result_errors{'index_special_region_titlepage_no_nodes'} 
= [
     'error_line' => 'warning: @cindex missing argument
 ',
     'file_name' => 'index_special_region.texi',
-    'line_nr' => 46,
+    'line_nr' => 44,
     'macro' => '',
     'text' => '@cindex missing argument',
     'type' => 'warning'
@@ -2160,7 +2115,7 @@ $result_errors{'index_special_region_titlepage_no_nodes'} 
= [
     'error_line' => 'warning: missing name for @deffn
 ',
     'file_name' => 'index_special_region.texi',
-    'line_nr' => 47,
+    'line_nr' => 45,
     'macro' => '',
     'text' => 'missing name for @deffn',
     'type' => 'warning'
@@ -2169,7 +2124,7 @@ $result_errors{'index_special_region_titlepage_no_nodes'} 
= [
     'error_line' => 'warning: missing name for @deffnx
 ',
     'file_name' => 'index_special_region.texi',
-    'line_nr' => 48,
+    'line_nr' => 46,
     'macro' => '',
     'text' => 'missing name for @deffnx',
     'type' => 'warning'
@@ -2178,7 +2133,7 @@ $result_errors{'index_special_region_titlepage_no_nodes'} 
= [
     'error_line' => 'warning: missing name for @deffnx
 ',
     'file_name' => 'index_special_region.texi',
-    'line_nr' => 49,
+    'line_nr' => 47,
     'macro' => '',
     'text' => 'missing name for @deffnx',
     'type' => 'warning'
@@ -2187,7 +2142,7 @@ $result_errors{'index_special_region_titlepage_no_nodes'} 
= [
     'error_line' => 'missing @ftable argument
 ',
     'file_name' => 'index_special_region.texi',
-    'line_nr' => 52,
+    'line_nr' => 50,
     'macro' => '',
     'text' => 'missing @ftable argument',
     'type' => 'error'
@@ -2196,7 +2151,7 @@ $result_errors{'index_special_region_titlepage_no_nodes'} 
= [
     'error_line' => 'warning: @item missing argument
 ',
     'file_name' => 'index_special_region.texi',
-    'line_nr' => 53,
+    'line_nr' => 51,
     'macro' => '',
     'text' => '@item missing argument',
     'type' => 'warning'
@@ -2228,7 +2183,7 @@ 
$result_converted_errors{'file_info'}->{'index_special_region_titlepage_no_nodes
     'error_line' => '@anchor output more than once: Copying information
 ',
     'file_name' => 'index_special_region.texi',
-    'line_nr' => 8,
+    'line_nr' => 6,
     'macro' => '',
     'text' => '@anchor output more than once: Copying information',
     'type' => 'error'
@@ -2237,7 +2192,7 @@ 
$result_converted_errors{'file_info'}->{'index_special_region_titlepage_no_nodes
     'error_line' => '@anchor output more than once: Public domain reference
 ',
     'file_name' => 'index_special_region.texi',
-    'line_nr' => 11,
+    'line_nr' => 9,
     'macro' => '',
     'text' => '@anchor output more than once: Public domain reference',
     'type' => 'error'
diff --git 
a/tp/t/results/indices/index_special_region_titlepage_no_nodes/res_html/index.html
 
b/tp/t/results/indices/index_special_region_titlepage_no_nodes/res_html/index.html
index 6a65b3b1d3..5500ffccd1 100644
--- 
a/tp/t/results/indices/index_special_region_titlepage_no_nodes/res_html/index.html
+++ 
b/tp/t/results/indices/index_special_region_titlepage_no_nodes/res_html/index.html
@@ -83,7 +83,6 @@ domain<a class="footnote" id="DOCF1" 
href="index_special_region_fot.html#FOOT1">
 <hr>
 
 
-
 <div class="top-level-extent" id="Top">
 <div class="nav-panel">
 <p>
diff --git 
a/tp/t/results/indices/index_special_region_titlepage_no_nodes_footnotes_default.pl
 
b/tp/t/results/indices/index_special_region_titlepage_no_nodes_footnotes_default.pl
index 863bd37083..55ad690fff 100644
--- 
a/tp/t/results/indices/index_special_region_titlepage_no_nodes_footnotes_default.pl
+++ 
b/tp/t/results/indices/index_special_region_titlepage_no_nodes_footnotes_default.pl
@@ -12,62 +12,20 @@ 
$result_trees{'index_special_region_titlepage_no_nodes_footnotes_default'} = {
         {
           'contents' => [
             {
-              'contents' => [
-                {
-                  'text' => '\\input texinfo @c -*-texinfo-*-
+              'text' => '\\input texinfo @c -*-texinfo-*-
 ',
-                  'type' => 'text_before_beginning'
-                },
-                {
-                  'text' => '
+              'type' => 'text_before_beginning'
+            },
+            {
+              'text' => '
 ',
-                  'type' => 'text_before_beginning'
-                }
-              ],
-              'type' => 'preamble_before_beginning'
+              'type' => 'text_before_beginning'
             }
           ],
-          'type' => 'preamble_before_setfilename'
+          'type' => 'preamble_before_beginning'
         },
         {
           'contents' => [
-            {
-              'args' => [
-                {
-                  'contents' => [
-                    {
-                      'text' => 'index_special_region.info'
-                    }
-                  ],
-                  'info' => {
-                    'spaces_after_argument' => {
-                      'text' => '
-'
-                    }
-                  },
-                  'type' => 'line_arg'
-                }
-              ],
-              'cmdname' => 'setfilename',
-              'extra' => {
-                'text_arg' => 'index_special_region.info'
-              },
-              'info' => {
-                'spaces_before_argument' => {
-                  'text' => ' '
-                }
-              },
-              'source_info' => {
-                'file_name' => 'index_special_region.texi',
-                'line_nr' => 3,
-                'macro' => ''
-              }
-            },
-            {
-              'text' => '
-',
-              'type' => 'empty_line'
-            },
             {
               'args' => [
                 {
@@ -126,7 +84,7 @@ 
$result_trees{'index_special_region_titlepage_no_nodes_footnotes_default'} = {
                   },
                   'source_info' => {
                     'file_name' => 'index_special_region.texi',
-                    'line_nr' => 7,
+                    'line_nr' => 5,
                     'macro' => ''
                   },
                   'type' => 'index_entry_command'
@@ -154,7 +112,7 @@ 
$result_trees{'index_special_region_titlepage_no_nodes_footnotes_default'} = {
                   },
                   'source_info' => {
                     'file_name' => 'index_special_region.texi',
-                    'line_nr' => 8,
+                    'line_nr' => 6,
                     'macro' => ''
                   }
                 },
@@ -204,7 +162,7 @@ 
$result_trees{'index_special_region_titlepage_no_nodes_footnotes_default'} = {
                               },
                               'source_info' => {
                                 'file_name' => 'index_special_region.texi',
-                                'line_nr' => 11,
+                                'line_nr' => 9,
                                 'macro' => ''
                               }
                             },
@@ -269,7 +227,7 @@ 
$result_trees{'index_special_region_titlepage_no_nodes_footnotes_default'} = {
                               },
                               'source_info' => {
                                 'file_name' => 'index_special_region.texi',
-                                'line_nr' => 14,
+                                'line_nr' => 12,
                                 'macro' => ''
                               },
                               'type' => 'index_entry_command'
@@ -281,7 +239,7 @@ 
$result_trees{'index_special_region_titlepage_no_nodes_footnotes_default'} = {
                       'cmdname' => 'footnote',
                       'source_info' => {
                         'file_name' => 'index_special_region.texi',
-                        'line_nr' => 11,
+                        'line_nr' => 9,
                         'macro' => ''
                       }
                     },
@@ -327,7 +285,7 @@ 
$result_trees{'index_special_region_titlepage_no_nodes_footnotes_default'} = {
                   },
                   'source_info' => {
                     'file_name' => 'index_special_region.texi',
-                    'line_nr' => 17,
+                    'line_nr' => 15,
                     'macro' => ''
                   }
                 },
@@ -364,14 +322,14 @@ 
$result_trees{'index_special_region_titlepage_no_nodes_footnotes_default'} = {
                   },
                   'source_info' => {
                     'file_name' => 'index_special_region.texi',
-                    'line_nr' => 19,
+                    'line_nr' => 17,
                     'macro' => ''
                   }
                 }
               ],
               'source_info' => {
                 'file_name' => 'index_special_region.texi',
-                'line_nr' => 5,
+                'line_nr' => 3,
                 'macro' => ''
               }
             },
@@ -438,7 +396,7 @@ 
$result_trees{'index_special_region_titlepage_no_nodes_footnotes_default'} = {
                   },
                   'source_info' => {
                     'file_name' => 'index_special_region.texi',
-                    'line_nr' => 23,
+                    'line_nr' => 21,
                     'macro' => ''
                   },
                   'type' => 'index_entry_command'
@@ -466,7 +424,7 @@ 
$result_trees{'index_special_region_titlepage_no_nodes_footnotes_default'} = {
                   },
                   'source_info' => {
                     'file_name' => 'index_special_region.texi',
-                    'line_nr' => 24,
+                    'line_nr' => 22,
                     'macro' => ''
                   }
                 },
@@ -512,7 +470,7 @@ 
$result_trees{'index_special_region_titlepage_no_nodes_footnotes_default'} = {
                               },
                               'source_info' => {
                                 'file_name' => 'index_special_region.texi',
-                                'line_nr' => 26,
+                                'line_nr' => 24,
                                 'macro' => ''
                               }
                             },
@@ -574,7 +532,7 @@ 
$result_trees{'index_special_region_titlepage_no_nodes_footnotes_default'} = {
                               },
                               'source_info' => {
                                 'file_name' => 'index_special_region.texi',
-                                'line_nr' => 29,
+                                'line_nr' => 27,
                                 'macro' => ''
                               },
                               'type' => 'index_entry_command'
@@ -586,7 +544,7 @@ 
$result_trees{'index_special_region_titlepage_no_nodes_footnotes_default'} = {
                       'cmdname' => 'footnote',
                       'source_info' => {
                         'file_name' => 'index_special_region.texi',
-                        'line_nr' => 26,
+                        'line_nr' => 24,
                         'macro' => ''
                       }
                     },
@@ -613,7 +571,7 @@ 
$result_trees{'index_special_region_titlepage_no_nodes_footnotes_default'} = {
                   'cmdname' => 'insertcopying',
                   'source_info' => {
                     'file_name' => 'index_special_region.texi',
-                    'line_nr' => 32,
+                    'line_nr' => 30,
                     'macro' => ''
                   }
                 },
@@ -645,14 +603,14 @@ 
$result_trees{'index_special_region_titlepage_no_nodes_footnotes_default'} = {
                   },
                   'source_info' => {
                     'file_name' => 'index_special_region.texi',
-                    'line_nr' => 33,
+                    'line_nr' => 31,
                     'macro' => ''
                   }
                 }
               ],
               'source_info' => {
                 'file_name' => 'index_special_region.texi',
-                'line_nr' => 21,
+                'line_nr' => 19,
                 'macro' => ''
               }
             },
@@ -706,7 +664,7 @@ 
$result_trees{'index_special_region_titlepage_no_nodes_footnotes_default'} = {
       },
       'source_info' => {
         'file_name' => 'index_special_region.texi',
-        'line_nr' => 35,
+        'line_nr' => 33,
         'macro' => ''
       }
     },
@@ -736,7 +694,7 @@ 
$result_trees{'index_special_region_titlepage_no_nodes_footnotes_default'} = {
       },
       'source_info' => {
         'file_name' => 'index_special_region.texi',
-        'line_nr' => 36,
+        'line_nr' => 34,
         'macro' => ''
       }
     },
@@ -775,7 +733,7 @@ 
$result_trees{'index_special_region_titlepage_no_nodes_footnotes_default'} = {
           'cmdname' => 'insertcopying',
           'source_info' => {
             'file_name' => 'index_special_region.texi',
-            'line_nr' => 39,
+            'line_nr' => 37,
             'macro' => ''
           }
         },
@@ -853,7 +811,7 @@ 
$result_trees{'index_special_region_titlepage_no_nodes_footnotes_default'} = {
           },
           'source_info' => {
             'file_name' => 'index_special_region.texi',
-            'line_nr' => 44,
+            'line_nr' => 42,
             'macro' => ''
           },
           'type' => 'index_entry_command'
@@ -881,7 +839,7 @@ 
$result_trees{'index_special_region_titlepage_no_nodes_footnotes_default'} = {
           },
           'source_info' => {
             'file_name' => 'index_special_region.texi',
-            'line_nr' => 46,
+            'line_nr' => 44,
             'macro' => ''
           }
         },
@@ -903,7 +861,7 @@ 
$result_trees{'index_special_region_titlepage_no_nodes_footnotes_default'} = {
                       },
                       'source_info' => {
                         'file_name' => 'index_special_region.texi',
-                        'line_nr' => 47,
+                        'line_nr' => 45,
                         'macro' => ''
                       },
                       'type' => 'bracketed_def_content'
@@ -926,7 +884,7 @@ 
$result_trees{'index_special_region_titlepage_no_nodes_footnotes_default'} = {
                       },
                       'source_info' => {
                         'file_name' => 'index_special_region.texi',
-                        'line_nr' => 47,
+                        'line_nr' => 45,
                         'macro' => ''
                       },
                       'type' => 'bracketed_def_content'
@@ -951,7 +909,7 @@ 
$result_trees{'index_special_region_titlepage_no_nodes_footnotes_default'} = {
               },
               'source_info' => {
                 'file_name' => 'index_special_region.texi',
-                'line_nr' => 47,
+                'line_nr' => 45,
                 'macro' => ''
               },
               'type' => 'def_line'
@@ -971,7 +929,7 @@ 
$result_trees{'index_special_region_titlepage_no_nodes_footnotes_default'} = {
                       },
                       'source_info' => {
                         'file_name' => 'index_special_region.texi',
-                        'line_nr' => 48,
+                        'line_nr' => 46,
                         'macro' => ''
                       },
                       'type' => 'bracketed_def_content'
@@ -996,7 +954,7 @@ 
$result_trees{'index_special_region_titlepage_no_nodes_footnotes_default'} = {
               },
               'source_info' => {
                 'file_name' => 'index_special_region.texi',
-                'line_nr' => 48,
+                'line_nr' => 46,
                 'macro' => ''
               },
               'type' => 'def_line'
@@ -1011,7 +969,7 @@ 
$result_trees{'index_special_region_titlepage_no_nodes_footnotes_default'} = {
                       },
                       'source_info' => {
                         'file_name' => 'index_special_region.texi',
-                        'line_nr' => 49,
+                        'line_nr' => 47,
                         'macro' => ''
                       },
                       'type' => 'bracketed_def_content'
@@ -1029,7 +987,7 @@ 
$result_trees{'index_special_region_titlepage_no_nodes_footnotes_default'} = {
                       },
                       'source_info' => {
                         'file_name' => 'index_special_region.texi',
-                        'line_nr' => 49,
+                        'line_nr' => 47,
                         'macro' => ''
                       },
                       'type' => 'bracketed_def_content'
@@ -1055,7 +1013,7 @@ 
$result_trees{'index_special_region_titlepage_no_nodes_footnotes_default'} = {
               },
               'source_info' => {
                 'file_name' => 'index_special_region.texi',
-                'line_nr' => 49,
+                'line_nr' => 47,
                 'macro' => ''
               },
               'type' => 'def_line'
@@ -1088,14 +1046,14 @@ 
$result_trees{'index_special_region_titlepage_no_nodes_footnotes_default'} = {
               },
               'source_info' => {
                 'file_name' => 'index_special_region.texi',
-                'line_nr' => 50,
+                'line_nr' => 48,
                 'macro' => ''
               }
             }
           ],
           'source_info' => {
             'file_name' => 'index_special_region.texi',
-            'line_nr' => 47,
+            'line_nr' => 45,
             'macro' => ''
           }
         },
@@ -1144,7 +1102,7 @@ 
$result_trees{'index_special_region_titlepage_no_nodes_footnotes_default'} = {
                       },
                       'source_info' => {
                         'file_name' => 'index_special_region.texi',
-                        'line_nr' => 53,
+                        'line_nr' => 51,
                         'macro' => ''
                       }
                     }
@@ -1197,7 +1155,7 @@ 
$result_trees{'index_special_region_titlepage_no_nodes_footnotes_default'} = {
                       },
                       'source_info' => {
                         'file_name' => 'index_special_region.texi',
-                        'line_nr' => 54,
+                        'line_nr' => 52,
                         'macro' => ''
                       }
                     }
@@ -1235,7 +1193,7 @@ 
$result_trees{'index_special_region_titlepage_no_nodes_footnotes_default'} = {
               },
               'source_info' => {
                 'file_name' => 'index_special_region.texi',
-                'line_nr' => 55,
+                'line_nr' => 53,
                 'macro' => ''
               }
             }
@@ -1245,7 +1203,7 @@ 
$result_trees{'index_special_region_titlepage_no_nodes_footnotes_default'} = {
           },
           'source_info' => {
             'file_name' => 'index_special_region.texi',
-            'line_nr' => 52,
+            'line_nr' => 50,
             'macro' => ''
           }
         },
@@ -1311,7 +1269,7 @@ 
$result_trees{'index_special_region_titlepage_no_nodes_footnotes_default'} = {
               },
               'source_info' => {
                 'file_name' => 'index_special_region.texi',
-                'line_nr' => 58,
+                'line_nr' => 56,
                 'macro' => ''
               },
               'type' => 'menu_entry'
@@ -1344,14 +1302,14 @@ 
$result_trees{'index_special_region_titlepage_no_nodes_footnotes_default'} = {
               },
               'source_info' => {
                 'file_name' => 'index_special_region.texi',
-                'line_nr' => 59,
+                'line_nr' => 57,
                 'macro' => ''
               }
             }
           ],
           'source_info' => {
             'file_name' => 'index_special_region.texi',
-            'line_nr' => 57,
+            'line_nr' => 55,
             'macro' => ''
           }
         },
@@ -1368,7 +1326,7 @@ 
$result_trees{'index_special_region_titlepage_no_nodes_footnotes_default'} = {
       },
       'source_info' => {
         'file_name' => 'index_special_region.texi',
-        'line_nr' => 37,
+        'line_nr' => 35,
         'macro' => ''
       }
     },
@@ -1412,7 +1370,7 @@ 
$result_trees{'index_special_region_titlepage_no_nodes_footnotes_default'} = {
       },
       'source_info' => {
         'file_name' => 'index_special_region.texi',
-        'line_nr' => 61,
+        'line_nr' => 59,
         'macro' => ''
       }
     },
@@ -1493,7 +1451,7 @@ 
$result_trees{'index_special_region_titlepage_no_nodes_footnotes_default'} = {
           },
           'source_info' => {
             'file_name' => 'index_special_region.texi',
-            'line_nr' => 66,
+            'line_nr' => 64,
             'macro' => ''
           },
           'type' => 'index_entry_command'
@@ -1542,7 +1500,7 @@ 
$result_trees{'index_special_region_titlepage_no_nodes_footnotes_default'} = {
           },
           'source_info' => {
             'file_name' => 'index_special_region.texi',
-            'line_nr' => 68,
+            'line_nr' => 66,
             'macro' => ''
           },
           'type' => 'index_entry_command'
@@ -1577,7 +1535,7 @@ 
$result_trees{'index_special_region_titlepage_no_nodes_footnotes_default'} = {
               },
               'source_info' => {
                 'file_name' => 'index_special_region.texi',
-                'line_nr' => 70,
+                'line_nr' => 68,
                 'macro' => ''
               }
             },
@@ -1608,7 +1566,7 @@ 
$result_trees{'index_special_region_titlepage_no_nodes_footnotes_default'} = {
               },
               'source_info' => {
                 'file_name' => 'index_special_region.texi',
-                'line_nr' => 71,
+                'line_nr' => 69,
                 'macro' => ''
               }
             },
@@ -1649,7 +1607,7 @@ 
$result_trees{'index_special_region_titlepage_no_nodes_footnotes_default'} = {
               },
               'source_info' => {
                 'file_name' => 'index_special_region.texi',
-                'line_nr' => 73,
+                'line_nr' => 71,
                 'macro' => ''
               }
             },
@@ -1680,7 +1638,7 @@ 
$result_trees{'index_special_region_titlepage_no_nodes_footnotes_default'} = {
               },
               'source_info' => {
                 'file_name' => 'index_special_region.texi',
-                'line_nr' => 74,
+                'line_nr' => 72,
                 'macro' => ''
               }
             },
@@ -1707,7 +1665,7 @@ 
$result_trees{'index_special_region_titlepage_no_nodes_footnotes_default'} = {
           'cmdname' => 'insertcopying',
           'source_info' => {
             'file_name' => 'index_special_region.texi',
-            'line_nr' => 76,
+            'line_nr' => 74,
             'macro' => ''
           }
         },
@@ -1746,7 +1704,7 @@ 
$result_trees{'index_special_region_titlepage_no_nodes_footnotes_default'} = {
           },
           'source_info' => {
             'file_name' => 'index_special_region.texi',
-            'line_nr' => 78,
+            'line_nr' => 76,
             'macro' => ''
           }
         },
@@ -1780,7 +1738,7 @@ 
$result_trees{'index_special_region_titlepage_no_nodes_footnotes_default'} = {
           },
           'source_info' => {
             'file_name' => 'index_special_region.texi',
-            'line_nr' => 79,
+            'line_nr' => 77,
             'macro' => ''
           }
         },
@@ -1800,7 +1758,7 @@ 
$result_trees{'index_special_region_titlepage_no_nodes_footnotes_default'} = {
           'cmdname' => 'contents',
           'source_info' => {
             'file_name' => 'index_special_region.texi',
-            'line_nr' => 81,
+            'line_nr' => 79,
             'macro' => ''
           }
         }
@@ -1813,7 +1771,7 @@ 
$result_trees{'index_special_region_titlepage_no_nodes_footnotes_default'} = {
       },
       'source_info' => {
         'file_name' => 'index_special_region.texi',
-        'line_nr' => 62,
+        'line_nr' => 60,
         'macro' => ''
       }
     },
@@ -1830,22 +1788,22 @@ 
$result_trees{'index_special_region_titlepage_no_nodes_footnotes_default'} = {
   ],
   'type' => 'document_root'
 };
+$result_trees{'index_special_region_titlepage_no_nodes_footnotes_default'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'index_special_region_titlepage_no_nodes_footnotes_default'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'};
+$result_trees{'index_special_region_titlepage_no_nodes_footnotes_default'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'index_special_region_titlepage_no_nodes_footnotes_default'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'};
+$result_trees{'index_special_region_titlepage_no_nodes_footnotes_default'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'index_special_region_titlepage_no_nodes_footnotes_default'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[1];
+$result_trees{'index_special_region_titlepage_no_nodes_footnotes_default'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[2]{'extra'}{'node_content'}[0]
 = 
$result_trees{'index_special_region_titlepage_no_nodes_footnotes_default'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0];
+$result_trees{'index_special_region_titlepage_no_nodes_footnotes_default'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[5]{'contents'}[2]{'args'}[0]{'contents'}[0]{'extra'}{'node_content'}[0]
 = 
$result_trees{'index_special_region_titlepage_no_nodes_footnotes_default'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[5]{'contents'}[2]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0];
+$result_trees{'index_special_region_titlepage_no_nodes_footnotes_default'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[5]{'contents'}[2]{'args'}[0]{'contents'}[4]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'index_special_region_titlepage_no_nodes_footnotes_default'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[5]{'contents'}[2]{'args'}[0]{'contents'}[4]{'args'}[0]{'contents'};
+$result_trees{'index_special_region_titlepage_no_nodes_footnotes_default'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[5]{'contents'}[2]{'args'}[0]{'contents'}[4]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'index_special_region_titlepage_no_nodes_footnotes_default'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[5]{'contents'}[2]{'args'}[0]{'contents'}[4]{'args'}[0]{'contents'};
+$result_trees{'index_special_region_titlepage_no_nodes_footnotes_default'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[5]{'contents'}[2]{'args'}[0]{'contents'}[4]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'index_special_region_titlepage_no_nodes_footnotes_default'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[5]{'contents'}[2]{'args'}[0]{'contents'}[4];
 
$result_trees{'index_special_region_titlepage_no_nodes_footnotes_default'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'index_special_region_titlepage_no_nodes_footnotes_default'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'args'}[0]{'contents'};
 
$result_trees{'index_special_region_titlepage_no_nodes_footnotes_default'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'index_special_region_titlepage_no_nodes_footnotes_default'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'args'}[0]{'contents'};
 
$result_trees{'index_special_region_titlepage_no_nodes_footnotes_default'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'index_special_region_titlepage_no_nodes_footnotes_default'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'contents'}[1];
 
$result_trees{'index_special_region_titlepage_no_nodes_footnotes_default'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'contents'}[2]{'extra'}{'node_content'}[0]
 = 
$result_trees{'index_special_region_titlepage_no_nodes_footnotes_default'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'contents'}[2]{'args'}[0]{'contents'}[0];
-$result_trees{'index_special_region_titlepage_no_nodes_footnotes_default'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'contents'}[5]{'contents'}[2]{'args'}[0]{'contents'}[0]{'extra'}{'node_content'}[0]
 = 
$result_trees{'index_special_region_titlepage_no_nodes_footnotes_default'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'contents'}[5]{'contents'}[2]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0];
-$result_trees{'index_special_region_titlepage_no_nodes_footnotes_default'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'contents'}[5]{'contents'}[2]{'args'}[0]{'contents'}[4]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'index_special_region_titlepage_no_nodes_footnotes_default'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'contents'}[5]{'contents'}[2]{'args'}[0]{'contents'}[4]{'args'}[0]{'contents'};
-$result_trees{'index_special_region_titlepage_no_nodes_footnotes_default'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'contents'}[5]{'contents'}[2]{'args'}[0]{'contents'}[4]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'index_special_region_titlepage_no_nodes_footnotes_default'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'contents'}[5]{'contents'}[2]{'args'}[0]{'contents'}[4]{'args'}[0]{'contents'};
-$result_trees{'index_special_region_titlepage_no_nodes_footnotes_default'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'contents'}[5]{'contents'}[2]{'args'}[0]{'contents'}[4]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'index_special_region_titlepage_no_nodes_footnotes_default'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'contents'}[5]{'contents'}[2]{'args'}[0]{'contents'}[4];
-$result_trees{'index_special_region_titlepage_no_nodes_footnotes_default'}{'contents'}[0]{'contents'}[1]{'contents'}[4]{'contents'}[1]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'index_special_region_titlepage_no_nodes_footnotes_default'}{'contents'}[0]{'contents'}[1]{'contents'}[4]{'contents'}[1]{'args'}[0]{'contents'};
-$result_trees{'index_special_region_titlepage_no_nodes_footnotes_default'}{'contents'}[0]{'contents'}[1]{'contents'}[4]{'contents'}[1]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'index_special_region_titlepage_no_nodes_footnotes_default'}{'contents'}[0]{'contents'}[1]{'contents'}[4]{'contents'}[1]{'args'}[0]{'contents'};
-$result_trees{'index_special_region_titlepage_no_nodes_footnotes_default'}{'contents'}[0]{'contents'}[1]{'contents'}[4]{'contents'}[1]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'index_special_region_titlepage_no_nodes_footnotes_default'}{'contents'}[0]{'contents'}[1]{'contents'}[4]{'contents'}[1];
-$result_trees{'index_special_region_titlepage_no_nodes_footnotes_default'}{'contents'}[0]{'contents'}[1]{'contents'}[4]{'contents'}[2]{'extra'}{'node_content'}[0]
 = 
$result_trees{'index_special_region_titlepage_no_nodes_footnotes_default'}{'contents'}[0]{'contents'}[1]{'contents'}[4]{'contents'}[2]{'args'}[0]{'contents'}[0];
-$result_trees{'index_special_region_titlepage_no_nodes_footnotes_default'}{'contents'}[0]{'contents'}[1]{'contents'}[4]{'contents'}[5]{'contents'}[1]{'args'}[0]{'contents'}[0]{'extra'}{'node_content'}[0]
 = 
$result_trees{'index_special_region_titlepage_no_nodes_footnotes_default'}{'contents'}[0]{'contents'}[1]{'contents'}[4]{'contents'}[5]{'contents'}[1]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0];
-$result_trees{'index_special_region_titlepage_no_nodes_footnotes_default'}{'contents'}[0]{'contents'}[1]{'contents'}[4]{'contents'}[5]{'contents'}[1]{'args'}[0]{'contents'}[4]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'index_special_region_titlepage_no_nodes_footnotes_default'}{'contents'}[0]{'contents'}[1]{'contents'}[4]{'contents'}[5]{'contents'}[1]{'args'}[0]{'contents'}[4]{'args'}[0]{'contents'};
-$result_trees{'index_special_region_titlepage_no_nodes_footnotes_default'}{'contents'}[0]{'contents'}[1]{'contents'}[4]{'contents'}[5]{'contents'}[1]{'args'}[0]{'contents'}[4]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'index_special_region_titlepage_no_nodes_footnotes_default'}{'contents'}[0]{'contents'}[1]{'contents'}[4]{'contents'}[5]{'contents'}[1]{'args'}[0]{'contents'}[4]{'args'}[0]{'contents'};
-$result_trees{'index_special_region_titlepage_no_nodes_footnotes_default'}{'contents'}[0]{'contents'}[1]{'contents'}[4]{'contents'}[5]{'contents'}[1]{'args'}[0]{'contents'}[4]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'index_special_region_titlepage_no_nodes_footnotes_default'}{'contents'}[0]{'contents'}[1]{'contents'}[4]{'contents'}[5]{'contents'}[1]{'args'}[0]{'contents'}[4];
+$result_trees{'index_special_region_titlepage_no_nodes_footnotes_default'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'contents'}[5]{'contents'}[1]{'args'}[0]{'contents'}[0]{'extra'}{'node_content'}[0]
 = 
$result_trees{'index_special_region_titlepage_no_nodes_footnotes_default'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'contents'}[5]{'contents'}[1]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0];
+$result_trees{'index_special_region_titlepage_no_nodes_footnotes_default'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'contents'}[5]{'contents'}[1]{'args'}[0]{'contents'}[4]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'index_special_region_titlepage_no_nodes_footnotes_default'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'contents'}[5]{'contents'}[1]{'args'}[0]{'contents'}[4]{'args'}[0]{'contents'};
+$result_trees{'index_special_region_titlepage_no_nodes_footnotes_default'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'contents'}[5]{'contents'}[1]{'args'}[0]{'contents'}[4]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'index_special_region_titlepage_no_nodes_footnotes_default'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'contents'}[5]{'contents'}[1]{'args'}[0]{'contents'}[4]{'args'}[0]{'contents'};
+$result_trees{'index_special_region_titlepage_no_nodes_footnotes_default'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'contents'}[5]{'contents'}[1]{'args'}[0]{'contents'}[4]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'index_special_region_titlepage_no_nodes_footnotes_default'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'contents'}[5]{'contents'}[1]{'args'}[0]{'contents'}[4];
 
$result_trees{'index_special_region_titlepage_no_nodes_footnotes_default'}{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'index_special_region_titlepage_no_nodes_footnotes_default'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'index_special_region_titlepage_no_nodes_footnotes_default'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'index_special_region_titlepage_no_nodes_footnotes_default'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'index_special_region_titlepage_no_nodes_footnotes_default'}{'contents'}[3]{'contents'}[5]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'index_special_region_titlepage_no_nodes_footnotes_default'}{'contents'}[3]{'contents'}[5]{'args'}[0]{'contents'};
@@ -1873,19 +1831,17 @@ 
$result_trees{'index_special_region_titlepage_no_nodes_footnotes_default'}{'cont
 
$result_trees{'index_special_region_titlepage_no_nodes_footnotes_default'}{'contents'}[5]{'contents'}[5]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'index_special_region_titlepage_no_nodes_footnotes_default'}{'contents'}[5]{'contents'}[5]{'args'}[0]{'contents'};
 
$result_trees{'index_special_region_titlepage_no_nodes_footnotes_default'}{'contents'}[5]{'contents'}[5]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'index_special_region_titlepage_no_nodes_footnotes_default'}{'contents'}[5]{'contents'}[5];
 
$result_trees{'index_special_region_titlepage_no_nodes_footnotes_default'}{'contents'}[5]{'contents'}[5]{'extra'}{'index_entry'}{'entry_node'}
 = 
$result_trees{'index_special_region_titlepage_no_nodes_footnotes_default'}{'contents'}[4];
-$result_trees{'index_special_region_titlepage_no_nodes_footnotes_default'}{'contents'}[5]{'contents'}[7]{'contents'}[0]{'extra'}{'label'}
 = 
$result_trees{'index_special_region_titlepage_no_nodes_footnotes_default'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'contents'}[2];
+$result_trees{'index_special_region_titlepage_no_nodes_footnotes_default'}{'contents'}[5]{'contents'}[7]{'contents'}[0]{'extra'}{'label'}
 = 
$result_trees{'index_special_region_titlepage_no_nodes_footnotes_default'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[2];
 
$result_trees{'index_special_region_titlepage_no_nodes_footnotes_default'}{'contents'}[5]{'contents'}[7]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[0]
 = 
$result_trees{'index_special_region_titlepage_no_nodes_footnotes_default'}{'contents'}[5]{'contents'}[7]{'contents'}[0]{'args'}[0]{'contents'}[0];
-$result_trees{'index_special_region_titlepage_no_nodes_footnotes_default'}{'contents'}[5]{'contents'}[7]{'contents'}[2]{'extra'}{'label'}
 = 
$result_trees{'index_special_region_titlepage_no_nodes_footnotes_default'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'contents'}[5]{'contents'}[2]{'args'}[0]{'contents'}[0];
+$result_trees{'index_special_region_titlepage_no_nodes_footnotes_default'}{'contents'}[5]{'contents'}[7]{'contents'}[2]{'extra'}{'label'}
 = 
$result_trees{'index_special_region_titlepage_no_nodes_footnotes_default'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[5]{'contents'}[2]{'args'}[0]{'contents'}[0];
 
$result_trees{'index_special_region_titlepage_no_nodes_footnotes_default'}{'contents'}[5]{'contents'}[7]{'contents'}[2]{'extra'}{'node_argument'}{'node_content'}[0]
 = 
$result_trees{'index_special_region_titlepage_no_nodes_footnotes_default'}{'contents'}[5]{'contents'}[7]{'contents'}[2]{'args'}[0]{'contents'}[0];
-$result_trees{'index_special_region_titlepage_no_nodes_footnotes_default'}{'contents'}[5]{'contents'}[9]{'contents'}[0]{'extra'}{'label'}
 = 
$result_trees{'index_special_region_titlepage_no_nodes_footnotes_default'}{'contents'}[0]{'contents'}[1]{'contents'}[4]{'contents'}[2];
+$result_trees{'index_special_region_titlepage_no_nodes_footnotes_default'}{'contents'}[5]{'contents'}[9]{'contents'}[0]{'extra'}{'label'}
 = 
$result_trees{'index_special_region_titlepage_no_nodes_footnotes_default'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'contents'}[2];
 
$result_trees{'index_special_region_titlepage_no_nodes_footnotes_default'}{'contents'}[5]{'contents'}[9]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[0]
 = 
$result_trees{'index_special_region_titlepage_no_nodes_footnotes_default'}{'contents'}[5]{'contents'}[9]{'contents'}[0]{'args'}[0]{'contents'}[0];
-$result_trees{'index_special_region_titlepage_no_nodes_footnotes_default'}{'contents'}[5]{'contents'}[9]{'contents'}[2]{'extra'}{'label'}
 = 
$result_trees{'index_special_region_titlepage_no_nodes_footnotes_default'}{'contents'}[0]{'contents'}[1]{'contents'}[4]{'contents'}[5]{'contents'}[1]{'args'}[0]{'contents'}[0];
+$result_trees{'index_special_region_titlepage_no_nodes_footnotes_default'}{'contents'}[5]{'contents'}[9]{'contents'}[2]{'extra'}{'label'}
 = 
$result_trees{'index_special_region_titlepage_no_nodes_footnotes_default'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'contents'}[5]{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'index_special_region_titlepage_no_nodes_footnotes_default'}{'contents'}[5]{'contents'}[9]{'contents'}[2]{'extra'}{'node_argument'}{'node_content'}[0]
 = 
$result_trees{'index_special_region_titlepage_no_nodes_footnotes_default'}{'contents'}[5]{'contents'}[9]{'contents'}[2]{'args'}[0]{'contents'}[0];
 
 $result_texis{'index_special_region_titlepage_no_nodes_footnotes_default'} = 
'\\input texinfo @c -*-texinfo-*-
 
-@setfilename index_special_region.info
-
 @copying 
 
 @cindex Copying this document
@@ -1969,7 +1925,6 @@ In the appendix, we print the indices and references.
 
 $result_texts{'index_special_region_titlepage_no_nodes_footnotes_default'} = '
 
-
 Top
 ***
 1 Chapter
@@ -2151,7 +2106,7 @@ 
$result_errors{'index_special_region_titlepage_no_nodes_footnotes_default'} = [
     'error_line' => 'warning: @cindex missing argument
 ',
     'file_name' => 'index_special_region.texi',
-    'line_nr' => 46,
+    'line_nr' => 44,
     'macro' => '',
     'text' => '@cindex missing argument',
     'type' => 'warning'
@@ -2160,7 +2115,7 @@ 
$result_errors{'index_special_region_titlepage_no_nodes_footnotes_default'} = [
     'error_line' => 'warning: missing name for @deffn
 ',
     'file_name' => 'index_special_region.texi',
-    'line_nr' => 47,
+    'line_nr' => 45,
     'macro' => '',
     'text' => 'missing name for @deffn',
     'type' => 'warning'
@@ -2169,7 +2124,7 @@ 
$result_errors{'index_special_region_titlepage_no_nodes_footnotes_default'} = [
     'error_line' => 'warning: missing name for @deffnx
 ',
     'file_name' => 'index_special_region.texi',
-    'line_nr' => 48,
+    'line_nr' => 46,
     'macro' => '',
     'text' => 'missing name for @deffnx',
     'type' => 'warning'
@@ -2178,7 +2133,7 @@ 
$result_errors{'index_special_region_titlepage_no_nodes_footnotes_default'} = [
     'error_line' => 'warning: missing name for @deffnx
 ',
     'file_name' => 'index_special_region.texi',
-    'line_nr' => 49,
+    'line_nr' => 47,
     'macro' => '',
     'text' => 'missing name for @deffnx',
     'type' => 'warning'
@@ -2187,7 +2142,7 @@ 
$result_errors{'index_special_region_titlepage_no_nodes_footnotes_default'} = [
     'error_line' => 'missing @ftable argument
 ',
     'file_name' => 'index_special_region.texi',
-    'line_nr' => 52,
+    'line_nr' => 50,
     'macro' => '',
     'text' => 'missing @ftable argument',
     'type' => 'error'
@@ -2196,7 +2151,7 @@ 
$result_errors{'index_special_region_titlepage_no_nodes_footnotes_default'} = [
     'error_line' => 'warning: @item missing argument
 ',
     'file_name' => 'index_special_region.texi',
-    'line_nr' => 53,
+    'line_nr' => 51,
     'macro' => '',
     'text' => '@item missing argument',
     'type' => 'warning'
diff --git 
a/tp/t/results/indices/index_special_region_titlepage_no_nodes_footnotes_default/res_html/index.html
 
b/tp/t/results/indices/index_special_region_titlepage_no_nodes_footnotes_default/res_html/index.html
index b6ef08a5d5..bed77d7083 100644
--- 
a/tp/t/results/indices/index_special_region_titlepage_no_nodes_footnotes_default/res_html/index.html
+++ 
b/tp/t/results/indices/index_special_region_titlepage_no_nodes_footnotes_default/res_html/index.html
@@ -83,7 +83,6 @@ domain<a class="footnote" id="DOCF1" 
href="#FOOT1"><sup>2</sup></a>.
 <hr>
 
 
-
 <div class="top-level-extent" id="Top">
 <div class="nav-panel">
 <p>
diff --git a/tp/t/results/indices/nodes_before_top_and_sections_chapter.pl 
b/tp/t/results/indices/nodes_before_top_and_sections_chapter.pl
index 6c050ded2e..f6b230b0fa 100644
--- a/tp/t/results/indices/nodes_before_top_and_sections_chapter.pl
+++ b/tp/t/results/indices/nodes_before_top_and_sections_chapter.pl
@@ -12,68 +12,20 @@ $result_trees{'nodes_before_top_and_sections_chapter'} = {
         {
           'contents' => [
             {
-              'contents' => [
-                {
-                  'text' => '\\input texinfo @c -*-texinfo-*-
-',
-                  'type' => 'text_before_beginning'
-                },
-                {
-                  'text' => '
-',
-                  'type' => 'text_before_beginning'
-                }
-              ],
-              'type' => 'preamble_before_beginning'
-            }
-          ],
-          'type' => 'preamble_before_setfilename'
-        },
-        {
-          'contents' => [
-            {
-              'args' => [
-                {
-                  'contents' => [
-                    {
-                      'text' => 'nodes_before_top_and_sections.info'
-                    }
-                  ],
-                  'info' => {
-                    'spaces_after_argument' => {
-                      'text' => '
-'
-                    }
-                  },
-                  'type' => 'line_arg'
-                }
-              ],
-              'cmdname' => 'setfilename',
-              'extra' => {
-                'text_arg' => 'nodes_before_top_and_sections.info'
-              },
-              'info' => {
-                'spaces_before_argument' => {
-                  'text' => ' '
-                }
-              },
-              'source_info' => {
-                'file_name' => 'nodes_before_top_and_sections.texi',
-                'line_nr' => 3,
-                'macro' => ''
-              }
-            },
-            {
-              'text' => '
+              'text' => '\\input texinfo @c -*-texinfo-*-
 ',
-              'type' => 'empty_line'
+              'type' => 'text_before_beginning'
             },
             {
               'text' => '
 ',
-              'type' => 'empty_line'
+              'type' => 'text_before_beginning'
             }
           ],
+          'type' => 'preamble_before_beginning'
+        },
+        {
+          'contents' => [],
           'type' => 'preamble_before_content'
         }
       ],
@@ -172,7 +124,7 @@ $result_trees{'nodes_before_top_and_sections_chapter'} = {
           },
           'source_info' => {
             'file_name' => 'nodes_before_top_and_sections.texi',
-            'line_nr' => 7,
+            'line_nr' => 4,
             'macro' => ''
           },
           'type' => 'index_entry_command'
@@ -221,7 +173,7 @@ $result_trees{'nodes_before_top_and_sections_chapter'} = {
           },
           'source_info' => {
             'file_name' => 'nodes_before_top_and_sections.texi',
-            'line_nr' => 10,
+            'line_nr' => 7,
             'macro' => ''
           }
         },
@@ -264,7 +216,7 @@ $result_trees{'nodes_before_top_and_sections_chapter'} = {
           },
           'source_info' => {
             'file_name' => 'nodes_before_top_and_sections.texi',
-            'line_nr' => 12,
+            'line_nr' => 9,
             'macro' => ''
           }
         },
@@ -334,7 +286,7 @@ $result_trees{'nodes_before_top_and_sections_chapter'} = {
               },
               'source_info' => {
                 'file_name' => 'nodes_before_top_and_sections.texi',
-                'line_nr' => 15,
+                'line_nr' => 12,
                 'macro' => ''
               },
               'type' => 'menu_entry'
@@ -367,14 +319,14 @@ $result_trees{'nodes_before_top_and_sections_chapter'} = {
               },
               'source_info' => {
                 'file_name' => 'nodes_before_top_and_sections.texi',
-                'line_nr' => 16,
+                'line_nr' => 13,
                 'macro' => ''
               }
             }
           ],
           'source_info' => {
             'file_name' => 'nodes_before_top_and_sections.texi',
-            'line_nr' => 14,
+            'line_nr' => 11,
             'macro' => ''
           }
         },
@@ -418,7 +370,7 @@ $result_trees{'nodes_before_top_and_sections_chapter'} = {
       },
       'source_info' => {
         'file_name' => 'nodes_before_top_and_sections.texi',
-        'line_nr' => 6,
+        'line_nr' => 3,
         'macro' => ''
       }
     },
@@ -499,7 +451,7 @@ $result_trees{'nodes_before_top_and_sections_chapter'} = {
           },
           'source_info' => {
             'file_name' => 'nodes_before_top_and_sections.texi',
-            'line_nr' => 20,
+            'line_nr' => 17,
             'macro' => ''
           },
           'type' => 'index_entry_command'
@@ -543,7 +495,7 @@ $result_trees{'nodes_before_top_and_sections_chapter'} = {
           },
           'source_info' => {
             'file_name' => 'nodes_before_top_and_sections.texi',
-            'line_nr' => 22,
+            'line_nr' => 19,
             'macro' => ''
           }
         },
@@ -600,7 +552,7 @@ $result_trees{'nodes_before_top_and_sections_chapter'} = {
           },
           'source_info' => {
             'file_name' => 'nodes_before_top_and_sections.texi',
-            'line_nr' => 25,
+            'line_nr' => 22,
             'macro' => ''
           },
           'type' => 'index_entry_command'
@@ -646,7 +598,7 @@ $result_trees{'nodes_before_top_and_sections_chapter'} = {
       },
       'source_info' => {
         'file_name' => 'nodes_before_top_and_sections.texi',
-        'line_nr' => 18,
+        'line_nr' => 15,
         'macro' => ''
       }
     },
@@ -724,7 +676,7 @@ $result_trees{'nodes_before_top_and_sections_chapter'} = {
           },
           'source_info' => {
             'file_name' => 'nodes_before_top_and_sections.texi',
-            'line_nr' => 29,
+            'line_nr' => 26,
             'macro' => ''
           },
           'type' => 'index_entry_command'
@@ -768,7 +720,7 @@ $result_trees{'nodes_before_top_and_sections_chapter'} = {
           },
           'source_info' => {
             'file_name' => 'nodes_before_top_and_sections.texi',
-            'line_nr' => 31,
+            'line_nr' => 28,
             'macro' => ''
           }
         },
@@ -807,7 +759,7 @@ $result_trees{'nodes_before_top_and_sections_chapter'} = {
           },
           'source_info' => {
             'file_name' => 'nodes_before_top_and_sections.texi',
-            'line_nr' => 33,
+            'line_nr' => 30,
             'macro' => ''
           }
         },
@@ -860,7 +812,7 @@ $result_trees{'nodes_before_top_and_sections_chapter'} = {
           },
           'source_info' => {
             'file_name' => 'nodes_before_top_and_sections.texi',
-            'line_nr' => 37,
+            'line_nr' => 34,
             'macro' => ''
           }
         },
@@ -899,7 +851,7 @@ $result_trees{'nodes_before_top_and_sections_chapter'} = {
       },
       'source_info' => {
         'file_name' => 'nodes_before_top_and_sections.texi',
-        'line_nr' => 28,
+        'line_nr' => 25,
         'macro' => ''
       }
     },
@@ -961,7 +913,7 @@ $result_trees{'nodes_before_top_and_sections_chapter'} = {
           },
           'source_info' => {
             'file_name' => 'nodes_before_top_and_sections.texi',
-            'line_nr' => 40,
+            'line_nr' => 37,
             'macro' => ''
           },
           'type' => 'index_entry_command'
@@ -1042,7 +994,7 @@ $result_trees{'nodes_before_top_and_sections_chapter'} = {
               },
               'source_info' => {
                 'file_name' => 'nodes_before_top_and_sections.texi',
-                'line_nr' => 45,
+                'line_nr' => 42,
                 'macro' => ''
               },
               'type' => 'menu_entry'
@@ -1090,7 +1042,7 @@ $result_trees{'nodes_before_top_and_sections_chapter'} = {
               },
               'source_info' => {
                 'file_name' => 'nodes_before_top_and_sections.texi',
-                'line_nr' => 46,
+                'line_nr' => 43,
                 'macro' => ''
               },
               'type' => 'menu_entry'
@@ -1138,7 +1090,7 @@ $result_trees{'nodes_before_top_and_sections_chapter'} = {
               },
               'source_info' => {
                 'file_name' => 'nodes_before_top_and_sections.texi',
-                'line_nr' => 47,
+                'line_nr' => 44,
                 'macro' => ''
               },
               'type' => 'menu_entry'
@@ -1171,14 +1123,14 @@ $result_trees{'nodes_before_top_and_sections_chapter'} 
= {
               },
               'source_info' => {
                 'file_name' => 'nodes_before_top_and_sections.texi',
-                'line_nr' => 48,
+                'line_nr' => 45,
                 'macro' => ''
               }
             }
           ],
           'source_info' => {
             'file_name' => 'nodes_before_top_and_sections.texi',
-            'line_nr' => 44,
+            'line_nr' => 41,
             'macro' => ''
           }
         },
@@ -1196,7 +1148,7 @@ $result_trees{'nodes_before_top_and_sections_chapter'} = {
       },
       'source_info' => {
         'file_name' => 'nodes_before_top_and_sections.texi',
-        'line_nr' => 39,
+        'line_nr' => 36,
         'macro' => ''
       }
     },
@@ -1286,7 +1238,7 @@ $result_trees{'nodes_before_top_and_sections_chapter'} = {
               },
               'source_info' => {
                 'file_name' => 'nodes_before_top_and_sections.texi',
-                'line_nr' => 52,
+                'line_nr' => 49,
                 'macro' => ''
               },
               'type' => 'index_entry_command'
@@ -1330,7 +1282,7 @@ $result_trees{'nodes_before_top_and_sections_chapter'} = {
               },
               'source_info' => {
                 'file_name' => 'nodes_before_top_and_sections.texi',
-                'line_nr' => 53,
+                'line_nr' => 50,
                 'macro' => ''
               },
               'type' => 'index_entry_command'
@@ -1374,7 +1326,7 @@ $result_trees{'nodes_before_top_and_sections_chapter'} = {
               },
               'source_info' => {
                 'file_name' => 'nodes_before_top_and_sections.texi',
-                'line_nr' => 54,
+                'line_nr' => 51,
                 'macro' => ''
               },
               'type' => 'index_entry_command'
@@ -1417,7 +1369,7 @@ $result_trees{'nodes_before_top_and_sections_chapter'} = {
           },
           'source_info' => {
             'file_name' => 'nodes_before_top_and_sections.texi',
-            'line_nr' => 56,
+            'line_nr' => 53,
             'macro' => ''
           }
         },
@@ -1483,7 +1435,7 @@ $result_trees{'nodes_before_top_and_sections_chapter'} = {
               },
               'source_info' => {
                 'file_name' => 'nodes_before_top_and_sections.texi',
-                'line_nr' => 59,
+                'line_nr' => 56,
                 'macro' => ''
               },
               'type' => 'menu_entry'
@@ -1516,14 +1468,14 @@ $result_trees{'nodes_before_top_and_sections_chapter'} 
= {
               },
               'source_info' => {
                 'file_name' => 'nodes_before_top_and_sections.texi',
-                'line_nr' => 60,
+                'line_nr' => 57,
                 'macro' => ''
               }
             }
           ],
           'source_info' => {
             'file_name' => 'nodes_before_top_and_sections.texi',
-            'line_nr' => 58,
+            'line_nr' => 55,
             'macro' => ''
           }
         },
@@ -1568,7 +1520,7 @@ $result_trees{'nodes_before_top_and_sections_chapter'} = {
       },
       'source_info' => {
         'file_name' => 'nodes_before_top_and_sections.texi',
-        'line_nr' => 50,
+        'line_nr' => 47,
         'macro' => ''
       }
     },
@@ -1662,7 +1614,7 @@ $result_trees{'nodes_before_top_and_sections_chapter'} = {
               },
               'source_info' => {
                 'file_name' => 'nodes_before_top_and_sections.texi',
-                'line_nr' => 64,
+                'line_nr' => 61,
                 'macro' => ''
               },
               'type' => 'menu_entry'
@@ -1710,7 +1662,7 @@ $result_trees{'nodes_before_top_and_sections_chapter'} = {
               },
               'source_info' => {
                 'file_name' => 'nodes_before_top_and_sections.texi',
-                'line_nr' => 65,
+                'line_nr' => 62,
                 'macro' => ''
               },
               'type' => 'menu_entry'
@@ -1743,14 +1695,14 @@ $result_trees{'nodes_before_top_and_sections_chapter'} 
= {
               },
               'source_info' => {
                 'file_name' => 'nodes_before_top_and_sections.texi',
-                'line_nr' => 66,
+                'line_nr' => 63,
                 'macro' => ''
               }
             }
           ],
           'source_info' => {
             'file_name' => 'nodes_before_top_and_sections.texi',
-            'line_nr' => 63,
+            'line_nr' => 60,
             'macro' => ''
           }
         },
@@ -1789,7 +1741,7 @@ $result_trees{'nodes_before_top_and_sections_chapter'} = {
           },
           'source_info' => {
             'file_name' => 'nodes_before_top_and_sections.texi',
-            'line_nr' => 68,
+            'line_nr' => 65,
             'macro' => ''
           }
         },
@@ -1829,7 +1781,7 @@ $result_trees{'nodes_before_top_and_sections_chapter'} = {
       },
       'source_info' => {
         'file_name' => 'nodes_before_top_and_sections.texi',
-        'line_nr' => 62,
+        'line_nr' => 59,
         'macro' => ''
       }
     },
@@ -1928,7 +1880,7 @@ $result_trees{'nodes_before_top_and_sections_chapter'} = {
           },
           'source_info' => {
             'file_name' => 'nodes_before_top_and_sections.texi',
-            'line_nr' => 72,
+            'line_nr' => 69,
             'macro' => ''
           },
           'type' => 'index_entry_command'
@@ -1972,7 +1924,7 @@ $result_trees{'nodes_before_top_and_sections_chapter'} = {
           },
           'source_info' => {
             'file_name' => 'nodes_before_top_and_sections.texi',
-            'line_nr' => 73,
+            'line_nr' => 70,
             'macro' => ''
           },
           'type' => 'index_entry_command'
@@ -2016,7 +1968,7 @@ $result_trees{'nodes_before_top_and_sections_chapter'} = {
           },
           'source_info' => {
             'file_name' => 'nodes_before_top_and_sections.texi',
-            'line_nr' => 74,
+            'line_nr' => 71,
             'macro' => ''
           },
           'type' => 'index_entry_command'
@@ -2061,7 +2013,7 @@ $result_trees{'nodes_before_top_and_sections_chapter'} = {
       },
       'source_info' => {
         'file_name' => 'nodes_before_top_and_sections.texi',
-        'line_nr' => 70,
+        'line_nr' => 67,
         'macro' => ''
       }
     },
@@ -2152,7 +2104,7 @@ $result_trees{'nodes_before_top_and_sections_chapter'} = {
           },
           'source_info' => {
             'file_name' => 'nodes_before_top_and_sections.texi',
-            'line_nr' => 77,
+            'line_nr' => 74,
             'macro' => ''
           },
           'type' => 'index_entry_command'
@@ -2192,7 +2144,7 @@ $result_trees{'nodes_before_top_and_sections_chapter'} = {
           },
           'source_info' => {
             'file_name' => 'nodes_before_top_and_sections.texi',
-            'line_nr' => 79,
+            'line_nr' => 76,
             'macro' => ''
           }
         },
@@ -2240,7 +2192,7 @@ $result_trees{'nodes_before_top_and_sections_chapter'} = {
           },
           'source_info' => {
             'file_name' => 'nodes_before_top_and_sections.texi',
-            'line_nr' => 81,
+            'line_nr' => 78,
             'macro' => ''
           },
           'type' => 'index_entry_command'
@@ -2284,7 +2236,7 @@ $result_trees{'nodes_before_top_and_sections_chapter'} = {
           },
           'source_info' => {
             'file_name' => 'nodes_before_top_and_sections.texi',
-            'line_nr' => 82,
+            'line_nr' => 79,
             'macro' => ''
           },
           'type' => 'index_entry_command'
@@ -2324,7 +2276,7 @@ $result_trees{'nodes_before_top_and_sections_chapter'} = {
           },
           'source_info' => {
             'file_name' => 'nodes_before_top_and_sections.texi',
-            'line_nr' => 84,
+            'line_nr' => 81,
             'macro' => ''
           }
         },
@@ -2369,7 +2321,7 @@ $result_trees{'nodes_before_top_and_sections_chapter'} = {
       },
       'source_info' => {
         'file_name' => 'nodes_before_top_and_sections.texi',
-        'line_nr' => 76,
+        'line_nr' => 73,
         'macro' => ''
       }
     },
@@ -2445,7 +2397,7 @@ $result_trees{'nodes_before_top_and_sections_chapter'} = {
       },
       'source_info' => {
         'file_name' => 'nodes_before_top_and_sections.texi',
-        'line_nr' => 86,
+        'line_nr' => 83,
         'macro' => ''
       }
     },
@@ -2503,7 +2455,7 @@ $result_trees{'nodes_before_top_and_sections_chapter'} = {
           },
           'source_info' => {
             'file_name' => 'nodes_before_top_and_sections.texi',
-            'line_nr' => 89,
+            'line_nr' => 86,
             'macro' => ''
           }
         },
@@ -2521,7 +2473,7 @@ $result_trees{'nodes_before_top_and_sections_chapter'} = {
       },
       'source_info' => {
         'file_name' => 'nodes_before_top_and_sections.texi',
-        'line_nr' => 87,
+        'line_nr' => 84,
         'macro' => ''
       }
     },
@@ -2612,7 +2564,7 @@ $result_trees{'nodes_before_top_and_sections_chapter'} = {
           },
           'source_info' => {
             'file_name' => 'nodes_before_top_and_sections.texi',
-            'line_nr' => 93,
+            'line_nr' => 90,
             'macro' => ''
           },
           'type' => 'index_entry_command'
@@ -2657,7 +2609,7 @@ $result_trees{'nodes_before_top_and_sections_chapter'} = {
       },
       'source_info' => {
         'file_name' => 'nodes_before_top_and_sections.texi',
-        'line_nr' => 91,
+        'line_nr' => 88,
         'macro' => ''
       }
     },
@@ -2777,9 +2729,6 @@ 
$result_trees{'nodes_before_top_and_sections_chapter'}{'contents'}[11]{'extra'}{
 
 $result_texis{'nodes_before_top_and_sections_chapter'} = '\\input texinfo @c 
-*-texinfo-*-
 
-@setfilename nodes_before_top_and_sections.info
-
-
 @node first before top, Top, ,(dir)
 @cindex first before top
 
@@ -2874,8 +2823,6 @@ Text and then index entries
 
 
 $result_texts{'nodes_before_top_and_sections_chapter'} = '
-
-
 in first node before printindex
 in first node
 after second printindex in first node
diff --git 
a/tp/t/results/indices/nodes_before_top_and_sections_chapter/res_html/first-before-top.html
 
b/tp/t/results/indices/nodes_before_top_and_sections_chapter/res_html/first-before-top.html
index d65206d800..507b5df6ad 100644
--- 
a/tp/t/results/indices/nodes_before_top_and_sections_chapter/res_html/first-before-top.html
+++ 
b/tp/t/results/indices/nodes_before_top_and_sections_chapter/res_html/first-before-top.html
@@ -31,8 +31,6 @@ th.sections-header-printindex {text-align:left; padding-left: 
1em}
 </head>
 
 <body lang="en">
-
-
 <a class="node-id" id="first-before-top"></a><div class="nav-panel">
 <p>
 Next: <a href="index.html#Top" accesskey="n" rel="next">top section</a>, Up: 
<a href="../dir_html/index.html" accesskey="u" rel="up">(dir)</a> &nbsp; [<a 
href="#first-before-top" title="Index" rel="index">Index</a>]</p>
diff --git 
a/tp/t/results/indices/nodes_before_top_and_sections_chapter_no_node.pl 
b/tp/t/results/indices/nodes_before_top_and_sections_chapter_no_node.pl
index b274e19a82..850e6e12c7 100644
--- a/tp/t/results/indices/nodes_before_top_and_sections_chapter_no_node.pl
+++ b/tp/t/results/indices/nodes_before_top_and_sections_chapter_no_node.pl
@@ -12,68 +12,20 @@ 
$result_trees{'nodes_before_top_and_sections_chapter_no_node'} = {
         {
           'contents' => [
             {
-              'contents' => [
-                {
-                  'text' => '\\input texinfo @c -*-texinfo-*-
-',
-                  'type' => 'text_before_beginning'
-                },
-                {
-                  'text' => '
-',
-                  'type' => 'text_before_beginning'
-                }
-              ],
-              'type' => 'preamble_before_beginning'
-            }
-          ],
-          'type' => 'preamble_before_setfilename'
-        },
-        {
-          'contents' => [
-            {
-              'args' => [
-                {
-                  'contents' => [
-                    {
-                      'text' => 'nodes_before_top_and_sections.info'
-                    }
-                  ],
-                  'info' => {
-                    'spaces_after_argument' => {
-                      'text' => '
-'
-                    }
-                  },
-                  'type' => 'line_arg'
-                }
-              ],
-              'cmdname' => 'setfilename',
-              'extra' => {
-                'text_arg' => 'nodes_before_top_and_sections.info'
-              },
-              'info' => {
-                'spaces_before_argument' => {
-                  'text' => ' '
-                }
-              },
-              'source_info' => {
-                'file_name' => 'nodes_before_top_and_sections.texi',
-                'line_nr' => 3,
-                'macro' => ''
-              }
-            },
-            {
-              'text' => '
+              'text' => '\\input texinfo @c -*-texinfo-*-
 ',
-              'type' => 'empty_line'
+              'type' => 'text_before_beginning'
             },
             {
               'text' => '
 ',
-              'type' => 'empty_line'
+              'type' => 'text_before_beginning'
             }
           ],
+          'type' => 'preamble_before_beginning'
+        },
+        {
+          'contents' => [],
           'type' => 'preamble_before_content'
         }
       ],
@@ -172,7 +124,7 @@ 
$result_trees{'nodes_before_top_and_sections_chapter_no_node'} = {
           },
           'source_info' => {
             'file_name' => 'nodes_before_top_and_sections.texi',
-            'line_nr' => 7,
+            'line_nr' => 4,
             'macro' => ''
           },
           'type' => 'index_entry_command'
@@ -221,7 +173,7 @@ 
$result_trees{'nodes_before_top_and_sections_chapter_no_node'} = {
           },
           'source_info' => {
             'file_name' => 'nodes_before_top_and_sections.texi',
-            'line_nr' => 10,
+            'line_nr' => 7,
             'macro' => ''
           }
         },
@@ -264,7 +216,7 @@ 
$result_trees{'nodes_before_top_and_sections_chapter_no_node'} = {
           },
           'source_info' => {
             'file_name' => 'nodes_before_top_and_sections.texi',
-            'line_nr' => 12,
+            'line_nr' => 9,
             'macro' => ''
           }
         },
@@ -334,7 +286,7 @@ 
$result_trees{'nodes_before_top_and_sections_chapter_no_node'} = {
               },
               'source_info' => {
                 'file_name' => 'nodes_before_top_and_sections.texi',
-                'line_nr' => 15,
+                'line_nr' => 12,
                 'macro' => ''
               },
               'type' => 'menu_entry'
@@ -367,14 +319,14 @@ 
$result_trees{'nodes_before_top_and_sections_chapter_no_node'} = {
               },
               'source_info' => {
                 'file_name' => 'nodes_before_top_and_sections.texi',
-                'line_nr' => 16,
+                'line_nr' => 13,
                 'macro' => ''
               }
             }
           ],
           'source_info' => {
             'file_name' => 'nodes_before_top_and_sections.texi',
-            'line_nr' => 14,
+            'line_nr' => 11,
             'macro' => ''
           }
         },
@@ -418,7 +370,7 @@ 
$result_trees{'nodes_before_top_and_sections_chapter_no_node'} = {
       },
       'source_info' => {
         'file_name' => 'nodes_before_top_and_sections.texi',
-        'line_nr' => 6,
+        'line_nr' => 3,
         'macro' => ''
       }
     },
@@ -499,7 +451,7 @@ 
$result_trees{'nodes_before_top_and_sections_chapter_no_node'} = {
           },
           'source_info' => {
             'file_name' => 'nodes_before_top_and_sections.texi',
-            'line_nr' => 20,
+            'line_nr' => 17,
             'macro' => ''
           },
           'type' => 'index_entry_command'
@@ -543,7 +495,7 @@ 
$result_trees{'nodes_before_top_and_sections_chapter_no_node'} = {
           },
           'source_info' => {
             'file_name' => 'nodes_before_top_and_sections.texi',
-            'line_nr' => 22,
+            'line_nr' => 19,
             'macro' => ''
           }
         },
@@ -600,7 +552,7 @@ 
$result_trees{'nodes_before_top_and_sections_chapter_no_node'} = {
           },
           'source_info' => {
             'file_name' => 'nodes_before_top_and_sections.texi',
-            'line_nr' => 25,
+            'line_nr' => 22,
             'macro' => ''
           },
           'type' => 'index_entry_command'
@@ -646,7 +598,7 @@ 
$result_trees{'nodes_before_top_and_sections_chapter_no_node'} = {
       },
       'source_info' => {
         'file_name' => 'nodes_before_top_and_sections.texi',
-        'line_nr' => 18,
+        'line_nr' => 15,
         'macro' => ''
       }
     },
@@ -724,7 +676,7 @@ 
$result_trees{'nodes_before_top_and_sections_chapter_no_node'} = {
           },
           'source_info' => {
             'file_name' => 'nodes_before_top_and_sections.texi',
-            'line_nr' => 29,
+            'line_nr' => 26,
             'macro' => ''
           },
           'type' => 'index_entry_command'
@@ -768,7 +720,7 @@ 
$result_trees{'nodes_before_top_and_sections_chapter_no_node'} = {
           },
           'source_info' => {
             'file_name' => 'nodes_before_top_and_sections.texi',
-            'line_nr' => 31,
+            'line_nr' => 28,
             'macro' => ''
           }
         },
@@ -807,7 +759,7 @@ 
$result_trees{'nodes_before_top_and_sections_chapter_no_node'} = {
           },
           'source_info' => {
             'file_name' => 'nodes_before_top_and_sections.texi',
-            'line_nr' => 33,
+            'line_nr' => 30,
             'macro' => ''
           }
         },
@@ -860,7 +812,7 @@ 
$result_trees{'nodes_before_top_and_sections_chapter_no_node'} = {
           },
           'source_info' => {
             'file_name' => 'nodes_before_top_and_sections.texi',
-            'line_nr' => 37,
+            'line_nr' => 34,
             'macro' => ''
           }
         },
@@ -899,7 +851,7 @@ 
$result_trees{'nodes_before_top_and_sections_chapter_no_node'} = {
       },
       'source_info' => {
         'file_name' => 'nodes_before_top_and_sections.texi',
-        'line_nr' => 28,
+        'line_nr' => 25,
         'macro' => ''
       }
     },
@@ -961,7 +913,7 @@ 
$result_trees{'nodes_before_top_and_sections_chapter_no_node'} = {
           },
           'source_info' => {
             'file_name' => 'nodes_before_top_and_sections.texi',
-            'line_nr' => 40,
+            'line_nr' => 37,
             'macro' => ''
           },
           'type' => 'index_entry_command'
@@ -1042,7 +994,7 @@ 
$result_trees{'nodes_before_top_and_sections_chapter_no_node'} = {
               },
               'source_info' => {
                 'file_name' => 'nodes_before_top_and_sections.texi',
-                'line_nr' => 45,
+                'line_nr' => 42,
                 'macro' => ''
               },
               'type' => 'menu_entry'
@@ -1090,7 +1042,7 @@ 
$result_trees{'nodes_before_top_and_sections_chapter_no_node'} = {
               },
               'source_info' => {
                 'file_name' => 'nodes_before_top_and_sections.texi',
-                'line_nr' => 46,
+                'line_nr' => 43,
                 'macro' => ''
               },
               'type' => 'menu_entry'
@@ -1138,7 +1090,7 @@ 
$result_trees{'nodes_before_top_and_sections_chapter_no_node'} = {
               },
               'source_info' => {
                 'file_name' => 'nodes_before_top_and_sections.texi',
-                'line_nr' => 47,
+                'line_nr' => 44,
                 'macro' => ''
               },
               'type' => 'menu_entry'
@@ -1171,14 +1123,14 @@ 
$result_trees{'nodes_before_top_and_sections_chapter_no_node'} = {
               },
               'source_info' => {
                 'file_name' => 'nodes_before_top_and_sections.texi',
-                'line_nr' => 48,
+                'line_nr' => 45,
                 'macro' => ''
               }
             }
           ],
           'source_info' => {
             'file_name' => 'nodes_before_top_and_sections.texi',
-            'line_nr' => 44,
+            'line_nr' => 41,
             'macro' => ''
           }
         },
@@ -1196,7 +1148,7 @@ 
$result_trees{'nodes_before_top_and_sections_chapter_no_node'} = {
       },
       'source_info' => {
         'file_name' => 'nodes_before_top_and_sections.texi',
-        'line_nr' => 39,
+        'line_nr' => 36,
         'macro' => ''
       }
     },
@@ -1286,7 +1238,7 @@ 
$result_trees{'nodes_before_top_and_sections_chapter_no_node'} = {
               },
               'source_info' => {
                 'file_name' => 'nodes_before_top_and_sections.texi',
-                'line_nr' => 52,
+                'line_nr' => 49,
                 'macro' => ''
               },
               'type' => 'index_entry_command'
@@ -1330,7 +1282,7 @@ 
$result_trees{'nodes_before_top_and_sections_chapter_no_node'} = {
               },
               'source_info' => {
                 'file_name' => 'nodes_before_top_and_sections.texi',
-                'line_nr' => 53,
+                'line_nr' => 50,
                 'macro' => ''
               },
               'type' => 'index_entry_command'
@@ -1374,7 +1326,7 @@ 
$result_trees{'nodes_before_top_and_sections_chapter_no_node'} = {
               },
               'source_info' => {
                 'file_name' => 'nodes_before_top_and_sections.texi',
-                'line_nr' => 54,
+                'line_nr' => 51,
                 'macro' => ''
               },
               'type' => 'index_entry_command'
@@ -1417,7 +1369,7 @@ 
$result_trees{'nodes_before_top_and_sections_chapter_no_node'} = {
           },
           'source_info' => {
             'file_name' => 'nodes_before_top_and_sections.texi',
-            'line_nr' => 56,
+            'line_nr' => 53,
             'macro' => ''
           }
         },
@@ -1483,7 +1435,7 @@ 
$result_trees{'nodes_before_top_and_sections_chapter_no_node'} = {
               },
               'source_info' => {
                 'file_name' => 'nodes_before_top_and_sections.texi',
-                'line_nr' => 59,
+                'line_nr' => 56,
                 'macro' => ''
               },
               'type' => 'menu_entry'
@@ -1516,14 +1468,14 @@ 
$result_trees{'nodes_before_top_and_sections_chapter_no_node'} = {
               },
               'source_info' => {
                 'file_name' => 'nodes_before_top_and_sections.texi',
-                'line_nr' => 60,
+                'line_nr' => 57,
                 'macro' => ''
               }
             }
           ],
           'source_info' => {
             'file_name' => 'nodes_before_top_and_sections.texi',
-            'line_nr' => 58,
+            'line_nr' => 55,
             'macro' => ''
           }
         },
@@ -1568,7 +1520,7 @@ 
$result_trees{'nodes_before_top_and_sections_chapter_no_node'} = {
       },
       'source_info' => {
         'file_name' => 'nodes_before_top_and_sections.texi',
-        'line_nr' => 50,
+        'line_nr' => 47,
         'macro' => ''
       }
     },
@@ -1662,7 +1614,7 @@ 
$result_trees{'nodes_before_top_and_sections_chapter_no_node'} = {
               },
               'source_info' => {
                 'file_name' => 'nodes_before_top_and_sections.texi',
-                'line_nr' => 64,
+                'line_nr' => 61,
                 'macro' => ''
               },
               'type' => 'menu_entry'
@@ -1710,7 +1662,7 @@ 
$result_trees{'nodes_before_top_and_sections_chapter_no_node'} = {
               },
               'source_info' => {
                 'file_name' => 'nodes_before_top_and_sections.texi',
-                'line_nr' => 65,
+                'line_nr' => 62,
                 'macro' => ''
               },
               'type' => 'menu_entry'
@@ -1743,14 +1695,14 @@ 
$result_trees{'nodes_before_top_and_sections_chapter_no_node'} = {
               },
               'source_info' => {
                 'file_name' => 'nodes_before_top_and_sections.texi',
-                'line_nr' => 66,
+                'line_nr' => 63,
                 'macro' => ''
               }
             }
           ],
           'source_info' => {
             'file_name' => 'nodes_before_top_and_sections.texi',
-            'line_nr' => 63,
+            'line_nr' => 60,
             'macro' => ''
           }
         },
@@ -1789,7 +1741,7 @@ 
$result_trees{'nodes_before_top_and_sections_chapter_no_node'} = {
           },
           'source_info' => {
             'file_name' => 'nodes_before_top_and_sections.texi',
-            'line_nr' => 68,
+            'line_nr' => 65,
             'macro' => ''
           }
         },
@@ -1829,7 +1781,7 @@ 
$result_trees{'nodes_before_top_and_sections_chapter_no_node'} = {
       },
       'source_info' => {
         'file_name' => 'nodes_before_top_and_sections.texi',
-        'line_nr' => 62,
+        'line_nr' => 59,
         'macro' => ''
       }
     },
@@ -1928,7 +1880,7 @@ 
$result_trees{'nodes_before_top_and_sections_chapter_no_node'} = {
           },
           'source_info' => {
             'file_name' => 'nodes_before_top_and_sections.texi',
-            'line_nr' => 72,
+            'line_nr' => 69,
             'macro' => ''
           },
           'type' => 'index_entry_command'
@@ -1972,7 +1924,7 @@ 
$result_trees{'nodes_before_top_and_sections_chapter_no_node'} = {
           },
           'source_info' => {
             'file_name' => 'nodes_before_top_and_sections.texi',
-            'line_nr' => 73,
+            'line_nr' => 70,
             'macro' => ''
           },
           'type' => 'index_entry_command'
@@ -2016,7 +1968,7 @@ 
$result_trees{'nodes_before_top_and_sections_chapter_no_node'} = {
           },
           'source_info' => {
             'file_name' => 'nodes_before_top_and_sections.texi',
-            'line_nr' => 74,
+            'line_nr' => 71,
             'macro' => ''
           },
           'type' => 'index_entry_command'
@@ -2061,7 +2013,7 @@ 
$result_trees{'nodes_before_top_and_sections_chapter_no_node'} = {
       },
       'source_info' => {
         'file_name' => 'nodes_before_top_and_sections.texi',
-        'line_nr' => 70,
+        'line_nr' => 67,
         'macro' => ''
       }
     },
@@ -2152,7 +2104,7 @@ 
$result_trees{'nodes_before_top_and_sections_chapter_no_node'} = {
           },
           'source_info' => {
             'file_name' => 'nodes_before_top_and_sections.texi',
-            'line_nr' => 77,
+            'line_nr' => 74,
             'macro' => ''
           },
           'type' => 'index_entry_command'
@@ -2192,7 +2144,7 @@ 
$result_trees{'nodes_before_top_and_sections_chapter_no_node'} = {
           },
           'source_info' => {
             'file_name' => 'nodes_before_top_and_sections.texi',
-            'line_nr' => 79,
+            'line_nr' => 76,
             'macro' => ''
           }
         },
@@ -2240,7 +2192,7 @@ 
$result_trees{'nodes_before_top_and_sections_chapter_no_node'} = {
           },
           'source_info' => {
             'file_name' => 'nodes_before_top_and_sections.texi',
-            'line_nr' => 81,
+            'line_nr' => 78,
             'macro' => ''
           },
           'type' => 'index_entry_command'
@@ -2284,7 +2236,7 @@ 
$result_trees{'nodes_before_top_and_sections_chapter_no_node'} = {
           },
           'source_info' => {
             'file_name' => 'nodes_before_top_and_sections.texi',
-            'line_nr' => 82,
+            'line_nr' => 79,
             'macro' => ''
           },
           'type' => 'index_entry_command'
@@ -2324,7 +2276,7 @@ 
$result_trees{'nodes_before_top_and_sections_chapter_no_node'} = {
           },
           'source_info' => {
             'file_name' => 'nodes_before_top_and_sections.texi',
-            'line_nr' => 84,
+            'line_nr' => 81,
             'macro' => ''
           }
         },
@@ -2369,7 +2321,7 @@ 
$result_trees{'nodes_before_top_and_sections_chapter_no_node'} = {
       },
       'source_info' => {
         'file_name' => 'nodes_before_top_and_sections.texi',
-        'line_nr' => 76,
+        'line_nr' => 73,
         'macro' => ''
       }
     },
@@ -2445,7 +2397,7 @@ 
$result_trees{'nodes_before_top_and_sections_chapter_no_node'} = {
       },
       'source_info' => {
         'file_name' => 'nodes_before_top_and_sections.texi',
-        'line_nr' => 86,
+        'line_nr' => 83,
         'macro' => ''
       }
     },
@@ -2503,7 +2455,7 @@ 
$result_trees{'nodes_before_top_and_sections_chapter_no_node'} = {
           },
           'source_info' => {
             'file_name' => 'nodes_before_top_and_sections.texi',
-            'line_nr' => 89,
+            'line_nr' => 86,
             'macro' => ''
           }
         },
@@ -2521,7 +2473,7 @@ 
$result_trees{'nodes_before_top_and_sections_chapter_no_node'} = {
       },
       'source_info' => {
         'file_name' => 'nodes_before_top_and_sections.texi',
-        'line_nr' => 87,
+        'line_nr' => 84,
         'macro' => ''
       }
     },
@@ -2612,7 +2564,7 @@ 
$result_trees{'nodes_before_top_and_sections_chapter_no_node'} = {
           },
           'source_info' => {
             'file_name' => 'nodes_before_top_and_sections.texi',
-            'line_nr' => 93,
+            'line_nr' => 90,
             'macro' => ''
           },
           'type' => 'index_entry_command'
@@ -2657,7 +2609,7 @@ 
$result_trees{'nodes_before_top_and_sections_chapter_no_node'} = {
       },
       'source_info' => {
         'file_name' => 'nodes_before_top_and_sections.texi',
-        'line_nr' => 91,
+        'line_nr' => 88,
         'macro' => ''
       }
     },
@@ -2777,9 +2729,6 @@ 
$result_trees{'nodes_before_top_and_sections_chapter_no_node'}{'contents'}[11]{'
 
 $result_texis{'nodes_before_top_and_sections_chapter_no_node'} = '\\input 
texinfo @c -*-texinfo-*-
 
-@setfilename nodes_before_top_and_sections.info
-
-
 @node first before top, Top, ,(dir)
 @cindex first before top
 
@@ -2874,8 +2823,6 @@ Text and then index entries
 
 
 $result_texts{'nodes_before_top_and_sections_chapter_no_node'} = '
-
-
 in first node before printindex
 in first node
 after second printindex in first node
diff --git 
a/tp/t/results/indices/nodes_before_top_and_sections_chapter_no_node/res_html/index.html
 
b/tp/t/results/indices/nodes_before_top_and_sections_chapter_no_node/res_html/index.html
index 3b9a13738d..56bd2e6677 100644
--- 
a/tp/t/results/indices/nodes_before_top_and_sections_chapter_no_node/res_html/index.html
+++ 
b/tp/t/results/indices/nodes_before_top_and_sections_chapter_no_node/res_html/index.html
@@ -30,8 +30,6 @@ th.sections-header-printindex {text-align:left; padding-left: 
1em}
 </head>
 
 <body lang="en">
-
-
 <a class="node" id="first-before-top"></a><div class="nav-panel">
 <p>
  &nbsp; [<a href="#Top" title="Index" rel="index">Index</a>]</p>
diff --git 
a/tp/t/results/indices/nodes_before_top_and_sections_unsplit_no_nodes.pl 
b/tp/t/results/indices/nodes_before_top_and_sections_unsplit_no_nodes.pl
index e806efa9c3..89134c0e07 100644
--- a/tp/t/results/indices/nodes_before_top_and_sections_unsplit_no_nodes.pl
+++ b/tp/t/results/indices/nodes_before_top_and_sections_unsplit_no_nodes.pl
@@ -12,68 +12,20 @@ 
$result_trees{'nodes_before_top_and_sections_unsplit_no_nodes'} = {
         {
           'contents' => [
             {
-              'contents' => [
-                {
-                  'text' => '\\input texinfo @c -*-texinfo-*-
-',
-                  'type' => 'text_before_beginning'
-                },
-                {
-                  'text' => '
-',
-                  'type' => 'text_before_beginning'
-                }
-              ],
-              'type' => 'preamble_before_beginning'
-            }
-          ],
-          'type' => 'preamble_before_setfilename'
-        },
-        {
-          'contents' => [
-            {
-              'args' => [
-                {
-                  'contents' => [
-                    {
-                      'text' => 'nodes_before_top_and_sections.info'
-                    }
-                  ],
-                  'info' => {
-                    'spaces_after_argument' => {
-                      'text' => '
-'
-                    }
-                  },
-                  'type' => 'line_arg'
-                }
-              ],
-              'cmdname' => 'setfilename',
-              'extra' => {
-                'text_arg' => 'nodes_before_top_and_sections.info'
-              },
-              'info' => {
-                'spaces_before_argument' => {
-                  'text' => ' '
-                }
-              },
-              'source_info' => {
-                'file_name' => 'nodes_before_top_and_sections.texi',
-                'line_nr' => 3,
-                'macro' => ''
-              }
-            },
-            {
-              'text' => '
+              'text' => '\\input texinfo @c -*-texinfo-*-
 ',
-              'type' => 'empty_line'
+              'type' => 'text_before_beginning'
             },
             {
               'text' => '
 ',
-              'type' => 'empty_line'
+              'type' => 'text_before_beginning'
             }
           ],
+          'type' => 'preamble_before_beginning'
+        },
+        {
+          'contents' => [],
           'type' => 'preamble_before_content'
         }
       ],
@@ -172,7 +124,7 @@ 
$result_trees{'nodes_before_top_and_sections_unsplit_no_nodes'} = {
           },
           'source_info' => {
             'file_name' => 'nodes_before_top_and_sections.texi',
-            'line_nr' => 7,
+            'line_nr' => 4,
             'macro' => ''
           },
           'type' => 'index_entry_command'
@@ -221,7 +173,7 @@ 
$result_trees{'nodes_before_top_and_sections_unsplit_no_nodes'} = {
           },
           'source_info' => {
             'file_name' => 'nodes_before_top_and_sections.texi',
-            'line_nr' => 10,
+            'line_nr' => 7,
             'macro' => ''
           }
         },
@@ -264,7 +216,7 @@ 
$result_trees{'nodes_before_top_and_sections_unsplit_no_nodes'} = {
           },
           'source_info' => {
             'file_name' => 'nodes_before_top_and_sections.texi',
-            'line_nr' => 12,
+            'line_nr' => 9,
             'macro' => ''
           }
         },
@@ -334,7 +286,7 @@ 
$result_trees{'nodes_before_top_and_sections_unsplit_no_nodes'} = {
               },
               'source_info' => {
                 'file_name' => 'nodes_before_top_and_sections.texi',
-                'line_nr' => 15,
+                'line_nr' => 12,
                 'macro' => ''
               },
               'type' => 'menu_entry'
@@ -367,14 +319,14 @@ 
$result_trees{'nodes_before_top_and_sections_unsplit_no_nodes'} = {
               },
               'source_info' => {
                 'file_name' => 'nodes_before_top_and_sections.texi',
-                'line_nr' => 16,
+                'line_nr' => 13,
                 'macro' => ''
               }
             }
           ],
           'source_info' => {
             'file_name' => 'nodes_before_top_and_sections.texi',
-            'line_nr' => 14,
+            'line_nr' => 11,
             'macro' => ''
           }
         },
@@ -418,7 +370,7 @@ 
$result_trees{'nodes_before_top_and_sections_unsplit_no_nodes'} = {
       },
       'source_info' => {
         'file_name' => 'nodes_before_top_and_sections.texi',
-        'line_nr' => 6,
+        'line_nr' => 3,
         'macro' => ''
       }
     },
@@ -499,7 +451,7 @@ 
$result_trees{'nodes_before_top_and_sections_unsplit_no_nodes'} = {
           },
           'source_info' => {
             'file_name' => 'nodes_before_top_and_sections.texi',
-            'line_nr' => 20,
+            'line_nr' => 17,
             'macro' => ''
           },
           'type' => 'index_entry_command'
@@ -543,7 +495,7 @@ 
$result_trees{'nodes_before_top_and_sections_unsplit_no_nodes'} = {
           },
           'source_info' => {
             'file_name' => 'nodes_before_top_and_sections.texi',
-            'line_nr' => 22,
+            'line_nr' => 19,
             'macro' => ''
           }
         },
@@ -600,7 +552,7 @@ 
$result_trees{'nodes_before_top_and_sections_unsplit_no_nodes'} = {
           },
           'source_info' => {
             'file_name' => 'nodes_before_top_and_sections.texi',
-            'line_nr' => 25,
+            'line_nr' => 22,
             'macro' => ''
           },
           'type' => 'index_entry_command'
@@ -646,7 +598,7 @@ 
$result_trees{'nodes_before_top_and_sections_unsplit_no_nodes'} = {
       },
       'source_info' => {
         'file_name' => 'nodes_before_top_and_sections.texi',
-        'line_nr' => 18,
+        'line_nr' => 15,
         'macro' => ''
       }
     },
@@ -724,7 +676,7 @@ 
$result_trees{'nodes_before_top_and_sections_unsplit_no_nodes'} = {
           },
           'source_info' => {
             'file_name' => 'nodes_before_top_and_sections.texi',
-            'line_nr' => 29,
+            'line_nr' => 26,
             'macro' => ''
           },
           'type' => 'index_entry_command'
@@ -768,7 +720,7 @@ 
$result_trees{'nodes_before_top_and_sections_unsplit_no_nodes'} = {
           },
           'source_info' => {
             'file_name' => 'nodes_before_top_and_sections.texi',
-            'line_nr' => 31,
+            'line_nr' => 28,
             'macro' => ''
           }
         },
@@ -807,7 +759,7 @@ 
$result_trees{'nodes_before_top_and_sections_unsplit_no_nodes'} = {
           },
           'source_info' => {
             'file_name' => 'nodes_before_top_and_sections.texi',
-            'line_nr' => 33,
+            'line_nr' => 30,
             'macro' => ''
           }
         },
@@ -860,7 +812,7 @@ 
$result_trees{'nodes_before_top_and_sections_unsplit_no_nodes'} = {
           },
           'source_info' => {
             'file_name' => 'nodes_before_top_and_sections.texi',
-            'line_nr' => 37,
+            'line_nr' => 34,
             'macro' => ''
           }
         },
@@ -899,7 +851,7 @@ 
$result_trees{'nodes_before_top_and_sections_unsplit_no_nodes'} = {
       },
       'source_info' => {
         'file_name' => 'nodes_before_top_and_sections.texi',
-        'line_nr' => 28,
+        'line_nr' => 25,
         'macro' => ''
       }
     },
@@ -961,7 +913,7 @@ 
$result_trees{'nodes_before_top_and_sections_unsplit_no_nodes'} = {
           },
           'source_info' => {
             'file_name' => 'nodes_before_top_and_sections.texi',
-            'line_nr' => 40,
+            'line_nr' => 37,
             'macro' => ''
           },
           'type' => 'index_entry_command'
@@ -1042,7 +994,7 @@ 
$result_trees{'nodes_before_top_and_sections_unsplit_no_nodes'} = {
               },
               'source_info' => {
                 'file_name' => 'nodes_before_top_and_sections.texi',
-                'line_nr' => 45,
+                'line_nr' => 42,
                 'macro' => ''
               },
               'type' => 'menu_entry'
@@ -1090,7 +1042,7 @@ 
$result_trees{'nodes_before_top_and_sections_unsplit_no_nodes'} = {
               },
               'source_info' => {
                 'file_name' => 'nodes_before_top_and_sections.texi',
-                'line_nr' => 46,
+                'line_nr' => 43,
                 'macro' => ''
               },
               'type' => 'menu_entry'
@@ -1138,7 +1090,7 @@ 
$result_trees{'nodes_before_top_and_sections_unsplit_no_nodes'} = {
               },
               'source_info' => {
                 'file_name' => 'nodes_before_top_and_sections.texi',
-                'line_nr' => 47,
+                'line_nr' => 44,
                 'macro' => ''
               },
               'type' => 'menu_entry'
@@ -1171,14 +1123,14 @@ 
$result_trees{'nodes_before_top_and_sections_unsplit_no_nodes'} = {
               },
               'source_info' => {
                 'file_name' => 'nodes_before_top_and_sections.texi',
-                'line_nr' => 48,
+                'line_nr' => 45,
                 'macro' => ''
               }
             }
           ],
           'source_info' => {
             'file_name' => 'nodes_before_top_and_sections.texi',
-            'line_nr' => 44,
+            'line_nr' => 41,
             'macro' => ''
           }
         },
@@ -1196,7 +1148,7 @@ 
$result_trees{'nodes_before_top_and_sections_unsplit_no_nodes'} = {
       },
       'source_info' => {
         'file_name' => 'nodes_before_top_and_sections.texi',
-        'line_nr' => 39,
+        'line_nr' => 36,
         'macro' => ''
       }
     },
@@ -1286,7 +1238,7 @@ 
$result_trees{'nodes_before_top_and_sections_unsplit_no_nodes'} = {
               },
               'source_info' => {
                 'file_name' => 'nodes_before_top_and_sections.texi',
-                'line_nr' => 52,
+                'line_nr' => 49,
                 'macro' => ''
               },
               'type' => 'index_entry_command'
@@ -1330,7 +1282,7 @@ 
$result_trees{'nodes_before_top_and_sections_unsplit_no_nodes'} = {
               },
               'source_info' => {
                 'file_name' => 'nodes_before_top_and_sections.texi',
-                'line_nr' => 53,
+                'line_nr' => 50,
                 'macro' => ''
               },
               'type' => 'index_entry_command'
@@ -1374,7 +1326,7 @@ 
$result_trees{'nodes_before_top_and_sections_unsplit_no_nodes'} = {
               },
               'source_info' => {
                 'file_name' => 'nodes_before_top_and_sections.texi',
-                'line_nr' => 54,
+                'line_nr' => 51,
                 'macro' => ''
               },
               'type' => 'index_entry_command'
@@ -1417,7 +1369,7 @@ 
$result_trees{'nodes_before_top_and_sections_unsplit_no_nodes'} = {
           },
           'source_info' => {
             'file_name' => 'nodes_before_top_and_sections.texi',
-            'line_nr' => 56,
+            'line_nr' => 53,
             'macro' => ''
           }
         },
@@ -1483,7 +1435,7 @@ 
$result_trees{'nodes_before_top_and_sections_unsplit_no_nodes'} = {
               },
               'source_info' => {
                 'file_name' => 'nodes_before_top_and_sections.texi',
-                'line_nr' => 59,
+                'line_nr' => 56,
                 'macro' => ''
               },
               'type' => 'menu_entry'
@@ -1516,14 +1468,14 @@ 
$result_trees{'nodes_before_top_and_sections_unsplit_no_nodes'} = {
               },
               'source_info' => {
                 'file_name' => 'nodes_before_top_and_sections.texi',
-                'line_nr' => 60,
+                'line_nr' => 57,
                 'macro' => ''
               }
             }
           ],
           'source_info' => {
             'file_name' => 'nodes_before_top_and_sections.texi',
-            'line_nr' => 58,
+            'line_nr' => 55,
             'macro' => ''
           }
         },
@@ -1568,7 +1520,7 @@ 
$result_trees{'nodes_before_top_and_sections_unsplit_no_nodes'} = {
       },
       'source_info' => {
         'file_name' => 'nodes_before_top_and_sections.texi',
-        'line_nr' => 50,
+        'line_nr' => 47,
         'macro' => ''
       }
     },
@@ -1662,7 +1614,7 @@ 
$result_trees{'nodes_before_top_and_sections_unsplit_no_nodes'} = {
               },
               'source_info' => {
                 'file_name' => 'nodes_before_top_and_sections.texi',
-                'line_nr' => 64,
+                'line_nr' => 61,
                 'macro' => ''
               },
               'type' => 'menu_entry'
@@ -1710,7 +1662,7 @@ 
$result_trees{'nodes_before_top_and_sections_unsplit_no_nodes'} = {
               },
               'source_info' => {
                 'file_name' => 'nodes_before_top_and_sections.texi',
-                'line_nr' => 65,
+                'line_nr' => 62,
                 'macro' => ''
               },
               'type' => 'menu_entry'
@@ -1743,14 +1695,14 @@ 
$result_trees{'nodes_before_top_and_sections_unsplit_no_nodes'} = {
               },
               'source_info' => {
                 'file_name' => 'nodes_before_top_and_sections.texi',
-                'line_nr' => 66,
+                'line_nr' => 63,
                 'macro' => ''
               }
             }
           ],
           'source_info' => {
             'file_name' => 'nodes_before_top_and_sections.texi',
-            'line_nr' => 63,
+            'line_nr' => 60,
             'macro' => ''
           }
         },
@@ -1789,7 +1741,7 @@ 
$result_trees{'nodes_before_top_and_sections_unsplit_no_nodes'} = {
           },
           'source_info' => {
             'file_name' => 'nodes_before_top_and_sections.texi',
-            'line_nr' => 68,
+            'line_nr' => 65,
             'macro' => ''
           }
         },
@@ -1829,7 +1781,7 @@ 
$result_trees{'nodes_before_top_and_sections_unsplit_no_nodes'} = {
       },
       'source_info' => {
         'file_name' => 'nodes_before_top_and_sections.texi',
-        'line_nr' => 62,
+        'line_nr' => 59,
         'macro' => ''
       }
     },
@@ -1928,7 +1880,7 @@ 
$result_trees{'nodes_before_top_and_sections_unsplit_no_nodes'} = {
           },
           'source_info' => {
             'file_name' => 'nodes_before_top_and_sections.texi',
-            'line_nr' => 72,
+            'line_nr' => 69,
             'macro' => ''
           },
           'type' => 'index_entry_command'
@@ -1972,7 +1924,7 @@ 
$result_trees{'nodes_before_top_and_sections_unsplit_no_nodes'} = {
           },
           'source_info' => {
             'file_name' => 'nodes_before_top_and_sections.texi',
-            'line_nr' => 73,
+            'line_nr' => 70,
             'macro' => ''
           },
           'type' => 'index_entry_command'
@@ -2016,7 +1968,7 @@ 
$result_trees{'nodes_before_top_and_sections_unsplit_no_nodes'} = {
           },
           'source_info' => {
             'file_name' => 'nodes_before_top_and_sections.texi',
-            'line_nr' => 74,
+            'line_nr' => 71,
             'macro' => ''
           },
           'type' => 'index_entry_command'
@@ -2061,7 +2013,7 @@ 
$result_trees{'nodes_before_top_and_sections_unsplit_no_nodes'} = {
       },
       'source_info' => {
         'file_name' => 'nodes_before_top_and_sections.texi',
-        'line_nr' => 70,
+        'line_nr' => 67,
         'macro' => ''
       }
     },
@@ -2152,7 +2104,7 @@ 
$result_trees{'nodes_before_top_and_sections_unsplit_no_nodes'} = {
           },
           'source_info' => {
             'file_name' => 'nodes_before_top_and_sections.texi',
-            'line_nr' => 77,
+            'line_nr' => 74,
             'macro' => ''
           },
           'type' => 'index_entry_command'
@@ -2192,7 +2144,7 @@ 
$result_trees{'nodes_before_top_and_sections_unsplit_no_nodes'} = {
           },
           'source_info' => {
             'file_name' => 'nodes_before_top_and_sections.texi',
-            'line_nr' => 79,
+            'line_nr' => 76,
             'macro' => ''
           }
         },
@@ -2240,7 +2192,7 @@ 
$result_trees{'nodes_before_top_and_sections_unsplit_no_nodes'} = {
           },
           'source_info' => {
             'file_name' => 'nodes_before_top_and_sections.texi',
-            'line_nr' => 81,
+            'line_nr' => 78,
             'macro' => ''
           },
           'type' => 'index_entry_command'
@@ -2284,7 +2236,7 @@ 
$result_trees{'nodes_before_top_and_sections_unsplit_no_nodes'} = {
           },
           'source_info' => {
             'file_name' => 'nodes_before_top_and_sections.texi',
-            'line_nr' => 82,
+            'line_nr' => 79,
             'macro' => ''
           },
           'type' => 'index_entry_command'
@@ -2324,7 +2276,7 @@ 
$result_trees{'nodes_before_top_and_sections_unsplit_no_nodes'} = {
           },
           'source_info' => {
             'file_name' => 'nodes_before_top_and_sections.texi',
-            'line_nr' => 84,
+            'line_nr' => 81,
             'macro' => ''
           }
         },
@@ -2369,7 +2321,7 @@ 
$result_trees{'nodes_before_top_and_sections_unsplit_no_nodes'} = {
       },
       'source_info' => {
         'file_name' => 'nodes_before_top_and_sections.texi',
-        'line_nr' => 76,
+        'line_nr' => 73,
         'macro' => ''
       }
     },
@@ -2445,7 +2397,7 @@ 
$result_trees{'nodes_before_top_and_sections_unsplit_no_nodes'} = {
       },
       'source_info' => {
         'file_name' => 'nodes_before_top_and_sections.texi',
-        'line_nr' => 86,
+        'line_nr' => 83,
         'macro' => ''
       }
     },
@@ -2503,7 +2455,7 @@ 
$result_trees{'nodes_before_top_and_sections_unsplit_no_nodes'} = {
           },
           'source_info' => {
             'file_name' => 'nodes_before_top_and_sections.texi',
-            'line_nr' => 89,
+            'line_nr' => 86,
             'macro' => ''
           }
         },
@@ -2521,7 +2473,7 @@ 
$result_trees{'nodes_before_top_and_sections_unsplit_no_nodes'} = {
       },
       'source_info' => {
         'file_name' => 'nodes_before_top_and_sections.texi',
-        'line_nr' => 87,
+        'line_nr' => 84,
         'macro' => ''
       }
     },
@@ -2612,7 +2564,7 @@ 
$result_trees{'nodes_before_top_and_sections_unsplit_no_nodes'} = {
           },
           'source_info' => {
             'file_name' => 'nodes_before_top_and_sections.texi',
-            'line_nr' => 93,
+            'line_nr' => 90,
             'macro' => ''
           },
           'type' => 'index_entry_command'
@@ -2657,7 +2609,7 @@ 
$result_trees{'nodes_before_top_and_sections_unsplit_no_nodes'} = {
       },
       'source_info' => {
         'file_name' => 'nodes_before_top_and_sections.texi',
-        'line_nr' => 91,
+        'line_nr' => 88,
         'macro' => ''
       }
     },
@@ -2777,9 +2729,6 @@ 
$result_trees{'nodes_before_top_and_sections_unsplit_no_nodes'}{'contents'}[11]{
 
 $result_texis{'nodes_before_top_and_sections_unsplit_no_nodes'} = '\\input 
texinfo @c -*-texinfo-*-
 
-@setfilename nodes_before_top_and_sections.info
-
-
 @node first before top, Top, ,(dir)
 @cindex first before top
 
@@ -2874,8 +2823,6 @@ Text and then index entries
 
 
 $result_texts{'nodes_before_top_and_sections_unsplit_no_nodes'} = '
-
-
 in first node before printindex
 in first node
 after second printindex in first node
diff --git 
a/tp/t/results/indices/nodes_before_top_and_sections_unsplit_no_nodes/res_html/nodes_before_top_and_sections.html
 
b/tp/t/results/indices/nodes_before_top_and_sections_unsplit_no_nodes/res_html/nodes_before_top_and_sections.html
index d55d09af56..bcab338bbd 100644
--- 
a/tp/t/results/indices/nodes_before_top_and_sections_unsplit_no_nodes/res_html/nodes_before_top_and_sections.html
+++ 
b/tp/t/results/indices/nodes_before_top_and_sections_unsplit_no_nodes/res_html/nodes_before_top_and_sections.html
@@ -30,8 +30,6 @@ th.sections-header-printindex {text-align:left; padding-left: 
1em}
 </head>
 
 <body lang="en">
-
-
 <a class="node" id="first-before-top"></a><div class="nav-panel">
 <p>
  &nbsp; [<a href="#Top" title="Index" rel="index">Index</a>]</p>
diff --git a/tp/t/results/languages/documentlanguage.pl 
b/tp/t/results/languages/documentlanguage.pl
index ffbe6ac8a4..3c8bfbef51 100644
--- a/tp/t/results/languages/documentlanguage.pl
+++ b/tp/t/results/languages/documentlanguage.pl
@@ -12,20 +12,20 @@ $result_trees{'documentlanguage'} = {
         {
           'contents' => [
             {
-              'contents' => [
-                {
-                  'text' => '\\input texinfo @c -*-texinfo-*-
+              'text' => '\\input texinfo @c -*-texinfo-*-
 ',
-                  'type' => 'text_before_beginning'
-                },
-                {
-                  'text' => '
-',
-                  'type' => 'text_before_beginning'
-                }
-              ],
-              'type' => 'preamble_before_beginning'
+              'type' => 'text_before_beginning'
             },
+            {
+              'text' => '
+',
+              'type' => 'text_before_beginning'
+            }
+          ],
+          'type' => 'preamble_before_beginning'
+        },
+        {
+          'contents' => [
             {
               'args' => [
                 {
@@ -313,43 +313,6 @@ $result_trees{'documentlanguage'} = {
 '
                 ]
               }
-            }
-          ],
-          'type' => 'preamble_before_setfilename'
-        },
-        {
-          'contents' => [
-            {
-              'args' => [
-                {
-                  'contents' => [
-                    {
-                      'text' => 'documentlanguage.info'
-                    }
-                  ],
-                  'info' => {
-                    'spaces_after_argument' => {
-                      'text' => '
-'
-                    }
-                  },
-                  'type' => 'line_arg'
-                }
-              ],
-              'cmdname' => 'setfilename',
-              'extra' => {
-                'text_arg' => 'documentlanguage.info'
-              },
-              'info' => {
-                'spaces_before_argument' => {
-                  'text' => ' '
-                }
-              },
-              'source_info' => {
-                'file_name' => 'documentlanguage.texi',
-                'line_nr' => 21,
-                'macro' => ''
-              }
             },
             {
               'text' => '
@@ -384,7 +347,7 @@ $result_trees{'documentlanguage'} = {
               },
               'source_info' => {
                 'file_name' => 'documentlanguage.texi',
-                'line_nr' => 23,
+                'line_nr' => 22,
                 'macro' => ''
               }
             },
@@ -438,7 +401,7 @@ $result_trees{'documentlanguage'} = {
       },
       'source_info' => {
         'file_name' => 'documentlanguage.texi',
-        'line_nr' => 25,
+        'line_nr' => 24,
         'macro' => ''
       }
     },
@@ -475,7 +438,7 @@ $result_trees{'documentlanguage'} = {
       },
       'source_info' => {
         'file_name' => 'documentlanguage.texi',
-        'line_nr' => 26,
+        'line_nr' => 25,
         'macro' => ''
       }
     },
@@ -519,7 +482,7 @@ $result_trees{'documentlanguage'} = {
       },
       'source_info' => {
         'file_name' => 'documentlanguage.texi',
-        'line_nr' => 28,
+        'line_nr' => 27,
         'macro' => ''
       }
     },
@@ -572,7 +535,7 @@ $result_trees{'documentlanguage'} = {
               },
               'source_info' => {
                 'file_name' => 'documentlanguage.texi',
-                'line_nr' => 31,
+                'line_nr' => 30,
                 'macro' => ''
               }
             },
@@ -709,7 +672,7 @@ $result_trees{'documentlanguage'} = {
               },
               'source_info' => {
                 'file_name' => 'documentlanguage.texi',
-                'line_nr' => 33,
+                'line_nr' => 32,
                 'macro' => ''
               },
               'type' => 'def_line'
@@ -756,7 +719,7 @@ $result_trees{'documentlanguage'} = {
               },
               'source_info' => {
                 'file_name' => 'documentlanguage.texi',
-                'line_nr' => 35,
+                'line_nr' => 34,
                 'macro' => ''
               }
             }
@@ -768,7 +731,7 @@ $result_trees{'documentlanguage'} = {
           },
           'source_info' => {
             'file_name' => 'documentlanguage.texi',
-            'line_nr' => 33,
+            'line_nr' => 32,
             'macro' => ''
           }
         },
@@ -807,7 +770,7 @@ $result_trees{'documentlanguage'} = {
           },
           'source_info' => {
             'file_name' => 'documentlanguage.texi',
-            'line_nr' => 37,
+            'line_nr' => 36,
             'macro' => ''
           }
         },
@@ -825,7 +788,7 @@ $result_trees{'documentlanguage'} = {
       },
       'source_info' => {
         'file_name' => 'documentlanguage.texi',
-        'line_nr' => 29,
+        'line_nr' => 28,
         'macro' => ''
       }
     },
@@ -879,7 +842,6 @@ $result_texis{'documentlanguage'} = '\\input texinfo @c 
-*-texinfo-*-
 @c before the converter, and the extra documentlanguage key is used to
 @c get the language, so if the wrong language is set, it will show up
 @c in the index generated by @printindex.
-@setfilename documentlanguage.info
 
 @documentlanguage pt
 
diff --git a/tp/t/results/languages/documentlanguage_option.pl 
b/tp/t/results/languages/documentlanguage_option.pl
index 3e6c0b3a81..af441a6571 100644
--- a/tp/t/results/languages/documentlanguage_option.pl
+++ b/tp/t/results/languages/documentlanguage_option.pl
@@ -12,20 +12,20 @@ $result_trees{'documentlanguage_option'} = {
         {
           'contents' => [
             {
-              'contents' => [
-                {
-                  'text' => '\\input texinfo @c -*-texinfo-*-
+              'text' => '\\input texinfo @c -*-texinfo-*-
 ',
-                  'type' => 'text_before_beginning'
-                },
-                {
-                  'text' => '
-',
-                  'type' => 'text_before_beginning'
-                }
-              ],
-              'type' => 'preamble_before_beginning'
+              'type' => 'text_before_beginning'
             },
+            {
+              'text' => '
+',
+              'type' => 'text_before_beginning'
+            }
+          ],
+          'type' => 'preamble_before_beginning'
+        },
+        {
+          'contents' => [
             {
               'args' => [
                 {
@@ -313,43 +313,6 @@ $result_trees{'documentlanguage_option'} = {
 '
                 ]
               }
-            }
-          ],
-          'type' => 'preamble_before_setfilename'
-        },
-        {
-          'contents' => [
-            {
-              'args' => [
-                {
-                  'contents' => [
-                    {
-                      'text' => 'documentlanguage.info'
-                    }
-                  ],
-                  'info' => {
-                    'spaces_after_argument' => {
-                      'text' => '
-'
-                    }
-                  },
-                  'type' => 'line_arg'
-                }
-              ],
-              'cmdname' => 'setfilename',
-              'extra' => {
-                'text_arg' => 'documentlanguage.info'
-              },
-              'info' => {
-                'spaces_before_argument' => {
-                  'text' => ' '
-                }
-              },
-              'source_info' => {
-                'file_name' => 'documentlanguage.texi',
-                'line_nr' => 21,
-                'macro' => ''
-              }
             },
             {
               'text' => '
@@ -384,7 +347,7 @@ $result_trees{'documentlanguage_option'} = {
               },
               'source_info' => {
                 'file_name' => 'documentlanguage.texi',
-                'line_nr' => 23,
+                'line_nr' => 22,
                 'macro' => ''
               }
             },
@@ -438,7 +401,7 @@ $result_trees{'documentlanguage_option'} = {
       },
       'source_info' => {
         'file_name' => 'documentlanguage.texi',
-        'line_nr' => 25,
+        'line_nr' => 24,
         'macro' => ''
       }
     },
@@ -475,7 +438,7 @@ $result_trees{'documentlanguage_option'} = {
       },
       'source_info' => {
         'file_name' => 'documentlanguage.texi',
-        'line_nr' => 26,
+        'line_nr' => 25,
         'macro' => ''
       }
     },
@@ -519,7 +482,7 @@ $result_trees{'documentlanguage_option'} = {
       },
       'source_info' => {
         'file_name' => 'documentlanguage.texi',
-        'line_nr' => 28,
+        'line_nr' => 27,
         'macro' => ''
       }
     },
@@ -572,7 +535,7 @@ $result_trees{'documentlanguage_option'} = {
               },
               'source_info' => {
                 'file_name' => 'documentlanguage.texi',
-                'line_nr' => 31,
+                'line_nr' => 30,
                 'macro' => ''
               }
             },
@@ -709,7 +672,7 @@ $result_trees{'documentlanguage_option'} = {
               },
               'source_info' => {
                 'file_name' => 'documentlanguage.texi',
-                'line_nr' => 33,
+                'line_nr' => 32,
                 'macro' => ''
               },
               'type' => 'def_line'
@@ -756,7 +719,7 @@ $result_trees{'documentlanguage_option'} = {
               },
               'source_info' => {
                 'file_name' => 'documentlanguage.texi',
-                'line_nr' => 35,
+                'line_nr' => 34,
                 'macro' => ''
               }
             }
@@ -768,7 +731,7 @@ $result_trees{'documentlanguage_option'} = {
           },
           'source_info' => {
             'file_name' => 'documentlanguage.texi',
-            'line_nr' => 33,
+            'line_nr' => 32,
             'macro' => ''
           }
         },
@@ -807,7 +770,7 @@ $result_trees{'documentlanguage_option'} = {
           },
           'source_info' => {
             'file_name' => 'documentlanguage.texi',
-            'line_nr' => 37,
+            'line_nr' => 36,
             'macro' => ''
           }
         },
@@ -825,7 +788,7 @@ $result_trees{'documentlanguage_option'} = {
       },
       'source_info' => {
         'file_name' => 'documentlanguage.texi',
-        'line_nr' => 29,
+        'line_nr' => 28,
         'macro' => ''
       }
     },
@@ -879,7 +842,6 @@ $result_texis{'documentlanguage_option'} = '\\input texinfo 
@c -*-texinfo-*-
 @c before the converter, and the extra documentlanguage key is used to
 @c get the language, so if the wrong language is set, it will show up
 @c in the index generated by @printindex.
-@setfilename documentlanguage.info
 
 @documentlanguage pt
 
diff --git a/tp/t/results/languages/documentlanguage_unknown.pl 
b/tp/t/results/languages/documentlanguage_unknown.pl
index 33d7d66276..f4b8aa67a6 100644
--- a/tp/t/results/languages/documentlanguage_unknown.pl
+++ b/tp/t/results/languages/documentlanguage_unknown.pl
@@ -12,20 +12,20 @@ $result_trees{'documentlanguage_unknown'} = {
         {
           'contents' => [
             {
-              'contents' => [
-                {
-                  'text' => '\\input texinfo @c -*-texinfo-*-
+              'text' => '\\input texinfo @c -*-texinfo-*-
 ',
-                  'type' => 'text_before_beginning'
-                },
-                {
-                  'text' => '
-',
-                  'type' => 'text_before_beginning'
-                }
-              ],
-              'type' => 'preamble_before_beginning'
+              'type' => 'text_before_beginning'
             },
+            {
+              'text' => '
+',
+              'type' => 'text_before_beginning'
+            }
+          ],
+          'type' => 'preamble_before_beginning'
+        },
+        {
+          'contents' => [
             {
               'args' => [
                 {
@@ -313,43 +313,6 @@ $result_trees{'documentlanguage_unknown'} = {
 '
                 ]
               }
-            }
-          ],
-          'type' => 'preamble_before_setfilename'
-        },
-        {
-          'contents' => [
-            {
-              'args' => [
-                {
-                  'contents' => [
-                    {
-                      'text' => 'documentlanguage.info'
-                    }
-                  ],
-                  'info' => {
-                    'spaces_after_argument' => {
-                      'text' => '
-'
-                    }
-                  },
-                  'type' => 'line_arg'
-                }
-              ],
-              'cmdname' => 'setfilename',
-              'extra' => {
-                'text_arg' => 'documentlanguage.info'
-              },
-              'info' => {
-                'spaces_before_argument' => {
-                  'text' => ' '
-                }
-              },
-              'source_info' => {
-                'file_name' => 'documentlanguage.texi',
-                'line_nr' => 21,
-                'macro' => ''
-              }
             },
             {
               'text' => '
@@ -384,7 +347,7 @@ $result_trees{'documentlanguage_unknown'} = {
               },
               'source_info' => {
                 'file_name' => 'documentlanguage.texi',
-                'line_nr' => 23,
+                'line_nr' => 22,
                 'macro' => ''
               }
             },
@@ -438,7 +401,7 @@ $result_trees{'documentlanguage_unknown'} = {
       },
       'source_info' => {
         'file_name' => 'documentlanguage.texi',
-        'line_nr' => 25,
+        'line_nr' => 24,
         'macro' => ''
       }
     },
@@ -475,7 +438,7 @@ $result_trees{'documentlanguage_unknown'} = {
       },
       'source_info' => {
         'file_name' => 'documentlanguage.texi',
-        'line_nr' => 26,
+        'line_nr' => 25,
         'macro' => ''
       }
     },
@@ -519,7 +482,7 @@ $result_trees{'documentlanguage_unknown'} = {
       },
       'source_info' => {
         'file_name' => 'documentlanguage.texi',
-        'line_nr' => 28,
+        'line_nr' => 27,
         'macro' => ''
       }
     },
@@ -572,7 +535,7 @@ $result_trees{'documentlanguage_unknown'} = {
               },
               'source_info' => {
                 'file_name' => 'documentlanguage.texi',
-                'line_nr' => 31,
+                'line_nr' => 30,
                 'macro' => ''
               }
             },
@@ -709,7 +672,7 @@ $result_trees{'documentlanguage_unknown'} = {
               },
               'source_info' => {
                 'file_name' => 'documentlanguage.texi',
-                'line_nr' => 33,
+                'line_nr' => 32,
                 'macro' => ''
               },
               'type' => 'def_line'
@@ -756,7 +719,7 @@ $result_trees{'documentlanguage_unknown'} = {
               },
               'source_info' => {
                 'file_name' => 'documentlanguage.texi',
-                'line_nr' => 35,
+                'line_nr' => 34,
                 'macro' => ''
               }
             }
@@ -768,7 +731,7 @@ $result_trees{'documentlanguage_unknown'} = {
           },
           'source_info' => {
             'file_name' => 'documentlanguage.texi',
-            'line_nr' => 33,
+            'line_nr' => 32,
             'macro' => ''
           }
         },
@@ -807,7 +770,7 @@ $result_trees{'documentlanguage_unknown'} = {
           },
           'source_info' => {
             'file_name' => 'documentlanguage.texi',
-            'line_nr' => 37,
+            'line_nr' => 36,
             'macro' => ''
           }
         },
@@ -825,7 +788,7 @@ $result_trees{'documentlanguage_unknown'} = {
       },
       'source_info' => {
         'file_name' => 'documentlanguage.texi',
-        'line_nr' => 29,
+        'line_nr' => 28,
         'macro' => ''
       }
     },
@@ -879,7 +842,6 @@ $result_texis{'documentlanguage_unknown'} = '\\input 
texinfo @c -*-texinfo-*-
 @c before the converter, and the extra documentlanguage key is used to
 @c get the language, so if the wrong language is set, it will show up
 @c in the index generated by @printindex.
-@setfilename documentlanguage.info
 
 @documentlanguage pt
 
diff --git a/tp/t/results/layout/no_monolithic.pl 
b/tp/t/results/layout/no_monolithic.pl
index 5be686dd7d..5d89ad6267 100644
--- a/tp/t/results/layout/no_monolithic.pl
+++ b/tp/t/results/layout/no_monolithic.pl
@@ -12,63 +12,20 @@ $result_trees{'no_monolithic'} = {
         {
           'contents' => [
             {
-              'contents' => [
-                {
-                  'text' => '\\input texinfo @c -*-texinfo-*-
-',
-                  'type' => 'text_before_beginning'
-                },
-                {
-                  'text' => '
+              'text' => '\\input texinfo @c -*-texinfo-*-
 ',
-                  'type' => 'text_before_beginning'
-                }
-              ],
-              'type' => 'preamble_before_beginning'
-            }
-          ],
-          'type' => 'preamble_before_setfilename'
-        },
-        {
-          'contents' => [
-            {
-              'args' => [
-                {
-                  'contents' => [
-                    {
-                      'text' => 'no_monolithic.info'
-                    }
-                  ],
-                  'info' => {
-                    'spaces_after_argument' => {
-                      'text' => '
-'
-                    }
-                  },
-                  'type' => 'line_arg'
-                }
-              ],
-              'cmdname' => 'setfilename',
-              'extra' => {
-                'text_arg' => 'no_monolithic.info'
-              },
-              'info' => {
-                'spaces_before_argument' => {
-                  'text' => ' '
-                }
-              },
-              'source_info' => {
-                'file_name' => 'no_monolithic.texi',
-                'line_nr' => 3,
-                'macro' => ''
-              }
+              'type' => 'text_before_beginning'
             },
             {
               'text' => '
 ',
-              'type' => 'empty_line'
+              'type' => 'text_before_beginning'
             }
           ],
+          'type' => 'preamble_before_beginning'
+        },
+        {
+          'contents' => [],
           'type' => 'preamble_before_content'
         }
       ],
@@ -113,7 +70,7 @@ $result_trees{'no_monolithic'} = {
       },
       'source_info' => {
         'file_name' => 'no_monolithic.texi',
-        'line_nr' => 5,
+        'line_nr' => 3,
         'macro' => ''
       }
     },
@@ -165,7 +122,7 @@ $result_trees{'no_monolithic'} = {
               'cmdname' => 'footnote',
               'source_info' => {
                 'file_name' => 'no_monolithic.texi',
-                'line_nr' => 8,
+                'line_nr' => 6,
                 'macro' => ''
               }
             },
@@ -220,7 +177,7 @@ $result_trees{'no_monolithic'} = {
           },
           'source_info' => {
             'file_name' => 'no_monolithic.texi',
-            'line_nr' => 10,
+            'line_nr' => 8,
             'macro' => ''
           },
           'type' => 'index_entry_command'
@@ -287,7 +244,7 @@ $result_trees{'no_monolithic'} = {
               },
               'source_info' => {
                 'file_name' => 'no_monolithic.texi',
-                'line_nr' => 13,
+                'line_nr' => 11,
                 'macro' => ''
               },
               'type' => 'menu_entry'
@@ -320,14 +277,14 @@ $result_trees{'no_monolithic'} = {
               },
               'source_info' => {
                 'file_name' => 'no_monolithic.texi',
-                'line_nr' => 14,
+                'line_nr' => 12,
                 'macro' => ''
               }
             }
           ],
           'source_info' => {
             'file_name' => 'no_monolithic.texi',
-            'line_nr' => 12,
+            'line_nr' => 10,
             'macro' => ''
           }
         },
@@ -345,7 +302,7 @@ $result_trees{'no_monolithic'} = {
       },
       'source_info' => {
         'file_name' => 'no_monolithic.texi',
-        'line_nr' => 6,
+        'line_nr' => 4,
         'macro' => ''
       }
     },
@@ -389,7 +346,7 @@ $result_trees{'no_monolithic'} = {
       },
       'source_info' => {
         'file_name' => 'no_monolithic.texi',
-        'line_nr' => 16,
+        'line_nr' => 14,
         'macro' => ''
       }
     },
@@ -442,7 +399,7 @@ $result_trees{'no_monolithic'} = {
           'cmdname' => 'contents',
           'source_info' => {
             'file_name' => 'no_monolithic.texi',
-            'line_nr' => 21,
+            'line_nr' => 19,
             'macro' => ''
           }
         },
@@ -457,7 +414,7 @@ $result_trees{'no_monolithic'} = {
           'cmdname' => 'shortcontents',
           'source_info' => {
             'file_name' => 'no_monolithic.texi',
-            'line_nr' => 22,
+            'line_nr' => 20,
             'macro' => ''
           }
         },
@@ -496,7 +453,7 @@ $result_trees{'no_monolithic'} = {
           },
           'source_info' => {
             'file_name' => 'no_monolithic.texi',
-            'line_nr' => 24,
+            'line_nr' => 22,
             'macro' => ''
           }
         }
@@ -509,7 +466,7 @@ $result_trees{'no_monolithic'} = {
       },
       'source_info' => {
         'file_name' => 'no_monolithic.texi',
-        'line_nr' => 17,
+        'line_nr' => 15,
         'macro' => ''
       }
     },
@@ -538,8 +495,6 @@ 
$result_trees{'no_monolithic'}{'contents'}[3]{'extra'}{'nodes_manuals'}[0]{'node
 
 $result_texis{'no_monolithic'} = '\\input texinfo @c -*-texinfo-*-
 
-@setfilename no_monolithic.info
-
 @node Top
 @top Not monolithic
 
@@ -564,8 +519,7 @@ Chapter.
 ';
 
 
-$result_texts{'no_monolithic'} = '
-Not monolithic
+$result_texts{'no_monolithic'} = 'Not monolithic
 **************
 
 Not monolitic manual.
diff --git a/tp/t/results/layout/no_monolithic/res_html/no_monolithic.html 
b/tp/t/results/layout/no_monolithic/res_html/no_monolithic.html
index 3c9e65e8a3..cc8670b133 100644
--- a/tp/t/results/layout/no_monolithic/res_html/no_monolithic.html
+++ b/tp/t/results/layout/no_monolithic/res_html/no_monolithic.html
@@ -31,7 +31,6 @@ th.sections-header-printindex {text-align:left; padding-left: 
1em}
 </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>
diff --git a/tp/t/results/layout/no_monolithic_only_toc_out.pl 
b/tp/t/results/layout/no_monolithic_only_toc_out.pl
index 29a474d3aa..cdec8c208d 100644
--- a/tp/t/results/layout/no_monolithic_only_toc_out.pl
+++ b/tp/t/results/layout/no_monolithic_only_toc_out.pl
@@ -12,63 +12,20 @@ $result_trees{'no_monolithic_only_toc_out'} = {
         {
           'contents' => [
             {
-              'contents' => [
-                {
-                  'text' => '\\input texinfo @c -*-texinfo-*-
-',
-                  'type' => 'text_before_beginning'
-                },
-                {
-                  'text' => '
+              'text' => '\\input texinfo @c -*-texinfo-*-
 ',
-                  'type' => 'text_before_beginning'
-                }
-              ],
-              'type' => 'preamble_before_beginning'
-            }
-          ],
-          'type' => 'preamble_before_setfilename'
-        },
-        {
-          'contents' => [
-            {
-              'args' => [
-                {
-                  'contents' => [
-                    {
-                      'text' => 'no_monolithic.info'
-                    }
-                  ],
-                  'info' => {
-                    'spaces_after_argument' => {
-                      'text' => '
-'
-                    }
-                  },
-                  'type' => 'line_arg'
-                }
-              ],
-              'cmdname' => 'setfilename',
-              'extra' => {
-                'text_arg' => 'no_monolithic.info'
-              },
-              'info' => {
-                'spaces_before_argument' => {
-                  'text' => ' '
-                }
-              },
-              'source_info' => {
-                'file_name' => 'no_monolithic.texi',
-                'line_nr' => 3,
-                'macro' => ''
-              }
+              'type' => 'text_before_beginning'
             },
             {
               'text' => '
 ',
-              'type' => 'empty_line'
+              'type' => 'text_before_beginning'
             }
           ],
+          'type' => 'preamble_before_beginning'
+        },
+        {
+          'contents' => [],
           'type' => 'preamble_before_content'
         }
       ],
@@ -113,7 +70,7 @@ $result_trees{'no_monolithic_only_toc_out'} = {
       },
       'source_info' => {
         'file_name' => 'no_monolithic.texi',
-        'line_nr' => 5,
+        'line_nr' => 3,
         'macro' => ''
       }
     },
@@ -165,7 +122,7 @@ $result_trees{'no_monolithic_only_toc_out'} = {
               'cmdname' => 'footnote',
               'source_info' => {
                 'file_name' => 'no_monolithic.texi',
-                'line_nr' => 8,
+                'line_nr' => 6,
                 'macro' => ''
               }
             },
@@ -220,7 +177,7 @@ $result_trees{'no_monolithic_only_toc_out'} = {
           },
           'source_info' => {
             'file_name' => 'no_monolithic.texi',
-            'line_nr' => 10,
+            'line_nr' => 8,
             'macro' => ''
           },
           'type' => 'index_entry_command'
@@ -287,7 +244,7 @@ $result_trees{'no_monolithic_only_toc_out'} = {
               },
               'source_info' => {
                 'file_name' => 'no_monolithic.texi',
-                'line_nr' => 13,
+                'line_nr' => 11,
                 'macro' => ''
               },
               'type' => 'menu_entry'
@@ -320,14 +277,14 @@ $result_trees{'no_monolithic_only_toc_out'} = {
               },
               'source_info' => {
                 'file_name' => 'no_monolithic.texi',
-                'line_nr' => 14,
+                'line_nr' => 12,
                 'macro' => ''
               }
             }
           ],
           'source_info' => {
             'file_name' => 'no_monolithic.texi',
-            'line_nr' => 12,
+            'line_nr' => 10,
             'macro' => ''
           }
         },
@@ -345,7 +302,7 @@ $result_trees{'no_monolithic_only_toc_out'} = {
       },
       'source_info' => {
         'file_name' => 'no_monolithic.texi',
-        'line_nr' => 6,
+        'line_nr' => 4,
         'macro' => ''
       }
     },
@@ -389,7 +346,7 @@ $result_trees{'no_monolithic_only_toc_out'} = {
       },
       'source_info' => {
         'file_name' => 'no_monolithic.texi',
-        'line_nr' => 16,
+        'line_nr' => 14,
         'macro' => ''
       }
     },
@@ -442,7 +399,7 @@ $result_trees{'no_monolithic_only_toc_out'} = {
           'cmdname' => 'contents',
           'source_info' => {
             'file_name' => 'no_monolithic.texi',
-            'line_nr' => 21,
+            'line_nr' => 19,
             'macro' => ''
           }
         },
@@ -457,7 +414,7 @@ $result_trees{'no_monolithic_only_toc_out'} = {
           'cmdname' => 'shortcontents',
           'source_info' => {
             'file_name' => 'no_monolithic.texi',
-            'line_nr' => 22,
+            'line_nr' => 20,
             'macro' => ''
           }
         },
@@ -496,7 +453,7 @@ $result_trees{'no_monolithic_only_toc_out'} = {
           },
           'source_info' => {
             'file_name' => 'no_monolithic.texi',
-            'line_nr' => 24,
+            'line_nr' => 22,
             'macro' => ''
           }
         }
@@ -509,7 +466,7 @@ $result_trees{'no_monolithic_only_toc_out'} = {
       },
       'source_info' => {
         'file_name' => 'no_monolithic.texi',
-        'line_nr' => 17,
+        'line_nr' => 15,
         'macro' => ''
       }
     },
@@ -538,8 +495,6 @@ 
$result_trees{'no_monolithic_only_toc_out'}{'contents'}[3]{'extra'}{'nodes_manua
 
 $result_texis{'no_monolithic_only_toc_out'} = '\\input texinfo @c -*-texinfo-*-
 
-@setfilename no_monolithic.info
-
 @node Top
 @top Not monolithic
 
@@ -564,8 +519,7 @@ Chapter.
 ';
 
 
-$result_texts{'no_monolithic_only_toc_out'} = '
-Not monolithic
+$result_texts{'no_monolithic_only_toc_out'} = 'Not monolithic
 **************
 
 Not monolitic manual.
diff --git 
a/tp/t/results/layout/no_monolithic_only_toc_out/res_html/no_monolithic.html 
b/tp/t/results/layout/no_monolithic_only_toc_out/res_html/no_monolithic.html
index c28eff1e32..126348bb59 100644
--- a/tp/t/results/layout/no_monolithic_only_toc_out/res_html/no_monolithic.html
+++ b/tp/t/results/layout/no_monolithic_only_toc_out/res_html/no_monolithic.html
@@ -34,7 +34,6 @@ ul.toc-numbered-mark {list-style: none}
 </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>
diff --git a/tp/t/results/sectioning/lone_Top_node.pl 
b/tp/t/results/sectioning/lone_Top_node.pl
index 8ecbf55e21..f99d219421 100644
--- a/tp/t/results/sectioning/lone_Top_node.pl
+++ b/tp/t/results/sectioning/lone_Top_node.pl
@@ -11,45 +11,7 @@ $result_trees{'lone_Top_node'} = [
       {
         'contents' => [
           {
-            'contents' => [
-              {
-                'args' => [
-                  {
-                    'contents' => [
-                      {
-                        'text' => 'lone_Top_node.info'
-                      }
-                    ],
-                    'info' => {
-                      'spaces_after_argument' => {
-                        'text' => '
-'
-                      }
-                    },
-                    'type' => 'line_arg'
-                  }
-                ],
-                'cmdname' => 'setfilename',
-                'extra' => {
-                  'text_arg' => 'lone_Top_node.info'
-                },
-                'info' => {
-                  'spaces_before_argument' => {
-                    'text' => ' '
-                  }
-                },
-                'source_info' => {
-                  'file_name' => '',
-                  'line_nr' => 1,
-                  'macro' => ''
-                }
-              },
-              {
-                'text' => '
-',
-                'type' => 'empty_line'
-              }
-            ],
+            'contents' => [],
             'type' => 'preamble_before_content'
           }
         ],
@@ -136,7 +98,7 @@ $result_trees{'lone_Top_node'} = [
                 },
                 'source_info' => {
                   'file_name' => '',
-                  'line_nr' => 6,
+                  'line_nr' => 4,
                   'macro' => ''
                 },
                 'type' => 'menu_entry'
@@ -169,14 +131,14 @@ $result_trees{'lone_Top_node'} = [
                 },
                 'source_info' => {
                   'file_name' => '',
-                  'line_nr' => 7,
+                  'line_nr' => 5,
                   'macro' => ''
                 }
               }
             ],
             'source_info' => {
               'file_name' => '',
-              'line_nr' => 5,
+              'line_nr' => 3,
               'macro' => ''
             }
           },
@@ -207,7 +169,7 @@ $result_trees{'lone_Top_node'} = [
         },
         'source_info' => {
           'file_name' => '',
-          'line_nr' => 3,
+          'line_nr' => 1,
           'macro' => ''
         }
       },
@@ -250,7 +212,7 @@ $result_trees{'lone_Top_node'} = [
         },
         'source_info' => {
           'file_name' => '',
-          'line_nr' => 9,
+          'line_nr' => 7,
           'macro' => ''
         }
       },
@@ -280,7 +242,7 @@ $result_trees{'lone_Top_node'} = [
         },
         'source_info' => {
           'file_name' => '',
-          'line_nr' => 10,
+          'line_nr' => 8,
           'macro' => ''
         }
       }
@@ -298,9 +260,7 @@ 
$result_trees{'lone_Top_node'}[0]{'contents'}[2]{'extra'}{'node_content'}[0] = $
 
$result_trees{'lone_Top_node'}[0]{'contents'}[2]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = $result_trees{'lone_Top_node'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0];
 $result_trees{'lone_Top_node'}[0]{'extra'}{'unit_command'} = 
$result_trees{'lone_Top_node'}[0]{'contents'}[3];
 
-$result_texis{'lone_Top_node'} = '@setfilename lone_Top_node.info
-
-@node Top
+$result_texis{'lone_Top_node'} = '@node Top
 
 @menu
 * First::
@@ -312,7 +272,6 @@ $result_texis{'lone_Top_node'} = '@setfilename 
lone_Top_node.info
 
 
 $result_texts{'lone_Top_node'} = '
-
 * First::
 
 1 chap
@@ -482,7 +441,7 @@ $result_errors{'lone_Top_node'} = [
     'error_line' => 'warning: node `Top\' is up for `First\' in menu but not 
in sectioning
 ',
     'file_name' => '',
-    'line_nr' => 9,
+    'line_nr' => 7,
     'macro' => '',
     'text' => 'node `Top\' is up for `First\' in menu but not in sectioning',
     'type' => 'warning'
@@ -530,8 +489,7 @@ $result_directions_text{'lone_Top_node'} = 'element: 
@chapter chap
 ';
 
 
-$result_converted{'latex_text'}->{'lone_Top_node'} = '
-\\begin{document}
+$result_converted{'latex_text'}->{'lone_Top_node'} = '\\begin{document}
 \\label{anchor:Top}%
 \\chapter{{chap}}
 \\label{anchor:First}%
diff --git a/tp/t/results/sectioning/lone_Top_node/res_latex/lone_Top_node.tex 
b/tp/t/results/sectioning/lone_Top_node/res_latex/lone_Top_node.tex
index 6c39a84ec9..74d21e619d 100644
--- a/tp/t/results/sectioning/lone_Top_node/res_latex/lone_Top_node.tex
+++ b/tp/t/results/sectioning/lone_Top_node/res_latex/lone_Top_node.tex
@@ -41,7 +41,6 @@
 \makeatother
 \pagestyle{single}%
 
-
 \begin{document}
 \label{anchor:Top}%
 \chapter{{chap}}
diff --git a/tp/t/results/sectioning/loop_nodes.pl 
b/tp/t/results/sectioning/loop_nodes.pl
index 78ce0ea8ac..d7ea2cb78a 100644
--- a/tp/t/results/sectioning/loop_nodes.pl
+++ b/tp/t/results/sectioning/loop_nodes.pl
@@ -10,45 +10,7 @@ $result_trees{'loop_nodes'} = {
     {
       'contents' => [
         {
-          'contents' => [
-            {
-              'args' => [
-                {
-                  'contents' => [
-                    {
-                      'text' => 'loop_nodes.info'
-                    }
-                  ],
-                  'info' => {
-                    'spaces_after_argument' => {
-                      'text' => '
-'
-                    }
-                  },
-                  'type' => 'line_arg'
-                }
-              ],
-              'cmdname' => 'setfilename',
-              'extra' => {
-                'text_arg' => 'loop_nodes.info'
-              },
-              'info' => {
-                'spaces_before_argument' => {
-                  'text' => ' '
-                }
-              },
-              'source_info' => {
-                'file_name' => '',
-                'line_nr' => 1,
-                'macro' => ''
-              }
-            },
-            {
-              'text' => '
-',
-              'type' => 'empty_line'
-            }
-          ],
+          'contents' => [],
           'type' => 'preamble_before_content'
         }
       ],
@@ -93,7 +55,7 @@ $result_trees{'loop_nodes'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 3,
+        'line_nr' => 1,
         'macro' => ''
       }
     },
@@ -178,7 +140,7 @@ $result_trees{'loop_nodes'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 7,
+                'line_nr' => 5,
                 'macro' => ''
               },
               'type' => 'menu_entry'
@@ -211,14 +173,14 @@ $result_trees{'loop_nodes'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 8,
+                'line_nr' => 6,
                 'macro' => ''
               }
             }
           ],
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 6,
+            'line_nr' => 4,
             'macro' => ''
           }
         },
@@ -236,7 +198,7 @@ $result_trees{'loop_nodes'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 4,
+        'line_nr' => 2,
         'macro' => ''
       }
     },
@@ -335,7 +297,7 @@ $result_trees{'loop_nodes'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 13,
+                'line_nr' => 11,
                 'macro' => ''
               },
               'type' => 'menu_entry'
@@ -368,14 +330,14 @@ $result_trees{'loop_nodes'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 14,
+                'line_nr' => 12,
                 'macro' => ''
               }
             }
           ],
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 12,
+            'line_nr' => 10,
             'macro' => ''
           }
         },
@@ -414,7 +376,7 @@ $result_trees{'loop_nodes'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 10,
+        'line_nr' => 8,
         'macro' => ''
       }
     },
@@ -513,7 +475,7 @@ $result_trees{'loop_nodes'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 19,
+                'line_nr' => 17,
                 'macro' => ''
               },
               'type' => 'menu_entry'
@@ -546,14 +508,14 @@ $result_trees{'loop_nodes'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 20,
+                'line_nr' => 18,
                 'macro' => ''
               }
             }
           ],
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 18,
+            'line_nr' => 16,
             'macro' => ''
           }
         },
@@ -592,7 +554,7 @@ $result_trees{'loop_nodes'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 16,
+        'line_nr' => 14,
         'macro' => ''
       }
     },
@@ -635,7 +597,7 @@ $result_trees{'loop_nodes'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 22,
+        'line_nr' => 20,
         'macro' => ''
       }
     }
@@ -656,9 +618,7 @@ 
$result_trees{'loop_nodes'}{'contents'}[4]{'extra'}{'nodes_manuals'}[3]{'node_co
 $result_trees{'loop_nodes'}{'contents'}[5]{'extra'}{'node_content'}[0] = 
$result_trees{'loop_nodes'}{'contents'}[5]{'args'}[0]{'contents'}[0];
 
$result_trees{'loop_nodes'}{'contents'}[5]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = $result_trees{'loop_nodes'}{'contents'}[5]{'args'}[0]{'contents'}[0];
 
-$result_texis{'loop_nodes'} = '@setfilename loop_nodes.info
-
-@node Top
+$result_texis{'loop_nodes'} = '@node Top
 @top top
 
 @menu
@@ -681,8 +641,7 @@ $result_texis{'loop_nodes'} = '@setfilename loop_nodes.info
 ';
 
 
-$result_texts{'loop_nodes'} = '
-top
+$result_texts{'loop_nodes'} = 'top
 ***
 
 * chap node up::
@@ -847,7 +806,7 @@ $result_errors{'loop_nodes'} = [
     'error_line' => 'warning: node up pointer for `chap node up\' is `node 
down\' but up is `Top\' in menu
 ',
     'file_name' => '',
-    'line_nr' => 10,
+    'line_nr' => 8,
     'macro' => '',
     'text' => 'node up pointer for `chap node up\' is `node down\' but up is 
`Top\' in menu',
     'type' => 'warning'
@@ -859,8 +818,7 @@ $result_floats{'loop_nodes'} = {};
 
 
 
-$result_converted{'latex_text'}->{'loop_nodes'} = '
-\\begin{document}
+$result_converted{'latex_text'}->{'loop_nodes'} = '\\begin{document}
 \\label{anchor:Top}%
 \\label{anchor:chap-node-up}%
 
diff --git a/tp/t/results/sectioning/loop_nodes/res_latex/loop_nodes.tex 
b/tp/t/results/sectioning/loop_nodes/res_latex/loop_nodes.tex
index d6404366c9..bcde3d6acb 100644
--- a/tp/t/results/sectioning/loop_nodes/res_latex/loop_nodes.tex
+++ b/tp/t/results/sectioning/loop_nodes/res_latex/loop_nodes.tex
@@ -41,7 +41,6 @@
 \makeatother
 \pagestyle{single}%
 
-
 \begin{document}
 \label{anchor:Top}%
 \label{anchor:chap-node-up}%
diff --git a/tp/t/results/sectioning/node_sectop_before_chapter_no_node.pl 
b/tp/t/results/sectioning/node_sectop_before_chapter_no_node.pl
index a700598260..f8e7e9914f 100644
--- a/tp/t/results/sectioning/node_sectop_before_chapter_no_node.pl
+++ b/tp/t/results/sectioning/node_sectop_before_chapter_no_node.pl
@@ -10,45 +10,7 @@ $result_trees{'node_sectop_before_chapter_no_node'} = {
     {
       'contents' => [
         {
-          'contents' => [
-            {
-              'args' => [
-                {
-                  'contents' => [
-                    {
-                      'text' => 'node_sectop_before_chapter_no_node.info'
-                    }
-                  ],
-                  'info' => {
-                    'spaces_after_argument' => {
-                      'text' => '
-'
-                    }
-                  },
-                  'type' => 'line_arg'
-                }
-              ],
-              'cmdname' => 'setfilename',
-              'extra' => {
-                'text_arg' => 'node_sectop_before_chapter_no_node.info'
-              },
-              'info' => {
-                'spaces_before_argument' => {
-                  'text' => ' '
-                }
-              },
-              'source_info' => {
-                'file_name' => '',
-                'line_nr' => 1,
-                'macro' => ''
-              }
-            },
-            {
-              'text' => '
-',
-              'type' => 'empty_line'
-            }
-          ],
+          'contents' => [],
           'type' => 'preamble_before_content'
         }
       ],
@@ -93,7 +55,7 @@ $result_trees{'node_sectop_before_chapter_no_node'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 3,
+        'line_nr' => 1,
         'macro' => ''
       }
     },
@@ -130,7 +92,7 @@ $result_trees{'node_sectop_before_chapter_no_node'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 4,
+        'line_nr' => 2,
         'macro' => ''
       }
     },
@@ -159,7 +121,7 @@ $result_trees{'node_sectop_before_chapter_no_node'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 6,
+        'line_nr' => 4,
         'macro' => ''
       }
     }
@@ -169,17 +131,14 @@ $result_trees{'node_sectop_before_chapter_no_node'} = {
 
$result_trees{'node_sectop_before_chapter_no_node'}{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'node_sectop_before_chapter_no_node'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'node_sectop_before_chapter_no_node'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'node_sectop_before_chapter_no_node'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
-$result_texis{'node_sectop_before_chapter_no_node'} = '@setfilename 
node_sectop_before_chapter_no_node.info
-
-@node Top
+$result_texis{'node_sectop_before_chapter_no_node'} = '@node Top
 @top top section
 
 @chapter chap
 ';
 
 
-$result_texts{'node_sectop_before_chapter_no_node'} = '
-top section
+$result_texts{'node_sectop_before_chapter_no_node'} = 'top section
 ***********
 
 1 chap
@@ -291,7 +250,6 @@ span:hover a.copiable-link {visibility: visible}
 </head>
 
 <body lang="en">
-
 <div class="top-level-extent" id="Top">
 <h1 class="top" id="top-section"><span>top section<a class="copiable-link" 
href="#top-section"> &para;</a></span></h1>
 
@@ -313,8 +271,7 @@ span:hover a.copiable-link {visibility: visible}
 $result_converted{'docbook'}->{'node_sectop_before_chapter_no_node'} = '';
 
 
-$result_converted{'latex_text'}->{'node_sectop_before_chapter_no_node'} = '
-\\begin{document}
+$result_converted{'latex_text'}->{'node_sectop_before_chapter_no_node'} = 
'\\begin{document}
 \\label{anchor:Top}%
 ';
 
diff --git 
a/tp/t/results/sectioning/node_sectop_before_chapter_no_node/res_latex/node_sectop_before_chapter_no_node.tex
 
b/tp/t/results/sectioning/node_sectop_before_chapter_no_node/res_latex/node_sectop_before_chapter_no_node.tex
index cd0cc5671f..7dd79b54c6 100644
--- 
a/tp/t/results/sectioning/node_sectop_before_chapter_no_node/res_latex/node_sectop_before_chapter_no_node.tex
+++ 
b/tp/t/results/sectioning/node_sectop_before_chapter_no_node/res_latex/node_sectop_before_chapter_no_node.tex
@@ -41,7 +41,6 @@
 \makeatother
 \pagestyle{single}%
 
-
 \begin{document}
 \label{anchor:Top}%
 
diff --git a/tp/t/results/sectioning/node_sectop_before_lone_node_Top.pl 
b/tp/t/results/sectioning/node_sectop_before_lone_node_Top.pl
index 7d3b6f264a..564fc0cd97 100644
--- a/tp/t/results/sectioning/node_sectop_before_lone_node_Top.pl
+++ b/tp/t/results/sectioning/node_sectop_before_lone_node_Top.pl
@@ -10,45 +10,7 @@ $result_trees{'node_sectop_before_lone_node_Top'} = {
     {
       'contents' => [
         {
-          'contents' => [
-            {
-              'args' => [
-                {
-                  'contents' => [
-                    {
-                      'text' => 'node_sectop_before_lone_node_Top.info'
-                    }
-                  ],
-                  'info' => {
-                    'spaces_after_argument' => {
-                      'text' => '
-'
-                    }
-                  },
-                  'type' => 'line_arg'
-                }
-              ],
-              'cmdname' => 'setfilename',
-              'extra' => {
-                'text_arg' => 'node_sectop_before_lone_node_Top.info'
-              },
-              'info' => {
-                'spaces_before_argument' => {
-                  'text' => ' '
-                }
-              },
-              'source_info' => {
-                'file_name' => '',
-                'line_nr' => 1,
-                'macro' => ''
-              }
-            },
-            {
-              'text' => '
-',
-              'type' => 'empty_line'
-            }
-          ],
+          'contents' => [],
           'type' => 'preamble_before_content'
         }
       ],
@@ -93,7 +55,7 @@ $result_trees{'node_sectop_before_lone_node_Top'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 3,
+        'line_nr' => 1,
         'macro' => ''
       }
     },
@@ -144,7 +106,7 @@ $result_trees{'node_sectop_before_lone_node_Top'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 4,
+        'line_nr' => 2,
         'macro' => ''
       }
     },
@@ -208,7 +170,7 @@ $result_trees{'node_sectop_before_lone_node_Top'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 8,
+        'line_nr' => 6,
         'macro' => ''
       }
     },
@@ -251,7 +213,7 @@ $result_trees{'node_sectop_before_lone_node_Top'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 12,
+        'line_nr' => 10,
         'macro' => ''
       }
     },
@@ -297,7 +259,7 @@ $result_trees{'node_sectop_before_lone_node_Top'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 13,
+        'line_nr' => 11,
         'macro' => ''
       }
     }
@@ -311,9 +273,7 @@ 
$result_trees{'node_sectop_before_lone_node_Top'}{'contents'}[3]{'extra'}{'nodes
 
$result_trees{'node_sectop_before_lone_node_Top'}{'contents'}[4]{'extra'}{'node_content'}[0]
 = 
$result_trees{'node_sectop_before_lone_node_Top'}{'contents'}[4]{'args'}[0]{'contents'}[0];
 
$result_trees{'node_sectop_before_lone_node_Top'}{'contents'}[4]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'node_sectop_before_lone_node_Top'}{'contents'}[4]{'args'}[0]{'contents'}[0];
 
-$result_texis{'node_sectop_before_lone_node_Top'} = '@setfilename 
node_sectop_before_lone_node_Top.info
-
-@node node before
+$result_texis{'node_sectop_before_lone_node_Top'} = '@node node before
 @top top sectionning
 
 in node before
@@ -329,8 +289,7 @@ in chap
 ';
 
 
-$result_texts{'node_sectop_before_lone_node_Top'} = '
-top sectionning
+$result_texts{'node_sectop_before_lone_node_Top'} = 'top sectionning
 ***************
 
 in node before
@@ -498,7 +457,6 @@ span:hover a.copiable-link {visibility: visible}
 </head>
 
 <body lang="en">
-
 <div class="top-level-extent" id="node-before">
 <div class="nav-panel">
 <p>
@@ -553,8 +511,7 @@ 
$result_converted{'docbook'}->{'node_sectop_before_lone_node_Top'} = '<chapter l
 ';
 
 
-$result_converted{'latex_text'}->{'node_sectop_before_lone_node_Top'} = '
-\\begin{document}
+$result_converted{'latex_text'}->{'node_sectop_before_lone_node_Top'} = 
'\\begin{document}
 \\part*{{top sectionning}}
 \\label{anchor:node-before}%
 
diff --git 
a/tp/t/results/sectioning/node_sectop_before_lone_node_Top/res_latex/node_sectop_before_lone_node_Top.tex
 
b/tp/t/results/sectioning/node_sectop_before_lone_node_Top/res_latex/node_sectop_before_lone_node_Top.tex
index dfc6aca244..1b16dd752e 100644
--- 
a/tp/t/results/sectioning/node_sectop_before_lone_node_Top/res_latex/node_sectop_before_lone_node_Top.tex
+++ 
b/tp/t/results/sectioning/node_sectop_before_lone_node_Top/res_latex/node_sectop_before_lone_node_Top.tex
@@ -41,7 +41,6 @@
 \makeatother
 \pagestyle{single}%
 
-
 \begin{document}
 \part*{{top sectionning}}
 \label{anchor:node-before}%
diff --git a/tp/t/results/sectioning/nodes_before_after_top.pl 
b/tp/t/results/sectioning/nodes_before_after_top.pl
index 9390ff6a71..74deabb00f 100644
--- a/tp/t/results/sectioning/nodes_before_after_top.pl
+++ b/tp/t/results/sectioning/nodes_before_after_top.pl
@@ -10,45 +10,7 @@ $result_trees{'nodes_before_after_top'} = {
     {
       'contents' => [
         {
-          'contents' => [
-            {
-              'args' => [
-                {
-                  'contents' => [
-                    {
-                      'text' => 'nodes_before_after_top.info'
-                    }
-                  ],
-                  'info' => {
-                    'spaces_after_argument' => {
-                      'text' => '
-'
-                    }
-                  },
-                  'type' => 'line_arg'
-                }
-              ],
-              'cmdname' => 'setfilename',
-              'extra' => {
-                'text_arg' => 'nodes_before_after_top.info'
-              },
-              'info' => {
-                'spaces_before_argument' => {
-                  'text' => ' '
-                }
-              },
-              'source_info' => {
-                'file_name' => '',
-                'line_nr' => 1,
-                'macro' => ''
-              }
-            },
-            {
-              'text' => '
-',
-              'type' => 'empty_line'
-            }
-          ],
+          'contents' => [],
           'type' => 'preamble_before_content'
         }
       ],
@@ -114,7 +76,7 @@ $result_trees{'nodes_before_after_top'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 3,
+        'line_nr' => 1,
         'macro' => ''
       }
     },
@@ -157,7 +119,7 @@ $result_trees{'nodes_before_after_top'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 7,
+        'line_nr' => 5,
         'macro' => ''
       }
     },
@@ -208,7 +170,7 @@ $result_trees{'nodes_before_after_top'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 8,
+        'line_nr' => 6,
         'macro' => ''
       }
     },
@@ -272,7 +234,7 @@ $result_trees{'nodes_before_after_top'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 12,
+        'line_nr' => 10,
         'macro' => ''
       }
     },
@@ -315,7 +277,7 @@ $result_trees{'nodes_before_after_top'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 16,
+        'line_nr' => 14,
         'macro' => ''
       }
     },
@@ -361,7 +323,7 @@ $result_trees{'nodes_before_after_top'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 17,
+        'line_nr' => 15,
         'macro' => ''
       }
     }
@@ -377,9 +339,7 @@ 
$result_trees{'nodes_before_after_top'}{'contents'}[4]{'extra'}{'nodes_manuals'}
 
$result_trees{'nodes_before_after_top'}{'contents'}[5]{'extra'}{'node_content'}[0]
 = 
$result_trees{'nodes_before_after_top'}{'contents'}[5]{'args'}[0]{'contents'}[0];
 
$result_trees{'nodes_before_after_top'}{'contents'}[5]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'nodes_before_after_top'}{'contents'}[5]{'args'}[0]{'contents'}[0];
 
-$result_texis{'nodes_before_after_top'} = '@setfilename 
nodes_before_after_top.info
-
-@node node before
+$result_texis{'nodes_before_after_top'} = '@node node before
 
 In node before
 
@@ -400,7 +360,6 @@ in chap
 
 
 $result_texts{'nodes_before_after_top'} = '
-
 In node before
 
 top sectionning
@@ -521,7 +480,7 @@ $result_errors{'nodes_before_after_top'} = [
     'error_line' => 'warning: node `node before\' unreferenced
 ',
     'file_name' => '',
-    'line_nr' => 3,
+    'line_nr' => 1,
     'macro' => '',
     'text' => 'node `node before\' unreferenced',
     'type' => 'warning'
@@ -530,7 +489,7 @@ $result_errors{'nodes_before_after_top'} = [
     'error_line' => 'warning: node `after\' unreferenced
 ',
     'file_name' => '',
-    'line_nr' => 12,
+    'line_nr' => 10,
     'macro' => '',
     'text' => 'node `after\' unreferenced',
     'type' => 'warning'
@@ -542,8 +501,7 @@ $result_floats{'nodes_before_after_top'} = {};
 
 
 
-$result_converted{'latex_text'}->{'nodes_before_after_top'} = '
-\\begin{document}
+$result_converted{'latex_text'}->{'nodes_before_after_top'} = 
'\\begin{document}
 \\label{anchor:node-before}%
 
 In node before
diff --git 
a/tp/t/results/sectioning/nodes_before_after_top/res_latex/nodes_before_after_top.tex
 
b/tp/t/results/sectioning/nodes_before_after_top/res_latex/nodes_before_after_top.tex
index 3d6d1d7f96..510379481b 100644
--- 
a/tp/t/results/sectioning/nodes_before_after_top/res_latex/nodes_before_after_top.tex
+++ 
b/tp/t/results/sectioning/nodes_before_after_top/res_latex/nodes_before_after_top.tex
@@ -41,7 +41,6 @@
 \makeatother
 \pagestyle{single}%
 
-
 \begin{document}
 \label{anchor:node-before}%
 
diff --git a/tp/t/results/sectioning/nodes_before_top.pl 
b/tp/t/results/sectioning/nodes_before_top.pl
index 23b804fe3c..4cf15ee1b4 100644
--- a/tp/t/results/sectioning/nodes_before_top.pl
+++ b/tp/t/results/sectioning/nodes_before_top.pl
@@ -10,45 +10,7 @@ $result_trees{'nodes_before_top'} = {
     {
       'contents' => [
         {
-          'contents' => [
-            {
-              'args' => [
-                {
-                  'contents' => [
-                    {
-                      'text' => 'nodes_before_top.info'
-                    }
-                  ],
-                  'info' => {
-                    'spaces_after_argument' => {
-                      'text' => '
-'
-                    }
-                  },
-                  'type' => 'line_arg'
-                }
-              ],
-              'cmdname' => 'setfilename',
-              'extra' => {
-                'text_arg' => 'nodes_before_top.info'
-              },
-              'info' => {
-                'spaces_before_argument' => {
-                  'text' => ' '
-                }
-              },
-              'source_info' => {
-                'file_name' => '',
-                'line_nr' => 1,
-                'macro' => ''
-              }
-            },
-            {
-              'text' => '
-',
-              'type' => 'empty_line'
-            }
-          ],
+          'contents' => [],
           'type' => 'preamble_before_content'
         }
       ],
@@ -170,7 +132,7 @@ $result_trees{'nodes_before_top'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 6,
+                'line_nr' => 4,
                 'macro' => ''
               },
               'type' => 'menu_entry'
@@ -203,14 +165,14 @@ $result_trees{'nodes_before_top'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 7,
+                'line_nr' => 5,
                 'macro' => ''
               }
             }
           ],
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 5,
+            'line_nr' => 3,
             'macro' => ''
           }
         },
@@ -253,7 +215,7 @@ $result_trees{'nodes_before_top'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 3,
+        'line_nr' => 1,
         'macro' => ''
       }
     },
@@ -325,7 +287,7 @@ $result_trees{'nodes_before_top'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 9,
+        'line_nr' => 7,
         'macro' => ''
       }
     },
@@ -386,7 +348,7 @@ $result_trees{'nodes_before_top'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 11,
+        'line_nr' => 9,
         'macro' => ''
       }
     },
@@ -471,7 +433,7 @@ $result_trees{'nodes_before_top'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 15,
+                'line_nr' => 13,
                 'macro' => ''
               },
               'type' => 'menu_entry'
@@ -504,14 +466,14 @@ $result_trees{'nodes_before_top'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 16,
+                'line_nr' => 14,
                 'macro' => ''
               }
             }
           ],
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 14,
+            'line_nr' => 12,
             'macro' => ''
           }
         },
@@ -529,7 +491,7 @@ $result_trees{'nodes_before_top'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 12,
+        'line_nr' => 10,
         'macro' => ''
       }
     },
@@ -572,7 +534,7 @@ $result_trees{'nodes_before_top'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 18,
+        'line_nr' => 16,
         'macro' => ''
       }
     },
@@ -602,7 +564,7 @@ $result_trees{'nodes_before_top'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 19,
+        'line_nr' => 17,
         'macro' => ''
       }
     }
@@ -624,9 +586,7 @@ 
$result_trees{'nodes_before_top'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'
 $result_trees{'nodes_before_top'}{'contents'}[5]{'extra'}{'node_content'}[0] = 
$result_trees{'nodes_before_top'}{'contents'}[5]{'args'}[0]{'contents'}[0];
 
$result_trees{'nodes_before_top'}{'contents'}[5]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = $result_trees{'nodes_before_top'}{'contents'}[5]{'args'}[0]{'contents'}[0];
 
-$result_texis{'nodes_before_top'} = '@setfilename nodes_before_top.info
-
-@node first, Top, ,(dir)
+$result_texis{'nodes_before_top'} = '@node first, Top, ,(dir)
 
 @menu
 * node in menu before top::
@@ -647,7 +607,6 @@ $result_texis{'nodes_before_top'} = '@setfilename 
nodes_before_top.info
 
 
 $result_texts{'nodes_before_top'} = '
-
 * node in menu before top::
 
 
@@ -820,8 +779,7 @@ $result_floats{'nodes_before_top'} = {};
 
 
 
-$result_converted{'latex_text'}->{'nodes_before_top'} = '
-\\begin{document}
+$result_converted{'latex_text'}->{'nodes_before_top'} = '\\begin{document}
 \\label{anchor:first}%
 
 
diff --git 
a/tp/t/results/sectioning/nodes_before_top/res_latex/nodes_before_top.tex 
b/tp/t/results/sectioning/nodes_before_top/res_latex/nodes_before_top.tex
index d8dbadcfea..45375824f0 100644
--- a/tp/t/results/sectioning/nodes_before_top/res_latex/nodes_before_top.tex
+++ b/tp/t/results/sectioning/nodes_before_top/res_latex/nodes_before_top.tex
@@ -41,7 +41,6 @@
 \makeatother
 \pagestyle{single}%
 
-
 \begin{document}
 \label{anchor:first}%
 
diff --git a/tp/tests/formatting/documentlanguage.texi 
b/tp/tests/formatting/documentlanguage.texi
index 32b3bed094..3e27e107d4 100644
--- a/tp/tests/formatting/documentlanguage.texi
+++ b/tp/tests/formatting/documentlanguage.texi
@@ -18,7 +18,6 @@
 @c before the converter, and the extra documentlanguage key is used to
 @c get the language, so if the wrong language is set, it will show up
 @c in the index generated by @printindex.
-@setfilename documentlanguage.info
 
 @documentlanguage pt
 
diff --git a/tp/tests/formatting/indices_in_begin_tables_lists.texi 
b/tp/tests/formatting/indices_in_begin_tables_lists.texi
index 2f707a3933..3f55c98590 100644
--- a/tp/tests/formatting/indices_in_begin_tables_lists.texi
+++ b/tp/tests/formatting/indices_in_begin_tables_lists.texi
@@ -1,5 +1,4 @@
 \input texinfo.tex
-@setfilename indices_in_begin_tables_lists.info
 
 @node Top
 @top top
diff --git 
a/tp/tests/formatting/res_parser/indices_in_begin_tables_lists/indices_in_begin_tables_lists.html
 
b/tp/tests/formatting/res_parser/indices_in_begin_tables_lists/indices_in_begin_tables_lists.html
index a042d4e2e9..a1bea35332 100644
--- 
a/tp/tests/formatting/res_parser/indices_in_begin_tables_lists/indices_in_begin_tables_lists.html
+++ 
b/tp/tests/formatting/res_parser/indices_in_begin_tables_lists/indices_in_begin_tables_lists.html
@@ -33,7 +33,6 @@ ul.mark-minus {list-style-type: "\2212"}
 </head>
 
 <body lang="en">
-
 <div class="top-level-extent" id="Top">
 <div class="nav-panel">
 <p>
diff --git 
a/tp/tests/formatting/res_parser/indices_in_begin_tables_lists_latex/indices_in_begin_tables_lists.tex
 
b/tp/tests/formatting/res_parser/indices_in_begin_tables_lists_latex/indices_in_begin_tables_lists.tex
index 396b047495..d9ae3075f5 100644
--- 
a/tp/tests/formatting/res_parser/indices_in_begin_tables_lists_latex/indices_in_begin_tables_lists.tex
+++ 
b/tp/tests/formatting/res_parser/indices_in_begin_tables_lists_latex/indices_in_begin_tables_lists.tex
@@ -60,7 +60,6 @@
 \makeatother
 \pagestyle{single}%
 
-
 \begin{document}
 \label{anchor:Top}%
 \chapter{{chap}}



reply via email to

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