texinfo-commits
[Top][All Lists]
Advanced

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

[no subject]


From: Patrice Dumas
Date: Thu, 1 Sep 2022 16:21:44 -0400 (EDT)

branch: master
commit 3b0f664405c62264512da99265d074ca44ca03a0
Author: Patrice Dumas <pertusus@free.fr>
AuthorDate: Thu Sep 1 22:20:19 2022 +0200

    Remove @setfilename for latex tests
---
 tp/t/latex_tests.t                                 | 112 ++++-------
 .../anchor_links_xref_xrefautomaticsectiontitle.pl |  94 +++------
 ...anchor_links_xref_xrefautomaticsectiontitle.tex |   1 -
 tp/t/results/latex_tests/brace_in_index.pl         | 106 -----------
 .../res_latex/brace_in_index.tex}                  |  37 ++--
 tp/t/results/latex_tests/custom_headings.pl        | 140 ++++++--------
 .../custom_headings/res_latex/custom_headings.tex  |   1 -
 tp/t/results/latex_tests/enumerate_arguments.pl    | 100 +++-------
 .../res_latex/enumerate_arguments.tex              |   1 -
 .../latex_tests/error_in_sectioning_command.pl     |  65 ++-----
 .../res_latex/error_in_sectioning_command.tex      |   1 -
 tp/t/results/latex_tests/example_in_cartouche.pl   |  64 +------
 .../res_latex/example_in_cartouche.tex             |   1 -
 tp/t/results/latex_tests/float_and_refs.pl         | 124 ++++--------
 .../float_and_refs/res_latex/float_and_refs.tex    |   1 -
 tp/t/results/latex_tests/fonttextsize.pl           |  83 ++------
 .../fonttextsize/res_latex/fonttextsize.tex        |   1 -
 tp/t/results/latex_tests/indices.pl                | 114 +++++------
 .../latex_tests/indices/res_latex/indices.tex      |   1 -
 .../informative_commands_in_top_node.pl            |  68 ++-----
 .../res_latex/informative_commands_in_top_node.tex |   1 -
 tp/t/results/latex_tests/nested_enumerate.pl       |  84 ++------
 .../res_latex/nested_enumerate.tex                 |   1 -
 tp/t/results/latex_tests/nested_itemize.pl         |  70 ++-----
 .../no_titlepage_and_setchapternewpage_odd.pl      |  37 +---
 .../no_titlepage_and_setchapternewpage_on.pl       |  37 +---
 tp/t/results/latex_tests/pagesizes.pl              |  71 ++-----
 .../latex_tests/pagesizes/res_latex/pagesizes.tex  |   1 -
 tp/t/results/latex_tests/pagetype.pl               |  69 ++-----
 .../latex_tests/pagetype/res_latex/pagetype.tex    |   1 -
 .../setchapternewpage_on_odd_titlepage.pl          |  63 ++----
 tp/t/results/latex_tests/settitle_and_headings.pl  |  49 +----
 tp/t/results/latex_tests/shorttitlepage.pl         |  59 +-----
 .../shorttitlepage/res_latex/shorttitlepage.tex    |   1 -
 .../three_setchapternewpage_on_odd_off.pl          |  53 +-----
 tp/t/results/latex_tests/titlepage_and_headings.pl |  61 +-----
 .../res_latex/titlepage_and_headings.tex           |   1 -
 .../titlepage_and_setchapternewpage_odd.pl         |  63 +-----
 .../titlepage_and_setchapternewpage_odd.tex        |   1 -
 .../titlepage_and_setchapternewpage_on.pl          |  55 ++----
 tp/t/results/latex_tests/titlepage_classical.pl    | 141 +++++---------
 .../res_latex/titlepage_classical.tex              |   1 -
 tp/t/results/latex_tests/titlepage_in_top_node.pl  |  66 ++-----
 .../res_latex/titlepage_in_top_node.tex            |   1 -
 tp/t/results/latex_tests/titlepage_long_title.pl   |  69 ++-----
 tp/t/results/latex_tests/titlepage_no_author.pl    |  63 ++----
 tp/t/results/latex_tests/titlepage_no_title.pl     |  77 +++-----
 .../titlepage_with_commands_classical.pl           | 211 ++++++++-------------
 .../titlepage_with_commands_classical.tex          |   1 -
 .../latex_tests/two_setchapternewpage_odd_on.pl    |  45 +----
 .../latex_tests/two_setchapternewpage_on_odd.pl    |  45 +----
 .../results/latex_tests/verbatim_in_smallformat.pl |  58 +-----
 .../res_latex/verbatim_in_smallformat.tex          |   1 -
 53 files changed, 661 insertions(+), 2011 deletions(-)

