[7122] set $float->{'extra'}->{'float_section'}

[Gavin D. Smith]

Revision: 7122
          http://svn.sv.gnu.org/viewvc/?view=rev&root=texinfo&revision=7122
Author:   gavin
Date:     2016-04-15 05:39:16 +0000 (Fri, 15 Apr 2016)
Log Message:
-----------
set $float->{'extra'}->{'float_section'}

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

Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog     2016-04-14 19:08:50 UTC (rev 7121)
+++ trunk/ChangeLog     2016-04-15 05:39:16 UTC (rev 7122)
@@ -1,5 +1,17 @@
 2016-04-14  Gavin Smith  <address@hidden>
 
+       * tp/Texinfo/Parser.pm (_end_line),
+       * tp/Texinfo/Structuring.pm (number_floats): Set
+       $float->{'extra'}->{'float_section'} instead of
+       $float->{'float_section'}, where $float is a @float element.
+
+2016-04-14  Gavin Smith  <address@hidden>
+
+       * tp/Texinfo/Parser.pm (_next_bracketed_or_word): Don't set 
+       parent field on created bracketed_def_content element.
+
+2016-04-14  Gavin Smith  <address@hidden>
+
        * doc/texinfo.tex (\scanmacro): Set catcode of @ to 0 so that 
        @-commands in macro expansions aren't printed literally in an 
        index, where \ is the escape character.

Modified: trunk/tp/Texinfo/Parser.pm
===================================================================
--- trunk/tp/Texinfo/Parser.pm  2016-04-14 19:08:50 UTC (rev 7121)
+++ trunk/tp/Texinfo/Parser.pm  2016-04-15 05:39:16 UTC (rev 7122)
@@ -2960,7 +2960,7 @@
       }
       push @{$self->{'floats'}->{$type}}, $float
         unless (_ignore_global_commands($self));
-      $float->{'float_section'} = $self->{'current_section'} 
+      $float->{'extra'}->{'float_section'} = $self->{'current_section'} 
         if (defined($self->{'current_section'}));
     }
     $current = $current->{'parent'};

Modified: trunk/tp/Texinfo/Structuring.pm
===================================================================
--- trunk/tp/Texinfo/Structuring.pm     2016-04-14 19:08:50 UTC (rev 7121)
+++ trunk/tp/Texinfo/Structuring.pm     2016-04-15 05:39:16 UTC (rev 7122)
@@ -1350,8 +1350,8 @@
                or !defined($float->{'extra'}->{'normalized'}));
       $float_index++;
       my $number;
-      if ($float->{'float_section'}) {
-        my $up = $float->{'float_section'};
+      if ($float->{'extra'}->{'float_section'}) {
+        my $up = $float->{'extra'}->{'float_section'};
         while ($up->{'section_up'} 
                #and $command_structuring_level{$up->{'cmdname'}} 
                and defined($up->{'section_up'}->{'cmdname'})