texinfo update (Mon Sep 6 19:44:01 EDT 2004)

[Karl Berry]

Index: ChangeLog
===================================================================
RCS file: /cvsroot/texinfo/texinfo/ChangeLog,v
retrieving revision 1.387
retrieving revision 1.388
diff -c -r1.387 -r1.388
*** ChangeLog   1 Sep 2004 11:40:20 -0000       1.387
--- ChangeLog   6 Sep 2004 23:24:02 -0000       1.388
***************
*** 1,3 ****
--- 1,11 ----
+ 2004-09-06  Stepan Kasal  <address@hidden>
+ 
+       * doc/texinfo.tex (\Efloat): Take care to run \scantokens on
+         \thisshortcaption before writing the lof line to auxfile.
+         Otherwise, when a newline appears in the argument to
+         @shortcaption, a literal ^^M is written to the aux file.
+         Report from Patrice, 1 Aug 2004 15:54:44 +0200.
+ 
  2004-09-01  Karl Berry  <address@hidden>
  
        * util/gendocs.sh: show commands, allow / in description.
Index: doc/texinfo.tex
===================================================================
RCS file: /cvsroot/texinfo/texinfo/doc/texinfo.tex,v
retrieving revision 1.174
retrieving revision 1.175
diff -c -r1.174 -r1.175
*** doc/texinfo.tex     27 Aug 2004 13:58:03 -0000      1.174
--- doc/texinfo.tex     6 Sep 2004 23:24:02 -0000       1.175
***************
*** 3,9 ****
  % Load plain if necessary, i.e., if running under initex.
  \expandafter\ifx\csname fmtname\endcsname\relax\input plain\fi
  %
! \def\texinfoversion{2004-08-27.06}
  %
  % Copyright (C) 1985, 1986, 1988, 1990, 1991, 1992, 1993, 1994, 1995,
  % 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004 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{2004-09-06.16}
  %
  % Copyright (C) 1985, 1986, 1988, 1990, 1991, 1992, 1993, 1994, 1995,
  % 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004 Free Software
***************
*** 6493,6506 ****
        % caption if specified, else the full caption if specified, else 
nothing.
        {%
          \atdummies \turnoffactive \otherbackslash
!         address@hidden
!           \floatident
!           \ifx\thisshortcaption\empty
!             \ifx\thiscaption\empty \else : \thiscaption \fi
!           \else
!             : \thisshortcaption
!           \fi
!         }}%
        }%
      \fi
    \egroup  % end of \vtop
--- 6493,6512 ----
        % caption if specified, else the full caption if specified, else 
nothing.
        {%
          \atdummies \turnoffactive \otherbackslash
!         % 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
!         % we don't write the literal three characters "^^M" into the aux file.
!       \scanexp{%
!         \xdef\noexpand\gtemp{%
!           \ifx\thisshortcaption\empty
!             \thiscaption
!           \else
!             \thisshortcaption
!           \fi
!         }%
!       }%
!         address@hidden
!         \ifx\gtemp\empty \else : \gtemp \fi}}%
        }%
      \fi
    \egroup  % end of \vtop
P ChangeLog
P doc/texinfo.tex