branch master updated: more full document tests for conversion to latex

[Patrice Dumas]

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

pertusus pushed a commit to branch master
in repository texinfo.

The following commit(s) were added to refs/heads/master by this push:
     new edf3e25c8c more full document tests for conversion to latex
edf3e25c8c is described below

commit edf3e25c8cf692a38dd863f3a286e56b1527d403
Author: Patrice Dumas <pertusus@free.fr>
AuthorDate: Mon Jan 10 02:13:12 2022 +0100

    more full document tests for conversion to latex
---
 tp/t/181quotation.t                                |  24 ++--
 tp/t/18itemize.t                                   |  48 ++++---
 tp/t/30sectioning.t                                |  10 +-
 .../itemize/inter_item_commands_in_enumerate.pl    |  57 ++++----
 .../itemize/inter_item_commands_in_itemize.pl      |  57 ++++----
 tp/t/results/quotation/empty_quotation.pl          | 120 ++++++----------
 .../empty_quotation/res_latex/empty_quotation.tex  |   1 -
 tp/t/results/quotation/quotation_and_author.pl     | 154 ++++++++-------------
 .../res_latex/quotation_and_author.tex             |   1 -
 .../quotation/quotation_author_in_example.pl       | 104 +++++---------
 .../res_latex/quotation_author_in_example.tex      |   1 -
 .../space_at_commands_end_quotation_line.pl        | 122 ++++++----------
 .../space_at_commands_end_quotation_line.tex       |   1 -
 tp/t/results/sectioning/lone_Top_node.pl           |  58 ++++----
 tp/t/results/sectioning/loop_nodes.pl              |  58 ++++----
 tp/t/results/sectioning/nodes_before_after_top.pl  |  58 ++++----
 .../sectioning/nodes_before_after_top_xref.pl      |  58 ++++----
 tp/t/results/sectioning/nodes_before_top.pl        |  58 ++++----
 18 files changed, 444 insertions(+), 546 deletions(-)

