summaryrefslogtreecommitdiff
path: root/Master
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2018-12-14 21:55:53 +0000
committerKarl Berry <karl@freefriends.org>2018-12-14 21:55:53 +0000
commit01c5fe4e31b7afa5576b74cae3f220305fa07f47 (patch)
tree1fcfc52bb3bb502bf41e58372c0baa2c36b16b2c /Master
parent6a45e1ed4207f5f056d0d7e95fc392df26fdbd62 (diff)
tugboat (14dec18)
git-svn-id: svn://tug.org/texlive/trunk@49415 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master')
-rw-r--r--Master/texmf-dist/bibtex/bst/tugboat/tugboat.bst12
-rw-r--r--Master/texmf-dist/doc/latex/tugboat/ltubguid.ltx33
-rw-r--r--Master/texmf-dist/doc/latex/tugboat/ltubguid.pdfbin321945 -> 324851 bytes
-rw-r--r--Master/texmf-dist/doc/latex/tugboat/tugboat.pdfbin465138 -> 460956 bytes
-rw-r--r--Master/texmf-dist/source/latex/tugboat/tugboat.dtx73
-rw-r--r--Master/texmf-dist/source/latex/tugboat/tugboat.ins8
-rw-r--r--Master/texmf-dist/tex/latex/tugboat/ltugboat.cls47
-rw-r--r--Master/texmf-dist/tex/latex/tugboat/ltugboat.sty5
-rw-r--r--Master/texmf-dist/tex/latex/tugboat/ltugcomn.sty14
-rw-r--r--Master/texmf-dist/tex/latex/tugboat/ltugproc.cls5
-rw-r--r--Master/texmf-dist/tex/latex/tugboat/ltugproc.sty5
11 files changed, 108 insertions, 94 deletions
diff --git a/Master/texmf-dist/bibtex/bst/tugboat/tugboat.bst b/Master/texmf-dist/bibtex/bst/tugboat/tugboat.bst
index a99d7a479b1..ad73920cb98 100644
--- a/Master/texmf-dist/bibtex/bst/tugboat/tugboat.bst
+++ b/Master/texmf-dist/bibtex/bst/tugboat/tugboat.bst
@@ -1,11 +1,15 @@
-%%% $Id: tugboat.bst 205 2018-09-06 17:28:53Z karl $
-%%% Modified for TUGboat from abbrurl.bst:
+%%% $Id: tugboat.bst 210 2018-10-29 18:04:16Z karl $
+%%% TUGboat changes are public domain.
+%%%
+%%% Modified for TUGboat from abbrvurl.bst:
%%% abbreviate "page(s)" to "p(p).",
%%% "volume" to "vol.",
%%% "editor(s)" to "ed(s)".
%%% urlintro=""
%%% reduce long author lists in format.names per Mico.
-%%% TUGboat changes public domain.
+%%% new fields for editors:
+%%% "newpage" - force page break after entry
+%%% "urlnewline" - force line break before url value.
%%% --karl, originally created 24jul18.
%%%
%%% Modification of BibTeX style file /usr/local/texlive/2009/texmf-dist/bibtex/bst/base/abbrv.bst
@@ -624,7 +628,7 @@ FUNCTION {format.in.ed.booktitle}
{ booktitle empty$
{ "" }
{ editor empty$
- { "In " booktitle emphasize * }
+ { "In~" booktitle emphasize * }
{ "In " format.editors * ", " * booktitle emphasize * }
if$
}
diff --git a/Master/texmf-dist/doc/latex/tugboat/ltubguid.ltx b/Master/texmf-dist/doc/latex/tugboat/ltubguid.ltx
index 64d19469b12..dcb817f014d 100644
--- a/Master/texmf-dist/doc/latex/tugboat/ltubguid.ltx
+++ b/Master/texmf-dist/doc/latex/tugboat/ltubguid.ltx
@@ -1,4 +1,4 @@
-% $Id: ltubguid.ltx 205 2018-09-06 17:28:53Z karl $
+% $Id: ltubguid.ltx 216 2018-12-13 21:40:11Z karl $
% ltubguid.ltx - documentation for ltugboat classes.
%
% Copyright 1994,1995,1996,2001,2005,2006,2010,2013,2014,2017,2018
@@ -39,28 +39,24 @@
@Misc{pkg:fancyvrb,
author = {Timothy Van Zandt and others},
title = {The {\textsf{fancyvrb}} package},
- year = {2015},
howpublished = {\url{ctan.org/pkg/fancyvrb}},
}
@Misc{pkg:listings,
author = {Carsten Heinz and others},
title = {The {\textsf{listings}} package},
- year = {2015},
howpublished = {\url{ctan.org/pkg/listings}},
}
@Misc{Arseneau:url:1996,
author = {Donald Arseneau},
title = {The {\textsf{url}} package},
- year = {2013},
howpublished = {\url{ctan.org/pkg/url}},
}
@Misc{Rahtz:hyperref:1997,
author = {Sebastian Rahtz and Heiko Oberdiek and others},
title = {The {\textsf{hyperref}} package},
- year = 2017,
howpublished = {\url{ctan.org/pkg/hyperref}},
}
@@ -75,15 +71,12 @@
@Misc{Schoepf:verbatim:1996,
author = {Rainer Sch{\umlaut{o}}pf},
title = {The {\textsf{verbatim}} package},
- year = {1996},
- month = {June},
- howpublished = {\url{ctan.org/pkg/mflogo}},
+ howpublished = {\url{ctan.org/pkg/verbatim}},
}
@Misc{Vieth:mflogo:1995,
author = {Ulrik Vieth},
title = {The {\textsf{mflogo}} package},
- year = {1999},
howpublished = {\url{ctan.org/pkg/mflogo}},
}
@@ -148,16 +141,8 @@
\overfullrule=4pt % want to see
%
% define CTAN addresses using the commands of the |ctandir| package
-\CTANdirectory{bibextract}{biblio/bibtex/utils/bibextract}
-\CTANdirectory{mflogo}{macros/latex/contrib/mflogo}
\CTANdirectory{packages}{macros/latex/required}
-\CTANdirectory{tools}{macros/latex/required/tools}
\CTANdirectory{tub-latex}{macros/latex/contrib/tugboat}
-\CTANdirectory{hyperref}{macros/latex/contrib/hyperref}
-%
-\CTANfile{cite}{macros/latex/contrib/cite/cite.sty}
-\CTANfile{tub-biblio}{digests/tugboat/biblio/tugboat.bib}
-\CTANfile{url}{macros/latex/contrib/misc/url.sty}
%
% ***** Commands provided by this paper *****
%
@@ -395,17 +380,18 @@ used in running heads or footers; similarly \cs{shortAuthor}.
The \cs{author} command is used once for each co-author of the paper,
and for each \cs{author} there should be a \cs{address} command that
-gives a (postal) correspondence address. In addition (wherever
-possible), \TUB{} likes to quote an email address for authors: for
-this, the \cs{netaddress} command is used. Finally, each
-author may mention a web page, using a \cs{personalURL} command.
+gives a (postal) correspondence address. In addition (wherever
+possible), \TUB{} likes to quote an email address for authors: for this,
+the \cs{netaddress} command is used. Each author may also mention a web
+page, using a \cs{personalURL} command, and an \acro{ORCID} (from
+\url{orcid.org}), using \cs{ORCID}.
-For example, the present paper has at its start:
+For example, the present paper has (approximately) this at its start:
\begin{verbatim}[\small]
\title{The \LaTeXe\ \TUB{} Macros}
\author{TUGboat editors}
-\EDITORnoaddress
+\address{\TeX\ Users Group}
\netaddress{tugboat@tug.org}
\personalURL{https://tug.org/TUGboat}
\maketitle
@@ -876,6 +862,7 @@ classes.
\bibliographystyle{tugboat}
\bibliography{tubguide}
+\advance\signaturewidth by 8pt
\makesignature
\end{document}
diff --git a/Master/texmf-dist/doc/latex/tugboat/ltubguid.pdf b/Master/texmf-dist/doc/latex/tugboat/ltubguid.pdf
index cdf822ebba0..48f978eb904 100644
--- a/Master/texmf-dist/doc/latex/tugboat/ltubguid.pdf
+++ b/Master/texmf-dist/doc/latex/tugboat/ltubguid.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/tugboat/tugboat.pdf b/Master/texmf-dist/doc/latex/tugboat/tugboat.pdf
index bce08c44405..f5e9d3068dc 100644
--- a/Master/texmf-dist/doc/latex/tugboat/tugboat.pdf
+++ b/Master/texmf-dist/doc/latex/tugboat/tugboat.pdf
Binary files differ
diff --git a/Master/texmf-dist/source/latex/tugboat/tugboat.dtx b/Master/texmf-dist/source/latex/tugboat/tugboat.dtx
index 8dff9585db9..176107a4d91 100644
--- a/Master/texmf-dist/source/latex/tugboat/tugboat.dtx
+++ b/Master/texmf-dist/source/latex/tugboat/tugboat.dtx
@@ -1,5 +1,5 @@
% \iffalse (this is a meta-comment (so they say))
-% $Id: tugboat.dtx 205 2018-09-06 17:28:53Z karl $
+% $Id: tugboat.dtx 217 2018-12-14 18:48:06Z karl $
% tugboat.dtx - main source for LaTeX TUGboat classes.
%
% Copyright 1994-2018 TeX Users Group.
@@ -28,7 +28,7 @@
%<ltugboatsty>\ProvidesPackage{ltugboat}
%<ltugprocsty>\ProvidesPackage{ltugproc}
%<ltugcomn> \ProvidesPackage{ltugcomn}
- [2018-09-06 v2.20
+ [2018-12-14 v2.21
%<ltugboatcls> TUGboat journal class%
%<ltugproccls> TUG conference proceedings class%
%<ltugboatsty|ltugprocsty> TUG compatibility package%
@@ -233,6 +233,7 @@
% |\ifPrelimDraft|& flag to indicate status as preliminary draft\\
% |\rtitlex|& \TUB{} volume and number info for running head\\
% |\midrtitle|& information for center of running head\\
+% |\rtitlenexttopage|& next to page number in running head\\
% |\HorzR@gisterRule|& pieces of registration marks (`trimmarks')\\
% |\DownShortR@gisterRule|&\\
% |\UpShortR@gisterRule|&\\
@@ -364,7 +365,12 @@
\AtEndOfClass{%
\let\thepage=\tuborigthepage
\NoBlackBoxes
- \PrelimDraftfalse
+ % Insert draft date into the header even with [final], if we are not
+ % doing a production run. (tugboat.dates sets up page numbers
+ % above 900 in such pseudo-draft mode.) We use [final] in the first
+ % place for this case because draft can change page layout, wrt
+ % registration marks, etc.
+ \ifnum\value{page}>900 \PrelimDrafttrue \else \PrelimDraftfalse \fi
\@tubrunningfull
}%
}
@@ -821,7 +827,7 @@
\expandafter\ifx\csname XeTeXrevision\endcsname\relax
\def\Thanh{H\`an~Th\^e\llap{\raise 0.5ex\hbox{\'{}}}~Th\`anh}% non-XeTeX
\else
-\def\Thanh{H\`an~Th\textcircumacute{e}~Th\`anh}% xunicode drops the acute else
+\def\Thanh{H\`an~Th\textcircumacute{e}~Th\`anh}% else xunicode drops the acute
\fi
\def\TikZ{Ti{\em k}Z}
\def\ttn{\textsl{TTN}\@}
@@ -1020,7 +1026,8 @@
\def\now{\number\hours:\ifnum\minutes<10 0\fi\number\minutes}
\def\Now{\today\ \now}
\newif\ifPrelimDraft
-\def\midrtitle{\ifPrelimDraft {\textsl{preliminary draft, \Now}}\fi}
+\def\midrtitle{} % center of running heads
+\def\rtitlenexttopage{\ifPrelimDraft \textsl{\small draft: \Now}\fi}
% \end{macrocode}
%
% \subsection{Ragged right and friends}
@@ -1077,13 +1084,16 @@
%
% Miscellaneous useful stuff. Note that \LaTeXe{} defines a robust
% \cs{,}, but that we provide a new definition of |~| by redefining
-% its robust underpinnings\footnote{\cs{DeclareRobustCommand} doesn't
-% mind redefinition, fortunately} (based on the version in
-% AMS-\TeX---the \LaTeXe{} version has \cs{leavevmode} and doesn't
-% care about surrounding space).
+% \cs{\nobreakspace} (\cs{DeclareRobustCommand} doesn't
+% mind redefinition, fortunately). This is based on the version in
+% AMS-\TeX---the \LaTeXe{} version (|ltspace.dtx|) has \cs{leavevmode}
+% and does not do anything with the surrounding space(s). Our version
+% messes up with the \cs{pfill} used in |doc|-generated indexes
+% (\url{github.com/latex3/latex2e/issues/75}), but later (2018++)
+% versions of |doc| should be protected against our redefinition.
% \begin{macrocode}
-\DeclareRobustCommand{\nobreakspace}{%
- \unskip\nobreak\ \ignorespaces}
+\let\latexnobreakspace=\nobreakspace
+\DeclareRobustCommand{\nobreakspace}{\unskip\nobreak\ \ignorespaces}
% \end{macrocode}
%
% Plain \TeX{} defines \cs{newbox} as \cs{outer}. We solemnly
@@ -1605,7 +1615,7 @@
% \cs{author} command for each of them. The names are then stored in
% a set of \cs{csname}s called \cs{author1}, \cs{author2}, \dots
% Similarly, there are several \cs{address<n>} and \cs{netaddress<n>}
-% and \cs{PersonalURL<n>} commands set up for each article.
+% and \cs{PersonalURL<n>} and \cs{ORCID<n>} commands set up for each article.
%
% \begin{description}
% \item[\emph{Comment:}] I would like to make provision for several
@@ -1619,6 +1629,7 @@
\def\theaddress#1{\csname theaddress#1\endcsname}
\def\thenetaddress#1{\csname thenetaddress#1\endcsname}
\def\thePersonalURL#1{\csname thePersonalURL#1\endcsname}
+\def\theORCID#1{\csname theORCID#1\endcsname}
% \end{macrocode}
%
% The standard way of listing authors is to iterate from 1 to
@@ -1709,6 +1720,7 @@
\allowhyphens
\thenetaddress{\number\authornumber}\\
\thePersonalURL{\number\authornumber}\\
+ \theORCID{\number\authornumber}\\
\else
% \end{macrocode}
% \cs{authornumber}$\ge0$, so we are in the body of an ordinary
@@ -1726,6 +1738,7 @@
\allowhyphens
\thenetaddress{\number\count@}\\
\thePersonalURL{\number\count@}\\
+ \theORCID{\number\count@}\\
}%
\repeat
\fi
@@ -1776,7 +1789,7 @@
%
% \begin{macrocode}
\def\tubmultipleaffilauthor{\unskip, \ignorespaces}%
-\def\tubmultipleaffilnet{\textrm{\unskip~,\ \ignorespaces}}
+\def\tubmultipleaffilnet{\unskip\textrm{\,,\ \ignorespaces}}
% \end{macrocode}
%
% Now all the awful machinery of author definitions.
@@ -1817,7 +1830,7 @@
% and to initialise author-related things. \cs{EDITORno*} commands
% allow the editor to record that there's good reason for an
% \emph{address} or \emph{netaddress} not to be there (the
-% \emph{personalURL} is optional anyway).
+% \emph{personalURL} and \emph{ORCID} are optional anyway).
% \begin{macrocode}
\def\TB@author#1{%
\expandafter\def\csname theauthor\number\authornumber\endcsname
@@ -1828,6 +1841,8 @@
{\TBWarningNL{Net address for #1\space missing}\@gobble}%
\expandafter\let\csname thePersonalURL\number\authornumber\endcsname
\@gobble
+ \expandafter\let\csname theORCID\number\authornumber\endcsname
+ \@gobble
}
\def\EDITORnoaddress{%
\expandafter\let\csname theaddress\number\authornumber\endcsname
@@ -1839,7 +1854,7 @@
}
% \end{macrocode}
%
-% \cs{address} simply copies its argument into the \cs{theaddress<n>}
+% \cs{address} copies its argument into the \cs{theaddress<n>}
% for this author.
%
% \begin{macrocode}
@@ -1994,6 +2009,15 @@
\def\@author{\@defaultauthorlist}
% \end{macrocode}
%
+% \cs{ORCID} inserts `ORCID' and then argument into the \cs{theORCID<n>}
+% for this author. Also, we want \cs{small} for this.
+%
+% \begin{macrocode}
+\def\ORCID#1{%
+ \expandafter\def\csname theORCID\number\authornumber\endcsname
+ {\leavevmode \ignorespaces {\SMC ORCID} #1\unskip}}
+% \end{macrocode}
+%
% For the online re-publication (as of 2009) by Mathematical Sciences
% Publishers |http://mathscipub.org|, lots and lots of metadata is
% needed, much of it redundant with things we already do. They are
@@ -2530,8 +2554,7 @@
% If the sections aren't numbered, the natural tendency of the
% author to cross-reference (which, after all, is one of the things
% \LaTeX{} is for ever being advertised as being good at) can cause
-% headaches for the editor. (Yes it can; believe me~\dots\ there's
-% always one.)
+% headaches.
%
% The following command is used by each of the sectioning commands to
% make a following \cs{ref} command bloop at the author. Even if the
@@ -3176,11 +3199,7 @@
% \subsection{Running heads}
%
% \begin{macrocode}
-\def \rtitlex{\def\texttub##1{{\normalsize\textrm{##1}}}\TUB, \volx }
-\def\PrelimDraftfooter{%
- \dlap{\kern\textheight\kern3pc
- \rlap{\hb@xt@\pagewd{\midrtitle\hfil\midrtitle}}
- }}
+\def\rtitlex{\def\texttub##1{{\normalsize\textrm{##1}}}\TUB, \volx}
% \end{macrocode}
% registration marks; these are temporarily inserted in the running head
% \begin{macrocode}
@@ -3192,12 +3211,12 @@
\topregister\vskip \headmargin \vskip 10\p@}}}}%
}
% put issue identification and page number in header.
-\def\@oddhead{\MakeRegistrationMarks\PrelimDraftfooter
+\def\@oddhead{\MakeRegistrationMarks
\normalsize\csname normalshape\endcsname\rm \tubheadhook
- \rtitlex\qquad\midrtitle \hfil \thepage}
-\def\@evenhead{\MakeRegistrationMarks\PrelimDraftfooter
+ \rtitlex\qquad \midrtitle\hfil \rtitlenexttopage\quad \thepage}
+\def\@evenhead{\MakeRegistrationMarks
\normalsize\csname normalshape\endcsname\rm \tubheadhook
- \thepage\hfil\midrtitle\qquad\rtitlex}
+ \thepage \quad\rtitlenexttopage \hfil\midrtitle \qquad\rtitlex}
% can be used to reset the font, e.g., tb98kuester.
\def\tubheadhook{}
@@ -3330,7 +3349,7 @@
% \begin{macrocode}
%<*classtail>
\def\xEdNote{{\EdNoteFont Editor's note:\enspace }}
-\def \EdNote{\@ifnextchar[%]
+\def\EdNote{\@ifnextchar[%]
{%
\ifvmode
\smallskip\noindent\let\@EdNote@\@EdNote@v
diff --git a/Master/texmf-dist/source/latex/tugboat/tugboat.ins b/Master/texmf-dist/source/latex/tugboat/tugboat.ins
index 10af0ed5daf..72b4f4f184a 100644
--- a/Master/texmf-dist/source/latex/tugboat/tugboat.ins
+++ b/Master/texmf-dist/source/latex/tugboat/tugboat.ins
@@ -1,11 +1,10 @@
-% $Id: tugboat.ins 139 2015-03-24 17:40:58Z karl $
+% $Id: tugboat.ins 210 2018-10-29 18:04:16Z karl $
% 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,2009,2011,2013,2014,2015
-%% TeX Users Group.
+%% Copyright 1994-2018 TeX Users Group.
%%
%% This file is part of the tugboat package.
%%
@@ -39,8 +38,7 @@
This is a generated file.
-Copyright 1994,1995,1996,2001,2005,2006,2009,2011,2013,2014,2015
-TeX Users Group.
+Copyright 1994-2018 TeX Users Group.
It may be distributed and/or modified under the
conditions of the LaTeX Project Public License, either version 1.3
diff --git a/Master/texmf-dist/tex/latex/tugboat/ltugboat.cls b/Master/texmf-dist/tex/latex/tugboat/ltugboat.cls
index c0fcbc23707..03087d4e2f3 100644
--- a/Master/texmf-dist/tex/latex/tugboat/ltugboat.cls
+++ b/Master/texmf-dist/tex/latex/tugboat/ltugboat.cls
@@ -8,8 +8,7 @@
%%
%% This is a generated file.
%%
-%% Copyright 1994,1995,1996,2001,2005,2006,2009,2011,2013,2014,2015
-%% TeX Users Group.
+%% Copyright 1994-2018 TeX Users Group.
%%
%% It may be distributed and/or modified under the
%% conditions of the LaTeX Project Public License, either version 1.3
@@ -33,7 +32,7 @@
%%
\NeedsTeXFormat{LaTeX2e}[1994/12/01]
\ProvidesClass {ltugboat}
- [2018-09-06 v2.20
+ [2018-12-14 v2.21
TUGboat journal class%
]
\csname tugstyloaded@\endcsname
@@ -70,7 +69,12 @@
\AtEndOfClass{%
\let\thepage=\tuborigthepage
\NoBlackBoxes
- \PrelimDraftfalse
+ % Insert draft date into the header even with [final], if we are not
+ % doing a production run. (tugboat.dates sets up page numbers
+ % above 900 in such pseudo-draft mode.) We use [final] in the first
+ % place for this case because draft can change page layout, wrt
+ % registration marks, etc.
+ \ifnum\value{page}>900 \PrelimDrafttrue \else \PrelimDraftfalse \fi
\@tubrunningfull
}%
}
@@ -306,7 +310,7 @@
\expandafter\ifx\csname XeTeXrevision\endcsname\relax
\def\Thanh{H\`an~Th\^e\llap{\raise 0.5ex\hbox{\'{}}}~Th\`anh}% non-XeTeX
\else
-\def\Thanh{H\`an~Th\textcircumacute{e}~Th\`anh}% xunicode drops the acute else
+\def\Thanh{H\`an~Th\textcircumacute{e}~Th\`anh}% else xunicode drops the acute
\fi
\def\TikZ{Ti{\em k}Z}
\def\ttn{\textsl{TTN}\@}
@@ -404,7 +408,8 @@
\def\now{\number\hours:\ifnum\minutes<10 0\fi\number\minutes}
\def\Now{\today\ \now}
\newif\ifPrelimDraft
-\def\midrtitle{\ifPrelimDraft {\textsl{preliminary draft, \Now}}\fi}
+\def\midrtitle{} % center of running heads
+\def\rtitlenexttopage{\ifPrelimDraft \textsl{\small draft: \Now}\fi}
\newdimen\raggedskip \raggedskip=\z@
\newdimen\raggedstretch \raggedstretch=5em % ems of font set now (10pt)
\newskip\raggedparfill \raggedparfill=\z@\@plus 1fil
@@ -426,8 +431,8 @@
\parindent=\z@ \parfillskip=\z@skip
}
\def\normalspaces{\spaceskip\z@skip \xspaceskip\z@skip}
-\DeclareRobustCommand{\nobreakspace}{%
- \unskip\nobreak\ \ignorespaces}
+\let\latexnobreakspace=\nobreakspace
+\DeclareRobustCommand{\nobreakspace}{\unskip\nobreak\ \ignorespaces}
\def\boxcs#1{\box\csname#1\endcsname}
\def\setboxcs#1{\setbox\csname#1\endcsname}
\def\newboxcs#1{\expandafter\newbox\csname#1\endcsname}
@@ -699,6 +704,7 @@
\def\theaddress#1{\csname theaddress#1\endcsname}
\def\thenetaddress#1{\csname thenetaddress#1\endcsname}
\def\thePersonalURL#1{\csname thePersonalURL#1\endcsname}
+\def\theORCID#1{\csname theORCID#1\endcsname}
\def\@defaultauthorlist{%
\@getauthorlist\@firstofone
}
@@ -738,6 +744,7 @@
\allowhyphens
\thenetaddress{\number\authornumber}\\
\thePersonalURL{\number\authornumber}\\
+ \theORCID{\number\authornumber}\\
\else
\count@=0
\loop
@@ -751,6 +758,7 @@
\allowhyphens
\thenetaddress{\number\count@}\\
\thePersonalURL{\number\count@}\\
+ \theORCID{\number\count@}\\
}%
\repeat
\fi
@@ -781,7 +789,7 @@
}
\def\signaturemark{\leavevmode\llap{$\diamond$\enspace}}
\def\tubmultipleaffilauthor{\unskip, \ignorespaces}%
-\def\tubmultipleaffilnet{\textrm{\unskip~,\ \ignorespaces}}
+\def\tubmultipleaffilnet{\unskip\textrm{\,,\ \ignorespaces}}
\newcount\authornumber
\authornumber=0
\def\author{%
@@ -802,6 +810,8 @@
{\TBWarningNL{Net address for #1\space missing}\@gobble}%
\expandafter\let\csname thePersonalURL\number\authornumber\endcsname
\@gobble
+ \expandafter\let\csname theORCID\number\authornumber\endcsname
+ \@gobble
}
\def\EDITORnoaddress{%
\expandafter\let\csname theaddress\number\authornumber\endcsname
@@ -876,6 +886,9 @@
\fi
\def\authorlist#1{\def\@author{#1}}
\def\@author{\@defaultauthorlist}
+\def\ORCID#1{%
+ \expandafter\def\csname theORCID\number\authornumber\endcsname
+ {\leavevmode \ignorespaces {\SMC ORCID} #1\unskip}}
\def\mspmetavar#1#2{}
\newif\if@articletitle
\def\maketitle{\@ifstar
@@ -1436,11 +1449,7 @@
\HorzR@gisterRule \hfil \HorzR@gisterRule}}}
\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}}
- }}
+\def\rtitlex{\def\texttub##1{{\normalsize\textrm{##1}}}\TUB, \volx}
\def\MakeRegistrationMarks{}
\def\UseTrimMarks{%
\def\MakeRegistrationMarks{%
@@ -1448,12 +1457,12 @@
\vbox{\dlap{\vbox to\trimlgt{\vfil\botregister}}%
\topregister\vskip \headmargin \vskip 10\p@}}}}%
}
-\def\@oddhead{\MakeRegistrationMarks\PrelimDraftfooter
+\def\@oddhead{\MakeRegistrationMarks
\normalsize\csname normalshape\endcsname\rm \tubheadhook
- \rtitlex\qquad\midrtitle \hfil \thepage}
-\def\@evenhead{\MakeRegistrationMarks\PrelimDraftfooter
+ \rtitlex\qquad \midrtitle\hfil \rtitlenexttopage\quad \thepage}
+\def\@evenhead{\MakeRegistrationMarks
\normalsize\csname normalshape\endcsname\rm \tubheadhook
- \thepage\hfil\midrtitle\qquad\rtitlex}
+ \thepage \quad\rtitlenexttopage \hfil\midrtitle \qquad\rtitlex}
\def\tubheadhook{}
@@ -1515,7 +1524,7 @@
\newcommand{\textSMC}[1]{{\SMC #1}}
\newcommand{\acro}[1]{\textSMC{#1}\@}
\def\xEdNote{{\EdNoteFont Editor's note:\enspace }}
-\def \EdNote{\@ifnextchar[%]
+\def\EdNote{\@ifnextchar[%]
{%
\ifvmode
\smallskip\noindent\let\@EdNote@\@EdNote@v
diff --git a/Master/texmf-dist/tex/latex/tugboat/ltugboat.sty b/Master/texmf-dist/tex/latex/tugboat/ltugboat.sty
index c4666bb13f3..2872a509a8f 100644
--- a/Master/texmf-dist/tex/latex/tugboat/ltugboat.sty
+++ b/Master/texmf-dist/tex/latex/tugboat/ltugboat.sty
@@ -8,8 +8,7 @@
%%
%% This is a generated file.
%%
-%% Copyright 1994,1995,1996,2001,2005,2006,2009,2011,2013,2014,2015
-%% TeX Users Group.
+%% Copyright 1994-2018 TeX Users Group.
%%
%% It may be distributed and/or modified under the
%% conditions of the LaTeX Project Public License, either version 1.3
@@ -32,7 +31,7 @@
%% extension .ins) which are part of the distribution.
%%
\ProvidesPackage{ltugboat}
- [2018-09-06 v2.20
+ [2018-12-14 v2.21
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 d5d41b3b3b6..1800a038840 100644
--- a/Master/texmf-dist/tex/latex/tugboat/ltugcomn.sty
+++ b/Master/texmf-dist/tex/latex/tugboat/ltugcomn.sty
@@ -8,8 +8,7 @@
%%
%% This is a generated file.
%%
-%% Copyright 1994,1995,1996,2001,2005,2006,2009,2011,2013,2014,2015
-%% TeX Users Group.
+%% Copyright 1994-2018 TeX Users Group.
%%
%% It may be distributed and/or modified under the
%% conditions of the LaTeX Project Public License, either version 1.3
@@ -33,7 +32,7 @@
%%
\NeedsTeXFormat{LaTeX2e}[1994/12/01]
\ProvidesPackage{ltugcomn}
- [2018-09-06 v2.20
+ [2018-12-14 v2.21
TUGboat `common macros' package%
]
\IfFileExists{mflogo.sty}%
@@ -236,7 +235,7 @@
\expandafter\ifx\csname XeTeXrevision\endcsname\relax
\def\Thanh{H\`an~Th\^e\llap{\raise 0.5ex\hbox{\'{}}}~Th\`anh}% non-XeTeX
\else
-\def\Thanh{H\`an~Th\textcircumacute{e}~Th\`anh}% xunicode drops the acute else
+\def\Thanh{H\`an~Th\textcircumacute{e}~Th\`anh}% else xunicode drops the acute
\fi
\def\TikZ{Ti{\em k}Z}
\def\ttn{\textsl{TTN}\@}
@@ -334,7 +333,8 @@
\def\now{\number\hours:\ifnum\minutes<10 0\fi\number\minutes}
\def\Now{\today\ \now}
\newif\ifPrelimDraft
-\def\midrtitle{\ifPrelimDraft {\textsl{preliminary draft, \Now}}\fi}
+\def\midrtitle{} % center of running heads
+\def\rtitlenexttopage{\ifPrelimDraft \textsl{\small draft: \Now}\fi}
\newdimen\raggedskip \raggedskip=\z@
\newdimen\raggedstretch \raggedstretch=5em % ems of font set now (10pt)
\newskip\raggedparfill \raggedparfill=\z@\@plus 1fil
@@ -356,8 +356,8 @@
\parindent=\z@ \parfillskip=\z@skip
}
\def\normalspaces{\spaceskip\z@skip \xspaceskip\z@skip}
-\DeclareRobustCommand{\nobreakspace}{%
- \unskip\nobreak\ \ignorespaces}
+\let\latexnobreakspace=\nobreakspace
+\DeclareRobustCommand{\nobreakspace}{\unskip\nobreak\ \ignorespaces}
\def\boxcs#1{\box\csname#1\endcsname}
\def\setboxcs#1{\setbox\csname#1\endcsname}
\def\newboxcs#1{\expandafter\newbox\csname#1\endcsname}
diff --git a/Master/texmf-dist/tex/latex/tugboat/ltugproc.cls b/Master/texmf-dist/tex/latex/tugboat/ltugproc.cls
index 06c1cfae147..26c721ca5fc 100644
--- a/Master/texmf-dist/tex/latex/tugboat/ltugproc.cls
+++ b/Master/texmf-dist/tex/latex/tugboat/ltugproc.cls
@@ -8,8 +8,7 @@
%%
%% This is a generated file.
%%
-%% Copyright 1994,1995,1996,2001,2005,2006,2009,2011,2013,2014,2015
-%% TeX Users Group.
+%% Copyright 1994-2018 TeX Users Group.
%%
%% It may be distributed and/or modified under the
%% conditions of the LaTeX Project Public License, either version 1.3
@@ -33,7 +32,7 @@
%%
\NeedsTeXFormat{LaTeX2e}[1994/12/01]
\ProvidesClass {ltugproc}
- [2018-09-06 v2.20
+ [2018-12-14 v2.21
TUG conference proceedings class%
]
\def\@tugclass{ltugproc}
diff --git a/Master/texmf-dist/tex/latex/tugboat/ltugproc.sty b/Master/texmf-dist/tex/latex/tugboat/ltugproc.sty
index c8c08599bcc..80616cdc9a9 100644
--- a/Master/texmf-dist/tex/latex/tugboat/ltugproc.sty
+++ b/Master/texmf-dist/tex/latex/tugboat/ltugproc.sty
@@ -8,8 +8,7 @@
%%
%% This is a generated file.
%%
-%% Copyright 1994,1995,1996,2001,2005,2006,2009,2011,2013,2014,2015
-%% TeX Users Group.
+%% Copyright 1994-2018 TeX Users Group.
%%
%% It may be distributed and/or modified under the
%% conditions of the LaTeX Project Public License, either version 1.3
@@ -32,7 +31,7 @@
%% extension .ins) which are part of the distribution.
%%
\ProvidesPackage{ltugproc}
- [2018-09-06 v2.20
+ [2018-12-14 v2.21
TUG compatibility package%
]
\@obsoletefile{ltugproc.cls}{ltugproc.sty}