[5416] conditional for testing new texindex work

[karl]

Revision: 5416
          http://svn.sv.gnu.org/viewvc/?view=rev&root=texinfo&revision=5416
Author:   karl
Date:     2014-02-17 00:36:37 +0000 (Mon, 17 Feb 2014)
Log Message:
-----------
conditional for testing new texindex work

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

Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog     2014-02-15 14:00:27 UTC (rev 5415)
+++ trunk/ChangeLog     2014-02-17 00:36:37 UTC (rev 5416)
@@ -1,10 +1,20 @@
+2014-02-16  Karl Berry  <address@hidden>
+
+       * doc/texinfo.tex (\ifusebracesinindexes): new conditional for testing.
+       (\indexnofonts): if set, output @{ as \{ in the sort string,
+       instead of |a; likewise @}.  Request from Arnold.
+
 2014-02-15  Patrice Dumas  <address@hidden>
+
        * Texinfo/Convert/DocBook.pm: do not use lineannotation for 
        @r, the semantics are not the same.  Report from Aharon Robbins.
-       * Texinfo/Convert/Plaintext.pm(_printindex_formatted), 
Texinfo/Common.pm, 
-       doc/texinfo.texi: new customization variable INDEX_SPECIAL_CHARS_WARNING
-       to warn about invalid index entries in Info.  Report from Glenn Morris.
 
+       * Texinfo/Convert/Plaintext.pm (_printindex_formatted),
+       * Texinfo/Common.pm, 
+       * doc/texinfo.texi: new customization variable
+        INDEX_SPECIAL_CHARS_WARNING to warn about invalid index entries in
+        Info.  Report from Glenn Morris.
+
 2014-02-09  Karl Berry  <address@hidden>
 
        * doc/texinfo.tex (\cartouche): do not do \nonarrowing at all;

Modified: trunk/doc/texinfo.tex
===================================================================
--- trunk/doc/texinfo.tex       2014-02-15 14:00:27 UTC (rev 5415)
+++ trunk/doc/texinfo.tex       2014-02-17 00:36:37 UTC (rev 5416)
@@ -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{2014-02-09.15}
+\def\texinfoversion{2014-02-16.16}
 %
 % Copyright 1985, 1986, 1988, 1990, 1991, 1992, 1993, 1994, 1995,
 % 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
@@ -4428,7 +4428,7 @@
   % 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.
+  % should use @lbracechar and @rbracechar?
   \def\{{{\tt\char123}}%
   \def\}{{\tt\char125}}%
   %
@@ -4449,9 +4449,8 @@
   % @end macro
   % ...
   % @funindex commtest
+  % This is not enough to reproduce the bug, but it gives the flavor.
   %
-  % The above is not enough to reproduce the bug, but it gives the flavor.
-  %
   % Sample whatsit resulting:
   % address@hidden@folio address@hidden address@hidden }}}
   %
@@ -4663,6 +4662,9 @@
   \let\xeatspaces = \eatspaces
 }
 
+% For testing: output @{ and @} in index sort strings as \{ and \}.
+\newif\ifusebracesinindexes
+
 % \indexnofonts is used when outputting the strings to sort the index
 % by, and when constructing control sequence names.  It eliminates all
 % control sequences and just writes whatever the best ASCII sort string
@@ -4691,11 +4693,16 @@
   % Unfortunately, texindex is not prepared to handle braces in the
   % content at all.  So for index sorting, we map @{ and @} to strings
   % starting with |, since that ASCII character is between ASCII { and }.
-  \def\{{|a}%
-  \def\lbracechar{|a}%
+  \ifusebracesinindexes
+    \def\lbracechar{\lbracecmd}%
+    \def\rbracechar{\rbracecmd}%
+  \else
+    \def\lbracechar{|a}%
+    \def\rbracechar{|b}%
+  \fi
+  \let\{=\lbracechar
+  \let\}=\rbracechar
   %
-  \def\}{|b}%
-  \def\rbracechar{|b}%
   %
   % Non-English letters.
   \def\AA{AA}%