texinfo update (Sat Aug 13 12:22:01 EDT 2005)

[Karl Berry]

Index: ChangeLog
===================================================================
RCS file: /cvsroot/texinfo/texinfo/ChangeLog,v
retrieving revision 1.527
retrieving revision 1.528
diff -c -r1.527 -r1.528
*** ChangeLog   12 Aug 2005 12:27:26 -0000      1.527
--- ChangeLog   13 Aug 2005 15:58:08 -0000      1.528
***************
*** 1,3 ****
--- 1,12 ----
+ 2005-08-13  Karl Berry  <address@hidden>
+ 
+       * doc/texinfo.tex (\writetocentry, ...): restore calls to
+       \turnoffactive after \atdummies removed in the July 1 change (v.193).
+       \turnoffactive and \normalturnoffactive are not the same -- we need
+       actual backslash characters in the pdf destinations and .aux and
+       index files, not expansions.  (I'm not sure we ever need
+       \normalturnoffactive, actually.)
+ 
  2005-08-12  Karl Berry  <address@hidden>
  
        * doc/info.texi: merge changes from Emacs, by Juri.
Index: doc/texinfo.tex
===================================================================
RCS file: /cvsroot/texinfo/texinfo/doc/texinfo.tex,v
retrieving revision 1.199
retrieving revision 1.200
diff -c -r1.199 -r1.200
*** doc/texinfo.tex     7 Aug 2005 13:11:21 -0000       1.199
--- doc/texinfo.tex     13 Aug 2005 15:58:08 -0000      1.200
***************
*** 3,9 ****
  % Load plain if necessary, i.e., if running under initex.
  \expandafter\ifx\csname fmtname\endcsname\relax\input plain\fi
  %
! \def\texinfoversion{2005-08-07.06}
  %
  % Copyright (C) 1985, 1986, 1988, 1990, 1991, 1992, 1993, 1994, 1995,
  % 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005 Free Software
--- 3,9 ----
  % Load plain if necessary, i.e., if running under initex.
  \expandafter\ifx\csname fmtname\endcsname\relax\input plain\fi
  %
! \def\texinfoversion{2005-08-13.08}
  %
  % Copyright (C) 1985, 1986, 1988, 1990, 1991, 1992, 1993, 1994, 1995,
  % 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005 Free Software
***************
*** 1279,1284 ****
--- 1279,1285 ----
      % We have to set dummies so commands such as @code, and characters
      % such as \, aren't expanded when present in a section title.
      \atdummies
+     \turnoffactive
      \activebackslashdouble
      \def\pdfdestname{#1}%
      \backslashparens\pdfdestname
***************
*** 4572,4577 ****
--- 4573,4579 ----
      %
      \iflinks
        {\atdummies
+        \turnoffactive
         \edef\temp{%
           address@hidden
         \temp
***************
*** 6004,6009 ****
--- 6006,6012 ----
    \iflinks
      {%
        \atdummies  % preserve commands, but don't expand them
+       \turnoffactive
        \edef\writexrdef##1##2{%
        address@hidden #1 of \setref, expanded by the \edef
          ##1}{##2}}% these are parameters of \writexrdef
***************
*** 6672,6677 ****
--- 6675,6681 ----
        % caption if specified, else the full caption if specified, else 
nothing.
        {%
          \atdummies
+         \turnoffactive
          %
          % since we read the caption text in the macro world, where ^^M
          % is turned into a normal character, we have to scan it back, so
P ChangeLog
P doc/texinfo.tex