branch master updated: Typewriter for @deftype* line

[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 58b01ff2f0 Typewriter for @deftype* line
58b01ff2f0 is described below

commit 58b01ff2f062624c224d2a63f3386d303dc2789c
Author: Gavin Smith <gavinsmith0123@gmail.com>
AuthorDate: Tue Aug 9 17:55:05 2022 +0100

    Typewriter for @deftype* line
    
    * doc/texinfo.tex (\defunargs): Use \tt font for @deftype*
    instead of \sl.  Remove code changing \hyphenchar for \sl font.
    Define @var to output in \sl instead of \ttsl.
---
 ChangeLog       |  8 ++++++++
 doc/texinfo.tex | 21 ++++-----------------
 2 files changed, 12 insertions(+), 17 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 0a27c4ad86..0feb7e9c98 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2022-08-09  Gavin Smith  <gavinsmith0123@gmail.com>
+
+       Typewriter for @deftype* line
+
+       * doc/texinfo.tex (\defunargs): Use \tt font for @deftype*
+       instead of \sl.  Remove code changing \hyphenchar for \sl font.
+       Define @var to output in \sl instead of \ttsl.
+
 2022-08-09  Gavin Smith  <gavinsmith0123@gmail.com>
 
        * doc/texinfo.tex (\deffn, \defop):
diff --git a/doc/texinfo.tex b/doc/texinfo.tex
index 0af2d448c9..d5ac01ce01 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-08-09.15}
+\def\texinfoversion{2022-08-09.16}
 %
 % Copyright 1985, 1986, 1988, 1990-2022 Free Software Foundation, Inc.
 %
@@ -7826,24 +7826,11 @@ might help (with 'rm \jobname.?? \jobname.??s')%
   % arguments will be output next, if any.
 }
 
-% Print arguments in slanted roman (not ttsl), inconsistently with using
-% tt for the name.  This is because literal text is sometimes needed in
-% the argument list (groff manual), and ttsl and tt are not very
-% distinguishable.  Prevent hyphenation at `-' chars.
-%
+% Print arguments.  Use slanted for @def*, typewriter for @deftype*.
 \def\defunargs#1{%
-  % use sl by default (not ttsl),
-  % tt for the names.
-  \df \sl \hyphenchar\font=0
-  %
-  % On the other hand, if an argument has two dashes (for instance), we
-  % 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{{\setregularquotes\ttslanted{##1}}}%
+  \df \ifdoingtypefn \tt \else \sl \fi
+  \let\var\cite % \sl font for @var
   #1%
-  \sl\hyphenchar\font=45
 }
 
 % We want ()&[] to print specially on the defun line.