diff --git a/tp/t/181quotation.t b/tp/t/181quotation.t
index adf7f50b2f..a7c90e6e6b 100644
--- a/tp/t/181quotation.t
+++ b/tp/t/181quotation.t
@@ -7,9 +7,7 @@ require 't/test_utils.pl';
 
 my @test_cases = (
 ['quotation_and_author',
-'@setfilename quotation_and_author.info
-
-Text before quotation
+'Text before quotation
 
 @quotation 
 @author Some One
@@ -29,9 +27,7 @@ A Note
 @end quotation
 '],
 ['quotation_author_in_example',
-'@setfilename quotation_author_in_example.info
-
-@example
+'@example
 @quotation 
 @author Some One
 A quot---ation
@@ -39,9 +35,7 @@ A quot---ation
 @end example
 '],
 ['space_at_commands_end_quotation_line',
-'@setfilename space_at_commands_end_quotation_line.info
-
-@quotation @@ at the end of line @
+'@quotation @@ at the end of line @
 A @@ at the end of the @@quotation line.
 @end quotation
 
@@ -50,9 +44,7 @@ A @@@  at the end of the @@quotation line.
 @end quotation
 '],
 ['empty_quotation',
-'@setfilename empty_quotation.info
-
-@quotation
+'@quotation
 @end quotation
 
 @quotation Empty
@@ -113,8 +105,12 @@ foreach my $test (@test_cases) {
   push @{$test->[2]->{'test_formats'}}, 'html_text';
   push @{$test->[2]->{'test_formats'}}, 'xml';
   push @{$test->[2]->{'test_formats'}}, 'docbook';
-  push @{$test->[2]->{'test_formats'}}, 'file_latex'
-    if (grep {$_ eq $test->[0]} @file_latex_tests_cases_tests);
+
+  if (grep {$_ eq $test->[0]} @file_latex_tests_cases_tests) {
+    push @{$test->[2]->{'test_formats'}}, 'file_latex';
+    $test->[2]->{'test_input_file_name'} = $test->[0] . '.texi';
+    $test->[2]->{'full_document'} = 1 unless 
(exists($test->[2]->{'full_document'}));
+  }
 }
 
 our ($arg_test_case, $arg_generate, $arg_debug);
diff --git a/tp/t/18itemize.t b/tp/t/18itemize.t
index 0b94feb525..9085c744ba 100644
--- a/tp/t/18itemize.t
+++ b/tp/t/18itemize.t
@@ -470,6 +470,25 @@ more.
 @end itemize
 @end example
 '],
+['table_in_itemize',
+'@itemize @bullet
+@item item one
+@item
+@table @asis
+@item table one
+aaaaa
+
+New para.
+@item table two
+Five
+
+New para.
+@end table
+@item item three
+@end itemize'],
+);
+
+my @test_full_doc = (
 ['inter_item_commands_in_itemize',
 '@setfilename inter_item_commands_in_itemize.info
 
@@ -548,22 +567,6 @@ Title
 @end enumerate
 
 '],
-['table_in_itemize',
-'@itemize @bullet
-@item item one
-@item
-@table @asis
-@item table one
-aaaaa
-
-New para.
-@item table two
-Five
-
-New para.
-@end table
-@item item three
-@end itemize']
 );
 
 my @test_invalid = (
@@ -617,14 +620,21 @@ my @latex_tests_cases_tests = ('w_argument');
 foreach my $test (@test_cases) {
   push @{$test->[2]->{'test_formats'}}, 'plaintext';
   push @{$test->[2]->{'test_formats'}}, 'html_text';
-  push @{$test->[2]->{'test_formats'}}, 'file_latex'
-    if (grep {$_ eq $test->[0]} @file_latex_tests_cases_tests);
   push @{$test->[2]->{'test_formats'}}, 'latex'
     if (grep {$_ eq $test->[0]} @latex_tests_cases_tests);
 }
 
+foreach my $test (@test_full_doc) {
+  push @{$test->[2]->{'test_formats'}}, 'plaintext';
+  push @{$test->[2]->{'test_formats'}}, 'html_text';
+  push @{$test->[2]->{'test_formats'}}, 'file_latex'
+    if (grep {$_ eq $test->[0]} @file_latex_tests_cases_tests);
+
+  $test->[2]->{'full_document'} = 1 unless 
(exists($test->[2]->{'full_document'}));
+}
+
 our ($arg_test_case, $arg_generate, $arg_debug);
 
-run_all ('itemize', [@test_cases, @test_invalid], $arg_test_case,
+run_all ('itemize', [@test_cases, @test_full_doc, @test_invalid], 
$arg_test_case,
    $arg_generate, $arg_debug);
 
diff --git a/tp/t/30sectioning.t b/tp/t/30sectioning.t
index af2d52c013..e003ea563d 100644
--- a/tp/t/30sectioning.t
+++ b/tp/t/30sectioning.t
@@ -2110,11 +2110,11 @@ foreach my $test (@tests_info) {
     if (grep {$_ eq $test->[0]} @docbook_tests_info_tests);
   if (grep {$_ eq $test->[0]} @latex_tests_info_tests) {
     push @{$test->[2]->{'test_formats'}}, 'latex';
-    $test->[2]->{'full_document'} = 1 unless 
(exists($test->[2]->{'full_document'}))
+    $test->[2]->{'full_document'} = 1 unless 
(exists($test->[2]->{'full_document'}));
   }
   if (grep {$_ eq $test->[0]} @file_latex_tests_info_tests) {
     push @{$test->[2]->{'test_formats'}}, 'file_latex';
-    $test->[2]->{'full_document'} = 1 unless 
(exists($test->[2]->{'full_document'}))
+    $test->[2]->{'full_document'} = 1 unless 
(exists($test->[2]->{'full_document'}));
   }
 }
 
@@ -2139,8 +2139,10 @@ foreach my $test (@test_cases) {
     if (grep {$_ eq $test->[0]} @xml_tests_cases_tests);
   push @{$test->[2]->{'test_formats'}}, 'latex'
     if (grep {$_ eq $test->[0]} @latex_tests_cases_tests);
-  push @{$test->[2]->{'test_formats'}}, 'file_latex'
-    if (grep {$_ eq $test->[0]} @file_latex_tests_cases_tests);
+  if (grep {$_ eq $test->[0]} @file_latex_tests_cases_tests) {
+    push @{$test->[2]->{'test_formats'}}, 'file_latex';
+    $test->[2]->{'full_document'} = 1 unless 
(exists($test->[2]->{'full_document'}));
+  }
 }
 
 our ($arg_test_case, $arg_generate, $arg_debug);
diff --git a/tp/t/results/itemize/inter_item_commands_in_enumerate.pl 
b/tp/t/results/itemize/inter_item_commands_in_enumerate.pl
index 2576603243..dbb1876a59 100644
--- a/tp/t/results/itemize/inter_item_commands_in_enumerate.pl
+++ b/tp/t/results/itemize/inter_item_commands_in_enumerate.pl
@@ -10,39 +10,45 @@ $result_trees{'inter_item_commands_in_enumerate'} = {
     {
       'contents' => [
         {
-          'args' => [
+          'contents' => [
             {
-              'contents' => [
+              'args' => [
                 {
+                  'contents' => [
+                    {
+                      'parent' => {},
+                      'text' => 'inter_item_commands_in_enumerate.info'
+                    }
+                  ],
+                  'extra' => {
+                    'spaces_after_argument' => '
+'
+                  },
                   'parent' => {},
-                  'text' => 'inter_item_commands_in_enumerate.info'
+                  'type' => 'line_arg'
                 }
               ],
+              'cmdname' => 'setfilename',
               'extra' => {
-                'spaces_after_argument' => '
-'
+                'spaces_before_argument' => ' ',
+                'text_arg' => 'inter_item_commands_in_enumerate.info'
+              },
+              'line_nr' => {
+                'file_name' => '',
+                'line_nr' => 1,
+                'macro' => ''
               },
+              'parent' => {}
+            },
+            {
               'parent' => {},
-              'type' => 'line_arg'
+              'text' => '
+',
+              'type' => 'empty_line'
             }
           ],
-          'cmdname' => 'setfilename',
-          'extra' => {
-            'spaces_before_argument' => ' ',
-            'text_arg' => 'inter_item_commands_in_enumerate.info'
-          },
-          'line_nr' => {
-            'file_name' => '',
-            'line_nr' => 1,
-            'macro' => ''
-          },
-          'parent' => {}
-        },
-        {
           'parent' => {},
-          'text' => '
-',
-          'type' => 'empty_line'
+          'type' => 'preamble_before_content'
         }
       ],
       'parent' => {},
@@ -1121,10 +1127,11 @@ $result_trees{'inter_item_commands_in_enumerate'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'inter_item_commands_in_enumerate'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'inter_item_commands_in_enumerate'}{'contents'}[0]{'contents'}[0]{'args'}[0];
-$result_trees{'inter_item_commands_in_enumerate'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'parent'}
 = 
$result_trees{'inter_item_commands_in_enumerate'}{'contents'}[0]{'contents'}[0];
+$result_trees{'inter_item_commands_in_enumerate'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'inter_item_commands_in_enumerate'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0];
+$result_trees{'inter_item_commands_in_enumerate'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'parent'}
 = 
$result_trees{'inter_item_commands_in_enumerate'}{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'inter_item_commands_in_enumerate'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'inter_item_commands_in_enumerate'}{'contents'}[0]{'contents'}[0];
+$result_trees{'inter_item_commands_in_enumerate'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'parent'}
 = 
$result_trees{'inter_item_commands_in_enumerate'}{'contents'}[0]{'contents'}[0];
 
$result_trees{'inter_item_commands_in_enumerate'}{'contents'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'inter_item_commands_in_enumerate'}{'contents'}[0];
-$result_trees{'inter_item_commands_in_enumerate'}{'contents'}[0]{'contents'}[1]{'parent'}
 = $result_trees{'inter_item_commands_in_enumerate'}{'contents'}[0];
 $result_trees{'inter_item_commands_in_enumerate'}{'contents'}[0]{'parent'} = 
$result_trees{'inter_item_commands_in_enumerate'};
 
$result_trees{'inter_item_commands_in_enumerate'}{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'inter_item_commands_in_enumerate'}{'contents'}[1]{'args'}[0];
 
$result_trees{'inter_item_commands_in_enumerate'}{'contents'}[1]{'args'}[0]{'parent'}
 = $result_trees{'inter_item_commands_in_enumerate'}{'contents'}[1];
diff --git a/tp/t/results/itemize/inter_item_commands_in_itemize.pl 
b/tp/t/results/itemize/inter_item_commands_in_itemize.pl
index 72ca43c51b..452d0438a6 100644
--- a/tp/t/results/itemize/inter_item_commands_in_itemize.pl
+++ b/tp/t/results/itemize/inter_item_commands_in_itemize.pl
@@ -10,39 +10,45 @@ $result_trees{'inter_item_commands_in_itemize'} = {
     {
       'contents' => [
         {
-          'args' => [
+          'contents' => [
             {
-              'contents' => [
+              'args' => [
                 {
+                  'contents' => [
+                    {
+                      'parent' => {},
+                      'text' => 'inter_item_commands_in_itemize.info'
+                    }
+                  ],
+                  'extra' => {
+                    'spaces_after_argument' => '
+'
+                  },
                   'parent' => {},
-                  'text' => 'inter_item_commands_in_itemize.info'
+                  'type' => 'line_arg'
                 }
               ],
+              'cmdname' => 'setfilename',
               'extra' => {
-                'spaces_after_argument' => '
-'
+                'spaces_before_argument' => ' ',
+                'text_arg' => 'inter_item_commands_in_itemize.info'
+              },
+              'line_nr' => {
+                'file_name' => '',
+                'line_nr' => 1,
+                'macro' => ''
               },
+              'parent' => {}
+            },
+            {
               'parent' => {},
-              'type' => 'line_arg'
+              'text' => '
+',
+              'type' => 'empty_line'
             }
           ],
-          'cmdname' => 'setfilename',
-          'extra' => {
-            'spaces_before_argument' => ' ',
-            'text_arg' => 'inter_item_commands_in_itemize.info'
-          },
-          'line_nr' => {
-            'file_name' => '',
-            'line_nr' => 1,
-            'macro' => ''
-          },
-          'parent' => {}
-        },
-        {
           'parent' => {},
-          'text' => '
-',
-          'type' => 'empty_line'
+          'type' => 'preamble_before_content'
         }
       ],
       'parent' => {},
@@ -758,10 +764,11 @@ $result_trees{'inter_item_commands_in_itemize'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'inter_item_commands_in_itemize'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'inter_item_commands_in_itemize'}{'contents'}[0]{'contents'}[0]{'args'}[0];
-$result_trees{'inter_item_commands_in_itemize'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'parent'}
 = 
$result_trees{'inter_item_commands_in_itemize'}{'contents'}[0]{'contents'}[0];
+$result_trees{'inter_item_commands_in_itemize'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'inter_item_commands_in_itemize'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0];
+$result_trees{'inter_item_commands_in_itemize'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'parent'}
 = 
$result_trees{'inter_item_commands_in_itemize'}{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'inter_item_commands_in_itemize'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'inter_item_commands_in_itemize'}{'contents'}[0]{'contents'}[0];
+$result_trees{'inter_item_commands_in_itemize'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'parent'}
 = 
$result_trees{'inter_item_commands_in_itemize'}{'contents'}[0]{'contents'}[0];
 
$result_trees{'inter_item_commands_in_itemize'}{'contents'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'inter_item_commands_in_itemize'}{'contents'}[0];
-$result_trees{'inter_item_commands_in_itemize'}{'contents'}[0]{'contents'}[1]{'parent'}
 = $result_trees{'inter_item_commands_in_itemize'}{'contents'}[0];
 $result_trees{'inter_item_commands_in_itemize'}{'contents'}[0]{'parent'} = 
$result_trees{'inter_item_commands_in_itemize'};
 
$result_trees{'inter_item_commands_in_itemize'}{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'inter_item_commands_in_itemize'}{'contents'}[1]{'args'}[0];
 
$result_trees{'inter_item_commands_in_itemize'}{'contents'}[1]{'args'}[0]{'parent'}
 = $result_trees{'inter_item_commands_in_itemize'}{'contents'}[1];
diff --git a/tp/t/results/quotation/empty_quotation.pl 
b/tp/t/results/quotation/empty_quotation.pl
index e197e1fb00..72f98423e0 100644
--- a/tp/t/results/quotation/empty_quotation.pl
+++ b/tp/t/results/quotation/empty_quotation.pl
@@ -10,39 +10,9 @@ $result_trees{'empty_quotation'} = {
     {
       'contents' => [
         {
-          'args' => [
-            {
-              'contents' => [
-                {
-                  'parent' => {},
-                  'text' => 'empty_quotation.info'
-                }
-              ],
-              'extra' => {
-                'spaces_after_argument' => '
-'
-              },
-              'parent' => {},
-              'type' => 'line_arg'
-            }
-          ],
-          'cmdname' => 'setfilename',
-          'extra' => {
-            'spaces_before_argument' => ' ',
-            'text_arg' => 'empty_quotation.info'
-          },
-          'line_nr' => {
-            'file_name' => '',
-            'line_nr' => 1,
-            'macro' => ''
-          },
-          'parent' => {}
-        },
-        {
+          'contents' => [],
           'parent' => {},
-          'text' => '
-',
-          'type' => 'empty_line'
+          'type' => 'preamble_before_content'
         },
         {
           'cmdname' => 'quotation',
@@ -81,7 +51,7 @@ $result_trees{'empty_quotation'} = {
               },
               'line_nr' => {
                 'file_name' => '',
-                'line_nr' => 4,
+                'line_nr' => 2,
                 'macro' => ''
               },
               'parent' => {}
@@ -92,7 +62,7 @@ $result_trees{'empty_quotation'} = {
           },
           'line_nr' => {
             'file_name' => '',
-            'line_nr' => 3,
+            'line_nr' => 1,
             'macro' => ''
           },
           'parent' => {}
@@ -147,7 +117,7 @@ $result_trees{'empty_quotation'} = {
               },
               'line_nr' => {
                 'file_name' => '',
-                'line_nr' => 7,
+                'line_nr' => 5,
                 'macro' => ''
               },
               'parent' => {}
@@ -159,7 +129,7 @@ $result_trees{'empty_quotation'} = {
           },
           'line_nr' => {
             'file_name' => '',
-            'line_nr' => 6,
+            'line_nr' => 4,
             'macro' => ''
           },
           'parent' => {}
@@ -186,7 +156,7 @@ $result_trees{'empty_quotation'} = {
                   'contents' => [],
                   'line_nr' => {
                     'file_name' => '',
-                    'line_nr' => 9,
+                    'line_nr' => 7,
                     'macro' => ''
                   },
                   'parent' => {}
@@ -227,7 +197,7 @@ $result_trees{'empty_quotation'} = {
               },
               'line_nr' => {
                 'file_name' => '',
-                'line_nr' => 10,
+                'line_nr' => 8,
                 'macro' => ''
               },
               'parent' => {}
@@ -239,7 +209,7 @@ $result_trees{'empty_quotation'} = {
           },
           'line_nr' => {
             'file_name' => '',
-            'line_nr' => 9,
+            'line_nr' => 7,
             'macro' => ''
           },
           'parent' => {}
@@ -294,7 +264,7 @@ $result_trees{'empty_quotation'} = {
               },
               'line_nr' => {
                 'file_name' => '',
-                'line_nr' => 13,
+                'line_nr' => 11,
                 'macro' => ''
               },
               'parent' => {}
@@ -306,7 +276,7 @@ $result_trees{'empty_quotation'} = {
           },
           'line_nr' => {
             'file_name' => '',
-            'line_nr' => 12,
+            'line_nr' => 10,
             'macro' => ''
           },
           'parent' => {}
@@ -318,47 +288,42 @@ $result_trees{'empty_quotation'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'empty_quotation'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'empty_quotation'}{'contents'}[0]{'contents'}[0]{'args'}[0];
-$result_trees{'empty_quotation'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'parent'}
 = $result_trees{'empty_quotation'}{'contents'}[0]{'contents'}[0];
 $result_trees{'empty_quotation'}{'contents'}[0]{'contents'}[0]{'parent'} = 
$result_trees{'empty_quotation'}{'contents'}[0];
+$result_trees{'empty_quotation'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'extra'}{'command'}
 = $result_trees{'empty_quotation'}{'contents'}[0]{'contents'}[1];
+$result_trees{'empty_quotation'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'parent'}
 = $result_trees{'empty_quotation'}{'contents'}[0]{'contents'}[1];
+$result_trees{'empty_quotation'}{'contents'}[0]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'empty_quotation'}{'contents'}[0]{'contents'}[1]{'contents'}[1]{'args'}[0];
+$result_trees{'empty_quotation'}{'contents'}[0]{'contents'}[1]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'empty_quotation'}{'contents'}[0]{'contents'}[1]{'contents'}[1];
+$result_trees{'empty_quotation'}{'contents'}[0]{'contents'}[1]{'contents'}[1]{'parent'}
 = $result_trees{'empty_quotation'}{'contents'}[0]{'contents'}[1];
+$result_trees{'empty_quotation'}{'contents'}[0]{'contents'}[1]{'extra'}{'end_command'}
 = 
$result_trees{'empty_quotation'}{'contents'}[0]{'contents'}[1]{'contents'}[1];
 $result_trees{'empty_quotation'}{'contents'}[0]{'contents'}[1]{'parent'} = 
$result_trees{'empty_quotation'}{'contents'}[0];
-$result_trees{'empty_quotation'}{'contents'}[0]{'contents'}[2]{'contents'}[0]{'extra'}{'command'}
 = $result_trees{'empty_quotation'}{'contents'}[0]{'contents'}[2];
-$result_trees{'empty_quotation'}{'contents'}[0]{'contents'}[2]{'contents'}[0]{'parent'}
 = $result_trees{'empty_quotation'}{'contents'}[0]{'contents'}[2];
-$result_trees{'empty_quotation'}{'contents'}[0]{'contents'}[2]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'empty_quotation'}{'contents'}[0]{'contents'}[2]{'contents'}[1]{'args'}[0];
-$result_trees{'empty_quotation'}{'contents'}[0]{'contents'}[2]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'empty_quotation'}{'contents'}[0]{'contents'}[2]{'contents'}[1];
-$result_trees{'empty_quotation'}{'contents'}[0]{'contents'}[2]{'contents'}[1]{'parent'}
 = $result_trees{'empty_quotation'}{'contents'}[0]{'contents'}[2];
-$result_trees{'empty_quotation'}{'contents'}[0]{'contents'}[2]{'extra'}{'end_command'}
 = 
$result_trees{'empty_quotation'}{'contents'}[0]{'contents'}[2]{'contents'}[1];
 $result_trees{'empty_quotation'}{'contents'}[0]{'contents'}[2]{'parent'} = 
$result_trees{'empty_quotation'}{'contents'}[0];
+$result_trees{'empty_quotation'}{'contents'}[0]{'contents'}[3]{'args'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'empty_quotation'}{'contents'}[0]{'contents'}[3]{'args'}[0];
+$result_trees{'empty_quotation'}{'contents'}[0]{'contents'}[3]{'args'}[0]{'parent'}
 = $result_trees{'empty_quotation'}{'contents'}[0]{'contents'}[3];
+$result_trees{'empty_quotation'}{'contents'}[0]{'contents'}[3]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'empty_quotation'}{'contents'}[0]{'contents'}[3]{'contents'}[0]{'args'}[0];
+$result_trees{'empty_quotation'}{'contents'}[0]{'contents'}[3]{'contents'}[0]{'args'}[0]{'parent'}
 = 
$result_trees{'empty_quotation'}{'contents'}[0]{'contents'}[3]{'contents'}[0];
+$result_trees{'empty_quotation'}{'contents'}[0]{'contents'}[3]{'contents'}[0]{'parent'}
 = $result_trees{'empty_quotation'}{'contents'}[0]{'contents'}[3];
+$result_trees{'empty_quotation'}{'contents'}[0]{'contents'}[3]{'extra'}{'end_command'}
 = 
$result_trees{'empty_quotation'}{'contents'}[0]{'contents'}[3]{'contents'}[0];
 $result_trees{'empty_quotation'}{'contents'}[0]{'contents'}[3]{'parent'} = 
$result_trees{'empty_quotation'}{'contents'}[0];
-$result_trees{'empty_quotation'}{'contents'}[0]{'contents'}[4]{'args'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'empty_quotation'}{'contents'}[0]{'contents'}[4]{'args'}[0];
-$result_trees{'empty_quotation'}{'contents'}[0]{'contents'}[4]{'args'}[0]{'parent'}
 = $result_trees{'empty_quotation'}{'contents'}[0]{'contents'}[4];
-$result_trees{'empty_quotation'}{'contents'}[0]{'contents'}[4]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'empty_quotation'}{'contents'}[0]{'contents'}[4]{'contents'}[0]{'args'}[0];
-$result_trees{'empty_quotation'}{'contents'}[0]{'contents'}[4]{'contents'}[0]{'args'}[0]{'parent'}
 = 
$result_trees{'empty_quotation'}{'contents'}[0]{'contents'}[4]{'contents'}[0];
-$result_trees{'empty_quotation'}{'contents'}[0]{'contents'}[4]{'contents'}[0]{'parent'}
 = $result_trees{'empty_quotation'}{'contents'}[0]{'contents'}[4];
-$result_trees{'empty_quotation'}{'contents'}[0]{'contents'}[4]{'extra'}{'end_command'}
 = 
$result_trees{'empty_quotation'}{'contents'}[0]{'contents'}[4]{'contents'}[0];
 $result_trees{'empty_quotation'}{'contents'}[0]{'contents'}[4]{'parent'} = 
$result_trees{'empty_quotation'}{'contents'}[0];
+$result_trees{'empty_quotation'}{'contents'}[0]{'contents'}[5]{'args'}[0]{'contents'}[0]{'args'}[0]{'parent'}
 = 
$result_trees{'empty_quotation'}{'contents'}[0]{'contents'}[5]{'args'}[0]{'contents'}[0];
+$result_trees{'empty_quotation'}{'contents'}[0]{'contents'}[5]{'args'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'empty_quotation'}{'contents'}[0]{'contents'}[5]{'args'}[0];
+$result_trees{'empty_quotation'}{'contents'}[0]{'contents'}[5]{'args'}[0]{'parent'}
 = $result_trees{'empty_quotation'}{'contents'}[0]{'contents'}[5];
+$result_trees{'empty_quotation'}{'contents'}[0]{'contents'}[5]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'empty_quotation'}{'contents'}[0]{'contents'}[5]{'contents'}[0]{'args'}[0];
+$result_trees{'empty_quotation'}{'contents'}[0]{'contents'}[5]{'contents'}[0]{'args'}[0]{'parent'}
 = 
$result_trees{'empty_quotation'}{'contents'}[0]{'contents'}[5]{'contents'}[0];
+$result_trees{'empty_quotation'}{'contents'}[0]{'contents'}[5]{'contents'}[0]{'parent'}
 = $result_trees{'empty_quotation'}{'contents'}[0]{'contents'}[5];
+$result_trees{'empty_quotation'}{'contents'}[0]{'contents'}[5]{'extra'}{'end_command'}
 = 
$result_trees{'empty_quotation'}{'contents'}[0]{'contents'}[5]{'contents'}[0];
 $result_trees{'empty_quotation'}{'contents'}[0]{'contents'}[5]{'parent'} = 
$result_trees{'empty_quotation'}{'contents'}[0];
-$result_trees{'empty_quotation'}{'contents'}[0]{'contents'}[6]{'args'}[0]{'contents'}[0]{'args'}[0]{'parent'}
 = 
$result_trees{'empty_quotation'}{'contents'}[0]{'contents'}[6]{'args'}[0]{'contents'}[0];
-$result_trees{'empty_quotation'}{'contents'}[0]{'contents'}[6]{'args'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'empty_quotation'}{'contents'}[0]{'contents'}[6]{'args'}[0];
-$result_trees{'empty_quotation'}{'contents'}[0]{'contents'}[6]{'args'}[0]{'parent'}
 = $result_trees{'empty_quotation'}{'contents'}[0]{'contents'}[6];
-$result_trees{'empty_quotation'}{'contents'}[0]{'contents'}[6]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'empty_quotation'}{'contents'}[0]{'contents'}[6]{'contents'}[0]{'args'}[0];
-$result_trees{'empty_quotation'}{'contents'}[0]{'contents'}[6]{'contents'}[0]{'args'}[0]{'parent'}
 = 
$result_trees{'empty_quotation'}{'contents'}[0]{'contents'}[6]{'contents'}[0];
-$result_trees{'empty_quotation'}{'contents'}[0]{'contents'}[6]{'contents'}[0]{'parent'}
 = $result_trees{'empty_quotation'}{'contents'}[0]{'contents'}[6];
-$result_trees{'empty_quotation'}{'contents'}[0]{'contents'}[6]{'extra'}{'end_command'}
 = 
$result_trees{'empty_quotation'}{'contents'}[0]{'contents'}[6]{'contents'}[0];
 $result_trees{'empty_quotation'}{'contents'}[0]{'contents'}[6]{'parent'} = 
$result_trees{'empty_quotation'}{'contents'}[0];
+$result_trees{'empty_quotation'}{'contents'}[0]{'contents'}[7]{'args'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'empty_quotation'}{'contents'}[0]{'contents'}[7]{'args'}[0];
+$result_trees{'empty_quotation'}{'contents'}[0]{'contents'}[7]{'args'}[0]{'parent'}
 = $result_trees{'empty_quotation'}{'contents'}[0]{'contents'}[7];
+$result_trees{'empty_quotation'}{'contents'}[0]{'contents'}[7]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'empty_quotation'}{'contents'}[0]{'contents'}[7]{'contents'}[0]{'args'}[0];
+$result_trees{'empty_quotation'}{'contents'}[0]{'contents'}[7]{'contents'}[0]{'args'}[0]{'parent'}
 = 
$result_trees{'empty_quotation'}{'contents'}[0]{'contents'}[7]{'contents'}[0];
+$result_trees{'empty_quotation'}{'contents'}[0]{'contents'}[7]{'contents'}[0]{'parent'}
 = $result_trees{'empty_quotation'}{'contents'}[0]{'contents'}[7];
+$result_trees{'empty_quotation'}{'contents'}[0]{'contents'}[7]{'extra'}{'end_command'}
 = 
$result_trees{'empty_quotation'}{'contents'}[0]{'contents'}[7]{'contents'}[0];
 $result_trees{'empty_quotation'}{'contents'}[0]{'contents'}[7]{'parent'} = 
$result_trees{'empty_quotation'}{'contents'}[0];
-$result_trees{'empty_quotation'}{'contents'}[0]{'contents'}[8]{'args'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'empty_quotation'}{'contents'}[0]{'contents'}[8]{'args'}[0];
-$result_trees{'empty_quotation'}{'contents'}[0]{'contents'}[8]{'args'}[0]{'parent'}
 = $result_trees{'empty_quotation'}{'contents'}[0]{'contents'}[8];
-$result_trees{'empty_quotation'}{'contents'}[0]{'contents'}[8]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'empty_quotation'}{'contents'}[0]{'contents'}[8]{'contents'}[0]{'args'}[0];
-$result_trees{'empty_quotation'}{'contents'}[0]{'contents'}[8]{'contents'}[0]{'args'}[0]{'parent'}
 = 
$result_trees{'empty_quotation'}{'contents'}[0]{'contents'}[8]{'contents'}[0];
-$result_trees{'empty_quotation'}{'contents'}[0]{'contents'}[8]{'contents'}[0]{'parent'}
 = $result_trees{'empty_quotation'}{'contents'}[0]{'contents'}[8];
-$result_trees{'empty_quotation'}{'contents'}[0]{'contents'}[8]{'extra'}{'end_command'}
 = 
$result_trees{'empty_quotation'}{'contents'}[0]{'contents'}[8]{'contents'}[0];
-$result_trees{'empty_quotation'}{'contents'}[0]{'contents'}[8]{'parent'} = 
$result_trees{'empty_quotation'}{'contents'}[0];
 $result_trees{'empty_quotation'}{'contents'}[0]{'parent'} = 
$result_trees{'empty_quotation'};
 
-$result_texis{'empty_quotation'} = '@setfilename empty_quotation.info
-
-@quotation
+$result_texis{'empty_quotation'} = '@quotation
 @end quotation
 
 @quotation Empty
@@ -373,7 +338,6 @@ $result_texis{'empty_quotation'} = '@setfilename 
empty_quotation.info
 
 
 $result_texts{'empty_quotation'} = '
-
 Empty
 
 
@@ -392,8 +356,7 @@ $result_converted{'plaintext'}->{'empty_quotation'} = '     
Empty:
      : ';
 
 
-$result_converted{'html_text'}->{'empty_quotation'} = '
-<blockquote>
+$result_converted{'html_text'}->{'empty_quotation'} = '<blockquote>
 </blockquote>
 
 <blockquote>
@@ -407,9 +370,7 @@ $result_converted{'html_text'}->{'empty_quotation'} = '
 ';
 
 
-$result_converted{'xml'}->{'empty_quotation'} = '<setfilename 
file="empty_quotation.info" spaces=" ">empty_quotation.info</setfilename>
-
-<quotation endspaces=" ">
+$result_converted{'xml'}->{'empty_quotation'} = '<quotation endspaces=" ">
 </quotation>
 
 <quotation spaces=" " endspaces=" "><quotationtype>Empty</quotationtype>
@@ -423,8 +384,7 @@ $result_converted{'xml'}->{'empty_quotation'} = 
'<setfilename file="empty_quotat
 ';
 
 
-$result_converted{'docbook'}->{'empty_quotation'} = '
-<blockquote></blockquote>
+$result_converted{'docbook'}->{'empty_quotation'} = '<blockquote></blockquote>
 <blockquote></blockquote>
 <blockquote></blockquote>
 <blockquote></blockquote>';
diff --git 
a/tp/t/results/quotation/empty_quotation/res_latex/empty_quotation.tex 
b/tp/t/results/quotation/empty_quotation/res_latex/empty_quotation.tex
index 43d7510ebe..232d9c4e11 100644
--- a/tp/t/results/quotation/empty_quotation/res_latex/empty_quotation.tex
+++ b/tp/t/results/quotation/empty_quotation/res_latex/empty_quotation.tex
@@ -55,7 +55,6 @@
 \makeatother
 \GNUTexinfosetsingleheader{}%
 
-
 \begin{document}
 \begin{quote}
 \end{quote}
diff --git a/tp/t/results/quotation/quotation_and_author.pl 
b/tp/t/results/quotation/quotation_and_author.pl
index 81d4bfb39a..2803264d90 100644
--- a/tp/t/results/quotation/quotation_and_author.pl
+++ b/tp/t/results/quotation/quotation_and_author.pl
@@ -10,39 +10,9 @@ $result_trees{'quotation_and_author'} = {
     {
       'contents' => [
         {
-          'args' => [
-            {
-              'contents' => [
-                {
-                  'parent' => {},
-                  'text' => 'quotation_and_author.info'
-                }
-              ],
-              'extra' => {
-                'spaces_after_argument' => '
-'
-              },
-              'parent' => {},
-              'type' => 'line_arg'
-            }
-          ],
-          'cmdname' => 'setfilename',
-          'extra' => {
-            'spaces_before_argument' => ' ',
-            'text_arg' => 'quotation_and_author.info'
-          },
-          'line_nr' => {
-            'file_name' => '',
-            'line_nr' => 1,
-            'macro' => ''
-          },
-          'parent' => {}
-        },
-        {
+          'contents' => [],
           'parent' => {},
-          'text' => '
-',
-          'type' => 'empty_line'
+          'type' => 'preamble_before_content'
         },
         {
           'contents' => [
@@ -97,7 +67,7 @@ $result_trees{'quotation_and_author'} = {
               },
               'line_nr' => {
                 'file_name' => '',
-                'line_nr' => 6,
+                'line_nr' => 4,
                 'macro' => ''
               },
               'parent' => {}
@@ -138,7 +108,7 @@ $result_trees{'quotation_and_author'} = {
               },
               'line_nr' => {
                 'file_name' => '',
-                'line_nr' => 8,
+                'line_nr' => 6,
                 'macro' => ''
               },
               'parent' => {}
@@ -152,7 +122,7 @@ $result_trees{'quotation_and_author'} = {
           },
           'line_nr' => {
             'file_name' => '',
-            'line_nr' => 5,
+            'line_nr' => 3,
             'macro' => ''
           },
           'parent' => {}
@@ -216,7 +186,7 @@ $result_trees{'quotation_and_author'} = {
               },
               'line_nr' => {
                 'file_name' => '',
-                'line_nr' => 13,
+                'line_nr' => 11,
                 'macro' => ''
               },
               'parent' => {}
@@ -257,7 +227,7 @@ $result_trees{'quotation_and_author'} = {
               },
               'line_nr' => {
                 'file_name' => '',
-                'line_nr' => 15,
+                'line_nr' => 13,
                 'macro' => ''
               },
               'parent' => {}
@@ -271,7 +241,7 @@ $result_trees{'quotation_and_author'} = {
           },
           'line_nr' => {
             'file_name' => '',
-            'line_nr' => 12,
+            'line_nr' => 10,
             'macro' => ''
           },
           'parent' => {}
@@ -325,7 +295,7 @@ $result_trees{'quotation_and_author'} = {
               },
               'line_nr' => {
                 'file_name' => '',
-                'line_nr' => 18,
+                'line_nr' => 16,
                 'macro' => ''
               },
               'parent' => {}
@@ -366,7 +336,7 @@ $result_trees{'quotation_and_author'} = {
               },
               'line_nr' => {
                 'file_name' => '',
-                'line_nr' => 20,
+                'line_nr' => 18,
                 'macro' => ''
               },
               'parent' => {}
@@ -381,7 +351,7 @@ $result_trees{'quotation_and_author'} = {
           },
           'line_nr' => {
             'file_name' => '',
-            'line_nr' => 17,
+            'line_nr' => 15,
             'macro' => ''
           },
           'parent' => {}
@@ -393,65 +363,60 @@ $result_trees{'quotation_and_author'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'quotation_and_author'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'quotation_and_author'}{'contents'}[0]{'contents'}[0]{'args'}[0];
-$result_trees{'quotation_and_author'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'parent'}
 = $result_trees{'quotation_and_author'}{'contents'}[0]{'contents'}[0];
 $result_trees{'quotation_and_author'}{'contents'}[0]{'contents'}[0]{'parent'} 
= $result_trees{'quotation_and_author'}{'contents'}[0];
+$result_trees{'quotation_and_author'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'parent'}
 = $result_trees{'quotation_and_author'}{'contents'}[0]{'contents'}[1];
 $result_trees{'quotation_and_author'}{'contents'}[0]{'contents'}[1]{'parent'} 
= $result_trees{'quotation_and_author'}{'contents'}[0];
-$result_trees{'quotation_and_author'}{'contents'}[0]{'contents'}[2]{'contents'}[0]{'parent'}
 = $result_trees{'quotation_and_author'}{'contents'}[0]{'contents'}[2];
 $result_trees{'quotation_and_author'}{'contents'}[0]{'contents'}[2]{'parent'} 
= $result_trees{'quotation_and_author'}{'contents'}[0];
+$result_trees{'quotation_and_author'}{'contents'}[0]{'contents'}[3]{'contents'}[0]{'extra'}{'command'}
 = $result_trees{'quotation_and_author'}{'contents'}[0]{'contents'}[3];
+$result_trees{'quotation_and_author'}{'contents'}[0]{'contents'}[3]{'contents'}[0]{'parent'}
 = $result_trees{'quotation_and_author'}{'contents'}[0]{'contents'}[3];
+$result_trees{'quotation_and_author'}{'contents'}[0]{'contents'}[3]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'quotation_and_author'}{'contents'}[0]{'contents'}[3]{'contents'}[1]{'args'}[0];
+$result_trees{'quotation_and_author'}{'contents'}[0]{'contents'}[3]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'quotation_and_author'}{'contents'}[0]{'contents'}[3]{'contents'}[1];
+$result_trees{'quotation_and_author'}{'contents'}[0]{'contents'}[3]{'contents'}[1]{'extra'}{'quotation'}
 = $result_trees{'quotation_and_author'}{'contents'}[0]{'contents'}[3];
+$result_trees{'quotation_and_author'}{'contents'}[0]{'contents'}[3]{'contents'}[1]{'parent'}
 = $result_trees{'quotation_and_author'}{'contents'}[0]{'contents'}[3];
+$result_trees{'quotation_and_author'}{'contents'}[0]{'contents'}[3]{'contents'}[2]{'contents'}[0]{'parent'}
 = 
$result_trees{'quotation_and_author'}{'contents'}[0]{'contents'}[3]{'contents'}[2];
+$result_trees{'quotation_and_author'}{'contents'}[0]{'contents'}[3]{'contents'}[2]{'parent'}
 = $result_trees{'quotation_and_author'}{'contents'}[0]{'contents'}[3];
+$result_trees{'quotation_and_author'}{'contents'}[0]{'contents'}[3]{'contents'}[3]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'quotation_and_author'}{'contents'}[0]{'contents'}[3]{'contents'}[3]{'args'}[0];
+$result_trees{'quotation_and_author'}{'contents'}[0]{'contents'}[3]{'contents'}[3]{'args'}[0]{'parent'}
 = 
$result_trees{'quotation_and_author'}{'contents'}[0]{'contents'}[3]{'contents'}[3];
+$result_trees{'quotation_and_author'}{'contents'}[0]{'contents'}[3]{'contents'}[3]{'parent'}
 = $result_trees{'quotation_and_author'}{'contents'}[0]{'contents'}[3];
+$result_trees{'quotation_and_author'}{'contents'}[0]{'contents'}[3]{'extra'}{'authors'}[0]
 = 
$result_trees{'quotation_and_author'}{'contents'}[0]{'contents'}[3]{'contents'}[1];
+$result_trees{'quotation_and_author'}{'contents'}[0]{'contents'}[3]{'extra'}{'end_command'}
 = 
$result_trees{'quotation_and_author'}{'contents'}[0]{'contents'}[3]{'contents'}[3];
 $result_trees{'quotation_and_author'}{'contents'}[0]{'contents'}[3]{'parent'} 
= $result_trees{'quotation_and_author'}{'contents'}[0];
-$result_trees{'quotation_and_author'}{'contents'}[0]{'contents'}[4]{'contents'}[0]{'extra'}{'command'}
 = $result_trees{'quotation_and_author'}{'contents'}[0]{'contents'}[4];
-$result_trees{'quotation_and_author'}{'contents'}[0]{'contents'}[4]{'contents'}[0]{'parent'}
 = $result_trees{'quotation_and_author'}{'contents'}[0]{'contents'}[4];
-$result_trees{'quotation_and_author'}{'contents'}[0]{'contents'}[4]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'quotation_and_author'}{'contents'}[0]{'contents'}[4]{'contents'}[1]{'args'}[0];
-$result_trees{'quotation_and_author'}{'contents'}[0]{'contents'}[4]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'quotation_and_author'}{'contents'}[0]{'contents'}[4]{'contents'}[1];
-$result_trees{'quotation_and_author'}{'contents'}[0]{'contents'}[4]{'contents'}[1]{'extra'}{'quotation'}
 = $result_trees{'quotation_and_author'}{'contents'}[0]{'contents'}[4];
-$result_trees{'quotation_and_author'}{'contents'}[0]{'contents'}[4]{'contents'}[1]{'parent'}
 = $result_trees{'quotation_and_author'}{'contents'}[0]{'contents'}[4];
-$result_trees{'quotation_and_author'}{'contents'}[0]{'contents'}[4]{'contents'}[2]{'contents'}[0]{'parent'}
 = 
$result_trees{'quotation_and_author'}{'contents'}[0]{'contents'}[4]{'contents'}[2];
-$result_trees{'quotation_and_author'}{'contents'}[0]{'contents'}[4]{'contents'}[2]{'parent'}
 = $result_trees{'quotation_and_author'}{'contents'}[0]{'contents'}[4];
-$result_trees{'quotation_and_author'}{'contents'}[0]{'contents'}[4]{'contents'}[3]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'quotation_and_author'}{'contents'}[0]{'contents'}[4]{'contents'}[3]{'args'}[0];
-$result_trees{'quotation_and_author'}{'contents'}[0]{'contents'}[4]{'contents'}[3]{'args'}[0]{'parent'}
 = 
$result_trees{'quotation_and_author'}{'contents'}[0]{'contents'}[4]{'contents'}[3];
-$result_trees{'quotation_and_author'}{'contents'}[0]{'contents'}[4]{'contents'}[3]{'parent'}
 = $result_trees{'quotation_and_author'}{'contents'}[0]{'contents'}[4];
-$result_trees{'quotation_and_author'}{'contents'}[0]{'contents'}[4]{'extra'}{'authors'}[0]
 = 
$result_trees{'quotation_and_author'}{'contents'}[0]{'contents'}[4]{'contents'}[1];
-$result_trees{'quotation_and_author'}{'contents'}[0]{'contents'}[4]{'extra'}{'end_command'}
 = 
$result_trees{'quotation_and_author'}{'contents'}[0]{'contents'}[4]{'contents'}[3];
 $result_trees{'quotation_and_author'}{'contents'}[0]{'contents'}[4]{'parent'} 
= $result_trees{'quotation_and_author'}{'contents'}[0];
+$result_trees{'quotation_and_author'}{'contents'}[0]{'contents'}[5]{'contents'}[0]{'parent'}
 = $result_trees{'quotation_and_author'}{'contents'}[0]{'contents'}[5];
 $result_trees{'quotation_and_author'}{'contents'}[0]{'contents'}[5]{'parent'} 
= $result_trees{'quotation_and_author'}{'contents'}[0];
-$result_trees{'quotation_and_author'}{'contents'}[0]{'contents'}[6]{'contents'}[0]{'parent'}
 = $result_trees{'quotation_and_author'}{'contents'}[0]{'contents'}[6];
 $result_trees{'quotation_and_author'}{'contents'}[0]{'contents'}[6]{'parent'} 
= $result_trees{'quotation_and_author'}{'contents'}[0];
+$result_trees{'quotation_and_author'}{'contents'}[0]{'contents'}[7]{'contents'}[0]{'extra'}{'command'}
 = $result_trees{'quotation_and_author'}{'contents'}[0]{'contents'}[7];
+$result_trees{'quotation_and_author'}{'contents'}[0]{'contents'}[7]{'contents'}[0]{'parent'}
 = $result_trees{'quotation_and_author'}{'contents'}[0]{'contents'}[7];
+$result_trees{'quotation_and_author'}{'contents'}[0]{'contents'}[7]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'quotation_and_author'}{'contents'}[0]{'contents'}[7]{'contents'}[1]{'args'}[0];
+$result_trees{'quotation_and_author'}{'contents'}[0]{'contents'}[7]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'quotation_and_author'}{'contents'}[0]{'contents'}[7]{'contents'}[1];
+$result_trees{'quotation_and_author'}{'contents'}[0]{'contents'}[7]{'contents'}[1]{'extra'}{'quotation'}
 = $result_trees{'quotation_and_author'}{'contents'}[0]{'contents'}[7];
+$result_trees{'quotation_and_author'}{'contents'}[0]{'contents'}[7]{'contents'}[1]{'parent'}
 = $result_trees{'quotation_and_author'}{'contents'}[0]{'contents'}[7];
+$result_trees{'quotation_and_author'}{'contents'}[0]{'contents'}[7]{'contents'}[2]{'contents'}[0]{'parent'}
 = 
$result_trees{'quotation_and_author'}{'contents'}[0]{'contents'}[7]{'contents'}[2];
+$result_trees{'quotation_and_author'}{'contents'}[0]{'contents'}[7]{'contents'}[2]{'parent'}
 = $result_trees{'quotation_and_author'}{'contents'}[0]{'contents'}[7];
+$result_trees{'quotation_and_author'}{'contents'}[0]{'contents'}[7]{'contents'}[3]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'quotation_and_author'}{'contents'}[0]{'contents'}[7]{'contents'}[3]{'args'}[0];
+$result_trees{'quotation_and_author'}{'contents'}[0]{'contents'}[7]{'contents'}[3]{'args'}[0]{'parent'}
 = 
$result_trees{'quotation_and_author'}{'contents'}[0]{'contents'}[7]{'contents'}[3];
+$result_trees{'quotation_and_author'}{'contents'}[0]{'contents'}[7]{'contents'}[3]{'parent'}
 = $result_trees{'quotation_and_author'}{'contents'}[0]{'contents'}[7];
+$result_trees{'quotation_and_author'}{'contents'}[0]{'contents'}[7]{'extra'}{'authors'}[0]
 = 
$result_trees{'quotation_and_author'}{'contents'}[0]{'contents'}[7]{'contents'}[1];
+$result_trees{'quotation_and_author'}{'contents'}[0]{'contents'}[7]{'extra'}{'end_command'}
 = 
$result_trees{'quotation_and_author'}{'contents'}[0]{'contents'}[7]{'contents'}[3];
 $result_trees{'quotation_and_author'}{'contents'}[0]{'contents'}[7]{'parent'} 
= $result_trees{'quotation_and_author'}{'contents'}[0];
-$result_trees{'quotation_and_author'}{'contents'}[0]{'contents'}[8]{'contents'}[0]{'extra'}{'command'}
 = $result_trees{'quotation_and_author'}{'contents'}[0]{'contents'}[8];
-$result_trees{'quotation_and_author'}{'contents'}[0]{'contents'}[8]{'contents'}[0]{'parent'}
 = $result_trees{'quotation_and_author'}{'contents'}[0]{'contents'}[8];
-$result_trees{'quotation_and_author'}{'contents'}[0]{'contents'}[8]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'quotation_and_author'}{'contents'}[0]{'contents'}[8]{'contents'}[1]{'args'}[0];
-$result_trees{'quotation_and_author'}{'contents'}[0]{'contents'}[8]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'quotation_and_author'}{'contents'}[0]{'contents'}[8]{'contents'}[1];
-$result_trees{'quotation_and_author'}{'contents'}[0]{'contents'}[8]{'contents'}[1]{'extra'}{'quotation'}
 = $result_trees{'quotation_and_author'}{'contents'}[0]{'contents'}[8];
-$result_trees{'quotation_and_author'}{'contents'}[0]{'contents'}[8]{'contents'}[1]{'parent'}
 = $result_trees{'quotation_and_author'}{'contents'}[0]{'contents'}[8];
-$result_trees{'quotation_and_author'}{'contents'}[0]{'contents'}[8]{'contents'}[2]{'contents'}[0]{'parent'}
 = 
$result_trees{'quotation_and_author'}{'contents'}[0]{'contents'}[8]{'contents'}[2];
-$result_trees{'quotation_and_author'}{'contents'}[0]{'contents'}[8]{'contents'}[2]{'parent'}
 = $result_trees{'quotation_and_author'}{'contents'}[0]{'contents'}[8];
-$result_trees{'quotation_and_author'}{'contents'}[0]{'contents'}[8]{'contents'}[3]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'quotation_and_author'}{'contents'}[0]{'contents'}[8]{'contents'}[3]{'args'}[0];
-$result_trees{'quotation_and_author'}{'contents'}[0]{'contents'}[8]{'contents'}[3]{'args'}[0]{'parent'}
 = 
$result_trees{'quotation_and_author'}{'contents'}[0]{'contents'}[8]{'contents'}[3];
-$result_trees{'quotation_and_author'}{'contents'}[0]{'contents'}[8]{'contents'}[3]{'parent'}
 = $result_trees{'quotation_and_author'}{'contents'}[0]{'contents'}[8];
-$result_trees{'quotation_and_author'}{'contents'}[0]{'contents'}[8]{'extra'}{'authors'}[0]
 = 
$result_trees{'quotation_and_author'}{'contents'}[0]{'contents'}[8]{'contents'}[1];
-$result_trees{'quotation_and_author'}{'contents'}[0]{'contents'}[8]{'extra'}{'end_command'}
 = 
$result_trees{'quotation_and_author'}{'contents'}[0]{'contents'}[8]{'contents'}[3];
 $result_trees{'quotation_and_author'}{'contents'}[0]{'contents'}[8]{'parent'} 
= $result_trees{'quotation_and_author'}{'contents'}[0];
+$result_trees{'quotation_and_author'}{'contents'}[0]{'contents'}[9]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'quotation_and_author'}{'contents'}[0]{'contents'}[9]{'args'}[0];
+$result_trees{'quotation_and_author'}{'contents'}[0]{'contents'}[9]{'args'}[0]{'parent'}
 = $result_trees{'quotation_and_author'}{'contents'}[0]{'contents'}[9];
+$result_trees{'quotation_and_author'}{'contents'}[0]{'contents'}[9]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'quotation_and_author'}{'contents'}[0]{'contents'}[9]{'contents'}[0]{'args'}[0];
+$result_trees{'quotation_and_author'}{'contents'}[0]{'contents'}[9]{'contents'}[0]{'args'}[0]{'parent'}
 = 
$result_trees{'quotation_and_author'}{'contents'}[0]{'contents'}[9]{'contents'}[0];
+$result_trees{'quotation_and_author'}{'contents'}[0]{'contents'}[9]{'contents'}[0]{'extra'}{'quotation'}
 = $result_trees{'quotation_and_author'}{'contents'}[0]{'contents'}[9];
+$result_trees{'quotation_and_author'}{'contents'}[0]{'contents'}[9]{'contents'}[0]{'parent'}
 = $result_trees{'quotation_and_author'}{'contents'}[0]{'contents'}[9];
+$result_trees{'quotation_and_author'}{'contents'}[0]{'contents'}[9]{'contents'}[1]{'contents'}[0]{'parent'}
 = 
$result_trees{'quotation_and_author'}{'contents'}[0]{'contents'}[9]{'contents'}[1];
+$result_trees{'quotation_and_author'}{'contents'}[0]{'contents'}[9]{'contents'}[1]{'parent'}
 = $result_trees{'quotation_and_author'}{'contents'}[0]{'contents'}[9];
+$result_trees{'quotation_and_author'}{'contents'}[0]{'contents'}[9]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'quotation_and_author'}{'contents'}[0]{'contents'}[9]{'contents'}[2]{'args'}[0];
+$result_trees{'quotation_and_author'}{'contents'}[0]{'contents'}[9]{'contents'}[2]{'args'}[0]{'parent'}
 = 
$result_trees{'quotation_and_author'}{'contents'}[0]{'contents'}[9]{'contents'}[2];
+$result_trees{'quotation_and_author'}{'contents'}[0]{'contents'}[9]{'contents'}[2]{'parent'}
 = $result_trees{'quotation_and_author'}{'contents'}[0]{'contents'}[9];
+$result_trees{'quotation_and_author'}{'contents'}[0]{'contents'}[9]{'extra'}{'authors'}[0]
 = 
$result_trees{'quotation_and_author'}{'contents'}[0]{'contents'}[9]{'contents'}[0];
+$result_trees{'quotation_and_author'}{'contents'}[0]{'contents'}[9]{'extra'}{'end_command'}
 = 
$result_trees{'quotation_and_author'}{'contents'}[0]{'contents'}[9]{'contents'}[2];
 $result_trees{'quotation_and_author'}{'contents'}[0]{'contents'}[9]{'parent'} 
= $result_trees{'quotation_and_author'}{'contents'}[0];
-$result_trees{'quotation_and_author'}{'contents'}[0]{'contents'}[10]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'quotation_and_author'}{'contents'}[0]{'contents'}[10]{'args'}[0];
-$result_trees{'quotation_and_author'}{'contents'}[0]{'contents'}[10]{'args'}[0]{'parent'}
 = $result_trees{'quotation_and_author'}{'contents'}[0]{'contents'}[10];
-$result_trees{'quotation_and_author'}{'contents'}[0]{'contents'}[10]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'quotation_and_author'}{'contents'}[0]{'contents'}[10]{'contents'}[0]{'args'}[0];
-$result_trees{'quotation_and_author'}{'contents'}[0]{'contents'}[10]{'contents'}[0]{'args'}[0]{'parent'}
 = 
