texinfo/texi2html ChangeLog texi2html.pl format...

[Patrice Dumas]

CVSROOT:        /sources/texinfo
Module name:    texinfo
Changes by:     Patrice Dumas <pertusus>        10/06/21 07:03:15

Modified files:
        texi2html      : ChangeLog texi2html.pl 
        texi2html/formats: html.init 
        texi2html/test/htmlxref: htmlxref.cnf 

Log message:
                * texi2html.pl: in htmlxref.cnf, a comment is now ^\s*# instead
                of # followed by a space anywhere on the line. Report from Karl.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/texinfo/texi2html/ChangeLog?cvsroot=texinfo&r1=1.498&r2=1.499
http://cvs.savannah.gnu.org/viewcvs/texinfo/texi2html/texi2html.pl?cvsroot=texinfo&r1=1.383&r2=1.384
http://cvs.savannah.gnu.org/viewcvs/texinfo/texi2html/formats/html.init?cvsroot=texinfo&r1=1.49&r2=1.50
http://cvs.savannah.gnu.org/viewcvs/texinfo/texi2html/test/htmlxref/htmlxref.cnf?cvsroot=texinfo&r1=1.1&r2=1.2

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/texinfo/texinfo/texi2html/ChangeLog,v
retrieving revision 1.498
retrieving revision 1.499
diff -u -b -r1.498 -r1.499
--- ChangeLog   20 Jun 2010 20:19:17 -0000      1.498
+++ ChangeLog   21 Jun 2010 07:03:12 -0000      1.499
@@ -1,3 +1,8 @@
+2010-06-21   Patrice Dumas  <address@hidden>
+
+       * texi2html.pl: in htmlxref.cnf, a comment is now ^\s*# instead
+       of # followed by a space anywhere on the line. Report from Karl.
+
 2010-06-20   Patrice Dumas  <address@hidden>
 
        * texi2html.pl: set the command name to texi2any when it is not

Index: texi2html.pl
===================================================================
RCS file: /sources/texinfo/texinfo/texi2html/texi2html.pl,v
retrieving revision 1.383
retrieving revision 1.384
diff -u -b -r1.383 -r1.384
--- texi2html.pl        20 Jun 2010 20:19:17 -0000      1.383
+++ texi2html.pl        21 Jun 2010 07:03:14 -0000      1.384
@@ -91,7 +91,7 @@
 }
 
 # CVS version:
-# $Id: texi2html.pl,v 1.383 2010/06/20 20:19:17 pertusus Exp $
+# $Id: texi2html.pl,v 1.384 2010/06/21 07:03:14 pertusus Exp $
 
 # Homepage:
 my $T2H_HOMEPAGE = "http://www.nongnu.org/texi2html/";;
@@ -4326,7 +4326,8 @@
     {
         my $line = $hline;
         $line_nr++;
-        $hline =~ s/[#]\s.*//;
+        next if $hline =~ /^\s*#/;
+        #$hline =~ s/[#]\s.*//;
         $hline =~ s/^\s*//;
         next if $hline =~ /^\s*$/;
         my @htmlxref = split /\s+/, $hline;

Index: formats/html.init
===================================================================
RCS file: /sources/texinfo/texinfo/texi2html/formats/html.init,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -b -r1.49 -r1.50
--- formats/html.init   12 Jun 2010 10:30:15 -0000      1.49
+++ formats/html.init   21 Jun 2010 07:03:15 -0000      1.50
@@ -7,7 +7,7 @@
 # A copy of this file is pasted into the beginning of texi2html by
 # running './configure'.
 #
-# $Id: html.init,v 1.49 2010/06/12 10:30:15 pertusus Exp $
+# $Id: html.init,v 1.50 2010/06/21 07:03:15 pertusus Exp $
 
 use strict;
 
@@ -1981,8 +1981,7 @@
 
 # formats a menu entry description, ie the text appearing after the node
 # specification in a menu entry an spanning until there is another
-# menu entry, an empty line or some text at the very beginning of the line
-# (we consider that text at the beginning of the line begins a menu comment) 
+# menu entry, or empty line
 #
 # arguments:
 # the description text

Index: test/htmlxref/htmlxref.cnf
===================================================================
RCS file: /sources/texinfo/texinfo/texi2html/test/htmlxref/htmlxref.cnf,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- test/htmlxref/htmlxref.cnf  18 Aug 2008 18:03:25 -0000      1.1
+++ test/htmlxref/htmlxref.cnf  21 Jun 2010 07:03:15 -0000      1.2
@@ -1,2 +1,4 @@
+# a comment
+  # a comment
 manual split split-dir-manual/
 manual mono   mono-manual.html