From a6c79ee97b4809b5fd4eee3135d73c2725df6d9f Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Wed, 24 Nov 2010 01:14:43 +0000 Subject: tugboat 2010/11/15 (24nov10) git-svn-id: svn://tug.org/texlive/trunk@20545 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/tex/latex/tugboat/ltugboat.cls | 86 ++++++++++++++---------- Master/texmf-dist/tex/latex/tugboat/ltugboat.sty | 2 +- Master/texmf-dist/tex/latex/tugboat/ltugcomn.sty | 25 ++++--- Master/texmf-dist/tex/latex/tugboat/ltugproc.cls | 2 +- Master/texmf-dist/tex/latex/tugboat/ltugproc.sty | 2 +- 5 files changed, 70 insertions(+), 47 deletions(-) (limited to 'Master/texmf-dist/tex/latex/tugboat') diff --git a/Master/texmf-dist/tex/latex/tugboat/ltugboat.cls b/Master/texmf-dist/tex/latex/tugboat/ltugboat.cls index cef2f14b660..25dd0e13607 100644 --- a/Master/texmf-dist/tex/latex/tugboat/ltugboat.cls +++ b/Master/texmf-dist/tex/latex/tugboat/ltugboat.cls @@ -32,7 +32,7 @@ %% \NeedsTeXFormat{LaTeX2e}[1994/12/01] \ProvidesClass {ltugboat} - [2009/09/29 v2.7 + [2010/11/15 v2.8 TUGboat journal class% ] \csname tugstyloaded@\endcsname @@ -50,7 +50,8 @@ \BlackBoxes \def\MakeRegistrationMarks{}% \PrelimDrafttrue - }% + \@tubrunningminimal + }% } \DeclareOption{preprint}{% \preprinttrue @@ -80,6 +81,7 @@ \DeclareOption{noextralabel}{\let\UseExtraLabel\@gobble} \DeclareOption{numbersec}{\let\if@numbersec\iftrue} \DeclareOption{nonumber}{\let\if@numbersec\iffalse} +\DeclareOption{runningoff}{\AtEndOfClass{\@tubrunningoff}} \DeclareOption{runningminimal}{\AtEndOfClass{\@tubrunningminimal}} \DeclareOption{runningfull}{\AtEndOfClass{\@tubrunningfull}} \DeclareOption*{\PassOptionsToClass{\CurrentOption}{article}} @@ -174,14 +176,18 @@ \fi } \def\BibTeX{\Bib\kern-.08em \TeX} +\def\BSD{\acro{BSD}} \def\CandT{\textsl{Computers \& Typesetting}} \def\CJK{\acro{CJK}} -\newcommand\ConTeXt{C\kern-.0333emon\-\kern-.0667em\TeX\kern-.0333emt} -\newcommand\Cplusplus{C\plusplus} -\newcommand\plusplus{\raisebox{.7ex}{$_{++}$}} +\def\ConTeXt{C\kern-.0333emon\-\kern-.0667em\TeX\kern-.0333emt} +\def\CMkIV{\ConTeXt\ \MkIV} +\def\Cplusplus{C\plusplus} +\def\plusplus{\raisebox{.7ex}{$_{++}$}} \def\CSS{\acro{CSS}} +\def\CSV{\acro{CSV}} \def\CTAN{\acro{CTAN}} \def\DTD{\acro{DTD}} +\def\DTK{\acro{DTK}} \def\DVD{\acro{DVD}} \def\DVI{\acro{DVI}} \def\DVIPDFMx{\acro{DVIPDFM}$x$} @@ -228,13 +234,15 @@ to\ht\TestBox{\hbox{c}\vfil}} % for Robert McGaffey \def\mf{\textsc{Metafont}} \def\MFB{\textsl{The \MF book}} +\def\MkIV{Mk\acro{IV}} \let\TB@@mp\mp \DeclareRobustCommand\mp{\ifmmode\TB@@mp\else MetaPost\fi} \DeclareTextSymbol{\textohm}{OT1}{'012} \DeclareTextSymbolDefault{\textohm}{OT1} \newcommand\OMEGA{\textohm} \DeclareRobustCommand{\OCP}{\OMEGA\acro{CP}} -\def\OOXML{\acro{OOXML}} +\DeclareRobustCommand{\OOXML}{\acro{OOXML}} +\DeclareRobustCommand{\OTF}{\acro{OTF}} \DeclareRobustCommand{\OTP}{\OMEGA\acro{TP}} \def\mtex{T\kern-.1667em\lower.424ex\hbox{\^E}\kern-.125emX\@} \DeclareRobustCommand\NTS{\ensuremath{\mathcal{N}\mkern-4mu @@ -244,10 +252,10 @@ \def\PCTeX{PC\thinspace\TeX} \def\pcTeX{\leavevmode\raise.5ex\hbox{p\kern-.3\p@ c}\TeX} \def\PDF{\acro{PDF}} -\def\PiC{P\kern-.12em\lower.5ex\hbox{I}\kern-.075emC\@} -\def\PiCTeX{\PiC\kern-.11em\TeX} \def\PGF{\acro{PGF}} \def\PHP{\acro{PHP}} +\def\PiC{P\kern-.12em\lower.5ex\hbox{I}\kern-.075emC\@} +\def\PiCTeX{\PiC\kern-.11em\TeX} \def\plain{\texttt{plain}} \def\PNG{\acro{PNG}} \def\POBox{P.\thinspace O.~Box } @@ -314,6 +322,8 @@ \def\XeTeX{\Xe\TeX} \def\XeLaTeX{\Xe{\,\LaTeX}} \def\XHTML{\acro{XHTML}} +\def\XSL{\acro{XSL}} +\def\XSLFO{\acro{XSL}\raise.08ex\hbox{-}\acro{FO}} \def\XSLT{\acro{XSLT}} \newlinechar=`\^^J \normallineskiplimit=\p@ @@ -460,7 +470,6 @@ \else th% nth \fi}% } -\def\r#1{\accent"17 #1} \def\Review{\@ifnextchar:{\@Review}{\@Review:}} \def\@Review:{\@ifnextchar[%] {\@Rev}% @@ -494,7 +503,7 @@ \setbox\TestBox=\hbox{\volno}% \ifdim \wd\TestBox > .2em \v@lx \fi } \vol 0, 0. -\issdate Thermidor, 2060. +\issdate Thermidor, 9999. \def\tubissue#1{\@ifnextchar(%) {\@tubissue@b{#1}} {\@tubissue@a{#1}}} @@ -677,9 +686,10 @@ \def\@signature{\@defaultsignature} \def\@defaultsignature{{% \let\thanks\@gobble + \frenchspacing + % \ifnum\authornumber<0 \medskip - \frenchspacing \signaturemark \theauthor{\number\authornumber}\\ \theaddress{\number\authornumber}\\ @@ -1098,29 +1108,19 @@ \def\@currentlabelname{#5}% \TB@@ssect{#1}{#2}{#3}{#4}{#5}% } -\def\label#1{{% - \@bsphack - \let\label\@gobble - \let\index\@gobble - \if@filesw - \protected@write\@auxout{}% - {\string\newlabel{#1}{% - {\@currentlabel}{\thepage}{\@currentlabelname}}% - }% - \fi - \@esphack - }% +\let\@savelatexlabel=\label % so save original LaTeX command +\def\label#1{% de + \@savelatexlabel{#1}% + \@bsphack + \if@filesw + \protected@write\@auxout{}% + {\string\newlabel{nr@#1}{{\@currentlabel}{\@currentlabelname}}}% + \fi + \@esphack } \let\@currentlabelname\@empty -\DeclareRobustCommand\ref[1]{\expandafter\@setref - \csname r@#1\endcsname\@firstofthree{#1}} -\DeclareRobustCommand\pageref[1]{\expandafter\@setref - \csname r@#1\endcsname\@secondofthree{#1}} \DeclareRobustCommand\nameref[1]{\expandafter\@setref - \csname r@#1\endcsname\@thirdofthree{#1}} -\long\def\@firstofthree#1#2#3{#1} -\long\def\@secondofthree#1#2#3{#2} -\long\def\@thirdofthree#1#2#3{#3} + \csname r@nr@#1\endcsname\@secondoftwo{#1}} \newdimen\tubfullpageindent \tubfullpageindent=4.875pc \long\def\@makecaption#1#2{% \vskip\abovecaptionskip @@ -1198,6 +1198,13 @@ \setlength{\parsep} {0pt}% }% {\end{itemize}} +\newenvironment{compactenumerate}% + {\begin{enumerate}% + \setlength{\itemsep}{0pt}% + \setlength{\parskip}{0pt}% + \setlength{\parsep} {0pt}% + }% + {\end{enumerate}} \let\@TBverbatim\verbatim \let\@TBendverbatim\endverbatim \def\verbatim{\par\obeylines @@ -1382,12 +1389,14 @@ \topregister\vskip \headmargin \vskip 10\p@}}}}% } \def\@oddhead{\MakeRegistrationMarks\PrelimDraftfooter - \normalsize\csname normalshape\endcsname\rm + \normalsize\csname normalshape\endcsname\rm \tubheadhook \rtitlex\qquad\midrtitle \hfil \thepage} \def\@evenhead{\MakeRegistrationMarks\PrelimDraftfooter - \normalsize\csname normalshape\endcsname\rm + \normalsize\csname normalshape\endcsname\rm \tubheadhook \thepage\hfil\midrtitle\qquad\rtitlex} +\def\tubheadhook{} + \def\@tubrunningfull{% \def\@oddfoot{\hfil\rhTitle} \def\@evenfoot{\@author\hfil} @@ -1401,8 +1410,15 @@ }% \def\@tubrunningminimal{% - \def\@oddfoot{\hfil} - \def\@evenfoot{\hfil} + \def\@oddfoot{\hfil}% + \def\@evenfoot{\hfil}% +} + +\def\@tubrunningoff{% + \def\@oddfoot{\hfil}% + \def\@evenfoot{\hfil}% + \def\@oddhead{\hfil}% + \def\@evenhead{\hfil}% } \def\ps@headings{} diff --git a/Master/texmf-dist/tex/latex/tugboat/ltugboat.sty b/Master/texmf-dist/tex/latex/tugboat/ltugboat.sty index 9aacce067c5..fb82028dbbb 100644 --- a/Master/texmf-dist/tex/latex/tugboat/ltugboat.sty +++ b/Master/texmf-dist/tex/latex/tugboat/ltugboat.sty @@ -31,7 +31,7 @@ %% extension .ins) which are part of the distribution. %% \ProvidesPackage{ltugboat} - [2009/09/29 v2.7 + [2010/11/15 v2.8 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 4dc5555bdfe..6e16b9abeba 100644 --- a/Master/texmf-dist/tex/latex/tugboat/ltugcomn.sty +++ b/Master/texmf-dist/tex/latex/tugboat/ltugcomn.sty @@ -32,7 +32,7 @@ %% \NeedsTeXFormat{LaTeX2e}[1994/12/01] \ProvidesPackage{ltugcomn} - [2009/09/29 v2.7 + [2010/11/15 v2.8 TUGboat `common macros' package% ] \IfFileExists{mflogo.sty}% @@ -117,14 +117,18 @@ \fi } \def\BibTeX{\Bib\kern-.08em \TeX} +\def\BSD{\acro{BSD}} \def\CandT{\textsl{Computers \& Typesetting}} \def\CJK{\acro{CJK}} -\newcommand\ConTeXt{C\kern-.0333emon\-\kern-.0667em\TeX\kern-.0333emt} -\newcommand\Cplusplus{C\plusplus} -\newcommand\plusplus{\raisebox{.7ex}{$_{++}$}} +\def\ConTeXt{C\kern-.0333emon\-\kern-.0667em\TeX\kern-.0333emt} +\def\CMkIV{\ConTeXt\ \MkIV} +\def\Cplusplus{C\plusplus} +\def\plusplus{\raisebox{.7ex}{$_{++}$}} \def\CSS{\acro{CSS}} +\def\CSV{\acro{CSV}} \def\CTAN{\acro{CTAN}} \def\DTD{\acro{DTD}} +\def\DTK{\acro{DTK}} \def\DVD{\acro{DVD}} \def\DVI{\acro{DVI}} \def\DVIPDFMx{\acro{DVIPDFM}$x$} @@ -171,13 +175,15 @@ to\ht\TestBox{\hbox{c}\vfil}} % for Robert McGaffey \def\mf{\textsc{Metafont}} \def\MFB{\textsl{The \MF book}} +\def\MkIV{Mk\acro{IV}} \let\TB@@mp\mp \DeclareRobustCommand\mp{\ifmmode\TB@@mp\else MetaPost\fi} \DeclareTextSymbol{\textohm}{OT1}{'012} \DeclareTextSymbolDefault{\textohm}{OT1} \newcommand\OMEGA{\textohm} \DeclareRobustCommand{\OCP}{\OMEGA\acro{CP}} -\def\OOXML{\acro{OOXML}} +\DeclareRobustCommand{\OOXML}{\acro{OOXML}} +\DeclareRobustCommand{\OTF}{\acro{OTF}} \DeclareRobustCommand{\OTP}{\OMEGA\acro{TP}} \def\mtex{T\kern-.1667em\lower.424ex\hbox{\^E}\kern-.125emX\@} \DeclareRobustCommand\NTS{\ensuremath{\mathcal{N}\mkern-4mu @@ -187,10 +193,10 @@ \def\PCTeX{PC\thinspace\TeX} \def\pcTeX{\leavevmode\raise.5ex\hbox{p\kern-.3\p@ c}\TeX} \def\PDF{\acro{PDF}} -\def\PiC{P\kern-.12em\lower.5ex\hbox{I}\kern-.075emC\@} -\def\PiCTeX{\PiC\kern-.11em\TeX} \def\PGF{\acro{PGF}} \def\PHP{\acro{PHP}} +\def\PiC{P\kern-.12em\lower.5ex\hbox{I}\kern-.075emC\@} +\def\PiCTeX{\PiC\kern-.11em\TeX} \def\plain{\texttt{plain}} \def\PNG{\acro{PNG}} \def\POBox{P.\thinspace O.~Box } @@ -257,6 +263,8 @@ \def\XeTeX{\Xe\TeX} \def\XeLaTeX{\Xe{\,\LaTeX}} \def\XHTML{\acro{XHTML}} +\def\XSL{\acro{XSL}} +\def\XSLFO{\acro{XSL}\raise.08ex\hbox{-}\acro{FO}} \def\XSLT{\acro{XSLT}} \newlinechar=`\^^J \normallineskiplimit=\p@ @@ -403,7 +411,6 @@ \else th% nth \fi}% } -\def\r#1{\accent"17 #1} \def\Review{\@ifnextchar:{\@Review}{\@Review:}} \def\@Review:{\@ifnextchar[%] {\@Rev}% @@ -437,7 +444,7 @@ \setbox\TestBox=\hbox{\volno}% \ifdim \wd\TestBox > .2em \v@lx \fi } \vol 0, 0. -\issdate Thermidor, 2060. +\issdate Thermidor, 9999. \def\tubissue#1{\@ifnextchar(%) {\@tubissue@b{#1}} {\@tubissue@a{#1}}} diff --git a/Master/texmf-dist/tex/latex/tugboat/ltugproc.cls b/Master/texmf-dist/tex/latex/tugboat/ltugproc.cls index eda54cedd16..f670c4a25ef 100644 --- a/Master/texmf-dist/tex/latex/tugboat/ltugproc.cls +++ b/Master/texmf-dist/tex/latex/tugboat/ltugproc.cls @@ -32,7 +32,7 @@ %% \NeedsTeXFormat{LaTeX2e}[1994/12/01] \ProvidesClass {ltugproc} - [2009/09/29 v2.7 + [2010/11/15 v2.8 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 1a13c069384..5561329598c 100644 --- a/Master/texmf-dist/tex/latex/tugboat/ltugproc.sty +++ b/Master/texmf-dist/tex/latex/tugboat/ltugproc.sty @@ -31,7 +31,7 @@ %% extension .ins) which are part of the distribution. %% \ProvidesPackage{ltugproc} - [2009/09/29 v2.7 + [2010/11/15 v2.8 TUG compatibility package% ] \@obsoletefile{ltugproc.cls}{ltugproc.sty} -- cgit v1.2.3