$result_trees{'quotation_and_author'}{'contents'}[0]{'contents'}[10]{'contents'}[0];
-$result_trees{'quotation_and_author'}{'contents'}[0]{'contents'}[10]{'contents'}[0]{'extra'}{'quotation'}
 = $result_trees{'quotation_and_author'}{'contents'}[0]{'contents'}[10];
-$result_trees{'quotation_and_author'}{'contents'}[0]{'contents'}[10]{'contents'}[0]{'parent'}
 = $result_trees{'quotation_and_author'}{'contents'}[0]{'contents'}[10];
-$result_trees{'quotation_and_author'}{'contents'}[0]{'contents'}[10]{'contents'}[1]{'contents'}[0]{'parent'}
 = 
$result_trees{'quotation_and_author'}{'contents'}[0]{'contents'}[10]{'contents'}[1];
-$result_trees{'quotation_and_author'}{'contents'}[0]{'contents'}[10]{'contents'}[1]{'parent'}
 = $result_trees{'quotation_and_author'}{'contents'}[0]{'contents'}[10];
-$result_trees{'quotation_and_author'}{'contents'}[0]{'contents'}[10]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'quotation_and_author'}{'contents'}[0]{'contents'}[10]{'contents'}[2]{'args'}[0];
-$result_trees{'quotation_and_author'}{'contents'}[0]{'contents'}[10]{'contents'}[2]{'args'}[0]{'parent'}
 = 