diff --git a/tp/t/latex_tests.t b/tp/t/latex_tests.t
index f5577c984c..51eb0b63de 100644
--- a/tp/t/latex_tests.t
+++ b/tp/t/latex_tests.t
@@ -117,8 +117,7 @@ Cop. @anchor{a in copying}. Ying.
 
 my @file_tests = (
 ['settitle_and_headings',
-'@setfilename settitle_and_headings.info
-@settitle Title @* for a manual
+'@settitle Title @* for a manual
 
 @headings double
 
@@ -134,9 +133,7 @@ Another page
 '],
 # default case
 ['titlepage_and_headings',
-'@setfilename titlepage_and_headings.info
-
-@titlepage
+'@titlepage
 in titlepage
 @end titlepage
 
@@ -147,9 +144,7 @@ in titlepage
 # to Texinfo default (@setchapternewpage on).  With 'file_latex',
 # they correspond to the actual output
 ['titlepage_and_setchapternewpage_odd',
-'@setfilename titlepage_and_setchapternewpage_odd.info
-
-@setchapternewpage odd
+'@setchapternewpage odd
 
 @titlepage
 in titlepage
@@ -157,12 +152,10 @@ in titlepage
 
 '],
 ['no_titlepage_and_setchapternewpage_odd',
-'@setfilename no_titlepage_and_setchapternewpage_odd.info
-@setchapternewpage odd
+'@setchapternewpage odd
 '],
 ['titlepage_and_setchapternewpage_on',
-'@setfilename titlepage_and_setchapternewpage_on.info
-@setchapternewpage on
+'@setchapternewpage on
 
 @titlepage
 in titlepage
@@ -170,24 +163,20 @@ in titlepage
 
 '],
 ['no_titlepage_and_setchapternewpage_on',
-'@setfilename no_titlepage_and_setchapternewpage_on.info
-@setchapternewpage on
+'@setchapternewpage on
 '],
 ['two_setchapternewpage_odd_on',
-'@setfilename two_setchapternewpage_odd_on.info
-@setchapternewpage odd
+'@setchapternewpage odd
 
 @setchapternewpage on
 '],
 ['two_setchapternewpage_on_odd',
-'@setfilename two_setchapternewpage_on_odd.info
-@setchapternewpage on
+'@setchapternewpage on
 
 @setchapternewpage odd
 '],
 ['three_setchapternewpage_on_odd_off',
-'@setfilename three_setchapternewpage_on_odd_off.info
-@setchapternewpage on
+'@setchapternewpage on
 
 @setchapternewpage odd
 
@@ -198,8 +187,7 @@ in titlepage
 # to @setchapternewpage on in preamble, then odd and then the
 # title page
 ['setchapternewpage_on_odd_titlepage',
-'@setfilename setchapternewpage_on_odd_titlepage.info
-@setchapternewpage on
+'@setchapternewpage on
 
 @setchapternewpage odd
 
@@ -208,8 +196,7 @@ in titlepage
 @end titlepage
 '],
 ['custom_headings',
-'@setfilename custom_headings.info
-
+'
 @evenheading @thispage @thissectionname @| @thissectionnum @thissection @| 
@thischaptername @thischapternum
 @evenfooting @thischapter @thistitle @| @thisfile @| @code{@thischaptername}
 
@@ -250,9 +237,7 @@ after everyheading before chap 3 second page
 '
 ],
 ['titlepage_in_top_node',
-'@setfilename titlepage_in_top_node.info
-
-@node Top
+'@node Top
 @top top sectionning
 
 In top
@@ -267,9 +252,7 @@ In top
 in chap
 '],
 ['informative_commands_in_top_node',
-'@setfilename informative_commands_in_top_node.info
-
-@node Top
+'@node Top
 @top top sectionning
 
 @paragraphindent 5
@@ -283,9 +266,7 @@ in chap
 In chapter
 '],
 ['shorttitlepage',
-'@setfilename shorttitlepage.info
-
-@shorttitlepage the title with shorttitlepage @* it can be long
+'@shorttitlepage the title with shorttitlepage @* it can be long
 
 @node Top
 @top section top
@@ -296,8 +277,7 @@ In chapter
 In chapter
 '],
 ['titlepage_no_author',
-'@setfilename titlepage_no_author.info
-@titlepage
+'@titlepage
 @title Some manual tested
 @end titlepage
 
@@ -310,8 +290,7 @@ In chapter
 In chapter
 '],
 ['titlepage_no_title',
-'@setfilename titlepage_no_title.info
-@titlepage
+'@titlepage
 @titlefont{Some manual tested}
 
 @author Some Author
@@ -326,8 +305,7 @@ In chapter
 In chapter
 '],
 ['titlepage_long_title',
-'@setfilename titlepage_long_title.info
-@titlepage
+'@titlepage
 @title a title than is long, very long, veeeeeeeeeeeeeeeeery long, it seems to 
never stop and it is not so interesting only very long oh an end of line @* and 
the title continue and keep on being unfinished until it is the end
 
 @end titlepage
@@ -341,9 +319,7 @@ In chapter
 In chapter
 '],
 ['titlepage_classical',
-'@setfilename titlepage_classical.info
-
-@copying
+'@copying
 in Copying
 @end copying
 
@@ -371,9 +347,7 @@ In chapter
 
 '],
 ['titlepage_with_commands_classical',
-'@setfilename titlepage_with_commands_classical.info
-
-@copying
+'@copying
 in Copying
 @end copying
 
@@ -407,9 +381,7 @@ In chapter
 
 '],
 ['float_and_refs',
-'@setfilename float_and_refs.info
-
-@node Top
+'@node Top
 @top top
 
 @node chapter
@@ -461,9 +433,7 @@ In figure
 
 '],
 ['anchor_links_xref_xrefautomaticsectiontitle',
-'@setfilename anchor_links_xref_xrefautomaticsectiontitle.info
-
-@node node before
+'@node node before
 
 In node before
 @anchor{anch: in node before}
@@ -498,9 +468,7 @@ in chap
 @xref{anch: in chap}.
 '],
 ['fonttextsize',
-'@setfilename fonttextsize.info
-
-@fonttextsize 10
+'@fonttextsize 10
 
 @node Top
 @top section top
@@ -529,9 +497,7 @@ In 8pts
 In 15pts
 '],
 ['pagetype',
-'@setfilename pagetype.info
-
-@afourpaper
+'@afourpaper
 
 @afourwide
 
@@ -555,9 +521,7 @@ After afourpaper
 In afourpaper reset
 '],
 ['pagesizes',
-'@setfilename pagesizes.info
-
-@pagesizes 200mm,150mm
+'@pagesizes 200mm,150mm
 
 @node Top
 @top section top
@@ -574,18 +538,14 @@ In afourpaper reset
 @pagesizes , 
 '],
 ['verbatim_in_smallformat',
-'@setfilename verbatim_in_smallformat.info
-
-@smallformat
+'@smallformat
 @verbatim
 ... still verbatim, but in a smaller font ...
 @end verbatim
 @end smallformat
 '],
 ['example_in_cartouche',
-'@setfilename example_in_cartouche.info
-
-@cartouche
+'@cartouche
 Normal cartouche
 
 New para
@@ -599,8 +559,7 @@ New para
 @end cartouche
 '],
 ['nested_itemize',
-'@setfilename nested_itemize.info
-@itemize
+'@itemize
    @item First level item
    @item First level item
 @itemize
@@ -619,9 +578,7 @@ New para
 
 '],
 ['nested_enumerate',
-'@setfilename nested_enumerate.info
-
-@enumerate
+'@enumerate
    @item First level item
    @item First level item
 @enumerate
@@ -640,9 +597,7 @@ New para
 
 '],
 ['enumerate_arguments',
-'@setfilename enumerate_arguments.info
-
-@enumerate a
+'@enumerate a
 @item value
 @item value
 @end enumerate
@@ -674,8 +629,7 @@ New para
 
 '],
 ['indices',
-'@setfilename indices.info
-
+'
 @set txiindexbackslashignore
 
 @node Top
@@ -699,9 +653,7 @@ New para
 @printindex fn
 '],
 ['error_in_sectioning_command',
-'@setfilename error_in_sectioning_command.info
-
-@contents
+'@contents
 
 @node Top
 @top top section
@@ -740,7 +692,7 @@ foreach my $test (@test_cases) {
 
 foreach my $test (@file_tests) {
   $test->[2]->{'test_formats'} = ['latex_text', '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/results/latex_tests/anchor_links_xref_xrefautomaticsectiontitle.pl 
b/tp/t/results/latex_tests/anchor_links_xref_xrefautomaticsectiontitle.pl
index fd8e03498d..17367f7a0f 100644
--- a/tp/t/results/latex_tests/anchor_links_xref_xrefautomaticsectiontitle.pl
+++ b/tp/t/results/latex_tests/anchor_links_xref_xrefautomaticsectiontitle.pl
@@ -10,43 +10,7 @@ $result_trees{'anchor_links_xref_xrefautomaticsectiontitle'} 
= {
     {
       'contents' => [
         {
-          'contents' => [
-            {
-              'args' => [
-                {
-                  'contents' => [
-                    {
-                      'parent' => {},
-                      'text' => 
'anchor_links_xref_xrefautomaticsectiontitle.info'
-                    }
-                  ],
-                  'extra' => {
-                    'spaces_after_argument' => '
-'
-                  },
-                  'parent' => {},
-                  'type' => 'line_arg'
-                }
-              ],
-              'cmdname' => 'setfilename',
-              'extra' => {
-                'spaces_before_argument' => ' ',
-                'text_arg' => 
'anchor_links_xref_xrefautomaticsectiontitle.info'
-              },
-              'parent' => {},
-              'source_info' => {
-                'file_name' => '',
-                'line_nr' => 1,
-                'macro' => ''
-              }
-            },
-            {
-              'parent' => {},
-              'text' => '
-',
-              'type' => 'empty_line'
-            }
-          ],
+          'contents' => [],
           'parent' => {},
           'type' => 'preamble_before_content'
         }
@@ -110,7 +74,7 @@ $result_trees{'anchor_links_xref_xrefautomaticsectiontitle'} 
= {
               'parent' => {},
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 6,
+                'line_nr' => 4,
                 'macro' => ''
               }
             },
@@ -149,7 +113,7 @@ 
$result_trees{'anchor_links_xref_xrefautomaticsectiontitle'} = {
       'parent' => {},
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 3,
+        'line_nr' => 1,
         'macro' => ''
       }
     },
@@ -190,7 +154,7 @@ 
$result_trees{'anchor_links_xref_xrefautomaticsectiontitle'} = {
       'parent' => {},
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 8,
+        'line_nr' => 6,
         'macro' => ''
       }
     },
@@ -250,7 +214,7 @@ 
$result_trees{'anchor_links_xref_xrefautomaticsectiontitle'} = {
               'parent' => {},
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 12,
+                'line_nr' => 10,
                 'macro' => ''
               }
             },
@@ -277,7 +241,7 @@ 
$result_trees{'anchor_links_xref_xrefautomaticsectiontitle'} = {
       'parent' => {},
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 9,
+        'line_nr' => 7,
         'macro' => ''
       }
     },
@@ -337,7 +301,7 @@ 
$result_trees{'anchor_links_xref_xrefautomaticsectiontitle'} = {
               'parent' => {},
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 17,
+                'line_nr' => 15,
                 'macro' => ''
               }
             },
@@ -376,7 +340,7 @@ 
$result_trees{'anchor_links_xref_xrefautomaticsectiontitle'} = {
       'parent' => {},
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 14,
+        'line_nr' => 12,
         'macro' => ''
       }
     },
@@ -417,7 +381,7 @@ 
$result_trees{'anchor_links_xref_xrefautomaticsectiontitle'} = {
       'parent' => {},
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 19,
+        'line_nr' => 17,
         'macro' => ''
       }
     },
@@ -477,7 +441,7 @@ 
$result_trees{'anchor_links_xref_xrefautomaticsectiontitle'} = {
               'parent' => {},
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 23,
+                'line_nr' => 21,
                 'macro' => ''
               }
             },
@@ -524,7 +488,7 @@ 
$result_trees{'anchor_links_xref_xrefautomaticsectiontitle'} = {
           'parent' => {},
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 25,
+            'line_nr' => 23,
             'macro' => ''
           }
         },
@@ -557,7 +521,7 @@ 
$result_trees{'anchor_links_xref_xrefautomaticsectiontitle'} = {
               'parent' => {},
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 26,
+                'line_nr' => 24,
                 'macro' => ''
               }
             },
@@ -593,7 +557,7 @@ 
$result_trees{'anchor_links_xref_xrefautomaticsectiontitle'} = {
               'parent' => {},
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 27,
+                'line_nr' => 25,
                 'macro' => ''
               }
             },
@@ -629,7 +593,7 @@ 
$result_trees{'anchor_links_xref_xrefautomaticsectiontitle'} = {
               'parent' => {},
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 28,
+                'line_nr' => 26,
                 'macro' => ''
               }
             },
@@ -665,7 +629,7 @@ 
$result_trees{'anchor_links_xref_xrefautomaticsectiontitle'} = {
               'parent' => {},
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 29,
+                'line_nr' => 27,
                 'macro' => ''
               }
             },
@@ -711,7 +675,7 @@ 
$result_trees{'anchor_links_xref_xrefautomaticsectiontitle'} = {
           'parent' => {},
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 31,
+            'line_nr' => 29,
             'macro' => ''
           }
         },
@@ -744,7 +708,7 @@ 
$result_trees{'anchor_links_xref_xrefautomaticsectiontitle'} = {
               'parent' => {},
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 32,
+                'line_nr' => 30,
                 'macro' => ''
               }
             },
@@ -780,7 +744,7 @@ 
$result_trees{'anchor_links_xref_xrefautomaticsectiontitle'} = {
               'parent' => {},
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 33,
+                'line_nr' => 31,
                 'macro' => ''
               }
             },
@@ -816,7 +780,7 @@ 
$result_trees{'anchor_links_xref_xrefautomaticsectiontitle'} = {
               'parent' => {},
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 34,
+                'line_nr' => 32,
                 'macro' => ''
               }
             },
@@ -852,7 +816,7 @@ 
$result_trees{'anchor_links_xref_xrefautomaticsectiontitle'} = {
               'parent' => {},
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 35,
+                'line_nr' => 33,
                 'macro' => ''
               }
             },
@@ -872,17 +836,13 @@ 
$result_trees{'anchor_links_xref_xrefautomaticsectiontitle'} = {
       'parent' => {},
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 20,
+        'line_nr' => 18,
         'macro' => ''
       }
     }
   ],
   'type' => 'document_root'
 };
-$result_trees{'anchor_links_xref_xrefautomaticsectiontitle'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'anchor_links_xref_xrefautomaticsectiontitle'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0];
-$result_trees{'anchor_links_xref_xrefautomaticsectiontitle'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'parent'}
 = 
$result_trees{'anchor_links_xref_xrefautomaticsectiontitle'}{'contents'}[0]{'contents'}[0]{'contents'}[0];
-$result_trees{'anchor_links_xref_xrefautomaticsectiontitle'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'anchor_links_xref_xrefautomaticsectiontitle'}{'contents'}[0]{'contents'}[0];
-$result_trees{'anchor_links_xref_xrefautomaticsectiontitle'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'parent'}
 = 
$result_trees{'anchor_links_xref_xrefautomaticsectiontitle'}{'contents'}[0]{'contents'}[0];
 
$result_trees{'anchor_links_xref_xrefautomaticsectiontitle'}{'contents'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'anchor_links_xref_xrefautomaticsectiontitle'}{'contents'}[0];
 
$result_trees{'anchor_links_xref_xrefautomaticsectiontitle'}{'contents'}[0]{'parent'}
 = $result_trees{'anchor_links_xref_xrefautomaticsectiontitle'};
 
$result_trees{'anchor_links_xref_xrefautomaticsectiontitle'}{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'anchor_links_xref_xrefautomaticsectiontitle'}{'contents'}[1]{'args'}[0];
@@ -1005,9 +965,7 @@ 
$result_trees{'anchor_links_xref_xrefautomaticsectiontitle'}{'contents'}[6]{'con
 
$result_trees{'anchor_links_xref_xrefautomaticsectiontitle'}{'contents'}[6]{'contents'}[7]{'parent'}
 = $result_trees{'anchor_links_xref_xrefautomaticsectiontitle'}{'contents'}[6];
 
$result_trees{'anchor_links_xref_xrefautomaticsectiontitle'}{'contents'}[6]{'parent'}
 = $result_trees{'anchor_links_xref_xrefautomaticsectiontitle'};
 
-$result_texis{'anchor_links_xref_xrefautomaticsectiontitle'} = '@setfilename 
anchor_links_xref_xrefautomaticsectiontitle.info
-
-@node node before
+$result_texis{'anchor_links_xref_xrefautomaticsectiontitle'} = '@node node 
before
 
 In node before
 @anchor{anch: in node before}
@@ -1044,7 +1002,6 @@ in chap
 
 
 $result_texts{'anchor_links_xref_xrefautomaticsectiontitle'} = '
-
 In node before
 
 top sectionning
@@ -1166,7 +1123,7 @@ 
$result_errors{'anchor_links_xref_xrefautomaticsectiontitle'} = [
     'error_line' => 'warning: node `node before\' unreferenced
 ',
     'file_name' => '',
-    'line_nr' => 3,
+    'line_nr' => 1,
     'macro' => '',
     'text' => 'node `node before\' unreferenced',
     'type' => 'warning'
@@ -1175,7 +1132,7 @@ 
$result_errors{'anchor_links_xref_xrefautomaticsectiontitle'} = [
     'error_line' => 'warning: node `after\' unreferenced
 ',
     'file_name' => '',
-    'line_nr' => 14,
+    'line_nr' => 12,
     'macro' => '',
     'text' => 'node `after\' unreferenced',
     'type' => 'warning'
@@ -1187,8 +1144,7 @@ 
$result_floats{'anchor_links_xref_xrefautomaticsectiontitle'} = {};
 
 
 
-$result_converted{'latex_text'}->{'anchor_links_xref_xrefautomaticsectiontitle'}
 = '
-\\begin{document}
+$result_converted{'latex_text'}->{'anchor_links_xref_xrefautomaticsectiontitle'}
 = '\\begin{document}
 \\label{anchor:node-before}%
 
 In node before
diff --git 
a/tp/t/results/latex_tests/anchor_links_xref_xrefautomaticsectiontitle/res_latex/anchor_links_xref_xrefautomaticsectiontitle.tex
 
b/tp/t/results/latex_tests/anchor_links_xref_xrefautomaticsectiontitle/res_latex/anchor_links_xref_xrefautomaticsectiontitle.tex
index e5d6368dd4..4c6f55191c 100644
--- 
a/tp/t/results/latex_tests/anchor_links_xref_xrefautomaticsectiontitle/res_latex/anchor_links_xref_xrefautomaticsectiontitle.tex
+++ 
b/tp/t/results/latex_tests/anchor_links_xref_xrefautomaticsectiontitle/res_latex/anchor_links_xref_xrefautomaticsectiontitle.tex
@@ -62,7 +62,6 @@
 \makeatother
 \GNUTexinfosetsingleheader{}%
 
-
 \begin{document}
 \label{anchor:node-before}%
 
diff --git a/tp/t/results/latex_tests/brace_in_index.pl 
b/tp/t/results/latex_tests/brace_in_index.pl
index 78eabcaaf3..b375ccbb63 100644
--- a/tp/t/results/latex_tests/brace_in_index.pl
+++ b/tp/t/results/latex_tests/brace_in_index.pl
@@ -701,110 +701,4 @@ CCC
 \\end{quote}
 ';
 
-
-$result_converted{'file_latex'}->{'brace_in_index'} = '\\documentclass{book}
-\\usepackage{imakeidx}
-\\usepackage{amsfonts}
-\\usepackage{amsmath}
-\\usepackage[gen]{eurosym}
-\\usepackage[T1]{fontenc}
-\\usepackage{textcomp}
-\\usepackage{graphicx}
-\\usepackage{etoolbox}
-\\usepackage{embrac}
-\\usepackage{expl3}
-\\usepackage{tabularx}
-\\usepackage{titleps}
-\\usepackage{float}
-% use hidelinks to remove boxes around links to be similar with Texinfo TeX
-\\usepackage[hidelinks]{hyperref}
-\\usepackage[utf8]{inputenc}
-
-\\makeatletter
-\\newcommand{\\GNUTexinfosettitle}{No Title}%
-
-\\makeindex[name=cp]%
-\\makeindex[name=fn]%
-
-% redefine the \\mainmatter command such that it does not clear page
-% as if in double page
-\\renewcommand\\mainmatter{\\clearpage\\@mainmattertrue\\pagenumbering{arabic}}
-% add command aliases to use the same command in book and report
-\\newcommand\\GNUTexinfomainmatter{\\mainmatter}
-\\newcommand\\GNUTexinfofrontmatter{\\frontmatter}
-\\newenvironment{GNUTexinfopreformatted}{%
-  \\par\\obeylines\\obeyspaces\\frenchspacing
-  \\parskip=\\z@\\parindent=\\z@}{}
-\\newenvironment{GNUTexinfoindented}
-  {\\begin{list}{}{}
-  \\item\\relax}
-  {\\end{list}}
-% command that does nothing used to help with substitutions in commands
-\\newcommand{\\GNUTexinfoplaceholder}[1]{}
-
-% plain page style, for part and chapter, which call \\thispagestyle{plain}
-\\renewpagestyle{plain}{\\sethead[\\thepage{}][][]
-                             {}{}{\\thepage{}}}
-
-% single header
-\\newpagestyle{single}{\\sethead[\\chaptername{} \\thechapter{} 
\\chaptertitle{}][][\\thepage]
-                              {\\chaptername{} \\thechapter{} 
\\chaptertitle{}}{}{\\thepage}}
-
-% called when setting single headers
-\\newcommand{\\GNUTexinfosetsingleheader}{\\pagestyle{single}}
-
-% double header
-\\newpagestyle{double}{\\sethead[\\thepage{}][][\\GNUTexinfosettitle]
-                              {\\chaptername{} \\thechapter{} 
\\chaptertitle{}}{}{\\thepage}}
-
-% called when setting double headers
-\\newcommand{\\GNUTexinfosetdoubleheader}{\\pagestyle{double}}
-
-
-% avoid pagebreak and headings setting for a sectionning command
-\\newcommand{\\GNUTexinfonopagebreakheading}[2]{{\\let\\clearpage\\relax 
\\let\\cleardoublepage\\relax \\let\\thispagestyle\\GNUTexinfoplaceholder 
#1{#2}}}
-
-% braces are upright in italic and slanted only in @def*
-% so it is turned off here, and turned on @def* lines
-\\EmbracOff{}%
-
-\\renewcommand{\\includegraphics}[1]{\\fbox{FIG \\detokenize{#1}}}
-
-\\makeatother
-% set default for @setchapternewpage
-\\makeatletter
-\\patchcmd{\\chapter}{\\if@openright\\cleardoublepage\\else\\clearpage\\fi}{\\GNUTexinfoplaceholder{setchapternewpage
 placeholder}\\clearpage}{}{}
-\\makeatother
-\\GNUTexinfosetsingleheader{}%
-
-\\begin{document}
-\\{
-
-$\\{$
-
-$$
-\\{
-$$
-
-\\index[cp]{\\textbraceleft{}}%
-
-\\index[cp]{$\\lbrace{}$}%
-
-\\index[cp]{`\\texttt{\\textbraceleft{}}\'}%
-
-
-\\noindent\\begin{tabularx}{\\linewidth}{@{}Xr}
-\\rightskip=5em plus 1 fill
-\\hangindent=2em
-\\texttt{A\\{A \\EmbracOn{}\\textnormal{\\textsl{(BBB)}}\\EmbracOff{}}& 
[Function]
-\\end{tabularx}
-
-\\index[fn]{AA@\\texttt{A\\textbraceleft{}A}}%
-\\begin{quote}
-\\unskip{\\parskip=0pt\\noindent}%
-CCC
-\\end{quote}
-\\end{document}
-';
-
 1;
diff --git a/tp/t/results/latex_tests/indices/res_latex/indices.tex 
b/tp/t/results/latex_tests/brace_in_index/res_latex/brace_in_index.tex
similarity index 80%
copy from tp/t/results/latex_tests/indices/res_latex/indices.tex
copy to tp/t/results/latex_tests/brace_in_index/res_latex/brace_in_index.tex
index 0a4e1aefd5..af67b1d95c 100644
--- a/tp/t/results/latex_tests/indices/res_latex/indices.tex
+++ b/tp/t/results/latex_tests/brace_in_index/res_latex/brace_in_index.tex
@@ -7,6 +7,9 @@
 \usepackage{textcomp}
 \usepackage{graphicx}
 \usepackage{etoolbox}
+\usepackage{embrac}
+\usepackage{expl3}
+\usepackage{tabularx}
 \usepackage{titleps}
 \usepackage{float}
 % use hidelinks to remove boxes around links to be similar with Texinfo TeX
@@ -57,6 +60,10 @@
 % avoid pagebreak and headings setting for a sectionning command
 \newcommand{\GNUTexinfonopagebreakheading}[2]{{\let\clearpage\relax 
\let\cleardoublepage\relax \let\thispagestyle\GNUTexinfoplaceholder #1{#2}}}
 
+% braces are upright in italic and slanted only in @def*
+% so it is turned off here, and turned on @def* lines
+\EmbracOff{}%
+
 \renewcommand{\includegraphics}[1]{\fbox{FIG \detokenize{#1}}}
 
 \makeatother
@@ -66,23 +73,31 @@
 \makeatother
 \GNUTexinfosetsingleheader{}%
 
+\begin{document}
+\{
 
+$\{$
 
-\begin{document}
-\label{anchor:Top}%
-\chapter{{Index}}
-\label{anchor:chapter}%
+$$
+\{
+$$
 
-\index[cp]{a"!"""@b """!"@ a"" o""@$a"!"""@b$ """!"@ \"{a} 
\"{o}!a"!"""@b@sub$a"!"""@b$ sub """!"@ \"{a} \"{o}|seealso{$a"!"""@b$ """!"@ 
\"{a} \"{o}}}%
-\index[cp]{cmd@\textbackslash{}cmd}%
-\index[cp]{\textbackslash{}cmd@totocmd}%
+\index[cp]{\textbraceleft{}}%
 
+\index[cp]{$\lbrace{}$}%
 
-\index[cp]{\textbackslash{}some\textbackslash{}command for \texttt{file}}%
+\index[cp]{`\texttt{\textbraceleft{}}'}%
 
-\index[fn]{the person index aa@\texttt{the \textnormal{person}\ index 
\texttt{aa}}}%
 
-\printindex[cp]
+\noindent\begin{tabularx}{\linewidth}{@{}Xr}
+\rightskip=5em plus 1 fill
+\hangindent=2em
+\texttt{A\{A \EmbracOn{}\textnormal{\textsl{(BBB)}}\EmbracOff{}}& [Function]
+\end{tabularx}
 
-\printindex[fn]
+\index[fn]{AA@\texttt{A\textbraceleft{}A}}%
+\begin{quote}
+\unskip{\parskip=0pt\noindent}%
+CCC
+\end{quote}
 \end{document}
diff --git a/tp/t/results/latex_tests/custom_headings.pl 
b/tp/t/results/latex_tests/custom_headings.pl
index f00d2306bf..65617d6e00 100644
--- a/tp/t/results/latex_tests/custom_headings.pl
+++ b/tp/t/results/latex_tests/custom_headings.pl
@@ -11,41 +11,18 @@ $result_trees{'custom_headings'} = {
       'contents' => [
         {
           'contents' => [
-            {
-              'args' => [
-                {
-                  'contents' => [
-                    {
-                      'parent' => {},
-                      'text' => 'custom_headings.info'
-                    }
-                  ],
-                  'extra' => {
-                    'spaces_after_argument' => '
-'
-                  },
-                  'parent' => {},
-                  'type' => 'line_arg'
-                }
-              ],
-              'cmdname' => 'setfilename',
-              'extra' => {
-                'spaces_before_argument' => ' ',
-                'text_arg' => 'custom_headings.info'
-              },
-              'parent' => {},
-              'source_info' => {
-                'file_name' => '',
-                'line_nr' => 1,
-                'macro' => ''
-              }
-            },
             {
               'parent' => {},
               'text' => '
 ',
-              'type' => 'empty_line'
-            },
+              'type' => 'text_before_beginning'
+            }
+          ],
+          'parent' => {},
+          'type' => 'preamble_before_beginning'
+        },
+        {
+          'contents' => [
             {
               'args' => [
                 {
@@ -126,7 +103,7 @@ $result_trees{'custom_headings'} = {
               'parent' => {},
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 3,
+                'line_nr' => 2,
                 'macro' => ''
               }
             },
@@ -192,7 +169,7 @@ $result_trees{'custom_headings'} = {
                       'parent' => {},
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 4,
+                        'line_nr' => 3,
                         'macro' => ''
                       }
                     }
@@ -212,7 +189,7 @@ $result_trees{'custom_headings'} = {
               'parent' => {},
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 4,
+                'line_nr' => 3,
                 'macro' => ''
               }
             },
@@ -267,7 +244,7 @@ $result_trees{'custom_headings'} = {
       'parent' => {},
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 6,
+        'line_nr' => 5,
         'macro' => ''
       }
     },
@@ -303,7 +280,7 @@ $result_trees{'custom_headings'} = {
       'parent' => {},
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 7,
+        'line_nr' => 6,
         'macro' => ''
       }
     },
@@ -344,7 +321,7 @@ $result_trees{'custom_headings'} = {
       'parent' => {},
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 9,
+        'line_nr' => 8,
         'macro' => ''
       }
     },
@@ -450,7 +427,7 @@ $result_trees{'custom_headings'} = {
       'parent' => {},
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 10,
+        'line_nr' => 9,
         'macro' => ''
       }
     },
@@ -486,7 +463,7 @@ $result_trees{'custom_headings'} = {
       'parent' => {},
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 20,
+        'line_nr' => 19,
         'macro' => ''
       }
     },
@@ -547,7 +524,7 @@ $result_trees{'custom_headings'} = {
           'parent' => {},
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 24,
+            'line_nr' => 23,
             'macro' => ''
           }
         },
@@ -634,7 +611,7 @@ $result_trees{'custom_headings'} = {
       'parent' => {},
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 22,
+        'line_nr' => 21,
         'macro' => ''
       }
     },
@@ -729,7 +706,7 @@ $result_trees{'custom_headings'} = {
           'parent' => {},
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 38,
+            'line_nr' => 37,
             'macro' => ''
           }
         },
@@ -746,51 +723,49 @@ $result_trees{'custom_headings'} = {
       'parent' => {},
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 34,
+        'line_nr' => 33,
         'macro' => ''
       }
     }
   ],
   'type' => 'document_root'
 };
-$result_trees{'custom_headings'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'custom_headings'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0];
-$result_trees{'custom_headings'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'parent'}
 = 
$result_trees{'custom_headings'}{'contents'}[0]{'contents'}[0]{'contents'}[0];
 
$result_trees{'custom_headings'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'custom_headings'}{'contents'}[0]{'contents'}[0];
-$result_trees{'custom_headings'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'parent'}
 = $result_trees{'custom_headings'}{'contents'}[0]{'contents'}[0];
-$result_trees{'custom_headings'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'custom_headings'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'args'}[0];
-$result_trees{'custom_headings'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[1]{'parent'}
 = 
$result_trees{'custom_headings'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'args'}[0];
-$result_trees{'custom_headings'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[2]{'parent'}
 = 
$result_trees{'custom_headings'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'args'}[0];
-$result_trees{'custom_headings'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[3]{'parent'}
 = 
$result_trees{'custom_headings'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'args'}[0];
-$result_trees{'custom_headings'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[4]{'parent'}
 = 
$result_trees{'custom_headings'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'args'}[0];
-$result_trees{'custom_headings'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[5]{'parent'}
 = 
$result_trees{'custom_headings'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'args'}[0];
-$result_trees{'custom_headings'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[6]{'parent'}
 = 
$result_trees{'custom_headings'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'args'}[0];
-$result_trees{'custom_headings'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[7]{'parent'}
 = 
$result_trees{'custom_headings'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'args'}[0];
-$result_trees{'custom_headings'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[8]{'parent'}
 = 
$result_trees{'custom_headings'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'args'}[0];
-$result_trees{'custom_headings'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[9]{'parent'}
 = 
$result_trees{'custom_headings'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'args'}[0];
-$result_trees{'custom_headings'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[10]{'parent'}
 = 
$result_trees{'custom_headings'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'args'}[0];
-$result_trees{'custom_headings'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[11]{'parent'}
 = 
$result_trees{'custom_headings'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'args'}[0];
-$result_trees{'custom_headings'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[12]{'parent'}
 = 
$result_trees{'custom_headings'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'args'}[0];
-$result_trees{'custom_headings'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[13]{'parent'}
 = 
$result_trees{'custom_headings'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'args'}[0];
-$result_trees{'custom_headings'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[14]{'parent'}
 = 
$result_trees{'custom_headings'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'args'}[0];
-$result_trees{'custom_headings'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'args'}[0]{'parent'}
 = 
$result_trees{'custom_headings'}{'contents'}[0]{'contents'}[0]{'contents'}[2];
-$result_trees{'custom_headings'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'parent'}
 = $result_trees{'custom_headings'}{'contents'}[0]{'contents'}[0];
-$result_trees{'custom_headings'}{'contents'}[0]{'contents'}[0]{'contents'}[3]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'custom_headings'}{'contents'}[0]{'contents'}[0]{'contents'}[3]{'args'}[0];
-$result_trees{'custom_headings'}{'contents'}[0]{'contents'}[0]{'contents'}[3]{'args'}[0]{'contents'}[1]{'parent'}
 = 
$result_trees{'custom_headings'}{'contents'}[0]{'contents'}[0]{'contents'}[3]{'args'}[0];
-$result_trees{'custom_headings'}{'contents'}[0]{'contents'}[0]{'contents'}[3]{'args'}[0]{'contents'}[2]{'parent'}
 = 
$result_trees{'custom_headings'}{'contents'}[0]{'contents'}[0]{'contents'}[3]{'args'}[0];
-$result_trees{'custom_headings'}{'contents'}[0]{'contents'}[0]{'contents'}[3]{'args'}[0]{'contents'}[3]{'parent'}
 = 
$result_trees{'custom_headings'}{'contents'}[0]{'contents'}[0]{'contents'}[3]{'args'}[0];
-$result_trees{'custom_headings'}{'contents'}[0]{'contents'}[0]{'contents'}[3]{'args'}[0]{'contents'}[4]{'parent'}
 = 
$result_trees{'custom_headings'}{'contents'}[0]{'contents'}[0]{'contents'}[3]{'args'}[0];
-$result_trees{'custom_headings'}{'contents'}[0]{'contents'}[0]{'contents'}[3]{'args'}[0]{'contents'}[5]{'parent'}
 = 
$result_trees{'custom_headings'}{'contents'}[0]{'contents'}[0]{'contents'}[3]{'args'}[0];
-$result_trees{'custom_headings'}{'contents'}[0]{'contents'}[0]{'contents'}[3]{'args'}[0]{'contents'}[6]{'parent'}
 = 
$result_trees{'custom_headings'}{'contents'}[0]{'contents'}[0]{'contents'}[3]{'args'}[0];
-$result_trees{'custom_headings'}{'contents'}[0]{'contents'}[0]{'contents'}[3]{'args'}[0]{'contents'}[7]{'parent'}
 = 
$result_trees{'custom_headings'}{'contents'}[0]{'contents'}[0]{'contents'}[3]{'args'}[0];
-$result_trees{'custom_headings'}{'contents'}[0]{'contents'}[0]{'contents'}[3]{'args'}[0]{'contents'}[8]{'parent'}
 = 
$result_trees{'custom_headings'}{'contents'}[0]{'contents'}[0]{'contents'}[3]{'args'}[0];
-$result_trees{'custom_headings'}{'contents'}[0]{'contents'}[0]{'contents'}[3]{'args'}[0]{'contents'}[9]{'parent'}
 = 
$result_trees{'custom_headings'}{'contents'}[0]{'contents'}[0]{'contents'}[3]{'args'}[0];
-$result_trees{'custom_headings'}{'contents'}[0]{'contents'}[0]{'contents'}[3]{'args'}[0]{'contents'}[10]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'custom_headings'}{'contents'}[0]{'contents'}[0]{'contents'}[3]{'args'}[0]{'contents'}[10]{'args'}[0];
-$result_trees{'custom_headings'}{'contents'}[0]{'contents'}[0]{'contents'}[3]{'args'}[0]{'contents'}[10]{'args'}[0]{'parent'}
 = 
$result_trees{'custom_headings'}{'contents'}[0]{'contents'}[0]{'contents'}[3]{'args'}[0]{'contents'}[10];
-$result_trees{'custom_headings'}{'contents'}[0]{'contents'}[0]{'contents'}[3]{'args'}[0]{'contents'}[10]{'parent'}
 = 
$result_trees{'custom_headings'}{'contents'}[0]{'contents'}[0]{'contents'}[3]{'args'}[0];
-$result_trees{'custom_headings'}{'contents'}[0]{'contents'}[0]{'contents'}[3]{'args'}[0]{'parent'}
 = 
$result_trees{'custom_headings'}{'contents'}[0]{'contents'}[0]{'contents'}[3];
-$result_trees{'custom_headings'}{'contents'}[0]{'contents'}[0]{'contents'}[3]{'parent'}
 = $result_trees{'custom_headings'}{'contents'}[0]{'contents'}[0];
-$result_trees{'custom_headings'}{'contents'}[0]{'contents'}[0]{'contents'}[4]{'parent'}
 = $result_trees{'custom_headings'}{'contents'}[0]{'contents'}[0];
 $result_trees{'custom_headings'}{'contents'}[0]{'contents'}[0]{'parent'} = 
$result_trees{'custom_headings'}{'contents'}[0];
+$result_trees{'custom_headings'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'custom_headings'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'args'}[0];
+$result_trees{'custom_headings'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[1]{'parent'}
 = 
$result_trees{'custom_headings'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'args'}[0];
+$result_trees{'custom_headings'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[2]{'parent'}
 = 
$result_trees{'custom_headings'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'args'}[0];
+$result_trees{'custom_headings'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[3]{'parent'}
 = 
$result_trees{'custom_headings'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'args'}[0];
+$result_trees{'custom_headings'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[4]{'parent'}
 = 
$result_trees{'custom_headings'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'args'}[0];
+$result_trees{'custom_headings'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[5]{'parent'}
 = 
$result_trees{'custom_headings'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'args'}[0];
+$result_trees{'custom_headings'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[6]{'parent'}
 = 
$result_trees{'custom_headings'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'args'}[0];
+$result_trees{'custom_headings'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[7]{'parent'}
 = 
$result_trees{'custom_headings'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'args'}[0];
+$result_trees{'custom_headings'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[8]{'parent'}
 = 
$result_trees{'custom_headings'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'args'}[0];
+$result_trees{'custom_headings'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[9]{'parent'}
 = 
$result_trees{'custom_headings'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'args'}[0];
+$result_trees{'custom_headings'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[10]{'parent'}
 = 
$result_trees{'custom_headings'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'args'}[0];
+$result_trees{'custom_headings'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[11]{'parent'}
 = 
$result_trees{'custom_headings'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'args'}[0];
+$result_trees{'custom_headings'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[12]{'parent'}
 = 
$result_trees{'custom_headings'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'args'}[0];
+$result_trees{'custom_headings'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[13]{'parent'}
 = 
$result_trees{'custom_headings'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'args'}[0];
+$result_trees{'custom_headings'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[14]{'parent'}
 = 
$result_trees{'custom_headings'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'args'}[0];
+$result_trees{'custom_headings'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'args'}[0]{'parent'}
 = 
$result_trees{'custom_headings'}{'contents'}[0]{'contents'}[1]{'contents'}[0];
+$result_trees{'custom_headings'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'parent'}
 = $result_trees{'custom_headings'}{'contents'}[0]{'contents'}[1];
+$result_trees{'custom_headings'}{'contents'}[0]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'custom_headings'}{'contents'}[0]{'contents'}[1]{'contents'}[1]{'args'}[0];
+$result_trees{'custom_headings'}{'contents'}[0]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[1]{'parent'}
 = 
$result_trees{'custom_headings'}{'contents'}[0]{'contents'}[1]{'contents'}[1]{'args'}[0];
+$result_trees{'custom_headings'}{'contents'}[0]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[2]{'parent'}
 = 
$result_trees{'custom_headings'}{'contents'}[0]{'contents'}[1]{'contents'}[1]{'args'}[0];
+$result_trees{'custom_headings'}{'contents'}[0]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[3]{'parent'}
 = 
$result_trees{'custom_headings'}{'contents'}[0]{'contents'}[1]{'contents'}[1]{'args'}[0];
+$result_trees{'custom_headings'}{'contents'}[0]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[4]{'parent'}
 = 
$result_trees{'custom_headings'}{'contents'}[0]{'contents'}[1]{'contents'}[1]{'args'}[0];
+$result_trees{'custom_headings'}{'contents'}[0]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[5]{'parent'}
 = 
$result_trees{'custom_headings'}{'contents'}[0]{'contents'}[1]{'contents'}[1]{'args'}[0];
+$result_trees{'custom_headings'}{'contents'}[0]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[6]{'parent'}
 = 
$result_trees{'custom_headings'}{'contents'}[0]{'contents'}[1]{'contents'}[1]{'args'}[0];
+$result_trees{'custom_headings'}{'contents'}[0]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[7]{'parent'}
 = 
$result_trees{'custom_headings'}{'contents'}[0]{'contents'}[1]{'contents'}[1]{'args'}[0];
+$result_trees{'custom_headings'}{'contents'}[0]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[8]{'parent'}
 = 
$result_trees{'custom_headings'}{'contents'}[0]{'contents'}[1]{'contents'}[1]{'args'}[0];
+$result_trees{'custom_headings'}{'contents'}[0]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[9]{'parent'}
 = 
$result_trees{'custom_headings'}{'contents'}[0]{'contents'}[1]{'contents'}[1]{'args'}[0];
+$result_trees{'custom_headings'}{'contents'}[0]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[10]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'custom_headings'}{'contents'}[0]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[10]{'args'}[0];
+$result_trees{'custom_headings'}{'contents'}[0]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[10]{'args'}[0]{'parent'}
 = 
$result_trees{'custom_headings'}{'contents'}[0]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[10];
+$result_trees{'custom_headings'}{'contents'}[0]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[10]{'parent'}
 = 
$result_trees{'custom_headings'}{'contents'}[0]{'contents'}[1]{'contents'}[1]{'args'}[0];
+$result_trees{'custom_headings'}{'contents'}[0]{'contents'}[1]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'custom_headings'}{'contents'}[0]{'contents'}[1]{'contents'}[1];
+$result_trees{'custom_headings'}{'contents'}[0]{'contents'}[1]{'contents'}[1]{'parent'}
 = $result_trees{'custom_headings'}{'contents'}[0]{'contents'}[1];
+$result_trees{'custom_headings'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'parent'}
 = $result_trees{'custom_headings'}{'contents'}[0]{'contents'}[1];
+$result_trees{'custom_headings'}{'contents'}[0]{'contents'}[1]{'parent'} = 
$result_trees{'custom_headings'}{'contents'}[0];
 $result_trees{'custom_headings'}{'contents'}[0]{'parent'} = 
$result_trees{'custom_headings'};
 
$result_trees{'custom_headings'}{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'custom_headings'}{'contents'}[1]{'args'}[0];
 $result_trees{'custom_headings'}{'contents'}[1]{'args'}[0]{'parent'} = 
$result_trees{'custom_headings'}{'contents'}[1];
@@ -866,8 +841,7 @@ 
$result_trees{'custom_headings'}{'contents'}[7]{'contents'}[3]{'parent'} = $resu
 $result_trees{'custom_headings'}{'contents'}[7]{'contents'}[4]{'parent'} = 
$result_trees{'custom_headings'}{'contents'}[7];
 $result_trees{'custom_headings'}{'contents'}[7]{'parent'} = 
$result_trees{'custom_headings'};
 
-$result_texis{'custom_headings'} = '@setfilename custom_headings.info
-
+$result_texis{'custom_headings'} = '
 @evenheading @thispage @thissectionname @| @thissectionnum @thissection @| 
@thischaptername @thischapternum
 @evenfooting @thischapter @thistitle @| @thisfile @| @code{@thischaptername}
 
@@ -909,7 +883,6 @@ after everyheading before chap 3 second page
 
 
 $result_texts{'custom_headings'} = '
-
 top sectionning
 ***************
 
@@ -1088,8 +1061,7 @@ $result_floats{'custom_headings'} = {};
 
 
 
-$result_converted{'latex_text'}->{'custom_headings'} = '
-\\newpagestyle{custom}{%
+$result_converted{'latex_text'}->{'custom_headings'} = 
'\\newpagestyle{custom}{%
 \\sethead[\\thepage{} \\sectiontitle{}][\\thesection{} Section \\thesection{} 
\\sectiontitle{}][\\chaptertitle{} \\thechapter{}]%
 {}{}{}%
 }%
diff --git 
a/tp/t/results/latex_tests/custom_headings/res_latex/custom_headings.tex 
b/tp/t/results/latex_tests/custom_headings/res_latex/custom_headings.tex
index 416cc08eb3..d55b4dfcfa 100644
--- a/tp/t/results/latex_tests/custom_headings/res_latex/custom_headings.tex
+++ b/tp/t/results/latex_tests/custom_headings/res_latex/custom_headings.tex
@@ -62,7 +62,6 @@
 \makeatother
 \GNUTexinfosetsingleheader{}%
 
-
 \newpagestyle{custom}{%
 \sethead[\thepage{} \sectiontitle{}][\thesection{} Section \thesection{} 
\sectiontitle{}][\chaptertitle{} \thechapter{}]%
 {}{}{}%
diff --git a/tp/t/results/latex_tests/enumerate_arguments.pl 
b/tp/t/results/latex_tests/enumerate_arguments.pl
index 36e4a0887a..879f8ff5f1 100644
--- a/tp/t/results/latex_tests/enumerate_arguments.pl
+++ b/tp/t/results/latex_tests/enumerate_arguments.pl
@@ -10,43 +10,7 @@ $result_trees{'enumerate_arguments'} = {
     {
       'contents' => [
         {
-          'contents' => [
-            {
-              'args' => [
-                {
-                  'contents' => [
-                    {
-                      'parent' => {},
-                      'text' => 'enumerate_arguments.info'
-                    }
-                  ],
-                  'extra' => {
-                    'spaces_after_argument' => '
-'
-                  },
-                  'parent' => {},
-                  'type' => 'line_arg'
-                }
-              ],
-              'cmdname' => 'setfilename',
-              'extra' => {
-                'spaces_before_argument' => ' ',
-                'text_arg' => 'enumerate_arguments.info'
-              },
-              'parent' => {},
-              'source_info' => {
-                'file_name' => '',
-                'line_nr' => 1,
-                'macro' => ''
-              }
-            },
-            {
-              'parent' => {},
-              'text' => '
-',
-              'type' => 'empty_line'
-            }
-          ],
+          'contents' => [],
           'parent' => {},
           'type' => 'preamble_before_content'
         },
@@ -91,7 +55,7 @@ $result_trees{'enumerate_arguments'} = {
               'parent' => {},
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 4,
+                'line_nr' => 2,
                 'macro' => ''
               }
             },
@@ -117,7 +81,7 @@ $result_trees{'enumerate_arguments'} = {
               'parent' => {},
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 5,
+                'line_nr' => 3,
                 'macro' => ''
               }
             },
@@ -147,7 +111,7 @@ $result_trees{'enumerate_arguments'} = {
               'parent' => {},
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 6,
+                'line_nr' => 4,
                 'macro' => ''
               }
             }
@@ -160,7 +124,7 @@ $result_trees{'enumerate_arguments'} = {
           'parent' => {},
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 3,
+            'line_nr' => 1,
             'macro' => ''
           }
         },
@@ -211,7 +175,7 @@ $result_trees{'enumerate_arguments'} = {
               'parent' => {},
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 9,
+                'line_nr' => 7,
                 'macro' => ''
               }
             },
@@ -237,7 +201,7 @@ $result_trees{'enumerate_arguments'} = {
               'parent' => {},
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 10,
+                'line_nr' => 8,
                 'macro' => ''
               }
             },
@@ -267,7 +231,7 @@ $result_trees{'enumerate_arguments'} = {
               'parent' => {},
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 11,
+                'line_nr' => 9,
                 'macro' => ''
               }
             }
@@ -280,7 +244,7 @@ $result_trees{'enumerate_arguments'} = {
           'parent' => {},
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 8,
+            'line_nr' => 6,
             'macro' => ''
           }
         },
@@ -331,7 +295,7 @@ $result_trees{'enumerate_arguments'} = {
               'parent' => {},
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 14,
+                'line_nr' => 12,
                 'macro' => ''
               }
             },
@@ -357,7 +321,7 @@ $result_trees{'enumerate_arguments'} = {
               'parent' => {},
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 15,
+                'line_nr' => 13,
                 'macro' => ''
               }
             },
@@ -387,7 +351,7 @@ $result_trees{'enumerate_arguments'} = {
               'parent' => {},
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 16,
+                'line_nr' => 14,
                 'macro' => ''
               }
             }
@@ -400,7 +364,7 @@ $result_trees{'enumerate_arguments'} = {
           'parent' => {},
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 13,
+            'line_nr' => 11,
             'macro' => ''
           }
         },
@@ -451,7 +415,7 @@ $result_trees{'enumerate_arguments'} = {
               'parent' => {},
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 19,
+                'line_nr' => 17,
                 'macro' => ''
               }
             },
@@ -477,7 +441,7 @@ $result_trees{'enumerate_arguments'} = {
               'parent' => {},
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 20,
+                'line_nr' => 18,
                 'macro' => ''
               }
             },
@@ -507,7 +471,7 @@ $result_trees{'enumerate_arguments'} = {
               'parent' => {},
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 21,
+                'line_nr' => 19,
                 'macro' => ''
               }
             }
@@ -520,7 +484,7 @@ $result_trees{'enumerate_arguments'} = {
           'parent' => {},
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 18,
+            'line_nr' => 16,
             'macro' => ''
           }
         },
@@ -571,7 +535,7 @@ $result_trees{'enumerate_arguments'} = {
               'parent' => {},
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 24,
+                'line_nr' => 22,
                 'macro' => ''
               }
             },
@@ -597,7 +561,7 @@ $result_trees{'enumerate_arguments'} = {
               'parent' => {},
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 25,
+                'line_nr' => 23,
                 'macro' => ''
               }
             },
@@ -627,7 +591,7 @@ $result_trees{'enumerate_arguments'} = {
               'parent' => {},
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 26,
+                'line_nr' => 24,
                 'macro' => ''
               }
             }
@@ -640,7 +604,7 @@ $result_trees{'enumerate_arguments'} = {
           'parent' => {},
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 23,
+            'line_nr' => 21,
             'macro' => ''
           }
         },
@@ -691,7 +655,7 @@ $result_trees{'enumerate_arguments'} = {
               'parent' => {},
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 29,
+                'line_nr' => 27,
                 'macro' => ''
               }
             },
@@ -717,7 +681,7 @@ $result_trees{'enumerate_arguments'} = {
               'parent' => {},
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 30,
+                'line_nr' => 28,
                 'macro' => ''
               }
             },
@@ -747,7 +711,7 @@ $result_trees{'enumerate_arguments'} = {
               'parent' => {},
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 31,
+                'line_nr' => 29,
                 'macro' => ''
               }
             }
@@ -760,7 +724,7 @@ $result_trees{'enumerate_arguments'} = {
           'parent' => {},
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 28,
+            'line_nr' => 26,
             'macro' => ''
           }
         },
@@ -777,10 +741,6 @@ $result_trees{'enumerate_arguments'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'enumerate_arguments'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'enumerate_arguments'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0];
-$result_trees{'enumerate_arguments'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'parent'}
 = 
$result_trees{'enumerate_arguments'}{'contents'}[0]{'contents'}[0]{'contents'}[0];
-$result_trees{'enumerate_arguments'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'enumerate_arguments'}{'contents'}[0]{'contents'}[0];
-$result_trees{'enumerate_arguments'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'parent'}
 = $result_trees{'enumerate_arguments'}{'contents'}[0]{'contents'}[0];
 $result_trees{'enumerate_arguments'}{'contents'}[0]{'contents'}[0]{'parent'} = 
$result_trees{'enumerate_arguments'}{'contents'}[0];
 
$result_trees{'enumerate_arguments'}{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'enumerate_arguments'}{'contents'}[0]{'contents'}[1]{'args'}[0];
 
$result_trees{'enumerate_arguments'}{'contents'}[0]{'contents'}[1]{'args'}[0]{'parent'}
 = $result_trees{'enumerate_arguments'}{'contents'}[0]{'contents'}[1];
@@ -868,9 +828,7 @@ 
$result_trees{'enumerate_arguments'}{'contents'}[0]{'contents'}[11]{'parent'} =
 $result_trees{'enumerate_arguments'}{'contents'}[0]{'contents'}[12]{'parent'} 
= $result_trees{'enumerate_arguments'}{'contents'}[0];
 $result_trees{'enumerate_arguments'}{'contents'}[0]{'parent'} = 
$result_trees{'enumerate_arguments'};
 
-$result_texis{'enumerate_arguments'} = '@setfilename enumerate_arguments.info
-
-@enumerate a
+$result_texis{'enumerate_arguments'} = '@enumerate a
 @item value
 @item value
 @end enumerate
@@ -903,8 +861,7 @@ $result_texis{'enumerate_arguments'} = '@setfilename 
enumerate_arguments.info
 ';
 
 
-$result_texts{'enumerate_arguments'} = '
-a. value
+$result_texts{'enumerate_arguments'} = 'a. value
 b. value
 
 A. value
@@ -931,8 +888,7 @@ $result_floats{'enumerate_arguments'} = {};
 
 
 
-$result_converted{'latex_text'}->{'enumerate_arguments'} = '
-\\begin{document}
+$result_converted{'latex_text'}->{'enumerate_arguments'} = '\\begin{document}
 \\begin{enumerate}[label=\\alph*.]
 \\item value
 \\item value
diff --git 
a/tp/t/results/latex_tests/enumerate_arguments/res_latex/enumerate_arguments.tex
 
b/tp/t/results/latex_tests/enumerate_arguments/res_latex/enumerate_arguments.tex
index 8c04aeeee3..ca5cfff9d8 100644
--- 
a/tp/t/results/latex_tests/enumerate_arguments/res_latex/enumerate_arguments.tex
+++ 
b/tp/t/results/latex_tests/enumerate_arguments/res_latex/enumerate_arguments.tex
@@ -66,7 +66,6 @@
 \makeatother
 \GNUTexinfosetsingleheader{}%
 
-
 \begin{document}
 \begin{enumerate}[label=\alph*.]
 \item value
diff --git a/tp/t/results/latex_tests/error_in_sectioning_command.pl 
b/tp/t/results/latex_tests/error_in_sectioning_command.pl
index ef3b8f1603..6258260c1c 100644
--- a/tp/t/results/latex_tests/error_in_sectioning_command.pl
+++ b/tp/t/results/latex_tests/error_in_sectioning_command.pl
@@ -11,41 +11,6 @@ $result_trees{'error_in_sectioning_command'} = {
       'contents' => [
         {
           'contents' => [
-            {
-              'args' => [
-                {
-                  'contents' => [
-                    {
-                      'parent' => {},
-                      'text' => 'error_in_sectioning_command.info'
-                    }
-                  ],
-                  'extra' => {
-                    'spaces_after_argument' => '
-'
-                  },
-                  'parent' => {},
-                  'type' => 'line_arg'
-                }
-              ],
-              'cmdname' => 'setfilename',
-              'extra' => {
-                'spaces_before_argument' => ' ',
-                'text_arg' => 'error_in_sectioning_command.info'
-              },
-              'parent' => {},
-              'source_info' => {
-                'file_name' => '',
-                'line_nr' => 1,
-                'macro' => ''
-              }
-            },
-            {
-              'parent' => {},
-              'text' => '
-',
-              'type' => 'empty_line'
-            },
             {
               'args' => [
                 {
@@ -59,7 +24,7 @@ $result_trees{'error_in_sectioning_command'} = {
               'parent' => {},
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 3,
+                'line_nr' => 1,
                 'macro' => ''
               }
             },
@@ -114,7 +79,7 @@ $result_trees{'error_in_sectioning_command'} = {
       'parent' => {},
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 5,
+        'line_nr' => 3,
         'macro' => ''
       }
     },
@@ -150,7 +115,7 @@ $result_trees{'error_in_sectioning_command'} = {
       'parent' => {},
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 6,
+        'line_nr' => 4,
         'macro' => ''
       }
     },
@@ -188,7 +153,7 @@ $result_trees{'error_in_sectioning_command'} = {
               'parent' => {},
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 8,
+                'line_nr' => 6,
                 'macro' => ''
               }
             },
@@ -209,7 +174,7 @@ $result_trees{'error_in_sectioning_command'} = {
               'parent' => {},
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 8,
+                'line_nr' => 6,
                 'macro' => ''
               }
             },
@@ -252,7 +217,7 @@ $result_trees{'error_in_sectioning_command'} = {
       'parent' => {},
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 8,
+        'line_nr' => 6,
         'macro' => ''
       }
     },
@@ -290,7 +255,7 @@ $result_trees{'error_in_sectioning_command'} = {
               'parent' => {},
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 9,
+                'line_nr' => 7,
                 'macro' => ''
               }
             },
@@ -311,7 +276,7 @@ $result_trees{'error_in_sectioning_command'} = {
               'parent' => {},
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 9,
+                'line_nr' => 7,
                 'macro' => ''
               }
             },
@@ -355,7 +320,7 @@ $result_trees{'error_in_sectioning_command'} = {
               'parent' => {},
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 11,
+                'line_nr' => 9,
                 'macro' => ''
               }
             },
@@ -375,20 +340,16 @@ $result_trees{'error_in_sectioning_command'} = {
       'parent' => {},
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 9,
+        'line_nr' => 7,
         'macro' => ''
       }
     }
   ],
   'type' => 'document_root'
 };
-$result_trees{'error_in_sectioning_command'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'error_in_sectioning_command'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0];
 
$result_trees{'error_in_sectioning_command'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'parent'}
 = 
$result_trees{'error_in_sectioning_command'}{'contents'}[0]{'contents'}[0]{'contents'}[0];
 
$result_trees{'error_in_sectioning_command'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'error_in_sectioning_command'}{'contents'}[0]{'contents'}[0];
 
$result_trees{'error_in_sectioning_command'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'parent'}
 = $result_trees{'error_in_sectioning_command'}{'contents'}[0]{'contents'}[0];
-$result_trees{'error_in_sectioning_command'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'args'}[0]{'parent'}
 = 
$result_trees{'error_in_sectioning_command'}{'contents'}[0]{'contents'}[0]{'contents'}[2];
-$result_trees{'error_in_sectioning_command'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'parent'}
 = $result_trees{'error_in_sectioning_command'}{'contents'}[0]{'contents'}[0];
-$result_trees{'error_in_sectioning_command'}{'contents'}[0]{'contents'}[0]{'contents'}[3]{'parent'}
 = $result_trees{'error_in_sectioning_command'}{'contents'}[0]{'contents'}[0];
 
$result_trees{'error_in_sectioning_command'}{'contents'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'error_in_sectioning_command'}{'contents'}[0];
 $result_trees{'error_in_sectioning_command'}{'contents'}[0]{'parent'} = 
$result_trees{'error_in_sectioning_command'};
 
$result_trees{'error_in_sectioning_command'}{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'error_in_sectioning_command'}{'contents'}[1]{'args'}[0];
@@ -439,9 +400,7 @@ 
$result_trees{'error_in_sectioning_command'}{'contents'}[4]{'contents'}[1]{'cont
 
$result_trees{'error_in_sectioning_command'}{'contents'}[4]{'contents'}[1]{'parent'}
 = $result_trees{'error_in_sectioning_command'}{'contents'}[4];
 $result_trees{'error_in_sectioning_command'}{'contents'}[4]{'parent'} = 
$result_trees{'error_in_sectioning_command'};
 
-$result_texis{'error_in_sectioning_command'} = '@setfilename 
error_in_sectioning_command.info
-
-@contents
+$result_texis{'error_in_sectioning_command'} = '@contents
 
 @node Top
 @top top section
@@ -454,7 +413,6 @@ Describe @error{}.
 
 
 $result_texts{'error_in_sectioning_command'} = '
-
 top section
 ***********
 
@@ -562,7 +520,6 @@ $result_floats{'error_in_sectioning_command'} = {};
 
 
 $result_converted{'latex_text'}->{'error_in_sectioning_command'} = '
-
 \\begin{document}
 \\tableofcontents\\newpage
 \\label{anchor:Top}%
diff --git 
a/tp/t/results/latex_tests/error_in_sectioning_command/res_latex/error_in_sectioning_command.tex
 
b/tp/t/results/latex_tests/error_in_sectioning_command/res_latex/error_in_sectioning_command.tex
index 7063ebc92b..3965ccb412 100644
--- 
a/tp/t/results/latex_tests/error_in_sectioning_command/res_latex/error_in_sectioning_command.tex
+++ 
b/tp/t/results/latex_tests/error_in_sectioning_command/res_latex/error_in_sectioning_command.tex
@@ -63,7 +63,6 @@
 \GNUTexinfosetsingleheader{}%
 
 
-
 \begin{document}
 \tableofcontents\newpage
 \label{anchor:Top}%
diff --git a/tp/t/results/latex_tests/example_in_cartouche.pl 
b/tp/t/results/latex_tests/example_in_cartouche.pl
index b6033516a8..3bdfb7ab75 100644
--- a/tp/t/results/latex_tests/example_in_cartouche.pl
+++ b/tp/t/results/latex_tests/example_in_cartouche.pl
@@ -10,43 +10,7 @@ $result_trees{'example_in_cartouche'} = {
     {
       'contents' => [
         {
-          'contents' => [
-            {
-              'args' => [
-                {
-                  'contents' => [
-                    {
-                      'parent' => {},
-                      'text' => 'example_in_cartouche.info'
-                    }
-                  ],
-                  'extra' => {
-                    'spaces_after_argument' => '
-'
-                  },
-                  'parent' => {},
-                  'type' => 'line_arg'
-                }
-              ],
-              'cmdname' => 'setfilename',
-              'extra' => {
-                'spaces_before_argument' => ' ',
-                'text_arg' => 'example_in_cartouche.info'
-              },
-              'parent' => {},
-              'source_info' => {
-                'file_name' => '',
-                'line_nr' => 1,
-                'macro' => ''
-              }
-            },
-            {
-              'parent' => {},
-              'text' => '
-',
-              'type' => 'empty_line'
-            }
-          ],
+          'contents' => [],
           'parent' => {},
           'type' => 'preamble_before_content'
         },
@@ -118,7 +82,7 @@ $result_trees{'example_in_cartouche'} = {
               'parent' => {},
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 7,
+                'line_nr' => 5,
                 'macro' => ''
               }
             }
@@ -129,7 +93,7 @@ $result_trees{'example_in_cartouche'} = {
           'parent' => {},
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 3,
+            'line_nr' => 1,
             'macro' => ''
           }
         },
@@ -209,7 +173,7 @@ $result_trees{'example_in_cartouche'} = {
                   'parent' => {},
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 13,
+                    'line_nr' => 11,
                     'macro' => ''
                   }
                 }
@@ -220,7 +184,7 @@ $result_trees{'example_in_cartouche'} = {
               'parent' => {},
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 10,
+                'line_nr' => 8,
                 'macro' => ''
               }
             },
@@ -250,7 +214,7 @@ $result_trees{'example_in_cartouche'} = {
               'parent' => {},
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 14,
+                'line_nr' => 12,
                 'macro' => ''
               }
             }
@@ -261,7 +225,7 @@ $result_trees{'example_in_cartouche'} = {
           'parent' => {},
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 9,
+            'line_nr' => 7,
             'macro' => ''
           }
         }
@@ -272,10 +236,6 @@ $result_trees{'example_in_cartouche'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'example_in_cartouche'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'example_in_cartouche'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0];
-$result_trees{'example_in_cartouche'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'parent'}
 = 
$result_trees{'example_in_cartouche'}{'contents'}[0]{'contents'}[0]{'contents'}[0];
-$result_trees{'example_in_cartouche'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'example_in_cartouche'}{'contents'}[0]{'contents'}[0];
-$result_trees{'example_in_cartouche'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'parent'}
 = $result_trees{'example_in_cartouche'}{'contents'}[0]{'contents'}[0];
 $result_trees{'example_in_cartouche'}{'contents'}[0]{'contents'}[0]{'parent'} 
= $result_trees{'example_in_cartouche'}{'contents'}[0];
 
$result_trees{'example_in_cartouche'}{'contents'}[0]{'contents'}[1]{'args'}[0]{'parent'}
 = $result_trees{'example_in_cartouche'}{'contents'}[0]{'contents'}[1];
 
$result_trees{'example_in_cartouche'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'example_in_cartouche'}{'contents'}[0]{'contents'}[1]{'contents'}[0];
@@ -306,9 +266,7 @@ 
$result_trees{'example_in_cartouche'}{'contents'}[0]{'contents'}[3]{'extra'}{'en
 $result_trees{'example_in_cartouche'}{'contents'}[0]{'contents'}[3]{'parent'} 
= $result_trees{'example_in_cartouche'}{'contents'}[0];
 $result_trees{'example_in_cartouche'}{'contents'}[0]{'parent'} = 
$result_trees{'example_in_cartouche'};
 
-$result_texis{'example_in_cartouche'} = '@setfilename example_in_cartouche.info
-
-@cartouche
+$result_texis{'example_in_cartouche'} = '@cartouche
 Normal cartouche
 
 New para
@@ -323,8 +281,7 @@ New para
 ';
 
 
-$result_texts{'example_in_cartouche'} = '
-Normal cartouche
+$result_texts{'example_in_cartouche'} = 'Normal cartouche
 
 New para
 
@@ -339,8 +296,7 @@ $result_floats{'example_in_cartouche'} = {};
 
 
 
-$result_converted{'latex_text'}->{'example_in_cartouche'} = '
-\\begin{document}
+$result_converted{'latex_text'}->{'example_in_cartouche'} = '\\begin{document}
 \\begin{mdframed}[style=GNUTexinfocartouche]
 Normal cartouche
 
diff --git 
a/tp/t/results/latex_tests/example_in_cartouche/res_latex/example_in_cartouche.tex
 
b/tp/t/results/latex_tests/example_in_cartouche/res_latex/example_in_cartouche.tex
index ed992384a7..8823870dc9 100644
--- 
a/tp/t/results/latex_tests/example_in_cartouche/res_latex/example_in_cartouche.tex
+++ 
b/tp/t/results/latex_tests/example_in_cartouche/res_latex/example_in_cartouche.tex
@@ -68,7 +68,6 @@ roundcorner=10pt}
 \makeatother
 \GNUTexinfosetsingleheader{}%
 
-
 \begin{document}
 \begin{mdframed}[style=GNUTexinfocartouche]
 Normal cartouche
diff --git a/tp/t/results/latex_tests/float_and_refs.pl 
b/tp/t/results/latex_tests/float_and_refs.pl
index c8fee14a15..e4c037e4c3 100644
--- a/tp/t/results/latex_tests/float_and_refs.pl
+++ b/tp/t/results/latex_tests/float_and_refs.pl
@@ -10,43 +10,7 @@ $result_trees{'float_and_refs'} = {
     {
       'contents' => [
         {
-          'contents' => [
-            {
-              'args' => [
-                {
-                  'contents' => [
-                    {
-                      'parent' => {},
-                      'text' => 'float_and_refs.info'
-                    }
-                  ],
-                  'extra' => {
-                    'spaces_after_argument' => '
-'
-                  },
-                  'parent' => {},
-                  'type' => 'line_arg'
-                }
-              ],
-              'cmdname' => 'setfilename',
-              'extra' => {
-                'spaces_before_argument' => ' ',
-                'text_arg' => 'float_and_refs.info'
-              },
-              'parent' => {},
-              'source_info' => {
-                'file_name' => '',
-                'line_nr' => 1,
-                'macro' => ''
-              }
-            },
-            {
-              'parent' => {},
-              'text' => '
-',
-              'type' => 'empty_line'
-            }
-          ],
+          'contents' => [],
           'parent' => {},
           'type' => 'preamble_before_content'
         }
@@ -91,7 +55,7 @@ $result_trees{'float_and_refs'} = {
       'parent' => {},
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 3,
+        'line_nr' => 1,
         'macro' => ''
       }
     },
@@ -127,7 +91,7 @@ $result_trees{'float_and_refs'} = {
       'parent' => {},
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 4,
+        'line_nr' => 2,
         'macro' => ''
       }
     },
@@ -168,7 +132,7 @@ $result_trees{'float_and_refs'} = {
       'parent' => {},
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 6,
+        'line_nr' => 4,
         'macro' => ''
       }
     },
@@ -260,7 +224,7 @@ $result_trees{'float_and_refs'} = {
               'parent' => {},
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 11,
+                'line_nr' => 9,
                 'macro' => ''
               }
             },
@@ -296,7 +260,7 @@ $result_trees{'float_and_refs'} = {
               'parent' => {},
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 12,
+                'line_nr' => 10,
                 'macro' => ''
               }
             },
@@ -331,7 +295,7 @@ $result_trees{'float_and_refs'} = {
               'parent' => {},
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 13,
+                'line_nr' => 11,
                 'macro' => ''
               }
             }
@@ -353,7 +317,7 @@ $result_trees{'float_and_refs'} = {
           'parent' => {},
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 9,
+            'line_nr' => 7,
             'macro' => ''
           }
         },
@@ -431,7 +395,7 @@ $result_trees{'float_and_refs'} = {
               'parent' => {},
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 17,
+                'line_nr' => 15,
                 'macro' => ''
               }
             },
@@ -467,7 +431,7 @@ $result_trees{'float_and_refs'} = {
               'parent' => {},
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 18,
+                'line_nr' => 16,
                 'macro' => ''
               }
             },
@@ -502,7 +466,7 @@ $result_trees{'float_and_refs'} = {
               'parent' => {},
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 19,
+                'line_nr' => 17,
                 'macro' => ''
               }
             }
@@ -527,7 +491,7 @@ $result_trees{'float_and_refs'} = {
           'parent' => {},
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 15,
+            'line_nr' => 13,
             'macro' => ''
           }
         },
@@ -605,7 +569,7 @@ $result_trees{'float_and_refs'} = {
               'parent' => {},
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 23,
+                'line_nr' => 21,
                 'macro' => ''
               }
             },
@@ -641,7 +605,7 @@ $result_trees{'float_and_refs'} = {
               'parent' => {},
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 24,
+                'line_nr' => 22,
                 'macro' => ''
               }
             },
@@ -676,7 +640,7 @@ $result_trees{'float_and_refs'} = {
               'parent' => {},
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 25,
+                'line_nr' => 23,
                 'macro' => ''
               }
             }
@@ -701,7 +665,7 @@ $result_trees{'float_and_refs'} = {
           'parent' => {},
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 21,
+            'line_nr' => 19,
             'macro' => ''
           }
         },
@@ -718,7 +682,7 @@ $result_trees{'float_and_refs'} = {
       'parent' => {},
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 7,
+        'line_nr' => 5,
         'macro' => ''
       }
     },
@@ -776,7 +740,7 @@ $result_trees{'float_and_refs'} = {
               'parent' => {},
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 29,
+                'line_nr' => 27,
                 'macro' => ''
               }
             },
@@ -825,7 +789,7 @@ $result_trees{'float_and_refs'} = {
               'parent' => {},
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 30,
+                'line_nr' => 28,
                 'macro' => ''
               }
             },
@@ -887,7 +851,7 @@ $result_trees{'float_and_refs'} = {
               'parent' => {},
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 31,
+                'line_nr' => 29,
                 'macro' => ''
               }
             },
@@ -960,7 +924,7 @@ $result_trees{'float_and_refs'} = {
               'parent' => {},
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 32,
+                'line_nr' => 30,
                 'macro' => ''
               }
             },
@@ -1046,7 +1010,7 @@ $result_trees{'float_and_refs'} = {
               'parent' => {},
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 33,
+                'line_nr' => 31,
                 'macro' => ''
               }
             },
@@ -1094,7 +1058,7 @@ $result_trees{'float_and_refs'} = {
               'parent' => {},
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 35,
+                'line_nr' => 33,
                 'macro' => ''
               }
             },
@@ -1143,7 +1107,7 @@ $result_trees{'float_and_refs'} = {
               'parent' => {},
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 36,
+                'line_nr' => 34,
                 'macro' => ''
               }
             },
@@ -1205,7 +1169,7 @@ $result_trees{'float_and_refs'} = {
               'parent' => {},
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 37,
+                'line_nr' => 35,
                 'macro' => ''
               }
             },
