branch master updated: * tp/Texinfo/Convert/TexinfoMarkup.pm (_convert): determine if an accent command argument has braces in the same way as it is done in other converters by checking if argument type is not brace_command_arg.

[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 cd53dda061 * tp/Texinfo/Convert/TexinfoMarkup.pm (_convert): determine 
if an accent command argument has braces in the same way as it is done in other 
converters by checking if argument type is not brace_command_arg.
cd53dda061 is described below

commit cd53dda061e1d626300c3395840dfd667f92c4a3
Author: Patrice Dumas <pertusus@free.fr>
AuthorDate: Sat Mar 11 12:00:55 2023 +0100

    * tp/Texinfo/Convert/TexinfoMarkup.pm (_convert): determine if an
    accent command argument has braces in the same way as it is done in
    other converters by checking if argument type is not
    brace_command_arg.
---
 ChangeLog                           |  7 +++++++
 tp/TODO                             |  3 +--
 tp/Texinfo/Convert/TexinfoMarkup.pm |  2 +-
 tp/Texinfo/ParserNonXS.pm           | 16 ++++++++--------
 4 files changed, 17 insertions(+), 11 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index bcf5dbabb2..435888c40e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2023-03-11  Patrice Dumas  <pertusus@free.fr>
+
+       * tp/Texinfo/Convert/TexinfoMarkup.pm (_convert): determine if an
+       accent command argument has braces in the same way as it is done in
+       other converters by checking if argument type is not
+       brace_command_arg.
+
 2023-03-11  Patrice Dumas  <pertusus@free.fr>
 
        * tp/Texinfo/ParserNonXS.pm (_close_current, _handle_close_brace),
diff --git a/tp/TODO b/tp/TODO
index 4bd5b1588d..da2d49b90a 100644
--- a/tp/TODO
+++ b/tp/TODO
@@ -32,8 +32,7 @@ Tree documentation in ParserNonXS.pm
 
 elided_rawpreformatted, elided_brace_command_arg types.
 
-extra->'comment_at_end'
-likely in many line commands
+'comment_at_end' in info hash
 
 source marks.
 
diff --git a/tp/Texinfo/Convert/TexinfoMarkup.pm 
b/tp/Texinfo/Convert/TexinfoMarkup.pm
index ae34856918..90d3f9ae3f 100644
--- a/tp/Texinfo/Convert/TexinfoMarkup.pm
+++ b/tp/Texinfo/Convert/TexinfoMarkup.pm
@@ -659,7 +659,7 @@ sub _convert($$;$)
             push @$attributes, ['spacesaftercmd',
                $element->{'info'}->{'spaces_after_cmd_before_arg'}->{'text'}];
           }
-          if ($element->{'args'}->[0]->{'type'} eq 'following_arg') {
+          if ($element->{'args'}->[0]->{'type'} ne 'brace_command_arg') {
             push @$attributes, ['bracketed', 'off'];
           }
         }
diff --git a/tp/Texinfo/ParserNonXS.pm b/tp/Texinfo/ParserNonXS.pm
index e5768e4592..b5d6d8d4d8 100644
--- a/tp/Texinfo/ParserNonXS.pm
+++ b/tp/Texinfo/ParserNonXS.pm
@@ -8085,14 +8085,6 @@ This type is set for an @-command that is redefined by 
C<@definfoenclose>.
 The beginning is in C<< {'extra'}->{'begin'} >> and the end in
 C<< {'extra'}->{'end'} >>.
 
-=item following_arg
-
-This type is set for accent @-commands that don't use braces but instead
-have their argument after them, as
-
-  @~n
-  @ringaccent A
-
 =item index_entry_command
 
 This is the type of index entry command like C<@cindex>, and, more
@@ -8254,6 +8246,8 @@ with items (C<@table>, C<@multitable>, C<@enumerate>...).
 
 =item block_line_arg
 
+=item following_arg
+
 Those containers occur within the C<args> array of @-commands taking an
 argument.  I<brace_command_arg> is used for the arguments to commands
 taking arguments surrounded by braces (and in some cases separated by
@@ -8265,6 +8259,12 @@ line as their argument, such as C<@settitle>, C<@node>, 
C<@section>.
 I<block_line_arg> is similar but is used for commands that start a new block
 (which is to be ended with C<@end>).
 
+I<following_arg> is used for the accent @-commands argument that did not use
+braces but instead followed the @-command, possibly after a space, as
+
+  @~n
+  @ringaccent A
+
 For example
 
  @code{in code}