branch master updated: * tp/Texinfo/Common.pm (add_preamble_before_content): put code that setup the preamble before content in a function add_preamble_before_content(). Add the preamble even if empty.

[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 6df11a669f * tp/Texinfo/Common.pm (add_preamble_before_content): put 
code that setup the preamble before content in a function 
add_preamble_before_content(). Add the preamble even if empty.
6df11a669f is described below

commit 6df11a669fa52a199c3a8eab94347d7c83fb33f8
Author: Patrice Dumas <pertusus@free.fr>
AuthorDate: Sun Jan 2 11:50:03 2022 +0100

    * tp/Texinfo/Common.pm (add_preamble_before_content): put code that
    setup the preamble before content in a function
    add_preamble_before_content().
    Add the preamble even if empty.
---
 ChangeLog                                                  |  7 +++++++
 tp/Texinfo/Common.pm                                       | 14 ++++++++++----
 tp/t/results/formatting/empty.pl                           |  9 ++++++++-
 tp/t/results/formatting/one_line.pl                        |  8 +++++++-
 tp/t/results/formatting/one_line_no_content.pl             |  6 ++++++
 .../empty_lines_at_beginning_no_setfilename_no_element.pl  | 12 +++++++++---
 tp/t/results/moreindices/double_index_entry.pl             |  6 ++++++
 tp/t/results/moresectioning/sectioning_frames.pl           |  6 ++++++
 tp/t/results/plaintext_tests/quote_node_names.pl           |  9 ++++++++-
 9 files changed, 67 insertions(+), 10 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 9c2e7fa050..11d617d05d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2022-01-02  Patrice Dumas  <pertusus@free.fr>
+
+       * tp/Texinfo/Common.pm (add_preamble_before_content): put code that
+       setup the preamble before content in a function
+       add_preamble_before_content().
+       Add the preamble even if empty.
+
 2022-01-02  Patrice Dumas  <pertusus@free.fr>
 
        * tp/Texinfo/Common.pm (%preamble_commands, rearrange_tree_beginning):
diff --git a/tp/Texinfo/Common.pm b/tp/Texinfo/Common.pm
index fc642b887f..60a22fce62 100644
--- a/tp/Texinfo/Common.pm
+++ b/tp/Texinfo/Common.pm
@@ -1117,7 +1117,7 @@ foreach my $command (
   $all_commands{$command} = 1;
 }
 
-my %preamble_commands;
+our %preamble_commands;
 foreach my $preamble_command ('direnty', 'hyphenation', 'errormsg',
        'inlineraw', '*', keys(%document_settable_at_commands),
        keys(%format_raw_commands), keys(%inline_commands),
@@ -1280,6 +1280,14 @@ sub rearrange_tree_beginning($$)
       if (@{$before_setfilename->{'contents'}});
   }
   
+  add_preamble_before_beginning($before_node_section);
+}
+
+# TODO document
+sub add_preamble_before_beginning($)
+{
+  my $before_node_section = shift;
+  
   # add a preamble for informational commands
   my $informational_preamble = {'type' => 'preamble_before_content',
                                 'parent' => $before_node_section,
@@ -1301,9 +1309,7 @@ sub rearrange_tree_beginning($$)
       push @{$informational_preamble->{'contents'}}, $content;
     }
   }
-  if (scalar(@{$informational_preamble->{'contents'}}) > 0) {
-    push @first_types, $informational_preamble;
-  }
+  push @first_types, $informational_preamble;
   unshift (@{$before_node_section->{'contents'}}, @first_types);
 }
 
diff --git a/tp/t/results/formatting/empty.pl b/tp/t/results/formatting/empty.pl
index 49bdaa68cc..ad44b9ae68 100644
--- a/tp/t/results/formatting/empty.pl
+++ b/tp/t/results/formatting/empty.pl
@@ -8,13 +8,20 @@ use utf8;
 $result_trees{'empty'} = {
   'contents' => [
     {
-      'contents' => [],
+      'contents' => [
+        {
+          'contents' => [],
+          'parent' => {},
+          'type' => 'preamble_before_content'
+        }
+      ],
       'parent' => {},
       'type' => 'before_node_section'
     }
   ],
   'type' => 'document_root'
 };
