texinfo ChangeLog doc/texinfo.txi util/htmlxref...

[Karl Berry]

CVSROOT:        /sources/texinfo
Module name:    texinfo
Changes by:     Karl Berry <karl>       10/11/09 17:55:04

Modified files:
        .              : ChangeLog 
        doc            : texinfo.txi 
        util           : htmlxref.cnf 

Log message:
        (Macro Details): more about newlines

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/texinfo/ChangeLog?cvsroot=texinfo&r1=1.1176&r2=1.1177
http://cvs.savannah.gnu.org/viewcvs/texinfo/doc/texinfo.txi?cvsroot=texinfo&r1=1.346&r2=1.347
http://cvs.savannah.gnu.org/viewcvs/texinfo/util/htmlxref.cnf?cvsroot=texinfo&r1=1.32&r2=1.33

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/texinfo/texinfo/ChangeLog,v
retrieving revision 1.1176
retrieving revision 1.1177
diff -u -b -r1.1176 -r1.1177
--- ChangeLog   8 Nov 2010 19:11:23 -0000       1.1176
+++ ChangeLog   9 Nov 2010 17:55:03 -0000       1.1177
@@ -1,3 +1,7 @@
+2010-11-09  Karl Berry  <address@hidden>
+
+       * doc/texinfo.txi (Macro Details): more caveats about newlines.
+
 2010-11-08  Karl Berry  <address@hidden>
 
        * doc/texinfo.txi (History): rationale for Perl texi2html -> texi2any.

Index: doc/texinfo.txi
===================================================================
RCS file: /sources/texinfo/texinfo/doc/texinfo.txi,v
retrieving revision 1.346
retrieving revision 1.347
diff -u -b -r1.346 -r1.347
--- doc/texinfo.txi     8 Nov 2010 19:11:23 -0000       1.346
+++ doc/texinfo.txi     9 Nov 2010 17:55:03 -0000       1.347
@@ -1,5 +1,5 @@
 \input texinfo.tex    @c -*-texinfo-*-
address@hidden $Id: texinfo.txi,v 1.346 2010/11/08 19:11:23 karl Exp $
address@hidden $Id: texinfo.txi,v 1.347 2010/11/09 17:55:03 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.
 
@@ -1779,7 +1779,7 @@
 impossible.
 
 @item Unicode, and multilingual support generally, especially of east
-Asian language.  Although of course it's perfectly plausible to write
+Asian languages.  Although of course it's perfectly plausible to write
 such support in C, in the particular case of @command{makeinfo}, it
 would have been tantamount to rewriting the entire program.  In Perl,
 much of that comes essentially for free.
@@ -14176,9 +14176,12 @@
 
 @cindex Spaces in macros
 @cindex Whitespace in macros
-The newlines after the @code{@@macro} line and before the @code{@@end
-macro} line are ignored, that is, not included in the macro body.  All
-other whitespace is treated according to the usual Texinfo rules.
+The newline characters after the @code{@@macro} line and before the
address@hidden@@end macro} line are ignored, that is, not included in the
+macro body.  All other whitespace is treated according to the usual
+Texinfo rules.  However, there are still undesirable and unpredictable
+interactions between newlines, macros, and commands which are
+line-delimited, as warned about below (@pxref{Macro Details}).
 
 @cindex Recursive macro invocations
 @findex rmacro
@@ -14239,11 +14242,11 @@
 @end display
 
 @cindex Backslash, and macros
-Thus, the arguments and parameters are separated by commas and delimited
-by braces; any whitespace after (but not before) a comma is ignored.
-The braces are required in the invocation (but not the definition), even
-when the macro takes no arguments, consistent with all other Texinfo
-commands.  For example:
+Thus, the arguments and parameters are separated by commas and
+delimited by braces; any whitespace after (but not before) a comma is
+ignored.  The braces are required in the invocation, even when the
+macro takes no arguments, consistent with other Texinfo commands.  For
+example:
 
 @example
 @@macro argless @address@hidden
@@ -14400,9 +14403,7 @@
 set of names, and the possible resulting errors are unpredictable.
 
 @item
-All macros are expanded inside at least one @TeX{} group.  This means
-that @code{@@set} and other such commands have no effect inside a
-macro.
+All macros are expanded inside at least one @TeX{} group.
 
 @item
 Commas in macro arguments, even if escaped by a backslash, don't
@@ -14417,16 +14418,20 @@
 
 @item
 Macros containing a command which must be on a line by itself, such as
