texinfo/tp Texinfo/Parser.pm t/22xtable.t t/res...

[Patrice Dumas]

CVSROOT:        /sources/texinfo
Module name:    texinfo
Changes by:     Patrice Dumas <pertusus>        12/04/09 20:20:30

Modified files:
        tp/Texinfo     : Parser.pm 
        tp/t           : 22xtable.t 
        tp/t/results/xtable: comment_and_itemx_before_item.pl 
                             itemx_before_item.pl 
                             title_and_itemx_before_item.pl 

Log message:
        Make @itemx before @item a warning and not an error (report from Karl).

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/Texinfo/Parser.pm?cvsroot=texinfo&r1=1.368&r2=1.369
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/22xtable.t?cvsroot=texinfo&r1=1.16&r2=1.17
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/xtable/comment_and_itemx_before_item.pl?cvsroot=texinfo&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/xtable/itemx_before_item.pl?cvsroot=texinfo&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/xtable/title_and_itemx_before_item.pl?cvsroot=texinfo&r1=1.3&r2=1.4

Patches:
Index: Texinfo/Parser.pm
===================================================================
RCS file: /sources/texinfo/texinfo/tp/Texinfo/Parser.pm,v
retrieving revision 1.368
retrieving revision 1.369
diff -u -b -r1.368 -r1.369
--- Texinfo/Parser.pm   1 Apr 2012 23:22:38 -0000       1.368
+++ Texinfo/Parser.pm   9 Apr 2012 20:20:29 -0000       1.369
@@ -1287,7 +1287,7 @@
   if ($current->{'contents'}->[-1]->{'type'}
       and $current->{'contents'}->[-1]->{'type'} eq 'before_item') {
     if ($next_command and $next_command eq 'itemx') {
-      $self->line_error(sprintf($self->__("address@hidden should not begin 
address@hidden"), 
+      $self->line_warn(sprintf($self->__("address@hidden should not begin 
address@hidden"), 
                                 $current->{'cmdname'}), $line_nr);
     }
     return;

Index: t/22xtable.t
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/22xtable.t,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -b -r1.16 -r1.17
--- t/22xtable.t        28 Jan 2012 13:48:43 -0000      1.16
+++ t/22xtable.t        9 Apr 2012 20:20:29 -0000       1.17
@@ -196,6 +196,12 @@
 @end quotation
 @end quotation
 '],
+['comment_and_itemx_before_item',
+'@table @code
address@hidden comment
address@hidden in itemx
address@hidden table
+'],
 );
 
 my @test_invalid = (
@@ -248,12 +254,6 @@
 @itemx in itemx
 @end table
 '],
-['comment_and_itemx_before_item',
-'@table @code
address@hidden comment
address@hidden in itemx
address@hidden table
-'],
 );
 
 foreach my $test (@test_cases) {

Index: t/results/xtable/comment_and_itemx_before_item.pl
===================================================================
RCS file: 
/sources/texinfo/texinfo/tp/t/results/xtable/comment_and_itemx_before_item.pl,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- t/results/xtable/comment_and_itemx_before_item.pl   19 Sep 2011 19:29:04 
-0000      1.1
+++ t/results/xtable/comment_and_itemx_before_item.pl   9 Apr 2012 20:20:29 
-0000       1.2
@@ -208,15 +208,32 @@
 
 $result_errors{'comment_and_itemx_before_item'} = [
   {
-    'error_line' => ':3: @itemx should not begin @table
+    'error_line' => ':3: warning: @itemx should not begin @table
 ',
     'file_name' => '',
     'line_nr' => 3,
     'macro' => '',
     'text' => '@itemx should not begin @table',
-    'type' => 'error'
+    'type' => 'warning'
   }
 ];
 
 
+
+$result_converted{'plaintext'}->{'comment_and_itemx_before_item'} = '\'in 
itemx\'
+';
+
+
+$result_converted{'html_text'}->{'comment_and_itemx_before_item'} = '<dl 
compact="compact">
+<dt><code>in itemx</code></dt>
+</dl>
+';
+
+
+$result_converted{'xml'}->{'comment_and_itemx_before_item'} = '<table 
commandarg="code">
+<beforefirstitem><!-- comment -->
+</beforefirstitem><tableentry><tableterm><itemx><itemformat command="code">in 
itemx</itemformat></itemx>
+</tableterm></tableentry></table>
+';
+
 1;

Index: t/results/xtable/itemx_before_item.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/results/xtable/itemx_before_item.pl,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- t/results/xtable/itemx_before_item.pl       19 Sep 2011 19:29:04 -0000      
1.3
+++ t/results/xtable/itemx_before_item.pl       9 Apr 2012 20:20:29 -0000       
1.4
@@ -186,13 +186,13 @@
 
 $result_errors{'itemx_before_item'} = [
   {
-    'error_line' => ':2: @itemx should not begin @table
+    'error_line' => ':2: warning: @itemx should not begin @table
 ',
     'file_name' => '',
     'line_nr' => 2,
     'macro' => '',
     'text' => '@itemx should not begin @table',
-    'type' => 'error'
+    'type' => 'warning'
   }
 ];
 

Index: t/results/xtable/title_and_itemx_before_item.pl
===================================================================
RCS file: 
/sources/texinfo/texinfo/tp/t/results/xtable/title_and_itemx_before_item.pl,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- t/results/xtable/title_and_itemx_before_item.pl     19 Sep 2011 19:29:04 
-0000      1.3
+++ t/results/xtable/title_and_itemx_before_item.pl     9 Apr 2012 20:20:29 
-0000       1.4
@@ -208,13 +208,13 @@
 
 $result_errors{'title_and_itemx_before_item'} = [
   {
-    'error_line' => ':3: @itemx should not begin @table
+    'error_line' => ':3: warning: @itemx should not begin @table
 ',
     'file_name' => '',
     'line_nr' => 3,
     'macro' => '',
     'text' => '@itemx should not begin @table',
-    'type' => 'error'
+    'type' => 'warning'
   }
 ];