texinfo ChangeLog doc/texinfo.tex doc/texinfo.txi

[Karl Berry]

CVSROOT:        /sources/texinfo
Module name:    texinfo
Changes by:     Karl Berry <karl>       12/07/30 00:13:40

Modified files:
        .              : ChangeLog 
        doc            : texinfo.tex texinfo.txi 

Log message:
        make synonyms for @code vs. @samp more consistent

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/texinfo/ChangeLog?cvsroot=texinfo&r1=1.1389&r2=1.1390
http://cvs.savannah.gnu.org/viewcvs/texinfo/doc/texinfo.tex?cvsroot=texinfo&r1=1.369&r2=1.370
http://cvs.savannah.gnu.org/viewcvs/texinfo/doc/texinfo.txi?cvsroot=texinfo&r1=1.457&r2=1.458

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/texinfo/texinfo/ChangeLog,v
retrieving revision 1.1389
retrieving revision 1.1390
diff -u -b -r1.1389 -r1.1390
--- ChangeLog   23 Jul 2012 00:03:28 -0000      1.1389
+++ ChangeLog   30 Jul 2012 00:13:39 -0000      1.1390
@@ -1,3 +1,9 @@
+2012-07-29  Karl Berry  <address@hidden>
+
+       * doc/texinfo.tex (\file, \option): \let to \code, not \samp.
+       (\indicateurl): \let to \samp, not \code.
+       * doc/texinfo.txi (env, file, option): document this.
+
 2012-07-22  Karl Berry  <address@hidden>
 
        * doc/texinfo.txi (HTML Xref 8-bit Character Expansion): English.

Index: doc/texinfo.tex
===================================================================
RCS file: /sources/texinfo/texinfo/doc/texinfo.tex,v
retrieving revision 1.369
retrieving revision 1.370
diff -u -b -r1.369 -r1.370
--- doc/texinfo.tex     6 Jul 2012 23:10:29 -0000       1.369
+++ doc/texinfo.tex     30 Jul 2012 00:13:39 -0000      1.370
@@ -3,7 +3,7 @@
 % Load plain if necessary, i.e., if running under initex.
 \expandafter\ifx\csname fmtname\endcsname\relax\input plain\fi
 %
-\def\texinfoversion{2012-07-03.16}
+\def\texinfoversion{2012-07-29.17}
 %
 % Copyright 1985, 1986, 1988, 1990, 1991, 1992, 1993, 1994, 1995,
 % 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
@@ -2448,34 +2448,12 @@
 % @samp.
 \def\samp#1{{\setupmarkupstyle{samp}\lq\tclose{#1}\rq\null}}
 
-% definition of @key that produces a lozenge.  Doesn't adjust to text size.
-%\setfont\keyrm\rmshape{8}{1000}{OT1}
-%\font\keysy=cmsy9
-%\def\key#1{{\keyrm\textfont2=\keysy \leavevmode\hbox{%
-%  \raise0.4pt\hbox{\angleleft}\kern-.08em\vtop{%
-%    \vbox{\hrule\kern-0.4pt
-%     \hbox{\raise0.4pt\hbox{\vphantom{\angleleft}}#1}}%
-%    \kern-0.4pt\hrule}%
-%  \kern-.06em\raise0.4pt\hbox{\angleright}}}}
-
-% definition of @key with no lozenge.  If the current font is already
-% monospace, don't change it; that way, we respect @kbdinputstyle.  But
-% if it isn't monospace, then use \tt.
-%
-\def\key#1{{\setupmarkupstyle{key}%
-  \nohyphenation
-  \ifmonospace\else\tt\fi
-  #1}\null}
+% @indicateurl is \samp, that is, with quotes.
+\let\indicateurl=\samp
 
-% ctrl is no longer a Texinfo command.
-\def\ctrl #1{{\tt \rawbackslash \hat}#1}
-
-% @file, @option are the same as @samp.
-\let\file=\samp
-\let\option=\samp
-
-% @code is a modification of @t,
-% which makes spaces the same size as normal in the surrounding text.
+% @code (and similar) prints in typewriter, but with spaces the same
+% size as normal in the surrounding text, without hyphenation, etc.
+% This is a subroutine for that.
 \def\tclose#1{%
   {%
     % Change normal interword space to be same as for the current font.
@@ -2500,7 +2478,7 @@
 % We *must* turn on hyphenation at `-' and `_' in @code.
 % Otherwise, it is too hard to avoid overfull hboxes
 % in the Emacs manual, the Library manual, etc.
-
+%
 % Unfortunately, TeX uses one parameter (\hyphenchar) to control
 % both hyphenation at - and hyphenation within words.
 % We must therefore turn them both off (\tclose does that)
@@ -2564,6 +2542,13 @@
   \fi\fi
 }
 
