[7273] @@ in index file

[gavinsmith0123]

Revision: 7273
          http://svn.sv.gnu.org/viewvc/?view=rev&root=texinfo&revision=7273
Author:   gavin
Date:     2016-07-23 13:22:11 +0000 (Sat, 23 Jul 2016)
Log Message:
-----------
@@ in index file

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

Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog     2016-07-20 14:05:17 UTC (rev 7272)
+++ trunk/ChangeLog     2016-07-23 13:22:11 UTC (rev 7273)
@@ -1,3 +1,13 @@
+2016-07-23  Gavin Smith  <address@hidden>
+
+       * doc/texinfo.tex (\indexdummies): Use \definedummyletter\@ 
+       instead of outputting "@@" as "@" in index file.
+       (\mylbrace, \myrbrace): Remove out-of-date comment.
+       (\rbracecmd, \lbracecmd): Remove unused macros.
+
+       * doc/texinfo-tex-test.texi (Test of macros with @ in index): 
+       New test.
+
 2016-07-20  Masamichi Hosoda  <address@hidden>
 
        * doc/texinfo.tex:

Modified: trunk/doc/texinfo-tex-test.texi
===================================================================
--- trunk/doc/texinfo-tex-test.texi     2016-07-20 14:05:17 UTC (rev 7272)
+++ trunk/doc/texinfo-tex-test.texi     2016-07-23 13:22:11 UTC (rev 7273)
@@ -374,7 +374,7 @@
 \entry {\code {pdfetex}}{167}
 \entry {\code {pdftex}}{176}
 \entry {\code {pdftex\r {, and images}}}{97}
-\entry {\code {pdftexi2dvi}}{166}
+\entry {\code {pdftxei2dvi}}{166}
 \entry {Period in node name}{37}
 \entry {Periods, inserting}{111}
 \entry {Perl format strings for translation}{199}
@@ -500,7 +500,7 @@
 \entry {\code {pdfetex}}{167}
 \entry {\code {pdftex}}{176}
 \entry {\code {pdftex\r {, and images}}}{97}
-\entry {\code {pdftexi2dvi}}{166}
+\entry {\code {pdftxei2dvi}}{166}
 \entry {Period in node name}{37}
 \entry {Periods, inserting}{111}
 \entry {Perl format strings for translation}{199}
@@ -938,7 +938,24 @@
 
 @printindex ax
 
address@hidden Test of macros with @samp{@@} in index
 
address@hidden BB
+
address@hidden Mac {arg}
address@hidden
address@hidden macro
+
address@hidden MacTwo {arg}
address@hidden@}
address@hidden macro
+
address@hidden @Mac{CCCC @@}
+
address@hidden @MacTwo{DDDD @@}
address@hidden BB
+
+
 @chapter @code{@@set} and @code{@@value}
 
 @section Another test of @t{@@value}

Modified: trunk/doc/texinfo.tex
===================================================================
--- trunk/doc/texinfo.tex       2016-07-20 14:05:17 UTC (rev 7272)
+++ trunk/doc/texinfo.tex       2016-07-23 13:22:11 UTC (rev 7273)
@@ -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{2016-07-20.14}
+\def\texinfoversion{2016-07-23.13}
 %
 % Copyright 1985, 1986, 1988, 1990, 1991, 1992, 1993, 1994, 1995,
 % 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
@@ -3297,8 +3297,6 @@
 \let\atchar=\@
 
 % @{ @} @lbracechar{} @rbracechar{} all generate brace characters.
-% Unless we're in typewriter, use \ecfont because the CM text fonts do
-% not have braces, and we don't want to switch into math.
 \def\mylbrace{{\ifmonospace\char123\else\ensuremath\lbrace\fi}}
 \def\myrbrace{{\ifmonospace\char125\else\ensuremath\rbrace\fi}}
 \let\{=\mylbrace \let\lbracechar=\{
@@ -3309,8 +3307,6 @@
   \catcode`\{ = \other \catcode`\} = \other
   \catcode`\[ = 1 \catcode`\] = 2
   \catcode`\! = 0 \catcode`\\ = \other
-  !gdef!lbracecmd[\{]%
-  !gdef!rbracecmd[\}]%
   address@hidden
   address@hidden
 !endgroup
@@ -4818,15 +4814,13 @@
 %
 \def\indexdummies{%
   \escapechar = `\\     % use backslash in output files.
-  address@hidden@}% change to @@ when we switch to @ as escape char in index 
files.
+  address@hidden
   \def\ {\realbackslash\space }%
   %
   % Need these unexpandable (because we define \tt as a dummy)
   % definitions when @{ or @} appear in index entry text.  Also, more
   % complicated, when \tex is in effect and \{ is a \delimiter again.
-  % We can't use \lbracecmd and \rbracecmd because texindex assumes
-  % braces and backslashes are used only as delimiters.  Perhaps we
-  % should use @lbracechar and @rbracechar?
+  % Perhaps we should use @lbracechar and @rbracechar?
   \def\{{{\tt\char123}}%
   \def\}{{\tt\char125}}%
   %