texinfo/tp Texinfo/Parser.pm Texinfo/Convert/Te...

[Patrice Dumas]

CVSROOT:        /sources/texinfo
Module name:    texinfo
Changes by:     Patrice Dumas <pertusus>        11/03/07 00:22:35

Modified files:
        tp/Texinfo     : Parser.pm 
        tp/Texinfo/Convert: Text.pm 
        tp/t/results/coverage: formats_only_title_comments.pl 
                               formats_only_titles.pl 
        tp/t/results/invalid_nestings: enumerate_in_style_command.pl 
                                       formats_not_closed_in_example.pl 
                                       itemx_in_itemize_enumerate_in_table.pl 
        tp/t/results/itemize: bad_enumerate_arguments.pl 
                              enumerate_and_empty_lines.pl 
                              enumerate_in_example.pl 
                              headitem_itemx_in_enumerate.pl 

Log message:
        Default enumerate argument is 1.
        Correct enumerate numbering.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/Texinfo/Parser.pm?cvsroot=texinfo&r1=1.217&r2=1.218
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/Texinfo/Convert/Text.pm?cvsroot=texinfo&r1=1.31&r2=1.32
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/coverage/formats_only_title_comments.pl?cvsroot=texinfo&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/coverage/formats_only_titles.pl?cvsroot=texinfo&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/invalid_nestings/enumerate_in_style_command.pl?cvsroot=texinfo&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/invalid_nestings/formats_not_closed_in_example.pl?cvsroot=texinfo&r1=1.21&r2=1.22
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/invalid_nestings/itemx_in_itemize_enumerate_in_table.pl?cvsroot=texinfo&r1=1.20&r2=1.21
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/itemize/bad_enumerate_arguments.pl?cvsroot=texinfo&r1=1.6&r2=1.7
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/itemize/enumerate_and_empty_lines.pl?cvsroot=texinfo&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/itemize/enumerate_in_example.pl?cvsroot=texinfo&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/itemize/headitem_itemx_in_enumerate.pl?cvsroot=texinfo&r1=1.14&r2=1.15

Patches:
Index: Texinfo/Parser.pm
===================================================================
RCS file: /sources/texinfo/texinfo/tp/Texinfo/Parser.pm,v
retrieving revision 1.217
retrieving revision 1.218
diff -u -b -r1.217 -r1.218
--- Texinfo/Parser.pm   6 Mar 2011 23:52:38 -0000       1.217
+++ Texinfo/Parser.pm   7 Mar 2011 00:22:14 -0000       1.218
@@ -2187,7 +2187,7 @@
     if ($current->{'cmdname'} 
           and $block_item_commands{$current->{'cmdname'}}) {
       if ($current->{'cmdname'} eq 'enumerate') {
-        my $spec = 0;
+        my $spec = 1;
         if ($current->{'extra'}->{'block_command_line_contents'}
             and 
defined($current->{'extra'}->{'block_command_line_contents'}->[0])) {
           if 
(scalar(@{$current->{'extra'}->{'block_command_line_contents'}->[0]}) > 1) {

Index: Texinfo/Convert/Text.pm
===================================================================
RCS file: /sources/texinfo/texinfo/tp/Texinfo/Convert/Text.pm,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -b -r1.31 -r1.32
--- Texinfo/Convert/Text.pm     28 Jan 2011 23:54:30 -0000      1.31
+++ Texinfo/Convert/Text.pm     7 Mar 2011 00:22:20 -0000       1.32
@@ -851,7 +851,7 @@
   my $number = shift;
 
   if ($specification =~ /^[0-9]$/) {
-    return $specification + $number;
+    return $specification + $number -1;
   }
 
   my $result = '';

Index: t/results/coverage/formats_only_title_comments.pl
===================================================================
RCS file: 
/sources/texinfo/texinfo/tp/t/results/coverage/formats_only_title_comments.pl,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- t/results/coverage/formats_only_title_comments.pl   6 Mar 2011 14:43:59 
-0000       1.4
+++ t/results/coverage/formats_only_title_comments.pl   7 Mar 2011 00:22:24 
-0000       1.5
@@ -205,7 +205,7 @@
       ],
       'extra' => {
         'end_command' => {},
-        'enumerate_specification' => 0
+        'enumerate_specification' => 1
       },
       'line_nr' => {
         'file_name' => '',

Index: t/results/coverage/formats_only_titles.pl
===================================================================
RCS file: 
/sources/texinfo/texinfo/tp/t/results/coverage/formats_only_titles.pl,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- t/results/coverage/formats_only_titles.pl   6 Mar 2011 14:43:59 -0000       
1.4
+++ t/results/coverage/formats_only_titles.pl   7 Mar 2011 00:22:25 -0000       
1.5
@@ -162,7 +162,7 @@
       ],
       'extra' => {
         'end_command' => {},
-        'enumerate_specification' => 0
+        'enumerate_specification' => 1
       },
       'line_nr' => {
         'file_name' => '',

Index: t/results/invalid_nestings/enumerate_in_style_command.pl
===================================================================
RCS file: 
/sources/texinfo/texinfo/tp/t/results/invalid_nestings/enumerate_in_style_command.pl,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- t/results/invalid_nestings/enumerate_in_style_command.pl    7 Mar 2011 
00:09:44 -0000       1.1
+++ t/results/invalid_nestings/enumerate_in_style_command.pl    7 Mar 2011 
00:22:26 -0000       1.2
@@ -174,7 +174,7 @@
 
 
 $result_texts{'enumerate_in_style_command'} = '
-2. item
+1. item
 ';
 
 $result_errors{'enumerate_in_style_command'} = [

Index: t/results/invalid_nestings/formats_not_closed_in_example.pl
===================================================================
RCS file: 
/sources/texinfo/texinfo/tp/t/results/invalid_nestings/formats_not_closed_in_example.pl,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -b -r1.21 -r1.22
--- t/results/invalid_nestings/formats_not_closed_in_example.pl 6 Mar 2011 
14:44:04 -0000       1.21
+++ t/results/invalid_nestings/formats_not_closed_in_example.pl 7 Mar 2011 
00:22:27 -0000       1.22
@@ -193,7 +193,7 @@
                 }
               ],
               'extra' => {
-                'enumerate_specification' => 0
+                'enumerate_specification' => 1
               },
               'line_nr' => {
                 'file_name' => '',

Index: t/results/invalid_nestings/itemx_in_itemize_enumerate_in_table.pl
===================================================================
RCS file: 
/sources/texinfo/texinfo/tp/t/results/invalid_nestings/itemx_in_itemize_enumerate_in_table.pl,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -b -r1.20 -r1.21
--- t/results/invalid_nestings/itemx_in_itemize_enumerate_in_table.pl   6 Mar 
2011 14:44:04 -0000       1.20
+++ t/results/invalid_nestings/itemx_in_itemize_enumerate_in_table.pl   7 Mar 
2011 00:22:28 -0000       1.21
@@ -248,7 +248,7 @@
           ],
           'extra' => {
             'end_command' => {},
-            'enumerate_specification' => 0
+            'enumerate_specification' => 1
           },
           'line_nr' => {
             'file_name' => '',

Index: t/results/itemize/bad_enumerate_arguments.pl
===================================================================
RCS file: 
/sources/texinfo/texinfo/tp/t/results/itemize/bad_enumerate_arguments.pl,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- t/results/itemize/bad_enumerate_arguments.pl        6 Mar 2011 14:44:04 
-0000       1.6
+++ t/results/itemize/bad_enumerate_arguments.pl        7 Mar 2011 00:22:30 
-0000       1.7
@@ -77,7 +77,7 @@
           ]
         ],
         'end_command' => {},
-        'enumerate_specification' => 0
+        'enumerate_specification' => 1
       },
       'line_nr' => {
         'file_name' => '',
@@ -163,7 +163,7 @@
           ]
         ],
         'end_command' => {},
