summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/source/latex/tugboat
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2018-09-06 20:47:15 +0000
committerKarl Berry <karl@freefriends.org>2018-09-06 20:47:15 +0000
commit0ed21e3b08ac7967aa4923032ccb6aa64c13f4e5 (patch)
treedc0dd2e97c7f96f48fca7b12b8915ca82181924d /Master/texmf-dist/source/latex/tugboat
parent15d1db0618b158e41f253e9d8af74981f10d0dd3 (diff)
tugboat (6sep18)
git-svn-id: svn://tug.org/texlive/trunk@48607 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/source/latex/tugboat')
-rw-r--r--Master/texmf-dist/source/latex/tugboat/tugboat.dtx73
1 files changed, 47 insertions, 26 deletions
diff --git a/Master/texmf-dist/source/latex/tugboat/tugboat.dtx b/Master/texmf-dist/source/latex/tugboat/tugboat.dtx
index 75d987cccfc..8dff9585db9 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 187 2017-11-06 20:29:32Z karl $
+% $Id: tugboat.dtx 205 2018-09-06 17:28:53Z karl $
% tugboat.dtx - main source for LaTeX TUGboat classes.
%
-% Copyright 1994-2017 TeX Users Group.
+% Copyright 1994-2018 TeX Users Group.
%
% This file is part of the tugboat package.
%
@@ -28,7 +28,7 @@
%<ltugboatsty>\ProvidesPackage{ltugboat}
%<ltugprocsty>\ProvidesPackage{ltugproc}
%<ltugcomn> \ProvidesPackage{ltugcomn}
- [2017/11/06 v2.19
+ [2018-09-06 v2.20
%<ltugboatcls> TUGboat journal class%
%<ltugproccls> TUG conference proceedings class%
%<ltugboatsty|ltugprocsty> TUG compatibility package%
@@ -177,14 +177,14 @@
% |\SC|& Steering Committee\\
% |\SGML|& SGML\\
% |\SliTeX|&\\
-% |\slMF|& Metafont (slanted)\Dash deprecated: use
+% |\slMF|& Metafont, slanted: deprecated: use
% \cs{textsl} instead \\
% |\stTeX|& \TeX{} for the Atari ST\\
% |\SVG|&\\
% |\TANGLE|&\\
% |\TB|& The \TeX book\\
% |\TeX|& (Although nearly every package defines this,
-% most\Dash including plain\Dash are missing the
+% most, including plain, are missing the
% spacefactor adjustment)\\
% |\TeXhax|&\\
% |\TeXMaG|& (defunct)\\
@@ -324,7 +324,7 @@
\providecommand{\@tugclass}{ltugboat}
% \end{macrocode}
%
-% Warnings/error messages/information messages~--- if we're using
+% Warnings/error messages/information messages\Dash if we're using
% \LaTeXe{} we can use the \cs{Class*} commands:
%
% \begin{macrocode}
@@ -415,9 +415,8 @@
% causes those letters to be suppressed. Note that (a) no two
% references will in any case have the same labels in the default
% (plain) |rawcite| setup, and that (b) the distinguishing letters
-% appear in the labels themselves~--- the even remotely intelligent
-% reader should be able to work out the correspondence one with the
-% other\dots
+% appear in the labels themselves; the reader can work out the
+% correspondence one with the other\dots
%
% \begin{macrocode}
\DeclareOption{extralabel}{\let\UseExtraLabel\@firstofone}
@@ -669,6 +668,7 @@
%
\def\BSD{\acro{BSD}}
\def\CandT{\textsl{Computers \& Typesetting}}
+% must not define \CJK, because the CJK package does.
% \end{macrocode}
% We place our \cs{kern} after \cs{-} so that it disappears if the
% hyphenation is taken:
@@ -1079,7 +1079,7 @@
% \cs{,}, but that we provide a new definition of |~| by redefining
% its robust underpinnings\footnote{\cs{DeclareRobustCommand} doesn't
% mind redefinition, fortunately} (based on the version in
-% AMS-\TeX~--- the \LaTeXe{} version has \cs{leavevmode} and doesn't
+% AMS-\TeX---the \LaTeXe{} version has \cs{leavevmode} and doesn't
% care about surrounding space).
% \begin{macrocode}
\DeclareRobustCommand{\nobreakspace}{%
@@ -1662,7 +1662,7 @@
\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
% \end{macrocode}
%
@@ -1673,6 +1673,8 @@
#1{\ignorespaces\theauthor{\number\authornumber}\unskip}
\fi
}
+%
+\def\@tubauthorlastsep{, }% until 2018, was: "\ and "
% \end{macrocode}
%
% Signature blocks. The author can (in principle) define a different
@@ -1751,11 +1753,12 @@
\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
@@ -1763,6 +1766,19 @@
\def\signaturemark{\leavevmode\llap{$\diamond$\enspace}}
% \end{macrocode}
%
+% The idea here is that if multiple authors share affiliation
+% information, we need only typeset the affiliation once. We separate by
+% commas for the \cs{maketitle}, and put on separate lines in the
+% \cs{makesignature}. Similarly, within \cs{netaddress},
+% |!tubmultipleaffilnet| separates with a space before and after the
+% comma, while . (All this per bb.) See |tb122childs-trotter.ltx| for an
+% example.
+%
+% \begin{macrocode}
+\def\tubmultipleaffilauthor{\unskip, \ignorespaces}%
+\def\tubmultipleaffilnet{\textrm{\unskip~,\ \ignorespaces}}
+% \end{macrocode}
+%
% Now all the awful machinery of author definitions.
% \cs{authornumber} records the number of authors we have recorded to
% date.
@@ -1788,7 +1804,7 @@
}
% \end{macrocode}
% \cs{contributor} is for a small part of a multiple-part article; it
-% begins a group that will be ended in \cs{makesignature}
+% begins a group that will be ended in \cs{makesignature}.
% \begin{macrocode}
\def\contributor{%
\begingroup
@@ -1866,7 +1882,8 @@
% \LaTeXe.
%
% \begin{macrocode}
- #1\@sanitize\makespace\ \makeactive\@
+ #1\@sanitize\makespace\ \makeactive\@%
+ \makeescape! \makebgroup[ \makeegroup]% seems more useful than literals
\makeactive\.\makeactive\%\@relay@netaddress}%
% \end{macrocode}
%
@@ -2106,9 +2123,9 @@
% last \cs{sectitle} will actually be executed.
%
% \begin{macrocode}
-\newif\ifSecTitle
-\SecTitlefalse
\newif\ifWideSecTitle
+\newif\iftubtitlerulefullwidth
+\newif\ifSecTitle \SecTitlefalse
\newcommand{\sectitle}{%
\SecTitletrue
\@ifstar
@@ -2181,7 +2198,7 @@
%
% \begin{macro}{\@sectitle@newline}
% For use inside \cs{sectitle} as |\\|. Works similarly to |\\| in
-% the ``real world''~--- uses an optional argument
+% the ``real world''---uses an optional argument
% \begin{macrocode}
\newcommand{\@sectitle@newline}[1][\z@]{%
\ifdim#1>\z@
@@ -2212,7 +2229,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
@@ -2376,9 +2397,9 @@
\fi
% \end{macrocode}
%
-% \cs{TB@startsection} used to trap \verb"*" versions of sectioning
+% \cs{TB@startsection} used to warn about \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
+% a useless complaint, since it can be usefule 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}.
%
@@ -2626,7 +2647,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
@@ -2643,7 +2664,7 @@
\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
% \end{macrocode}
%
% Also use \cs{tubcaptionfonts} for the caption
@@ -3244,12 +3265,12 @@
%</classtail>
% \end{macrocode}
%
-% \cs{SMC} \emph{isn't} small caps~--- Barbara Beeton says she thinks
+% \cs{SMC} \emph{isn't} small caps---Barbara Beeton says she thinks
% of it as ``big small caps''. She says (modulo capitalisation of
% things\dots):
% \begin{quote}
% For the things it's used for, regular small caps are not
-% appropriate~--- they're too small. Real small caps are
+% appropriate---they're too small. Real small caps are
% appropriate for author names (and are so used in continental
% bibliographies), section headings, running heads, and, on
% occasion, words to which some emphasis is to be given. \cs{SMC}
@@ -3257,7 +3278,7 @@
% which look terrible in small caps, but nearly as bad in all caps
% in the regular text size. The principle of using ``one size
% smaller'' than the text size is similar to the design of caps in
-% German~--- where they are smaller relative to lowercase than are
+% German---where they are smaller relative to lowercase than are
% caps in fonts intended for English, to improve the appearance of
% regular text in which caps are used at the heads of all nouns, not
% just at the beginnings of sentences.