[8232] no misc_content

[gavinsmith0123]

Revision: 8232
          http://svn.sv.gnu.org/viewvc/?view=rev&root=texinfo&revision=8232
Author:   gavin
Date:     2018-09-24 11:36:32 -0400 (Mon, 24 Sep 2018)
Log Message:
-----------
no misc_content

Modified Paths:
--------------
    trunk/ChangeLog
    trunk/tp/Texinfo/Common.pm
    trunk/tp/Texinfo/Structuring.pm
    trunk/tp/Texinfo/Transformations.pm

Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog     2018-09-24 13:01:50 UTC (rev 8231)
+++ trunk/ChangeLog     2018-09-24 15:36:32 UTC (rev 8232)
@@ -1,5 +1,14 @@
 2018-09-24  Gavin Smith  <address@hidden>
 
+       * tp/Texinfo/Common.pm (_copy_tree): Change a comment.
+       * tp/Texinfo/Structuring.pm (_print_root_command_texi),
+       * tp/Texinfo/Transformations.pm (insert_nodes_for_sectioning_commands)
+       (print_down_menus): Use 'args' instead of 'misc_content'.
+       * tp/Texinfo/Transformations.pm (fill_gaps_in_sectioning): Do 
+       not set 'misc_content'.
+
+2018-09-24  Gavin Smith  <address@hidden>
+
        * tp/Texinfo/Convert/Converter.pm 
        (_sectioning_command_normalized_filename),
        * tp/Texinfo/Convert/DocBook.pm (_convert),

Modified: trunk/tp/Texinfo/Common.pm
===================================================================
--- trunk/tp/Texinfo/Common.pm  2018-09-24 13:01:50 UTC (rev 8231)
+++ trunk/tp/Texinfo/Common.pm  2018-09-24 15:36:32 UTC (rev 8232)
@@ -1787,8 +1787,7 @@
 # extra->index_entry extra->type
 #
 # extra that should point to other elements: 
-# command_as_argument
-# @brace_command_contents @misc_content end_command
+# command_as_argument end_command
 # associated_section part_associated_section associated_node associated_part
 # @prototypes @columnfractions titlepage quotation @author command
 # menu_entry_description menu_entry_name

Modified: trunk/tp/Texinfo/Structuring.pm
===================================================================
--- trunk/tp/Texinfo/Structuring.pm     2018-09-24 13:01:50 UTC (rev 8231)
+++ trunk/tp/Texinfo/Structuring.pm     2018-09-24 15:36:32 UTC (rev 8232)
@@ -1105,7 +1105,7 @@
     if ($command->{'cmdname'} eq 'node') {
       $tree = $command->{'extra'}->{'node_content'};
     } elsif ($sectioning_commands{$command->{'cmdname'}}) {
-      $tree = $command->{'extra'}->{'misc_content'};
+      $tree = $command->{'args'}->[0]->{'contents'};
     }
   } else {
     return "Not a root command";

Modified: trunk/tp/Texinfo/Transformations.pm
===================================================================
--- trunk/tp/Texinfo/Transformations.pm 2018-09-24 13:01:50 UTC (rev 8231)
+++ trunk/tp/Texinfo/Transformations.pm 2018-09-24 15:36:32 UTC (rev 8232)
@@ -1,7 +1,7 @@
 # Transformations.pm: some transformations of the document tree
 #
-# Copyright 2010, 2011, 2012, 2013, 2014, 2015, 2016 Free Software Foundation, 
-# Inc.
+# Copyright 2010, 2011, 2012, 2013, 2014, 2015, 2016, 2017 2018
+# Free Software Foundation, Inc.
 # 
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -124,9 +124,6 @@
              = [{'type' => 'brace_command_arg',
                  'contents' => [],
                  'parent' => $new_section->{'args'}->[0]->{'contents'}->[1]}];
-          my @misc_contents = @{$new_section->{'args'}->[0]->{'contents'}};
-          Texinfo::Common::trim_spaces_comment_from_content(address@hidden);
-          $new_section->{'extra'}->{'misc_content'} = address@hidden;
           push @contents, $new_section;
           push @added_sections, $new_section;
           #print STDERR "  -> "._print_root_command_texi($new_section)."\n";
@@ -323,7 +320,7 @@
         $new_node_tree = {'contents' => [{'text' => 'Top'}]};
       } else {
         $new_node_tree = Texinfo::Common::copy_tree({'contents' 
-          => $content->{'extra'}->{'misc_content'}});
+          => $content->{'args'}->[0]->{'contents'}});
       }
       my $new_node = _new_node($self, $new_node_tree);
       if (defined($new_node)) {
@@ -506,10 +503,11 @@
       # Prepend node title
       my $node_title_contents;
       if ($node->{'extra'}->{'associated_section'}
-          and $node->{'extra'}->{'associated_section'}->{'extra'}
-          and 
$node->{'extra'}->{'associated_section'}->{'extra'}->{'misc_content'}) {
+          and $node->{'extra'}->{'associated_section'}->{'args'}
+          and $node->{'extra'}->{'associated_section'}->{'args'}->[0]
+          and 
$node->{'extra'}->{'associated_section'}->{'args'}->[0]->{'contents'}) {
         $node_title_contents
-          = 
_copy_contents($node->{'extra'}->{'associated_section'}->{'extra'}->{'misc_content'});
+          = 
_copy_contents($node->{'extra'}->{'associated_section'}->{'args'}->[0]->{'contents'});
       } else {
         $node_title_contents = 
_copy_contents($node->{'extra'}->{'node_content'});
       }