diff options
Diffstat (limited to 'Master/texmf-dist/source')
| -rw-r--r-- | Master/texmf-dist/source/latex/tugboat/tugboat.dtx | 117 | ||||
| -rw-r--r-- | Master/texmf-dist/source/latex/tugboat/tugboat.ins | 2 |
2 files changed, 65 insertions, 54 deletions
diff --git a/Master/texmf-dist/source/latex/tugboat/tugboat.dtx b/Master/texmf-dist/source/latex/tugboat/tugboat.dtx index 0b8e8c038f8..12bcc09992b 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 106 2012-11-05 01:08:57Z bnb $ +% $Id: tugboat.dtx 121 2013-08-02 18:44:59Z bnb $ % tugboat.dtx - main source for LaTeX TUGboat classes. % -% Copyright 1994-1998, 2000-2001, 2004-2012, 2013 TeX Users Group. +% Copyright 1994-1998, 2000-2001, 2004-2013 TeX Users Group. % % This file is part of the tugboat package. % @@ -28,7 +28,7 @@ %<ltugboatsty>\ProvidesPackage{ltugboat} %<ltugprocsty>\ProvidesPackage{ltugproc} %<ltugcomn> \ProvidesPackage{ltugcomn} - [2013/01/31 v2.12 + [2013/08/02 v2.13 %<ltugboatcls> TUGboat journal class% %<ltugproccls> TUG conference proceedings class% %<ltugboatsty|ltugprocsty> TUG compatibility package% @@ -373,13 +373,11 @@ \DeclareOption{12pt}{\csname ds@11pt\endcsname} % \end{macrocode} % -% Similarly, ignore one/two-side/column +% Similarly, ignore one/two-side options. % % \begin{macrocode} \DeclareOption{oneside}{\TBWarning{Option \CurrentOption\space ignored}} \DeclareOption{twoside}{\ds@oneside} -\DeclareOption{onecolumn}{\ds@oneside} -\DeclareOption{twocolumn}{\ds@oneside} % \end{macrocode} % % There are these people who seem to think |tugproc| is an option rather @@ -439,6 +437,17 @@ \DeclareOption{runningfull}{\AtEndOfClass{\@tubrunningfull}} % \end{macrocode} % +% \begin{macro}{\if@tubtwocolumn} +% Occasionally (|tb107jackowski|, and past conference preprints), we +% need the option |onecolumn|. For alternative approaches to one-column +% articles, see |tb92hagen-euler| and |tb78milo|. +% +% \begin{macrocode} +\newif\if@tubtwocolumn \@tubtwocolumntrue +\DeclareOption{onecolumn}{\@tubtwocolumnfalse} +% \end{macrocode} +% \end{macro} +% % Any other options, we pass on to |article.cls| before we load it: % % \begin{macrocode} @@ -650,7 +659,6 @@ \def\BSD{\acro{BSD}} \def\CandT{\textsl{Computers \& Typesetting}} \def\CD{\acro{CD}} -\def\CJK{\acro{CJK}} % \end{macrocode} % We place our \cs{kern} after \cs{-} so that it disappears if the % hyphenation is taken: @@ -659,6 +667,7 @@ \def\CMkIV{\ConTeXt\ \MkIV} \def\Cplusplus{C\plusplus} \def\plusplus{\raisebox{.7ex}{$_{++}$}} +\def\CPU{\acro{CPU}} \def\CSS{\acro{CSS}} \def\CSV{\acro{CSV}} \def\CTAN{\acro{CTAN}} @@ -840,11 +849,13 @@ }% } \def\tubhideheight#1{\setbox0=\hbox{#1}\ht0=0pt \dp0=0pt \box0 } -\DeclareRobustCommand\Xe[1]{\leavevmode +\def\XekernbeforeE{-.125em} +\def\XekernafterE{-.1667em} +\DeclareRobustCommand\Xe{\leavevmode \tubhideheight{\hbox{X% \setbox0=\hbox{\TeX}\setbox1=\hbox{E}% - \lower\dp0\hbox{\raise\dp1\hbox{\kern-.125em\tubreflect{E}}}% - \kern-.1667em #1}}} + \lower\dp0\hbox{\raise\dp1\hbox{\kern\XekernbeforeE\tubreflect{E}}}% + \kern\XekernafterE}}} \def\XeTeX{\Xe\TeX} \def\XeLaTeX{\Xe{\kern.11em \LaTeX}} % @@ -1462,8 +1473,11 @@ \topsep=3\p@\@plus\p@\@minus\p@ \parsep=3\p@\@plus\p@\@minus\p@ \itemsep=\parsep -\twocolumn -\newdimen\pagewd \pagewd=39pc +% +% Ordinarily we typeset in two columns. But if option is given, revert to one. +\if@tubtwocolumn \twocolumn \else \onecolumn \textwidth=34pc \fi +% +\newdimen\pagewd \pagewd=\textwidth \newdimen\trimwd \trimwd=\pagewd \newdimen\trimlgt \trimlgt=11in \newdimen\headmargin \headmargin=3.5pc @@ -2216,27 +2230,35 @@ {\endgraf\medskip} % \end{macrocode} % -% The |abstract| and |longabstract| environments both use -% \cs{section*}. -% ^^A [the following is no longer true] -% ^^A They therefore hack at our subversion of -% ^^A \cs{@startsection}, to avoid a confusing warning. +% The |abstract| and |longabstract| environments both use \cs{section*}. +% For one-column articles (or in |ltugproc| class), indent the +% abstract. This is done in the usual bizarre \LaTeX\ way, by treating +% it as a one-item list with an empty item marker. % % \begin{macrocode} +\def\@tubonecolumnabstractstart{% + \list{}{\listparindent\normalparindent + \itemindent\z@ \leftmargin\@tubfullpageindent + \rightmargin\leftmargin \parsep \z@}\item[]\ignorespaces +} +\def\@tubonecolumnabstractfinish{% + \endlist +} \renewenvironment{abstract}% - {% - \begin{SafeSection}% - \section*{Abstract}% + {\begin{SafeSection}% + \section*{% + \if@tubtwocolumn\else \hspace*{\@tubfullpageindent}\fi + Abstract}% + \if@tubtwocolumn\else \@tubonecolumnabstractstart \fi }% - {\end{SafeSection}} + {\if@tubtwocolumn\else \@tubonecolumnabstractfinish \fi + \end{SafeSection}} \newenvironment{longabstract}% - {% - \begin{SafeSection}% + {\begin{SafeSection}% \section*{Abstract}% \bgroup\small }% - {% - \endgraf\egroup + {\endgraf\egroup \end{SafeSection}% \vspace{.25\baselineskip} \begin{center} @@ -2566,27 +2588,29 @@ % % By analogy with what we've just done to section titles and the like, % we now do our best to discourage hyphenation within captions. We also -% typeset them in \cs{small}. +% typeset them in \cs{small} (actually \cs{tubcaptionfonts}). % % First, let's define a dimension by which we will indent full-page % captions. We'll also use this to indent abstracts in proceedings style. -% \begin{macro}{\tubfullpageindent} +% \begin{macro}{\@tubfullpageindent} % \begin{macrocode} -\newdimen\tubfullpageindent \tubfullpageindent=4.875pc +\newdimen\@tubfullpageindent +\@tubfullpageindent = \if@tubtwocolumn 4.875pc \else 3.875pc \fi % \end{macrocode} % \end{macro} % % Ok, here is the \cs{@makecaption}. % \begin{macrocode} +\def\tubcaptionfonts{\small}% \long\def\@makecaption#1#2{% \vskip\abovecaptionskip - \sbox\@tempboxa{\small \tubmakecaptionbox{#1}{#2}}% try in an hbox + \sbox\@tempboxa{\tubcaptionfonts \tubmakecaptionbox{#1}{#2}}% try in an hbox \ifdim \wd\@tempboxa > \hsize {% caption doesn't fit on one line; set as a paragraph. - \small \raggedright \hyphenpenalty=\@M \parindent=1em + \tubcaptionfonts \raggedright \hyphenpenalty=\@M \parindent=1em % indent full-width captions {figure*}, but not single-column {figure}. \ifdim\hsize = \textwidth - \leftskip=\tubfullpageindent \rightskip=\leftskip + \leftskip=\@tubfullpageindent \rightskip=\leftskip \advance\rightskip by 0pt plus2em % increase acceptable raggedness \fi \noindent \tubmakecaptionbox{#1}{#2}\par}% @@ -2600,12 +2624,12 @@ \def\tubmakecaptionbox#1#2{#1: #2}% allow overriding for a paper % \end{macrocode} % -% Also use \cs{small} for the caption labels, and put the label itself -% (e.g., ``Figure 1'') in bold. +% Also use \cs{tubcaptionfonts} for the caption +% labels, and put the label itself (e.g., ``Figure 1'') in bold. % % \begin{macrocode} -\def\fnum@figure{{\small \bf \figurename\nobreakspace\thefigure}} -\def\fnum@table{{\small \bf \tablename\nobreakspace\thetable}} +\def\fnum@figure{{\tubcaptionfonts \bf \figurename\nobreakspace\thefigure}} +\def\fnum@table{{\tubcaptionfonts \bf \tablename\nobreakspace\thetable}} % \end{macrocode} % % Let's reduce the default space above captions a bit, and give it some @@ -3349,18 +3373,6 @@ % \end{macrocode} % \end{macro} % -% \begin{macro}{\if@proctw@column} -% For the case where we're preparing the preprints, we may not have -% been able to prepare submissions for typesetting in two columns. In -% this case, therefore, we may need the option |onecolumn|, that will -% suppress the use of twocolumn setting within the article. -% -% \begin{macrocode} -\newif\if@proctw@column \@proctw@columntrue -\DeclareOption{onecolumn}{\@proctw@columnfalse} -% \end{macrocode} -% \end{macro} -% % \begin{macro}{\if@proc@sober} % \begin{macro}{\if@proc@numerable} % ^^A\acro @@ -3539,7 +3551,7 @@ \ifTB@title \setcounter{footnote}{0}% \renewcommand\thefootnote{\@fnsymbol\c@footnote}% - \if@proctw@column + \if@tubtwocolumn \twocolumn[\@maketitle]% \else \onecolumn @@ -3628,11 +3640,10 @@ \if@abstract \centerline{\bfseries Abstract}% \vskip.5\baselineskip\rmfamily - \list{}{\listparindent20\p@ - \itemindent\z@ \leftmargin\tubfullpageindent - \rightmargin\leftmargin \parsep \z@}\item[]\ignorespaces + \@tubonecolumnabstractstart \the\abstract@toks - \endlist\global\@ignoretrue + \@tubonecolumnabstractfinish + \global\@ignoretrue \fi \vskip\belowabstractskip \global\@afterindentfalse\aftergroup\@afterheading @@ -3710,7 +3721,7 @@ \else % \end{macrocode} % -% It's not \cs{end}|{abstract}| --- check that it's not +% It's not \cs{end}|{abstract}|---check that it's not % \cs{end}|{document}| either (which signifies that the author's % forgotten about ending the abstract) % \begin{macrocode} diff --git a/Master/texmf-dist/source/latex/tugboat/tugboat.ins b/Master/texmf-dist/source/latex/tugboat/tugboat.ins index 51b932c91c1..8e5bbc7800c 100644 --- a/Master/texmf-dist/source/latex/tugboat/tugboat.ins +++ b/Master/texmf-dist/source/latex/tugboat/tugboat.ins @@ -1,4 +1,4 @@ -% $Id: tugboat.ins 79 2011-05-05 17:04:32Z karl $ +% $Id: tugboat.ins 108 2013-01-31 23:45:00Z bnb $ % tugboat.ins %% This file will generate fast loadable files and documentation %% driver files from the doc files in this package when run through |