texinfo ChangeLog doc/texinfo.tex

[Karl Berry]

CVSROOT:        /sources/texinfo
Module name:    texinfo
Changes by:     Karl Berry <karl>       10/04/22 16:23:44

Modified files:
        .              : ChangeLog 
        doc            : texinfo.tex 

Log message:
        do not expand \{ and \} in index entries

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/texinfo/ChangeLog?cvsroot=texinfo&r1=1.1041&r2=1.1042
http://cvs.savannah.gnu.org/viewcvs/texinfo/doc/texinfo.tex?cvsroot=texinfo&r1=1.316&r2=1.317

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/texinfo/texinfo/ChangeLog,v
retrieving revision 1.1041
retrieving revision 1.1042
diff -u -b -r1.1041 -r1.1042
--- ChangeLog   18 Apr 2010 16:34:29 -0000      1.1041
+++ ChangeLog   22 Apr 2010 16:23:43 -0000      1.1042
@@ -1,3 +1,9 @@
+2010-04-22  Karl Berry  <address@hidden>
+
+       * doc/texinfo.tex (\indexdummies): define \{ and \} as before,
+       so they don't get expanded in writing the index.  Report
+       from Peter Breitenlohner.
+
 2010-04-18  Karl Berry  <address@hidden>
 
        * doc/texinfo.tex (\@): use \char64 from the current font, instead

Index: doc/texinfo.tex
===================================================================
RCS file: /sources/texinfo/texinfo/doc/texinfo.tex,v
retrieving revision 1.316
retrieving revision 1.317
diff -u -b -r1.316 -r1.317
--- doc/texinfo.tex     18 Apr 2010 16:34:29 -0000      1.316
+++ doc/texinfo.tex     22 Apr 2010 16:23:43 -0000      1.317
@@ -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{2010-04-18.09}
+\def\texinfoversion{2010-04-22.18}
 %
 % Copyright 1985, 1986, 1988, 1990, 1991, 1992, 1993, 1994, 1995,
 % 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
@@ -2720,8 +2720,8 @@
 % Used to generate quoted braces.  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\else\ecfont\fi \char123}}
-\def\myrbrace {{\ifmonospace\else\ecfont\fi \char125}}
+\def\mylbrace{{\ifmonospace\else\ecfont\fi \char123}}
+\def\myrbrace{{\ifmonospace\else\ecfont\fi \char125}}
 \let\{=\mylbrace
 \let\}=\myrbrace
 \begingroup
@@ -4136,11 +4136,14 @@
   address@hidden@}% change to @@ when we switch to @ as escape char in index 
files.
   \def\ {\realbackslash\space }%
   %
-  % Need these in case \tex is in effect and \{ is a \delimiter again.
-  % But can't use \lbracecmd and \rbracecmd because texindex assumes
-  % braces and backslashes are used only as delimiters.
-  \let\{ = \mylbrace
-  \let\} = \myrbrace
+  % 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 define @lbrace and @rbrace commands a la @comma.
+  \def\{{{\tt\char123}}%
+  \def\}{{\tt\char125}}%
   %
   % I don't entirely understand this, but when an index entry is
   % generated from a macro call, the \endinput which \scanmacro inserts