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/doc/latex/tugboat/ltubguid.pdf | Bin 314599 -> 314595 bytes Master/texmf-dist/doc/latex/tugboat/tugboat.pdf | Bin 463521 -> 466058 bytes Master/texmf-dist/source/latex/tugboat/tugboat.dtx | 124 ++++++++++++--------- 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 +- 8 files changed, 106 insertions(+), 84 deletions(-) diff --git a/Master/texmf-dist/doc/latex/tugboat/ltubguid.pdf b/Master/texmf-dist/doc/latex/tugboat/ltubguid.pdf index f365a857e94..7d7193ba8d5 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 109db4e1685..8f04c2e288e 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 43469c42945..ef847134e70 100644 --- a/Master/texmf-dist/source/latex/tugboat/tugboat.dtx +++ b/Master/texmf-dist/source/latex/tugboat/tugboat.dtx @@ -1,8 +1,8 @@ % \iffalse (this is a meta-comment (so they say)) -% $Id: tugboat.dtx 138 2015-03-18 23:23:36Z karl $ +% $Id: tugboat.dtx 172 2016-11-07 19:29:41Z karl $ % tugboat.dtx - main source for LaTeX TUGboat classes. % -% Copyright 1994-2015 TeX Users Group. +% Copyright 1994-2016 TeX Users Group. % % This file is part of the tugboat package. % @@ -28,7 +28,7 @@ %\ProvidesPackage{ltugboat} %\ProvidesPackage{ltugproc} % \ProvidesPackage{ltugcomn} - [2015/03/24 v2.17 + [2016/11/07 v2.18 % TUGboat journal class% % TUG conference proceedings class% % TUG compatibility package% @@ -48,7 +48,7 @@ % % \iffalse % -% Note that the version control $Id above relates to the number of times +% Note that the version control Id above relates to the number of times % the file has been checked-in, which relates to a development process % taking place on several machines, rather than the incidence of % significant change; the definitive version number is that in the @@ -158,7 +158,7 @@ % |\Mc|& M with raised c\\ % |\MF|& \MF\\ % |\mf|& \textsc{Metafont}\\ -% |\MFB|& The Metafont book\\ +% |\MFB|& The Metafontbook\\ % |\MP|& \MP\\ % |\mp|& MetaPost (in text only: still `\ensuremath{\mp}' in math)\\ % |\OMEGA|& Omega `logo' (\ensuremath{\Omega})\\ @@ -196,7 +196,6 @@ % |\TUB|& \TUB\\ % |\TUG|& \TeX{} Users Group\\ % |\UNIX|&\\ -% |\UTF|&\\ % |\VAX|&\\ % |\VnTeX|&\\ % |\VorTeX|&\\ @@ -464,9 +463,11 @@ \DeclareOption*{\PassOptionsToClass{\CurrentOption}{article}} % \end{macrocode} % -% Request default options (draft mode, standard citation, double-sided -% printing, etc.), process all options, and then get the base document -% class on top of which we reside. +% Request default options (draft mode, standard citation, numbered +% sections, etc.), process all options, and then get the base document +% class on top of which we reside, namely |article|. Always call +% |article| with the |twoside| option, since we want the ability to have +% odd/even headers/footers. % % \begin{macrocode} \ExecuteOptions{draft,extralabel,numbersec,rawcite,runningminimal} @@ -677,7 +678,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}} @@ -750,7 +753,7 @@ % specify \cs{MF} or \cs{MP} % \begin{macrocode} \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} @@ -827,7 +830,7 @@ \def\tug{\acro{TUG}} \def\UG{Users Group} \def\UNIX{\acro{UNIX}} -% let's not do \UTF, since other packages use it for Unicode character access. +% omit \UTF, since other packages use it for Unicode character access. \def\VAX{V\kern-.12em A\kern-.1em X\@} \def\VnTeX{V\kern-.03em n\kern-.02em \TeX} \def\VorTeX{V\kern-2.7\p@\lower.5ex\hbox{O\kern-1.4\p@ R}\kern-2.6\p@\TeX} @@ -1476,6 +1479,7 @@ \textwidth 39pc \columnsep 1.5pc \columnwidth 18.75pc +\hfuzz 1pt \parindent \normalparindent \parskip \z@ % \@plus\p@ \leftmargini 2em @@ -1493,8 +1497,17 @@ \parsep=3\p@\@plus\p@\@minus\p@ \itemsep=\parsep % -% Ordinarily we typeset in two columns. But if option is given, revert to one. -\if@tubtwocolumn \twocolumn \else \onecolumn \textwidth=34pc \fi +% Ordinarily we typeset in two columns, but the onecolumn option +% goes to one. In which case we want to center the text block on an +% 8.5in width, given the default 72.27pt offset with margins of zero. +% We are always in LaTeX's twoside mode because of how we load article, +% and this is a good thing, since we want different headings. +\if@tubtwocolumn \twocolumn \else + \onecolumn + \textwidth=34pc + \oddsidemargin=30.8775pt + \evensidemargin=\oddsidemargin +\fi % \newdimen\pagewd \pagewd=\textwidth \newdimen\trimwd \trimwd=\pagewd @@ -2012,6 +2025,7 @@ \fi \begingroup \setcounter{footnote}{0} + \global\@topnum\z@ % disallow floats above the title \def\thefootnote{\fnsymbol{footnote}} \@maketitle \@thanks @@ -2116,9 +2130,9 @@ % the essentially useless functionality of being able to change them % using assignment, which I'm not about to struggle with just now... % -% \cs{AboveTitleSkip} and \cs{BelowTitleSkip} are what you'ld expect; +% \cs{AboveTitleSkip} and \cs{BelowTitleSkip} are what you'd expect; % \cs{strulethickness} is the value to use for \cs{fboxrule} when -% setting the title. +% setting the title, and for the rule above titles when there is no box. % % \begin{macrocode} \newskip\AboveTitleSkip \AboveTitleSkip=12\p@ @@ -2361,25 +2375,14 @@ \fi % \end{macrocode} % -% \cs{TB@startsection} traps \verb"*" versions of sectioning -% commands, if numbering isn't in effect. Its argument is the -% complete set of \cs{@startsection} arguments. +% \cs{TB@startsection} used to trap \verb"*" versions of sectioning +% commands when numbering wasn't in effect. But that eventually seemed +% a useless complaint, since being able to switch back and forth between +% numbered and unnumbered can be useful during article development. +% So now \cs{TB@startsection} is just a synonym for \cs{@startsection}. % % \begin{macrocode} -\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}% % \end{macrocode} % % \cs{TB@safe@startsection} is to be used where \cs{section*} (etc.)\ @@ -2605,10 +2608,19 @@ % \begin{macrocode} \newdimen\@tubfullpageindent \@tubfullpageindent = \if@tubtwocolumn 4.875pc \else 3.875pc \fi +\let\tubcaptionleftglue=\hfil % \end{macrocode} % \end{macro} % -% Ok, here is the \cs{@makecaption}. +% One-line captions are normally centered, but sometimes we want to set +% them flush-left for consistency with other nearby figures. +% \begin{macro}{\tubcaptionleftglue} +% \begin{macrocode} +\let\tubcaptionleftglue=\hfil +% \end{macrocode} +% \end{macro} +% +% Ok, here is \cs{@makecaption}. % \begin{macrocode} \def\tubcaptionfonts{\small}% \long\def\@makecaption#1#2{% @@ -2626,7 +2638,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} % @@ -2993,7 +3005,7 @@ % here\dots % % \begin{macrocode} -\def\thebibliography#1{% +\def\thebibliography#1{% for harvardcite \let\TB@startsection\TB@safe@startsection \section*{\refname \@mkboth{\uppercase{\refname}}{\uppercase{\refname}}}% @@ -3003,10 +3015,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 } % \end{macrocode} % @@ -3050,19 +3062,29 @@ % \begin{macro}{\thebibliography} % \begin{macro}{\TB@@thebibliography} % If the user's asked to use \LaTeX's default citation mechanism -% (using the |rawcite| option), we still need to play with -% \cs{TB@startsection}: this is a boring fact of life\dots -% -% We also patch \cs{sloppy} in case there's a need for alternative -% justification of the body of the bibliography. +% (using the |rawcite| option), we still need to +% patch \cs{sloppy} to support justification of the body of the +% bibliography. We kludge in a call to \cs{frenchspacing} too, +% since there is no reason to change only period's \cs{sfcode}, as +% \LaTeX's original |thebibliography| (in |classes.dtx|) does. +% +% By the way, |amsgen.sty| changes \cs{frenchspacing} to set the +% \cs{sfcode} of punctuation character to successively decreasing +% integers ending at 1001 for comma. Thus its 1006 for period is +% overwritten to 1000 for |thebibliography|, making |amsgen|'s +% \cs{@addpunct} ineffective. Don't know what that means in practice, +% if anything. +% +% Back here, we also play with \TB@startsection since we always have, +% though that is no longer needed. % \begin{macrocode} -\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 % \end{macrocode} % \end{macro} % \end{macro} @@ -3151,7 +3173,7 @@ \def\@evenfoot{\@author\hfil} } -\def\@tubrunninggetauthor#1{#1 +\def\@tubrunninggetauthor#1{#1% \begingroup \let\thanks\@gobble \protected@xdef\rhAuthor{\the\toks@##1}% @@ -3255,8 +3277,8 @@ % \end{macrocode} % % The \cs{acro} command uses \cs{SMC} as it was originally intended. -% Note that, since most of these things are uppercase-only names, it -% fiddles with the spacefactor after inserting its text. +% Since these things are uppercase-only, it fiddles with the +% spacefactor after inserting its text. % % \begin{macrocode} \newcommand{\acro}[1]{\textSMC{#1}\@} 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