branch master updated: * tp/Texinfo/ParserNonXS.pm (_end_line_def_line): Do not call _isolate_last_space. (_end_line_misc_line, _end_line_starting_block): Move call to _isolate_last_space before call to _end_line_def_line.

[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 36dadc20b3 * tp/Texinfo/ParserNonXS.pm (_end_line_def_line): Do not 
call _isolate_last_space. (_end_line_misc_line, _end_line_starting_block): Move 
call to _isolate_last_space before call to _end_line_def_line.
36dadc20b3 is described below

commit 36dadc20b302daee6472378f0e09fe15a512ca1e
Author: Gavin Smith <gavinsmith0123@gmail.com>
AuthorDate: Sat Feb 11 16:43:39 2023 +0000

    * tp/Texinfo/ParserNonXS.pm (_end_line_def_line): Do not call
    _isolate_last_space.
    (_end_line_misc_line, _end_line_starting_block): Move call to
    _isolate_last_space before call to _end_line_def_line.
    
    * tp/Texinfo/XS/parsetexi/end_line.c
    (_end_line_def_line, _end_line_misc_line, _end_line_starting_block):
    Make the same change.
---
 ChangeLog                          | 11 +++++++++++
 tp/Texinfo/ParserNonXS.pm          |  6 ++----
 tp/Texinfo/XS/parsetexi/end_line.c |  7 ++-----
 3 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 369c73a468..c94085b9c1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2023-02-11  Gavin Smith <gavinsmith0123@gmail.com>
+
+       * tp/Texinfo/ParserNonXS.pm (_end_line_def_line): Do not call
+       _isolate_last_space.
+       (_end_line_misc_line, _end_line_starting_block): Move call to
+       _isolate_last_space before call to _end_line_def_line.
+
+       * tp/Texinfo/XS/parsetexi/end_line.c
+       (_end_line_def_line, _end_line_misc_line, _end_line_starting_block):
+       Make the same change.
+
 2023-02-11  Gavin Smith <gavinsmith0123@gmail.com>
 
        Initial @newdef implementation
diff --git a/tp/Texinfo/ParserNonXS.pm b/tp/Texinfo/ParserNonXS.pm
index c5c331a748..35ba233bfc 100644
--- a/tp/Texinfo/ParserNonXS.pm
+++ b/tp/Texinfo/ParserNonXS.pm
@@ -3381,6 +3381,7 @@ sub _end_line_misc_line($$$)
   if ($self->{'basic_inline_commands'}->{$command}) {
     pop @{$self->{'nesting_context'}->{'basic_inline_stack_on_line'}};
   }
+  _isolate_last_space($self, $current);
 
   if ($current->{'parent'}->{'type'}
         and $current->{'parent'}->{'type'} eq 'def_line') {
@@ -3389,7 +3390,6 @@ sub _end_line_misc_line($$$)
   }
 
   $self->_pop_context(['ct_line'], $source_info, $current, 'in line_arg');
-  _isolate_last_space($self, $current);
 
   $current = $current->{'parent'};
   my $misc_cmd = $current;
@@ -3726,8 +3726,6 @@ sub _end_line_def_line($$$)
     .Texinfo::Common::debug_print_element_short($current)."\n"
       if ($self->{'DEBUG'});
 
-  _isolate_last_space($self, $current);
-
   my $arguments = _parse_def($self, $def_command, $current, $source_info);
   if (scalar(@$arguments)) {
     #$current->{'parent'}->{'extra'}->{'def_args'} = $arguments;
@@ -3815,6 +3813,7 @@ sub _end_line_starting_block($$$)
   if ($self->{'basic_inline_commands'}->{$command}) {
     pop @{$self->{'nesting_context'}->{'basic_inline_stack_block'}};
   }
+  _isolate_last_space($self, $current);
 
   if ($current->{'parent'}->{'type'}
         and $current->{'parent'}->{'type'} eq 'def_line') {
@@ -3891,7 +3890,6 @@ sub _end_line_starting_block($$$)
     }
     $multitable->{'extra'}->{'prototypes'} = \@prototype_row;
   }
-  _isolate_last_space($self, $current);
   $current = $current->{'parent'};
   delete $current->{'remaining_args'};
 
diff --git a/tp/Texinfo/XS/parsetexi/end_line.c 
b/tp/Texinfo/XS/parsetexi/end_line.c
index 0ebb0184fd..835097a6e0 100644
--- a/tp/Texinfo/XS/parsetexi/end_line.c
+++ b/tp/Texinfo/XS/parsetexi/end_line.c
@@ -1020,6 +1020,7 @@ end_line_starting_block (ELEMENT *current)
 
   if (command_data(command).flags & CF_contain_basic_inline)
       (void) pop_command (&nesting_context.basic_inline_stack_block);
+  isolate_last_space (current);
 
   if (current->parent->type == ET_def_line)
     return end_line_def_line (current);
@@ -1110,7 +1111,6 @@ end_line_starting_block (ELEMENT *current)
       add_extra_contents_oot (current->parent, "prototypes", prototypes);
       /* See code in destroy_element for how prototypes is deallocated. */
     }
-  isolate_last_space (current);
 
   current = current->parent;
   if (counter_value (&count_remaining_args, current) != -1)
@@ -1388,12 +1388,11 @@ end_line_misc_line (ELEMENT *current)
   if ((command_data(cmd).flags & CF_contain_basic_inline)
       || cmd == CM_item) /* CM_item_LINE on stack */
     (void) pop_command (&nesting_context.basic_inline_stack_on_line);
+  isolate_last_space (current);
 
   if (current->parent->type == ET_def_line)
     return end_line_def_line (current);
 
-  isolate_last_space (current);
-
   current = current->parent;
   misc_cmd = current;
 
@@ -2026,8 +2025,6 @@ end_line_def_line (ELEMENT *current)
       free (stripped);
     }
 
-  isolate_last_space (current);
-
   def_info = parse_def (def_command, current);
 
   /* Record the index entry if def_info is not empty. */