texinfo update (Tue Jul 5 20:22:01 EDT 2005)

[Karl Berry]

Index: ChangeLog
===================================================================
RCS file: /cvsroot/texinfo/texinfo/ChangeLog,v
retrieving revision 1.519
retrieving revision 1.520
diff -c -r1.519 -r1.520
*** ChangeLog   5 Jul 2005 10:27:07 -0000       1.519
--- ChangeLog   6 Jul 2005 00:00:36 -0000       1.520
***************
*** 1,3 ****
--- 1,8 ----
+ 2005-07-05  Karl Berry  <address@hidden>
+ 
+       * doc/texinfo.txi (verbatim): mention @verbatim inside
+       @smallformat, now that it works.
+ 
  2005-07-04  Stepan Kasal  <address@hidden>
  
        * doc/texinfo.tex (\commondummies): Remove \unsepspaces, it's already
Index: doc/texinfo.txi
===================================================================
RCS file: /cvsroot/texinfo/texinfo/doc/texinfo.txi,v
retrieving revision 1.145
retrieving revision 1.146
diff -c -r1.145 -r1.146
*** doc/texinfo.txi     5 Jun 2005 15:06:17 -0000       1.145
--- doc/texinfo.txi     6 Jul 2005 00:00:36 -0000       1.146
***************
*** 1,5 ****
  \input texinfo.tex    @c -*-texinfo-*-
! @c $Id: texinfo.txi,v 1.145 2005/06/05 15:06:17 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.146 2005/07/06 00:00:36 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.
  
***************
*** 7970,7989 ****
  Use the @code{@@verbatim} environment for printing of text that may
  contain special characters or commands that should not be interpreted,
  such as computer input or output (@code{@@example} interprets its text
! as regular Texinfo commands).  This is especially useful for including
! automatically generated output in a Texinfo manual.  Here is an example;
! the output you see is just the same as the input, with a line
! @code{@@verbatim} before and a line @code{@@end verbatim} after.
  
! @verbatim
! This is an example of text written in a @verbatim
! block.  No character substitutions are made.  All commands
! are ignored, until `<at>end verbatim'.
! 
! In the printed manual, the text is typeset in a
! fixed-width font, and not indented or filled.  All
! spaces and blank lines are significant, including tabs.
! @end verbatim
  
  Write a @code{@@verbatim} command at the beginning of a line by itself.
  This line will disappear from the output.  Mark the end of the verbatim
--- 7970,7982 ----
  Use the @code{@@verbatim} environment for printing of text that may
  contain special characters or commands that should not be interpreted,
  such as computer input or output (@code{@@example} interprets its text
! as regular Texinfo commands).  This is especially useful for including 
automatically
! generated files in a Texinfo manual.
  
! In general, the output will be just the same as the input.  No
! character substitutions are made, e.g., all spaces and blank lines are
! significant, including tabs.  In the printed manual, the text is
! typeset in a fixed-width font, and not indented or filled.
  
  Write a @code{@@verbatim} command at the beginning of a line by itself.
  This line will disappear from the output.  Mark the end of the verbatim
***************
*** 8004,8010 ****
  @end example
  
  @noindent
! produces
  
  @verbatim
  {
--- 7997,8003 ----
  @end example
  
  @noindent
! This produces:
  
  @verbatim
  {
***************
*** 8019,8025 ****
  verbatim}.  Blank lines between the beginning @code{@@verbatim} and
  the ending @code{@@end verbatim} will appear in the output.
  
! It is not reliable to use @code{@@verbatim} inside other Texinfo constructs.
  
  
  @node verbatiminclude
--- 8012,8033 ----
  verbatim}.  Blank lines between the beginning @code{@@verbatim} and
  the ending @code{@@end verbatim} will appear in the output.
  
! @cindex Verbatim, small
! @cindex Small verbatim
! You can get a ``small'' verbatim by enclosing the @code{@@verbatim} in
! an @code{@@smallformat} environment, as shown here:
! 
! @c more cheating ...
! @smallexample
! @exdent @t{@@smallformat}
! @exdent @t{@@verbatim}
! @exdent @t{... still verbatim, but in a smaller font ...}
! @exdent @t{@@end verbatim}
! @exdent @t{@@end smallformat}
! @end smallexample
! 
! Finally, a word of warning: it is not reliable to use
! @code{@@verbatim} inside other Texinfo constructs.
  
  
  @node verbatiminclude
***************
*** 8044,8059 ****
  
  The name of the file is taken literally, with a single exception:
  @code{@@address@hidden@address@hidden references are expanded.  This makes it
! possible to reliably include files in other directories in a
! distribution, for instance:
  
  @example
! @@include @@address@hidden@}/NEWS
  @end example
  
  @noindent (You still have to get @code{top_srcdir} defined in the
  first place.)
  
  
  @node lisp
  @section @code{@@lisp}: Marking a Lisp Example
--- 8052,8070 ----
  
  The name of the file is taken literally, with a single exception:
  @code{@@address@hidden@address@hidden references are expanded.  This makes it
! possible to include files in other directories within a distribution,
! for instance:
  
  @example
! @@verbatiminclude @@address@hidden@}/NEWS
  @end example
  
  @noindent (You still have to get @code{top_srcdir} defined in the
  first place.)
  
+ For a method on printing the file contents in a smaller font size, see
+ the end of the previous section on @code{@@verbatim}.
+ 
  
  @node lisp
  @section @code{@@lisp}: Marking a Lisp Example
***************
*** 18576,18582 ****
  (@url{http://www.gnu.org/software/rcs}) version control systems, which
  expand it into a string such as:
  @example
! $Id: texinfo.txi,v 1.145 2005/06/05 15:06:17 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}
--- 18587,18593 ----
  (@url{http://www.gnu.org/software/rcs}) version control systems, which
  expand it into a string such as:
  @example
! $Id: texinfo.txi,v 1.146 2005/07/06 00:00:36 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}
***************
*** 18642,18648 ****
  
  @verbatim
  \input texinfo   @c -*-texinfo-*-
! @comment $Id: texinfo.txi,v 1.145 2005/06/05 15:06:17 karl Exp $
  @comment %**start of header
  @setfilename sample.info
  @include version.texi
--- 18653,18659 ----
  
  @verbatim
  \input texinfo   @c -*-texinfo-*-
! @comment $Id: texinfo.txi,v 1.146 2005/07/06 00:00:36 karl Exp $
  @comment %**start of header
  @setfilename sample.info
  @include version.texi
P ChangeLog
P doc/texinfo.txi