+$result_trees{'empty'}{'contents'}[0]{'contents'}[0]{'parent'} = 
$result_trees{'empty'}{'contents'}[0];
 $result_trees{'empty'}{'contents'}[0]{'parent'} = $result_trees{'empty'};
 
 $result_texis{'empty'} = '';
diff --git a/tp/t/results/formatting/one_line.pl 
b/tp/t/results/formatting/one_line.pl
index f54c8f591a..46148e3642 100644
--- a/tp/t/results/formatting/one_line.pl
+++ b/tp/t/results/formatting/one_line.pl
@@ -9,6 +9,11 @@ $result_trees{'one_line'} = {
   'contents' => [
     {
       'contents' => [
+        {
+          'contents' => [],
+          'parent' => {},
+          'type' => 'preamble_before_content'
+        },
         {
           'contents' => [
             {
@@ -27,8 +32,9 @@ $result_trees{'one_line'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'one_line'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'one_line'}{'contents'}[0]{'contents'}[0];
 $result_trees{'one_line'}{'contents'}[0]{'contents'}[0]{'parent'} = 
$result_trees{'one_line'}{'contents'}[0];
+$result_trees{'one_line'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'parent'}
 = $result_trees{'one_line'}{'contents'}[0]{'contents'}[1];
+$result_trees{'one_line'}{'contents'}[0]{'contents'}[1]{'parent'} = 
$result_trees{'one_line'}{'contents'}[0];
 $result_trees{'one_line'}{'contents'}[0]{'parent'} = $result_trees{'one_line'};
 
 $result_texis{'one_line'} = 'AB
diff --git a/tp/t/results/formatting/one_line_no_content.pl 
b/tp/t/results/formatting/one_line_no_content.pl
index 5598de5aca..be2ba87026 100644
--- a/tp/t/results/formatting/one_line_no_content.pl
+++ b/tp/t/results/formatting/one_line_no_content.pl
@@ -20,6 +20,11 @@ $result_trees{'one_line_no_content'} = {
           ],
           'parent' => {},
           'type' => 'preamble_before_beginning'
+        },
+        {
+          'contents' => [],
+          'parent' => {},
+          'type' => 'preamble_before_content'
         }
       ],
       'parent' => {},
@@ -30,6 +35,7 @@ $result_trees{'one_line_no_content'} = {
 };
 
$result_trees{'one_line_no_content'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'one_line_no_content'}{'contents'}[0]{'contents'}[0];
 $result_trees{'one_line_no_content'}{'contents'}[0]{'contents'}[0]{'parent'} = 
$result_trees{'one_line_no_content'}{'contents'}[0];
+$result_trees{'one_line_no_content'}{'contents'}[0]{'contents'}[1]{'parent'} = 
$result_trees{'one_line_no_content'}{'contents'}[0];
 $result_trees{'one_line_no_content'}{'contents'}[0]{'parent'} = 
$result_trees{'one_line_no_content'};
 
 $result_texis{'one_line_no_content'} = '\\input texinfo.tex
diff --git 
a/tp/t/results/html_tests/empty_lines_at_beginning_no_setfilename_no_element.pl 
b/tp/t/results/html_tests/empty_lines_at_beginning_no_setfilename_no_element.pl
index 58978e5e1a..14f4d0c379 100644
--- 
a/tp/t/results/html_tests/empty_lines_at_beginning_no_setfilename_no_element.pl
+++ 
b/tp/t/results/html_tests/empty_lines_at_beginning_no_setfilename_no_element.pl
@@ -33,6 +33,11 @@ 
$result_trees{'empty_lines_at_beginning_no_setfilename_no_element'} = {
           'parent' => {},
           'type' => 'preamble_before_beginning'
         },
+        {
+          'contents' => [],
+          'parent' => {},
+          'type' => 'preamble_before_content'
+        },
         {
           'args' => [
             {
@@ -107,13 +112,14 @@ 
$result_trees{'empty_lines_at_beginning_no_setfilename_no_element'}{'contents'}[
 
$result_trees{'empty_lines_at_beginning_no_setfilename_no_element'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'parent'}
 = 
$result_trees{'empty_lines_at_beginning_no_setfilename_no_element'}{'contents'}[0]{'contents'}[0];
 
$result_trees{'empty_lines_at_beginning_no_setfilename_no_element'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'parent'}
 = 
$result_trees{'empty_lines_at_beginning_no_setfilename_no_element'}{'contents'}[0]{'contents'}[0];
 
$result_trees{'empty_lines_at_beginning_no_setfilename_no_element'}{'contents'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'empty_lines_at_beginning_no_setfilename_no_element'}{'contents'}[0];
-$result_trees{'empty_lines_at_beginning_no_setfilename_no_element'}{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'empty_lines_at_beginning_no_setfilename_no_element'}{'contents'}[0]{'contents'}[1]{'args'}[0];
-$result_trees{'empty_lines_at_beginning_no_setfilename_no_element'}{'contents'}[0]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'empty_lines_at_beginning_no_setfilename_no_element'}{'contents'}[0]{'contents'}[1];
 
$result_trees{'empty_lines_at_beginning_no_setfilename_no_element'}{'contents'}[0]{'contents'}[1]{'parent'}
 = 
$result_trees{'empty_lines_at_beginning_no_setfilename_no_element'}{'contents'}[0];
+$result_trees{'empty_lines_at_beginning_no_setfilename_no_element'}{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'empty_lines_at_beginning_no_setfilename_no_element'}{'contents'}[0]{'contents'}[2]{'args'}[0];
+$result_trees{'empty_lines_at_beginning_no_setfilename_no_element'}{'contents'}[0]{'contents'}[2]{'args'}[0]{'parent'}
 = 
$result_trees{'empty_lines_at_beginning_no_setfilename_no_element'}{'contents'}[0]{'contents'}[2];
 
$result_trees{'empty_lines_at_beginning_no_setfilename_no_element'}{'contents'}[0]{'contents'}[2]{'parent'}
 = 
$result_trees{'empty_lines_at_beginning_no_setfilename_no_element'}{'contents'}[0];
-$result_trees{'empty_lines_at_beginning_no_setfilename_no_element'}{'contents'}[0]{'contents'}[3]{'contents'}[0]{'parent'}
 = 
$result_trees{'empty_lines_at_beginning_no_setfilename_no_element'}{'contents'}[0]{'contents'}[3];
 
$result_trees{'empty_lines_at_beginning_no_setfilename_no_element'}{'contents'}[0]{'contents'}[3]{'parent'}
 = 
$result_trees{'empty_lines_at_beginning_no_setfilename_no_element'}{'contents'}[0];
+$result_trees{'empty_lines_at_beginning_no_setfilename_no_element'}{'contents'}[0]{'contents'}[4]{'contents'}[0]{'parent'}
 = 
$result_trees{'empty_lines_at_beginning_no_setfilename_no_element'}{'contents'}[0]{'contents'}[4];
 
$result_trees{'empty_lines_at_beginning_no_setfilename_no_element'}{'contents'}[0]{'contents'}[4]{'parent'}
 = 
$result_trees{'empty_lines_at_beginning_no_setfilename_no_element'}{'contents'}[0];
+$result_trees{'empty_lines_at_beginning_no_setfilename_no_element'}{'contents'}[0]{'contents'}[5]{'parent'}
 = 
$result_trees{'empty_lines_at_beginning_no_setfilename_no_element'}{'contents'}[0];
 
$result_trees{'empty_lines_at_beginning_no_setfilename_no_element'}{'contents'}[0]{'parent'}
 = $result_trees{'empty_lines_at_beginning_no_setfilename_no_element'};
 
$result_trees{'empty_lines_at_beginning_no_setfilename_no_element'}{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'empty_lines_at_beginning_no_setfilename_no_element'}{'contents'}[1];
 
$result_trees{'empty_lines_at_beginning_no_setfilename_no_element'}{'contents'}[1]{'parent'}
 = $result_trees{'empty_lines_at_beginning_no_setfilename_no_element'};
diff --git a/tp/t/results/moreindices/double_index_entry.pl 
b/tp/t/results/moreindices/double_index_entry.pl
index de41cf333d..7e06128e53 100644
--- a/tp/t/results/moreindices/double_index_entry.pl
+++ b/tp/t/results/moreindices/double_index_entry.pl
@@ -20,6 +20,11 @@ $result_trees{'double_index_entry'} = {
           ],
           'parent' => {},
           'type' => 'preamble_before_beginning'
+        },
+        {
+          'contents' => [],
+          'parent' => {},
+          'type' => 'preamble_before_content'
         }
       ],
       'parent' => {},
@@ -466,6 +471,7 @@ $result_trees{'double_index_entry'} = {
 };
 
$result_trees{'double_index_entry'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'double_index_entry'}{'contents'}[0]{'contents'}[0];
 $result_trees{'double_index_entry'}{'contents'}[0]{'contents'}[0]{'parent'} = 
$result_trees{'double_index_entry'}{'contents'}[0];
+$result_trees{'double_index_entry'}{'contents'}[0]{'contents'}[1]{'parent'} = 
$result_trees{'double_index_entry'}{'contents'}[0];
 $result_trees{'double_index_entry'}{'contents'}[0]{'parent'} = 
$result_trees{'double_index_entry'};
 
$result_trees{'double_index_entry'}{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'double_index_entry'}{'contents'}[1]{'args'}[0];
 $result_trees{'double_index_entry'}{'contents'}[1]{'args'}[0]{'parent'} = 
$result_trees{'double_index_entry'}{'contents'}[1];
diff --git a/tp/t/results/moresectioning/sectioning_frames.pl 
b/tp/t/results/moresectioning/sectioning_frames.pl
index 7a7444378a..96e7f0659a 100644
--- a/tp/t/results/moresectioning/sectioning_frames.pl
+++ b/tp/t/results/moresectioning/sectioning_frames.pl
@@ -26,6 +26,11 @@ $result_trees{'sectioning_frames'} = {
           ],
           'parent' => {},
           'type' => 'preamble_before_beginning'
+        },
+        {
+          'contents' => [],
+          'parent' => {},
+          'type' => 'preamble_before_content'
         }
       ],
       'parent' => {},
@@ -2551,6 +2556,7 @@ $result_trees{'sectioning_frames'} = {
 
$result_trees{'sectioning_frames'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'sectioning_frames'}{'contents'}[0]{'contents'}[0];
 
$result_trees{'sectioning_frames'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'parent'}
 = $result_trees{'sectioning_frames'}{'contents'}[0]{'contents'}[0];
 $result_trees{'sectioning_frames'}{'contents'}[0]{'contents'}[0]{'parent'} = 
$result_trees{'sectioning_frames'}{'contents'}[0];
+$result_trees{'sectioning_frames'}{'contents'}[0]{'contents'}[1]{'parent'} = 
$result_trees{'sectioning_frames'}{'contents'}[0];
 $result_trees{'sectioning_frames'}{'contents'}[0]{'parent'} = 
$result_trees{'sectioning_frames'};
 
$result_trees{'sectioning_frames'}{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'sectioning_frames'}{'contents'}[1]{'args'}[0];
 $result_trees{'sectioning_frames'}{'contents'}[1]{'args'}[0]{'parent'} = 
$result_trees{'sectioning_frames'}{'contents'}[1];
diff --git a/tp/t/results/plaintext_tests/quote_node_names.pl 
b/tp/t/results/plaintext_tests/quote_node_names.pl
index e5a77e9d7f..392785ff63 100644
--- a/tp/t/results/plaintext_tests/quote_node_names.pl
+++ b/tp/t/results/plaintext_tests/quote_node_names.pl
@@ -8,7 +8,13 @@ use utf8;
 $result_trees{'quote_node_names'} = {
   'contents' => [
     {
-      'contents' => [],
+      'contents' => [
+        {
+          'contents' => [],
+          'parent' => {},
+          'type' => 'preamble_before_content'
+        }
+      ],
       'parent' => {},
       'type' => 'before_node_section'
     },
@@ -1438,6 +1444,7 @@ $result_trees{'quote_node_names'} = {
   ],
   'type' => 'document_root'
 };
+$result_trees{'quote_node_names'}{'contents'}[0]{'contents'}[0]{'parent'} = 
$result_trees{'quote_node_names'}{'contents'}[0];
 $result_trees{'quote_node_names'}{'contents'}[0]{'parent'} = 
$result_trees{'quote_node_names'};
 
$result_trees{'quote_node_names'}{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'quote_node_names'}{'contents'}[1]{'args'}[0];
 $result_trees{'quote_node_names'}{'contents'}[1]{'args'}[0]{'parent'} = 
$result_trees{'quote_node_names'}{'contents'}[1];