$result_trees{'quotation_and_author'}{'contents'}[0]{'contents'}[10]{'contents'}[2];
-$result_trees{'quotation_and_author'}{'contents'}[0]{'contents'}[10]{'contents'}[2]{'parent'}
 = $result_trees{'quotation_and_author'}{'contents'}[0]{'contents'}[10];
-$result_trees{'quotation_and_author'}{'contents'}[0]{'contents'}[10]{'extra'}{'authors'}[0]
 = 
$result_trees{'quotation_and_author'}{'contents'}[0]{'contents'}[10]{'contents'}[0];
-$result_trees{'quotation_and_author'}{'contents'}[0]{'contents'}[10]{'extra'}{'end_command'}
 = 
$result_trees{'quotation_and_author'}{'contents'}[0]{'contents'}[10]{'contents'}[2];
-$result_trees{'quotation_and_author'}{'contents'}[0]{'contents'}[10]{'parent'} 
= $result_trees{'quotation_and_author'}{'contents'}[0];
 $result_trees{'quotation_and_author'}{'contents'}[0]{'parent'} = 
$result_trees{'quotation_and_author'};
 
-$result_texis{'quotation_and_author'} = '@setfilename quotation_and_author.info
-
-Text before quotation
+$result_texis{'quotation_and_author'} = 'Text before quotation
 
 @quotation 
 @author Some One
@@ -472,8 +437,7 @@ A Note
 ';
 
 
