summaryrefslogtreecommitdiff
path: root/Master
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2024-04-15 20:04:48 +0000
committerKarl Berry <karl@freefriends.org>2024-04-15 20:04:48 +0000
commit675d2943bdc6fea7928272e08987d15442ca71dd (patch)
tree25becfc61529cc702878b0a267e64b04b2e229e4 /Master
parent5d31be4aaceb41849166c324dfd52e9cb6a0331b (diff)
tugboat-plain (15apr24)
git-svn-id: svn://tug.org/texlive/trunk@70960 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master')
-rw-r--r--Master/texmf-dist/doc/plain/tugboat-plain/tubguide.pdfbin207800 -> 207800 bytes
-rw-r--r--Master/texmf-dist/tex/plain/tugboat-plain/tugboat.cmn17
-rw-r--r--Master/texmf-dist/tex/plain/tugboat-plain/tugboat.sty20
3 files changed, 23 insertions, 14 deletions
diff --git a/Master/texmf-dist/doc/plain/tugboat-plain/tubguide.pdf b/Master/texmf-dist/doc/plain/tugboat-plain/tubguide.pdf
index 08ee36e2972..18dc2019453 100644
--- a/Master/texmf-dist/doc/plain/tugboat-plain/tubguide.pdf
+++ b/Master/texmf-dist/doc/plain/tugboat-plain/tubguide.pdf
Binary files differ
diff --git a/Master/texmf-dist/tex/plain/tugboat-plain/tugboat.cmn b/Master/texmf-dist/tex/plain/tugboat-plain/tugboat.cmn
index b51f03acd36..68ba0695f1b 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-2023 TeX Users Group.
+%% copyright = "Copyright 1993-1996,2006,2008,2011-2024 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 534 2023-10-29 01:17:51Z karl $
+%% $Id: tugboat.cmn 561 2024-04-15 17:28:40Z karl $
% do nothing when reading this file a second time.
\ifx\tugboatcmn\undefined
@@ -29,8 +29,8 @@
\fi
\next
-\def\fileversion{v1.29}
-\def\filedate{2023-10-28}
+\def\fileversion{v1.30}
+\def\filedate{2024-04-15}
\message{File `TUGBOAT.CMN' \fileversion \space\space <\filedate>}
@@ -97,7 +97,7 @@
\ifx\tugstyloaded@\undefined\let\tugstyloaded@\plaintubstyle\fi
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%
+% emacs-page
% ***** abbreviations and logos *****
%
@@ -219,7 +219,6 @@
\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
@@ -259,7 +258,7 @@
\def\nohyphens{\hyphenpenalty\@M\exhyphenpenalty\@M}
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%
+% emacs-page
% ***** utility registers and definitions *****
%
@@ -743,7 +742,7 @@
\def\signaturemark{\leavevmode\llap{$\diamond$\enspace}}
-
+% emacs-page
% 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).
@@ -1024,6 +1023,8 @@ that may not be obvious. For full definitions, see real code above.
Version Date Changes
------- --------- ---------------------------------------------------
+1.30 15 Apr 24 remove duplicate \TP definition.
+
1.29 28 Oct 23 in \AllTeX, kern around ).
define \pdfTeX and \pdfLaTeX with italic corrections.
define \LMTX.
diff --git a/Master/texmf-dist/tex/plain/tugboat-plain/tugboat.sty b/Master/texmf-dist/tex/plain/tugboat-plain/tugboat.sty
index 529d8bf4209..88f8d036628 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-2023 TeX Users Group.
+%% copyright = "Copyright 1993,1999,2003,2006,2011-2024 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 534 2023-10-29 01:17:51Z karl $
+%% $Id: tugboat.sty 561 2024-04-15 17:28:40Z karl $
\def\thistubstyle{plain}
-\def\fileversion{v1.29}
-\def\filedate{2023-10-28}
+\def\fileversion{v1.30}
+\def\filedate{2024-03-31}
% general items
@@ -504,7 +504,9 @@
%
% 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\iftubsecondcolstart % when we splice, e.g., tb139wermuth-isdim
+\newdimen\tubcolwidthandgutter
\newif\iftubfinaloption % set in tugboat.dates
\def\tbsurl#1{{\tt #1}} % we don't try to have live urls in plain
\def\tbhurl#1{{\tt #1}} % we don't try to have live urls in plain
@@ -522,7 +524,7 @@
doi.org/\tubdoiprefix/\volno-\issno/\jobname}%
\scriptsize
\vskip\baselineskip
- \iftubsecondcolstart \moveright \tubcolwidthandgutter \fi
+ \iftubsecondcolstart \moveright\tubcolwidthandgutter \fi
\rlap{\expandafter\tbsurl\expandafter{\thedoi}}%
\vss
}%
@@ -1365,6 +1367,10 @@
\def\article{%
\@allowspanningfigsfalse
+ \iftubsecondcolstart % if splicing, start in col.2
+ \null\newcol % and set horizontal shift
+ \tubcolwidthandgutter=\colwd \advance\tubcolwidthandgutter by \intercolwd
+ \fi
\ifSecTitle \global\SecTitlefalse
\else \vskip\AboveTitleSkip
\kern\topskip
@@ -2243,6 +2249,8 @@
Version Date Changes
------- --------- ---------------------------------------------------
+1.30 15 Apr 24 implement \iftubsecondcolstart for tb139wermuth-isdim.
+
1.29 28 Oct 23 introduce \abovecaptionskipamount, reduce to \smallskip
a la ltugboat.