tugboat update

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

21 files changed, 985 insertions, 707 deletions

diff --git a/Master/texmf-dist/bibtex/bib/tugboat/tubguide.bib b/Master/texmf-dist/bibtex/bib/tugboat/tubguide.bib
deleted file mode 100644
index 4484db72f77..00000000000
--- a/Master/texmf-dist/bibtex/bib/tugboat/tubguide.bib
+++ /dev/null
@@ -1,106 +0,0 @@
-%% LaTeX2e file `tubguide.bib'
-%% generated by the `filecontents' environment
-%% from source `ltubguid' on 2004/07/10.
-%%
-% BibTeX bibliography file (generated by aux2bib)
-
-@Misc{Arseneau:url:1996,
-  author = {Donald Arseneau},
-  title = {The {\textsf{url}} package},
-  year = {1996},
-  howpublished = {Available from {\CTAN}, {\CTANref{url}}}
-}
-
-@Article{Baxter:TB15-3-331,
-  author = {William Erik Baxter},
-  title = {{{An object-oriented programming system in {\TeX}}}},
-  journal = {{\TUB}},
-  year = {1994},
-  month = {September},
-  volume = {15},
-  number = {3},
-  pages = {331--338}
-}
-
-@Misc{Duggan:moreverb:1996,
-  author = {Angus Duggan and Rainer Sch{\umlaut{o}}pf and Victor Eijkhout and
-    Robin Fairbairns},
-  title = {The {\textsf{moreverb}} package},
-  year = {1997},
-  howpublished = {Available from {\CTAN}, {\CTANref{moreverb}}}
-}
-
-@Misc{Rahtz:hyperref:1997,
-  author = {Sebastian Rahtz},
-  title = {The {\textsf{hyperref}} system},
-  year = 1997,
-  howpublished = {Available from {\CTAN}, {\CTANref{hyperref}}}
-}
-
-@Book{Lamport:1994,
-  author = {Leslie Lamport},
-  title = {{\LaTeX}, a Document Preparation System},
-  edition = {\nth{2}},
-  year = {1994},
-  publisher = {Addison-Wesley}
-}
-
-@Article{Ogawa:TB15-3-325,
-  author = {Arthur Ogawa},
-  title = {{{Object-oriented programming, descriptive markup, and {\TeX}}}},
-  journal = {{\TUB}},
-  year = {1994},
-  month = {September},
-  volume = {15},
-  number = {3},
-  pages = {325--330}
-}
-
-@Article{Rowley:TB15-1-63,
-  author = {Chris Rowley},
-  title = {{{{\LaTeXe} update, dateline: 31 January 1994}}},
-  journal = {{\TUB}},
-  year = {1994},
-  month = {March},
-  volume = {15},
-  number = {1},
-  pages = {63}
-}
-
-@Misc{Schoepf:verbatim:1996,
-  author = {Rainer Sch{\umlaut{o}}pf},
-  title = {The {\textsf{verbatim}} package},
-  year = {1996},
-  month = {June},
-  howpublished = {Part of the \textsf{tools} bundle, available from {\CTAN},
-  {\CTANref{tools}}}
-}
-
-@Article{Swift:TB16-3-269,
-  author = {Matt Swift},
-  title = {Modularity in {\LaTeX}},
-  journal = {{\TUB}},
-  year = {1995},
-  volume = {16},
-  number = {3},
-  pages = {269--275}
-}
-
-@Misc{Vieth:mflogo:1995,
-  author = {Ulrik Vieth},
-  title = {The {\textsf{mflogo}} package},
-  year = {1995},
-  howpublished = {Available from {\CTAN}, {\CTANref{mflogo}}}
-}
-
-@Article{Whitney:TB10-3-378,
-  author = {Ron Whitney and Barbara Beeton},
-  title = {{{{\TUB} authors' guide}}},
-  journal = {{\TUB}},
-  year = {1989},
-  month = {November},
-  volume = {10},
-  number = {3},
-  pages = {378--385}
-}
-
diff --git a/Master/texmf-dist/bibtex/bst/tugboat/ltugbib.bst b/Master/texmf-dist/bibtex/bst/tugboat/ltugbib.bst
index aefa8132e93..7c62871ae2f 100644
--- a/Master/texmf-dist/bibtex/bst/tugboat/ltugbib.bst
+++ b/Master/texmf-dist/bibtex/bst/tugboat/ltugbib.bst
@@ -2,10 +2,27 @@
 %% to the ltug* LaTeX classes.
 %%
 %% \iffalse (this is a meta-comment (so they say))
-%% Copyright (C) 1995,1996,1997,1998,2000,2004 TeX Users Group.
-%% Copying of this file is authorized only if either:
-%%  (1) you make absolutely no changes to your copy, OR
-%%  (2) if you do make changes, you first rename it to some other name.
+%% Copyright (C) 1995,1996,1997,1998,2000,2004,2006 TeX Users Group.
+%% 
+%% It may be distributed and/or modified under the
+%% conditions of the LaTeX Project Public License, either version 1.3
+%% of this license or (at your option) any later version.
+%% The latest version of this license is in
+%%    http://www.latex-project.org/lppl.txt
+%% and version 1.3 or later is part of all distributions of LaTeX
+%% version 2003/12/01 or later.
+%% 
+%% This file has the LPPL maintenance status "maintained".
+%% 
+%% The Current Maintainer of this work is the TeX Users Group
+%% (http://tug.org/TUGboat).
+%% 
+%% The list of all files belonging to this package is given in the file
+%% `manifest.txt'.
+%% 
+%% The list of derived (unpacked) files belonging to the distribution
+%% and covered by LPPL is defined by the unpacking scripts (with
+%% extension .ins) which are part of the distribution.
 %% \fi
 %%
 %% 7-Jun-04: (all related code marked OP) handle a title ending in, e.g., a
diff --git a/Master/texmf-dist/doc/latex/tugboat/README b/Master/texmf-dist/doc/latex/tugboat/README
index 2726ccb6e12..736c57e3574 100644
--- a/Master/texmf-dist/doc/latex/tugboat/README
+++ b/Master/texmf-dist/doc/latex/tugboat/README
@@ -10,9 +10,15 @@ editor, if you're preparing an article for submission to a TUG
 conference).  Bother me, instead (the editors do, in any case, so you
 might as well short-circuit them ;-)
 
+See the TUGboat web pages at http://tug.org/TUGboat for back issues,
+guidelines for authors, etc.  We greatly appreciate new article
+submissions!
+
+
 Robin Fairbairns
 robin.fairbairns@cl.cam.ac.uk
 
+
 Installation and use:
 =====================
 
diff --git a/Master/texmf-dist/doc/latex/tugboat/ltubguid.ltx b/Master/texmf-dist/doc/latex/tugboat/ltubguid.ltx
index afc85ad0165..8155296a13e 100644
--- a/Master/texmf-dist/doc/latex/tugboat/ltubguid.ltx
+++ b/Master/texmf-dist/doc/latex/tugboat/ltubguid.ltx
@@ -1,3 +1,29 @@
+% ltubguid.ltx - documentation for ltugboat classes.
+% 
+%% Copyright 1994,1995,1996,2001,2005,2006 TeX Users Group.
+%% 
+%% This file is part of the tugboat package.
+%% 
+%% This work may be distributed and/or modified under the
+%% conditions of the LaTeX Project Public License, either version 1.3
+%% of this license or (at your option) any later version.
+%% The latest version of this license is in
+%%   http://www.latex-project.org/lppl.txt
+%% and version 1.3 or later is part of all distributions of LaTeX
+%% version 2003/12/01 or later.
+%%
+%% This work has the LPPL maintenance status "maintained".
+%% 
+%% The Current Maintainer of this work is the TeX Users Group
+%% (http://tug.org/TUGboat).
+%%
+%% The list of all files belonging to the distribution is
+%% given in the file `manifest.txt'. 
+%%
+%% The list of derived (unpacked) files belonging to the distribution 
+%% and covered by LPPL is defined by the unpacking scripts (with 
+%% extension .ins) which are part of the distribution.
+
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %
 %  tubguide.bib -- the bibliography for this paper (apart from the
@@ -148,7 +174,7 @@
 %
 \listfiles
 \setcounter{errorcontextlines}{999}
-\documentclass[harvardcite]{ltugboat}
+\documentclass[harvardcite,final]{ltugboat}
 \usepackage{ctandir}
 \IfFileExists{booktabs.sty}%
   {\usepackage{booktabs}}%
@@ -157,9 +183,6 @@
 % only tell me important overfulls, please
 \hfuzz=2pt
 %
-% ahem, why not?
-\hyphenation{col-umns}
-%
 % define CTAN addresses using the commands of the |ctandir| package
 \CTANdirectory{bibextract}{biblio/bibtex/utils/bibextract}
 \CTANdirectory{mflogo}{macros/latex/contrib/mflogo}
@@ -232,7 +255,7 @@
 \begin{document}
 %%%%%%%%%%%%%%%%
 %
-\title{The New (\LaTeXe) \TUB{} Macros}
+\title{The \LaTeXe\ \TUB{} Macros}
 \author{Robin Fairbairns}
 \address{University of Cambridge Computer Laboratory\\
   William Gates Building\\
@@ -278,6 +301,11 @@ within \LaTeX.}
   present note.
 \end{sloppypar}
 
+The \TUB\ web site is at \url{http://tug.org/TUGboat}.  It contains much
+information for authors and reviewers, all the back issues, and plenty
+more.  In particular, sample documents for both regular articles and
+proceedings articles are available from \url{http://tug.org/TUGboat}.
+
 \section{The general structure of a paper}
 
 The author need not understand the details of the production of
@@ -317,13 +345,11 @@ one/two-side and one/two-column options).
 \begin{optlist}
 \item[draft] Set up for a draft copy of a paper (this is the default
   setting\Dash the author need not explicitly set it): page numbering
-  to start at 1001, black marks for overfull boxes, and no
-  registration marks.
+  to start at 1001, black marks for overfull boxes.
 \item[extralabel] Use the extra label-distinguishing mark in the body
   of the reference; see section~\ref{sec:biblio}.
 \item[final] Set up for the final copy of a paper: page numbering to
-  come from elsewhere, no black marks, and registration marks to be
-  used.
+  come from elsewhere, no black marks.
 \item[harvardcite] Specify Harvard-style citation; see
   section~\ref{sec:biblio}.
 \item[noextralabel] Don't use the extra label-distinguishing mark in
@@ -345,7 +371,7 @@ one/two-side and one/two-column options).
 The \clsname{ltugproc} class accepts all of the options allowed with
 \clsname{ltugboat}.  In addition, it accepts an option that specifies
 the year of the conference for which the paper is submitted.  For
-example, the conference for 2004 would be specified by option
+example, the conference for \number\year\ would be specified by option
 %
 %% % although this paper will be published in 1996, it may be reprinted
 %% % again in the future, so let's calculate `this year' on the fly
@@ -470,7 +496,7 @@ the main body of the paper.  Therefore, for proceedings articles, the
 \subsection{Appendices}
 
 A paper may have appendices, which are expressed in exactly the same
-way as they would be in \LaTeX{} article class:
+way as they would be in the \LaTeX{} article class:
 
 \begin{verbatim}[\small]
 \appendix
@@ -590,7 +616,7 @@ between the \cs{maketitle} and (possibly) \cs{makesignature} commands.
   are under the general (sub-)\penalty0\relax\hskip0pt plus0pt minus0pt\relax
   editorship of the author\footnote{Or authors: there's no reason in
     particular that compilation articles should not be put together
-    more than one person} of the article.  The author of the article
+    by more than one person.} of the article.  The author of the article
   is presented (using \cs{author} and suchlike commands) in the usual
   way, and writes the introductory text.  Each contributors' part then
   follows.  The contributor's name is quoted in the \cs{contributor}
@@ -715,42 +741,50 @@ set of the macros.
 
 The classes provide macros that produce `correct' representations of a
 large number of acronyms and logos; a small representative selection is
-shown in figure~\ref{fig:acro-logo}.
+shown in figure~\ref{fig:acro-logo}.  The sample documents at
+\url{http://tug.org/TUGboat/location.html} have a more complete list,
+and of course the class sources are the ultimate reference.
 \begin{figure}[htbp!]
   \begin{center}
     \begin{tabular}{@{}ll@{}}
       \small\textsl{\textsf{Macro}}&\small\textsl{\textsf{Output}}\\
       \midrule
+      \verb|\ConTeXt|   & \ConTeXt \\
+      \verb|\Cplusplus| & \Cplusplus \\
       \verb|\CTAN|   & \CTAN \\
       \verb|\eTex|   & \eTeX \\
+      \verb|\FAQ|    & \FAQ \\
       \verb|\HTML|   & \HTML \\
       \verb|\ISBN|   & \ISBN \\
       \verb|\ISSN|   & \ISSN \\
+      \verb|\MacOSX| & \MacOSX \\
+      \verb|\MathML| & \MathML \\
       \verb|\MF|     & \MF \\
       \verb|\MP|     & \MP \\
       \verb|\NTS|    & \NTS \\
       \verb|\OMEGA|  & \OMEGA \\
       \verb|\OTP|    & \OTP \\
+      \verb|\PDF|    & \PDF \\
       \verb|\SGML|   & \SGML \\
       \verb|\TUB|    & \TUB \\
       \verb|\TUG|    & \TUG \\
       \verb|\tug|    & \tug \\
+      \verb|\XML|    & \XML \\
     \end{tabular}
   \end{center}
-  \caption{Some of the classes' acronyms and logos}
+  \caption{A few of the classes' acronyms and logos}
   \label{fig:acro-logo}
 \end{figure}
 
-Authors are urged to note the \cs{acro} command, which is defined in
-the classes.  The visual appearance of (mostly) lower-case English
-text, with interpolated acronyms in the same point size, is generally
-unpleasing.  Therefore, the \cs{acro} command typesets its argument
-slightly smaller than it would otherwise appear: compare `\acro{URL}'
-(\verb|\acro{URL}|, as used above) with `URL'\@.  Many macros that
-simply generate calls to \cs{acro} are defined by the classes; two
-examples, \cs{CTAN} and \cs{tug} of the list in
-figure~\ref{fig:acro-logo} have already been used in the present
-paper.
+Authors are especially urged to note the \cs{acro} command, which is
+defined in the classes.  The visual appearance of (mostly) lower-case
+English text, with interpolated acronyms in the same point size, is
+generally unpleasing.  Therefore, the \cs{acro} command typesets its
+argument slightly smaller than it would otherwise appear: compare
+`\acro{URL}' (\verb|\acro{URL}|, as used above) with `URL'\@.  Many
+macros that simply generate calls to \cs{acro} are defined by the
+classes; two examples, \cs{CTAN} and \cs{tug} of the list in
+figure~\ref{fig:acro-logo} have already been used in the present paper.
 
 \subsection{Other special typesetting}
 
diff --git a/Master/texmf-dist/doc/latex/tugboat/ltubguid.pdf b/Master/texmf-dist/doc/latex/tugboat/ltubguid.pdf
index 5211b28f836..ac781e3fc5c 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/doc/latex/tugboat/manifest.txt b/Master/texmf-dist/doc/latex/tugboat/manifest.txt
new file mode 100644
index 00000000000..b7076020e57
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/tugboat/manifest.txt
@@ -0,0 +1,8 @@
+List of files in the tugboat LaTeX package.
+README
+ltubguid.ltx
+ltubguid.pdf
+ltugbib.bst
+tugboat.dtx
+tugboat.pdf
+tugboat.ins
diff --git a/Master/texmf-dist/doc/latex/tugboat/tugboat.pdf b/Master/texmf-dist/doc/latex/tugboat/tugboat.pdf
index 4d327cd84c1..9db6e63ea25 100644
--- a/Master/texmf-dist/doc/latex/tugboat/tugboat.pdf
+++ b/Master/texmf-dist/doc/latex/tugboat/tugboat.pdf
diff --git a/Master/texmf-dist/doc/plain/tugboat/README b/Master/texmf-dist/doc/plain/tugboat/README
new file mode 100644
index 00000000000..996049fd4fe
--- /dev/null
+++ b/Master/texmf-dist/doc/plain/tugboat/README
@@ -0,0 +1,4 @@
+(This file in the public domain.)
+
+The plain style files for TUGboat, the journal of the TeX Users Group.
+See http://tug.org/TUGboat for back issues, author information, and more.
diff --git a/Master/texmf-dist/doc/plain/tugboat/tubguide.pdf b/Master/texmf-dist/doc/plain/tugboat/tubguide.pdf
index 19e97d6f1f0..5e00b9eea76 100644
--- a/Master/texmf-dist/doc/plain/tugboat/tubguide.pdf
+++ b/Master/texmf-dist/doc/plain/tugboat/tubguide.pdf
diff --git a/Master/texmf-dist/doc/plain/tugboat/tubguide.tex b/Master/texmf-dist/doc/plain/tugboat/tubguide.tex
index ef930b2ebaa..56a18c8602b 100644
--- a/Master/texmf-dist/doc/plain/tugboat/tubguide.tex
+++ b/Master/texmf-dist/doc/plain/tugboat/tubguide.tex
@@ -1,27 +1,36 @@
 %% @texfile{
-%%     filename="tubguide.sty",
-%%     version="1.02",
-%%     date="9-Mar-1992",
-%%     filetype="TUGboat Authors' Guide",
-%%     copyright="Copyright (C) TeX Users Group.
-%%            Copying of this file is authorized only if either:
-%%            (1) you make absolutely no changes to your copy, OR
-%%            (2) if you do make changes, you first rename it to some
-%%                other name.",
-%%     author="TeX Users Group",
-%%     address="TeX Users Group",
-%%            P. O. Box 9506,
-%%            Providence, RI 02940,
-%%            USA",
-%%     telephone="401-751-7760",
-%%     email="Internet: TUGboat@Math.AMS.com",
-%%     codetable="ISO/ASCII",
-%%     checksumtype="line count",
-%%     checksum="844",
-%%     keywords="tex users group, tugboat, authors' guide",
-%%     abstract="This file is an updated version of the file
-%%            that produced the original Authors' Guide in
-%%            TUGboat 10, no. 3, November 1989."
+%%     filename   = "tubguide.tex",
+%%     version    = "1.03",
+%%     date       = "2006/05/24",
+%%     time       = "09:48:56 EDT",
+%%     checksum   = "12752 869 4993 34296",
+%%     filetype   = "TUGboat Authors' Guide",
+%%     copyright  = "Copyright 1989, 1992, 2006 TeX Users Group.
+%%                   Unlimited copying and redistribution of this file
+%%                   are permitted as long as this file is not
+%%                   modified.  Modifications (and redistribution of
+%%                   modified versions) are also permitted, but only if
+%%                   the resulting file is renamed."
+%%     author     = "TeX Users Group",
+%%     address    = "TeX Users Group,
+%%                   P.O.Box 2311,
+%%                   Portland, OR 97208-2311,
+%%                   USA",
+%%     telephone  = "+1 503 223-9994",
+%%     FAX        = "+1 206 203-3960",
+%%     email      = "TUGboat@tug.org",
+%%     codetable  = "ISO/ASCII",
+%%     keywords   = "tex users group, tugboat, authors' guide",
+%%     supported  = "yes",
+%%     abstract   = "This file is an updated version of the file
+%%                   that produced the original Authors' Guide in
+%%                   TUGboat 10, no. 3, November 1989.",
+%%     docstring  = "The checksum field above contains a CRC-16
+%%                   checksum as the first value, followed by the
+%%                   equivalent of the standard UNIX wc (word
+%%                   count) utility output of lines, words, and
+%%                   characters.  This is produced by Robert
+%%                   Solovay's checksum utility.",
 %%     }
 %% *********************************************************
 %%
