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

[karl]

CVSROOT:        /sources/texinfo
Module name:    texinfo
Changes by:     karl <karl>     12/09/12 23:35:58

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

Log message:
        make @kbd respect @codequote... settings

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/texinfo/ChangeLog?cvsroot=texinfo&r1=1.1419&r2=1.1420
http://cvs.savannah.gnu.org/viewcvs/texinfo/doc/texinfo.txi?cvsroot=texinfo&r1=1.479&r2=1.480
http://cvs.savannah.gnu.org/viewcvs/texinfo/doc/texinfo.tex?cvsroot=texinfo&r1=1.374&r2=1.375

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/texinfo/texinfo/ChangeLog,v
retrieving revision 1.1419
retrieving revision 1.1420
diff -u -b -r1.1419 -r1.1420
--- ChangeLog   12 Sep 2012 22:23:10 -0000      1.1419
+++ ChangeLog   12 Sep 2012 23:35:58 -0000      1.1420
@@ -1,12 +1,30 @@
 2012-09-13  Patrice Dumas  <address@hidden>
 
-       * doc/refcard/txivarcheck(read_tp): filter out customization 
+       * doc/refcard/txivarcheck (read_tp): filter out customization 
        variables that are internal for the Parser and documented
        in the Parser, and variables that may only be set in
        init files as they are arrays or hashes.
 
 2012-09-12  Karl Berry  <address@hidden>
 
+       * doc/texinfo.tex (\markupsetuplqkbd, \markupsetuprqkbd):
+       use \markupsetcodequoteleft and right, like all the others.
+        (\markupsetnoligaturesquoteleft): no longer needed.
+        (\kbdsub): rename from \kbdfoo, reformat.
+        Other doc tweaks.
+       * doc/texinfo.txi (Inserting Quote Characters): @kbd now also
+       respects @codequote*.
+       Suggestion from Patrice, texinfo-devel 14 Aug 2012 00:03:54.
+
+       * doc/texinfo.tex (\markupsetuplqkbd, \markupsetuprqkbd):
+       use \markupsetcodequoteleft and right, like all the others.
+        (\markupsetnoligaturesquoteleft): no longer needed.
+        (\kbdsub): rename from \kbdfoo, reformat.
+        Other doc tweaks.
+       * doc/texinfo.txi (Inserting Quote Characters): @kbd now also
+       respects @codequote*.
+       Suggestion from Patrice, texinfo-devel 14 Aug 2012 00:03:54.
+
        * doc/texinfo.txi (verb): make example input match output.
        Report from christophe.jarry, 12 Sep 2012 13:49:27.
 

Index: doc/texinfo.txi
===================================================================
RCS file: /sources/texinfo/texinfo/doc/texinfo.txi,v
retrieving revision 1.479
retrieving revision 1.480
diff -u -b -r1.479 -r1.480
--- doc/texinfo.txi     12 Sep 2012 21:52:58 -0000      1.479
+++ doc/texinfo.txi     12 Sep 2012 23:35:58 -0000      1.480
@@ -1,5 +1,5 @@
 \input texinfo.tex    @c -*-texinfo-*-
address@hidden $Id: texinfo.txi,v 1.479 2012/09/12 21:52:58 karl Exp $
address@hidden $Id: texinfo.txi,v 1.480 2012/09/12 23:35:58 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.
 
@@ -10626,9 +10626,9 @@
 @code{@@codequote... off} will restore the normal behavior, as in
 @code{@@codequoteundirected off}.
 
-These settings affect @code{@@code}, @code{@@example}, @code{@@samp},
address@hidden, and @code{@@verbatim}; they do not affect @code{@@kbd}.
address@hidden Highlighting}.
+These settings affect @code{@@code}, @code{@@example}, @code{@@kbd},
address@hidden@@samp}, @code{@@verb}, and @code{@@verbatim}.  @xref{Useful
+Highlighting}.
 
 This feature used to be controlled by @code{@@set} variable names;
 they are still supported, but the command interface is preferred.
@@ -21841,7 +21841,7 @@
 or other version control systems, which expand it into a string such
 as:
 @example
