texinfo-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

texinfo/tp TODO Texinfo/Convert/Info.pm t/resul...


From: Patrice Dumas
Subject: texinfo/tp TODO Texinfo/Convert/Info.pm t/resul...
Date: Tue, 17 Jan 2012 08:24:36 +0000

CVSROOT:        /sources/texinfo
Module name:    texinfo
Changes by:     Patrice Dumas <pertusus>        12/01/17 08:24:36

Modified files:
        tp             : TODO 
        tp/Texinfo/Convert: Info.pm 
        tp/t/results/info_tests: colon_in_index_entry.pl 
        tp/tests/encodings/res_parser_info/nodetest_latin1: 
                                                            nodetest_latin1.2 
        tp/tests/encodings/res_parser_info/nodetest_latin1_use_nodes: 
                                                                      
nodetest_latin1.2 
        tp/tests/encodings/res_parser_info/nodetest_utf8: 
                                                          nodetest_utf8.2 
        tp/tests/encodings/res_parser_info/nodetest_utf8_use_nodes: 
                                                                    
nodetest_utf8.2 
        
tp/tests/encodings/res_parser_info/nodetest_utf8_use_nodes_no_unidecode: 
                                                                                
 nodetest_utf8.2 

Log message:
        Remove warning for : in index entry.  It should be protected instead.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/TODO?cvsroot=texinfo&r1=1.249&r2=1.250
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/Texinfo/Convert/Info.pm?cvsroot=texinfo&r1=1.78&r2=1.79
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/info_tests/colon_in_index_entry.pl?cvsroot=texinfo&r1=1.8&r2=1.9
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/tests/encodings/res_parser_info/nodetest_latin1/nodetest_latin1.2?cvsroot=texinfo&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/tests/encodings/res_parser_info/nodetest_latin1_use_nodes/nodetest_latin1.2?cvsroot=texinfo&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/tests/encodings/res_parser_info/nodetest_utf8/nodetest_utf8.2?cvsroot=texinfo&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/tests/encodings/res_parser_info/nodetest_utf8_use_nodes/nodetest_utf8.2?cvsroot=texinfo&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/tests/encodings/res_parser_info/nodetest_utf8_use_nodes_no_unidecode/nodetest_utf8.2?cvsroot=texinfo&r1=1.1&r2=1.2

Patches:
Index: TODO
===================================================================
RCS file: /sources/texinfo/texinfo/tp/TODO,v
retrieving revision 1.249
retrieving revision 1.250
diff -u -b -r1.249 -r1.250
--- TODO        16 Jan 2012 22:54:42 -0000      1.249
+++ TODO        17 Jan 2012 08:24:34 -0000      1.250
@@ -8,6 +8,7 @@
 
 Document TEXTCONTENT_COMMENT.
 
+
 Bugs
 ====
 

Index: Texinfo/Convert/Info.pm
===================================================================
RCS file: /sources/texinfo/texinfo/tp/Texinfo/Convert/Info.pm,v
retrieving revision 1.78
retrieving revision 1.79
diff -u -b -r1.78 -r1.79
--- Texinfo/Convert/Info.pm     15 Nov 2011 00:00:43 -0000      1.78
+++ Texinfo/Convert/Info.pm     17 Jan 2012 08:24:35 -0000      1.79
@@ -409,12 +409,13 @@
     my $entry_text = '';
     $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 
