summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2022-03-13 20:49:34 +0000
committerKarl Berry <karl@freefriends.org>2022-03-13 20:49:34 +0000
commita370b71536d38cec18c7baf3908c2bbaa83e1a0d (patch)
treed715db630a9e305cf618969f254dbc5bfcc626b5 /Master/texmf-dist/tex
parente178dd8e5072a961829b8d3e5ff93fb37dd76a35 (diff)
tugboat-plain (13mar22)
git-svn-id: svn://tug.org/texlive/trunk@62688 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex')
-rw-r--r--Master/texmf-dist/tex/plain/tugboat-plain/tugboat.cmn16
-rw-r--r--Master/texmf-dist/tex/plain/tugboat-plain/tugboat.sty115
2 files changed, 87 insertions, 44 deletions
diff --git a/Master/texmf-dist/tex/plain/tugboat-plain/tugboat.cmn b/Master/texmf-dist/tex/plain/tugboat-plain/tugboat.cmn
index 979b0eee659..3ab6cdd6598 100644
--- a/Master/texmf-dist/tex/plain/tugboat-plain/tugboat.cmn
+++ b/Master/texmf-dist/tex/plain/tugboat-plain/tugboat.cmn
@@ -1,6 +1,6 @@
%% @texfile{
%% filename = "tugboat.cmn",
-%% copyright = "Copyright 1993-1996,2006,2008,2011-2018 TeX Users Group.
+%% copyright = "Copyright 1993-1996,2006,2008,2011-2022 TeX Users Group.
%% Unlimited copying and redistribution of this file
%% are permitted as long as this file is not
%% modified. Modifications (and redistribution of
@@ -19,7 +19,7 @@
%% definitions for abbreviations and logos that
%% appear in TUGboat."
%% }
-%% $Id: tugboat.cmn 207 2018-09-06 17:32:17Z karl $
+%% $Id: tugboat.cmn 413 2022-03-13 02:13:57Z karl $
% do nothing when reading this file a second time.
\ifx\tugboatcmn\undefined
@@ -29,8 +29,8 @@
\fi
\next
-\def\fileversion{v1.24}
-\def\filedate{2018-09-05}
+\def\fileversion{v1.25}
+\def\filedate{2022-03-12}
\message{File `TUGBOAT.CMN' \fileversion \space\space <\filedate>}
@@ -174,6 +174,7 @@
\def\OMEGA{$\Omega$}
\def\OCP{\OMEGA\acro{CP}}
\def\OTP{\OMEGA\acro{TP}}
+\def\OpTeX{Op\kern-.05em\TeX}
\def\Pas{Pascal}
\def\pcMF{\leavevmode\raise.5ex\hbox{p\kern-.3ptc}MF\spacefactor1000 }
\def\PCTeX{PC\thinspace\TeX}
@@ -275,6 +276,7 @@
\def\tub@inputcheck{\if\@nextchar\bgroup
\expandafter\iinput\else\expandafter\@@input\fi}
\def\input{\futurelet\@nextchar\tub@inputcheck}
+ \def\@{\spacefactor=1000 }
\fi
% Smashes repeated from AMS-TeX; PLAIN implements only full \smash .
@@ -604,10 +606,10 @@
\def\TUBfilename#1#2{\expandafter\def\csname file@@#1\endcsname{#2}}
\newread\@altfilenames
-\def\@readFLN{\immediate\openin\@altfilenames=\jobname.fln
+\def\@readFLN{\openin\@altfilenames=\jobname.fln
\ifeof\@altfilenames\let\@result\relax\else
\def\@result{\@@input\jobname.fln }\fi
- \immediate\closein\@altfilenames
+ \closein\@altfilenames
\@result}
\@readFLN
\everyjob=\expandafter{\the\everyjob\@readFLN}
@@ -740,7 +742,7 @@
\ifx\tubomithyphenations\@thisisundefined
\hyphenation{Del-a-ware Dijk-stra Duane Eijk-hout
Flor-i-da Free-BSD Ghost-script Ghost-view
- Hara-lam-bous Jac-kow-ski Karls-ruhe
+ Hara-lam-bous Jac-kow-ski Ja-pa-nese Karls-ruhe
Mac-OS Ma-la-ya-lam Math-Sci-Net
Net-BSD Open-BSD Open-Office
Pfa-Edit Post-Script Rich-ard Skoup South-all
diff --git a/Master/texmf-dist/tex/plain/tugboat-plain/tugboat.sty b/Master/texmf-dist/tex/plain/tugboat-plain/tugboat.sty
index 5320e420975..4b5ab523bc1 100644
--- a/Master/texmf-dist/tex/plain/tugboat-plain/tugboat.sty
+++ b/Master/texmf-dist/tex/plain/tugboat-plain/tugboat.sty
@@ -1,6 +1,6 @@
%% @texfile{
%% filename = "tugboat.sty",
-%% copyright = "Copyright 1993,1999,2003,2006,2011-2019 TeX Users Group.
+%% copyright = "Copyright 1993,1999,2003,2006,2011-2022 TeX Users Group.
%% Unlimited copying and redistribution of this file
%% are permitted as long as this file is not
%% modified. Modifications (and redistribution of
@@ -18,11 +18,11 @@
%% for preparation of items in TUGboat, the
%% Communications of the TeX Users Group.",
%% }
-%% $Id: tugboat.sty 242 2019-06-12 22:01:32Z karl $
+%% $Id: tugboat.sty 413 2022-03-13 02:13:57Z karl $
\def\thistubstyle{plain}
-\def\fileversion{v1.25}
-\def\filedate{2019-06-10}
+\def\fileversion{v1.26}
+\def\filedate{2022-03-12}
% general items
@@ -159,6 +159,14 @@
\font\tentex=cmtex10 % for ASCII character set
+\font\tenlogo=logo10
+\font\ninelogo=logo9
+\font\eightlogo=logo8
+%
+\font\tenlogosl=logosl10
+\font\ninelogosl=logosl10 at 9pt
+\font\eightlogosl=logosl10 at 8pt
+
\def\mit{\fam\@ne} % from plain
\def\cal{\fam\tw@} % from plain
\def\sy{\cal}
@@ -228,24 +236,22 @@
\belowdisplayskip=3pt plus 3pt minus 1pt
\abovedisplayshortskip=0pt plus 3pt
\belowdisplayshortskip=1pt plus 3pt minus 1pt
- \def\rm{\def\sl{\fam\slfam\tensl}\fam\z@\tenrm}%
+ \def\rm{\def\sl{\fam\slfam\tensl}\def\SMC{\ninerm}\fam\z@\tenrm}%
\textfont\z@=\tenrm \scriptfont\z@=\sevenrm
\def\oldstyle{\fam\@ne\teni}%
\textfont\@ne=\teni \scriptfont\@ne=\seveni
\textfont\tw@=\tensy \scriptfont\tw@=\sevensy
\textfont\thr@@=\tenex \scriptfont\thr@@=\tenex
- \def\it{\fam\itfam\tenit}%
+ \def\it{\def\SMC{\nineit}\fam\itfam\tenit}%
\textfont\itfam=\tenit \scriptfont\itfam=\sevenit
- \def\sl{\fam\slfam\tensl}%
+ \def\sl{\def\SMC{\ninesl}\fam\slfam\tensl}%
\textfont\slfam=\tensl \scriptfont\slfam=\sevensl
- \def\bf{\def\sl{\tenbfsl}\fam\bffam\tenbf}%
+ \def\bf{\def\sl{\tenbfsl}\def\SMC{\ninebf}\fam\bffam\tenbf}%
\textfont\bffam=\tenbf \scriptfont\bffam=\eightbf
\def\smc{\tensmc}%
- \def\SMC{\ninerm}%
- \font\manual=logo10
- \font\manualsl=logosl10
- \def\tt{\tentt}%
- \setttglue
+ \let\manual=\tenlogo
+ \let\manualsl=\tenlogosl
+ \def\tt{\tentt}\setttglue
\def\upright{\tenuit}%
\setbox\strutbox=\hbox{\vrule height7.5pt depth2.5pt width\z@}%
\setbox\struttbox=\hbox{\vrule height8.5pt depth3.5pt width\z@}%
@@ -264,23 +270,21 @@
\belowdisplayskip=2.5pt plus 2.5pt minus 1pt
\abovedisplayshortskip=0pt plus 2.5pt
\belowdisplayshortskip=1pt plus 2.5pt minus 1pt
- \def\rm{\fam\z@\ninerm}%
+ \def\rm{\def\SMC{\eightrm}\fam\z@\ninerm}%
\textfont\z@=\ninerm \scriptfont\z@=\sevenrm
\def\oldstyle{\fam\@ne\ninei}%
\textfont\@ne=\ninei \scriptfont\@ne=\seveni
\textfont\tw@=\ninesy \scriptfont\tw@=\sevensy
- \def\it{\fam\itfam\nineit}%
+ \def\it{\def\SMC{\eightit}\fam\itfam\nineit}%
\textfont\itfam=\nineit
- \def\sl{\fam\slfam\ninesl}%
+ \def\sl{\def\SMC{\eightsl}\fam\slfam\ninesl}%
\textfont\slfam=\ninesl
- \def\bf{\fam\bffam\ninebf}%
+ \def\bf{\def\SMC{\eightbf}\fam\bffam\ninebf}%
\textfont\bffam=\ninebf \scriptfont\bffam=\sevenbf
\def\smc{\ninesmc}%
- \def\SMC{\eightrm}%
- \font\manual=logo9
- \font\manualsl=logosl10 at 9pt
- \def\tt{\ninett}%
- \setttglue
+ \let\manual\ninelogo
+ \let\manualsl=\ninelogosl
+ \def\tt{\ninett}\setttglue
\setbox\strutbox=\hbox{\vrule height 6.75pt depth 2.25pt width\z@}%
\setbox\struttbox=\hbox{\vrule height 7.75pt depth 3.25pt width\z@}%
\normalbaselines \rm
@@ -299,24 +303,22 @@
\belowdisplayskip=2pt plus 2pt minus 1pt
\abovedisplayshortskip=0pt plus 2pt
\belowdisplayshortskip=1pt plus 2pt minus 1pt
- \def\rm{\fam\z@\eightrm}%
+ \def\rm{\def\SMC{\sevenrm}\fam\z@\eightrm}%
\textfont\z@=\eightrm \scriptfont\z@=\sixrm
\def\oldstyle{\fam\@ne\eighti}%
\textfont\@ne=\eighti \scriptfont\@ne=\sixi
\textfont\tw@=\eightsy \scriptfont\tw@=\sixsy
% \textfont\thr@@=\eightex \scriptfont\thr@@=\eightex
- \def\it{\fam\itfam\eightit}%
+ \def\it{\def\SMC{\sevenit}\fam\itfam\eightit}%
\textfont\itfam=\eightit
- \def\sl{\fam\slfam\eightsl}%
+ \def\sl{\def\SMC{\sevensl}\fam\slfam\eightsl}%
\textfont\slfam=\eightsl
- \def\bf{\fam\bffam\eightbf}%
+ \def\bf{\def\SMC{\sevenbf}\fam\bffam\eightbf}%
\textfont\bffam=\eightbf \scriptfont\bffam=\sixbf
\def\smc{\eightsmc}%
- \def\SMC{\sevenrm}%
- \font\manual=logo8
- \font\manualsl=logosl10 at 8pt
- \def\tt{\eighttt}%
- \setttglue
+ \let\manual\eightlogo
+ \let\manualsl\eightlogosl
+ \def\tt{\eighttt}\setttglue
\setbox\strutbox=\hbox{\vrule height 6pt depth 2pt width\z@}%
\setbox\struttbox=\hbox{\vrule height 7pt depth 3pt width\z@}%
\normalbaselines \rm
@@ -459,7 +461,10 @@
\def\rfoot{%
\hbox to \pagewd{%
- \tenrm
+ \tenrm \frenchspacing
+ \def\\{\unskip\ \ignorespaces}% line break commands produce normal space
+ \let\newline=\\%
+ \tubtypesetdoi
\makestrut[\z@;0.5pc]%
\ifPrelimDraft
\midrtitle\hfil\midrtitle
@@ -484,7 +489,7 @@
\ifnum\count1<\authornumber
, % Wanted space.
\else
- {} and % Idem.
+ , % Idem. Was "{} and", but we prefer all commas now.
\fi
\fi
\theauthor{\the\count1}%
@@ -495,6 +500,36 @@
\def\runfoot{\vbox to \rfootlgt{\vfil \rfoot }}
+% DOI output. See tugboat.dtx for comments.
+%
+% Macros so we can use the same code as tugboat.dtx.
+\newif\iftubomitdoioption % explicit option when posting early
+\newif\iftubsecondcolstart % we'll add if ever needed for plain
+\newif\iftubfinaloption % set in tugboat.dates
+\def\tbsurl#1{{\tt #1}} % we don't try to have live urls in plain
+\def\scriptsize{\let\rm=\sevenrm \font\tt=cmtt8 at 7pt % fake 7pt match LaTeX
+ \baselineskip=8pt \relax} % fake
+\def\@empty{}
+%
+\def\tubdoiprefix{10.47397/tb} % the number crossref assigned us
+%
+\def\tubtypesetdoi{\iftubomitdoioption\else % if not explicit omission ...
+ \ifnum\authornumber>0 % our convention: no doi if no author
+ \iftubfinaloption % do this if [final], even if pageno>900
+ \vbox to 0pt{% don't impact normal layout
+ \edef\thedoi{\ifnum\count0>900 xnot\fi % but make url invalid if >900
+ doi.org/\tubdoiprefix/\volno-\issno/\jobname}%
+ \scriptsize
+ \vskip\baselineskip
+ \iftubsecondcolstart \moveright \tubcolwidthandgutter \fi
+ \rlap{\expandafter\tbsurl\expandafter{\thedoi}}%
+ \vss
+ }%
+ \global\let\tubtypesetdoi\@empty % only do it once, no matter what.
+ \fi
+ \fi
+\fi}
+
% Macros to produce extra running heads for stripping onto pages
% received as camera copy. Format must be preset to \OneCol, and
% start on a new page.
@@ -814,7 +849,7 @@
% Two cases: 0 = last page was nonstandard; reset \vsize
% 1 = do not reset \vsize: okay or length already reset
\def\D@EndPage{%
- \global\advancepageno
+ \advancepageno
\T@stCount=1
\ifThisIsFirstPage \T@stCount=0 \global\ThisIsFirstPagefalse
\resetfirsthead \resetfirstfoot
@@ -1790,10 +1825,16 @@
\frenchspacing\rightskip=-\ttrightskip \hyphenpenalty\@M
}
-% \ttrightskip is the permissible overhang beyond right margin;
-% in MANMAC, this is 5pc, which is fine for the TeXbook, but too much here.
+% \ttrightskip is the permissible overhang beyond right margin for verbatim;
+% in MANMAC, this is 5pc, which is fine for the TeXbook, but much too
+% much here. Until 2020-10-07, this was 1pc, but that also looks to be
+% too much (we don't allow any overrun by default in LaTeX). The 2.9pt
+% value comes from a verbatim line in \ninett (the default), with the
+% standard \parindent (resetting that to zero seems too big a change)
+% that is 43 characters long; it's 2.89pt overfull, and doesn't look
+% terrible, so accept it. BTW \hfuzz=1pt in tugboat.sty.
-\newdimen\ttrightskip \ttrightskip=1pc
+\newdimen\ttrightskip \ttrightskip=2.9pt
\def\@afterverbinline{}