[no subject]

[Patrice Dumas]

branch: master
commit 56c7791d19266f1fb06e93de51cf48cd4612d571
Author: Patrice Dumas <pertusus@free.fr>
AuthorDate: Mon Jun 24 00:13:14 2024 +0200

    * tp/Texinfo/ParserNonXS.pm (_process_remaining_on_line),
    tp/Texinfo/XS/parsetexi/parser.c (process_remaining_on_line): call
    close_container instead of end_paragraph to close a paragraph when
    directly in the paragraph.
---
 ChangeLog                        | 7 +++++++
 tp/Texinfo/ParserNonXS.pm        | 2 +-
 tp/Texinfo/XS/parsetexi/parser.c | 2 +-
 3 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 5345f2d531..5c64cf83e7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2024-06-23  Patrice Dumas  <pertusus@free.fr>
+
+       * tp/Texinfo/ParserNonXS.pm (_process_remaining_on_line),
+       tp/Texinfo/XS/parsetexi/parser.c (process_remaining_on_line): call
+       close_container instead of end_paragraph to close a paragraph when
+       directly in the paragraph.
+
 2024-06-23  Patrice Dumas  <pertusus@free.fr>
 
        * tp/Texinfo/ParserNonXS.pm (%close_paragraph_not_preformatted)
diff --git a/tp/Texinfo/ParserNonXS.pm b/tp/Texinfo/ParserNonXS.pm
index 22ac107e12..0708856823 100644
--- a/tp/Texinfo/ParserNonXS.pm
+++ b/tp/Texinfo/ParserNonXS.pm
@@ -7591,7 +7591,7 @@ sub _process_remaining_on_line($$$$)
     if ($current->{'type'}
         and $current->{'type'} eq 'paragraph') {
       # A form feed stops and restart a paragraph.
-      $current = _end_paragraph($self, $current, $source_info);
+      $current = _close_container($self, $current, $source_info);
       my $line_feed = {'type' => 'empty_line', 'text' => $form_feed,
                        'parent' => $current };
       push @{$current->{'contents'}}, $line_feed;
diff --git a/tp/Texinfo/XS/parsetexi/parser.c b/tp/Texinfo/XS/parsetexi/parser.c
index 86f0fbdbdf..ed001cc1cc 100644
--- a/tp/Texinfo/XS/parsetexi/parser.c
+++ b/tp/Texinfo/XS/parsetexi/parser.c
@@ -2580,7 +2580,7 @@ process_remaining_on_line (ELEMENT **current_inout, const 
char **line_inout)
           ELEMENT *e;
 
           /* A form feed stops and restarts a paragraph. */
-          current = end_paragraph (current, 0, 0);
+          current = close_container (current);
           e = new_text_element (ET_empty_line);
           text_append_n (e->e.text, "\f", 1);
           add_to_element_contents (current, e);