summaryrefslogtreecommitdiff
path: root/macros/texinfo/latest/texinfo.tex
diff options
context:
space:
mode:
Diffstat (limited to 'macros/texinfo/latest/texinfo.tex')
-rw-r--r--macros/texinfo/latest/texinfo.tex20
1 files changed, 12 insertions, 8 deletions
diff --git a/macros/texinfo/latest/texinfo.tex b/macros/texinfo/latest/texinfo.tex
index c8c9aadb5f..c0bc8adb74 100644
--- a/macros/texinfo/latest/texinfo.tex
+++ b/macros/texinfo/latest/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-09-04.08}
+\def\texinfoversion{2022-09-15.17}
%
% Copyright 1985, 1986, 1988, 1990-2022 Free Software Foundation, Inc.
%
@@ -2806,12 +2806,11 @@ end
\def\var#1{%
\let\saveaftersmartic = \aftersmartic
\def\aftersmartic{\null\let\aftersmartic=\saveaftersmartic}%
- \ifusingtt{%
- \ifflagclear{txicodevaristt}%
- {{\sl #1}}%
- {{\ttsl #1}}%
- }{{\sl #1}}%
- \smartitaliccorrection
+ %
+ \ifflagclear{txicodevaristt}%
+ {\def\varnext{{{\sl #1}}\smartitaliccorrection}}%
+ {\def\varnext{\smartslanted{#1}}}%
+ \varnext
}
% To be removed after next release
@@ -6766,6 +6765,11 @@ might help (with 'rm \jobname.?? \jobname.??s')%
\ifnum\romancount=0 \global\romancount=\pagecount \fi
}
+% \raggedbottom in plain.tex hardcodes \topskip so override it
+\catcode`\@=11
+\def\raggedbottom{\advance\topskip by 0pt plus60pt \r@ggedbottomtrue}
+\catcode`\@=\other
+
% redefined for the two-volume lispref. We always output on
% \jobname.toc even if this is redefined.
%
@@ -7126,7 +7130,7 @@ might help (with 'rm \jobname.?? \jobname.??s')%
% collide with the section heading.
\ifnum\lastpenalty>10000 \vskip\parskip \penalty\lastpenalty \fi
%
- \setbox\groupbox=\vbox\bgroup
+ \setbox\groupbox=\vtop\bgroup
\baselineskip=0pt\parskip=0pt\lineskip=0pt
\carttop
\hbox\bgroup