branch master updated: Blank line before detailmenu

[Gavin D. Smith]

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

gavin pushed a commit to branch master
in repository texinfo.

The following commit(s) were added to refs/heads/master by this push:
     new d67dc4ccfb Blank line before detailmenu
d67dc4ccfb is described below

commit d67dc4ccfb7e24ce325d635e46dbab3cea8391d8
Author: Gavin Smith <gavinsmith0123@gmail.com>
AuthorDate: Fri Aug 4 16:51:12 2023 +0100

    Blank line before detailmenu
    
    * tp/Texinfo/Convert/Plaintext.pm (_convert) <sectioning commands>:
    Add a blank line before the inserted detailmenu block.
---
 ChangeLog                                             |   7 +++++++
 tp/Texinfo/Convert/Plaintext.pm                       |  13 +++++++++++--
 .../indices/printindex_between_node_section.pl        |   5 +++--
 .../res_info/end_of_line_command_in_node_lines.info   | Bin 1267 -> 1268 bytes
 .../regions/ref_in_copying_insert_in_chapter.pl       |   5 +++--
 .../sectioning/automatic_menu_referencing_node.pl     |   5 +++--
 6 files changed, 27 insertions(+), 8 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index bc3094ed9e..72509b93ef 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2023-08-04  Gavin Smith <gavinsmith0123@gmail.com>
+
+       Blank line before detailmenu
+
+       * tp/Texinfo/Convert/Plaintext.pm (_convert) <sectioning commands>:
+       Add a blank line before the inserted detailmenu block.
+
 2023-08-04  Gavin Smith <gavinsmith0123@gmail.com>
 
        * tp/Texinfo/Structuring.pm,
diff --git a/tp/Texinfo/Convert/Plaintext.pm b/tp/Texinfo/Convert/Plaintext.pm
index a0e4c81be4..9d07184d61 100644
--- a/tp/Texinfo/Convert/Plaintext.pm
+++ b/tp/Texinfo/Convert/Plaintext.pm
@@ -3840,8 +3840,17 @@ sub _convert($$)
                                                         $self->{'labels'},
                                                         [ $menu_node ]);
           if ($detailmenu) {
-            # TODO: add a blank line before detailmenu, as in
-            # regenerate_master_menu.
+            # add a blank line before the detailed node listing
+            my $menu_comment = {'type' => 'menu_comment',
+                                'parent' => $menu_node};
+            push @{$menu_node->{'contents'}}, $menu_comment;
+            my $preformatted = {'type' => 'preformatted',
+                                'parent' => $menu_comment};
+            push @{$menu_comment->{'contents'}}, $preformatted;
+            my $empty_line = {'type' => 'after_menu_description_line',
+                              'text' => "\n", 'parent' => $preformatted};
+            push @{$preformatted->{'contents'}}, $empty_line;
+
             $detailmenu->{'parent'} = $menu_node;
             push @{$menu_node->{'contents'}}, $detailmenu;
           }
diff --git a/tp/t/results/indices/printindex_between_node_section.pl 
b/tp/t/results/indices/printindex_between_node_section.pl
index fcacb9e022..1214412212 100644
--- a/tp/t/results/indices/printindex_between_node_section.pl
+++ b/tp/t/results/indices/printindex_between_node_section.pl
@@ -668,6 +668,7 @@ top
 * Menu:
 
 * node chap1::
+
  -- The Detailed Node Listing --
 
 chapter 1
@@ -704,8 +705,8 @@ File: ,  Node: node sec1,  Up: node chap1
 
 Tag Table:
 Node: Top27
-Node: node chap1173
-Node: node sec1273
+Node: node chap1174
+Node: node sec1274
 
 End Tag Table
 
diff --git 
a/tp/t/results/info_tests/end_of_line_command_in_node_lines/res_info/end_of_line_command_in_node_lines.info
 
b/tp/t/results/info_tests/end_of_line_command_in_node_lines/res_info/end_of_line_command_in_node_lines.info
index abe87481c1..1e2f960b00 100644
Binary files 
a/tp/t/results/info_tests/end_of_line_command_in_node_lines/res_info/end_of_line_command_in_node_lines.info
 and 
b/tp/t/results/info_tests/end_of_line_command_in_node_lines/res_info/end_of_line_command_in_node_lines.info
 differ
diff --git a/tp/t/results/regions/ref_in_copying_insert_in_chapter.pl 
b/tp/t/results/regions/ref_in_copying_insert_in_chapter.pl
index ac9bc8e2c1..9fa0c0c4cb 100644
--- a/tp/t/results/regions/ref_in_copying_insert_in_chapter.pl
+++ b/tp/t/results/regions/ref_in_copying_insert_in_chapter.pl
@@ -634,6 +634,7 @@ top
 * Menu:
 
 * Intro::
+
  -- The Detailed Node Listing --
 
 Introduction
@@ -662,8 +663,8 @@ File: ,  Node: GFDL,  Up: Intro
 
 Tag Table:
 Node: Top41
-Node: Intro175
-Node: GFDL285
+Node: Intro176
+Node: GFDL286
 
 End Tag Table
 
diff --git a/tp/t/results/sectioning/automatic_menu_referencing_node.pl 
b/tp/t/results/sectioning/automatic_menu_referencing_node.pl
index 696ffa33e5..4801486d2f 100644
--- a/tp/t/results/sectioning/automatic_menu_referencing_node.pl
+++ b/tp/t/results/sectioning/automatic_menu_referencing_node.pl
@@ -363,6 +363,7 @@ top
 * Menu:
 
 * Chapter::
+
  -- The Detailed Node Listing --
 
 chap
@@ -389,8 +390,8 @@ File: ,  Node: section,  Up: Chapter
 
 Tag Table:
 Node: Top27
-Node: Chapter160
-Node: section245
+Node: Chapter161
+Node: section246
 
 End Tag Table