texinfo update (Sun Jan 8 17:22:01 EST 2006)

[Karl Berry]

Index: ChangeLog
===================================================================
RCS file: /sources/texinfo/texinfo/ChangeLog,v
retrieving revision 1.553
retrieving revision 1.554
diff -c -r1.553 -r1.554
*** ChangeLog   26 Dec 2005 22:05:09 -0000      1.553
--- ChangeLog   8 Jan 2006 22:14:37 -0000       1.554
***************
*** 1,3 ****
--- 1,14 ----
+ 2006-01-08  Karl Berry  <address@hidden>
+ 
+       * doc/texinfo.tex (\normalturnoffactive): restore setting of
+       active \ to \normalbackslash.
+       (\onepageout): restore call to \normalturnoffactive.
+       Otherwise, if a page break happens at the wrong time, the active
+       \ will result in writing an actual \ character,
+       instead of {\tt \backslashcurfont }.
+       Report from address@hidden, 6 Jan 2006 14:38:38 +0100.
+       [test idxback-exts]
+ 
  2005-12-26  Karl Berry  <address@hidden>
  
        * doc/texinfo.txi (node, Node Names): pxref Node Line Requirements,
Index: doc/texinfo.tex
===================================================================
RCS file: /sources/texinfo/texinfo/doc/texinfo.tex,v
retrieving revision 1.205
retrieving revision 1.206
diff -c -r1.205 -r1.206
*** doc/texinfo.tex     26 Dec 2005 00:23:11 -0000      1.205
--- doc/texinfo.tex     8 Jan 2006 22:14:37 -0000       1.206
***************
*** 3,13 ****
  % Load plain if necessary, i.e., if running under initex.
  \expandafter\ifx\csname fmtname\endcsname\relax\input plain\fi
  %
! \def\texinfoversion{2005-12-25.16}
  %
  % Copyright (C) 1985, 1986, 1988, 1990, 1991, 1992, 1993, 1994, 1995,
! % 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005 Free Software
! % Foundation, Inc.
  %
  % This texinfo.tex file is free software; you can redistribute it and/or
  % modify it under the terms of the GNU General Public License as
--- 3,13 ----
  % Load plain if necessary, i.e., if running under initex.
  \expandafter\ifx\csname fmtname\endcsname\relax\input plain\fi
  %
! \def\texinfoversion{2006-01-08.14}
  %
  % Copyright (C) 1985, 1986, 1988, 1990, 1991, 1992, 1993, 1994, 1995,
! % 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006 Free
! % Software Foundation, Inc.
  %
  % This texinfo.tex file is free software; you can redistribute it and/or
  % modify it under the terms of the GNU General Public License as
***************
*** 293,298 ****
--- 293,305 ----
      % before the \shipout runs.
      %
      \indexdummies         % don't expand commands in the output.
+     \normalturnoffactive  % \ in index entries must not stay \, e.g., if
+                % the page break happens to be in the middle of an example.
+                % We don't want .vr (or whatever) entries like this:
+                % \entry{{\tt \indexbackslash }acronym}{32}{\code {\acronym}}
+                % "\acronym" won't work when it's read back in;
+                % it needs to be 
+                % {\code {{\tt \backslashcurfont }acronym}
      \shipout\vbox{%
        % Do this early so pdf references go to the beginning of the page.
        \ifpdfmakepagedest \pdfdest name{\the\pageno} xyz\fi
***************
*** 7113,7134 ****
  % \otherifyactive is called near the end of this file.
  \def\otherifyactive{\catcode`+=\other \catcode`\_=\other}
  
- % Same as @turnoffactive below, but backslash retains its normal definition.
- % (Before 2005-08-15, this macro explicitly assigned @address@hidden,
- % but it doesn't seem to be necessary. --kasal)
- \def\normalturnoffactive{%
-   \let"=\normaldoublequote
-   \let~=\normaltilde
-   \let^=\normalcaret
-   \let_=\normalunderscore
-   \let|=\normalverticalbar
-   \let<=\normalless
-   \let>=\normalgreater
-   \let+=\normalplus
-   \let$=\normaldollar %$ font-lock fix
-   \unsepspaces
- }
- 
  % Used sometimes to turn off (effectively) the active characters even after
  % parsing them.
  \def\turnoffactive{%
--- 7120,7125 ----
***************
*** 7160,7165 ****
--- 7151,7173 ----
  @address@hidden@address@hidden
  @address@hidden@address@hidden
  
+ % Same as @turnoffactive except outputs \ as {\tt\char`\\} instead of
+ % the literal character `\'.
+ % 
+ @address@hidden
+   @address@hidden
+   @let"address@hidden
+   @address@hidden
+   @address@hidden
+   @address@hidden
+   @let|address@hidden
+   @let<address@hidden
+   @let>address@hidden
+   @address@hidden
+   @address@hidden %$ font-lock fix
+   @unsepspaces
+ }
+ 
  % Make _ and + \other characters, temporarily.
  % This is canceled by @fixbackslash.
  @otherifyactive
P ChangeLog
P doc/texinfo.tex