texinfo/tp Texinfo/Parser.pm t/results/sectioni...

[Patrice Dumas]

CVSROOT:        /sources/texinfo
Module name:    texinfo
Changes by:     Patrice Dumas <pertusus>        12/07/08 22:38:15

Modified files:
        tp/Texinfo     : Parser.pm 
        tp/t/results/sectioning: contents_in_document.pl 

Log message:
        Remove the message issued when @contents is not before any sectioning 
command
        or at teh end of the manual, as a @contents after the first sectioning 
command
        is correct if not using TeX.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/Texinfo/Parser.pm?cvsroot=texinfo&r1=1.379&r2=1.380
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/sectioning/contents_in_document.pl?cvsroot=texinfo&r1=1.1&r2=1.2

Patches:
Index: Texinfo/Parser.pm
===================================================================
RCS file: /sources/texinfo/texinfo/tp/Texinfo/Parser.pm,v
retrieving revision 1.379
retrieving revision 1.380
diff -u -b -r1.379 -r1.380
--- Texinfo/Parser.pm   20 Jun 2012 23:44:23 -0000      1.379
+++ Texinfo/Parser.pm   8 Jul 2012 22:38:14 -0000       1.380
@@ -762,6 +762,8 @@
   return $tree;
 }
 
+# Not used for now, as a @contents after the first sectioning command
+# is correct if not using TeX.
 sub _check_contents_location($$)
 {
   my $self = shift;
@@ -877,7 +879,7 @@
     unshift (@{$text_root->{'contents'}}, $before_setfilename)
       if (@{$before_setfilename->{'contents'}});
   }
-  $self->_check_contents_location($tree);
+  #$self->_check_contents_location($tree);
 
   return $tree;
 }

Index: t/results/sectioning/contents_in_document.pl
===================================================================
RCS file: 
/sources/texinfo/texinfo/tp/t/results/sectioning/contents_in_document.pl,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- t/results/sectioning/contents_in_document.pl        6 Feb 2012 23:23:00 
-0000       1.1
+++ t/results/sectioning/contents_in_document.pl        8 Jul 2012 22:38:15 
-0000       1.2
@@ -376,17 +376,7 @@
   }
 };
 
-$result_errors{'contents_in_document'} = [
-  {
-    'error_line' => 'contents_in_document.texi:8: warning: @contents should 
only appear at beginning or end of document
-',
-    'file_name' => 'contents_in_document.texi',
-    'line_nr' => 8,
-    'macro' => '',
-    'text' => '@contents should only appear at beginning or end of document',
-    'type' => 'warning'
-  }
-];
+$result_errors{'contents_in_document'} = [];
 
 
 1;