@@ -1278,7 +1242,7 @@ $result_trees{'float_and_refs'} = {
               'parent' => {},
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 38,
+                'line_nr' => 36,
                 'macro' => ''
               }
             },
@@ -1364,7 +1328,7 @@ $result_trees{'float_and_refs'} = {
               'parent' => {},
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 39,
+                'line_nr' => 37,
                 'macro' => ''
               }
             },
@@ -1412,7 +1376,7 @@ $result_trees{'float_and_refs'} = {
               'parent' => {},
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 41,
+                'line_nr' => 39,
                 'macro' => ''
               }
             },
@@ -1461,7 +1425,7 @@ $result_trees{'float_and_refs'} = {
               'parent' => {},
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 42,
+                'line_nr' => 40,
                 'macro' => ''
               }
             },
@@ -1523,7 +1487,7 @@ $result_trees{'float_and_refs'} = {
               'parent' => {},
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 43,
+                'line_nr' => 41,
                 'macro' => ''
               }
             },
@@ -1596,7 +1560,7 @@ $result_trees{'float_and_refs'} = {
               'parent' => {},
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 44,
+                'line_nr' => 42,
                 'macro' => ''
               }
             },
@@ -1682,7 +1646,7 @@ $result_trees{'float_and_refs'} = {
               'parent' => {},
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 45,
+                'line_nr' => 43,
                 'macro' => ''
               }
             },
@@ -1708,7 +1672,7 @@ $result_trees{'float_and_refs'} = {
       'parent' => {},
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 27,
+        'line_nr' => 25,
         'macro' => ''
       }
     },
@@ -1758,7 +1722,7 @@ $result_trees{'float_and_refs'} = {
           'parent' => {},
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 49,
+            'line_nr' => 47,
             'macro' => ''
           }
         },
@@ -1792,7 +1756,7 @@ $result_trees{'float_and_refs'} = {
           'parent' => {},
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 50,
+            'line_nr' => 48,
             'macro' => ''
           }
         },
@@ -1826,7 +1790,7 @@ $result_trees{'float_and_refs'} = {
           'parent' => {},
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 51,
+            'line_nr' => 49,
             'macro' => ''
           }
         },
@@ -1843,17 +1807,13 @@ $result_trees{'float_and_refs'} = {
       'parent' => {},
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 47,
+        'line_nr' => 45,
         'macro' => ''
       }
     }
   ],
   'type' => 'document_root'
 };
-$result_trees{'float_and_refs'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'float_and_refs'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0];
-$result_trees{'float_and_refs'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'parent'}
 = $result_trees{'float_and_refs'}{'contents'}[0]{'contents'}[0]{'contents'}[0];
-$result_trees{'float_and_refs'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'float_and_refs'}{'contents'}[0]{'contents'}[0];
-$result_trees{'float_and_refs'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'parent'}
 = $result_trees{'float_and_refs'}{'contents'}[0]{'contents'}[0];
 $result_trees{'float_and_refs'}{'contents'}[0]{'contents'}[0]{'parent'} = 
$result_trees{'float_and_refs'}{'contents'}[0];
 $result_trees{'float_and_refs'}{'contents'}[0]{'parent'} = 
$result_trees{'float_and_refs'};
 
$result_trees{'float_and_refs'}{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'float_and_refs'}{'contents'}[1]{'args'}[0];
@@ -2129,9 +2089,7 @@ 
$result_trees{'float_and_refs'}{'contents'}[6]{'contents'}[3]{'parent'} = $resul
 $result_trees{'float_and_refs'}{'contents'}[6]{'contents'}[4]{'parent'} = 
$result_trees{'float_and_refs'}{'contents'}[6];
 $result_trees{'float_and_refs'}{'contents'}[6]{'parent'} = 
$result_trees{'float_and_refs'};
 
-$result_texis{'float_and_refs'} = '@setfilename float_and_refs.info
-
-@node Top
+$result_texis{'float_and_refs'} = '@node Top
 @top top
 
 @node chapter
@@ -2184,8 +2142,7 @@ In figure
 ';
 
 
-$result_texts{'float_and_refs'} = '
-top
+$result_texts{'float_and_refs'} = 'top
 ***
 
 1 chapter
@@ -2468,8 +2425,7 @@ 
$result_floats{'float_and_refs'}{'Thing'}[0]{'extra'}{'shortcaption'}{'extra'}{'
 
 
 
-$result_converted{'latex_text'}->{'float_and_refs'} = '
-\\begin{document}
+$result_converted{'latex_text'}->{'float_and_refs'} = '\\begin{document}
 \\label{anchor:Top}%
 \\chapter{{chapter}}
 \\label{anchor:chapter}%
diff --git 
a/tp/t/results/latex_tests/float_and_refs/res_latex/float_and_refs.tex 
b/tp/t/results/latex_tests/float_and_refs/res_latex/float_and_refs.tex
index 8d220f00da..f49fa33a5c 100644
--- a/tp/t/results/latex_tests/float_and_refs/res_latex/float_and_refs.tex
+++ b/tp/t/results/latex_tests/float_and_refs/res_latex/float_and_refs.tex
@@ -68,7 +68,6 @@
 \makeatother
 \GNUTexinfosetsingleheader{}%
 
-
 \begin{document}
 \label{anchor:Top}%
 \chapter{{chapter}}
diff --git a/tp/t/results/latex_tests/fonttextsize.pl 
b/tp/t/results/latex_tests/fonttextsize.pl
index 74373b9dec..c15bdda867 100644
--- a/tp/t/results/latex_tests/fonttextsize.pl
+++ b/tp/t/results/latex_tests/fonttextsize.pl
@@ -11,41 +11,6 @@ $result_trees{'fonttextsize'} = {
       'contents' => [
         {
           'contents' => [
-            {
-              'args' => [
-                {
-                  'contents' => [
-                    {
-                      'parent' => {},
-                      'text' => 'fonttextsize.info'
-                    }
-                  ],
-                  'extra' => {
-                    'spaces_after_argument' => '
-'
-                  },
-                  'parent' => {},
-                  'type' => 'line_arg'
-                }
-              ],
-              'cmdname' => 'setfilename',
-              'extra' => {
-                'spaces_before_argument' => ' ',
-                'text_arg' => 'fonttextsize.info'
-              },
-              'parent' => {},
-              'source_info' => {
-                'file_name' => '',
-                'line_nr' => 1,
-                'macro' => ''
-              }
-            },
-            {
-              'parent' => {},
-              'text' => '
-',
-              'type' => 'empty_line'
-            },
             {
               'args' => [
                 {
@@ -73,7 +38,7 @@ $result_trees{'fonttextsize'} = {
               'parent' => {},
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 3,
+                'line_nr' => 1,
                 'macro' => ''
               }
             },
@@ -128,7 +93,7 @@ $result_trees{'fonttextsize'} = {
       'parent' => {},
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 5,
+        'line_nr' => 3,
         'macro' => ''
       }
     },
@@ -164,7 +129,7 @@ $result_trees{'fonttextsize'} = {
       'parent' => {},
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 6,
+        'line_nr' => 4,
         'macro' => ''
       }
     },
@@ -205,7 +170,7 @@ $result_trees{'fonttextsize'} = {
       'parent' => {},
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 8,
+        'line_nr' => 6,
         'macro' => ''
       }
     },
@@ -241,7 +206,7 @@ $result_trees{'fonttextsize'} = {
       'parent' => {},
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 9,
+        'line_nr' => 7,
         'macro' => ''
       }
     },
@@ -277,7 +242,7 @@ $result_trees{'fonttextsize'} = {
       'parent' => {},
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 11,
+        'line_nr' => 9,
         'macro' => ''
       }
     },
@@ -344,7 +309,7 @@ $result_trees{'fonttextsize'} = {
           'parent' => {},
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 16,
+            'line_nr' => 14,
             'macro' => ''
           }
         }
@@ -355,7 +320,7 @@ $result_trees{'fonttextsize'} = {
       'parent' => {},
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 13,
+        'line_nr' => 11,
         'macro' => ''
       }
     },
@@ -426,7 +391,7 @@ $result_trees{'fonttextsize'} = {
           'parent' => {},
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 21,
+            'line_nr' => 19,
             'macro' => ''
           }
         }
@@ -437,7 +402,7 @@ $result_trees{'fonttextsize'} = {
       'parent' => {},
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 17,
+        'line_nr' => 15,
         'macro' => ''
       }
     },
@@ -508,7 +473,7 @@ $result_trees{'fonttextsize'} = {
           'parent' => {},
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 26,
+            'line_nr' => 24,
             'macro' => ''
           }
         }
@@ -519,7 +484,7 @@ $result_trees{'fonttextsize'} = {
       'parent' => {},
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 22,
+        'line_nr' => 20,
         'macro' => ''
       }
     },
@@ -566,7 +531,7 @@ $result_trees{'fonttextsize'} = {
       'parent' => {},
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 27,
+        'line_nr' => 25,
         'macro' => ''
       }
     }
@@ -577,10 +542,6 @@ 
$result_trees{'fonttextsize'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args
 
$result_trees{'fonttextsize'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'parent'}
 = $result_trees{'fonttextsize'}{'contents'}[0]{'contents'}[0]{'contents'}[0];
 
$result_trees{'fonttextsize'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'fonttextsize'}{'contents'}[0]{'contents'}[0];
 
$result_trees{'fonttextsize'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'parent'}
 = $result_trees{'fonttextsize'}{'contents'}[0]{'contents'}[0];
-$result_trees{'fonttextsize'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'fonttextsize'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'args'}[0];
-$result_trees{'fonttextsize'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'args'}[0]{'parent'}
 = $result_trees{'fonttextsize'}{'contents'}[0]{'contents'}[0]{'contents'}[2];
-$result_trees{'fonttextsize'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'parent'}
 = $result_trees{'fonttextsize'}{'contents'}[0]{'contents'}[0];
-$result_trees{'fonttextsize'}{'contents'}[0]{'contents'}[0]{'contents'}[3]{'parent'}
 = $result_trees{'fonttextsize'}{'contents'}[0]{'contents'}[0];
 $result_trees{'fonttextsize'}{'contents'}[0]{'contents'}[0]{'parent'} = 
$result_trees{'fonttextsize'}{'contents'}[0];
 $result_trees{'fonttextsize'}{'contents'}[0]{'parent'} = 
$result_trees{'fonttextsize'};
 
$result_trees{'fonttextsize'}{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'fonttextsize'}{'contents'}[1]{'args'}[0];
@@ -641,9 +602,7 @@ 
$result_trees{'fonttextsize'}{'contents'}[9]{'contents'}[1]{'contents'}[0]{'pare
 $result_trees{'fonttextsize'}{'contents'}[9]{'contents'}[1]{'parent'} = 
$result_trees{'fonttextsize'}{'contents'}[9];
 $result_trees{'fonttextsize'}{'contents'}[9]{'parent'} = 
$result_trees{'fonttextsize'};
 
-$result_texis{'fonttextsize'} = '@setfilename fonttextsize.info
-
-@fonttextsize 10
+$result_texis{'fonttextsize'} = '@fonttextsize 10
 
 @node Top
 @top section top
@@ -674,7 +633,6 @@ In 15pts
 
 
 $result_texts{'fonttextsize'} = '
-
 section top
 ***********
 
@@ -859,7 +817,7 @@ $result_errors{'fonttextsize'} = [
     'error_line' => 'warning: multiple @fonttextsize
 ',
     'file_name' => '',
-    'line_nr' => 16,
+    'line_nr' => 14,
     'macro' => '',
     'text' => 'multiple @fonttextsize',
     'type' => 'warning'
@@ -868,7 +826,7 @@ $result_errors{'fonttextsize'} = [
     'error_line' => 'warning: multiple @fonttextsize
 ',
     'file_name' => '',
-    'line_nr' => 21,
+    'line_nr' => 19,
     'macro' => '',
     'text' => 'multiple @fonttextsize',
     'type' => 'warning'
@@ -877,7 +835,7 @@ $result_errors{'fonttextsize'} = [
     'error_line' => 'Only @fonttextsize 10 or 11 is supported, not `8\'
 ',
     'file_name' => '',
-    'line_nr' => 21,
+    'line_nr' => 19,
     'macro' => '',
     'text' => 'Only @fonttextsize 10 or 11 is supported, not `8\'',
     'type' => 'error'
@@ -886,7 +844,7 @@ $result_errors{'fonttextsize'} = [
     'error_line' => 'warning: multiple @fonttextsize
 ',
     'file_name' => '',
-    'line_nr' => 26,
+    'line_nr' => 24,
     'macro' => '',
     'text' => 'multiple @fonttextsize',
     'type' => 'warning'
@@ -895,7 +853,7 @@ $result_errors{'fonttextsize'} = [
     'error_line' => 'Only @fonttextsize 10 or 11 is supported, not `15\'
 ',
     'file_name' => '',
-    'line_nr' => 26,
+    'line_nr' => 24,
     'macro' => '',
     'text' => 'Only @fonttextsize 10 or 11 is supported, not `15\'',
     'type' => 'error'
@@ -907,8 +865,7 @@ $result_floats{'fonttextsize'} = {};
 
 
 
-$result_converted{'latex_text'}->{'fonttextsize'} = '
-\\changefontsize{10}
+$result_converted{'latex_text'}->{'fonttextsize'} = '\\changefontsize{10}
 
 \\begin{document}
 \\label{anchor:Top}%
diff --git a/tp/t/results/latex_tests/fonttextsize/res_latex/fonttextsize.tex 
b/tp/t/results/latex_tests/fonttextsize/res_latex/fonttextsize.tex
index 273bf495a2..b810b91980 100644
--- a/tp/t/results/latex_tests/fonttextsize/res_latex/fonttextsize.tex
+++ b/tp/t/results/latex_tests/fonttextsize/res_latex/fonttextsize.tex
@@ -63,7 +63,6 @@
 \makeatother
 \GNUTexinfosetsingleheader{}%
 
-
 \changefontsize{10}
 
 \begin{document}
diff --git a/tp/t/results/latex_tests/indices.pl 
b/tp/t/results/latex_tests/indices.pl
index e870db64cb..6e9f021e6a 100644
--- a/tp/t/results/latex_tests/indices.pl
+++ b/tp/t/results/latex_tests/indices.pl
@@ -11,41 +11,18 @@ $result_trees{'indices'} = {
       'contents' => [
         {
           'contents' => [
-            {
-              'args' => [
-                {
-                  'contents' => [
-                    {
-                      'parent' => {},
-                      'text' => 'indices.info'
-                    }
-                  ],
-                  'extra' => {
-                    'spaces_after_argument' => '
-'
-                  },
-                  'parent' => {},
-                  'type' => 'line_arg'
-                }
-              ],
-              'cmdname' => 'setfilename',
-              'extra' => {
-                'spaces_before_argument' => ' ',
-                'text_arg' => 'indices.info'
-              },
-              'parent' => {},
-              'source_info' => {
-                'file_name' => '',
-                'line_nr' => 1,
-                'macro' => ''
-              }
-            },
             {
               'parent' => {},
               'text' => '
 ',
-              'type' => 'empty_line'
-            },
+              'type' => 'text_before_beginning'
+            }
+          ],
+          'parent' => {},
+          'type' => 'preamble_before_beginning'
+        },
+        {
+          'contents' => [
             {
               'args' => [
                 {
@@ -121,7 +98,7 @@ $result_trees{'indices'} = {
       'parent' => {},
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 5,
+        'line_nr' => 4,
         'macro' => ''
       }
     },
@@ -157,7 +134,7 @@ $result_trees{'indices'} = {
       'parent' => {},
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 6,
+        'line_nr' => 5,
         'macro' => ''
       }
     },
@@ -199,7 +176,7 @@ $result_trees{'indices'} = {
       'parent' => {},
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 8,
+        'line_nr' => 7,
         'macro' => ''
       }
     },
@@ -258,7 +235,7 @@ $result_trees{'indices'} = {
                   'parent' => {},
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 11,
+                    'line_nr' => 10,
                     'macro' => ''
                   }
                 },
@@ -292,7 +269,7 @@ $result_trees{'indices'} = {
                   'parent' => {},
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 11,
+                    'line_nr' => 10,
                     'macro' => ''
                   }
                 },
@@ -318,7 +295,7 @@ $result_trees{'indices'} = {
                   'parent' => {},
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 11,
+                    'line_nr' => 10,
                     'macro' => ''
                   }
                 }
@@ -377,7 +354,7 @@ $result_trees{'indices'} = {
                       'parent' => {},
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 11,
+                        'line_nr' => 10,
                         'macro' => ''
                       }
                     },
@@ -416,7 +393,7 @@ $result_trees{'indices'} = {
                       'parent' => {},
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 11,
+                        'line_nr' => 10,
                         'macro' => ''
                       }
                     },
@@ -450,7 +427,7 @@ $result_trees{'indices'} = {
                       'parent' => {},
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 11,
+                        'line_nr' => 10,
                         'macro' => ''
                       }
                     },
@@ -476,7 +453,7 @@ $result_trees{'indices'} = {
                       'parent' => {},
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 11,
+                        'line_nr' => 10,
                         'macro' => ''
                       }
                     },
@@ -515,7 +492,7 @@ $result_trees{'indices'} = {
                               'parent' => {},
                               'source_info' => {
                                 'file_name' => '',
-                                'line_nr' => 11,
+                                'line_nr' => 10,
                                 'macro' => ''
                               }
                             },
@@ -549,7 +526,7 @@ $result_trees{'indices'} = {
                               'parent' => {},
                               'source_info' => {
                                 'file_name' => '',
-                                'line_nr' => 11,
+                                'line_nr' => 10,
                                 'macro' => ''
                               }
                             },
@@ -575,7 +552,7 @@ $result_trees{'indices'} = {
                               'parent' => {},
                               'source_info' => {
                                 'file_name' => '',
-                                'line_nr' => 11,
+                                'line_nr' => 10,
                                 'macro' => ''
                               }
                             }
@@ -589,7 +566,7 @@ $result_trees{'indices'} = {
                       'parent' => {},
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 11,
+                        'line_nr' => 10,
                         'macro' => ''
                       }
                     }
@@ -612,7 +589,7 @@ $result_trees{'indices'} = {
               'parent' => {},
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 11,
+                'line_nr' => 10,
                 'macro' => ''
               }
             }
@@ -620,7 +597,7 @@ $result_trees{'indices'} = {
           'parent' => {},
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 11,
+            'line_nr' => 10,
             'macro' => ''
           },
           'type' => 'index_entry_command'
@@ -664,7 +641,7 @@ $result_trees{'indices'} = {
           'parent' => {},
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 12,
+            'line_nr' => 11,
             'macro' => ''
           },
           'type' => 'index_entry_command'
@@ -700,7 +677,7 @@ $result_trees{'indices'} = {
                   'parent' => {},
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 13,
+                    'line_nr' => 12,
                     'macro' => ''
                   }
                 }
@@ -736,7 +713,7 @@ $result_trees{'indices'} = {
           'parent' => {},
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 13,
+            'line_nr' => 12,
             'macro' => ''
           },
           'type' => 'index_entry_command'
@@ -797,7 +774,7 @@ $result_trees{'indices'} = {
                   'parent' => {},
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 17,
+                    'line_nr' => 16,
                     'macro' => ''
                   }
                 }
@@ -846,7 +823,7 @@ $result_trees{'indices'} = {
           'parent' => {},
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 17,
+            'line_nr' => 16,
             'macro' => ''
           },
           'type' => 'index_entry_command'
@@ -883,7 +860,7 @@ $result_trees{'indices'} = {
                   'parent' => {},
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 19,
+                    'line_nr' => 18,
                     'macro' => ''
                   }
                 },
@@ -909,7 +886,7 @@ $result_trees{'indices'} = {
                   'parent' => {},
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 19,
+                    'line_nr' => 18,
                     'macro' => ''
                   }
                 }
@@ -941,7 +918,7 @@ $result_trees{'indices'} = {
           'parent' => {},
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 19,
+            'line_nr' => 18,
             'macro' => ''
           },
           'type' => 'index_entry_command'
@@ -979,7 +956,7 @@ $result_trees{'indices'} = {
           'parent' => {},
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 21,
+            'line_nr' => 20,
             'macro' => ''
           }
         },
@@ -1016,7 +993,7 @@ $result_trees{'indices'} = {
           'parent' => {},
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 23,
+            'line_nr' => 22,
             'macro' => ''
           }
         }
@@ -1027,22 +1004,20 @@ $result_trees{'indices'} = {
       'parent' => {},
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 9,
+        'line_nr' => 8,
         'macro' => ''
       }
     }
   ],
   'type' => 'document_root'
 };
-$result_trees{'indices'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'indices'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0];
-$result_trees{'indices'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'parent'}
 = $result_trees{'indices'}{'contents'}[0]{'contents'}[0]{'contents'}[0];
 
$result_trees{'indices'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'parent'} 
= $result_trees{'indices'}{'contents'}[0]{'contents'}[0];
-$result_trees{'indices'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'parent'}
 = $result_trees{'indices'}{'contents'}[0]{'contents'}[0];
-$result_trees{'indices'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'args'}[0]{'parent'}
 = $result_trees{'indices'}{'contents'}[0]{'contents'}[0]{'contents'}[2];
-$result_trees{'indices'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'args'}[1]{'parent'}
 = $result_trees{'indices'}{'contents'}[0]{'contents'}[0]{'contents'}[2];
-$result_trees{'indices'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'parent'}
 = $result_trees{'indices'}{'contents'}[0]{'contents'}[0];
-$result_trees{'indices'}{'contents'}[0]{'contents'}[0]{'contents'}[3]{'parent'}
 = $result_trees{'indices'}{'contents'}[0]{'contents'}[0];
 $result_trees{'indices'}{'contents'}[0]{'contents'}[0]{'parent'} = 
$result_trees{'indices'}{'contents'}[0];
+$result_trees{'indices'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'args'}[0]{'parent'}
 = $result_trees{'indices'}{'contents'}[0]{'contents'}[1]{'contents'}[0];
+$result_trees{'indices'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'args'}[1]{'parent'}
 = $result_trees{'indices'}{'contents'}[0]{'contents'}[1]{'contents'}[0];
+$result_trees{'indices'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'parent'}
 = $result_trees{'indices'}{'contents'}[0]{'contents'}[1];
+$result_trees{'indices'}{'contents'}[0]{'contents'}[1]{'contents'}[1]{'parent'}
 = $result_trees{'indices'}{'contents'}[0]{'contents'}[1];
+$result_trees{'indices'}{'contents'}[0]{'contents'}[1]{'parent'} = 
$result_trees{'indices'}{'contents'}[0];
 $result_trees{'indices'}{'contents'}[0]{'parent'} = $result_trees{'indices'};
 $result_trees{'indices'}{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'} = 
$result_trees{'indices'}{'contents'}[1]{'args'}[0];
 $result_trees{'indices'}{'contents'}[1]{'args'}[0]{'parent'} = 
$result_trees{'indices'}{'contents'}[1];
@@ -1185,8 +1160,7 @@ 
$result_trees{'indices'}{'contents'}[4]{'contents'}[14]{'args'}[0]{'parent'} = $
 $result_trees{'indices'}{'contents'}[4]{'contents'}[14]{'parent'} = 
$result_trees{'indices'}{'contents'}[4];
 $result_trees{'indices'}{'contents'}[4]{'parent'} = $result_trees{'indices'};
 
-$result_texis{'indices'} = '@setfilename indices.info
-
+$result_texis{'indices'} = '
 @set txiindexbackslashignore
 
 @node Top
@@ -1212,7 +1186,6 @@ $result_texis{'indices'} = '@setfilename indices.info
 
 
 $result_texts{'indices'} = '
-
 top section
 ***********
 
@@ -1323,7 +1296,7 @@ $result_errors{'indices'} = [
     'error_line' => 'misplaced {
 ',
     'file_name' => '',
-    'line_nr' => 17,
+    'line_nr' => 16,
     'macro' => '',
     'text' => 'misplaced {',
     'type' => 'error'
@@ -1332,7 +1305,7 @@ $result_errors{'indices'} = [
     'error_line' => 'misplaced }
 ',
     'file_name' => '',
-    'line_nr' => 17,
+    'line_nr' => 16,
     'macro' => '',
     'text' => 'misplaced }',
     'type' => 'error'
@@ -1358,7 +1331,6 @@ $result_indices_sort_strings{'indices'} = {
 
 
 $result_converted{'latex_text'}->{'indices'} = '
-
 \\begin{document}
 \\label{anchor:Top}%
 \\chapter{{Index}}
diff --git a/tp/t/results/latex_tests/indices/res_latex/indices.tex 
b/tp/t/results/latex_tests/indices/res_latex/indices.tex
index 0a4e1aefd5..eb16b79b15 100644
--- a/tp/t/results/latex_tests/indices/res_latex/indices.tex
+++ b/tp/t/results/latex_tests/indices/res_latex/indices.tex
@@ -67,7 +67,6 @@
 \GNUTexinfosetsingleheader{}%
 
 
-
 \begin{document}
 \label{anchor:Top}%
 \chapter{{Index}}
diff --git a/tp/t/results/latex_tests/informative_commands_in_top_node.pl 
b/tp/t/results/latex_tests/informative_commands_in_top_node.pl
index ff8ac563f5..246adfa46c 100644
--- a/tp/t/results/latex_tests/informative_commands_in_top_node.pl
+++ b/tp/t/results/latex_tests/informative_commands_in_top_node.pl
@@ -10,43 +10,7 @@ $result_trees{'informative_commands_in_top_node'} = {
     {
       'contents' => [
         {
-          'contents' => [
-            {
-              'args' => [
-                {
-                  'contents' => [
-                    {
-                      'parent' => {},
-                      'text' => 'informative_commands_in_top_node.info'
-                    }
-                  ],
-                  'extra' => {
-                    'spaces_after_argument' => '
-'
-                  },
-                  'parent' => {},
-                  'type' => 'line_arg'
-                }
-              ],
-              'cmdname' => 'setfilename',
-              'extra' => {
-                'spaces_before_argument' => ' ',
-                'text_arg' => 'informative_commands_in_top_node.info'
-              },
-              'parent' => {},
-              'source_info' => {
-                'file_name' => '',
-                'line_nr' => 1,
-                'macro' => ''
-              }
-            },
-            {
-              'parent' => {},
-              'text' => '
-',
-              'type' => 'empty_line'
-            }
-          ],
+          'contents' => [],
           'parent' => {},
           'type' => 'preamble_before_content'
         }
@@ -91,7 +55,7 @@ $result_trees{'informative_commands_in_top_node'} = {
       'parent' => {},
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 3,
+        'line_nr' => 1,
         'macro' => ''
       }
     },
@@ -147,7 +111,7 @@ $result_trees{'informative_commands_in_top_node'} = {
           'parent' => {},
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 6,
+            'line_nr' => 4,
             'macro' => ''
           }
         },
@@ -219,7 +183,7 @@ $result_trees{'informative_commands_in_top_node'} = {
                   'parent' => {},
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 8,
+                    'line_nr' => 6,
                     'macro' => ''
                   }
                 }
@@ -239,7 +203,7 @@ $result_trees{'informative_commands_in_top_node'} = {
           'parent' => {},
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 8,
+            'line_nr' => 6,
             'macro' => ''
           }
         },
@@ -270,7 +234,7 @@ $result_trees{'informative_commands_in_top_node'} = {
           'parent' => {},
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 9,
+            'line_nr' => 7,
             'macro' => ''
           }
         },
@@ -287,7 +251,7 @@ $result_trees{'informative_commands_in_top_node'} = {
       'parent' => {},
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 4,
+        'line_nr' => 2,
         'macro' => ''
       }
     },
@@ -328,7 +292,7 @@ $result_trees{'informative_commands_in_top_node'} = {
       'parent' => {},
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 11,
+        'line_nr' => 9,
         'macro' => ''
       }
     },
@@ -375,17 +339,13 @@ $result_trees{'informative_commands_in_top_node'} = {
       'parent' => {},
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 12,
+        'line_nr' => 10,
         'macro' => ''
       }
     }
   ],
   'type' => 'document_root'
 };
-$result_trees{'informative_commands_in_top_node'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'informative_commands_in_top_node'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0];
-$result_trees{'informative_commands_in_top_node'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'parent'}
 = 
$result_trees{'informative_commands_in_top_node'}{'contents'}[0]{'contents'}[0]{'contents'}[0];
-$result_trees{'informative_commands_in_top_node'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'informative_commands_in_top_node'}{'contents'}[0]{'contents'}[0];
-$result_trees{'informative_commands_in_top_node'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'parent'}
 = 
$result_trees{'informative_commands_in_top_node'}{'contents'}[0]{'contents'}[0];
 
$result_trees{'informative_commands_in_top_node'}{'contents'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'informative_commands_in_top_node'}{'contents'}[0];
 $result_trees{'informative_commands_in_top_node'}{'contents'}[0]{'parent'} = 
$result_trees{'informative_commands_in_top_node'};
 
$result_trees{'informative_commands_in_top_node'}{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'informative_commands_in_top_node'}{'contents'}[1]{'args'}[0];
@@ -432,9 +392,7 @@ 
$result_trees{'informative_commands_in_top_node'}{'contents'}[4]{'contents'}[1]{
 
$result_trees{'informative_commands_in_top_node'}{'contents'}[4]{'contents'}[1]{'parent'}
 = $result_trees{'informative_commands_in_top_node'}{'contents'}[4];
 $result_trees{'informative_commands_in_top_node'}{'contents'}[4]{'parent'} = 
$result_trees{'informative_commands_in_top_node'};
 
-$result_texis{'informative_commands_in_top_node'} = '@setfilename 
informative_commands_in_top_node.info
-
-@node Top
+$result_texis{'informative_commands_in_top_node'} = '@node Top
 @top top sectionning
 
 @paragraphindent 5
@@ -449,8 +407,7 @@ In chapter
 ';
 
 
-$result_texts{'informative_commands_in_top_node'} = '
-top sectionning
+$result_texts{'informative_commands_in_top_node'} = 'top sectionning
 ***************
 
 
@@ -558,8 +515,7 @@ $result_floats{'informative_commands_in_top_node'} = {};
 
 
 
-$result_converted{'latex_text'}->{'informative_commands_in_top_node'} = '
-\\begin{document}
+$result_converted{'latex_text'}->{'informative_commands_in_top_node'} = 
'\\begin{document}
 \\label{anchor:Top}%
 \\setlength{\\parindent}{5em}
 \\newpagestyle{custom}{%
diff --git 
a/tp/t/results/latex_tests/informative_commands_in_top_node/res_latex/informative_commands_in_top_node.tex
 
b/tp/t/results/latex_tests/informative_commands_in_top_node/res_latex/informative_commands_in_top_node.tex
index ec5cb7da71..cc08308924 100644
--- 
a/tp/t/results/latex_tests/informative_commands_in_top_node/res_latex/informative_commands_in_top_node.tex
+++ 
b/tp/t/results/latex_tests/informative_commands_in_top_node/res_latex/informative_commands_in_top_node.tex
@@ -62,7 +62,6 @@
 \makeatother
 \GNUTexinfosetsingleheader{}%
 
-
 \begin{document}
 \label{anchor:Top}%
 \setlength{\parindent}{5em}
diff --git a/tp/t/results/latex_tests/nested_enumerate.pl 
b/tp/t/results/latex_tests/nested_enumerate.pl
index 58e70c6a87..3ac2223d0c 100644
--- a/tp/t/results/latex_tests/nested_enumerate.pl
+++ b/tp/t/results/latex_tests/nested_enumerate.pl
@@ -10,43 +10,7 @@ $result_trees{'nested_enumerate'} = {
     {
       'contents' => [
         {
-          'contents' => [
-            {
-              'args' => [
-                {
-                  'contents' => [
-                    {
-                      'parent' => {},
-                      'text' => 'nested_enumerate.info'
-                    }
-                  ],
-                  'extra' => {
-                    'spaces_after_argument' => '
-'
-                  },
-                  'parent' => {},
-                  'type' => 'line_arg'
-                }
-              ],
-              'cmdname' => 'setfilename',
-              'extra' => {
-                'spaces_before_argument' => ' ',
-                'text_arg' => 'nested_enumerate.info'
-              },
-              'parent' => {},
-              'source_info' => {
-                'file_name' => '',
-                'line_nr' => 1,
-                'macro' => ''
-              }
-            },
-            {
-              'parent' => {},
-              'text' => '
-',
-              'type' => 'empty_line'
-            }
-          ],
+          'contents' => [],
           'parent' => {},
           'type' => 'preamble_before_content'
         },
@@ -101,7 +65,7 @@ $result_trees{'nested_enumerate'} = {
               'parent' => {},
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 4,
+                'line_nr' => 2,
                 'macro' => ''
               }
             },
@@ -170,7 +134,7 @@ $result_trees{'nested_enumerate'} = {
                       'parent' => {},
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 7,
+                        'line_nr' => 5,
                         'macro' => ''
                       }
                     },
@@ -239,7 +203,7 @@ $result_trees{'nested_enumerate'} = {
                               'parent' => {},
                               'source_info' => {
                                 'file_name' => '',
-                                'line_nr' => 10,
+                                'line_nr' => 8,
                                 'macro' => ''
                               }
                             },
@@ -308,7 +272,7 @@ $result_trees{'nested_enumerate'} = {
                                       'parent' => {},
                                       'source_info' => {
                                         'file_name' => '',
-                                        'line_nr' => 13,
+                                        'line_nr' => 11,
                                         'macro' => ''
                                       }
                                     },
@@ -334,7 +298,7 @@ $result_trees{'nested_enumerate'} = {
                                       'parent' => {},
                                       'source_info' => {
                                         'file_name' => '',
-                                        'line_nr' => 14,
+                                        'line_nr' => 12,
                                         'macro' => ''
                                       }
                                     },
@@ -364,7 +328,7 @@ $result_trees{'nested_enumerate'} = {
                                       'parent' => {},
                                       'source_info' => {
                                         'file_name' => '',
-                                        'line_nr' => 15,
+                                        'line_nr' => 13,
                                         'macro' => ''
                                       }
                                     }
@@ -376,7 +340,7 @@ $result_trees{'nested_enumerate'} = {
                                   'parent' => {},
                                   'source_info' => {
                                     'file_name' => '',
-                                    'line_nr' => 12,
+                                    'line_nr' => 10,
                                     'macro' => ''
                                   }
                                 }
@@ -388,7 +352,7 @@ $result_trees{'nested_enumerate'} = {
                               'parent' => {},
                               'source_info' => {
                                 'file_name' => '',
-                                'line_nr' => 11,
+                                'line_nr' => 9,
                                 'macro' => ''
                               }
                             },
@@ -418,7 +382,7 @@ $result_trees{'nested_enumerate'} = {
                               'parent' => {},
                               'source_info' => {
                                 'file_name' => '',
-                                'line_nr' => 16,
+                                'line_nr' => 14,
                                 'macro' => ''
                               }
                             }
@@ -430,7 +394,7 @@ $result_trees{'nested_enumerate'} = {
                           'parent' => {},
                           'source_info' => {
                             'file_name' => '',
-                            'line_nr' => 9,
+                            'line_nr' => 7,
                             'macro' => ''
                           }
                         }
@@ -442,7 +406,7 @@ $result_trees{'nested_enumerate'} = {
                       'parent' => {},
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 8,
+                        'line_nr' => 6,
                         'macro' => ''
                       }
                     },
@@ -472,7 +436,7 @@ $result_trees{'nested_enumerate'} = {
                       'parent' => {},
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 17,
+                        'line_nr' => 15,
                         'macro' => ''
                       }
                     }
@@ -484,7 +448,7 @@ $result_trees{'nested_enumerate'} = {
                   'parent' => {},
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 6,
+                    'line_nr' => 4,
                     'macro' => ''
                   }
                 }
@@ -496,7 +460,7 @@ $result_trees{'nested_enumerate'} = {
               'parent' => {},
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 5,
+                'line_nr' => 3,
                 'macro' => ''
               }
             },
@@ -526,7 +490,7 @@ $result_trees{'nested_enumerate'} = {
               'parent' => {},
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 18,
+                'line_nr' => 16,
                 'macro' => ''
               }
             }
@@ -538,7 +502,7 @@ $result_trees{'nested_enumerate'} = {
           'parent' => {},
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 3,
+            'line_nr' => 1,
             'macro' => ''
           }
         },
@@ -555,10 +519,6 @@ $result_trees{'nested_enumerate'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'nested_enumerate'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'nested_enumerate'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0];
-$result_trees{'nested_enumerate'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'parent'}
 = 
$result_trees{'nested_enumerate'}{'contents'}[0]{'contents'}[0]{'contents'}[0];
-$result_trees{'nested_enumerate'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'nested_enumerate'}{'contents'}[0]{'contents'}[0];
-$result_trees{'nested_enumerate'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'parent'}
 = $result_trees{'nested_enumerate'}{'contents'}[0]{'contents'}[0];
 $result_trees{'nested_enumerate'}{'contents'}[0]{'contents'}[0]{'parent'} = 
$result_trees{'nested_enumerate'}{'contents'}[0];
 
$result_trees{'nested_enumerate'}{'contents'}[0]{'contents'}[1]{'args'}[0]{'parent'}
 = $result_trees{'nested_enumerate'}{'contents'}[0]{'contents'}[1];
 
$result_trees{'nested_enumerate'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'nested_enumerate'}{'contents'}[0]{'contents'}[1]{'contents'}[0];
@@ -623,9 +583,7 @@ 
$result_trees{'nested_enumerate'}{'contents'}[0]{'contents'}[1]{'parent'} = $res
 $result_trees{'nested_enumerate'}{'contents'}[0]{'contents'}[2]{'parent'} = 
$result_trees{'nested_enumerate'}{'contents'}[0];
 $result_trees{'nested_enumerate'}{'contents'}[0]{'parent'} = 
$result_trees{'nested_enumerate'};
 
-$result_texis{'nested_enumerate'} = '@setfilename nested_enumerate.info
-
-@enumerate
+$result_texis{'nested_enumerate'} = '@enumerate
    @item First level item
    @item First level item
 @enumerate
@@ -645,8 +603,7 @@ $result_texis{'nested_enumerate'} = '@setfilename 
nested_enumerate.info
 ';
 
 
-$result_texts{'nested_enumerate'} = '
-1. First level item
+$result_texts{'nested_enumerate'} = '1. First level item
    2. First level item
 1. Second level item
      2. Second level item
@@ -664,8 +621,7 @@ $result_floats{'nested_enumerate'} = {};
 
 
 
-$result_converted{'latex_text'}->{'nested_enumerate'} = '
-\\begin{document}
+$result_converted{'latex_text'}->{'nested_enumerate'} = '\\begin{document}
 \\begin{enumerate}[start=1]
    \\item First level item
    \\item First level item