: produces invalid Info: %s"),
-                                 $entry->{'index_at_command'},
-          Texinfo::Convert::Texinfo::convert($entry_tree)), 
-                        $entry->{'command'}->{'line_nr'});
-    }
+    # FIXME protect instead
+    #if ($entry_text =~ /:/) {
+      #$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'});
+    #}
 
     my $entry_nr = '';
     if (!defined($entry_counts{$entry_text})) {

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.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- t/results/info_tests/colon_in_index_entry.pl        3 Dec 2011 14:58:38 
-0000       1.8
+++ t/results/info_tests/colon_in_index_entry.pl        17 Jan 2012 08:24:35 
-0000      1.9
@@ -923,44 +923,4 @@
 End Tag Table
 ';
 
-$result_converted_errors{'info'}->{'colon_in_index_entry'} = [
-  {
-    'file_name' => '',
-    'error_line' => ':8: warning: Index entry in @item with : produces invalid 
Info: %main::value
-',
-    'text' => 'Index entry in @item with : produces invalid Info: 
%main::value',
-    'type' => 'warning',
-    'macro' => '',
-    'line_nr' => 8
-  },
-  {
-    'file_name' => '',
-    'error_line' => ':5: warning: Index entry in @cindex with : produces 
invalid Info: a:b
-',
-    '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 : produces 
invalid Info: c:d
-',
-    '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 : produces 
invalid Info: z:t
-',
-    'text' => 'Index entry in @defvrx with : produces invalid Info: z:t',
-    'type' => 'warning',
-    'macro' => '',
-    'line_nr' => 12
-  }
-];
-
-
 1;

Index: tests/encodings/res_parser_info/nodetest_latin1/nodetest_latin1.2
===================================================================
RCS file: 
/sources/texinfo/texinfo/tp/tests/encodings/res_parser_info/nodetest_latin1/nodetest_latin1.2,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- tests/encodings/res_parser_info/nodetest_latin1/nodetest_latin1.2   14 Jan 
2012 19:00:00 -0000      1.1
+++ tests/encodings/res_parser_info/nodetest_latin1/nodetest_latin1.2   17 Jan 
2012 08:24:35 -0000      1.2
@@ -1,5 +1,3 @@
 nodetest_latin1.texi:3: warning: Encoding `latin1' is not a canonical texinfo 
encoding
 nodetest_latin1.texi:305: @node address@hidden' previously defined
 nodetest_latin1.texi:273: here is the previous definition as @node
-nodetest_latin1.texi:336: warning: Index entry in @cindex with : produces 
invalid Info: index entry with accented letter: à @`a
-nodetest_latin1.texi:337: warning: Index entry in @cindex with : produces 
invalid Info: index entry with accented letter: â @`a

Index: 
tests/encodings/res_parser_info/nodetest_latin1_use_nodes/nodetest_latin1.2
===================================================================
RCS file: 
/sources/texinfo/texinfo/tp/tests/encodings/res_parser_info/nodetest_latin1_use_nodes/nodetest_latin1.2,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- tests/encodings/res_parser_info/nodetest_latin1_use_nodes/nodetest_latin1.2 
14 Jan 2012 19:00:01 -0000      1.1
+++ tests/encodings/res_parser_info/nodetest_latin1_use_nodes/nodetest_latin1.2 
17 Jan 2012 08:24:35 -0000      1.2
@@ -2,5 +2,3 @@
 nodetest_latin1.texi:3: warning: Encoding `latin1' is not a canonical texinfo 
encoding
 nodetest_latin1.texi:305: @node address@hidden' previously defined
 nodetest_latin1.texi:273: here is the previous definition as @node
-nodetest_latin1.texi:336: warning: Index entry in @cindex with : produces 
invalid Info: index entry with accented letter: à @`a
-nodetest_latin1.texi:337: warning: Index entry in @cindex with : produces 
invalid Info: index entry with accented letter: â @`a

Index: tests/encodings/res_parser_info/nodetest_utf8/nodetest_utf8.2
===================================================================
RCS file: 
/sources/texinfo/texinfo/tp/tests/encodings/res_parser_info/nodetest_utf8/nodetest_utf8.2,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- tests/encodings/res_parser_info/nodetest_utf8/nodetest_utf8.2       14 Jan 
2012 19:00:15 -0000      1.1
+++ tests/encodings/res_parser_info/nodetest_utf8/nodetest_utf8.2       17 Jan 
2012 08:24:35 -0000      1.2
@@ -1,5 +1,3 @@
 nodetest_utf8.texi:3: warning: Encoding `utf8' is not a canonical texinfo 
encoding
 nodetest_utf8.texi:305: @node address@hidden' previously defined
 nodetest_utf8.texi:273: here is the previous definition as @node
-nodetest_utf8.texi:336: warning: Index entry in @cindex with : produces 
invalid Info: index entry with accented letter: à @`a
-nodetest_utf8.texi:337: warning: Index entry in @cindex with : produces 
invalid Info: index entry with accented letter: â @`a

Index: tests/encodings/res_parser_info/nodetest_utf8_use_nodes/nodetest_utf8.2
===================================================================
RCS file: 
/sources/texinfo/texinfo/tp/tests/encodings/res_parser_info/nodetest_utf8_use_nodes/nodetest_utf8.2,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- tests/encodings/res_parser_info/nodetest_utf8_use_nodes/nodetest_utf8.2     
14 Jan 2012 19:00:25 -0000      1.1
+++ tests/encodings/res_parser_info/nodetest_utf8_use_nodes/nodetest_utf8.2     
17 Jan 2012 08:24:35 -0000      1.2
@@ -2,5 +2,3 @@
 nodetest_utf8.texi:3: warning: Encoding `utf8' is not a canonical texinfo 
encoding
 nodetest_utf8.texi:305: @node address@hidden' previously defined
 nodetest_utf8.texi:273: here is the previous definition as @node
-nodetest_utf8.texi:336: warning: Index entry in @cindex with : produces 
invalid Info: index entry with accented letter: à @`a
-nodetest_utf8.texi:337: warning: Index entry in @cindex with : produces 
invalid Info: index entry with accented letter: â @`a

Index: 
tests/encodings/res_parser_info/nodetest_utf8_use_nodes_no_unidecode/nodetest_utf8.2
===================================================================
RCS file: 
/sources/texinfo/texinfo/tp/tests/encodings/res_parser_info/nodetest_utf8_use_nodes_no_unidecode/nodetest_utf8.2,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- 
tests/encodings/res_parser_info/nodetest_utf8_use_nodes_no_unidecode/nodetest_utf8.2
        14 Jan 2012 19:00:28 -0000      1.1
+++ 
tests/encodings/res_parser_info/nodetest_utf8_use_nodes_no_unidecode/nodetest_utf8.2
        17 Jan 2012 08:24:36 -0000      1.2
@@ -2,5 +2,3 @@
 nodetest_utf8.texi:3: warning: Encoding `utf8' is not a canonical texinfo 
encoding
 nodetest_utf8.texi:305: @node address@hidden' previously defined
 nodetest_utf8.texi:273: here is the previous definition as @node
-nodetest_utf8.texi:336: warning: Index entry in @cindex with : produces 
invalid Info: index entry with accented letter: à @`a
-nodetest_utf8.texi:337: warning: Index entry in @cindex with : produces 
invalid Info: index entry with accented letter: â @`a



reply via email to

[Prev in Thread] Current Thread [Next in Thread]