-$Id: texinfo.txi,v 1.479 2012/09/12 21:52:58 karl Exp $
+$Id: texinfo.txi,v 1.480 2012/09/12 23:35:58 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.374
retrieving revision 1.375
diff -u -b -r1.374 -r1.375
--- doc/texinfo.tex     10 Sep 2012 18:45:44 -0000      1.374
+++ doc/texinfo.tex     12 Sep 2012 23:35:58 -0000      1.375
@@ -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-10.11}
+\def\texinfoversion{2012-09-12.16}
 %
 % Copyright 1985, 1986, 1988, 1990, 1991, 1992, 1993, 1994, 1995,
 % 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
@@ -2272,8 +2272,6 @@
 
 \gdef\markupsetcodequoteleft{\let`\codequoteleft}
 \gdef\markupsetcodequoteright{\let'\codequoteright}
-
-\gdef\markupsetnoligaturesquoteleft{\let`\noligaturesquoteleft}
 }
 
 \let\markupsetuplqcode \markupsetcodequoteleft
@@ -2282,6 +2280,9 @@
 \let\markupsetuplqexample \markupsetcodequoteleft
 \let\markupsetuprqexample \markupsetcodequoteright
 %
+\let\markupsetuplqkbd     \markupsetcodequoteleft
+\let\markupsetuprqkbd     \markupsetcodequoteright
+%
 \let\markupsetuplqsamp \markupsetcodequoteleft
 \let\markupsetuprqsamp \markupsetcodequoteright
 %
@@ -2291,8 +2292,6 @@
 \let\markupsetuplqverbatim \markupsetcodequoteleft
 \let\markupsetuprqverbatim \markupsetcodequoteright
 
-\let\markupsetuplqkbd \markupsetnoligaturesquoteleft
-
 % Allow an option to not use regular directed right quote/apostrophe
 % (char 0x27), but instead the undirected quote from cmtt (char 0x0d).
 % The undirected quote is ugly, so don't make it the default, but it
@@ -2694,10 +2693,6 @@
   \let\email=\uref
 \fi
 
-% @kbd is like @code, except that if the argument is just one @key command,
-% then @kbd has no effect.
-\def\kbd#1{{\setupmarkupstyle{kbd}\def\look{#1}\expandafter\kbdfoo\look??\par}}
-
 % @kbdinputstyle -- arg is `distinct' (@kbd uses slanted tty font always),
 %   `example' (@kbd uses ttsl only inside of @example and friends),
 %   or `code' (@kbd uses normal tty font always).
@@ -2721,11 +2716,17 @@
 % Default is `distinct'.
 \kbdinputstyle distinct
 
+% @kbd is like @code, except that if the argument is just one @key command,
+% then @kbd has no effect.
+\def\kbd#1{{\def\look{#1}\expandafter\kbdsub\look??\par}}
+
 \def\xkey{\key}
-\def\kbdfoo#1#2#3\par{\def\one{#1}\def\three{#3}\def\threex{??}%
-\ifx\one\xkey\ifx\threex\three \key{#2}%
-\else{\tclose{\kbdfont\setupmarkupstyle{kbd}\look}}\fi
-\else{\tclose{\kbdfont\setupmarkupstyle{kbd}\look}}\fi}
+\def\kbdsub#1#2#3\par{%
+  \def\one{#1}\def\three{#3}\def\threex{??}%
+  \ifx\one\xkey\ifx\threex\three \key{#2}%
+  \else{\tclose{\kbdfont\setupmarkupstyle{kbd}\look}}\fi
+  \else{\tclose{\kbdfont\setupmarkupstyle{kbd}\look}}\fi
+}
 
 % definition of @key that produces a lozenge.  Doesn't adjust to text size.
 %\setfont\keyrm\rmshape{8}{1000}{OT1}
@@ -4256,7 +4257,7 @@
 }
 \def\ifcmddefinedfail{\doignore{ifcommanddefined}}
 
-% @ifcommandnotdefined CMD ... handlded similar to @ifclear above.
+% @ifcommandnotdefined CMD ... handled similar to @ifclear above.
 \makecond{ifcommandnotdefined}
 \def\ifcommandnotdefined{%
   \parsearg{\doifcmddefined{\else \let\next=\ifcmdnotdefinedfail}}}