texinfo-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

branch master updated: * tp/Texinfo/Common.pm, tp/Texinfo/Convert/DocBoo


From: Patrice Dumas
Subject: branch master updated: * tp/Texinfo/Common.pm, tp/Texinfo/Convert/DocBook.pm, tp/Texinfo/Convert/HTML.pm, tp/Texinfo/Convert/LaTeX.pm, tp/Texinfo/Convert/Plaintext.pm, tp/Texinfo/Convert/TexinfoMarkup.pm, tp/Texinfo/Convert/Text.pm, tp/Texinfo/ParserNonXS.pm (_process_remaining_on_line), tp/Texinfo/XS/parsetexi/command_data.txt, tp/Texinfo/XS/parsetexi/commands.h, tp/Texinfo/XS/parsetexi/parser.c (check_valid_nesting), tp/Texinfo/XS/parsetexi/separator.c (handle_open_brace, handle_close_brace, handle_comma): rep [...]
Date: Fri, 30 Sep 2022 12:09:14 -0400

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 050efe1f33 * tp/Texinfo/Common.pm, tp/Texinfo/Convert/DocBook.pm, 
tp/Texinfo/Convert/HTML.pm, tp/Texinfo/Convert/LaTeX.pm, 
tp/Texinfo/Convert/Plaintext.pm, tp/Texinfo/Convert/TexinfoMarkup.pm, 
tp/Texinfo/Convert/Text.pm, tp/Texinfo/ParserNonXS.pm 
(_process_remaining_on_line), tp/Texinfo/XS/parsetexi/command_data.txt, 
tp/Texinfo/XS/parsetexi/commands.h, tp/Texinfo/XS/parsetexi/parser.c 
(check_valid_nesting), tp/Texinfo/XS/parsetexi/separator.c (handle_open_brace, 
handle_close_brac [...]
050efe1f33 is described below

commit 050efe1f33c1d4510f1e11afa8239748fe75d7f3
Author: Patrice Dumas <pertusus@free.fr>
AuthorDate: Fri Sep 30 18:09:01 2022 +0200

    * tp/Texinfo/Common.pm, tp/Texinfo/Convert/DocBook.pm,
    tp/Texinfo/Convert/HTML.pm, tp/Texinfo/Convert/LaTeX.pm,
    tp/Texinfo/Convert/Plaintext.pm, tp/Texinfo/Convert/TexinfoMarkup.pm,
    tp/Texinfo/Convert/Text.pm, tp/Texinfo/ParserNonXS.pm
    (_process_remaining_on_line),
    tp/Texinfo/XS/parsetexi/command_data.txt,
    tp/Texinfo/XS/parsetexi/commands.h, tp/Texinfo/XS/parsetexi/parser.c
    (check_valid_nesting), tp/Texinfo/XS/parsetexi/separator.c
    (handle_open_brace, handle_close_brace, handle_comma): replace
    %inline_commands/CF_inline with the brace command inline type/BRACE_inline.
---
 ChangeLog                                | 13 +++++++++++++
 tp/Texinfo/Common.pm                     | 12 +++---------
 tp/Texinfo/Convert/DocBook.pm            |  2 +-
 tp/Texinfo/Convert/HTML.pm               |  4 ++--
 tp/Texinfo/Convert/LaTeX.pm              |  7 ++++---
 tp/Texinfo/Convert/Plaintext.pm          |  7 ++++---
 tp/Texinfo/Convert/TexinfoMarkup.pm      | 18 +++++++++++-------
 tp/Texinfo/Convert/Text.pm               |  6 ++++--
 tp/Texinfo/ParserNonXS.pm                | 21 ++++++++++-----------
 tp/Texinfo/XS/parsetexi/command_data.txt | 11 ++++++-----
 tp/Texinfo/XS/parsetexi/commands.h       |  2 ++
 tp/Texinfo/XS/parsetexi/parser.c         |  3 +--
 tp/Texinfo/XS/parsetexi/separator.c      | 13 ++++++-------
 13 files changed, 67 insertions(+), 52 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index dbf5341513..24f281c1e7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,16 @@
+2022-09-30  Patrice Dumas  <pertusus@free.fr>
+
+       * tp/Texinfo/Common.pm, tp/Texinfo/Convert/DocBook.pm,
+       tp/Texinfo/Convert/HTML.pm, tp/Texinfo/Convert/LaTeX.pm,
+       tp/Texinfo/Convert/Plaintext.pm, tp/Texinfo/Convert/TexinfoMarkup.pm,
+       tp/Texinfo/Convert/Text.pm, tp/Texinfo/ParserNonXS.pm
+       (_process_remaining_on_line),
+       tp/Texinfo/XS/parsetexi/command_data.txt,
+       tp/Texinfo/XS/parsetexi/commands.h, tp/Texinfo/XS/parsetexi/parser.c
+       (check_valid_nesting), tp/Texinfo/XS/parsetexi/separator.c
+       (handle_open_brace, handle_close_brace, handle_comma): replace
+       %inline_commands/CF_inline with the brace command inline 
type/BRACE_inline.
+
 2022-09-30  Patrice Dumas  <pertusus@free.fr>
 
        * tp/Texinfo/Common.pm (%in_heading_spec_commands),
diff --git a/tp/Texinfo/Common.pm b/tp/Texinfo/Common.pm
index 02722e633c..efa8210bc5 100644
--- a/tp/Texinfo/Common.pm
+++ b/tp/Texinfo/Common.pm
@@ -795,13 +795,11 @@ foreach my $explained_command ('abbr', 'acronym') {
 }
 
 our %inline_format_commands;
-our %inline_commands;
 foreach my $inline_format_command ('inlineraw', 'inlinefmt',
         'inlinefmtifelse') {
   $inline_format_commands{$inline_format_command} = 1;
   $commands_args_number{$inline_format_command} = 2;
-  $brace_commands{$inline_format_command} = 'arguments';
-  $inline_commands{$inline_format_command} = 1;
+  $brace_commands{$inline_format_command} = 'inline';
 }
 
 $commands_args_number{'inlinefmtifelse'} = 3;
@@ -810,8 +808,7 @@ our %inline_conditional_commands;
 foreach my $inline_conditional_command ('inlineifclear', 'inlineifset') {
   $inline_conditional_commands{$inline_conditional_command} = 1;
   $commands_args_number{$inline_conditional_command} = 2;
-  $brace_commands{$inline_conditional_command} = 'arguments';
-  $inline_commands{$inline_conditional_command} = 1;
+  $brace_commands{$inline_conditional_command} = 'inline';
 }
 
 foreach my $two_arg_command('email') {
@@ -1187,7 +1184,7 @@ our %preamble_commands;
 foreach my $preamble_command ('direnty', 'hyphenation', 'errormsg',
        'inlineraw', '*', keys(%document_settable_at_commands),
        (grep {$block_commands{$_} eq 'format_raw'} keys(%block_commands)),
-       keys(%inline_commands),
+       keys(%inline_format_commands), keys(%inline_conditional_commands),
        keys(%unformatted_block_commands), keys(%misc_commands),
        keys(%region_commands)) {
   $preamble_commands{$preamble_command} = 1;
@@ -3094,12 +3091,9 @@ X<C<%in_heading_spec_commands>>
 Special @-commands appearing in custom headings, such as C<@thischapter>
 or C<@thistitle>.
 
-=item %inline_commands
-
 =item %inline_conditional_commands
 
 =item %inline_format_commands
-X<C<%inline_commands>>
 X<C<%inline_conditional_commands>>
 X<C<%inline_format_commands>>
 
diff --git a/tp/Texinfo/Convert/DocBook.pm b/tp/Texinfo/Convert/DocBook.pm
index 490fee0df5..7cc82c6d6a 100644
--- a/tp/Texinfo/Convert/DocBook.pm
+++ b/tp/Texinfo/Convert/DocBook.pm
@@ -1402,7 +1402,7 @@ sub _convert($$;$)
         }
         return $result;
 
-      } elsif ($Texinfo::Common::inline_commands{$element->{'cmdname'}}) {
+      } elsif ($Texinfo::Common::brace_commands{$element->{'cmdname'}} eq 
'inline') {
         my $expand = 0;
         if ($Texinfo::Common::inline_format_commands{$element->{'cmdname'}}) {
           if ($element->{'cmdname'} eq 'inlinefmtifelse'
diff --git a/tp/Texinfo/Convert/HTML.pm b/tp/Texinfo/Convert/HTML.pm
index 647fafd219..02ed9d196e 100644
--- a/tp/Texinfo/Convert/HTML.pm
+++ b/tp/Texinfo/Convert/HTML.pm
@@ -108,7 +108,6 @@ my %root_commands = %Texinfo::Common::root_commands;
 my %preformatted_commands = %Texinfo::Common::preformatted_commands;
 my %math_commands = %Texinfo::Common::math_commands;
 my %explained_commands = %Texinfo::Common::explained_commands;
-my %inline_commands = %Texinfo::Common::inline_commands;
 my %inline_format_commands = %Texinfo::Common::inline_format_commands;
 my %brace_code_commands       = %Texinfo::Common::brace_code_commands;
 my %preformatted_code_commands = %Texinfo::Common::preformatted_code_commands;
@@ -3903,7 +3902,8 @@ sub _convert_inline_command($$$$)
   return '';
 }
 
-foreach my $command (keys(%inline_commands)) {
+foreach my $command (grep {$brace_commands{$_} eq 'inline'}
+                           keys(%brace_commands)) {
   $default_commands_conversion{$command} = \&_convert_inline_command;
 }
 
diff --git a/tp/Texinfo/Convert/LaTeX.pm b/tp/Texinfo/Convert/LaTeX.pm
index 8c3bec7c56..9f083a5d86 100644
--- a/tp/Texinfo/Convert/LaTeX.pm
+++ b/tp/Texinfo/Convert/LaTeX.pm
@@ -233,7 +233,6 @@ my %preformatted_commands = 
%Texinfo::Common::preformatted_commands;
 my %math_commands = %Texinfo::Common::math_commands;
 my %explained_commands = %Texinfo::Common::explained_commands;
 my %inline_format_commands = %Texinfo::Common::inline_format_commands;
-my %inline_commands = %Texinfo::Common::inline_commands;
 my %brace_code_commands       = %Texinfo::Common::brace_code_commands;
 my %preformatted_code_commands = %Texinfo::Common::preformatted_code_commands;
 my %default_index_commands = %Texinfo::Common::default_index_commands;
@@ -2209,7 +2208,8 @@ sub _convert($$)
   if ((defined($type) and $self->{'ignored_types'}->{$type})
        or (defined($cmdname)
             and ($self->{'ignored_commands'}->{$cmdname}
-                 or ($inline_commands{$cmdname}
+                 or ($Texinfo::Common::brace_commands{$cmdname}
+                     and $Texinfo::Common::brace_commands{$cmdname} eq 'inline'
                      and $cmdname ne 'inlinefmtifelse'
                      and (($inline_format_commands{$cmdname}
                           and (!$element->{'extra'}->{'format'}
@@ -2965,7 +2965,8 @@ sub _convert($$)
         }
       }
       return $result;
-    } elsif ($inline_commands{$cmdname}) {
+    } elsif ($Texinfo::Common::brace_commands{$cmdname}
+             and $Texinfo::Common::brace_commands{$cmdname} eq 'inline') {
       my $arg_index = 1;
       if ($cmdname eq 'inlinefmtifelse'
           and (!$element->{'extra'}->{'format'}
diff --git a/tp/Texinfo/Convert/Plaintext.pm b/tp/Texinfo/Convert/Plaintext.pm
index 4fe0fac5cf..66ff426b77 100644
--- a/tp/Texinfo/Convert/Plaintext.pm
+++ b/tp/Texinfo/Convert/Plaintext.pm
@@ -100,7 +100,6 @@ my %preformatted_commands = 
%Texinfo::Common::preformatted_commands;
 my %math_commands = %Texinfo::Common::math_commands;
 my %explained_commands = %Texinfo::Common::explained_commands;
 my %inline_format_commands = %Texinfo::Common::inline_format_commands;
-my %inline_commands = %Texinfo::Common::inline_commands;
 my %brace_code_commands       = %Texinfo::Common::brace_code_commands;
 my %preformatted_code_commands = %Texinfo::Common::preformatted_code_commands;
 my %default_index_commands = %Texinfo::Common::default_index_commands;
@@ -1577,7 +1576,8 @@ sub _convert($$)
   if (($element->{'type'} and $self->{'ignored_types'}->{$element->{'type'}})
        or ($element->{'cmdname'}
             and ($self->{'ignored_commands'}->{$element->{'cmdname'}}
-                 or ($inline_commands{$element->{'cmdname'}}
+                 or ($brace_commands{$element->{'cmdname'}}
+                     and $brace_commands{$element->{'cmdname'}} eq 'inline'
                      and $element->{'cmdname'} ne 'inlinefmtifelse'
                      and (($inline_format_commands{$element->{'cmdname'}}
                           and (!$element->{'extra'}->{'format'}
@@ -2320,7 +2320,8 @@ sub _convert($$)
         }
       }
       return '';
-    } elsif ($inline_commands{$command}) {
+    } elsif ($brace_commands{$command}
+             and $brace_commands{$command} eq 'inline') {
       my $arg_index = 1;
       if ($command eq 'inlinefmtifelse'
           and (!$element->{'extra'}->{'format'}
diff --git a/tp/Texinfo/Convert/TexinfoMarkup.pm 
b/tp/Texinfo/Convert/TexinfoMarkup.pm
index 1300ba730d..6ea1c49b2f 100644
--- a/tp/Texinfo/Convert/TexinfoMarkup.pm
+++ b/tp/Texinfo/Convert/TexinfoMarkup.pm
@@ -195,14 +195,18 @@ foreach my $explained_command 
(keys(%Texinfo::Common::explained_commands)) {
                                                  "${explained_command}desc"];
 }
 
-foreach my $inline_command (keys(%Texinfo::Common::inline_commands)) {
-  $commands_args_elements{$inline_command} = ["${inline_command}format",
-                                              "${inline_command}content"];
-}
+foreach my $brace_command (keys(%Texinfo::Common::brace_commands)) {
+  if ($Texinfo::Common::brace_commands{$brace_command} eq 'inline') {
+    if ($brace_command eq 'inlinefmtifelse') {
+      $commands_args_elements{$brace_command} = ["${brace_command}format",
+             "${brace_command}contentif", "${brace_command}contentelse"];
 
-my $inline_command = 'inlinefmtifelse';
-$commands_args_elements{$inline_command} = ["${inline_command}format",
-             "${inline_command}contentif", "${inline_command}contentelse"];
+    } else {
+      $commands_args_elements{$brace_command} = ["${brace_command}format",
+                                                 "${brace_command}content"];
+    }
+  }
+}
 
 my %defcommand_name_type = (
  'deffn'     => 'function',
diff --git a/tp/Texinfo/Convert/Text.pm b/tp/Texinfo/Convert/Text.pm
index bf9ebfc071..bf971a9d74 100644
--- a/tp/Texinfo/Convert/Text.pm
+++ b/tp/Texinfo/Convert/Text.pm
@@ -386,7 +386,8 @@ sub _convert($;$)
                  or ($ignored_block_commands{$element->{'cmdname'}}
                      and !(defined($options->{'expanded_formats_hash'})
                            and 
$options->{'expanded_formats_hash'}->{$element->{'cmdname'}}))
-                 or ($Texinfo::Common::inline_commands{$element->{'cmdname'}}
+                 or ($Texinfo::Common::brace_commands{$element->{'cmdname'}}
+                     and 
$Texinfo::Common::brace_commands{$element->{'cmdname'}} eq 'inline'
                      and $element->{'cmdname'} ne 'inlinefmtifelse'
                      and 
(($Texinfo::Common::inline_format_commands{$element->{'cmdname'}}
                           and (!$element->{'extra'}->{'format'}
@@ -494,7 +495,8 @@ sub _convert($;$)
       } else {
         return _convert($element->{'args'}->[0], $options);
       }
-    } elsif ($Texinfo::Common::inline_commands{$element->{'cmdname'}}) {
+    } elsif ($Texinfo::Common::brace_commands{$element->{'cmdname'}}
+             and $Texinfo::Common::brace_commands{$element->{'cmdname'}} eq 
'inline') {
       $options->{'raw'} = 1 if ($element->{'cmdname'} eq 'inlineraw');
       my $arg_index = 1;
       if ($element->{'cmdname'} eq 'inlinefmtifelse'
diff --git a/tp/Texinfo/ParserNonXS.pm b/tp/Texinfo/ParserNonXS.pm
index 32a4b96d75..e59029117a 100644
--- a/tp/Texinfo/ParserNonXS.pm
+++ b/tp/Texinfo/ParserNonXS.pm
@@ -287,7 +287,6 @@ my %in_heading_spec_commands  = 
%Texinfo::Common::in_heading_spec_commands;
 my %in_index_commands         = %Texinfo::Common::in_index_commands;
 my %explained_commands        = %Texinfo::Common::explained_commands;
 my %inline_format_commands    = %Texinfo::Common::inline_format_commands;
-my %inline_commands           = %Texinfo::Common::inline_commands;
 my %all_commands              = %Texinfo::Common::all_commands;
 
 # equivalence between a @set flag and an @@-command
@@ -461,8 +460,7 @@ delete $simple_text_commands{'center'};
 delete $simple_text_commands{'exdent'};
 
 foreach my $command (keys (%brace_commands)) {
-  if ($brace_commands{$command} eq 'arguments'
-      and !$inline_commands{$command}) {
+  if ($brace_commands{$command} eq 'arguments') {
     $simple_text_commands{$command} = 1;
   }
 }
@@ -5264,9 +5262,10 @@ sub _process_remaining_on_line($$$$)
           };
         } else {
           $current->{'type'} = 'brace_command_arg';
-          # Commands that disregard leading and trailing whitespace.
+          # Commands that disregard leading whitespace.
           if ($brace_commands{$command}
-              and $brace_commands{$command} eq 'arguments') {
+              and ($brace_commands{$command} eq 'arguments'
+                   or $brace_commands{$command} eq 'inline')) {
             # internal_spaces_before_argument is a transient internal type,
             # which should end up in extra spaces_before_argument.
             push @{$current->{'contents'}}, {
@@ -5348,9 +5347,7 @@ sub _process_remaining_on_line($$$$)
         if ($brace_commands{$current->{'parent'}->{'cmdname'}}
             and $brace_commands{$current->{'parent'}{'cmdname'}} eq 'arguments'
             and $current->{'parent'}->{'cmdname'} ne 'math') {
-          # @inline* always have end spaces considered as normal text
-          _isolate_last_space($self, $current)
-            unless ($inline_commands{$current->{'parent'}->{'cmdname'}});
+          _isolate_last_space($self, $current);
         }
         my $closed_command = $current->{'parent'}->{'cmdname'};
         print STDERR "CLOSING(brace) \@$current->{'parent'}->{'cmdname'}\n"
@@ -5457,9 +5454,10 @@ sub _process_remaining_on_line($$$$)
             }
           }
         } elsif ($explained_commands{$current->{'parent'}->{'cmdname'}}
-                 or $inline_commands{$current->{'parent'}->{'cmdname'}}) {
+                 or ($brace_commands{$current->{'parent'}->{'cmdname'}}
+                     and $brace_commands{$current->{'parent'}->{'cmdname'}} eq 
'inline')) {
           my $current_command = $current->{'parent'};
-          if ($inline_commands{$current_command->{'cmdname'}}) {
+          if ($brace_commands{$current_command->{'cmdname'}} eq 'inline') {
             if ($current_command->{'cmdname'} eq 'inlineraw') {
               $self->_pop_context(['ct_inlineraw'], $source_info, $current,
                                   ' inlineraw');
@@ -5577,7 +5575,8 @@ sub _process_remaining_on_line($$$$)
       _isolate_last_space($self, $current);
       my $type = $current->{'type'};
       $current = $current->{'parent'};
-      if ($inline_commands{$current->{'cmdname'}}) {
+      if ($brace_commands{$current->{'cmdname'}}
+          and $brace_commands{$current->{'cmdname'}} eq 'inline') {
         my $expandp = 0;
         #$current->{'extra'} = {} if (!$current->{'extra'});
         if (! $current->{'extra'}->{'format'}) {
diff --git a/tp/Texinfo/XS/parsetexi/command_data.txt 
b/tp/Texinfo/XS/parsetexi/command_data.txt
index 3bf6020ccf..b6d04228e1 100644
--- a/tp/Texinfo/XS/parsetexi/command_data.txt
+++ b/tp/Texinfo/XS/parsetexi/command_data.txt
@@ -328,14 +328,15 @@ math                    brace,math                      
BRACE_context
 abbr                    brace                           BRACE_arguments     2
 acronym                 brace                           BRACE_arguments     2
 
+# leading space is ignored in inline brace commands, not trailing space
 # inline format command
-inlineraw               brace,inline                    BRACE_arguments     2
-inlinefmt               brace,inline                    BRACE_arguments     2
-inlinefmtifelse         brace,inline                    BRACE_arguments     3
+inlineraw               brace                           BRACE_inline        2
+inlinefmt               brace                           BRACE_inline        2
+inlinefmtifelse         brace                           BRACE_inline        3
 
 # inline conditional commands
-inlineifclear           brace,inline                    BRACE_arguments     2
-inlineifset             brace,inline                    BRACE_arguments     2
+inlineifclear           brace                           BRACE_inline        2
+inlineifset             brace                           BRACE_inline        2
 
 email                   brace                           BRACE_arguments     2
 
diff --git a/tp/Texinfo/XS/parsetexi/commands.h 
b/tp/Texinfo/XS/parsetexi/commands.h
index f01e7c2c15..d05f86cc3e 100644
--- a/tp/Texinfo/XS/parsetexi/commands.h
+++ b/tp/Texinfo/XS/parsetexi/commands.h
@@ -84,6 +84,7 @@ void wipe_user_commands (void);
 #define CF_item_line                   0x02000000
 #define CF_nobrace                     0x04000000
 #define CF_blockitem                   0x08000000
+/* CF_inline is not used */
 #define CF_inline                      0x10000000
 #define CF_MACRO                       0x20000000
 #define CF_index_entry_command         0x40000000
@@ -131,6 +132,7 @@ void wipe_user_commands (void);
 #define BRACE_style_no_code -6
 #define BRACE_other -7
 #define BRACE_special -8
+#define BRACE_inline -9
 
 /* Types of internal commands (CF_internal). */
 #define INTERNAL_brace -1
diff --git a/tp/Texinfo/XS/parsetexi/parser.c b/tp/Texinfo/XS/parsetexi/parser.c
index dfcbbea6c0..e6e119022d 100644
--- a/tp/Texinfo/XS/parsetexi/parser.c
+++ b/tp/Texinfo/XS/parsetexi/parser.c
@@ -928,8 +928,7 @@ check_valid_nesting (ELEMENT *current, enum command_id cmd)
             && outer != CM_center
             && outer != CM_exdent)
       || ((outer_flags & CF_brace)
-           && !(outer_flags & CF_inline)
-           && command_data(outer).data > 0)
+           && command_data(outer).data == BRACE_arguments)
       || outer == CM_shortcaption
       || outer == CM_math
       || (outer_flags & CF_index_entry_command)
diff --git a/tp/Texinfo/XS/parsetexi/separator.c 
b/tp/Texinfo/XS/parsetexi/separator.c
index 47fc44c1bc..dd1c49b60a 100644
--- a/tp/Texinfo/XS/parsetexi/separator.c
+++ b/tp/Texinfo/XS/parsetexi/separator.c
@@ -136,8 +136,9 @@ handle_open_brace (ELEMENT *current, char **line_inout)
         {
           current->type = ET_brace_command_arg;
 
-          /* Commands that disregard leading and trailing whitespace. */
-          if (command_data(command).data == BRACE_arguments)
+          /* Commands that disregard leading whitespace. */
+          if (command_data(command).data == BRACE_arguments
+              || command_data(command).data == BRACE_inline)
             {
               ELEMENT *e;
               e = new_element (ET_internal_spaces_before_argument);
@@ -251,9 +252,7 @@ handle_close_brace (ELEMENT *current, char **line_inout)
       /* determine if trailing spaces are ignored */
       else if (command_data(current->parent->cmd).data == BRACE_arguments)
         {
-          /* @inline* always have end spaces considered as normal text */
-          if (!(command_flags(current->parent) & CF_inline))
-            isolate_last_space (current);
+          isolate_last_space (current);
         }
 
       closed_command = current->parent->cmd;
@@ -387,7 +386,7 @@ handle_close_brace (ELEMENT *current, char **line_inout)
                 }
             }
         }
-      else if ((command_data(closed_command).flags & CF_inline)
+      else if ((command_data(closed_command).data == BRACE_inline)
                || closed_command == CM_abbr
                || closed_command == CM_acronym)
         {
@@ -559,7 +558,7 @@ handle_comma (ELEMENT *current, char **line_inout)
   type = current->type;
   current = current->parent;
 
-  if (command_flags(current) & CF_inline)
+  if (command_data(current->cmd).data == BRACE_inline)
     {
       KEY_PAIR *k;
       int expandp = 0;



reply via email to

[Prev in Thread] Current Thread [Next in Thread]