texinfo ChangeLog doc/texinfo.txi

[Karl Berry]

CVSROOT:        /sources/texinfo
Module name:    texinfo
Changes by:     Karl Berry <karl>       12/02/23 02:53:40

Modified files:
        .              : ChangeLog 
        doc            : texinfo.txi 

Log message:
        require "filename" with trailing flags

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/texinfo/ChangeLog?cvsroot=texinfo&r1=1.1331&r2=1.1332
http://cvs.savannah.gnu.org/viewcvs/texinfo/doc/texinfo.txi?cvsroot=texinfo&r1=1.425&r2=1.426

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/texinfo/texinfo/ChangeLog,v
retrieving revision 1.1331
retrieving revision 1.1332
diff -u -b -r1.1331 -r1.1332
--- ChangeLog   21 Feb 2012 17:32:48 -0000      1.1331
+++ ChangeLog   23 Feb 2012 02:53:39 -0000      1.1332
@@ -1,3 +1,10 @@
+2012-02-22  Karl Berry  <address@hidden>
+
+       * doc/texinfo.txi (#line Syntax Details): update for new regexp,
+       requiring the "filename" be present with trailing flags.
+       Not 100% sure about cpp's behavior here, but that's what
+       we've observed so far.
+
 2012-02-21  Karl Berry  <address@hidden>
 
        * doc/texinfo.txi: more on alternate implementations.

Index: doc/texinfo.txi
===================================================================
RCS file: /sources/texinfo/texinfo/doc/texinfo.txi,v
retrieving revision 1.425
retrieving revision 1.426
diff -u -b -r1.425 -r1.426
--- doc/texinfo.txi     21 Feb 2012 17:32:49 -0000      1.425
+++ doc/texinfo.txi     23 Feb 2012 02:53:40 -0000      1.426
@@ -1,5 +1,5 @@
 \input texinfo.tex    @c -*-texinfo-*-
address@hidden $Id: texinfo.txi,v 1.425 2012/02/21 17:32:49 karl Exp $
address@hidden $Id: texinfo.txi,v 1.426 2012/02/23 02:53:40 karl Exp $
 @c Ordinarily, Texinfo files have the extension .texi.  But texinfo.texi
 @c clashes with texinfo.tex on 8.3 filesystems, so we use texinfo.txi.
 
@@ -15145,14 +15145,18 @@
 (Perl) regular expression which is matched is this:
 
 @example
-^(\s*)#(\s*(line)? (\d+)( "([^"]+)")?(\s+\d+)*\s*)$
+/^\s*#\s*(line)? (\d+)(( "([^"]+)")(\s+\d+)*)?\s*$/
 @end example
 
-For example, the following is also a valid @samp{#line} directive,
-meaning line 1 of @file{/usr/include/stdio.h}:
+As far as we've been able to tell, the trailing integer flags only
+occur in conjunction with a filename, so that is reflected in the
+regular expression.
+
+As an example, the following is a syntactically valid @samp{#line}
+directive, meaning line 1 of @file{/usr/include/stdio.h}:
 
 @example
address@hidden 1 "/usr/include/stdio.h" 1 3 4
address@hidden 1 "/usr/include/stdio.h" 2 3 4
 @end example
 
 Unfortunately, the quoted filename (@samp{"..."}) has to be optional,
@@ -15161,7 +15165,7 @@
 result is that lines might match which you wouldn't expect, e.g.,
 
 @example
address@hidden 1 2 3 4
address@hidden 1
 @end example
 
 The possible solutions are described above (@pxref{#line Directive,,
@@ -21765,7 +21769,7 @@
 Revision Control System}) or other version control systems, which
 expand it into a string such as:
 @example
-$Id: texinfo.txi,v 1.425 2012/02/21 17:32:49 karl Exp $
+$Id: texinfo.txi,v 1.426 2012/02/23 02:53:40 karl Exp $
 @end example
 (This is useful in all sources that use version control, not just manuals.)
 You may wish to include the @samp{$Id:} comment in the @code{@@copying}