-$result_texts{'quotation_and_author'} = '
-Text before quotation
+$result_texts{'quotation_and_author'} = 'Text before quotation
 
 Some One
 A quot--ation
@@ -510,8 +474,7 @@ $result_converted{'plaintext'}->{'quotation_and_author'} = 
'Text before quotatio
 ';
 
 
-$result_converted{'html_text'}->{'quotation_and_author'} = '
-<p>Text before quotation
+$result_converted{'html_text'}->{'quotation_and_author'} = '<p>Text before 
quotation
 </p>
 <blockquote>
 <p>A quot&mdash;ation
@@ -532,9 +495,7 @@ $result_converted{'html_text'}->{'quotation_and_author'} = '
 </div>';
 
 
-$result_converted{'xml'}->{'quotation_and_author'} = '<setfilename 
file="quotation_and_author.info" spaces=" 
">quotation_and_author.info</setfilename>
-
-<para>Text before quotation
+$result_converted{'xml'}->{'quotation_and_author'} = '<para>Text before 
quotation
 </para>
 <quotation endspaces=" "> 
 <author spaces=" ">Some One</author>
@@ -555,8 +516,7 @@ $result_converted{'xml'}->{'quotation_and_author'} = 
'<setfilename file="quotati
 ';
 
 
-$result_converted{'docbook'}->{'quotation_and_author'} = '
-<para>Text before quotation
+$result_converted{'docbook'}->{'quotation_and_author'} = '<para>Text before 
quotation
 </para>
 <blockquote><attribution>Some One</attribution>
 <para>A quot&#8212;ation
diff --git 
a/tp/t/results/quotation/quotation_and_author/res_latex/quotation_and_author.tex
 
b/tp/t/results/quotation/quotation_and_author/res_latex/quotation_and_author.tex
index 2691f432ba..f7edf053cb 100644
--- 
a/tp/t/results/quotation/quotation_and_author/res_latex/quotation_and_author.tex
+++ 
b/tp/t/results/quotation/quotation_and_author/res_latex/quotation_and_author.tex
@@ -55,7 +55,6 @@
 \makeatother
 \GNUTexinfosetsingleheader{}%
 
-
 \begin{document}
 Text before quotation
 
diff --git a/tp/t/results/quotation/quotation_author_in_example.pl 
b/tp/t/results/quotation/quotation_author_in_example.pl
index 936c898000..9b665635c1 100644
--- a/tp/t/results/quotation/quotation_author_in_example.pl
+++ b/tp/t/results/quotation/quotation_author_in_example.pl
@@ -10,39 +10,9 @@ $result_trees{'quotation_author_in_example'} = {
     {
       'contents' => [
         {
-          'args' => [
-            {
-              'contents' => [
-                {
-                  'parent' => {},
-                  'text' => 'quotation_author_in_example.info'
-                }
-              ],
-              'extra' => {
-                'spaces_after_argument' => '
-'
-              },
-              'parent' => {},
-              'type' => 'line_arg'
-            }
-          ],
-          'cmdname' => 'setfilename',
-          'extra' => {
-            'spaces_before_argument' => ' ',
-            'text_arg' => 'quotation_author_in_example.info'
-          },
-          'line_nr' => {
-            'file_name' => '',
-            'line_nr' => 1,
-            'macro' => ''
-          },
-          'parent' => {}
-        },
-        {
+          'contents' => [],
           'parent' => {},
-          'text' => '
-',
-          'type' => 'empty_line'
+          'type' => 'preamble_before_content'
         },
         {
           'cmdname' => 'example',
@@ -94,7 +64,7 @@ $result_trees{'quotation_author_in_example'} = {
                       },
                       'line_nr' => {
                         'file_name' => '',
-                        'line_nr' => 5,
+                        'line_nr' => 3,
                         'macro' => ''
                       },
                       'parent' => {}
@@ -133,7 +103,7 @@ $result_trees{'quotation_author_in_example'} = {
                   },
                   'line_nr' => {
                     'file_name' => '',
-                    'line_nr' => 7,
+                    'line_nr' => 5,
                     'macro' => ''
                   },
                   'parent' => {}
@@ -147,7 +117,7 @@ $result_trees{'quotation_author_in_example'} = {
               },
               'line_nr' => {
                 'file_name' => '',
-                'line_nr' => 4,
+                'line_nr' => 2,
                 'macro' => ''
               },
               'parent' => {}
@@ -177,7 +147,7 @@ $result_trees{'quotation_author_in_example'} = {
               },
               'line_nr' => {
                 'file_name' => '',
-                'line_nr' => 8,
+                'line_nr' => 6,
                 'macro' => ''
               },
               'parent' => {}
@@ -188,7 +158,7 @@ $result_trees{'quotation_author_in_example'} = {
           },
           'line_nr' => {
             'file_name' => '',
-            'line_nr' => 3,
+            'line_nr' => 1,
             'macro' => ''
           },
           'parent' => {}
@@ -200,36 +170,31 @@ $result_trees{'quotation_author_in_example'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'quotation_author_in_example'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'quotation_author_in_example'}{'contents'}[0]{'contents'}[0]{'args'}[0];
-$result_trees{'quotation_author_in_example'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'parent'}
 = $result_trees{'quotation_author_in_example'}{'contents'}[0]{'contents'}[0];
 
$result_trees{'quotation_author_in_example'}{'contents'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'quotation_author_in_example'}{'contents'}[0];
+$result_trees{'quotation_author_in_example'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'extra'}{'command'}
 = $result_trees{'quotation_author_in_example'}{'contents'}[0]{'contents'}[1];
+$result_trees{'quotation_author_in_example'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'parent'}
 = $result_trees{'quotation_author_in_example'}{'contents'}[0]{'contents'}[1];
+$result_trees{'quotation_author_in_example'}{'contents'}[0]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'extra'}{'command'}
 = 
$result_trees{'quotation_author_in_example'}{'contents'}[0]{'contents'}[1]{'contents'}[1];
+$result_trees{'quotation_author_in_example'}{'contents'}[0]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'parent'}
 = 
$result_trees{'quotation_author_in_example'}{'contents'}[0]{'contents'}[1]{'contents'}[1];
+$result_trees{'quotation_author_in_example'}{'contents'}[0]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'quotation_author_in_example'}{'contents'}[0]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'args'}[0];
+$result_trees{'quotation_author_in_example'}{'contents'}[0]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'args'}[0]{'parent'}
 = 
$result_trees{'quotation_author_in_example'}{'contents'}[0]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[0];
+$result_trees{'quotation_author_in_example'}{'contents'}[0]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'extra'}{'quotation'}
 = 
$result_trees{'quotation_author_in_example'}{'contents'}[0]{'contents'}[1]{'contents'}[1];
+$result_trees{'quotation_author_in_example'}{'contents'}[0]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'parent'}
 = 
$result_trees{'quotation_author_in_example'}{'contents'}[0]{'contents'}[1]{'contents'}[1]{'contents'}[1];
+$result_trees{'quotation_author_in_example'}{'contents'}[0]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'parent'}
 = 
$result_trees{'quotation_author_in_example'}{'contents'}[0]{'contents'}[1]{'contents'}[1]{'contents'}[1];
+$result_trees{'quotation_author_in_example'}{'contents'}[0]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'parent'}
 = 
$result_trees{'quotation_author_in_example'}{'contents'}[0]{'contents'}[1]{'contents'}[1];
+$result_trees{'quotation_author_in_example'}{'contents'}[0]{'contents'}[1]{'contents'}[1]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'quotation_author_in_example'}{'contents'}[0]{'contents'}[1]{'contents'}[1]{'contents'}[2]{'args'}[0];
+$result_trees{'quotation_author_in_example'}{'contents'}[0]{'contents'}[1]{'contents'}[1]{'contents'}[2]{'args'}[0]{'parent'}
 = 
$result_trees{'quotation_author_in_example'}{'contents'}[0]{'contents'}[1]{'contents'}[1]{'contents'}[2];
+$result_trees{'quotation_author_in_example'}{'contents'}[0]{'contents'}[1]{'contents'}[1]{'contents'}[2]{'parent'}
 = 
$result_trees{'quotation_author_in_example'}{'contents'}[0]{'contents'}[1]{'contents'}[1];
+$result_trees{'quotation_author_in_example'}{'contents'}[0]{'contents'}[1]{'contents'}[1]{'extra'}{'authors'}[0]
 = 
$result_trees{'quotation_author_in_example'}{'contents'}[0]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[0];
+$result_trees{'quotation_author_in_example'}{'contents'}[0]{'contents'}[1]{'contents'}[1]{'extra'}{'end_command'}
 = 
$result_trees{'quotation_author_in_example'}{'contents'}[0]{'contents'}[1]{'contents'}[1]{'contents'}[2];
+$result_trees{'quotation_author_in_example'}{'contents'}[0]{'contents'}[1]{'contents'}[1]{'parent'}
 = $result_trees{'quotation_author_in_example'}{'contents'}[0]{'contents'}[1];
+$result_trees{'quotation_author_in_example'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'quotation_author_in_example'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'args'}[0];
+$result_trees{'quotation_author_in_example'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'args'}[0]{'parent'}
 = 
$result_trees{'quotation_author_in_example'}{'contents'}[0]{'contents'}[1]{'contents'}[2];
+$result_trees{'quotation_author_in_example'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'parent'}
 = $result_trees{'quotation_author_in_example'}{'contents'}[0]{'contents'}[1];
+$result_trees{'quotation_author_in_example'}{'contents'}[0]{'contents'}[1]{'extra'}{'end_command'}
 = 
$result_trees{'quotation_author_in_example'}{'contents'}[0]{'contents'}[1]{'contents'}[2];
 
$result_trees{'quotation_author_in_example'}{'contents'}[0]{'contents'}[1]{'parent'}
 = $result_trees{'quotation_author_in_example'}{'contents'}[0];
-$result_trees{'quotation_author_in_example'}{'contents'}[0]{'contents'}[2]{'contents'}[0]{'extra'}{'command'}
 = $result_trees{'quotation_author_in_example'}{'contents'}[0]{'contents'}[2];
-$result_trees{'quotation_author_in_example'}{'contents'}[0]{'contents'}[2]{'contents'}[0]{'parent'}
 = $result_trees{'quotation_author_in_example'}{'contents'}[0]{'contents'}[2];
-$result_trees{'quotation_author_in_example'}{'contents'}[0]{'contents'}[2]{'contents'}[1]{'contents'}[0]{'extra'}{'command'}
 = 
$result_trees{'quotation_author_in_example'}{'contents'}[0]{'contents'}[2]{'contents'}[1];
-$result_trees{'quotation_author_in_example'}{'contents'}[0]{'contents'}[2]{'contents'}[1]{'contents'}[0]{'parent'}
 = 
$result_trees{'quotation_author_in_example'}{'contents'}[0]{'contents'}[2]{'contents'}[1];
-$result_trees{'quotation_author_in_example'}{'contents'}[0]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'quotation_author_in_example'}{'contents'}[0]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'args'}[0];
-$result_trees{'quotation_author_in_example'}{'contents'}[0]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'args'}[0]{'parent'}
 = 
$result_trees{'quotation_author_in_example'}{'contents'}[0]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[0];
-$result_trees{'quotation_author_in_example'}{'contents'}[0]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'extra'}{'quotation'}
 = 
$result_trees{'quotation_author_in_example'}{'contents'}[0]{'contents'}[2]{'contents'}[1];
-$result_trees{'quotation_author_in_example'}{'contents'}[0]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'parent'}
 = 
$result_trees{'quotation_author_in_example'}{'contents'}[0]{'contents'}[2]{'contents'}[1]{'contents'}[1];
-$result_trees{'quotation_author_in_example'}{'contents'}[0]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'parent'}
 = 
$result_trees{'quotation_author_in_example'}{'contents'}[0]{'contents'}[2]{'contents'}[1]{'contents'}[1];
-$result_trees{'quotation_author_in_example'}{'contents'}[0]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'parent'}
 = 
$result_trees{'quotation_author_in_example'}{'contents'}[0]{'contents'}[2]{'contents'}[1];
-$result_trees{'quotation_author_in_example'}{'contents'}[0]{'contents'}[2]{'contents'}[1]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'quotation_author_in_example'}{'contents'}[0]{'contents'}[2]{'contents'}[1]{'contents'}[2]{'args'}[0];
-$result_trees{'quotation_author_in_example'}{'contents'}[0]{'contents'}[2]{'contents'}[1]{'contents'}[2]{'args'}[0]{'parent'}
 = 
$result_trees{'quotation_author_in_example'}{'contents'}[0]{'contents'}[2]{'contents'}[1]{'contents'}[2];
-$result_trees{'quotation_author_in_example'}{'contents'}[0]{'contents'}[2]{'contents'}[1]{'contents'}[2]{'parent'}
 = 
$result_trees{'quotation_author_in_example'}{'contents'}[0]{'contents'}[2]{'contents'}[1];
-$result_trees{'quotation_author_in_example'}{'contents'}[0]{'contents'}[2]{'contents'}[1]{'extra'}{'authors'}[0]
 = 
$result_trees{'quotation_author_in_example'}{'contents'}[0]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[0];
-$result_trees{'quotation_author_in_example'}{'contents'}[0]{'contents'}[2]{'contents'}[1]{'extra'}{'end_command'}
 = 
$result_trees{'quotation_author_in_example'}{'contents'}[0]{'contents'}[2]{'contents'}[1]{'contents'}[2];
-$result_trees{'quotation_author_in_example'}{'contents'}[0]{'contents'}[2]{'contents'}[1]{'parent'}
 = $result_trees{'quotation_author_in_example'}{'contents'}[0]{'contents'}[2];
-$result_trees{'quotation_author_in_example'}{'contents'}[0]{'contents'}[2]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'quotation_author_in_example'}{'contents'}[0]{'contents'}[2]{'contents'}[2]{'args'}[0];
-$result_trees{'quotation_author_in_example'}{'contents'}[0]{'contents'}[2]{'contents'}[2]{'args'}[0]{'parent'}
 = 
$result_trees{'quotation_author_in_example'}{'contents'}[0]{'contents'}[2]{'contents'}[2];
-$result_trees{'quotation_author_in_example'}{'contents'}[0]{'contents'}[2]{'contents'}[2]{'parent'}
 = $result_trees{'quotation_author_in_example'}{'contents'}[0]{'contents'}[2];
-$result_trees{'quotation_author_in_example'}{'contents'}[0]{'contents'}[2]{'extra'}{'end_command'}
 = 
$result_trees{'quotation_author_in_example'}{'contents'}[0]{'contents'}[2]{'contents'}[2];
-$result_trees{'quotation_author_in_example'}{'contents'}[0]{'contents'}[2]{'parent'}
 = $result_trees{'quotation_author_in_example'}{'contents'}[0];
 $result_trees{'quotation_author_in_example'}{'contents'}[0]{'parent'} = 
