From 0ed21e3b08ac7967aa4923032ccb6aa64c13f4e5 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Thu, 6 Sep 2018 20:47:15 +0000 Subject: tugboat (6sep18) git-svn-id: svn://tug.org/texlive/trunk@48607 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/tex/latex/tugboat/ltugboat.cls | 29 ++++++++++++++++-------- Master/texmf-dist/tex/latex/tugboat/ltugboat.sty | 2 +- Master/texmf-dist/tex/latex/tugboat/ltugcomn.sty | 2 +- Master/texmf-dist/tex/latex/tugboat/ltugproc.cls | 2 +- Master/texmf-dist/tex/latex/tugboat/ltugproc.sty | 2 +- 5 files changed, 23 insertions(+), 14 deletions(-) (limited to 'Master/texmf-dist/tex/latex/tugboat') diff --git a/Master/texmf-dist/tex/latex/tugboat/ltugboat.cls b/Master/texmf-dist/tex/latex/tugboat/ltugboat.cls index a1ef7d5d591..c0fcbc23707 100644 --- a/Master/texmf-dist/tex/latex/tugboat/ltugboat.cls +++ b/Master/texmf-dist/tex/latex/tugboat/ltugboat.cls @@ -33,7 +33,7 @@ %% \NeedsTeXFormat{LaTeX2e}[1994/12/01] \ProvidesClass {ltugboat} - [2017/11/06 v2.19 + [2018-09-06 v2.20 TUGboat journal class% ] \csname tugstyloaded@\endcsname @@ -718,11 +718,12 @@ \ifnum\count@>1 \count@\authornumber \advance\count@ by \m@ne - #1{\ignorespaces\theauthor{\number\count@}\unskip\ and }% + #1{\ignorespaces\theauthor{\number\count@}\unskip\@tubauthorlastsep}% \fi #1{\ignorespaces\theauthor{\number\authornumber}\unskip} \fi } +\def\@tubauthorlastsep{, }% until 2018, was: "\ and " \def\signature#1{\def\@signature{#1}} \def\@signature{\@defaultsignature} \def\@defaultsignature{{% @@ -768,16 +769,19 @@ \vspace{#1}% \rightline{% \vbox{\hsize\signaturewidth \ninepoint \raggedright - \parindent \z@ \everypar={\hangindent 1pc } + \parindent \z@ \everypar={\hangindent 1pc }% \parskip \z@skip \def\|{\unskip\hfil\break}% \def\\{\endgraf}% - \def\phone{\rm Phone: } + \def\phone{\rm Phone: }% + \def\tubmultipleaffilauthor{\\\hspace*{1em}}% \rm\@signature}% }% \ifnum\authornumber<0 \endgroup\fi } \def\signaturemark{\leavevmode\llap{$\diamond$\enspace}} +\def\tubmultipleaffilauthor{\unskip, \ignorespaces}% +\def\tubmultipleaffilnet{\textrm{\unskip~,\ \ignorespaces}} \newcount\authornumber \authornumber=0 \def\author{% @@ -814,7 +818,8 @@ \newcommand{\netaddress}[1][\relax]{% \begingroup \def\@network{}% - #1\@sanitize\makespace\ \makeactive\@ + #1\@sanitize\makespace\ \makeactive\@% + \makeescape! \makebgroup[ \makeegroup]% seems more useful than literals \makeactive\.\makeactive\%\@relay@netaddress}% \def\@relay@netaddress#1{% \ProtectNetChars @@ -913,9 +918,9 @@ \newdimen\stbaselineskip \stbaselineskip=18\p@ \newdimen\stfontheight \settoheight{\stfontheight}{\sectitlefont O} -\newif\ifSecTitle -\SecTitlefalse \newif\ifWideSecTitle +\newif\iftubtitlerulefullwidth +\newif\ifSecTitle \SecTitlefalse \newcommand{\sectitle}{% \SecTitletrue \@ifstar @@ -967,7 +972,11 @@ \hrule \@height\z@ \@depth\z@ \@width 10\p@ \kern-\topskip \kern-\strulethickness - \hrule \@height\strulethickness \@depth\z@ + \iftubtitlerulefullwidth + \hrule \@height\strulethickness \@depth\z@ width\textwidth + \else + \hrule \@height\strulethickness \@depth\z@ + \fi \kern\medskipamount \nobreak \fi @@ -1166,7 +1175,7 @@ \def\tubcaptionfonts{\small}% \long\def\@makecaption#1#2{% \vskip\abovecaptionskip - \sbox\@tempboxa{\tubcaptionfonts \tubmakecaptionbox{#1}{#2}}% try in an hbox + \sbox\@tempboxa{\tubcaptionfonts \frenchspacing \tubmakecaptionbox{#1}{#2}}% try in an hbox \ifdim \wd\@tempboxa > \hsize {% caption doesn't fit on one line; set as a paragraph. \tubcaptionfonts \raggedright \hyphenpenalty=\@M \parindent=1em @@ -1182,7 +1191,7 @@ \hb@xt@\hsize{\tubcaptionleftglue\box\@tempboxa\hfil}% \fi \vskip\belowcaptionskip} -\def\tubmakecaptionbox#1#2{#1: #2}% allow overriding for a paper +\def\tubmakecaptionbox#1#2{#1:\ #2}% allow overriding for a paper \def\fnum@figure{{\tubcaptionfonts \bf \figurename\nobreakspace\thefigure}} \def\fnum@table{{\tubcaptionfonts \bf \tablename\nobreakspace\thetable}} \setlength\abovecaptionskip{6pt plus1pt minus1pt} diff --git a/Master/texmf-dist/tex/latex/tugboat/ltugboat.sty b/Master/texmf-dist/tex/latex/tugboat/ltugboat.sty index cac733c3655..c4666bb13f3 100644 --- a/Master/texmf-dist/tex/latex/tugboat/ltugboat.sty +++ b/Master/texmf-dist/tex/latex/tugboat/ltugboat.sty @@ -32,7 +32,7 @@ %% extension .ins) which are part of the distribution. %% \ProvidesPackage{ltugboat} - [2017/11/06 v2.19 + [2018-09-06 v2.20 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 14dfba4f7de..d5d41b3b3b6 100644 --- a/Master/texmf-dist/tex/latex/tugboat/ltugcomn.sty +++ b/Master/texmf-dist/tex/latex/tugboat/ltugcomn.sty @@ -33,7 +33,7 @@ %% \NeedsTeXFormat{LaTeX2e}[1994/12/01] \ProvidesPackage{ltugcomn} - [2017/11/06 v2.19 + [2018-09-06 v2.20 TUGboat `common macros' package% ] \IfFileExists{mflogo.sty}% diff --git a/Master/texmf-dist/tex/latex/tugboat/ltugproc.cls b/Master/texmf-dist/tex/latex/tugboat/ltugproc.cls index 17c4958c4a6..06c1cfae147 100644 --- a/Master/texmf-dist/tex/latex/tugboat/ltugproc.cls +++ b/Master/texmf-dist/tex/latex/tugboat/ltugproc.cls @@ -33,7 +33,7 @@ %% \NeedsTeXFormat{LaTeX2e}[1994/12/01] \ProvidesClass {ltugproc} - [2017/11/06 v2.19 + [2018-09-06 v2.20 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 c73c00b82d5..c8c08599bcc 100644 --- a/Master/texmf-dist/tex/latex/tugboat/ltugproc.sty +++ b/Master/texmf-dist/tex/latex/tugboat/ltugproc.sty @@ -32,7 +32,7 @@ %% extension .ins) which are part of the distribution. %% \ProvidesPackage{ltugproc} - [2017/11/06 v2.19 + [2018-09-06 v2.20 TUG compatibility package% ] \@obsoletefile{ltugproc.cls}{ltugproc.sty} -- cgit v1.2.3