[7555] Structuring.pm do_index_keys

[gavinsmith0123]

Revision: 7555
          http://svn.sv.gnu.org/viewvc/?view=rev&root=texinfo&revision=7555
Author:   gavin
Date:     2016-12-18 15:34:25 +0000 (Sun, 18 Dec 2016)
Log Message:
-----------
Structuring.pm do_index_keys

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

Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog     2016-12-18 15:21:33 UTC (rev 7554)
+++ trunk/ChangeLog     2016-12-18 15:34:25 UTC (rev 7555)
@@ -1,3 +1,8 @@
+2016-12-18  Gavin Smith  <address@hidden>
+
+       * tp/Texinfo/Structuring.pm (do_index_keys): Explicitly list the 
+       commands to get the text of index entries for.
+
 2016-12-11  Gavin Smith  <address@hidden>
 
        * tp/Texinfo/Parser.pm (_end_line): For some index commands

Modified: trunk/tp/Texinfo/Structuring.pm
===================================================================
--- trunk/tp/Texinfo/Structuring.pm     2016-12-18 15:21:33 UTC (rev 7554)
+++ trunk/tp/Texinfo/Structuring.pm     2016-12-18 15:34:25 UTC (rev 7555)
@@ -1449,7 +1449,6 @@
           }
         }
         my $def_command = $entry->{'command'}->{'extra'}->{'def_command'};
-        my $command_index = $parser->{'command_index'};
 
         my $def_parsed_hash = 
$entry->{'command'}->{'extra'}->{'def_parsed_hash'}; 
         if ($def_parsed_hash and $def_parsed_hash->{'class'}
@@ -1458,7 +1457,10 @@
           # used for getting the translation.
           $self->{'documentlanguage'} = 
$entry->{'command'}->{'extra'}->{'documentlanguage'};
           delete $entry->{'command'}->{'extra'}->{'documentlanguage'};
-          if ($command_index->{$def_command} eq 'fn') {
+          if ($def_command eq 'defop'
+              or $def_command eq 'deftypeop'
+              or $def_command eq 'defmethod'
+              or $def_command eq 'deftypemethod') {
             $index_entry = $self->gdt('{name} on {class}',
                                   {'name' => $def_parsed_hash->{'name'},
                                    'class' => $def_parsed_hash->{'class'}});
@@ -1466,8 +1468,9 @@
              = [_non_bracketed_contents($def_parsed_hash->{'name'}),
                 { 'text' => ' on '},
                 _non_bracketed_contents($def_parsed_hash->{'class'})];
-          } elsif ($command_index->{$def_command} eq 'vr'
-                  and $def_command ne 'defcv') {
+          } elsif ($def_command eq 'defivar'
+                   or $def_command eq 'deftypeivar'
+                   or $def_command eq 'deftypecv') {
             $index_entry = $self->gdt('{name} of {class}',
                                      {'name' => $def_parsed_hash->{'name'},
                                      'class' => $def_parsed_hash->{'class'}});