diff --git 
a/tp/t/results/latex_tests/nested_enumerate/res_latex/nested_enumerate.tex 
b/tp/t/results/latex_tests/nested_enumerate/res_latex/nested_enumerate.tex
index ccdfad15fc..fef9895ed1 100644
--- a/tp/t/results/latex_tests/nested_enumerate/res_latex/nested_enumerate.tex
+++ b/tp/t/results/latex_tests/nested_enumerate/res_latex/nested_enumerate.tex
@@ -66,7 +66,6 @@
 \makeatother
 \GNUTexinfosetsingleheader{}%
 
-
 \begin{document}
 \begin{enumerate}[start=1]
    \item First level item
diff --git a/tp/t/results/latex_tests/nested_itemize.pl 
b/tp/t/results/latex_tests/nested_itemize.pl
index 1763340ef1..9ef5966f4a 100644
--- a/tp/t/results/latex_tests/nested_itemize.pl
+++ b/tp/t/results/latex_tests/nested_itemize.pl
@@ -10,37 +10,7 @@ $result_trees{'nested_itemize'} = {
     {
       'contents' => [
         {
-          'contents' => [
-            {
-              'args' => [
-                {
-                  'contents' => [
-                    {
-                      'parent' => {},
-                      'text' => 'nested_itemize.info'
-                    }
-                  ],
-                  'extra' => {
-                    'spaces_after_argument' => '
-'
-                  },
-                  'parent' => {},
-                  'type' => 'line_arg'
-                }
-              ],
-              'cmdname' => 'setfilename',
-              'extra' => {
-                'spaces_before_argument' => ' ',
-                'text_arg' => 'nested_itemize.info'
-              },
-              'parent' => {},
-              'source_info' => {
-                'file_name' => '',
-                'line_nr' => 1,
-                'macro' => ''
-              }
-            }
-          ],
+          'contents' => [],
           'parent' => {},
           'type' => 'preamble_before_content'
         },
@@ -102,7 +72,7 @@ $result_trees{'nested_itemize'} = {
               'parent' => {},
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 3,
+                'line_nr' => 2,
                 'macro' => ''
               }
             },
@@ -178,7 +148,7 @@ $result_trees{'nested_itemize'} = {
                       'parent' => {},
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 6,
+                        'line_nr' => 5,
                         'macro' => ''
                       }
                     },
@@ -254,7 +224,7 @@ $result_trees{'nested_itemize'} = {
                               'parent' => {},
                               'source_info' => {
                                 'file_name' => '',
-                                'line_nr' => 9,
+                                'line_nr' => 8,
                                 'macro' => ''
                               }
                             },
@@ -330,7 +300,7 @@ $result_trees{'nested_itemize'} = {
                                       'parent' => {},
                                       'source_info' => {
                                         'file_name' => '',
-                                        'line_nr' => 12,
+                                        'line_nr' => 11,
                                         'macro' => ''
                                       }
                                     },
@@ -356,7 +326,7 @@ $result_trees{'nested_itemize'} = {
                                       'parent' => {},
                                       'source_info' => {
                                         'file_name' => '',
-                                        'line_nr' => 13,
+                                        'line_nr' => 12,
                                         'macro' => ''
                                       }
                                     },
@@ -386,7 +356,7 @@ $result_trees{'nested_itemize'} = {
                                       'parent' => {},
                                       'source_info' => {
                                         'file_name' => '',
-                                        'line_nr' => 14,
+                                        'line_nr' => 13,
                                         'macro' => ''
                                       }
                                     }
@@ -398,7 +368,7 @@ $result_trees{'nested_itemize'} = {
                                   'parent' => {},
                                   'source_info' => {
                                     'file_name' => '',
-                                    'line_nr' => 11,
+                                    'line_nr' => 10,
                                     'macro' => ''
                                   }
                                 }
@@ -410,7 +380,7 @@ $result_trees{'nested_itemize'} = {
                               'parent' => {},
                               'source_info' => {
                                 'file_name' => '',
-                                'line_nr' => 10,
+                                'line_nr' => 9,
                                 'macro' => ''
                               }
                             },
@@ -440,7 +410,7 @@ $result_trees{'nested_itemize'} = {
                               'parent' => {},
                               'source_info' => {
                                 'file_name' => '',
-                                'line_nr' => 15,
+                                'line_nr' => 14,
                                 'macro' => ''
                               }
                             }
@@ -452,7 +422,7 @@ $result_trees{'nested_itemize'} = {
                           'parent' => {},
                           'source_info' => {
                             'file_name' => '',
-                            'line_nr' => 8,
+                            'line_nr' => 7,
                             'macro' => ''
                           }
                         }
@@ -464,7 +434,7 @@ $result_trees{'nested_itemize'} = {
                       'parent' => {},
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 7,
+                        'line_nr' => 6,
                         'macro' => ''
                       }
                     },
@@ -494,7 +464,7 @@ $result_trees{'nested_itemize'} = {
                       'parent' => {},
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 16,
+                        'line_nr' => 15,
                         'macro' => ''
                       }
                     }
@@ -506,7 +476,7 @@ $result_trees{'nested_itemize'} = {
                   'parent' => {},
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 5,
+                    'line_nr' => 4,
                     'macro' => ''
                   }
                 }
@@ -518,7 +488,7 @@ $result_trees{'nested_itemize'} = {
               'parent' => {},
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 4,
+                'line_nr' => 3,
                 'macro' => ''
               }
             },
@@ -548,7 +518,7 @@ $result_trees{'nested_itemize'} = {
               'parent' => {},
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 17,
+                'line_nr' => 16,
                 'macro' => ''
               }
             }
@@ -560,7 +530,7 @@ $result_trees{'nested_itemize'} = {
           'parent' => {},
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 2,
+            'line_nr' => 1,
             'macro' => ''
           }
         },
@@ -577,9 +547,6 @@ $result_trees{'nested_itemize'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'nested_itemize'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'nested_itemize'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0];
-$result_trees{'nested_itemize'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'parent'}
 = $result_trees{'nested_itemize'}{'contents'}[0]{'contents'}[0]{'contents'}[0];
-$result_trees{'nested_itemize'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'nested_itemize'}{'contents'}[0]{'contents'}[0];
 $result_trees{'nested_itemize'}{'contents'}[0]{'contents'}[0]{'parent'} = 
$result_trees{'nested_itemize'}{'contents'}[0];
 
$result_trees{'nested_itemize'}{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'nested_itemize'}{'contents'}[0]{'contents'}[1]{'args'}[0];
 
$result_trees{'nested_itemize'}{'contents'}[0]{'contents'}[1]{'args'}[0]{'parent'}
 = $result_trees{'nested_itemize'}{'contents'}[0]{'contents'}[1];
@@ -652,8 +619,7 @@ 
$result_trees{'nested_itemize'}{'contents'}[0]{'contents'}[1]{'parent'} = $resul
 $result_trees{'nested_itemize'}{'contents'}[0]{'contents'}[2]{'parent'} = 
$result_trees{'nested_itemize'}{'contents'}[0];
 $result_trees{'nested_itemize'}{'contents'}[0]{'parent'} = 
$result_trees{'nested_itemize'};
 
-$result_texis{'nested_itemize'} = '@setfilename nested_itemize.info
-@itemize
+$result_texis{'nested_itemize'} = '@itemize
    @item First level item
    @item First level item
 @itemize
