branch master updated: * doc/texinfo.tex (\kbd): Simplify definition so as not to check whether @key is contained within.

[Gavin D. Smith]

This is an automated email from the git hooks/post-receive script.

gavin pushed a commit to branch master
in repository texinfo.

The following commit(s) were added to refs/heads/master by this push:
     new e48f5532d1 * doc/texinfo.tex (\kbd): Simplify definition so as not to 
check whether @key is contained within.
e48f5532d1 is described below

commit e48f5532d11731269d0c5539fa7aeec0d00f21ae
Author: Gavin Smith <gavinsmith0123@gmail.com>
AuthorDate: Sun Jan 2 13:47:30 2022 +0000

    * doc/texinfo.tex (\kbd): Simplify definition so as not to
    check whether @key is contained within.
---
 ChangeLog       |  5 +++++
 doc/texinfo.tex | 14 +++-----------
 2 files changed, 8 insertions(+), 11 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 872373e147..7353711627 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2022-01-02  Gavin Smith  <gavinsmith0123@gmail.com>
+
+       * doc/texinfo.tex (\kbd): Simplify definition so as not to
+       check whether @key is contained within.
+
 2022-01-02  Gavin Smith  <gavinsmith0123@gmail.com>
 
        * doc/info-stnd.texi: Revise use of @key and @kbd.
diff --git a/doc/texinfo.tex b/doc/texinfo.tex
index 951ac11fcf..2da7271f16 100644
--- a/doc/texinfo.tex
+++ b/doc/texinfo.tex
@@ -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{2022-01-02.12}
+\def\texinfoversion{2022-01-02.13}
 %
 % Copyright 1985, 1986, 1988, 1990-2021 Free Software Foundation, Inc.
 %
@@ -3171,16 +3171,8 @@ end
 % 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\kbdsub#1#2#3\par{%
-  \def\one{#1}\def\three{#3}\def\threex{??}%
-  \ifx\one\xkey\ifx\threex\three \key{#2}%
-  \else{\tclose{\kbdfont\setcodequotes\look}}\fi
-  \else{\tclose{\kbdfont\setcodequotes\look}}\fi
+\def\kbd#1{%
+  \tclose{\kbdfont\setcodequotes#1}%
 }
 
 % definition of @key that produces a lozenge.  Doesn't adjust to text size.