+% For @command, @env, @file, @option quotes seem unnecessary,
+% so use \code rather than \samp.
+\let\command=\code
+\let\env=\code
+\let\file=\code
+\let\option=\code
+
 % @uref (abbreviation for `urlref') takes an optional (comma-separated)
 % second argument specifying the text to display and an optional third
 % arg as text to display instead of (rather than in addition to) the url
@@ -2743,10 +2728,24 @@
 \else{\tclose{\kbdfont\setupmarkupstyle{kbd}\look}}\fi
 \else{\tclose{\kbdfont\setupmarkupstyle{kbd}\look}}\fi}
 
-% For @indicateurl, @env, @command quotes seem unnecessary, so use \code.
-\let\indicateurl=\code
-\let\env=\code
-\let\command=\code
+% definition of @key that produces a lozenge.  Doesn't adjust to text size.
+%\setfont\keyrm\rmshape{8}{1000}{OT1}
+%\font\keysy=cmsy9
+%\def\key#1{{\keyrm\textfont2=\keysy \leavevmode\hbox{%
+%  \raise0.4pt\hbox{\angleleft}\kern-.08em\vtop{%
+%    \vbox{\hrule\kern-0.4pt
+%     \hbox{\raise0.4pt\hbox{\vphantom{\angleleft}}#1}}%
+%    \kern-0.4pt\hrule}%
+%  \kern-.06em\raise0.4pt\hbox{\angleright}}}}
+
+% definition of @key with no lozenge.  If the current font is already
+% monospace, don't change it; that way, we respect @kbdinputstyle.  But
+% if it isn't monospace, then use \tt.
+%
+\def\key#1{{\setupmarkupstyle{key}%
+  \nohyphenation
+  \ifmonospace\else\tt\fi
+  #1}\null}
 
 % @clicksequence{File @click{} Open ...}
 \def\clicksequence#1{\begingroup #1\endgroup}
@@ -2854,6 +2853,9 @@
   }
 }
 
+% ctrl is no longer a Texinfo command, but leave this definition for fun.
+\def\ctrl #1{{\tt \rawbackslash \hat}#1}
+
 % @inlinefmt{FMTNAME,PROCESSED-TEXT} and @inlineraw{FMTNAME,RAW-TEXT}.
 % Ignore unless FMTNAME == tex; then it is like @iftex and @tex,
 % except specified as a normal braced arg, so no newlines to worry about.

Index: doc/texinfo.txi
===================================================================
RCS file: /sources/texinfo/texinfo/doc/texinfo.txi,v
retrieving revision 1.457
retrieving revision 1.458
diff -u -b -r1.457 -r1.458
--- doc/texinfo.txi     23 Jul 2012 00:03:28 -0000      1.457
+++ doc/texinfo.txi     30 Jul 2012 00:13:40 -0000      1.458
@@ -1,5 +1,5 @@
 \input texinfo.tex    @c -*-texinfo-*-
address@hidden $Id: texinfo.txi,v 1.457 2012/07/23 00:03:28 karl Exp $
address@hidden $Id: texinfo.txi,v 1.458 2012/07/30 00:13: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.
 
@@ -6791,8 +6791,7 @@
 @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
-meaning.)
+was almost always misused.  So we've changed the meaning.)
 
 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
@@ -6891,9 +6890,6 @@
 The <a href="/man.cgi/1/ls">ls</a> program @dots{}
 @end example
 
-To merely indicate a url without creating a link people can follow, use
address@hidden@@indicateurl} (@pxref{indicateurl, @code{@@indicateurl}}).
-
 Some people prefer to display urls in the unambiguous format:
 
 @display
@@ -6907,6 +6903,9 @@
 since any software that tries to detect urls in text already has to
 detect them without the @samp{<URL:} to be useful.
 
+To merely indicate a url without creating a link people can follow, use
address@hidden@@indicateurl} (@pxref{indicateurl, @code{@@indicateurl}}).
+
 
 @node cite
 @section @code{@@address@hidden@address@hidden
@@ -7505,10 +7504,10 @@
 @subsection @code{@@address@hidden@address@hidden
 @findex env
 
-Use the @code{@@env} command to indicate environment variables, as used
-by many operating systems, including address@hidden  Do not use it for
-metasyntactic variables; use @code{@@var} instead (see the previous
-section).
+Use the @code{@@env} command to indicate environment variables, as
+used by many operating systems, including address@hidden  Do not use it for
address@hidden variables; use @code{@@var} for those (see the
+previous section).
 
 @code{@@env} is equivalent to @code{@@code} in its effects.
 For example:
@@ -7531,8 +7530,8 @@
 also use the command for file name suffixes.  Do not use @code{@@file}
 for symbols in a programming language; use @code{@@code}.
 
-Currently, @code{@@file} is equivalent to @code{@@samp} in its effects.
-For example,
address@hidden@@file} is equivalent to @code{code} in its effects.  For
+example,
 
 @example
 The @@address@hidden@} files are in
@@ -7584,7 +7583,7 @@
 example, @option{-l} or @option{--version} or
 @address@hidden
 
address@hidden@@option} is equivalent to @code{@@samp} in its effects.
address@hidden@@option} is equivalent to @code{@@code} in its effects.
 For example:
 
 @example
@@ -7595,8 +7594,6 @@
 The option @option{-l} produces a long listing.
 @end quotation
 
-In tables, putting options inside @code{@@code} produces a
-more pleasing effect.
 
 @node dfn
 @subsection @code{@@address@hidden@address@hidden
@@ -7814,6 +7811,7 @@
 * Fonts::                       Various font commands for printed output.
 @end menu
 
+
 @node emph & strong
 @subsection @code{@@address@hidden@address@hidden and 
@code{@@address@hidden@address@hidden
 @cindex Emphasizing text, font for
@@ -21958,7 +21956,7 @@
 Revision Control System}) or other version control systems, which
 expand it into a string such as:
 @example
-$Id: texinfo.txi,v 1.457 2012/07/23 00:03:28 karl Exp $
+$Id: texinfo.txi,v 1.458 2012/07/30 00:13: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}