branch master updated: @set txicodevaristt by default, for now

[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 18389820e7 @set txicodevaristt by default, for now
18389820e7 is described below

commit 18389820e7059724edfcd616e8bfafb376c5b9e1
Author: Gavin Smith <gavinsmith0123@gmail.com>
AuthorDate: Sat Aug 27 00:53:57 2022 +0100

    @set txicodevaristt by default, for now
    
    * doc/texinfo.tex: @set txicodevaristt by default
    * NEWS, doc/texinfo.texi (@var): update
    * README-hacking, TODO: note to turn this off after next release
---
 ChangeLog        |  8 ++++++++
 NEWS             |  6 ++++--
 README-hacking   |  6 ++++++
 TODO             |  1 +
 doc/texinfo.tex  |  5 ++++-
 doc/texinfo.texi | 16 ++++++++++------
 6 files changed, 33 insertions(+), 9 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index b032742050..60a85c9c13 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2022-08-27  Gavin Smith  <gavinsmith0123@gmail.com>
+
+       @set txicodevaristt by default, for now
+
+       * doc/texinfo.tex: @set txicodevaristt by default
+       * NEWS, doc/texinfo.texi (@var): update
+       * README-hacking, TODO: note to turn this off after next release
+
 2022-08-26  Gavin Smith  <gavinsmith0123@gmail.com>
 
        * NEWS: font change for @deftype*
diff --git a/NEWS b/NEWS
index 968a39ff5a..3a02816316 100644
--- a/NEWS
+++ b/NEWS
@@ -79,8 +79,10 @@ See the manual for detailed information.
 * texinfo.tex
   . do not ignore @part page immediately following Top node
   . for @deftype* commands, use typewriter font in argument list
-  . use slanted, variable-width roman font for @var, indiscriminately.
-    do "@set txicodevaristt" to get slanted typewriter for @var in code.
+  . do "@set txicodevaristt" to get slanted typewriter for @var in code,
+    "@clear txicodevaristt" to use slanted, variable-width roman font for
+    @var everywhere.  flag is @set by default, but we plan to turn this
+    off in the future.
 
 * info
   . better support for index entries containing parentheses
diff --git a/README-hacking b/README-hacking
index 55f94cd67a..d4e6088acc 100644
--- a/README-hacking
+++ b/README-hacking
@@ -333,4 +333,10 @@ news item at savannah.
 #  ... post-release, or when development resumes:
 configure.ac, util/texi2dvi: add "dev" to versions for clarity,
 until it's time to do pretests again.
+
+after next release:
 rename old ChangeLog and start a new one
+check TODO file and do pending tasks
+delete these lines from README-hacking
+
+
diff --git a/TODO b/TODO
index 0ddf597b2a..e41b04a1c1 100644
--- a/TODO
+++ b/TODO
@@ -45,6 +45,7 @@ If you are interested in working on any of these, email 
bug-texinfo@gnu.org.
   - Support the MediaWiki output format.
 
 * TeX:
+  - turn off @set txicodevaristt after next release
   - 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 b69c281693..c800b7b59d 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-22.20}
+\def\texinfoversion{2022-08-26.23}
 %
 % Copyright 1985, 1986, 1988, 1990-2022 Free Software Foundation, Inc.
 %
@@ -2817,6 +2817,9 @@ end
   \smartitaliccorrection
 }
 
+% To be removed after next release
+\def\SETtxicodevaristt{}% @set txicodevaristt
+
 \let\i=\smartitalic
 \let\slanted=\smartslanted
 \let\dfn=\smartslanted
diff --git a/doc/texinfo.texi b/doc/texinfo.texi
index d41b76ac08..0ae87274da 100644
--- a/doc/texinfo.texi
+++ b/doc/texinfo.texi
@@ -60,6 +60,8 @@ Texts.  A copy of the license is included in the section 
entitled
 @set txiindexlessthanignore
 @set txiindexhyphenignore
 
+@clear txicodevaristt
+
 
 @titlepage
 @title Texinfo
@@ -5777,12 +5779,14 @@ 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, by default the slanted font used is in a
-variable-width, roman style in all contexts.  To use a slanted
-typewriter style in code contexts such as @code{@@code} or
-@code{@@example}, set the @samp{txicodevaristt}  variable using
-@code{@@set} (@pxref{@code{@@set @@value}}).  Note that this option
-does nothing in @LaTeX{} output.}
+@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
+@LaTeX{} output.}
 
 @need 700
 For example,