texinfo/doc texinfo.txi,1.50,1.51 texinfo.tex,1.42,1.43

[karl]

Update of /cvsroot/texinfo/texinfo/doc
In directory sheep:/tmp/cvs-serv5950

Modified Files:
        texinfo.txi texinfo.tex 
Log Message:
indicateurl, donode remove comma

Index: texinfo.txi
===================================================================
RCS file: /cvsroot/texinfo/texinfo/doc/texinfo.txi,v
retrieving revision 1.50
retrieving revision 1.51
diff -C2 -d -r1.50 -r1.51
*** texinfo.txi 4 Apr 2004 01:59:22 -0000       1.50
--- texinfo.txi 7 Apr 2004 15:20:30 -0000       1.51
***************
*** 347,351 ****
  * cite::                        Referring to books not in the  Info system.
  * acronym::                     Indicating acronyms.
! * url::                         Indicating a World Wide Web reference.
  * email::                       Indicating an electronic mail address.
  
--- 347,351 ----
  * 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.
  
***************
*** 6505,6509 ****
  
  @node uref
! @section @code{@@address@hidden@var{url}[, @var{text}][, @address@hidden
  @findex uref
  @cindex Uniform resource locator, referring to
--- 6505,6509 ----
  
  @node uref
! @section @code{@@url}, @code{@@address@hidden@var{url}[, @var{text}][, 
@address@hidden
  @findex uref
  @cindex Uniform resource locator, referring to
***************
*** 6516,6519 ****
--- 6516,6525 ----
  produces a link you can follow.
  
+ @code{@@url} is a synonym for @code{@@uref}.  Originally, @code{@@url}
+ had the meaning of @code{@@indicateurl}
+ (@pxref{indicateurl,,@code{@@indicateurl}}), but in actual practice it
+ was misused the vast majority of the time.  So we've changed the
+ definitions.
+ 
  The second argument, if specified, is the text to display (the default
  is the url itself); in Info and DVI output, but not in HTML output, the
***************
*** 6586,6590 ****
  
  To merely indicate a url without creating a link people can follow, use
! @code{@@url} (@pxref{url, @code{@@url}}).
  
  Some people prefer to display url's in the unambiguous format:
--- 6592,6596 ----
  
  To merely indicate a url without creating a link people can follow, use
! @code{@@indicateurl} (@pxref{indicateurl, @code{@@indicateurl}}).
  
  Some people prefer to display url's in the unambiguous format:
***************
*** 6661,6665 ****
  * cite::                        Referring to books not in the  Info system.
  * acronym::                     Indicating acronyms.
! * url::                         Indicating a World Wide Web reference.
  * email::                       Indicating an electronic mail address.
  @end menu
--- 6667,6671 ----
  * 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
***************
*** 6716,6720 ****
  Indicate an address@hidden
  
! @item @@address@hidden@address@hidden
  Indicate a uniform resource locator for the World Wide Web.
  
--- 6722,6726 ----
  Indicate an address@hidden
  
! @item @@address@hidden@address@hidden
  Indicate a uniform resource locator for the World Wide Web.
  
***************
*** 7388,7407 ****
  
  
! @node url
! @subsection @code{@@address@hidden@address@hidden
! @findex url
  @cindex Uniform resource locator, indicating
  @cindex URL, indicating
  
! Use the @code{@@url} command to indicate a uniform resource locator on
! the World Wide Web.  This is analogous to @code{@@file}, @code{@@var},
! etc., and is purely for markup purposes.  It does not produce a link you
! can follow in HTML output (use the @code{@@uref} command for that,
! @pxref{uref,, @code{@@uref}}).  It is useful for url's which do
! not actually exist.  For example:
  
- @c Two lines because one is too long for smallbook format.
  @example
! For example, the url might be @@address@hidden://example.org/address@hidden
  @end example
  
--- 7394,7412 ----
  
  
! @node indicateurl
! @subsection @code{@@address@hidden@address@hidden
! @findex indicateurl
  @cindex Uniform resource locator, indicating
  @cindex URL, indicating
  
! Use the @code{@@indicateurl} command to indicate a uniform resource
! locator on the World Wide Web.  This is analogous to @code{@@file},
! @code{@@var}, etc., and is purely for markup purposes.  It does not
! produce a link you can follow in HTML output (use the @code{@@uref}
! command for that, @pxref{uref,, @code{@@uref}}).  It is useful for
! url's which do not actually exist.  For example:
  
  @example
! For example, the url might be @@address@hidden://example.org/address@hidden
  @end example
  
***************
*** 7409,7413 ****
  
  @display
! For example, the url might be @url{http://example.org/path}.
  @end display
  
--- 7414,7418 ----
  
  @display
! For example, the url might be @indicateurl{http://example.org/path}.
  @end display
  
***************
*** 16196,16201 ****
  
  Then, for the following commands, the command name and braces are removed,
! the text of the argument is recursively transformed: @code{
! @@asis
  @@b
  @@cite
--- 16201,16205 ----
  
  Then, for the following commands, the command name and braces are removed,
! the text of the argument is recursively transformed: @code{@@asis
  @@b
  @@cite
***************
*** 16208,16211 ****
--- 16212,16216 ----
  @@env
  @@file
+ @@indicateurl
  @@kbd
  @@key
***************
*** 16214,16221 ****
  @@strong
  @@t
- @@url
  @@var
! @@w
! }.  For @code{@@sc}, any letters are capitalized.
  
  The following commands are replaced by constant text, as shown.  If
--- 16219,16224 ----
  @@strong
  @@t
  @@var
! @@w}.  For @code{@@sc}, any letters are capitalized.
  
  The following commands are replaced by constant text, as shown.  If
***************
*** 17041,17044 ****
--- 17044,17051 ----
  or printed document.  @xref{Include address@hidden
  
+ @item @@address@hidden@address@hidden
+ Indicate text that is a uniform resource locator for the World Wide
+ Web.  @xref{indicateurl, , @code{@@indicateurl}}.
+ 
  @item @@address@hidden@var{node-name}, address@hidden, @address@hidden
  Make a cross reference to an Info file for which there is no printed
***************
*** 17507,17516 ****
  
  @item @@address@hidden@var{url}[, @var{displayed-text}][, @address@hidden
  Define a cross reference to an external uniform resource locator for the
! World Wide Web.  @xref{uref, , @code{@@address@hidden
! 
! @item @@address@hidden@address@hidden
! Indicate text that is a uniform resource locator for the World Wide
! Web.  @xref{url, , @code{@@address@hidden
  
  @item @@address@hidden@address@hidden
--- 17514,17520 ----
  
  @item @@address@hidden@var{url}[, @var{displayed-text}][, @address@hidden
+ @itemx @@address@hidden@var{url}[, @var{displayed-text}][, @address@hidden
  Define a cross reference to an external uniform resource locator for the
! World Wide Web.  @xref{uref, , @code{@@uref}}.
  
  @item @@address@hidden@address@hidden

Index: texinfo.tex
===================================================================
RCS file: /cvsroot/texinfo/texinfo/doc/texinfo.tex,v
retrieving revision 1.42
retrieving revision 1.43
diff -C2 -d -r1.42 -r1.43
*** texinfo.tex 2 Apr 2004 17:34:05 -0000       1.42
--- texinfo.tex 7 Apr 2004 15:20:30 -0000       1.43
***************
*** 4,8 ****
  \expandafter\ifx\csname fmtname\endcsname\relax\input plain\fi
  %
! \def\texinfoversion{2004-04-02.09}
  %
  % Copyright (C) 1985, 1986, 1988, 1990, 1991, 1992, 1993, 1994, 1995,
--- 4,8 ----
  \expandafter\ifx\csname fmtname\endcsname\relax\input plain\fi
  %
! \def\texinfoversion{2004-04-07.08}
  %
  % Copyright (C) 1985, 1986, 1988, 1990, 1991, 1992, 1993, 1994, 1995,
***************
*** 1852,1857 ****
  \else{\tclose{\kbdfont\look}}\fi}
  
! % For @url, @env, @command quotes seem unnecessary, so use \code.
! \let\url=\code
  \let\env=\code
  \let\command=\code
--- 1852,1857 ----
  \else{\tclose{\kbdfont\look}}\fi}
  
! % For @indicateurl, @env, @command quotes seem unnecessary, so use \code.
! \let\indicateurl=\code
  \let\env=\code
  \let\command=\code
***************
*** 1885,1888 ****
--- 1885,1892 ----
  \endgroup}
  
+ % @url synonym for @uref, since that's how everyone uses it.
+ % 
+ \let\url=\uref
+ 
  % rms does not like angle brackets --karl, 17may97.
  % So now @email is just like @uref, unless we are pdf.
***************
*** 5761,5765 ****
  % 
  \parseargdef\node{\checkenv{}\donode #1 ,\finishnodeparse}
! \def\donode#1 ,#2\finishnodeparse{\gdef\lastnode{#1}}
  
  \let\nwnode=\node
--- 5765,5773 ----
  % 
  \parseargdef\node{\checkenv{}\donode #1 ,\finishnodeparse}
! %
! % also remove a trailing comma, in case of something like this:
! % @node Help-Cross,  ,  , Cross-refs
! \def\donode#1 ,#2\finishnodeparse{\dodonode #1,\finishnodeparse}
! \def\dodonode#1,#2\finishnodeparse{\gdef\lastnode{#1}}
  
  \let\nwnode=\node