From 46880f568f9d00af3ad45864942a7fb942fcc554 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Tue, 8 Nov 2016 22:36:05 +0000 Subject: tugboat (8nov16) git-svn-id: svn://tug.org/texlive/trunk@42465 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/tex/latex/tugboat/ltugboat.cls | 54 ++++++++++++------------ Master/texmf-dist/tex/latex/tugboat/ltugboat.sty | 2 +- Master/texmf-dist/tex/latex/tugboat/ltugcomn.sty | 6 ++- Master/texmf-dist/tex/latex/tugboat/ltugproc.cls | 2 +- Master/texmf-dist/tex/latex/tugboat/ltugproc.sty | 2 +- 5 files changed, 33 insertions(+), 33 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 de6419d4782..6963e383dfc 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} - [2015/03/24 v2.17 + [2016/11/07 v2.18 TUGboat journal class% ] \csname tugstyloaded@\endcsname @@ -195,7 +195,9 @@ \def\Cplusplus{C\plusplus} \def\plusplus{\raisebox{.7ex}{$_{++}$}} \def\CPU{\acro{CPU}} +\def\CSabbr{\ensuremath{\cal C}\kern-.1667em\lower.5ex\hbox{$\cal S$}} \def\CSS{\acro{CSS}} +\def\CSTUG{\CSabbr\acro{TUG}} \def\CSV{\acro{CSV}} \def\CTAN{\acro{CTAN}} \def\DTD{\acro{DTD}} @@ -246,7 +248,7 @@ \def\Mc{\setbox\TestBox=\hbox{M}M\vbox to\ht\TestBox{\hbox{c}\vfil}} % for Robert McGaffey \def\mf{\textsc{Metafont}} -\def\MFB{\textsl{The \MF book}} +\def\MFB{\textsl{The \MF\kern1pt book}} \def\MkIV{Mk\acro{IV}} \let\TB@@mp\mp \DeclareRobustCommand{\mp}{\ifmmode\TB@@mp\else MetaPost\fi} @@ -632,6 +634,7 @@ \textwidth 39pc \columnsep 1.5pc \columnwidth 18.75pc +\hfuzz 1pt \parindent \normalparindent \parskip \z@ % \@plus\p@ \leftmargini 2em @@ -648,7 +651,12 @@ \topsep=3\p@\@plus\p@\@minus\p@ \parsep=3\p@\@plus\p@\@minus\p@ \itemsep=\parsep -\if@tubtwocolumn \twocolumn \else \onecolumn \textwidth=34pc \fi +\if@tubtwocolumn \twocolumn \else + \onecolumn + \textwidth=34pc + \oddsidemargin=30.8775pt + \evensidemargin=\oddsidemargin +\fi \newdimen\pagewd \pagewd=\textwidth \newdimen\trimwd \trimwd=\pagewd \newdimen\trimlgt \trimlgt=11in @@ -879,6 +887,7 @@ \fi \begingroup \setcounter{footnote}{0} + \global\@topnum\z@ % disallow floats above the title \def\thefootnote{\fnsymbol{footnote}} \@maketitle \@thanks @@ -1070,20 +1079,7 @@ {-0.5em\@plus-\fontdimen3\font}% {\normalsize\bf\raggedright\hyphenpenalty=\@M}}} \fi -\if@numbersec - \def\TB@startsection#1{\@startsection#1}% -\else - \def\TB@startsection#1{% - \@ifstar - {\TBWarning{*-form of \expandafter\string\csname\@firstofsix#1% - \endcsname\space - \MessageBreak - conflicts with nonumber class option}% - \@startsection#1}% - {\@startsection#1}% - } -\fi -\def\@firstofsix#1#2#3#4#5#6{#1} +\def\TB@startsection#1{\@startsection#1}% \def\TB@safe@startsection#1{\@startsection#1} \newenvironment{SafeSection}% {\let\TB@startsection\TB@safe@startsection}% @@ -1163,6 +1159,8 @@ \csname r@nr@#1\endcsname\@secondoftwo{#1}} \newdimen\@tubfullpageindent \@tubfullpageindent = \if@tubtwocolumn 4.875pc \else 3.875pc \fi +\let\tubcaptionleftglue=\hfil +\let\tubcaptionleftglue=\hfil \def\tubcaptionfonts{\small}% \long\def\@makecaption#1#2{% \vskip\abovecaptionskip @@ -1179,7 +1177,7 @@ \else % fits on one line; use the hbox, centered. Do not reset its glue. \global\@minipagefalse - \hb@xt@\hsize{\hfil\box\@tempboxa\hfil}% + \hb@xt@\hsize{\tubcaptionleftglue\box\@tempboxa\hfil}% \fi \vskip\belowcaptionskip} \def\tubmakecaptionbox#1#2{#1: #2}% allow overriding for a paper @@ -1358,7 +1356,7 @@ \@ifundefined{refname}% {\newcommand{\refname}{References}}% {}% -\def\thebibliography#1{% +\def\thebibliography#1{% for harvardcite \let\TB@startsection\TB@safe@startsection \section*{\refname \@mkboth{\uppercase{\refname}}{\uppercase{\refname}}}% @@ -1368,10 +1366,10 @@ \itemindent -\bibindent \listparindent \itemindent \parsep \z@ - \usecounter{enumi}} - \def\newblock{} + \usecounter{enumi}}% + \def\newblock{}% \BibJustification - \sfcode`\.=1000\relax + \frenchspacing % more than just period, see comments below } \def\etal{et\,al.\@} \def\bibentry{% @@ -1394,13 +1392,13 @@ \immediate\write\@auxout{\string\bibstyle{\@tubfilename{#1}}}% \fi } -\else -\let\TB@@thebibliography\thebibliography +\else % not harvardcite +\let\TB@origthebibliography\thebibliography \def\thebibliography{% \let\TB@startsection\TB@safe@startsection - \let\sloppy\BibJustification - \TB@@thebibliography} -\fi + \def\sloppy{\frenchspacing\BibJustification}% + \TB@origthebibliography} % latex's thebibliography now reads args. +\fi % not harvardcite \let\TB@@sloppy\sloppy \let\BibJustification\TB@@sloppy \newcommand{\SetBibJustification}[1]{% @@ -1451,7 +1449,7 @@ \def\@evenfoot{\@author\hfil} } -\def\@tubrunninggetauthor#1{#1 +\def\@tubrunninggetauthor#1{#1% \begingroup \let\thanks\@gobble \protected@xdef\rhAuthor{\the\toks@##1}% diff --git a/Master/texmf-dist/tex/latex/tugboat/ltugboat.sty b/Master/texmf-dist/tex/latex/tugboat/ltugboat.sty index d9e11d6a3b6..a25f03f76b5 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} - [2015/03/24 v2.17 + [2016/11/07 v2.18 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 3b772cfd56c..4a8ba4911a8 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} - [2015/03/24 v2.17 + [2016/11/07 v2.18 TUGboat `common macros' package% ] \IfFileExists{mflogo.sty}% @@ -125,7 +125,9 @@ \def\Cplusplus{C\plusplus} \def\plusplus{\raisebox{.7ex}{$_{++}$}} \def\CPU{\acro{CPU}} +\def\CSabbr{\ensuremath{\cal C}\kern-.1667em\lower.5ex\hbox{$\cal S$}} \def\CSS{\acro{CSS}} +\def\CSTUG{\CSabbr\acro{TUG}} \def\CSV{\acro{CSV}} \def\CTAN{\acro{CTAN}} \def\DTD{\acro{DTD}} @@ -176,7 +178,7 @@ \def\Mc{\setbox\TestBox=\hbox{M}M\vbox to\ht\TestBox{\hbox{c}\vfil}} % for Robert McGaffey \def\mf{\textsc{Metafont}} -\def\MFB{\textsl{The \MF book}} +\def\MFB{\textsl{The \MF\kern1pt book}} \def\MkIV{Mk\acro{IV}} \let\TB@@mp\mp \DeclareRobustCommand{\mp}{\ifmmode\TB@@mp\else MetaPost\fi} diff --git a/Master/texmf-dist/tex/latex/tugboat/ltugproc.cls b/Master/texmf-dist/tex/latex/tugboat/ltugproc.cls index 3bbc93537b3..c156ce7655f 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} - [2015/03/24 v2.17 + [2016/11/07 v2.18 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 79b79ce79eb..d26c10ef59e 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} - [2015/03/24 v2.17 + [2016/11/07 v2.18 TUG compatibility package% ] \@obsoletefile{ltugproc.cls}{ltugproc.sty} -- cgit v1.2.3