[no subject]

[Patrice Dumas]

branch: master
commit 9af3a4f99d507281f33b322b461387495aae4b14
Author: Patrice Dumas <pertusus@free.fr>
AuthorDate: Sat Jun 22 19:17:54 2024 +0200

    * tp/Texinfo/ParserNonXS.pm (%type_without_paragraph),
    tp/Texinfo/XS/parsetexi/parser.c (begin_paragraph_p): remove explicit
    check for root_line as non-paragraph type, as it is in ct_line context
    now.
---
 ChangeLog                        | 7 +++++++
 tp/Texinfo/ParserNonXS.pm        | 4 ++--
 tp/Texinfo/XS/parsetexi/parser.c | 5 ++---
 3 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index f74069340d..40229e0740 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2024-06-22  Patrice Dumas  <pertusus@free.fr>
+
+       * tp/Texinfo/ParserNonXS.pm (%type_without_paragraph),
+       tp/Texinfo/XS/parsetexi/parser.c (begin_paragraph_p): remove explicit
+       check for root_line as non-paragraph type, as it is in ct_line context
+       now.
+
 2024-06-22  Patrice Dumas  <pertusus@free.fr>
 
        * tp/Texinfo/ParserNonXS.pm (_current_context_command): rename
diff --git a/tp/Texinfo/ParserNonXS.pm b/tp/Texinfo/ParserNonXS.pm
index 84c6182cb2..980b72405a 100644
--- a/tp/Texinfo/ParserNonXS.pm
+++ b/tp/Texinfo/ParserNonXS.pm
@@ -379,7 +379,7 @@ my @set_flag_index_char_ignore = (
 #}
 
 my %type_without_paragraph;
-foreach my $type ('brace_arg', 'brace_container', 'root_line') {
+foreach my $type ('brace_arg', 'brace_container') {
   $type_without_paragraph{$type} = 1;
 };
 
@@ -1376,7 +1376,7 @@ sub _begin_paragraph($$;$)
   my ($self, $current, $source_info) = @_;
 
   # we want to avoid
-  # brace_container, brace_arg, root_line,
+  # brace_container, brace_arg, root_line (ct_line),
   # paragraphs (ct_paragraph), line_arg (ct_line, ct_def), balanced_braces
   # (only in ct_math, ct_rawpreformatted, ct_inlineraw), block_line_arg
   # (ct_line, ct_def), preformatted (ct_preformatted).
diff --git a/tp/Texinfo/XS/parsetexi/parser.c b/tp/Texinfo/XS/parsetexi/parser.c
index 496b958bb7..9f131d3fce 100644
--- a/tp/Texinfo/XS/parsetexi/parser.c
+++ b/tp/Texinfo/XS/parsetexi/parser.c
@@ -568,15 +568,14 @@ static int
 begin_paragraph_p (const ELEMENT *current)
 {
   /* we want to avoid
-     brace_container, brace_arg, root_line,
+     brace_container, brace_arg, root_line (ct_line),
      paragraphs (ct_paragraph), line_arg (ct_line, ct_def), balanced_braces
      (only in ct_math, ct_rawpreformatted, ct_inlineraw), block_line_arg
      (ct_line, ct_def), preformatted (ct_preformatted).
    */
   return (begin_paragraph_context (current_context ())
           && current->type != ET_brace_arg
-          && current->type != ET_brace_container
-          && current->type != ET_root_line);
+          && current->type != ET_brace_container);
 
   /* explicit selection of types with paragraphs within */
   /*