branch master updated: No change for txicodevaristt

[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 1a6a773ae1 No change for txicodevaristt
1a6a773ae1 is described below

commit 1a6a773ae1a6b55047150d4ff5fd1d1efac27d5f
Author: Gavin Smith <gavinsmith0123@gmail.com>
AuthorDate: Wed Jan 1 14:55:58 2025 +0000

    No change for txicodevaristt
    
    * doc/texinfo.tex (\var): change comments to no longer say that
    we will turn off "@set txicodevaristt".  In practice users appear
    happy with the current behaviour.
    
    * TODO,
    * doc/texinfo.texi (@var): update
---
 ChangeLog        | 11 +++++++++++
 TODO             |  1 -
 doc/texinfo.tex  | 13 ++++++-------
 doc/texinfo.texi | 13 ++++++-------
 4 files changed, 23 insertions(+), 15 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index b90d7b7c45..4fe04e5d1b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2025-01-01  Gavin Smith <gavinsmith0123@gmail.com>
+
+       No change for txicodevaristt
+
+       * doc/texinfo.tex (\var): change comments to no longer say that
+       we will turn off "@set txicodevaristt".  In practice users appear
+       happy with the current behaviour.
+
+       * TODO,
+       * doc/texinfo.texi (@var): update
+
 2025-01-01  Gavin Smith <gavinsmith0123@gmail.com>
 
        * doc/texinfo.tex (\b): Call \defcharsdefault so that
diff --git a/TODO b/TODO
index 1a21887198..fbfc1b605f 100644
--- a/TODO
+++ b/TODO
@@ -83,7 +83,6 @@ If you are interested in working on any of these, email 
bug-texinfo@gnu.org.
       are not shown in emacs.  Ask AUCTeX/Emacs Info for help/tests?
 
 * TeX:
-  - should we turn off @set txicodevaristt?
   - Index above @item allows page break.
   - Table of contents is misaligned if there are 10 or more [sub]sections.
   - @float captions should be typeset in a smaller font?
diff --git a/doc/texinfo.tex b/doc/texinfo.tex
index 63cfe2a219..df714a3e16 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{2025-01-01.14}
+\def\texinfoversion{2025-01-01.15}
 %
 % Copyright 1985, 1986, 1988, 1990-2024 Free Software Foundation, Inc.
 %
@@ -2773,15 +2773,15 @@ end
 % @cite unconditionally uses \sl with \smartitaliccorrection.
 \def\cite#1{{\sl #1}\smartitaliccorrection}
 
-% @var unconditionally uses \sl.  This gives consistency for
-% parameter names whether they are in @def, @table @code or a
-% regular paragraph.
-%  To get ttsl font for @var when used in code context, @set txicodevaristt.
-% The \null is to reset \spacefactor.
+% By default, use ttsl font for @var when used in code context.
+% To unconditionally use \sl for @var, @clear txicodevaristt.  This
+% gives consistency for parameter names whether they are in @def,
+% @table @code or a regular paragraph.
 \def\aftersmartic{}
 \def\var#1{%
   \let\saveaftersmartic = \aftersmartic
   \def\aftersmartic{\null\let\aftersmartic=\saveaftersmartic}%
+  % The \null is to reset \spacefactor.
   %
   \ifflagclear{txicodevaristt}%
     {\def\varnext{{{\sl #1}}\smartitaliccorrection}}%
@@ -2789,7 +2789,6 @@ end
   \varnext
 }
 
-% To be removed after next release
 \def\SETtxicodevaristt{}% @set txicodevaristt
 
 \let\i=\smartitalic
diff --git a/doc/texinfo.texi b/doc/texinfo.texi
index 53a9c42728..f0d208a8c0 100644
--- a/doc/texinfo.texi
+++ b/doc/texinfo.texi
@@ -5202,13 +5202,12 @@ is correct for them (see the next section).
 The effect of @code{@@var} in the Info file is to change the case of
 the argument to all uppercase.  In the printed manual, the argument
 is output in slanted type.
-@footnote{In @TeX{} output, @code{@@var} currently uses a
-slanted typewriter font in code contexts such as @code{@@code}
-or @code{@@example}.  We plan to change this in the next release to
-use a variable-width, slanted roman font in all contexts.  To avoid
-this change, set the @samp{txicodevaristt} flag using @code{@@set};
-specify @samp{@@clear txicodevaristt} to make this change now
-(@pxref{@code{@@set @@value}}).  Note that this flag does nothing in
+@footnote{In @TeX{} output, @code{@@var} uses a slanted typewriter font
+in code contexts such as @code{@@code} or @code{@@example}.  To use a
+variable-width, slanted roman font in all contexts, specify @samp{@@clear
+txicodevaristt} (@pxref{@code{@@set @@value}}).   This gives consistency
+for parameter names whether they are in @code{@@def}, @code{@@table
+@@code}, or a regular paragraph.  Note that this flag does nothing in
 @LaTeX{} output.}
 
 @need 700