3 files changed, 31 insertions, 25 deletions
diff --git a/Master/texmf-dist/doc/plain/tugboat-plain/tubguide.pdf b/Master/texmf-dist/doc/plain/tugboat-plain/tubguide.pdf
index b725031b1bc..12805977e7a 100644
--- a/Master/texmf-dist/doc/plain/tugboat-plain/tubguide.pdf
+++ b/Master/texmf-dist/doc/plain/tugboat-plain/tubguide.pdf
diff --git a/Master/texmf-dist/tex/plain/tugboat-plain/tugboat.cmn b/Master/texmf-dist/tex/plain/tugboat-plain/tugboat.cmn
index a47b9eab1a5..979b0eee659 100644
--- a/Master/texmf-dist/tex/plain/tugboat-plain/tugboat.cmn
+++ b/Master/texmf-dist/tex/plain/tugboat-plain/tugboat.cmn
@@ -1,29 +1,36 @@
 %% @texfile{
 %%     filename   = "tugboat.cmn",
-%%     version    = "see below \fileversion"
-%%     date       = "see below \filedate",
-%%     filetype   = "common macros for TUGboat",
-%%     copyright  = "Copyright 1993-1996,2006,2008,2011-2016 TeX Users Group.
+%%     copyright  = "Copyright 1993-1996,2006,2008,2011-2018 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."
+%%     version    = "see below \fileversion"
+%%     date       = "see below \filedate",
+%%     filetype   = "common (plain) macros for TUGboat",
+%%     supported  = "yes",
 %%     email      = "TUGboat@tug.org",
 %%     codetable  = "ISO/ASCII",
 %%     keywords   = "tex users group, tugboat, common macros, plain tex",
-%%     supported  = "yes",
 %%     abstract   = "This file contains macros potentially common to
 %%                   the various style files for TUGboat,
 %%                   Among other things, it contains supplementary
 %%                   definitions for abbreviations and logos that
 %%                   appear in TUGboat."
 %%     }
-%% $Id: tugboat.cmn 176 2017-03-19 18:13:59Z karl $
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% $Id: tugboat.cmn 207 2018-09-06 17:32:17Z karl $
 
-\def\fileversion{v1.23}
-\def\filedate{2017/03/19}
+% do nothing when reading this file a second time.
+\ifx\tugboatcmn\undefined
+  \let\next\relax
+\else
+  \expandafter\let\expandafter\next\csname endinput\endcsname
+\fi
+\next
+
+\def\fileversion{v1.24}
+\def\filedate{2018-09-05}
 
 \message{File `TUGBOAT.CMN' \fileversion \space\space <\filedate>}
 
@@ -110,7 +117,8 @@
 \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\Cplusplus{C\plusplus}
+\def\plusplus{\raise.7ex\hbox{$_{++}$}}
 \def\CSS{\acro{CSS}}
 \def\CSabbr{$\cal C$\kern-.1667em\lower.5ex\hbox{$\cal S$}} % from opmac.tex
 \def\CSTUG{\CSabbr\acro{TUG}}
@@ -768,6 +776,8 @@
 
 \restorecat\@
 
+\let\tugboatcmn = t % so we can avoid being read twice.
+
 \endinput
 
 
@@ -1001,6 +1011,8 @@ that may not be obvious.  For full definitions, see real code above.
 
 Version   Date        Changes
 -------   ---------   ---------------------------------------------------
+1.24       5 Sep 18   \tugboatcmn sentinent, \plusplus separated out.
+
 1.23      19 Mar 17   move \manual and \manualsl to tugboat.sty.
 
 1.22      31 Oct 16   define \CSabbr, \CSTUG;
diff --git a/Master/texmf-dist/tex/plain/tugboat-plain/tugboat.sty b/Master/texmf-dist/tex/plain/tugboat-plain/tugboat.sty
index f1b9770142b..660df853f25 100644
--- a/Master/texmf-dist/tex/plain/tugboat-plain/tugboat.sty
+++ b/Master/texmf-dist/tex/plain/tugboat-plain/tugboat.sty
@@ -1,34 +1,28 @@
 %% @texfile{
 %%     filename   = "tugboat.sty",
-%%     version    = "see below \fileversion"
-%%     date       = "see below \filedate",
-%%     filetype   = "Plain TeX macros for TUGboat",
-%%     copyright  = "Copyright 1993,1999,2003,2006,2011-2016 TeX Users Group.
+%%     copyright  = "Copyright 1993,1999,2003,2006,2011-2017 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."
+%%     version    = "see below \fileversion"
+%%     date       = "see below \filedate",
+%%     filetype   = "Plain TeX macros for TUGboat",
+%%     requires   = "tugboat.cmn",
+%%     supported  = "yes",
 %%     email      = "TUGboat@tug.org",
 %%     codetable  = "ISO/ASCII",
 %%     keywords   = "tex users group, tugboat, plain tex",
-%%     supported  = "yes",
 %%     abstract   = "This file contains the plain-based macros
 %%                   for preparation of items in TUGboat, the
 %%                   Communications of the TeX Users Group.",
 %%     }
-%% $Id: tugboat.sty 176 2017-03-19 18:13:59Z karl $
-%%
-%% *********************************************************
-%%
-%%  TeXing with this file also requires the following files:
-%%      TUGBOAT.CMN (version 1.08+)
-%%
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% $Id: tugboat.sty 207 2018-09-06 17:32:17Z karl $
 
 \def\thistubstyle{plain}
-\def\fileversion{v1.23}
-\def\filedate{2017/03/19}
+\def\fileversion{v1.24}
+\def\filedate{2018-09-05}
 
 % general items