@@ -39,23 +48,27 @@
 
 % ****************************************************************
 
+\pageno=1
+\def\rtitlex{\def\tubfont{\tenpoint\rm}\TUB{} Authors' Guide, May 2006}
+\def\midrtitle{}
+
 \title *\TUB\/ Authors' Guide*
 
 \author * Ron Whitney *
 \address * \TUG\\
 	   \POBox 9506\\
 	   Providence, RI 02940-9506 *
-\netaddress * TUGboat@Math.AMS.com *
+%\netaddress * TUGboat@Math.AMS.com *
 
 \author  * Barbara Beeton *
 \address * American Mathematical Society\\
-	   \POBox 6248\\
-	   Providence, RI 02940-6248 *
-\netaddress * TUGboat@Math.AMS.com *
+	   201 Charles Street\\
+	   Providence, RI 02904-2294 *
+\netaddress * TUGboat@tug.org *
 
 
-\vfootnote{}{Revised March 1992; the original appeared in \tubissue 10(3),
-November 1989.}
+\vfootnote{}{Revised March 1992, May 2006; the original appeared in
+\tubissue 10(3), November 1989.}
 
 \article
 
@@ -79,7 +92,7 @@ make comment on various aspects of the \TUB\/ package, first for the
 \plain-based macros, then for \LaTeX.  The macro sets share
 the file |tugboat.cmn|,\footnote{$^1$}{This file used to be named
 {\tt tugboat.com}, but that notation was in conflict with conventions
-of MS-DOS and other operating systems; no conflicts are known to
+of \acro{MS-DOS} and other operating systems; no conflicts are known to
 exist for the new name.} and users of either style should read the
 section entitled ``Common Abbreviations and Utilities''.  We conclude
 with some general suggestions to help make the lives of those on the
@@ -212,7 +225,11 @@ of
 \theaddress {<author number>}
 \thenetaddress {<author number>}
 ||
-to get the desired result.  For example, for an article with
+to get the desired result.  For example, for an article with%
+\footnote{$^2$}{\xEdNote The \TUB{} address shown in examples
+was current when this article first appeared, but is now obsolete;
+it has been left intact to avoid other problems.  The correct address
+is now {\tt TUGboat@tug.org}.}
 \verbatim[\outputtofile{ray.vbm}]
 \author * Ray Goucher *
 \address * \TUG *
@@ -262,7 +279,7 @@ assemble streams of articles in \TUB.
 \subhead * Section Heads *
 Heads of sections, subsections, etc.\ are introduced with |\head|,
 |\subhead|, etc., respectively.  The underlying macros all use
-|\head|, so |\endhead| is the long-form ending for all these tags. 
+|\head|, so |\endhead| is the long-form ending for all these tags.
 For example, the first two heads of this article could have been
 keyed as
 ||
@@ -467,13 +484,13 @@ escape character in that block.  Thus,
 ||
 really calls the italic font in the middle of the listing (one might
 also want to use |\makebgroup| and |\makeegroup| in the options to define
-characters to localize this call; see p.~384).  Situations
+characters to localize this call; see p.~7).  Situations
 will dictate preferences for what character may be used as an escape
 (we use the \verbinline|\endverbatim, |!|, and |/| in this article).
 There is also a means of changing the setup of every occurrence of
 verbatim mode.  The contents of token register |\everyverbatim|
 is scanned after the defaults of verbatim mode
-have been set.  In this article, for example, we have made 
+have been set.  In this article, for example, we have made
 |[\makeother\<]<| active and defined it in such a way that
 |[\makeother\<]<...>| typesets as metacode.  Since |\verbatim|
 ordinarily changes |[\makeother\<]<| to type `other' on startup, we key
@@ -543,7 +560,7 @@ top-insertions, but the options |[\lastoption][\mid]| and
 bottom-insertions, respectively.  Here we recommend that the
 long-form terminator be used ({\it not\/} the |*...*| form).  One can
 think of the information ``passed'' as being ``long'' in the sense of
-possibly containing paragraphs, this being a mnemonic device only. 
+possibly containing paragraphs, this being a mnemonic device only.
 The primary reason for the recommendation is that one is (in some
 sense, maybe) more likely to encounter a rogue |*| in longer text
 than in shorter text and hence more likely to encounter a surprising
@@ -552,7 +569,7 @@ result due to a macro stopping short at the wrong |*|.
 \subtext
 Perhaps here is a natural place to mention also that these macros
 sometimes read their arguments and then act, and sometimes act on the
-fly, not actually storing an argument as a string of tokens at all. 
+fly, not actually storing an argument as a string of tokens at all.
 |\title|, for example, is in the former category, while |\figure| is
 in the latter.  Reasons may vary for the choice in
 methods.  Storing a string of tokens as an argument does not allow
@@ -649,12 +666,15 @@ listed under tags.
 ||
 and, of course, \verbinline|\endverbatim and \verbinline||\endverbatim.
 
-\head * The \LaTeX\ macros: {\tt ltugboat.sty} *
+\head * The \LaTeX\ macros: {\tt ltugboat.sty}%
+\footnote{$^3$}{This discussion of {\tt ltugboat.sty} is now of
+historical interest only; it has been superseded by a \LaTeXe{}
+documentclass, {\tt ltugboat.cls}, available from \CTAN.} *
 
 |ltugboat.sty| is the primary macro file, and is based on the \LaTeX{}
 |article.sty|.  |tugboat.cmn|, a collection of items common to both
 \LaTeX\ and \plain\ input, is also required.  Articles will have
-the form:\footnote{$^2$}{{\tt ltugboat} used to be a substyle; it now
+the form:\footnote{$^4$}{{\tt ltugboat} used to be a substyle; it now
 stands on its own, by automatically inputting {\tt article.sty}.}
 \verbatim[\makeescape\|]
 \documentstyle{ltugboat}
@@ -703,6 +723,11 @@ and |\BibTeX| are contained in |tugboat.cmn|.  Please use these whenever
 possible rather than creating your own.  We will add to the list as
 necessary.
 
+A nicety for the sake of appearance is the command |\acro|, which
+sets an acronym in caps one size smaller than the surrounding text.
+Compare CTAN (full size), \CTAN{} (|\acro{CTAN}|) and {\smc ctan}
+(small caps).  Acronyms in |tugboat.cmn| use |\acro| consistently.
+
 Several other constructions that we have found useful for both
 \plain- and \LaTeX-style input have been incorporated in
 |tugboat.cmn|.  Various |\*lap|\,s (|\ulap|, |\dlap|, |\xlap|,
@@ -828,11 +853,11 @@ appreciated.
 
 In addition to |tugboat.sty|, |ltugboat.sty|, and |tugboat.cmn|,
 a copy of this article, |tubguide.tex|, will be available at
-most \TeX{} archives, including those at SHSU, Aston, and Stuttgart.
+most \TeX{} archives, in particular \CTAN.
 
 Please address all electronic correspondence to the \TUB{} maildrop:
-||TUGboat@Math.AMS.com||
-Mail to either of our personal addresses is liable to go unseen if
+||TUGboat@tug.org||
+Mail to personal addresses is liable to go unseen if
 vacation or illness intervenes.  We also request that you supply
 an abstract of any expository article.  This will be used as the
 basis for translation of abstracts to languages other than that
diff --git a/Master/texmf-dist/source/latex/tugboat/tugboat.dtx b/Master/texmf-dist/source/latex/tugboat/tugboat.dtx
index a0d6f5540ba..e5fa41ababe 100644
--- a/Master/texmf-dist/source/latex/tugboat/tugboat.dtx
+++ b/Master/texmf-dist/source/latex/tugboat/tugboat.dtx
@@ -1,11 +1,31 @@
 %^^A This (the production version of the macros) started life as xpt3
 %^^A and no need has arisen to perform other experiments...
-%
+% tugboat.dtx - main source for LaTeX TUGboat classes.
+% 
 % \iffalse (this is a meta-comment (so they say))
-% Copyright (C) 1995,1996,1997,1998,2000,2004 TeX Users Group.
-% Copying of this file is authorized only if either:
-%  (1) you make absolutely no changes to your copy, OR
-%  (2) if you do make changes, you first rename it to some other name.
+%% Copyright 1994,1995,1996,2001,2005,2006 TeX Users Group.
+%% 
+%% This file is part of the tugboat package.
+%% 
+%% This work may be distributed and/or modified under the
+%% conditions of the LaTeX Project Public License, either version 1.3
+%% of this license or (at your option) any later version.
+%% The latest version of this license is in
+%%   http://www.latex-project.org/lppl.txt
+%% and version 1.3 or later is part of all distributions of LaTeX
+%% version 2003/12/01 or later.
+%%
+%% This work has the LPPL maintenance status "maintained".
+%% 
+%% The Current Maintainer of this work is the TeX Users Group
+%% (http://tug.org/TUGboat).
+%%
+%% The list of all files belonging to the distribution is
+%% given in the file `manifest.txt'. 
+%%
+%% The list of derived (unpacked) files belonging to the distribution 
+%% and covered by LPPL is defined by the unpacking scripts (with 
+%% extension .ins) which are part of the distribution.
 % \fi
 %
 % \section{Document preambles}
@@ -20,7 +40,7 @@
 %<ltugboatsty>\ProvidesPackage{ltugboat}
 %<ltugprocsty>\ProvidesPackage{ltugproc}
 %<ltugcomn>   \ProvidesPackage{ltugcomn}