diff --git a/tp/t/results/latex_tests/no_titlepage_and_setchapternewpage_odd.pl 
b/tp/t/results/latex_tests/no_titlepage_and_setchapternewpage_odd.pl
index 7ea680edf2..c200b42bd5 100644
--- a/tp/t/results/latex_tests/no_titlepage_and_setchapternewpage_odd.pl
+++ b/tp/t/results/latex_tests/no_titlepage_and_setchapternewpage_odd.pl
@@ -11,35 +11,6 @@ $result_trees{'no_titlepage_and_setchapternewpage_odd'} = {
       'contents' => [
         {
           'contents' => [
-            {
-              'args' => [
-                {
-                  'contents' => [
-                    {
-                      'parent' => {},
-                      'text' => 'no_titlepage_and_setchapternewpage_odd.info'
-                    }
-                  ],
-                  'extra' => {
-                    'spaces_after_argument' => '
-'
-                  },
-                  'parent' => {},
-                  'type' => 'line_arg'
-                }
-              ],
-              'cmdname' => 'setfilename',
-              'extra' => {
-                'spaces_before_argument' => ' ',
-                'text_arg' => 'no_titlepage_and_setchapternewpage_odd.info'
-              },
-              'parent' => {},
-              'source_info' => {
-                'file_name' => '',
-                'line_nr' => 1,
-                'macro' => ''
-              }
-            },
             {
               'args' => [
                 {
@@ -67,7 +38,7 @@ $result_trees{'no_titlepage_and_setchapternewpage_odd'} = {
               'parent' => {},
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 2,
+                'line_nr' => 1,
                 'macro' => ''
               }
             }
@@ -85,14 +56,10 @@ $result_trees{'no_titlepage_and_setchapternewpage_odd'} = {
 
$result_trees{'no_titlepage_and_setchapternewpage_odd'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'no_titlepage_and_setchapternewpage_odd'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0];
 
$result_trees{'no_titlepage_and_setchapternewpage_odd'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'parent'}
 = 
$result_trees{'no_titlepage_and_setchapternewpage_odd'}{'contents'}[0]{'contents'}[0]{'contents'}[0];
 
$result_trees{'no_titlepage_and_setchapternewpage_odd'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'no_titlepage_and_setchapternewpage_odd'}{'contents'}[0]{'contents'}[0];
-$result_trees{'no_titlepage_and_setchapternewpage_odd'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'no_titlepage_and_setchapternewpage_odd'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0];
-$result_trees{'no_titlepage_and_setchapternewpage_odd'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'no_titlepage_and_setchapternewpage_odd'}{'contents'}[0]{'contents'}[0]{'contents'}[1];
-$result_trees{'no_titlepage_and_setchapternewpage_odd'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'parent'}
 = 
$result_trees{'no_titlepage_and_setchapternewpage_odd'}{'contents'}[0]{'contents'}[0];
 
$result_trees{'no_titlepage_and_setchapternewpage_odd'}{'contents'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'no_titlepage_and_setchapternewpage_odd'}{'contents'}[0];
 
$result_trees{'no_titlepage_and_setchapternewpage_odd'}{'contents'}[0]{'parent'}
 = $result_trees{'no_titlepage_and_setchapternewpage_odd'};
 
-$result_texis{'no_titlepage_and_setchapternewpage_odd'} = '@setfilename 
no_titlepage_and_setchapternewpage_odd.info
-@setchapternewpage odd
+$result_texis{'no_titlepage_and_setchapternewpage_odd'} = '@setchapternewpage 
odd
 ';
 
 
diff --git a/tp/t/results/latex_tests/no_titlepage_and_setchapternewpage_on.pl 
b/tp/t/results/latex_tests/no_titlepage_and_setchapternewpage_on.pl
index 8d4be30b96..51d1741658 100644
--- a/tp/t/results/latex_tests/no_titlepage_and_setchapternewpage_on.pl
+++ b/tp/t/results/latex_tests/no_titlepage_and_setchapternewpage_on.pl
@@ -11,35 +11,6 @@ $result_trees{'no_titlepage_and_setchapternewpage_on'} = {
       'contents' => [
         {
           'contents' => [
-            {
-              'args' => [
-                {
-                  'contents' => [
-                    {
-                      'parent' => {},
-                      'text' => 'no_titlepage_and_setchapternewpage_on.info'
-                    }
-                  ],
-                  'extra' => {
-                    'spaces_after_argument' => '
-'
-                  },
-                  'parent' => {},
-                  'type' => 'line_arg'
-                }
-              ],
-              'cmdname' => 'setfilename',
-              'extra' => {
-                'spaces_before_argument' => ' ',
-                'text_arg' => 'no_titlepage_and_setchapternewpage_on.info'
-              },
-              'parent' => {},
-              'source_info' => {
-                'file_name' => '',
-                'line_nr' => 1,
-                'macro' => ''
-              }
-            },
             {
               'args' => [
                 {
@@ -67,7 +38,7 @@ $result_trees{'no_titlepage_and_setchapternewpage_on'} = {
               'parent' => {},
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 2,
+                'line_nr' => 1,
                 'macro' => ''
               }
             }
@@ -85,14 +56,10 @@ $result_trees{'no_titlepage_and_setchapternewpage_on'} = {
 
$result_trees{'no_titlepage_and_setchapternewpage_on'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'no_titlepage_and_setchapternewpage_on'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0];
 
$result_trees{'no_titlepage_and_setchapternewpage_on'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'parent'}
 = 
$result_trees{'no_titlepage_and_setchapternewpage_on'}{'contents'}[0]{'contents'}[0]{'contents'}[0];
 
$result_trees{'no_titlepage_and_setchapternewpage_on'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'no_titlepage_and_setchapternewpage_on'}{'contents'}[0]{'contents'}[0];
-$result_trees{'no_titlepage_and_setchapternewpage_on'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'no_titlepage_and_setchapternewpage_on'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0];
-$result_trees{'no_titlepage_and_setchapternewpage_on'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'no_titlepage_and_setchapternewpage_on'}{'contents'}[0]{'contents'}[0]{'contents'}[1];
-$result_trees{'no_titlepage_and_setchapternewpage_on'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'parent'}
 = 
$result_trees{'no_titlepage_and_setchapternewpage_on'}{'contents'}[0]{'contents'}[0];
 
$result_trees{'no_titlepage_and_setchapternewpage_on'}{'contents'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'no_titlepage_and_setchapternewpage_on'}{'contents'}[0];
 
$result_trees{'no_titlepage_and_setchapternewpage_on'}{'contents'}[0]{'parent'} 
= $result_trees{'no_titlepage_and_setchapternewpage_on'};
 
-$result_texis{'no_titlepage_and_setchapternewpage_on'} = '@setfilename 
no_titlepage_and_setchapternewpage_on.info
-@setchapternewpage on
+$result_texis{'no_titlepage_and_setchapternewpage_on'} = '@setchapternewpage on
 ';
 
 
diff --git a/tp/t/results/latex_tests/pagesizes.pl 
b/tp/t/results/latex_tests/pagesizes.pl
index 6dc8733a95..1db72b7671 100644
--- a/tp/t/results/latex_tests/pagesizes.pl
+++ b/tp/t/results/latex_tests/pagesizes.pl
@@ -11,41 +11,6 @@ $result_trees{'pagesizes'} = {
       'contents' => [
         {
           'contents' => [
-            {
-              'args' => [
-                {
-                  'contents' => [
-                    {
-                      'parent' => {},
-                      'text' => 'pagesizes.info'
-                    }
-                  ],
-                  'extra' => {
-                    'spaces_after_argument' => '
-'
-                  },
-                  'parent' => {},
-                  'type' => 'line_arg'
-                }
-              ],
-              'cmdname' => 'setfilename',
-              'extra' => {
-                'spaces_before_argument' => ' ',
-                'text_arg' => 'pagesizes.info'
-              },
-              'parent' => {},
-              'source_info' => {
-                'file_name' => '',
-                'line_nr' => 1,
-                'macro' => ''
-              }
-            },
-            {
-              'parent' => {},
-              'text' => '
-',
-              'type' => 'empty_line'
-            },
             {
               'args' => [
                 {
@@ -70,7 +35,7 @@ $result_trees{'pagesizes'} = {
               'parent' => {},
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 3,
+                'line_nr' => 1,
                 'macro' => ''
               }
             },
@@ -125,7 +90,7 @@ $result_trees{'pagesizes'} = {
       'parent' => {},
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 5,
+        'line_nr' => 3,
         'macro' => ''
       }
     },
@@ -161,7 +126,7 @@ $result_trees{'pagesizes'} = {
       'parent' => {},
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 6,
+        'line_nr' => 4,
         'macro' => ''
       }
     },
@@ -202,7 +167,7 @@ $result_trees{'pagesizes'} = {
       'parent' => {},
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 8,
+        'line_nr' => 6,
         'macro' => ''
       }
     },
@@ -255,7 +220,7 @@ $result_trees{'pagesizes'} = {
           'parent' => {},
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 11,
+            'line_nr' => 9,
             'macro' => ''
           }
         },
@@ -272,7 +237,7 @@ $result_trees{'pagesizes'} = {
       'parent' => {},
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 9,
+        'line_nr' => 7,
         'macro' => ''
       }
     },
@@ -325,7 +290,7 @@ $result_trees{'pagesizes'} = {
           'parent' => {},
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 15,
+            'line_nr' => 13,
             'macro' => ''
           }
         },
@@ -359,7 +324,7 @@ $result_trees{'pagesizes'} = {
           'parent' => {},
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 17,
+            'line_nr' => 15,
             'macro' => ''
           }
         }
@@ -370,7 +335,7 @@ $result_trees{'pagesizes'} = {
       'parent' => {},
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 13,
+        'line_nr' => 11,
         'macro' => ''
       }
     }
@@ -381,10 +346,6 @@ 
$result_trees{'pagesizes'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[
 
$result_trees{'pagesizes'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'parent'}
 = $result_trees{'pagesizes'}{'contents'}[0]{'contents'}[0]{'contents'}[0];
 
$result_trees{'pagesizes'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'pagesizes'}{'contents'}[0]{'contents'}[0];
 
$result_trees{'pagesizes'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'parent'}
 = $result_trees{'pagesizes'}{'contents'}[0]{'contents'}[0];
-$result_trees{'pagesizes'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'pagesizes'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'args'}[0];
-$result_trees{'pagesizes'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'args'}[0]{'parent'}
 = $result_trees{'pagesizes'}{'contents'}[0]{'contents'}[0]{'contents'}[2];
-$result_trees{'pagesizes'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'parent'}
 = $result_trees{'pagesizes'}{'contents'}[0]{'contents'}[0];
-$result_trees{'pagesizes'}{'contents'}[0]{'contents'}[0]{'contents'}[3]{'parent'}
 = $result_trees{'pagesizes'}{'contents'}[0]{'contents'}[0];
 $result_trees{'pagesizes'}{'contents'}[0]{'contents'}[0]{'parent'} = 
$result_trees{'pagesizes'}{'contents'}[0];
 $result_trees{'pagesizes'}{'contents'}[0]{'parent'} = 
$result_trees{'pagesizes'};
 $result_trees{'pagesizes'}{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'} 
= $result_trees{'pagesizes'}{'contents'}[1]{'args'}[0];
@@ -421,9 +382,7 @@ 
$result_trees{'pagesizes'}{'contents'}[5]{'contents'}[3]{'args'}[0]{'parent'} =
 $result_trees{'pagesizes'}{'contents'}[5]{'contents'}[3]{'parent'} = 
$result_trees{'pagesizes'}{'contents'}[5];
 $result_trees{'pagesizes'}{'contents'}[5]{'parent'} = 
$result_trees{'pagesizes'};
 
-$result_texis{'pagesizes'} = '@setfilename pagesizes.info
-
-@pagesizes 200mm,150mm
+$result_texis{'pagesizes'} = '@pagesizes 200mm,150mm
 
 @node Top
 @top section top
@@ -442,7 +401,6 @@ $result_texis{'pagesizes'} = '@setfilename pagesizes.info
 
 
 $result_texts{'pagesizes'} = '
-
 section top
 ***********
 
@@ -567,7 +525,7 @@ $result_errors{'pagesizes'} = [
     'error_line' => 'warning: multiple @pagesizes
 ',
     'file_name' => '',
-    'line_nr' => 11,
+    'line_nr' => 9,
     'macro' => '',
     'text' => 'multiple @pagesizes',
     'type' => 'warning'
@@ -576,7 +534,7 @@ $result_errors{'pagesizes'} = [
     'error_line' => 'warning: multiple @pagesizes
 ',
     'file_name' => '',
-    'line_nr' => 15,
+    'line_nr' => 13,
     'macro' => '',
     'text' => 'multiple @pagesizes',
     'type' => 'warning'
@@ -585,7 +543,7 @@ $result_errors{'pagesizes'} = [
     'error_line' => 'warning: multiple @pagesizes
 ',
     'file_name' => '',
-    'line_nr' => 17,
+    'line_nr' => 15,
     'macro' => '',
     'text' => 'multiple @pagesizes',
     'type' => 'warning'
@@ -597,8 +555,7 @@ $result_floats{'pagesizes'} = {};
 
 
 
-$result_converted{'latex_text'}->{'pagesizes'} = '
-\\newgeometry{textheight=200mm,textwidth=150mm}
+$result_converted{'latex_text'}->{'pagesizes'} = 
'\\newgeometry{textheight=200mm,textwidth=150mm}
 
 \\begin{document}
 \\label{anchor:Top}%
diff --git a/tp/t/results/latex_tests/pagesizes/res_latex/pagesizes.tex 
b/tp/t/results/latex_tests/pagesizes/res_latex/pagesizes.tex
index 5d5b5e12ae..8aabbfacf7 100644
--- a/tp/t/results/latex_tests/pagesizes/res_latex/pagesizes.tex
+++ b/tp/t/results/latex_tests/pagesizes/res_latex/pagesizes.tex
@@ -63,7 +63,6 @@
 \makeatother
 \GNUTexinfosetsingleheader{}%
 
-
 \newgeometry{textheight=200mm,textwidth=150mm}
 
 \begin{document}
diff --git a/tp/t/results/latex_tests/pagetype.pl 
b/tp/t/results/latex_tests/pagetype.pl
index 5a5c095695..2b4f3e1cec 100644
--- a/tp/t/results/latex_tests/pagetype.pl
+++ b/tp/t/results/latex_tests/pagetype.pl
@@ -11,41 +11,6 @@ $result_trees{'pagetype'} = {
       'contents' => [
         {
           'contents' => [
-            {
-              'args' => [
-                {
-                  'contents' => [
-                    {
-                      'parent' => {},
-                      'text' => 'pagetype.info'
-                    }
-                  ],
-                  'extra' => {
-                    'spaces_after_argument' => '
-'
-                  },
-                  'parent' => {},
-                  'type' => 'line_arg'
-                }
-              ],
-              'cmdname' => 'setfilename',
-              'extra' => {
-                'spaces_before_argument' => ' ',
-                'text_arg' => 'pagetype.info'
-              },
-              'parent' => {},
-              'source_info' => {
-                'file_name' => '',
-                'line_nr' => 1,
-                'macro' => ''
-              }
-            },
-            {
-              'parent' => {},
-              'text' => '
-',
-              'type' => 'empty_line'
-            },
             {
               'args' => [
                 {
@@ -59,7 +24,7 @@ $result_trees{'pagetype'} = {
               'parent' => {},
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 3,
+                'line_nr' => 1,
                 'macro' => ''
               }
             },
@@ -82,7 +47,7 @@ $result_trees{'pagetype'} = {
               'parent' => {},
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 5,
+                'line_nr' => 3,
                 'macro' => ''
               }
             },
@@ -137,7 +102,7 @@ $result_trees{'pagetype'} = {
       'parent' => {},
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 7,
+        'line_nr' => 5,
         'macro' => ''
       }
     },
@@ -173,7 +138,7 @@ $result_trees{'pagetype'} = {
       'parent' => {},
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 8,
+        'line_nr' => 6,
         'macro' => ''
       }
     },
@@ -214,7 +179,7 @@ $result_trees{'pagetype'} = {
       'parent' => {},
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 10,
+        'line_nr' => 8,
         'macro' => ''
       }
     },
@@ -256,7 +221,7 @@ $result_trees{'pagetype'} = {
           'parent' => {},
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 13,
+            'line_nr' => 11,
             'macro' => ''
           }
         },
@@ -303,7 +268,7 @@ $result_trees{'pagetype'} = {
               'parent' => {},
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 18,
+                'line_nr' => 16,
                 'macro' => ''
               }
             }
@@ -341,7 +306,7 @@ $result_trees{'pagetype'} = {
       'parent' => {},
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 11,
+        'line_nr' => 9,
         'macro' => ''
       }
     },
@@ -388,23 +353,19 @@ $result_trees{'pagetype'} = {
       'parent' => {},
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 22,
+        'line_nr' => 20,
         'macro' => ''
       }
     }
   ],
   'type' => 'document_root'
 };
-$result_trees{'pagetype'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'pagetype'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0];
 
$result_trees{'pagetype'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'parent'}
 = $result_trees{'pagetype'}{'contents'}[0]{'contents'}[0]{'contents'}[0];
 
$result_trees{'pagetype'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'pagetype'}{'contents'}[0]{'contents'}[0];
 
$result_trees{'pagetype'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'parent'}
 = $result_trees{'pagetype'}{'contents'}[0]{'contents'}[0];
 
$result_trees{'pagetype'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'args'}[0]{'parent'}
 = $result_trees{'pagetype'}{'contents'}[0]{'contents'}[0]{'contents'}[2];
 
$result_trees{'pagetype'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'parent'}
 = $result_trees{'pagetype'}{'contents'}[0]{'contents'}[0];
 
$result_trees{'pagetype'}{'contents'}[0]{'contents'}[0]{'contents'}[3]{'parent'}
 = $result_trees{'pagetype'}{'contents'}[0]{'contents'}[0];
-$result_trees{'pagetype'}{'contents'}[0]{'contents'}[0]{'contents'}[4]{'args'}[0]{'parent'}
 = $result_trees{'pagetype'}{'contents'}[0]{'contents'}[0]{'contents'}[4];
-$result_trees{'pagetype'}{'contents'}[0]{'contents'}[0]{'contents'}[4]{'parent'}
 = $result_trees{'pagetype'}{'contents'}[0]{'contents'}[0];
-$result_trees{'pagetype'}{'contents'}[0]{'contents'}[0]{'contents'}[5]{'parent'}
 = $result_trees{'pagetype'}{'contents'}[0]{'contents'}[0];
 $result_trees{'pagetype'}{'contents'}[0]{'contents'}[0]{'parent'} = 
$result_trees{'pagetype'}{'contents'}[0];
 $result_trees{'pagetype'}{'contents'}[0]{'parent'} = $result_trees{'pagetype'};
 $result_trees{'pagetype'}{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'} = 
$result_trees{'pagetype'}{'contents'}[1]{'args'}[0];
@@ -446,9 +407,7 @@ 
$result_trees{'pagetype'}{'contents'}[5]{'contents'}[1]{'contents'}[0]{'parent'}
 $result_trees{'pagetype'}{'contents'}[5]{'contents'}[1]{'parent'} = 
$result_trees{'pagetype'}{'contents'}[5];
 $result_trees{'pagetype'}{'contents'}[5]{'parent'} = $result_trees{'pagetype'};
 
-$result_texis{'pagetype'} = '@setfilename pagetype.info
-
-@afourpaper
+$result_texis{'pagetype'} = '@afourpaper
 
 @afourwide
 
@@ -475,7 +434,6 @@ In afourpaper reset
 
 $result_texts{'pagetype'} = '
 
-
 section top
 ***********
 
@@ -606,7 +564,7 @@ $result_errors{'pagetype'} = [
     'error_line' => 'unknown command `Chapter\'
 ',
     'file_name' => '',
-    'line_nr' => 15,
+    'line_nr' => 13,
     'macro' => '',
     'text' => 'unknown command `Chapter\'',
     'type' => 'error'
@@ -615,7 +573,7 @@ $result_errors{'pagetype'} = [
     'error_line' => 'warning: multiple @afourpaper
 ',
     'file_name' => '',
-    'line_nr' => 18,
+    'line_nr' => 16,
     'macro' => '',
     'text' => 'multiple @afourpaper',
     'type' => 'warning'
@@ -627,8 +585,7 @@ $result_floats{'pagetype'} = {};
 
 
 
-$result_converted{'latex_text'}->{'pagetype'} = '
-\\geometry{papername=a4paper}%
+$result_converted{'latex_text'}->{'pagetype'} = '\\geometry{papername=a4paper}%
 
 \\geometry{papername=a4paper}%
 
diff --git a/tp/t/results/latex_tests/pagetype/res_latex/pagetype.tex 
b/tp/t/results/latex_tests/pagetype/res_latex/pagetype.tex
index 46dc847e94..084e56ee16 100644
--- a/tp/t/results/latex_tests/pagetype/res_latex/pagetype.tex
+++ b/tp/t/results/latex_tests/pagetype/res_latex/pagetype.tex
@@ -63,7 +63,6 @@
 \makeatother
 \GNUTexinfosetsingleheader{}%
 
-
 \geometry{papername=a4paper}%
 
 \geometry{papername=a4paper}%
diff --git a/tp/t/results/latex_tests/setchapternewpage_on_odd_titlepage.pl 
b/tp/t/results/latex_tests/setchapternewpage_on_odd_titlepage.pl
index 56b643afd2..5e3184552d 100644
--- a/tp/t/results/latex_tests/setchapternewpage_on_odd_titlepage.pl
+++ b/tp/t/results/latex_tests/setchapternewpage_on_odd_titlepage.pl
@@ -11,35 +11,6 @@ $result_trees{'setchapternewpage_on_odd_titlepage'} = {
       'contents' => [
         {
           'contents' => [
-            {
-              'args' => [
-                {
-                  'contents' => [
-                    {
-                      'parent' => {},
-                      'text' => 'setchapternewpage_on_odd_titlepage.info'
-                    }
-                  ],
-                  'extra' => {
-                    'spaces_after_argument' => '
-'
-                  },
-                  'parent' => {},
-                  'type' => 'line_arg'
-                }
-              ],
-              'cmdname' => 'setfilename',
-              'extra' => {
-                'spaces_before_argument' => ' ',
-                'text_arg' => 'setchapternewpage_on_odd_titlepage.info'
-              },
-              'parent' => {},
-              'source_info' => {
-                'file_name' => '',
-                'line_nr' => 1,
-                'macro' => ''
-              }
-            },
             {
               'args' => [
                 {
@@ -67,7 +38,7 @@ $result_trees{'setchapternewpage_on_odd_titlepage'} = {
               'parent' => {},
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 2,
+                'line_nr' => 1,
                 'macro' => ''
               }
             },
@@ -104,7 +75,7 @@ $result_trees{'setchapternewpage_on_odd_titlepage'} = {
               'parent' => {},
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 4,
+                'line_nr' => 3,
                 'macro' => ''
               }
             },
@@ -165,7 +136,7 @@ $result_trees{'setchapternewpage_on_odd_titlepage'} = {
                   'parent' => {},
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 8,
+                    'line_nr' => 7,
                     'macro' => ''
                   }
                 }
@@ -176,7 +147,7 @@ $result_trees{'setchapternewpage_on_odd_titlepage'} = {
               'parent' => {},
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 6,
+                'line_nr' => 5,
                 'macro' => ''
               }
             }
@@ -194,27 +165,23 @@ $result_trees{'setchapternewpage_on_odd_titlepage'} = {
 
$result_trees{'setchapternewpage_on_odd_titlepage'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'setchapternewpage_on_odd_titlepage'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0];
 
$result_trees{'setchapternewpage_on_odd_titlepage'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'parent'}
 = 
$result_trees{'setchapternewpage_on_odd_titlepage'}{'contents'}[0]{'contents'}[0]{'contents'}[0];
 
$result_trees{'setchapternewpage_on_odd_titlepage'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'setchapternewpage_on_odd_titlepage'}{'contents'}[0]{'contents'}[0];
-$result_trees{'setchapternewpage_on_odd_titlepage'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'setchapternewpage_on_odd_titlepage'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0];
-$result_trees{'setchapternewpage_on_odd_titlepage'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'setchapternewpage_on_odd_titlepage'}{'contents'}[0]{'contents'}[0]{'contents'}[1];
 
$result_trees{'setchapternewpage_on_odd_titlepage'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'parent'}
 = 
$result_trees{'setchapternewpage_on_odd_titlepage'}{'contents'}[0]{'contents'}[0];
+$result_trees{'setchapternewpage_on_odd_titlepage'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'setchapternewpage_on_odd_titlepage'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'args'}[0];
+$result_trees{'setchapternewpage_on_odd_titlepage'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'args'}[0]{'parent'}
 = 
$result_trees{'setchapternewpage_on_odd_titlepage'}{'contents'}[0]{'contents'}[0]{'contents'}[2];
 
$result_trees{'setchapternewpage_on_odd_titlepage'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'parent'}
 = 
$result_trees{'setchapternewpage_on_odd_titlepage'}{'contents'}[0]{'contents'}[0];
-$result_trees{'setchapternewpage_on_odd_titlepage'}{'contents'}[0]{'contents'}[0]{'contents'}[3]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'setchapternewpage_on_odd_titlepage'}{'contents'}[0]{'contents'}[0]{'contents'}[3]{'args'}[0];
-$result_trees{'setchapternewpage_on_odd_titlepage'}{'contents'}[0]{'contents'}[0]{'contents'}[3]{'args'}[0]{'parent'}
 = 
$result_trees{'setchapternewpage_on_odd_titlepage'}{'contents'}[0]{'contents'}[0]{'contents'}[3];
 
$result_trees{'setchapternewpage_on_odd_titlepage'}{'contents'}[0]{'contents'}[0]{'contents'}[3]{'parent'}
 = 
$result_trees{'setchapternewpage_on_odd_titlepage'}{'contents'}[0]{'contents'}[0];
+$result_trees{'setchapternewpage_on_odd_titlepage'}{'contents'}[0]{'contents'}[0]{'contents'}[4]{'args'}[0]{'parent'}
 = 
$result_trees{'setchapternewpage_on_odd_titlepage'}{'contents'}[0]{'contents'}[0]{'contents'}[4];
+$result_trees{'setchapternewpage_on_odd_titlepage'}{'contents'}[0]{'contents'}[0]{'contents'}[4]{'contents'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'setchapternewpage_on_odd_titlepage'}{'contents'}[0]{'contents'}[0]{'contents'}[4]{'contents'}[0];
+$result_trees{'setchapternewpage_on_odd_titlepage'}{'contents'}[0]{'contents'}[0]{'contents'}[4]{'contents'}[0]{'parent'}
 = 
$result_trees{'setchapternewpage_on_odd_titlepage'}{'contents'}[0]{'contents'}[0]{'contents'}[4];
+$result_trees{'setchapternewpage_on_odd_titlepage'}{'contents'}[0]{'contents'}[0]{'contents'}[4]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'setchapternewpage_on_odd_titlepage'}{'contents'}[0]{'contents'}[0]{'contents'}[4]{'contents'}[1]{'args'}[0];
+$result_trees{'setchapternewpage_on_odd_titlepage'}{'contents'}[0]{'contents'}[0]{'contents'}[4]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'setchapternewpage_on_odd_titlepage'}{'contents'}[0]{'contents'}[0]{'contents'}[4]{'contents'}[1];
+$result_trees{'setchapternewpage_on_odd_titlepage'}{'contents'}[0]{'contents'}[0]{'contents'}[4]{'contents'}[1]{'parent'}
 = 
$result_trees{'setchapternewpage_on_odd_titlepage'}{'contents'}[0]{'contents'}[0]{'contents'}[4];
+$result_trees{'setchapternewpage_on_odd_titlepage'}{'contents'}[0]{'contents'}[0]{'contents'}[4]{'extra'}{'end_command'}
 = 
$result_trees{'setchapternewpage_on_odd_titlepage'}{'contents'}[0]{'contents'}[0]{'contents'}[4]{'contents'}[1];
 
$result_trees{'setchapternewpage_on_odd_titlepage'}{'contents'}[0]{'contents'}[0]{'contents'}[4]{'parent'}
 = 
$result_trees{'setchapternewpage_on_odd_titlepage'}{'contents'}[0]{'contents'}[0];
-$result_trees{'setchapternewpage_on_odd_titlepage'}{'contents'}[0]{'contents'}[0]{'contents'}[5]{'args'}[0]{'parent'}
 = 
$result_trees{'setchapternewpage_on_odd_titlepage'}{'contents'}[0]{'contents'}[0]{'contents'}[5];
-$result_trees{'setchapternewpage_on_odd_titlepage'}{'contents'}[0]{'contents'}[0]{'contents'}[5]{'contents'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'setchapternewpage_on_odd_titlepage'}{'contents'}[0]{'contents'}[0]{'contents'}[5]{'contents'}[0];
-$result_trees{'setchapternewpage_on_odd_titlepage'}{'contents'}[0]{'contents'}[0]{'contents'}[5]{'contents'}[0]{'parent'}
 = 
$result_trees{'setchapternewpage_on_odd_titlepage'}{'contents'}[0]{'contents'}[0]{'contents'}[5];
-$result_trees{'setchapternewpage_on_odd_titlepage'}{'contents'}[0]{'contents'}[0]{'contents'}[5]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'setchapternewpage_on_odd_titlepage'}{'contents'}[0]{'contents'}[0]{'contents'}[5]{'contents'}[1]{'args'}[0];
-$result_trees{'setchapternewpage_on_odd_titlepage'}{'contents'}[0]{'contents'}[0]{'contents'}[5]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'setchapternewpage_on_odd_titlepage'}{'contents'}[0]{'contents'}[0]{'contents'}[5]{'contents'}[1];
-$result_trees{'setchapternewpage_on_odd_titlepage'}{'contents'}[0]{'contents'}[0]{'contents'}[5]{'contents'}[1]{'parent'}
 = 
$result_trees{'setchapternewpage_on_odd_titlepage'}{'contents'}[0]{'contents'}[0]{'contents'}[5];
-$result_trees{'setchapternewpage_on_odd_titlepage'}{'contents'}[0]{'contents'}[0]{'contents'}[5]{'extra'}{'end_command'}
 = 
$result_trees{'setchapternewpage_on_odd_titlepage'}{'contents'}[0]{'contents'}[0]{'contents'}[5]{'contents'}[1];
-$result_trees{'setchapternewpage_on_odd_titlepage'}{'contents'}[0]{'contents'}[0]{'contents'}[5]{'parent'}
 = 
$result_trees{'setchapternewpage_on_odd_titlepage'}{'contents'}[0]{'contents'}[0];
 
$result_trees{'setchapternewpage_on_odd_titlepage'}{'contents'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'setchapternewpage_on_odd_titlepage'}{'contents'}[0];
 $result_trees{'setchapternewpage_on_odd_titlepage'}{'contents'}[0]{'parent'} = 
$result_trees{'setchapternewpage_on_odd_titlepage'};
 
-$result_texis{'setchapternewpage_on_odd_titlepage'} = '@setfilename 
setchapternewpage_on_odd_titlepage.info
-@setchapternewpage on
+$result_texis{'setchapternewpage_on_odd_titlepage'} = '@setchapternewpage on
 
 @setchapternewpage odd
 
@@ -233,7 +200,7 @@ $result_errors{'setchapternewpage_on_odd_titlepage'} = [
     'error_line' => 'warning: multiple @setchapternewpage
 ',
     'file_name' => '',
-    'line_nr' => 4,
+    'line_nr' => 3,
     'macro' => '',
     'text' => 'multiple @setchapternewpage',
     'type' => 'warning'
diff --git a/tp/t/results/latex_tests/settitle_and_headings.pl 
b/tp/t/results/latex_tests/settitle_and_headings.pl
index 4e26f6d368..bb897a1393 100644
--- a/tp/t/results/latex_tests/settitle_and_headings.pl
+++ b/tp/t/results/latex_tests/settitle_and_headings.pl
@@ -11,35 +11,6 @@ $result_trees{'settitle_and_headings'} = {
       'contents' => [
         {
           'contents' => [
-            {
-              'args' => [
-                {
-                  'contents' => [
-                    {
-                      'parent' => {},
-                      'text' => 'settitle_and_headings.info'
-                    }
-                  ],
-                  'extra' => {
-                    'spaces_after_argument' => '
-'
-                  },
-                  'parent' => {},
-                  'type' => 'line_arg'
-                }
-              ],
-              'cmdname' => 'setfilename',
-              'extra' => {
-                'spaces_before_argument' => ' ',
-                'text_arg' => 'settitle_and_headings.info'
-              },
-              'parent' => {},
-              'source_info' => {
-                'file_name' => '',
-                'line_nr' => 1,
-                'macro' => ''
-              }
-            },
             {
               'args' => [
                 {
@@ -72,7 +43,7 @@ $result_trees{'settitle_and_headings'} = {
               'parent' => {},
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 2,
+                'line_nr' => 1,
                 'macro' => ''
               }
             },
@@ -109,7 +80,7 @@ $result_trees{'settitle_and_headings'} = {
               'parent' => {},
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 4,
+                'line_nr' => 3,
                 'macro' => ''
               }
             },
@@ -223,7 +194,7 @@ $result_trees{'settitle_and_headings'} = {
       'parent' => {},
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 6,
+        'line_nr' => 5,
         'macro' => ''
       }
     }
@@ -231,18 +202,15 @@ $result_trees{'settitle_and_headings'} = {
   'type' => 'document_root'
 };
 
$result_trees{'settitle_and_headings'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'settitle_and_headings'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0];
+$result_trees{'settitle_and_headings'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[1]{'parent'}
 = 
$result_trees{'settitle_and_headings'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0];
+$result_trees{'settitle_and_headings'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[2]{'parent'}
 = 
$result_trees{'settitle_and_headings'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0];
 
$result_trees{'settitle_and_headings'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'parent'}
 = 
$result_trees{'settitle_and_headings'}{'contents'}[0]{'contents'}[0]{'contents'}[0];
 
$result_trees{'settitle_and_headings'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'settitle_and_headings'}{'contents'}[0]{'contents'}[0];
-$result_trees{'settitle_and_headings'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'settitle_and_headings'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0];
-$result_trees{'settitle_and_headings'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[1]{'parent'}
 = 
$result_trees{'settitle_and_headings'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0];
-$result_trees{'settitle_and_headings'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[2]{'parent'}
 = 
$result_trees{'settitle_and_headings'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0];
-$result_trees{'settitle_and_headings'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'settitle_and_headings'}{'contents'}[0]{'contents'}[0]{'contents'}[1];
 
$result_trees{'settitle_and_headings'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'parent'}
 = $result_trees{'settitle_and_headings'}{'contents'}[0]{'contents'}[0];
+$result_trees{'settitle_and_headings'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'settitle_and_headings'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'args'}[0];
+$result_trees{'settitle_and_headings'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'args'}[0]{'parent'}
 = 
$result_trees{'settitle_and_headings'}{'contents'}[0]{'contents'}[0]{'contents'}[2];
 
$result_trees{'settitle_and_headings'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'parent'}
 = $result_trees{'settitle_and_headings'}{'contents'}[0]{'contents'}[0];
-$result_trees{'settitle_and_headings'}{'contents'}[0]{'contents'}[0]{'contents'}[3]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'settitle_and_headings'}{'contents'}[0]{'contents'}[0]{'contents'}[3]{'args'}[0];
-$result_trees{'settitle_and_headings'}{'contents'}[0]{'contents'}[0]{'contents'}[3]{'args'}[0]{'parent'}
 = 
$result_trees{'settitle_and_headings'}{'contents'}[0]{'contents'}[0]{'contents'}[3];
 
$result_trees{'settitle_and_headings'}{'contents'}[0]{'contents'}[0]{'contents'}[3]{'parent'}
 = $result_trees{'settitle_and_headings'}{'contents'}[0]{'contents'}[0];
-$result_trees{'settitle_and_headings'}{'contents'}[0]{'contents'}[0]{'contents'}[4]{'parent'}
 = $result_trees{'settitle_and_headings'}{'contents'}[0]{'contents'}[0];
 $result_trees{'settitle_and_headings'}{'contents'}[0]{'contents'}[0]{'parent'} 
= $result_trees{'settitle_and_headings'}{'contents'}[0];
 $result_trees{'settitle_and_headings'}{'contents'}[0]{'parent'} = 
$result_trees{'settitle_and_headings'};
 
$result_trees{'settitle_and_headings'}{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'settitle_and_headings'}{'contents'}[1]{'args'}[0];
@@ -261,8 +229,7 @@ 
$result_trees{'settitle_and_headings'}{'contents'}[1]{'contents'}[7]{'contents'}
 $result_trees{'settitle_and_headings'}{'contents'}[1]{'contents'}[7]{'parent'} 
= $result_trees{'settitle_and_headings'}{'contents'}[1];
 $result_trees{'settitle_and_headings'}{'contents'}[1]{'parent'} = 
$result_trees{'settitle_and_headings'};
 
-$result_texis{'settitle_and_headings'} = '@setfilename 
settitle_and_headings.info
-@settitle Title @* for a manual
+$result_texis{'settitle_and_headings'} = '@settitle Title @* for a manual
 
 @headings double
 
diff --git a/tp/t/results/latex_tests/shorttitlepage.pl 
b/tp/t/results/latex_tests/shorttitlepage.pl
index 21985ff549..e02d976f69 100644
--- a/tp/t/results/latex_tests/shorttitlepage.pl
+++ b/tp/t/results/latex_tests/shorttitlepage.pl
@@ -11,41 +11,6 @@ $result_trees{'shorttitlepage'} = {
       'contents' => [
         {
           'contents' => [
-            {
-              'args' => [
-                {
-                  'contents' => [
-                    {
-                      'parent' => {},
-                      'text' => 'shorttitlepage.info'
-                    }
-                  ],
-                  'extra' => {
-                    'spaces_after_argument' => '
-'
-                  },
-                  'parent' => {},
-                  'type' => 'line_arg'
-                }
-              ],
-              'cmdname' => 'setfilename',
-              'extra' => {
-                'spaces_before_argument' => ' ',
-                'text_arg' => 'shorttitlepage.info'
-              },
-              'parent' => {},
-              'source_info' => {
-                'file_name' => '',
-                'line_nr' => 1,
-                'macro' => ''
-              }
-            },
-            {
-              'parent' => {},
-              'text' => '
-',
-              'type' => 'empty_line'
-            },
             {
               'args' => [
                 {
@@ -78,7 +43,7 @@ $result_trees{'shorttitlepage'} = {
               'parent' => {},
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 3,
+                'line_nr' => 1,
                 'macro' => ''
               }
             },
@@ -133,7 +98,7 @@ $result_trees{'shorttitlepage'} = {
       'parent' => {},
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 5,
+        'line_nr' => 3,
         'macro' => ''
       }
     },
@@ -169,7 +134,7 @@ $result_trees{'shorttitlepage'} = {
       'parent' => {},
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 6,
+        'line_nr' => 4,
         'macro' => ''
       }
     },
@@ -210,7 +175,7 @@ $result_trees{'shorttitlepage'} = {
       'parent' => {},
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 8,
+        'line_nr' => 6,
         'macro' => ''
       }
     },
@@ -257,7 +222,7 @@ $result_trees{'shorttitlepage'} = {
       'parent' => {},
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 9,
+        'line_nr' => 7,
         'macro' => ''
       }
     }
@@ -265,15 +230,11 @@ $result_trees{'shorttitlepage'} = {
   'type' => 'document_root'
 };
 
$result_trees{'shorttitlepage'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'shorttitlepage'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0];
+$result_trees{'shorttitlepage'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[1]{'parent'}
 = 
$result_trees{'shorttitlepage'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0];
+$result_trees{'shorttitlepage'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[2]{'parent'}
 = 
$result_trees{'shorttitlepage'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0];
 
$result_trees{'shorttitlepage'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'parent'}
 = $result_trees{'shorttitlepage'}{'contents'}[0]{'contents'}[0]{'contents'}[0];
 
$result_trees{'shorttitlepage'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'shorttitlepage'}{'contents'}[0]{'contents'}[0];
 
$result_trees{'shorttitlepage'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'parent'}
 = $result_trees{'shorttitlepage'}{'contents'}[0]{'contents'}[0];
-$result_trees{'shorttitlepage'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'shorttitlepage'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'args'}[0];
-$result_trees{'shorttitlepage'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[1]{'parent'}
 = 
$result_trees{'shorttitlepage'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'args'}[0];
-$result_trees{'shorttitlepage'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[2]{'parent'}
 = 
$result_trees{'shorttitlepage'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'args'}[0];
-$result_trees{'shorttitlepage'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'args'}[0]{'parent'}
 = $result_trees{'shorttitlepage'}{'contents'}[0]{'contents'}[0]{'contents'}[2];
-$result_trees{'shorttitlepage'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'parent'}
 = $result_trees{'shorttitlepage'}{'contents'}[0]{'contents'}[0];
-$result_trees{'shorttitlepage'}{'contents'}[0]{'contents'}[0]{'contents'}[3]{'parent'}
 = $result_trees{'shorttitlepage'}{'contents'}[0]{'contents'}[0];
 $result_trees{'shorttitlepage'}{'contents'}[0]{'contents'}[0]{'parent'} = 
$result_trees{'shorttitlepage'}{'contents'}[0];
 $result_trees{'shorttitlepage'}{'contents'}[0]{'parent'} = 
$result_trees{'shorttitlepage'};
 
$result_trees{'shorttitlepage'}{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'shorttitlepage'}{'contents'}[1]{'args'}[0];
@@ -297,9 +258,7 @@ 
$result_trees{'shorttitlepage'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'pa
 $result_trees{'shorttitlepage'}{'contents'}[4]{'contents'}[1]{'parent'} = 
$result_trees{'shorttitlepage'}{'contents'}[4];
 $result_trees{'shorttitlepage'}{'contents'}[4]{'parent'} = 
$result_trees{'shorttitlepage'};
 
-$result_texis{'shorttitlepage'} = '@setfilename shorttitlepage.info
-
-@shorttitlepage the title with shorttitlepage @* it can be long
+$result_texis{'shorttitlepage'} = '@shorttitlepage the title with 
shorttitlepage @* it can be long
 
 @node Top
 @top section top
@@ -312,7 +271,6 @@ In chapter
 
 
 $result_texts{'shorttitlepage'} = '
-
 section top
 ***********
 
@@ -420,7 +378,6 @@ $result_floats{'shorttitlepage'} = {};
 
 
 $result_converted{'latex_text'}->{'shorttitlepage'} = '
-
 \\begin{document}
 
 \\GNUTexinfofrontmatter
diff --git 
a/tp/t/results/latex_tests/shorttitlepage/res_latex/shorttitlepage.tex 
b/tp/t/results/latex_tests/shorttitlepage/res_latex/shorttitlepage.tex
index bc851e4ef8..4e036779b8 100644
--- a/tp/t/results/latex_tests/shorttitlepage/res_latex/shorttitlepage.tex
+++ b/tp/t/results/latex_tests/shorttitlepage/res_latex/shorttitlepage.tex
@@ -65,7 +65,6 @@
 \pagestyle{empty}%
 
 
-
 \begin{document}
 
 \GNUTexinfofrontmatter
diff --git a/tp/t/results/latex_tests/three_setchapternewpage_on_odd_off.pl 
b/tp/t/results/latex_tests/three_setchapternewpage_on_odd_off.pl
index f0d9eb9d15..50ce343c9d 100644
--- a/tp/t/results/latex_tests/three_setchapternewpage_on_odd_off.pl
+++ b/tp/t/results/latex_tests/three_setchapternewpage_on_odd_off.pl
@@ -11,35 +11,6 @@ $result_trees{'three_setchapternewpage_on_odd_off'} = {
       'contents' => [
         {
           'contents' => [
-            {
-              'args' => [
-                {
-                  'contents' => [
-                    {
-                      'parent' => {},
-                      'text' => 'three_setchapternewpage_on_odd_off.info'
-                    }
-                  ],
-                  'extra' => {
-                    'spaces_after_argument' => '
-'
-                  },
-                  'parent' => {},
-                  'type' => 'line_arg'
-                }
-              ],
-              'cmdname' => 'setfilename',
-              'extra' => {
-                'spaces_before_argument' => ' ',
-                'text_arg' => 'three_setchapternewpage_on_odd_off.info'
-              },
-              'parent' => {},
-              'source_info' => {
-                'file_name' => '',
-                'line_nr' => 1,
-                'macro' => ''
-              }
-            },
             {
               'args' => [
                 {
@@ -67,7 +38,7 @@ $result_trees{'three_setchapternewpage_on_odd_off'} = {
               'parent' => {},
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 2,
+                'line_nr' => 1,
                 'macro' => ''
               }
             },
@@ -104,7 +75,7 @@ $result_trees{'three_setchapternewpage_on_odd_off'} = {
               'parent' => {},
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 4,
+                'line_nr' => 3,
                 'macro' => ''
               }
             },
@@ -141,7 +112,7 @@ $result_trees{'three_setchapternewpage_on_odd_off'} = {
               'parent' => {},
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 6,
+                'line_nr' => 5,
                 'macro' => ''
               }
             }
@@ -159,22 +130,18 @@ $result_trees{'three_setchapternewpage_on_odd_off'} = {
 
$result_trees{'three_setchapternewpage_on_odd_off'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'three_setchapternewpage_on_odd_off'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0];
 
$result_trees{'three_setchapternewpage_on_odd_off'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'parent'}
 = 
$result_trees{'three_setchapternewpage_on_odd_off'}{'contents'}[0]{'contents'}[0]{'contents'}[0];
 
$result_trees{'three_setchapternewpage_on_odd_off'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'three_setchapternewpage_on_odd_off'}{'contents'}[0]{'contents'}[0];
-$result_trees{'three_setchapternewpage_on_odd_off'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'three_setchapternewpage_on_odd_off'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0];
-$result_trees{'three_setchapternewpage_on_odd_off'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'three_setchapternewpage_on_odd_off'}{'contents'}[0]{'contents'}[0]{'contents'}[1];
 
$result_trees{'three_setchapternewpage_on_odd_off'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'parent'}
 = 
$result_trees{'three_setchapternewpage_on_odd_off'}{'contents'}[0]{'contents'}[0];
+$result_trees{'three_setchapternewpage_on_odd_off'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'three_setchapternewpage_on_odd_off'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'args'}[0];
+$result_trees{'three_setchapternewpage_on_odd_off'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'args'}[0]{'parent'}
 = 
$result_trees{'three_setchapternewpage_on_odd_off'}{'contents'}[0]{'contents'}[0]{'contents'}[2];
 
$result_trees{'three_setchapternewpage_on_odd_off'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'parent'}
 = 
$result_trees{'three_setchapternewpage_on_odd_off'}{'contents'}[0]{'contents'}[0];
-$result_trees{'three_setchapternewpage_on_odd_off'}{'contents'}[0]{'contents'}[0]{'contents'}[3]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'three_setchapternewpage_on_odd_off'}{'contents'}[0]{'contents'}[0]{'contents'}[3]{'args'}[0];
-$result_trees{'three_setchapternewpage_on_odd_off'}{'contents'}[0]{'contents'}[0]{'contents'}[3]{'args'}[0]{'parent'}
 = 
$result_trees{'three_setchapternewpage_on_odd_off'}{'contents'}[0]{'contents'}[0]{'contents'}[3];
 
$result_trees{'three_setchapternewpage_on_odd_off'}{'contents'}[0]{'contents'}[0]{'contents'}[3]{'parent'}
 = 
$result_trees{'three_setchapternewpage_on_odd_off'}{'contents'}[0]{'contents'}[0];
+$result_trees{'three_setchapternewpage_on_odd_off'}{'contents'}[0]{'contents'}[0]{'contents'}[4]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'three_setchapternewpage_on_odd_off'}{'contents'}[0]{'contents'}[0]{'contents'}[4]{'args'}[0];
+$result_trees{'three_setchapternewpage_on_odd_off'}{'contents'}[0]{'contents'}[0]{'contents'}[4]{'args'}[0]{'parent'}
 = 
$result_trees{'three_setchapternewpage_on_odd_off'}{'contents'}[0]{'contents'}[0]{'contents'}[4];
 
$result_trees{'three_setchapternewpage_on_odd_off'}{'contents'}[0]{'contents'}[0]{'contents'}[4]{'parent'}
 = 
$result_trees{'three_setchapternewpage_on_odd_off'}{'contents'}[0]{'contents'}[0];
-$result_trees{'three_setchapternewpage_on_odd_off'}{'contents'}[0]{'contents'}[0]{'contents'}[5]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'three_setchapternewpage_on_odd_off'}{'contents'}[0]{'contents'}[0]{'contents'}[5]{'args'}[0];
-$result_trees{'three_setchapternewpage_on_odd_off'}{'contents'}[0]{'contents'}[0]{'contents'}[5]{'args'}[0]{'parent'}
 = 
$result_trees{'three_setchapternewpage_on_odd_off'}{'contents'}[0]{'contents'}[0]{'contents'}[5];
-$result_trees{'three_setchapternewpage_on_odd_off'}{'contents'}[0]{'contents'}[0]{'contents'}[5]{'parent'}
 = 
$result_trees{'three_setchapternewpage_on_odd_off'}{'contents'}[0]{'contents'}[0];
 
$result_trees{'three_setchapternewpage_on_odd_off'}{'contents'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'three_setchapternewpage_on_odd_off'}{'contents'}[0];
 $result_trees{'three_setchapternewpage_on_odd_off'}{'contents'}[0]{'parent'} = 
$result_trees{'three_setchapternewpage_on_odd_off'};
 
-$result_texis{'three_setchapternewpage_on_odd_off'} = '@setfilename 
three_setchapternewpage_on_odd_off.info
-@setchapternewpage on
+$result_texis{'three_setchapternewpage_on_odd_off'} = '@setchapternewpage on
 
 @setchapternewpage odd
 
@@ -191,7 +158,7 @@ $result_errors{'three_setchapternewpage_on_odd_off'} = [
     'error_line' => 'warning: multiple @setchapternewpage
 ',
     'file_name' => '',
-    'line_nr' => 4,
+    'line_nr' => 3,
     'macro' => '',
     'text' => 'multiple @setchapternewpage',
     'type' => 'warning'
@@ -200,7 +167,7 @@ $result_errors{'three_setchapternewpage_on_odd_off'} = [
     'error_line' => 'warning: multiple @setchapternewpage
 ',
     'file_name' => '',
-    'line_nr' => 6,
+    'line_nr' => 5,
     'macro' => '',
     'text' => 'multiple @setchapternewpage',
     'type' => 'warning'
diff --git a/tp/t/results/latex_tests/titlepage_and_headings.pl 
b/tp/t/results/latex_tests/titlepage_and_headings.pl
index 50f91c55c0..69e9616658 100644
--- a/tp/t/results/latex_tests/titlepage_and_headings.pl
+++ b/tp/t/results/latex_tests/titlepage_and_headings.pl
@@ -11,41 +11,6 @@ $result_trees{'titlepage_and_headings'} = {
       'contents' => [
         {
           'contents' => [
-            {
-              'args' => [
-                {
-                  'contents' => [
-                    {
-                      'parent' => {},
-                      'text' => 'titlepage_and_headings.info'
-                    }
-                  ],
-                  'extra' => {
-                    'spaces_after_argument' => '
-'
-                  },
-                  'parent' => {},
-                  'type' => 'line_arg'
-                }
-              ],
-              'cmdname' => 'setfilename',
-              'extra' => {
-                'spaces_before_argument' => ' ',
-                'text_arg' => 'titlepage_and_headings.info'
-              },
-              'parent' => {},
-              'source_info' => {
-                'file_name' => '',
-                'line_nr' => 1,
-                'macro' => ''
-              }
-            },
-            {
-              'parent' => {},
-              'text' => '
-',
-              'type' => 'empty_line'
-            },
             {
               'args' => [
                 {
@@ -97,7 +62,7 @@ $result_trees{'titlepage_and_headings'} = {
                   'parent' => {},
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 5,
+                    'line_nr' => 3,
                     'macro' => ''
                   }
                 }
@@ -108,7 +73,7 @@ $result_trees{'titlepage_and_headings'} = {
               'parent' => {},
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 3,
+                'line_nr' => 1,
                 'macro' => ''
               }
             },
@@ -129,25 +94,19 @@ $result_trees{'titlepage_and_headings'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'titlepage_and_headings'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'titlepage_and_headings'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0];
 
$result_trees{'titlepage_and_headings'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'parent'}
 = 
$result_trees{'titlepage_and_headings'}{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'titlepage_and_headings'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'titlepage_and_headings'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'titlepage_and_headings'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'titlepage_and_headings'}{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'titlepage_and_headings'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'titlepage_and_headings'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0];
+$result_trees{'titlepage_and_headings'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'titlepage_and_headings'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1];
+$result_trees{'titlepage_and_headings'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'parent'}
 = 
$result_trees{'titlepage_and_headings'}{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'titlepage_and_headings'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'end_command'}
 = 
$result_trees{'titlepage_and_headings'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1];
 
$result_trees{'titlepage_and_headings'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'titlepage_and_headings'}{'contents'}[0]{'contents'}[0];
 
$result_trees{'titlepage_and_headings'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'parent'}
 = $result_trees{'titlepage_and_headings'}{'contents'}[0]{'contents'}[0];
-$result_trees{'titlepage_and_headings'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'args'}[0]{'parent'}
 = 
$result_trees{'titlepage_and_headings'}{'contents'}[0]{'contents'}[0]{'contents'}[2];
-$result_trees{'titlepage_and_headings'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'titlepage_and_headings'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'contents'}[0];
-$result_trees{'titlepage_and_headings'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'contents'}[0]{'parent'}
 = 
$result_trees{'titlepage_and_headings'}{'contents'}[0]{'contents'}[0]{'contents'}[2];
-$result_trees{'titlepage_and_headings'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'titlepage_and_headings'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'contents'}[1]{'args'}[0];
-$result_trees{'titlepage_and_headings'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'titlepage_and_headings'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'contents'}[1];
-$result_trees{'titlepage_and_headings'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'contents'}[1]{'parent'}
 = 
$result_trees{'titlepage_and_headings'}{'contents'}[0]{'contents'}[0]{'contents'}[2];
-$result_trees{'titlepage_and_headings'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'extra'}{'end_command'}
 = 
$result_trees{'titlepage_and_headings'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'contents'}[1];
-$result_trees{'titlepage_and_headings'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'parent'}
 = $result_trees{'titlepage_and_headings'}{'contents'}[0]{'contents'}[0];
-$result_trees{'titlepage_and_headings'}{'contents'}[0]{'contents'}[0]{'contents'}[3]{'parent'}
 = $result_trees{'titlepage_and_headings'}{'contents'}[0]{'contents'}[0];
 
$result_trees{'titlepage_and_headings'}{'contents'}[0]{'contents'}[0]{'parent'} 
= $result_trees{'titlepage_and_headings'}{'contents'}[0];
 $result_trees{'titlepage_and_headings'}{'contents'}[0]{'parent'} = 
$result_trees{'titlepage_and_headings'};
 
-$result_texis{'titlepage_and_headings'} = '@setfilename 
titlepage_and_headings.info
-
-@titlepage
+$result_texis{'titlepage_and_headings'} = '@titlepage
 in titlepage
 @end titlepage
 
@@ -155,7 +114,6 @@ in titlepage
 
 
 $result_texts{'titlepage_and_headings'} = '
-
 ';
 
 $result_errors{'titlepage_and_headings'} = [];
@@ -166,7 +124,6 @@ $result_floats{'titlepage_and_headings'} = {};
 
 
 $result_converted{'latex_text'}->{'titlepage_and_headings'} = '
-
 \\begin{document}
 
 \\GNUTexinfofrontmatter
diff --git 
a/tp/t/results/latex_tests/titlepage_and_headings/res_latex/titlepage_and_headings.tex
 
b/tp/t/results/latex_tests/titlepage_and_headings/res_latex/titlepage_and_headings.tex
index ead4305a93..00c787c1ca 100644
--- 
a/tp/t/results/latex_tests/titlepage_and_headings/res_latex/titlepage_and_headings.tex
+++ 
b/tp/t/results/latex_tests/titlepage_and_headings/res_latex/titlepage_and_headings.tex
@@ -65,7 +65,6 @@
 \pagestyle{empty}%
 
 
-
 \begin{document}
 
 \GNUTexinfofrontmatter
diff --git a/tp/t/results/latex_tests/titlepage_and_setchapternewpage_odd.pl 
b/tp/t/results/latex_tests/titlepage_and_setchapternewpage_odd.pl
index 0aad67aaa3..f7bcaf3977 100644
--- a/tp/t/results/latex_tests/titlepage_and_setchapternewpage_odd.pl
+++ b/tp/t/results/latex_tests/titlepage_and_setchapternewpage_odd.pl
@@ -11,41 +11,6 @@ $result_trees{'titlepage_and_setchapternewpage_odd'} = {
       'contents' => [
         {
           'contents' => [
-            {
-              'args' => [
-                {
-                  'contents' => [
-                    {
-                      'parent' => {},
-                      'text' => 'titlepage_and_setchapternewpage_odd.info'
-                    }
-                  ],
-                  'extra' => {
-                    'spaces_after_argument' => '
-'
-                  },
-                  'parent' => {},
-                  'type' => 'line_arg'
-                }
-              ],
-              'cmdname' => 'setfilename',
-              'extra' => {
-                'spaces_before_argument' => ' ',
-                'text_arg' => 'titlepage_and_setchapternewpage_odd.info'
-              },
-              'parent' => {},
-              'source_info' => {
-                'file_name' => '',
-                'line_nr' => 1,
-                'macro' => ''
-              }
-            },
-            {
-              'parent' => {},
-              'text' => '
-',
-              'type' => 'empty_line'
-            },
             {
               'args' => [
                 {
@@ -73,7 +38,7 @@ $result_trees{'titlepage_and_setchapternewpage_odd'} = {
               'parent' => {},
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 3,
+                'line_nr' => 1,
                 'macro' => ''
               }
             },
@@ -134,7 +99,7 @@ $result_trees{'titlepage_and_setchapternewpage_odd'} = {
                   'parent' => {},
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 7,
+                    'line_nr' => 5,
                     'macro' => ''
                   }
                 }
@@ -145,7 +110,7 @@ $result_trees{'titlepage_and_setchapternewpage_odd'} = {
               'parent' => {},
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 5,
+                'line_nr' => 3,
                 'macro' => ''
               }
             },
@@ -170,25 +135,19 @@ 
$result_trees{'titlepage_and_setchapternewpage_odd'}{'contents'}[0]{'contents'}[
 
$result_trees{'titlepage_and_setchapternewpage_odd'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'parent'}
 = 
$result_trees{'titlepage_and_setchapternewpage_odd'}{'contents'}[0]{'contents'}[0]{'contents'}[0];
 
$result_trees{'titlepage_and_setchapternewpage_odd'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'titlepage_and_setchapternewpage_odd'}{'contents'}[0]{'contents'}[0];
 
$result_trees{'titlepage_and_setchapternewpage_odd'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'parent'}
 = 
$result_trees{'titlepage_and_setchapternewpage_odd'}{'contents'}[0]{'contents'}[0];
-$result_trees{'titlepage_and_setchapternewpage_odd'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'titlepage_and_setchapternewpage_odd'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'args'}[0];
 
$result_trees{'titlepage_and_setchapternewpage_odd'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'args'}[0]{'parent'}
 = 
$result_trees{'titlepage_and_setchapternewpage_odd'}{'contents'}[0]{'contents'}[0]{'contents'}[2];
+$result_trees{'titlepage_and_setchapternewpage_odd'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'titlepage_and_setchapternewpage_odd'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'contents'}[0];
+$result_trees{'titlepage_and_setchapternewpage_odd'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'contents'}[0]{'parent'}
 = 
$result_trees{'titlepage_and_setchapternewpage_odd'}{'contents'}[0]{'contents'}[0]{'contents'}[2];
+$result_trees{'titlepage_and_setchapternewpage_odd'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'titlepage_and_setchapternewpage_odd'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'contents'}[1]{'args'}[0];
+$result_trees{'titlepage_and_setchapternewpage_odd'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'titlepage_and_setchapternewpage_odd'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'contents'}[1];
+$result_trees{'titlepage_and_setchapternewpage_odd'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'contents'}[1]{'parent'}
 = 
$result_trees{'titlepage_and_setchapternewpage_odd'}{'contents'}[0]{'contents'}[0]{'contents'}[2];
+$result_trees{'titlepage_and_setchapternewpage_odd'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'extra'}{'end_command'}
 = 
$result_trees{'titlepage_and_setchapternewpage_odd'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'contents'}[1];
 
$result_trees{'titlepage_and_setchapternewpage_odd'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'parent'}
 = 
$result_trees{'titlepage_and_setchapternewpage_odd'}{'contents'}[0]{'contents'}[0];
 
$result_trees{'titlepage_and_setchapternewpage_odd'}{'contents'}[0]{'contents'}[0]{'contents'}[3]{'parent'}
 = 
$result_trees{'titlepage_and_setchapternewpage_odd'}{'contents'}[0]{'contents'}[0];
-$result_trees{'titlepage_and_setchapternewpage_odd'}{'contents'}[0]{'contents'}[0]{'contents'}[4]{'args'}[0]{'parent'}
 = 
$result_trees{'titlepage_and_setchapternewpage_odd'}{'contents'}[0]{'contents'}[0]{'contents'}[4];
-$result_trees{'titlepage_and_setchapternewpage_odd'}{'contents'}[0]{'contents'}[0]{'contents'}[4]{'contents'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'titlepage_and_setchapternewpage_odd'}{'contents'}[0]{'contents'}[0]{'contents'}[4]{'contents'}[0];
-$result_trees{'titlepage_and_setchapternewpage_odd'}{'contents'}[0]{'contents'}[0]{'contents'}[4]{'contents'}[0]{'parent'}
 = 
$result_trees{'titlepage_and_setchapternewpage_odd'}{'contents'}[0]{'contents'}[0]{'contents'}[4];
-$result_trees{'titlepage_and_setchapternewpage_odd'}{'contents'}[0]{'contents'}[0]{'contents'}[4]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'titlepage_and_setchapternewpage_odd'}{'contents'}[0]{'contents'}[0]{'contents'}[4]{'contents'}[1]{'args'}[0];
-$result_trees{'titlepage_and_setchapternewpage_odd'}{'contents'}[0]{'contents'}[0]{'contents'}[4]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'titlepage_and_setchapternewpage_odd'}{'contents'}[0]{'contents'}[0]{'contents'}[4]{'contents'}[1];
-$result_trees{'titlepage_and_setchapternewpage_odd'}{'contents'}[0]{'contents'}[0]{'contents'}[4]{'contents'}[1]{'parent'}
 = 
$result_trees{'titlepage_and_setchapternewpage_odd'}{'contents'}[0]{'contents'}[0]{'contents'}[4];
-$result_trees{'titlepage_and_setchapternewpage_odd'}{'contents'}[0]{'contents'}[0]{'contents'}[4]{'extra'}{'end_command'}
 = 
$result_trees{'titlepage_and_setchapternewpage_odd'}{'contents'}[0]{'contents'}[0]{'contents'}[4]{'contents'}[1];
-$result_trees{'titlepage_and_setchapternewpage_odd'}{'contents'}[0]{'contents'}[0]{'contents'}[4]{'parent'}
 = 
$result_trees{'titlepage_and_setchapternewpage_odd'}{'contents'}[0]{'contents'}[0];
-$result_trees{'titlepage_and_setchapternewpage_odd'}{'contents'}[0]{'contents'}[0]{'contents'}[5]{'parent'}
 = 
$result_trees{'titlepage_and_setchapternewpage_odd'}{'contents'}[0]{'contents'}[0];
 
$result_trees{'titlepage_and_setchapternewpage_odd'}{'contents'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'titlepage_and_setchapternewpage_odd'}{'contents'}[0];
 $result_trees{'titlepage_and_setchapternewpage_odd'}{'contents'}[0]{'parent'} 
= $result_trees{'titlepage_and_setchapternewpage_odd'};
 
-$result_texis{'titlepage_and_setchapternewpage_odd'} = '@setfilename 
titlepage_and_setchapternewpage_odd.info
-
-@setchapternewpage odd
+$result_texis{'titlepage_and_setchapternewpage_odd'} = '@setchapternewpage odd
 
 @titlepage
 in titlepage
@@ -199,7 +158,6 @@ in titlepage
 
 $result_texts{'titlepage_and_setchapternewpage_odd'} = '
 
-
 ';
 
 $result_errors{'titlepage_and_setchapternewpage_odd'} = [];
@@ -211,7 +169,6 @@ $result_floats{'titlepage_and_setchapternewpage_odd'} = {};
 
 $result_converted{'latex_text'}->{'titlepage_and_setchapternewpage_odd'} = '
 
-
 \\begin{document}
 
 \\GNUTexinfofrontmatter
diff --git 
a/tp/t/results/latex_tests/titlepage_and_setchapternewpage_odd/res_latex/titlepage_and_setchapternewpage_odd.tex
 
b/tp/t/results/latex_tests/titlepage_and_setchapternewpage_odd/res_latex/titlepage_and_setchapternewpage_odd.tex
index 678c037dd7..dc4b56ea94 100644
--- 
a/tp/t/results/latex_tests/titlepage_and_setchapternewpage_odd/res_latex/titlepage_and_setchapternewpage_odd.tex
+++ 
b/tp/t/results/latex_tests/titlepage_and_setchapternewpage_odd/res_latex/titlepage_and_setchapternewpage_odd.tex
@@ -64,7 +64,6 @@
 % no headings before titlepage
 \pagestyle{empty}%
 
-
 \makeatletter
 \patchcmd{\chapter}{\GNUTexinfoplaceholder{setchapternewpage 
placeholder}\clearpage}{\if@openright\cleardoublepage\else\clearpage\fi}{}{}
 \makeatother
diff --git a/tp/t/results/latex_tests/titlepage_and_setchapternewpage_on.pl 
b/tp/t/results/latex_tests/titlepage_and_setchapternewpage_on.pl
index 13d889eb0e..daa889c8cc 100644
--- a/tp/t/results/latex_tests/titlepage_and_setchapternewpage_on.pl
+++ b/tp/t/results/latex_tests/titlepage_and_setchapternewpage_on.pl
@@ -11,35 +11,6 @@ $result_trees{'titlepage_and_setchapternewpage_on'} = {
       'contents' => [
         {
           'contents' => [
-            {
-              'args' => [
-                {
-                  'contents' => [
-                    {
-                      'parent' => {},
-                      'text' => 'titlepage_and_setchapternewpage_on.info'
-                    }
-                  ],
-                  'extra' => {
-                    'spaces_after_argument' => '
-'
-                  },
-                  'parent' => {},
-                  'type' => 'line_arg'
-                }
-              ],
-              'cmdname' => 'setfilename',
-              'extra' => {
-                'spaces_before_argument' => ' ',
-                'text_arg' => 'titlepage_and_setchapternewpage_on.info'
-              },
-              'parent' => {},
-              'source_info' => {
-                'file_name' => '',
-                'line_nr' => 1,
-                'macro' => ''
-              }
-            },
             {
               'args' => [
                 {
@@ -67,7 +38,7 @@ $result_trees{'titlepage_and_setchapternewpage_on'} = {
               'parent' => {},
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 2,
+                'line_nr' => 1,
                 'macro' => ''
               }
             },
@@ -128,7 +99,7 @@ $result_trees{'titlepage_and_setchapternewpage_on'} = {
                   'parent' => {},
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 6,
+                    'line_nr' => 5,
                     'macro' => ''
                   }
                 }
@@ -139,7 +110,7 @@ $result_trees{'titlepage_and_setchapternewpage_on'} = {
               'parent' => {},
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 4,
+                'line_nr' => 3,
                 'macro' => ''
               }
             },
@@ -163,24 +134,20 @@ $result_trees{'titlepage_and_setchapternewpage_on'} = {
 
$result_trees{'titlepage_and_setchapternewpage_on'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'titlepage_and_setchapternewpage_on'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0];
 
$result_trees{'titlepage_and_setchapternewpage_on'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'parent'}
 = 
$result_trees{'titlepage_and_setchapternewpage_on'}{'contents'}[0]{'contents'}[0]{'contents'}[0];
 
$result_trees{'titlepage_and_setchapternewpage_on'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'titlepage_and_setchapternewpage_on'}{'contents'}[0]{'contents'}[0];
-$result_trees{'titlepage_and_setchapternewpage_on'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'titlepage_and_setchapternewpage_on'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0];
-$result_trees{'titlepage_and_setchapternewpage_on'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'titlepage_and_setchapternewpage_on'}{'contents'}[0]{'contents'}[0]{'contents'}[1];
 
$result_trees{'titlepage_and_setchapternewpage_on'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'parent'}
 = 
$result_trees{'titlepage_and_setchapternewpage_on'}{'contents'}[0]{'contents'}[0];
+$result_trees{'titlepage_and_setchapternewpage_on'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'args'}[0]{'parent'}
 = 
$result_trees{'titlepage_and_setchapternewpage_on'}{'contents'}[0]{'contents'}[0]{'contents'}[2];
+$result_trees{'titlepage_and_setchapternewpage_on'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'titlepage_and_setchapternewpage_on'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'contents'}[0];
+$result_trees{'titlepage_and_setchapternewpage_on'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'contents'}[0]{'parent'}
 = 
$result_trees{'titlepage_and_setchapternewpage_on'}{'contents'}[0]{'contents'}[0]{'contents'}[2];
+$result_trees{'titlepage_and_setchapternewpage_on'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'titlepage_and_setchapternewpage_on'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'contents'}[1]{'args'}[0];
+$result_trees{'titlepage_and_setchapternewpage_on'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'titlepage_and_setchapternewpage_on'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'contents'}[1];
+$result_trees{'titlepage_and_setchapternewpage_on'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'contents'}[1]{'parent'}
 = 
$result_trees{'titlepage_and_setchapternewpage_on'}{'contents'}[0]{'contents'}[0]{'contents'}[2];
+$result_trees{'titlepage_and_setchapternewpage_on'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'extra'}{'end_command'}
 = 
$result_trees{'titlepage_and_setchapternewpage_on'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'contents'}[1];
 
$result_trees{'titlepage_and_setchapternewpage_on'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'parent'}
 = 
$result_trees{'titlepage_and_setchapternewpage_on'}{'contents'}[0]{'contents'}[0];
-$result_trees{'titlepage_and_setchapternewpage_on'}{'contents'}[0]{'contents'}[0]{'contents'}[3]{'args'}[0]{'parent'}
 = 
$result_trees{'titlepage_and_setchapternewpage_on'}{'contents'}[0]{'contents'}[0]{'contents'}[3];
-$result_trees{'titlepage_and_setchapternewpage_on'}{'contents'}[0]{'contents'}[0]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'titlepage_and_setchapternewpage_on'}{'contents'}[0]{'contents'}[0]{'contents'}[3]{'contents'}[0];
-$result_trees{'titlepage_and_setchapternewpage_on'}{'contents'}[0]{'contents'}[0]{'contents'}[3]{'contents'}[0]{'parent'}
 = 
$result_trees{'titlepage_and_setchapternewpage_on'}{'contents'}[0]{'contents'}[0]{'contents'}[3];
-$result_trees{'titlepage_and_setchapternewpage_on'}{'contents'}[0]{'contents'}[0]{'contents'}[3]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'titlepage_and_setchapternewpage_on'}{'contents'}[0]{'contents'}[0]{'contents'}[3]{'contents'}[1]{'args'}[0];
-$result_trees{'titlepage_and_setchapternewpage_on'}{'contents'}[0]{'contents'}[0]{'contents'}[3]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'titlepage_and_setchapternewpage_on'}{'contents'}[0]{'contents'}[0]{'contents'}[3]{'contents'}[1];
-$result_trees{'titlepage_and_setchapternewpage_on'}{'contents'}[0]{'contents'}[0]{'contents'}[3]{'contents'}[1]{'parent'}
 = 
$result_trees{'titlepage_and_setchapternewpage_on'}{'contents'}[0]{'contents'}[0]{'contents'}[3];
-$result_trees{'titlepage_and_setchapternewpage_on'}{'contents'}[0]{'contents'}[0]{'contents'}[3]{'extra'}{'end_command'}
 = 
$result_trees{'titlepage_and_setchapternewpage_on'}{'contents'}[0]{'contents'}[0]{'contents'}[3]{'contents'}[1];
 
$result_trees{'titlepage_and_setchapternewpage_on'}{'contents'}[0]{'contents'}[0]{'contents'}[3]{'parent'}
 = 
$result_trees{'titlepage_and_setchapternewpage_on'}{'contents'}[0]{'contents'}[0];
-$result_trees{'titlepage_and_setchapternewpage_on'}{'contents'}[0]{'contents'}[0]{'contents'}[4]{'parent'}
 = 
$result_trees{'titlepage_and_setchapternewpage_on'}{'contents'}[0]{'contents'}[0];
 
$result_trees{'titlepage_and_setchapternewpage_on'}{'contents'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'titlepage_and_setchapternewpage_on'}{'contents'}[0];
 $result_trees{'titlepage_and_setchapternewpage_on'}{'contents'}[0]{'parent'} = 
$result_trees{'titlepage_and_setchapternewpage_on'};
 
-$result_texis{'titlepage_and_setchapternewpage_on'} = '@setfilename 
titlepage_and_setchapternewpage_on.info
-@setchapternewpage on
+$result_texis{'titlepage_and_setchapternewpage_on'} = '@setchapternewpage on
 
 @titlepage
 in titlepage
diff --git a/tp/t/results/latex_tests/titlepage_classical.pl 
b/tp/t/results/latex_tests/titlepage_classical.pl
index d50a774c20..e6c636dc95 100644
--- a/tp/t/results/latex_tests/titlepage_classical.pl
+++ b/tp/t/results/latex_tests/titlepage_classical.pl
@@ -11,41 +11,6 @@ $result_trees{'titlepage_classical'} = {
       'contents' => [
         {
           'contents' => [
-            {
-              'args' => [
-                {
-                  'contents' => [
-                    {
-                      'parent' => {},
-                      'text' => 'titlepage_classical.info'
-                    }
-                  ],
-                  'extra' => {
-                    'spaces_after_argument' => '
-'
-                  },
-                  'parent' => {},
-                  'type' => 'line_arg'
-                }
-              ],
-              'cmdname' => 'setfilename',
-              'extra' => {
-                'spaces_before_argument' => ' ',
-                'text_arg' => 'titlepage_classical.info'
-              },
-              'parent' => {},
-              'source_info' => {
-                'file_name' => '',
-                'line_nr' => 1,
-                'macro' => ''
-              }
-            },
-            {
-              'parent' => {},
-              'text' => '
-',
-              'type' => 'empty_line'
-            },
             {
               'args' => [
                 {
@@ -97,7 +62,7 @@ $result_trees{'titlepage_classical'} = {
                   'parent' => {},
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 5,
+                    'line_nr' => 3,
                     'macro' => ''
                   }
                 }
@@ -108,7 +73,7 @@ $result_trees{'titlepage_classical'} = {
               'parent' => {},
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 3,
+                'line_nr' => 1,
                 'macro' => ''
               }
             },
@@ -156,7 +121,7 @@ $result_trees{'titlepage_classical'} = {
                   'parent' => {},
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 8,
+                    'line_nr' => 6,
                     'macro' => ''
                   }
                 },
@@ -184,7 +149,7 @@ $result_trees{'titlepage_classical'} = {
                   'parent' => {},
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 9,
+                    'line_nr' => 7,
                     'macro' => ''
                   }
                 },
@@ -212,7 +177,7 @@ $result_trees{'titlepage_classical'} = {
                   'parent' => {},
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 10,
+                    'line_nr' => 8,
                     'macro' => ''
                   }
                 },
@@ -241,7 +206,7 @@ $result_trees{'titlepage_classical'} = {
                   'parent' => {},
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 11,
+                    'line_nr' => 9,
                     'macro' => ''
                   }
                 },
@@ -270,7 +235,7 @@ $result_trees{'titlepage_classical'} = {
                   'parent' => {},
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 12,
+                    'line_nr' => 10,
                     'macro' => ''
                   }
                 },
@@ -353,7 +318,7 @@ $result_trees{'titlepage_classical'} = {
                   'parent' => {},
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 18,
+                    'line_nr' => 16,
                     'macro' => ''
                   }
                 },
@@ -383,7 +348,7 @@ $result_trees{'titlepage_classical'} = {
                   'parent' => {},
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 19,
+                    'line_nr' => 17,
                     'macro' => ''
                   }
                 }
@@ -394,7 +359,7 @@ $result_trees{'titlepage_classical'} = {
               'parent' => {},
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 7,
+                'line_nr' => 5,
                 'macro' => ''
               }
             },
@@ -449,7 +414,7 @@ $result_trees{'titlepage_classical'} = {
       'parent' => {},
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 21,
+        'line_nr' => 19,
         'macro' => ''
       }
     },
@@ -485,7 +450,7 @@ $result_trees{'titlepage_classical'} = {
       'parent' => {},
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 22,
+        'line_nr' => 20,
         'macro' => ''
       }
     },
@@ -526,7 +491,7 @@ $result_trees{'titlepage_classical'} = {
       'parent' => {},
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 24,
+        'line_nr' => 22,
         'macro' => ''
       }
     },
@@ -579,61 +544,57 @@ $result_trees{'titlepage_classical'} = {
       'parent' => {},
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 25,
+        'line_nr' => 23,
         'macro' => ''
       }
     }
   ],
   'type' => 'document_root'
 };
-$result_trees{'titlepage_classical'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'titlepage_classical'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0];
 
$result_trees{'titlepage_classical'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'parent'}
 = 
$result_trees{'titlepage_classical'}{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'titlepage_classical'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'titlepage_classical'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'titlepage_classical'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'titlepage_classical'}{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'titlepage_classical'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'titlepage_classical'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0];
+$result_trees{'titlepage_classical'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'titlepage_classical'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1];
+$result_trees{'titlepage_classical'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'parent'}
 = 
$result_trees{'titlepage_classical'}{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'titlepage_classical'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'end_command'}
 = 
$result_trees{'titlepage_classical'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1];
 
$result_trees{'titlepage_classical'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'titlepage_classical'}{'contents'}[0]{'contents'}[0];
 
$result_trees{'titlepage_classical'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'parent'}
 = $result_trees{'titlepage_classical'}{'contents'}[0]{'contents'}[0];
 
$result_trees{'titlepage_classical'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'args'}[0]{'parent'}
 = 
$result_trees{'titlepage_classical'}{'contents'}[0]{'contents'}[0]{'contents'}[2];
-$result_trees{'titlepage_classical'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'titlepage_classical'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'contents'}[0];
+$result_trees{'titlepage_classical'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'titlepage_classical'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'contents'}[0]{'args'}[0];
+$result_trees{'titlepage_classical'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'contents'}[0]{'args'}[0]{'parent'}
 = 
$result_trees{'titlepage_classical'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'contents'}[0];
 
$result_trees{'titlepage_classical'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'contents'}[0]{'parent'}
 = 
$result_trees{'titlepage_classical'}{'contents'}[0]{'contents'}[0]{'contents'}[2];
 
$result_trees{'titlepage_classical'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'titlepage_classical'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'contents'}[1]{'args'}[0];
 
$result_trees{'titlepage_classical'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'titlepage_classical'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'contents'}[1];
 
$result_trees{'titlepage_classical'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'contents'}[1]{'parent'}
 = 
$result_trees{'titlepage_classical'}{'contents'}[0]{'contents'}[0]{'contents'}[2];
-$result_trees{'titlepage_classical'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'extra'}{'end_command'}
 = 
$result_trees{'titlepage_classical'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'contents'}[1];
+$result_trees{'titlepage_classical'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'titlepage_classical'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'contents'}[2]{'args'}[0];
+$result_trees{'titlepage_classical'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'contents'}[2]{'args'}[0]{'parent'}
 = 
$result_trees{'titlepage_classical'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'contents'}[2];
+$result_trees{'titlepage_classical'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'contents'}[2]{'parent'}
 = 
$result_trees{'titlepage_classical'}{'contents'}[0]{'contents'}[0]{'contents'}[2];
+$result_trees{'titlepage_classical'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'contents'}[3]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'titlepage_classical'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'contents'}[3]{'args'}[0];
+$result_trees{'titlepage_classical'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'contents'}[3]{'args'}[0]{'parent'}
 = 
$result_trees{'titlepage_classical'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'contents'}[3];
+$result_trees{'titlepage_classical'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'contents'}[3]{'extra'}{'titlepage'}
 = 
$result_trees{'titlepage_classical'}{'contents'}[0]{'contents'}[0]{'contents'}[2];
+$result_trees{'titlepage_classical'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'contents'}[3]{'parent'}
 = 
$result_trees{'titlepage_classical'}{'contents'}[0]{'contents'}[0]{'contents'}[2];
+$result_trees{'titlepage_classical'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'contents'}[4]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'titlepage_classical'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'contents'}[4]{'args'}[0];
+$result_trees{'titlepage_classical'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'contents'}[4]{'args'}[0]{'parent'}
 = 
$result_trees{'titlepage_classical'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'contents'}[4];
+$result_trees{'titlepage_classical'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'contents'}[4]{'extra'}{'titlepage'}
 = 
$result_trees{'titlepage_classical'}{'contents'}[0]{'contents'}[0]{'contents'}[2];
+$result_trees{'titlepage_classical'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'contents'}[4]{'parent'}
 = 
$result_trees{'titlepage_classical'}{'contents'}[0]{'contents'}[0]{'contents'}[2];
+$result_trees{'titlepage_classical'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'contents'}[5]{'parent'}
 = 
$result_trees{'titlepage_classical'}{'contents'}[0]{'contents'}[0]{'contents'}[2];
+$result_trees{'titlepage_classical'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'contents'}[6]{'args'}[0]{'parent'}
 = 
$result_trees{'titlepage_classical'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'contents'}[6];
+$result_trees{'titlepage_classical'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'contents'}[6]{'parent'}
 = 
$result_trees{'titlepage_classical'}{'contents'}[0]{'contents'}[0]{'contents'}[2];
+$result_trees{'titlepage_classical'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'contents'}[7]{'args'}[0]{'parent'}
 = 
$result_trees{'titlepage_classical'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'contents'}[7];
+$result_trees{'titlepage_classical'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'contents'}[7]{'parent'}
 = 
$result_trees{'titlepage_classical'}{'contents'}[0]{'contents'}[0]{'contents'}[2];
+$result_trees{'titlepage_classical'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'contents'}[8]{'args'}[0]{'parent'}
 = 
$result_trees{'titlepage_classical'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'contents'}[8];
+$result_trees{'titlepage_classical'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'contents'}[8]{'parent'}
 = 
$result_trees{'titlepage_classical'}{'contents'}[0]{'contents'}[0]{'contents'}[2];
+$result_trees{'titlepage_classical'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'contents'}[9]{'args'}[0]{'parent'}
 = 
$result_trees{'titlepage_classical'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'contents'}[9];
+$result_trees{'titlepage_classical'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'contents'}[9]{'parent'}
 = 
$result_trees{'titlepage_classical'}{'contents'}[0]{'contents'}[0]{'contents'}[2];
+$result_trees{'titlepage_classical'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'contents'}[10]{'args'}[0]{'parent'}
 = 
$result_trees{'titlepage_classical'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'contents'}[10];
+$result_trees{'titlepage_classical'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'contents'}[10]{'parent'}
 = 
$result_trees{'titlepage_classical'}{'contents'}[0]{'contents'}[0]{'contents'}[2];
+$result_trees{'titlepage_classical'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'contents'}[11]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'titlepage_classical'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'contents'}[11]{'args'}[0];
+$result_trees{'titlepage_classical'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'contents'}[11]{'args'}[0]{'parent'}
 = 
$result_trees{'titlepage_classical'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'contents'}[11];
+$result_trees{'titlepage_classical'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'contents'}[11]{'parent'}
 = 
$result_trees{'titlepage_classical'}{'contents'}[0]{'contents'}[0]{'contents'}[2];
+$result_trees{'titlepage_classical'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'extra'}{'end_command'}
 = 
$result_trees{'titlepage_classical'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'contents'}[11];
 
$result_trees{'titlepage_classical'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'parent'}
 = $result_trees{'titlepage_classical'}{'contents'}[0]{'contents'}[0];
 
$result_trees{'titlepage_classical'}{'contents'}[0]{'contents'}[0]{'contents'}[3]{'parent'}
 = $result_trees{'titlepage_classical'}{'contents'}[0]{'contents'}[0];
-$result_trees{'titlepage_classical'}{'contents'}[0]{'contents'}[0]{'contents'}[4]{'args'}[0]{'parent'}
 = 
$result_trees{'titlepage_classical'}{'contents'}[0]{'contents'}[0]{'contents'}[4];
-$result_trees{'titlepage_classical'}{'contents'}[0]{'contents'}[0]{'contents'}[4]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'titlepage_classical'}{'contents'}[0]{'contents'}[0]{'contents'}[4]{'contents'}[0]{'args'}[0];
-$result_trees{'titlepage_classical'}{'contents'}[0]{'contents'}[0]{'contents'}[4]{'contents'}[0]{'args'}[0]{'parent'}
 = 
$result_trees{'titlepage_classical'}{'contents'}[0]{'contents'}[0]{'contents'}[4]{'contents'}[0];
-$result_trees{'titlepage_classical'}{'contents'}[0]{'contents'}[0]{'contents'}[4]{'contents'}[0]{'parent'}
 = 
$result_trees{'titlepage_classical'}{'contents'}[0]{'contents'}[0]{'contents'}[4];
-$result_trees{'titlepage_classical'}{'contents'}[0]{'contents'}[0]{'contents'}[4]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'titlepage_classical'}{'contents'}[0]{'contents'}[0]{'contents'}[4]{'contents'}[1]{'args'}[0];
-$result_trees{'titlepage_classical'}{'contents'}[0]{'contents'}[0]{'contents'}[4]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'titlepage_classical'}{'contents'}[0]{'contents'}[0]{'contents'}[4]{'contents'}[1];
-$result_trees{'titlepage_classical'}{'contents'}[0]{'contents'}[0]{'contents'}[4]{'contents'}[1]{'parent'}
 = 
$result_trees{'titlepage_classical'}{'contents'}[0]{'contents'}[0]{'contents'}[4];
-$result_trees{'titlepage_classical'}{'contents'}[0]{'contents'}[0]{'contents'}[4]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'titlepage_classical'}{'contents'}[0]{'contents'}[0]{'contents'}[4]{'contents'}[2]{'args'}[0];
-$result_trees{'titlepage_classical'}{'contents'}[0]{'contents'}[0]{'contents'}[4]{'contents'}[2]{'args'}[0]{'parent'}
 = 
$result_trees{'titlepage_classical'}{'contents'}[0]{'contents'}[0]{'contents'}[4]{'contents'}[2];
-$result_trees{'titlepage_classical'}{'contents'}[0]{'contents'}[0]{'contents'}[4]{'contents'}[2]{'parent'}
 = 
$result_trees{'titlepage_classical'}{'contents'}[0]{'contents'}[0]{'contents'}[4];
-$result_trees{'titlepage_classical'}{'contents'}[0]{'contents'}[0]{'contents'}[4]{'contents'}[3]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'titlepage_classical'}{'contents'}[0]{'contents'}[0]{'contents'}[4]{'contents'}[3]{'args'}[0];
-$result_trees{'titlepage_classical'}{'contents'}[0]{'contents'}[0]{'contents'}[4]{'contents'}[3]{'args'}[0]{'parent'}
 = 
$result_trees{'titlepage_classical'}{'contents'}[0]{'contents'}[0]{'contents'}[4]{'contents'}[3];
-$result_trees{'titlepage_classical'}{'contents'}[0]{'contents'}[0]{'contents'}[4]{'contents'}[3]{'extra'}{'titlepage'}
 = 
$result_trees{'titlepage_classical'}{'contents'}[0]{'contents'}[0]{'contents'}[4];
-$result_trees{'titlepage_classical'}{'contents'}[0]{'contents'}[0]{'contents'}[4]{'contents'}[3]{'parent'}
 = 
$result_trees{'titlepage_classical'}{'contents'}[0]{'contents'}[0]{'contents'}[4];
-$result_trees{'titlepage_classical'}{'contents'}[0]{'contents'}[0]{'contents'}[4]{'contents'}[4]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'titlepage_classical'}{'contents'}[0]{'contents'}[0]{'contents'}[4]{'contents'}[4]{'args'}[0];
-$result_trees{'titlepage_classical'}{'contents'}[0]{'contents'}[0]{'contents'}[4]{'contents'}[4]{'args'}[0]{'parent'}
 = 
$result_trees{'titlepage_classical'}{'contents'}[0]{'contents'}[0]{'contents'}[4]{'contents'}[4];
-$result_trees{'titlepage_classical'}{'contents'}[0]{'contents'}[0]{'contents'}[4]{'contents'}[4]{'extra'}{'titlepage'}
 = 
$result_trees{'titlepage_classical'}{'contents'}[0]{'contents'}[0]{'contents'}[4];
-$result_trees{'titlepage_classical'}{'contents'}[0]{'contents'}[0]{'contents'}[4]{'contents'}[4]{'parent'}
 = 
$result_trees{'titlepage_classical'}{'contents'}[0]{'contents'}[0]{'contents'}[4];
-$result_trees{'titlepage_classical'}{'contents'}[0]{'contents'}[0]{'contents'}[4]{'contents'}[5]{'parent'}
 = 
$result_trees{'titlepage_classical'}{'contents'}[0]{'contents'}[0]{'contents'}[4];
-$result_trees{'titlepage_classical'}{'contents'}[0]{'contents'}[0]{'contents'}[4]{'contents'}[6]{'args'}[0]{'parent'}
 = 
$result_trees{'titlepage_classical'}{'contents'}[0]{'contents'}[0]{'contents'}[4]{'contents'}[6];
-$result_trees{'titlepage_classical'}{'contents'}[0]{'contents'}[0]{'contents'}[4]{'contents'}[6]{'parent'}
 = 
$result_trees{'titlepage_classical'}{'contents'}[0]{'contents'}[0]{'contents'}[4];
-$result_trees{'titlepage_classical'}{'contents'}[0]{'contents'}[0]{'contents'}[4]{'contents'}[7]{'args'}[0]{'parent'}
 = 
$result_trees{'titlepage_classical'}{'contents'}[0]{'contents'}[0]{'contents'}[4]{'contents'}[7];
-$result_trees{'titlepage_classical'}{'contents'}[0]{'contents'}[0]{'contents'}[4]{'contents'}[7]{'parent'}
 = 
$result_trees{'titlepage_classical'}{'contents'}[0]{'contents'}[0]{'contents'}[4];
-$result_trees{'titlepage_classical'}{'contents'}[0]{'contents'}[0]{'contents'}[4]{'contents'}[8]{'args'}[0]{'parent'}
 = 
$result_trees{'titlepage_classical'}{'contents'}[0]{'contents'}[0]{'contents'}[4]{'contents'}[8];
-$result_trees{'titlepage_classical'}{'contents'}[0]{'contents'}[0]{'contents'}[4]{'contents'}[8]{'parent'}
 = 
$result_trees{'titlepage_classical'}{'contents'}[0]{'contents'}[0]{'contents'}[4];
-$result_trees{'titlepage_classical'}{'contents'}[0]{'contents'}[0]{'contents'}[4]{'contents'}[9]{'args'}[0]{'parent'}
 = 
$result_trees{'titlepage_classical'}{'contents'}[0]{'contents'}[0]{'contents'}[4]{'contents'}[9];
-$result_trees{'titlepage_classical'}{'contents'}[0]{'contents'}[0]{'contents'}[4]{'contents'}[9]{'parent'}
 = 
$result_trees{'titlepage_classical'}{'contents'}[0]{'contents'}[0]{'contents'}[4];
-$result_trees{'titlepage_classical'}{'contents'}[0]{'contents'}[0]{'contents'}[4]{'contents'}[10]{'args'}[0]{'parent'}
 = 
$result_trees{'titlepage_classical'}{'contents'}[0]{'contents'}[0]{'contents'}[4]{'contents'}[10];
-$result_trees{'titlepage_classical'}{'contents'}[0]{'contents'}[0]{'contents'}[4]{'contents'}[10]{'parent'}
 = 
$result_trees{'titlepage_classical'}{'contents'}[0]{'contents'}[0]{'contents'}[4];
-$result_trees{'titlepage_classical'}{'contents'}[0]{'contents'}[0]{'contents'}[4]{'contents'}[11]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'titlepage_classical'}{'contents'}[0]{'contents'}[0]{'contents'}[4]{'contents'}[11]{'args'}[0];
-$result_trees{'titlepage_classical'}{'contents'}[0]{'contents'}[0]{'contents'}[4]{'contents'}[11]{'args'}[0]{'parent'}
 = 
$result_trees{'titlepage_classical'}{'contents'}[0]{'contents'}[0]{'contents'}[4]{'contents'}[11];
-$result_trees{'titlepage_classical'}{'contents'}[0]{'contents'}[0]{'contents'}[4]{'contents'}[11]{'parent'}
 = 
$result_trees{'titlepage_classical'}{'contents'}[0]{'contents'}[0]{'contents'}[4];
-$result_trees{'titlepage_classical'}{'contents'}[0]{'contents'}[0]{'contents'}[4]{'extra'}{'end_command'}
 = 
$result_trees{'titlepage_classical'}{'contents'}[0]{'contents'}[0]{'contents'}[4]{'contents'}[11];
-$result_trees{'titlepage_classical'}{'contents'}[0]{'contents'}[0]{'contents'}[4]{'parent'}
 = $result_trees{'titlepage_classical'}{'contents'}[0]{'contents'}[0];
-$result_trees{'titlepage_classical'}{'contents'}[0]{'contents'}[0]{'contents'}[5]{'parent'}
 = $result_trees{'titlepage_classical'}{'contents'}[0]{'contents'}[0];
 $result_trees{'titlepage_classical'}{'contents'}[0]{'contents'}[0]{'parent'} = 
$result_trees{'titlepage_classical'}{'contents'}[0];
 $result_trees{'titlepage_classical'}{'contents'}[0]{'parent'} = 
$result_trees{'titlepage_classical'};
 
$result_trees{'titlepage_classical'}{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'titlepage_classical'}{'contents'}[1]{'args'}[0];
@@ -658,9 +619,7 @@ 
$result_trees{'titlepage_classical'}{'contents'}[4]{'contents'}[1]{'parent'} = $
 $result_trees{'titlepage_classical'}{'contents'}[4]{'contents'}[2]{'parent'} = 
$result_trees{'titlepage_classical'}{'contents'}[4];
 $result_trees{'titlepage_classical'}{'contents'}[4]{'parent'} = 
$result_trees{'titlepage_classical'};
 
-$result_texis{'titlepage_classical'} = '@setfilename titlepage_classical.info
-
-@copying
+$result_texis{'titlepage_classical'} = '@copying
 in Copying
 @end copying
 
@@ -691,7 +650,6 @@ In chapter
 
 $result_texts{'titlepage_classical'} = '
 
-
 section top
 ***********
 
@@ -801,7 +759,6 @@ $result_floats{'titlepage_classical'} = {};
 
 $result_converted{'latex_text'}->{'titlepage_classical'} = '
 
-
 \\begin{document}
 
 \\GNUTexinfofrontmatter
diff --git 
a/tp/t/results/latex_tests/titlepage_classical/res_latex/titlepage_classical.tex
 
b/tp/t/results/latex_tests/titlepage_classical/res_latex/titlepage_classical.tex
index 48aff2b69e..e687486c0e 100644
--- 
a/tp/t/results/latex_tests/titlepage_classical/res_latex/titlepage_classical.tex
+++ 
b/tp/t/results/latex_tests/titlepage_classical/res_latex/titlepage_classical.tex
@@ -66,7 +66,6 @@
 
 
 
-
 \begin{document}
 
 \GNUTexinfofrontmatter
diff --git a/tp/t/results/latex_tests/titlepage_in_top_node.pl 
b/tp/t/results/latex_tests/titlepage_in_top_node.pl
index 014957c219..129998c74c 100644
--- a/tp/t/results/latex_tests/titlepage_in_top_node.pl
+++ b/tp/t/results/latex_tests/titlepage_in_top_node.pl
@@ -10,43 +10,7 @@ $result_trees{'titlepage_in_top_node'} = {
     {
       'contents' => [
         {
-          'contents' => [
-            {
-              'args' => [
-                {
-                  'contents' => [
-                    {
-                      'parent' => {},
-                      'text' => 'titlepage_in_top_node.info'
-                    }
-                  ],
-                  'extra' => {
-                    'spaces_after_argument' => '
-'
-                  },
-                  'parent' => {},
-                  'type' => 'line_arg'
-                }
-              ],
-              'cmdname' => 'setfilename',
-              'extra' => {
-                'spaces_before_argument' => ' ',
-                'text_arg' => 'titlepage_in_top_node.info'
-              },
-              'parent' => {},
-              'source_info' => {
-                'file_name' => '',
-                'line_nr' => 1,
-                'macro' => ''
-              }
-            },
-            {
-              'parent' => {},
-              'text' => '
-',
-              'type' => 'empty_line'
-            }
-          ],
+          'contents' => [],
           'parent' => {},
           'type' => 'preamble_before_content'
         }
@@ -91,7 +55,7 @@ $result_trees{'titlepage_in_top_node'} = {
       'parent' => {},
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 3,
+        'line_nr' => 1,
         'macro' => ''
       }
     },
@@ -175,7 +139,7 @@ $result_trees{'titlepage_in_top_node'} = {
               'parent' => {},
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 9,
+                'line_nr' => 7,
                 'macro' => ''
               }
             },
@@ -205,7 +169,7 @@ $result_trees{'titlepage_in_top_node'} = {
               'parent' => {},
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 10,
+                'line_nr' => 8,
                 'macro' => ''
               }
             }
@@ -216,7 +180,7 @@ $result_trees{'titlepage_in_top_node'} = {
           'parent' => {},
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 8,
+            'line_nr' => 6,
             'macro' => ''
           }
         },
@@ -233,7 +197,7 @@ $result_trees{'titlepage_in_top_node'} = {
       'parent' => {},
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 4,
+        'line_nr' => 2,
         'macro' => ''
       }
     },
@@ -274,7 +238,7 @@ $result_trees{'titlepage_in_top_node'} = {
       'parent' => {},
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 12,
+        'line_nr' => 10,
         'macro' => ''
       }
     },
@@ -321,17 +285,13 @@ $result_trees{'titlepage_in_top_node'} = {
       'parent' => {},
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 13,
+        'line_nr' => 11,
         'macro' => ''
       }
     }
   ],
   'type' => 'document_root'
 };
-$result_trees{'titlepage_in_top_node'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'titlepage_in_top_node'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0];
-$result_trees{'titlepage_in_top_node'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'parent'}
 = 
$result_trees{'titlepage_in_top_node'}{'contents'}[0]{'contents'}[0]{'contents'}[0];
-$result_trees{'titlepage_in_top_node'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'titlepage_in_top_node'}{'contents'}[0]{'contents'}[0];
-$result_trees{'titlepage_in_top_node'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'parent'}
 = $result_trees{'titlepage_in_top_node'}{'contents'}[0]{'contents'}[0];
 $result_trees{'titlepage_in_top_node'}{'contents'}[0]{'contents'}[0]{'parent'} 
= $result_trees{'titlepage_in_top_node'}{'contents'}[0];
 $result_trees{'titlepage_in_top_node'}{'contents'}[0]{'parent'} = 
$result_trees{'titlepage_in_top_node'};
 
$result_trees{'titlepage_in_top_node'}{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'titlepage_in_top_node'}{'contents'}[1]{'args'}[0];
@@ -368,9 +328,7 @@ 
$result_trees{'titlepage_in_top_node'}{'contents'}[4]{'contents'}[1]{'contents'}
 $result_trees{'titlepage_in_top_node'}{'contents'}[4]{'contents'}[1]{'parent'} 
= $result_trees{'titlepage_in_top_node'}{'contents'}[4];
 $result_trees{'titlepage_in_top_node'}{'contents'}[4]{'parent'} = 
$result_trees{'titlepage_in_top_node'};
 
-$result_texis{'titlepage_in_top_node'} = '@setfilename 
titlepage_in_top_node.info
-
-@node Top
+$result_texis{'titlepage_in_top_node'} = '@node Top
 @top top sectionning
 
 In top
@@ -386,8 +344,7 @@ in chap
 ';
 
 
-$result_texts{'titlepage_in_top_node'} = '
-top sectionning
+$result_texts{'titlepage_in_top_node'} = 'top sectionning
 ***************
 
 In top
@@ -496,8 +453,7 @@ $result_floats{'titlepage_in_top_node'} = {};
 
 
 
-$result_converted{'latex_text'}->{'titlepage_in_top_node'} = '
-\\begin{document}
+$result_converted{'latex_text'}->{'titlepage_in_top_node'} = '\\begin{document}
 
 \\GNUTexinfofrontmatter
 \\begin{titlepage}
diff --git 
a/tp/t/results/latex_tests/titlepage_in_top_node/res_latex/titlepage_in_top_node.tex
 
b/tp/t/results/latex_tests/titlepage_in_top_node/res_latex/titlepage_in_top_node.tex
index 7ff0860e7e..04fe550c15 100644
--- 
a/tp/t/results/latex_tests/titlepage_in_top_node/res_latex/titlepage_in_top_node.tex
+++ 
b/tp/t/results/latex_tests/titlepage_in_top_node/res_latex/titlepage_in_top_node.tex
@@ -64,7 +64,6 @@
 % no headings before titlepage
 \pagestyle{empty}%
 
-
 \begin{document}
 
 \GNUTexinfofrontmatter
diff --git a/tp/t/results/latex_tests/titlepage_long_title.pl 
b/tp/t/results/latex_tests/titlepage_long_title.pl
index 3ae23bca7c..67426535a4 100644
--- a/tp/t/results/latex_tests/titlepage_long_title.pl
+++ b/tp/t/results/latex_tests/titlepage_long_title.pl
@@ -11,35 +11,6 @@ $result_trees{'titlepage_long_title'} = {
       'contents' => [
         {
           'contents' => [
-            {
-              'args' => [
-                {
-                  'contents' => [
-                    {
-                      'parent' => {},
-                      'text' => 'titlepage_long_title.info'
-                    }
-                  ],
-                  'extra' => {
-                    'spaces_after_argument' => '
-'
-                  },
-                  'parent' => {},
-                  'type' => 'line_arg'
-                }
-              ],
-              'cmdname' => 'setfilename',
-              'extra' => {
-                'spaces_before_argument' => ' ',
-                'text_arg' => 'titlepage_long_title.info'
-              },
-              'parent' => {},
-              'source_info' => {
-                'file_name' => '',
-                'line_nr' => 1,
-                'macro' => ''
-              }
-            },
             {
               'args' => [
                 {
@@ -86,7 +57,7 @@ $result_trees{'titlepage_long_title'} = {
                   'parent' => {},
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 3,
+                    'line_nr' => 2,
                     'macro' => ''
                   }
                 },
@@ -122,7 +93,7 @@ $result_trees{'titlepage_long_title'} = {
                   'parent' => {},
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 5,
+                    'line_nr' => 4,
                     'macro' => ''
                   }
                 }
@@ -133,7 +104,7 @@ $result_trees{'titlepage_long_title'} = {
               'parent' => {},
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 2,
+                'line_nr' => 1,
                 'macro' => ''
               }
             },
@@ -188,7 +159,7 @@ $result_trees{'titlepage_long_title'} = {
       'parent' => {},
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 7,
+        'line_nr' => 6,
         'macro' => ''
       }
     },
@@ -224,7 +195,7 @@ $result_trees{'titlepage_long_title'} = {
       'parent' => {},
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 8,
+        'line_nr' => 7,
         'macro' => ''
       }
     },
@@ -265,7 +236,7 @@ $result_trees{'titlepage_long_title'} = {
       'parent' => {},
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 10,
+        'line_nr' => 9,
         'macro' => ''
       }
     },
@@ -312,29 +283,26 @@ $result_trees{'titlepage_long_title'} = {
       'parent' => {},
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 11,
+        'line_nr' => 10,
         'macro' => ''
       }
     }
   ],
   'type' => 'document_root'
 };
-$result_trees{'titlepage_long_title'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'titlepage_long_title'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0];
 
$result_trees{'titlepage_long_title'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'parent'}
 = 
$result_trees{'titlepage_long_title'}{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'titlepage_long_title'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'titlepage_long_title'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0];
+$result_trees{'titlepage_long_title'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[1]{'parent'}
 = 
$result_trees{'titlepage_long_title'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0];
+$result_trees{'titlepage_long_title'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[2]{'parent'}
 = 
$result_trees{'titlepage_long_title'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0];
+$result_trees{'titlepage_long_title'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'parent'}
 = 
$result_trees{'titlepage_long_title'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'titlepage_long_title'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'titlepage_long_title'}{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'titlepage_long_title'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'parent'}
 = 
$result_trees{'titlepage_long_title'}{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'titlepage_long_title'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'titlepage_long_title'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[2]{'args'}[0];
+$result_trees{'titlepage_long_title'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[2]{'args'}[0]{'parent'}
 = 
$result_trees{'titlepage_long_title'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[2];
+$result_trees{'titlepage_long_title'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[2]{'parent'}
 = 
$result_trees{'titlepage_long_title'}{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'titlepage_long_title'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'end_command'}
 = 
$result_trees{'titlepage_long_title'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[2];
 
$result_trees{'titlepage_long_title'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'titlepage_long_title'}{'contents'}[0]{'contents'}[0];
-$result_trees{'titlepage_long_title'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'titlepage_long_title'}{'contents'}[0]{'contents'}[0]{'contents'}[1];
-$result_trees{'titlepage_long_title'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'titlepage_long_title'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'args'}[0];
-$result_trees{'titlepage_long_title'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[1]{'parent'}
 = 
$result_trees{'titlepage_long_title'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'args'}[0];
-$result_trees{'titlepage_long_title'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[2]{'parent'}
 = 
$result_trees{'titlepage_long_title'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'args'}[0];
-$result_trees{'titlepage_long_title'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'args'}[0]{'parent'}
 = 
$result_trees{'titlepage_long_title'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[0];
-$result_trees{'titlepage_long_title'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'parent'}
 = 
$result_trees{'titlepage_long_title'}{'contents'}[0]{'contents'}[0]{'contents'}[1];
-$result_trees{'titlepage_long_title'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[1]{'parent'}
 = 
$result_trees{'titlepage_long_title'}{'contents'}[0]{'contents'}[0]{'contents'}[1];
-$result_trees{'titlepage_long_title'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'titlepage_long_title'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[2]{'args'}[0];
-$result_trees{'titlepage_long_title'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[2]{'args'}[0]{'parent'}
 = 
$result_trees{'titlepage_long_title'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[2];
-$result_trees{'titlepage_long_title'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[2]{'parent'}
 = 
$result_trees{'titlepage_long_title'}{'contents'}[0]{'contents'}[0]{'contents'}[1];
-$result_trees{'titlepage_long_title'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'extra'}{'end_command'}
 = 
$result_trees{'titlepage_long_title'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[2];
 
$result_trees{'titlepage_long_title'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'parent'}
 = $result_trees{'titlepage_long_title'}{'contents'}[0]{'contents'}[0];
-$result_trees{'titlepage_long_title'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'parent'}
 = $result_trees{'titlepage_long_title'}{'contents'}[0]{'contents'}[0];
 $result_trees{'titlepage_long_title'}{'contents'}[0]{'contents'}[0]{'parent'} 
= $result_trees{'titlepage_long_title'}{'contents'}[0];
 $result_trees{'titlepage_long_title'}{'contents'}[0]{'parent'} = 
$result_trees{'titlepage_long_title'};
 
$result_trees{'titlepage_long_title'}{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'titlepage_long_title'}{'contents'}[1]{'args'}[0];
@@ -358,8 +326,7 @@ 
$result_trees{'titlepage_long_title'}{'contents'}[4]{'contents'}[1]{'contents'}[
 $result_trees{'titlepage_long_title'}{'contents'}[4]{'contents'}[1]{'parent'} 
= $result_trees{'titlepage_long_title'}{'contents'}[4];
 $result_trees{'titlepage_long_title'}{'contents'}[4]{'parent'} = 
$result_trees{'titlepage_long_title'};
 
-$result_texis{'titlepage_long_title'} = '@setfilename titlepage_long_title.info
-@titlepage
+$result_texis{'titlepage_long_title'} = '@titlepage
 @title a title than is long, very long, veeeeeeeeeeeeeeeeery long, it seems to 
never stop and it is not so interesting only very long oh an end of line @* and 
the title continue and keep on being unfinished until it is the end
 
 @end titlepage
diff --git a/tp/t/results/latex_tests/titlepage_no_author.pl 
b/tp/t/results/latex_tests/titlepage_no_author.pl
index 6c94657af4..e5b32a57b9 100644
--- a/tp/t/results/latex_tests/titlepage_no_author.pl
+++ b/tp/t/results/latex_tests/titlepage_no_author.pl
@@ -11,35 +11,6 @@ $result_trees{'titlepage_no_author'} = {
       'contents' => [
         {
           'contents' => [
-            {
-              'args' => [
-                {
-                  'contents' => [
-                    {
-                      'parent' => {},
-                      'text' => 'titlepage_no_author.info'
-                    }
-                  ],
-                  'extra' => {
-                    'spaces_after_argument' => '
-'
-                  },
-                  'parent' => {},
-                  'type' => 'line_arg'
-                }
-              ],
-              'cmdname' => 'setfilename',
-              'extra' => {
-                'spaces_before_argument' => ' ',
-                'text_arg' => 'titlepage_no_author.info'
-              },
-              'parent' => {},
-              'source_info' => {
-                'file_name' => '',
-                'line_nr' => 1,
-                'macro' => ''
-              }
-            },
             {
               'args' => [
                 {
@@ -78,7 +49,7 @@ $result_trees{'titlepage_no_author'} = {
                   'parent' => {},
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 3,
+                    'line_nr' => 2,
                     'macro' => ''
                   }
                 },
@@ -108,7 +79,7 @@ $result_trees{'titlepage_no_author'} = {
                   'parent' => {},
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 4,
+                    'line_nr' => 3,
                     'macro' => ''
                   }
                 }
@@ -119,7 +90,7 @@ $result_trees{'titlepage_no_author'} = {
               'parent' => {},
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 2,
+                'line_nr' => 1,
                 'macro' => ''
               }
             },
@@ -174,7 +145,7 @@ $result_trees{'titlepage_no_author'} = {
       'parent' => {},
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 6,
+        'line_nr' => 5,
         'macro' => ''
       }
     },
@@ -210,7 +181,7 @@ $result_trees{'titlepage_no_author'} = {
       'parent' => {},
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 7,
+        'line_nr' => 6,
         'macro' => ''
       }
     },
@@ -251,7 +222,7 @@ $result_trees{'titlepage_no_author'} = {
       'parent' => {},
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 9,
+        'line_nr' => 8,
         'macro' => ''
       }
     },
@@ -298,26 +269,23 @@ $result_trees{'titlepage_no_author'} = {
       'parent' => {},
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 10,
+        'line_nr' => 9,
         'macro' => ''
       }
     }
   ],
   'type' => 'document_root'
 };
-$result_trees{'titlepage_no_author'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'titlepage_no_author'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0];
 
$result_trees{'titlepage_no_author'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'parent'}
 = 
$result_trees{'titlepage_no_author'}{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'titlepage_no_author'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'titlepage_no_author'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0];
+$result_trees{'titlepage_no_author'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'parent'}
 = 
$result_trees{'titlepage_no_author'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'titlepage_no_author'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'titlepage_no_author'}{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'titlepage_no_author'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'titlepage_no_author'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0];
+$result_trees{'titlepage_no_author'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'titlepage_no_author'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1];
+$result_trees{'titlepage_no_author'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'parent'}
 = 
$result_trees{'titlepage_no_author'}{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'titlepage_no_author'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'end_command'}
 = 
$result_trees{'titlepage_no_author'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1];
 
$result_trees{'titlepage_no_author'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'titlepage_no_author'}{'contents'}[0]{'contents'}[0];
-$result_trees{'titlepage_no_author'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'titlepage_no_author'}{'contents'}[0]{'contents'}[0]{'contents'}[1];
-$result_trees{'titlepage_no_author'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'titlepage_no_author'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'args'}[0];
-$result_trees{'titlepage_no_author'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'args'}[0]{'parent'}
 = 
$result_trees{'titlepage_no_author'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[0];
-$result_trees{'titlepage_no_author'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'parent'}
 = 
$result_trees{'titlepage_no_author'}{'contents'}[0]{'contents'}[0]{'contents'}[1];
-$result_trees{'titlepage_no_author'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'titlepage_no_author'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[1]{'args'}[0];
-$result_trees{'titlepage_no_author'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'titlepage_no_author'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[1];
-$result_trees{'titlepage_no_author'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[1]{'parent'}
 = 
$result_trees{'titlepage_no_author'}{'contents'}[0]{'contents'}[0]{'contents'}[1];
-$result_trees{'titlepage_no_author'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'extra'}{'end_command'}
 = 
$result_trees{'titlepage_no_author'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[1];
 
$result_trees{'titlepage_no_author'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'parent'}
 = $result_trees{'titlepage_no_author'}{'contents'}[0]{'contents'}[0];
-$result_trees{'titlepage_no_author'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'parent'}
 = $result_trees{'titlepage_no_author'}{'contents'}[0]{'contents'}[0];
 $result_trees{'titlepage_no_author'}{'contents'}[0]{'contents'}[0]{'parent'} = 
$result_trees{'titlepage_no_author'}{'contents'}[0];
 $result_trees{'titlepage_no_author'}{'contents'}[0]{'parent'} = 
$result_trees{'titlepage_no_author'};
 
$result_trees{'titlepage_no_author'}{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'titlepage_no_author'}{'contents'}[1]{'args'}[0];
@@ -341,8 +309,7 @@ 
$result_trees{'titlepage_no_author'}{'contents'}[4]{'contents'}[1]{'contents'}[0
 $result_trees{'titlepage_no_author'}{'contents'}[4]{'contents'}[1]{'parent'} = 
$result_trees{'titlepage_no_author'}{'contents'}[4];
 $result_trees{'titlepage_no_author'}{'contents'}[4]{'parent'} = 
$result_trees{'titlepage_no_author'};
 
-$result_texis{'titlepage_no_author'} = '@setfilename titlepage_no_author.info
-@titlepage
+$result_texis{'titlepage_no_author'} = '@titlepage
 @title Some manual tested
 @end titlepage
 
diff --git a/tp/t/results/latex_tests/titlepage_no_title.pl 
b/tp/t/results/latex_tests/titlepage_no_title.pl
index b0172b1aa5..b9b92896f8 100644
--- a/tp/t/results/latex_tests/titlepage_no_title.pl
+++ b/tp/t/results/latex_tests/titlepage_no_title.pl
@@ -11,35 +11,6 @@ $result_trees{'titlepage_no_title'} = {
       'contents' => [
         {
           'contents' => [
-            {
-              'args' => [
-                {
-                  'contents' => [
-                    {
-                      'parent' => {},
-                      'text' => 'titlepage_no_title.info'
-                    }
-                  ],
-                  'extra' => {
-                    'spaces_after_argument' => '
-'
-                  },
-                  'parent' => {},
-                  'type' => 'line_arg'
-                }
-              ],
-              'cmdname' => 'setfilename',
-              'extra' => {
-                'spaces_before_argument' => ' ',
-                'text_arg' => 'titlepage_no_title.info'
-              },
-              'parent' => {},
-              'source_info' => {
-                'file_name' => '',
-                'line_nr' => 1,
-                'macro' => ''
-              }
-            },
             {
               'args' => [
                 {
@@ -72,7 +43,7 @@ $result_trees{'titlepage_no_title'} = {
                   'parent' => {},
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 3,
+                    'line_nr' => 2,
                     'macro' => ''
                   }
                 },
@@ -112,7 +83,7 @@ $result_trees{'titlepage_no_title'} = {
                   'parent' => {},
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 5,
+                    'line_nr' => 4,
                     'macro' => ''
                   }
                 },
@@ -142,7 +113,7 @@ $result_trees{'titlepage_no_title'} = {
                   'parent' => {},
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 6,
+                    'line_nr' => 5,
                     'macro' => ''
                   }
                 }
@@ -153,7 +124,7 @@ $result_trees{'titlepage_no_title'} = {
               'parent' => {},
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 2,
+                'line_nr' => 1,
                 'macro' => ''
               }
             },
@@ -208,7 +179,7 @@ $result_trees{'titlepage_no_title'} = {
       'parent' => {},
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 8,
+        'line_nr' => 7,
         'macro' => ''
       }
     },
@@ -244,7 +215,7 @@ $result_trees{'titlepage_no_title'} = {
       'parent' => {},
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 9,
+        'line_nr' => 8,
         'macro' => ''
       }
     },
@@ -285,7 +256,7 @@ $result_trees{'titlepage_no_title'} = {
       'parent' => {},
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 11,
+        'line_nr' => 10,
         'macro' => ''
       }
     },
@@ -332,32 +303,29 @@ $result_trees{'titlepage_no_title'} = {
       'parent' => {},
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 12,
+        'line_nr' => 11,
         'macro' => ''
       }
     }
   ],
   'type' => 'document_root'
 };
-$result_trees{'titlepage_no_title'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'titlepage_no_title'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0];
 
$result_trees{'titlepage_no_title'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'parent'}
 = 
$result_trees{'titlepage_no_title'}{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'titlepage_no_title'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'titlepage_no_title'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0];
+$result_trees{'titlepage_no_title'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'parent'}
 = 
$result_trees{'titlepage_no_title'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'titlepage_no_title'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'titlepage_no_title'}{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'titlepage_no_title'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'parent'}
 = 
$result_trees{'titlepage_no_title'}{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'titlepage_no_title'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[2]{'parent'}
 = 
$result_trees{'titlepage_no_title'}{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'titlepage_no_title'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[3]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'titlepage_no_title'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[3]{'args'}[0];
+$result_trees{'titlepage_no_title'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[3]{'args'}[0]{'parent'}
 = 
$result_trees{'titlepage_no_title'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[3];
+$result_trees{'titlepage_no_title'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[3]{'extra'}{'titlepage'}
 = 
$result_trees{'titlepage_no_title'}{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'titlepage_no_title'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[3]{'parent'}
 = 
$result_trees{'titlepage_no_title'}{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'titlepage_no_title'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[4]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'titlepage_no_title'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[4]{'args'}[0];
+$result_trees{'titlepage_no_title'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[4]{'args'}[0]{'parent'}
 = 
$result_trees{'titlepage_no_title'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[4];
+$result_trees{'titlepage_no_title'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[4]{'parent'}
 = 
$result_trees{'titlepage_no_title'}{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'titlepage_no_title'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'end_command'}
 = 
$result_trees{'titlepage_no_title'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[4];
 
$result_trees{'titlepage_no_title'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'titlepage_no_title'}{'contents'}[0]{'contents'}[0];
-$result_trees{'titlepage_no_title'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'titlepage_no_title'}{'contents'}[0]{'contents'}[0]{'contents'}[1];
-$result_trees{'titlepage_no_title'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'titlepage_no_title'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'args'}[0];
-$result_trees{'titlepage_no_title'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'args'}[0]{'parent'}
 = 
$result_trees{'titlepage_no_title'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[0];
-$result_trees{'titlepage_no_title'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'parent'}
 = 
$result_trees{'titlepage_no_title'}{'contents'}[0]{'contents'}[0]{'contents'}[1];
-$result_trees{'titlepage_no_title'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[1]{'parent'}
 = 
$result_trees{'titlepage_no_title'}{'contents'}[0]{'contents'}[0]{'contents'}[1];
-$result_trees{'titlepage_no_title'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[2]{'parent'}
 = 
$result_trees{'titlepage_no_title'}{'contents'}[0]{'contents'}[0]{'contents'}[1];
-$result_trees{'titlepage_no_title'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'titlepage_no_title'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[3]{'args'}[0];
-$result_trees{'titlepage_no_title'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[3]{'args'}[0]{'parent'}
 = 
$result_trees{'titlepage_no_title'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[3];
-$result_trees{'titlepage_no_title'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[3]{'extra'}{'titlepage'}
 = 
$result_trees{'titlepage_no_title'}{'contents'}[0]{'contents'}[0]{'contents'}[1];
-$result_trees{'titlepage_no_title'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[3]{'parent'}
 = 
$result_trees{'titlepage_no_title'}{'contents'}[0]{'contents'}[0]{'contents'}[1];
-$result_trees{'titlepage_no_title'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[4]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'titlepage_no_title'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[4]{'args'}[0];
-$result_trees{'titlepage_no_title'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[4]{'args'}[0]{'parent'}
 = 
$result_trees{'titlepage_no_title'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[4];
-$result_trees{'titlepage_no_title'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[4]{'parent'}
 = 
$result_trees{'titlepage_no_title'}{'contents'}[0]{'contents'}[0]{'contents'}[1];
-$result_trees{'titlepage_no_title'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'extra'}{'end_command'}
 = 
$result_trees{'titlepage_no_title'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[4];
 
$result_trees{'titlepage_no_title'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'parent'}
 = $result_trees{'titlepage_no_title'}{'contents'}[0]{'contents'}[0];
-$result_trees{'titlepage_no_title'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'parent'}
 = $result_trees{'titlepage_no_title'}{'contents'}[0]{'contents'}[0];
 $result_trees{'titlepage_no_title'}{'contents'}[0]{'contents'}[0]{'parent'} = 
$result_trees{'titlepage_no_title'}{'contents'}[0];
 $result_trees{'titlepage_no_title'}{'contents'}[0]{'parent'} = 
$result_trees{'titlepage_no_title'};
 
$result_trees{'titlepage_no_title'}{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'titlepage_no_title'}{'contents'}[1]{'args'}[0];
@@ -381,8 +349,7 @@ 
$result_trees{'titlepage_no_title'}{'contents'}[4]{'contents'}[1]{'contents'}[0]
 $result_trees{'titlepage_no_title'}{'contents'}[4]{'contents'}[1]{'parent'} = 
$result_trees{'titlepage_no_title'}{'contents'}[4];
 $result_trees{'titlepage_no_title'}{'contents'}[4]{'parent'} = 
$result_trees{'titlepage_no_title'};
 
-$result_texis{'titlepage_no_title'} = '@setfilename titlepage_no_title.info
-@titlepage
+$result_texis{'titlepage_no_title'} = '@titlepage
 @titlefont{Some manual tested}
 
 @author Some Author
diff --git a/tp/t/results/latex_tests/titlepage_with_commands_classical.pl 
b/tp/t/results/latex_tests/titlepage_with_commands_classical.pl
index 77d74300ec..76d2b32b7a 100644
--- a/tp/t/results/latex_tests/titlepage_with_commands_classical.pl
+++ b/tp/t/results/latex_tests/titlepage_with_commands_classical.pl
@@ -11,41 +11,6 @@ $result_trees{'titlepage_with_commands_classical'} = {
       'contents' => [
         {
           'contents' => [
-            {
-              'args' => [
-                {
-                  'contents' => [
-                    {
-                      'parent' => {},
-                      'text' => 'titlepage_with_commands_classical.info'
-                    }
-                  ],
-                  'extra' => {
-                    'spaces_after_argument' => '
-'
-                  },
-                  'parent' => {},
-                  'type' => 'line_arg'
-                }
-              ],
-              'cmdname' => 'setfilename',
-              'extra' => {
-                'spaces_before_argument' => ' ',
-                'text_arg' => 'titlepage_with_commands_classical.info'
-              },
-              'parent' => {},
-              'source_info' => {
-                'file_name' => '',
-                'line_nr' => 1,
-                'macro' => ''
-              }
-            },
-            {
-              'parent' => {},
-              'text' => '
-',
-              'type' => 'empty_line'
-            },
             {
               'args' => [
                 {
@@ -97,7 +62,7 @@ $result_trees{'titlepage_with_commands_classical'} = {
                   'parent' => {},
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 5,
+                    'line_nr' => 3,
                     'macro' => ''
                   }
                 }
@@ -108,7 +73,7 @@ $result_trees{'titlepage_with_commands_classical'} = {
               'parent' => {},
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 3,
+                'line_nr' => 1,
                 'macro' => ''
               }
             },
@@ -164,7 +129,7 @@ $result_trees{'titlepage_with_commands_classical'} = {
                   'parent' => {},
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 8,
+                    'line_nr' => 6,
                     'macro' => ''
                   }
                 },
@@ -200,7 +165,7 @@ $result_trees{'titlepage_with_commands_classical'} = {
                   'parent' => {},
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 9,
+                    'line_nr' => 7,
                     'macro' => ''
                   }
                 },
@@ -236,7 +201,7 @@ $result_trees{'titlepage_with_commands_classical'} = {
                   'parent' => {},
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 10,
+                    'line_nr' => 8,
                     'macro' => ''
                   }
                 },
@@ -273,7 +238,7 @@ $result_trees{'titlepage_with_commands_classical'} = {
                   'parent' => {},
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 11,
+                    'line_nr' => 9,
                     'macro' => ''
                   }
                 },
@@ -358,7 +323,7 @@ $result_trees{'titlepage_with_commands_classical'} = {
                                       'parent' => {},
                                       'source_info' => {
                                         'file_name' => '',
-                                        'line_nr' => 17,
+                                        'line_nr' => 15,
                                         'macro' => ''
                                       },
                                       'type' => 'bracketed'
@@ -373,7 +338,7 @@ $result_trees{'titlepage_with_commands_classical'} = {
                                       'parent' => {},
                                       'source_info' => {
                                         'file_name' => '',
-                                        'line_nr' => 17,
+                                        'line_nr' => 15,
                                         'macro' => ''
                                       },
                                       'type' => 'bracketed'
@@ -409,7 +374,7 @@ $result_trees{'titlepage_with_commands_classical'} = {
                                       'parent' => {},
                                       'source_info' => {
                                         'file_name' => '',
-                                        'line_nr' => 18,
+                                        'line_nr' => 16,
                                         'macro' => ''
                                       }
                                     }
@@ -420,7 +385,7 @@ $result_trees{'titlepage_with_commands_classical'} = {
                                   'parent' => {},
                                   'source_info' => {
                                     'file_name' => '',
-                                    'line_nr' => 16,
+                                    'line_nr' => 14,
                                     'macro' => ''
                                   }
                                 }
@@ -434,7 +399,7 @@ $result_trees{'titlepage_with_commands_classical'} = {
                           'parent' => {},
                           'source_info' => {
                             'file_name' => '',
-                            'line_nr' => 12,
+                            'line_nr' => 10,
                             'macro' => ''
                           }
                         }
@@ -455,7 +420,7 @@ $result_trees{'titlepage_with_commands_classical'} = {
                   'parent' => {},
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 12,
+                    'line_nr' => 10,
                     'macro' => ''
                   }
                 },
@@ -532,7 +497,7 @@ $result_trees{'titlepage_with_commands_classical'} = {
                   'parent' => {},
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 24,
+                    'line_nr' => 22,
                     'macro' => ''
                   }
                 },
@@ -562,7 +527,7 @@ $result_trees{'titlepage_with_commands_classical'} = {
                   'parent' => {},
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 25,
+                    'line_nr' => 23,
                     'macro' => ''
                   }
                 }
@@ -573,7 +538,7 @@ $result_trees{'titlepage_with_commands_classical'} = {
               'parent' => {},
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 7,
+                'line_nr' => 5,
                 'macro' => ''
               }
             },
@@ -628,7 +593,7 @@ $result_trees{'titlepage_with_commands_classical'} = {
       'parent' => {},
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 27,
+        'line_nr' => 25,
         'macro' => ''
       }
     },
@@ -664,7 +629,7 @@ $result_trees{'titlepage_with_commands_classical'} = {
       'parent' => {},
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 28,
+        'line_nr' => 26,
         'macro' => ''
       }
     },
@@ -705,7 +670,7 @@ $result_trees{'titlepage_with_commands_classical'} = {
       'parent' => {},
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 30,
+        'line_nr' => 28,
         'macro' => ''
       }
     },
@@ -758,90 +723,86 @@ $result_trees{'titlepage_with_commands_classical'} = {
       'parent' => {},
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 31,
+        'line_nr' => 29,
         'macro' => ''
       }
     }
   ],
   'type' => 'document_root'
 };
-$result_trees{'titlepage_with_commands_classical'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'titlepage_with_commands_classical'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0];
 
$result_trees{'titlepage_with_commands_classical'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'parent'}
 = 
$result_trees{'titlepage_with_commands_classical'}{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'titlepage_with_commands_classical'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'titlepage_with_commands_classical'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'titlepage_with_commands_classical'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'titlepage_with_commands_classical'}{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'titlepage_with_commands_classical'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'titlepage_with_commands_classical'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0];
+$result_trees{'titlepage_with_commands_classical'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'titlepage_with_commands_classical'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1];
+$result_trees{'titlepage_with_commands_classical'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'parent'}
 = 
$result_trees{'titlepage_with_commands_classical'}{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'titlepage_with_commands_classical'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'end_command'}
 = 
$result_trees{'titlepage_with_commands_classical'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1];
 
$result_trees{'titlepage_with_commands_classical'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'titlepage_with_commands_classical'}{'contents'}[0]{'contents'}[0];
 
$result_trees{'titlepage_with_commands_classical'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'parent'}
 = 
$result_trees{'titlepage_with_commands_classical'}{'contents'}[0]{'contents'}[0];
 
$result_trees{'titlepage_with_commands_classical'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'args'}[0]{'parent'}
 = 
$result_trees{'titlepage_with_commands_classical'}{'contents'}[0]{'contents'}[0]{'contents'}[2];
-$result_trees{'titlepage_with_commands_classical'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'titlepage_with_commands_classical'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'contents'}[0];
+$result_trees{'titlepage_with_commands_classical'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'titlepage_with_commands_classical'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'contents'}[0]{'args'}[0];
+$result_trees{'titlepage_with_commands_classical'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'contents'}[0]{'args'}[0]{'contents'}[1]{'parent'}
 = 
$result_trees{'titlepage_with_commands_classical'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'contents'}[0]{'args'}[0];
+$result_trees{'titlepage_with_commands_classical'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'contents'}[0]{'args'}[0]{'contents'}[2]{'parent'}
 = 
$result_trees{'titlepage_with_commands_classical'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'contents'}[0]{'args'}[0];
+$result_trees{'titlepage_with_commands_classical'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'contents'}[0]{'args'}[0]{'parent'}
 = 
$result_trees{'titlepage_with_commands_classical'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'contents'}[0];
 
$result_trees{'titlepage_with_commands_classical'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'contents'}[0]{'parent'}
 = 
$result_trees{'titlepage_with_commands_classical'}{'contents'}[0]{'contents'}[0]{'contents'}[2];
 
$result_trees{'titlepage_with_commands_classical'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'titlepage_with_commands_classical'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'contents'}[1]{'args'}[0];
+$result_trees{'titlepage_with_commands_classical'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'contents'}[1]{'args'}[0]{'contents'}[1]{'parent'}
 = 
$result_trees{'titlepage_with_commands_classical'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'contents'}[1]{'args'}[0];
+$result_trees{'titlepage_with_commands_classical'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'contents'}[1]{'args'}[0]{'contents'}[2]{'parent'}
 = 
$result_trees{'titlepage_with_commands_classical'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'contents'}[1]{'args'}[0];
 
$result_trees{'titlepage_with_commands_classical'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'titlepage_with_commands_classical'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'contents'}[1];
 
$result_trees{'titlepage_with_commands_classical'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'contents'}[1]{'parent'}
 = 
$result_trees{'titlepage_with_commands_classical'}{'contents'}[0]{'contents'}[0]{'contents'}[2];
-$result_trees{'titlepage_with_commands_classical'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'extra'}{'end_command'}
 = 
$result_trees{'titlepage_with_commands_classical'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'contents'}[1];
+$result_trees{'titlepage_with_commands_classical'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'titlepage_with_commands_classical'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'contents'}[2]{'args'}[0];
+$result_trees{'titlepage_with_commands_classical'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'contents'}[2]{'args'}[0]{'contents'}[1]{'parent'}
 = 
$result_trees{'titlepage_with_commands_classical'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'contents'}[2]{'args'}[0];
+$result_trees{'titlepage_with_commands_classical'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'contents'}[2]{'args'}[0]{'contents'}[2]{'parent'}
 = 
$result_trees{'titlepage_with_commands_classical'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'contents'}[2]{'args'}[0];
+$result_trees{'titlepage_with_commands_classical'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'contents'}[2]{'args'}[0]{'parent'}
 = 
$result_trees{'titlepage_with_commands_classical'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'contents'}[2];
+$result_trees{'titlepage_with_commands_classical'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'contents'}[2]{'parent'}
 = 
$result_trees{'titlepage_with_commands_classical'}{'contents'}[0]{'contents'}[0]{'contents'}[2];
+$result_trees{'titlepage_with_commands_classical'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'contents'}[3]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'titlepage_with_commands_classical'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'contents'}[3]{'args'}[0];
+$result_trees{'titlepage_with_commands_classical'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'contents'}[3]{'args'}[0]{'contents'}[1]{'parent'}
 = 
$result_trees{'titlepage_with_commands_classical'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'contents'}[3]{'args'}[0];
+$result_trees{'titlepage_with_commands_classical'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'contents'}[3]{'args'}[0]{'contents'}[2]{'parent'}
 = 
$result_trees{'titlepage_with_commands_classical'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'contents'}[3]{'args'}[0];
+$result_trees{'titlepage_with_commands_classical'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'contents'}[3]{'args'}[0]{'parent'}
 = 
$result_trees{'titlepage_with_commands_classical'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'contents'}[3];
+$result_trees{'titlepage_with_commands_classical'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'contents'}[3]{'extra'}{'titlepage'}
 = 
$result_trees{'titlepage_with_commands_classical'}{'contents'}[0]{'contents'}[0]{'contents'}[2];
+$result_trees{'titlepage_with_commands_classical'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'contents'}[3]{'parent'}
 = 
$result_trees{'titlepage_with_commands_classical'}{'contents'}[0]{'contents'}[0]{'contents'}[2];
+$result_trees{'titlepage_with_commands_classical'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'contents'}[4]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'titlepage_with_commands_classical'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'contents'}[4]{'args'}[0];
+$result_trees{'titlepage_with_commands_classical'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'contents'}[4]{'args'}[0]{'contents'}[1]{'parent'}
 = 
$result_trees{'titlepage_with_commands_classical'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'contents'}[4]{'args'}[0];
+$result_trees{'titlepage_with_commands_classical'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'contents'}[4]{'args'}[0]{'contents'}[2]{'parent'}
 = 
$result_trees{'titlepage_with_commands_classical'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'contents'}[4]{'args'}[0];
+$result_trees{'titlepage_with_commands_classical'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'contents'}[4]{'args'}[0]{'contents'}[3]{'args'}[0]{'contents'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'titlepage_with_commands_classical'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'contents'}[4]{'args'}[0]{'contents'}[3]{'args'}[0]{'contents'}[0];
+$result_trees{'titlepage_with_commands_classical'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'contents'}[4]{'args'}[0]{'contents'}[3]{'args'}[0]{'contents'}[0]{'contents'}[1]{'parent'}
 = 
$result_trees{'titlepage_with_commands_classical'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'contents'}[4]{'args'}[0]{'contents'}[3]{'args'}[0]{'contents'}[0];
+$result_trees{'titlepage_with_commands_classical'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'contents'}[4]{'args'}[0]{'contents'}[3]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'titlepage_with_commands_classical'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'contents'}[4]{'args'}[0]{'contents'}[3]{'args'}[0];
+$result_trees{'titlepage_with_commands_classical'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'contents'}[4]{'args'}[0]{'contents'}[3]{'args'}[0]{'contents'}[1]{'parent'}
 = 
$result_trees{'titlepage_with_commands_classical'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'contents'}[4]{'args'}[0]{'contents'}[3]{'args'}[0];
+$result_trees{'titlepage_with_commands_classical'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'contents'}[4]{'args'}[0]{'contents'}[3]{'args'}[0]{'contents'}[2]{'contents'}[0]{'parent'}
 = 
$result_trees{'titlepage_with_commands_classical'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'contents'}[4]{'args'}[0]{'contents'}[3]{'args'}[0]{'contents'}[2];
+$result_trees{'titlepage_with_commands_classical'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'contents'}[4]{'args'}[0]{'contents'}[3]{'args'}[0]{'contents'}[2]{'parent'}
 = 
$result_trees{'titlepage_with_commands_classical'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'contents'}[4]{'args'}[0]{'contents'}[3]{'args'}[0];
+$result_trees{'titlepage_with_commands_classical'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'contents'}[4]{'args'}[0]{'contents'}[3]{'args'}[0]{'contents'}[3]{'args'}[0]{'parent'}
 = 
$result_trees{'titlepage_with_commands_classical'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'contents'}[4]{'args'}[0]{'contents'}[3]{'args'}[0]{'contents'}[3];
+$result_trees{'titlepage_with_commands_classical'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'contents'}[4]{'args'}[0]{'contents'}[3]{'args'}[0]{'contents'}[3]{'contents'}[0]{'parent'}
 = 
$result_trees{'titlepage_with_commands_classical'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'contents'}[4]{'args'}[0]{'contents'}[3]{'args'}[0]{'contents'}[3];
+$result_trees{'titlepage_with_commands_classical'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'contents'}[4]{'args'}[0]{'contents'}[3]{'args'}[0]{'contents'}[3]{'contents'}[1]{'contents'}[0]{'parent'}
 = 
$result_trees{'titlepage_with_commands_classical'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'contents'}[4]{'args'}[0]{'contents'}[3]{'args'}[0]{'contents'}[3]{'contents'}[1];
+$result_trees{'titlepage_with_commands_classical'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'contents'}[4]{'args'}[0]{'contents'}[3]{'args'}[0]{'contents'}[3]{'contents'}[1]{'parent'}
 = 
$result_trees{'titlepage_with_commands_classical'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'contents'}[4]{'args'}[0]{'contents'}[3]{'args'}[0]{'contents'}[3];
+$result_trees{'titlepage_with_commands_classical'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'contents'}[4]{'args'}[0]{'contents'}[3]{'args'}[0]{'contents'}[3]{'contents'}[2]{'contents'}[0]{'parent'}
 = 
$result_trees{'titlepage_with_commands_classical'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'contents'}[4]{'args'}[0]{'contents'}[3]{'args'}[0]{'contents'}[3]{'contents'}[2];
+$result_trees{'titlepage_with_commands_classical'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'contents'}[4]{'args'}[0]{'contents'}[3]{'args'}[0]{'contents'}[3]{'contents'}[2]{'parent'}
 = 
$result_trees{'titlepage_with_commands_classical'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'contents'}[4]{'args'}[0]{'contents'}[3]{'args'}[0]{'contents'}[3];
+$result_trees{'titlepage_with_commands_classical'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'contents'}[4]{'args'}[0]{'contents'}[3]{'args'}[0]{'contents'}[3]{'contents'}[3]{'parent'}
 = 
$result_trees{'titlepage_with_commands_classical'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'contents'}[4]{'args'}[0]{'contents'}[3]{'args'}[0]{'contents'}[3];
+$result_trees{'titlepage_with_commands_classical'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'contents'}[4]{'args'}[0]{'contents'}[3]{'args'}[0]{'contents'}[3]{'contents'}[4]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'titlepage_with_commands_classical'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'contents'}[4]{'args'}[0]{'contents'}[3]{'args'}[0]{'contents'}[3]{'contents'}[4]{'args'}[0];
+$result_trees{'titlepage_with_commands_classical'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'contents'}[4]{'args'}[0]{'contents'}[3]{'args'}[0]{'contents'}[3]{'contents'}[4]{'args'}[0]{'parent'}
 = 
$result_trees{'titlepage_with_commands_classical'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'contents'}[4]{'args'}[0]{'contents'}[3]{'args'}[0]{'contents'}[3]{'contents'}[4];
+$result_trees{'titlepage_with_commands_classical'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'contents'}[4]{'args'}[0]{'contents'}[3]{'args'}[0]{'contents'}[3]{'contents'}[4]{'parent'}
 = 
$result_trees{'titlepage_with_commands_classical'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'contents'}[4]{'args'}[0]{'contents'}[3]{'args'}[0]{'contents'}[3];
+$result_trees{'titlepage_with_commands_classical'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'contents'}[4]{'args'}[0]{'contents'}[3]{'args'}[0]{'contents'}[3]{'extra'}{'end_command'}
 = 
$result_trees{'titlepage_with_commands_classical'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'contents'}[4]{'args'}[0]{'contents'}[3]{'args'}[0]{'contents'}[3]{'contents'}[4];
+$result_trees{'titlepage_with_commands_classical'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'contents'}[4]{'args'}[0]{'contents'}[3]{'args'}[0]{'contents'}[3]{'parent'}
 = 
$result_trees{'titlepage_with_commands_classical'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'contents'}[4]{'args'}[0]{'contents'}[3]{'args'}[0];
+$result_trees{'titlepage_with_commands_classical'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'contents'}[4]{'args'}[0]{'contents'}[3]{'args'}[0]{'parent'}
 = 
$result_trees{'titlepage_with_commands_classical'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'contents'}[4]{'args'}[0]{'contents'}[3];
+$result_trees{'titlepage_with_commands_classical'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'contents'}[4]{'args'}[0]{'contents'}[3]{'parent'}
 = 
$result_trees{'titlepage_with_commands_classical'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'contents'}[4]{'args'}[0];
+$result_trees{'titlepage_with_commands_classical'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'contents'}[4]{'args'}[0]{'parent'}
 = 
$result_trees{'titlepage_with_commands_classical'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'contents'}[4];
+$result_trees{'titlepage_with_commands_classical'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'contents'}[4]{'extra'}{'titlepage'}
 = 
$result_trees{'titlepage_with_commands_classical'}{'contents'}[0]{'contents'}[0]{'contents'}[2];
+$result_trees{'titlepage_with_commands_classical'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'contents'}[4]{'parent'}
 = 
$result_trees{'titlepage_with_commands_classical'}{'contents'}[0]{'contents'}[0]{'contents'}[2];
+$result_trees{'titlepage_with_commands_classical'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'contents'}[5]{'args'}[0]{'parent'}
 = 
$result_trees{'titlepage_with_commands_classical'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'contents'}[5];
+$result_trees{'titlepage_with_commands_classical'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'contents'}[5]{'parent'}
 = 
$result_trees{'titlepage_with_commands_classical'}{'contents'}[0]{'contents'}[0]{'contents'}[2];
+$result_trees{'titlepage_with_commands_classical'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'contents'}[6]{'args'}[0]{'parent'}
 = 
$result_trees{'titlepage_with_commands_classical'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'contents'}[6];
+$result_trees{'titlepage_with_commands_classical'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'contents'}[6]{'parent'}
 = 
$result_trees{'titlepage_with_commands_classical'}{'contents'}[0]{'contents'}[0]{'contents'}[2];
+$result_trees{'titlepage_with_commands_classical'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'contents'}[7]{'args'}[0]{'parent'}
 = 
$result_trees{'titlepage_with_commands_classical'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'contents'}[7];
+$result_trees{'titlepage_with_commands_classical'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'contents'}[7]{'parent'}
 = 
$result_trees{'titlepage_with_commands_classical'}{'contents'}[0]{'contents'}[0]{'contents'}[2];
+$result_trees{'titlepage_with_commands_classical'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'contents'}[8]{'args'}[0]{'parent'}
 = 
$result_trees{'titlepage_with_commands_classical'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'contents'}[8];
+$result_trees{'titlepage_with_commands_classical'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'contents'}[8]{'parent'}
 = 
$result_trees{'titlepage_with_commands_classical'}{'contents'}[0]{'contents'}[0]{'contents'}[2];
+$result_trees{'titlepage_with_commands_classical'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'contents'}[9]{'args'}[0]{'parent'}
 = 
$result_trees{'titlepage_with_commands_classical'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'contents'}[9];
+$result_trees{'titlepage_with_commands_classical'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'contents'}[9]{'parent'}
 = 
$result_trees{'titlepage_with_commands_classical'}{'contents'}[0]{'contents'}[0]{'contents'}[2];
+$result_trees{'titlepage_with_commands_classical'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'contents'}[10]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'titlepage_with_commands_classical'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'contents'}[10]{'args'}[0];
+$result_trees{'titlepage_with_commands_classical'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'contents'}[10]{'args'}[0]{'parent'}
 = 
$result_trees{'titlepage_with_commands_classical'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'contents'}[10];
+$result_trees{'titlepage_with_commands_classical'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'contents'}[10]{'parent'}
 = 
$result_trees{'titlepage_with_commands_classical'}{'contents'}[0]{'contents'}[0]{'contents'}[2];
+$result_trees{'titlepage_with_commands_classical'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'extra'}{'end_command'}
 = 
$result_trees{'titlepage_with_commands_classical'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'contents'}[10];
 
$result_trees{'titlepage_with_commands_classical'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'parent'}
 = 
$result_trees{'titlepage_with_commands_classical'}{'contents'}[0]{'contents'}[0];
 
$result_trees{'titlepage_with_commands_classical'}{'contents'}[0]{'contents'}[0]{'contents'}[3]{'parent'}
 = 
$result_trees{'titlepage_with_commands_classical'}{'contents'}[0]{'contents'}[0];
-$result_trees{'titlepage_with_commands_classical'}{'contents'}[0]{'contents'}[0]{'contents'}[4]{'args'}[0]{'parent'}
 = 
$result_trees{'titlepage_with_commands_classical'}{'contents'}[0]{'contents'}[0]{'contents'}[4];
-$result_trees{'titlepage_with_commands_classical'}{'contents'}[0]{'contents'}[0]{'contents'}[4]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'titlepage_with_commands_classical'}{'contents'}[0]{'contents'}[0]{'contents'}[4]{'contents'}[0]{'args'}[0];
-$result_trees{'titlepage_with_commands_classical'}{'contents'}[0]{'contents'}[0]{'contents'}[4]{'contents'}[0]{'args'}[0]{'contents'}[1]{'parent'}
 = 
$result_trees{'titlepage_with_commands_classical'}{'contents'}[0]{'contents'}[0]{'contents'}[4]{'contents'}[0]{'args'}[0];
-$result_trees{'titlepage_with_commands_classical'}{'contents'}[0]{'contents'}[0]{'contents'}[4]{'contents'}[0]{'args'}[0]{'contents'}[2]{'parent'}
 = 
$result_trees{'titlepage_with_commands_classical'}{'contents'}[0]{'contents'}[0]{'contents'}[4]{'contents'}[0]{'args'}[0];
-$result_trees{'titlepage_with_commands_classical'}{'contents'}[0]{'contents'}[0]{'contents'}[4]{'contents'}[0]{'args'}[0]{'parent'}
 = 
$result_trees{'titlepage_with_commands_classical'}{'contents'}[0]{'contents'}[0]{'contents'}[4]{'contents'}[0];
-$result_trees{'titlepage_with_commands_classical'}{'contents'}[0]{'contents'}[0]{'contents'}[4]{'contents'}[0]{'parent'}
 = 
$result_trees{'titlepage_with_commands_classical'}{'contents'}[0]{'contents'}[0]{'contents'}[4];
-$result_trees{'titlepage_with_commands_classical'}{'contents'}[0]{'contents'}[0]{'contents'}[4]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'titlepage_with_commands_classical'}{'contents'}[0]{'contents'}[0]{'contents'}[4]{'contents'}[1]{'args'}[0];
-$result_trees{'titlepage_with_commands_classical'}{'contents'}[0]{'contents'}[0]{'contents'}[4]{'contents'}[1]{'args'}[0]{'contents'}[1]{'parent'}
 = 
$result_trees{'titlepage_with_commands_classical'}{'contents'}[0]{'contents'}[0]{'contents'}[4]{'contents'}[1]{'args'}[0];
-$result_trees{'titlepage_with_commands_classical'}{'contents'}[0]{'contents'}[0]{'contents'}[4]{'contents'}[1]{'args'}[0]{'contents'}[2]{'parent'}
 = 
$result_trees{'titlepage_with_commands_classical'}{'contents'}[0]{'contents'}[0]{'contents'}[4]{'contents'}[1]{'args'}[0];
-$result_trees{'titlepage_with_commands_classical'}{'contents'}[0]{'contents'}[0]{'contents'}[4]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'titlepage_with_commands_classical'}{'contents'}[0]{'contents'}[0]{'contents'}[4]{'contents'}[1];
-$result_trees{'titlepage_with_commands_classical'}{'contents'}[0]{'contents'}[0]{'contents'}[4]{'contents'}[1]{'parent'}
 = 
$result_trees{'titlepage_with_commands_classical'}{'contents'}[0]{'contents'}[0]{'contents'}[4];
-$result_trees{'titlepage_with_commands_classical'}{'contents'}[0]{'contents'}[0]{'contents'}[4]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'titlepage_with_commands_classical'}{'contents'}[0]{'contents'}[0]{'contents'}[4]{'contents'}[2]{'args'}[0];
-$result_trees{'titlepage_with_commands_classical'}{'contents'}[0]{'contents'}[0]{'contents'}[4]{'contents'}[2]{'args'}[0]{'contents'}[1]{'parent'}
 = 
$result_trees{'titlepage_with_commands_classical'}{'contents'}[0]{'contents'}[0]{'contents'}[4]{'contents'}[2]{'args'}[0];
-$result_trees{'titlepage_with_commands_classical'}{'contents'}[0]{'contents'}[0]{'contents'}[4]{'contents'}[2]{'args'}[0]{'contents'}[2]{'parent'}
 = 
$result_trees{'titlepage_with_commands_classical'}{'contents'}[0]{'contents'}[0]{'contents'}[4]{'contents'}[2]{'args'}[0];
-$result_trees{'titlepage_with_commands_classical'}{'contents'}[0]{'contents'}[0]{'contents'}[4]{'contents'}[2]{'args'}[0]{'parent'}
 = 
$result_trees{'titlepage_with_commands_classical'}{'contents'}[0]{'contents'}[0]{'contents'}[4]{'contents'}[2];
-$result_trees{'titlepage_with_commands_classical'}{'contents'}[0]{'contents'}[0]{'contents'}[4]{'contents'}[2]{'parent'}
 = 
$result_trees{'titlepage_with_commands_classical'}{'contents'}[0]{'contents'}[0]{'contents'}[4];
-$result_trees{'titlepage_with_commands_classical'}{'contents'}[0]{'contents'}[0]{'contents'}[4]{'contents'}[3]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'titlepage_with_commands_classical'}{'contents'}[0]{'contents'}[0]{'contents'}[4]{'contents'}[3]{'args'}[0];
-$result_trees{'titlepage_with_commands_classical'}{'contents'}[0]{'contents'}[0]{'contents'}[4]{'contents'}[3]{'args'}[0]{'contents'}[1]{'parent'}
 = 
$result_trees{'titlepage_with_commands_classical'}{'contents'}[0]{'contents'}[0]{'contents'}[4]{'contents'}[3]{'args'}[0];
-$result_trees{'titlepage_with_commands_classical'}{'contents'}[0]{'contents'}[0]{'contents'}[4]{'contents'}[3]{'args'}[0]{'contents'}[2]{'parent'}
 = 
$result_trees{'titlepage_with_commands_classical'}{'contents'}[0]{'contents'}[0]{'contents'}[4]{'contents'}[3]{'args'}[0];
-$result_trees{'titlepage_with_commands_classical'}{'contents'}[0]{'contents'}[0]{'contents'}[4]{'contents'}[3]{'args'}[0]{'parent'}
 = 
$result_trees{'titlepage_with_commands_classical'}{'contents'}[0]{'contents'}[0]{'contents'}[4]{'contents'}[3];
-$result_trees{'titlepage_with_commands_classical'}{'contents'}[0]{'contents'}[0]{'contents'}[4]{'contents'}[3]{'extra'}{'titlepage'}
 = 
$result_trees{'titlepage_with_commands_classical'}{'contents'}[0]{'contents'}[0]{'contents'}[4];
-$result_trees{'titlepage_with_commands_classical'}{'contents'}[0]{'contents'}[0]{'contents'}[4]{'contents'}[3]{'parent'}
 = 
$result_trees{'titlepage_with_commands_classical'}{'contents'}[0]{'contents'}[0]{'contents'}[4];
-$result_trees{'titlepage_with_commands_classical'}{'contents'}[0]{'contents'}[0]{'contents'}[4]{'contents'}[4]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'titlepage_with_commands_classical'}{'contents'}[0]{'contents'}[0]{'contents'}[4]{'contents'}[4]{'args'}[0];
-$result_trees{'titlepage_with_commands_classical'}{'contents'}[0]{'contents'}[0]{'contents'}[4]{'contents'}[4]{'args'}[0]{'contents'}[1]{'parent'}
 = 
$result_trees{'titlepage_with_commands_classical'}{'contents'}[0]{'contents'}[0]{'contents'}[4]{'contents'}[4]{'args'}[0];
-$result_trees{'titlepage_with_commands_classical'}{'contents'}[0]{'contents'}[0]{'contents'}[4]{'contents'}[4]{'args'}[0]{'contents'}[2]{'parent'}
 = 
$result_trees{'titlepage_with_commands_classical'}{'contents'}[0]{'contents'}[0]{'contents'}[4]{'contents'}[4]{'args'}[0];
-$result_trees{'titlepage_with_commands_classical'}{'contents'}[0]{'contents'}[0]{'contents'}[4]{'contents'}[4]{'args'}[0]{'contents'}[3]{'args'}[0]{'contents'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'titlepage_with_commands_classical'}{'contents'}[0]{'contents'}[0]{'contents'}[4]{'contents'}[4]{'args'}[0]{'contents'}[3]{'args'}[0]{'contents'}[0];
-$result_trees{'titlepage_with_commands_classical'}{'contents'}[0]{'contents'}[0]{'contents'}[4]{'contents'}[4]{'args'}[0]{'contents'}[3]{'args'}[0]{'contents'}[0]{'contents'}[1]{'parent'}
 = 
$result_trees{'titlepage_with_commands_classical'}{'contents'}[0]{'contents'}[0]{'contents'}[4]{'contents'}[4]{'args'}[0]{'contents'}[3]{'args'}[0]{'contents'}[0];
-$result_trees{'titlepage_with_commands_classical'}{'contents'}[0]{'contents'}[0]{'contents'}[4]{'contents'}[4]{'args'}[0]{'contents'}[3]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'titlepage_with_commands_classical'}{'contents'}[0]{'contents'}[0]{'contents'}[4]{'contents'}[4]{'args'}[0]{'contents'}[3]{'args'}[0];
-$result_trees{'titlepage_with_commands_classical'}{'contents'}[0]{'contents'}[0]{'contents'}[4]{'contents'}[4]{'args'}[0]{'contents'}[3]{'args'}[0]{'contents'}[1]{'parent'}
 = 
$result_trees{'titlepage_with_commands_classical'}{'contents'}[0]{'contents'}[0]{'contents'}[4]{'contents'}[4]{'args'}[0]{'contents'}[3]{'args'}[0];
-$result_trees{'titlepage_with_commands_classical'}{'contents'}[0]{'contents'}[0]{'contents'}[4]{'contents'}[4]{'args'}[0]{'contents'}[3]{'args'}[0]{'contents'}[2]{'contents'}[0]{'parent'}
 = 
$result_trees{'titlepage_with_commands_classical'}{'contents'}[0]{'contents'}[0]{'contents'}[4]{'contents'}[4]{'args'}[0]{'contents'}[3]{'args'}[0]{'contents'}[2];
-$result_trees{'titlepage_with_commands_classical'}{'contents'}[0]{'contents'}[0]{'contents'}[4]{'contents'}[4]{'args'}[0]{'contents'}[3]{'args'}[0]{'contents'}[2]{'parent'}
 = 
$result_trees{'titlepage_with_commands_classical'}{'contents'}[0]{'contents'}[0]{'contents'}[4]{'contents'}[4]{'args'}[0]{'contents'}[3]{'args'}[0];
-$result_trees{'titlepage_with_commands_classical'}{'contents'}[0]{'contents'}[0]{'contents'}[4]{'contents'}[4]{'args'}[0]{'contents'}[3]{'args'}[0]{'contents'}[3]{'args'}[0]{'parent'}
 = 
$result_trees{'titlepage_with_commands_classical'}{'contents'}[0]{'contents'}[0]{'contents'}[4]{'contents'}[4]{'args'}[0]{'contents'}[3]{'args'}[0]{'contents'}[3];
-$result_trees{'titlepage_with_commands_classical'}{'contents'}[0]{'contents'}[0]{'contents'}[4]{'contents'}[4]{'args'}[0]{'contents'}[3]{'args'}[0]{'contents'}[3]{'contents'}[0]{'parent'}
 = 
$result_trees{'titlepage_with_commands_classical'}{'contents'}[0]{'contents'}[0]{'contents'}[4]{'contents'}[4]{'args'}[0]{'contents'}[3]{'args'}[0]{'contents'}[3];
-$result_trees{'titlepage_with_commands_classical'}{'contents'}[0]{'contents'}[0]{'contents'}[4]{'contents'}[4]{'args'}[0]{'contents'}[3]{'args'}[0]{'contents'}[3]{'contents'}[1]{'contents'}[0]{'parent'}
 = 
$result_trees{'titlepage_with_commands_classical'}{'contents'}[0]{'contents'}[0]{'contents'}[4]{'contents'}[4]{'args'}[0]{'contents'}[3]{'args'}[0]{'contents'}[3]{'contents'}[1];
-$result_trees{'titlepage_with_commands_classical'}{'contents'}[0]{'contents'}[0]{'contents'}[4]{'contents'}[4]{'args'}[0]{'contents'}[3]{'args'}[0]{'contents'}[3]{'contents'}[1]{'parent'}
 = 
$result_trees{'titlepage_with_commands_classical'}{'contents'}[0]{'contents'}[0]{'contents'}[4]{'contents'}[4]{'args'}[0]{'contents'}[3]{'args'}[0]{'contents'}[3];
-$result_trees{'titlepage_with_commands_classical'}{'contents'}[0]{'contents'}[0]{'contents'}[4]{'contents'}[4]{'args'}[0]{'contents'}[3]{'args'}[0]{'contents'}[3]{'contents'}[2]{'contents'}[0]{'parent'}
 = 
$result_trees{'titlepage_with_commands_classical'}{'contents'}[0]{'contents'}[0]{'contents'}[4]{'contents'}[4]{'args'}[0]{'contents'}[3]{'args'}[0]{'contents'}[3]{'contents'}[2];
-$result_trees{'titlepage_with_commands_classical'}{'contents'}[0]{'contents'}[0]{'contents'}[4]{'contents'}[4]{'args'}[0]{'contents'}[3]{'args'}[0]{'contents'}[3]{'contents'}[2]{'parent'}
 = 
$result_trees{'titlepage_with_commands_classical'}{'contents'}[0]{'contents'}[0]{'contents'}[4]{'contents'}[4]{'args'}[0]{'contents'}[3]{'args'}[0]{'contents'}[3];
-$result_trees{'titlepage_with_commands_classical'}{'contents'}[0]{'contents'}[0]{'contents'}[4]{'contents'}[4]{'args'}[0]{'contents'}[3]{'args'}[0]{'contents'}[3]{'contents'}[3]{'parent'}
 = 
$result_trees{'titlepage_with_commands_classical'}{'contents'}[0]{'contents'}[0]{'contents'}[4]{'contents'}[4]{'args'}[0]{'contents'}[3]{'args'}[0]{'contents'}[3];
-$result_trees{'titlepage_with_commands_classical'}{'contents'}[0]{'contents'}[0]{'contents'}[4]{'contents'}[4]{'args'}[0]{'contents'}[3]{'args'}[0]{'contents'}[3]{'contents'}[4]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'titlepage_with_commands_classical'}{'contents'}[0]{'contents'}[0]{'contents'}[4]{'contents'}[4]{'args'}[0]{'contents'}[3]{'args'}[0]{'contents'}[3]{'contents'}[4]{'args'}[0];
-$result_trees{'titlepage_with_commands_classical'}{'contents'}[0]{'contents'}[0]{'contents'}[4]{'contents'}[4]{'args'}[0]{'contents'}[3]{'args'}[0]{'contents'}[3]{'contents'}[4]{'args'}[0]{'parent'}
 = 
$result_trees{'titlepage_with_commands_classical'}{'contents'}[0]{'contents'}[0]{'contents'}[4]{'contents'}[4]{'args'}[0]{'contents'}[3]{'args'}[0]{'contents'}[3]{'contents'}[4];
-$result_trees{'titlepage_with_commands_classical'}{'contents'}[0]{'contents'}[0]{'contents'}[4]{'contents'}[4]{'args'}[0]{'contents'}[3]{'args'}[0]{'contents'}[3]{'contents'}[4]{'parent'}
 = 
$result_trees{'titlepage_with_commands_classical'}{'contents'}[0]{'contents'}[0]{'contents'}[4]{'contents'}[4]{'args'}[0]{'contents'}[3]{'args'}[0]{'contents'}[3];
-$result_trees{'titlepage_with_commands_classical'}{'contents'}[0]{'contents'}[0]{'contents'}[4]{'contents'}[4]{'args'}[0]{'contents'}[3]{'args'}[0]{'contents'}[3]{'extra'}{'end_command'}
 = 
$result_trees{'titlepage_with_commands_classical'}{'contents'}[0]{'contents'}[0]{'contents'}[4]{'contents'}[4]{'args'}[0]{'contents'}[3]{'args'}[0]{'contents'}[3]{'contents'}[4];
-$result_trees{'titlepage_with_commands_classical'}{'contents'}[0]{'contents'}[0]{'contents'}[4]{'contents'}[4]{'args'}[0]{'contents'}[3]{'args'}[0]{'contents'}[3]{'parent'}
 = 
$result_trees{'titlepage_with_commands_classical'}{'contents'}[0]{'contents'}[0]{'contents'}[4]{'contents'}[4]{'args'}[0]{'contents'}[3]{'args'}[0];
-$result_trees{'titlepage_with_commands_classical'}{'contents'}[0]{'contents'}[0]{'contents'}[4]{'contents'}[4]{'args'}[0]{'contents'}[3]{'args'}[0]{'parent'}
 = 
$result_trees{'titlepage_with_commands_classical'}{'contents'}[0]{'contents'}[0]{'contents'}[4]{'contents'}[4]{'args'}[0]{'contents'}[3];
-$result_trees{'titlepage_with_commands_classical'}{'contents'}[0]{'contents'}[0]{'contents'}[4]{'contents'}[4]{'args'}[0]{'contents'}[3]{'parent'}
 = 
$result_trees{'titlepage_with_commands_classical'}{'contents'}[0]{'contents'}[0]{'contents'}[4]{'contents'}[4]{'args'}[0];
-$result_trees{'titlepage_with_commands_classical'}{'contents'}[0]{'contents'}[0]{'contents'}[4]{'contents'}[4]{'args'}[0]{'parent'}
 = 
$result_trees{'titlepage_with_commands_classical'}{'contents'}[0]{'contents'}[0]{'contents'}[4]{'contents'}[4];
-$result_trees{'titlepage_with_commands_classical'}{'contents'}[0]{'contents'}[0]{'contents'}[4]{'contents'}[4]{'extra'}{'titlepage'}
 = 
$result_trees{'titlepage_with_commands_classical'}{'contents'}[0]{'contents'}[0]{'contents'}[4];
-$result_trees{'titlepage_with_commands_classical'}{'contents'}[0]{'contents'}[0]{'contents'}[4]{'contents'}[4]{'parent'}
 = 
$result_trees{'titlepage_with_commands_classical'}{'contents'}[0]{'contents'}[0]{'contents'}[4];
-$result_trees{'titlepage_with_commands_classical'}{'contents'}[0]{'contents'}[0]{'contents'}[4]{'contents'}[5]{'args'}[0]{'parent'}
 = 
$result_trees{'titlepage_with_commands_classical'}{'contents'}[0]{'contents'}[0]{'contents'}[4]{'contents'}[5];
-$result_trees{'titlepage_with_commands_classical'}{'contents'}[0]{'contents'}[0]{'contents'}[4]{'contents'}[5]{'parent'}
 = 
$result_trees{'titlepage_with_commands_classical'}{'contents'}[0]{'contents'}[0]{'contents'}[4];
-$result_trees{'titlepage_with_commands_classical'}{'contents'}[0]{'contents'}[0]{'contents'}[4]{'contents'}[6]{'args'}[0]{'parent'}
 = 
$result_trees{'titlepage_with_commands_classical'}{'contents'}[0]{'contents'}[0]{'contents'}[4]{'contents'}[6];
-$result_trees{'titlepage_with_commands_classical'}{'contents'}[0]{'contents'}[0]{'contents'}[4]{'contents'}[6]{'parent'}
 = 
$result_trees{'titlepage_with_commands_classical'}{'contents'}[0]{'contents'}[0]{'contents'}[4];
-$result_trees{'titlepage_with_commands_classical'}{'contents'}[0]{'contents'}[0]{'contents'}[4]{'contents'}[7]{'args'}[0]{'parent'}
 = 
$result_trees{'titlepage_with_commands_classical'}{'contents'}[0]{'contents'}[0]{'contents'}[4]{'contents'}[7];
-$result_trees{'titlepage_with_commands_classical'}{'contents'}[0]{'contents'}[0]{'contents'}[4]{'contents'}[7]{'parent'}
 = 
$result_trees{'titlepage_with_commands_classical'}{'contents'}[0]{'contents'}[0]{'contents'}[4];
-$result_trees{'titlepage_with_commands_classical'}{'contents'}[0]{'contents'}[0]{'contents'}[4]{'contents'}[8]{'args'}[0]{'parent'}
 = 
$result_trees{'titlepage_with_commands_classical'}{'contents'}[0]{'contents'}[0]{'contents'}[4]{'contents'}[8];
-$result_trees{'titlepage_with_commands_classical'}{'contents'}[0]{'contents'}[0]{'contents'}[4]{'contents'}[8]{'parent'}
 = 
$result_trees{'titlepage_with_commands_classical'}{'contents'}[0]{'contents'}[0]{'contents'}[4];
-$result_trees{'titlepage_with_commands_classical'}{'contents'}[0]{'contents'}[0]{'contents'}[4]{'contents'}[9]{'args'}[0]{'parent'}
 = 
$result_trees{'titlepage_with_commands_classical'}{'contents'}[0]{'contents'}[0]{'contents'}[4]{'contents'}[9];
-$result_trees{'titlepage_with_commands_classical'}{'contents'}[0]{'contents'}[0]{'contents'}[4]{'contents'}[9]{'parent'}
 = 
$result_trees{'titlepage_with_commands_classical'}{'contents'}[0]{'contents'}[0]{'contents'}[4];
-$result_trees{'titlepage_with_commands_classical'}{'contents'}[0]{'contents'}[0]{'contents'}[4]{'contents'}[10]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'titlepage_with_commands_classical'}{'contents'}[0]{'contents'}[0]{'contents'}[4]{'contents'}[10]{'args'}[0];
-$result_trees{'titlepage_with_commands_classical'}{'contents'}[0]{'contents'}[0]{'contents'}[4]{'contents'}[10]{'args'}[0]{'parent'}
 = 
$result_trees{'titlepage_with_commands_classical'}{'contents'}[0]{'contents'}[0]{'contents'}[4]{'contents'}[10];
-$result_trees{'titlepage_with_commands_classical'}{'contents'}[0]{'contents'}[0]{'contents'}[4]{'contents'}[10]{'parent'}
 = 
$result_trees{'titlepage_with_commands_classical'}{'contents'}[0]{'contents'}[0]{'contents'}[4];
-$result_trees{'titlepage_with_commands_classical'}{'contents'}[0]{'contents'}[0]{'contents'}[4]{'extra'}{'end_command'}
 = 
$result_trees{'titlepage_with_commands_classical'}{'contents'}[0]{'contents'}[0]{'contents'}[4]{'contents'}[10];
-$result_trees{'titlepage_with_commands_classical'}{'contents'}[0]{'contents'}[0]{'contents'}[4]{'parent'}
 = 
$result_trees{'titlepage_with_commands_classical'}{'contents'}[0]{'contents'}[0];
-$result_trees{'titlepage_with_commands_classical'}{'contents'}[0]{'contents'}[0]{'contents'}[5]{'parent'}
 = 
$result_trees{'titlepage_with_commands_classical'}{'contents'}[0]{'contents'}[0];
 
$result_trees{'titlepage_with_commands_classical'}{'contents'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'titlepage_with_commands_classical'}{'contents'}[0];
 $result_trees{'titlepage_with_commands_classical'}{'contents'}[0]{'parent'} = 
$result_trees{'titlepage_with_commands_classical'};
 
$result_trees{'titlepage_with_commands_classical'}{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'titlepage_with_commands_classical'}{'contents'}[1]{'args'}[0];
@@ -866,9 +827,7 @@ 
$result_trees{'titlepage_with_commands_classical'}{'contents'}[4]{'contents'}[1]
 
$result_trees{'titlepage_with_commands_classical'}{'contents'}[4]{'contents'}[2]{'parent'}
 = $result_trees{'titlepage_with_commands_classical'}{'contents'}[4];
 $result_trees{'titlepage_with_commands_classical'}{'contents'}[4]{'parent'} = 
$result_trees{'titlepage_with_commands_classical'};
 
-$result_texis{'titlepage_with_commands_classical'} = '@setfilename 
titlepage_with_commands_classical.info
-
-@copying
+$result_texis{'titlepage_with_commands_classical'} = '@copying
 in Copying
 @end copying
 
@@ -905,7 +864,6 @@ In chapter
 
 $result_texts{'titlepage_with_commands_classical'} = '
 
-
 section top
 ***********
 
@@ -1011,7 +969,7 @@ $result_errors{'titlepage_with_commands_classical'} = [
     'error_line' => 'warning: @footnote should not appear in @author
 ',
     'file_name' => '',
-    'line_nr' => 12,
+    'line_nr' => 10,
     'macro' => '',
     'text' => '@footnote should not appear in @author',
     'type' => 'warning'
@@ -1025,7 +983,6 @@ $result_floats{'titlepage_with_commands_classical'} = {};
 
 $result_converted{'latex_text'}->{'titlepage_with_commands_classical'} = '
 
-
 \\begin{document}
 
 \\GNUTexinfofrontmatter
diff --git 
a/tp/t/results/latex_tests/titlepage_with_commands_classical/res_latex/titlepage_with_commands_classical.tex
 
b/tp/t/results/latex_tests/titlepage_with_commands_classical/res_latex/titlepage_with_commands_classical.tex
index 4b2d8df375..fe94ed8dc3 100644
--- 
a/tp/t/results/latex_tests/titlepage_with_commands_classical/res_latex/titlepage_with_commands_classical.tex
+++ 
b/tp/t/results/latex_tests/titlepage_with_commands_classical/res_latex/titlepage_with_commands_classical.tex
@@ -66,7 +66,6 @@
 
 
 
-
 \begin{document}
 
 \GNUTexinfofrontmatter
diff --git a/tp/t/results/latex_tests/two_setchapternewpage_odd_on.pl 
b/tp/t/results/latex_tests/two_setchapternewpage_odd_on.pl
index e08c2fa2ae..b05b1e70a8 100644
--- a/tp/t/results/latex_tests/two_setchapternewpage_odd_on.pl
+++ b/tp/t/results/latex_tests/two_setchapternewpage_odd_on.pl
@@ -11,35 +11,6 @@ $result_trees{'two_setchapternewpage_odd_on'} = {
       'contents' => [
         {
           'contents' => [
-            {
-              'args' => [
-                {
-                  'contents' => [
-                    {
-                      'parent' => {},
-                      'text' => 'two_setchapternewpage_odd_on.info'
-                    }
-                  ],
-                  'extra' => {
-                    'spaces_after_argument' => '
-'
-                  },
-                  'parent' => {},
-                  'type' => 'line_arg'
-                }
-              ],
-              'cmdname' => 'setfilename',
-              'extra' => {
-                'spaces_before_argument' => ' ',
-                'text_arg' => 'two_setchapternewpage_odd_on.info'
-              },
-              'parent' => {},
-              'source_info' => {
-                'file_name' => '',
-                'line_nr' => 1,
-                'macro' => ''
-              }
-            },
             {
               'args' => [
                 {
@@ -67,7 +38,7 @@ $result_trees{'two_setchapternewpage_odd_on'} = {
               'parent' => {},
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 2,
+                'line_nr' => 1,
                 'macro' => ''
               }
             },
@@ -104,7 +75,7 @@ $result_trees{'two_setchapternewpage_odd_on'} = {
               'parent' => {},
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 4,
+                'line_nr' => 3,
                 'macro' => ''
               }
             }
@@ -122,18 +93,14 @@ $result_trees{'two_setchapternewpage_odd_on'} = {
 
$result_trees{'two_setchapternewpage_odd_on'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'two_setchapternewpage_odd_on'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0];
 
$result_trees{'two_setchapternewpage_odd_on'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'parent'}
 = 
$result_trees{'two_setchapternewpage_odd_on'}{'contents'}[0]{'contents'}[0]{'contents'}[0];
 
$result_trees{'two_setchapternewpage_odd_on'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'two_setchapternewpage_odd_on'}{'contents'}[0]{'contents'}[0];
-$result_trees{'two_setchapternewpage_odd_on'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'two_setchapternewpage_odd_on'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0];
-$result_trees{'two_setchapternewpage_odd_on'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'two_setchapternewpage_odd_on'}{'contents'}[0]{'contents'}[0]{'contents'}[1];
 
$result_trees{'two_setchapternewpage_odd_on'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'parent'}
 = $result_trees{'two_setchapternewpage_odd_on'}{'contents'}[0]{'contents'}[0];
+$result_trees{'two_setchapternewpage_odd_on'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'two_setchapternewpage_odd_on'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'args'}[0];
+$result_trees{'two_setchapternewpage_odd_on'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'args'}[0]{'parent'}
 = 
$result_trees{'two_setchapternewpage_odd_on'}{'contents'}[0]{'contents'}[0]{'contents'}[2];
 
$result_trees{'two_setchapternewpage_odd_on'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'parent'}
 = $result_trees{'two_setchapternewpage_odd_on'}{'contents'}[0]{'contents'}[0];
-$result_trees{'two_setchapternewpage_odd_on'}{'contents'}[0]{'contents'}[0]{'contents'}[3]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'two_setchapternewpage_odd_on'}{'contents'}[0]{'contents'}[0]{'contents'}[3]{'args'}[0];
-$result_trees{'two_setchapternewpage_odd_on'}{'contents'}[0]{'contents'}[0]{'contents'}[3]{'args'}[0]{'parent'}
 = 
$result_trees{'two_setchapternewpage_odd_on'}{'contents'}[0]{'contents'}[0]{'contents'}[3];
-$result_trees{'two_setchapternewpage_odd_on'}{'contents'}[0]{'contents'}[0]{'contents'}[3]{'parent'}
 = $result_trees{'two_setchapternewpage_odd_on'}{'contents'}[0]{'contents'}[0];
 
$result_trees{'two_setchapternewpage_odd_on'}{'contents'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'two_setchapternewpage_odd_on'}{'contents'}[0];
 $result_trees{'two_setchapternewpage_odd_on'}{'contents'}[0]{'parent'} = 
$result_trees{'two_setchapternewpage_odd_on'};
 
-$result_texis{'two_setchapternewpage_odd_on'} = '@setfilename 
two_setchapternewpage_odd_on.info
-@setchapternewpage odd
+$result_texis{'two_setchapternewpage_odd_on'} = '@setchapternewpage odd
 
 @setchapternewpage on
 ';
@@ -147,7 +114,7 @@ $result_errors{'two_setchapternewpage_odd_on'} = [
     'error_line' => 'warning: multiple @setchapternewpage
 ',
     'file_name' => '',
-    'line_nr' => 4,
+    'line_nr' => 3,
     'macro' => '',
     'text' => 'multiple @setchapternewpage',
     'type' => 'warning'
diff --git a/tp/t/results/latex_tests/two_setchapternewpage_on_odd.pl 
b/tp/t/results/latex_tests/two_setchapternewpage_on_odd.pl
index 0be40ba2a1..fe3ccca308 100644
--- a/tp/t/results/latex_tests/two_setchapternewpage_on_odd.pl
+++ b/tp/t/results/latex_tests/two_setchapternewpage_on_odd.pl
@@ -11,35 +11,6 @@ $result_trees{'two_setchapternewpage_on_odd'} = {
       'contents' => [
         {
           'contents' => [
-            {
-              'args' => [
-                {
-                  'contents' => [
-                    {
-                      'parent' => {},
-                      'text' => 'two_setchapternewpage_on_odd.info'
-                    }
-                  ],
-                  'extra' => {
-                    'spaces_after_argument' => '
-'
-                  },
-                  'parent' => {},
-                  'type' => 'line_arg'
-                }
-              ],
-              'cmdname' => 'setfilename',
-              'extra' => {
-                'spaces_before_argument' => ' ',
-                'text_arg' => 'two_setchapternewpage_on_odd.info'
-              },
-              'parent' => {},
-              'source_info' => {
-                'file_name' => '',
-                'line_nr' => 1,
-                'macro' => ''
-              }
-            },
             {
               'args' => [
                 {
@@ -67,7 +38,7 @@ $result_trees{'two_setchapternewpage_on_odd'} = {
               'parent' => {},
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 2,
+                'line_nr' => 1,
                 'macro' => ''
               }
             },
@@ -104,7 +75,7 @@ $result_trees{'two_setchapternewpage_on_odd'} = {
               'parent' => {},
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 4,
+                'line_nr' => 3,
                 'macro' => ''
               }
             }
@@ -122,18 +93,14 @@ $result_trees{'two_setchapternewpage_on_odd'} = {
 
$result_trees{'two_setchapternewpage_on_odd'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'two_setchapternewpage_on_odd'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0];
 
$result_trees{'two_setchapternewpage_on_odd'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'parent'}
 = 
$result_trees{'two_setchapternewpage_on_odd'}{'contents'}[0]{'contents'}[0]{'contents'}[0];
 
$result_trees{'two_setchapternewpage_on_odd'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'two_setchapternewpage_on_odd'}{'contents'}[0]{'contents'}[0];
-$result_trees{'two_setchapternewpage_on_odd'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'two_setchapternewpage_on_odd'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0];
-$result_trees{'two_setchapternewpage_on_odd'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'two_setchapternewpage_on_odd'}{'contents'}[0]{'contents'}[0]{'contents'}[1];
 
$result_trees{'two_setchapternewpage_on_odd'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'parent'}
 = $result_trees{'two_setchapternewpage_on_odd'}{'contents'}[0]{'contents'}[0];
+$result_trees{'two_setchapternewpage_on_odd'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'two_setchapternewpage_on_odd'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'args'}[0];
+$result_trees{'two_setchapternewpage_on_odd'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'args'}[0]{'parent'}
 = 
$result_trees{'two_setchapternewpage_on_odd'}{'contents'}[0]{'contents'}[0]{'contents'}[2];
 
$result_trees{'two_setchapternewpage_on_odd'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'parent'}
 = $result_trees{'two_setchapternewpage_on_odd'}{'contents'}[0]{'contents'}[0];
-$result_trees{'two_setchapternewpage_on_odd'}{'contents'}[0]{'contents'}[0]{'contents'}[3]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'two_setchapternewpage_on_odd'}{'contents'}[0]{'contents'}[0]{'contents'}[3]{'args'}[0];
-$result_trees{'two_setchapternewpage_on_odd'}{'contents'}[0]{'contents'}[0]{'contents'}[3]{'args'}[0]{'parent'}
 = 
$result_trees{'two_setchapternewpage_on_odd'}{'contents'}[0]{'contents'}[0]{'contents'}[3];
-$result_trees{'two_setchapternewpage_on_odd'}{'contents'}[0]{'contents'}[0]{'contents'}[3]{'parent'}
 = $result_trees{'two_setchapternewpage_on_odd'}{'contents'}[0]{'contents'}[0];
 
$result_trees{'two_setchapternewpage_on_odd'}{'contents'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'two_setchapternewpage_on_odd'}{'contents'}[0];
 $result_trees{'two_setchapternewpage_on_odd'}{'contents'}[0]{'parent'} = 
$result_trees{'two_setchapternewpage_on_odd'};
 
-$result_texis{'two_setchapternewpage_on_odd'} = '@setfilename 
two_setchapternewpage_on_odd.info
-@setchapternewpage on
+$result_texis{'two_setchapternewpage_on_odd'} = '@setchapternewpage on
 
 @setchapternewpage odd
 ';
@@ -147,7 +114,7 @@ $result_errors{'two_setchapternewpage_on_odd'} = [
     'error_line' => 'warning: multiple @setchapternewpage
 ',
     'file_name' => '',
-    'line_nr' => 4,
+    'line_nr' => 3,
     'macro' => '',
     'text' => 'multiple @setchapternewpage',
     'type' => 'warning'
diff --git a/tp/t/results/latex_tests/verbatim_in_smallformat.pl 
b/tp/t/results/latex_tests/verbatim_in_smallformat.pl
index f2ae7dca26..7463918e5b 100644
--- a/tp/t/results/latex_tests/verbatim_in_smallformat.pl
+++ b/tp/t/results/latex_tests/verbatim_in_smallformat.pl
@@ -10,43 +10,7 @@ $result_trees{'verbatim_in_smallformat'} = {
     {
       'contents' => [
         {
-          'contents' => [
-            {
-              'args' => [
-                {
-                  'contents' => [
-                    {
-                      'parent' => {},
-                      'text' => 'verbatim_in_smallformat.info'
-                    }
-                  ],
-                  'extra' => {
-                    'spaces_after_argument' => '
-'
-                  },
-                  'parent' => {},
-                  'type' => 'line_arg'
-                }
-              ],
-              'cmdname' => 'setfilename',
-              'extra' => {
-                'spaces_before_argument' => ' ',
-                'text_arg' => 'verbatim_in_smallformat.info'
-              },
-              'parent' => {},
-              'source_info' => {
-                'file_name' => '',
-                'line_nr' => 1,
-                'macro' => ''
-              }
-            },
-            {
-              'parent' => {},
-              'text' => '
-',
-              'type' => 'empty_line'
-            }
-          ],
+          'contents' => [],
           'parent' => {},
           'type' => 'preamble_before_content'
         },
@@ -86,7 +50,7 @@ $result_trees{'verbatim_in_smallformat'} = {
               'parent' => {},
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 4,
+                'line_nr' => 2,
                 'macro' => ''
               }
             },
@@ -122,7 +86,7 @@ $result_trees{'verbatim_in_smallformat'} = {
               'parent' => {},
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 7,
+                'line_nr' => 5,
                 'macro' => ''
               }
             }
@@ -133,7 +97,7 @@ $result_trees{'verbatim_in_smallformat'} = {
           'parent' => {},
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 3,
+            'line_nr' => 1,
             'macro' => ''
           }
         }
@@ -144,10 +108,6 @@ $result_trees{'verbatim_in_smallformat'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'verbatim_in_smallformat'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'verbatim_in_smallformat'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0];
-$result_trees{'verbatim_in_smallformat'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'parent'}
 = 
$result_trees{'verbatim_in_smallformat'}{'contents'}[0]{'contents'}[0]{'contents'}[0];
-$result_trees{'verbatim_in_smallformat'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'verbatim_in_smallformat'}{'contents'}[0]{'contents'}[0];
-$result_trees{'verbatim_in_smallformat'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'parent'}
 = $result_trees{'verbatim_in_smallformat'}{'contents'}[0]{'contents'}[0];
 
$result_trees{'verbatim_in_smallformat'}{'contents'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'verbatim_in_smallformat'}{'contents'}[0];
 
$result_trees{'verbatim_in_smallformat'}{'contents'}[0]{'contents'}[1]{'args'}[0]{'parent'}
 = $result_trees{'verbatim_in_smallformat'}{'contents'}[0]{'contents'}[1];
 
$result_trees{'verbatim_in_smallformat'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'extra'}{'command'}
 = 
$result_trees{'verbatim_in_smallformat'}{'contents'}[0]{'contents'}[1]{'contents'}[0];
@@ -162,9 +122,7 @@ 
$result_trees{'verbatim_in_smallformat'}{'contents'}[0]{'contents'}[1]{'extra'}{
 
$result_trees{'verbatim_in_smallformat'}{'contents'}[0]{'contents'}[1]{'parent'}
 = $result_trees{'verbatim_in_smallformat'}{'contents'}[0];
 $result_trees{'verbatim_in_smallformat'}{'contents'}[0]{'parent'} = 
$result_trees{'verbatim_in_smallformat'};
 
-$result_texis{'verbatim_in_smallformat'} = '@setfilename 
verbatim_in_smallformat.info
-
-@smallformat
+$result_texis{'verbatim_in_smallformat'} = '@smallformat
 @verbatim
 ... still verbatim, but in a smaller font ...
 @end verbatim
@@ -172,8 +130,7 @@ $result_texis{'verbatim_in_smallformat'} = '@setfilename 
verbatim_in_smallformat
 ';
 
 
-$result_texts{'verbatim_in_smallformat'} = '
-... still verbatim, but in a smaller font ...
+$result_texts{'verbatim_in_smallformat'} = '... still verbatim, but in a 
smaller font ...
 ';
 
 $result_errors{'verbatim_in_smallformat'} = [];
@@ -183,8 +140,7 @@ $result_floats{'verbatim_in_smallformat'} = {};
 
 
 
-$result_converted{'latex_text'}->{'verbatim_in_smallformat'} = '
-\\begin{document}
+$result_converted{'latex_text'}->{'verbatim_in_smallformat'} = 
'\\begin{document}
 \\begin{verbatim}
 ... still verbatim, but in a smaller font ...
 \\end{verbatim}
diff --git 
a/tp/t/results/latex_tests/verbatim_in_smallformat/res_latex/verbatim_in_smallformat.tex
 
b/tp/t/results/latex_tests/verbatim_in_smallformat/res_latex/verbatim_in_smallformat.tex
index ae7a5b25b4..f49b395119 100644
--- 
a/tp/t/results/latex_tests/verbatim_in_smallformat/res_latex/verbatim_in_smallformat.tex
+++ 
b/tp/t/results/latex_tests/verbatim_in_smallformat/res_latex/verbatim_in_smallformat.tex
@@ -62,7 +62,6 @@
 \makeatother
 \GNUTexinfosetsingleheader{}%
 
-
 \begin{document}
 \begin{verbatim}
 ... still verbatim, but in a smaller font ...



reply via email to

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