tugboat (3aug13)

git-svn-id: svn://tug.org/texlive/trunk@31339 c570f23f-e606-0410-a88d-b1316a301751

5 files changed, 50 insertions, 38 deletions

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}