texinfo update (Fri Aug 27 10:22:01 EDT 2004)

[Karl Berry]

Index: ChangeLog
===================================================================
RCS file: /cvsroot/texinfo/texinfo/ChangeLog,v
retrieving revision 1.382
retrieving revision 1.384
diff -c -r1.382 -r1.384
*** ChangeLog   27 Aug 2004 13:39:25 -0000      1.382
--- ChangeLog   27 Aug 2004 13:58:03 -0000      1.384
***************
*** 1,3 ****
--- 1,13 ----
+ 2004-08-27  Karl Berry  <address@hidden>
+ 
+       * doc/texinfo.tex (\Efloat): \vskip\parskip after printing the
+       caption; previous \printedsomething code to do this had become
+       obsolete.  Reported by Stepan.
+ 
+       * doc/texinfo.txi (caption shortcaption): show an example for
+         @shortcaption, and remark that weird commands like @c and @verb
+       are not allowed.  Suggested by Stepan.
+ 
  2004-08-27  Stepan Kasal  <address@hidden>
  
        * doc/texinfo.tex (\initial): when breaking the column before the
Index: doc/texinfo.tex
===================================================================
RCS file: /cvsroot/texinfo/texinfo/doc/texinfo.tex,v
retrieving revision 1.173
retrieving revision 1.174
diff -c -r1.173 -r1.174
*** doc/texinfo.tex     27 Aug 2004 13:39:25 -0000      1.173
--- doc/texinfo.tex     27 Aug 2004 13:58:03 -0000      1.174
***************
*** 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-20.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-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
***************
*** 6480,6485 ****
--- 6480,6488 ----
      \ifx\captionline\empty \else
        \vskip.5\parskip
        \captionline
+       %
+       % Space below caption.
+       \vskip\parskip
      \fi
      %
      % If have an xref label, write the list of floats info.  Do this
***************
*** 6500,6508 ****
          }}%
        }%
      \fi
-     %
-     % Space below caption, if we printed anything.
-     \ifx\printedsomething\empty \else \vskip\parskip \fi
    \egroup  % end of \vtop
    %
    % place the captured inserts
--- 6503,6508 ----
Index: doc/texinfo.txi
===================================================================
RCS file: /cvsroot/texinfo/texinfo/doc/texinfo.txi,v
retrieving revision 1.108
retrieving revision 1.109
diff -c -r1.108 -r1.109
*** doc/texinfo.txi     18 Aug 2004 22:41:28 -0000      1.108
--- doc/texinfo.txi     27 Aug 2004 13:53:40 -0000      1.109
***************
*** 1,5 ****
  \input texinfo.tex    @c -*-texinfo-*-
! @c $Id: texinfo.txi,v 1.108 2004/08/18 22:41:28 karl Exp $
  @c Ordinarily, Texinfo files have the extension .texi.  But texinfo.texi
  @c clashes with texinfo.tex on 8.3 filesystems, so we use texinfo.txi.
  
--- 1,5 ----
  \input texinfo.tex    @c -*-texinfo-*-
! @c $Id: texinfo.txi,v 1.109 2004/08/27 13:53:40 karl Exp $
  @c Ordinarily, Texinfo files have the extension .texi.  But texinfo.texi
  @c clashes with texinfo.tex on 8.3 filesystems, so we use texinfo.txi.
  
***************
*** 9183,9189 ****
  @code{@@float}, and takes a single argument in braces.  The short
  caption text is used instead of the caption text in a list of floats
  (see the next section).  Thus, you can write a long caption for the
! main document, and a short title to appear in the list of floats.
  
  
  @node listoffloats
--- 9183,9201 ----
  @code{@@float}, and takes a single argument in braces.  The short
  caption text is used instead of the caption text in a list of floats
  (see the next section).  Thus, you can write a long caption for the
! main document, and a short title to appear in the list of floats.  For
! example:
! 
! @example
! @@float
! ... as above ...
! @@shortcaption{Text for list of floats.}
! @@end float
! @end example
! 
! The text for @code{@@caption} and @code{@@shortcaption} may not
! contain comments (@code{@@c}), verbatim text (@text{@@verb}),
! environments such as @code{@@example}, or other complex constructs.
  
  
  @node listoffloats
***************
*** 18312,18318 ****
  Concurrent Versions System}) or RCS (see rcsintro(1)) version control
  systems, which expand it into a string such as:
  @example
! $Id: texinfo.txi,v 1.108 2004/08/18 22:41:28 karl Exp $
  @end example
  (This is useful in all sources that use version control, not just manuals.)
  You may wish to include the @samp{$Id:} comment in the @code{@@copying}
--- 18324,18330 ----
  Concurrent Versions System}) or RCS (see rcsintro(1)) version control
  systems, which expand it into a string such as:
  @example
! $Id: texinfo.txi,v 1.109 2004/08/27 13:53:40 karl Exp $
  @end example
  (This is useful in all sources that use version control, not just manuals.)
  You may wish to include the @samp{$Id:} comment in the @code{@@copying}
***************
*** 18378,18384 ****
  
  @verbatim
  \input texinfo   @c -*-texinfo-*-
! @comment $Id: texinfo.txi,v 1.108 2004/08/18 22:41:28 karl Exp $
  @comment %**start of header
  @setfilename sample.info
  @include version.texi
--- 18390,18396 ----
  
  @verbatim
  \input texinfo   @c -*-texinfo-*-
! @comment $Id: texinfo.txi,v 1.109 2004/08/27 13:53:40 karl Exp $
  @comment %**start of header
  @setfilename sample.info
  @include version.texi
P ChangeLog
P doc/texinfo.tex
P doc/texinfo.txi