From addded1ab23789fbb7f5868ed6b8881f933d44d5 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Fri, 24 Aug 2007 18:35:25 +0000 Subject: tugboat update (21aug07) git-svn-id: svn://tug.org/texlive/trunk@4797 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/doc/latex/tugboat/tugboat.pdf | Bin 282399 -> 304394 bytes Master/texmf-dist/source/latex/tugboat/tugboat.dtx | 33 ++++++++++++++++----- Master/texmf-dist/tex/latex/tugboat/ltugboat.cls | 12 +++++--- Master/texmf-dist/tex/latex/tugboat/ltugboat.sty | 2 +- Master/texmf-dist/tex/latex/tugboat/ltugcomn.sty | 2 +- Master/texmf-dist/tex/latex/tugboat/ltugproc.cls | 4 +-- Master/texmf-dist/tex/latex/tugboat/ltugproc.sty | 2 +- 7 files changed, 39 insertions(+), 16 deletions(-) diff --git a/Master/texmf-dist/doc/latex/tugboat/tugboat.pdf b/Master/texmf-dist/doc/latex/tugboat/tugboat.pdf index 9db6e63ea25..c8e97df6adf 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 9eac928b928..d70a48be5e9 100644 --- a/Master/texmf-dist/source/latex/tugboat/tugboat.dtx +++ b/Master/texmf-dist/source/latex/tugboat/tugboat.dtx @@ -41,7 +41,7 @@ %\ProvidesPackage{ltugboat} %\ProvidesPackage{ltugproc} % \ProvidesPackage{ltugcomn} - [2007/03/19 v2.1 + [2007/08/11 v2.2 % TUGboat journal class% % TUG conference proceedings class% % TUG compatibility package% @@ -63,7 +63,7 @@ % % RCS identification of this file (lest I fail to update the above ;-) % -% $Id: tugboat.dtx,v 1.3 2007/03/30 13:55:31 rf10 Exp rf10 $ +% $Id: tugboat.dtx,v 1.5 2007/08/21 12:46:27 rf10 Exp $ % % Note that the RCS version relates to the number of times the file % has been checked-in, which relates to a development process taking @@ -129,7 +129,7 @@ % \end{macrocode} % % \fi -% \CheckSum{4455} +% \CheckSum{4462} % % \section{Introduction} % @@ -1576,6 +1576,7 @@ % if \cs{authornumber}$<0$, we are in a contributor's section % \begin{macrocode} \medskip + \frenchspacing \signaturemark \theauthor{\number\authornumber}\\ \theaddress{\number\authornumber}\\ @@ -2271,6 +2272,17 @@ % \end{macrocode} % % \cs{l@} is for table of contents (of an article). +% +% We define new macros to allow easily changing the font used for toc +% entries (for \TUB, we usually want roman, not bold), and the space +% between entries. Nelson Beebe's articles are almost the only ones +% that ever have toc's. +% +% \begin{macrocode} +\def\TBtocsectionfont{\normalfont} +\newskip\TBtocsectionspace \TBtocsectionspace=1.0em\@plus\p@ +% \end{macrocode} +% % Don't ask me (RF) why \cs{l@part} is there; I commented it out % because I couldn't understand why it had been left there for me. To % be finally deleted in a future release of these macros\dots @@ -2282,13 +2294,15 @@ % {\large \bf \leavevmode #1\hfil \hbox to\@pnumwidth{\hss #2}}\par % \nobreak % \endgroup} +% \def\l@section#1#2{\addpenalty{\@secpenalty}% - \addvspace{1.0em\@plus\p@}% + \addvspace{\TBtocsectionspace}% \@tempdima 1.5em \begingroup \parindent\z@ \rightskip\z@ % article style makes \rightskip > 0 \parfillskip\z@ - \bf\leavevmode\advance\leftskip\@tempdima\hskip-\leftskip#1\nobreak\hfil + \TBtocsectionfont + \leavevmode\advance\leftskip\@tempdima\hskip-\leftskip#1\nobreak\hfil \nobreak\hb@xt@\@pnumwidth{\hss #2}\par \endgroup} % \end{macrocode} @@ -2553,12 +2567,17 @@ % \end{macrocode} % % Impose an optional argument on the environment. +% +% We start the macro with \cs{par} to avoid a common error: if the +% optional argument is \cs{small}, and the document has no blank line +% before the verbatim block, we don't want that preceding paragraph to +% be set with \cs{small}'s line spacing. % % (\cs{obeylines} added to prevent the \cs{futurelet} from propagating % into the body of the verbatim, thus causing lines that start with % odd characters (like |#| or even |\|) to behave peculiarly.) % \begin{macrocode} -\def\verbatim{\obeylines +\def\verbatim{\par\obeylines \futurelet\reserved@a\@switch@sqbverbatim} \def\@switch@sqbverbatim{\ifx\reserved@a[%] \expandafter\@sqbverbatim\else @@ -3391,6 +3410,7 @@ % \begin{macrocode} \def\@maketitle{% {\parskip\z@ + \frenchspacing \TITLEfont\raggedright\noindent\@title\par \count@=0 \loop @@ -3402,7 +3422,6 @@ {% \allowhyphens \hangindent1.5pc - \frenchspacing \netaddrfont\thenetaddress{\number\count@}\endgraf \hangindent1.5pc \thePersonalURL{\number\count@}\endgraf diff --git a/Master/texmf-dist/tex/latex/tugboat/ltugboat.cls b/Master/texmf-dist/tex/latex/tugboat/ltugboat.cls index cab16ced271..b6502155592 100644 --- a/Master/texmf-dist/tex/latex/tugboat/ltugboat.cls +++ b/Master/texmf-dist/tex/latex/tugboat/ltugboat.cls @@ -56,7 +56,7 @@ %% extension .ins) which are part of the distribution. \NeedsTeXFormat{LaTeX2e}[1994/12/01] \ProvidesClass {ltugboat} - [2007/03/19 v2.1 + [2007/08/11 v2.2 TUGboat journal class% ] \csname tugstyloaded@\endcsname @@ -666,6 +666,7 @@ \let\thanks\@gobble \ifnum\authornumber<0 \medskip + \frenchspacing \signaturemark \theauthor{\number\authornumber}\\ \theaddress{\number\authornumber}\\ @@ -1021,13 +1022,16 @@ \def\part{\TB@nosection\part\section} \def\TB@nosection#1#2{\TBWarning{class does not support \string#1, \string#2\space used instead}#2} +\def\TBtocsectionfont{\normalfont} +\newskip\TBtocsectionspace \TBtocsectionspace=1.0em\@plus\p@ \def\l@section#1#2{\addpenalty{\@secpenalty}% - \addvspace{1.0em\@plus\p@}% + \addvspace{\TBtocsectionspace}% \@tempdima 1.5em \begingroup \parindent\z@ \rightskip\z@ % article style makes \rightskip > 0 \parfillskip\z@ - \bf\leavevmode\advance\leftskip\@tempdima\hskip-\leftskip#1\nobreak\hfil + \TBtocsectionfont + \leavevmode\advance\leftskip\@tempdima\hskip-\leftskip#1\nobreak\hfil \nobreak\hb@xt@\@pnumwidth{\hss #2}\par \endgroup} \renewcommand\appendix{\par @@ -1154,7 +1158,7 @@ \rightmargin.5\leftmargin\parsep \z@\@plus\p@}\item[]} \let\@TBverbatim\verbatim \let\@TBendverbatim\endverbatim -\def\verbatim{\obeylines +\def\verbatim{\par\obeylines \futurelet\reserved@a\@switch@sqbverbatim} \def\@switch@sqbverbatim{\ifx\reserved@a[%] \expandafter\@sqbverbatim\else diff --git a/Master/texmf-dist/tex/latex/tugboat/ltugboat.sty b/Master/texmf-dist/tex/latex/tugboat/ltugboat.sty index b9c92e19137..199ee55e54d 100644 --- a/Master/texmf-dist/tex/latex/tugboat/ltugboat.sty +++ b/Master/texmf-dist/tex/latex/tugboat/ltugboat.sty @@ -55,7 +55,7 @@ %% and covered by LPPL is defined by the unpacking scripts (with %% extension .ins) which are part of the distribution. \ProvidesPackage{ltugboat} - [2007/03/19 v2.1 + [2007/08/11 v2.2 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 886e3765904..33ab73b69ee 100644 --- a/Master/texmf-dist/tex/latex/tugboat/ltugcomn.sty +++ b/Master/texmf-dist/tex/latex/tugboat/ltugcomn.sty @@ -56,7 +56,7 @@ %% extension .ins) which are part of the distribution. \NeedsTeXFormat{LaTeX2e}[1994/12/01] \ProvidesPackage{ltugcomn} - [2007/03/19 v2.1 + [2007/08/11 v2.2 TUGboat `common macros' package% ] \IfFileExists{mflogo.sty}% diff --git a/Master/texmf-dist/tex/latex/tugboat/ltugproc.cls b/Master/texmf-dist/tex/latex/tugboat/ltugproc.cls index 5b357913cd0..ad603633d55 100644 --- a/Master/texmf-dist/tex/latex/tugboat/ltugproc.cls +++ b/Master/texmf-dist/tex/latex/tugboat/ltugproc.cls @@ -56,7 +56,7 @@ %% extension .ins) which are part of the distribution. \NeedsTeXFormat{LaTeX2e}[1994/12/01] \ProvidesClass {ltugproc} - [2007/03/19 v2.1 + [2007/08/11 v2.2 TUG conference proceedings class% ] \def\@tugclass{ltugproc} @@ -172,6 +172,7 @@ \newskip\belowabstractskip \belowabstractskip=14\p@ \@plus3\p@ \@minus2\p@ \def\@maketitle{% {\parskip\z@ + \frenchspacing \TITLEfont\raggedright\noindent\@title\par \count@=0 \loop @@ -183,7 +184,6 @@ {% \allowhyphens \hangindent1.5pc - \frenchspacing \netaddrfont\thenetaddress{\number\count@}\endgraf \hangindent1.5pc \thePersonalURL{\number\count@}\endgraf diff --git a/Master/texmf-dist/tex/latex/tugboat/ltugproc.sty b/Master/texmf-dist/tex/latex/tugboat/ltugproc.sty index 001e0722972..393c83e6056 100644 --- a/Master/texmf-dist/tex/latex/tugboat/ltugproc.sty +++ b/Master/texmf-dist/tex/latex/tugboat/ltugproc.sty @@ -55,7 +55,7 @@ %% and covered by LPPL is defined by the unpacking scripts (with %% extension .ins) which are part of the distribution. \ProvidesPackage{ltugproc} - [2007/03/19 v2.1 + [2007/08/11 v2.2 TUG compatibility package% ] \@obsoletefile{ltugproc.cls}{ltugproc.sty} -- cgit v1.2.3