[7704] check if inside index entry differently

[gavinsmith0123]

Revision: 7704
          http://svn.sv.gnu.org/viewvc/?view=rev&root=texinfo&revision=7704
Author:   gavin
Date:     2017-04-01 15:44:43 -0400 (Sat, 01 Apr 2017)
Log Message:
-----------
check if inside index entry differently

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

Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog     2017-04-01 18:42:25 UTC (rev 7703)
+++ trunk/ChangeLog     2017-04-01 19:44:43 UTC (rev 7704)
@@ -1,5 +1,14 @@
 2017-04-01  Gavin Smith  <address@hidden>
 
+       * tp/Texinfo/Parser.pm (_parse_texi) <@sortas>: Check if inside 
+       index entry differently.
+
+2017-04-01  Gavin Smith  <address@hidden>
+
+       * t/09indices.t (explicit_sort_key): New test.
+
+2017-04-01  Gavin Smith  <address@hidden>
+
        * tp/Texinfo/Parser.pm (_parse_texi) <close brace, @sortas>: Set 
        'sortas' value on index entry element.
        (_enter_index_entry): Set 'sortas' value on index entry from 

Modified: trunk/tp/Texinfo/Parser.pm
===================================================================
--- trunk/tp/Texinfo/Parser.pm  2017-04-01 18:42:25 UTC (rev 7703)
+++ trunk/tp/Texinfo/Parser.pm  2017-04-01 19:44:43 UTC (rev 7704)
@@ -5182,8 +5182,8 @@
               my $arg = $contents[0]->{'text'};
               if (defined($arg)) {
                 my $index_element = 
$current->{'parent'}->{'parent'}->{'parent'};
-                if ($index_element->{'type'}
-                    and $index_element->{'type'} eq 'index_entry_command') {
+                if ($index_element and $index_element->{'cmdname'}
+             and $self->{'command_index'}->{$index_element->{'cmdname'}}) {
                   $index_element->{'extra'}->{'sortas'} = $arg;
                 }
               }

Modified: trunk/tp/t/results/indices/explicit_sort_key.pl
===================================================================
(Binary files differ)