$result_trees{'quotation_author_in_example'};
 
-$result_texis{'quotation_author_in_example'} = '@setfilename 
quotation_author_in_example.info
-
-@example
+$result_texis{'quotation_author_in_example'} = '@example
 @quotation 
 @author Some One
 A quot---ation
@@ -238,8 +203,7 @@ A quot---ation
 ';
 
 
-$result_texts{'quotation_author_in_example'} = '
-Some One
+$result_texts{'quotation_author_in_example'} = 'Some One
 A quot---ation
 ';
 
@@ -255,8 +219,7 @@ 
$result_converted{'plaintext'}->{'quotation_author_in_example'} = '          A q
 ';
 
 
-$result_converted{'html_text'}->{'quotation_author_in_example'} = '
-<div class="example">
+$result_converted{'html_text'}->{'quotation_author_in_example'} = '<div 
class="example">
 <blockquote>
 <pre class="example">A quot---ation
 </pre></blockquote>
@@ -265,9 +228,7 @@ 
$result_converted{'html_text'}->{'quotation_author_in_example'} = '
 ';
 
 
-$result_converted{'xml'}->{'quotation_author_in_example'} = '<setfilename 
file="quotation_author_in_example.info" spaces=" 
">quotation_author_in_example.info</setfilename>
-
-<example endspaces=" ">
+$result_converted{'xml'}->{'quotation_author_in_example'} = '<example 
endspaces=" ">
 <quotation endspaces=" "> 
 <pre xml:space="preserve"><author spaces=" ">Some One</author>
 A quot---ation
@@ -276,8 +237,7 @@ A quot---ation
 ';
 
 
-$result_converted{'docbook'}->{'quotation_author_in_example'} = '
-<blockquote><attribution>Some One</attribution>
+$result_converted{'docbook'}->{'quotation_author_in_example'} = 
'<blockquote><attribution>Some One</attribution>
 <screen>A quot---ation
 </screen></blockquote>';
 
diff --git 
a/tp/t/results/quotation/quotation_author_in_example/res_latex/quotation_author_in_example.tex
 
b/tp/t/results/quotation/quotation_author_in_example/res_latex/quotation_author_in_example.tex
index bfddfae335..456f476398 100644
--- 
a/tp/t/results/quotation/quotation_author_in_example/res_latex/quotation_author_in_example.tex
+++ 
b/tp/t/results/quotation/quotation_author_in_example/res_latex/quotation_author_in_example.tex
@@ -55,7 +55,6 @@
 \makeatother
 \GNUTexinfosetsingleheader{}%
 
-
 \begin{document}
 
\par\begingroup\obeylines\obeyspaces\frenchspacing\leftskip=2em\relax\parskip=0pt\relax\ttfamily{}%
 \begin{quote}
diff --git a/tp/t/results/quotation/space_at_commands_end_quotation_line.pl 
b/tp/t/results/quotation/space_at_commands_end_quotation_line.pl
index 286d3a463f..32c51caec5 100644
--- a/tp/t/results/quotation/space_at_commands_end_quotation_line.pl
+++ b/tp/t/results/quotation/space_at_commands_end_quotation_line.pl
@@ -10,39 +10,9 @@ $result_trees{'space_at_commands_end_quotation_line'} = {
     {
       'contents' => [
         {
-          'args' => [
-            {
-              'contents' => [
-                {
-                  'parent' => {},
-                  'text' => 'space_at_commands_end_quotation_line.info'
-                }
-              ],
-              'extra' => {
-                'spaces_after_argument' => '
-'
-              },
-              'parent' => {},
-              'type' => 'line_arg'
-            }
-          ],
-          'cmdname' => 'setfilename',
-          'extra' => {
-            'spaces_before_argument' => ' ',
-            'text_arg' => 'space_at_commands_end_quotation_line.info'
-          },
-          'line_nr' => {
-            'file_name' => '',
-            'line_nr' => 1,
-            'macro' => ''
-          },
-          'parent' => {}
-        },
-        {
+          'contents' => [],
           'parent' => {},
-          'text' => '
-',
-          'type' => 'empty_line'
+          'type' => 'preamble_before_content'
         },
         {
           'args' => [
@@ -120,7 +90,7 @@ $result_trees{'space_at_commands_end_quotation_line'} = {
               },
               'line_nr' => {
                 'file_name' => '',
-                'line_nr' => 5,
+                'line_nr' => 3,
                 'macro' => ''
               },
               'parent' => {}
@@ -132,7 +102,7 @@ $result_trees{'space_at_commands_end_quotation_line'} = {
           },
           'line_nr' => {
             'file_name' => '',
-            'line_nr' => 3,
+            'line_nr' => 1,
             'macro' => ''
           },
           'parent' => {}
@@ -230,7 +200,7 @@ $result_trees{'space_at_commands_end_quotation_line'} = {
               },
               'line_nr' => {
                 'file_name' => '',
-                'line_nr' => 9,
+                'line_nr' => 7,
                 'macro' => ''
               },
               'parent' => {}
@@ -242,7 +212,7 @@ $result_trees{'space_at_commands_end_quotation_line'} = {
           },
           'line_nr' => {
             'file_name' => '',
-            'line_nr' => 7,
+            'line_nr' => 5,
             'macro' => ''
           },
           'parent' => {}
@@ -254,48 +224,43 @@ $result_trees{'space_at_commands_end_quotation_line'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'space_at_commands_end_quotation_line'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'space_at_commands_end_quotation_line'}{'contents'}[0]{'contents'}[0]{'args'}[0];
-$result_trees{'space_at_commands_end_quotation_line'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'parent'}
 = 
$result_trees{'space_at_commands_end_quotation_line'}{'contents'}[0]{'contents'}[0];
 
$result_trees{'space_at_commands_end_quotation_line'}{'contents'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'space_at_commands_end_quotation_line'}{'contents'}[0];
+$result_trees{'space_at_commands_end_quotation_line'}{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'space_at_commands_end_quotation_line'}{'contents'}[0]{'contents'}[1]{'args'}[0];
+$result_trees{'space_at_commands_end_quotation_line'}{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[1]{'parent'}
 = 
$result_trees{'space_at_commands_end_quotation_line'}{'contents'}[0]{'contents'}[1]{'args'}[0];
+$result_trees{'space_at_commands_end_quotation_line'}{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[2]{'parent'}
 = 
$result_trees{'space_at_commands_end_quotation_line'}{'contents'}[0]{'contents'}[1]{'args'}[0];
+$result_trees{'space_at_commands_end_quotation_line'}{'contents'}[0]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'space_at_commands_end_quotation_line'}{'contents'}[0]{'contents'}[1];
+$result_trees{'space_at_commands_end_quotation_line'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'space_at_commands_end_quotation_line'}{'contents'}[0]{'contents'}[1]{'contents'}[0];
+$result_trees{'space_at_commands_end_quotation_line'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'parent'}
 = 
$result_trees{'space_at_commands_end_quotation_line'}{'contents'}[0]{'contents'}[1]{'contents'}[0];
+$result_trees{'space_at_commands_end_quotation_line'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[2]{'parent'}
 = 
$result_trees{'space_at_commands_end_quotation_line'}{'contents'}[0]{'contents'}[1]{'contents'}[0];
+$result_trees{'space_at_commands_end_quotation_line'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[3]{'parent'}
 = 
$result_trees{'space_at_commands_end_quotation_line'}{'contents'}[0]{'contents'}[1]{'contents'}[0];
+$result_trees{'space_at_commands_end_quotation_line'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[4]{'parent'}
 = 
$result_trees{'space_at_commands_end_quotation_line'}{'contents'}[0]{'contents'}[1]{'contents'}[0];
+$result_trees{'space_at_commands_end_quotation_line'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'parent'}
 = 
$result_trees{'space_at_commands_end_quotation_line'}{'contents'}[0]{'contents'}[1];
+$result_trees{'space_at_commands_end_quotation_line'}{'contents'}[0]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'space_at_commands_end_quotation_line'}{'contents'}[0]{'contents'}[1]{'contents'}[1]{'args'}[0];
+$result_trees{'space_at_commands_end_quotation_line'}{'contents'}[0]{'contents'}[1]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'space_at_commands_end_quotation_line'}{'contents'}[0]{'contents'}[1]{'contents'}[1];
+$result_trees{'space_at_commands_end_quotation_line'}{'contents'}[0]{'contents'}[1]{'contents'}[1]{'parent'}
 = 
$result_trees{'space_at_commands_end_quotation_line'}{'contents'}[0]{'contents'}[1];
+$result_trees{'space_at_commands_end_quotation_line'}{'contents'}[0]{'contents'}[1]{'extra'}{'end_command'}
 = 
$result_trees{'space_at_commands_end_quotation_line'}{'contents'}[0]{'contents'}[1]{'contents'}[1];
 
$result_trees{'space_at_commands_end_quotation_line'}{'contents'}[0]{'contents'}[1]{'parent'}
 = $result_trees{'space_at_commands_end_quotation_line'}{'contents'}[0];
-$result_trees{'space_at_commands_end_quotation_line'}{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'space_at_commands_end_quotation_line'}{'contents'}[0]{'contents'}[2]{'args'}[0];
-$result_trees{'space_at_commands_end_quotation_line'}{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[1]{'parent'}
 = 
$result_trees{'space_at_commands_end_quotation_line'}{'contents'}[0]{'contents'}[2]{'args'}[0];
-$result_trees{'space_at_commands_end_quotation_line'}{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[2]{'parent'}
 = 
$result_trees{'space_at_commands_end_quotation_line'}{'contents'}[0]{'contents'}[2]{'args'}[0];
-$result_trees{'space_at_commands_end_quotation_line'}{'contents'}[0]{'contents'}[2]{'args'}[0]{'parent'}
 = 
$result_trees{'space_at_commands_end_quotation_line'}{'contents'}[0]{'contents'}[2];
-$result_trees{'space_at_commands_end_quotation_line'}{'contents'}[0]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'space_at_commands_end_quotation_line'}{'contents'}[0]{'contents'}[2]{'contents'}[0];
-$result_trees{'space_at_commands_end_quotation_line'}{'contents'}[0]{'contents'}[2]{'contents'}[0]{'contents'}[1]{'parent'}
 = 
$result_trees{'space_at_commands_end_quotation_line'}{'contents'}[0]{'contents'}[2]{'contents'}[0];
-$result_trees{'space_at_commands_end_quotation_line'}{'contents'}[0]{'contents'}[2]{'contents'}[0]{'contents'}[2]{'parent'}
 = 
$result_trees{'space_at_commands_end_quotation_line'}{'contents'}[0]{'contents'}[2]{'contents'}[0];
-$result_trees{'space_at_commands_end_quotation_line'}{'contents'}[0]{'contents'}[2]{'contents'}[0]{'contents'}[3]{'parent'}
 = 
$result_trees{'space_at_commands_end_quotation_line'}{'contents'}[0]{'contents'}[2]{'contents'}[0];
-$result_trees{'space_at_commands_end_quotation_line'}{'contents'}[0]{'contents'}[2]{'contents'}[0]{'contents'}[4]{'parent'}
 = 
$result_trees{'space_at_commands_end_quotation_line'}{'contents'}[0]{'contents'}[2]{'contents'}[0];
-$result_trees{'space_at_commands_end_quotation_line'}{'contents'}[0]{'contents'}[2]{'contents'}[0]{'parent'}
 = 
$result_trees{'space_at_commands_end_quotation_line'}{'contents'}[0]{'contents'}[2];
-$result_trees{'space_at_commands_end_quotation_line'}{'contents'}[0]{'contents'}[2]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'space_at_commands_end_quotation_line'}{'contents'}[0]{'contents'}[2]{'contents'}[1]{'args'}[0];
-$result_trees{'space_at_commands_end_quotation_line'}{'contents'}[0]{'contents'}[2]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'space_at_commands_end_quotation_line'}{'contents'}[0]{'contents'}[2]{'contents'}[1];
-$result_trees{'space_at_commands_end_quotation_line'}{'contents'}[0]{'contents'}[2]{'contents'}[1]{'parent'}
 = 
$result_trees{'space_at_commands_end_quotation_line'}{'contents'}[0]{'contents'}[2];
-$result_trees{'space_at_commands_end_quotation_line'}{'contents'}[0]{'contents'}[2]{'extra'}{'end_command'}
 = 
$result_trees{'space_at_commands_end_quotation_line'}{'contents'}[0]{'contents'}[2]{'contents'}[1];
 
$result_trees{'space_at_commands_end_quotation_line'}{'contents'}[0]{'contents'}[2]{'parent'}
 = $result_trees{'space_at_commands_end_quotation_line'}{'contents'}[0];
+$result_trees{'space_at_commands_end_quotation_line'}{'contents'}[0]{'contents'}[3]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'space_at_commands_end_quotation_line'}{'contents'}[0]{'contents'}[3]{'args'}[0];
+$result_trees{'space_at_commands_end_quotation_line'}{'contents'}[0]{'contents'}[3]{'args'}[0]{'contents'}[1]{'parent'}
 = 
$result_trees{'space_at_commands_end_quotation_line'}{'contents'}[0]{'contents'}[3]{'args'}[0];
+$result_trees{'space_at_commands_end_quotation_line'}{'contents'}[0]{'contents'}[3]{'args'}[0]{'contents'}[2]{'parent'}
 = 
$result_trees{'space_at_commands_end_quotation_line'}{'contents'}[0]{'contents'}[3]{'args'}[0];
+$result_trees{'space_at_commands_end_quotation_line'}{'contents'}[0]{'contents'}[3]{'args'}[0]{'contents'}[3]{'parent'}
 = 
$result_trees{'space_at_commands_end_quotation_line'}{'contents'}[0]{'contents'}[3]{'args'}[0];
+$result_trees{'space_at_commands_end_quotation_line'}{'contents'}[0]{'contents'}[3]{'args'}[0]{'parent'}
 = 
$result_trees{'space_at_commands_end_quotation_line'}{'contents'}[0]{'contents'}[3];
+$result_trees{'space_at_commands_end_quotation_line'}{'contents'}[0]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'space_at_commands_end_quotation_line'}{'contents'}[0]{'contents'}[3]{'contents'}[0];
+$result_trees{'space_at_commands_end_quotation_line'}{'contents'}[0]{'contents'}[3]{'contents'}[0]{'contents'}[1]{'parent'}
 = 
$result_trees{'space_at_commands_end_quotation_line'}{'contents'}[0]{'contents'}[3]{'contents'}[0];
+$result_trees{'space_at_commands_end_quotation_line'}{'contents'}[0]{'contents'}[3]{'contents'}[0]{'contents'}[2]{'parent'}
 = 
$result_trees{'space_at_commands_end_quotation_line'}{'contents'}[0]{'contents'}[3]{'contents'}[0];
+$result_trees{'space_at_commands_end_quotation_line'}{'contents'}[0]{'contents'}[3]{'contents'}[0]{'contents'}[3]{'parent'}
 = 
$result_trees{'space_at_commands_end_quotation_line'}{'contents'}[0]{'contents'}[3]{'contents'}[0];
+$result_trees{'space_at_commands_end_quotation_line'}{'contents'}[0]{'contents'}[3]{'contents'}[0]{'contents'}[4]{'parent'}
 = 
$result_trees{'space_at_commands_end_quotation_line'}{'contents'}[0]{'contents'}[3]{'contents'}[0];
+$result_trees{'space_at_commands_end_quotation_line'}{'contents'}[0]{'contents'}[3]{'contents'}[0]{'contents'}[5]{'parent'}
 = 
$result_trees{'space_at_commands_end_quotation_line'}{'contents'}[0]{'contents'}[3]{'contents'}[0];
+$result_trees{'space_at_commands_end_quotation_line'}{'contents'}[0]{'contents'}[3]{'contents'}[0]{'parent'}
 = 
$result_trees{'space_at_commands_end_quotation_line'}{'contents'}[0]{'contents'}[3];
+$result_trees{'space_at_commands_end_quotation_line'}{'contents'}[0]{'contents'}[3]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'space_at_commands_end_quotation_line'}{'contents'}[0]{'contents'}[3]{'contents'}[1]{'args'}[0];
+$result_trees{'space_at_commands_end_quotation_line'}{'contents'}[0]{'contents'}[3]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'space_at_commands_end_quotation_line'}{'contents'}[0]{'contents'}[3]{'contents'}[1];
+$result_trees{'space_at_commands_end_quotation_line'}{'contents'}[0]{'contents'}[3]{'contents'}[1]{'parent'}
 = 
$result_trees{'space_at_commands_end_quotation_line'}{'contents'}[0]{'contents'}[3];
+$result_trees{'space_at_commands_end_quotation_line'}{'contents'}[0]{'contents'}[3]{'extra'}{'end_command'}
 = 
$result_trees{'space_at_commands_end_quotation_line'}{'contents'}[0]{'contents'}[3]{'contents'}[1];
 
$result_trees{'space_at_commands_end_quotation_line'}{'contents'}[0]{'contents'}[3]{'parent'}
 = $result_trees{'space_at_commands_end_quotation_line'}{'contents'}[0];
-$result_trees{'space_at_commands_end_quotation_line'}{'contents'}[0]{'contents'}[4]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'space_at_commands_end_quotation_line'}{'contents'}[0]{'contents'}[4]{'args'}[0];
-$result_trees{'space_at_commands_end_quotation_line'}{'contents'}[0]{'contents'}[4]{'args'}[0]{'contents'}[1]{'parent'}
 = 
$result_trees{'space_at_commands_end_quotation_line'}{'contents'}[0]{'contents'}[4]{'args'}[0];
-$result_trees{'space_at_commands_end_quotation_line'}{'contents'}[0]{'contents'}[4]{'args'}[0]{'contents'}[2]{'parent'}
 = 
$result_trees{'space_at_commands_end_quotation_line'}{'contents'}[0]{'contents'}[4]{'args'}[0];
-$result_trees{'space_at_commands_end_quotation_line'}{'contents'}[0]{'contents'}[4]{'args'}[0]{'contents'}[3]{'parent'}
 = 
$result_trees{'space_at_commands_end_quotation_line'}{'contents'}[0]{'contents'}[4]{'args'}[0];
-$result_trees{'space_at_commands_end_quotation_line'}{'contents'}[0]{'contents'}[4]{'args'}[0]{'parent'}
 = 
$result_trees{'space_at_commands_end_quotation_line'}{'contents'}[0]{'contents'}[4];
-$result_trees{'space_at_commands_end_quotation_line'}{'contents'}[0]{'contents'}[4]{'contents'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'space_at_commands_end_quotation_line'}{'contents'}[0]{'contents'}[4]{'contents'}[0];
-$result_trees{'space_at_commands_end_quotation_line'}{'contents'}[0]{'contents'}[4]{'contents'}[0]{'contents'}[1]{'parent'}
 = 
$result_trees{'space_at_commands_end_quotation_line'}{'contents'}[0]{'contents'}[4]{'contents'}[0];
-$result_trees{'space_at_commands_end_quotation_line'}{'contents'}[0]{'contents'}[4]{'contents'}[0]{'contents'}[2]{'parent'}
 = 
$result_trees{'space_at_commands_end_quotation_line'}{'contents'}[0]{'contents'}[4]{'contents'}[0];
-$result_trees{'space_at_commands_end_quotation_line'}{'contents'}[0]{'contents'}[4]{'contents'}[0]{'contents'}[3]{'parent'}
 = 
$result_trees{'space_at_commands_end_quotation_line'}{'contents'}[0]{'contents'}[4]{'contents'}[0];
-$result_trees{'space_at_commands_end_quotation_line'}{'contents'}[0]{'contents'}[4]{'contents'}[0]{'contents'}[4]{'parent'}
 = 
$result_trees{'space_at_commands_end_quotation_line'}{'contents'}[0]{'contents'}[4]{'contents'}[0];
-$result_trees{'space_at_commands_end_quotation_line'}{'contents'}[0]{'contents'}[4]{'contents'}[0]{'contents'}[5]{'parent'}
 = 
$result_trees{'space_at_commands_end_quotation_line'}{'contents'}[0]{'contents'}[4]{'contents'}[0];
-$result_trees{'space_at_commands_end_quotation_line'}{'contents'}[0]{'contents'}[4]{'contents'}[0]{'parent'}
 = 
$result_trees{'space_at_commands_end_quotation_line'}{'contents'}[0]{'contents'}[4];
-$result_trees{'space_at_commands_end_quotation_line'}{'contents'}[0]{'contents'}[4]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'space_at_commands_end_quotation_line'}{'contents'}[0]{'contents'}[4]{'contents'}[1]{'args'}[0];
-$result_trees{'space_at_commands_end_quotation_line'}{'contents'}[0]{'contents'}[4]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'space_at_commands_end_quotation_line'}{'contents'}[0]{'contents'}[4]{'contents'}[1];
-$result_trees{'space_at_commands_end_quotation_line'}{'contents'}[0]{'contents'}[4]{'contents'}[1]{'parent'}
 = 
