From 089e4b330f948cd72fa2c53690e40e830ff7bd3d Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Thu, 9 Mar 2023 21:13:35 +0000 Subject: tugboat (9mar23) (branch) git-svn-id: svn://tug.org/texlive/branches/branch2022.final@66499 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/bibtex/bst/tugboat/tugboat.bst | 7 ++-- Master/texmf-dist/doc/latex/tugboat/NEWS | 11 ++++- Master/texmf-dist/doc/latex/tugboat/ltubguid.pdf | Bin 363980 -> 363060 bytes Master/texmf-dist/doc/latex/tugboat/tugboat.pdf | Bin 516448 -> 516315 bytes Master/texmf-dist/source/latex/tugboat/tugboat.dtx | 46 +++++++++++++-------- Master/texmf-dist/tex/latex/tugboat/ltugboat.cls | 44 +++++++++++++------- Master/texmf-dist/tex/latex/tugboat/ltugboat.sty | 2 +- Master/texmf-dist/tex/latex/tugboat/ltugcomn.sty | 10 ++++- Master/texmf-dist/tex/latex/tugboat/ltugproc.cls | 2 +- Master/texmf-dist/tex/latex/tugboat/ltugproc.sty | 2 +- 10 files changed, 82 insertions(+), 42 deletions(-) diff --git a/Master/texmf-dist/bibtex/bst/tugboat/tugboat.bst b/Master/texmf-dist/bibtex/bst/tugboat/tugboat.bst index a64d28fd17a..1129bb8ab5e 100644 --- a/Master/texmf-dist/bibtex/bst/tugboat/tugboat.bst +++ b/Master/texmf-dist/bibtex/bst/tugboat/tugboat.bst @@ -1,4 +1,4 @@ -%%% $Id: tugboat.bst 457 2023-01-16 18:43:54Z karl $ +%%% $Id: tugboat.bst 462 2023-03-08 17:26:54Z karl $ %%% TUGboat changes are public domain. %%% %%% Modified for TUGboat from abbrvurl.bst: @@ -735,7 +735,7 @@ FUNCTION {format.chapter.pages} { chapter empty$ 'format.pages { type empty$ - { "chapter" } + { "ch." } { type "l" change.case$ } if$ chapter tie.or.space.connect @@ -972,7 +972,8 @@ FUNCTION {format.pubmed} % (aka the doiurl variable), and only add it if needed. % % This code is from https://tex.stackexchange.com/questions/119237 -% (thank you, mafp). +% (thank you, mafp). The original urlbst package solved the problem in a +% different (simpler) way in its 0.9.1 (January 2023) release. % % The "X Y contains" function checks if string Y is contained in X. % Although we only need to check if Y is at the beginning of X, diff --git a/Master/texmf-dist/doc/latex/tugboat/NEWS b/Master/texmf-dist/doc/latex/tugboat/NEWS index 5f9b4fa5534..aa1e53391ea 100644 --- a/Master/texmf-dist/doc/latex/tugboat/NEWS +++ b/Master/texmf-dist/doc/latex/tugboat/NEWS @@ -1,6 +1,15 @@ -$Id: NEWS 458 2023-01-16 18:44:30Z karl $ +$Id: NEWS 463 2023-03-08 21:59:19Z karl $ This file records noteworthy changes. This file is public domain. +----------------- +2.29 (2023-03-08): + +ltugboat.cls: +- \url: the fallback definition now typesets (in tt) more special characters. +- omit TUG-specific doi when not typesetting in the production environment. + +tugboat.bst: abbreviate "chapter" to "ch." in tugboat.bst. + ----------------- 2.28 (2023-01-16): diff --git a/Master/texmf-dist/doc/latex/tugboat/ltubguid.pdf b/Master/texmf-dist/doc/latex/tugboat/ltubguid.pdf index 4e9a95b9797..3d39af7dade 100644 Binary files a/Master/texmf-dist/doc/latex/tugboat/ltubguid.pdf and b/Master/texmf-dist/doc/latex/tugboat/ltubguid.pdf differ diff --git a/Master/texmf-dist/doc/latex/tugboat/tugboat.pdf b/Master/texmf-dist/doc/latex/tugboat/tugboat.pdf index 611ea5fe18e..fc6500607f0 100644 Binary files a/Master/texmf-dist/doc/latex/tugboat/tugboat.pdf and b/Master/texmf-dist/doc/latex/tugboat/tugboat.pdf differ diff --git a/Master/texmf-dist/source/latex/tugboat/tugboat.dtx b/Master/texmf-dist/source/latex/tugboat/tugboat.dtx index d205ab011d5..ea7f22af778 100644 --- a/Master/texmf-dist/source/latex/tugboat/tugboat.dtx +++ b/Master/texmf-dist/source/latex/tugboat/tugboat.dtx @@ -1,5 +1,5 @@ % \iffalse (this is a meta-comment (so they say)) -% $Id: tugboat.dtx 459 2023-01-16 21:05:37Z karl $ +% $Id: tugboat.dtx 462 2023-03-08 17:26:54Z karl $ % tugboat.dtx - main source for LaTeX TUGboat classes. % % Copyright 1994-2023 TeX Users Group. @@ -28,7 +28,7 @@ %\ProvidesPackage{ltugboat} %\ProvidesPackage{ltugproc} % \ProvidesPackage{ltugcomn} - [2023-01-16 v2.28 + [2023-03-08 v2.29 % TUGboat journal class% % TUG conference proceedings class% % TUG compatibility package% @@ -1308,7 +1308,13 @@ \def\tburl{\url}% \def\tbsurl{\url}% no hyperref, so just \url is fine. \def\tbhurl{\url}% - \ifx\url\undefined \let\url\texttt \fi % er, make sure \url is defined + \ifx\url\undefined % make sure \url is defined + \def\url{\begingroup % might as well catch common special chars + \catcode`\#=12 \catcode`\$=12 \catcode`\%=12 \catcode`\^=12 + \catcode`\&=12 \catcode`\_=12 \catcode`\~=12 + \finish@tub@url} + \def\finish@tub@url#1{\tt #1\endgroup} + \fi \else % This hyperref hook-in is due to Ulrike Fischer. % \url{https://github.com/latex3/hyperref/issues/125}. @@ -3544,21 +3550,27 @@ \def\tubdoiprefix{10.47397/tb} % the number crossref assigned us \def\tubabovedoi{} % fudge spacing or whatever. % -\def\tubtypesetdoi{\iftubomitdoioption\else % if not explicit omission ... - \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 - \tubabovedoi - \iftubsecondcolstart \moveright \tubcolwidthandgutter \fi - \rlap{\expandafter\tbsurl\expandafter{\thedoi}}% - \vss - }% +\def\tubtypesetdoi{% + \iftubomitdoioption\else % do if not explicit omission ... + \ifnum\volno>0 % and if being run for production ... + \iftubfinaloption % and if [final], even if pageno>900 + \vbox to 0pt{% don't impact normal layout + \edef\thedoi{% but make url invalid if >900 + \ifnum\count0>900 example.org% + \else doi.org\fi + /\tubdoiprefix/\volno-\issno/\jobname}% + \scriptsize + \vskip\baselineskip + \tubabovedoi + \iftubsecondcolstart \moveright \tubcolwidthandgutter \fi + \rlap{\expandafter\tbsurl\expandafter{\thedoi}}% + \vss + }% + \fi % tubfinaloption + \fi % volno>0 + \fi % !tubomitdoioption \global\let\tubtypesetdoi\@empty % only do it once, no matter what. - \fi -\fi} +} % % % \end{macrocode} diff --git a/Master/texmf-dist/tex/latex/tugboat/ltugboat.cls b/Master/texmf-dist/tex/latex/tugboat/ltugboat.cls index 3206812055b..5014f891f30 100644 --- a/Master/texmf-dist/tex/latex/tugboat/ltugboat.cls +++ b/Master/texmf-dist/tex/latex/tugboat/ltugboat.cls @@ -32,7 +32,7 @@ %% \NeedsTeXFormat{LaTeX2e}[1994/12/01] \ProvidesClass {ltugboat} - [2023-01-16 v2.28 + [2023-03-08 v2.29 TUGboat journal class% ] \newif\ifTBunicodeengine @@ -572,7 +572,13 @@ \def\tburl{\url}% \def\tbsurl{\url}% no hyperref, so just \url is fine. \def\tbhurl{\url}% - \ifx\url\undefined \let\url\texttt \fi % er, make sure \url is defined + \ifx\url\undefined % make sure \url is defined + \def\url{\begingroup % might as well catch common special chars + \catcode`\#=12 \catcode`\$=12 \catcode`\%=12 \catcode`\^=12 + \catcode`\&=12 \catcode`\_=12 \catcode`\~=12 + \finish@tub@url} + \def\finish@tub@url#1{\tt #1\endgroup} + \fi \else % This hyperref hook-in is due to Ulrike Fischer. % \url{https://github.com/latex3/hyperref/issues/125}. @@ -1666,21 +1672,27 @@ \pagestyle{headings} \def\tubdoiprefix{10.47397/tb} % the number crossref assigned us \def\tubabovedoi{} % fudge spacing or whatever. -\def\tubtypesetdoi{\iftubomitdoioption\else % if not explicit omission ... - \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 - \tubabovedoi - \iftubsecondcolstart \moveright \tubcolwidthandgutter \fi - \rlap{\expandafter\tbsurl\expandafter{\thedoi}}% - \vss - }% +\def\tubtypesetdoi{% + \iftubomitdoioption\else % do if not explicit omission ... + \ifnum\volno>0 % and if being run for production ... + \iftubfinaloption % and if [final], even if pageno>900 + \vbox to 0pt{% don't impact normal layout + \edef\thedoi{% but make url invalid if >900 + \ifnum\count0>900 example.org% + \else doi.org\fi + /\tubdoiprefix/\volno-\issno/\jobname}% + \scriptsize + \vskip\baselineskip + \tubabovedoi + \iftubsecondcolstart \moveright \tubcolwidthandgutter \fi + \rlap{\expandafter\tbsurl\expandafter{\thedoi}}% + \vss + }% + \fi % tubfinaloption + \fi % volno>0 + \fi % !tubomitdoioption \global\let\tubtypesetdoi\@empty % only do it once, no matter what. - \fi -\fi} +} \def\@outputdblcol{\if@firstcolumn \global\@firstcolumnfalse \global\setbox\@leftcolumn\box\@outputbox \global\brokenpenalty10000 diff --git a/Master/texmf-dist/tex/latex/tugboat/ltugboat.sty b/Master/texmf-dist/tex/latex/tugboat/ltugboat.sty index 9db17d80c03..ef48a7e6d9f 100644 --- a/Master/texmf-dist/tex/latex/tugboat/ltugboat.sty +++ b/Master/texmf-dist/tex/latex/tugboat/ltugboat.sty @@ -31,7 +31,7 @@ %% extension .ins) which are part of the distribution. %% \ProvidesPackage{ltugboat} - [2023-01-16 v2.28 + [2023-03-08 v2.29 TUG compatibility package% ] \@obsoletefile{ltugboat.cls}{ltugboat.sty} diff --git a/Master/texmf-dist/tex/latex/tugboat/ltugcomn.sty b/Master/texmf-dist/tex/latex/tugboat/ltugcomn.sty index f54600aa574..edee9be67e2 100644 --- a/Master/texmf-dist/tex/latex/tugboat/ltugcomn.sty +++ b/Master/texmf-dist/tex/latex/tugboat/ltugcomn.sty @@ -32,7 +32,7 @@ %% \NeedsTeXFormat{LaTeX2e}[1994/12/01] \ProvidesPackage{ltugcomn} - [2023-01-16 v2.28 + [2023-03-08 v2.29 TUGboat `common macros' package% ] \newif\ifTBunicodeengine @@ -469,7 +469,13 @@ \def\tburl{\url}% \def\tbsurl{\url}% no hyperref, so just \url is fine. \def\tbhurl{\url}% - \ifx\url\undefined \let\url\texttt \fi % er, make sure \url is defined + \ifx\url\undefined % make sure \url is defined + \def\url{\begingroup % might as well catch common special chars + \catcode`\#=12 \catcode`\$=12 \catcode`\%=12 \catcode`\^=12 + \catcode`\&=12 \catcode`\_=12 \catcode`\~=12 + \finish@tub@url} + \def\finish@tub@url#1{\tt #1\endgroup} + \fi \else % This hyperref hook-in is due to Ulrike Fischer. % \url{https://github.com/latex3/hyperref/issues/125}. diff --git a/Master/texmf-dist/tex/latex/tugboat/ltugproc.cls b/Master/texmf-dist/tex/latex/tugboat/ltugproc.cls index 0dcf92e9119..cf8814e0513 100644 --- a/Master/texmf-dist/tex/latex/tugboat/ltugproc.cls +++ b/Master/texmf-dist/tex/latex/tugboat/ltugproc.cls @@ -32,7 +32,7 @@ %% \NeedsTeXFormat{LaTeX2e}[1994/12/01] \ProvidesClass {ltugproc} - [2023-01-16 v2.28 + [2023-03-08 v2.29 TUG conference proceedings class% ] \def\@tugclass{ltugproc} diff --git a/Master/texmf-dist/tex/latex/tugboat/ltugproc.sty b/Master/texmf-dist/tex/latex/tugboat/ltugproc.sty index e4843746c15..bb3b6d98676 100644 --- a/Master/texmf-dist/tex/latex/tugboat/ltugproc.sty +++ b/Master/texmf-dist/tex/latex/tugboat/ltugproc.sty @@ -31,7 +31,7 @@ %% extension .ins) which are part of the distribution. %% \ProvidesPackage{ltugproc} - [2023-01-16 v2.28 + [2023-03-08 v2.29 TUG compatibility package% ] \@obsoletefile{ltugproc.cls}{ltugproc.sty} -- cgit v1.2.3