[6948] fix @{ in @xref

[Gavin D. Smith]

Revision: 6948
          http://svn.sv.gnu.org/viewvc/?view=rev&root=texinfo&revision=6948
Author:   gavin
Date:     2016-01-20 19:03:10 +0000 (Wed, 20 Jan 2016)
Log Message:
-----------
fix @{ in @xref

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

Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog     2016-01-17 13:42:56 UTC (rev 6947)
+++ trunk/ChangeLog     2016-01-20 19:03:10 UTC (rev 6948)
@@ -1,3 +1,21 @@
+2016-01-20  Gavin Smith  <address@hidden>
+
+       * doc/texinfo.tex (\indexnofonts): Replace definitions of @{ and
+       @} so that \indexnofonts can be used for constructing a control
+       sequence name with \csname, as is done in \xrefX.  Give them
+       different values in order not to cause problems should two xref
+       names differ only by replacing @{ with @}.
+       (\dosubindwrite): Override definitions of @{ and @} set in 
+       \indexnofonts to their previous definitions in \indexnofonts.
+       @{ in xref broken reported by Karl Berry.
+
+2016-01-17  Gavin Smith  <address@hidden>
+
+       6.0.92 pretest.
+
+       * configure.ac, README, NEWS: 2016.
+       * configure.ac: 6.0.92 pretest.
+
 2016-01-15  Gavin Smith  <address@hidden>
 
        * tp/Texinfo/Convert/XSParagraph/configure.ac: Get Perl conf 

Modified: trunk/doc/texinfo.tex
===================================================================
--- trunk/doc/texinfo.tex       2016-01-17 13:42:56 UTC (rev 6947)
+++ trunk/doc/texinfo.tex       2016-01-20 19:03:10 UTC (rev 6948)
@@ -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-01-11.19}
+\def\texinfoversion{2016-01-20.19}
 %
 % Copyright 1985, 1986, 1988, 1990, 1991, 1992, 1993, 1994, 1995,
 % 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
@@ -4737,12 +4737,11 @@
   \def\_{\normalunderscore}%
   \def\-{}% @- shouldn't affect sorting
   %
-  \def\lbracechar{{\indexlbrace}}%
-  \def\rbracechar{{\indexrbrace}}%
-  \let\{=\lbracechar
-  \let\}=\rbracechar
+  \uccode`\1=`\{ \uppercase{\def\{{1}}%
+  \uccode`\1=`\} \uppercase{\def\}{1}}%
+  \let\lbracechar\{
+  \let\rbracechar\}
   %
-  %
   % Non-English letters.
   \def\AA{AA}%
   \def\AE{AE}%
@@ -4901,9 +4900,15 @@
   \indexdummies % Must do this here, since \bf, etc expand at this stage
   \useindexbackslash % \indexbackslash isn't defined now so it will be output 
                      % as is; and it will print as backslash.
+  % The braces around \indexbrace are recognized by texindex.
+  %
   % Get the string to sort by, by processing the index entry with all
   % font commands turned off.
   {\indexnofonts
+   \def\lbracechar{{\indexlbrace}}%
+   \def\rbracechar{{\indexrbrace}}%
+   \let\{=\lbracechar
+   \let\}=\rbracechar
    \indexnonalnumdisappear
    \xdef\indexsortkey{}%
    \let\sortas=\indexwritesortas