$result_trees{'space_at_commands_end_quotation_line'}{'contents'}[0]{'contents'}[4];
-$result_trees{'space_at_commands_end_quotation_line'}{'contents'}[0]{'contents'}[4]{'extra'}{'end_command'}
 = 
$result_trees{'space_at_commands_end_quotation_line'}{'contents'}[0]{'contents'}[4]{'contents'}[1];
-$result_trees{'space_at_commands_end_quotation_line'}{'contents'}[0]{'contents'}[4]{'parent'}
 = $result_trees{'space_at_commands_end_quotation_line'}{'contents'}[0];
 $result_trees{'space_at_commands_end_quotation_line'}{'contents'}[0]{'parent'} 
= $result_trees{'space_at_commands_end_quotation_line'};
 
-$result_texis{'space_at_commands_end_quotation_line'} = '@setfilename 
space_at_commands_end_quotation_line.info
-
-@quotation @@ at the end of line @
+$result_texis{'space_at_commands_end_quotation_line'} = '@quotation @@ at the 
end of line @
 A @@ at the end of the @@quotation line.
 @end quotation
 
@@ -305,8 +270,7 @@ A @@@  at the end of the @@quotation line.
 ';
 
 
-$result_texts{'space_at_commands_end_quotation_line'} = '
-@ at the end of line  
+$result_texts{'space_at_commands_end_quotation_line'} = '@ at the end of line  
 A @ at the end of the @quotation line.
 
 @  at the end of line  
@@ -326,8 +290,7 @@ 
$result_converted{'plaintext'}->{'space_at_commands_end_quotation_line'} = '
 ';
 
 
-$result_converted{'html_text'}->{'space_at_commands_end_quotation_line'} = '
-<blockquote>
+$result_converted{'html_text'}->{'space_at_commands_end_quotation_line'} = 
'<blockquote>
 <p><b>@ at the end of line &nbsp;:</b> A @ at the end of the @quotation line.
 </p></blockquote>
 
@@ -337,9 +300,7 @@ 
$result_converted{'html_text'}->{'space_at_commands_end_quotation_line'} = '
 ';
 
 
-$result_converted{'xml'}->{'space_at_commands_end_quotation_line'} = 
'<setfilename file="space_at_commands_end_quotation_line.info" spaces=" 
">space_at_commands_end_quotation_line.info</setfilename>
-
-<quotation spaces=" " endspaces=" "><quotationtype>&arobase; at the end of 
line <spacecmd type="nl"/></quotationtype><para>A &arobase; at the end of the 
&arobase;quotation line.
+$result_converted{'xml'}->{'space_at_commands_end_quotation_line'} = 
'<quotation spaces=" " endspaces=" "><quotationtype>&arobase; at the end of 
line <spacecmd type="nl"/></quotationtype><para>A &arobase; at the end of the 
&arobase;quotation line.
 </para></quotation>
 
 <quotation spaces=" " endspaces=" "><quotationtype>&arobase;<spacecmd 
type="spc"/> at the end of line <spacecmd type="spc"/></quotationtype>
@@ -348,8 +309,7 @@ 
$result_converted{'xml'}->{'space_at_commands_end_quotation_line'} = '<setfilena
 ';
 
 
-$result_converted{'docbook'}->{'space_at_commands_end_quotation_line'} = '
-<blockquote><para><emphasis role="bold">@ at the end of line 
&#160;:</emphasis> A @ at the end of the @quotation line.
+$result_converted{'docbook'}->{'space_at_commands_end_quotation_line'} = 
'<blockquote><para><emphasis role="bold">@ at the end of line 
&#160;:</emphasis> A @ at the end of the @quotation line.
 </para></blockquote>
 <blockquote><para><emphasis role="bold">@&#160; at the end of line 
&#160;:</emphasis> A @&#160; at the end of the @quotation line.
 </para></blockquote>';
diff --git 
a/tp/t/results/quotation/space_at_commands_end_quotation_line/res_latex/space_at_commands_end_quotation_line.tex
 
b/tp/t/results/quotation/space_at_commands_end_quotation_line/res_latex/space_at_commands_end_quotation_line.tex
index 29670f83b6..e2a4bd040f 100644
--- 
a/tp/t/results/quotation/space_at_commands_end_quotation_line/res_latex/space_at_commands_end_quotation_line.tex
+++ 
b/tp/t/results/quotation/space_at_commands_end_quotation_line/res_latex/space_at_commands_end_quotation_line.tex
@@ -55,7 +55,6 @@
 \makeatother
 \GNUTexinfosetsingleheader{}%
 
-
 \begin{document}
 \begin{quote}
 \textbf{@ at the end of line \ {}:} A @ at the end of the @quotation line.