-a conditional, cannot be invoked in the middle of a line.  In general,
-the interaction of newlines in the macro definitions and invocations
-depends on the precise commands and context.  You may be able to work
-around some problems with judicious use of @code{@@c}.  Suppose you
-define a macro that is always intended to be used on a line by itself:
+a conditional, cannot be invoked in the middle of a line.  Similarly,
+macros containing line-oriented commands or text, such as
address@hidden@@example} environments, may behave unpredictably in @TeX{}.
+
address@hidden
+In general, the interaction of newlines in the macro definitions and
+invocations depends on the precise commands and context, despite the
+previous statements.  You may be able to work around some problems
+with judicious use of @code{@@c}.  Suppose you define a macro that is
+always intended to be used on a line by itself:
 
 @example
 @@macro linemac
-@@cindex whatever
-@@c
+@@cindex whatever @@c
 @@end macro
 ...
 foo
@@ -14445,9 +14450,9 @@
 
 @item
 In general, you can't arbitrarily substitute a macro call for Texinfo
-command arguments, even when the text is the same.  It might work with
-some commands, it fails with others.  Best not to do it at all.  For
-instance, this fails:
+command arguments, even when the text is the same.  Texinfo is not M4,
+or even @TeX{}.  It might work with some commands, it fails with
+others.  Best not to do it at all.  For instance, this fails:
 
 @example
 @@macro offmacro
@@ -22880,7 +22885,7 @@
 (@url{http://www.gnu.org/software/rcs}) version control systems, which
 expand it into a string such as:
 @example
-$Id: texinfo.txi,v 1.346 2010/11/08 19:11:23 karl Exp $
+$Id: texinfo.txi,v 1.347 2010/11/09 17:55:03 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}
@@ -22959,7 +22964,7 @@
 
 @verbatim
 \input texinfo   @c -*-texinfo-*-
address@hidden $Id: texinfo.txi,v 1.346 2010/11/08 19:11:23 karl Exp $
address@hidden $Id: texinfo.txi,v 1.347 2010/11/09 17:55:03 karl Exp $
 @comment %**start of header
 @setfilename sample.info
 @include version.texi

Index: util/htmlxref.cnf
===================================================================
RCS file: /sources/texinfo/texinfo/util/htmlxref.cnf,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -b -r1.32 -r1.33
--- util/htmlxref.cnf   8 Nov 2010 19:11:24 -0000       1.32
+++ util/htmlxref.cnf   9 Nov 2010 17:55:04 -0000       1.33
@@ -1,6 +1,6 @@
 # htmlxref.cnf - reference file for Texinfo files on the web.
 
-htmlxrefversion=2010-11-08.17; # UTC
+htmlxrefversion=2010-11-09.16; # UTC
 
 # Copyright 2010 Free Software Foundation, Inc.
 # 
@@ -35,7 +35,7 @@
 anubis         section ${GS}/anubis/manual/html_section/
 anubis         node    ${GS}/anubis/manual/html_node/
 
-anubis         section http://aspell.net/man-html/index.html
+aspell         section http://aspell.net/man-html/index.html
 
 auctex         mono    ${GS}/auctex/manual/auctex.html
 auctex         node    ${GS}/auctex/manual/auctex/
@@ -73,6 +73,9 @@
 coreutils      mono    ${GS}/coreutils/manual/coreutils
 coreutils      node    ${GS}/coreutils/manual/html_node/
 
+cpio           mono    ${GS}/cpio/manual/cpio
+cpio           node    ${GS}/cpio/manual/html_node/
+
 cssc           node    ${GS}/cssc/manual/
 
 #cvs cannot be handled here; see http://ximbiot.com/cvs/manual.
@@ -215,7 +218,7 @@
 
 gnu-arch       node    ${GS}/gnu-arch/tutorial/
 
-gnu-crypt      node    ${GS}/gnu-crypto/manual/
+gnu-crypto     node    ${GS}/gnu-crypto/manual/
 
 gnubg          mono    ${GS}/gnubg/manual/gnubg.html
 gnubg          node    ${GS}/gnubg/manual/html_node/
@@ -301,6 +304,9 @@
 jwhois         mono    ${GS}/jwhois/manual/jwhois.html
 jwhois         node    ${GS}/jwhois/manual/html_node/
 
+libc           mono    ${GS}/libc/manual/html_mono/libc.html
+libc           node    ${GS}/libc/manual/html_node/
+
 libextractor   mono    ${GS}/libextractor/extractor.html
 
 libidn         mono    ${GS}/libidn/manual/libidn.html
@@ -317,6 +323,9 @@
 liquidwar6     mono    ${GS}/liquidwar6/manual/liquidwar6.html
 liquidwar6     node    ${GS}/liquidwar6/manual/html_node/
 
+m4             mono    ${GS}/m4/manual/m4.html
+m4             node    ${GS}/m4/manual/html_node/
+
 mailutils      mono    ${GS}/mailutils/manual/mailutils.html
 mailutils      node    ${GS}/mailutils/manual/html_node/