branch master updated: * tp/Texinfo/ParserNonXS.pm (_end_line), tp/Texinfo/XS/parsetexi/end_line.c (end_line_starting_block): remove code never used that is not relevan since there is no empty_line_after_command space container left in block command argument.

[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 05b83f002b * tp/Texinfo/ParserNonXS.pm (_end_line), 
tp/Texinfo/XS/parsetexi/end_line.c (end_line_starting_block): remove code never 
used that is not relevan since there is no empty_line_after_command space 
container left in block command argument.
05b83f002b is described below

commit 05b83f002b2888b1f15959ad0a9041763828c0b6
Author: Patrice Dumas <pertusus@free.fr>
AuthorDate: Sat Sep 10 21:50:29 2022 +0200

    * tp/Texinfo/ParserNonXS.pm (_end_line),
    tp/Texinfo/XS/parsetexi/end_line.c (end_line_starting_block):
    remove code never used that is not relevan since there is no
    empty_line_after_command space container left in block command
    argument.
---
 ChangeLog                          |  8 ++++++++
 tp/Texinfo/ParserNonXS.pm          | 14 +-------------
 tp/Texinfo/XS/parsetexi/end_line.c | 12 ------------
 3 files changed, 9 insertions(+), 25 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index c6f62220a7..5c155968ff 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2022-09-10  Patrice Dumas  <pertusus@free.fr>
+
+       * tp/Texinfo/ParserNonXS.pm (_end_line),
+       tp/Texinfo/XS/parsetexi/end_line.c (end_line_starting_block):
+       remove code never used that is not relevan since there is no
+       empty_line_after_command space container left in block command
+       argument.
+
 2022-09-10  Patrice Dumas  <pertusus@free.fr>
 
        Only use a specific space type container for skipspace commands
diff --git a/tp/Texinfo/ParserNonXS.pm b/tp/Texinfo/ParserNonXS.pm
index 7612293760..6bd0fa82e7 100644
--- a/tp/Texinfo/ParserNonXS.pm
+++ b/tp/Texinfo/ParserNonXS.pm
@@ -3083,19 +3083,7 @@ sub _end_line($$$)
     _isolate_last_space($self, $current);
     $current = $current->{'parent'};
     delete $current->{'remaining_args'};
-    # don't consider empty argument of block @-commands as argument,
-    # reparent them as contents
-    # TODO does not happen, likely because all the block commands 
empty_line_after_command
-    # are directly put in extra space_*_command.
-    if ($current->{'args'}->[0]->{'contents'}->[0]
-         and $current->{'args'}->[0]->{'contents'}->[0]->{'type'}
-         and $current->{'args'}->[0]->{'contents'}->[0]->{'type'} eq 
'empty_line_after_command')
-    {
-      my $empty_text = $current->{'args'}->[0]->{'contents'}->[0];
-      $empty_text->{'parent'} = $current;
-      unshift @{$current->{'contents'}}, $empty_text;
-      delete $current->{'args'};
-    }
+
     # this is in particular to have the same output as the XS parser
     if (scalar(@{$current->{'contents'}}) == 0) {
       delete $current->{'contents'};
diff --git a/tp/Texinfo/XS/parsetexi/end_line.c 
b/tp/Texinfo/XS/parsetexi/end_line.c
index 853116e1cf..5938cb4713 100644
--- a/tp/Texinfo/XS/parsetexi/end_line.c
+++ b/tp/Texinfo/XS/parsetexi/end_line.c
@@ -1076,18 +1076,6 @@ end_line_starting_block (ELEMENT *current)
   if (counter_value (&count_remaining_args, current) != -1)
     counter_pop (&count_remaining_args);
 
-  /* Don't consider empty argument of block @-command as argument,
-     reparent them as contents. */
-  /* FIXME probably cannot happen anymore */
-  if (current->args.list[0]->contents.number > 0
-      && current->args.list[0]->contents.list[0]->type
-         == ET_empty_line_after_command)
-    {
-      ELEMENT *e = remove_from_contents (current->args.list[0], 0);
-      insert_into_contents (current, e, 0);
-      destroy_element (pop_element_from_args (current));
-    }
-
   if (current->cmd == CM_float)
     {
       char *type = "";