tugboat (8nov16)

git-svn-id: svn://tug.org/texlive/trunk@42465 c570f23f-e606-0410-a88d-b1316a301751

1 files changed, 73 insertions, 51 deletions

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 @@
 %<ltugboatsty>\ProvidesPackage{ltugboat}
 %<ltugprocsty>\ProvidesPackage{ltugproc}
 %<ltugcomn>   \ProvidesPackage{ltugcomn}
-                   [2015/03/24 v2.17
+                   [2016/11/07 v2.18
 %<ltugboatcls>                       TUGboat journal class%
 %<ltugproccls>                       TUG conference proceedings class%
 %<ltugboatsty|ltugprocsty>           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}\@}