[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
texinfo ChangeLog doc/texinfo.txi doc/texinfo.tex
From: |
karl |
Subject: |
texinfo ChangeLog doc/texinfo.txi doc/texinfo.tex |
Date: |
Mon, 10 Sep 2012 18:45:44 +0000 |
CVSROOT: /sources/texinfo
Module name: texinfo
Changes by: karl <karl> 12/09/10 18:45:44
Modified files:
. : ChangeLog
doc : texinfo.txi texinfo.tex
Log message:
@code better than @var to get multiple dashes in @defun args
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/texinfo/ChangeLog?cvsroot=texinfo&r1=1.1413&r2=1.1414
http://cvs.savannah.gnu.org/viewcvs/texinfo/doc/texinfo.txi?cvsroot=texinfo&r1=1.475&r2=1.476
http://cvs.savannah.gnu.org/viewcvs/texinfo/doc/texinfo.tex?cvsroot=texinfo&r1=1.373&r2=1.374
Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/texinfo/texinfo/ChangeLog,v
retrieving revision 1.1413
retrieving revision 1.1414
diff -u -b -r1.1413 -r1.1414
--- ChangeLog 10 Sep 2012 13:43:35 -0000 1.1413
+++ ChangeLog 10 Sep 2012 18:45:44 -0000 1.1414
@@ -1,3 +1,9 @@
+2012-09-10 Karl Berry <address@hidden>
+
+ * doc/texinfo.txi (Functions Commands): recommend @code rather
+ than @var to avoid en-dashes and em-dashes (and Spanish ligatures)
+ in formal parameter names containing 2+ hyphens.
+
2012-09-10 Patrice Dumas <address@hidden>
* util/Makefile.am, util/txixml2texi.pl, TODO: add a new script,
Index: doc/texinfo.txi
===================================================================
RCS file: /sources/texinfo/texinfo/doc/texinfo.txi,v
retrieving revision 1.475
retrieving revision 1.476
diff -u -b -r1.475 -r1.476
--- doc/texinfo.txi 9 Sep 2012 19:16:49 -0000 1.475
+++ doc/texinfo.txi 10 Sep 2012 18:45:44 -0000 1.476
@@ -1,5 +1,5 @@
\input texinfo.tex @c -*-texinfo-*-
address@hidden $Id: texinfo.txi,v 1.475 2012/09/09 19:16:49 karl Exp $
address@hidden $Id: texinfo.txi,v 1.476 2012/09/10 18:45:44 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.
@@ -12596,12 +12596,12 @@
explicitly with @code{@@var} to refer to the value of the argument.
In the example above, we used @samp{@@address@hidden@}} in this way.
-In the unusual case when an argument name contains @samp{--}, or
-another character sequence which is treated specially
-(@pxref{Conventions}), use @code{@@var} around the argument. This
-causes the name to be printed in slanted typewriter, instead of the
-regular slanted font, exactly as input.
address@hidden except for ?` and !`, but we won't explain that.
+In the extremely unusual case when an argument name contains
address@hidden, or another character sequence which is treated specially
+(@pxref{Conventions}), use @code{@@code} around the special
+characters. This avoids the conversion to typographic en-dashes and
+em-dashes.
address@hidden @var also works; that's what we used to recommend.
The template for @code{@@deffn} is:
@@ -21836,7 +21836,7 @@
or other version control systems, which expand it into a string such
as:
@example
-$Id: texinfo.txi,v 1.475 2012/09/09 19:16:49 karl Exp $
+$Id: texinfo.txi,v 1.476 2012/09/10 18:45:44 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}
Index: doc/texinfo.tex
===================================================================
RCS file: /sources/texinfo/texinfo/doc/texinfo.tex,v
retrieving revision 1.373
retrieving revision 1.374
diff -u -b -r1.373 -r1.374
--- doc/texinfo.tex 5 Sep 2012 15:44:34 -0000 1.373
+++ doc/texinfo.tex 10 Sep 2012 18:45:44 -0000 1.374
@@ -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-09-05.06}
+\def\texinfoversion{2012-09-10.11}
%
% Copyright 1985, 1986, 1988, 1990, 1991, 1992, 1993, 1994, 1995,
% 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
@@ -2382,8 +2382,7 @@
\aftersmartic
}
-% like \smartslanted except unconditionally uses \ttsl, and no ic.
-% @var is set to this for defun arguments.
+% Unconditional use \ttsl, and no ic. @var is set to this for defuns.
\def\ttslanted#1{{\ttsl #1}}
% @cite is like \smartslanted except unconditionally use \sl. We never want
@@ -7072,7 +7071,10 @@
\df \sl \hyphenchar\font=0
%
% On the other hand, if an argument has two dashes (for instance), we
- % want a way to get ttsl. Let's try @var for that.
+ % want a way to get ttsl. We used to recommend @var for that, so
+ % leave the code in, but it's strange for @var to lead to typewriter.
+ % Nowadays we recommend @code, since the difference between a ttsl hyphen
+ % and a tt hyphen is pretty tiny. @code also disables ?` !`.
\def\var##1{{\setupmarkupstyle{var}\ttslanted{##1}}}%
#1%
\sl\hyphenchar\font=45
- texinfo ChangeLog doc/texinfo.txi doc/texinfo.tex,
karl <=