texinfo update (Thu Oct 7 08:22:01 EDT 2004)

[Karl Berry]

Index: ChangeLog
===================================================================
RCS file: /cvsroot/texinfo/texinfo/ChangeLog,v
retrieving revision 1.394
retrieving revision 1.395
diff -c -r1.394 -r1.395
*** ChangeLog   6 Oct 2004 21:31:34 -0000       1.394
--- ChangeLog   7 Oct 2004 12:13:01 -0000       1.395
***************
*** 1,3 ****
--- 1,14 ----
+ 2004-10-07  Stepan Kasal  <address@hidden>
+ 
+       @table command doesn't work inside environment @display.
+       There is no point in trying to fix it: just give up with a cry.
+ 
+       * doc/texinfo.tex (\table, \ftable, \vtable): Instead of calling
+         \tablex directly, call ...
+       (\tablecheck): ... this new macro which checks for active newline;
+         if it's found, it reports an error and uses \doignore to recover.
+       * doc/texinfo.txi (display): mention this.
+ 
  2004-10-06  Karl Berry  <address@hidden>
  
        * doc/*.texi: more consistent use of dashes.
Index: doc/texinfo.tex
===================================================================
RCS file: /cvsroot/texinfo/texinfo/doc/texinfo.tex,v
retrieving revision 1.175
retrieving revision 1.176
diff -c -r1.175 -r1.176
*** doc/texinfo.tex     6 Sep 2004 23:24:02 -0000       1.175
--- doc/texinfo.tex     7 Oct 2004 12:13:02 -0000       1.176
***************
*** 2314,2328 ****
  % @table, @ftable, @vtable.
  \envdef\table{%
    \let\itemindex\gobble
!   \tablex
  }
  \envdef\ftable{%
    \def\itemindex ##1{\doind {fn}{\code{##1}}}%
!   \tablex
  }
  \envdef\vtable{%
    \def\itemindex ##1{\doind {vr}{\code{##1}}}%
!   \tablex
  }
  \def\tablex#1{%
    \def\itemindicate{#1}%
--- 2314,2339 ----
  % @table, @ftable, @vtable.
  \envdef\table{%
    \let\itemindex\gobble
!   \tablecheck{table}%
  }
  \envdef\ftable{%
    \def\itemindex ##1{\doind {fn}{\code{##1}}}%
!   \tablecheck{ftable}%
  }
  \envdef\vtable{%
    \def\itemindex ##1{\doind {vr}{\code{##1}}}%
!   \tablecheck{vtable}%
! }
! \def\tablecheck#1{%
!   \ifnum \the\catcode`\^^M=\active
!     \endgroup
!     \errmessage{This command won't work in this context; perhaps the problem 
is
!       that we are \inenvironment\thisenv}%
!     \def\next{\doignore{#1}}%
!   \else
!     \let\next\tablex
!   \fi
!   \next
  }
  \def\tablex#1{%
    \def\itemindicate{#1}%
Index: doc/texinfo.txi
===================================================================
RCS file: /cvsroot/texinfo/texinfo/doc/texinfo.txi,v
retrieving revision 1.114
retrieving revision 1.115
diff -c -r1.114 -r1.115
*** doc/texinfo.txi     6 Oct 2004 21:29:48 -0000       1.114
--- doc/texinfo.txi     7 Oct 2004 12:13:02 -0000       1.115
***************
*** 1,5 ****
  \input texinfo.tex    @c -*-texinfo-*-
! @c $Id: texinfo.txi,v 1.114 2004/10/06 21:29:48 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.115 2004/10/07 12:13:02 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.
  
***************
*** 8136,8148 ****
  @cindex Display formatting
  @findex display
  
! The @code{@@display} command begins a kind of example.  It is like the
! @code{@@example} command
! except that, in
! a printed manual, @code{@@display} does not select the fixed-width
! font.  In fact, it does not specify the font at all, so that the text
! appears in the same font it would have appeared in without the
! @code{@@display} address@hidden
  
  @display
  This is an example of text written between an @code{@@display} command
--- 8136,8148 ----
  @cindex Display formatting
  @findex display
  
! The @code{@@display} command begins a kind of example, where each line
! of input produces a line of output, and the output is indented.  It is
! thus like the @code{@@example} command except that, in a printed
! manual, @code{@@display} does not select the fixed-width font.  In
! fact, it does not specify the font at all, so that the text appears in
! the same font it would have appeared in without the @code{@@display}
! command.
  
  @display
  This is an example of text written between an @code{@@display} command
***************
*** 8155,8160 ****
--- 8155,8165 ----
  @code{@@display} but uses a smaller font in @code{@@smallbook} format.
  @xref{small}.
  
+ The @code{@@table} command (@pxref{table}) does not work inside
+ @code{@@display}.  Since @code{@@display} is line-oriented, it doesn't
+ make sense to use them together.  If you want to indent a table, try
+ @code{@@quotation} (@pxref{quotation}).
+ 
  
  @node format
  @section @code{@@format} and @code{@@smallformat}
***************
*** 18351,18357 ****
  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.114 2004/10/06 21:29:48 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}
--- 18356,18362 ----
  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.115 2004/10/07 12:13:02 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}
***************
*** 18417,18423 ****
  
  @verbatim
  \input texinfo   @c -*-texinfo-*-
! @comment $Id: texinfo.txi,v 1.114 2004/10/06 21:29:48 karl Exp $
  @comment %**start of header
  @setfilename sample.info
  @include version.texi
--- 18422,18428 ----
  
  @verbatim
  \input texinfo   @c -*-texinfo-*-
! @comment $Id: texinfo.txi,v 1.115 2004/10/07 12:13:02 karl Exp $
  @comment %**start of header
  @setfilename sample.info
  @include version.texi
P ChangeLog
P doc/texinfo.tex
P doc/texinfo.txi