-        'enumerate_specification' => 0
+        'enumerate_specification' => 1
       },
       'line_nr' => {
         'file_name' => '',
@@ -267,7 +267,7 @@
           ]
         ],
         'end_command' => {},
-        'enumerate_specification' => 0
+        'enumerate_specification' => 1
       },
       'line_nr' => {},
       'parent' => {}
@@ -440,7 +440,7 @@
           ]
         ],
         'end_command' => {},
-        'enumerate_specification' => 0
+        'enumerate_specification' => 1
       },
       'line_nr' => {
         'file_name' => '',

Index: t/results/itemize/enumerate_and_empty_lines.pl
===================================================================
RCS file: 
/sources/texinfo/texinfo/tp/t/results/itemize/enumerate_and_empty_lines.pl,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- t/results/itemize/enumerate_and_empty_lines.pl      6 Mar 2011 14:44:04 
-0000       1.4
+++ t/results/itemize/enumerate_and_empty_lines.pl      7 Mar 2011 00:22:31 
-0000       1.5
@@ -478,7 +478,7 @@
       ],
       'extra' => {
         'end_command' => {},
-        'enumerate_specification' => 0
+        'enumerate_specification' => 1
       },
       'line_nr' => {
         'file_name' => '',
@@ -572,7 +572,7 @@
       ],
       'extra' => {
         'end_command' => {},
-        'enumerate_specification' => 0
+        'enumerate_specification' => 1
       },
       'line_nr' => {
         'file_name' => '',

Index: t/results/itemize/enumerate_in_example.pl
===================================================================
RCS file: 
/sources/texinfo/texinfo/tp/t/results/itemize/enumerate_in_example.pl,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- t/results/itemize/enumerate_in_example.pl   6 Mar 2011 14:44:04 -0000       
1.4
+++ t/results/itemize/enumerate_in_example.pl   7 Mar 2011 00:22:32 -0000       
1.5
@@ -136,7 +136,7 @@
           ],
           'extra' => {
             'end_command' => {},
-            'enumerate_specification' => 0
+            'enumerate_specification' => 1
           },
           'line_nr' => {
             'file_name' => '',

Index: t/results/itemize/headitem_itemx_in_enumerate.pl
===================================================================
RCS file: 
/sources/texinfo/texinfo/tp/t/results/itemize/headitem_itemx_in_enumerate.pl,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -b -r1.14 -r1.15
--- t/results/itemize/headitem_itemx_in_enumerate.pl    6 Mar 2011 14:44:04 
-0000       1.14
+++ t/results/itemize/headitem_itemx_in_enumerate.pl    7 Mar 2011 00:22:33 
-0000       1.15
@@ -117,7 +117,7 @@
       ],
       'extra' => {
         'end_command' => {},
-        'enumerate_specification' => 0
+        'enumerate_specification' => 1
       },
       'line_nr' => {
         'file_name' => '',