[7975] replace use of brace_command_contents array

[gavinsmith0123]

Revision: 7975
          http://svn.sv.gnu.org/viewvc/?view=rev&root=texinfo&revision=7975
Author:   gavin
Date:     2017-10-26 17:59:36 -0400 (Thu, 26 Oct 2017)
Log Message:
-----------
replace use of brace_command_contents array

Modified Paths:
--------------
    trunk/ChangeLog
    trunk/tp/Texinfo/Convert/TexinfoXML.pm

Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog     2017-10-26 21:36:54 UTC (rev 7974)
+++ trunk/ChangeLog     2017-10-26 21:59:36 UTC (rev 7975)
@@ -1,5 +1,11 @@
 2017-10-26  Gavin Smith  <address@hidden>
 
+       * tp/Texinfo/Convert/TexinfoXML.pm (_convert): Replace use
+       of 'brace_command_contents' array in the 'extra' hash with
+       the 'args' in the main tree.
+
+2017-10-26  Gavin Smith  <address@hidden>
+
        * tp/Texinfo/Parser.pm (_isolate_last_space): For 
        'brace_command_arg' only, save trailing spaces in 
        'spaces_after_argument' extra value instead of adding a 

Modified: trunk/tp/Texinfo/Convert/TexinfoXML.pm
===================================================================
--- trunk/tp/Texinfo/Convert/TexinfoXML.pm      2017-10-26 21:36:54 UTC (rev 
7974)
+++ trunk/tp/Texinfo/Convert/TexinfoXML.pm      2017-10-26 21:59:36 UTC (rev 
7975)
@@ -1134,10 +1134,10 @@
           push @{$self->{'document_context'}}, {'monospace' => [0]};
           $self->{'document_context'}->[-1]->{'raw'} = 1;
         }
-        if (scalar (@{$root->{'extra'}->{'brace_command_contents'}}) == 2
-            and defined($root->{'extra'}->{'brace_command_contents'}->[-1])) {
+        if (scalar (@{$root->{'args'}}) == 2
+              and @{$root->{'args'}->[-1]->{'contents'}}) {
           $result .= $self->_convert({'contents' 
-                        => 
$root->{'extra'}->{'brace_command_contents'}->[-1]});
+                        => $root->{'args'}->[-1]->{'contents'}});
         }
         if ($root->{'cmdname'} eq 'inlineraw') {
           pop @{$self->{'document_context'}};
@@ -1209,7 +1209,7 @@
           push @$attribute, ('where', 'inline');
         }
       } elsif ($Texinfo::Common::ref_commands{$root->{'cmdname'}}) {
-        if ($root->{'extra'}->{'brace_command_contents'}) {
+        if ($root->{'args'}) {
           my $normalized;
           if ($root->{'extra'}->{'node_argument'}
               and $root->{'extra'}->{'node_argument'}->{'node_content'}) {
@@ -1228,9 +1228,9 @@
           if ($root->{'cmdname'} eq 'inforef') {
             $manual_arg_index = 2;
           }
-          if 
($root->{'extra'}->{'brace_command_contents'}->[$manual_arg_index]) {
+          if (@{$root->{'args'}->[$manual_arg_index]->{'contents'}}) {
             $manual = Texinfo::Convert::Text::convert({'contents'
-             => 
$root->{'extra'}->{'brace_command_contents'}->[$manual_arg_index]}, 
+                     => $root->{'args'}->[$manual_arg_index]->{'contents'}},
                       {'code' => 1,
                        Texinfo::Common::_convert_text_options($self)});
           }