-                   [2004/07/06 v1.6
+                   [2006/05/05 v2.0
 %<ltugboatcls>                       TUGboat journal class%
 %<ltugproccls>                       TUG conference proceedings class%
 %<ltugboatsty|ltugprocsty>           TUG compatibility package%
@@ -42,7 +62,7 @@
 %
 % RCS identification of this file (lest I fail to update the above ;-)
 %
-% $Id: tugboat.dtx,v 1.42 2004/05/30 13:21:40 rf Exp rf $
+% $Id: tugboat.dtx,v 1.46 2006/03/22 11:27:54 rf10 Exp rf10 $
 %
 % Note that the RCS version relates to the number of times the file
 % has been checked-in, which relates to a development process taking
@@ -107,12 +127,13 @@
 %    \end{macrocode}
 %
 % \fi
-% \CheckSum{4637}
+% \CheckSum{4458}
 %
 % \section{Introduction}
 %
 % This file contains all the macros for typesetting \TUB{} with
-% both plain \TeX\ and \LaTeXe.
+% \LaTeXe.
+%
 % \subsection{Summary of control sequences}
 % 
 % Abbreviations.  Just a listing with indications of expansion where
@@ -130,6 +151,7 @@
 % |\ConTeXt|&       \ConTeXt\\
 % |\Cplusplus|&     C++\\
 % |\DTD|&\\
+% |\DVIPDFMx|&      \DVIPDFMx\\
 % |\DVItoVDU|&      DVItoVDU\\
 % |\eTeX|&          \eTeX\\
 % |\Ghostscript|&\\
@@ -184,6 +206,7 @@
 % |\VAX|&\\
 % |\VorTeX|&\\
 % |\XeT|&\\
+% |\XeTeX|&         reflected and lowered first `E'\\
 % |\XML|&\\
 % |\WEB|&\\
 % |\WEAVE|&\\
@@ -310,12 +333,10 @@
 % \LaTeXe{} we can use the \cs{Class*} commands:
 %
 %    \begin{macrocode}
-%<*latex2e>
 \def\TBInfo{\ClassInfo{\@tugclass}}
 \def\TBError{\ClassError{\@tugclass}}
 \def\TBWarning{\ClassWarning{\@tugclass}}
 \def\TBWarningNL{\ClassWarningNoLine{\@tugclass}}
-%</latex2e>
 %    \end{macrocode}
 %
 % Some trivial options, just flicking switches, etc.
@@ -541,18 +562,9 @@
 \def\makespace #1{\catcode`#1=10 }
 \def\makeletter#1{\catcode`#1=11 }
 \chardef\other=12
-%<*!latex>
-\def\makeother #1{\catcode`#1=\other}
-%</!latex>
-%<*latex>
 \let\makeother\@makeother
-%</latex>
 \def\makeactive#1{\catcode`#1=13 }
 \def\makecomment#1{\catcode`#1=14 }
-%<*!latex>
-\def\makeatletter{\makeletter\@}
-\def\makeatother {\makeother\@}
-%</!latex>
 %    \end{macrocode}
 % |\savecat#1| and |\restorecat#1| will save and restore the category
 % of a given character.  These are useful in cases where one doesn't
@@ -588,13 +600,10 @@
 % necessary:
 %
 %    \begin{macrocode}
-%<*latex2e>
 \providecommand\hb@xt@{\hbox to}
 \providecommand\textsuperscript[1]{\ensuremath{\m@th
                                      ^{\mbox{\fontsize\sf@size\z@
                                          \selectfont #1}}}}
-%</latex2e>
-%<!latex2e>\def\hb@xt@{\hbox to}
 %    \end{macrocode}
 % (Note that that definition of \cs{textsuperscript} isn't robust, but
 % probably doesn't need to be\dots  What's more, it doesn't appear in
@@ -605,61 +614,53 @@
 %
 % Font used for the METAFONT logo, etc.
 %    \begin{macrocode}
-%<!latex2e>\font\manual=logo10 
 \def\AllTeX{(\La\kern-.075em)\kern-.075em\TeX}
 \def\AMS{American Mathematical Society}
-%<!latex2e>\def\AmS{{\the\textfont2 A}\kern-.1667em\lower.5ex\hbox
-%<!latex2e>        {\the\textfont2 M}\kern-.125em{\the\textfont2 S}}
-%<latex2e>\def\AmS{$\mathcal{A}$\kern-.1667em\lower.5ex\hbox
-%<latex2e>    {$\mathcal{M}$}\kern-.125em$\mathcal{S}$}
+\def\AmS{$\mathcal{A}$\kern-.1667em\lower.5ex\hbox
+    {$\mathcal{M}$}\kern-.125em$\mathcal{S}$}
 \def\AmSLaTeX{\AmS-\LaTeX}
 \def\AmSTeX{\AmS-\TeX}
+\def\ANSI{\acro{ANSI}}
+\def\ASCII{\acro{ASCII}}
 \def\aw{A\kern.1em-W}
 \def\AW{Addison\kern.1em-\penalty\z@\hskip\z@skip Wesley}
-%<!latex2e>\def\BibTeX{{\rm B\kern-.05em{\smc i\kern-.025emb}\kern-.08em\TeX}}
-%<latex2e>\def\BibTeX{\textsc{Bib}\kern-.08em\TeX}
-%<!latex2e>\def\CandT{{\sl Computers \& Typesetting}}
-%<latex2e>\def\CandT{\textsl{Computers \& Typesetting}}
+\def\BibTeX{\textsc{Bib}\kern-.08em\TeX}
+\def\CandT{\textsl{Computers \& Typesetting}}
 %    \end{macrocode}
 % We place our \cs{kern} after \cs{-} so that it disappears if the
 % hyphenation is taken:
 %    \begin{macrocode}
 \newcommand\ConTeXt{C\kern-.0333emon\-\kern-.0667em\TeX\kern-.0333emt}
 \newcommand\Cplusplus{C\raisebox{.7ex}{$_{++}$}}
+\def\CSS{\acro{CSS}}
 \def\CTAN{\acro{CTAN}}
 \def\DTD{\acro{DTD}}
+\def\DVD{\acro{DVD}}
+\def\DVIPDFMx{\acro{DVIPDFM}$x$}
 \def\DVItoVDU{DVIto\kern-.12em VDU}
-%<latex2e>\DeclareRobustCommand\eTeX{\ensuremath{\varepsilon}-\kern-.125em\TeX}
-%<!latex2e>\def\eTeX{{$\varepsilon$}-\kern-.125em\TeX}
+\DeclareRobustCommand\eTeX{\ensuremath{\varepsilon}-\kern-.125em\TeX}
+\def\FAQ{\acro{FAQ}}
+\def\FTP{\acro{FTP}}
 \def\Ghostscript{Ghost\-script}
+\def\GNU{\acro{GNU}}
+\def\GUI{\acro{GUI}}
 \def\Hawaii{Hawai`i}
 \def\HTML{\acro{HTML}}
+\def\HTTP{\acro{HTTP}}
 \def\ISBN{\acro{ISBN}}
 \def\ISSN{\acro{ISSN}}
+\def\JPEG{\acro{JPEG}}
 \def\JTeX{\leavevmode\hbox{\lower.5ex\hbox{J}\kern-.18em\TeX}}
-%<!latex2e>\def\JoT{{\sl The Joy of \TeX}}
-%<latex2e>\def\JoT{\textsl{The Joy of \TeX}}
-%<*!latex2e>
-\def\LAMSTeX{L\raise.42ex\hbox{\kern-.3em\the\scriptfont2 A}%
-    \kern-.2em\lower.376ex\hbox{\the\textfont2 M}\kern-.125em
-    {\the\textfont2 S}-\TeX}
-%</!latex2e>
-%<*latex2e>
+\def\JoT{\textsl{The Joy of \TeX}}
 \def\LAMSTeX{L\raise.42ex\hbox{\kern-.3em
                    $\m@th$\fontsize\sf@size\z@\selectfont
                    $\m@th\mathcal{A}$}%
     \kern-.2em\lower.376ex\hbox{$\m@th\mathcal{M}$}\kern-.125em
     {$\m@th\mathcal{S}$}-\TeX}
-%</latex2e>
-%<!latex2e>\def\La{\TestCount=\the\fam \leavevmode L\raise.42ex
-%<!latex2e>        \hbox{$\fam\TestCount\scriptstyle\kern-.3em A$}}
-%    \end{macrocode}
-%
-% With the facilities of \LaTeXe, we can do rather better.  This code
+% This code
 % is hacked from its definition of \cs{LaTeX}; it allows slants (for
 % example) to propagate into the raised (small) `A':
 %    \begin{macrocode}
-%<*latex2e>
 \newcommand{\La}%
    {L\kern-.36em
         {\setbox0\hbox{T}%
@@ -670,7 +671,6 @@
                             A}%
                       \vss}%
         }}
-%</latex2e>
 %    \end{macrocode}
 %
 % We started with the intention that we wouldn't redefine \cs{LaTeX}
@@ -682,8 +682,8 @@
 %
 %    \begin{macrocode}
 %<!latex>\def\LaTeX{\La\kern-.15em\TeX}
-\def\MathML{Math\acro{ML}}
 \def\MacOSX{Mac\,\acro{OS\,X}}
+\def\MathML{Math\acro{ML}}
 \def\Mc{\setbox\TestBox=\hbox{M}M\vbox
    to\ht\TestBox{\hbox{c}\vfil}} %  for Robert McGaffey
 %    \end{macrocode}
@@ -693,17 +693,10 @@
 % short extract of Vieth's stuff.  Either way, we don't need to
 % specify \cs{MF} or \cs{MP}
 %    \begin{macrocode}
-%<!latex2e>\def\MF{{\manual META}\-{\manual FONT}\@}
-%<!latex2e>\def\mf{{\smc Metafont}}
-%<latex2e>\def\mf{\textsc{Metafont}}
-%<!latex2e>\def\MFB{{\sl The \slMF book}}
-%<latex2e>\def\MFB{\textsl{The \MF book}}
-%<!latex2e>\def\MP{{\manual META}\-{\manual POST}\@}
-%<*latex2e>
+\def\mf{\textsc{Metafont}}
+\def\MFB{\textsl{The \MF book}}
 \let\TB@@mp\mp
 \DeclareRobustCommand\mp{\ifmmode\TB@@mp\else MetaPost\fi}
-%</latex2e>
-%    \end{macrocode}
 %
 % In order that the \cs{OMEGA} command will switch to using the TS1
 % variant of the capital Omega character if \texttt{textcomp.sty} is
@@ -712,64 +705,51 @@
 % than to use \cs{let}\dots
 %
 %    \begin{macrocode}
-%<*latex2e>
 \DeclareTextSymbol{\textohm}{OT1}{'012}
 \DeclareTextSymbolDefault{\textohm}{OT1}
 \newcommand\OMEGA{\textohm}
 \DeclareRobustCommand{\OCP}{\OMEGA\acro{CP}}
 \DeclareRobustCommand{\OTP}{\OMEGA\acro{TP}}
-%</latex2e>
 \def\mtex{T\kern-.1667em\lower.424ex\hbox{\^E}\kern-.125emX\@}
 %    \end{macrocode}
 % Revised definition of \cs{NTS} based on that used by Phil Taylor.
 %    \begin{macrocode}
 \DeclareRobustCommand\NTS{\ensuremath{\mathcal{N}\mkern-4mu
   \raisebox{-0.5ex}{$\mathcal{T}$}\mkern-2mu \mathcal{S}}}
+\def\Pas{Pascal}
 \def\pcMF{\leavevmode\raise.5ex\hbox{p\kern-.3\p@ c}MF\@}
 \def\PCTeX{PC\thinspace\TeX}
 \def\pcTeX{\leavevmode\raise.5ex\hbox{p\kern-.3\p@ c}\TeX}
-\def\Pas{Pascal}
+\def\PDF{\acro{PDF}}
 \def\PiC{P\kern-.12em\lower.5ex\hbox{I}\kern-.075emC\@}
 \def\PiCTeX{\PiC\kern-.11em\TeX}
-%<!latex2e>\def\plain{{\tt plain}}
-%<latex2e>\def\plain{\texttt{plain}}
+\def\plain{\texttt{plain}}
+\def\PNG{\acro{PNG}}
 \def\POBox{P.\thinspace O.~Box }
 \def\PS{{Post\-Script}}
+\def\RTF{\acro{RTF}}
 \def\SC{Steering Committee}
 \def\SGML{\acro{SGML}}
-%<!latex2e>\def\SliTeX{{\rm S\kern-.06em{\smc l\kern-.035emi}\kern-.06em\TeX}}
-%<latex2e>\def\SliTeX{\textrm{S\kern-.06em\textsc{l\kern-.035emi}%
-%<latex2e>                     \kern-.06em\TeX}}
-%<!latex2e>\def\slMF{\MF}
-%<latex2e> \def\slMF{\textsl{\MF}} % should never be used
-%<!latex2e>\def\stTeX{{\smc st\rm\kern-0.13em\TeX}}
-%<latex2e> \def\stTeX{\textsc{st}\kern-0.13em\TeX}
-%<!latex2e>\def\TANGLE{{\tt TANGLE}\@}
-%<latex2e>\def\TANGLE{\texttt{TANGLE}\@}
-%<!latex2e>\def\TB{{\sl The \TeX book}}
-%<latex2e>\def\TB{\textsl{The \TeX book}}
-%<!latex2e>\def\TP{{\sl \TeX\/}: {\sl The Program\/}}
-%<latex2e>\def\TP{\textsl{\TeX}: \textsl{The Program}}
-%<!latex2e>\def\TeX{T\kern-.1667em\lower.424ex\hbox{E}\kern-.125emX\@}
-%<*latex2e>
+\def\SliTeX{\textrm{S\kern-.06em\textsc{l\kern-.035emi}%
+                     \kern-.06em\TeX}}
+\def\slMF{\textsl{\MF}} % should never be used
+\def\stTeX{\textsc{st}\kern-0.13em\TeX}
+\def\TANGLE{\texttt{TANGLE}\@}
+\def\TB{\textsl{The \TeX book}}
+\def\TIFF{\acro{TIFF}}
+\def\TP{\textsl{\TeX}: \textsl{The Program}}
 \DeclareRobustCommand\TeX{T\kern-.1667em\lower.424ex\hbox{E}\kern-.125emX\@}
-%</latex2e>
 \def\TeXhax{\TeX hax}
 \def\TeXMaG{\TeX M\kern-.1667em\lower.5ex\hbox{A}%
    \kern-.2267emG\@}
-%<!latex2e>\def\TeXtures{{\it Textures}}
-%<latex2e>\def\TeXtures{\textit{Textures}}
+\def\TeXtures{\textit{Textures}}
 \let\Textures=\TeXtures
 \def\TeXXeT{\TeX-{}-\XeT}
 \def\Thanh{H\`an~Th\^e\llap{\raise 0.5ex\hbox{\'{}}}~Th\`anh}
-%<!latex2e>\def\ttn{{\sl TTN}\@}
-%<latex2e>\def\ttn{\textsl{TTN}\@}
-%<!latex2e>\def\TTN{{\sl \TeX{} and TUG News}}
-%<latex2e>\def\TTN{\textsl{\TeX{} and TUG News}}
-%<!latex2e>\def\tubfont{\sl}               % redefined in other situations
-%<!latex2e>\def\TUB{{\tubfont TUGboat\/}}
-%<latex2e>\let\texttub\textsl              % redefined in other situations
-%<latex2e>\def\TUB{\texttub{TUGboat}}
+\def\ttn{\textsl{TTN}\@}
+\def\TTN{\textsl{\TeX{} and TUG News}}
+\let\texttub\textsl              % redefined in other situations
+\def\TUB{\texttub{TUGboat}}
 \def\TUG{\TeX\ \UG}
 \def\tug{\acro{TUG}}
 \def\UG{Users Group}
@@ -778,10 +758,37 @@
 \def\VorTeX{V\kern-2.7\p@\lower.5ex\hbox{O\kern-1.4\p@ R}\kern-2.6\p@\TeX}
 \def\XeT{X\kern-.125em\lower.424ex\hbox{E}\kern-.1667emT\@}
 \def\XML{\acro{XML}}
-%<!latex2e>\def\WEB{{\tt WEB}\@}
-%<latex2e>\def\WEB{\texttt{WEB}\@}
-%<!latex2e>\def\WEAVE{{\tt WEAVE}\@}
-%<latex2e>\def\WEAVE{\texttt{WEAVE}\@}
+\def\WEB{\texttt{WEB}\@}
+\def\WEAVE{\texttt{WEAVE}\@}
+%    \end{macrocode}
+% 
+% Xe\TeX{} requires reflecting the first E, hence we complain if the
+% graphics package is not present.  (For plain documents, this can be
+% loaded via Eplain.)  Also, at Barbara's suggestion, if the current
+% font is slanted, we rotate by 180 instead of reflecting so there is at
+% least a chance to look ok.  (The magic values here seem more or less
+% ok for \texttt{cmsl} and \texttt{cmti}.)
+% 
+%    \begin{macrocode}
+\def\tubreflect#1{%
+  \@ifundefined{reflectbox}{%
+    \TBerror{A graphics package must be loaded for \string\XeTeX}%
+  }{%
+    \ifdim \fontdimen1\font>0pt
+      \raise 1.75ex \hbox{\kern.1em\rotatebox{180}{#1}}\kern-.1em
+    \else
+      \reflectbox{#1}%
+    \fi
+  }%
+}
+\def\tubhideheight#1{\setbox0=\hbox{#1}\ht0=0pt \dp0=0pt \box0 }
+\def\XeTeX{\leavevmode
+  \tubhideheight{\hbox{X%
+    \lower.5ex \hbox{\kern-.125em\tubreflect{E}}%
+    \kern-.1667em \TeX}}}
+%
+\def\XHTML{\acro{XHTML}}
+\def\XSLT{\acro{XSLT}}
 %    \end{macrocode}
 %
 % \subsection{General typesetting rules}
@@ -925,8 +932,7 @@
 \def\now{\number\hours:\ifnum\minutes<10 0\fi\number\minutes}
 \def\Now{\today\ \now}
 \newif\ifPrelimDraft
-%<!latex2e>\def\midrtitle{\ifPrelimDraft {{\tensl preliminary draft, \Now}}\fi}
-%<latex2e>\def\midrtitle{\ifPrelimDraft {\textsl{preliminary draft, \Now}}\fi}
+\def\midrtitle{\ifPrelimDraft {\textsl{preliminary draft, \Now}}\fi}
 %    \end{macrocode}
 %
 % \subsection{Ragged right and friends}
@@ -988,14 +994,8 @@
 % AMS-\TeX~--- the \LaTeXe{} version has \cs{leavevmode} and doesn't
 % care about surrounding space).
 %    \begin{macrocode}
-%<*!latex2e>
-\def\,{\relax\ifmmode\mskip\thinmuskip\else\thinspace\fi}
-\def~{\unskip\nobreak\ \ignorespaces}
-%</!latex2e>
-%<*latex2e>
 \DeclareRobustCommand{\nobreakspace}{%
   \unskip\nobreak\ \ignorespaces}
-%</latex2e>
 %    \end{macrocode}
 %
 % Plain \TeX{} defines \cs{newbox} as \cs{outer}.  We solemnly
@@ -1009,12 +1009,10 @@
 % perhaps not the place to conduct a serious debate\dots)
 %
 %    \begin{macrocode}
-%<!latex>\def\newbox{\alloc@4\box\chardef\insc@unt}
 \def\boxcs#1{\box\csname#1\endcsname}
 \def\setboxcs#1{\setbox\csname#1\endcsname}
 \def\newboxcs#1{\expandafter\newbox\csname#1\endcsname}
-%<!latex>\def\gobble#1{}
-%<latex>\let\gobble\@gobble
+\let\gobble\@gobble
 \def\vellipsis{%
   \leavevmode\kern0.5em
   \raise\p@\vbox{\baselineskip6\p@\vskip7\p@\hbox{.}\hbox{.}\hbox{.}}
@@ -1024,12 +1022,6 @@
 \def\Dag{\raise .6ex\hbox{$\scriptstyle\dagger$}}
 \def\careof{\leavevmode\hbox{\raise.75ex\hbox{c}\kern-.15em
                 /\kern-.125em\smash{\lower.3ex\hbox{o}}} \ignorespaces}
-%<*!latex2e>
-\def\sfrac#1/#2{\leavevmode\kern.1em
-        \raise.5ex\hbox{\the\scriptfont\z@ #1}\kern-.1em
-        /\kern-.15em\lower.25ex\hbox{\the\scriptfont\z@ #2}}
-%</!latex2e>
-%<*latex2e>
 \DeclareRobustCommand\sfrac[1]{\@ifnextchar/{\@sfrac{#1}}%
                                             {\@sfrac{#1}/}}
 \def\@sfrac#1/#2{\leavevmode\kern.1em\raise.5ex
@@ -1043,7 +1035,6 @@
   \ensuremath{\langle}\emph{#1}\ensuremath{\rangle}}
 \DeclareRobustCommand\env[1]{%
   \cs{begin}\texttt{\char`\{#1\char`\}}}
-%</latex2e>
 \def\thinskip{\hskip 0.16667em\relax}
 %    \end{macrocode}
 %
@@ -1078,9 +1069,9 @@
 \def\nth#1{%
     \def\reserved@a##1##2\@nil{\ifcat##1n%
            0%
-%<latex2e>   \let\reserved@b\ensuremath
+          \let\reserved@b\ensuremath
       \else##1##2%
-%<latex2e>   \let\reserved@b\relax
+          \let\reserved@b\relax
       \fi}%
     \TestCount=\reserved@a#1\@nil\relax
     \ifnum\TestCount <0 \multiply\TestCount by\m@ne \fi % subdue negatives
@@ -1091,18 +1082,6 @@
       \divide\T@stCount by 10 \multiply\T@stCount by 10
       \advance\TestCount by-\T@stCount   % n mod 10
     \fi
-%<*!latex2e>
-    \T@stCount=\the\fam\relax
-    $\fam\T@stCount#1^{\fam\T@stCount
-      \ifcase\TestCount th%    0th
-      \or   st%                1st
-      \or   nd%                2nd
-      \or   rd%                3rd
-      \else th%                nth
-      \fi
-     }$%
-%</!latex2e>
-%<*latex2e>
      \reserved@b{#1}%
        \textsuperscript{\ifcase\TestCount th%    0th
                         \or   st%                1st
@@ -1110,49 +1089,32 @@
                         \or   rd%                3rd
                         \else th%                nth
                         \fi}%
-%</latex2e>
-     }
+}
 %    \end{macrocode}
 %
 % \subsection{Reviews}
 %
 % Format information on reviewed items for book review articles.
-%    \begin{macrocode}
-%<*!latex2e>
-\def\Review:#1{\ifx[#1\@Rev[%
-  \else Book review:\enspace\sl #1%
-  \fi
-  }
-\def\@Rev[#1]{\ignorespaces#1\unskip:\enspace\ignorespaces\sl}
-%</!latex2e>
-%    \end{macrocode}
-%
 % For the \LaTeXe{} version, we follow Fairbairns' maxim, and define
 % something that can even look like a \LaTeX{} macro\dots
 %
 %    \begin{macrocode}
-%<*latex2e>
 \def\Review{\@ifnextchar:{\@Review}{\@Review:}}
 \def\@Review:{\@ifnextchar[%]
   {\@Rev}%
   {\@Rev[Book review]}}
 \def\@Rev[#1]#2{{\ignorespaces#1\unskip:\enspace\ignorespaces
                                         \slshape\mdseries#2}}
-%</latex2e>
-%<!latex2e>\def\reviewitem{%
-%<latex2e>\def\reviewitem{\addvspace{\BelowTitleSkip}%
+\def\reviewitem{\addvspace{\BelowTitleSkip}%
   \def\revauth##1{\def\therevauth{##1, }\ignorespaces}%
-%<!latex2e>  \def\revtitle##1{\def\therevtitle{{\sl##1}. }\ignorespaces}%
-%<latex2e>  \def\revtitle##1{\def\therevtitle{{\slshape##1}. }\ignorespaces}%
+  \def\revtitle##1{\def\therevtitle{{\slshape##1}. }\ignorespaces}%
   \def\revpubinfo##1{\def\therevpubinfo{##1.}\ignorespaces}%
-  }
+}
 \def\endreviewitem{{\noindent\interlinepenalty=10000
   \therevauth\therevtitle\therevpubinfo\endgraf}%
   \vskip\medskipamount
-%<!latex>\DeleteOptionalSpacesandPars{\noindent\ignorespaces}%
-  }
-%<!latex2e>\def\booktitle#1{{\sl #1\/}}
-%<latex2e>\def\booktitle#1{{\slshape#1\/}}
+}
+\def\booktitle#1{{\slshape#1\/}}
 %    \end{macrocode}
 %
 %  \subsection{Dates, volume and issue numbers, etc.}
@@ -1288,7 +1250,6 @@
 %
 %    \begin{macrocode}
 \def\TUBfilename#1#2{\expandafter\def\csname file@@#1\endcsname{#2}}
-%<*!latex2e>
 \newread\@altfilenames
 \def\@readFLN{\immediate\openin\@altfilenames=\jobname.fln
   \ifeof\@altfilenames\let\@result\relax\else
@@ -1297,9 +1258,8 @@
   \@result}
 \@readFLN
 \everyjob=\expandafter{\the\everyjob\@readFLN}
-%</!latex2e>
-%<latex2e>\InputIfFileExists{\jobname.fln}%
-%<latex2e>     {\TBInfo{Reading alternative file file \jobname.fln}}{}
+\InputIfFileExists{\jobname.fln}%
+     {\TBInfo{Reading alternative file file \jobname.fln}}{}
 %    \end{macrocode}
 %
 % The following needs to work entirely in \TeX's mouth
@@ -1365,21 +1325,31 @@
 % Some hyphenation exceptions:
 %
 %    \begin{macrocode}
-\hyphenation{Dijk-stra Eijk-hout Hara-lam-bous
-  Doc-Book Flor-i-da Ghost-script Ghost-view Open-Type Pfa-Edit
-  Post-Script True-Type
-  ap-pen-dix
-  bit-map bit-mapped bit-maps bool-ean
-  col-umns
+\hyphenation{Del-a-ware Dijk-stra Duane Eijk-hout
+  Flor-i-da Free-BSD Ghost-script Ghost-view
+  Hara-lam-bous Jac-kow-ski Karls-ruhe
+  Mac-OS Math-Sci-Net
+  Net-BSD Open-BSD Open-Office
+  Pfa-Edit Post-Script Rich-ard Skoup South-all
+  VM-ware Win-Edt 
+  acro-nym ap-pen-dix asyn-chro-nous
+  bit-map bit-mapped bit-maps buf-fer buf-fers bool-ean
+  col-umns cus-tom-iz-able
   data-base data-bases
+   de-riv-a-tive de-riv-a-tives de-riv-a-ble der-i-va-tion
   fall-ing
   half-way
+  key-note 
   long-est
   ma-gyar man-u-script man-u-scripts
-  over-view
-  par-a-digm par-a-digm-atic par-a-digms
+  off-line over-view
+  pal-ettes par-a-digm par-a-dig-mat-ic par-a-digms
+   pipe-line pipe-lines
+   plug-in plug-ins pro-gram-mable
   se-vere-ly spell-ing spell-ings stand-alone strong-est
+   sub-ex-pres-sion syn-chro-ni-city syn-chro-nous
   time-stamp time-stamped
+  vis-ual vis-ual-ly 
   which-ever white-space white-spaces wide-spread wrap-around
 }
 %<!latex>\restorecat\@
@@ -1416,13 +1386,9 @@
 \newdimen\headmargin    \headmargin=3.5pc
 %    \end{macrocode}
 %
-% If we're in \LaTeXe, |twoside| option is forced on when
+% In \LaTeXe, |twoside| option is forced on when
 % |article.cls| is loaded.
 %
-%    \begin{macrocode}
-%<!latex2e>\@twosidetrue
-%    \end{macrocode}
-%
 % \subsection{Messing about with the \LaTeX{} logo}
 % \label{sec:latex-logo}
 %
@@ -1445,13 +1411,16 @@
 \def\@LaTeX@default{{.36}{.15}}
 %    \end{macrocode}
 %
-% Three more defined in the initial version, for bold CM sans (which is
-% used as \cs{SecTitleFont}), and CM italic medium and bold:
+% More are defined in the initial version, for bold CM sans (which is
+% used as \cs{SecTitleFont}), and CM italic medium and bold, and
+% Bitstream Charter (which Nelson Beebe likes to use):
 %
 %    \begin{macrocode}
 \DeclareLaTeXLogo{cmss}{bx}n{.3}{.15}
 \DeclareLaTeXLogo{cmr}m{it}{.3}{.27}
 \DeclareLaTeXLogo{cmr}{bx}{it}{.3}{.27}
+\DeclareLaTeXLogo{bch}{m}{n}{.2}{.08}
+\DeclareLaTeXLogo{bch}{m}{it}{.2}{.08}
 %    \end{macrocode}
 %
 % Redefine \cs{LaTeX} to choose the parameters for the current font,
@@ -1755,19 +1724,9 @@
 % otherwise we write it out in all its horribleness.
 %
 %    \begin{macrocode}
-%<*latex2e>
 \newcommand\netaddress[1][\relax]{%
   \begingroup
   \def\@network{}%
-%</latex2e>
-%<*!latex2e>
-\def\netaddress{%
-  \begingroup
-  \def\@network{}%
-  \@ifnextchar[{\@netaddress}{\@netaddress[]}%]
-  }
-\def\@netaddress[#1]{%}
-%</!latex2e>
 %    \end{macrocode}
 %
 % Unfortunately, because of the catcode hackery, we have still to do
@@ -1788,19 +1747,11 @@
 %    \begin{macrocode}
 \def\@relay@netaddress#1{%
   \ProtectNetChars
-%<*!latex2e>
-  \expandafter\xdef\csname thenetaddress\number\authornumber\endcsname
-     {\leavevmode{\noexpand\rm\@network}%
-     {\noexpand\NetAddrChars\noexpand\net
-      \ignorespaces#1\unskip}}%
-%</!latex2e>
-%<*latex2e>
   \expandafter\protected@xdef
       \csname thenetaddress\number\authornumber\endcsname
     {\protect\leavevmode\textrm{\@network}%
      {\protect\NetAddrChars\net
       \ignorespaces#1\unskip}}%
-%</latex2e>
   \endgroup
   }
 %    \end{macrocode}
@@ -1820,12 +1771,6 @@
   \makeactive\.\makeactive\%\makeactive\/\@personalURL}%
 \def\@personalURL#1{%
   \ProtectNetChars
-%<*!latex2e>
-  \expandafter\xdef\csname thePersonalURL\number\authornumber\endcsname
-   {\noexpand\URLchars\noexpand\net
-    \ignorespaces#1\unskip}}%
-%</!latex2e>
-%<*latex2e>
   \expandafter\protected@xdef
     \csname thePersonalURL\number\authornumber\endcsname{%
       \protect\leavevmode
@@ -1834,7 +1779,6 @@
         \ignorespaces#1\unskip
       }%
     }%
-%</latex2e>
   \endgroup
   }
 %    \end{macrocode}
@@ -1879,43 +1823,26 @@
 %
 %    \begin{macrocode}
   \gdef\ProtectNetChars{*
-%<*!latex2e>
-    \def@{\noexpand@}*
-    \def%{\noexpand%}*
-    \def.{\noexpand.}*
-    \def/{\noexpand/}*
-%</!latex2e>
-%<*latex2e>
     \def@{\protect@}*
     \def%{\protect%}*
     \def.{\protect.}*
     \def/{\protect/}*
-%</latex2e>
     }
 }
 %    \end{macrocode}
 %
-% In \LaTeX2.09, there's no inhibition against simply saying the
-% following:
-%
-%    \begin{macrocode}
-%<!latex2e>\def\net{\tt}
-%    \end{macrocode}
-%
-%  \LaTeXe{}, on the other hand (in its wisdom), suppresses
+%  \LaTeXe{} (in its wisdom) suppresses
 %  \cs{DeclareOldFontCommand} when in compatibility mode, so that in
 %  that circumstance we need to use a declaration copied from
 %  |latex209.def| rather than the way we would normally do the thing
 %  (using the command \LaTeXe{} defines for the job).
 % 
 %    \begin{macrocode}
-%<*latex2e>
 \if@compatibility
   \DeclareRobustCommand\net{\normalfont\ttfamily\mathgroup\symtypewriter}
 \else
   \DeclareOldFontCommand{\net}{\ttfamily\upshape\mdseries}{\mathtt}
 \fi
-%</latex2e>
 \def\authorlist#1{\def\@author{#1}}
 \def\@author{\@defaultauthorlist}
 %    \end{macrocode}
@@ -1982,11 +1909,7 @@
 %    \begin{macrocode}
 \newdimen\stbaselineskip        \stbaselineskip=18\p@
 \newdimen\stfontheight
-%<*!latex2e>
-\setbox\T@stBox=\hbox{\sectitlefont O}
-\stfontheight=\ht\T@stBox
-%</!latex2e>
-%<latex2e> \settoheight{\stfontheight}{\sectitlefont O}
+\settoheight{\stfontheight}{\sectitlefont O}
 %    \end{macrocode}
 %
 % Declaring section titles; the conditional \cs{ifSecTitle} records
@@ -2152,16 +2075,9 @@
 % Dedications are ragged right, in italics.
 %
 %    \begin{macrocode}
-%<*!latex2e>
-\def\dedication{\bgroup\raggedright\let\MF=\slMF
-                       \noindent\it\ignorespaces}
-\def\enddedication{\endgraf\egroup\medskip}
-%</!latex2e>
-%<*latex2e>
 \newenvironment{dedication}%
   {\raggedright\noindent\itshape\ignorespaces}%
   {\endgraf\medskip}
-%</latex2e>
 %    \end{macrocode}
 %
 % The |abstract| and |longabstract| environments both use
@@ -2171,27 +2087,12 @@
 % ^^A \cs{@startsection}, to avoid a confusing warning.
 %
 %    \begin{macrocode}
-%<*!latex2e>
-\def\abstract{
-\section*{Abstract}
-}
-\def\endabstract{}
-%</!latex2e>
-%<*latex2e>
 \renewenvironment{abstract}%
   {%
     \begin{SafeSection}%
     \section*{Abstract}%
   }%
   {\end{SafeSection}}
-%</latex2e>
-%<*!latex2e>
-\def\longabstract{
-  \section*{Abstract}
-  \bgroup\small}
-\def\endlongabstract{\endgraf\egroup
-%</!latex2e>
-%<*latex2e>
 \newenvironment{longabstract}%
   {%
     \begin{SafeSection}%
@@ -2201,7 +2102,6 @@
   {%
     \endgraf\egroup
     \end{SafeSection}%
-%</latex2e>
   \vspace{.25\baselineskip}
   \begin{center}
     {$--*--$}
@@ -2210,10 +2110,11 @@
 %    \end{macrocode}
 %
 % \subsection{Headings}
-%
-%  Redefine style of section headings to match \TUB{}'s defined styles.
-%  |\vskip 8pt| \penalty0|\vskip\parskip| before; |\vskip 4pt| after.
-%  Negative beforeskip suppresses following parindent.
+% 
+%  Redefine style of section headings for \TUB: |\vskip 8pt| |plus2pt|
+%  |minus2pt| \penalty0|\vskip\parskip| before; |\vskip 4pt plus.5pt|
+%  after. Negative beforeskip suppresses following parindent.  (So
+%  negate the stretch and shrinktoo).
 %
 %  These macros are called \cs{*head} in the plain styles.
 %
@@ -2230,20 +2131,20 @@
   \def\section{\TB@startsection{{section}%
                                 1%
                                 \z@
-                                {-8\p@}%
-                                {4\p@}%
+                                {-8\p@\@plus-2\p@\@minus-2\p@}%
+                                {4\p@\@plus.5\p@}%
           {\normalsize\bf\raggedright\hyphenpenalty=\@M}}}
   \def\subsection{\TB@startsection{{subsection}%
                                    2%
                                    \z@
-                                   {-8\p@}%
-                                   {4\p@}%
+                                   {-8\p@\@plus-2\p@\@minus-2\p@}%
+                                   {4\p@\@plus.5\p@}%
           {\normalsize\bf\raggedright\hyphenpenalty=\@M}}}
   \def\subsubsection{\TB@startsection{{subsubsection}%
                                       3%
                                       \z@
-                                      {-8\p@}%
-                                      {4\p@}%
+                                      {-8\p@\@plus-2\p@\@minus-2\p@}%
+                                      {4\p@\@plus.5\p@}%
           {\normalsize\bf\raggedright\hyphenpenalty=\@M}}}
   \def\paragraph{\TB@startsection{{paragraph}%
                                   4%
@@ -2263,36 +2164,44 @@
                \TB@startsection{{section}%
                                 1%
                                 \z@
-                                {-8\p@}%
-                                {4\p@}%
+                                {-8\p@\@plus-2\p@\@minus-2\p@}%
+                                {4\p@\@plus.5\p@}%
           {\normalsize\bf\raggedright\hyphenpenalty=\@M}}}
   \def\subsection{\TB@nolimelabel
                   \TB@startsection{{subsection}%
                                    2%
                                    \z@
-                                   {-8\p@}%
+                                   {-8\p@\@plus-2\p@\@minus-2\p@}%
                                    {-0.5em\@plus-\fontdimen3\font}%
           {\normalsize\bf\raggedright\hyphenpenalty=\@M}}}
   \def\subsubsection{\TB@nolimelabel
                      \TB@startsection{{subsubsection}%
                                       3%
                                       \parindent
-                                      {-8\p@}%
+                                      {-8\p@\@plus-2\p@\@minus-2\p@}%
                                       {-0.5em\@plus-\fontdimen3\font}%
           {\normalsize\bf\raggedright\hyphenpenalty=\@M}}}
 \fi
 %    \end{macrocode}
 %
 % \cs{TB@startsection} traps \verb"*" versions of sectioning
-% commands.  Its argument is the complete set of \cs{@startsection}
-% arguments.
+% commands, if numbering isn't in effect.  Its argument is the
+% complete set of \cs{@startsection} arguments.
 %
 %    \begin{macrocode}
-\def\TB@startsection#1{\@ifstar
-  {\TBWarning{*-form of \expandafter\string\csname\@firstofsix#1%
-              \endcsname\space inappropriate}%
-   \@startsection#1}%
-  {\@startsection#1}}
+\if@numbersec
+  \def\TB@startsection#1{\@startsection#1}%
+\else
+  \def\TB@startsection#1{%
+    \@ifstar
+      {\TBWarning{*-form of \expandafter\string\csname\@firstofsix#1%
+                  \endcsname\space
+                  \MessageBreak
+                  conflicts with nonumber class option}%
+       \@startsection#1}%
+      {\@startsection#1}%
+  }
+\fi
 \def\@firstofsix#1#2#3#4#5#6{#1}
 %    \end{macrocode}
 %
@@ -2513,15 +2422,17 @@
 % \subsection{Float captions}
 %
 % 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 now do our best to discourage hyphenation within captions.  We also
+% typeset them in \cs{small}.
 %
 %    \begin{macrocode}
-\long\def\@makecaption#1#2{%
+\def\@makecaption#1#2{%
   \vskip\abovecaptionskip
-  \sbox\@tempboxa{#1: #2}%
+  \def\@makecaptiontext{\small \parindent=1em\noindent #1: #2}%
+  \setbox\@tempboxa=\vbox{\@makecaptiontext\par}%
   \ifdim \wd\@tempboxa >\hsize
     \raggedright\hyphenpenalty=\@M
-    #1: #2\par
+    \@makecaptiontext
   \else
     \global \@minipagefalse
     \hb@xt@\hsize{\hfil\box\@tempboxa\hfil}%
@@ -2681,7 +2592,7 @@
 %    \end{macrocode}
 %
 % To end the environment, we do everything in reverse order: relay via
-% the copy we made of \cs{endveratim}, and then finish off the option
+% the copy we made of \cs{endverbatim}, and then finish off the option
 % changes (again \cs{ruled} only, so far).
 %
 %    \begin{macrocode}
@@ -2966,9 +2877,7 @@
 % \subsection{Running heads}
 %
 %    \begin{macrocode}
-%<!latex2e>\def \rtitlex{\def\tubfont{\normalsize\rm}\TUB, \volx }
-%<latex2e>\def \rtitlex{\def\texttub##1{{\normalsize\textrm{##1}}}\TUB, \volx }
-
+\def \rtitlex{\def\texttub##1{{\normalsize\textrm{##1}}}\TUB, \volx }
 \def\PrelimDraftfooter{%
   \dlap{\kern\textheight\kern3pc
         \rlap{\hb@xt@\pagewd{\midrtitle\hfil\midrtitle}}
@@ -3025,6 +2934,7 @@
 \newif\ifFirstPar       \FirstParfalse
 \def\smc{\sc}
 \def\ninepoint{\small}
+%</classtail>
 %    \end{macrocode}
 %
 % \cs{SMC} \emph{isn't} small caps~--- Barbara Beeton says she thinks
@@ -3049,14 +2959,12 @@
 % We define this in terms of the memory of the size currently selected
 % that's maintained in \cs{@currsize}: if the user does something
 % silly re.~selecting fonts, we'll get the wrong results.  The
-% following code is adapted from |relsize.sty| by Donald Arseneau and
-% Matt Swift, from a 2.09 original by Bernie Cosell.  (Note that the
+% following code is adapted from an old version of |relsize.sty| by
+% Donald Arseneau and Matt Swift.   (Note that the
 % order of examination of \cs{@currsize} is to get the commonest cases
 % out of the way first.)
 %    \begin{macrocode}
-%<!latex2e>\def\SMC{\small}
-%<*latex>
-%<*latex2e>
+%<*common>
 \DeclareRobustCommand\SMC{%
   \ifx\@currsize\normalsize\small\else
    \ifx\@currsize\small\footnotesize\else
@@ -3071,7 +2979,7 @@
             \small\SMC@unknown@warning
  \fi\fi\fi\fi\fi\fi\fi\fi\fi\fi
 }
-\newcommand\SMC@unknown@warning{\TBWarning{\string\SMC: unrecognised
+\newcommand\SMC@unknown@warning{\TBWarning{\string\SMC: nonstandard
     text font size command -- using \string\small}}
 \newcommand\textSMC[1]{{\SMC #1}}
 %    \end{macrocode}
@@ -3082,10 +2990,7 @@
 %
 %    \begin{macrocode}
 \newcommand\acro[1]{\textSMC{#1}\@}
-%</latex2e>
-%<!latex2e>\def\acro#1{{\SMC #1}\@}
-%</latex>
-%<!latex>\def\acro#1{{\SMC #1}\spacefactor\@m}
+%</common>
 %    \end{macrocode}
 %
 % \subsection{Miscellaneous definitions}
@@ -3096,6 +3001,7 @@
 % (Yes, it really is!)
 %
 %    \begin{macrocode}
+%<*classtail>
 \def\xEdNote{{\EdNoteFont Editor's note:\enspace }}
 \def \EdNote{\@ifnextchar[%]
   {%
@@ -3145,7 +3051,7 @@
 %% }
 
 
-\def\fnum@figure{{\bf Figure \thefigure}}
+\def\fnum@figure{{\small\bf Figure \thefigure}}
 %    \end{macrocode}
 %
 % \subsection{Initialization}
@@ -3303,20 +3209,20 @@
 %    \end{macrocode}
 %
 % Check that this is a ``sensible year'' (one for which we have a
-% class option defined).  If not, make it the `most recent year we
-% know about'.
+% class option defined).  If not, make it a `suitable' year, in
+% particular, one that allows numbering sections.
 %    \begin{macrocode}
 \expandafter\ifx\csname ds@tug\tugProcYear\endcsname\relax
   \def\tugProcYear{2002}\fi
 %    \end{macrocode}
 % \end{macro}
-%
-% Now execute the default `year' option, and the default
-% \textsf{nonumber} option and get on with processing.  Note that this
-% command gets ignored if the configuration file specifies a silly year.
+% 
+% Now execute the default `year' option and get on with processing.
+% Note that this command gets ignored if the configuration file
+% specifies a silly year. 
 %
 %    \begin{macrocode}
-\ExecuteOptions{nonumber,tug\tugProcYear,title\TUGprocExtraOptions}
+\ExecuteOptions{tug\tugProcYear,title\TUGprocExtraOptions}
 \ProcessOptions
 \if@proc@numbersec
   \if@proc@numerable
@@ -3339,7 +3245,7 @@
 % \begin{macro}{\ifTB@madetitle}
 % There's no provision for `section titles' in proceedings issues, as
 % there are in \TUB{} proper.  Note the tedious \LaTeX{} bug-avoidance
-% in the \cs{@TB@test@document} macro
+% in the \cs{@TB@test@document} macro.
 %
 %    \begin{macrocode}
 \def\maketitle{%
@@ -3390,7 +3296,6 @@
 % \cs{@TB@test@document} checks to see, at entry to \cs{maketitle}, if
 % we've had \verb:\begin{document}:.  See \LaTeX{} bug report latex/2212,
 % submitted by Robin Fairbairns, for details.
-%
 %    \begin{macrocode}
 \def\@TB@test@document{%
   \edef\@tempa{\the\everypar}
@@ -3407,7 +3312,6 @@
 % \begin{macro}{\addressfont}
 % \begin{macro}{\netaddrfont}
 % Define the fonts for titles and things
-%
 %    \begin{macrocode}
 \def\AUTHORfont {\large\rmfamily\mdseries\upshape}
 \def\TITLEfont  {\Large\rmfamily\mdseries\upshape}
@@ -3419,9 +3323,21 @@
 % \end{macro}
 % \end{macro}
 %
+% \begin{macro}{\aboveauthorskip}
+% \begin{macro}{\belowauthorskip}
+% \begin{macro}{\belowabstractskip}
+% Some stretchable stuff to permit variability in page layout.
+%    \begin{macrocode}
+\newskip\aboveauthorskip   \aboveauthorskip=18\p@ \@plus4\p@
+\newskip\belowauthorskip   \belowauthorskip=\aboveauthorskip
+\newskip\belowabstractskip \belowabstractskip=14\p@ \@plus3\p@ \@minus2\p@
+%    \end{macrocode}
+% \end{macro}
+% \end{macro}
+% \end{macro}
+%
 % \begin{macro}{\@maketitle}
 % The body of \cs{maketitle}
-%
 %    \begin{macrocode}
 \def\@maketitle{%
    {\parskip\z@
@@ -3429,19 +3345,20 @@
       \count@=0
       \loop
       \ifnum\count@<\authornumber
-        \vskip20\p@
+        \vskip\aboveauthorskip
         \advance\count@\@ne
         {\AUTHORfont\theauthor{\number\count@}\endgraf}%
         \addressfont\theaddress{\number\count@}\endgraf
         {%
           \allowhyphens
           \hangindent1.5pc
+          \frenchspacing
           \netaddrfont\thenetaddress{\number\count@}\endgraf
           \hangindent1.5pc
           \thePersonalURL{\number\count@}\endgraf
         }%
       \repeat
-   \vskip20\p@}%
+   \vskip\belowauthorskip}%
    \if@abstract
       \centerline{\bfseries Abstract}%
       \vskip.5\baselineskip\rmfamily
@@ -3451,7 +3368,7 @@
             \the\abstract@toks
       \endlist\global\@ignoretrue
    \fi
-   \vskip1pc
+   \vskip\belowabstractskip
    \global\@afterindentfalse\aftergroup\@afterheading
   }
 %    \end{macrocode}
@@ -3566,6 +3483,30 @@
 % \end{macro}
 % \end{environment}
 %
+% \begin{macro}{\creditfootnote}
+% \begin{macro}{\supportfootnote}
+% Sometimes we want the label ``Editor's Note:'', sometimes not.
+% 
+%    \begin{macrocode}
+\def\creditfootnote{\nomarkfootnote\xEdNote}
+\def\supportfootnote{\nomarkfootnote\relax}
+%    \end{macrocode}
+%
+% General macro \cs{nomarkfootnote} to make a footnote without a
+% reference mark, etc.  |#1| is an extra command to insert, |#2| the
+% user's text.
+%    \begin{macrocode}
+\gdef\nomarkfootnote#1#2{\begingroup
+  \def\thefootnote{}%
+  % no period, please, also no fnmark.
+  \def\@makefntext##1{##1}%
+  \footnotetext{\noindent #1#2}%
+  \endgroup
+}
+%    \end{macrocode}
+% \end{macro}
+% \end{macro}
+%
 % \begin{macro}{\makesignature}
 % \cs{makesignature} is improper in proceedings, so we replace it with a
 % warning (and a no-op otherwise)
@@ -3669,11 +3610,12 @@
 % \end{macro}
 %
 % \subsection{Section divisions}
-%
-% Neither sections nor subsections are numbered in the proceedings
-% style: note that this puts a degree of stress on authors' natural
-% tendency to reference sections, which is a matter that needs
-% attention.
+% 
+% Neither sections nor subsections are numbered by default in the
+% proceedings style: note that this puts a degree of stress on authors'
+% natural tendency to reference sections, which is a matter that needs
+% attention.  The class option \textsc{numbersec} once again numbers the
+% sections (and noticeably changes the layout).
 % 
 %    \begin{macrocode}
 \if@proc@numbersec
diff --git a/Master/texmf-dist/source/latex/tugboat/tugboat.ins b/Master/texmf-dist/source/latex/tugboat/tugboat.ins
index 579ca46d4b2..44a494748b6 100644
--- a/Master/texmf-dist/source/latex/tugboat/tugboat.ins
+++ b/Master/texmf-dist/source/latex/tugboat/tugboat.ins
@@ -1,25 +1,68 @@
+% tugboat.ins
+%% This file will generate fast loadable files and documentation
+%% driver files from the doc files in this package when run through
+%% LaTeX or TeX.
+%%
+%% Copyright 1994,1995,1996,2001,2005,2006 TeX Users Group.
+%% 
+%% This file is part of the tugboat package.
+%% 
+%% This work may be distributed and/or modified under the
+%% conditions of the LaTeX Project Public License, either version 1.3
+%% of this license or (at your option) any later version.
+%% The latest version of this license is in
+%%   http://www.latex-project.org/lppl.txt
+%% and version 1.3 or later is part of all distributions of LaTeX
+%% version 2003/12/01 or later.
+%%
+%% This work has the LPPL maintenance status "maintained".
+%% 
+%% The Current Maintainer of this work is the TeX Users Group
+%% (http://tug.org/TUGboat).
+%%
+%% The list of all files belonging to the distribution is
+%% given in the file `manifest.txt'. 
+%%
+%% The list of derived (unpacked) files belonging to the distribution 
+%% and covered by LPPL is defined by the unpacking scripts (with 
+%% extension .ins) which are part of the distribution.
+
 \def\batchfile{tugboat.ins}
 \input docstrip.tex
-%\errorcontextlines999
 
 \keepsilent
+\askforoverwritefalse
 
 \preamble
 
-Copyright (C) 1994,1995,1996,2001 TeX Users Group
-All rights reserved.
+This is a generated file.
+
+Copyright 1994,1995,1996,2001,2005,2006 TeX Users Group.
 
-This file is part of the tugboat package.
------------------------------------------
+It may be distributed and/or modified under the
+conditions of the LaTeX Project Public License, either version 1.3
+of this license or (at your option) any later version.
+The latest version of this license is in
+   http://www.latex-project.org/lppl.txt
+and version 1.3 or later is part of all distributions of LaTeX 
+version 2003/12/01 or later.
 
-This is a generated file.  Permission is granted to customize the
-declarations in this file to serve the needs of your installation.
-However, no permission is granted to distribute a modified version of
-this file under its original name.
+This file has the LPPL maintenance status "maintained".
 
+The Current Maintainer of this work is the TeX Users Group
+(http://tug.org/TUGboat).
+
+The list of all files belonging to the distribution is given in the file
+`manifest.txt'.
+
+The list of derived (unpacked) files belonging to the distribution 
+and covered by LPPL is defined by the unpacking scripts (with 
+extension .ins) which are part of the distribution.
 
 \endpreamble
+
 \askforoverwritefalse
+
 \generate{\file{ltugboat.cls}{%
  \from{tugboat.dtx}{latex,classtop,common,classtail,latex2e,ltugboatcls}}
           \file{ltugproc.cls}{%
@@ -31,21 +74,10 @@ this file under its original name.
           \file{ltugcomn.sty}{%
                        \from{tugboat.dtx}{common,latex,latex2e,ltugcomn}}}
 
-%\generateFile{tugboat.sty}{f}{
-%  \from{tugboat.dtx}{tugboatsty}}
-%
-%\generateFile{tugproc.sty}{f}{
-%  \from{tugboat.dtx}{tugprocsty}}
-%
-
-\keepsilent
-
-\ifToplevel{
 \Msg{***********************************************************}
 \Msg{*}
 \Msg{* To finish the installation you have to move the following}
 \Msg{* files into a directory searched by TeX:}
-\Msg{*}
 \Msg{* \space\space All *.sty and all *.cls}
 \Msg{*}
 \Msg{* Then move ltugbib.bst to a directory searched by BibTeX}
@@ -55,6 +87,5 @@ this file under its original name.
 \Msg{*    bibtex/bst/misc   (for ltugbib.bst)}
 \Msg{*}
 \Msg{***********************************************************}
-}
 
 \endinput
diff --git a/Master/texmf-dist/tex/latex/tugboat/ltugboat.cls b/Master/texmf-dist/tex/latex/tugboat/ltugboat.cls
index 0ba717a2a60..cc5248c88cc 100644
--- a/Master/texmf-dist/tex/latex/tugboat/ltugboat.cls
+++ b/Master/texmf-dist/tex/latex/tugboat/ltugboat.cls
@@ -6,21 +6,56 @@
 %%
 %% tugboat.dtx  (with options: `latex,classtop,common,classtail,latex2e,ltugboatcls')
 %% 
-%% Copyright (C) 1994,1995,1996,2001 TeX Users Group
-%% All rights reserved.
+%% This is a generated file.
 %% 
-%% This file is part of the tugboat package.
-%% -----------------------------------------
+%% Copyright 1994,1995,1996,2001,2005,2006 TeX Users Group.
+%% 
+%% It may be distributed and/or modified under the
+%% conditions of the LaTeX Project Public License, either version 1.3
+%% of this license or (at your option) any later version.
+%% The latest version of this license is in
+%%    http://www.latex-project.org/lppl.txt
+%% and version 1.3 or later is part of all distributions of LaTeX
+%% version 2003/12/01 or later.
+%% 
+%% This file has the LPPL maintenance status "maintained".
+%% 
+%% The Current Maintainer of this work is the TeX Users Group
+%% (http://tug.org/TUGboat).
 %% 
-%% This is a generated file.  Permission is granted to customize the
-%% declarations in this file to serve the needs of your installation.
-%% However, no permission is granted to distribute a modified version of
-%% this file under its original name.
+%% The list of all files belonging to the distribution is given in the file
+%% `manifest.txt'.
 %% 
+%% The list of derived (unpacked) files belonging to the distribution
+%% and covered by LPPL is defined by the unpacking scripts (with
+%% extension .ins) which are part of the distribution.
 %% 
+%% Copyright 1994,1995,1996,2001,2005,2006 TeX Users Group.
+%%
+%% This file is part of the tugboat package.
+%%
+%% This work may be distributed and/or modified under the
+%% conditions of the LaTeX Project Public License, either version 1.3
+%% of this license or (at your option) any later version.
+%% The latest version of this license is in
+%%   http://www.latex-project.org/lppl.txt
+%% and version 1.3 or later is part of all distributions of LaTeX
+%% version 2003/12/01 or later.
+%%
+%% This work has the LPPL maintenance status "maintained".
+%%
+%% The Current Maintainer of this work is the TeX Users Group
+%% (http://tug.org/TUGboat).
+%%
+%% The list of all files belonging to the distribution is
+%% given in the file `manifest.txt'.
+%%
+%% The list of derived (unpacked) files belonging to the distribution
+%% and covered by LPPL is defined by the unpacking scripts (with
+%% extension .ins) which are part of the distribution.
 \NeedsTeXFormat{LaTeX2e}[1994/12/01]
 \ProvidesClass  {ltugboat}
-                   [2004/07/06 v1.6
+                   [2006/05/05 v2.0
                        TUGboat journal class%
                    ]
 \csname tugstyloaded@\endcsname
@@ -147,21 +182,32 @@
     {$\mathcal{M}$}\kern-.125em$\mathcal{S}$}
 \def\AmSLaTeX{\AmS-\LaTeX}
 \def\AmSTeX{\AmS-\TeX}
+\def\ANSI{\acro{ANSI}}
+\def\ASCII{\acro{ASCII}}
 \def\aw{A\kern.1em-W}
 \def\AW{Addison\kern.1em-\penalty\z@\hskip\z@skip Wesley}
 \def\BibTeX{\textsc{Bib}\kern-.08em\TeX}
 \def\CandT{\textsl{Computers \& Typesetting}}
 \newcommand\ConTeXt{C\kern-.0333emon\-\kern-.0667em\TeX\kern-.0333emt}
 \newcommand\Cplusplus{C\raisebox{.7ex}{$_{++}$}}
+\def\CSS{\acro{CSS}}
 \def\CTAN{\acro{CTAN}}
 \def\DTD{\acro{DTD}}
+\def\DVD{\acro{DVD}}
+\def\DVIPDFMx{\acro{DVIPDFM}$x$}
 \def\DVItoVDU{DVIto\kern-.12em VDU}
 \DeclareRobustCommand\eTeX{\ensuremath{\varepsilon}-\kern-.125em\TeX}
+\def\FAQ{\acro{FAQ}}
+\def\FTP{\acro{FTP}}
 \def\Ghostscript{Ghost\-script}
+\def\GNU{\acro{GNU}}
+\def\GUI{\acro{GUI}}
 \def\Hawaii{Hawai`i}
 \def\HTML{\acro{HTML}}
+\def\HTTP{\acro{HTTP}}
 \def\ISBN{\acro{ISBN}}
 \def\ISSN{\acro{ISSN}}
+\def\JPEG{\acro{JPEG}}
 \def\JTeX{\leavevmode\hbox{\lower.5ex\hbox{J}\kern-.18em\TeX}}
 \def\JoT{\textsl{The Joy of \TeX}}
 \def\LAMSTeX{L\raise.42ex\hbox{\kern-.3em
@@ -179,8 +225,8 @@
                             A}%
                       \vss}%
         }}
-\def\MathML{Math\acro{ML}}
 \def\MacOSX{Mac\,\acro{OS\,X}}
+\def\MathML{Math\acro{ML}}
 \def\Mc{\setbox\TestBox=\hbox{M}M\vbox
    to\ht\TestBox{\hbox{c}\vfil}} %  for Robert McGaffey
 \def\mf{\textsc{Metafont}}
@@ -195,23 +241,27 @@
 \def\mtex{T\kern-.1667em\lower.424ex\hbox{\^E}\kern-.125emX\@}
 \DeclareRobustCommand\NTS{\ensuremath{\mathcal{N}\mkern-4mu
   \raisebox{-0.5ex}{$\mathcal{T}$}\mkern-2mu \mathcal{S}}}
+\def\Pas{Pascal}
 \def\pcMF{\leavevmode\raise.5ex\hbox{p\kern-.3\p@ c}MF\@}
 \def\PCTeX{PC\thinspace\TeX}
 \def\pcTeX{\leavevmode\raise.5ex\hbox{p\kern-.3\p@ c}\TeX}
-\def\Pas{Pascal}
+\def\PDF{\acro{PDF}}
 \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 }
 \def\PS{{Post\-Script}}
+\def\RTF{\acro{RTF}}
 \def\SC{Steering Committee}
 \def\SGML{\acro{SGML}}
 \def\SliTeX{\textrm{S\kern-.06em\textsc{l\kern-.035emi}%
                      \kern-.06em\TeX}}
- \def\slMF{\textsl{\MF}} % should never be used
- \def\stTeX{\textsc{st}\kern-0.13em\TeX}
+\def\slMF{\textsl{\MF}} % should never be used
+\def\stTeX{\textsc{st}\kern-0.13em\TeX}
 \def\TANGLE{\texttt{TANGLE}\@}
 \def\TB{\textsl{The \TeX book}}
+\def\TIFF{\acro{TIFF}}
 \def\TP{\textsl{\TeX}: \textsl{The Program}}
 \DeclareRobustCommand\TeX{T\kern-.1667em\lower.424ex\hbox{E}\kern-.125emX\@}
 \def\TeXhax{\TeX hax}
@@ -235,6 +285,24 @@
 \def\XML{\acro{XML}}
 \def\WEB{\texttt{WEB}\@}
 \def\WEAVE{\texttt{WEAVE}\@}
+\def\tubreflect#1{%
+  \@ifundefined{reflectbox}{%
+    \TBerror{A graphics package must be loaded for \string\XeTeX}%
+  }{%
+    \ifdim \fontdimen1\font>0pt
+      \raise 1.75ex \hbox{\kern.1em\rotatebox{180}{#1}}\kern-.1em
+    \else
+      \reflectbox{#1}%
+    \fi
+  }%
+}
+\def\tubhideheight#1{\setbox0=\hbox{#1}\ht0=0pt \dp0=0pt \box0 }
+\def\XeTeX{\leavevmode
+  \tubhideheight{\hbox{X%
+    \lower.5ex \hbox{\kern-.125em\tubreflect{E}}%
+    \kern-.1667em \TeX}}}
+\def\XHTML{\acro{XHTML}}
+\def\XSLT{\acro{XSLT}}
 \newlinechar=`\^^J
 \normallineskiplimit=\p@
 \clubpenalty=10000
@@ -354,9 +422,9 @@
 \def\nth#1{%
     \def\reserved@a##1##2\@nil{\ifcat##1n%
            0%
-   \let\reserved@b\ensuremath
+          \let\reserved@b\ensuremath
       \else##1##2%
-   \let\reserved@b\relax
+          \let\reserved@b\relax
       \fi}%
     \TestCount=\reserved@a#1\@nil\relax
     \ifnum\TestCount <0 \multiply\TestCount by\m@ne \fi % subdue negatives
@@ -374,7 +442,7 @@
                         \or   rd%                3rd
                         \else th%                nth
                         \fi}%
-     }
+}
 \def\Review{\@ifnextchar:{\@Review}{\@Review:}}
 \def\@Review:{\@ifnextchar[%]
   {\@Rev}%
@@ -385,11 +453,11 @@
   \def\revauth##1{\def\therevauth{##1, }\ignorespaces}%
   \def\revtitle##1{\def\therevtitle{{\slshape##1}. }\ignorespaces}%
   \def\revpubinfo##1{\def\therevpubinfo{##1.}\ignorespaces}%
-  }
+}
 \def\endreviewitem{{\noindent\interlinepenalty=10000
   \therevauth\therevtitle\therevpubinfo\endgraf}%
   \vskip\medskipamount
-  }
+}
 \def\booktitle#1{{\slshape#1\/}}
 \newcount\issueseqno            \issueseqno=-1
 \def\v@lx{\gdef\volx{Volume~\volno~(\volyr), No.~\issno}}
@@ -442,6 +510,14 @@
 \def\TBEnableRemarks{\let\TBremark\@TBremark}
 \def\TUBedit#1{}
 \def\TUBfilename#1#2{\expandafter\def\csname file@@#1\endcsname{#2}}
+\newread\@altfilenames
+\def\@readFLN{\immediate\openin\@altfilenames=\jobname.fln
+  \ifeof\@altfilenames\let\@result\relax\else
+  \def\@result{\@@input\jobname.fln }\fi
+  \immediate\closein\@altfilenames
+  \@result}
+\@readFLN
+\everyjob=\expandafter{\the\everyjob\@readFLN}
 \InputIfFileExists{\jobname.fln}%
      {\TBInfo{Reading alternative file file \jobname.fln}}{}
 \def\@tubfilename#1{\expandafter\ifx\csname file@@#1\endcsname\relax
@@ -468,21 +544,31 @@
 \def\xreftoOFF#1{???}
 \let\xrefto=\xreftoOFF
 \let\TBdriver\gobble
-\hyphenation{Dijk-stra Eijk-hout Hara-lam-bous
-  Doc-Book Flor-i-da Ghost-script Ghost-view Open-Type Pfa-Edit
-  Post-Script True-Type
-  ap-pen-dix
-  bit-map bit-mapped bit-maps bool-ean
-  col-umns
+\hyphenation{Del-a-ware Dijk-stra Duane Eijk-hout
+  Flor-i-da Free-BSD Ghost-script Ghost-view
+  Hara-lam-bous Jac-kow-ski Karls-ruhe
+  Mac-OS Math-Sci-Net
+  Net-BSD Open-BSD Open-Office
+  Pfa-Edit Post-Script Rich-ard Skoup South-all
+  VM-ware Win-Edt
+  acro-nym ap-pen-dix asyn-chro-nous
+  bit-map bit-mapped bit-maps buf-fer buf-fers bool-ean
+  col-umns cus-tom-iz-able
   data-base data-bases
+   de-riv-a-tive de-riv-a-tives de-riv-a-ble der-i-va-tion
   fall-ing
   half-way
+  key-note
   long-est
   ma-gyar man-u-script man-u-scripts
-  over-view
-  par-a-digm par-a-digm-atic par-a-digms
+  off-line over-view
+  pal-ettes par-a-digm par-a-dig-mat-ic par-a-digms
+   pipe-line pipe-lines
+   plug-in plug-ins pro-gram-mable
   se-vere-ly spell-ing spell-ings stand-alone strong-est
+   sub-ex-pres-sion syn-chro-ni-city syn-chro-nous
   time-stamp time-stamped
+  vis-ual vis-ual-ly
   which-ever white-space white-spaces wide-spread wrap-around
 }
 \PrelimDrafttrue
@@ -517,6 +603,8 @@
 \DeclareLaTeXLogo{cmss}{bx}n{.3}{.15}
 \DeclareLaTeXLogo{cmr}m{it}{.3}{.27}
 \DeclareLaTeXLogo{cmr}{bx}{it}{.3}{.27}
+\DeclareLaTeXLogo{bch}{m}{n}{.2}{.08}
+\DeclareLaTeXLogo{bch}{m}{it}{.2}{.08}
 \DeclareRobustCommand\LaTeX{\expandafter\let\expandafter\reserved@a
   \csname @LaTeX@\f@family/\f@series/\f@shape\endcsname
   \ifx\reserved@a\relax\let\reserved@a\@LaTeX@default\fi
@@ -733,7 +821,7 @@
 \def\secsep{\vskip 5\baselineskip}
 \newdimen\stbaselineskip        \stbaselineskip=18\p@
 \newdimen\stfontheight
- \settoheight{\stfontheight}{\sectitlefont O}
+\settoheight{\stfontheight}{\sectitlefont O}
 \newif\ifSecTitle
 \SecTitlefalse
 \newif\ifWideSecTitle
@@ -848,20 +936,20 @@
   \def\section{\TB@startsection{{section}%
                                 1%
                                 \z@
-                                {-8\p@}%
-                                {4\p@}%
+                                {-8\p@\@plus-2\p@\@minus-2\p@}%
+                                {4\p@\@plus.5\p@}%
           {\normalsize\bf\raggedright\hyphenpenalty=\@M}}}
   \def\subsection{\TB@startsection{{subsection}%
                                    2%
                                    \z@
-                                   {-8\p@}%
-                                   {4\p@}%
+                                   {-8\p@\@plus-2\p@\@minus-2\p@}%
+                                   {4\p@\@plus.5\p@}%
           {\normalsize\bf\raggedright\hyphenpenalty=\@M}}}
   \def\subsubsection{\TB@startsection{{subsubsection}%
                                       3%
                                       \z@
-                                      {-8\p@}%
-                                      {4\p@}%
+                                      {-8\p@\@plus-2\p@\@minus-2\p@}%
+                                      {4\p@\@plus.5\p@}%
           {\normalsize\bf\raggedright\hyphenpenalty=\@M}}}
   \def\paragraph{\TB@startsection{{paragraph}%
                                   4%
@@ -875,29 +963,37 @@
                \TB@startsection{{section}%
                                 1%
                                 \z@
-                                {-8\p@}%
-                                {4\p@}%
+                                {-8\p@\@plus-2\p@\@minus-2\p@}%
+                                {4\p@\@plus.5\p@}%
           {\normalsize\bf\raggedright\hyphenpenalty=\@M}}}
   \def\subsection{\TB@nolimelabel
                   \TB@startsection{{subsection}%
                                    2%
                                    \z@
-                                   {-8\p@}%
+                                   {-8\p@\@plus-2\p@\@minus-2\p@}%
                                    {-0.5em\@plus-\fontdimen3\font}%
           {\normalsize\bf\raggedright\hyphenpenalty=\@M}}}
   \def\subsubsection{\TB@nolimelabel
                      \TB@startsection{{subsubsection}%
                                       3%
                                       \parindent
-                                      {-8\p@}%
+                                      {-8\p@\@plus-2\p@\@minus-2\p@}%
                                       {-0.5em\@plus-\fontdimen3\font}%
           {\normalsize\bf\raggedright\hyphenpenalty=\@M}}}
 \fi
-\def\TB@startsection#1{\@ifstar
-  {\TBWarning{*-form of \expandafter\string\csname\@firstofsix#1%
-              \endcsname\space inappropriate}%
-   \@startsection#1}%
-  {\@startsection#1}}
+\if@numbersec
+  \def\TB@startsection#1{\@startsection#1}%
+\else
+  \def\TB@startsection#1{%
+    \@ifstar
+      {\TBWarning{*-form of \expandafter\string\csname\@firstofsix#1%
+                  \endcsname\space
+                  \MessageBreak
+                  conflicts with nonumber class option}%
+       \@startsection#1}%
+      {\@startsection#1}%
+  }
+\fi
 \def\@firstofsix#1#2#3#4#5#6{#1}
 \def\TB@safe@startsection#1{\@startsection#1}
 \newenvironment{SafeSection}%
@@ -983,12 +1079,13 @@
 \long\def\@firstofthree#1#2#3{#1}
 \long\def\@secondofthree#1#2#3{#2}
 \long\def\@thirdofthree#1#2#3{#3}
-\long\def\@makecaption#1#2{%
+\def\@makecaption#1#2{%
   \vskip\abovecaptionskip
-  \sbox\@tempboxa{#1: #2}%
+  \def\@makecaptiontext{\small \parindent=1em\noindent #1: #2}%
+  \setbox\@tempboxa=\vbox{\@makecaptiontext\par}%
   \ifdim \wd\@tempboxa >\hsize
     \raggedright\hyphenpenalty=\@M
-    #1: #2\par
+    \@makecaptiontext
   \else
     \global \@minipagefalse
     \hb@xt@\hsize{\hfil\box\@tempboxa\hfil}%
@@ -1209,7 +1306,6 @@
 \def\topregister{\ttopregister}
 \def\botregister{\tbotregister}
 \def \rtitlex{\def\texttub##1{{\normalsize\textrm{##1}}}\TUB, \volx }
-
 \def\PrelimDraftfooter{%
   \dlap{\kern\textheight\kern3pc
         \rlap{\hb@xt@\pagewd{\midrtitle\hfil\midrtitle}}
@@ -1261,7 +1357,7 @@
             \small\SMC@unknown@warning
  \fi\fi\fi\fi\fi\fi\fi\fi\fi\fi
 }
-\newcommand\SMC@unknown@warning{\TBWarning{\string\SMC: unrecognised
+\newcommand\SMC@unknown@warning{\TBWarning{\string\SMC: nonstandard
     text font size command -- using \string\small}}
 \newcommand\textSMC[1]{{\SMC #1}}
 \newcommand\acro[1]{\textSMC{#1}\@}
@@ -1310,7 +1406,7 @@
 %%   #1%
 %% }
 
-\def\fnum@figure{{\bf Figure \thefigure}}
+\def\fnum@figure{{\small\bf Figure \thefigure}}
 \if@Harvardcite
   \AtBeginDocument{%
     \bibliographystyle{ltugbib}%
diff --git a/Master/texmf-dist/tex/latex/tugboat/ltugboat.sty b/Master/texmf-dist/tex/latex/tugboat/ltugboat.sty
index b6443966f48..a1e3f406310 100644
--- a/Master/texmf-dist/tex/latex/tugboat/ltugboat.sty
+++ b/Master/texmf-dist/tex/latex/tugboat/ltugboat.sty
@@ -6,20 +6,55 @@
 %%
 %% tugboat.dtx  (with options: `ltugboatsty')
 %% 
-%% Copyright (C) 1994,1995,1996,2001 TeX Users Group
-%% All rights reserved.
+%% This is a generated file.
 %% 
-%% This file is part of the tugboat package.
-%% -----------------------------------------
+%% Copyright 1994,1995,1996,2001,2005,2006 TeX Users Group.
+%% 
+%% It may be distributed and/or modified under the
+%% conditions of the LaTeX Project Public License, either version 1.3
+%% of this license or (at your option) any later version.
+%% The latest version of this license is in
+%%    http://www.latex-project.org/lppl.txt
+%% and version 1.3 or later is part of all distributions of LaTeX
+%% version 2003/12/01 or later.
+%% 
+%% This file has the LPPL maintenance status "maintained".
 %% 
-%% This is a generated file.  Permission is granted to customize the
-%% declarations in this file to serve the needs of your installation.
-%% However, no permission is granted to distribute a modified version of
-%% this file under its original name.
+%% The Current Maintainer of this work is the TeX Users Group
+%% (http://tug.org/TUGboat).
 %% 
+%% The list of all files belonging to the distribution is given in the file
+%% `manifest.txt'.
 %% 
+%% The list of derived (unpacked) files belonging to the distribution
+%% and covered by LPPL is defined by the unpacking scripts (with
+%% extension .ins) which are part of the distribution.
+%% 
+%% Copyright 1994,1995,1996,2001,2005,2006 TeX Users Group.
+%%
+%% This file is part of the tugboat package.
+%%
+%% This work may be distributed and/or modified under the
+%% conditions of the LaTeX Project Public License, either version 1.3
+%% of this license or (at your option) any later version.
+%% The latest version of this license is in
+%%   http://www.latex-project.org/lppl.txt
+%% and version 1.3 or later is part of all distributions of LaTeX
+%% version 2003/12/01 or later.
+%%
+%% This work has the LPPL maintenance status "maintained".
+%%
+%% The Current Maintainer of this work is the TeX Users Group
+%% (http://tug.org/TUGboat).
+%%
+%% The list of all files belonging to the distribution is
+%% given in the file `manifest.txt'.
+%%
+%% The list of derived (unpacked) files belonging to the distribution
+%% and covered by LPPL is defined by the unpacking scripts (with
+%% extension .ins) which are part of the distribution.
 \ProvidesPackage{ltugboat}
-                   [2004/07/06 v1.6
+                   [2006/05/05 v2.0
            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 3f9bdc47bf2..a3b82056f30 100644
--- a/Master/texmf-dist/tex/latex/tugboat/ltugcomn.sty
+++ b/Master/texmf-dist/tex/latex/tugboat/ltugcomn.sty
@@ -6,21 +6,56 @@
 %%
 %% tugboat.dtx  (with options: `common,latex,latex2e,ltugcomn')
 %% 
-%% Copyright (C) 1994,1995,1996,2001 TeX Users Group
-%% All rights reserved.
+%% This is a generated file.
 %% 
-%% This file is part of the tugboat package.
-%% -----------------------------------------
+%% Copyright 1994,1995,1996,2001,2005,2006 TeX Users Group.
+%% 
+%% It may be distributed and/or modified under the
+%% conditions of the LaTeX Project Public License, either version 1.3
+%% of this license or (at your option) any later version.
+%% The latest version of this license is in
+%%    http://www.latex-project.org/lppl.txt
+%% and version 1.3 or later is part of all distributions of LaTeX
+%% version 2003/12/01 or later.
+%% 
+%% This file has the LPPL maintenance status "maintained".
 %% 
-%% This is a generated file.  Permission is granted to customize the
-%% declarations in this file to serve the needs of your installation.
-%% However, no permission is granted to distribute a modified version of
-%% this file under its original name.
+%% The Current Maintainer of this work is the TeX Users Group
+%% (http://tug.org/TUGboat).
 %% 
+%% The list of all files belonging to the distribution is given in the file
+%% `manifest.txt'.
 %% 
+%% The list of derived (unpacked) files belonging to the distribution
+%% and covered by LPPL is defined by the unpacking scripts (with
+%% extension .ins) which are part of the distribution.
+%% 
+%% Copyright 1994,1995,1996,2001,2005,2006 TeX Users Group.
+%%
+%% This file is part of the tugboat package.
+%%
+%% This work may be distributed and/or modified under the
+%% conditions of the LaTeX Project Public License, either version 1.3
+%% of this license or (at your option) any later version.
+%% The latest version of this license is in
+%%   http://www.latex-project.org/lppl.txt
+%% and version 1.3 or later is part of all distributions of LaTeX
+%% version 2003/12/01 or later.
+%%
+%% This work has the LPPL maintenance status "maintained".
+%%
+%% The Current Maintainer of this work is the TeX Users Group
+%% (http://tug.org/TUGboat).
+%%
+%% The list of all files belonging to the distribution is
+%% given in the file `manifest.txt'.
+%%
+%% The list of derived (unpacked) files belonging to the distribution
+%% and covered by LPPL is defined by the unpacking scripts (with
+%% extension .ins) which are part of the distribution.
 \NeedsTeXFormat{LaTeX2e}[1994/12/01]
    \ProvidesPackage{ltugcomn}
-                   [2004/07/06 v1.6
+                   [2006/05/05 v2.0
                           TUGboat `common macros' package%
                    ]
 \IfFileExists{mflogo.sty}%
@@ -92,21 +127,32 @@
     {$\mathcal{M}$}\kern-.125em$\mathcal{S}$}
 \def\AmSLaTeX{\AmS-\LaTeX}
 \def\AmSTeX{\AmS-\TeX}
+\def\ANSI{\acro{ANSI}}
+\def\ASCII{\acro{ASCII}}
 \def\aw{A\kern.1em-W}
 \def\AW{Addison\kern.1em-\penalty\z@\hskip\z@skip Wesley}
 \def\BibTeX{\textsc{Bib}\kern-.08em\TeX}
 \def\CandT{\textsl{Computers \& Typesetting}}
 \newcommand\ConTeXt{C\kern-.0333emon\-\kern-.0667em\TeX\kern-.0333emt}
 \newcommand\Cplusplus{C\raisebox{.7ex}{$_{++}$}}
+\def\CSS{\acro{CSS}}
 \def\CTAN{\acro{CTAN}}
 \def\DTD{\acro{DTD}}
+\def\DVD{\acro{DVD}}
+\def\DVIPDFMx{\acro{DVIPDFM}$x$}
 \def\DVItoVDU{DVIto\kern-.12em VDU}
 \DeclareRobustCommand\eTeX{\ensuremath{\varepsilon}-\kern-.125em\TeX}
+\def\FAQ{\acro{FAQ}}
+\def\FTP{\acro{FTP}}
 \def\Ghostscript{Ghost\-script}
+\def\GNU{\acro{GNU}}
+\def\GUI{\acro{GUI}}
 \def\Hawaii{Hawai`i}
 \def\HTML{\acro{HTML}}
+\def\HTTP{\acro{HTTP}}
 \def\ISBN{\acro{ISBN}}
 \def\ISSN{\acro{ISSN}}
+\def\JPEG{\acro{JPEG}}
 \def\JTeX{\leavevmode\hbox{\lower.5ex\hbox{J}\kern-.18em\TeX}}
 \def\JoT{\textsl{The Joy of \TeX}}
 \def\LAMSTeX{L\raise.42ex\hbox{\kern-.3em
@@ -124,8 +170,8 @@
                             A}%
                       \vss}%
         }}
-\def\MathML{Math\acro{ML}}
 \def\MacOSX{Mac\,\acro{OS\,X}}
+\def\MathML{Math\acro{ML}}
 \def\Mc{\setbox\TestBox=\hbox{M}M\vbox
    to\ht\TestBox{\hbox{c}\vfil}} %  for Robert McGaffey
 \def\mf{\textsc{Metafont}}
@@ -140,23 +186,27 @@
 \def\mtex{T\kern-.1667em\lower.424ex\hbox{\^E}\kern-.125emX\@}
 \DeclareRobustCommand\NTS{\ensuremath{\mathcal{N}\mkern-4mu
   \raisebox{-0.5ex}{$\mathcal{T}$}\mkern-2mu \mathcal{S}}}
+\def\Pas{Pascal}
 \def\pcMF{\leavevmode\raise.5ex\hbox{p\kern-.3\p@ c}MF\@}
 \def\PCTeX{PC\thinspace\TeX}
 \def\pcTeX{\leavevmode\raise.5ex\hbox{p\kern-.3\p@ c}\TeX}
-\def\Pas{Pascal}
+\def\PDF{\acro{PDF}}
 \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 }
 \def\PS{{Post\-Script}}
+\def\RTF{\acro{RTF}}
 \def\SC{Steering Committee}
 \def\SGML{\acro{SGML}}
 \def\SliTeX{\textrm{S\kern-.06em\textsc{l\kern-.035emi}%
                      \kern-.06em\TeX}}
- \def\slMF{\textsl{\MF}} % should never be used
- \def\stTeX{\textsc{st}\kern-0.13em\TeX}
+\def\slMF{\textsl{\MF}} % should never be used
+\def\stTeX{\textsc{st}\kern-0.13em\TeX}
 \def\TANGLE{\texttt{TANGLE}\@}
 \def\TB{\textsl{The \TeX book}}
+\def\TIFF{\acro{TIFF}}
 \def\TP{\textsl{\TeX}: \textsl{The Program}}
 \DeclareRobustCommand\TeX{T\kern-.1667em\lower.424ex\hbox{E}\kern-.125emX\@}
 \def\TeXhax{\TeX hax}
@@ -180,6 +230,24 @@
 \def\XML{\acro{XML}}
 \def\WEB{\texttt{WEB}\@}
 \def\WEAVE{\texttt{WEAVE}\@}
+\def\tubreflect#1{%
+  \@ifundefined{reflectbox}{%
+    \TBerror{A graphics package must be loaded for \string\XeTeX}%
+  }{%
+    \ifdim \fontdimen1\font>0pt
+      \raise 1.75ex \hbox{\kern.1em\rotatebox{180}{#1}}\kern-.1em
+    \else
+      \reflectbox{#1}%
+    \fi
+  }%
+}
+\def\tubhideheight#1{\setbox0=\hbox{#1}\ht0=0pt \dp0=0pt \box0 }
+\def\XeTeX{\leavevmode
+  \tubhideheight{\hbox{X%
+    \lower.5ex \hbox{\kern-.125em\tubreflect{E}}%
+    \kern-.1667em \TeX}}}
+\def\XHTML{\acro{XHTML}}
+\def\XSLT{\acro{XSLT}}
 \newlinechar=`\^^J
 \normallineskiplimit=\p@
 \clubpenalty=10000
@@ -299,9 +367,9 @@
 \def\nth#1{%
     \def\reserved@a##1##2\@nil{\ifcat##1n%
            0%
-   \let\reserved@b\ensuremath
+          \let\reserved@b\ensuremath
       \else##1##2%
-   \let\reserved@b\relax
+          \let\reserved@b\relax
       \fi}%
     \TestCount=\reserved@a#1\@nil\relax
     \ifnum\TestCount <0 \multiply\TestCount by\m@ne \fi % subdue negatives
@@ -319,7 +387,7 @@
                         \or   rd%                3rd
                         \else th%                nth
                         \fi}%
-     }
+}
 \def\Review{\@ifnextchar:{\@Review}{\@Review:}}
 \def\@Review:{\@ifnextchar[%]
   {\@Rev}%
@@ -330,11 +398,11 @@
   \def\revauth##1{\def\therevauth{##1, }\ignorespaces}%
   \def\revtitle##1{\def\therevtitle{{\slshape##1}. }\ignorespaces}%
   \def\revpubinfo##1{\def\therevpubinfo{##1.}\ignorespaces}%
-  }
+}
 \def\endreviewitem{{\noindent\interlinepenalty=10000
   \therevauth\therevtitle\therevpubinfo\endgraf}%
   \vskip\medskipamount
-  }
+}
 \def\booktitle#1{{\slshape#1\/}}
 \newcount\issueseqno            \issueseqno=-1
 \def\v@lx{\gdef\volx{Volume~\volno~(\volyr), No.~\issno}}
@@ -387,6 +455,14 @@
 \def\TBEnableRemarks{\let\TBremark\@TBremark}
 \def\TUBedit#1{}
 \def\TUBfilename#1#2{\expandafter\def\csname file@@#1\endcsname{#2}}
+\newread\@altfilenames
+\def\@readFLN{\immediate\openin\@altfilenames=\jobname.fln
+  \ifeof\@altfilenames\let\@result\relax\else
+  \def\@result{\@@input\jobname.fln }\fi
+  \immediate\closein\@altfilenames
+  \@result}
+\@readFLN
+\everyjob=\expandafter{\the\everyjob\@readFLN}
 \InputIfFileExists{\jobname.fln}%
      {\TBInfo{Reading alternative file file \jobname.fln}}{}
 \def\@tubfilename#1{\expandafter\ifx\csname file@@#1\endcsname\relax
@@ -413,23 +489,51 @@
 \def\xreftoOFF#1{???}
 \let\xrefto=\xreftoOFF
 \let\TBdriver\gobble
-\hyphenation{Dijk-stra Eijk-hout Hara-lam-bous
-  Doc-Book Flor-i-da Ghost-script Ghost-view Open-Type Pfa-Edit
-  Post-Script True-Type
-  ap-pen-dix
-  bit-map bit-mapped bit-maps bool-ean
-  col-umns
+\hyphenation{Del-a-ware Dijk-stra Duane Eijk-hout
+  Flor-i-da Free-BSD Ghost-script Ghost-view
+  Hara-lam-bous Jac-kow-ski Karls-ruhe
+  Mac-OS Math-Sci-Net
+  Net-BSD Open-BSD Open-Office
+  Pfa-Edit Post-Script Rich-ard Skoup South-all
+  VM-ware Win-Edt
+  acro-nym ap-pen-dix asyn-chro-nous
+  bit-map bit-mapped bit-maps buf-fer buf-fers bool-ean
+  col-umns cus-tom-iz-able
   data-base data-bases
+   de-riv-a-tive de-riv-a-tives de-riv-a-ble der-i-va-tion
   fall-ing
   half-way
+  key-note
   long-est
   ma-gyar man-u-script man-u-scripts
-  over-view
-  par-a-digm par-a-digm-atic par-a-digms
+  off-line over-view
+  pal-ettes par-a-digm par-a-dig-mat-ic par-a-digms
+   pipe-line pipe-lines
+   plug-in plug-ins pro-gram-mable
   se-vere-ly spell-ing spell-ings stand-alone strong-est
+   sub-ex-pres-sion syn-chro-ni-city syn-chro-nous
   time-stamp time-stamped
+  vis-ual vis-ual-ly
   which-ever white-space white-spaces wide-spread wrap-around
 }
+\DeclareRobustCommand\SMC{%
+  \ifx\@currsize\normalsize\small\else
+   \ifx\@currsize\small\footnotesize\else
+    \ifx\@currsize\footnotesize\scriptsize\else
+     \ifx\@currsize\large\normalsize\else
+      \ifx\@currsize\Large\large\else
+       \ifx\@currsize\LARGE\Large\else
+        \ifx\@currsize\scriptsize\tiny\else
+         \ifx\@currsize\tiny\tiny\else
+          \ifx\@currsize\huge\LARGE\else
+           \ifx\@currsize\Huge\huge\else
+            \small\SMC@unknown@warning
+ \fi\fi\fi\fi\fi\fi\fi\fi\fi\fi
+}
+\newcommand\SMC@unknown@warning{\TBWarning{\string\SMC: nonstandard
+    text font size command -- using \string\small}}
+\newcommand\textSMC[1]{{\SMC #1}}
+\newcommand\acro[1]{\textSMC{#1}\@}
 \endinput
 %%
 %% End of file `ltugcomn.sty'.
diff --git a/Master/texmf-dist/tex/latex/tugboat/ltugproc.cls b/Master/texmf-dist/tex/latex/tugboat/ltugproc.cls
index 83211deeaa4..74c20ca9bbe 100644
--- a/Master/texmf-dist/tex/latex/tugboat/ltugproc.cls
+++ b/Master/texmf-dist/tex/latex/tugboat/ltugproc.cls
@@ -6,21 +6,56 @@
 %%
 %% tugboat.dtx  (with options: `ltugproccls')
 %% 
-%% Copyright (C) 1994,1995,1996,2001 TeX Users Group
-%% All rights reserved.
+%% This is a generated file.
 %% 
-%% This file is part of the tugboat package.
-%% -----------------------------------------
+%% Copyright 1994,1995,1996,2001,2005,2006 TeX Users Group.
+%% 
+%% It may be distributed and/or modified under the
+%% conditions of the LaTeX Project Public License, either version 1.3
+%% of this license or (at your option) any later version.
+%% The latest version of this license is in
+%%    http://www.latex-project.org/lppl.txt
+%% and version 1.3 or later is part of all distributions of LaTeX
+%% version 2003/12/01 or later.
+%% 
+%% This file has the LPPL maintenance status "maintained".
+%% 
+%% The Current Maintainer of this work is the TeX Users Group
+%% (http://tug.org/TUGboat).
 %% 
-%% This is a generated file.  Permission is granted to customize the
-%% declarations in this file to serve the needs of your installation.
-%% However, no permission is granted to distribute a modified version of
-%% this file under its original name.
+%% The list of all files belonging to the distribution is given in the file
+%% `manifest.txt'.
 %% 
+%% The list of derived (unpacked) files belonging to the distribution
+%% and covered by LPPL is defined by the unpacking scripts (with
+%% extension .ins) which are part of the distribution.
 %% 
+%% Copyright 1994,1995,1996,2001,2005,2006 TeX Users Group.
+%%
+%% This file is part of the tugboat package.
+%%
+%% This work may be distributed and/or modified under the
+%% conditions of the LaTeX Project Public License, either version 1.3
+%% of this license or (at your option) any later version.
+%% The latest version of this license is in
+%%   http://www.latex-project.org/lppl.txt
+%% and version 1.3 or later is part of all distributions of LaTeX
+%% version 2003/12/01 or later.
+%%
+%% This work has the LPPL maintenance status "maintained".
+%%
+%% The Current Maintainer of this work is the TeX Users Group
+%% (http://tug.org/TUGboat).
+%%
+%% The list of all files belonging to the distribution is
+%% given in the file `manifest.txt'.
+%%
+%% The list of derived (unpacked) files belonging to the distribution
+%% and covered by LPPL is defined by the unpacking scripts (with
+%% extension .ins) which are part of the distribution.
 \NeedsTeXFormat{LaTeX2e}[1994/12/01]
 \ProvidesClass  {ltugproc}
-                   [2004/07/06 v1.6
+                   [2006/05/05 v2.0
                        TUG conference proceedings class%
                    ]
 \def\@tugclass{ltugproc}
@@ -80,7 +115,7 @@
     \@gobble}
 \expandafter\ifx\csname ds@tug\tugProcYear\endcsname\relax
   \def\tugProcYear{2002}\fi
-\ExecuteOptions{nonumber,tug\tugProcYear,title\TUGprocExtraOptions}
+\ExecuteOptions{tug\tugProcYear,title\TUGprocExtraOptions}
 \ProcessOptions
 \if@proc@numbersec
   \if@proc@numerable
@@ -131,25 +166,29 @@
 \def\TITLEfont  {\Large\rmfamily\mdseries\upshape}
 \def\addressfont{\small\rmfamily\mdseries\upshape}
 \def\netaddrfont{\small\ttfamily\mdseries\upshape}
+\newskip\aboveauthorskip   \aboveauthorskip=18\p@ \@plus4\p@
+\newskip\belowauthorskip   \belowauthorskip=\aboveauthorskip
+\newskip\belowabstractskip \belowabstractskip=14\p@ \@plus3\p@ \@minus2\p@
 \def\@maketitle{%
    {\parskip\z@
     \TITLEfont\raggedright\noindent\@title\par
       \count@=0
       \loop
       \ifnum\count@<\authornumber
-        \vskip20\p@
+        \vskip\aboveauthorskip
         \advance\count@\@ne
         {\AUTHORfont\theauthor{\number\count@}\endgraf}%
         \addressfont\theaddress{\number\count@}\endgraf
         {%
           \allowhyphens
           \hangindent1.5pc
+          \frenchspacing
           \netaddrfont\thenetaddress{\number\count@}\endgraf
           \hangindent1.5pc
           \thePersonalURL{\number\count@}\endgraf
         }%
       \repeat
-   \vskip20\p@}%
+   \vskip\belowauthorskip}%
    \if@abstract
       \centerline{\bfseries Abstract}%
       \vskip.5\baselineskip\rmfamily
@@ -159,7 +198,7 @@
             \the\abstract@toks
       \endlist\global\@ignoretrue
    \fi
-   \vskip1pc
+   \vskip\belowabstractskip
    \global\@afterindentfalse\aftergroup\@afterheading
   }
 \newtoks\abstract@toks  \abstract@toks{}
@@ -200,6 +239,15 @@
   \fi}
 \def\@abstract@end{\ifnum0=`{\fi}%
   \expandafter\end\expandafter{\@abstract@}}
+\def\creditfootnote{\nomarkfootnote\xEdNote}
+\def\supportfootnote{\nomarkfootnote\relax}
+\gdef\nomarkfootnote#1#2{\begingroup
+  \def\thefootnote{}%
+  % no period, please, also no fnmark.
+  \def\@makefntext##1{##1}%
+  \footnotetext{\noindent #1#2}%
+  \endgroup
+}
 \renewcommand{\makesignature}{\TBWarning
          {\string\makesignature\space is invalid in proceedings issues}}
 \renewcommand\title{\@dblarg\TB@title}
diff --git a/Master/texmf-dist/tex/latex/tugboat/ltugproc.sty b/Master/texmf-dist/tex/latex/tugboat/ltugproc.sty
index c10c80062ce..8394d10646c 100644
--- a/Master/texmf-dist/tex/latex/tugboat/ltugproc.sty
+++ b/Master/texmf-dist/tex/latex/tugboat/ltugproc.sty
@@ -6,20 +6,55 @@
 %%
 %% tugboat.dtx  (with options: `ltugprocsty')
 %% 
-%% Copyright (C) 1994,1995,1996,2001 TeX Users Group
-%% All rights reserved.
+%% This is a generated file.
 %% 
-%% This file is part of the tugboat package.
-%% -----------------------------------------
+%% Copyright 1994,1995,1996,2001,2005,2006 TeX Users Group.
+%% 
+%% It may be distributed and/or modified under the
+%% conditions of the LaTeX Project Public License, either version 1.3
+%% of this license or (at your option) any later version.
+%% The latest version of this license is in
+%%    http://www.latex-project.org/lppl.txt
+%% and version 1.3 or later is part of all distributions of LaTeX
+%% version 2003/12/01 or later.
+%% 
+%% This file has the LPPL maintenance status "maintained".
 %% 
-%% This is a generated file.  Permission is granted to customize the
-%% declarations in this file to serve the needs of your installation.
-%% However, no permission is granted to distribute a modified version of
-%% this file under its original name.
+%% The Current Maintainer of this work is the TeX Users Group
+%% (http://tug.org/TUGboat).
 %% 
+%% The list of all files belonging to the distribution is given in the file
+%% `manifest.txt'.
 %% 
+%% The list of derived (unpacked) files belonging to the distribution
+%% and covered by LPPL is defined by the unpacking scripts (with
+%% extension .ins) which are part of the distribution.
+%% 
+%% Copyright 1994,1995,1996,2001,2005,2006 TeX Users Group.
+%%
+%% This file is part of the tugboat package.
+%%
+%% This work may be distributed and/or modified under the
+%% conditions of the LaTeX Project Public License, either version 1.3
+%% of this license or (at your option) any later version.
+%% The latest version of this license is in
+%%   http://www.latex-project.org/lppl.txt
+%% and version 1.3 or later is part of all distributions of LaTeX
+%% version 2003/12/01 or later.
+%%
+%% This work has the LPPL maintenance status "maintained".
+%%
+%% The Current Maintainer of this work is the TeX Users Group
+%% (http://tug.org/TUGboat).
+%%
+%% The list of all files belonging to the distribution is
+%% given in the file `manifest.txt'.
+%%
+%% The list of derived (unpacked) files belonging to the distribution
+%% and covered by LPPL is defined by the unpacking scripts (with
+%% extension .ins) which are part of the distribution.
 \ProvidesPackage{ltugproc}
-                   [2004/07/06 v1.6
+                   [2006/05/05 v2.0
            TUG compatibility package%
                    ]
 \@obsoletefile{ltugproc.cls}{ltugproc.sty}
diff --git a/Master/texmf-dist/tex/plain/tugboat/tugboat.cmn b/Master/texmf-dist/tex/plain/tugboat/tugboat.cmn
index e8b7b771cae..6543ca254d8 100644
--- a/Master/texmf-dist/tex/plain/tugboat/tugboat.cmn
+++ b/Master/texmf-dist/tex/plain/tugboat/tugboat.cmn
@@ -1,25 +1,27 @@
-%% @latexfile{
+%% @texfile{
 %%     filename   = "tugboat.cmn",
-%%     version    = "1.14",
-%%     date       = "2004/07/12",
-%%     time       = "13:43:50 EDT",
-%%     checksum   = "02352 1070 2988 34579",
+%%     version    = "1.17",
+%%     date       = "2006/05/24",
+%%     time       = "09:49:20 EDT",
+%%     checksum   = "53229 1060 3095 35854",
 %%     filetype   = "common macros for TUGboat",
-%%     copyright  = "Copyright (C) TeX Users Group.
-%%                   Copying of this file is authorized only if either:
-%%                   (1) you make absolutely no changes to your copy, OR
-%%                   (2) if you do make changes, you first rename it to some
-%%                       other name.",
+%%     copyright  = "Copyright 1993-1996, 2006 TeX Users Group.
+%%                   Unlimited copying and redistribution of this file
+%%                   are permitted as long as this file is not
+%%                   modified.  Modifications (and redistribution of
+%%                   modified versions) are also permitted, but only if
+%%                   the resulting file is renamed."
 %%     author     = "TeX Users Group",
 %%     address    = "TeX Users Group,
 %%                   P.O.Box 2311,
 %%                   Portland, OR 97208-2311,
 %%                   USA",
-%%     telephone  = "415-982-8449",
-%%     FAX        = "415-982-8559",
+%%     telephone  = "+1 503 223-9994",
+%%     FAX        = "+1 206 203-3960",
 %%     email      = "TUGboat@tug.org",
 %%     codetable  = "ISO/ASCII",
 %%     keywords   = "tex users group, tugboat, common macros",
+%%     supported  = "yes",
 %%     abstract   = "This file contains macros common to both
 %%                   the PLAIN and LaTeX style files for TUGboat,
 %%                   the Communications of the TeX Users Group.
@@ -36,8 +38,8 @@
 %%
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
-\def\fileversion{v1.14}
-\def\filedate{2004/07/12}
+\def\fileversion{v1.17}
+\def\filedate{2006/05/24}
 
 \message{File `TUGBOAT.CMN' \fileversion \space\space <\filedate>}
 
@@ -111,42 +113,43 @@
 \def\acro#1{{\SMC #1}\spacefactor1000 }
 
 \def\AllTeX{(\La)\TeX}
-
 \def\AMS{American Mathematical Society}
-
 \def\AmS{{\the\textfont2 A}\kern-.1667em\lower.5ex\hbox
         {\the\textfont2 M}\kern-.125em{\the\textfont2 S}}
 \def\AmSLaTeX{\AmS-\LaTeX}
 \def\AmSTeX{\AmS-\TeX}
-
+\def\ANSI{\acro{ANSI}}
+\def\ASCII{\acro{ASCII}}
 \def\aw{A\kern.1em-W}
 \def\AW{Addison\kern.1em-\penalty\z@\hskip\z@skip Wesley}
-
 \def\BibTeX{{\rm B\kern-.05em{\smc i\kern-.025emb}\kern-.08em\TeX}}
-
 \def\CandT{{\sl Computers \& Typesetting}}
 \def\ConTeXt{C\kern-.0333emon\-\kern-.0667em\TeX\kern-.0333emt}
+\def\Cplusplus{C\raise.7ex\hbox{$_{++}$}}
+\def\CSS{\acro{CSS}}
 \def\CTAN{\acro{CTAN}}
-
+\def\DTD{\acro{DTD}}
+\def\DVD{\acro{DVD}}
+\def\DVIPDFMx{\acro{DVIPDFM}$x$}
 \def\DVItoVDU{DVIto\kern-.12em VDU}
-
 \def\eTeX{$\varepsilon$-\kern-.125em\TeX}
-
+\def\FAQ{\acro{FAQ}}
+\def\FTP{\acro{FTP}}
+\def\Ghostscript{Ghost\-script}
+\def\GNU{\acro{GNU}}
+\def\GUI{\acro{GUI}}
 \def\Hawaii{Hawai`i}
 \def\HTML{\acro{HTML}}
-
-\def\ISBN{\acro{ISBN} }
-\def\ISSN{\acro{ISSN} }
-
+\def\HTTP{\acro{HTTP}}
+\def\ISBN{\acro{ISBN}}
+\def\ISSN{\acro{ISSN}}
+\def\JPEG{\acro{JPEG}}
 %       Japanese TeX
 \def\JTeX{\leavevmode\hbox{\lower.5ex\hbox{J}\kern-.18em\TeX}}
-
-\def\JoT{{\sl The Joy of \TeX}}
-
+\def\JoT{{\sl The Joy of \TeX\/}}
 \def\LAMSTeX{L\raise.42ex\hbox{\kern-.3em\the\scriptfont2 A}%
     \kern-.2em\lower.376ex\hbox{\the\textfont2 M}\kern-.125em
     {\the\textfont2 S}-\TeX}
-
 %       note -- \LaTeX definition is from LATEX.TEX 2.09 of 7 Jan 86,
 %               adapted for additional flexibility in TUGboat
 %\def\LaTeX{\TestCount=\the\fam \leavevmode L\raise.42ex
@@ -158,103 +161,77 @@
         \kern-.5\wd\TestBox\raise.42ex\box\TestBox}
 \def\LaTeX{\La\kern-.15em\TeX}
 \def\LaTeXe{\LaTeX{}\kern.05em2$_{\textstyle\varepsilon}$}
-
 \def\MathML{Math\acro{ML}}
 \def\MacOSX{Mac\,\acro{OS\,X}}
-
 %       for Robert McGaffey
 \def\Mc{\setbox\TestBox=\hbox{M}M\vbox to\ht\TestBox{\hbox{c}\vfil}}
-
+%  Additional sizes of the manual font may be needed.
 \font\manual=logo10 % font used for the METAFONT logo, etc.
 \def\MF{{\manual META}\-{\manual FONT}\spacefactor1000 }
 \def\MP{{\manual META}\-{\manual POST}\spacefactor1000 }
 \def\mf{{\smc Metafont}}
 \def\MFB{{\sl The \slMF book}}
-
 %       multilingual (INRS) TeX
 \def\mtex{T\kern-.1667em\lower.5ex\hbox{\^E}\kern-.125emX\spacefactor1000 }
-
 \def\NTStext{N\mkern-4mu \lower.5ex\hbox{$\cal T$}\mkern-2mu S}
 \def\NTS{{\ifmmode \cal\NTStext \else $\cal\NTStext $\fi}}
-
-\def\OCP{$\Omega$\acro{CP}}
-
-\def\PDF{\acro{PDF}}
-
+\def\OMEGA{$\Omega$}
+\def\OCP{\OMEGA\acro{CP}}
+\def\OTP{\OMEGA\acro{TP}}
+\def\Pas{Pascal}
 \def\pcMF{\leavevmode\raise.5ex\hbox{p\kern-.3ptc}MF\spacefactor1000 }
 \def\PCTeX{PC\thinspace\TeX}
 \def\pcTeX{\leavevmode\raise.5ex\hbox{p\kern-.3ptc}\TeX}
-
-\def\Pas{Pascal}
-
+\def\PDF{\acro{PDF}}
 \def\PiC{P\kern-.12em\lower.5ex\hbox{I}\kern-.075emC\spacefactor1000 }
 \def\PiCTeX{\PiC\kern-.11em\TeX}
-
 \def\plain{{\tt plain}}
-
+\def\PNG{\acro{PNG}}
 \def\POBox{P.\thinspace O.~Box }
-\def\POBoxTUG{\POBox\unskip~9506, Providence, RI~02940}
-
+%\def\POBoxTUG{\POBox\unskip~9506, Providence, RI~02940}
 \def\PS{{Post\-Script}}
-
+\def\RTF{\acro{RTF}}
 \def\SC{Steering Committee}
-
 \def\SGML{\acro{SGML}}
-
-\def\SliTeX{{\rm S\kern-.06em{\smc l\kern-.035emi}\kern-.06em\TeX}}
-
-\def\slMF{\MF}
-%       Use \font\manualsl=logosl10 instead, if it's available,
+\def\SliTeX{{\rm S\kern-.06em{\smc l\kern-.035emi}\kern-.06em\TeX}}\
 %       for \def\slMF{{\manualsl META}\-{\manualsl FONT}\spacefactor1000 }
-
+%       Use \font\manualsl=logosl10 instead, if it's available,
+\def\slMF{\MF}
 %       Atari ST (Klaus Guntermann)
 \def\stTeX{{\smc st\rm\kern-0.13em\TeX}}
-
 \def\TANGLE{{\tt TANGLE}\spacefactor1000 }
-
-\def\TB{{\sl The \TeX book}}
+\def\TB{{\sl The \TeX book\/}}
+\def\TIFF{\acro{TIFF}}
 \def\TP{{\sl \TeX\/}: {\sl The Program\/}}
-
 \def\TeX{T\kern-.1667em\lower.424ex\hbox{E}\kern-.125emX\spacefactor1000 }
-
 \def\TeXhax{\TeX hax}
-
 %       Don Hosek
 \def\TeXMaG{\TeX M\kern-.1667em\lower.5ex\hbox{A}\kern-.2267emG%
         \spacefactor1000 }
-
 %\def\TeXtures{\TestCount=\the\fam
 %       \TeX\-\hbox{$\fam\TestCount\scriptstyle TURES$}}
 \def\TeXtures{{\it Textures}}
 \let\Textures=\TeXtures
-
 \def\TeXXeT{\TeX-{}-\XeT}
-
 \def\Thanh{H\`an~Th\^e\llap{\raise.5ex\hbox{\'{}}}~Th\`anh}
-
 \def\ttn{{\sl TTN}\spacefactor1000 }
 \def\TTN{{\sl \TeX{} and TUG NEWS}\spacefactor1000 }
-
 \def\tubfont{\sl}               % redefined in other situations
 \def\TUB{{\tubfont TUGboat\/}}
-
 \def\TUG{\TeX\ \UG}
-
+\def\tug{\acro{TUG}}
 \def\UG{Users Group}
-
 \def\UNIX{\acro{UNIX}}
-
 \def\VAX{V\kern-.12em A\kern-.1em X\spacefactor1000 }
-
 \def\VorTeX{V\kern-2.7pt\lower.5ex\hbox{O\kern-1.4pt R}\kern-2.6pt\TeX}
-
 \def\XeT{X\kern-.125em\lower.424ex\hbox{E}\kern-.1667emT\spacefactor1000 }
 \def\XML{\acro{XML}}
-
 \def\WEB{{\tt WEB}\spacefactor1000 }
 \def\WEAVE{{\tt WEAVE}\spacefactor1000 }
-
-
+%  the Xe\TeX logo requires Eplain, which is not assumed here, so
+%  the definition is omitted.
+\def\XHTML{\acro{XHTML}}
+\def\XSLT{\acro{XSLT}}
 
 %********************************************************************
 
@@ -293,9 +270,9 @@
 \ifx\tugstyloaded@\plaintubstyle
   \let\@@input\input
   \def\iinput#1{\@@input#1 }
-  \def\@inputcheck{\if\@nextchar\bgroup
+  \def\tub@inputcheck{\if\@nextchar\bgroup
     \expandafter\iinput\else\expandafter\@@input\fi}
-  \def\input{\futurelet\@nextchar\@inputcheck}
+  \def\input{\futurelet\@nextchar\tub@inputcheck}
 \fi
 
 %       Smashes repeated from AMS-TeX; PLAIN implements only full \smash .
@@ -756,21 +733,31 @@
 
 
 %       some hyphenation exceptions:
-\hyphenation{Dijk-stra Eijk-hout Hara-lam-bous
-  Doc-Book Flor-i-da Ghost-script Ghost-view Open-Type Pfa-Edit
-  Post-Script True-Type
-  ap-pen-dix
-  bit-map bit-mapped bit-maps bool-ean
-  col-umns
+\hyphenation{Del-a-ware Dijk-stra Duane Eijk-hout
+  Flor-i-da Free-BSD Ghost-script Ghost-view
+  Hara-lam-bous Jac-kow-ski Karls-ruhe
+  Mac-OS Math-Sci-Net
+  Net-BSD Open-BSD Open-Office
+  Pfa-Edit Post-Script Rich-ard Skoup South-all
+  VM-ware Win-Edt
+  acro-nym ap-pen-dix asyn-chro-nous
+  bit-map bit-mapped bit-maps buf-fer buf-fers bool-ean
+  col-umns cus-tom-iz-able
   data-base data-bases
+  de-riv-a-tive de-riv-a-tives de-riv-a-ble der-i-va-tion
   fall-ing
   half-way
+  key-note
   long-est
   ma-gyar man-u-script man-u-scripts
-  over-view
-  par-a-digm par-a-digm-atic par-a-digms
+  off-line over-view
+  pal-ettes par-a-digm par-a-dig-mat-ic par-a-digms
+  pipe-line pipe-lines
+  plug-in plug-ins pro-gram-mable
   se-vere-ly spell-ing spell-ings stand-alone strong-est
+  sub-ex-pres-sion syn-chro-ni-city syn-chro-nous
   time-stamp time-stamped
+  vis-ual vis-ual-ly
   which-ever white-space white-spaces wide-spread wrap-around
 }
 
@@ -973,6 +960,9 @@ that may not be obvious.  For full definitions, see real code above.
 
 Version   Date        Changes
 -------   ---------   ---------------------------------------------------
+1.15      30 Apr 06   additions to match ltugboat.cls v2.0, 2006/04/25:
+                        name macros and hyphenation exceptions
+
 1.14      21 Jun 04   added numerous name macros and hyphenation exceptions
 
 1.13l     15 Nov 03   updated header address to Portland, OR
diff --git a/Master/texmf-dist/tex/plain/tugboat/tugboat.sty b/Master/texmf-dist/tex/plain/tugboat/tugboat.sty
index 04cfc7237cb..74f7ea40fed 100644
--- a/Master/texmf-dist/tex/plain/tugboat/tugboat.sty
+++ b/Master/texmf-dist/tex/plain/tugboat/tugboat.sty
@@ -1,24 +1,25 @@
 %% @texfile{
 %%     filename   = "tugboat.sty",
-%%     version    = "1.14c",
-%%     date       = "14 October 1996",
-%%     time       = "14:26:08",
+%%     version    = "1.17",
+%%     date       = "2006/05/24",
+%%     time       = "09:49:10 EDT",
+%%     checksum   = "29280 2245 6313 69380",
 %%     filetype   = "Plain TeX macros for TUGboat",
-%%     copyright  = "Copyright (C) TeX Users Group.
-%%                   Copying of this file is authorized only if either:
-%%                   (1) you make absolutely no changes to your copy, OR
-%%                   (2) if you do make changes, you first rename it to some
-%%                       other name.",
+%%     copyright  = "Copyright 1993, 1999, 2003, 2006 TeX Users Group.
+%%                   Unlimited copying and redistribution of this file
+%%                   are permitted as long as this file is not
+%%                   modified.  Modifications (and redistribution of
+%%                   modified versions) are also permitted, but only if
+%%                   the resulting file is renamed."
 %%     author     = "TeX Users Group",
 %%     address    = "TeX Users Group,
-%%                   1850 Union Street, \#1637,
-%%                   San Francisco, CA 94123,
+%%                   P.O.Box 2311,
+%%                   Portland, OR 97208-2311,
 %%                   USA",
-%%     telephone  = "415-982-8449",
-%%     FAX        = "415-982-8559",
-%%     email      = "Internet: TUGboat@ams.org",
+%%     telephone  = "+1 503 223-9994",
+%%     FAX        = "+1 206 203-3960",
+%%     email      = "TUGboat@tug.org",
 %%     codetable  = "ISO/ASCII",
-%%     checksum   = "2238    6284   69130",
 %%     keywords   = "tex users group, tugboat, plain tex",
 %%     supported  = "yes",
 %%     abstract   = "This file contains the plain-based macros
@@ -41,8 +42,8 @@
 % TUGBOAT.STY
 
 \def\thistubstyle{plain}
-\def\fileversion{v1.14c}
-\def\filedate{14 October 1996}
+\def\fileversion{v1.17}
+\def\filedate{2006/05/24}}
 
 % general items
 
@@ -1207,7 +1208,9 @@
 %
 %  addresses
 
+\newif\if@address \@addressfalse
 \def\address{%
+  \@addresstrue
   \begingroup
   \def\CurrentTag{address}%
   \@defaultoptions
@@ -2162,6 +2165,10 @@
 
 Version   Date        Changes
 -------   ---------   ---------------------------------------------------
+1.16       2 Jan 06   updated TUG address and phone in header
+
+1.15      15 Aug 05   added switch \if@address to avoid skip in signature
+
 1.14c     14 Oct 96   lowered footnoterule by 3pt
 
 1.14b     14 Apr 94   added \interlinepenalty=10000 to avoid page breaks
diff --git a/Master/texmf-dist/tpm/tugboat.tpm b/Master/texmf-dist/tpm/tugboat.tpm
index 32913312447..68a8dc1ffe8 100644
--- a/Master/texmf-dist/tpm/tugboat.tpm
+++ b/Master/texmf-dist/tpm/tugboat.tpm
@@ -3,7 +3,7 @@
   <rdf:Description about="http://texlive.dante.de/texlive/Package/tugboat.zip">
     <TPM:Name>tugboat</TPM:Name>
     <TPM:Type>Package</TPM:Type>
-    <TPM:Date>2006/01/11 23:03:17</TPM:Date>
+    <TPM:Date>2006/05/28 18:33:22</TPM:Date>
     <TPM:Version></TPM:Version>
     <TPM:Creator>rahtz</TPM:Creator>
     <TPM:Title>LaTeX macros for TUGboat articles.</TPM:Title>
@@ -17,8 +17,7 @@ Barbara Beeton (plain), Robin Fairbairns (LaTeX)
     </TPM:Author>
     <TPM:Size>1191533</TPM:Size>
     <TPM:Build/>
-    <TPM:RunFiles size="210597">
-texmf-dist/bibtex/bib/tugboat/tubguide.bib
+    <TPM:RunFiles size="222074">
 texmf-dist/bibtex/bst/tugboat/ltugbib.bst
 texmf-dist/tex/latex/tugboat/ltugboat.cls
 texmf-dist/tex/latex/tugboat/ltugboat.sty
@@ -30,15 +29,17 @@ texmf-dist/tex/plain/tugboat/tugboat.sty
 texmf-dist/tex/plain/tugboat/tugproc.sty
 texmf-dist/tpm/tugboat.tpm
     </TPM:RunFiles>
-    <TPM:DocFiles size="855902">
+    <TPM:DocFiles size="689133">
 texmf-dist/doc/latex/tugboat/README
 texmf-dist/doc/latex/tugboat/ltubguid.ltx
 texmf-dist/doc/latex/tugboat/ltubguid.pdf
+texmf-dist/doc/latex/tugboat/manifest.txt
 texmf-dist/doc/latex/tugboat/tugboat.pdf
+texmf-dist/doc/plain/tugboat/README
 texmf-dist/doc/plain/tugboat/tubguide.pdf
 texmf-dist/doc/plain/tugboat/tubguide.tex
     </TPM:DocFiles>
-    <TPM:SourceFiles size="125034">
+    <TPM:SourceFiles size="125464">
 texmf-dist/source/latex/tugboat/tugboat.dtx
 texmf-dist/source/latex/tugboat/tugboat.ins
     </TPM:SourceFiles>
diff --git a/Master/texmf/lists/tugboat b/Master/texmf/lists/tugboat
index 12ce10a69bc..84c558e1bb0 100644
--- a/Master/texmf/lists/tugboat
+++ b/Master/texmf/lists/tugboat
@@ -1,12 +1,13 @@
 texmf-dist/doc/latex/tugboat/README
 texmf-dist/doc/latex/tugboat/ltubguid.ltx
 texmf-dist/doc/latex/tugboat/ltubguid.pdf
+texmf-dist/doc/latex/tugboat/manifest.txt
 texmf-dist/doc/latex/tugboat/tugboat.pdf
+texmf-dist/doc/plain/tugboat/README
 texmf-dist/doc/plain/tugboat/tubguide.pdf
 texmf-dist/doc/plain/tugboat/tubguide.tex
 texmf-dist/source/latex/tugboat/tugboat.dtx
 texmf-dist/source/latex/tugboat/tugboat.ins
-texmf-dist/bibtex/bib/tugboat/tubguide.bib
 texmf-dist/bibtex/bst/tugboat/ltugbib.bst
 texmf-dist/tex/latex/tugboat/ltugboat.cls
 texmf-dist/tex/latex/tugboat/ltugboat.sty