[6554] allow @, in macro argument

[Gavin D. Smith]

Revision: 6554
          http://svn.sv.gnu.org/viewvc/?view=rev&root=texinfo&revision=6554
Author:   gavin
Date:     2015-08-19 15:23:23 +0000 (Wed, 19 Aug 2015)
Log Message:
-----------
allow @, in macro argument

Modified Paths:
--------------
    trunk/ChangeLog
    trunk/doc/texinfo-tex-test.texi
    trunk/doc/texinfo.tex

Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog     2015-08-19 14:59:00 UTC (rev 6553)
+++ trunk/ChangeLog     2015-08-19 15:23:23 UTC (rev 6554)
@@ -1,5 +1,13 @@
 2015-08-19  Gavin Smith  <address@hidden>
 
+       * doc/texinfo.tex (\scanctxt, \macrobodyctxt): Move change of 
+       catcode of @ to \macrobodyctxt, so that the , in @, doesn't 
+       separate arguments to a macro.
+       * doc/texinfo-tex-test.texi: Add example with @,c in a macro 
+       argument.
+
+2015-08-19  Gavin Smith  <address@hidden>
+
        * doc/texinfo.texi (Using Texinfo,  Overview): Merge Using 
        Texinfo into the introductory material for the containing 
        chapter.

Modified: trunk/doc/texinfo-tex-test.texi
===================================================================
--- trunk/doc/texinfo-tex-test.texi     2015-08-19 14:59:00 UTC (rev 6553)
+++ trunk/doc/texinfo-tex-test.texi     2015-08-19 15:23:23 UTC (rev 6554)
@@ -142,6 +142,48 @@
 address@hidden
 @end example
 
address@hidden Open or close a group in a macro
 
+Output should be doubled
 
address@hidden
address@hidden Example
address@hidden
address@hidden
address@hidden macro
+
address@hidden endExample
address@hidden group
address@hidden example
address@hidden macro
+
+x
address@hidden
+groff [ -abceghijklpstvzCEGNRSUVXZ ]
address@hidden
+x
+
+x
address@hidden
address@hidden@comment
+groff [ -abceghijklpstvzCEGNRSUVXZ ]
address@hidden group
address@hidden example
+x
+
address@hidden @,c in macro argument
+
address@hidden mactwo{argfirst, argsecond}
+\argfirst\+\argsecond\.
address@hidden macro
+
address@hidden
+
address@hidden fc Fran@,cois
address@hidden@value{fc},address@hidden
address@hidden@,cois,address@hidden
+Fran@,cois+.
+
+
+
 @bye

Modified: trunk/doc/texinfo.tex
===================================================================
--- trunk/doc/texinfo.tex       2015-08-19 14:59:00 UTC (rev 6553)
+++ trunk/doc/texinfo.tex       2015-08-19 15:23:23 UTC (rev 6554)
@@ -3,7 +3,7 @@
 % Load plain if necessary, i.e., if running under initex.
 \expandafter\ifx\csname fmtname\endcsname\relax\input plain\fi
 %
-\def\texinfoversion{2015-08-19.14}
+\def\texinfoversion{2015-08-19.17}
 %
 % Copyright 1985, 1986, 1988, 1990, 1991, 1992, 1993, 1994, 1995,
 % 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
@@ -7448,7 +7448,6 @@
   \catcode`\+=\other
   \catcode`\<=\other
   \catcode`\>=\other
-  address@hidden
   \catcode`\^=\other
   \catcode`\_=\other
   \catcode`\|=\other
@@ -7465,6 +7464,7 @@
 \def\macrobodyctxt{% used for @macro definitions
   \scanctxt
   \catcode`\ =\other
+  address@hidden
   \catcode`\{=\other
   \catcode`\}=\other
   \catcode`\^^M=\other