[7978] use args instead of brace_command_contents

[gavinsmith0123]

Revision: 7978
          http://svn.sv.gnu.org/viewvc/?view=rev&root=texinfo&revision=7978
Author:   gavin
Date:     2017-10-29 07:47:02 -0400 (Sun, 29 Oct 2017)
Log Message:
-----------
use args instead of brace_command_contents

Modified Paths:
--------------
    trunk/ChangeLog
    trunk/tp/Texinfo/Convert/HTML.pm
    trunk/tp/Texinfo/Convert/IXIN.pm
    trunk/tp/Texinfo/Convert/Info.pm

Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog     2017-10-29 10:17:52 UTC (rev 7977)
+++ trunk/ChangeLog     2017-10-29 11:47:02 UTC (rev 7978)
@@ -1,5 +1,12 @@
-2017-10-28  Gavin Smith  <address@hidden>
+2017-10-29  Gavin Smith  <address@hidden>
 
+       * tp/Texinfo/Convert/Plaintext.pm (_image),
+       * tp/Texinfo/Convert/IXIN.pm (output_ixin),
+       * tp/Texinfo/Convert/HTML.pm (_convert_explained_command, output):
+       Use 'args' array instead of 'brace_command_contents' array.
+
+2017-10-29  Gavin Smith  <address@hidden>
+
        * tp/Texinfo/Convert/Plaintext.pm (_convert)
        (_image_formatted_text, _image):
        Use 'args' array instead of 'brace_command_contents' array.

