texinfo update (Mon Jul 12 10:22:01 EDT 2004)

[Karl Berry]

Index: ChangeLog
===================================================================
RCS file: /cvsroot/texinfo/texinfo/ChangeLog,v
retrieving revision 1.355
retrieving revision 1.356
diff -c -r1.355 -r1.356
*** ChangeLog   11 Jul 2004 21:51:16 -0000      1.355
--- ChangeLog   12 Jul 2004 14:05:36 -0000      1.356
***************
*** 1,3 ****
--- 1,14 ----
+ 2004-07-12  Karl Berry  <address@hidden>
+ 
+       * texinfo/texinfo.txi (Useful Highlighting): Include
+               cross-references to each of the commands.  Suggestion from
+               Wolfgang Pausch, 12 Jul 2004 08:26:28 +0200.
+ 
+       * texinfo/texinfo.txi (Invoking makeinfo),
+       * makeinfo/makeinfo.c: mention that --if-noFORMAT also processes
+       @ifnotFORMAT blocks.
+       Suggestion from Stepan.
+ 
  2004-07-11  Karl Berry  <address@hidden>
  
        * makeinfo/makeinfo.c (discard_until): leave input_text_offset at
Index: doc/texinfo.txi
===================================================================
RCS file: /cvsroot/texinfo/texinfo/doc/texinfo.txi,v
retrieving revision 1.100
retrieving revision 1.101
diff -c -r1.100 -r1.101
*** doc/texinfo.txi     11 Jul 2004 01:02:34 -0000      1.100
--- doc/texinfo.txi     12 Jul 2004 14:05:36 -0000      1.101
***************
*** 1,5 ****
  \input texinfo.tex    @c -*-texinfo-*-
! @c $Id: texinfo.txi,v 1.100 2004/07/11 01:02:34 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.101 2004/07/12 14:05: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.
  
***************
*** 6657,6673 ****
  * code::                        Indicating program code.
  * kbd::                         Showing keyboard input.
  * key::                         Specifying keys.
! * samp::                        A literal sequence of characters.
! * verb::                        A verbatim sequence of characters.
  * var::                         Indicating metasyntactic variables.
  * env::                         Indicating environment variables.
  * file::                        Indicating file names.
  * command::                     Indicating command names.
  * option::                      Indicating option names.
  * dfn::                         Specifying definitions.
! * cite::                        Referring to books not in the  Info system.
  * acronym::                     Indicating acronyms.
! * indicateurl::                 Indicating a World Wide Web reference.
  * email::                       Indicating an electronic mail address.
  @end menu
  
--- 6657,6673 ----
  * code::                        Indicating program code.
  * kbd::                         Showing keyboard input.
  * key::                         Specifying keys.
! * samp::                        Indicating a literal sequence of characters.
! * verb::                        Indicating a verbatim sequence of characters.
  * var::                         Indicating metasyntactic variables.
  * env::                         Indicating environment variables.
  * file::                        Indicating file names.
  * command::                     Indicating command names.
  * option::                      Indicating option names.
  * dfn::                         Specifying definitions.
! * cite::                        Referring to books not in the Info system.
  * acronym::                     Indicating acronyms.
! * indicateurl::                 Indicating an example URL.
  * email::                       Indicating an electronic mail address.
  @end menu
  
***************
*** 6687,6732 ****
  
  @table @code
  @item @@address@hidden@address@hidden
! Indicate text that is a literal example of a piece of a address@hidden
  
  @item @@address@hidden@address@hidden
! Indicate keyboard address@hidden
  
  @item @@address@hidden@address@hidden
! Indicate the conventional name for a key on a address@hidden
  
  @item @@address@hidden@address@hidden
!
! commands, and do process @samp{@@address@hidden, even if
! generating the given format.  For instance, if @option{--no-ifhtml} is
! specified, then @samp{@@ifhtml} and @samp{@@html} blocks will not be
! read, and @samp{@@ifnothtml} blocks will be.
  
  @item --no-split
  @opindex --no-split
***************
*** 18186,18192 ****
  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.100 2004/07/11 01:02:34 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}
--- 18205,18211 ----
  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.101 2004/07/12 14:05: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}
***************
*** 18252,18258 ****
  
  @verbatim
  \input texinfo   @c -*-texinfo-*-
! @comment $Id: texinfo.txi,v 1.100 2004/07/11 01:02:34 karl Exp $
  @comment %**start of header
  @setfilename sample.info
  @include version.texi
--- 18271,18277 ----
  
  @verbatim
  \input texinfo   @c -*-texinfo-*-
! @comment $Id: texinfo.txi,v 1.101 2004/07/12 14:05:36 karl Exp $
  @comment %**start of header
  @setfilename sample.info
  @include version.texi
Index: makeinfo/makeinfo.c
===================================================================
RCS file: /cvsroot/texinfo/texinfo/makeinfo/makeinfo.c,v
retrieving revision 1.62
retrieving revision 1.63
diff -c -r1.62 -r1.63
*** makeinfo/makeinfo.c 11 Jul 2004 21:51:18 -0000      1.62
--- makeinfo/makeinfo.c 12 Jul 2004 14:05:37 -0000      1.63
***************
*** 1,5 ****
  /* makeinfo -- convert Texinfo source into other formats.
!    $Id: makeinfo.c,v 1.62 2004/07/11 21:51:18 karl Exp $
  
     Copyright (C) 1987, 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
     2000, 2001, 2002, 2003, 2004 Free Software Foundation, Inc.
--- 1,5 ----
  /* makeinfo -- convert Texinfo source into other formats.
!    $Id: makeinfo.c,v 1.63 2004/07/12 14:05:37 karl Exp $
  
     Copyright (C) 1987, 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
     2000, 2001, 2002, 2003, 2004 Free Software Foundation, Inc.
***************
*** 437,442 ****
--- 437,444 ----
    --no-ifplaintext  do not process @ifplaintext text.\n\
    --no-iftex        do not process @iftex and @tex text.\n\
    --no-ifxml        do not process @ifxml and @xml text.\n\
+ \n\
+   Also, for the --no-ifFORMAT options, do process @ifnotFORMAT text.\n\
  "));
  
      puts (_("\
P ChangeLog
P doc/texinfo.txi
P makeinfo/makeinfo.c