From 97e544fd6c37d818dc7abc63ec40612a44a1e525 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Sun, 29 Oct 2023 20:14:43 +0000 Subject: tugboat-plain (29oct23) git-svn-id: svn://tug.org/texlive/trunk@68695 c570f23f-e606-0410-a88d-b1316a301751 --- .../doc/plain/tugboat-plain/tubguide.pdf | Bin 207821 -> 207800 bytes .../texmf-dist/tex/plain/tugboat-plain/tugboat.cmn | 53 ++++++++++++++------- .../texmf-dist/tex/plain/tugboat-plain/tugboat.sty | 14 ++++-- 3 files changed, 45 insertions(+), 22 deletions(-) (limited to 'Master') diff --git a/Master/texmf-dist/doc/plain/tugboat-plain/tubguide.pdf b/Master/texmf-dist/doc/plain/tugboat-plain/tubguide.pdf index db745fcf9ed..08ee36e2972 100644 Binary files a/Master/texmf-dist/doc/plain/tugboat-plain/tubguide.pdf and b/Master/texmf-dist/doc/plain/tugboat-plain/tubguide.pdf differ diff --git a/Master/texmf-dist/tex/plain/tugboat-plain/tugboat.cmn b/Master/texmf-dist/tex/plain/tugboat-plain/tugboat.cmn index 58fe38ee137..b51f03acd36 100644 --- a/Master/texmf-dist/tex/plain/tugboat-plain/tugboat.cmn +++ b/Master/texmf-dist/tex/plain/tugboat-plain/tugboat.cmn @@ -19,7 +19,7 @@ %% definitions for abbreviations and logos that %% appear in TUGboat." %% } -%% $Id: tugboat.cmn 482 2023-06-11 22:30:07Z karl $ +%% $Id: tugboat.cmn 534 2023-10-29 01:17:51Z karl $ % do nothing when reading this file a second time. \ifx\tugboatcmn\undefined @@ -29,8 +29,8 @@ \fi \next -\def\fileversion{v1.28} -\def\filedate{2023-06-11} +\def\fileversion{v1.29} +\def\filedate{2023-10-28} \message{File `TUGBOAT.CMN' \fileversion \space\space <\filedate>} @@ -103,7 +103,7 @@ \def\acro#1{{\SMC #1}\spacefactor1000 } -\def\AllTeX{(\La)\TeX} +\def\AllTeX{(\La\kern-.075em)\kern-.05em\TeX} \def\AMS{American Mathematical Society} \def\AmS{{\the\textfont2 A}\kern-.1667em\lower.5ex\hbox {\the\textfont2 M}\kern-.125em{\the\textfont2 S}} @@ -158,6 +158,7 @@ \kern-.5\wd\TestBox\raise.42ex\box\TestBox} \def\LaTeX{\La\kern-.15em\TeX} \def\LaTeXe{\LaTeX{}\kern.05em2$_{\textstyle\varepsilon}$} +\def\LMTX{\acro{LMTX}} \def\LyX{L\kern-.1667em\lower.25em\hbox{Y}\kern-.125emX} \def\MacOSX{Mac\,\acro{OS\,X}} \def\MathML{Math\acro{ML}} @@ -180,6 +181,8 @@ \def\PCTeX{PC\thinspace\TeX} \def\pcTeX{\leavevmode\raise.5ex\hbox{p\kern-.3ptc}\TeX} \def\PDF{\acro{PDF}} +\def\pdfLaTeX{pdf\/\-\LaTeX} +\def\pdfTeX{pdf\/\-\TeX} \def\PGF{\acro{PGF}} \def\PiC{P\kern-.12em\lower.5ex\hbox{I}\kern-.075emC\spacefactor1000 } \def\PiCTeX{\PiC\kern-.11em\TeX} @@ -216,6 +219,7 @@ \def\Thanh{H\`an~Th\^e\llap{\raise.5ex\hbox{\'{}}}~Th\`anh} \def\TIFF{\acro{TIFF}} \def\TikZ{Ti{\it k}Z} +\def\TP{{\sl \TeX:\ The Program\/}} \def\ttn{{\sl TTN}\spacefactor1000 } \def\TTN{{\sl \TeX{} and TUG NEWS}\spacefactor1000 } \def\tubfont{\sl} % redefined in other situations @@ -454,7 +458,7 @@ \def\setboxcs#1{\setbox\csname#1\endcsname} \def\newboxcs#1{\expandafter\newbox\csname#1\endcsname} -\def\gobble#1{} +\long\def\gobble#1{} \def\vellipsis{% \leavevmode\kern0.5em @@ -489,6 +493,9 @@ \def\slash{/\penalty\z@\hskip\z@skip } % "breakable" slash +\def\tbcode#1{\hbox{\tt #1}} % literal text +\def\tbcodebreak{\nolinkurl} % assume url.sty has been loaded + % Adapted from c.t.t posting by Donald Arseneau, 26 May 93. \def\nth#1{\TestCount=#1\relax \ifnum\TestCount <0 \multiply\TestCount by\m@ne \fi % subdue negatives @@ -737,19 +744,23 @@ \def\signaturemark{\leavevmode\llap{$\diamond$\enspace}} -% some hyphenation exceptions, unless \tubomithyphenations -% is defined (used in tb*hyf.tex). +% Some hyphenation exceptions, plus read our entire +% ushyphex.tex file if present -- unless \tubomithyphenations +% is defined, in which case do nothing (needed for tb*hyf.tex). \ifx\tubomithyphenations\@thisisundefined -\hyphenation{Del-a-ware Dijk-stra Duane Eijk-hout - Flor-i-da Free-BSD Ghost-script Ghost-view + \openin\@altfilenames=ushyphex.tex + \ifeof\@altfilenames\else\input ushyphex.tex \fi + % now a selected list, historically used before we input ushyphex. + \hyphenation{Del-a-ware Dijk-stra Duane Eijk-hout + Flor-i-da Free-BSD Ghost-script Hara-lam-bous Jac-kow-ski Ja-pa-nese Karls-ruhe Lua-Meta - Mac-OS Ma-la-ya-lam Math-Sci-Net + Mac-OS Math-Sci-Net Net-BSD Open-BSD Open-Office - Pfa-Edit Post-Script Rich-ard Skoup South-all + Post-Script Rich-ard Skoup South-all Vieth VM-ware Win-Edt acro-nym acro-nyms analy-sis ap-pen-di-ces ap-pen-dix asyn-chro-nous bib-lio-graph-i-cal bit-map bit-mapped bit-maps buf-fer buf-fers bool-ean - col-umns com-put-able com-put-abil-ity cus-tom-iz-able + col-umns com-put-able com-put-abil-ity data-base data-bases de-allo-cate de-allo-cates de-allo-cated de-allo-ca-tion de-riv-a-tive de-riv-a-tives de-riv-a-ble der-i-va-tion dis-trib-ut-able @@ -763,7 +774,7 @@ mne-mon-ic mne-mon-ics mono-space mono-spaced name-space name-spaces off-line over-view - pal-ettes par-a-digm par-a-dig-mat-ic par-a-digms + pal-ettes par-a-digm par-a-dig-matic par-a-digms pipe-line pipe-lines plug-in plug-ins pres-ent-ly pro-gram-mable re-allo-cate re-allo-cates re-allo-cated re-printed @@ -1006,13 +1017,21 @@ that may not be obvious. For full definitions, see real code above. \signaturewidth -% ************************************************************************* - -% Change history ------------------- +%% +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +% +% History of changes Version Date Changes ------- --------- --------------------------------------------------- +1.29 28 Oct 23 in \AllTeX, kern around ). + define \pdfTeX and \pdfLaTeX with italic corrections. + define \LMTX. + define \tbcode and \tbcodebreak. + make \gobble \long. + \input ushyphex.tex if it exists; correct explicit + hyphenation list. + 1.28 11 Jun 23 (belatedly) add \meta, change \TP to print : in \sl, Lua-Meta hyphenation exception. diff --git a/Master/texmf-dist/tex/plain/tugboat-plain/tugboat.sty b/Master/texmf-dist/tex/plain/tugboat-plain/tugboat.sty index c1d62f57f6b..529d8bf4209 100644 --- a/Master/texmf-dist/tex/plain/tugboat-plain/tugboat.sty +++ b/Master/texmf-dist/tex/plain/tugboat-plain/tugboat.sty @@ -18,11 +18,11 @@ %% for preparation of items in TUGboat, the %% Communications of the TeX Users Group.", %% } -%% $Id: tugboat.sty 482 2023-06-11 22:30:07Z karl $ +%% $Id: tugboat.sty 534 2023-10-29 01:17:51Z karl $ \def\thistubstyle{plain} -\def\fileversion{v1.28} -\def\filedate{2023-06-11} +\def\fileversion{v1.29} +\def\filedate{2023-10-28} % general items @@ -2015,7 +2015,8 @@ \newif\if@@mid \@@midfalse \newif\if@@bot \@@botfalse \def\@caption{} -\def\abovecaptionskip{\bigskip} +\def\abovecaptionskip{\vskip\abovecaptionskipamount} +\newskip\abovecaptionskipamount \abovecaptionskipamount=3pt plus2pt minus1pt \newif\if@fixed \@fixedfalse @@ -2043,7 +2044,7 @@ \def\top{}% \def\bot{\@@bottrue}% \def\mid{\@@midtrue}% - \def\caption##1{\def\@caption{\ulap{\abovecaptionskip##1\smallskip}}}% + \def\caption##1{\def\@caption{{\abovecaptionskip##1\smallskip}}}% \def\fixed{\@fixedtrue}% \def\scol{\@figurescol}% \def\ecol{\@figureecol}% @@ -2242,6 +2243,9 @@ Version Date Changes ------- --------- --------------------------------------------------- +1.29 28 Oct 23 introduce \abovecaptionskipamount, reduce to \smallskip + a la ltugboat. + 1.28 11 Jun 23 \tenpoint in footer, not just \tenrm. 1.27 19 May 22 \tbhurl belatedly defined. -- cgit v1.2.3