(\tocentry): Don't \turnoffactive before

typesetting the arguments, it causes special characters to be
printed incorrectly.

1 files changed, 4 insertions, 3 deletions

diff --git a/texinfo.tex b/texinfo.tex
index c8b5f9f..f1d7d4f 100644
--- a/texinfo.tex
+++ b/texinfo.tex
@@ -3442,11 +3442,12 @@ width0pt\relax} \fi
 % the index entries, but we want to suppress hyphenation here.  (We
 % can't do that in the \entry macro, since index entries might consist
 % of hyphenated-identifiers-that-do-not-fit-on-a-line-and-nothing-else.)
-%
-% \turnoffactive is for the sake of @" used for umlauts.
 \def\tocentry#1#2{\begingroup
   \vskip 0pt plus1pt % allow a little stretch for the sake of nice page breaks
-  \entry{\turnoffactive #1}{\turnoffactive #2}%
+  % Do not use \turnoffactive in these arguments.  Since the toc is
+  % typeset in cmr, so characters such as _ would come out wrong; we
+  % have to do the usual translation tricks.
+  \entry{#1}{#2}%
 \endgroup}
 
 % Space between chapter (or whatever) number and the title.