[7404] @synindex update ->{'merged_indices'}

[gavinsmith0123]

Revision: 7404
          http://svn.sv.gnu.org/viewvc/?view=rev&root=texinfo&revision=7404
Author:   gavin
Date:     2016-09-21 15:25:51 +0000 (Wed, 21 Sep 2016)
Log Message:
-----------
@synindex update ->{'merged_indices'}

Modified Paths:
--------------
    trunk/ChangeLog
    trunk/tp/Texinfo/Parser.pm
    trunk/tp/t/results/indices/def_syn_indices.pl

Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog     2016-09-21 14:16:41 UTC (rev 7403)
+++ trunk/ChangeLog     2016-09-21 15:25:51 UTC (rev 7404)
@@ -1,5 +1,11 @@
 2016-09-21  Gavin Smith  <address@hidden>
 
+       * tp/Texinfo/Parser.pm (_parse_line_command_args) <@synindex>: 
+       Update $self->{'merged_indices'} for any indices already merged
+       into the source index.
+
+2016-09-21  Gavin Smith  <address@hidden>
+
        * tp/Texinfo/Parser.pm (_parse_line_command_args) <@synindex>:
        Remove 'contained_indices' hash when an index is merged into 
        another index.  This simplifies the result in the following 

Modified: trunk/tp/Texinfo/Parser.pm
===================================================================
--- trunk/tp/Texinfo/Parser.pm  2016-09-21 14:16:41 UTC (rev 7403)
+++ trunk/tp/Texinfo/Parser.pm  2016-09-21 15:25:51 UTC (rev 7404)
@@ -5743,9 +5743,10 @@
           $in_code = 1 if ($command eq 'syncodeindex');
           $self->{'merged_indices'}->{$index_from} = $current_to;
           $index_from_info->{'in_code'} = $in_code;
-          foreach my $contained_index (keys 
%{$index_from_info->{'ontained_indices'}}) {
+          foreach my $contained_index (keys 
%{$index_from_info->{'contained_indices'}}) {
             $index_to_info->{'contained_indices'}->{$contained_index} = 1;
             $self->{'index_names'}->{$contained_index}->{'merged_in'} = 
$current_to;
+            $self->{'merged_indices'}->{$contained_index} = $current_to;
           }
           delete $index_from_info->{'contained_indices'};
           $index_from_info->{'merged_in'} = $current_to;

Modified: trunk/tp/t/results/indices/def_syn_indices.pl
===================================================================
--- trunk/tp/t/results/indices/def_syn_indices.pl       2016-09-21 14:16:41 UTC 
(rev 7403)
+++ trunk/tp/t/results/indices/def_syn_indices.pl       2016-09-21 15:25:51 UTC 
(rev 7404)
@@ -1991,12 +1991,12 @@
     'type' => 'warning'
   },
   {
-    'error_line' => ':57: warning: printing an index `abc\' merged in another 
one, `defg\'
+    'error_line' => ':57: warning: printing an index `abc\' merged in another 
one, `pg\'
 ',
     'file_name' => '',
     'line_nr' => 57,
     'macro' => '',
-    'text' => 'printing an index `abc\' merged in another one, `defg\'',
+    'text' => 'printing an index `abc\' merged in another one, `pg\'',
     'type' => 'warning'
   }
 ];
@@ -2071,7 +2071,7 @@
     }
   },
   'merged_indices' => {
-    'abc' => 'defg',
+    'abc' => 'pg',
     'cp' => 'fn',
     'defg' => 'pg',
     'ky' => 'pg',