[6559] fix @macro expansion in @math

[Gavin D. Smith]

Revision: 6559
          http://svn.sv.gnu.org/viewvc/?view=rev&root=texinfo&revision=6559
Author:   gavin
Date:     2015-08-21 11:07:07 +0000 (Fri, 21 Aug 2015)
Log Message:
-----------
fix @macro expansion in @math

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

Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog     2015-08-20 11:43:21 UTC (rev 6558)
+++ trunk/ChangeLog     2015-08-21 11:07:07 UTC (rev 6559)
@@ -1,3 +1,13 @@
+2015-08-21  Gavin Smith  <address@hidden>
+
+       * doc/texinfo.tex (\scanmacro): Alias \c with \texinfoc and use 
+       it instead of \c at end of macro body.
+       (\parsearg): Strip of a texinfoc comment as well.
+       * doc/texinfo-tex-test.texi: Add example with a @macro expansion 
+       inside @math.
+
+       * NEWS: Mention change for non-alphanumeric index initials.
+
 2015-08-20  Gavin Smith  <address@hidden>
 
        * doc/texinfo.tex (\indexdummies): Remove redefinition of 

Modified: trunk/NEWS
===================================================================
--- trunk/NEWS  2015-08-20 11:43:21 UTC (rev 6558)
+++ trunk/NEWS  2015-08-21 11:07:07 UTC (rev 6559)
@@ -29,6 +29,12 @@
     makeinfo will, where needed, create a menu for nodes lacking one 
     given explicitly.
 
+* texinfo.tex:
+  . For initials in indices that are non-alphanumeric characters (for
+    example, backslash, or braces), avoid use of a typewriter font.  
+    This gives a more consistent appearance.
+  . \c no longer has its plain TeX meaning inside @tex or @math.
+
 * makeinfo
   . Some Perl modules have been rewritten in C to increase speed.
     Disable at build time with "configure --disable-perl-xs".  The 

Modified: trunk/doc/texinfo-tex-test.texi
===================================================================
--- trunk/doc/texinfo-tex-test.texi     2015-08-20 11:43:21 UTC (rev 6558)
+++ trunk/doc/texinfo-tex-test.texi     2015-08-21 11:07:07 UTC (rev 6559)
@@ -184,6 +184,14 @@
 @mactwo{Fran@,cois,address@hidden
 Fran@,cois+.
 
address@hidden Macro in argument to @@math
 
address@hidden frac {a,b}
+\a\ @over \b\
address@hidden macro
 
+exceeds @address@hidden,16}} pt
+
+
+
 @bye

Modified: trunk/doc/texinfo.tex
===================================================================
--- trunk/doc/texinfo.tex       2015-08-20 11:43:21 UTC (rev 6558)
+++ trunk/doc/texinfo.tex       2015-08-21 11:07:07 UTC (rev 6559)
@@ -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-20.13}
+\def\texinfoversion{2015-08-21.13}
 %
 % Copyright 1985, 1986, 1988, 1990, 1991, 1992, 1993, 1994, 1995,
 % 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
@@ -427,9 +427,13 @@
 \def\nsbot{\vbox
   {\hrule height\cornerlong depth\cornerthick width\cornerthick}}
 
+
+% Argument parsing
+
 % Parse an argument, then pass it to #1.  The argument is the rest of
 % the input line (except we remove a trailing comment).  #1 should be a
 % macro which expects an ordinary undelimited TeX argument.
+% For example, \def\foo{\parsearg\fooxxx}.
 %
 \def\parsearg{\parseargusing{}}
 \def\parseargusing#1#2{%
@@ -448,9 +452,11 @@
   }%
 }
 
-% First remove any @comment, then any @c comment.
+% First remove any @comment, then any @c comment.  Also remove a @texinfoc
+% comment (see \scanmacro for details).  Pass the result on to \argcheckspaces.
 \def\argremovecomment#1\comment#2\ArgTerm{\argremovec #1\c\ArgTerm}
-\def\argremovec#1\c#2\ArgTerm{\argcheckspaces#1\^^M\ArgTerm}
+\def\argremovec#1\c#2\ArgTerm{\argremovetexinfoc #1\texinfoc\ArgTerm}
+\def\argremovetexinfoc#1\texinfoc#2\ArgTerm{\argcheckspaces#1\^^M\ArgTerm}
 
 % Each occurrence of `\^^M' or `<space>\^^M' is replaced by a single space.
 %
@@ -7329,13 +7335,17 @@
 \let\aftermacroxxx\relax
 \def\aftermacro{\aftermacroxxx}
 
+% alias because \c means cedilla in @tex or @math
+\let\texinfoc=\c
+
+% Used at the time of macro expansion.
 % Argument is macro body with arguments substituted
 \def\scanmacro#1{%
   \newlinechar`\^^M
   \let\xeatspaces\eatspaces
   %
   % Process the macro body under the current catcode regime.
-  \scantokens{#1\c}\aftermacro%
+  \scantokens{#1\texinfoc}\aftermacro%
   %
   % The \c is to remove the \newlinechar added by \scantokens, and
   % can be noticed by \parsearg.