summaryrefslogtreecommitdiff
path: root/macros/latex/contrib/tugboat
diff options
context:
space:
mode:
authorNorbert Preining <norbert@preining.info>2020-03-13 03:02:35 +0000
committerNorbert Preining <norbert@preining.info>2020-03-13 03:02:35 +0000
commit7f2b2a9d664831db3f6dcb985d3a10212ce3b752 (patch)
tree5b5ca88ef53ca03a6e4d8232ae8964bf2001b053 /macros/latex/contrib/tugboat
parentc4777604044f5d7ed37fd9e47edd58b44630a66d (diff)
CTAN sync 202003130302
Diffstat (limited to 'macros/latex/contrib/tugboat')
-rw-r--r--macros/latex/contrib/tugboat/README8
-rw-r--r--macros/latex/contrib/tugboat/ltubguid.ltx142
-rw-r--r--macros/latex/contrib/tugboat/ltubguid.pdfbin325091 -> 330289 bytes
-rw-r--r--macros/latex/contrib/tugboat/tugboat.bst18
-rw-r--r--macros/latex/contrib/tugboat/tugboat.dtx75
-rw-r--r--macros/latex/contrib/tugboat/tugboat.ins14
-rw-r--r--macros/latex/contrib/tugboat/tugboat.pdfbin461276 -> 462486 bytes
7 files changed, 177 insertions, 80 deletions
diff --git a/macros/latex/contrib/tugboat/README b/macros/latex/contrib/tugboat/README
index bed52cdfdb..d4e7d544a8 100644
--- a/macros/latex/contrib/tugboat/README
+++ b/macros/latex/contrib/tugboat/README
@@ -1,11 +1,11 @@
-$Id: README 261 2019-11-09 22:00:31Z karl $
-Copyright 2006, 2009-2019 TeX Users Group.
+$Id: README 274 2020-03-12 16:47:21Z karl $
+Copyright 2006, 2009-2020 TeX Users Group.
You may freely use, modify and/or distribute this file.
LaTeX macros for use in TUGboat
===============================
-See the TUGboat web pages at http://tug.org/TUGboat for upcoming
+See the TUGboat web pages at https://tug.org/TUGboat for upcoming
deadlines, tips on writing articles, access to online issues, etc.
We greatly appreciate new article submissions!
@@ -24,7 +24,7 @@ Installation and use:
Usually you can get the tugboat packages through your distribution.
But if you want to install it by hand from CTAN, its directory there
-(see http://ctan.org/pkg/tugboat) has three files containing TeX code:
+(see https://ctan.org/pkg/tugboat) has three files containing TeX code:
tugboat.dtx -- the source for the macros
tugboat.ins -- the docstrip instructions
diff --git a/macros/latex/contrib/tugboat/ltubguid.ltx b/macros/latex/contrib/tugboat/ltubguid.ltx
index 906789bf28..db9f183dac 100644
--- a/macros/latex/contrib/tugboat/ltubguid.ltx
+++ b/macros/latex/contrib/tugboat/ltubguid.ltx
@@ -1,7 +1,7 @@
-% $Id: ltubguid.ltx 261 2019-11-09 22:00:31Z karl $
+% $Id: ltubguid.ltx 274 2020-03-12 16:47:21Z karl $
% ltubguid.ltx - documentation for ltugboat classes.
%
-% Copyright 1994-2019 TeX Users Group.
+% Copyright 1994-2020 TeX Users Group.
%
% This file is part of the tugboat package.
%
@@ -207,7 +207,7 @@ authors. The macros represent a development of the earlier
use with \LaTeX~2.09; major contributors have been Robin Fairbairns,
Sebastian Rahtz, Michel Goossens, Nico Poppelier and Johannes Braams.
Many others have been involved, including Barbara Beeton, Karl Berry,
-Mimi Burbank, and the \LaTeX3 team.
+Mimi Burbank, and the \LaTeX\ team.
\section{Availability}
@@ -226,8 +226,8 @@ produced. (\path|ltugproc.cls| is also produced for compatibility, but
is no longer used for proceedings or anything else.)
The\,\verb|.dtx| file may itself be processed by \LaTeX{} to
-produce a formatted (somewhat `literate') source listing for those who
-would like more detailed descriptions of the \TUB\ macros.
+produce a formatted (somewhat `literate') source listing for those
+interested in the implementation of the \TUB\ macros.
\section{The general structure of a paper}
@@ -631,7 +631,7 @@ generate calls to \cs{acro}; 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}
+\subsection{Assorted other markup}
A small list of special typesetting commands follows: a large set of
such commands is defined in the classes, but the list covers most of
@@ -654,6 +654,8 @@ the `everyday' ones.
% for example \verb|\sfrac{3}{4}| is set as \sfrac{3}{4}\,.
\end{cmdlist}
+For commands to typeset urls, see section~\ref{sec:urls}.
+
\section{Use of packages}
Being a \TeX\ journal, authors may use both standard and non-standard
@@ -667,7 +669,7 @@ zip or other archive.
In general, packages currently on \CTAN, and known to work with
\emph{current} \LaTeX{} are likely to be fine. In particular,
the team is happy to accept papers using packages that are supported by
-members of the \LaTeX3 team,\footnote{%
+members of the \LaTeX\ team,\footnote{%
Those in the \LaTeX{} base distribution, or one of those in the
\CTANref{packages} sub-tree on \CTAN.} subject to the warning already
mentioned (section~\ref{sec:verbatim}): that use of the standard
@@ -689,15 +691,64 @@ important feature.)
An additional canonically-recommended package is \path|url.sty|
\cite{Arseneau:url:1996}, for typesetting filenames, email addresses,
urls, etc.; it is being used throughout the present paper (not least in
-the bibliography). Speaking of urls, nowadays we generally omit a
-leading \texttt{http://} or \texttt{https://}.
+the bibliography), either on its own or via \texttt{hyperref}.
Although not necessarily recommended in all cases, many additional
packages are commonly used. To mention a few: \texttt{microtype} can
-help reduce overfull boxes; sometimes it may be preferable to use the
-Latin Modern fonts via \texttt{lmodern}; \texttt{iftex} provides tests
-for the \TeX\ engine being run; and \texttt{hyperref} supports live and
-internal hyperlinks, outlines, and many other features.
+help reduce overfull boxes (and improve appearance); sometimes it may be
+preferable to use the Latin Modern fonts via \texttt{lmodern};
+\texttt{iftex} provides tests for the \TeX\ engine being run;
+\texttt{texosquery} provides operating system information; and
+\texttt{hyperref} supports live and internal hyperlinks, outlines, and
+many other features.
+
+\section{Typesetting urls}
+\label{sec:urls}
+
+As mentioned above, please load either \texttt{url} or (preferably)
+\texttt{hyperref} so that reasonable line breaking of urls can happen.
+
+Furthermore, for the printed (visible) \TUB\ page, nowadays we typically
+omit a leading \texttt{http://} or \texttt{https://}. But for the link
+to actually work in the output \PDF\ or \HTML, the protocol is required
+(or it appears to be a local filesystem path). Therefore the
+\texttt{ltugboat} class provides (as of version 2.23, released
+March~2020) commands \cs{tbsurl} for \texttt{https} and \cs{tbhurl} for
+\texttt{http}.\footnote{They are simple two-line wrapper around
+\cs{hyper@linkurl}, and are due to Ulrike Fischer.
+\url{https://github.com/latex3/hyperref/issues/125}\raggedright}
+
+For example, \verb|\tbsurl{tug.org}| typesets the text
+`\texttt{tug.org}' (with the usual url line breaks) as a link to
+\url{https://tug.org}.
+
+Similarly, \verb|\tbhurl{mirror.ctan.org}| typesets the text
+`\texttt{mirror.ctan.org}' as a link to \url{http://mirror.ctan.org}.
+
+\cs{tbsurl} and \cs{tbhurl} only add the protocol and make live links if
+\texttt{hyperref} is loaded. Without \texttt{hyperref}, they are merely
+synonyms for \cs{url}. This is ok, and we still request that the
+protocol not be included; if live links are not being produced in the
+output, the printed url without the protocol suffices. (When a user
+copies/pastes url text into a browser, it will normally work.)
+
+For \texttt{ftp}, \texttt{rsync}, and other protocols, it is best to
+include them explicitly and use \cs{url}:\\ \verb|\url{ftp://tug.org}|,\\
+\verb|\url{rsync://tug.org}|, etc.
+
+\subsection{Url shortcuts}
+\label{sec:urlshortcuts}
+
+Another aspect of urls: the \tug\ web server supports a shortcut url
+mechanism, \url{tug.org/l/}\meta{ident}, where \meta{ident} can be any
+tag, similar to \url{tinyurl.com} and similar sites. The idea is that
+\url{tug.org} shortcuts can be used in \TUB\ articles needing to link to
+excessively long and/or unstable web resources; then we update the
+shortcut if needed, and not worry that a commercial shortcut provider
+will disappear.
+
+The only way to create a \url{tug.org/l/} shortcut is by request, which
+we are happy to receive.
\section{Bibliography}
\label{sec:biblio}
@@ -705,8 +756,8 @@ internal hyperlinks, outlines, and many other features.
In short: our basic recommendation for handling bibliographies is to use
\BibTeX\ and the \pkgname{tugboat} bibliography style. No document
options are needed or recommended. All that is required in the article
-source (as shown in the template available from
-\url{tug.org/TUGboat}) is the following:
+source (as in the template available from \url{tug.org/TUGboat}) is the
+following:
\begin{verbatim}[\small]
\bibliographystyle{tugboat}
@@ -720,31 +771,35 @@ though, you may enjoy the following small but useful features:
\begin{itemize}
\item It is based on \pkgname{abbrvurl.bst} (see \url{ctan.org/pkg/urlbst}),
-\item thus supports \textsf{url} and \textsf{doi} fields, among others.
+\item and thus supports \textsf{url} and \textsf{doi} fields, among others.
+Please use \textsf{url} instead of putting urls in the
+\textsf{note} field, where possible. Also, please don't bother to
+include ``url access date'' information for \TUB; we find that extraneous.
-\item The \textsf{url} field is ignored if either the \textsf{doi} or
-\textsf{howpublished} field is present, since in practice we observe
-that people put the same information in all those fields, and we don't
-typeset redundant information.
+\item The \textsf{url} field is ignored if either the \textsf{howpublished} or
+\textsf{doi} field is present. In practice we observe that people put
+the same information in all those fields, and we don't want to typeset
+redundant information.
-\item Has even more abbreviations than \textsf{abbrv}, including
-printing only two author names (plus ``et~al\@.'') if there are more
-than four authors (thanks to Mico Loretan).
+\item Has even more abbreviations than \textsf{abbrv}, such as
+printing only two author names (plus ``et~al.'')\ if there are more than
+four authors (thanks to Mico Loretan).
\item Defines an \textsf{@online} entry type as an alias for \textsf{@misc}.
-\item For completeness only: \verb|tugboat.bst| provides ``secret''
+\item For completeness only: \verb|tugboat.bst| provides editor-intended
fields \textsf{newpage} to force a page break after the current item,
-and \textsf{urlnewline} to force a line break before the \textsf{url}
-value. As editors, we've found that these presentation tweaks are often
-necessary for the final typeset output. Authors need not worry about
-them.
+\textsf{urlnewline} to force a line break before the \textsf{url} value,
+and \textsf{journaltie} to output a tie instead of space after the
+\textsf{journal} value. As editors, we've found that these presentation
+tweaks can be desirable for the final typeset output. Authors need not
+worry about them.
\end{itemize}
If you use \BibTeX, feel free to take advantage of the accumulated
bibliography of \TUB{} itself (\url{info/tugboat.bib} on \CTAN), and the
-various compilations by Nelson Beebe in that same directory.
+other compilations by Nelson Beebe in that same directory.
Bibliographies provide further problems because they're notoriously
difficult to typeset at the best of times. \LaTeX{} sets \cs{sloppy}
@@ -756,7 +811,7 @@ set \cs{sloppy}, by default (just like \LaTeX{}), but the author may
\begin{verbatim}
\SetBibJustification{\raggedright}
\end{verbatim}
-as the present article does, to achieve somewhat better results.
+as the present article does, to often achieve somewhat better results.
A last note for references: for \TUB\ issues, please use the format
\textsl{volno\,:\,issno}, e.g., ``\TUB\ 32:1'' for volume~32, number~1.
@@ -764,23 +819,23 @@ A last note for references: for \TUB\ issues, please use the format
\section{Non-recommended bibliography facilities}
The preceding gives the bibliography recommendations for current \TUB\
-article. If, for whatever reason, you cannot follow the recommendation,
-this section is about some of the myriad historical and other
-possibilities.
+articles. If, for whatever reason, you do not wish to follow those
+recommendations, this section is about some of the myriad historical and
+other possibilities.
-Notwithstanding the general recommendation for the \pkgname{tugboat}
-(falling back to \pkgname{plain}) \BibTeX\ style, \TUB's Harvard
+Notwithstanding that general recommendation for the \pkgname{tugboat}
+(falling back to \pkgname{plain}) \BibTeX\ style, \TUB's Harvard-style
citation support may be selected by specifying \optname{harvardcite} as
an option of the \cs{documentclass} command.\footnote{%
The macros used derive rather directly from the `harvard' styles
- written by Glenn Paulley and now maintained by Peter Williams; the
+ written by Glenn Paulley and later maintained by Peter Williams; the
\BibTeX{} style derives from one developed by Patrick Daly.}
If your article demands Harvard-style citations, you may prefer to load
\pkgname{natbib} or similar instead of using \TUB's facilities; that's
-ok.
+fine.
-The basic citation format is `author(s), year', but the macros are
-capable of many variations: this in turn places somewhat of a load on
+This basic citation format is `author(s), year', but the macros are
+capable of many variations. This in turn places somewhat of a load on
the author to use the correct citation macro. The macros available are
shown in figure~\ref{fig:citation-macros}; the figure assumes an entry
in the bibliography with authors Tom, Dick, and~Harry, and with a 1990
@@ -818,7 +873,7 @@ controlled by the \optname{extralabel} and \optname{noextralabel} class
options. The default state (option \optname{extralabel}) attaches the
extra characters.
-As for \BibLaTeX, we don't recommend it for \TUB. If you feel you must
+As for \BibLaTeX: we don't recommend it for \TUB. If you feel you must
use it, that is ok, but we may still change it to using the default
\LaTeX\ and \BibTeX\ facilities in processing for publication if the
output from \BibLaTeX\ is problematic, as we have often seen it to be.
@@ -865,11 +920,8 @@ section~\ref{sec:verbatim}).
Of course, the syntax of commands given to the \LaTeX{} classes is
different (as discussed in section~\ref{sec:syntax}); arguments are
-(almost always) enclosed in braces, and neither of the forms of
-argument provision promulgated by the `plain' macros
-(\cs{macro}\meta{argument}\linebreak[0]\cs{endmacro} and
-\cs{macro * }\meta{argument}\verb| *|) are provided by the \LaTeX{}
-classes.
+(almost always) enclosed in braces instead of the various
+forms provided by the `plain' macros.
\SetBibJustification{\raggedright}
\bibliographystyle{tugboat}
diff --git a/macros/latex/contrib/tugboat/ltubguid.pdf b/macros/latex/contrib/tugboat/ltubguid.pdf
index 96524d71f7..a1f67a5e13 100644
--- a/macros/latex/contrib/tugboat/ltubguid.pdf
+++ b/macros/latex/contrib/tugboat/ltubguid.pdf
Binary files differ
diff --git a/macros/latex/contrib/tugboat/tugboat.bst b/macros/latex/contrib/tugboat/tugboat.bst
index 3be31fa97e..57831f4832 100644
--- a/macros/latex/contrib/tugboat/tugboat.bst
+++ b/macros/latex/contrib/tugboat/tugboat.bst
@@ -1,4 +1,4 @@
-%%% $Id: tugboat.bst 261 2019-11-09 22:00:31Z karl $
+%%% $Id: tugboat.bst 271 2020-01-13 19:13:12Z karl $
%%% TUGboat changes are public domain.
%%%
%%% Modified for TUGboat from abbrvurl.bst:
@@ -10,7 +10,8 @@
%%% Reduce long author lists in format.names per Mico Loretan.
%%% New fields for editors:
%%% "newpage" - force page break after entry;
-%%% "urlnewline" - force line break before url value.
+%%% "urlnewline" - force line break before url value;
+%%% "journaltie" - ~ instead of space after journal name.
%%% --karl, originally created 24jul18.
%%%
%%% Modification of BibTeX style file /usr/local/texlive/2009/texmf-dist/bibtex/bst/base/abbrv.bst
@@ -61,8 +62,9 @@ ENTRY
pubmed % urlbst
url % urlbst
lastchecked % urlbst
- newpage % tub
+ newpage % tub
urlnewline % tub
+ journaltie % tub
}
{}
{ label }
@@ -150,15 +152,23 @@ STRINGS { s t last.output.check }
% urlbst
% arg on stack is what needs to be written.
+%
% If a journal, we want to omit the following comma, as in
% "TUGboat 39(1)" instead of the default "TUGboat, 39(1)".
%
+% Furthermore, if field journaltie is non-empty, output a tie after the
+% journal name instad of a space.
+%
FUNCTION {output.nonnull.original}
{ 's :=
output.state mid.sentence =
{ last.output.check "journal" = not
{ ", " * }
- { " " *}
+ { journaltie empty$ not
+ { "~" * }
+ { " " * }
+ if$
+ }
if$
write$
}
diff --git a/macros/latex/contrib/tugboat/tugboat.dtx b/macros/latex/contrib/tugboat/tugboat.dtx
index 973d05a646..6ed75cece1 100644
--- a/macros/latex/contrib/tugboat/tugboat.dtx
+++ b/macros/latex/contrib/tugboat/tugboat.dtx
@@ -1,8 +1,8 @@
% \iffalse (this is a meta-comment (so they say))
-% $Id: tugboat.dtx 261 2019-11-09 22:00:31Z karl $
+% $Id: tugboat.dtx 274 2020-03-12 16:47:21Z karl $
% tugboat.dtx - main source for LaTeX TUGboat classes.
%
-% Copyright 1994-2019 TeX Users Group.
+% Copyright 1994-2020 TeX Users Group.
%
% This file is part of the tugboat package.
%
@@ -28,7 +28,7 @@
%<ltugboatsty>\ProvidesPackage{ltugboat}
%<ltugprocsty>\ProvidesPackage{ltugproc}
%<ltugcomn> \ProvidesPackage{ltugcomn}
- [2019-11-09 v2.22
+ [2020-03-12 v2.23
%<ltugboatcls> TUGboat journal class%
%<ltugproccls> TUG conference proceedings class%
%<ltugboatsty|ltugprocsty> TUG compatibility package%
@@ -277,7 +277,7 @@
% |\revtitle|& with one argument, title of \ldots \\
% |\revpubinfo|& with one argument, other info pertaining to \ldots \\
% |\endreviewitem|& end data for item being reviewed\\
-% |\booktitle|& with one argument, format book title in text\\
+% |\booktitle|& with one argument, format book title as straight text\\
% |\Input|& |\input| with some other bookkeeping for
% case where multiple articles are put together\\
% |\TBremark|& reminder to \TUB{} editorial staff\\
@@ -348,7 +348,7 @@
\let\tuborigthepage = \thepage
\def\thepage{%
\ifnum\value{page}>900
- \textsl{?\,\@arabic{\numexpr\the\c@page-900\relax}}%
+ \textsl{?\texorpdfstring{\,}{}\@arabic{\numexpr\the\c@page-900\relax}}%
\else
\arabic{page}%
\fi}%
@@ -376,8 +376,18 @@
}
% \end{macrocode}
%
-% The rules dictate that the output should be set using a 10pt base
-% font.
+% We want to use \texttt{hyperref}'s \cs{texorpdfstring}, e.g., in the
+% \texttt{draft} option above. If \texttt{hyperref} is not loaded,
+% define our own trivial fallback to expand to the \TeX\ (first) argument.
+% \begin{macrocode}
+\AtBeginDocument{%
+ \ifx\undefined\texorpdfstring
+ \DeclareRobustCommand{\texorpdfstring}[2]{#1}%
+ \fi
+}
+% \end{macrocode}
+%
+% \TUB\ uses only 10pt for the main text.
%
% \begin{macrocode}
\DeclareOption{11pt}{%
@@ -546,7 +556,7 @@
% We store a set of commands that should be executed at the start of
% each paper, before any paper-specific customisation. These commands
% (stored in the token register \cs{ResetCommands}) include things
-% suc as resetting section and footnote numbers, re-establishing
+% such as resetting section and footnote numbers, re-establishing
% default settings of typesetting parameters, and so on. The user (or
% more typically, editor) may execute the commands by using the
% command \cs{StartNewPaper}. Things I've not yet thought of may be
@@ -567,7 +577,7 @@
% \end{macro}
% \end{macro}
%
-% \subsection{Helpful shorthand (common code with Plain styles)}
+% \subsection{Helpful shorthands (common code with Plain styles)}
%
% \cs{makeescape}, \dots, \cs{makecomment} allow users to change the
% category code of a single character a little more easily. These
@@ -1100,15 +1110,17 @@
% \end{macro}
% \end{macro}
%
-% Miscellaneous useful stuff. Note that \LaTeXe{} defines a robust
-% \cs{,}, but that we provide a new definition of |~| by redefining
-% \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}
+% \subsection{Assorted user-level markup}
+%
+% \LaTeXe{} defines a robust \cs{,}, but that we provide a new definition
+% of |~| by redefining \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}
\let\latexnobreakspace=\nobreakspace
\DeclareRobustCommand{\nobreakspace}{\unskip\nobreak\ \ignorespaces}
@@ -1160,8 +1172,8 @@
% and upright works well enough in both italic and bold contexts.
\DeclareRobustCommand{\cs}[1]{{\tt \char`\\#1}}
%
-% This command was defined much later than the other, so let's not
-% conflict with any existing definitions that might be out there.
+% This command was defined much later than the others around here, so
+% let's not conflict with any existing definitions that might be out there.
% Don't allow hyphenations or other line breaks.
\DeclareRobustCommand{\tubbraced}[1]{\mbox{\texttt{\char`\{#1\char`\}}}}
%
@@ -1172,6 +1184,28 @@
% but fine, just keeping it.
\DeclareRobustCommand{\thinskip}{\hskip 0.16667em\relax}
%
+% Ah, urls. Nowadays, we like the visible url to not have any protocol,
+% if it is \texttt{http://} or \texttt{https://}. But we need to include
+% the protocol if we are making live links, since a string like
+% \texttt{tug.org/whatever} will be taken as a local filename by
+% browsers and PDF readers. Since we need to check for
+% \texttt{hyperref}, make the definition \cs{AtBeginDocument}. In the
+% end, \cs{tbsurl}\tubbraced{foo} produces \texttt{https://foo} and
+% \cs{tbhurl}\tubbraced{foo} produces \texttt{http://foo}.
+\AtBeginDocument{%
+\ifx\hyper@normalise\undefined
+ \def\tbsurl{\url}% no hyperref, so just \url is fine.
+ \def\tbhurl{\url}%
+\else
+ % This hyperref hook-in is due to Ulrike Fischer.
+ % \url{https://github.com/latex3/hyperref/issues/125}.
+ \DeclareRobustCommand*{\tbsurl}{\hyper@normalise\tbsurl@}%
+ \def\tbsurl@#1{\hyper@linkurl{\Hurl{#1}}{https://#1}}%
+ \DeclareRobustCommand*{\tbhurl}{\hyper@normalise\tbhurl@}
+ \def\tbhurl@#1{\hyper@linkurl{\Hurl{#1}}{http://#1}}%
+\fi
+}
+%
% Make \! work in text mode.
\DeclareRobustCommand{\!}{\ifmmode\mskip-\thinmuskip \else\kern-0.16667em \fi}
%
@@ -1511,7 +1545,7 @@
%<*classtail>
\PrelimDrafttrue
% \end{macrocode}
-% \subsection{Page dimensions, glue, penalties etc}
+% \subsection{Page dimensions, glue, penalties, etc.}
% \begin{macrocode}
\textheight 54pc
\textwidth 39pc
@@ -2614,7 +2648,7 @@
%
% \subsection{Title references}
%
-% This is a first cut at a mecahnism for referencing by the title of a
+% This is a first cut at a mechanism for referencing by the title of a
% section; it employs the delightfully simple idea Sebastian Rahtz has
% in the \texttt{nameref} package (which is part of
% \texttt{hyperref}). As it stands, it lacks some of the bells and
@@ -2957,14 +2991,15 @@
% \end{macrocode}
%
% Finally, if |microtype| is loaded, we want it to be deactivated in
-% verbatim blocks. It often manipulates a leading |\| rather too much.
+% verbatim blocks. It often manipulates a leading |\| rather too much,
+% and messes with the visible fixed-width alignment.
% \begin{macrocode}
\AtBeginDocument{%
\@ifpackageloaded{microtype}
{\g@addto@macro\@verbatim{\microtypesetup{activate=false}}}{}
}
% \end{macrocode}
-
+%
% \subsection{Bibliography}
% \label{sec:citations}
% This is more or less copied verbatim from Glenn Paulley's
diff --git a/macros/latex/contrib/tugboat/tugboat.ins b/macros/latex/contrib/tugboat/tugboat.ins
index 4aabebdd9b..05b6476b09 100644
--- a/macros/latex/contrib/tugboat/tugboat.ins
+++ b/macros/latex/contrib/tugboat/tugboat.ins
@@ -1,10 +1,10 @@
-% $Id: tugboat.ins 261 2019-11-09 22:00:31Z karl $
+% $Id: tugboat.ins 274 2020-03-12 16:47:21Z 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-2019 TeX Users Group.
+%% Copyright 1994-2020 TeX Users Group.
%%
%% This file is part of the tugboat package.
%%
@@ -12,14 +12,14 @@
%% 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
+%% https://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).
+%% (https://tug.org/TUGboat).
%%
%% The list of all files belonging to the distribution is
%% given in the file `manifest.txt'.
@@ -38,20 +38,20 @@
This is a generated file.
-Copyright 1994-2019 TeX Users Group.
+Copyright 1994-2020 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
+ https://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).
+(https://tug.org/TUGboat).
The list of all files belonging to the distribution is given in the file
`manifest.txt'.
diff --git a/macros/latex/contrib/tugboat/tugboat.pdf b/macros/latex/contrib/tugboat/tugboat.pdf
index afdef4195d..30bd7e3eb9 100644
--- a/macros/latex/contrib/tugboat/tugboat.pdf
+++ b/macros/latex/contrib/tugboat/tugboat.pdf
Binary files differ