texinfo/tp Texinfo/Convert/Info.pm t/results/in...

[Patrice Dumas]

CVSROOT:        /sources/texinfo
Module name:    texinfo
Changes by:     Patrice Dumas <pertusus>        11/08/20 23:06:06

Modified files:
        tp/Texinfo/Convert: Info.pm 
        tp/t/results/info_tests: colon_in_index_entry.pl 

Log message:
        Better wording of colon in index entry for Info warning message by Karl.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/Texinfo/Convert/Info.pm?cvsroot=texinfo&r1=1.58&r2=1.59
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/info_tests/colon_in_index_entry.pl?cvsroot=texinfo&r1=1.1&r2=1.2

Patches:
Index: Texinfo/Convert/Info.pm
===================================================================
RCS file: /sources/texinfo/texinfo/tp/Texinfo/Convert/Info.pm,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -b -r1.58 -r1.59
--- Texinfo/Convert/Info.pm     20 Aug 2011 22:26:52 -0000      1.58
+++ Texinfo/Convert/Info.pm     20 Aug 2011 23:06:05 -0000      1.59
@@ -374,8 +374,9 @@
     $entry_text .= $self->convert_line($entry_tree, {'indent' => 0});
     next if ($entry_text !~ /\S/);
     if ($entry_text =~ /:/) {
-      $self->line_warn (sprintf($self->__("Index entry in address@hidden with 
a : will lead to invalid Info"),
-                                 $entry->{'index_at_command'}), 
+      $self->line_warn (sprintf($self->__("Index entry in address@hidden with 
: produces invalid Info: %s"),
+                                 $entry->{'index_at_command'},
+          Texinfo::Convert::Texinfo::convert($entry_tree)), 
                         $entry->{'command'}->{'line_nr'});
     }
 

Index: t/results/info_tests/colon_in_index_entry.pl
===================================================================
RCS file: 
/sources/texinfo/texinfo/tp/t/results/info_tests/colon_in_index_entry.pl,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- t/results/info_tests/colon_in_index_entry.pl        20 Aug 2011 22:26:57 
-0000      1.1
+++ t/results/info_tests/colon_in_index_entry.pl        20 Aug 2011 23:06:06 
-0000      1.2
@@ -887,36 +887,36 @@
 $result_converted_errors{'info'}->{'colon_in_index_entry'} = [
   {
     'file_name' => '',
-    'error_line' => ':8: warning: Index entry in @vtable with a : will lead to 
invalid Info
+    'error_line' => ':8: warning: Index entry in @vtable with : produces 
invalid Info: %main::value
 ',
-    'text' => 'Index entry in @vtable with a : will lead to invalid Info',
+    'text' => 'Index entry in @vtable with : produces invalid Info: 
%main::value',
     'type' => 'warning',
     'macro' => '',
     'line_nr' => 8
   },
   {
     'file_name' => '',
-    'error_line' => ':5: warning: Index entry in @cindex with a : will lead to 
invalid Info
+    'error_line' => ':5: warning: Index entry in @cindex with : produces 
invalid Info: a:b
 ',
-    'text' => 'Index entry in @cindex with a : will lead to invalid Info',
+    'text' => 'Index entry in @cindex with : produces invalid Info: a:b',
     'type' => 'warning',
     'macro' => '',
     'line_nr' => 5
   },
   {
     'file_name' => '',
-    'error_line' => ':11: warning: Index entry in @defvr with a : will lead to 
invalid Info
+    'error_line' => ':11: warning: Index entry in @defvr with : produces 
invalid Info: c:d
 ',
-    'text' => 'Index entry in @defvr with a : will lead to invalid Info',
+    'text' => 'Index entry in @defvr with : produces invalid Info: c:d',
     'type' => 'warning',
     'macro' => '',
     'line_nr' => 11
   },
   {
     'file_name' => '',
-    'error_line' => ':12: warning: Index entry in @defvrx with a : will lead 
to invalid Info
+    'error_line' => ':12: warning: Index entry in @defvrx with : produces 
invalid Info: z:t
 ',
-    'text' => 'Index entry in @defvrx with a : will lead to invalid Info',
+    'text' => 'Index entry in @defvrx with : produces invalid Info: z:t',
     'type' => 'warning',
     'macro' => '',
     'line_nr' => 12