diff options
Diffstat (limited to 'Master/texmf-dist')
| -rw-r--r-- | Master/texmf-dist/doc/latex/tugboat/README | 17 | ||||
| -rw-r--r-- | Master/texmf-dist/doc/latex/tugboat/ltubguid.ltx | 26 | ||||
| -rw-r--r-- | Master/texmf-dist/doc/latex/tugboat/ltubguid.pdf | bin | 313615 -> 314045 bytes | |||
| -rw-r--r-- | Master/texmf-dist/source/latex/tugboat/tugboat.dtx | 117 | ||||
| -rw-r--r-- | Master/texmf-dist/source/latex/tugboat/tugboat.ins | 2 | ||||
| -rw-r--r-- | Master/texmf-dist/tex/latex/tugboat/ltugboat.cls | 59 | ||||
| -rw-r--r-- | Master/texmf-dist/tex/latex/tugboat/ltugboat.sty | 2 | ||||
| -rw-r--r-- | Master/texmf-dist/tex/latex/tugboat/ltugcomn.sty | 12 | ||||
| -rw-r--r-- | Master/texmf-dist/tex/latex/tugboat/ltugproc.cls | 13 | ||||
| -rw-r--r-- | Master/texmf-dist/tex/latex/tugboat/ltugproc.sty | 2 |
10 files changed, 137 insertions, 113 deletions
diff --git a/Master/texmf-dist/doc/latex/tugboat/README b/Master/texmf-dist/doc/latex/tugboat/README index 240d5b47946..5c36819e5ea 100644 --- a/Master/texmf-dist/doc/latex/tugboat/README +++ b/Master/texmf-dist/doc/latex/tugboat/README @@ -1,4 +1,4 @@ -$Id: README 103 2012-09-28 22:55:44Z bnb $ +$Id: README 121 2013-08-02 18:44:59Z bnb $ Copyright 2006, 2009-2013 TeX Users Group. You may freely use, modify and/or distribute this file. @@ -13,20 +13,18 @@ The files in this directory generate the TUGboat article class ltugboat.cls, which should be used for all articles nowadays -- both proceedings and regular issues. -These macros are supported. +These macros are supported. Feel free to write to us. -Robin Fairbairns and the rest of the TUGboat staff, -tugboat@tug.org +The TUGboat staff <tugboat@tug.org> Installation and use: ===================== -Of course, normally you would get the tugboat packages through your -distribution. +Usually you can get the tugboat packages through your distribution. -But if you want to install it by hand from CTAN, this directory contains -three files containing TeX code: +But if you want to install it by hand from CTAN, its directory there +(see http://ctan.org/pkg/tugboat) has three files containing TeX code: tugboat.dtx -- the source for the macros tugboat.ins -- the docstrip instructions @@ -35,8 +33,7 @@ three files containing TeX code: but much updated since) other files are - ltugbib.bst -- a BibTeX style to match ltugboat.cls's default - biblio capabilities + ltugbib.bst -- a BibTeX style for ltugboat.cls's Harvard-cite capabilities ltubguid.pdf -- browsable user documentation tugboat.pdf -- browsable implementation documentation diff --git a/Master/texmf-dist/doc/latex/tugboat/ltubguid.ltx b/Master/texmf-dist/doc/latex/tugboat/ltubguid.ltx index 3620b65eb26..882ba3a0d24 100644 --- a/Master/texmf-dist/doc/latex/tugboat/ltubguid.ltx +++ b/Master/texmf-dist/doc/latex/tugboat/ltubguid.ltx @@ -1,4 +1,4 @@ -% $Id: ltubguid.ltx 66 2010-11-23 16:33:37Z karl $ +% $Id: ltubguid.ltx 121 2013-08-02 18:44:59Z bnb $ % ltubguid.ltx - documentation for ltugboat classes. % % Copyright 1994,1995,1996,2001,2005,2006,2010,2013 TeX Users Group. @@ -266,8 +266,8 @@ authors. The macros represent a development of the earlier \clsname{ltugboat} and \clsname{ltugproc} styles that were written for use with \LaTeX~2.09; major contributors have been Robin Fairbairns, Sebastian Rahtz, Michel Goossens, Nico Poppelier and Johannes Braams. -Many others have been involved, including Barbara Beeton, Mimi Burbank -and the \LaTeX3 team. +Many others have been involved, including Barbara Beeton, Karl Berry, +Mimi Burbank, and the \LaTeX3 team. \section{Availability} @@ -278,13 +278,15 @@ the back issues, and more. The macros are released for general use, and are distributed via \CTAN{} (directory \CTANref{tub-latex}) in the usual \LaTeX{} way as files \path|tugboat.dtx| and \path|tugboat.ins|. When the\,\verb|.ins| file -is processed by \LaTeX{}, the files \path|ltugboat.cls|, -\path|ltugproc.cls| and \path|ltugbib.bst| (for ordinary production -work) and \path|ltugcomn.sty| (a cooking pot of useful macros, for -documentation, etc.)\ are produced. The\,\verb|.dtx| file may itself be -processed by \LaTeX{} to produce a formatted (somewhat `literate') -source listing for those who would like more detailed descriptions of -the \TUB\ macros. +is processed by \LaTeX{}, the files \path|ltugboat.cls| and +\path|ltugbib.bst| (for use with articles) and \path|ltugcomn.sty| (a +cooking pot of perhaps-useful macros, for documentation, etc.)\ are +produced. (\path|ltugproc.cls| is also produced for compatibility, but +no longer used for proceedings or anything else.) + +The\,\verb|.dtx| file may itself be processed by \LaTeX{} to +produce a formatted (somewhat `literate') source listing for those who +would like more detailed descriptions of the \TUB\ macros. \section{The general structure of a paper} @@ -448,7 +450,9 @@ In both cases, the subsections are numbered as normal (i.e., as The title and author(s) of a paper are quoted using commands that are familiar (in syntax, at least) to most \LaTeX{} users; the \cs{title} -command is exactly that used in the standard \LaTeX{} classes. +command is exactly that used in the standard \LaTeX{} classes. There is +also \cs{shortTitle\char`{\meta{your-short-title}\char`}} to define the form +used in running heads or footers; similarly \cs{shortAuthor}. The \cs{author} command is used once for each co-author of the paper, and for each \cs{author} there should be a \cs{address} command that diff --git a/Master/texmf-dist/doc/latex/tugboat/ltubguid.pdf b/Master/texmf-dist/doc/latex/tugboat/ltubguid.pdf Binary files differindex 5df1217bd19..517b306ff4d 100644 --- a/Master/texmf-dist/doc/latex/tugboat/ltubguid.pdf +++ b/Master/texmf-dist/doc/latex/tugboat/ltubguid.pdf 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 diff --git a/Master/texmf-dist/tex/latex/tugboat/ltugboat.cls b/Master/texmf-dist/tex/latex/tugboat/ltugboat.cls index 5356761227a..f27f24cfc52 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} - [2013/01/31 v2.12 + [2013/08/02 v2.13 TUGboat journal class% ] \csname tugstyloaded@\endcsname @@ -69,8 +69,6 @@ \DeclareOption{12pt}{\csname ds@11pt\endcsname} \DeclareOption{oneside}{\TBWarning{Option \CurrentOption\space ignored}} \DeclareOption{twoside}{\ds@oneside} -\DeclareOption{onecolumn}{\ds@oneside} -\DeclareOption{twocolumn}{\ds@oneside} \DeclareOption{tugproc}{% \TBWarning{Option \CurrentOption\space ignored: use class ltugproc instead of \@tugclass}% @@ -84,6 +82,8 @@ \DeclareOption{runningoff}{\AtEndOfClass{\@tubrunningoff}} \DeclareOption{runningminimal}{\AtEndOfClass{\@tubrunningminimal}} \DeclareOption{runningfull}{\AtEndOfClass{\@tubrunningfull}} +\newif\if@tubtwocolumn \@tubtwocolumntrue +\DeclareOption{onecolumn}{\@tubtwocolumnfalse} \DeclareOption*{\PassOptionsToClass{\CurrentOption}{article}} \ExecuteOptions{draft,extralabel,numbersec,rawcite,runningminimal} \ProcessOptions @@ -179,11 +179,11 @@ \def\BSD{\acro{BSD}} \def\CandT{\textsl{Computers \& Typesetting}} \def\CD{\acro{CD}} -\def\CJK{\acro{CJK}} \def\ConTeXt{C\kern-.0333emon\-\kern-.0667em\TeX\kern-.0333emt} \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}} @@ -322,11 +322,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}} \def\XHTML{\acro{XHTML}} @@ -636,8 +638,8 @@ \topsep=3\p@\@plus\p@\@minus\p@ \parsep=3\p@\@plus\p@\@minus\p@ \itemsep=\parsep -\twocolumn -\newdimen\pagewd \pagewd=39pc +\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 @@ -971,20 +973,29 @@ \newenvironment{dedication}% {\raggedright\noindent\itshape\ignorespaces}% {\endgraf\medskip} +\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} @@ -1131,16 +1142,18 @@ \let\@currentlabelname\@empty \DeclareRobustCommand\nameref[1]{\expandafter\@setref \csname r@nr@#1\endcsname\@secondoftwo{#1}} -\newdimen\tubfullpageindent \tubfullpageindent=4.875pc +\newdimen\@tubfullpageindent +\@tubfullpageindent = \if@tubtwocolumn 4.875pc \else 3.875pc \fi +\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}% @@ -1151,8 +1164,8 @@ \fi \vskip\belowcaptionskip} \def\tubmakecaptionbox#1#2{#1: #2}% allow overriding for a paper -\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}} \setlength\abovecaptionskip{6pt plus1pt minus1pt} \renewcommand\normalsize{% \@setfontsize\normalsize\@xpt\@xiipt diff --git a/Master/texmf-dist/tex/latex/tugboat/ltugboat.sty b/Master/texmf-dist/tex/latex/tugboat/ltugboat.sty index 0c88ebabdf4..5f763dce83a 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} - [2013/01/31 v2.12 + [2013/08/02 v2.13 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 811a6f79164..866c41af55f 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} - [2013/01/31 v2.12 + [2013/08/02 v2.13 TUGboat `common macros' package% ] \IfFileExists{mflogo.sty}% @@ -120,11 +120,11 @@ \def\BSD{\acro{BSD}} \def\CandT{\textsl{Computers \& Typesetting}} \def\CD{\acro{CD}} -\def\CJK{\acro{CJK}} \def\ConTeXt{C\kern-.0333emon\-\kern-.0667em\TeX\kern-.0333emt} \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}} @@ -263,11 +263,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}} \def\XHTML{\acro{XHTML}} diff --git a/Master/texmf-dist/tex/latex/tugboat/ltugproc.cls b/Master/texmf-dist/tex/latex/tugboat/ltugproc.cls index 2c4a33e7e69..f56c4603e2f 100644 --- a/Master/texmf-dist/tex/latex/tugboat/ltugproc.cls +++ b/Master/texmf-dist/tex/latex/tugboat/ltugproc.cls @@ -32,12 +32,10 @@ %% \NeedsTeXFormat{LaTeX2e}[1994/12/01] \ProvidesClass {ltugproc} - [2013/01/31 v2.12 + [2013/08/02 v2.13 TUG conference proceedings class% ] \def\@tugclass{ltugproc} -\newif\if@proctw@column \@proctw@columntrue -\DeclareOption{onecolumn}{\@proctw@columnfalse} \newif\if@proc@sober \newif\if@proc@numerable \DeclareOption{tug95}{% @@ -118,7 +116,7 @@ \ifTB@title \setcounter{footnote}{0}% \renewcommand\thefootnote{\@fnsymbol\c@footnote}% - \if@proctw@column + \if@tubtwocolumn \twocolumn[\@maketitle]% \else \onecolumn @@ -169,11 +167,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 diff --git a/Master/texmf-dist/tex/latex/tugboat/ltugproc.sty b/Master/texmf-dist/tex/latex/tugboat/ltugproc.sty index c27cbc8a2a7..19a0e29614e 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} - [2013/01/31 v2.12 + [2013/08/02 v2.13 TUG compatibility package% ] \@obsoletefile{ltugproc.cls}{ltugproc.sty} |