diff --git a/tp/t/results/sectioning/lone_Top_node.pl 
b/tp/t/results/sectioning/lone_Top_node.pl
index 65c119085a..a31944ebf0 100644
--- a/tp/t/results/sectioning/lone_Top_node.pl
+++ b/tp/t/results/sectioning/lone_Top_node.pl
@@ -11,39 +11,45 @@ $result_trees{'lone_Top_node'} = [
       {
         'contents' => [
           {
-            'args' => [
+            'contents' => [
               {
-                'contents' => [
+                'args' => [
                   {
+                    'contents' => [
+                      {
+                        'parent' => {},
+                        'text' => 'lone_Top_node.info'
+                      }
+                    ],
+                    'extra' => {
+                      'spaces_after_argument' => '
+'
+                    },
                     'parent' => {},
-                    'text' => 'lone_Top_node.info'
+                    'type' => 'line_arg'
                   }
                 ],
+                'cmdname' => 'setfilename',
                 'extra' => {
-                  'spaces_after_argument' => '
-'
+                  'spaces_before_argument' => ' ',
+                  'text_arg' => 'lone_Top_node.info'
                 },
+                'line_nr' => {
+                  'file_name' => '',
+                  'line_nr' => 1,
+                  'macro' => ''
+                },
+                'parent' => {}
+              },
+              {
                 'parent' => {},
-                'type' => 'line_arg'
+                'text' => '
+',
+                'type' => 'empty_line'
               }
             ],
-            'cmdname' => 'setfilename',
-            'extra' => {
-              'spaces_before_argument' => ' ',
-              'text_arg' => 'lone_Top_node.info'
-            },
-            'line_nr' => {
-              'file_name' => '',
-              'line_nr' => 1,
-              'macro' => ''
-            },
-            'parent' => {}
-          },
-          {
             'parent' => {},
-            'text' => '
-',
-            'type' => 'empty_line'
+            'type' => 'preamble_before_content'
           }
         ],
         'parent' => {
@@ -298,10 +304,11 @@ $result_trees{'lone_Top_node'} = [
     'type' => 'unit'
   }
 ];
-$result_trees{'lone_Top_node'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'lone_Top_node'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0];
-$result_trees{'lone_Top_node'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'parent'}
 = $result_trees{'lone_Top_node'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'lone_Top_node'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'lone_Top_node'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0];
+$result_trees{'lone_Top_node'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'parent'}
 = 
$result_trees{'lone_Top_node'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'lone_Top_node'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'lone_Top_node'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'lone_Top_node'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'parent'}
 = $result_trees{'lone_Top_node'}[0]{'contents'}[0]{'contents'}[0];
 $result_trees{'lone_Top_node'}[0]{'contents'}[0]{'contents'}[0]{'parent'} = 
$result_trees{'lone_Top_node'}[0]{'contents'}[0];
-$result_trees{'lone_Top_node'}[0]{'contents'}[0]{'contents'}[1]{'parent'} = 
$result_trees{'lone_Top_node'}[0]{'contents'}[0];
 $result_trees{'lone_Top_node'}[0]{'contents'}[0]{'parent'}{'contents'}[0] = 
$result_trees{'lone_Top_node'}[0]{'contents'}[0];
 
$result_trees{'lone_Top_node'}[0]{'contents'}[0]{'parent'}{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'lone_Top_node'}[0]{'contents'}[0]{'parent'}{'contents'}[1]{'args'}[0];
 
$result_trees{'lone_Top_node'}[0]{'contents'}[0]{'parent'}{'contents'}[1]{'args'}[0]{'parent'}
 = $result_trees{'lone_Top_node'}[0]{'contents'}[0]{'parent'}{'contents'}[1];
@@ -565,6 +572,7 @@ $result_directions_text{'lone_Top_node'} = 'element: 
@chapter chap
 
 
 $result_converted{'latex'}->{'lone_Top_node'} = '
+\\begin{document}
 \\chapter{chap}
 \\label{anchor:First}%
 ';
diff --git a/tp/t/results/sectioning/loop_nodes.pl 
b/tp/t/results/sectioning/loop_nodes.pl
index b87352ff16..7731f417b7 100644
--- a/tp/t/results/sectioning/loop_nodes.pl
+++ b/tp/t/results/sectioning/loop_nodes.pl
@@ -10,39 +10,45 @@ $result_trees{'loop_nodes'} = {
     {
       'contents' => [
         {
-          'args' => [
+          'contents' => [
             {
-              'contents' => [
+              'args' => [
                 {
+                  'contents' => [
+                    {
+                      'parent' => {},
+                      'text' => 'loop_nodes.info'
+                    }
+                  ],
+                  'extra' => {
+                    'spaces_after_argument' => '
+'
+                  },
                   'parent' => {},
-                  'text' => 'loop_nodes.info'
+                  'type' => 'line_arg'
                 }
               ],
+              'cmdname' => 'setfilename',
               'extra' => {
-                'spaces_after_argument' => '
-'
+                'spaces_before_argument' => ' ',
+                'text_arg' => 'loop_nodes.info'
+              },
+              'line_nr' => {
+                'file_name' => '',
+                'line_nr' => 1,
+                'macro' => ''
               },
+              'parent' => {}
+            },
+            {
               'parent' => {},
-              'type' => 'line_arg'
+              'text' => '
+',
+              'type' => 'empty_line'
             }
           ],
-          'cmdname' => 'setfilename',
-          'extra' => {
-            'spaces_before_argument' => ' ',
-            'text_arg' => 'loop_nodes.info'
-          },
-          'line_nr' => {
-            'file_name' => '',
-            'line_nr' => 1,
-            'macro' => ''
-          },
-          'parent' => {}
-        },
-        {
           'parent' => {},
-          'text' => '
-',
-          'type' => 'empty_line'
+          'type' => 'preamble_before_content'
         }
       ],
       'parent' => {},
@@ -669,10 +675,11 @@ $result_trees{'loop_nodes'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'loop_nodes'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'loop_nodes'}{'contents'}[0]{'contents'}[0]{'args'}[0];
-$result_trees{'loop_nodes'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'parent'} 
= $result_trees{'loop_nodes'}{'contents'}[0]{'contents'}[0];
+$result_trees{'loop_nodes'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'loop_nodes'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0];
+$result_trees{'loop_nodes'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'parent'}
 = $result_trees{'loop_nodes'}{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'loop_nodes'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'loop_nodes'}{'contents'}[0]{'contents'}[0];
+$result_trees{'loop_nodes'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'parent'}
 = $result_trees{'loop_nodes'}{'contents'}[0]{'contents'}[0];
 $result_trees{'loop_nodes'}{'contents'}[0]{'contents'}[0]{'parent'} = 
$result_trees{'loop_nodes'}{'contents'}[0];
-$result_trees{'loop_nodes'}{'contents'}[0]{'contents'}[1]{'parent'} = 
$result_trees{'loop_nodes'}{'contents'}[0];
 $result_trees{'loop_nodes'}{'contents'}[0]{'parent'} = 
$result_trees{'loop_nodes'};
 $result_trees{'loop_nodes'}{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'} 
= $result_trees{'loop_nodes'}{'contents'}[1]{'args'}[0];
 $result_trees{'loop_nodes'}{'contents'}[1]{'args'}[0]{'parent'} = 
$result_trees{'loop_nodes'}{'contents'}[1];
@@ -961,6 +968,7 @@ $result_floats{'loop_nodes'} = {};
 
 
 $result_converted{'latex'}->{'loop_nodes'} = '
+\\begin{document}
 \\label{anchor:node-up}%
 
 
diff --git a/tp/t/results/sectioning/nodes_before_after_top.pl 
b/tp/t/results/sectioning/nodes_before_after_top.pl
index 2afd434cd7..5d52fa7c0d 100644
--- a/tp/t/results/sectioning/nodes_before_after_top.pl
+++ b/tp/t/results/sectioning/nodes_before_after_top.pl
@@ -10,39 +10,45 @@ $result_trees{'nodes_before_after_top'} = {
     {
       'contents' => [
         {
-          'args' => [
+          'contents' => [
             {
-              'contents' => [
+              'args' => [
                 {
+                  'contents' => [
+                    {
+                      'parent' => {},
+                      'text' => 'nodes_before_after_top.info'
+                    }
+                  ],
+                  'extra' => {
+                    'spaces_after_argument' => '
+'
+                  },
                   'parent' => {},
-                  'text' => 'nodes_before_after_top.info'
+                  'type' => 'line_arg'
                 }
               ],
+              'cmdname' => 'setfilename',
               'extra' => {
-                'spaces_after_argument' => '
-'
+                'spaces_before_argument' => ' ',
+                'text_arg' => 'nodes_before_after_top.info'
               },
+              'line_nr' => {
+                'file_name' => '',
+                'line_nr' => 1,
+                'macro' => ''
+              },
+              'parent' => {}
+            },
+            {
               'parent' => {},
-              'type' => 'line_arg'
+              'text' => '
+',
+              'type' => 'empty_line'
             }
           ],
-          'cmdname' => 'setfilename',
-          'extra' => {
-            'spaces_before_argument' => ' ',
-            'text_arg' => 'nodes_before_after_top.info'
-          },
-          'line_nr' => {
-            'file_name' => '',
-            'line_nr' => 1,
-            'macro' => ''
-          },
-          'parent' => {}
-        },
-        {
           'parent' => {},
-          'text' => '
-',
-          'type' => 'empty_line'
+          'type' => 'preamble_before_content'
         }
       ],
       'parent' => {},
@@ -363,10 +369,11 @@ $result_trees{'nodes_before_after_top'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'nodes_before_after_top'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'nodes_before_after_top'}{'contents'}[0]{'contents'}[0]{'args'}[0];
-$result_trees{'nodes_before_after_top'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'parent'}
 = $result_trees{'nodes_before_after_top'}{'contents'}[0]{'contents'}[0];
+$result_trees{'nodes_before_after_top'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'nodes_before_after_top'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0];
+$result_trees{'nodes_before_after_top'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'parent'}
 = 
$result_trees{'nodes_before_after_top'}{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'nodes_before_after_top'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'nodes_before_after_top'}{'contents'}[0]{'contents'}[0];
+$result_trees{'nodes_before_after_top'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'parent'}
 = $result_trees{'nodes_before_after_top'}{'contents'}[0]{'contents'}[0];
 
$result_trees{'nodes_before_after_top'}{'contents'}[0]{'contents'}[0]{'parent'} 
= $result_trees{'nodes_before_after_top'}{'contents'}[0];
-$result_trees{'nodes_before_after_top'}{'contents'}[0]{'contents'}[1]{'parent'}
 = $result_trees{'nodes_before_after_top'}{'contents'}[0];
 $result_trees{'nodes_before_after_top'}{'contents'}[0]{'parent'} = 
$result_trees{'nodes_before_after_top'};
 
$result_trees{'nodes_before_after_top'}{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'nodes_before_after_top'}{'contents'}[1]{'args'}[0];
 $result_trees{'nodes_before_after_top'}{'contents'}[1]{'args'}[0]{'parent'} = 
$result_trees{'nodes_before_after_top'}{'contents'}[1];
@@ -567,6 +574,7 @@ $result_floats{'nodes_before_after_top'} = {};
 
 
 $result_converted{'latex'}->{'nodes_before_after_top'} = '
+\\begin{document}
 \\label{anchor:node-before}%
 
 In node before
diff --git a/tp/t/results/sectioning/nodes_before_after_top_xref.pl 
b/tp/t/results/sectioning/nodes_before_after_top_xref.pl
index 0053bf6b94..bedbbb0f19 100644
--- a/tp/t/results/sectioning/nodes_before_after_top_xref.pl
+++ b/tp/t/results/sectioning/nodes_before_after_top_xref.pl
@@ -10,39 +10,45 @@ $result_trees{'nodes_before_after_top_xref'} = {
     {
       'contents' => [
         {
-          'args' => [
+          'contents' => [
             {
-              'contents' => [
+              'args' => [
                 {
+                  'contents' => [
+                    {
+                      'parent' => {},
+                      'text' => 'nodes_before_after_top_xref.info'
+                    }
+                  ],
+                  'extra' => {
+                    'spaces_after_argument' => '
+'
+                  },
                   'parent' => {},
-                  'text' => 'nodes_before_after_top_xref.info'
+                  'type' => 'line_arg'
                 }
               ],
+              'cmdname' => 'setfilename',
               'extra' => {
-                'spaces_after_argument' => '
-'
+                'spaces_before_argument' => ' ',
+                'text_arg' => 'nodes_before_after_top_xref.info'
+              },
+              'line_nr' => {
+                'file_name' => '',
+                'line_nr' => 1,
+                'macro' => ''
               },
+              'parent' => {}
+            },
+            {
               'parent' => {},
-              'type' => 'line_arg'
+              'text' => '
+',
+              'type' => 'empty_line'
             }
           ],
-          'cmdname' => 'setfilename',
-          'extra' => {
-            'spaces_before_argument' => ' ',
-            'text_arg' => 'nodes_before_after_top_xref.info'
-          },
-          'line_nr' => {
-            'file_name' => '',
-            'line_nr' => 1,
-            'macro' => ''
-          },
-          'parent' => {}
-        },
-        {
           'parent' => {},
-          'text' => '
-',
-          'type' => 'empty_line'
+          'type' => 'preamble_before_content'
         }
       ],
       'parent' => {},
@@ -599,10 +605,11 @@ $result_trees{'nodes_before_after_top_xref'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'nodes_before_after_top_xref'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'nodes_before_after_top_xref'}{'contents'}[0]{'contents'}[0]{'args'}[0];
-$result_trees{'nodes_before_after_top_xref'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'parent'}
 = $result_trees{'nodes_before_after_top_xref'}{'contents'}[0]{'contents'}[0];
+$result_trees{'nodes_before_after_top_xref'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'nodes_before_after_top_xref'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0];
+$result_trees{'nodes_before_after_top_xref'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'parent'}
 = 
$result_trees{'nodes_before_after_top_xref'}{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'nodes_before_after_top_xref'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'nodes_before_after_top_xref'}{'contents'}[0]{'contents'}[0];
+$result_trees{'nodes_before_after_top_xref'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'parent'}
 = $result_trees{'nodes_before_after_top_xref'}{'contents'}[0]{'contents'}[0];
 
$result_trees{'nodes_before_after_top_xref'}{'contents'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'nodes_before_after_top_xref'}{'contents'}[0];
-$result_trees{'nodes_before_after_top_xref'}{'contents'}[0]{'contents'}[1]{'parent'}
 = $result_trees{'nodes_before_after_top_xref'}{'contents'}[0];
 $result_trees{'nodes_before_after_top_xref'}{'contents'}[0]{'parent'} = 
$result_trees{'nodes_before_after_top_xref'};
 
$result_trees{'nodes_before_after_top_xref'}{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'nodes_before_after_top_xref'}{'contents'}[1]{'args'}[0];
 
$result_trees{'nodes_before_after_top_xref'}{'contents'}[1]{'args'}[0]{'parent'}
 = $result_trees{'nodes_before_after_top_xref'}{'contents'}[1];
@@ -835,6 +842,7 @@ $result_floats{'nodes_before_after_top_xref'} = {};
 
 
 $result_converted{'latex'}->{'nodes_before_after_top_xref'} = '
+\\begin{document}
 \\label{anchor:node-before}%
 
 In node before
diff --git a/tp/t/results/sectioning/nodes_before_top.pl 
b/tp/t/results/sectioning/nodes_before_top.pl
index af99966ba3..09abbab1f9 100644
--- a/tp/t/results/sectioning/nodes_before_top.pl
+++ b/tp/t/results/sectioning/nodes_before_top.pl
@@ -10,39 +10,45 @@ $result_trees{'nodes_before_top'} = {
     {
       'contents' => [
         {
-          'args' => [
+          'contents' => [
             {
-              'contents' => [
+              'args' => [
                 {
+                  'contents' => [
+                    {
+                      'parent' => {},
+                      'text' => 'nodes_before_top.info'
+                    }
+                  ],
+                  'extra' => {
+                    'spaces_after_argument' => '
+'
+                  },
                   'parent' => {},
-                  'text' => 'nodes_before_top.info'
+                  'type' => 'line_arg'
                 }
               ],
+              'cmdname' => 'setfilename',
               'extra' => {
-                'spaces_after_argument' => '
-'
+                'spaces_before_argument' => ' ',
+                'text_arg' => 'nodes_before_top.info'
+              },
+              'line_nr' => {
+                'file_name' => '',
+                'line_nr' => 1,
+                'macro' => ''
               },
+              'parent' => {}
+            },
+            {
               'parent' => {},
-              'type' => 'line_arg'
+              'text' => '
+',
+              'type' => 'empty_line'
             }
           ],
-          'cmdname' => 'setfilename',
-          'extra' => {
-            'spaces_before_argument' => ' ',
-            'text_arg' => 'nodes_before_top.info'
-          },
-          'line_nr' => {
-            'file_name' => '',
-            'line_nr' => 1,
-            'macro' => ''
-          },
-          'parent' => {}
-        },
-        {
           'parent' => {},
-          'text' => '
-',
-          'type' => 'empty_line'
+          'type' => 'preamble_before_content'
         }
       ],
       'parent' => {},
@@ -627,10 +633,11 @@ $result_trees{'nodes_before_top'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'nodes_before_top'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'nodes_before_top'}{'contents'}[0]{'contents'}[0]{'args'}[0];
-$result_trees{'nodes_before_top'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'parent'}
 = $result_trees{'nodes_before_top'}{'contents'}[0]{'contents'}[0];
+$result_trees{'nodes_before_top'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'nodes_before_top'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0];
+$result_trees{'nodes_before_top'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'parent'}
 = 
$result_trees{'nodes_before_top'}{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'nodes_before_top'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'nodes_before_top'}{'contents'}[0]{'contents'}[0];
+$result_trees{'nodes_before_top'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'parent'}
 = $result_trees{'nodes_before_top'}{'contents'}[0]{'contents'}[0];
 $result_trees{'nodes_before_top'}{'contents'}[0]{'contents'}[0]{'parent'} = 
$result_trees{'nodes_before_top'}{'contents'}[0];
-$result_trees{'nodes_before_top'}{'contents'}[0]{'contents'}[1]{'parent'} = 
$result_trees{'nodes_before_top'}{'contents'}[0];
 $result_trees{'nodes_before_top'}{'contents'}[0]{'parent'} = 
$result_trees{'nodes_before_top'};
 
$result_trees{'nodes_before_top'}{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'nodes_before_top'}{'contents'}[1]{'args'}[0];
 $result_trees{'nodes_before_top'}{'contents'}[1]{'args'}[0]{'parent'} = 
$result_trees{'nodes_before_top'}{'contents'}[1];
@@ -903,6 +910,7 @@ $result_floats{'nodes_before_top'} = {};
 
 
 $result_converted{'latex'}->{'nodes_before_top'} = '
+\\begin{document}
 \\label{anchor:first}%