Modified: trunk/tp/Texinfo/Convert/HTML.pm
===================================================================
--- trunk/tp/Texinfo/Convert/HTML.pm    2017-10-29 10:17:52 UTC (rev 7977)
+++ trunk/tp/Texinfo/Convert/HTML.pm    2017-10-29 11:47:02 UTC (rev 7978)
@@ -1498,8 +1498,7 @@
   my $explanation_string;
   my $normalized_type
     = Texinfo::Convert::NodeNameNormalization::normalize_node(
-    {'contents' =>
-      $command->{'extra'}->{'brace_command_contents'}->[0]});
+    {'contents' => $command->{'args'}->[0]->{'contents'}});
 
   if ($args->[1] and defined($args->[1]->{'string'}) 
                  and $args->[1]->{'string'} =~ /\S/) {
@@ -1512,7 +1511,7 @@
     $explanation_result = $self->convert_tree( $args->[1]->{'tree'} );
 
     $self->{'explained_commands'}->{$cmdname}->{$normalized_type} =
-       $command->{'extra'}->{'brace_command_contents'}->[1];
+       $command->{'args'}->[1]->{'contents'};
   } elsif ($command->{'extra'}->{'explanation_contents'}) {
     if (@{$command->{'extra'}->{'explanation_contents'}}) {
       $explanation_string = $self->convert_tree_new_formatting_context(
@@ -6881,9 +6880,9 @@
     }
   }
   if (!$fulltitle and $self->{'extra'}->{'titlefont'}
-      and $self->{'extra'}->{'titlefont'}->[0]->{'extra'}
-      and 
$self->{'extra'}->{'titlefont'}->[0]->{'extra'}->{'brace_command_contents'}
-      and 
defined($self->{'extra'}->{'titlefont'}->[0]->{'extra'}->{'brace_command_contents'}->[0]))
 {
+      and $self->{'extra'}->{'titlefont'}->[0]->{'args'}
+      and defined($self->{'extra'}->{'titlefont'}->[0]->{'args'}->[0])
+      and 
@{$self->{'extra'}->{'titlefont'}->[0]->{'args'}->[0]->{'contents'}}) {
     $fulltitle = $self->{'extra'}->{'titlefont'}->[0];
   }
   # prepare simpletitle

Modified: trunk/tp/Texinfo/Convert/IXIN.pm
===================================================================
--- trunk/tp/Texinfo/Convert/IXIN.pm    2017-10-29 10:17:52 UTC (rev 7977)
+++ trunk/tp/Texinfo/Convert/IXIN.pm    2017-10-29 11:47:02 UTC (rev 7978)
@@ -832,14 +832,16 @@
       my @extension;
       my $basefile;
       my $extension;
-      if (defined($command->{'extra'}->{'brace_command_contents'}->[0])) {
+      if (defined($command->{'args'}->[0])
+            and @{$command->{'args'}->[0]->{'contents'}}) {
         $basefile = Texinfo::Convert::Text::convert(
-          {'contents' => $command->{'extra'}->{'brace_command_contents'}->[0]},
+          {'contents' => $command->{'args'}->[0]->{'contents'}},
           {'code' => 1, Texinfo::Common::_convert_text_options($self)});
       }
-      if (defined($command->{'extra'}->{'brace_command_contents'}->[4])) {
+      if (defined($command->{'args'}->[4])
+            and @{$command->{'args'}->[4]->{'contents'}}) {
         $extension = Texinfo::Convert::Text::convert(
-          {'contents' => $command->{'extra'}->{'brace_command_contents'}->[0]},
+          {'contents' => $command->{'args'}->[4]->{'contents'}},
           {'code' => 1, Texinfo::Common::_convert_text_options($self)});
         $extension =~ s/^\.//;
         @extension = ($extension);

Modified: trunk/tp/Texinfo/Convert/Info.pm
===================================================================
--- trunk/tp/Texinfo/Convert/Info.pm    2017-10-29 10:17:52 UTC (rev 7977)
+++ trunk/tp/Texinfo/Convert/Info.pm    2017-10-29 11:47:02 UTC (rev 7978)
@@ -473,13 +473,15 @@
 
   my $lines_count = 0;
 
-  if (defined($root->{'extra'}->{'brace_command_contents'}->[0])) {
+  if (defined($root->{'args'}->[0])
+      and @{$root->{'args'}->[0]->{'contents'}}) {
     my $basefile = Texinfo::Convert::Text::convert(
-      {'contents' => $root->{'extra'}->{'brace_command_contents'}->[0]},
+      {'contents' => $root->{'args'}->[0]->{'contents'}},
       {'code' => 1, Texinfo::Common::_convert_text_options($self)});
-    if (defined($root->{'extra'}->{'brace_command_contents'}->[4])) {
+    if (defined($root->{'args'}->[4])
+        and @{$root->{'args'}->[4]->{'contents'}}) {
       my $extension = Texinfo::Convert::Text::convert(
-        {'contents' => $root->{'extra'}->{'brace_command_contents'}->[4]},
+        {'contents' => $root->{'args'}->[4]->{'contents'}},
         {'code' => 1, Texinfo::Common::_convert_text_options($self)});
       unshift @extensions, ".$extension";
       unshift @extensions, "$extension";
@@ -495,9 +497,10 @@
     }
     my ($text, $width) = $self->_image_text($root, $basefile);
     my $alt;
-    if (defined($root->{'extra'}->{'brace_command_contents'}->[3])) {
+    if (defined($root->{'args'}->[3])
+        and @{$root->{'args'}->[3]->{'contents'}}) {
      $alt = Texinfo::Convert::Text::convert(
-       {'contents' => $root->{'extra'}->{'brace_command_contents'}->[3]},
+       {'contents' => $root->{'args'}->[3]->{'contents'}},
        {Texinfo::Common::_convert_text_options($self)});
     }
 
@@ -508,7 +511,8 @@
       $image_file =~ s/\"/\\\"/g;
       $result = "\x{00}\x{08}[image src=\"$image_file\"";
 
-      if (defined($root->{'extra'}->{'brace_command_contents'}->[3])) {
+      if (defined($root->{'args'}->[3])
+          and @{$root->{'args'}->[3]->{'contents'}}) {
         $alt =~ s/\\/\\\\/g;
         $alt =~ s/\"/\\\"/g;
         $result .= " alt=\"$alt\"";