summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/source/latex-dev
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2020-02-03 22:29:17 +0000
committerKarl Berry <karl@freefriends.org>2020-02-03 22:29:17 +0000
commitca44d57bbfaa45d580f466e5dff1b3a9cccd49f6 (patch)
tree70648594f45670fbca5dd6a8841809d6781a3a56 /Master/texmf-dist/source/latex-dev
parentab7df394be9df85dae10db6d1e49584d0abfece2 (diff)
latex-dev (3feb20)
git-svn-id: svn://tug.org/texlive/trunk@53651 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/source/latex-dev')
-rw-r--r--Master/texmf-dist/source/latex-dev/base/alltt.ins28
-rw-r--r--Master/texmf-dist/source/latex-dev/base/classes.dtx21
-rw-r--r--Master/texmf-dist/source/latex-dev/base/classes.ins29
-rw-r--r--Master/texmf-dist/source/latex-dev/base/cmextra.ins44
-rw-r--r--Master/texmf-dist/source/latex-dev/base/cmfonts.fdd44
-rw-r--r--Master/texmf-dist/source/latex-dev/base/cmfonts.ins29
-rw-r--r--Master/texmf-dist/source/latex-dev/base/doc.dtx4
-rw-r--r--Master/texmf-dist/source/latex-dev/base/docstrip.dtx4
-rw-r--r--Master/texmf-dist/source/latex-dev/base/docstrip.ins28
-rw-r--r--Master/texmf-dist/source/latex-dev/base/ec.ins28
-rw-r--r--Master/texmf-dist/source/latex-dev/base/exscale.dtx4
-rw-r--r--Master/texmf-dist/source/latex-dev/base/exscale.ins28
-rw-r--r--Master/texmf-dist/source/latex-dev/base/fix-cm.ins28
-rw-r--r--Master/texmf-dist/source/latex-dev/base/fontdef.dtx45
-rw-r--r--Master/texmf-dist/source/latex-dev/base/format.ins49
-rw-r--r--Master/texmf-dist/source/latex-dev/base/graphpap.ins28
-rw-r--r--Master/texmf-dist/source/latex-dev/base/ifthen.ins28
-rw-r--r--Master/texmf-dist/source/latex-dev/base/inputenc.ins34
-rw-r--r--Master/texmf-dist/source/latex-dev/base/latex209.ins30
-rw-r--r--Master/texmf-dist/source/latex-dev/base/latexrelease.dtx24
-rw-r--r--Master/texmf-dist/source/latex-dev/base/latexrelease.ins28
-rw-r--r--Master/texmf-dist/source/latex-dev/base/latexsym.dtx2
-rw-r--r--Master/texmf-dist/source/latex-dev/base/latexsym.ins37
-rw-r--r--Master/texmf-dist/source/latex-dev/base/letter.ins31
-rw-r--r--Master/texmf-dist/source/latex-dev/base/ltclass.dtx80
-rw-r--r--Master/texmf-dist/source/latex-dev/base/ltcounts.dtx18
-rw-r--r--Master/texmf-dist/source/latex-dev/base/ltdefns.dtx8
-rw-r--r--Master/texmf-dist/source/latex-dev/base/ltdirchk.dtx2
-rw-r--r--Master/texmf-dist/source/latex-dev/base/lterror.dtx6
-rw-r--r--Master/texmf-dist/source/latex-dev/base/ltexpl.dtx2
-rw-r--r--Master/texmf-dist/source/latex-dev/base/ltfiles.dtx10
-rw-r--r--Master/texmf-dist/source/latex-dev/base/ltfinal.dtx8
-rw-r--r--Master/texmf-dist/source/latex-dev/base/ltfntcmd.dtx4
-rw-r--r--Master/texmf-dist/source/latex-dev/base/ltfssaxes.dtx798
-rw-r--r--Master/texmf-dist/source/latex-dev/base/ltfssbas.dtx8
-rw-r--r--Master/texmf-dist/source/latex-dev/base/ltfssdcl.dtx81
-rw-r--r--Master/texmf-dist/source/latex-dev/base/ltfssini.dtx46
-rw-r--r--Master/texmf-dist/source/latex-dev/base/ltfsstrc.dtx6
-rw-r--r--Master/texmf-dist/source/latex-dev/base/ltlists.dtx3
-rw-r--r--Master/texmf-dist/source/latex-dev/base/ltluatex.dtx171
-rw-r--r--Master/texmf-dist/source/latex-dev/base/ltmath.dtx16
-rw-r--r--Master/texmf-dist/source/latex-dev/base/ltmiscen.dtx20
-rw-r--r--Master/texmf-dist/source/latex-dev/base/ltoutenc.dtx96
-rw-r--r--Master/texmf-dist/source/latex-dev/base/ltoutenc.ins32
-rw-r--r--Master/texmf-dist/source/latex-dev/base/ltoutput.dtx30
-rw-r--r--Master/texmf-dist/source/latex-dev/base/ltpage.dtx4
-rw-r--r--Master/texmf-dist/source/latex-dev/base/ltpictur.dtx12
-rw-r--r--Master/texmf-dist/source/latex-dev/base/ltplain.dtx4
-rw-r--r--Master/texmf-dist/source/latex-dev/base/ltsect.dtx10
-rw-r--r--Master/texmf-dist/source/latex-dev/base/ltspace.dtx15
-rw-r--r--Master/texmf-dist/source/latex-dev/base/lttab.dtx4
-rw-r--r--Master/texmf-dist/source/latex-dev/base/lttextcomp.dtx201
-rw-r--r--Master/texmf-dist/source/latex-dev/base/ltvers.dtx19
-rw-r--r--Master/texmf-dist/source/latex-dev/base/ltxref.dtx18
-rw-r--r--Master/texmf-dist/source/latex-dev/base/makeindx.ins28
-rw-r--r--Master/texmf-dist/source/latex-dev/base/newdc.ins31
-rw-r--r--Master/texmf-dist/source/latex-dev/base/nfssfont.ins28
-rw-r--r--Master/texmf-dist/source/latex-dev/base/olddc.ins36
-rw-r--r--Master/texmf-dist/source/latex-dev/base/proc.ins28
-rw-r--r--Master/texmf-dist/source/latex-dev/base/slides.dtx2
-rw-r--r--Master/texmf-dist/source/latex-dev/base/slides.ins38
-rw-r--r--Master/texmf-dist/source/latex-dev/base/slifonts.fdd78
-rw-r--r--Master/texmf-dist/source/latex-dev/base/syntonly.ins29
-rw-r--r--Master/texmf-dist/source/latex-dev/base/tulm.fdd20
-rw-r--r--Master/texmf-dist/source/latex-dev/base/tulm.ins29
-rw-r--r--Master/texmf-dist/source/latex-dev/base/unpack.ins22
-rw-r--r--Master/texmf-dist/source/latex-dev/base/utf8ienc.dtx26
-rw-r--r--Master/texmf-dist/source/latex-dev/graphics/color.dtx38
-rw-r--r--Master/texmf-dist/source/latex-dev/graphics/drivers.dtx2
-rw-r--r--Master/texmf-dist/source/latex-dev/graphics/epsfig.dtx2
-rw-r--r--Master/texmf-dist/source/latex-dev/graphics/graphics.dtx21
-rw-r--r--Master/texmf-dist/source/latex-dev/graphics/graphicx.dtx9
-rw-r--r--Master/texmf-dist/source/latex-dev/graphics/keyval.dtx2
-rw-r--r--Master/texmf-dist/source/latex-dev/graphics/lscape.dtx2
-rw-r--r--Master/texmf-dist/source/latex-dev/graphics/rotating.dtx58
-rw-r--r--Master/texmf-dist/source/latex-dev/graphics/trig.dtx2
-rw-r--r--Master/texmf-dist/source/latex-dev/tools/afterpage.dtx2
-rw-r--r--Master/texmf-dist/source/latex-dev/tools/afterpage.ins22
-rw-r--r--Master/texmf-dist/source/latex-dev/tools/array.dtx31
-rw-r--r--Master/texmf-dist/source/latex-dev/tools/bm.dtx4
-rw-r--r--Master/texmf-dist/source/latex-dev/tools/bm.ins22
-rw-r--r--Master/texmf-dist/source/latex-dev/tools/calc.dtx2
-rw-r--r--Master/texmf-dist/source/latex-dev/tools/dcolumn.dtx2
-rw-r--r--Master/texmf-dist/source/latex-dev/tools/delarray.dtx2
-rw-r--r--Master/texmf-dist/source/latex-dev/tools/enumerate.dtx2
-rw-r--r--Master/texmf-dist/source/latex-dev/tools/fileerr.dtx2
-rw-r--r--Master/texmf-dist/source/latex-dev/tools/fontsmpl.dtx2
-rw-r--r--Master/texmf-dist/source/latex-dev/tools/ftnright.dtx2
-rw-r--r--Master/texmf-dist/source/latex-dev/tools/indentfirst.dtx2
-rw-r--r--Master/texmf-dist/source/latex-dev/tools/layout.dtx2
-rw-r--r--Master/texmf-dist/source/latex-dev/tools/longtable.dtx22
-rw-r--r--Master/texmf-dist/source/latex-dev/tools/longtable.ins22
-rw-r--r--Master/texmf-dist/source/latex-dev/tools/multicol.dtx58
-rw-r--r--Master/texmf-dist/source/latex-dev/tools/multicol.ins22
-rw-r--r--Master/texmf-dist/source/latex-dev/tools/rawfonts.dtx2
-rw-r--r--Master/texmf-dist/source/latex-dev/tools/shellesc.dtx10
-rw-r--r--Master/texmf-dist/source/latex-dev/tools/showkeys.dtx2
-rw-r--r--Master/texmf-dist/source/latex-dev/tools/somedefs.dtx2
-rw-r--r--Master/texmf-dist/source/latex-dev/tools/tabularx.dtx15
-rw-r--r--Master/texmf-dist/source/latex-dev/tools/tabularx.ins22
-rw-r--r--Master/texmf-dist/source/latex-dev/tools/theorem.dtx2
-rw-r--r--Master/texmf-dist/source/latex-dev/tools/tools.ins24
-rw-r--r--Master/texmf-dist/source/latex-dev/tools/trace.dtx10
-rw-r--r--Master/texmf-dist/source/latex-dev/tools/varioref.dtx37
-rw-r--r--Master/texmf-dist/source/latex-dev/tools/varioref.ins22
-rw-r--r--Master/texmf-dist/source/latex-dev/tools/verbatim.dtx8
-rw-r--r--Master/texmf-dist/source/latex-dev/tools/xr.dtx5
-rw-r--r--Master/texmf-dist/source/latex-dev/tools/xspace.dtx2
108 files changed, 1688 insertions, 1616 deletions
diff --git a/Master/texmf-dist/source/latex-dev/base/alltt.ins b/Master/texmf-dist/source/latex-dev/base/alltt.ins
index 197637dfb1b..adb3838a473 100644
--- a/Master/texmf-dist/source/latex-dev/base/alltt.ins
+++ b/Master/texmf-dist/source/latex-dev/base/alltt.ins
@@ -5,34 +5,34 @@
%%
%% Copyright (C) 1993-2020
%% The LaTeX3 Project and any individual authors listed elsewhere
-%% in this file.
-%%
+%% in this file.
+%%
%% This file is part of the LaTeX base system.
%% -------------------------------------------
-%%
+%%
%% It may be distributed and/or modified under the
%% conditions of the LaTeX Project Public License, either version 1.3c
%% of this license or (at your option) any later version.
%% The latest version of this license is in
%% https://www.latex-project.org/lppl.txt
-%% and version 1.3c or later is part of all distributions of LaTeX
+%% and version 1.3c or later is part of all distributions of LaTeX
%% version 2008 or later.
-%%
+%%
%% This file has the LPPL maintenance status "maintained".
-%%
+%%
%% As this file contains legal notices, it is NOT PERMITTED to modify
%% this file in any way that the legal information placed into
%% generated files is changed (i.e., the files generated when the
%% original file is executed). This restriction does not apply if
%% (parts of) the content is reused in a different WORK producing its
%% own generated files.
-%%
+%%
%% The list of all files belonging to the LaTeX base distribution is
%% given in the file `manifest.txt'. See also `legal.txt' for additional
%% information.
-%%
-%%
-%%
+%%
+%%
+%%
%%
%% --------------- start of docstrip commands ------------------
%%
@@ -50,7 +50,7 @@ reports for it can be opened at https://latex-project.org/bugs.html
Copyright (C) 1993-2020
The LaTeX3 Project and any individual authors listed elsewhere
-in this file.
+in this file.
This file was generated from file(s) of the LaTeX base system.
--------------------------------------------------------------
@@ -60,7 +60,7 @@ conditions of the LaTeX Project Public License, either version 1.3c
of this license or (at your option) any later version.
The latest version of this license is in
https://www.latex-project.org/lppl.txt
-and version 1.3c or later is part of all distributions of LaTeX
+and version 1.3c or later is part of all distributions of LaTeX
version 2008 or later.
This file has the LPPL maintenance status "maintained".
@@ -73,8 +73,8 @@ The list of all files belonging to the LaTeX base distribution is
given in the file `manifest.txt'. See also `legal.txt' for additional
information.
-The list of derived (unpacked) files belonging to the distribution
-and covered by LPPL is defined by the unpacking scripts (with
+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
diff --git a/Master/texmf-dist/source/latex-dev/base/classes.dtx b/Master/texmf-dist/source/latex-dev/base/classes.dtx
index b43ae84f370..ea3b014c897 100644
--- a/Master/texmf-dist/source/latex-dev/base/classes.dtx
+++ b/Master/texmf-dist/source/latex-dev/base/classes.dtx
@@ -213,7 +213,7 @@
% \changes{v1.3l}{1995/10/20}{Disabled in compatibility mode all
% options that are new in \LaTeXe.}
% \changes{v1.3v}{1997/06/16}{Documentation fixes.}
-% \changes{v1.4j}{2019/08/27}{Various commands made robust}
+% \changes{v1.4j}{2019/08/27}{Various commands made robust}
%
%
% \title{Standard Document Classes for \LaTeX{} version 2e\thanks{This
@@ -611,11 +611,11 @@
\normalsize
% \end{macrocode}
% We use |\MakeRobust| instead of |\DeclareRobustCommand| above to avoid a log
-% entry for the redefinition. But if we are running in in a rollback situation
+% entry for the redefinition. But if we are running in a rollback situation
% (prior to 2015) we don't touch it.
-% \changes{v1.4k}{2019/10/25}{Roll back handling (gh/201)}
+% \changes{v1.4k}{2019/10/25}{Roll back handling (gh/201)}
% \begin{macrocode}
-\ifx\MakeRobust\@undefined \else
+\ifx\MakeRobust\@undefined \else
\MakeRobust\normalsize
\fi
% \end{macrocode}
@@ -2964,7 +2964,7 @@
% font to \cs{normalfont} so that always the same symbol is
% produced regardless of surrounding conditions.
%
-% \changes{v1.4l}{2019/12/20}{Normalize label fonts}
+% \changes{v1.4l}{2019/12/20}{Normalize label fonts}
% A possible alternative would be
%\begin{verbatim}
%\renewcommand\labelitemfont{%
@@ -3776,7 +3776,7 @@
\@mkboth{%
\MakeUppercase\contentsname}{\MakeUppercase\contentsname}}%
% \end{macrocode}
-% The the actual table of contents is made by calling
+% The actual table of contents is made by calling
% |\@starttoc{toc}|. After that we restore twocolumn mode if
% necessary.
% \begin{macrocode}
@@ -3844,7 +3844,7 @@
\large \bfseries #1\hfil
\hb@xt@\@pnumwidth{\hss #2%
% \end{macrocode}
-%
+%
% \changes{v1.4i}{2018/09/03}{Prevent protrusion
% (\url{https://tex.stackexchange.com/q/172785/10109})}
% \begin{macrocode}
@@ -3912,7 +3912,7 @@
#1\nobreak\hfil
\nobreak\hb@xt@\@pnumwidth{\hss #2%
% \end{macrocode}
-%
+%
% \changes{v1.4i}{2018/09/03}{Prevent protrusion
% (\url{https://tex.stackexchange.com/q/172785/10109})}
% \begin{macrocode}
@@ -3969,7 +3969,7 @@
#1\nobreak\hfil
\nobreak\hb@xt@\@pnumwidth{\hss #2%
% \end{macrocode}
-%
+%
% \changes{v1.4i}{2018/09/03}{Prevent protrusion
% (\url{https://tex.stackexchange.com/q/172785/10109})}
% \begin{macrocode}
@@ -4361,7 +4361,7 @@
% defined below in command names. These commands may be redefined in
% any class or package that is customising \LaTeX\ for use with
% non-English languages.
-% \changes{v1.3h}{1995/07/20}{Split up to save save stack /1742}
+% \changes{v1.3h}{1995/07/20}{Split up to save on save stack /1742}
%
% \begin{macro}{\contentsname}
% \begin{macro}{\listfigurename}
@@ -4496,4 +4496,3 @@
% \Finale
%
\endinput
-
diff --git a/Master/texmf-dist/source/latex-dev/base/classes.ins b/Master/texmf-dist/source/latex-dev/base/classes.ins
index c6f1696a1d3..13d49747272 100644
--- a/Master/texmf-dist/source/latex-dev/base/classes.ins
+++ b/Master/texmf-dist/source/latex-dev/base/classes.ins
@@ -5,34 +5,34 @@
%%
%% Copyright (C) 1993-2020
%% The LaTeX3 Project and any individual authors listed elsewhere
-%% in this file.
-%%
+%% in this file.
+%%
%% This file is part of the LaTeX base system.
%% -------------------------------------------
-%%
+%%
%% It may be distributed and/or modified under the
%% conditions of the LaTeX Project Public License, either version 1.3c
%% of this license or (at your option) any later version.
%% The latest version of this license is in
%% https://www.latex-project.org/lppl.txt
-%% and version 1.3c or later is part of all distributions of LaTeX
+%% and version 1.3c or later is part of all distributions of LaTeX
%% version 2008 or later.
-%%
+%%
%% This file has the LPPL maintenance status "maintained".
-%%
+%%
%% As this file contains legal notices, it is NOT PERMITTED to modify
%% this file in any way that the legal information placed into
%% generated files is changed (i.e., the files generated when the
%% original file is executed). This restriction does not apply if
%% (parts of) the content is reused in a different WORK producing its
%% own generated files.
-%%
+%%
%% The list of all files belonging to the LaTeX base distribution is
%% given in the file `manifest.txt'. See also `legal.txt' for additional
%% information.
-%%
-%%
-%%
+%%
+%%
+%%
%%
%% --------------- start of docstrip commands ------------------
%%
@@ -50,7 +50,7 @@ reports for it can be opened at https://latex-project.org/bugs.html
Copyright (C) 1993-2020
The LaTeX3 Project and any individual authors listed elsewhere
-in this file.
+in this file.
This file was generated from file(s) of the LaTeX base system.
--------------------------------------------------------------
@@ -60,7 +60,7 @@ conditions of the LaTeX Project Public License, either version 1.3c
of this license or (at your option) any later version.
The latest version of this license is in
https://www.latex-project.org/lppl.txt
-and version 1.3c or later is part of all distributions of LaTeX
+and version 1.3c or later is part of all distributions of LaTeX
version 2008 or later.
This file has the LPPL maintenance status "maintained".
@@ -73,8 +73,8 @@ The list of all files belonging to the LaTeX base distribution is
given in the file `manifest.txt'. See also `legal.txt' for additional
information.
-The list of derived (unpacked) files belonging to the distribution
-and covered by LPPL is defined by the unpacking scripts (with
+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
@@ -118,4 +118,3 @@ extension .ins) which are part of the distribution.
}
\endbatchfile
-
diff --git a/Master/texmf-dist/source/latex-dev/base/cmextra.ins b/Master/texmf-dist/source/latex-dev/base/cmextra.ins
index 64901332964..05776a68075 100644
--- a/Master/texmf-dist/source/latex-dev/base/cmextra.ins
+++ b/Master/texmf-dist/source/latex-dev/base/cmextra.ins
@@ -5,34 +5,34 @@
%%
%% Copyright (C) 1993-2020
%% The LaTeX3 Project and any individual authors listed elsewhere
-%% in this file.
-%%
+%% in this file.
+%%
%% This file is part of the LaTeX base system.
%% -------------------------------------------
-%%
+%%
%% It may be distributed and/or modified under the
%% conditions of the LaTeX Project Public License, either version 1.3c
%% of this license or (at your option) any later version.
%% The latest version of this license is in
%% https://www.latex-project.org/lppl.txt
-%% and version 1.3c or later is part of all distributions of LaTeX
+%% and version 1.3c or later is part of all distributions of LaTeX
%% version 2008 or later.
-%%
+%%
%% This file has the LPPL maintenance status "maintained".
-%%
+%%
%% As this file contains legal notices, it is NOT PERMITTED to modify
%% this file in any way that the legal information placed into
%% generated files is changed (i.e., the files generated when the
%% original file is executed). This restriction does not apply if
%% (parts of) the content is reused in a different WORK producing its
%% own generated files.
-%%
+%%
%% The list of all files belonging to the LaTeX base distribution is
%% given in the file `manifest.txt'. See also `legal.txt' for additional
%% information.
-%%
-%%
-%%
+%%
+%%
+%%
%%
%% --------------- start of docstrip commands ------------------
%%
@@ -50,7 +50,7 @@ reports for it can be opened at https://latex-project.org/bugs.html
Copyright (C) 1993-2020
The LaTeX3 Project and any individual authors listed elsewhere
-in this file.
+in this file.
This file was generated from file(s) of the LaTeX base system.
--------------------------------------------------------------
@@ -60,7 +60,7 @@ conditions of the LaTeX Project Public License, either version 1.3c
of this license or (at your option) any later version.
The latest version of this license is in
https://www.latex-project.org/lppl.txt
-and version 1.3c or later is part of all distributions of LaTeX
+and version 1.3c or later is part of all distributions of LaTeX
version 2008 or later.
This file may only be distributed together with a copy of the LaTeX
@@ -90,39 +90,39 @@ making successful document exchange impossible.
%
% \Ask\answer{%
% **************************************************************
-% ^^J*
+% ^^J*
% ^^J* Do you have the Concrete Roman fonts installed on your system,
% ^^J* or do you intend to install them?
-% ^^J*
+% ^^J*
% ^^J* If so please answer with `y' otherwise with `n' below.
% ^^J*
-% ^^J* You can easily redo this installation later in case you
+% ^^J* You can easily redo this installation later in case you
% ^^J* change your mind.
% ^^J**************************************************************}
-%
+%
% {\ifx\answer\y
-%
+%
% \Msg{*** Generating font defs for Cork encoded fonts ***}
% \Msg{*** Generating font defs for old TeX Text encoding ***}
% \Msg{*** Generating font defs for math italic encoding ***}
-%
+%
% \generate{%
% \file{t1ccr.fd}{\from{cmfonts.fdd}{fd,T1ccr}}
% \file{ot1ccr.fd}{\from{cmfonts.fdd}{fd,OT1ccr}}
% \file{omlccm.fd}{\from{cmfonts.fdd}{fd,OMLccm}}}
-%
+%
% \fi}
\Ask\answer{%
**************************************************************
- ^^J*
+ ^^J*
^^J* Do you have the cyrillic fonts from the University of
^^J* Washington installed on your system,
^^J* or do you intend to install them?
- ^^J*
+ ^^J*
^^J* If so please answer with `y' otherwise with `n' below.
^^J*
- ^^J* You can easily redo this installation later in case you
+ ^^J* You can easily redo this installation later in case you
^^J* change your mind.
^^J*
^^J* Normally it is better *not* to install these files, but use
diff --git a/Master/texmf-dist/source/latex-dev/base/cmfonts.fdd b/Master/texmf-dist/source/latex-dev/base/cmfonts.fdd
index b7b97ccf1c8..1eb318b0492 100644
--- a/Master/texmf-dist/source/latex-dev/base/cmfonts.fdd
+++ b/Master/texmf-dist/source/latex-dev/base/cmfonts.fdd
@@ -2,29 +2,29 @@
%
% Copyright 1993-2019
% The LaTeX3 Project and any individual authors listed elsewhere
-% in this file.
-%
+% in this file.
+%
% This file is part of the LaTeX base system.
% -------------------------------------------
-%
+%
% It may be distributed and/or modified under the
% conditions of the LaTeX Project Public License, either version 1.3c
% of this license or (at your option) any later version.
% The latest version of this license is in
% https://www.latex-project.org/lppl.txt
-% and version 1.3c or later is part of all distributions of LaTeX
+% and version 1.3c or later is part of all distributions of LaTeX
% version 2008 or later.
-%
+%
% This file has the LPPL maintenance status "maintained".
-%
+%
% The list of all files belonging to the LaTeX base distribution is
% given in the file `manifest.txt'. See also `legal.txt' for additional
% information.
-%
-% The list of derived (unpacked) files belonging to the distribution
-% and covered by LPPL is defined by the unpacking scripts (with
+%
+% 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
%
%\iffalse This is a META comment
@@ -87,7 +87,7 @@
%\fi
%
%
-%
+%
% \changes{v2.5e}{1997/06/16}{Replaced reference to DC-fonts by ec
% fonts.}
% \changes{v2.5c}{1997/05/26}{Removed spaces in and around arguments
@@ -106,11 +106,11 @@
% {Dont force T1 hyphenchar to 127. latex/1853}
% \changes{v2.4c}{1995/11/07}{Use decimal rather than octal character
% specification for \cs{hyphenchar} and \cs{skewchar} so that there is
-% no problem with an active quote character.}
+% no problem with an active quote character.}
% \changes{v2.4a}{1995/10/22}{Added support for new (v1.2) DC fonts
% and text companion fonts (TS1 encoding).}
% \changes{v2.3d}{1994/11/02}{Added more font substitutions for
-% \cs{pounds}.}
+% \cs{pounds}.}
% \changes{v2.3d}{1994/10/30}{Added OMLcmr.fd and OMScmr.fd.}
% \changes{v2.3b}{1994/05/12}{Added \cs{ProvidesFile} commands}
% \changes{v2.3a}{1994/05/03}{Included definitions for
@@ -513,7 +513,7 @@
%<ec>ecssdc10
}{}
% \end{macrocode}
-%
+%
% \begin{macrocode}
%<*!new&!ec>
%<+T1cmss>%%%%%%%% bold extended series
@@ -612,7 +612,7 @@
%
% \subsubsection{Computer Modern Variable Typewriter}
%
-% The Computer Modern Variable Typewriter family is the
+% The Computer Modern Variable Typewriter family is the
% proportional spaced version of the Computer Modern Typewriter
% family. It is implemented as a separate family to allow easy use
% in normal text, including changes of shape/series etc if available.
@@ -947,7 +947,7 @@
%<-ori> <5><6><7><8><9>cmssdc10%
<10><10.95><12><14.4><17.28><20.74><24.88>cmssdc10%
}{}
-
+
%<+OT1cmss,Ucmss>%%%%%%%%% bold extended series
%<+OT1cmss>\DeclareFontShape{OT1}{cmss}{bx}{n}
%<+Ucmss>\DeclareFontShape{U}{cmss}{bx}{n}%
@@ -1026,7 +1026,7 @@
%<-nowarn> {<->sub*cmtt/m/it}{}
%<+nowarn> {<->ssub*cmtt/m/it}{}
% \end{macrocode}
-%
+%
% \changes{v2.5j}{2019/12/16}{Provide substitutions for cmtt/bx/sl}
% \begin{macrocode}
%<+OT1cmtt>\DeclareFontShape{OT1}{cmtt}{bx}{sl}
@@ -1042,7 +1042,7 @@
%
% \subsubsection{Computer Modern Variable Typewriter (\texttt{OT1})}
%
-% The Computer Modern Variable Typewriter family is the
+% The Computer Modern Variable Typewriter family is the
% proportional spaced version of the Computer Modern Typewriter
% family. It is implemented as a separate family to allow easy use
% in normal text, including changes of shape/series etc if available.
@@ -1137,7 +1137,7 @@
%
% \subsubsection{Computer Modern Roman Math italics}
%
-% \changes{v2.3d}{1994/10/30}{Added OMLcmr font substitutions pointing
+% \changes{v2.3d}{1994/10/30}{Added OMLcmr font substitutions pointing
% to OMLcmm. }
% \changes{v2.3f}{1995/04/22}{Corrected OMLcmr \cs{skewchar}}
%
@@ -1164,7 +1164,7 @@
{<->ssub*cmm/b/it}{}
%</OMLcmr>
% \end{macrocode}
-%
+%
% \subsubsection{Computer Modern Math symbols}
%
% \changes{v2.3a}{1994/05/02}{Included font definitions for
@@ -1185,10 +1185,10 @@
%
% \subsubsection{Computer Modern Roman Math symbols}
%
-% \changes{v2.3d}{1994/10/30}{Added OMScmr font substitutions pointing
+% \changes{v2.3d}{1994/10/30}{Added OMScmr font substitutions pointing
% to OMScmm. }
%
-% Some text symbols like `\P' and `\dag' are kept in the OMS encoding,
+% Some text symbols like `\P' and `\dag' are kept in the OMS encoding,
% so we need font substititutions from OMS/cmr to OMS/cmsy.
% \begin{macrocode}
%<*OMScmr>
diff --git a/Master/texmf-dist/source/latex-dev/base/cmfonts.ins b/Master/texmf-dist/source/latex-dev/base/cmfonts.ins
index a290b22cd3a..b5ed3e3f106 100644
--- a/Master/texmf-dist/source/latex-dev/base/cmfonts.ins
+++ b/Master/texmf-dist/source/latex-dev/base/cmfonts.ins
@@ -5,34 +5,34 @@
%%
%% Copyright (C) 1993-2020
%% The LaTeX3 Project and any individual authors listed elsewhere
-%% in this file.
-%%
+%% in this file.
+%%
%% This file is part of the LaTeX base system.
%% -------------------------------------------
-%%
+%%
%% It may be distributed and/or modified under the
%% conditions of the LaTeX Project Public License, either version 1.3c
%% of this license or (at your option) any later version.
%% The latest version of this license is in
%% https://www.latex-project.org/lppl.txt
-%% and version 1.3c or later is part of all distributions of LaTeX
+%% and version 1.3c or later is part of all distributions of LaTeX
%% version 2008 or later.
-%%
+%%
%% This file has the LPPL maintenance status "maintained".
-%%
+%%
%% As this file contains legal notices, it is NOT PERMITTED to modify
%% this file in any way that the legal information placed into
%% generated files is changed (i.e., the files generated when the
%% original file is executed). This restriction does not apply if
%% (parts of) the content is reused in a different WORK producing its
%% own generated files.
-%%
+%%
%% The list of all files belonging to the LaTeX base distribution is
%% given in the file `manifest.txt'. See also `legal.txt' for additional
%% information.
-%%
-%%
-%%
+%%
+%%
+%%
%%
%% --------------- start of docstrip commands ------------------
%%
@@ -50,7 +50,7 @@ reports for it can be opened at https://latex-project.org/bugs.html
Copyright (C) 1993-2020
The LaTeX3 Project and any individual authors listed elsewhere
-in this file.
+in this file.
This file was generated from file(s) of the LaTeX base system.
--------------------------------------------------------------
@@ -60,7 +60,7 @@ conditions of the LaTeX Project Public License, either version 1.3c
of this license or (at your option) any later version.
The latest version of this license is in
https://www.latex-project.org/lppl.txt
-and version 1.3c or later is part of all distributions of LaTeX
+and version 1.3c or later is part of all distributions of LaTeX
version 2008 or later.
This file may only be distributed together with a copy of the LaTeX
@@ -104,7 +104,7 @@ making successful document exchange impossible.
\file{omscmr.fd}{\from{cmfonts.fdd}{OMScmr}}
}
-
+
\ifToplevel{
\Msg{***********************************************************}
\Msg{*}
@@ -119,6 +119,5 @@ making successful document exchange impossible.
\Msg{* Happy TeXing}
\Msg{***********************************************************}
}
-
-\endbatchfile
+\endbatchfile
diff --git a/Master/texmf-dist/source/latex-dev/base/doc.dtx b/Master/texmf-dist/source/latex-dev/base/doc.dtx
index 31c36b88c73..1341f56b8b2 100644
--- a/Master/texmf-dist/source/latex-dev/base/doc.dtx
+++ b/Master/texmf-dist/source/latex-dev/base/doc.dtx
@@ -2007,7 +2007,7 @@
% \begin{macrocode}
\@namedef{verbatim*}{\@beginparpenalty \predisplaypenalty \@verbatim
% \end{macrocode}
-%
+%
% \changes{v2.1j}{2019/11/03}{Kernel now sets up \cs{verbvisiblespace} (gh/205)}
% \changes{v2.1k}{2019/11/10}{Put the definition into the right command :-( (gh/205)}
% \begin{macrocode}
@@ -4543,7 +4543,7 @@
\ifnum\check@sum>\m@ne
% \end{macrocode}
% We do nothing if the checksum in the file is negative (or not given as
-% it is initialized with -1).
+% it is initialized with -1).
% \begin{macrocode}
\ifnum\check@sum=\z@
\typeout{**********************************}%
diff --git a/Master/texmf-dist/source/latex-dev/base/docstrip.dtx b/Master/texmf-dist/source/latex-dev/base/docstrip.dtx
index 31245a1ef81..9cc7945d602 100644
--- a/Master/texmf-dist/source/latex-dev/base/docstrip.dtx
+++ b/Master/texmf-dist/source/latex-dev/base/docstrip.dtx
@@ -316,8 +316,8 @@
% \DeclareDir{makeindex}{idxstyle}
%\end{verbatim}
% This will cause base latex files and font descriptions to be
-% written to directory |c:\emtex\texinput\latex2e|, files of the
-% \texttt{tools} package to be written to |c:\emtex\texinput\tools|
+% written to directory |c:\emtex\texinput\latex2e|, files of the
+% \texttt{tools} package to be written to |c:\emtex\texinput\tools|
% and makeindex files to |c:\emtex\idxstyle|.
%
% Sometimes it is desirable to put some files outside of the base
diff --git a/Master/texmf-dist/source/latex-dev/base/docstrip.ins b/Master/texmf-dist/source/latex-dev/base/docstrip.ins
index aa4d869dfd5..281a376761b 100644
--- a/Master/texmf-dist/source/latex-dev/base/docstrip.ins
+++ b/Master/texmf-dist/source/latex-dev/base/docstrip.ins
@@ -5,34 +5,34 @@
%%
%% Copyright (C) 1993-2020
%% The LaTeX3 Project and any individual authors listed elsewhere
-%% in this file.
-%%
+%% in this file.
+%%
%% This file is part of the LaTeX base system.
%% -------------------------------------------
-%%
+%%
%% It may be distributed and/or modified under the
%% conditions of the LaTeX Project Public License, either version 1.3c
%% of this license or (at your option) any later version.
%% The latest version of this license is in
%% https://www.latex-project.org/lppl.txt
-%% and version 1.3c or later is part of all distributions of LaTeX
+%% and version 1.3c or later is part of all distributions of LaTeX
%% version 2008 or later.
-%%
+%%
%% This file has the LPPL maintenance status "maintained".
-%%
+%%
%% As this file contains legal notices, it is NOT PERMITTED to modify
%% this file in any way that the legal information placed into
%% generated files is changed (i.e., the files generated when the
%% original file is executed). This restriction does not apply if
%% (parts of) the content is reused in a different WORK producing its
%% own generated files.
-%%
+%%
%% The list of all files belonging to the LaTeX base distribution is
%% given in the file `manifest.txt'. See also `legal.txt' for additional
%% information.
-%%
-%%
-%%
+%%
+%%
+%%
%%
%% --------------- start of docstrip commands ------------------
%%
@@ -54,7 +54,7 @@ reports for it can be opened at https://latex-project.org/bugs.html
Copyright (C) 1993-2020
The LaTeX3 Project and any individual authors listed elsewhere
-in this file.
+in this file.
This file was generated from file(s) of the LaTeX base system.
--------------------------------------------------------------
@@ -64,7 +64,7 @@ conditions of the LaTeX Project Public License, either version 1.3c
of this license or (at your option) any later version.
The latest version of this license is in
https://www.latex-project.org/lppl.txt
-and version 1.3c or later is part of all distributions of LaTeX
+and version 1.3c or later is part of all distributions of LaTeX
version 2008 or later.
This file has the LPPL maintenance status "maintained".
@@ -77,8 +77,8 @@ The list of all files belonging to the LaTeX base distribution is
given in the file `manifest.txt'. See also `legal.txt' for additional
information.
-The list of derived (unpacked) files belonging to the distribution
-and covered by LPPL is defined by the unpacking scripts (with
+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
diff --git a/Master/texmf-dist/source/latex-dev/base/ec.ins b/Master/texmf-dist/source/latex-dev/base/ec.ins
index 9c10479eae1..4283ef1ddda 100644
--- a/Master/texmf-dist/source/latex-dev/base/ec.ins
+++ b/Master/texmf-dist/source/latex-dev/base/ec.ins
@@ -5,34 +5,34 @@
%%
%% Copyright (C) 1993-2020
%% The LaTeX3 Project and any individual authors listed elsewhere
-%% in this file.
-%%
+%% in this file.
+%%
%% This file is part of the LaTeX base system.
%% -------------------------------------------
-%%
+%%
%% It may be distributed and/or modified under the
%% conditions of the LaTeX Project Public License, either version 1.3c
%% of this license or (at your option) any later version.
%% The latest version of this license is in
%% https://www.latex-project.org/lppl.txt
-%% and version 1.3c or later is part of all distributions of LaTeX
+%% and version 1.3c or later is part of all distributions of LaTeX
%% version 2008 or later.
-%%
+%%
%% This file has the LPPL maintenance status "maintained".
-%%
+%%
%% As this file contains legal notices, it is NOT PERMITTED to modify
%% this file in any way that the legal information placed into
%% generated files is changed (i.e., the files generated when the
%% original file is executed). This restriction does not apply if
%% (parts of) the content is reused in a different WORK producing its
%% own generated files.
-%%
+%%
%% The list of all files belonging to the LaTeX base distribution is
%% given in the file `manifest.txt'. See also `legal.txt' for additional
%% information.
-%%
-%%
-%%
+%%
+%%
+%%
%%
%% --------------- start of docstrip commands ------------------
%%
@@ -50,7 +50,7 @@ reports for it can be opened at https://latex-project.org/bugs.html
Copyright (C) 1993-2020
The LaTeX3 Project and any individual authors listed elsewhere
-in this file.
+in this file.
This file was generated from file(s) of the LaTeX base system.
--------------------------------------------------------------
@@ -60,7 +60,7 @@ conditions of the LaTeX Project Public License, either version 1.3c
of this license or (at your option) any later version.
The latest version of this license is in
https://www.latex-project.org/lppl.txt
-and version 1.3c or later is part of all distributions of LaTeX
+and version 1.3c or later is part of all distributions of LaTeX
version 2008 or later.
This file may only be distributed together with a copy of the LaTeX
@@ -87,7 +87,7 @@ making successful document exchange impossible.
\Msg{*** Generating font defs for Cork encoded
and Text Companion fonts ***}
-
+
\generate{
\file{t1cmfib.fd}{
\from{cmfonts.fdd}{fd,T1cmfib,ec}}
@@ -137,5 +137,5 @@ making successful document exchange impossible.
\Msg{* Happy TeXing}
\Msg{***********************************************************}
}
-
+
\endbatchfile
diff --git a/Master/texmf-dist/source/latex-dev/base/exscale.dtx b/Master/texmf-dist/source/latex-dev/base/exscale.dtx
index 0267d947948..f13e0116cd1 100644
--- a/Master/texmf-dist/source/latex-dev/base/exscale.dtx
+++ b/Master/texmf-dist/source/latex-dev/base/exscale.dtx
@@ -174,7 +174,7 @@
% Now we can define the macros. Note: |\n@space| sets the internal
% variables |\nulldelimiterspace| and |\mathsurround| to zero length.
%
-% Older kernels (e.g in roll back didn't have LR-mode with the
+% Older kernels (e.g in roll back didn't have LR-mode with the
% these commands) so we test for the support comment. This only works
% if the rollback request is before loading this package but that is
% where it should be.
@@ -192,7 +192,7 @@
\def\bigg{\bBigg@\tw@}
\def\Bigg{\bBigg@{2.5}}
% \end{macrocode}
-%
+%
% \begin{macrocode}
%</package>
% \end{macrocode}
diff --git a/Master/texmf-dist/source/latex-dev/base/exscale.ins b/Master/texmf-dist/source/latex-dev/base/exscale.ins
index 13941ca647d..d504b056cb4 100644
--- a/Master/texmf-dist/source/latex-dev/base/exscale.ins
+++ b/Master/texmf-dist/source/latex-dev/base/exscale.ins
@@ -5,34 +5,34 @@
%%
%% Copyright (C) 1993-2020
%% The LaTeX3 Project and any individual authors listed elsewhere
-%% in this file.
-%%
+%% in this file.
+%%
%% This file is part of the LaTeX base system.
%% -------------------------------------------
-%%
+%%
%% It may be distributed and/or modified under the
%% conditions of the LaTeX Project Public License, either version 1.3c
%% of this license or (at your option) any later version.
%% The latest version of this license is in
%% https://www.latex-project.org/lppl.txt
-%% and version 1.3c or later is part of all distributions of LaTeX
+%% and version 1.3c or later is part of all distributions of LaTeX
%% version 2008 or later.
-%%
+%%
%% This file has the LPPL maintenance status "maintained".
-%%
+%%
%% As this file contains legal notices, it is NOT PERMITTED to modify
%% this file in any way that the legal information placed into
%% generated files is changed (i.e., the files generated when the
%% original file is executed). This restriction does not apply if
%% (parts of) the content is reused in a different WORK producing its
%% own generated files.
-%%
+%%
%% The list of all files belonging to the LaTeX base distribution is
%% given in the file `manifest.txt'. See also `legal.txt' for additional
%% information.
-%%
-%%
-%%
+%%
+%%
+%%
%%
%% --------------- start of docstrip commands ------------------
%%
@@ -50,7 +50,7 @@ reports for it can be opened at https://latex-project.org/bugs.html
Copyright (C) 1993-2020
The LaTeX3 Project and any individual authors listed elsewhere
-in this file.
+in this file.
This file was generated from file(s) of the LaTeX base system.
--------------------------------------------------------------
@@ -60,7 +60,7 @@ conditions of the LaTeX Project Public License, either version 1.3c
of this license or (at your option) any later version.
The latest version of this license is in
https://www.latex-project.org/lppl.txt
-and version 1.3c or later is part of all distributions of LaTeX
+and version 1.3c or later is part of all distributions of LaTeX
version 2008 or later.
This file has the LPPL maintenance status "maintained".
@@ -73,8 +73,8 @@ The list of all files belonging to the LaTeX base distribution is
given in the file `manifest.txt'. See also `legal.txt' for additional
information.
-The list of derived (unpacked) files belonging to the distribution
-and covered by LPPL is defined by the unpacking scripts (with
+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
diff --git a/Master/texmf-dist/source/latex-dev/base/fix-cm.ins b/Master/texmf-dist/source/latex-dev/base/fix-cm.ins
index 0e587d80baa..0407d39630b 100644
--- a/Master/texmf-dist/source/latex-dev/base/fix-cm.ins
+++ b/Master/texmf-dist/source/latex-dev/base/fix-cm.ins
@@ -5,34 +5,34 @@
%%
%% Copyright (C) 1993-2020
%% The LaTeX3 Project and any individual authors listed elsewhere
-%% in this file.
-%%
+%% in this file.
+%%
%% This file is part of the LaTeX base system.
%% -------------------------------------------
-%%
+%%
%% It may be distributed and/or modified under the
%% conditions of the LaTeX Project Public License, either version 1.3c
%% of this license or (at your option) any later version.
%% The latest version of this license is in
%% https://www.latex-project.org/lppl.txt
-%% and version 1.3c or later is part of all distributions of LaTeX
+%% and version 1.3c or later is part of all distributions of LaTeX
%% version 2008 or later.
-%%
+%%
%% This file has the LPPL maintenance status "maintained".
-%%
+%%
%% As this file contains legal notices, it is NOT PERMITTED to modify
%% this file in any way that the legal information placed into
%% generated files is changed (i.e., the files generated when the
%% original file is executed). This restriction does not apply if
%% (parts of) the content is reused in a different WORK producing its
%% own generated files.
-%%
+%%
%% The list of all files belonging to the LaTeX base distribution is
%% given in the file `manifest.txt'. See also `legal.txt' for additional
%% information.
-%%
-%%
-%%
+%%
+%%
+%%
%%
%% --------------- start of docstrip commands ------------------
%%
@@ -50,7 +50,7 @@ reports for it can be opened at https://latex-project.org/bugs.html
Copyright (C) 1993-2020
The LaTeX3 Project and any individual authors listed elsewhere
-in this file.
+in this file.
This file was generated from file(s) of the LaTeX base system.
--------------------------------------------------------------
@@ -60,7 +60,7 @@ conditions of the LaTeX Project Public License, either version 1.3c
of this license or (at your option) any later version.
The latest version of this license is in
https://www.latex-project.org/lppl.txt
-and version 1.3c or later is part of all distributions of LaTeX
+and version 1.3c or later is part of all distributions of LaTeX
version 2008 or later.
This file has the LPPL maintenance status "maintained".
@@ -73,8 +73,8 @@ The list of all files belonging to the LaTeX base distribution is
given in the file `manifest.txt'. See also `legal.txt' for additional
information.
-The list of derived (unpacked) files belonging to the distribution
-and covered by LPPL is defined by the unpacking scripts (with
+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
diff --git a/Master/texmf-dist/source/latex-dev/base/fontdef.dtx b/Master/texmf-dist/source/latex-dev/base/fontdef.dtx
index d1931e86525..4dd5ea38456 100644
--- a/Master/texmf-dist/source/latex-dev/base/fontdef.dtx
+++ b/Master/texmf-dist/source/latex-dev/base/fontdef.dtx
@@ -39,7 +39,7 @@
%<driver, >\ProvidesFile{fontdef.drv}
% \fi
% \ProvidesFile{fontdef.dtx}
-%<-latexrelease> [2019/12/17 v3.0e LaTeX Kernel
+%<-latexrelease> [2020/01/25 v3.0f LaTeX Kernel
% \iftrue (\else
%<text, >(Text
%<math, >(Math
@@ -102,7 +102,7 @@
%
% You are not allowed to change this source file! If you want to
% change the default encodings and/or the font shape groups preloaded
-% you should should create a copy of \texttt{fonttext.ltx}
+% you should create a copy of \texttt{fonttext.ltx}
% under the name \texttt{fonttext.cfg} and change this copy. If
% \LaTeXe{} finds a file of this name it will use it, otherwise it
% uses the standard file which is \texttt{fontdef.ltx}.
@@ -249,11 +249,18 @@
% \changes{v3.0a}{2016/12/03}{(DPC) Default to TU encoding for Unicode TeX engines}
% \begin{macrocode}
\input {omlenc.def}
-\input {t1enc.def}
-\input {ot1enc.def} % <- should come after T1 for speed
\input {omsenc.def}
% \end{macrocode}
-%
+% Documents containing a lot of accented characters should really
+% be using T1 fonts. We therefore load this last so that T1 encoding
+% specific commands are executed as fast as possible (encoding
+% files are no longer reloaded in \texttt{fontenc}.
+% \changes{v3.0f}{2020/01/25}{Load t1enc.def last (gh/255)}
+% \begin{macrocode}
+\input {ot1enc.def}
+\input {t1enc.def}
+% \end{macrocode}
+%
% \begin{macrocode}
\input{ts1enc.def}
% \end{macrocode}
@@ -262,7 +269,7 @@
\ifx\Umathchar\@undefined
% \end{macrocode}
%
-% We then set set the default text font encoding. This will
+% We then set the default text font encoding. This will
% hopefully change some day to |T1|. This setting should \emph{not}
% be changed to produce a portable format.
% \begin{macrocode}
@@ -278,7 +285,7 @@
\def\ttsubstdefault{cmtt}
\LoadFontDefinitionFile{TS1}{cmr}
% \end{macrocode}
-%
+%
% \begin{macrocode}
\else
% \end{macrocode}
@@ -291,7 +298,7 @@
\LoadFontDefinitionFile{TU}{lmss}
\LoadFontDefinitionFile{TU}{lmtt}
% \end{macrocode}
-%
+%
% \begin{macrocode}
\def\rmsubstdefault{lmr}
\def\sfsubstdefault{lmss}
@@ -472,7 +479,7 @@
% \begin{macro}{\sldefault}
% \begin{macro}{\scdefault}
% \begin{macro}{\updefault}
-%
+%
% Shape changing commands use the following hooks.
% \changes{v3.0e}{2019/12/17}{Set \cs{updefault} to ``up''}
% \begin{macrocode}
@@ -908,7 +915,7 @@
% \let\lnot=\neg
\DeclareMathSymbol{\lnot}{\mathord}{symbols}{"3A}
% \end{macrocode}
-%
+%
% \begin{macrocode}
\DeclareMathSymbol{\flat}{\mathord}{letters}{"5B}
\DeclareMathSymbol{\natural}{\mathord}{letters}{"5C}
@@ -918,9 +925,9 @@
\DeclareMathSymbol{\heartsuit}{\mathord}{symbols}{"7E}
\DeclareMathSymbol{\spadesuit}{\mathord}{symbols}{"7F}
% \end{macrocode}
-%
+%
% \changes{v3.0c}{2019/08/27}{Various commands made robust throughout
-% the file}
+% the file}
% \begin{macrocode}
\DeclareRobustCommand\hbar{{\mathchar'26\mkern-9muh}}
\DeclareRobustCommand\surd{{\mathchar"1270}}
@@ -988,7 +995,7 @@
\DeclareMathSymbol{\land}{\mathbin}{symbols}{"5E}
\DeclareMathSymbol{\lor}{\mathbin}{symbols}{"5F}
% \end{macrocode}
-%
+%
% \begin{macrocode}
\DeclareMathSymbol{\cap}{\mathbin}{symbols}{"5C}
\DeclareMathSymbol{\cup}{\mathbin}{symbols}{"5B}
@@ -1039,7 +1046,7 @@
\DeclareRobustCommand\neq{\not=}
% \end{macrocode}
% As \cs{neq} is robust we should not use \cs{let} to define
-% \cs{ne} as then then it would change if \cs{neq} changes.
+% \cs{ne} as then it would change if \cs{neq} changes.
% \changes{v3.0d}{2019/09/21}{Distangle alias (gh/184)}
% \begin{macrocode}
\DeclareRobustCommand\ne{\not=}
@@ -1059,7 +1066,7 @@
\DeclareMathSymbol{\le}{\mathrel}{symbols}{"14}
\DeclareMathSymbol{\ge}{\mathrel}{symbols}{"15}
% \end{macrocode}
-%
+%
% \begin{macrocode}
\DeclareMathSymbol{\succ}{\mathrel}{symbols}{"1F}
\DeclareMathSymbol{\prec}{\mathrel}{symbols}{"1E}
@@ -1079,7 +1086,7 @@
% \let\owns=\ni
\DeclareMathSymbol{\owns}{\mathrel}{symbols}{"33}
% \end{macrocode}
-%
+%
% \begin{macrocode}
\DeclareMathSymbol{\gg}{\mathrel}{symbols}{"1D}
\DeclareMathSymbol{\ll}{\mathrel}{symbols}{"1C}
@@ -1096,7 +1103,7 @@
\DeclareMathSymbol{\gets}{\mathrel}{symbols}{"20}
\DeclareMathSymbol{\to}{\mathrel}{symbols}{"21}
% \end{macrocode}
-%
+%
% \begin{macrocode}
\DeclareMathSymbol{\mapstochar}{\mathrel}{symbols}{"37}
\DeclareRobustCommand\mapsto{\mapstochar\rightarrow}
@@ -1440,7 +1447,7 @@
%
% \subsubsection{Biggggg}
%
-% \changes{v3.0b}{2018/09/24}{Start LR-mode if necessary (git/49)}
+% \changes{v3.0b}{2018/09/24}{Start LR-mode if necessary (git/49)}
% \begin{macrocode}
%</math>
%<*math|latexrelease>
@@ -1465,7 +1472,7 @@
%<latexrelease>\EndIncludeInRelease
%<*math>
% \end{macrocode}
-%
+%
% \begin{macrocode}
\def\n@space{\nulldelimiterspace\z@ \m@th}
% \end{macrocode}
diff --git a/Master/texmf-dist/source/latex-dev/base/format.ins b/Master/texmf-dist/source/latex-dev/base/format.ins
index 2a4b68e4f60..940161edd5b 100644
--- a/Master/texmf-dist/source/latex-dev/base/format.ins
+++ b/Master/texmf-dist/source/latex-dev/base/format.ins
@@ -5,34 +5,34 @@
%%
%% Copyright (C) 1993-2020
%% The LaTeX3 Project and any individual authors listed elsewhere
-%% in this file.
-%%
+%% in this file.
+%%
%% This file is part of the LaTeX base system.
%% -------------------------------------------
-%%
+%%
%% It may be distributed and/or modified under the
%% conditions of the LaTeX Project Public License, either version 1.3c
%% of this license or (at your option) any later version.
%% The latest version of this license is in
%% https://www.latex-project.org/lppl.txt
-%% and version 1.3c or later is part of all distributions of LaTeX
+%% and version 1.3c or later is part of all distributions of LaTeX
%% version 2008 or later.
-%%
+%%
%% This file has the LPPL maintenance status "maintained".
-%%
+%%
%% As this file contains legal notices, it is NOT PERMITTED to modify
%% this file in any way that the legal information placed into
%% generated files is changed (i.e., the files generated when the
%% original file is executed). This restriction does not apply if
%% (parts of) the content is reused in a different WORK producing its
%% own generated files.
-%%
+%%
%% The list of all files belonging to the LaTeX base distribution is
%% given in the file `manifest.txt'. See also `legal.txt' for additional
%% information.
-%%
-%%
-%%
+%%
+%%
+%%
%%
%% --------------- start of docstrip commands ------------------
%%
@@ -50,7 +50,7 @@ reports for it can be opened at https://latex-project.org/bugs.html
Copyright (C) 1993-2020
The LaTeX3 Project and any individual authors listed elsewhere
-in this file.
+in this file.
This file was generated from file(s) of the LaTeX base system.
--------------------------------------------------------------
@@ -60,7 +60,7 @@ conditions of the LaTeX Project Public License, either version 1.3c
of this license or (at your option) any later version.
The latest version of this license is in
https://www.latex-project.org/lppl.txt
-and version 1.3c or later is part of all distributions of LaTeX
+and version 1.3c or later is part of all distributions of LaTeX
version 2008 or later.
This file has the LPPL maintenance status "maintained".
@@ -73,8 +73,8 @@ The list of all files belonging to the LaTeX base distribution is
given in the file `manifest.txt'. See also `legal.txt' for additional
information.
-The list of derived (unpacked) files belonging to the distribution
-and covered by LPPL is defined by the unpacking scripts (with
+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
@@ -90,7 +90,7 @@ reports for it can be opened at https://latex-project.org/bugs.html
Copyright 2015
The LaTeX3 Project and any individual authors listed elsewhere
-in this file.
+in this file.
This file was generated from file(s) of the LaTeX base system.
--------------------------------------------------------------
@@ -100,7 +100,7 @@ conditions of the LaTeX Project Public License, either version 1.3c
of this license or (at your option) any later version.
The latest version of this license is in
https://www.latex-project.org/lppl.txt
-and version 1.3c or later is part of all distributions of LaTeX
+and version 1.3c or later is part of all distributions of LaTeX
version 2008 or later.
This file has the LPPL maintenance status "maintained".
@@ -113,19 +113,19 @@ The list of all files belonging to the LaTeX base distribution is
given in the file `manifest.txt'. See also `legal.txt' for additional
information.
-The list of derived (unpacked) files belonging to the distribution
-and covered by LPPL is defined by the unpacking scripts (with
+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
\let\MetaPrefix\DoubleperCent
\declarepreamble\cfgpreamble
-This is a generated file.
+This is a generated file.
Copyright (C) 1993-2020
The LaTeX3 Project and any individual authors listed elsewhere
-in this file.
+in this file.
This file was generated from file(s) of the LaTeX base system.
--------------------------------------------------------------
@@ -135,7 +135,7 @@ conditions of the LaTeX Project Public License, either version 1.3c
of this license or (at your option) any later version.
The latest version of this license is in
https://www.latex-project.org/lppl.txt
-and version 1.3c or later is part of all distributions of LaTeX
+and version 1.3c or later is part of all distributions of LaTeX
version 2008 or later.
This file may only be distributed together with a copy of the LaTeX
@@ -209,7 +209,7 @@ the system are in the document `cfgguide.tex'.
\from{ltmath.dtx}{fleqn}}
\file{leqno.clo}{%
\from{ltmath.dtx}{leqno}}
-%%% generate the textcomp package
+%%% generate the textcomp package
\file{textcomp.sty}{%
\from{lttextcomp.dtx}{TS1sty}}
\file{textcomp-2018-08-11.sty}{%
@@ -262,7 +262,7 @@ the system are in the document `cfgguide.tex'.
%%%%%%%%%%%%%%%%% Lua code
% This is at the end as the prefix/postamble requirements are
-% different to everything else
+% different to everything else
\def\MetaPrefix{--}
\usepreamble\luapreamble
@@ -270,6 +270,3 @@ the system are in the document `cfgguide.tex'.
\generate{\file{ltluatex.lua}{\from{ltluatex.dtx}{lua}}}
\endbatchfile
-
-
-
diff --git a/Master/texmf-dist/source/latex-dev/base/graphpap.ins b/Master/texmf-dist/source/latex-dev/base/graphpap.ins
index 8563ac0f43b..b5bb800122a 100644
--- a/Master/texmf-dist/source/latex-dev/base/graphpap.ins
+++ b/Master/texmf-dist/source/latex-dev/base/graphpap.ins
@@ -5,34 +5,34 @@
%%
%% Copyright (C) 1993-2020
%% The LaTeX3 Project and any individual authors listed elsewhere
-%% in this file.
-%%
+%% in this file.
+%%
%% This file is part of the LaTeX base system.
%% -------------------------------------------
-%%
+%%
%% It may be distributed and/or modified under the
%% conditions of the LaTeX Project Public License, either version 1.3c
%% of this license or (at your option) any later version.
%% The latest version of this license is in
%% https://www.latex-project.org/lppl.txt
-%% and version 1.3c or later is part of all distributions of LaTeX
+%% and version 1.3c or later is part of all distributions of LaTeX
%% version 2008 or later.
-%%
+%%
%% This file has the LPPL maintenance status "maintained".
-%%
+%%
%% As this file contains legal notices, it is NOT PERMITTED to modify
%% this file in any way that the legal information placed into
%% generated files is changed (i.e., the files generated when the
%% original file is executed). This restriction does not apply if
%% (parts of) the content is reused in a different WORK producing its
%% own generated files.
-%%
+%%
%% The list of all files belonging to the LaTeX base distribution is
%% given in the file `manifest.txt'. See also `legal.txt' for additional
%% information.
-%%
-%%
-%%
+%%
+%%
+%%
%%
%% --------------- start of docstrip commands ------------------
%%
@@ -50,7 +50,7 @@ reports for it can be opened at https://latex-project.org/bugs.html
Copyright (C) 1993-2020
The LaTeX3 Project and any individual authors listed elsewhere
-in this file.
+in this file.
This file was generated from file(s) of the LaTeX base system.
--------------------------------------------------------------
@@ -60,7 +60,7 @@ conditions of the LaTeX Project Public License, either version 1.3c
of this license or (at your option) any later version.
The latest version of this license is in
https://www.latex-project.org/lppl.txt
-and version 1.3c or later is part of all distributions of LaTeX
+and version 1.3c or later is part of all distributions of LaTeX
version 2008 or later.
This file has the LPPL maintenance status "maintained".
@@ -73,8 +73,8 @@ The list of all files belonging to the LaTeX base distribution is
given in the file `manifest.txt'. See also `legal.txt' for additional
information.
-The list of derived (unpacked) files belonging to the distribution
-and covered by LPPL is defined by the unpacking scripts (with
+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
diff --git a/Master/texmf-dist/source/latex-dev/base/ifthen.ins b/Master/texmf-dist/source/latex-dev/base/ifthen.ins
index 71e17c118da..0e813cd5de3 100644
--- a/Master/texmf-dist/source/latex-dev/base/ifthen.ins
+++ b/Master/texmf-dist/source/latex-dev/base/ifthen.ins
@@ -5,34 +5,34 @@
%%
%% Copyright (C) 1993-2020
%% The LaTeX3 Project and any individual authors listed elsewhere
-%% in this file.
-%%
+%% in this file.
+%%
%% This file is part of the LaTeX base system.
%% -------------------------------------------
-%%
+%%
%% It may be distributed and/or modified under the
%% conditions of the LaTeX Project Public License, either version 1.3c
%% of this license or (at your option) any later version.
%% The latest version of this license is in
%% https://www.latex-project.org/lppl.txt
-%% and version 1.3c or later is part of all distributions of LaTeX
+%% and version 1.3c or later is part of all distributions of LaTeX
%% version 2008 or later.
-%%
+%%
%% This file has the LPPL maintenance status "maintained".
-%%
+%%
%% As this file contains legal notices, it is NOT PERMITTED to modify
%% this file in any way that the legal information placed into
%% generated files is changed (i.e., the files generated when the
%% original file is executed). This restriction does not apply if
%% (parts of) the content is reused in a different WORK producing its
%% own generated files.
-%%
+%%
%% The list of all files belonging to the LaTeX base distribution is
%% given in the file `manifest.txt'. See also `legal.txt' for additional
%% information.
-%%
-%%
-%%
+%%
+%%
+%%
%%
%% --------------- start of docstrip commands ------------------
%%
@@ -50,7 +50,7 @@ reports for it can be opened at https://latex-project.org/bugs.html
Copyright (C) 1993-2020
The LaTeX3 Project and any individual authors listed elsewhere
-in this file.
+in this file.
This file was generated from file(s) of the LaTeX base system.
--------------------------------------------------------------
@@ -60,7 +60,7 @@ conditions of the LaTeX Project Public License, either version 1.3c
of this license or (at your option) any later version.
The latest version of this license is in
https://www.latex-project.org/lppl.txt
-and version 1.3c or later is part of all distributions of LaTeX
+and version 1.3c or later is part of all distributions of LaTeX
version 2008 or later.
This file has the LPPL maintenance status "maintained".
@@ -73,8 +73,8 @@ The list of all files belonging to the LaTeX base distribution is
given in the file `manifest.txt'. See also `legal.txt' for additional
information.
-The list of derived (unpacked) files belonging to the distribution
-and covered by LPPL is defined by the unpacking scripts (with
+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
diff --git a/Master/texmf-dist/source/latex-dev/base/inputenc.ins b/Master/texmf-dist/source/latex-dev/base/inputenc.ins
index 4b866f2a5cb..6494a689eab 100644
--- a/Master/texmf-dist/source/latex-dev/base/inputenc.ins
+++ b/Master/texmf-dist/source/latex-dev/base/inputenc.ins
@@ -5,34 +5,34 @@
%%
%% Copyright (C) 1993-2020
%% The LaTeX3 Project and any individual authors listed elsewhere
-%% in this file.
-%%
+%% in this file.
+%%
%% This file is part of the LaTeX base system.
%% -------------------------------------------
-%%
+%%
%% It may be distributed and/or modified under the
%% conditions of the LaTeX Project Public License, either version 1.3c
%% of this license or (at your option) any later version.
%% The latest version of this license is in
%% https://www.latex-project.org/lppl.txt
-%% and version 1.3c or later is part of all distributions of LaTeX
+%% and version 1.3c or later is part of all distributions of LaTeX
%% version 2008 or later.
-%%
+%%
%% This file has the LPPL maintenance status "maintained".
-%%
+%%
%% As this file contains legal notices, it is NOT PERMITTED to modify
%% this file in any way that the legal information placed into
%% generated files is changed (i.e., the files generated when the
%% original file is executed). This restriction does not apply if
%% (parts of) the content is reused in a different WORK producing its
%% own generated files.
-%%
+%%
%% The list of all files belonging to the LaTeX base distribution is
%% given in the file `manifest.txt'. See also `legal.txt' for additional
%% information.
-%%
-%%
-%%
+%%
+%%
+%%
%%
%% --------------- start of docstrip commands ------------------
%%
@@ -50,7 +50,7 @@ reports for it can be opened at https://latex-project.org/bugs.html
Copyright (C) 1993-2020
The LaTeX3 Project and any individual authors listed elsewhere
-in this file.
+in this file.
This file was generated from file(s) of the LaTeX base system.
--------------------------------------------------------------
@@ -60,7 +60,7 @@ conditions of the LaTeX Project Public License, either version 1.3c
of this license or (at your option) any later version.
The latest version of this license is in
https://www.latex-project.org/lppl.txt
-and version 1.3c or later is part of all distributions of LaTeX
+and version 1.3c or later is part of all distributions of LaTeX
version 2008 or later.
This file has the LPPL maintenance status "maintained".
@@ -73,8 +73,8 @@ The list of all files belonging to the LaTeX base distribution is
given in the file `manifest.txt'. See also `legal.txt' for additional
information.
-The list of derived (unpacked) files belonging to the distribution
-and covered by LPPL is defined by the unpacking scripts (with
+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
@@ -103,8 +103,8 @@ extension .ins) which are part of the distribution.
\file{latin10.def}{
\from{inputenc.dtx}{latin10}}
}
-
-
+
+
\generate{
\file{cp850.def}{
@@ -122,7 +122,7 @@ extension .ins) which are part of the distribution.
\file{decmulti.def}{
\from{inputenc.dtx}{decmulti}}
}
-
+
\generate{
\file{ascii.def}{
\from{inputenc.dtx}{ascii}}
diff --git a/Master/texmf-dist/source/latex-dev/base/latex209.ins b/Master/texmf-dist/source/latex-dev/base/latex209.ins
index 7e51808ae08..bb72f344f1b 100644
--- a/Master/texmf-dist/source/latex-dev/base/latex209.ins
+++ b/Master/texmf-dist/source/latex-dev/base/latex209.ins
@@ -5,34 +5,34 @@
%%
%% Copyright (C) 1993-2020
%% The LaTeX3 Project and any individual authors listed elsewhere
-%% in this file.
-%%
+%% in this file.
+%%
%% This file is part of the LaTeX base system.
%% -------------------------------------------
-%%
+%%
%% It may be distributed and/or modified under the
%% conditions of the LaTeX Project Public License, either version 1.3c
%% of this license or (at your option) any later version.
%% The latest version of this license is in
%% https://www.latex-project.org/lppl.txt
-%% and version 1.3c or later is part of all distributions of LaTeX
+%% and version 1.3c or later is part of all distributions of LaTeX
%% version 2008 or later.
-%%
+%%
%% This file has the LPPL maintenance status "maintained".
-%%
+%%
%% As this file contains legal notices, it is NOT PERMITTED to modify
%% this file in any way that the legal information placed into
%% generated files is changed (i.e., the files generated when the
%% original file is executed). This restriction does not apply if
%% (parts of) the content is reused in a different WORK producing its
%% own generated files.
-%%
+%%
%% The list of all files belonging to the LaTeX base distribution is
%% given in the file `manifest.txt'. See also `legal.txt' for additional
%% information.
-%%
-%%
-%%
+%%
+%%
+%%
%%
%% --------------- start of docstrip commands ------------------
%%
@@ -50,7 +50,7 @@ reports for it can be opened at https://latex-project.org/bugs.html
Copyright (C) 1993-2020
The LaTeX3 Project and any individual authors listed elsewhere
-in this file.
+in this file.
This file was generated from file(s) of the LaTeX base system.
--------------------------------------------------------------
@@ -60,7 +60,7 @@ conditions of the LaTeX Project Public License, either version 1.3c
of this license or (at your option) any later version.
The latest version of this license is in
https://www.latex-project.org/lppl.txt
-and version 1.3c or later is part of all distributions of LaTeX
+and version 1.3c or later is part of all distributions of LaTeX
version 2008 or later.
This file has the LPPL maintenance status "maintained".
@@ -73,8 +73,8 @@ The list of all files belonging to the LaTeX base distribution is
given in the file `manifest.txt'. See also `legal.txt' for additional
information.
-The list of derived (unpacked) files belonging to the distribution
-and covered by LPPL is defined by the unpacking scripts (with
+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
@@ -88,7 +88,7 @@ extension .ins) which are part of the distribution.
\file{latex209.def}{
\from{latex209.dtx}{head}
\from{oldlfont.dtx}{latex209}
- \from{latex209.dtx}{tail}}
+ \from{latex209.dtx}{tail}}
\file{article.sty}{
\from{latex209.dtx}{article}}
\file{book.sty}{
diff --git a/Master/texmf-dist/source/latex-dev/base/latexrelease.dtx b/Master/texmf-dist/source/latex-dev/base/latexrelease.dtx
index 4a59e76e307..5ee39a3a2df 100644
--- a/Master/texmf-dist/source/latex-dev/base/latexrelease.dtx
+++ b/Master/texmf-dist/source/latex-dev/base/latexrelease.dtx
@@ -30,7 +30,7 @@
% \iffalse
%
%<*dtx>
- \def\latexreleaseversion{<date only known in .sty file>}
+ \def\latexreleaseversion{<date only known in .sty file>}
\ProvidesFile{latexrelease.dtx}
%</dtx>
%<driver>\ProvidesFile{latexrelease.drv}
@@ -83,7 +83,7 @@
% explicitly opt-in to bug fixes and improvements, and the vast
% majority of documents did not benefit.
%
-% As described in \LaTeX\ News 22, a new policy is being implemented
+% As described in \LaTeX\ News 22, a new policy is being implemented
% in which improvements will now be added to the format by default,
% and this \Lpack{latexrelease} package may be used to ensure
% stability where needed, either by making a new format use an older
@@ -108,7 +108,7 @@
% the commands defined here to adjust their definitions to the
% specified date as described below.
%
-% Note that the \Lpack{latexrelease} package is intended for use
+% Note that the \Lpack{latexrelease} package is intended for use
% at the start of a \emph{document}. Package and class code should not
% include this package as loading a package should not normally globally
% reset the effective version of \LaTeX\ that is in force, so affecting all
@@ -126,8 +126,8 @@
% \item \emph{yyyy/mm/dd} or \emph{yyyy-nn-dd}
% The package accepts any possible \LaTeX\ format date as argument,
% although dates in the future for which the current release of this
-% package has no information will generate a warning. Dates
-% earlier than 2015 will work but will roll back to some point in 2015
+% package has no information will generate a warning. Dates
+% earlier than 2015 will work but will roll back to some point in 2015
% when the method was introduced.
% |\IncludeInRelease| command is defined.
% The |\requestedLaTeXdate| is set to the normalized date argument
@@ -176,7 +176,7 @@
% \item[\marg{code-date}] This date is associated with the \marg{code}
% argument and will be compared to the requested date in the option to
% the \Lpack{latexrelease}.
-%
+%
% \item[\oarg{format-date}] This optional argument can be used to
% specify a format date with the code in addition to the mandatory
% \marg{code-date} argument. This can be useful for package developers
@@ -268,11 +268,11 @@
%\end{verbatim}
%
% To use the latest version, however it would have disadvantage that
-% until the next release of \LaTeX, by default, if the document does
+% until the next release of \LaTeX, by default, if the document does
% not use \Lpack{latexrelease} to specify a date, the new improved
% code will not be selected as the effective date will be 2015/01/01
% and so the first code block will be skipped.
-%
+%
% For this reason |\IncludeInRelease| has an optional argument that
% specifies an alternative date to use if a date option has not been
% specified to \Lpack{latexrelease}.
@@ -297,7 +297,7 @@
% skipped.
%
% If on the other hand the document requests an explicit release date
-% using \Lpack{latexrelease} then this date will be used to decide what
+% using \Lpack{latexrelease} then this date will be used to decide what
% code block to include.
%
% \subsection{Using \cs{IncludeInRelease} in Packages}
@@ -317,7 +317,7 @@
%
% To avoid this issue you can use the following coding
% strategy: place the current |\widget| definition in the main code
-% where it correctly belongs.
+% where it correctly belongs.
% \begin{verbatim}
% ...
% \def\widget {even newer improved March version}
@@ -366,7 +366,7 @@
% \section{fixltx2e}
%
% As noted above, prior to the 2015 \LaTeX\ release updates to the
-% \LaTeX\ kernel were not made in the format source files but were
+% \LaTeX\ kernel were not made in the format source files but were
% made available in the \Lpack{fixltx2e} package. That package is no
% longer needed but we generate a small package from this source
% that just makes a warning message but otherwise does nothing.
@@ -487,7 +487,7 @@ of this package available from CTAN}
%
% The code for each change will be inserted at this point, extracted
% from the kernel source files.
-%
+%
% \begin{macrocode}
%</latexrelease>
% \end{macrocode}
diff --git a/Master/texmf-dist/source/latex-dev/base/latexrelease.ins b/Master/texmf-dist/source/latex-dev/base/latexrelease.ins
index 2f6d4cdb40d..ff55e7d8c0e 100644
--- a/Master/texmf-dist/source/latex-dev/base/latexrelease.ins
+++ b/Master/texmf-dist/source/latex-dev/base/latexrelease.ins
@@ -5,34 +5,34 @@
%%
%% Copyright (C) 1993-2020
%% The LaTeX3 Project and any individual authors listed elsewhere
-%% in this file.
-%%
+%% in this file.
+%%
%% This file is part of the LaTeX base system.
%% -------------------------------------------
-%%
+%%
%% It may be distributed and/or modified under the
%% conditions of the LaTeX Project Public License, either version 1.3c
%% of this license or (at your option) any later version.
%% The latest version of this license is in
%% https://www.latex-project.org/lppl.txt
-%% and version 1.3c or later is part of all distributions of LaTeX
+%% and version 1.3c or later is part of all distributions of LaTeX
%% version 2008 or later.
-%%
+%%
%% This file has the LPPL maintenance status "maintained".
-%%
+%%
%% As this file contains legal notices, it is NOT PERMITTED to modify
%% this file in any way that the legal information placed into
%% generated files is changed (i.e., the files generated when the
%% original file is executed). This restriction does not apply if
%% (parts of) the content is reused in a different WORK producing its
%% own generated files.
-%%
+%%
%% The list of all files belonging to the LaTeX base distribution is
%% given in the file `manifest.txt'. See also `legal.txt' for additional
%% information.
-%%
-%%
-%%
+%%
+%%
+%%
%%
%% --------------- start of docstrip commands ------------------
%%
@@ -50,7 +50,7 @@ reports for it can be opened at https://latex-project.org/bugs.html
Copyright (C) 1993-2020
The LaTeX3 Project and any individual authors listed elsewhere
-in this file.
+in this file.
This file was generated from file(s) of the LaTeX base system.
--------------------------------------------------------------
@@ -60,7 +60,7 @@ conditions of the LaTeX Project Public License, either version 1.3c
of this license or (at your option) any later version.
The latest version of this license is in
https://www.latex-project.org/lppl.txt
-and version 1.3c or later is part of all distributions of LaTeX
+and version 1.3c or later is part of all distributions of LaTeX
version 2008 or later.
This file has the LPPL maintenance status "maintained".
@@ -73,8 +73,8 @@ The list of all files belonging to the LaTeX base distribution is
given in the file `manifest.txt'. See also `legal.txt' for additional
information.
-The list of derived (unpacked) files belonging to the distribution
-and covered by LPPL is defined by the unpacking scripts (with
+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
diff --git a/Master/texmf-dist/source/latex-dev/base/latexsym.dtx b/Master/texmf-dist/source/latex-dev/base/latexsym.dtx
index 36a3346f3ee..908f11e1244 100644
--- a/Master/texmf-dist/source/latex-dev/base/latexsym.dtx
+++ b/Master/texmf-dist/source/latex-dev/base/latexsym.dtx
@@ -172,7 +172,7 @@
% \subsection{\LaTeX{} symbols fonts}
%
% \changes{v2.2d}{1996/11/20}{lowercase ulasy.fd /1044}
-% The rest of this file defines the the font shape declarations
+% The rest of this file defines the font shape declarations
% that have to go into the corresponding |.fd| file.
%
% \begin{macrocode}
diff --git a/Master/texmf-dist/source/latex-dev/base/latexsym.ins b/Master/texmf-dist/source/latex-dev/base/latexsym.ins
index f354e188b77..9e9901b879c 100644
--- a/Master/texmf-dist/source/latex-dev/base/latexsym.ins
+++ b/Master/texmf-dist/source/latex-dev/base/latexsym.ins
@@ -5,34 +5,34 @@
%%
%% Copyright (C) 1993-2020
%% The LaTeX3 Project and any individual authors listed elsewhere
-%% in this file.
-%%
+%% in this file.
+%%
%% This file is part of the LaTeX base system.
%% -------------------------------------------
-%%
+%%
%% It may be distributed and/or modified under the
%% conditions of the LaTeX Project Public License, either version 1.3c
%% of this license or (at your option) any later version.
%% The latest version of this license is in
%% https://www.latex-project.org/lppl.txt
-%% and version 1.3c or later is part of all distributions of LaTeX
+%% and version 1.3c or later is part of all distributions of LaTeX
%% version 2008 or later.
-%%
+%%
%% This file has the LPPL maintenance status "maintained".
-%%
+%%
%% As this file contains legal notices, it is NOT PERMITTED to modify
%% this file in any way that the legal information placed into
%% generated files is changed (i.e., the files generated when the
%% original file is executed). This restriction does not apply if
%% (parts of) the content is reused in a different WORK producing its
%% own generated files.
-%%
+%%
%% The list of all files belonging to the LaTeX base distribution is
%% given in the file `manifest.txt'. See also `legal.txt' for additional
%% information.
-%%
-%%
-%%
+%%
+%%
+%%
%%
%% --------------- start of docstrip commands ------------------
%%
@@ -50,7 +50,7 @@ reports for it can be opened at https://latex-project.org/bugs.html
Copyright (C) 1993-2020
The LaTeX3 Project and any individual authors listed elsewhere
-in this file.
+in this file.
This file was generated from file(s) of the LaTeX base system.
--------------------------------------------------------------
@@ -60,7 +60,7 @@ conditions of the LaTeX Project Public License, either version 1.3c
of this license or (at your option) any later version.
The latest version of this license is in
https://www.latex-project.org/lppl.txt
-and version 1.3c or later is part of all distributions of LaTeX
+and version 1.3c or later is part of all distributions of LaTeX
version 2008 or later.
This file has the LPPL maintenance status "maintained".
@@ -73,8 +73,8 @@ The list of all files belonging to the LaTeX base distribution is
given in the file `manifest.txt'. See also `legal.txt' for additional
information.
-The list of derived (unpacked) files belonging to the distribution
-and covered by LPPL is defined by the unpacking scripts (with
+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
@@ -89,7 +89,7 @@ reports for it can be opened at https://latex-project.org/bugs.html
Copyright (C) 1993-2020
The LaTeX3 Project and any individual authors listed elsewhere
-in this file.
+in this file.
This file was generated from file(s) of the LaTeX base system.
--------------------------------------------------------------
@@ -99,7 +99,7 @@ conditions of the LaTeX Project Public License, either version 1.3c
of this license or (at your option) any later version.
The latest version of this license is in
https://www.latex-project.org/lppl.txt
-and version 1.3c or later is part of all distributions of LaTeX
+and version 1.3c or later is part of all distributions of LaTeX
version 2008 or later.
This file may only be distributed together with a copy of the LaTeX
@@ -150,8 +150,3 @@ making successful document exchange impossible.
}
\endbatchfile
-
-
-
-
-
diff --git a/Master/texmf-dist/source/latex-dev/base/letter.ins b/Master/texmf-dist/source/latex-dev/base/letter.ins
index 9143e88c138..8e8ed4ef7b9 100644
--- a/Master/texmf-dist/source/latex-dev/base/letter.ins
+++ b/Master/texmf-dist/source/latex-dev/base/letter.ins
@@ -5,34 +5,34 @@
%%
%% Copyright (C) 1993-2020
%% The LaTeX3 Project and any individual authors listed elsewhere
-%% in this file.
-%%
+%% in this file.
+%%
%% This file is part of the LaTeX base system.
%% -------------------------------------------
-%%
+%%
%% It may be distributed and/or modified under the
%% conditions of the LaTeX Project Public License, either version 1.3c
%% of this license or (at your option) any later version.
%% The latest version of this license is in
%% https://www.latex-project.org/lppl.txt
-%% and version 1.3c or later is part of all distributions of LaTeX
+%% and version 1.3c or later is part of all distributions of LaTeX
%% version 2008 or later.
-%%
+%%
%% This file has the LPPL maintenance status "maintained".
-%%
+%%
%% As this file contains legal notices, it is NOT PERMITTED to modify
%% this file in any way that the legal information placed into
%% generated files is changed (i.e., the files generated when the
%% original file is executed). This restriction does not apply if
%% (parts of) the content is reused in a different WORK producing its
%% own generated files.
-%%
+%%
%% The list of all files belonging to the LaTeX base distribution is
%% given in the file `manifest.txt'. See also `legal.txt' for additional
%% information.
-%%
-%%
-%%
+%%
+%%
+%%
%%
%% --------------- start of docstrip commands ------------------
%%
@@ -50,7 +50,7 @@ reports for it can be opened at https://latex-project.org/bugs.html
Copyright (C) 1993-2020
The LaTeX3 Project and any individual authors listed elsewhere
-in this file.
+in this file.
This file was generated from file(s) of the LaTeX base system.
--------------------------------------------------------------
@@ -60,7 +60,7 @@ conditions of the LaTeX Project Public License, either version 1.3c
of this license or (at your option) any later version.
The latest version of this license is in
https://www.latex-project.org/lppl.txt
-and version 1.3c or later is part of all distributions of LaTeX
+and version 1.3c or later is part of all distributions of LaTeX
version 2008 or later.
This file has the LPPL maintenance status "maintained".
@@ -73,8 +73,8 @@ The list of all files belonging to the LaTeX base distribution is
given in the file `manifest.txt'. See also `legal.txt' for additional
information.
-The list of derived (unpacked) files belonging to the distribution
-and covered by LPPL is defined by the unpacking scripts (with
+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
@@ -104,6 +104,3 @@ extension .ins) which are part of the distribution.
}
\endbatchfile
-
-
-
diff --git a/Master/texmf-dist/source/latex-dev/base/ltclass.dtx b/Master/texmf-dist/source/latex-dev/base/ltclass.dtx
index e14fb1ef404..9e7668e88e0 100644
--- a/Master/texmf-dist/source/latex-dev/base/ltclass.dtx
+++ b/Master/texmf-dist/source/latex-dev/base/ltclass.dtx
@@ -33,7 +33,7 @@
%<*driver>
% \fi
\ProvidesFile{ltclass.dtx}
- [2020/01/05 v1.3f LaTeX Kernel (Class & Package Interface)]
+ [2020/01/28 v1.3h LaTeX Kernel (Class & Package Interface)]
% \iffalse
\documentclass{ltxdoc}
\GetFileInfo{ltclass.dtx}
@@ -156,7 +156,7 @@
% some comments about how it was produced.
%
% The environment can also be called with an optional argument which is
-% used to alter some of its behavior: option \texttt{force} or
+% used to alter some of its behavior: option \texttt{force} or
% \texttt{overwrite} will allow for overwriting existing files,
% option \texttt{nosearch} will only check the current directory
% when looking if the file exists. This can be useful if you want to
@@ -172,10 +172,10 @@
% A possible use case for using it inside the document body is if you
% want to reuse some text several times in the document you could then
% write it and later use \cs{input} to retrieve it where needed.
-%
+%
%
% The begin and end tags should each be on a
-% line by itself.
+% line by itself.
%
% \subsection{Option processing}
%
@@ -362,7 +362,7 @@
%
% |\DeclareOption*{\PassOptionsToPackage{\CurrentOption}|^^A
% |{|\meta{pkg-name}|}|\\
-% Handle the the current option by passing it on to the package
+% Handle the current option by passing it on to the package
% \meta{pkg-name}, which will presumably be loaded via
% |\RequirePackage| later in the file. This is useful for building
% `extension' packages, that perhaps handle a couple of new options,
@@ -671,7 +671,7 @@
%<latexrelease>\EndIncludeInRelease
%<*2ekernel>
% \end{macrocode}
-%
+%
% \begin{macrocode}
\@onlypreamble\@ifl@t@r
% \end{macrocode}
@@ -847,11 +847,11 @@
%<latexrelease>\EndIncludeInRelease
%<*2ekernel>
% \end{macrocode}
-%
+%
% \begin{macrocode}
\@onlypreamble\@pr@videpackage
% \end{macrocode}
-%
+%
%
%
% \begin{macro}{\ProvidesClass}
@@ -975,7 +975,7 @@
% \end{macro}
%
% \begin{macro}{\default@ds}
-% The default default option code.
+% The default option code.
% Set by |\@onefilewithoptions| to either |\OptionNotUsed| for
% classes, or |\@unknownoptionerror| for packages. This may be reset
% in either case with |\DeclareOption*|.
@@ -1406,8 +1406,8 @@
% \begin{macrocode}
\def\reserved@b##1,{%
% \end{macrocode}
-% If |#1| is |\@nnil| we have reached the end of the list
-% (older version used |\@nil| here but |\@nil| is undefined so |\ifx|
+% If |#1| is |\@nnil| we have reached the end of the list
+% (older version used |\@nil| here but |\@nil| is undefined so |\ifx|
% equal to all undefined commands)
% \begin{macrocode}
\ifx\@nnil##1\relax\else
@@ -1802,13 +1802,16 @@
% To handle the optional argument we execute for each option the
% command \cs{filec@ntents@OPTION} if it exist or complain about
% unknown option.
+% \changes{v1.3h}{2020/01/28}{Allow spaces in option string and display
+% only unknown options not the whole option list (gh/256)}
% \begin{macrocode}
\def\filec@ntents@opt[#1]{%
- \@for\@tempa:=#1\do{%
- \ifcsname filec@ntents@\@tempa\endcsname
- \csname filec@ntents@\@tempa\endcsname
+ \edef\@fortmp{\zap@space#1 \@empty}%
+ \@for\@reserveda:=\@fortmp\do{%
+ \ifcsname filec@ntents@\@reserveda\endcsname
+ \csname filec@ntents@\@reserveda\endcsname
\else
- \@latex@error{Unknown filecontents option #1}%
+ \@latex@error{Unknown filecontents option \@reserveda}%
{Valid options are force (or overwrite), nosearch, noheader}%
\fi}%
\filec@ntents
@@ -1837,7 +1840,7 @@
\let\filec@ntents@checkdir\@empty
\def\filec@ntents@where{exists on the system}
% \end{macrocode}
-%
+%
% \begin{macrocode}
\begingroup%
\@tempcnta=1
@@ -1890,7 +1893,7 @@
% by mistake overwriting the input file (\cs{jobname}). Of course,
% this only works for input files ending in \texttt{.tex}. If a
% different extension is used there is no way to see that we are
-% overwriting outselves!
+% overwriting ourselves!
% \begin{macrocode}
\edef\reserved@a{#1}%
\edef\reserved@a{\detokenize\expandafter{\reserved@a}}%
@@ -1906,12 +1909,13 @@
% \end{macrocode}
% We allocate a write channel but we open it only if it is
% (hopefully) safe. If not opened that means we are going to write
-% on the terminal.
+% on the terminal.
+% \changes{v1.3g}{2020/01/27}{Fix typo in error message}
% \begin{macrocode}
\ch@ck7\reserved@c\write\relax%
\if@filesw% % Foul ... trying to overwrite \jobname!
\@latex@error{Trying to overwrite `\jobname.tex'}{You can't %
- write to the file you a reading from!\MessageBreak%
+ write to the file you are reading from!\MessageBreak%
Data is written to screen instead.}%
\else%
\@latex@warning@no@line%
@@ -1921,7 +1925,7 @@
\fi%
\fi%
% \end{macrocode}
-% Closing the \cs{@inputcheck} is done here ot avoid having to do
+% Closing the \cs{@inputcheck} is done here to avoid having to do
% this in each branch.
% \begin{macrocode}
\closein\@inputcheck%
@@ -2145,7 +2149,7 @@
% \section{Package/class rollback mechanism}
%
%
-%
+%
% \begin{macrocode}
%</2ekernel>
%<*2ekernel|latexreleasefirst>
@@ -2169,7 +2173,7 @@
% \begin{macro}{\requestedLaTeXdate}
% The macro (!) |\requestedLaTeXdate| holds the globally requested
% rollback date (via \texttt{latexrelease}) or zero if no such
-% request was made.
+% request was made.
% \begin{macrocode}
\def\requestedLaTeXdate{0}
% \end{macrocode}
@@ -2244,7 +2248,7 @@
\ifx\load@onefilewithoptions\@undefined
\let\load@onefilewithoptions\@onefilewithoptions
% \end{macrocode}
-%
+%
% \begin{macrocode}
\def\@onefilewithoptions#1[#2][#3]#4{%
% \end{macrocode}
@@ -2295,7 +2299,7 @@
% \end{macrocode}
% \end{macro}
% \end{macro}
-%
+%
%
% \begin{macro}{\pkgcls@parse@date@arg}
% The |\pkgcls@parse@date@arg| command parses the second optional
@@ -2329,8 +2333,8 @@
% So in summary we have:
% \begin{flushleft}
% \hspace*{-1in}\begin{tabular}{ccccc@{}}
-% Input & & \cs{pkgcls@targetdate}
-% & \cs{pkgcls@targetlabel}
+% Input & & \cs{pkgcls@targetdate}
+% & \cs{pkgcls@targetlabel}
% & \cs{pkgcls@mindate}\\[3pt]
% \meta{empty} & $\to$ & \meta{global-rollbackdate-as-number}
% & \meta{empty} & \meta{empty}
@@ -2341,7 +2345,7 @@
% \texttt{=}\meta{date} & $\to$ & \meta{date-as-number}
% & \meta{empty} & \meta{empty}
% \\
-% \texttt{=}\meta{version}& $\to$ & \texttt{1}
+% \texttt{=}\meta{version}& $\to$ & \texttt{1}
% & \meta{version} & \meta{empty}
% \\
% \meta{other} & $\to$ & \meta{global-rollbackdate-as-number}
@@ -2351,7 +2355,7 @@
% \end{flushleft}
% where \meta{global-rollbackdate-as-number} is a date request given
% via \texttt{latexrelease} or if there wasn't one \texttt{0}.
-%
+%
% \begin{macrocode}
\def\pkgcls@parse@date@arg #1{%
% \end{macrocode}
@@ -2373,7 +2377,7 @@
\fi
}
% \end{macrocode}
-% The actual parsing work then happens in |\pkgcls@parse@date@arg@|:
+% The actual parsing work then happens in |\pkgcls@parse@date@arg@|:
% \begin{macrocode}
\def\pkgcls@parse@date@arg@#1=#2\@nil{%
% \end{macrocode}
@@ -2411,7 +2415,7 @@
\else
% \end{macrocode}
% If |#1| was not empty then there wasn't a \texttt{=} character in
-% first position so we we are dealing either with a ``minimum
+% first position so we are dealing either with a ``minimum
% date'' or with some incorrect data. We assume the former and make
% the following assignments (the first one finishing the assignment
% of |\pkgcls@targetdate|):
@@ -2429,9 +2433,9 @@
% \begin{macrocode}
\ifnum \pkgcls@targetdate > \z@
\ifnum \@parse@version0#1//00\@nil > \pkgcls@targetdate
- \@latex@warning@no@line{Suspicious rollback/min-date date given\MessageBreak
+ \@latex@warning@no@line{Suspicious rollback/min-date date given\MessageBreak
A minimal date of #1 has been specified for
- \@cls@pkg\MessageBreak '\pkgcls@name'.\MessageBreak
+ \@cls@pkg\MessageBreak '\pkgcls@name'.\MessageBreak
But this is in conflict
with a rollback request to \requestedpatchdate}
\fi
@@ -2439,7 +2443,7 @@
\fi
}
% \end{macrocode}
-% Strip off te trailing \texttt{=} and assign the version name to
+% Strip off the trailing \texttt{=} and assign the version name to
% |\pkgcls@targetlabel|.
% \begin{macrocode}
\def\pkgcls@parse@date@arg@version#1={%
@@ -2531,7 +2535,7 @@
\pkgcls@debug{New candidate: #3}%
%</tracerollback>
\fi
- \else
+ \else
% \end{macrocode}
% If we end up in this branch we have a named version request. So
% we check if |\pkgcls@targetlabel| matches the current name and if
@@ -2607,7 +2611,7 @@
date
\ifnum\requestedLaTeXdate=\pkgcls@targetdate
\requestedpatchdate
- \else
+ \else
\expandafter\@gobble\pkgcls@arg
\fi.\MessageBreak
% \end{macrocode}
@@ -2617,7 +2621,7 @@
% \begin{macrocode}
Best approximation is
\else
- version '\pkgcls@targetlabel'.\MessageBreak
+ version '\pkgcls@targetlabel'.\MessageBreak
This corresponds to
\fi
\ifx\@nil#2\@nil
@@ -2636,11 +2640,11 @@
%
% A similar error is given if global rollback date and min-date on
% a specific package conflict with each other, but that case is
-% happens only once so it is is inlined.
+% happens only once so it is inlined.
% \begin{macrocode}
\def\pkgcls@rollbackdate@error#1{%
\@latex@error{Suspicious rollback date given}%
- {The \@cls@pkg\space'\@currname' claims that it
+ {The \@cls@pkg\space'\@currname' claims that it
came into existence on #1 which\MessageBreak
is after your requested rollback date --- so
something is wrong here.\MessageBreak
diff --git a/Master/texmf-dist/source/latex-dev/base/ltcounts.dtx b/Master/texmf-dist/source/latex-dev/base/ltcounts.dtx
index 4759fdfee64..5dc1c8866d7 100644
--- a/Master/texmf-dist/source/latex-dev/base/ltcounts.dtx
+++ b/Master/texmf-dist/source/latex-dev/base/ltcounts.dtx
@@ -322,7 +322,7 @@
% \end{macrocode}
% \end{macro}
%
-%
+%
% \begin{macrocode}
%</2ekernel>
% \end{macrocode}
@@ -335,7 +335,7 @@
%<latexrelease> {\@removefromreset}{Add interfaces}%
%<*2ekernel|latexrelease>
% \end{macrocode}
-%
+%
% \begin{macrocode}
\def\@removefromreset#1#2{%
% \end{macrocode}
@@ -374,17 +374,17 @@
% \begin{macro}{\counterwithout}
-%
+%
% \changes{v1.1k}{2018/03/08}{Interface added}
% \begin{macrocode}
\def\counterwithout {\@ifstar\counterwithout@s\counterwithout@x}
% \end{macrocode}
-%
+%
% \begin{macrocode}
\def\counterwithout@s#1#2{%
\@ifbothcounters{#1}{#2}{\@removefromreset{#1}{#2}}}
% \end{macrocode}
-%
+%
% \begin{macrocode}
\def\counterwithout@x#1#2{%
\@ifbothcounters{#1}{#2}%
@@ -399,17 +399,17 @@
% \begin{macro}{\counterwithin}
-%
+%
% \changes{v1.1k}{2018/03/08}{Interface added}
% \begin{macrocode}
\def\counterwithin{\@ifstar\counterwithin@s\counterwithin@x}
% \end{macrocode}
-%
+%
% \begin{macrocode}
\def\counterwithin@s#1#2{%
\@ifbothcounters{#1}{#2}{\@addtoreset{#1}{#2}}}
% \end{macrocode}
-%
+%
% \changes{v1.1l}{2018/04/11}{Correct default (issue/38)}
% \begin{macrocode}
\def\counterwithin@x#1#2{%
@@ -424,7 +424,7 @@
% \end{macro}
-%
+%
% \begin{macrocode}
%</2ekernel|latexrelease>
%<latexrelease>\EndIncludeInRelease
diff --git a/Master/texmf-dist/source/latex-dev/base/ltdefns.dtx b/Master/texmf-dist/source/latex-dev/base/ltdefns.dtx
index 0cc925bb74c..ae472966d57 100644
--- a/Master/texmf-dist/source/latex-dev/base/ltdefns.dtx
+++ b/Master/texmf-dist/source/latex-dev/base/ltdefns.dtx
@@ -1049,7 +1049,7 @@
% infinite loop! In particular, setting |\protect| to |\@empty| will
% cause |\_| to loop forever. It will also break lots of other
% things, such as protected |\ifmmode|s inside |\halign|s. If you
-% really really have to do such a thing, then please set
+% really have to do such a thing, then please set
% |\@typeset@protect| to be |\@empty| as well. (This is what the
% code for |\patterns| does, for example.)
%
@@ -1289,7 +1289,7 @@
\expandafter\@gobble\string#1\space\endcsname
\global\expandafter\let\csname
\expandafter\@gobble\string#1\space\endcsname\@undefined
- }%
+ }%
}
%<latexrelease>\EndIncludeInRelease
%</2ekernel|latexrelease>
@@ -1563,7 +1563,7 @@
% current font's |\hyphenchar|. Monospace fonts are usually declared
% with |\hyphenchar| set to $-1$ to suppress hyhenation.
%
-% \LaTeX, from \LaTeX2.09 in 1986 defined |\-| by
+% \LaTeX, from \LaTeX2.09 in 1986 defined |\-| by
% \begin{verbatim}
% \def\-{\discretionary{-}{}{}}
% \end{verbatim}
@@ -1618,7 +1618,7 @@
% \end{macrocode}
% \end{macro}
%
-% Delayed from |ltvers.dtx|
+% Delayed from |ltvers.dtx|
% \begin{macrocode}
\newif\if@includeinrelease
\@includeinreleasefalse
diff --git a/Master/texmf-dist/source/latex-dev/base/ltdirchk.dtx b/Master/texmf-dist/source/latex-dev/base/ltdirchk.dtx
index 8cc21eca90d..25fb9480ddd 100644
--- a/Master/texmf-dist/source/latex-dev/base/ltdirchk.dtx
+++ b/Master/texmf-dist/source/latex-dev/base/ltdirchk.dtx
@@ -978,7 +978,7 @@
% \section{\TeX\ Versions}
%
% \begin{macro}{\@TeXversion}
-% \TeX\ versions older than than 3.141 require |\@TeXversion| to be
+% \TeX\ versions older than 3.141 require |\@TeXversion| to be
% set. This can be determined automatically due to a trick suggested
% by Bernd Raichle. (Actually this will not always get the correct
% version number, eg \TeX3.14 would be detected as \TeX3, but \LaTeX\
diff --git a/Master/texmf-dist/source/latex-dev/base/lterror.dtx b/Master/texmf-dist/source/latex-dev/base/lterror.dtx
index 2583b1f3481..9a606ea8c1d 100644
--- a/Master/texmf-dist/source/latex-dev/base/lterror.dtx
+++ b/Master/texmf-dist/source/latex-dev/base/lterror.dtx
@@ -103,7 +103,7 @@
% the error messages already in the format.
%
% These days we don't support autoloading approach any longer, but
-% this part bit is kept in case it is used in old documents.
+% this part bit is kept in case it is used in old documents.
% \begin{macrocode}
\expandafter\let\csname ver@autoerr.sty\endcsname\fmtversion
% \end{macrocode}
@@ -448,7 +448,7 @@ Type H <return> for immediate help.}%
%
% \begin{macro}{\c@errorcontextlines}
% \changes{LaTeX2e}{1993/11/22}{Macro added}
-% |\errorcontextlines| as a \LaTeX\ counter, so that it may be be
+% |\errorcontextlines| as a \LaTeX\ counter, so that it may be
% manipulated with |\setcounter| (once it is defined :-)
% \begin{macrocode}
\let\c@errorcontextlines\errorcontextlines
@@ -792,7 +792,7 @@ Type H <return> for immediate help.}%
% \end{macro}
% \end{macro}
%
-%
+%
% \begin{macrocode}
%</2ekernel>
% \end{macrocode}
diff --git a/Master/texmf-dist/source/latex-dev/base/ltexpl.dtx b/Master/texmf-dist/source/latex-dev/base/ltexpl.dtx
index c3f64306ad3..230cd911588 100644
--- a/Master/texmf-dist/source/latex-dev/base/ltexpl.dtx
+++ b/Master/texmf-dist/source/latex-dev/base/ltexpl.dtx
@@ -1,6 +1,6 @@
% \iffalse meta-comment
%
-% Copyright (C) 2019
+% Copyright (C) 2019-2020
% The LaTeX3 Project and any individual authors listed elsewhere
% in this file.
%
diff --git a/Master/texmf-dist/source/latex-dev/base/ltfiles.dtx b/Master/texmf-dist/source/latex-dev/base/ltfiles.dtx
index 65995c292fa..33594a7b912 100644
--- a/Master/texmf-dist/source/latex-dev/base/ltfiles.dtx
+++ b/Master/texmf-dist/source/latex-dev/base/ltfiles.dtx
@@ -745,7 +745,7 @@
% "a b c" -> "a b c"
% a" "b" "c -> "a b c"
% -> ""
-%\end{verbatim}
+%\end{verbatim}
% \begin{macrocode}
\def\quote@name#1{"\quote@@name#1\@gobble""}
\def\quote@@name#1"{#1\quote@@name}
@@ -761,7 +761,7 @@
%
%
% \begin{macro}{\IfFileExists}
-%
+%
% \changes{v1.2a}{2019/07/01}{Support UTF-8}
% \changes{v1.2b}{2019/08/27}{Make command robust}
% \changes{v1.2d}{2019/10/26}{dont quote name}
@@ -868,7 +868,7 @@
%<latexrelease>\EndIncludeInRelease
%<*2ekernel>
% \end{macrocode}
-%
+%
%
%
%
@@ -901,7 +901,7 @@
% \end{macrocode}
% \end{macro}
%
-%
+%
% \begin{macro}{\@swaptwoargs}
%
% \changes{v1.1o}{2019/02/07}{Helper macro added}
@@ -912,7 +912,7 @@
% \end{macrocode}
% \end{macro}
%
-%
+%
% \begin{macrocode}
%</2ekernel|latexrelease>
%<latexrelease>\EndIncludeInRelease
diff --git a/Master/texmf-dist/source/latex-dev/base/ltfinal.dtx b/Master/texmf-dist/source/latex-dev/base/ltfinal.dtx
index a6468178fd6..56549507624 100644
--- a/Master/texmf-dist/source/latex-dev/base/ltfinal.dtx
+++ b/Master/texmf-dist/source/latex-dev/base/ltfinal.dtx
@@ -237,7 +237,7 @@
% \end{macro}
% \end{macro}
% \end{macro}
-%
+%
%
%
% The default values of the picture and |\fbox| parameters:
@@ -271,10 +271,10 @@
% \end{macrocode}
%
% \subsection{Lccodes for hyphenation}
-%
+%
% \changes{v2.0a}{2015/01/03}{Unicode data loading added}
% \changes{v2.0c}{2015/01/24}{Skip T1-code entirely with Unicode engines}
-% \changes{v2.0d}{2015/03/26}{Use renamed
+% \changes{v2.0d}{2015/03/26}{Use renamed
% \texttt{unicode-letters.def}}
% \changes{v2.0i}{2015/12/10}{Use new common Unicode data loaders}
% \changes{v2.0j}{2016/01/04}{Do not set up inter character classes for
@@ -739,7 +739,7 @@
%<latexrelease> \catcode\@tempcnta=15
%<latexrelease> \advance\@tempcnta\@ne
%<latexrelease>\ifnum\@tempcnta<32
-%<latexrelease>\repeat %
+%<latexrelease>\repeat %
%<latexrelease>\catcode9=10 % tab
%<latexrelease>\catcode10=12 % ctrl J
%<latexrelease>\catcode12=13 % ctrl L
diff --git a/Master/texmf-dist/source/latex-dev/base/ltfntcmd.dtx b/Master/texmf-dist/source/latex-dev/base/ltfntcmd.dtx
index 0869be20d57..0a44d5acf1e 100644
--- a/Master/texmf-dist/source/latex-dev/base/ltfntcmd.dtx
+++ b/Master/texmf-dist/source/latex-dev/base/ltfntcmd.dtx
@@ -396,14 +396,14 @@
% \begin{macro}{textulc}
% \begin{macro}{textsw}
% \begin{macro}{textssc}
-%
+%
% \changes{v3.4c}{2019/12/17}{Macro added}
% \begin{macrocode}
%</2ekernel>
%<*2ekernel|latexrelease>
%<latexrelease>\IncludeInRelease{2020/02/02}%
%<latexrelease> {\textulc}{Additional text commands}%
-\DeclareTextFontCommand{\textulc}{\ulcshape}
+\DeclareTextFontCommand{\textulc}{\ulcshape}
\DeclareTextFontCommand{\textsw}{\swshape}
\DeclareTextFontCommand{\textssc}{\sscshape}
%</2ekernel|latexrelease>
diff --git a/Master/texmf-dist/source/latex-dev/base/ltfssaxes.dtx b/Master/texmf-dist/source/latex-dev/base/ltfssaxes.dtx
index 62c97f389db..4dd7a36ca48 100644
--- a/Master/texmf-dist/source/latex-dev/base/ltfssaxes.dtx
+++ b/Master/texmf-dist/source/latex-dev/base/ltfssaxes.dtx
@@ -1,6 +1,6 @@
% \iffalse meta-comment
%
-% Copyright (C) 2019
+% Copyright (C) 2019-2020
% The LaTeX3 Project and any individual authors listed elsewhere
% in this file.
%
@@ -27,15 +27,15 @@
%
% \fi
% \iffalse
-%%% From File: ltfssbas.dtx
-%% Copyright (C) 1989-2002 Frank Mittelbach and Rainer Sch\"opf
+%%% From File: ltfssaxes.dtx
+%% Copyright (C) 1999-2020 Frank Mittelbach
%
%<*driver>
% \fi
%
%
\ProvidesFile{ltfssaxes.dtx}
- [2019/12/16 v1.0a LaTeX Kernel (NFSS Axes handing)]
+ [2020/01/30 v1.0a LaTeX Kernel (NFSS Axes handing)]
% \iffalse
\documentclass{ltxdoc}
\begin{document}
@@ -138,7 +138,7 @@
%
% We could alternatively split the axis and maintain weight and width
% separately, but that would take more processing time and would not
-% allow for setting up explicit exceptions nicely (not sure that that
+% allow for setting up explicit exceptions nicely (not sure that this
% would ever get used though).
%
% Design considerations for mapping entries:
@@ -198,35 +198,35 @@
% \end{itemize}
%
% \begin{macrocode}
-\DeclareFontSeriesChangeRule {bc}{b}{bc}{}
+\DeclareFontSeriesChangeRule {bc}{b}{bc}{}
\DeclareFontSeriesChangeRule {bc}{c}{bc}{}
-\DeclareFontSeriesChangeRule {bc}{eb}{ebc}{}
+\DeclareFontSeriesChangeRule {bc}{eb}{ebc}{}
\DeclareFontSeriesChangeRule {bc}{ec}{bec} {bc}
-\DeclareFontSeriesChangeRule {bc}{el}{elc}{}
-\DeclareFontSeriesChangeRule {bc}{l}{lc}{}
-\DeclareFontSeriesChangeRule {bc}{sb}{sbc}{}
+\DeclareFontSeriesChangeRule {bc}{el}{elc}{}
+\DeclareFontSeriesChangeRule {bc}{l}{lc}{}
+\DeclareFontSeriesChangeRule {bc}{sb}{sbc}{}
\DeclareFontSeriesChangeRule {bc}{sc}{bsc} {bc}
-\DeclareFontSeriesChangeRule {bc}{sl}{slc}{}
-\DeclareFontSeriesChangeRule {bc}{ub}{ubc}{}
-\DeclareFontSeriesChangeRule {bc}{ul}{ulc}{}
-\DeclareFontSeriesChangeRule {bc}{x}{bx}{}
+\DeclareFontSeriesChangeRule {bc}{sl}{slc}{}
+\DeclareFontSeriesChangeRule {bc}{ub}{ubc}{}
+\DeclareFontSeriesChangeRule {bc}{ul}{ulc}{}
+\DeclareFontSeriesChangeRule {bc}{x}{bx}{}
% \end{macrocode}
-%
+%
% \begin{macrocode}
-\DeclareFontSeriesChangeRule {bx}{b}{bx}{}
+\DeclareFontSeriesChangeRule {bx}{b}{bx}{}
\DeclareFontSeriesChangeRule {bx}{c} {bc} {bx} %<-----
-\DeclareFontSeriesChangeRule {bx}{eb}{ebx}{}
+\DeclareFontSeriesChangeRule {bx}{eb}{ebx}{}
\DeclareFontSeriesChangeRule {bx}{ec} {bec} {bx} %<-----
-\DeclareFontSeriesChangeRule {bx}{el}{elx}{}
-\DeclareFontSeriesChangeRule {bx}{l}{lx}{}
+\DeclareFontSeriesChangeRule {bx}{el}{elx}{}
+\DeclareFontSeriesChangeRule {bx}{l}{lx}{}
\DeclareFontSeriesChangeRule {bx}{sb} {sbx} {}
\DeclareFontSeriesChangeRule {bx}{sc} {bsc} {bx} %<-----
-\DeclareFontSeriesChangeRule {bx}{sl}{slx} {}
-\DeclareFontSeriesChangeRule {bx}{ub}{ubx}{}
-\DeclareFontSeriesChangeRule {bx}{ul}{ulx}{}
-\DeclareFontSeriesChangeRule {bx}{x}{bx}{}
+\DeclareFontSeriesChangeRule {bx}{sl}{slx} {}
+\DeclareFontSeriesChangeRule {bx}{ub}{ubx}{}
+\DeclareFontSeriesChangeRule {bx}{ul}{ulx}{}
+\DeclareFontSeriesChangeRule {bx}{x}{bx}{}
% \end{macrocode}
-%
+%
% \begin{macrocode}
\DeclareFontSeriesChangeRule {b}{bx} {bx} {b} %<-----
\DeclareFontSeriesChangeRule {b}{c} {bc} {b} %<-----
@@ -235,151 +235,151 @@
\DeclareFontSeriesChangeRule {b}{sc} {bsc} {b} %<-----
\DeclareFontSeriesChangeRule {b}{x} {bx} {b} %<-----
% \end{macrocode}
-%
+%
% \begin{macrocode}
\DeclareFontSeriesChangeRule {c}{bx} {bx} {b} %<-----
-\DeclareFontSeriesChangeRule {c}{b}{bc}{}
-\DeclareFontSeriesChangeRule {c}{eb}{ebc}{}
-\DeclareFontSeriesChangeRule {c}{el}{elc}{}
-\DeclareFontSeriesChangeRule {c}{l}{lc}{}
-\DeclareFontSeriesChangeRule {c}{sb}{sbc}{}
-\DeclareFontSeriesChangeRule {c}{sl}{slc}{}
-\DeclareFontSeriesChangeRule {c}{ub}{ubc}{}
-\DeclareFontSeriesChangeRule {c}{ul}{ulc}{}
+\DeclareFontSeriesChangeRule {c}{b}{bc}{}
+\DeclareFontSeriesChangeRule {c}{eb}{ebc}{}
+\DeclareFontSeriesChangeRule {c}{el}{elc}{}
+\DeclareFontSeriesChangeRule {c}{l}{lc}{}
+\DeclareFontSeriesChangeRule {c}{sb}{sbc}{}
+\DeclareFontSeriesChangeRule {c}{sl}{slc}{}
+\DeclareFontSeriesChangeRule {c}{ub}{ubc}{}
+\DeclareFontSeriesChangeRule {c}{ul}{ulc}{}
\DeclareFontSeriesChangeRule {c}{x}{x}{m} %<-----
% \end{macrocode}
-%
+%
% \begin{macrocode}
-\DeclareFontSeriesChangeRule {ebc}{b}{bc}{}
-\DeclareFontSeriesChangeRule {ebc}{c}{ebc}{}
-\DeclareFontSeriesChangeRule {ebc}{eb}{ebc}{}
-\DeclareFontSeriesChangeRule {ebc}{ec}{ebec}{ebc}
-\DeclareFontSeriesChangeRule {ebc}{el}{elc}{}
-\DeclareFontSeriesChangeRule {ebc}{l}{lc}{}
-\DeclareFontSeriesChangeRule {ebc}{sb}{sbc}{}
-\DeclareFontSeriesChangeRule {ebc}{sc}{ebsc}{ebc}
-\DeclareFontSeriesChangeRule {ebc}{sl}{slc}{}
-\DeclareFontSeriesChangeRule {ebc}{ub}{ubc}{}
-\DeclareFontSeriesChangeRule {ebc}{ul}{ulc}{}
-\DeclareFontSeriesChangeRule {ebc}{x}{ebx}{}
+\DeclareFontSeriesChangeRule {ebc}{b}{bc}{}
+\DeclareFontSeriesChangeRule {ebc}{c}{ebc}{}
+\DeclareFontSeriesChangeRule {ebc}{eb}{ebc}{}
+\DeclareFontSeriesChangeRule {ebc}{ec}{ebec}{ebc}
+\DeclareFontSeriesChangeRule {ebc}{el}{elc}{}
+\DeclareFontSeriesChangeRule {ebc}{l}{lc}{}
+\DeclareFontSeriesChangeRule {ebc}{sb}{sbc}{}
+\DeclareFontSeriesChangeRule {ebc}{sc}{ebsc}{ebc}
+\DeclareFontSeriesChangeRule {ebc}{sl}{slc}{}
+\DeclareFontSeriesChangeRule {ebc}{ub}{ubc}{}
+\DeclareFontSeriesChangeRule {ebc}{ul}{ulc}{}
+\DeclareFontSeriesChangeRule {ebc}{x}{ebx}{}
% \end{macrocode}
-%
-%
+%
+%
% \begin{macrocode}
\DeclareFontSeriesChangeRule {ec}{bx} {bx} {b} %<-----
-\DeclareFontSeriesChangeRule {ec}{b}{bec}{}
-\DeclareFontSeriesChangeRule {ec}{eb}{ebec}{}
-\DeclareFontSeriesChangeRule {ec}{el}{elec}{}
-\DeclareFontSeriesChangeRule {ec}{l}{lec}{}
-\DeclareFontSeriesChangeRule {ec}{sb}{sbec}{}
-\DeclareFontSeriesChangeRule {ec}{sl}{slec}{}
-\DeclareFontSeriesChangeRule {ec}{ub}{ubec}{}
-\DeclareFontSeriesChangeRule {ec}{ul}{ulec}{}
+\DeclareFontSeriesChangeRule {ec}{b}{bec}{}
+\DeclareFontSeriesChangeRule {ec}{eb}{ebec}{}
+\DeclareFontSeriesChangeRule {ec}{el}{elec}{}
+\DeclareFontSeriesChangeRule {ec}{l}{lec}{}
+\DeclareFontSeriesChangeRule {ec}{sb}{sbec}{}
+\DeclareFontSeriesChangeRule {ec}{sl}{slec}{}
+\DeclareFontSeriesChangeRule {ec}{ub}{ubec}{}
+\DeclareFontSeriesChangeRule {ec}{ul}{ulec}{}
\DeclareFontSeriesChangeRule {ec}{x}{x}{m} %<-----
% \end{macrocode}
-%
+%
% \begin{macrocode}
\DeclareFontSeriesChangeRule {sc}{bx} {bx} {b} %<-----
-\DeclareFontSeriesChangeRule {sc}{b}{bsc}{}
-\DeclareFontSeriesChangeRule {sc}{eb}{ebsc}{}
-\DeclareFontSeriesChangeRule {sc}{el}{elsc}{}
-\DeclareFontSeriesChangeRule {sc}{l}{lsc}{}
-\DeclareFontSeriesChangeRule {sc}{sb}{sbsc}{}
-\DeclareFontSeriesChangeRule {sc}{sl}{slsc}{}
-\DeclareFontSeriesChangeRule {sc}{ub}{ubsc}{}
-\DeclareFontSeriesChangeRule {sc}{ul}{ulsc}{}
+\DeclareFontSeriesChangeRule {sc}{b}{bsc}{}
+\DeclareFontSeriesChangeRule {sc}{eb}{ebsc}{}
+\DeclareFontSeriesChangeRule {sc}{el}{elsc}{}
+\DeclareFontSeriesChangeRule {sc}{l}{lsc}{}
+\DeclareFontSeriesChangeRule {sc}{sb}{sbsc}{}
+\DeclareFontSeriesChangeRule {sc}{sl}{slsc}{}
+\DeclareFontSeriesChangeRule {sc}{ub}{ubsc}{}
+\DeclareFontSeriesChangeRule {sc}{ul}{ulsc}{}
\DeclareFontSeriesChangeRule {sc}{x}{x}{m} %<-----
% \end{macrocode}
%
% \begin{macrocode}
-\DeclareFontSeriesChangeRule {ebx}{b}{bx}{}
-\DeclareFontSeriesChangeRule {ebx}{c}{ebc}{}
-\DeclareFontSeriesChangeRule {ebx}{eb}{ebx}{}
-\DeclareFontSeriesChangeRule {ebx}{ec}{ebec}{}
-\DeclareFontSeriesChangeRule {ebx}{el}{elx}{}
-\DeclareFontSeriesChangeRule {ebx}{l}{lx}{}
-\DeclareFontSeriesChangeRule {ebx}{sb}{sbx}{}
-\DeclareFontSeriesChangeRule {ebx}{sc}{ebsc}{}
-\DeclareFontSeriesChangeRule {ebx}{sl}{slx}{}
-\DeclareFontSeriesChangeRule {ebx}{ub}{ubx}{}
-\DeclareFontSeriesChangeRule {ebx}{ul}{ulx}{}
-\DeclareFontSeriesChangeRule {ebx}{x}{ebx}{}
-% \end{macrocode}
-%
-% \begin{macrocode}
-\DeclareFontSeriesChangeRule {eb}{c}{ebc}{}
-\DeclareFontSeriesChangeRule {eb}{ec}{ebec}{}
-\DeclareFontSeriesChangeRule {eb}{sc}{ebsc}{}
-\DeclareFontSeriesChangeRule {eb}{x}{ebx}{}
-% \end{macrocode}
-%
-% \begin{macrocode}
-\DeclareFontSeriesChangeRule {elc}{b}{bc}{}
-\DeclareFontSeriesChangeRule {elc}{c}{elc}{}
-\DeclareFontSeriesChangeRule {elc}{eb}{ebc}{}
-\DeclareFontSeriesChangeRule {elc}{ec}{elec}{}
-\DeclareFontSeriesChangeRule {elc}{el}{elc}{}
-\DeclareFontSeriesChangeRule {elc}{l}{lc}{}
-\DeclareFontSeriesChangeRule {elc}{sb}{sbc}{}
-\DeclareFontSeriesChangeRule {elc}{sc}{elsc}{}
-\DeclareFontSeriesChangeRule {elc}{sl}{slc}{}
-\DeclareFontSeriesChangeRule {elc}{ub}{ubc}{}
-\DeclareFontSeriesChangeRule {elc}{ul}{ulc}{}
-\DeclareFontSeriesChangeRule {elc}{x}{elx}{}
-% \end{macrocode}
-%
-% \begin{macrocode}
-\DeclareFontSeriesChangeRule {elx}{b}{bx}{}
-\DeclareFontSeriesChangeRule {elx}{c}{elc}{}
-\DeclareFontSeriesChangeRule {elx}{eb}{ebx}{}
-\DeclareFontSeriesChangeRule {elx}{ec}{elec}{}
-\DeclareFontSeriesChangeRule {elx}{el}{elx}{}
-\DeclareFontSeriesChangeRule {elx}{l}{lx}{}
-\DeclareFontSeriesChangeRule {elx}{sb}{sbx}{}
-\DeclareFontSeriesChangeRule {elx}{sc}{elsc}{}
-\DeclareFontSeriesChangeRule {elx}{sl}{slx}{}
-\DeclareFontSeriesChangeRule {elx}{ub}{ubx}{}
-\DeclareFontSeriesChangeRule {elx}{ul}{ulx}{}
-\DeclareFontSeriesChangeRule {elx}{x}{elx}{}
-% \end{macrocode}
-%
-% \begin{macrocode}
-\DeclareFontSeriesChangeRule {el}{c}{elc}{}
-\DeclareFontSeriesChangeRule {el}{ec}{elec}{}
-\DeclareFontSeriesChangeRule {el}{sc}{elsc}{}
-\DeclareFontSeriesChangeRule {el}{x}{elx}{}
-% \end{macrocode}
-%
-% \begin{macrocode}
-\DeclareFontSeriesChangeRule {lc}{b}{bc}{}
-\DeclareFontSeriesChangeRule {lc}{c}{lc}{}
-\DeclareFontSeriesChangeRule {lc}{eb}{ebc}{}
-\DeclareFontSeriesChangeRule {lc}{ec}{lec}{}
-\DeclareFontSeriesChangeRule {lc}{el}{elc}{}
-\DeclareFontSeriesChangeRule {lc}{l}{lc}{}
-\DeclareFontSeriesChangeRule {lc}{sb}{sbc}{}
-\DeclareFontSeriesChangeRule {lc}{sc}{lsc}{}
-\DeclareFontSeriesChangeRule {lc}{sl}{slc}{}
-\DeclareFontSeriesChangeRule {lc}{ub}{ubc}{}
-\DeclareFontSeriesChangeRule {lc}{ul}{ulc}{}
-\DeclareFontSeriesChangeRule {lc}{x}{lx}{}
-% \end{macrocode}
-%
-% \begin{macrocode}
-\DeclareFontSeriesChangeRule {lx}{b}{bx}{}
-\DeclareFontSeriesChangeRule {lx}{c}{lc}{}
-\DeclareFontSeriesChangeRule {lx}{eb}{ebx}{}
-\DeclareFontSeriesChangeRule {lx}{ec}{lec}{}
-\DeclareFontSeriesChangeRule {lx}{el}{elx}{}
-\DeclareFontSeriesChangeRule {lx}{l}{lx}{}
-\DeclareFontSeriesChangeRule {lx}{sb}{sbx}{}
-\DeclareFontSeriesChangeRule {lx}{sc}{lsc}{}
-\DeclareFontSeriesChangeRule {lx}{sl}{slx}{}
-\DeclareFontSeriesChangeRule {lx}{ub}{ubx}{}
-\DeclareFontSeriesChangeRule {lx}{ul}{ulx}{}
-\DeclareFontSeriesChangeRule {lx}{x}{lx}{}
-% \end{macrocode}
-%
+\DeclareFontSeriesChangeRule {ebx}{b}{bx}{}
+\DeclareFontSeriesChangeRule {ebx}{c}{ebc}{}
+\DeclareFontSeriesChangeRule {ebx}{eb}{ebx}{}
+\DeclareFontSeriesChangeRule {ebx}{ec}{ebec}{}
+\DeclareFontSeriesChangeRule {ebx}{el}{elx}{}
+\DeclareFontSeriesChangeRule {ebx}{l}{lx}{}
+\DeclareFontSeriesChangeRule {ebx}{sb}{sbx}{}
+\DeclareFontSeriesChangeRule {ebx}{sc}{ebsc}{}
+\DeclareFontSeriesChangeRule {ebx}{sl}{slx}{}
+\DeclareFontSeriesChangeRule {ebx}{ub}{ubx}{}
+\DeclareFontSeriesChangeRule {ebx}{ul}{ulx}{}
+\DeclareFontSeriesChangeRule {ebx}{x}{ebx}{}
+% \end{macrocode}
+%
+% \begin{macrocode}
+\DeclareFontSeriesChangeRule {eb}{c}{ebc}{}
+\DeclareFontSeriesChangeRule {eb}{ec}{ebec}{}
+\DeclareFontSeriesChangeRule {eb}{sc}{ebsc}{}
+\DeclareFontSeriesChangeRule {eb}{x}{ebx}{}
+% \end{macrocode}
+%
+% \begin{macrocode}
+\DeclareFontSeriesChangeRule {elc}{b}{bc}{}
+\DeclareFontSeriesChangeRule {elc}{c}{elc}{}
+\DeclareFontSeriesChangeRule {elc}{eb}{ebc}{}
+\DeclareFontSeriesChangeRule {elc}{ec}{elec}{}
+\DeclareFontSeriesChangeRule {elc}{el}{elc}{}
+\DeclareFontSeriesChangeRule {elc}{l}{lc}{}
+\DeclareFontSeriesChangeRule {elc}{sb}{sbc}{}
+\DeclareFontSeriesChangeRule {elc}{sc}{elsc}{}
+\DeclareFontSeriesChangeRule {elc}{sl}{slc}{}
+\DeclareFontSeriesChangeRule {elc}{ub}{ubc}{}
+\DeclareFontSeriesChangeRule {elc}{ul}{ulc}{}
+\DeclareFontSeriesChangeRule {elc}{x}{elx}{}
+% \end{macrocode}
+%
+% \begin{macrocode}
+\DeclareFontSeriesChangeRule {elx}{b}{bx}{}
+\DeclareFontSeriesChangeRule {elx}{c}{elc}{}
+\DeclareFontSeriesChangeRule {elx}{eb}{ebx}{}
+\DeclareFontSeriesChangeRule {elx}{ec}{elec}{}
+\DeclareFontSeriesChangeRule {elx}{el}{elx}{}
+\DeclareFontSeriesChangeRule {elx}{l}{lx}{}
+\DeclareFontSeriesChangeRule {elx}{sb}{sbx}{}
+\DeclareFontSeriesChangeRule {elx}{sc}{elsc}{}
+\DeclareFontSeriesChangeRule {elx}{sl}{slx}{}
+\DeclareFontSeriesChangeRule {elx}{ub}{ubx}{}
+\DeclareFontSeriesChangeRule {elx}{ul}{ulx}{}
+\DeclareFontSeriesChangeRule {elx}{x}{elx}{}
+% \end{macrocode}
+%
+% \begin{macrocode}
+\DeclareFontSeriesChangeRule {el}{c}{elc}{}
+\DeclareFontSeriesChangeRule {el}{ec}{elec}{}
+\DeclareFontSeriesChangeRule {el}{sc}{elsc}{}
+\DeclareFontSeriesChangeRule {el}{x}{elx}{}
+% \end{macrocode}
+%
+% \begin{macrocode}
+\DeclareFontSeriesChangeRule {lc}{b}{bc}{}
+\DeclareFontSeriesChangeRule {lc}{c}{lc}{}
+\DeclareFontSeriesChangeRule {lc}{eb}{ebc}{}
+\DeclareFontSeriesChangeRule {lc}{ec}{lec}{}
+\DeclareFontSeriesChangeRule {lc}{el}{elc}{}
+\DeclareFontSeriesChangeRule {lc}{l}{lc}{}
+\DeclareFontSeriesChangeRule {lc}{sb}{sbc}{}
+\DeclareFontSeriesChangeRule {lc}{sc}{lsc}{}
+\DeclareFontSeriesChangeRule {lc}{sl}{slc}{}
+\DeclareFontSeriesChangeRule {lc}{ub}{ubc}{}
+\DeclareFontSeriesChangeRule {lc}{ul}{ulc}{}
+\DeclareFontSeriesChangeRule {lc}{x}{lx}{}
+% \end{macrocode}
+%
+% \begin{macrocode}
+\DeclareFontSeriesChangeRule {lx}{b}{bx}{}
+\DeclareFontSeriesChangeRule {lx}{c}{lc}{}
+\DeclareFontSeriesChangeRule {lx}{eb}{ebx}{}
+\DeclareFontSeriesChangeRule {lx}{ec}{lec}{}
+\DeclareFontSeriesChangeRule {lx}{el}{elx}{}
+\DeclareFontSeriesChangeRule {lx}{l}{lx}{}
+\DeclareFontSeriesChangeRule {lx}{sb}{sbx}{}
+\DeclareFontSeriesChangeRule {lx}{sc}{lsc}{}
+\DeclareFontSeriesChangeRule {lx}{sl}{slx}{}
+\DeclareFontSeriesChangeRule {lx}{ub}{ubx}{}
+\DeclareFontSeriesChangeRule {lx}{ul}{ulx}{}
+\DeclareFontSeriesChangeRule {lx}{x}{lx}{}
+% \end{macrocode}
+%
% \begin{macrocode}
\DeclareFontSeriesChangeRule {l}{bx} {bx} {b} %<-----
\DeclareFontSeriesChangeRule {l}{b} {b} {bx} %<-----
@@ -389,7 +389,7 @@
\DeclareFontSeriesChangeRule {l}{sc} {lsc} {l} % ? %<-----
\DeclareFontSeriesChangeRule {l}{x} {lx} {l} % ? %<-----
% \end{macrocode}
-%
+%
% \begin{macrocode}
\DeclareFontSeriesChangeRule {m}{bx} {bx} {b} %<-----
\DeclareFontSeriesChangeRule {m}{b} {b} {bx} %<-----
@@ -400,155 +400,155 @@
\DeclareFontSeriesChangeRule {m}{sc} {sc} {m} %<-----
\DeclareFontSeriesChangeRule {m}{x} {x} {m} %<-----
% \end{macrocode}
-%
-% \begin{macrocode}
-\DeclareFontSeriesChangeRule {sbc}{b}{bc}{}
-\DeclareFontSeriesChangeRule {sbc}{c}{sbc}{}
-\DeclareFontSeriesChangeRule {sbc}{eb}{ebc}{}
-\DeclareFontSeriesChangeRule {sbc}{ec}{sbec}{sbc}
-\DeclareFontSeriesChangeRule {sbc}{el}{elc}{}
-\DeclareFontSeriesChangeRule {sbc}{l}{lc}{}
-\DeclareFontSeriesChangeRule {sbc}{sb}{sbc}{}
-\DeclareFontSeriesChangeRule {sbc}{sc}{sbsc}{sbc}
-\DeclareFontSeriesChangeRule {sbc}{sl}{slc}{}
-\DeclareFontSeriesChangeRule {sbc}{ub}{ubc}{}
-\DeclareFontSeriesChangeRule {sbc}{ul}{ulc}{}
-\DeclareFontSeriesChangeRule {sbc}{x}{sbx}{}
-% \end{macrocode}
-%
-% \begin{macrocode}
-\DeclareFontSeriesChangeRule {sbx}{b}{bx}{}
-\DeclareFontSeriesChangeRule {sbx}{c}{sbc}{}
-\DeclareFontSeriesChangeRule {sbx}{eb}{ebx}{}
-\DeclareFontSeriesChangeRule {sbx}{ec}{sbec}{}
-\DeclareFontSeriesChangeRule {sbx}{el}{elx}{}
-\DeclareFontSeriesChangeRule {sbx}{l}{lx}{}
-\DeclareFontSeriesChangeRule {sbx}{sb}{sbx}{}
-\DeclareFontSeriesChangeRule {sbx}{sc}{sbsc}{}
-\DeclareFontSeriesChangeRule {sbx}{sl}{slx}{}
-\DeclareFontSeriesChangeRule {sbx}{ub}{ubx}{}
-\DeclareFontSeriesChangeRule {sbx}{ul}{ulx}{}
-\DeclareFontSeriesChangeRule {sbx}{x}{sbx}{}
-% \end{macrocode}
-%
+%
+% \begin{macrocode}
+\DeclareFontSeriesChangeRule {sbc}{b}{bc}{}
+\DeclareFontSeriesChangeRule {sbc}{c}{sbc}{}
+\DeclareFontSeriesChangeRule {sbc}{eb}{ebc}{}
+\DeclareFontSeriesChangeRule {sbc}{ec}{sbec}{sbc}
+\DeclareFontSeriesChangeRule {sbc}{el}{elc}{}
+\DeclareFontSeriesChangeRule {sbc}{l}{lc}{}
+\DeclareFontSeriesChangeRule {sbc}{sb}{sbc}{}
+\DeclareFontSeriesChangeRule {sbc}{sc}{sbsc}{sbc}
+\DeclareFontSeriesChangeRule {sbc}{sl}{slc}{}
+\DeclareFontSeriesChangeRule {sbc}{ub}{ubc}{}
+\DeclareFontSeriesChangeRule {sbc}{ul}{ulc}{}
+\DeclareFontSeriesChangeRule {sbc}{x}{sbx}{}
+% \end{macrocode}
+%
+% \begin{macrocode}
+\DeclareFontSeriesChangeRule {sbx}{b}{bx}{}
+\DeclareFontSeriesChangeRule {sbx}{c}{sbc}{}
+\DeclareFontSeriesChangeRule {sbx}{eb}{ebx}{}
+\DeclareFontSeriesChangeRule {sbx}{ec}{sbec}{}
+\DeclareFontSeriesChangeRule {sbx}{el}{elx}{}
+\DeclareFontSeriesChangeRule {sbx}{l}{lx}{}
+\DeclareFontSeriesChangeRule {sbx}{sb}{sbx}{}
+\DeclareFontSeriesChangeRule {sbx}{sc}{sbsc}{}
+\DeclareFontSeriesChangeRule {sbx}{sl}{slx}{}
+\DeclareFontSeriesChangeRule {sbx}{ub}{ubx}{}
+\DeclareFontSeriesChangeRule {sbx}{ul}{ulx}{}
+\DeclareFontSeriesChangeRule {sbx}{x}{sbx}{}
+% \end{macrocode}
+%
% \begin{macrocode}
\DeclareFontSeriesChangeRule {sb}{c} {sbc} {bc} %? %<-----
\DeclareFontSeriesChangeRule {sb}{ec} {sbec} {sbc} %? %<-----
\DeclareFontSeriesChangeRule {sb}{sc} {sbsc} {sbc} %? %<-----
\DeclareFontSeriesChangeRule {sb}{x} {sbx} {bx} %? %<-----
% \end{macrocode}
-%
-% \begin{macrocode}
-\DeclareFontSeriesChangeRule {slc}{b}{bc}{}
-\DeclareFontSeriesChangeRule {slc}{c}{slc}{}
-\DeclareFontSeriesChangeRule {slc}{eb}{ebc}{}
-\DeclareFontSeriesChangeRule {slc}{ec}{slec}{}
-\DeclareFontSeriesChangeRule {slc}{el}{elc}{}
-\DeclareFontSeriesChangeRule {slc}{l}{lc}{}
-\DeclareFontSeriesChangeRule {slc}{sb}{sbc}{}
-\DeclareFontSeriesChangeRule {slc}{sc}{slsc}{}
-\DeclareFontSeriesChangeRule {slc}{sl}{slc}{}
-\DeclareFontSeriesChangeRule {slc}{ub}{ubc}{}
-\DeclareFontSeriesChangeRule {slc}{ul}{ulc}{}
-\DeclareFontSeriesChangeRule {slc}{x}{slx}{}
-% \end{macrocode}
-%
-% \begin{macrocode}
-\DeclareFontSeriesChangeRule {slx}{b}{bx}{}
-\DeclareFontSeriesChangeRule {slx}{c}{slc}{}
-\DeclareFontSeriesChangeRule {slx}{eb}{ebx}{}
-\DeclareFontSeriesChangeRule {slx}{ec}{slec}{}
-\DeclareFontSeriesChangeRule {slx}{el}{elx}{}
-\DeclareFontSeriesChangeRule {slx}{l}{lx}{}
-\DeclareFontSeriesChangeRule {slx}{sb}{sbx}{}
-\DeclareFontSeriesChangeRule {slx}{sc}{slsc}{}
-\DeclareFontSeriesChangeRule {slx}{sl}{slx}{}
-\DeclareFontSeriesChangeRule {slx}{ub}{ubx}{}
-\DeclareFontSeriesChangeRule {slx}{ul}{ulx}{}
-\DeclareFontSeriesChangeRule {slx}{x}{slx}{}
-% \end{macrocode}
-%
-% \begin{macrocode}
-\DeclareFontSeriesChangeRule {sl}{c}{slc}{}
-\DeclareFontSeriesChangeRule {sl}{ec}{slec}{}
-\DeclareFontSeriesChangeRule {sl}{sc}{slsc}{}
-\DeclareFontSeriesChangeRule {sl}{x}{slx}{}
-% \end{macrocode}
-%
-% \begin{macrocode}
-\DeclareFontSeriesChangeRule {ubc}{b}{bc}{}
-\DeclareFontSeriesChangeRule {ubc}{c}{ubc}{}
-\DeclareFontSeriesChangeRule {ubc}{eb}{ebc}{}
-\DeclareFontSeriesChangeRule {ubc}{ec}{ubec}{}
-\DeclareFontSeriesChangeRule {ubc}{el}{elc}{}
-\DeclareFontSeriesChangeRule {ubc}{l}{lc}{}
-\DeclareFontSeriesChangeRule {ubc}{sb}{sbc}{}
-\DeclareFontSeriesChangeRule {ubc}{sc}{ubsc}{}
-\DeclareFontSeriesChangeRule {ubc}{sl}{slc}{}
-\DeclareFontSeriesChangeRule {ubc}{ub}{ubc}{}
-\DeclareFontSeriesChangeRule {ubc}{ul}{ulc}{}
-\DeclareFontSeriesChangeRule {ubc}{x}{ubx}{}
-% \end{macrocode}
-%
-% \begin{macrocode}
-\DeclareFontSeriesChangeRule {ubx}{b}{bx}{}
-\DeclareFontSeriesChangeRule {ubx}{c}{ubc}{}
-\DeclareFontSeriesChangeRule {ubx}{eb}{ebx}{}
-\DeclareFontSeriesChangeRule {ubx}{ec}{ubec}{}
-\DeclareFontSeriesChangeRule {ubx}{el}{elx}{}
-\DeclareFontSeriesChangeRule {ubx}{l}{lx}{}
-\DeclareFontSeriesChangeRule {ubx}{sb}{sbx}{}
-\DeclareFontSeriesChangeRule {ubx}{sc}{ubsc}{}
-\DeclareFontSeriesChangeRule {ubx}{sl}{slx}{}
-\DeclareFontSeriesChangeRule {ubx}{ub}{ubx}{}
-\DeclareFontSeriesChangeRule {ubx}{ul}{ulx}{}
-\DeclareFontSeriesChangeRule {ubx}{x}{ubx}{}
-% \end{macrocode}
-%
-% \begin{macrocode}
-\DeclareFontSeriesChangeRule {ub}{c}{ubc}{}
-\DeclareFontSeriesChangeRule {ub}{ec}{ubec}{}
-\DeclareFontSeriesChangeRule {ub}{sc}{ubsc}{}
-\DeclareFontSeriesChangeRule {ub}{x}{ubx}{}
-% \end{macrocode}
-%
-% \begin{macrocode}
-\DeclareFontSeriesChangeRule {ulc}{b}{bc}{}
-\DeclareFontSeriesChangeRule {ulc}{c}{ulc}{}
-\DeclareFontSeriesChangeRule {ulc}{eb}{ebc}{}
-\DeclareFontSeriesChangeRule {ulc}{ec}{ulec}{ulc}
-\DeclareFontSeriesChangeRule {ulc}{el}{elc}{}
-\DeclareFontSeriesChangeRule {ulc}{l}{lc}{}
-\DeclareFontSeriesChangeRule {ulc}{sb}{sbc}{}
-\DeclareFontSeriesChangeRule {ulc}{sc}{ulsc}{ulc}
-\DeclareFontSeriesChangeRule {ulc}{sl}{slc}{}
-\DeclareFontSeriesChangeRule {ulc}{ub}{ubc}{}
-\DeclareFontSeriesChangeRule {ulc}{ul}{ulc}{}
-\DeclareFontSeriesChangeRule {ulc}{x}{ulx}{}
-% \end{macrocode}
-%
-% \begin{macrocode}
-\DeclareFontSeriesChangeRule {ulx}{b}{bx}{}
-\DeclareFontSeriesChangeRule {ulx}{c}{ulc}{}
-\DeclareFontSeriesChangeRule {ulx}{eb}{ebx}{}
-\DeclareFontSeriesChangeRule {ulx}{ec}{ulec}{}
-\DeclareFontSeriesChangeRule {ulx}{el}{elx}{}
-\DeclareFontSeriesChangeRule {ulx}{l}{lx}{}
-\DeclareFontSeriesChangeRule {ulx}{sb}{sbx}{}
-\DeclareFontSeriesChangeRule {ulx}{sc}{ulsc}{}
-\DeclareFontSeriesChangeRule {ulx}{sl}{slx}{}
-\DeclareFontSeriesChangeRule {ulx}{ub}{ubx}{}
-\DeclareFontSeriesChangeRule {ulx}{ul}{ulx}{}
-\DeclareFontSeriesChangeRule {ulx}{x}{ulx}{}
-% \end{macrocode}
-%
-% \begin{macrocode}
-\DeclareFontSeriesChangeRule {ul}{c}{ulc}{}
-\DeclareFontSeriesChangeRule {ul}{ec}{ulec}{}
-\DeclareFontSeriesChangeRule {ul}{sc}{ulsc}{}
-\DeclareFontSeriesChangeRule {ul}{x}{ulx}{}
-% \end{macrocode}
-%
+%
+% \begin{macrocode}
+\DeclareFontSeriesChangeRule {slc}{b}{bc}{}
+\DeclareFontSeriesChangeRule {slc}{c}{slc}{}
+\DeclareFontSeriesChangeRule {slc}{eb}{ebc}{}
+\DeclareFontSeriesChangeRule {slc}{ec}{slec}{}
+\DeclareFontSeriesChangeRule {slc}{el}{elc}{}
+\DeclareFontSeriesChangeRule {slc}{l}{lc}{}
+\DeclareFontSeriesChangeRule {slc}{sb}{sbc}{}
+\DeclareFontSeriesChangeRule {slc}{sc}{slsc}{}
+\DeclareFontSeriesChangeRule {slc}{sl}{slc}{}
+\DeclareFontSeriesChangeRule {slc}{ub}{ubc}{}
+\DeclareFontSeriesChangeRule {slc}{ul}{ulc}{}
+\DeclareFontSeriesChangeRule {slc}{x}{slx}{}
+% \end{macrocode}
+%
+% \begin{macrocode}
+\DeclareFontSeriesChangeRule {slx}{b}{bx}{}
+\DeclareFontSeriesChangeRule {slx}{c}{slc}{}
+\DeclareFontSeriesChangeRule {slx}{eb}{ebx}{}
+\DeclareFontSeriesChangeRule {slx}{ec}{slec}{}
+\DeclareFontSeriesChangeRule {slx}{el}{elx}{}
+\DeclareFontSeriesChangeRule {slx}{l}{lx}{}
+\DeclareFontSeriesChangeRule {slx}{sb}{sbx}{}
+\DeclareFontSeriesChangeRule {slx}{sc}{slsc}{}
+\DeclareFontSeriesChangeRule {slx}{sl}{slx}{}
+\DeclareFontSeriesChangeRule {slx}{ub}{ubx}{}
+\DeclareFontSeriesChangeRule {slx}{ul}{ulx}{}
+\DeclareFontSeriesChangeRule {slx}{x}{slx}{}
+% \end{macrocode}
+%
+% \begin{macrocode}
+\DeclareFontSeriesChangeRule {sl}{c}{slc}{}
+\DeclareFontSeriesChangeRule {sl}{ec}{slec}{}
+\DeclareFontSeriesChangeRule {sl}{sc}{slsc}{}
+\DeclareFontSeriesChangeRule {sl}{x}{slx}{}
+% \end{macrocode}
+%
+% \begin{macrocode}
+\DeclareFontSeriesChangeRule {ubc}{b}{bc}{}
+\DeclareFontSeriesChangeRule {ubc}{c}{ubc}{}
+\DeclareFontSeriesChangeRule {ubc}{eb}{ebc}{}
+\DeclareFontSeriesChangeRule {ubc}{ec}{ubec}{}
+\DeclareFontSeriesChangeRule {ubc}{el}{elc}{}
+\DeclareFontSeriesChangeRule {ubc}{l}{lc}{}
+\DeclareFontSeriesChangeRule {ubc}{sb}{sbc}{}
+\DeclareFontSeriesChangeRule {ubc}{sc}{ubsc}{}
+\DeclareFontSeriesChangeRule {ubc}{sl}{slc}{}
+\DeclareFontSeriesChangeRule {ubc}{ub}{ubc}{}
+\DeclareFontSeriesChangeRule {ubc}{ul}{ulc}{}
+\DeclareFontSeriesChangeRule {ubc}{x}{ubx}{}
+% \end{macrocode}
+%
+% \begin{macrocode}
+\DeclareFontSeriesChangeRule {ubx}{b}{bx}{}
+\DeclareFontSeriesChangeRule {ubx}{c}{ubc}{}
+\DeclareFontSeriesChangeRule {ubx}{eb}{ebx}{}
+\DeclareFontSeriesChangeRule {ubx}{ec}{ubec}{}
+\DeclareFontSeriesChangeRule {ubx}{el}{elx}{}
+\DeclareFontSeriesChangeRule {ubx}{l}{lx}{}
+\DeclareFontSeriesChangeRule {ubx}{sb}{sbx}{}
+\DeclareFontSeriesChangeRule {ubx}{sc}{ubsc}{}
+\DeclareFontSeriesChangeRule {ubx}{sl}{slx}{}
+\DeclareFontSeriesChangeRule {ubx}{ub}{ubx}{}
+\DeclareFontSeriesChangeRule {ubx}{ul}{ulx}{}
+\DeclareFontSeriesChangeRule {ubx}{x}{ubx}{}
+% \end{macrocode}
+%
+% \begin{macrocode}
+\DeclareFontSeriesChangeRule {ub}{c}{ubc}{}
+\DeclareFontSeriesChangeRule {ub}{ec}{ubec}{}
+\DeclareFontSeriesChangeRule {ub}{sc}{ubsc}{}
+\DeclareFontSeriesChangeRule {ub}{x}{ubx}{}
+% \end{macrocode}
+%
+% \begin{macrocode}
+\DeclareFontSeriesChangeRule {ulc}{b}{bc}{}
+\DeclareFontSeriesChangeRule {ulc}{c}{ulc}{}
+\DeclareFontSeriesChangeRule {ulc}{eb}{ebc}{}
+\DeclareFontSeriesChangeRule {ulc}{ec}{ulec}{ulc}
+\DeclareFontSeriesChangeRule {ulc}{el}{elc}{}
+\DeclareFontSeriesChangeRule {ulc}{l}{lc}{}
+\DeclareFontSeriesChangeRule {ulc}{sb}{sbc}{}
+\DeclareFontSeriesChangeRule {ulc}{sc}{ulsc}{ulc}
+\DeclareFontSeriesChangeRule {ulc}{sl}{slc}{}
+\DeclareFontSeriesChangeRule {ulc}{ub}{ubc}{}
+\DeclareFontSeriesChangeRule {ulc}{ul}{ulc}{}
+\DeclareFontSeriesChangeRule {ulc}{x}{ulx}{}
+% \end{macrocode}
+%
+% \begin{macrocode}
+\DeclareFontSeriesChangeRule {ulx}{b}{bx}{}
+\DeclareFontSeriesChangeRule {ulx}{c}{ulc}{}
+\DeclareFontSeriesChangeRule {ulx}{eb}{ebx}{}
+\DeclareFontSeriesChangeRule {ulx}{ec}{ulec}{}
+\DeclareFontSeriesChangeRule {ulx}{el}{elx}{}
+\DeclareFontSeriesChangeRule {ulx}{l}{lx}{}
+\DeclareFontSeriesChangeRule {ulx}{sb}{sbx}{}
+\DeclareFontSeriesChangeRule {ulx}{sc}{ulsc}{}
+\DeclareFontSeriesChangeRule {ulx}{sl}{slx}{}
+\DeclareFontSeriesChangeRule {ulx}{ub}{ubx}{}
+\DeclareFontSeriesChangeRule {ulx}{ul}{ulx}{}
+\DeclareFontSeriesChangeRule {ulx}{x}{ulx}{}
+% \end{macrocode}
+%
+% \begin{macrocode}
+\DeclareFontSeriesChangeRule {ul}{c}{ulc}{}
+\DeclareFontSeriesChangeRule {ul}{ec}{ulec}{}
+\DeclareFontSeriesChangeRule {ul}{sc}{ulsc}{}
+\DeclareFontSeriesChangeRule {ul}{x}{ulx}{}
+% \end{macrocode}
+%
% \begin{macrocode}
\DeclareFontSeriesChangeRule {x}{b}{bx}{}
\DeclareFontSeriesChangeRule {x}{c}{c}{}
@@ -575,47 +575,47 @@
\DeclareFontSeriesChangeRule {bc}{m?}{c}{}
\DeclareFontSeriesChangeRule {bec}{m?}{ec}{}
\DeclareFontSeriesChangeRule {bsc}{m?}{sc}{}
-\DeclareFontSeriesChangeRule {bx}{m?}{x}{}
-\DeclareFontSeriesChangeRule {b}{m?}{m}{}
-\DeclareFontSeriesChangeRule {c}{m?}{c}{}
-\DeclareFontSeriesChangeRule {ebc}{m?}{c}{}
-\DeclareFontSeriesChangeRule {ebec}{m?}{ec}{}
-\DeclareFontSeriesChangeRule {ebsc}{m?}{sc}{}
-\DeclareFontSeriesChangeRule {ebx}{m?}{x}{}
-\DeclareFontSeriesChangeRule {eb}{m?}{m}{}
+\DeclareFontSeriesChangeRule {bx}{m?}{x}{}
+\DeclareFontSeriesChangeRule {b}{m?}{m}{}
+\DeclareFontSeriesChangeRule {c}{m?}{c}{}
+\DeclareFontSeriesChangeRule {ebc}{m?}{c}{}
+\DeclareFontSeriesChangeRule {ebec}{m?}{ec}{}
+\DeclareFontSeriesChangeRule {ebsc}{m?}{sc}{}
+\DeclareFontSeriesChangeRule {ebx}{m?}{x}{}
+\DeclareFontSeriesChangeRule {eb}{m?}{m}{}
\DeclareFontSeriesChangeRule {ec}{m?}{ec}{}
-\DeclareFontSeriesChangeRule {elc}{m?}{c}{}
-\DeclareFontSeriesChangeRule {elec}{m?}{ec}{}
-\DeclareFontSeriesChangeRule {elsc}{m?}{sc}{}
-\DeclareFontSeriesChangeRule {elx}{m?}{x}{}
-\DeclareFontSeriesChangeRule {el}{m?}{m}{}
-\DeclareFontSeriesChangeRule {lc}{m?}{c}{}
-\DeclareFontSeriesChangeRule {lec}{m?}{ec}{}
-\DeclareFontSeriesChangeRule {lsc}{m?}{sc}{}
-\DeclareFontSeriesChangeRule {lx}{m?}{x}{}
-\DeclareFontSeriesChangeRule {l}{m?}{m}{}
-\DeclareFontSeriesChangeRule {m}{m?}{m}{}
-\DeclareFontSeriesChangeRule {sbc}{m?}{c}{}
-\DeclareFontSeriesChangeRule {sbec}{m?}{ec}{}
-\DeclareFontSeriesChangeRule {sbsc}{m?}{sc}{}
-\DeclareFontSeriesChangeRule {sbx}{m?}{x}{}
-\DeclareFontSeriesChangeRule {sb}{m?}{m}{}
+\DeclareFontSeriesChangeRule {elc}{m?}{c}{}
+\DeclareFontSeriesChangeRule {elec}{m?}{ec}{}
+\DeclareFontSeriesChangeRule {elsc}{m?}{sc}{}
+\DeclareFontSeriesChangeRule {elx}{m?}{x}{}
+\DeclareFontSeriesChangeRule {el}{m?}{m}{}
+\DeclareFontSeriesChangeRule {lc}{m?}{c}{}
+\DeclareFontSeriesChangeRule {lec}{m?}{ec}{}
+\DeclareFontSeriesChangeRule {lsc}{m?}{sc}{}
+\DeclareFontSeriesChangeRule {lx}{m?}{x}{}
+\DeclareFontSeriesChangeRule {l}{m?}{m}{}
+\DeclareFontSeriesChangeRule {m}{m?}{m}{}
+\DeclareFontSeriesChangeRule {sbc}{m?}{c}{}
+\DeclareFontSeriesChangeRule {sbec}{m?}{ec}{}
+\DeclareFontSeriesChangeRule {sbsc}{m?}{sc}{}
+\DeclareFontSeriesChangeRule {sbx}{m?}{x}{}
+\DeclareFontSeriesChangeRule {sb}{m?}{m}{}
\DeclareFontSeriesChangeRule {sc}{m?}{sc}{}
-\DeclareFontSeriesChangeRule {slc}{m?}{c}{}
-\DeclareFontSeriesChangeRule {slec}{m?}{ec}{}
-\DeclareFontSeriesChangeRule {slsc}{m?}{sc}{}
-\DeclareFontSeriesChangeRule {slx}{m?}{x}{}
-\DeclareFontSeriesChangeRule {sl}{m?}{m}{}
-\DeclareFontSeriesChangeRule {ubc}{m?}{c}{}
-\DeclareFontSeriesChangeRule {ubec}{m?}{ec}{}
-\DeclareFontSeriesChangeRule {ubsc}{m?}{sc}{}
-\DeclareFontSeriesChangeRule {ubx}{m?}{x}{}
-\DeclareFontSeriesChangeRule {ub}{m?}{ub}{}
-\DeclareFontSeriesChangeRule {ulc}{m?}{c}{}
+\DeclareFontSeriesChangeRule {slc}{m?}{c}{}
+\DeclareFontSeriesChangeRule {slec}{m?}{ec}{}
+\DeclareFontSeriesChangeRule {slsc}{m?}{sc}{}
+\DeclareFontSeriesChangeRule {slx}{m?}{x}{}
+\DeclareFontSeriesChangeRule {sl}{m?}{m}{}
+\DeclareFontSeriesChangeRule {ubc}{m?}{c}{}
+\DeclareFontSeriesChangeRule {ubec}{m?}{ec}{}
+\DeclareFontSeriesChangeRule {ubsc}{m?}{sc}{}
+\DeclareFontSeriesChangeRule {ubx}{m?}{x}{}
+\DeclareFontSeriesChangeRule {ub}{m?}{ub}{}
+\DeclareFontSeriesChangeRule {ulc}{m?}{c}{}
\DeclareFontSeriesChangeRule {ulec}{m?}{ec}{}
\DeclareFontSeriesChangeRule {ulsc}{m?}{sc}{}
-\DeclareFontSeriesChangeRule {ulx}{m?}{x}{}
-\DeclareFontSeriesChangeRule {ul}{m?}{m}{}
+\DeclareFontSeriesChangeRule {ulx}{m?}{x}{}
+\DeclareFontSeriesChangeRule {ul}{m?}{m}{}
\DeclareFontSeriesChangeRule {x}{m?}{x}{}
% \end{macrocode}
%
@@ -625,59 +625,59 @@
\DeclareFontSeriesChangeRule {bec}{?m}{b}{}
\DeclareFontSeriesChangeRule {bsc}{?m}{b}{}
\DeclareFontSeriesChangeRule {bsc}{?m}{b}{}
-\DeclareFontSeriesChangeRule {bx}{?m}{b}{}
-\DeclareFontSeriesChangeRule {b}{?m}{b}{}
-\DeclareFontSeriesChangeRule {c}{?m}{m}{}
-\DeclareFontSeriesChangeRule {ebc}{?m}{eb}{}
-\DeclareFontSeriesChangeRule {ebec}{?m}{eb}{}
-\DeclareFontSeriesChangeRule {ebsc}{?m}{eb}{}
-\DeclareFontSeriesChangeRule {ebsc}{?m}{eb}{}
-\DeclareFontSeriesChangeRule {ebx}{?m}{eb}{}
-\DeclareFontSeriesChangeRule {eb}{?m}{eb}{}
-\DeclareFontSeriesChangeRule {ec}{?m}{m}{}
-\DeclareFontSeriesChangeRule {elc}{?m}{el}{}
-\DeclareFontSeriesChangeRule {elec}{?m}{el}{}
-\DeclareFontSeriesChangeRule {elsc}{?m}{el}{}
-\DeclareFontSeriesChangeRule {elsc}{?m}{el}{}
-\DeclareFontSeriesChangeRule {elx}{?m}{el}{}
-\DeclareFontSeriesChangeRule {el}{?m}{el}{}
-\DeclareFontSeriesChangeRule {lc}{?m}{l}{}
-\DeclareFontSeriesChangeRule {lec}{?m}{l}{}
-\DeclareFontSeriesChangeRule {lsc}{?m}{l}{}
-\DeclareFontSeriesChangeRule {lsc}{?m}{l}{}
-\DeclareFontSeriesChangeRule {lx}{?m}{l}{}
-\DeclareFontSeriesChangeRule {l}{?m}{l}{}
-\DeclareFontSeriesChangeRule {m}{?m}{m}{}
-\DeclareFontSeriesChangeRule {sbc}{?m}{sb}{}
-\DeclareFontSeriesChangeRule {sbec}{?m}{sb}{}
-\DeclareFontSeriesChangeRule {sbsc}{?m}{sb}{}
-\DeclareFontSeriesChangeRule {sbsc}{?m}{sb}{}
-\DeclareFontSeriesChangeRule {sbx}{?m}{sb}{}
-\DeclareFontSeriesChangeRule {sb}{?m}{sb}{}
-\DeclareFontSeriesChangeRule {sc}{?m}{m}{}
-\DeclareFontSeriesChangeRule {sc}{?m}{m}{}
-\DeclareFontSeriesChangeRule {slc}{?m}{sl}{}
-\DeclareFontSeriesChangeRule {slec}{?m}{sl}{}
-\DeclareFontSeriesChangeRule {slsc}{?m}{sl}{}
-\DeclareFontSeriesChangeRule {slsc}{?m}{sl}{}
-\DeclareFontSeriesChangeRule {slx}{?m}{sl}{}
-\DeclareFontSeriesChangeRule {sl}{?m}{sl}{}
-\DeclareFontSeriesChangeRule {ubc}{?m}{ub}{}
-\DeclareFontSeriesChangeRule {ubec}{?m}{ub}{}
-\DeclareFontSeriesChangeRule {ubsc}{?m}{ub}{}
-\DeclareFontSeriesChangeRule {ubsc}{?m}{ub}{}
-\DeclareFontSeriesChangeRule {ubx}{?m}{ub}{}
-\DeclareFontSeriesChangeRule {ub}{?m}{m}{}
-\DeclareFontSeriesChangeRule {ulc}{?m}{ul}{}
-\DeclareFontSeriesChangeRule {ulec}{?m}{ul}{}
-\DeclareFontSeriesChangeRule {ulsc}{?m}{ul}{}
-\DeclareFontSeriesChangeRule {ulsc}{?m}{ul}{}
-\DeclareFontSeriesChangeRule {ulx}{?m}{ul}{}
-\DeclareFontSeriesChangeRule {ul}{?m}{ul}{}
-\DeclareFontSeriesChangeRule {x}{?m}{m}{}
-% \end{macrocode}
-%
-%
+\DeclareFontSeriesChangeRule {bx}{?m}{b}{}
+\DeclareFontSeriesChangeRule {b}{?m}{b}{}
+\DeclareFontSeriesChangeRule {c}{?m}{m}{}
+\DeclareFontSeriesChangeRule {ebc}{?m}{eb}{}
+\DeclareFontSeriesChangeRule {ebec}{?m}{eb}{}
+\DeclareFontSeriesChangeRule {ebsc}{?m}{eb}{}
+\DeclareFontSeriesChangeRule {ebsc}{?m}{eb}{}
+\DeclareFontSeriesChangeRule {ebx}{?m}{eb}{}
+\DeclareFontSeriesChangeRule {eb}{?m}{eb}{}
+\DeclareFontSeriesChangeRule {ec}{?m}{m}{}
+\DeclareFontSeriesChangeRule {elc}{?m}{el}{}
+\DeclareFontSeriesChangeRule {elec}{?m}{el}{}
+\DeclareFontSeriesChangeRule {elsc}{?m}{el}{}
+\DeclareFontSeriesChangeRule {elsc}{?m}{el}{}
+\DeclareFontSeriesChangeRule {elx}{?m}{el}{}
+\DeclareFontSeriesChangeRule {el}{?m}{el}{}
+\DeclareFontSeriesChangeRule {lc}{?m}{l}{}
+\DeclareFontSeriesChangeRule {lec}{?m}{l}{}
+\DeclareFontSeriesChangeRule {lsc}{?m}{l}{}
+\DeclareFontSeriesChangeRule {lsc}{?m}{l}{}
+\DeclareFontSeriesChangeRule {lx}{?m}{l}{}
+\DeclareFontSeriesChangeRule {l}{?m}{l}{}
+\DeclareFontSeriesChangeRule {m}{?m}{m}{}
+\DeclareFontSeriesChangeRule {sbc}{?m}{sb}{}
+\DeclareFontSeriesChangeRule {sbec}{?m}{sb}{}
+\DeclareFontSeriesChangeRule {sbsc}{?m}{sb}{}
+\DeclareFontSeriesChangeRule {sbsc}{?m}{sb}{}
+\DeclareFontSeriesChangeRule {sbx}{?m}{sb}{}
+\DeclareFontSeriesChangeRule {sb}{?m}{sb}{}
+\DeclareFontSeriesChangeRule {sc}{?m}{m}{}
+\DeclareFontSeriesChangeRule {sc}{?m}{m}{}
+\DeclareFontSeriesChangeRule {slc}{?m}{sl}{}
+\DeclareFontSeriesChangeRule {slec}{?m}{sl}{}
+\DeclareFontSeriesChangeRule {slsc}{?m}{sl}{}
+\DeclareFontSeriesChangeRule {slsc}{?m}{sl}{}
+\DeclareFontSeriesChangeRule {slx}{?m}{sl}{}
+\DeclareFontSeriesChangeRule {sl}{?m}{sl}{}
+\DeclareFontSeriesChangeRule {ubc}{?m}{ub}{}
+\DeclareFontSeriesChangeRule {ubec}{?m}{ub}{}
+\DeclareFontSeriesChangeRule {ubsc}{?m}{ub}{}
+\DeclareFontSeriesChangeRule {ubsc}{?m}{ub}{}
+\DeclareFontSeriesChangeRule {ubx}{?m}{ub}{}
+\DeclareFontSeriesChangeRule {ub}{?m}{m}{}
+\DeclareFontSeriesChangeRule {ulc}{?m}{ul}{}
+\DeclareFontSeriesChangeRule {ulec}{?m}{ul}{}
+\DeclareFontSeriesChangeRule {ulsc}{?m}{ul}{}
+\DeclareFontSeriesChangeRule {ulsc}{?m}{ul}{}
+\DeclareFontSeriesChangeRule {ulx}{?m}{ul}{}
+\DeclareFontSeriesChangeRule {ul}{?m}{ul}{}
+\DeclareFontSeriesChangeRule {x}{?m}{m}{}
+% \end{macrocode}
+%
+%
% \subsection{Changing to a new series}
@@ -719,7 +719,7 @@
\csname series@\f@series @#1\endcsname
{#1}%
\@nil
-}
+}
% \end{macrocode}
% \end{macro}
@@ -825,9 +825,9 @@
% condensed series, etc.). We do this in all branches above because a user
% might have written
%\begin{verbatim}
-\DeclareFontSeriesChangeRule {m}{sc}{msc}{mc}
+\DeclareFontSeriesChangeRule {m}{sc}{msc}{mc}
%\end{verbatim}
-% instead of of using \texttt{sc} and \texttt{c} as needed in the
+% instead of using \texttt{sc} and \texttt{c} as needed in the
% \texttt{.fd} file.
% \begin{macrocode}
\def\set@target@series#1{%
@@ -990,7 +990,7 @@
%\DeclareFontShapeChangeRule {sc}{n} {n} {}
\DeclareFontShapeChangeRule {sc}{it} {scit} {scsl}
\DeclareFontShapeChangeRule {sc}{sl} {scsl} {scit}
-\DeclareFontShapeChangeRule {sc}{sw} {scsw} {sw}
+\DeclareFontShapeChangeRule {sc}{sw} {scsw} {sw}
%\DeclareFontShapeChangeRule {sc}{sc} {sc} {}
\DeclareFontShapeChangeRule {sc}{ulc} {n} {}
% \end{macrocode}
@@ -1019,7 +1019,7 @@
%\DeclareFontShapeChangeRule {scit}{n} {n} {}
\DeclareFontShapeChangeRule {scit}{it} {scit} {}
\DeclareFontShapeChangeRule {scit}{sl} {scsl} {scit}
-\DeclareFontShapeChangeRule {scit}{sw} {scsw} {sc} % or scit?
+\DeclareFontShapeChangeRule {scit}{sw} {scsw} {sc} % or scit?
\DeclareFontShapeChangeRule {scit}{sc} {scit} {}
\DeclareFontShapeChangeRule {scit}{ulc} {it} {}
\DeclareFontShapeChangeRule {scit}{up} {sc} {}
@@ -1037,7 +1037,7 @@
%\DeclareFontShapeChangeRule {scsl}{n} {n} {}
\DeclareFontShapeChangeRule {scsl}{it} {scit} {scsl}
\DeclareFontShapeChangeRule {scsl}{sl} {scsl} {}
-\DeclareFontShapeChangeRule {scsl}{sw} {scsw} {sc} % or scsl?
+\DeclareFontShapeChangeRule {scsl}{sw} {scsw} {sc} % or scsl?
\DeclareFontShapeChangeRule {scsl}{sc} {scsl} {}
\DeclareFontShapeChangeRule {scsl}{ulc} {sl} {}
\DeclareFontShapeChangeRule {scsl}{up} {sc} {}
@@ -1047,7 +1047,7 @@
%\DeclareFontShapeChangeRule {scsw}{n} {n} {}
\DeclareFontShapeChangeRule {scsw}{it} {scit} {scsw}
\DeclareFontShapeChangeRule {scsw}{sl} {scsl} {}
-\DeclareFontShapeChangeRule {scsw}{sw} {scsw} {}
+\DeclareFontShapeChangeRule {scsw}{sw} {scsw} {}
\DeclareFontShapeChangeRule {scsw}{sc} {scsw} {}
\DeclareFontShapeChangeRule {scsw}{ulc} {sw} {}
\DeclareFontShapeChangeRule {scsw}{up} {sc} {}
@@ -1057,7 +1057,7 @@
%\DeclareFontShapeChangeRule {sw}{n} {n} {}
%\DeclareFontShapeChangeRule {sw}{it} {it} {}
%\DeclareFontShapeChangeRule {sw}{sl} {sl} {}
-%\DeclareFontShapeChangeRule {sw}{sw} {sw} {}
+%\DeclareFontShapeChangeRule {sw}{sw} {sw} {}
\DeclareFontShapeChangeRule {sw}{sc} {scsw} {}
\DeclareFontShapeChangeRule {sw}{ulc} {sw} {}
\DeclareFontShapeChangeRule {sw}{up} {n} {}
@@ -1092,7 +1092,7 @@
\csname shape@\f@shape @#1\endcsname
{#1}%
\@nil
-}
+}
% \end{macrocode}
% \end{macro}
%
@@ -1128,7 +1128,7 @@
%
%
% \begin{macro}{\normalshape}
-%
+%
% \cs{normalshape} resets both sub-axes if the default rules are used.
% \begin{macrocode}
\protected\def\normalshape
@@ -1154,7 +1154,7 @@
% case of rollback).
%
% \begin{macro}{\reinstall@nfss@defs}
-%
+%
% I use \cs{protected} here not \cs{DeclareRobustCommand} to avoid
% extra status lines.
% \begin{macrocode}
@@ -1227,5 +1227,3 @@
%
% \Finale
%
-
-
diff --git a/Master/texmf-dist/source/latex-dev/base/ltfssbas.dtx b/Master/texmf-dist/source/latex-dev/base/ltfssbas.dtx
index e87f154b3de..b59b0fafdd6 100644
--- a/Master/texmf-dist/source/latex-dev/base/ltfssbas.dtx
+++ b/Master/texmf-dist/source/latex-dev/base/ltfssbas.dtx
@@ -824,7 +824,7 @@
% but instead of calling \cs{fontfamily}, \cs{fontseries} and
% \cs{fontshape} it earlier versions of this code did, we now set
% \cs{f@family}, etc.\ directly. If we would call \cs{fontseries}
-% or \cs{fontshape} as it
+% or \cs{fontshape} as it
% was done in the past, they would now interact with the existing
% series and shape which is not desired if we intend to use an
% explicit font shape!
@@ -1358,7 +1358,7 @@
\LoadFontDefinitionFile{#1}{#2}%
\LoadFontDefinitionFile{#1}{#3}%
% \end{macrocode}
-%
+%
% \begin{macrocode}
\DeclareFontShape{#1}{#2}{m}{it}{<->ssub * #3/m/it}{}%
\DeclareFontShape{#1}{#2}{m}{n}{<->ssub * #3/m/n}{}%
@@ -1459,7 +1459,7 @@
%<latexrelease>\EndIncludeInRelease
%<*2ekernel>
% \end{macrocode}
-%
+%
% \begin{macrocode}
\@onlypreamble\DeclareErrorFont
% \end{macrocode}
@@ -1525,7 +1525,7 @@
% \begin{macrocode}
\begingroup
\try@load@fontshape
- \endgroup
+ \endgroup
\fi \fi
\fi
% \end{macrocode}
diff --git a/Master/texmf-dist/source/latex-dev/base/ltfssdcl.dtx b/Master/texmf-dist/source/latex-dev/base/ltfssdcl.dtx
index 1c546e921c7..951c6de2e5a 100644
--- a/Master/texmf-dist/source/latex-dev/base/ltfssdcl.dtx
+++ b/Master/texmf-dist/source/latex-dev/base/ltfssdcl.dtx
@@ -36,7 +36,7 @@
%
%
\ProvidesFile{ltfssdcl.dtx}
- [2019/08/27 v3.0s LaTeX Kernel (NFSS Declarative Interface)]
+ [2020/01/20 v3.0t LaTeX Kernel (NFSS Declarative Interface)]
% \iffalse
\documentclass{ltxdoc}
\begin{document}
@@ -1104,7 +1104,7 @@
\edef\reserved@a{\noexpand\in@
{\expandafter\@gobble\string\mathaccent}
{\expandafter\meaning
- \csname\expandafter\@gobble\string#1\space\endcsname}}%
+ \csname\expandafter\@gobble\string#1\space\endcsname}}%
\reserved@a
\ifin@
\expandafter\let
@@ -1367,12 +1367,7 @@
% \begin{macro}{\@DeclareMathDelimiter}
% \changes{v3.0r}{2016/02/18}
% {Check for delimiter not \cs{delimiter}}
-% \changes{v3.0s}{2019/08/27}{Make math delimiters robust}
% \begin{macrocode}
-%</2ekernel>
-%<*2ekernel|latexrelease>
-%<latexrelease>\IncludeInRelease{2019/10/01}%
-%<latexrelease> {\@DeclareMathDelimiter}{Make math delimiters robust}%
\def\@DeclareMathDelimiter#1#2#3#4#5#6{%
\expandafter\in@\csname sym#3\expandafter\endcsname
\expandafter{\group@list}%
@@ -1398,11 +1393,9 @@
\edef\reserved@d{\hexnumber@{\count\z@}\hexnumber@{\count\tw@}}%
%
\edef\reserved@a{\noexpand\in@
- {\expandafter\@gobble\string\delimiter}%
- {\expandafter\meaning\csname\expandafter\@gobble\string#1\space\endcsname}}%
+ {\expandafter\@gobble\string\delimiter}{\meaning#1}}%
\reserved@a
\ifin@
- \expandafter\let\csname\expandafter\@gobble\string#1\space\endcsname\@undefined
\expandafter\set@mathdelimiter
\csname sym#3\expandafter\endcsname
\csname sym#5\endcsname#1#2%
@@ -1428,65 +1421,6 @@
\@latex@error{Symbol font `#3' is not defined}\@eha
\fi
}
-%</2ekernel|latexrelease>
-%<latexrelease>\EndIncludeInRelease
-%<latexrelease>\IncludeInRelease{0000/00/00}%
-%<latexrelease> {\@DeclareMathDelimiter}{Make math delimiters robust}%
-%<latexrelease>\def\@DeclareMathDelimiter#1#2#3#4#5#6{%
-%<latexrelease> \expandafter\in@\csname sym#3\expandafter\endcsname
-%<latexrelease> \expandafter{\group@list}%
-%<latexrelease> \ifin@
-%<latexrelease> \expandafter\in@\csname sym#5\expandafter\endcsname
-%<latexrelease> \expandafter{\group@list}%
-%<latexrelease> \ifin@
-%<latexrelease> \begingroup
-%<latexrelease> \count\z@=#4\relax
-%<latexrelease> \count\tw@\count\z@
-%<latexrelease> \divide\count\z@\sixt@@n
-%<latexrelease> \count@\count\z@
-%<latexrelease> \multiply\count@\sixt@@n
-%<latexrelease> \advance\count\tw@-\count@
-%<latexrelease> \edef\reserved@c{\hexnumber@{\count\z@}\hexnumber@{\count\tw@}}%
-%<latexrelease> %
-%<latexrelease> \count\z@=#6\relax
-%<latexrelease> \count\tw@\count\z@
-%<latexrelease> \divide\count\z@\sixt@@n
-%<latexrelease> \count@\count\z@
-%<latexrelease> \multiply\count@\sixt@@n
-%<latexrelease> \advance\count\tw@-\count@
-%<latexrelease> \edef\reserved@d{\hexnumber@{\count\z@}\hexnumber@{\count\tw@}}%
-%<latexrelease> %
-%<latexrelease> \edef\reserved@a{\noexpand\in@
-%<latexrelease> {\expandafter\@gobble\string\delimiter}{\meaning#1}}%
-%<latexrelease> \reserved@a
-%<latexrelease> \ifin@
-%<latexrelease> \expandafter\set@mathdelimiter
-%<latexrelease> \csname sym#3\expandafter\endcsname
-%<latexrelease> \csname sym#5\endcsname#1#2%
-%<latexrelease> \reserved@c\reserved@d
-%<latexrelease> \@font@info{Redeclaring math delimiter \string#1}%
-%<latexrelease> \else
-%<latexrelease> \expandafter\ifx
-%<latexrelease> \csname\expandafter\@gobble\string#1\endcsname
-%<latexrelease> \relax
-%<latexrelease> \expandafter\set@mathdelimiter
-%<latexrelease> \csname sym#3\expandafter\endcsname
-%<latexrelease> \csname sym#5\endcsname#1#2%
-%<latexrelease> \reserved@c\reserved@d
-%<latexrelease> \else
-%<latexrelease> \@latex@error{Command `\string#1' already defined}\@eha
-%<latexrelease> \fi
-%<latexrelease> \fi
-%<latexrelease> \endgroup
-%<latexrelease> \else
-%<latexrelease> \@latex@error{Symbol font `#5' is not defined}\@eha
-%<latexrelease> \fi
-%<latexrelease> \else
-%<latexrelease> \@latex@error{Symbol font `#3' is not defined}\@eha
-%<latexrelease> \fi
-%<latexrelease>}
-%<latexrelease>\EndIncludeInRelease
-%<*2ekernel>
% \end{macrocode}
%
% \begin{macrocode}
@@ -1547,9 +1481,16 @@
%<latexrelease>\IncludeInRelease{2019/10/01}%
%<latexrelease> {\set@mathdelimiter}{make delimiters robust}%
\def\set@mathdelimiter#1#2#3#4#5#6{%
+% \end{macrocode}
+% We use \cs{protected} not \cs{MakeRobust} so that
+% \verb=\bigl\lfoor= etc.\ works inside \cs{protected@edef}.
+% \changes{v3.0s}{2019/08/27}{Make math delimiters robust}
+% \changes{v3.0t}{2020/01/20}{fix for gh/251}
+% \begin{macrocode}
+ \protected
\xdef#3{\delimiter"\mathchar@type#4\hexnumber@#1#5%
\hexnumber@#2#6 }%
- \MakeRobust#3%
+% \MakeRobust#3%
}
\@onlypreamble\set@mathdelimiter
%</2ekernel|latexrelease>
diff --git a/Master/texmf-dist/source/latex-dev/base/ltfssini.dtx b/Master/texmf-dist/source/latex-dev/base/ltfssini.dtx
index e948aa4809c..9687e08b0e6 100644
--- a/Master/texmf-dist/source/latex-dev/base/ltfssini.dtx
+++ b/Master/texmf-dist/source/latex-dev/base/ltfssini.dtx
@@ -202,7 +202,7 @@
% \section{Custom series settings for main document families}
%
% This section was introduced 2020/02/02 and for now we support a
-% full rollback (may need splitting later).
+% full rollback (may need splitting later).
% \changes{v3.1e}{2019/12/17}{Provide custom series settings a la mweights}
% \begin{macrocode}
%</2ekernel>
@@ -287,7 +287,7 @@
\ifcsname #2series\endcsname % supported are
% \[md/bf]default
\expandafter\def
- \csname #2default\endcsname{#3}%
+ \csname #2default\endcsname{#3}%
\else
\@latex@error{Wrong syntax for \string\DeclareFontSeriesDefault}%
{Mandatory first argument must be 'md' or 'bf'.}
@@ -299,7 +299,7 @@
\ifcsname #2series@#1\endcsname % supported are
% \[md/bf]series@[rm/sf/tt]
\expandafter\edef
- \csname #2series@#1\endcsname{#3}%
+ \csname #2series@#1\endcsname{#3}%
% \end{macrocode}
%
% If the interface is used we remove the frozen kernel
@@ -343,9 +343,9 @@
% fonts are used then \cs{bfseries@rm} etc kick in and make
% \cs{textbf} use \texttt{bx}. However, if the font gets changed
% then \cs{bfdefault} will get used.
-%
+%
% \begin{macrocode}
-\def\bfseries@rm{bx}
+\def\bfseries@rm{bx}
\def\bfseries@sf{bx}
\def\bfseries@tt{bx}
% \end{macrocode}
@@ -458,13 +458,13 @@
% If families are changed then we have to do a bit more work.
% In the original NFSS implementation
% a family change kept encoding, series shape and size unchanged
-% but now we can't any
+% but now we can't any
% longer simply reuse the current series value. Instead we may have
% to change it from one family default to the next.
%\begin{verbatim}
% \expand@font@defaults
%\end{verbatim}
-% We have to do the testing while while the current family is still
+% We have to do the testing while the current family is still
% unchanged but we have to do the adjustment of the series after it
% got changed (because the new family might has different sets
% ofshapes available and we certainly don't want to see
@@ -539,7 +539,7 @@
% \cs{fontseries} because that would apply the mappings and then
% \texttt{bx + b} would keep \texttt{bx} instead of changing to
% \texttt{b} as desired.
-% as
+% as
%\begin{verbatim}
% \let\f@series\target@series@value
% \fi
@@ -551,7 +551,7 @@
% so that the definition becomes again fairly short. In addition we
% add a hook, mainly for our Japanese friends so that the code can
% be extended prior to the call to \cs{selectfont}.
-%
+%
% \changes{v3.1f}{2020/01/11}{Streamlined implementation with hook}
% \begin{macrocode}
\DeclareRobustCommand\rmfamily{%
@@ -597,11 +597,11 @@
% \end{macro}
% \end{macro}
%
-%
+%
% \begin{macro}{\@rmfamilyhook}
% \begin{macro}{\@sffamilyhook}
% \begin{macro}{\@ttfamilyhook}
-% By default the hooks do nothing.
+% By default the hooks do nothing.
% \begin{macrocode}
\let\@rmfamilyhook\@empty
\let\@sffamilyhook\@empty
@@ -627,7 +627,7 @@
\def\@meta@family@list{\@elt{rm}\@elt{sf}\@elt{tt}}
% \end{macrocode}
% \end{macro}
-%
+%
% \begin{macrocode}
\def\prepare@family@series@update#1#2{%
\expand@font@defaults
@@ -767,7 +767,7 @@
\expandafter\in@\expandafter{\ttdefault}{cmr,cmss,cmtt,lcmss,lcmtt,lmr,lmss,lmtt}%
\ifin@ \else \def\bfseries@tt{b}\fi\fi
% \end{macrocode}
-%
+%
% If the document preamble has changed the \cs{familydefault} or if
% the if the \cs{rmdefault} contains a new font family, we have to
% adjust the series defaults accordingly, before starting
@@ -776,7 +776,7 @@
% On the other hand if we still typeset in CM or LM then
% \cs{bfdefault} is wrong since it is now saying \texttt{b} and not
% \texttt{bx}.
-
+
% To fix this we run \cs{rmfamily}, \cs{sffamily} or
% \cs{ttfamily} depending on the situation and this will correct
% the setup for us.
@@ -808,7 +808,7 @@
% \end{macrocode}
%
%
-%
+%
% \begin{macrocode}
%</2ekernel|latexrelease>
%<latexrelease>\EndIncludeInRelease
@@ -859,7 +859,7 @@
%<latexrelease>\EndIncludeInRelease
%<*2ekernel>
% \end{macrocode}
-
+
%
%
%
@@ -875,7 +875,7 @@
% but instead of providing a fixed one \LaTeX{} now offers a
% general mechanism that allows to define arbitrary sequences.
%
-% \DescribeMacro\DeclareEmphSequence
+% \DescribeMacro\DeclareEmphSequence
% \DescribeMacro\emforce
%
% This declaration expects a comma separated list of (font) change
@@ -895,12 +895,12 @@
% exhausted then \cs{emreset} is used as a final set of
% declarations (which by default returns
% back to the upright shape). Any additional nesting levels will
-% then reuse the list from its beginning.
+% then reuse the list from its beginning.
%
%
%
% \begin{macro}{\DeclareEmphSequence}
-%
+%
% \cs{DeclareEmphSequence} expects a clist of declaration. Spaces in the
% argument are dropped to avoid surious spaces in the output. The
% declarations are additive. At the very end the shape is reset
@@ -923,7 +923,7 @@
% By default the it is empty, in which case \cs{eminnershape} is
% used by \LaTeX.
% \begin{macrocode}
-\let\emfontdeclare@clist\@empty
+\let\emfontdeclare@clist\@empty
% \end{macrocode}
% \end{macro}
@@ -967,7 +967,7 @@
\fi
}
% \end{macrocode}
-%
+%
% \begin{macrocode}
\def\eminnershape{\upshape}
% \end{macrocode}
@@ -984,7 +984,7 @@
% \end{macrocode}
% First action is to alter the list and move the first entry to the end
% \begin{macrocode}
- \def\emfontdeclare@clist{#2,#1}%
+ \def\emfontdeclare@clist{#2,#1}%
% \end{macrocode}
% Then we execute current declaration. Appending |\selectfont| means one
% can write just |\fontshape{it}}| and that works then too.
@@ -1147,7 +1147,7 @@
% \begin{macrocode}
\def\newfont#1#2{\@ifdefinable#1{\font#1=#2\relax}}
% \end{macrocode}
-%
+%
% \begin{macrocode}
\DeclareRobustCommand\symbol[1]{\char #1\relax}
% \end{macrocode}
diff --git a/Master/texmf-dist/source/latex-dev/base/ltfsstrc.dtx b/Master/texmf-dist/source/latex-dev/base/ltfsstrc.dtx
index bb82627de1a..e997e5be552 100644
--- a/Master/texmf-dist/source/latex-dev/base/ltfsstrc.dtx
+++ b/Master/texmf-dist/source/latex-dev/base/ltfsstrc.dtx
@@ -731,7 +731,7 @@
%
% \subsubsection{Outline of algorithm for math font sizes}
%
-% \TeX{} uses the the math fonts that are current when the end of a
+% \TeX{} uses the math fonts that are current when the end of a
% formula is reached. If we don't want to keep font setups local to
% every formula (which would result in an enormous overhead, we have
% to be careful not to end up with the wrong setup in case formulas
@@ -1130,7 +1130,7 @@
% \execute@size@function{}
%\end{verbatim}
% This means: the default (empty) size function will be executed,
-% with its optional argument argument set to empty and its mandatory
+% with its optional argument set to empty and its mandatory
% argument set to |cmss12| by |\set@simple@size@args|.
% As we discussed earlier, the effect of the default size function
% is to load the given external font (cmss12) at the specified size
@@ -1371,7 +1371,7 @@
% \begin{macrocode}
\def\reserved@f{\extract@rangefontinfo<#3\@nnil}%
% \end{macrocode}
-% Now we check the the size against |\f@size|. If it is not equal
+% Now we check the size against |\f@size|. If it is not equal
% |\f@size| it is no good and we have to recurse.
% \begin{macrocode}
\ifdim \f@size \p@=#1\p@
diff --git a/Master/texmf-dist/source/latex-dev/base/ltlists.dtx b/Master/texmf-dist/source/latex-dev/base/ltlists.dtx
index d1cafa6cd0b..e8c9ebc16bd 100644
--- a/Master/texmf-dist/source/latex-dev/base/ltlists.dtx
+++ b/Master/texmf-dist/source/latex-dev/base/ltlists.dtx
@@ -744,7 +744,7 @@
\everypar{}\@endpefalse}}
%<latexrelease>\EndIncludeInRelease
% \end{macrocode}
-%
+%
% \begin{macrocode}
%<latexrelease>\IncludeInRelease{0000/00/00}{\@doendpe}{clubpenalty fix}%
%<latexrelease>\def\@doendpe{\@endpetrue
@@ -837,7 +837,6 @@
% This |\if@inlabel| check is needed in case an item starts of
% inside a group so that |\everypar| does not become empty
% outside that group.
-% \@nobreakfalse, etc etc.
% \begin{macrocode}
\if@inlabel
\global\@inlabelfalse
diff --git a/Master/texmf-dist/source/latex-dev/base/ltluatex.dtx b/Master/texmf-dist/source/latex-dev/base/ltluatex.dtx
index 51fa46f6954..1f9ab8d1332 100644
--- a/Master/texmf-dist/source/latex-dev/base/ltluatex.dtx
+++ b/Master/texmf-dist/source/latex-dev/base/ltluatex.dtx
@@ -28,7 +28,7 @@
\ProvidesFile{ltluatex.dtx}
%</driver>
%<*tex>
-[2019/10/22 v1.1j
+[2020/02/02 v1.1l
%</tex>
%<plain> LuaTeX support for plain TeX (core)
%<*tex>
@@ -152,7 +152,7 @@
%
% \section{Plain \TeX\ interface}
%
-% The \textsf{ltluatex} interface may be used with plain \TeX\ using
+% The \textsf{ltluatex} interface may be used with plain \TeX\ using
% |\input{ltluatex}|. This inputs |ltluatex.tex| which inputs
% |etex.src| (or |etex.sty| if used with \LaTeX)
% if it is not already input, and then defines some internal commands to
@@ -199,7 +199,7 @@
% \noindent
% \DescribeMacro{new_chunkname}
% |luatexbase.new_chunkname(|\meta{chunkname}|)|\\
-% Returns an allocation number for a Lua chunk name for use with
+% Returns an allocation number for a Lua chunk name for use with
% |\directlua| and |\latelua|, indexed from~$1$.
% The number is returned and also \meta{name} argument is added to the
% |lua.name| array at that index.
@@ -339,7 +339,7 @@
% \DescribeMacro{remove_from_callback}
% |luatexbase.remove_from_callback(|\meta{callback}, \meta{description}|)|
% Removes the callback function with \meta{description} from the \meta{callback}.
-% The removed function and its description
+% The removed function and its description
% are returned as the results of this function.
%
% \noindent
@@ -407,7 +407,7 @@
% \end{macrocode}
%
% \subsection{Older \LaTeX{}/Plain \TeX\ setup}
-%
+%
% \begin{macrocode}
%<*tex>
% \end{macrocode}
@@ -473,7 +473,7 @@
% End of proposed changes to \texttt{etex.src}
%
% \subsubsection{luatex specific settings}
-%
+%
% Switch to global cf |luatex.sty| to leave room for inserts
% not really needed for luatex but possibly most compatible
% with existing use.
@@ -675,7 +675,7 @@
\chardef\unicoderead=\numexpr\count16 + 1\relax
\openin\unicoderead=UnicodeData.txt %
\loop\unless\ifeof\unicoderead %
- \read\unicoderead to \unicodedataline
+ \read\unicoderead to \unicodedataline
\unless\ifx\unicodedataline\storedpar
\expandafter\parseunicodedataI\unicodedataline\relax
\fi
@@ -785,7 +785,7 @@
% \end{macrocode}
% Note name change required on older luatex, for hash table access.
% \begin{macrocode}
- \countdef \CountZero =0 %
+ \countdef \CountZero =0 %
\dimendef \dimenzero =0 %
\mathchardef \mathcharzero =0 %
\muskipdef \muskipzero =0 %
@@ -978,7 +978,7 @@ local function msg_format(mod, msg_type, text)
end
return first_head .. " "
.. string_gsub(
- text
+ text
.. "on input line "
.. tex.inputlineno, "\n", "\n" .. cont .. " "
)
@@ -1045,7 +1045,7 @@ local createtoken
if tex.luatexversion > 81 then
createtoken = token.create
elseif tex.luatexversion > 79 then
- createtoken = newtoken.create
+ createtoken = newtoken.create
end
local hashtokens = tex.hashtokens()
local luatexversion = tex.luatexversion
@@ -1134,7 +1134,7 @@ luatexbase.new_attribute = new_attribute
% \begin{macrocode}
local whatsit_count_name = whatsit_count_name or "e@alloc@whatsit@count"
local function new_whatsit(name)
- tex_setcount("global", whatsit_count_name,
+ tex_setcount("global", whatsit_count_name,
tex_count[whatsit_count_name] + 1)
if tex_count[whatsit_count_name] > 65534 then
luatexbase_error("No room for a new custom whatsit")
@@ -1157,7 +1157,7 @@ luatexbase.new_whatsit = new_whatsit
local bytecode_count_name =
bytecode_count_name or "e@alloc@bytecode@count"
local function new_bytecode(name)
- tex_setcount("global", bytecode_count_name,
+ tex_setcount("global", bytecode_count_name,
tex_count[bytecode_count_name] + 1)
if tex_count[bytecode_count_name] > 65534 then
luatexbase_error("No room for a new bytecode register")
@@ -1180,7 +1180,7 @@ luatexbase.new_bytecode = new_bytecode
local chunkname_count_name =
chunkname_count_name or "e@alloc@luachunk@count"
local function new_chunkname(name)
- tex_setcount("global", chunkname_count_name,
+ tex_setcount("global", chunkname_count_name,
tex_count[chunkname_count_name] + 1)
local chunkname_count = tex_count[chunkname_count_name]
chunkname_count = chunkname_count + 1
@@ -1188,7 +1188,7 @@ local function new_chunkname(name)
luatexbase_error("No room for a new chunkname")
end
lua.name[chunkname_count]=name
- luatexbase_log("Lua chunkname " .. (name or "") .. " = " ..
+ luatexbase_log("Lua chunkname " .. (name or "") .. " = " ..
chunkname_count .. "\n")
return chunkname_count
end
@@ -1239,12 +1239,13 @@ local callbacklist = callbacklist or { }
% Numerical codes for callback types, and name-to-value association (the
% table keys are strings, the values are numbers).
% \begin{macrocode}
-local list, data, exclusive, simple = 1, 2, 3, 4
-local types = {
- list = list,
- data = data,
- exclusive = exclusive,
- simple = simple,
+local list, data, exclusive, simple, reverselist = 1, 2, 3, 4, 5
+local types = {
+ list = list,
+ data = data,
+ exclusive = exclusive,
+ simple = simple,
+ reverselist = reverselist,
}
% \end{macrocode}
%
@@ -1319,6 +1320,7 @@ local callbacktypes = callbacktypes or {
% \changes{v1.1k}{2019/10/02}{linebreak\_filter is \texttt{exclusive}}
% \changes{v1.1k}{2019/10/02}{process\_rule is \texttt{exclusive}}
% \changes{v1.1k}{2019/10/02}{mlist\_to\_hlist is \texttt{exclusive}}
+% \changes{v1.1l}{2020/02/02}{post\_linebreak\_filter is \texttt{reverselist}}
% \begin{macrocode}
contribute_filter = simple,
buildpage_filter = simple,
@@ -1326,7 +1328,7 @@ local callbacktypes = callbacktypes or {
pre_linebreak_filter = list,
linebreak_filter = exclusive,
append_to_vlist_filter = exclusive,
- post_linebreak_filter = list,
+ post_linebreak_filter = reverselist,
hpack_filter = list,
vpack_filter = list,
hpack_quality = list,
@@ -1337,7 +1339,9 @@ local callbacktypes = callbacktypes or {
ligaturing = simple,
kerning = simple,
insert_local_par = simple,
+ pre_mlist_to_hlist_filter = list,
mlist_to_hlist = exclusive,
+ post_mlist_to_hlist_filter = reverselist,
new_graf = simple,
% \end{macrocode}
% Section 8.5: information reporting callbacks.
@@ -1366,10 +1370,12 @@ local callbacktypes = callbacktypes or {
% \changes{v1.1j}{2019/06/18}{page\_objnum\_provider added}
% \changes{v1.1j}{2019/06/18}{process\_pdf\_image\_content added}
% \changes{v1.1j}{2019/10/22}{page\_objnum\_provider and process\_pdf\_image\_content classified data}
+% \changes{v1.1l}{2020/02/02}{page\_order\_index added}
% \begin{macrocode}
finish_pdffile = data,
finish_pdfpage = data,
page_objnum_provider = data,
+ page_order_index = data,
process_pdf_image_content = data,
% \end{macrocode}
% Section 8.7: font-related callbacks.
@@ -1377,9 +1383,11 @@ local callbacktypes = callbacktypes or {
% \changes{v1.1g}{2018/05/02}{glyph\_not\_found added}
% \changes{v1.1j}{2019/06/18}{make\_extensible added}
% \changes{v1.1j}{2019/06/18}{font\_descriptor\_objnum\_provider added}
+% \changes{v1.1l}{2020/02/02}{glyph\_info added}
% \begin{macrocode}
define_font = exclusive,
- glyph_not_found = exclusive,
+ glyph_info = exclusive,
+ glyph_not_found = exclusive,
glyph_stream_provider = exclusive,
make_extensible = exclusive,
font_descriptor_objnum_provider = exclusive,
@@ -1437,6 +1445,8 @@ end
% |true|, then the same head is passed to the next function. If all
% functions return |true|, then |true| is returned, otherwise the return
% value of the last function not returning |true| is used.
+% \item[reverselist] is a specialized variant of \emph{list} which executes
+% functions in inverse order.
% \item[exclusive] is for functions with more complex signatures; functions in
% this type of callback are \emph{not} combined: An error is raised if
% a second callback is registered..
@@ -1453,6 +1463,12 @@ local function data_handler(name)
end
end
% \end{macrocode}
+% Default for user-defined |data| callbacks without explicit default.
+% \begin{macrocode}
+local function data_handler_default(value)
+ return value
+end
+% \end{macrocode}
% Handler for |exclusive| callbacks. We can assume |callbacklist[name]| is not
% empty: otherwise, the function wouldn't be registered in the callback any
% more.
@@ -1488,6 +1504,39 @@ local function list_handler(name)
end
end
% \end{macrocode}
+% Default for user-defined |list| and |reverselist| callbacks without explicit default.
+% \begin{macrocode}
+local function list_handler_default()
+ return true
+end
+% \end{macrocode}
+% Handler for |reverselist| callbacks.
+% \changes{v1.1l}{2020/02/02}{Add reverselist callback type}
+% \begin{macrocode}
+local function reverselist_handler(name)
+ return function(head, ...)
+ local ret
+ local alltrue = true
+ local callbacks = callbacklist[name]
+ for i = #callbacks, 1, -1 do
+ local cb = callbacks[i]
+ ret = cb.func(head, ...)
+ if ret == false then
+ luatexbase_warning(
+ "Function `" .. cb.description .. "' returned false\n"
+ .. "in callback `" .. name .."'"
+ )
+ break
+ end
+ if ret ~= true then
+ alltrue = false
+ head = ret
+ end
+ end
+ return alltrue and true or head
+ end
+end
+% \end{macrocode}
% Handler for |simple| callbacks.
% \begin{macrocode}
local function simple_handler(name)
@@ -1498,14 +1547,27 @@ local function simple_handler(name)
end
end
% \end{macrocode}
+% Default for user-defined |simple| callbacks without explicit default.
+% \begin{macrocode}
+local function simple_handler_default()
+end
+% \end{macrocode}
%
-% Keep a handlers table for indexed access.
+% Keep a handlers table for indexed access and a table with the corresponding default functions.
% \begin{macrocode}
-local handlers = {
- [data] = data_handler,
- [exclusive] = exclusive_handler,
- [list] = list_handler,
- [simple] = simple_handler,
+local handlers = {
+ [data] = data_handler,
+ [exclusive] = exclusive_handler,
+ [list] = list_handler,
+ [reverselist] = reverselist_handler,
+ [simple] = simple_handler,
+}
+local defaults = {
+ [data] = data_handler_default,
+ [exclusive] = nil,
+ [list] = list_handler_default,
+ [reverselist] = list_handler_default,
+ [simple] = simple_handler_default,
}
% \end{macrocode}
%
@@ -1516,18 +1578,24 @@ local handlers = {
% If a default function is not required, it may be declared as |false|.
% First we need a list of user callbacks.
% \begin{macrocode}
-local user_callbacks_defaults = { }
+local user_callbacks_defaults = {
+ pre_mlist_to_hlist_filter = list_handler_default,
+ mlist_to_hlist = node.mlist_to_hlist,
+ post_mlist_to_hlist_filter = list_handler_default,
+}
% \end{macrocode}
%
% \begin{macro}{create_callback}
% \changes{v1.0a}{2015/09/24}{Function added}
% \changes{v1.0i}{2015/11/29}{Check name is not nil in error message (PHG)}
% \changes{v1.0k}{2015/12/02}{Give more specific error messages (PHG)}
+% \changes{v1.1l}{2020/02/02}{Provide proper fallbacks for user-defined callbacks without user-provided default handler}
% The allocator itself.
% \begin{macrocode}
local function create_callback(name, ctype, default)
+ local ctype_id = types[ctype]
if not name or name == ""
- or not ctype or ctype == ""
+ or not ctype_id
then
luatexbase_error("Unable to create callback:\n" ..
"valid callback name and type required")
@@ -1536,12 +1604,17 @@ local function create_callback(name, ctype, default)
luatexbase_error("Unable to create callback `" .. name ..
"':\ncallback is already defined")
end
- if default ~= false and type (default) ~= "function" then
+ default = default or defaults[ctype_id]
+ if not default then
luatexbase_error("Unable to create callback `" .. name ..
- ":\ndefault is not a function")
- end
+ "':\ndefault is required for `" .. ctype ..
+ "' callbacks")
+ elseif type (default) ~= "function" then
+ luatexbase_error("Unable to create callback `" .. name ..
+ "':\ndefault is not a function")
+ end
user_callbacks_defaults[name] = default
- callbacktypes[name] = types[ctype]
+ callbacktypes[name] = ctype_id
end
luatexbase.create_callback = create_callback
% \end{macrocode}
@@ -1566,9 +1639,6 @@ local function call_callback(name,...)
local f
if not l then
f = user_callbacks_defaults[name]
- if l == false then
- return nil
- end
else
f = handlers[callbacktypes[name]](name)
end
@@ -1759,7 +1829,7 @@ local function callback_descriptions (name)
end
return d
end
-luatexbase.callback_descriptions =callback_descriptions
+luatexbase.callback_descriptions =callback_descriptions
% \end{macrocode}
% \end{macro}
%
@@ -1781,6 +1851,31 @@ end
luatexbase.uninstall = uninstall
% \end{macrocode}
% \end{macro}
+% \begin{macro}{mlist_to_hlist}
+% \changes{v1.1l}{2020/02/02}{|pre/post_mlist_to_hlist| added}
+% To emulate these callbacks, the ``real'' |mlist_to_hlist| is replaced by a
+% wrapper calling the wrappers before and after.
+% \begin{macrocode}
+callback_register("mlist_to_hlist", function(head, display_type, need_penalties)
+ local current = call_callback("pre_mlist_to_hlist_filter", head, display_type, need_penalties)
+ if current == false then
+ flush_list(head)
+ return nil
+ elseif current == true then
+ current = head
+ end
+ current = call_callback("mlist_to_hlist", current, display_type, need_penalties)
+ local post = call_callback("post_mlist_to_hlist_filter", current, display_type, need_penalties)
+ if post == true then
+ return current
+ elseif post == false then
+ flush_list(current)
+ return nil
+ end
+ return post
+end)
+% \end{macrocode}
+% \end{macro}
% \endgroup
%
% \begin{macrocode}
diff --git a/Master/texmf-dist/source/latex-dev/base/ltmath.dtx b/Master/texmf-dist/source/latex-dev/base/ltmath.dtx
index 379dbf1afda..18688068b04 100644
--- a/Master/texmf-dist/source/latex-dev/base/ltmath.dtx
+++ b/Master/texmf-dist/source/latex-dev/base/ltmath.dtx
@@ -260,7 +260,7 @@
\newif\ifv@
\newif\ifh@
% \end{macrocode}
-%
+%
%
%
%
@@ -270,7 +270,7 @@
%<latexrelease>\IncludeInRelease{2019/10/01}%
%<latexrelease> {\vphantom}{Make commands robust}%
% \end{macrocode}
-%
+%
% \begin{macrocode}
\DeclareRobustCommand\vphantom{\v@true\h@false\ph@nt}
% \end{macrocode}
@@ -331,9 +331,9 @@
\def\finph@nt{%
\setbox\tw@\null
\ifv@ \ht\tw@\ht\z@ \dp\tw@\dp\z@\fi
- \ifh@ \wd\tw@\wd\z@\fi
+ \ifh@ \wd\tw@\wd\z@\fi
% \end{macrocode}
-% \changes{v1.2b}{2018/09/24}{Start LR-mode if necessary (git/49)}
+% \changes{v1.2b}{2018/09/24}{Start LR-mode if necessary (git/49)}
% \begin{macrocode}
\leavevmode@ifvmode\box\tw@}
%</2ekernel|latexrelease>
@@ -373,7 +373,7 @@
\def\mathsm@sh#1#2{%
\setbox\z@\hbox{$\m@th#1{#2}$}\finsm@sh}
% \end{macrocode}
-% \changes{v1.2b}{2018/09/24}{Start LR-mode if necessary (git/49)}
+% \changes{v1.2b}{2018/09/24}{Start LR-mode if necessary (git/49)}
% \begin{macrocode}
%</2ekernel>
%<*2ekernel|latexrelease>
@@ -396,14 +396,14 @@
% \end{macrocode}
% \end{macro}
%
-%
+%
% \begin{macrocode}
%</2ekernel>
%<*2ekernel|latexrelease>
%<latexrelease>\IncludeInRelease{2019/10/01}%
%<latexrelease> {\cases}{Make commands robust}%
% \end{macrocode}
-%
+%
% \begin{macro}{\cases}
% \changes{LaTeX2.09}{1991/08/14}
% {(RmS) inserted extra braces around entry for NFSS}
@@ -633,7 +633,7 @@
% {(MH) Fixed potential problem in \cs{[} (pr/3399).}
% \begin{macro}{\]}
% Produces |$$...$$| with checks that |\[| isn't used in math mode,
-% and that |\]| is only used in display math mode (though there is no
+% and that |\]| is only used in display math mode (though there is no
% real test that this display math started with |\[| and not with |$$|).
% \changes{v1.1h}{2015/01/08}{Make Robust (latexrelease)}
% \begin{macrocode}
diff --git a/Master/texmf-dist/source/latex-dev/base/ltmiscen.dtx b/Master/texmf-dist/source/latex-dev/base/ltmiscen.dtx
index 1c05a08ec59..97b1f4a572b 100644
--- a/Master/texmf-dist/source/latex-dev/base/ltmiscen.dtx
+++ b/Master/texmf-dist/source/latex-dev/base/ltmiscen.dtx
@@ -345,7 +345,7 @@
% package that uses \cs{@writefile} for writing its own files) then
% the command behaves exactly as before.
% \end{itemize}
-%
+%
%
% \begin{macro}{\protected@file@percent}
% Dummy cs to be replaced by a percent sign inside
@@ -358,7 +358,7 @@
%<*2ekernel|latexrelease>
%<latexrelease>\IncludeInRelease{2018/12/01}%
%<latexrelease> {\protected@file@percent}{Mask line endings}%
-\protected\def\protected@file@percent{}
+\protected\def\protected@file@percent{}
% \end{macrocode}
% \end{macro}
@@ -372,7 +372,7 @@
% writing to files (github/73)}
%
% \begin{macrocode}
-\catcode`\^^A=9
+\catcode`\^^A=9
\long\gdef\add@percent@to@temptokena
#1\protected@file@percent#2\add@percent@to@temptokena
% \end{macrocode}
@@ -386,7 +386,7 @@
{\expandafter\ifx\expandafter X\detokenize{#2}X\expandafter\dont@add@percent@to@temptokena\else
\expandafter\do@add@percent@to@temptokena\fi{#1}}
% \end{macrocode}
-%
+%
% \begin{macrocode}
\long\def\dont@add@percent@to@temptokena#1{%
\@temptokena\expandafter{#1}}
@@ -398,7 +398,7 @@
% in the definition. Therefore the |\fi| needs to be on the next
% line and we need locally another comment character to avoid
% getting spaces into the definition---a weird problem :-)
-%
+%
% \begin{macrocode}
\begingroup
\catcode`\%=12
@@ -435,7 +435,7 @@
}%
}
% \end{macrocode}
-%
+%
% \begin{macrocode}
%</2ekernel|latexrelease>
%<latexrelease>\EndIncludeInRelease
@@ -716,7 +716,7 @@
\par\@ifstar{\nobreak\@xcentercr}\@xcentercr}
%</2ekernel|latexrelease>
% \end{macrocode}
-%
+%
% \begin{macrocode}
%<latexrelease>\EndIncludeInRelease
%<latexrelease>\IncludeInRelease{0000/00/00}%
@@ -741,7 +741,7 @@
% \begin{macrocode}
\def\@icentercr[#1]{\vskip #1\ignorespaces}
% \end{macrocode}
-%
+%
% \end{macro}
%
%
@@ -759,7 +759,7 @@
% \end{macrocode}
% \end{environment}
%
-%
+%
% \begin{macrocode}
%</2ekernel>
%<*2ekernel|latexrelease>
@@ -1005,7 +1005,7 @@
% \end{macrocode}
% \end{macro}
%
-%
+%
% \begin{macrocode}
%</2ekernel>
%<*2ekernel|latexrelease>
diff --git a/Master/texmf-dist/source/latex-dev/base/ltoutenc.dtx b/Master/texmf-dist/source/latex-dev/base/ltoutenc.dtx
index fb437d4ad2b..6ebb62cee8d 100644
--- a/Master/texmf-dist/source/latex-dev/base/ltoutenc.dtx
+++ b/Master/texmf-dist/source/latex-dev/base/ltoutenc.dtx
@@ -37,14 +37,14 @@
%<TS1>\ProvidesFile{ts1enc.def}[2001/06/05 v3.0e (jk/car/fm)
%<TU>\ProvidesFile{tuenc.def}
%<package>\ProvidesPackage{fontenc}
-%<OT1|T1|OMS|OML|OT4|TU|package> [2019/11/22 v2.0l
+%<OT1|T1|OMS|OML|OT4|TU|package> [2020/01/25 v2.0m
%<OT1|T1|OMS|OML|OT4|TS1|TU> Standard LaTeX file]
%<package> Standard LaTeX package]
%
%<*driver>
% \fi
\ProvidesFile{ltoutenc.dtx}
- [2019/12/18 v2.0m LaTeX Kernel (font encodings)]
+ [2020/01/20 v2.0n LaTeX Kernel (font encodings)]
% \iffalse
\documentclass{ltxdoc}
\GetFileInfo{ltoutenc.dtx}
@@ -1044,7 +1044,7 @@
% \begin{macrocode}
\@onlypreamble\DeclareTextComposite
% \end{macrocode}
-%
+%
% \end{macro}
% \end{macro}
% \end{macro}
@@ -1062,7 +1062,7 @@
%<latexrelease>\IncludeInRelease{2019/10/01}%
%<latexrelease> {\UseTextAccent}{Make commands robust}%
% \end{macrocode}
-%
+%
% \begin{macro}{\UseTextAccent}
% \begin{macro}{\UseTextSymbol}
% \changes{v1.7p}{1995/11/17}{Support \cs{@wrong@font@char} latex/1676}
@@ -1512,8 +1512,16 @@
% Some commands can be used in both text and math mode:
% \begin{macrocode}
\DeclareRobustCommand{\$}{\ifmmode\mathdollar\else\textdollar\fi}
-\DeclareRobustCommand{\{}{\ifmmode\lbrace\else\textbraceleft\fi}
-\DeclareRobustCommand{\}}{\ifmmode\rbrace\else\textbraceright\fi}
+% \end{macrocode}
+% We use \cs{protected} not \cs{DeclareRobustCommand} so that
+% \verb=\bigl\{= etc.\ works inside \cs{protected@edef}.
+% \changes{v2.0n}{2020/01/20}{fix for gh/251}
+% \begin{macrocode}
+\protected\def\{{\ifmmode\lbrace\else\textbraceleft\fi}
+\protected\def\}{\ifmmode\rbrace\else\textbraceright\fi}
+% \end{macrocode}
+%
+% \begin{macrocode}
\DeclareRobustCommand{\P}{\ifmmode\mathparagraph\else\textparagraph\fi}
\DeclareRobustCommand{\S}{\ifmmode\mathsection\else\textsection\fi}
\DeclareRobustCommand{\dag}{\ifmmode{\dagger}\else\textdagger\fi}
@@ -2008,7 +2016,7 @@
\DeclareTextSymbol{\guillemotleft}{T1}{19}
\DeclareTextSymbol{\guillemotright}{T1}{20}
% \end{macrocode}
-%
+%
% \begin{macrocode}
\DeclareTextSymbol{\guilsinglleft}{T1}{14}
\DeclareTextSymbol{\guilsinglright}{T1}{15}
@@ -2397,7 +2405,7 @@
\DeclareTextSymbol{\guillemotleft}{OT4}{174}
\DeclareTextSymbol{\guillemotright}{OT4}{175}
% \end{macrocode}
-%
+%
% \begin{macrocode}
\DeclareTextSymbol{\i}{OT4}{16}
\DeclareTextSymbol{\j}{OT4}{17}
@@ -2998,7 +3006,7 @@
% old Adobe name
\DeclareTextSymbol{\guillemotleft} \UnicodeEncodingName{"00AB}
% \end{macrocode}
-%
+%
% \begin{macrocode}
\DeclareTextSymbol{\textlnot} \UnicodeEncodingName{"00AC}
\DeclareTextSymbol{\textregistered} \UnicodeEncodingName{"00AE}
@@ -3020,7 +3028,7 @@
% old Adobe name
\DeclareTextSymbol{\guillemotright} \UnicodeEncodingName{"00BB}
% \end{macrocode}
-%
+%
% \begin{macrocode}
\DeclareTextSymbol{\textonequarter} \UnicodeEncodingName{"00BC}
\DeclareTextSymbol{\textonehalf} \UnicodeEncodingName{"00BD}
@@ -3109,7 +3117,7 @@
\DeclareTextSymbol{\Hwithstroke} \UnicodeEncodingName{"0126}
\DeclareTextSymbol{\hwithstroke} \UnicodeEncodingName{"0127}
% \end{macrocode}
-%
+%
% Not all fonts have U+2217 but using U+002A requires some adjustment.
% \begin{macrocode}
\DeclareTextCommand{\textasteriskcentered}\UnicodeEncodingName{%
@@ -3487,27 +3495,48 @@
% \begin{macrocode}
\DeclareOption*{%
\let\encodingdefault\CurrentOption
- \edef\reserved@f{%
- \lowercase{\def\noexpand\reserved@f{\CurrentOption enc.def}}}%
- \reserved@f
- \InputIfFileExists\reserved@f
- {}{\PackageError{fontenc}%
- {Encoding file `\reserved@f' not found.%
- \MessageBreak
- You might have misspelt the name of the encoding}%
- {Necessary code for this encoding was not
- loaded.\MessageBreak
- Thus calling the encoding later on will
- produce further error messages.}}%
- \let\reserved@f\relax
+% \end{macrocode}
+% From 2020/02/02 release onward we only load the encoding files if
+% they haven't be loaded already. To check this we look if
+% \verb=\T@=\textit{encoding} is already defined. If not we load
+% (indicated by setting the switch
+% \texttt{@tempswa} to true and we always load if we run in an older
+% format (or rather in a rollback situation).
+% \changes{v2.0m}{2020/01/25}{Load each encoding file only once (gh/255)}
+% \begin{macrocode}
+ \@tempswafalse
+ \@ifl@t@r\fmtversion{2020/02/02}%
+ {\expandafter\ifx\csname T@\CurrentOption\endcsname\relax
+ \@tempswatrue\fi}%
+ {\@tempswatrue}%
+% \end{macrocode}
+% Load if necessary:
+% \begin{macrocode}
+ \if@tempswa
+% \end{macrocode}
+%
+% \begin{macrocode}
+ \edef\reserved@f{%
+ \lowercase{\def\noexpand\reserved@f{\CurrentOption enc.def}}}%
+ \reserved@f
+ \InputIfFileExists\reserved@f
+ {}{\PackageError{fontenc}%
+ {Encoding file `\reserved@f' not found.%
+ \MessageBreak
+ You might have misspelt the name of the encoding}%
+ {Necessary code for this encoding was not
+ loaded.\MessageBreak
+ Thus calling the encoding later on will
+ produce further error messages.}}%
+ \let\reserved@f\relax
% \end{macrocode}
%
% In case the current encoding is one of a list of known
% cyrillic ones we extend the |\@uclclist|:
% \begin{macrocode}
- \expandafter\in@\expandafter{\CurrentOption}%
- {T2A,T2B,T2C,X2,LCY,OT2}%
- \ifin@
+ \expandafter\in@\expandafter{\CurrentOption}%
+ {T2A,T2B,T2C,X2,LCY,OT2}%
+ \ifin@
% \end{macrocode}
%
% But only if it hasn't already been extended. This might happen if
@@ -3516,12 +3545,13 @@
% unnecessarily big, slowing down the processing at runtime.
% \changes{v1.9v}{1999/06/12}{Extend \cs{@uclclist} only once}
% \begin{macrocode}
- \expandafter\in@\expandafter\cyra\expandafter
- {\@uclclist}%
- \ifin@
- \else
- \update@uclc@with@cyrillic
- \fi
+ \expandafter\in@\expandafter\cyra\expandafter
+ {\@uclclist}%
+ \ifin@
+ \else
+ \update@uclc@with@cyrillic
+ \fi
+ \fi
\fi
}
% \end{macrocode}
diff --git a/Master/texmf-dist/source/latex-dev/base/ltoutenc.ins b/Master/texmf-dist/source/latex-dev/base/ltoutenc.ins
index 71bee61f578..17d62e11e8a 100644
--- a/Master/texmf-dist/source/latex-dev/base/ltoutenc.ins
+++ b/Master/texmf-dist/source/latex-dev/base/ltoutenc.ins
@@ -5,34 +5,34 @@
%%
%% Copyright (C) 1993-2020
%% The LaTeX3 Project and any individual authors listed elsewhere
-%% in this file.
-%%
+%% in this file.
+%%
%% This file is part of the LaTeX base system.
%% -------------------------------------------
-%%
+%%
%% It may be distributed and/or modified under the
%% conditions of the LaTeX Project Public License, either version 1.3c
%% of this license or (at your option) any later version.
%% The latest version of this license is in
%% https://www.latex-project.org/lppl.txt
-%% and version 1.3c or later is part of all distributions of LaTeX
+%% and version 1.3c or later is part of all distributions of LaTeX
%% version 2008 or later.
-%%
+%%
%% This file has the LPPL maintenance status "maintained".
-%%
+%%
%% As this file contains legal notices, it is NOT PERMITTED to modify
%% this file in any way that the legal information placed into
%% generated files is changed (i.e., the files generated when the
%% original file is executed). This restriction does not apply if
%% (parts of) the content is reused in a different WORK producing its
%% own generated files.
-%%
+%%
%% The list of all files belonging to the LaTeX base distribution is
%% given in the file `manifest.txt'. See also `legal.txt' for additional
%% information.
-%%
-%%
-%%
+%%
+%%
+%%
%%
%% --------------- start of docstrip commands ------------------
%%
@@ -50,7 +50,7 @@ reports for it can be opened at https://latex-project.org/bugs.html
Copyright (C) 1993-2020
The LaTeX3 Project and any individual authors listed elsewhere
-in this file.
+in this file.
This file was generated from file(s) of the LaTeX base system.
--------------------------------------------------------------
@@ -60,7 +60,7 @@ conditions of the LaTeX Project Public License, either version 1.3c
of this license or (at your option) any later version.
The latest version of this license is in
https://www.latex-project.org/lppl.txt
-and version 1.3c or later is part of all distributions of LaTeX
+and version 1.3c or later is part of all distributions of LaTeX
version 2008 or later.
This file has the LPPL maintenance status "maintained".
@@ -73,8 +73,8 @@ The list of all files belonging to the LaTeX base distribution is
given in the file `manifest.txt'. See also `legal.txt' for additional
information.
-The list of derived (unpacked) files belonging to the distribution
-and covered by LPPL is defined by the unpacking scripts (with
+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
@@ -96,7 +96,7 @@ extension .ins) which are part of the distribution.
\from{ltoutenc.dtx}{TS1}}
\file{tuenc.def}{
\from{ltoutenc.dtx}{TU}}
-% no longer in this file since 2020/02 release
+% no longer in this file since 2020/02 release
% \file{textcomp.sty}{
% \from{ltoutenc.dtx}{TS1sty}}
\file{fontenc.sty}{
@@ -104,5 +104,3 @@ extension .ins) which are part of the distribution.
}
\endbatchfile
-
-
diff --git a/Master/texmf-dist/source/latex-dev/base/ltoutput.dtx b/Master/texmf-dist/source/latex-dev/base/ltoutput.dtx
index 131560b22e1..c3b27baf42d 100644
--- a/Master/texmf-dist/source/latex-dev/base/ltoutput.dtx
+++ b/Master/texmf-dist/source/latex-dev/base/ltoutput.dtx
@@ -748,10 +748,10 @@
% \changes{v1.2m}{2015/03/12}
% {initialise \cs{@dbldeferlist} again}
% The new algorithm stores page wide floats together with column floats
-% in a single |\@deferlist| list. We keep |\@dbldeferlist|
+% in a single |\@deferlist| list. We keep |\@dbldeferlist|
% initialised as empty so that packages that are testing for
% deferred floats can use the same code for old or new float
-% handling.
+% handling.
% \begin{macrocode}
\gdef\@dbldeferlist{}
% \end{macrocode}
@@ -990,15 +990,15 @@
\if@nobreak \@nobreakfalse \everypar{}\fi
\par
% \end{macrocode}
-% The |\vfil| at the end of the macro before the break penalty will
+% The |\vfil| at the end of the macro before the break penalty will
% normally result in the page being run short, even with |\flushbottom|
% in effect (in contrast to the behavior
-% of |\pagebreak|). However, if there
+% of |\pagebreak|). However, if there
% is some explicit stretch on the page, say, a |\vfill|, it has the undesired
% side-effect, that the last line will not align at its baseline if it
% contains characters going below the baseline, as the value of |\prevdepth|
-% is no longer taken into account by \TeX{}. So we back up by that amount
-% (or by |\maxdepth| if it is really huge), to mimic the normal behavior
+% is no longer taken into account by \TeX{}. So we back up by that amount
+% (or by |\maxdepth| if it is really huge), to mimic the normal behavior
% without the |\newpage|.
% \begin{macrocode}
\ifdim\prevdepth>\z@
@@ -1448,8 +1448,8 @@
\def\@testwrongwidth #1{%
\ifdim\dp#1=\f@depth
%<*trace>
- \fl@trace{\string#1
- \ifdim\f@depth=\z@ single \else double \fi
+ \fl@trace{\string#1
+ \ifdim\f@depth=\z@ single \else double \fi
column float -- ok}%
%</trace>
\else
@@ -3110,7 +3110,7 @@
% |\@textmin| also.
% \begin{macrocode}
%<*trace>
-%<latexrelease|fltrace|flafter> \fl@trace{textfloatsheight (before) =
+%<latexrelease|fltrace|flafter> \fl@trace{textfloatsheight (before) =
%<latexrelease|fltrace|flafter> \the \@textfloatsheight}%
%</trace>
%<latexrelease|fltrace|flafter> \advance \@textmin \@textfloatsheight
@@ -3133,7 +3133,7 @@
%<latexrelease|fltrace|flafter> \fi
%<latexrelease|fltrace|flafter> \advance \@reqcolroom \ht\@currbox
%<*trace>
-%<latexrelease|fltrace|flafter> \fl@trace{float size =
+%<latexrelease|fltrace|flafter> \fl@trace{float size =
%<latexrelease|fltrace|flafter> \the \ht \@currbox (addtocurcol)}%
%<latexrelease|fltrace|flafter> \fl@trace{colroom =
%<latexrelease|fltrace|flafter> \the \@colroom (addtocurcol)}%
@@ -3234,7 +3234,7 @@
%<latexrelease|fltrace|flafter> \box\@currbox
%<latexrelease|fltrace|flafter> \penalty\interlinepenalty
%<latexrelease|fltrace|flafter> \vskip\intextsep
-%<latexrelease|fltrace|flafter> \ifnum\outputpenalty
+%<latexrelease|fltrace|flafter> \ifnum\outputpenalty
%<latexrelease|fltrace|flafter> <-\@Mii \vskip
%<latexrelease|fltrace|flafter> -\parskip\fi
% \end{macrocode}
@@ -3278,14 +3278,14 @@
%<latexrelease|fltrace|flafter> \fl@trace{Fail: colnum = \the \@colnum:
%<latexrelease|fltrace|flafter> fpstype \the \@fpstype=ORD?}%
%<latexrelease|fltrace|flafter> \ifnum \@fpstype<\sixt@@n
-%<latexrelease|fltrace|flafter> \fl@trace{ERROR: BANG float not successful
+%<latexrelease|fltrace|flafter> \fl@trace{ERROR: BANG float not successful
%<latexrelease|fltrace|flafter> (addtocurcol)}%
%<latexrelease|fltrace|flafter> \fi
%</trace>
%<latexrelease|fltrace|flafter> \fi
%<*trace>
%<latexrelease|fltrace|flafter> \else
-%<latexrelease|fltrace|flafter> \fl@trace{Fail---no room: fl box ht:
+%<latexrelease|fltrace|flafter> \fl@trace{Fail---no room: fl box ht:
%<latexrelease|fltrace|flafter> \the \ht \@currbox (addtocurcol)}%
%</trace>
%<latexrelease|fltrace|flafter> \fi
@@ -3485,7 +3485,7 @@
%<*trace>
%<latexrelease|fltrace> \fl@trace{End of addtonextcol --
%<latexrelease|fltrace> locally counts:}%
-%<latexrelease|fltrace> \fl@trace{col: \the \@colnum.
+%<latexrelease|fltrace> \fl@trace{col: \the \@colnum.
%<latexrelease|fltrace> top: \the \@topnum. bot: \the \@botnum.}%
%</trace>
%<latexrelease|fltrace> \endgroup
@@ -4410,7 +4410,7 @@
\advance \@reqcolroom
\ifx #2\@empty \textfloatsep \else \floatsep \fi
%<*trace>
- \fl@trace{colroom = \the \@colroom
+ \fl@trace{colroom = \the \@colroom
(flcheckspace \string#1 \string#2)}%
\fl@trace{reqcolroom = \the \@reqcolroom
(flcheckspace \string#1 \string#2)}%
diff --git a/Master/texmf-dist/source/latex-dev/base/ltpage.dtx b/Master/texmf-dist/source/latex-dev/base/ltpage.dtx
index bf203fb9c9a..f926f330605 100644
--- a/Master/texmf-dist/source/latex-dev/base/ltpage.dtx
+++ b/Master/texmf-dist/source/latex-dev/base/ltpage.dtx
@@ -183,7 +183,7 @@
%<latexrelease>\IncludeInRelease{2019/10/01}%
%<latexrelease> {\markboth}{Make commands robust}%
% \end{macrocode}
-%
+%
% \begin{macro}{\markboth}
% \begin{macro}{\markright}
% \changes{v1.0d}{1994/05/20}{Changed setting for \cs{protect}.}
@@ -211,7 +211,7 @@
\endgroup
\if@nobreak\ifvmode\nobreak\fi\fi}
% \end{macrocode}
-%
+%
% \begin{macrocode}
\DeclareRobustCommand\markright[1]{%
\begingroup
diff --git a/Master/texmf-dist/source/latex-dev/base/ltpictur.dtx b/Master/texmf-dist/source/latex-dev/base/ltpictur.dtx
index da3cdf897d6..9440fc783ad 100644
--- a/Master/texmf-dist/source/latex-dev/base/ltpictur.dtx
+++ b/Master/texmf-dist/source/latex-dev/base/ltpictur.dtx
@@ -1141,7 +1141,7 @@
% \changes{v1.1l}{2016/03/29}{macro added (latex/4452)}
% Tests whether horizontal or vertical lines are needed.
% \begin{macrocode}
-\newif\if@ovvline \@ovvlinetrue
+\newif\if@ovvline \@ovvlinetrue
\newif\if@ovhline \@ovhlinetrue
% \end{macrocode}
% \end{macro}
@@ -1250,7 +1250,7 @@
%<latexrelease> \@circlefnt \setbox\@tempboxa
%<latexrelease> \hbox{\if@ovr \@ovvert32\kern -\@tempdima \fi
%<latexrelease> \if@ovl
-%<latexrelease> \kern \@ovxx \@ovvert01\kern -\@tempdima \kern -\@ovxx
+%<latexrelease> \kern \@ovxx \@ovvert01\kern -\@tempdima \kern -\@ovxx
%<latexrelease> \fi
%<latexrelease> \if@ovt \@ovhorz \kern -\@ovxx \fi
%<latexrelease> \if@ovb \raise \@ovyy \@ovhorz \fi}\advance\@ovdx\@ovro
@@ -1547,7 +1547,7 @@
%<*2ekernel|latexrelease>
%<latexrelease>\IncludeInRelease{2019/10/01}%
%<latexrelease> {\bezier}{Make commands robust}%
-\MakeRobust\bezier
+\MakeRobust\bezier
\MakeRobust\circle
\MakeRobust\dashbox
\MakeRobust\line
@@ -1555,7 +1555,7 @@
\MakeRobust\multiput
\MakeRobust\oval
\MakeRobust\put
-\MakeRobust\qbezier
+\MakeRobust\qbezier
\MakeRobust\shortstack
\MakeRobust\thinlines
\MakeRobust\vector
@@ -1564,7 +1564,7 @@
%<latexrelease>\IncludeInRelease{0000/00/00}%
%<latexrelease> {\bezier}{Make commands robust}%
%<latexrelease>
-%<latexrelease>\kernel@make@fragile\bezier
+%<latexrelease>\kernel@make@fragile\bezier
%<latexrelease>\kernel@make@fragile\circle
%<latexrelease>\kernel@make@fragile\dashbox
%<latexrelease>\kernel@make@fragile\line
@@ -1572,7 +1572,7 @@
%<latexrelease>\kernel@make@fragile\multiput
%<latexrelease>\kernel@make@fragile\oval
%<latexrelease>\kernel@make@fragile\put
-%<latexrelease>\kernel@make@fragile\qbezier
+%<latexrelease>\kernel@make@fragile\qbezier
%<latexrelease>\kernel@make@fragile\shortstack
%<latexrelease>\kernel@make@fragile\thinlines
%<latexrelease>\kernel@make@fragile\vector
diff --git a/Master/texmf-dist/source/latex-dev/base/ltplain.dtx b/Master/texmf-dist/source/latex-dev/base/ltplain.dtx
index 2e5a345ecbb..06602780664 100644
--- a/Master/texmf-dist/source/latex-dev/base/ltplain.dtx
+++ b/Master/texmf-dist/source/latex-dev/base/ltplain.dtx
@@ -378,7 +378,7 @@
\ifx\directlua\@undefined
\def\newwrite {\e@alloc\write \chardef{\count17}\m@ne\sixt@@n}
\else
- \def\newwrite {\e@alloc\write
+ \def\newwrite {\e@alloc\write
{\ifnum\allocationnumber=18
\advance\count17\@ne
\allocationnumber\count17 %
@@ -542,7 +542,7 @@
% \begin{macrocode}
\def\e@alloc#1#2#3#4#5#6{%
\global\advance#3\@ne
- \e@ch@ck{#3}{#4}{#5}#1%
+ \e@ch@ck{#3}{#4}{#5}#1%
\allocationnumber#3\relax
\global#2#6\allocationnumber
\wlog{\string#6=\string#1\the\allocationnumber}}%
diff --git a/Master/texmf-dist/source/latex-dev/base/ltsect.dtx b/Master/texmf-dist/source/latex-dev/base/ltsect.dtx
index c658c23818c..9ccd042fb4e 100644
--- a/Master/texmf-dist/source/latex-dev/base/ltsect.dtx
+++ b/Master/texmf-dist/source/latex-dev/base/ltsect.dtx
@@ -116,14 +116,14 @@
% using the information previously saved with the other commands.
%
%
-%
+%
% \begin{macrocode}
%</2ekernel>
%<*2ekernel|latexrelease>
%<latexrelease>\IncludeInRelease{2019/10/01}%
%<latexrelease> {\title}{Make commands robust}%
% \end{macrocode}
-%
+%
%
% \begin{macro}{\title}
% \changes{LaTeX2e}{1993/12/11}{Added default}
@@ -191,7 +191,7 @@
% \end{macrocode}
%
%
-%
+%
% \begin{macro}{\@title}
% \begin{macrocode}
\def\@title{\@latex@error{No \noexpand\title given}\@ehc}
@@ -923,7 +923,7 @@
% \begin{macro}{\noprotrusion}
% This command, if placed directly to the right (or left) of a
-% word, will prevent prevent protrusion of that word into the
+% word, will prevent protrusion of that word into the
% margin. It is used in the toc entry lines as they shouldn't
% protrude. It is implemented as to kerns that cancel each other
% but being there hide the word so that protrusion is not
@@ -934,7 +934,7 @@
% \end{macrocode}
% \end{macro}
%
-%
+%
% \begin{macrocode}
%</2ekernel|latexrelease>
%<latexrelease>\EndIncludeInRelease
diff --git a/Master/texmf-dist/source/latex-dev/base/ltspace.dtx b/Master/texmf-dist/source/latex-dev/base/ltspace.dtx
index 078da324d28..16d7dcb43aa 100644
--- a/Master/texmf-dist/source/latex-dev/base/ltspace.dtx
+++ b/Master/texmf-dist/source/latex-dev/base/ltspace.dtx
@@ -275,7 +275,7 @@
%<*2ekernel>
\message{spacing,}
% \end{macrocode}
-%
+%
% \begin{macrocode}
%</2ekernel>
%<*2ekernel|latexrelease>
@@ -406,7 +406,7 @@
\@xnewline}%
\@xnewline}
% \end{macrocode}
-%
+%
% \begin{macrocode}
\let\\\@normalcr
%</2ekernel|latexrelease>
@@ -621,7 +621,7 @@
% \changes{v1.3f}{2015/11/07}
% {Only space if there is no space at the end of the hlist latex/4443}
% \begin{macrocode}
- \ifdim\lastskip=\z@
+ \ifdim\lastskip=\z@
\nobreak \hskip\z@skip
\fi
\ignorespaces
@@ -647,7 +647,7 @@
%<latexrelease> \ifhmode
%<latexrelease> \spacefactor\@savsf
%<latexrelease> \ifdim\@savsk>\z@
-%<latexrelease> \ifdim\lastskip=\z@
+%<latexrelease> \ifdim\lastskip=\z@
%<latexrelease> \nobreak \hskip\z@skip
%<latexrelease> \fi
%<latexrelease> \ignorespaces
@@ -1176,7 +1176,7 @@
% \end{macrocode}
% \end{macro}
%
-%
+%
% \begin{macrocode}
%</2ekernel>
%<*2ekernel|latexrelease>
@@ -1188,7 +1188,7 @@
% \begin{macro}{\thinspace}
% \begin{macro}{\negthinspace}
% \begin{macro}{\enspace}
-% \changes{v1.3h}{2018/09/24}{Start LR-mode if necessary (git/49)}
+% \changes{v1.3h}{2018/09/24}{Start LR-mode if necessary (git/49)}
% \begin{macrocode}
\DeclareRobustCommand\thinspace{\leavevmode@ifvmode\kern .16667em }
\DeclareRobustCommand\negthinspace{\leavevmode@ifvmode\kern-.16667em }
@@ -1201,7 +1201,7 @@
% \begin{macro}{\leavevmode@ifvmode}
% Leave vmode but only if we are really in vmode, otherwise the
% expansion is empty (which is not the case with the default definition).
-% \changes{v1.3h}{2018/09/24}{Macro added (git/49)}
+% \changes{v1.3h}{2018/09/24}{Macro added (git/49)}
% \begin{macrocode}
\protected\def\leavevmode@ifvmode{\ifvmode\expandafter\indent\fi}
% \end{macrocode}
@@ -1257,4 +1257,3 @@
%
% \Finale
\endinput
-
diff --git a/Master/texmf-dist/source/latex-dev/base/lttab.dtx b/Master/texmf-dist/source/latex-dev/base/lttab.dtx
index dcb82dece73..47cf4a66184 100644
--- a/Master/texmf-dist/source/latex-dev/base/lttab.dtx
+++ b/Master/texmf-dist/source/latex-dev/base/lttab.dtx
@@ -608,7 +608,7 @@
%<latexrelease>\IncludeInRelease{2019/10/01}%
%<latexrelease> {\pushtabs}{Make commands robust}%
% \end{macrocode}
-%
+%
% \begin{macro}{\pushtabs}
% \begin{macrocode}
\DeclareRobustCommand\pushtabs{%
@@ -658,7 +658,7 @@
%<latexrelease>\EndIncludeInRelease
%<*2ekernel>
% \end{macrocode}
-%
+%
% \begin{macro}{\tabbingsep}
% \begin{macrocode}
\newdimen\tabbingsep
diff --git a/Master/texmf-dist/source/latex-dev/base/lttextcomp.dtx b/Master/texmf-dist/source/latex-dev/base/lttextcomp.dtx
index fc208c2e74e..eca72e4d28c 100644
--- a/Master/texmf-dist/source/latex-dev/base/lttextcomp.dtx
+++ b/Master/texmf-dist/source/latex-dev/base/lttextcomp.dtx
@@ -1,6 +1,6 @@
% \iffalse meta-comment
%
-% Copyright (C) 2019
+% Copyright (C) 2019-2020
% The LaTeX3 Project and any individual authors listed elsewhere
% in this file.
%
@@ -33,7 +33,7 @@
%
%
\ProvidesFile{lttextcomp.dtx}
- [2019/12/24 v1.0a LaTeX Kernel (text companion symbols)]
+ [2020/01/25 v1.0b LaTeX Kernel (text companion symbols)]
% \iffalse
\documentclass{ltxdoc}
\begin{document}
@@ -73,7 +73,7 @@
%
%
% Preserve the old definition of \cs{oldstylenums} under a different name.
-%
+%
% This macro implements old style numerals but only works if we
% assume that the standard math fonts are used. Thus it needs
% changing in case other math encodings are used.
@@ -103,7 +103,7 @@
\endgroup
}
% \end{macrocode}
-%
+%
% And here is the improved one that adjusts depending on surroundings.
% \begin{macrocode}
\DeclareRobustCommand\oldstylenums[1]{%
@@ -173,8 +173,8 @@
%<latexrelease>
%<latexrelease>\EndIncludeInRelease
% \end{macrocode}
-%
-%
+%
+%
@@ -211,14 +211,14 @@
% ends in \texttt{-*} then the star gets replaced by these common
% ending, e.g.,
%\begin{verbatim}
-% \DeclareEncodingSubeset{TS1}{Alegreya-*}{2}
+% \DeclareEncodingSubset{TS1}{Alegreya-*}{2}
%\end{verbatim}
% is the same as writing
%\begin{verbatim}
-% \DeclareEncodingSubeset{TS1}{Alegreya-LF}{2}
-% \DeclareEncodingSubeset{TS1}{Alegreya-OsF}{2}
-% \DeclareEncodingSubeset{TS1}{Alegreya-TLF}{2}
-% \DeclareEncodingSubeset{TS1}{Alegreya-TOsF}{2}
+% \DeclareEncodingSubset{TS1}{Alegreya-LF}{2}
+% \DeclareEncodingSubset{TS1}{Alegreya-OsF}{2}
+% \DeclareEncodingSubset{TS1}{Alegreya-TLF}{2}
+% \DeclareEncodingSubset{TS1}{Alegreya-TOsF}{2}
%\end{verbatim}
% If only some are needed then one can define them individually but
% in many cases all four are wanted, hence the shortcut.
@@ -229,13 +229,13 @@
% \begin{macrocode}
\def\DeclareEncodingSubset#1#2{%
\DeclareEncodingSubset@aux{#1}#2*\DeclareEncodingSubset@aux
-}
+}
% \end{macrocode}
-%
+%
% \begin{macrocode}
\def\DeclareEncodingSubset@aux#1#2*#3\DeclareEncodingSubset@aux#4{%
% \end{macrocode}
-% if \verb=#3= is empty then there was no star, otherwise we we
+% if \verb=#3= is empty then there was no star, otherwise we
% define all four variants.
% \begin{macrocode}
\expandafter\ifx\expandafter X\detokenize{#3}X%
@@ -259,7 +259,7 @@
{\@font@info{Changing #2 sub-encoding to #1/#3}}%
\@namedef{#1:#2}{#3}}
% \end{macrocode}
-%
+%
% Any reason to allow those in the middle of documents?
% \begin{macrocode}
\@onlypreamble\DeclareEncodingSubset
@@ -331,7 +331,9 @@
% \begin{macro}{\tc@subst}
-%
+%
+% \changes{v1.0b}{2020/01/22}{The overall default is \cs{textcompsubstdefault}
+% not \cs{substdefault}}
% \begin{macrocode}
\def\tc@subst#1{%
\tc@errorwarn
@@ -347,7 +349,7 @@
\else\ifx\f@family\ttdef@ult
\fontfamily\ttsubstdefault
\else
- \fontfamily\substdefault
+ \fontfamily\textcompsubstdefault
\fi\fi\fi
% \end{macrocode}
% Whatever default was chosen, we claim now (locally hopefully)
@@ -411,7 +413,7 @@
% \begin{macrocode}
%\def\tc@check@accent{\CheckEncodingSubset\UseTextAccent{TS1}\tc@error}
% \end{macrocode}
-%
+%
% \begin{macrocode}
\def\tc@check@accent#1{\CheckEncodingSubset\UseTextAccent{TS1}{\tc@swap@accent#1}}
\def\tc@swap@accent#1#2{\UseTextAccent{T1}#1}
@@ -425,30 +427,32 @@
% Here are the default definitions for the \texttt{TS1} symbols.
% First those that we assume are always available if a font
% implements \texttt{TS1}.
-%
+%
% \begin{macrocode}
\DeclareTextSymbolDefault{\textdollar}{TS1}
\UndeclareTextCommand{\textdollar} {OT1} % don't use the OT1 def any longer
% \end{macrocode}
-%
+%
% \begin{macrocode}
\DeclareTextSymbolDefault{\textsterling}{TS1}
\UndeclareTextCommand{\textsterling}{OT1} % don't use the OT1 def any longer
% \end{macrocode}
-%
+%
% \begin{macrocode}
\DeclareTextSymbolDefault{\textperthousand}{TS1}
\UndeclareTextCommand{\textperthousand}{T1} % don't use the T1 def
- % should actually not be declaed
- % in the t1enc.def file instead
- % otherwise fontenc would overwrite
- % it again (legacy tests!)
% \end{macrocode}
-%
+% Using \cs{UndeclareTextCommand} above is enough only if the
+% encoding definition files are not reloaded afterwards. In the
+% past that happened if \texttt{fontenc} was used in the document
+% preamble (not not any longer). So in some sense it is better to fully remove
+% them from the encoding files, but for rollbacks it is easier to
+% keep them in for now.
+%
% These are the standard \texttt{itemize} and footnote symbols
% originally taken from \texttt{OMS} and now from \texttt{TS1}:
% \begin{macrocode}
-\DeclareTextSymbolDefault{\textasteriskcentered}{TS1}
+\DeclareTextSymbolDefault{\textasteriskcentered}{TS1}
\DeclareTextSymbolDefault{\textbullet}{TS1}
\DeclareTextSymbolDefault{\textdaggerdbl}{TS1}
\DeclareTextSymbolDefault{\textdagger}{TS1}
@@ -460,12 +464,12 @@
% And here are the other \texttt{TS1} glyphs that are implemented
% by every font (or nearly everyone---a few are commented out and
% moved to sub-encoding 9,
-% because they aren't around in one or two fonts.
+% because they aren't around in one or two fonts.
% \begin{macrocode}
%%\DeclareTextSymbolDefault{\textbardbl}{TS1} % subst in sub-enc 9 above
\DeclareTextSymbolDefault{\textbrokenbar}{TS1}
%%\DeclareTextSymbolDefault{\textcelsius}{TS1} % subst in sub-enc 9 above
-\DeclareTextSymbolDefault{\textcent}{TS1}
+\DeclareTextSymbolDefault{\textcent}{TS1}
\DeclareTextSymbolDefault{\textcopyright}{TS1}
\DeclareTextSymbolDefault{\textdegree}{TS1}
\DeclareTextSymbolDefault{\textdiv}{TS1}
@@ -489,7 +493,7 @@
%%\DeclareTextSymbolDefault{\texttwosuperior}{TS1} % subst in sub-enc 9 above
\DeclareTextSymbolDefault{\textyen}{TS1}
% \end{macrocode}
-%
+%
% \begin{macrocode}
\DeclareTextSymbolDefault{\textcapitalcompwordmark}{TS1}
\DeclareTextSymbolDefault{\textascendercompwordmark}{TS1}
@@ -516,7 +520,7 @@
% \end{macrocode}
%
%
-%
+%
%
%
% \subsection{Sub-encoding \texttt{2} (majority of new OTF fonts via autoinst)}
@@ -534,7 +538,7 @@
% the basic accents instead. whether that works or not really
% depends on the font, something like \verb=\"X= usually comes out
% wrong in Unicode engines.
-%
+%
% \begin{macrocode}
\ifx\Umathcode\@undefined
\DeclareTextCommandDefault{\capitalacute} {\tc@check@accent{\'}2\capitalacute}
@@ -558,7 +562,7 @@
\DeclareTextCommandDefault{\newtie} {\tc@check@accent{\t}2\newtie}
\DeclareTextCommandDefault{\capitalnewtie} {\tc@check@accent{\t}2\capitalnewtie}
% \end{macrocode}
-%
+%
% In Unicode engines we just execute the simple accents:
% \begin{macrocode}
\else
@@ -580,7 +584,7 @@
\def\newtie{\t}
\fi
% \end{macrocode}
-%
+%
%
%
%
@@ -705,9 +709,9 @@
\DeclareTextCommandDefault{\textuparrow} {\tc@check@symbol4\textuparrow}
\DeclareTextCommandDefault{\textwon} {\tc@check@symbol4\textwon}
% \end{macrocode}
-%
%
-%
+%
+%
%
%
% \subsection{Sub-encoding \texttt{5} (most older PS fonts)}
@@ -731,17 +735,17 @@
\DeclareTextCommandDefault{\textestimated} {\tc@check@symbol5\textestimated}
\DeclareTextCommandDefault{\textnumero} {\tc@check@symbol5\textnumero}
% \end{macrocode}
-%
+%
%
%
%
% \subsection{Sub-encoding \texttt{6}}
%
% \begin{macrocode}
-\DeclareTextCommandDefault{\textflorin} {\tc@check@symbol6\textflorin}
+\DeclareTextCommandDefault{\textflorin} {\tc@check@symbol6\textflorin}
\DeclareTextCommandDefault{\textcurrency} {\tc@check@symbol6\textcurrency}
% \end{macrocode}
-%
+%
%
%
% \subsection{Sub-encoding \texttt{7}}
@@ -752,7 +756,7 @@
\DeclareTextCommandDefault{\textmu} {\tc@check@symbol7\textmu}
\DeclareTextCommandDefault{\textminus} {\tc@check@symbol7\textminus}
% \end{macrocode}
-%
+%
%
%
% \subsection{Sub-encoding \texttt{8}}
@@ -784,9 +788,9 @@
\DeclareTextCommandDefault{\texttwosuperior}{\tc@check@symbol{9}\texttwosuperior}
\DeclareTextCommandDefault{\textbardbl}{\tc@check@symbol{9}\textbardbl}
% \end{macrocode}
-%
%
-%
+%
+%
%
% \section{Unicode engine specials}
%
@@ -845,8 +849,8 @@
\DeclareTextSymbol{\textdollaroldstyle}{TS1}{138}
\DeclareTextSymbol{\textcentoldstyle} {TS1}{139}
% \end{macrocode}
-%
-%
+%
+%
% \begin{macrocode}
\fi % --- END of Unicode engines specials
% \end{macrocode}
@@ -857,9 +861,9 @@
% \ldots
%
% But first the default for anything that is not declared. We use
-% \texttt{9} which is most like much too conservative but with the
+% \texttt{9} which is most likely much too conservative, but with the
% advantage that we aren't getting missing glyphs (or at least that
-% this very very unlikely).
+% this is very unlikely).
% For nearly all font in the \TeX{} Live distribution of 2019
% ``correct'' classifications are given below, so that this default
% is only used for new font families, and over time the right
@@ -895,7 +899,7 @@
\DeclareEncodingSubset{TS1}{txss} {0}
\DeclareEncodingSubset{TS1}{txtt} {0}
% \end{macrocode}
-%
+%
% \begin{macrocode}
\DeclareEncodingSubset{TS1}{lmr} {1}
\DeclareEncodingSubset{TS1}{lmdh} {1}
@@ -904,43 +908,43 @@
\DeclareEncodingSubset{TS1}{lmvtt} {1}
\DeclareEncodingSubset{TS1}{lmtt} {1} % missing TM, SM, pertenthousand for some reason
% \end{macrocode}
-%
+%
% \begin{macrocode}
\DeclareEncodingSubset{TS1}{ptmx} {2}
\DeclareEncodingSubset{TS1}{ptmj} {2}
\DeclareEncodingSubset{TS1}{ul8} {2}
% \end{macrocode}
-%
+%
% \begin{macrocode}
-\DeclareEncodingSubset{TS1}{bch} {5} % tofu for blank, ohm
-\DeclareEncodingSubset{TS1}{futj} {5} % tofu for blank, interrobang/down, ohm
-\DeclareEncodingSubset{TS1}{futs} {5} % tofu for blank, ohm
+\DeclareEncodingSubset{TS1}{bch} {5} % tofu for blank, ohm
+\DeclareEncodingSubset{TS1}{futj} {5} % tofu for blank, interrobang/down, ohm
+\DeclareEncodingSubset{TS1}{futs} {5} % tofu for blank, ohm
\DeclareEncodingSubset{TS1}{futx} {5} % probably (currently broken distrib)
-\DeclareEncodingSubset{TS1}{pag} {5} % tofu for blank, interrobang/down, ohm
-\DeclareEncodingSubset{TS1}{pbk} {5} % tofu for blank, interrobang/down, ohm
-\DeclareEncodingSubset{TS1}{pcr} {5} % tofu for blank, interrobang/down, ohm
-\DeclareEncodingSubset{TS1}{phv} {5} % tofu for blank, interrobang/down, ohm
-\DeclareEncodingSubset{TS1}{pnc} {5} % tofu for blank, interrobang/down, ohm
+\DeclareEncodingSubset{TS1}{pag} {5} % tofu for blank, interrobang/down, ohm
+\DeclareEncodingSubset{TS1}{pbk} {5} % tofu for blank, interrobang/down, ohm
+\DeclareEncodingSubset{TS1}{pcr} {5} % tofu for blank, interrobang/down, ohm
+\DeclareEncodingSubset{TS1}{phv} {5} % tofu for blank, interrobang/down, ohm
+\DeclareEncodingSubset{TS1}{pnc} {5} % tofu for blank, interrobang/down, ohm
\DeclareEncodingSubset{TS1}{pplj} {5} % tofu for blank
\DeclareEncodingSubset{TS1}{pplx} {5} % tofu for blank
\DeclareEncodingSubset{TS1}{ppl} {5} % tofu for blank interrobang/down
-\DeclareEncodingSubset{TS1}{ptm} {5} % tofu for blank, interrobang/down, ohm
-\DeclareEncodingSubset{TS1}{pzc} {5} % tofu for blank, interrobang/down, ohm
-\DeclareEncodingSubset{TS1}{ul9} {5} % tofu for blank, interrobang/down, ohm
+\DeclareEncodingSubset{TS1}{ptm} {5} % tofu for blank, interrobang/down, ohm
+\DeclareEncodingSubset{TS1}{pzc} {5} % tofu for blank, interrobang/down, ohm
+\DeclareEncodingSubset{TS1}{ul9} {5} % tofu for blank, interrobang/down, ohm
% \end{macrocode}
-%
+%
% \begin{macrocode}
-\DeclareEncodingSubset{TS1}{dayroms} {6} % tofu for blank, interrobang/down, ohm
-\DeclareEncodingSubset{TS1}{dayrom} {6} % tofu for blank, interrobang/down, ohm
+\DeclareEncodingSubset{TS1}{dayroms} {6} % tofu for blank, interrobang/down, ohm
+\DeclareEncodingSubset{TS1}{dayrom} {6} % tofu for blank, interrobang/down, ohm
% \end{macrocode}
-%
+%
% \begin{macrocode}
\DeclareEncodingSubset{TS1}{augie} {8} % really only missing euro
\DeclareEncodingSubset{TS1}{put} {8}
\DeclareEncodingSubset{TS1}{uag} {8} % probably (currently broken distrib)
-\DeclareEncodingSubset{TS1}{ugq} {8}
+\DeclareEncodingSubset{TS1}{ugq} {8}
% \end{macrocode}
-%
+%
% \begin{macrocode}
\DeclareEncodingSubset{TS1}{zi4} {9}
% \end{macrocode}
@@ -960,7 +964,7 @@
%
% Below are the newer fonts that have support files for
% \LaTeX{}. With very few exceptions the classifications are done
-% so that that all characters are correctly produced (either being
+% so that all characters are correctly produced (either being
% available in the font or substituted.
%
% There are a few fonts that contain ``tofu'' squares in places
@@ -975,11 +979,11 @@
\DeclareEncodingSubset{TS1}{cantarell-*} {0} % with a bunch of tofu inside
\DeclareEncodingSubset{TS1}{fbb-*} {0} % missing centoldstyle
% \end{macrocode}
-%
+%
% \begin{macrocode}
\DeclareEncodingSubset{TS1}{tli} {1} % with lots of tofu inside
% \end{macrocode}
-%
+%
% \begin{macrocode}
\DeclareEncodingSubset{TS1}{Alegreya-*} {2}
\DeclareEncodingSubset{TS1}{AlegreyaSans-*} {2}
@@ -990,13 +994,13 @@
\DeclareEncodingSubset{TS1}{Tempora-TLF} {2}
\DeclareEncodingSubset{TS1}{Tempora-TOsF} {2}
% \end{macrocode}
-%
+%
% \begin{macrocode}
\DeclareEncodingSubset{TS1}{Arimo-TLF} {3}
\DeclareEncodingSubset{TS1}{Carlito-*} {3}
\DeclareEncodingSubset{TS1}{FiraSans-*} {3}
\DeclareEncodingSubset{TS1}{IBMPlexSans-TLF} {3}
-\DeclareEncodingSubset{TS1}{Merriweather-OsF} {3}
+\DeclareEncodingSubset{TS1}{Merriweather-OsF} {3}
\DeclareEncodingSubset{TS1}{Montserrat-*} {3}
\DeclareEncodingSubset{TS1}{MontserratAlternates-*} {3}
\DeclareEncodingSubset{TS1}{SourceCodePro-TLF} {3}
@@ -1005,7 +1009,7 @@
\DeclareEncodingSubset{TS1}{SourceSerifPro-*} {3}
\DeclareEncodingSubset{TS1}{Tinos-TLF} {3}
% \end{macrocode}
-%
+%
% \begin{macrocode}
\DeclareEncodingSubset{TS1}{AccanthisADFStdNoThree-LF}{4}
\DeclareEncodingSubset{TS1}{Cabin-TLF} {4}
@@ -1028,7 +1032,7 @@
\DeclareEncodingSubset{TS1}{LinguisticsPro-OsF} {4}
\DeclareEncodingSubset{TS1}{LinuxBiolinumT-*} {4}
\DeclareEncodingSubset{TS1}{LinuxLibertineT-*} {4}
-\DeclareEncodingSubset{TS1}{MerriweatherSans-OsF} {4}
+\DeclareEncodingSubset{TS1}{MerriweatherSans-OsF} {4}
\DeclareEncodingSubset{TS1}{MintSpirit-*} {4}
\DeclareEncodingSubset{TS1}{MintSpiritNoTwo-*} {4}
\DeclareEncodingSubset{TS1}{PTMono-TLF} {4}
@@ -1046,9 +1050,9 @@
\DeclareEncodingSubset{TS1}{SticksTooText-*} {4}
\DeclareEncodingSubset{TS1}{UniversalisADFStd-LF} {4}
% \end{macrocode}
-%
+%
% \begin{macrocode}
-\DeclareEncodingSubset{TS1}{Almendra-OsF} {5}
+\DeclareEncodingSubset{TS1}{Almendra-OsF} {5}
\DeclareEncodingSubset{TS1}{Baskervaldx-*} {5}
\DeclareEncodingSubset{TS1}{BaskervilleF-*} {5}
\DeclareEncodingSubset{TS1}{Bitter-TLF} {5}
@@ -1071,7 +1075,7 @@
\DeclareEncodingSubset{TS1}{TheanoOldStyle-TLF} {5}
\DeclareEncodingSubset{TS1}{TheanoOldStyle-TOsF} {5}
% \end{macrocode}
-%
+%
% \begin{macrocode}
\DeclareEncodingSubset{TS1}{Crimson-TLF} {6}
\DeclareEncodingSubset{TS1}{IBMPlexMono-TLF} {6}
@@ -1083,7 +1087,7 @@
\DeclareEncodingSubset{TS1}{LinuxLibertineMonoT-TLF} {6}
\DeclareEncodingSubset{TS1}{Overlock-LF} {6}
% \end{macrocode}
-%
+%
% \begin{macrocode}
\DeclareEncodingSubset{TS1}{CormorantGaramond-*} {7}
\DeclareEncodingSubset{TS1}{Heuristica-TLF} {7}
@@ -1100,16 +1104,16 @@
\DeclareEncodingSubset{TS1}{QuattrocentoSans-TLF} {7}
\DeclareEncodingSubset{TS1}{XCharter-TLF} {7}
\DeclareEncodingSubset{TS1}{XCharter-TOsF} {7}
-\DeclareEncodingSubset{TS1}{erewhon-*} {7}
-\DeclareEncodingSubset{TS1}{ComicNeue-TLF} {7}
-\DeclareEncodingSubset{TS1}{ComicNeueAngular-TLF} {7}
-\DeclareEncodingSubset{TS1}{Forum-LF} {7} % the superiors are missing
+\DeclareEncodingSubset{TS1}{erewhon-*} {7}
+\DeclareEncodingSubset{TS1}{ComicNeue-TLF} {7}
+\DeclareEncodingSubset{TS1}{ComicNeueAngular-TLF} {7}
+\DeclareEncodingSubset{TS1}{Forum-LF} {7} % the superiors are missing
% \end{macrocode}
-%
+%
% \begin{macrocode}
\DeclareEncodingSubset{TS1}{Cochineal-*} {8}
% \end{macrocode}
-%
+%
% \begin{macrocode}
\DeclareEncodingSubset{TS1}{AlgolRevived-TLF} {9}
% \end{macrocode}
@@ -1120,7 +1124,7 @@
% \section{Legacy symbol support for lists and footnote symbols}
%
% \begin{macro}{\UseLegacyTextSymbols}
-%
+%
% \begin{macrocode}
\def\UseLegacyTextSymbols{%
\DeclareTextSymbolDefault{\textasteriskcentered}{OMS}%
@@ -1152,7 +1156,7 @@
% Here are new names for the legacy symbols that \LaTeX{} used to
% pick up from the \texttt{OMS} encoded fonts (and used dor itemize
% lists or footnote symbols.
-%
+%
% We go the roundabout way via separate OMS declarations so that
%\begin{verbatim}
% \renewcommand\textbullet{\textlegacybullet}
@@ -1168,7 +1172,7 @@
\DeclareTextSymbol{\textlegacyperiodcentered}{OMS}{1} % "01
\DeclareTextSymbol{\textlegacysection}{OMS}{120} % "78
% \end{macrocode}
-%
+%
% \begin{macrocode}
\DeclareTextSymbolDefault{\textlegacyasteriskcentered}{OMS}
\DeclareTextSymbolDefault{\textlegacybardbl}{OMS}
@@ -1217,7 +1221,7 @@
%<latexrelease> \fi
%<latexrelease> \char`\$\egroup}
%<latexrelease>\DeclareTextCommand{\textperthousand}{T1}
-%<latexrelease> {\%\char 24 }
+%<latexrelease> {\%\char 24 }
%<latexrelease>
%<latexrelease>\DeclareTextSymbolDefault{\textasteriskcentered}{OMS}
%<latexrelease>\DeclareTextSymbolDefault{\textbullet}{OMS}
@@ -1333,8 +1337,8 @@
%<latexrelease>\DeclareTextCommand{\textpertenthousand}{T1}
%<latexrelease> {\%\char 24\char 24 }
%<latexrelease>
-%<latexrelease>\let\textlangle\@undefined
-%<latexrelease>\let\textrangle\@undefined
+%<latexrelease>\let\textlangle\@undefined
+%<latexrelease>\let\textrangle\@undefined
%<latexrelease>
%<latexrelease>\let\textcolonmonetary\@undefined
%<latexrelease>\let\textdong\@undefined
@@ -1379,7 +1383,7 @@
%<latexrelease>\let\textlegacyparagraph\@undefined
%<latexrelease>\let\textlegacyperiodcentered\@undefined
%<latexrelease>\let\textlegacysection\@undefined
-%<latexrelease>
+%<latexrelease>
%<latexrelease>\EndIncludeInRelease
%<*2ekernel>
%</2ekernel>
@@ -1390,7 +1394,7 @@
%
% \section{The \texttt{textcomp} package}
%
-%
+%
% \begin{macrocode}
%<*TS1sty>
\NeedsTeXFormat{LaTeX2e}[1995/06/01]
@@ -1460,12 +1464,12 @@
\InputIfFileExists{textcomp.cfg}
{\PackageInfo{textcomp}{Local configuration file used}}{}
% \end{macrocode}
-%
+%
% \begin{macrocode}
%</TS1sty>
% \end{macrocode}
%
-%
+%
%
% \subsection{The old textcomp package code}
%
@@ -1529,7 +1533,7 @@
\string\textcurrency\MessageBreak
\space\space 4 = 5 + \string\texteuro\MessageBreak
\space\space 3 = 4 + \string\textohm\MessageBreak
- \space\space 2 = 3 + \noexpand\textestimated+
+ \space\space 2 = 3 + \noexpand\textestimated+
\string\textcurrency\MessageBreak
\space\space 1 = TS1 - \noexpand\textcircled-
\string\t\MessageBreak
@@ -1981,7 +1985,7 @@
% \end{macrocode}
% The |\textcircled| and |\t| are handled specially, unless the
% current font has a subset id of 0 (i.e. full \texttt{TS1}) we
-% pick the symbols up from the the math font encodings, i.e., the
+% pick the symbols up from the math font encodings, i.e., the
% third argument to |\CheckEncodingSubset| uses |\UseTextAccent| to
% get them from there.
% \begin{macrocode}
@@ -2191,7 +2195,7 @@
\InputIfFileExists{textcomp.cfg}
{\PackageInfo{textcomp}{Local configuration file used}}{}
% \end{macrocode}
-%
+%
% \begin{macrocode}
\fi
% \end{macrocode}
@@ -2208,8 +2212,3 @@
\endinput
-
-
-
-
-
diff --git a/Master/texmf-dist/source/latex-dev/base/ltvers.dtx b/Master/texmf-dist/source/latex-dev/base/ltvers.dtx
index 1a149f788d3..1bd6a492462 100644
--- a/Master/texmf-dist/source/latex-dev/base/ltvers.dtx
+++ b/Master/texmf-dist/source/latex-dev/base/ltvers.dtx
@@ -33,7 +33,7 @@
%<*driver>
% \fi
\ProvidesFile{ltvers.dtx}
- [2019/07/01 v1.1c LaTeX Kernel (Version Info)]
+ [2020/01/31 v1.1e LaTeX Kernel (Version Info)]
% \iffalse
\documentclass{ltxdoc}
\GetFileInfo{ltvers.dtx}
@@ -112,17 +112,17 @@
%</2ekernel>
%<latexrelease>\edef\latexreleaseversion
%<*2ekernel|latexrelease>
- {2020-02-01}
+ {2020-10-01}
%</2ekernel|latexrelease>
%<*2ekernel>
-\def\patch@level{-3}
+\def\patch@level{0}
% \end{macrocode}
-%
+%
% \begin{macro}{\development@branch@name}
% For more fine grain control there is the possibility to name the
% current development branch. This is only used when the
% \cs{patch@level} is negative (i.e., a pre-release format) and is
-% intended to help help us internally when we locally install a
+% intended to help us internally when we locally install a
% format out of some development branch.
% \begin{macrocode}
\edef\development@branch@name{develop \the\year-\the\month-\the\day}
@@ -177,8 +177,9 @@
% \changes{v1.0p}{2015/01/22}{Preserve any \cs{everyjob} material inserted
% by a loader (\texttt{.ini} file)}
% \changes{v1.0v}{2015/08/23}{Allow negative patchlevel for pre-release}
+% \changes{v1.1e}{2020/01/31}{Allow for upcoming format as pre-release 0}
% \begin{macrocode}
- \ifnum\patch@level=0
+ \ifnum0\ifnum\patch@level=0 \ifx\development@branch@name\@empty 1\fi\fi>0 %
\everyjob\expandafter{\the\everyjob
\typeout{\fmtname \space<\fmtversion>}}
\immediate
@@ -190,7 +191,7 @@
\write16{\fmtname \space<\fmtversion> patch level \patch@level}
\else
\everyjob\expandafter{\the\everyjob
- \typeout{\fmtname \space<\fmtversion> pre-release\patch@level
+ \typeout{\fmtname \space<\fmtversion> pre-release-\number-\patch@level\space
\ifx\development@branch@name\@undefined \else
\ifx\development@branch@name\@empty \else
\space (\development@branch@name\space branch)%
@@ -198,7 +199,7 @@
\fi
}}
\immediate
- \write16{\fmtname \space<\fmtversion> pre-release\patch@level
+ \write16{\fmtname \space<\fmtversion> pre-release-\number-\patch@level\space
\ifx\development@branch@name\@undefined \else
\ifx\development@branch@name\@empty \else
\space (\development@branch@name\space branch)%
@@ -240,7 +241,7 @@
% \end{macrocode}
%
% If a specific date has not been specified in |latexrelease|
-% use `|#1|`.
+% use `|#1|`.
% \begin{macrocode}
\def\@IncludeInRelease#1[#2]{\@IncludeInRele@se{#2}}
% \end{macrocode}
diff --git a/Master/texmf-dist/source/latex-dev/base/ltxref.dtx b/Master/texmf-dist/source/latex-dev/base/ltxref.dtx
index ae7d4ef5890..c20a3245588 100644
--- a/Master/texmf-dist/source/latex-dev/base/ltxref.dtx
+++ b/Master/texmf-dist/source/latex-dev/base/ltxref.dtx
@@ -70,7 +70,7 @@
%
% |\ref|\marg{foo}: value of most recently incremented referencable
% counter. in the current environment. (Chapter, section,
-% theorem and enumeration counters counters are
+% theorem and enumeration counters are
% referencable, footnote counters are not.)
%
% |\pageref|\marg{foo}: page number at which |\label{foo}| command
@@ -314,7 +314,7 @@
%<latexrelease>\IncludeInRelease{2019/10/01}%
%<latexrelease> {\refstepcounter}{Add \labelformat and \Ref}%
% \end{macrocode}
-%
+%
% \begin{macro}{\refstepcounter}
% Step the counter and allow for labels to point to its current value.
% \begin{macrocode}
@@ -324,14 +324,14 @@
% By generating the second csname first the |\p@...| command can
% grab it as an argument which can be helpful for more complicated
% typesetting arrangements.
-%
+%
% The trick is to ensure that |\csname the#1\endcsname| is turned
% into a single token before |\p@...| is expanded further. This
% way, if the |\p@...| command is a macro with one argument it will
% receive |\the...|. With the original kernel code (i.e., without the
% |\expandafter|) it will instead pick up |\csname| which would be
% disastrous.
-%
+%
% Using |\expandafter| instead of braces delimiting the argument is
% better because, assuming that the |\p@...| command is not defined
% as a macro with one argument, the braces will stay and prohibit
@@ -394,11 +394,11 @@
%<latexrelease>\EndIncludeInRelease
%<*2ekernel>
% \end{macrocode}
-%
-%
-%
-%
-%
+%
+%
+%
+%
+%
%
%
% \begin{macro}{\@currentlabel}
diff --git a/Master/texmf-dist/source/latex-dev/base/makeindx.ins b/Master/texmf-dist/source/latex-dev/base/makeindx.ins
index 2f70c394936..5e86d50579e 100644
--- a/Master/texmf-dist/source/latex-dev/base/makeindx.ins
+++ b/Master/texmf-dist/source/latex-dev/base/makeindx.ins
@@ -5,34 +5,34 @@
%%
%% Copyright (C) 1993-2020
%% The LaTeX3 Project and any individual authors listed elsewhere
-%% in this file.
-%%
+%% in this file.
+%%
%% This file is part of the LaTeX base system.
%% -------------------------------------------
-%%
+%%
%% It may be distributed and/or modified under the
%% conditions of the LaTeX Project Public License, either version 1.3c
%% of this license or (at your option) any later version.
%% The latest version of this license is in
%% https://www.latex-project.org/lppl.txt
-%% and version 1.3c or later is part of all distributions of LaTeX
+%% and version 1.3c or later is part of all distributions of LaTeX
%% version 2008 or later.
-%%
+%%
%% This file has the LPPL maintenance status "maintained".
-%%
+%%
%% As this file contains legal notices, it is NOT PERMITTED to modify
%% this file in any way that the legal information placed into
%% generated files is changed (i.e., the files generated when the
%% original file is executed). This restriction does not apply if
%% (parts of) the content is reused in a different WORK producing its
%% own generated files.
-%%
+%%
%% The list of all files belonging to the LaTeX base distribution is
%% given in the file `manifest.txt'. See also `legal.txt' for additional
%% information.
-%%
-%%
-%%
+%%
+%%
+%%
%%
%% --------------- start of docstrip commands ------------------
%%
@@ -50,7 +50,7 @@ reports for it can be opened at https://latex-project.org/bugs.html
Copyright (C) 1993-2020
The LaTeX3 Project and any individual authors listed elsewhere
-in this file.
+in this file.
This file was generated from file(s) of the LaTeX base system.
--------------------------------------------------------------
@@ -60,7 +60,7 @@ conditions of the LaTeX Project Public License, either version 1.3c
of this license or (at your option) any later version.
The latest version of this license is in
https://www.latex-project.org/lppl.txt
-and version 1.3c or later is part of all distributions of LaTeX
+and version 1.3c or later is part of all distributions of LaTeX
version 2008 or later.
This file has the LPPL maintenance status "maintained".
@@ -73,8 +73,8 @@ The list of all files belonging to the LaTeX base distribution is
given in the file `manifest.txt'. See also `legal.txt' for additional
information.
-The list of derived (unpacked) files belonging to the distribution
-and covered by LPPL is defined by the unpacking scripts (with
+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
diff --git a/Master/texmf-dist/source/latex-dev/base/newdc.ins b/Master/texmf-dist/source/latex-dev/base/newdc.ins
index 3a4cd9341ea..962510313c0 100644
--- a/Master/texmf-dist/source/latex-dev/base/newdc.ins
+++ b/Master/texmf-dist/source/latex-dev/base/newdc.ins
@@ -5,34 +5,34 @@
%%
%% Copyright (C) 1993-2020
%% The LaTeX3 Project and any individual authors listed elsewhere
-%% in this file.
-%%
+%% in this file.
+%%
%% This file is part of the LaTeX base system.
%% -------------------------------------------
-%%
+%%
%% It may be distributed and/or modified under the
%% conditions of the LaTeX Project Public License, either version 1.3c
%% of this license or (at your option) any later version.
%% The latest version of this license is in
%% https://www.latex-project.org/lppl.txt
-%% and version 1.3c or later is part of all distributions of LaTeX
+%% and version 1.3c or later is part of all distributions of LaTeX
%% version 2008 or later.
-%%
+%%
%% This file has the LPPL maintenance status "maintained".
-%%
+%%
%% As this file contains legal notices, it is NOT PERMITTED to modify
%% this file in any way that the legal information placed into
%% generated files is changed (i.e., the files generated when the
%% original file is executed). This restriction does not apply if
%% (parts of) the content is reused in a different WORK producing its
%% own generated files.
-%%
+%%
%% The list of all files belonging to the LaTeX base distribution is
%% given in the file `manifest.txt'. See also `legal.txt' for additional
%% information.
-%%
-%%
-%%
+%%
+%%
+%%
%%
%% --------------- start of docstrip commands ------------------
%%
@@ -50,7 +50,7 @@ reports for it can be opened at https://latex-project.org/bugs.html
Copyright (C) 1993-2020
The LaTeX3 Project and any individual authors listed elsewhere
-in this file.
+in this file.
This file was generated from file(s) of the LaTeX base system.
--------------------------------------------------------------
@@ -60,7 +60,7 @@ conditions of the LaTeX Project Public License, either version 1.3c
of this license or (at your option) any later version.
The latest version of this license is in
https://www.latex-project.org/lppl.txt
-and version 1.3c or later is part of all distributions of LaTeX
+and version 1.3c or later is part of all distributions of LaTeX
version 2008 or later.
This file may only be distributed together with a copy of the LaTeX
@@ -87,7 +87,7 @@ making successful document exchange impossible.
\Msg{*** Generating font defs for Cork encoded
and Text Companion fonts ***}
-
+
\generate{
\file{t1cmfib.fd}{
\from{cmfonts.fdd}{fd,T1cmfib,new}}
@@ -112,7 +112,7 @@ making successful document exchange impossible.
\file{ts1cmvtt.fd}{
\from{cmfonts.fdd}{fd,TS1cmvtt,new,tt}}
}
-
+
\ifToplevel{
\Msg{***********************************************************}
@@ -128,6 +128,5 @@ making successful document exchange impossible.
\Msg{* Happy TeXing}
\Msg{***********************************************************}
}
-
-\endbatchfile
+\endbatchfile
diff --git a/Master/texmf-dist/source/latex-dev/base/nfssfont.ins b/Master/texmf-dist/source/latex-dev/base/nfssfont.ins
index ba890603abd..d6760bcfde8 100644
--- a/Master/texmf-dist/source/latex-dev/base/nfssfont.ins
+++ b/Master/texmf-dist/source/latex-dev/base/nfssfont.ins
@@ -5,34 +5,34 @@
%%
%% Copyright (C) 1993-2020
%% The LaTeX3 Project and any individual authors listed elsewhere
-%% in this file.
-%%
+%% in this file.
+%%
%% This file is part of the LaTeX base system.
%% -------------------------------------------
-%%
+%%
%% It may be distributed and/or modified under the
%% conditions of the LaTeX Project Public License, either version 1.3c
%% of this license or (at your option) any later version.
%% The latest version of this license is in
%% https://www.latex-project.org/lppl.txt
-%% and version 1.3c or later is part of all distributions of LaTeX
+%% and version 1.3c or later is part of all distributions of LaTeX
%% version 2008 or later.
-%%
+%%
%% This file has the LPPL maintenance status "maintained".
-%%
+%%
%% As this file contains legal notices, it is NOT PERMITTED to modify
%% this file in any way that the legal information placed into
%% generated files is changed (i.e., the files generated when the
%% original file is executed). This restriction does not apply if
%% (parts of) the content is reused in a different WORK producing its
%% own generated files.
-%%
+%%
%% The list of all files belonging to the LaTeX base distribution is
%% given in the file `manifest.txt'. See also `legal.txt' for additional
%% information.
-%%
-%%
-%%
+%%
+%%
+%%
%%
%% --------------- start of docstrip commands ------------------
%%
@@ -50,7 +50,7 @@ reports for it can be opened at https://latex-project.org/bugs.html
Copyright (C) 1993-2020
The LaTeX3 Project and any individual authors listed elsewhere
-in this file.
+in this file.
This file was generated from file(s) of the LaTeX base system.
--------------------------------------------------------------
@@ -60,7 +60,7 @@ conditions of the LaTeX Project Public License, either version 1.3c
of this license or (at your option) any later version.
The latest version of this license is in
https://www.latex-project.org/lppl.txt
-and version 1.3c or later is part of all distributions of LaTeX
+and version 1.3c or later is part of all distributions of LaTeX
version 2008 or later.
This file has the LPPL maintenance status "maintained".
@@ -73,8 +73,8 @@ The list of all files belonging to the LaTeX base distribution is
given in the file `manifest.txt'. See also `legal.txt' for additional
information.
-The list of derived (unpacked) files belonging to the distribution
-and covered by LPPL is defined by the unpacking scripts (with
+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
diff --git a/Master/texmf-dist/source/latex-dev/base/olddc.ins b/Master/texmf-dist/source/latex-dev/base/olddc.ins
index 9ebc62468db..85cb077b59c 100644
--- a/Master/texmf-dist/source/latex-dev/base/olddc.ins
+++ b/Master/texmf-dist/source/latex-dev/base/olddc.ins
@@ -5,40 +5,40 @@
%%
%% Copyright (C) 1993-2020
%% The LaTeX3 Project and any individual authors listed elsewhere
-%% in this file.
-%%
+%% in this file.
+%%
%% This file is part of the LaTeX base system.
%% -------------------------------------------
-%%
+%%
%% It may be distributed and/or modified under the
%% conditions of the LaTeX Project Public License, either version 1.3c
%% of this license or (at your option) any later version.
%% The latest version of this license is in
%% https://www.latex-project.org/lppl.txt
-%% and version 1.3c or later is part of all distributions of LaTeX
+%% and version 1.3c or later is part of all distributions of LaTeX
%% version 2008 or later.
-%%
+%%
%% This file has the LPPL maintenance status "maintained".
-%%
+%%
%% As this file contains legal notices, it is NOT PERMITTED to modify
%% this file in any way that the legal information placed into
%% generated files is changed (i.e., the files generated when the
%% original file is executed). This restriction does not apply if
%% (parts of) the content is reused in a different WORK producing its
%% own generated files.
-%%
+%%
%% The list of all files belonging to the LaTeX base distribution is
%% given in the file `manifest.txt'. See also `legal.txt' for additional
%% information.
-%%
-%%
-%%
+%%
+%%
+%%
%%
%% --------------- start of docstrip commands ------------------
%%
\input docstrip
-
+
\preamble
This is a generated file.
@@ -50,7 +50,7 @@ reports for it can be opened at https://latex-project.org/bugs.html
Copyright (C) 1993-2020
The LaTeX3 Project and any individual authors listed elsewhere
-in this file.
+in this file.
This file was generated from file(s) of the LaTeX base system.
--------------------------------------------------------------
@@ -60,7 +60,7 @@ conditions of the LaTeX Project Public License, either version 1.3c
of this license or (at your option) any later version.
The latest version of this license is in
https://www.latex-project.org/lppl.txt
-and version 1.3c or later is part of all distributions of LaTeX
+and version 1.3c or later is part of all distributions of LaTeX
version 2008 or later.
This file may only be distributed together with a copy of the LaTeX
@@ -86,7 +86,7 @@ making successful document exchange impossible.
\usedir{tex/latex/base}
\Msg{*** Generating font defs for Cork encoded fonts ***}
-
+
\generate{
\file{t1cmfib.fd}{
\from{cmfonts.fdd}{fd,T1cmfib,old}}
@@ -103,9 +103,9 @@ making successful document exchange impossible.
\file{t1cmvtt.fd}{
\from{cmfonts.fdd}{fd,T1cmvtt,old}}
}
-
-
-
+
+
+
\ifToplevel{
\Msg{***********************************************************}
\Msg{*}
@@ -120,5 +120,5 @@ making successful document exchange impossible.
\Msg{* Happy TeXing}
\Msg{***********************************************************}
}
-
+
\endbatchfile
diff --git a/Master/texmf-dist/source/latex-dev/base/proc.ins b/Master/texmf-dist/source/latex-dev/base/proc.ins
index 0b447057529..2c419c92b94 100644
--- a/Master/texmf-dist/source/latex-dev/base/proc.ins
+++ b/Master/texmf-dist/source/latex-dev/base/proc.ins
@@ -5,34 +5,34 @@
%%
%% Copyright (C) 1993-2020
%% The LaTeX3 Project and any individual authors listed elsewhere
-%% in this file.
-%%
+%% in this file.
+%%
%% This file is part of the LaTeX base system.
%% -------------------------------------------
-%%
+%%
%% It may be distributed and/or modified under the
%% conditions of the LaTeX Project Public License, either version 1.3c
%% of this license or (at your option) any later version.
%% The latest version of this license is in
%% https://www.latex-project.org/lppl.txt
-%% and version 1.3c or later is part of all distributions of LaTeX
+%% and version 1.3c or later is part of all distributions of LaTeX
%% version 2008 or later.
-%%
+%%
%% This file has the LPPL maintenance status "maintained".
-%%
+%%
%% As this file contains legal notices, it is NOT PERMITTED to modify
%% this file in any way that the legal information placed into
%% generated files is changed (i.e., the files generated when the
%% original file is executed). This restriction does not apply if
%% (parts of) the content is reused in a different WORK producing its
%% own generated files.
-%%
+%%
%% The list of all files belonging to the LaTeX base distribution is
%% given in the file `manifest.txt'. See also `legal.txt' for additional
%% information.
-%%
-%%
-%%
+%%
+%%
+%%
%%
%% --------------- start of docstrip commands ------------------
%%
@@ -50,7 +50,7 @@ reports for it can be opened at https://latex-project.org/bugs.html
Copyright (C) 1993-2020
The LaTeX3 Project and any individual authors listed elsewhere
-in this file.
+in this file.
This file was generated from file(s) of the LaTeX base system.
--------------------------------------------------------------
@@ -60,7 +60,7 @@ conditions of the LaTeX Project Public License, either version 1.3c
of this license or (at your option) any later version.
The latest version of this license is in
https://www.latex-project.org/lppl.txt
-and version 1.3c or later is part of all distributions of LaTeX
+and version 1.3c or later is part of all distributions of LaTeX
version 2008 or later.
This file has the LPPL maintenance status "maintained".
@@ -73,8 +73,8 @@ The list of all files belonging to the LaTeX base distribution is
given in the file `manifest.txt'. See also `legal.txt' for additional
information.
-The list of derived (unpacked) files belonging to the distribution
-and covered by LPPL is defined by the unpacking scripts (with
+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
diff --git a/Master/texmf-dist/source/latex-dev/base/slides.dtx b/Master/texmf-dist/source/latex-dev/base/slides.dtx
index d96773c590a..a0dbdabe5f0 100644
--- a/Master/texmf-dist/source/latex-dev/base/slides.dtx
+++ b/Master/texmf-dist/source/latex-dev/base/slides.dtx
@@ -2414,7 +2414,7 @@ COLOR LAYER\\[.75in]%
% (re)declare these booleans as they not defined in old format
% (or with latexrelease package)
% \begin{macrocode}
-\newif\if@ovvline \@ovvlinetrue
+\newif\if@ovvline \@ovvlinetrue
\newif\if@ovhline \@ovhlinetrue
% \end{macrocode}
% \begin{macrocode}
diff --git a/Master/texmf-dist/source/latex-dev/base/slides.ins b/Master/texmf-dist/source/latex-dev/base/slides.ins
index aed69c54c97..0eaa1eb1d7f 100644
--- a/Master/texmf-dist/source/latex-dev/base/slides.ins
+++ b/Master/texmf-dist/source/latex-dev/base/slides.ins
@@ -5,34 +5,34 @@
%%
%% Copyright (C) 1993-2020
%% The LaTeX3 Project and any individual authors listed elsewhere
-%% in this file.
-%%
+%% in this file.
+%%
%% This file is part of the LaTeX base system.
%% -------------------------------------------
-%%
+%%
%% It may be distributed and/or modified under the
%% conditions of the LaTeX Project Public License, either version 1.3c
%% of this license or (at your option) any later version.
%% The latest version of this license is in
%% https://www.latex-project.org/lppl.txt
-%% and version 1.3c or later is part of all distributions of LaTeX
+%% and version 1.3c or later is part of all distributions of LaTeX
%% version 2008 or later.
-%%
+%%
%% This file has the LPPL maintenance status "maintained".
-%%
+%%
%% As this file contains legal notices, it is NOT PERMITTED to modify
%% this file in any way that the legal information placed into
%% generated files is changed (i.e., the files generated when the
%% original file is executed). This restriction does not apply if
%% (parts of) the content is reused in a different WORK producing its
%% own generated files.
-%%
+%%
%% The list of all files belonging to the LaTeX base distribution is
%% given in the file `manifest.txt'. See also `legal.txt' for additional
%% information.
-%%
-%%
-%%
+%%
+%%
+%%
%%
%% --------------- start of docstrip commands ------------------
%%
@@ -50,7 +50,7 @@ reports for it can be opened at https://latex-project.org/bugs.html
Copyright (C) 1993-2020
The LaTeX3 Project and any individual authors listed elsewhere
-in this file.
+in this file.
This file was generated from file(s) of the LaTeX base system.
--------------------------------------------------------------
@@ -60,7 +60,7 @@ conditions of the LaTeX Project Public License, either version 1.3c
of this license or (at your option) any later version.
The latest version of this license is in
https://www.latex-project.org/lppl.txt
-and version 1.3c or later is part of all distributions of LaTeX
+and version 1.3c or later is part of all distributions of LaTeX
version 2008 or later.
This file has the LPPL maintenance status "maintained".
@@ -73,8 +73,8 @@ The list of all files belonging to the LaTeX base distribution is
given in the file `manifest.txt'. See also `legal.txt' for additional
information.
-The list of derived (unpacked) files belonging to the distribution
-and covered by LPPL is defined by the unpacking scripts (with
+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
@@ -94,11 +94,11 @@ extension .ins) which are part of the distribution.
\preamble
-This is a generated file.
+This is a generated file.
Copyright (C) 1993-2020
The LaTeX3 Project and any individual authors listed elsewhere
-in this file.
+in this file.
This file was generated from file(s) of the LaTeX base system.
--------------------------------------------------------------
@@ -108,7 +108,7 @@ conditions of the LaTeX Project Public License, either version 1.3c
of this license or (at your option) any later version.
The latest version of this license is in
https://www.latex-project.org/lppl.txt
-and version 1.3c or later is part of all distributions of LaTeX
+and version 1.3c or later is part of all distributions of LaTeX
version 2008 or later.
This file may only be distributed together with a copy of the LaTeX
@@ -140,7 +140,7 @@ reports for it can be opened at https://latex-project.org/bugs.html
Copyright (C) 1993-2020
The LaTeX3 Project and any individual authors listed elsewhere
-in this file.
+in this file.
This file was generated from file(s) of the LaTeX base system.
--------------------------------------------------------------
@@ -150,7 +150,7 @@ conditions of the LaTeX Project Public License, either version 1.3c
of this license or (at your option) any later version.
The latest version of this license is in
https://www.latex-project.org/lppl.txt
-and version 1.3c or later is part of all distributions of LaTeX
+and version 1.3c or later is part of all distributions of LaTeX
version 2008 or later.
This file may only be distributed together with a copy of the LaTeX
diff --git a/Master/texmf-dist/source/latex-dev/base/slifonts.fdd b/Master/texmf-dist/source/latex-dev/base/slifonts.fdd
index abb950d6a1b..d3951cfa574 100644
--- a/Master/texmf-dist/source/latex-dev/base/slifonts.fdd
+++ b/Master/texmf-dist/source/latex-dev/base/slifonts.fdd
@@ -2,29 +2,29 @@
%
% Copyright 1993-2019
% The LaTeX3 Project and any individual authors listed elsewhere
-% in this file.
-%
+% in this file.
+%
% This file is part of the LaTeX base system.
% -------------------------------------------
-%
+%
% It may be distributed and/or modified under the
% conditions of the LaTeX Project Public License, either version 1.3c
% of this license or (at your option) any later version.
% The latest version of this license is in
% https://www.latex-project.org/lppl.txt
-% and version 1.3c or later is part of all distributions of LaTeX
+% and version 1.3c or later is part of all distributions of LaTeX
% version 2008 or later.
-%
+%
% This file has the LPPL maintenance status "maintained".
-%
+%
% The list of all files belonging to the LaTeX base distribution is
% given in the file `manifest.txt'. See also `legal.txt' for additional
% information.
-%
-% The list of derived (unpacked) files belonging to the distribution
-% and covered by LPPL is defined by the unpacking scripts (with
+%
+% 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
%
%\iffalse This is a META comment
@@ -51,7 +51,7 @@
\documentclass{ltxdoc}
\GetFileInfo{sfonts.drv}
\providecommand\dst{\expandafter{\normalfont\scshape docstrip}}
-\title{The file \texttt{slifonts.fdd} for use with
+\title{The file \texttt{slifonts.fdd} for use with
\LaTeXe.\thanks{This file has version
number \fileversion, dated \filedate.}}
\date{\filedate}
@@ -132,7 +132,7 @@
%
% The next bit of code contains the documentation driver file for
% \TeX{}, i.e., the file that will produce the documentation you are
-% currently reading. It will be extracted from this file by the
+% currently reading. It will be extracted from this file by the
% \dst{} program.
% \changes{v2.1b}{1993/12/14}{Corrected \cs{documentclass}.}
% \begin{macrocode}
@@ -197,7 +197,7 @@
}{}
%</lccr>
% \end{macrocode}
-%
+%
% \subsection{Computer Modern Sans}
%
% \begin{macrocode}
@@ -205,7 +205,7 @@
%<!ec> \DeclareFontFamily{OT1}{lcmss}{\hyphenchar\font45 }
%<ec> \DeclareFontFamily{T1}{lcmss}{}
% \end{macrocode}
-%
+%
% \begin{macrocode}
%<!ec> \DeclareFontShape{OT1}{lcmss}{m}{n}{%
%<ec> \DeclareFontShape{T1}{lcmss}{m}{n}{%
@@ -214,7 +214,7 @@
%<ec> eclq8%
}{}
% \end{macrocode}
-%
+%
% \begin{macrocode}
%<!ec> \DeclareFontShape{OT1}{lcmss}{m}{In}{%
%<ec> \DeclareFontShape{T1}{lcmss}{m}{In}{%
@@ -223,7 +223,7 @@
%<ec> ieclq8%
}{}
% \end{macrocode}
-%
+%
% \begin{macrocode}
%<!ec> \DeclareFontShape{OT1}{lcmss}{m}{sl}{%
%<ec> \DeclareFontShape{T1}{lcmss}{m}{sl}{%
@@ -232,7 +232,7 @@
%<ec> ecli8%
}{}
% \end{macrocode}
-%
+%
% \begin{macrocode}
%<!ec> \DeclareFontShape{OT1}{lcmss}{m}{Isl}{%
%<ec> \DeclareFontShape{T1}{lcmss}{m}{Isl}{%
@@ -241,19 +241,19 @@
%<ec> iecli8%
}{}
% \end{macrocode}
-%
+%
% \begin{macrocode}
%<!ec> \DeclareFontShape{OT1}{lcmss}{m}{it}{%
%<ec> \DeclareFontShape{T1}{lcmss}{m}{it}{%
<->sub*lcmss/m/sl}{}
% \end{macrocode}
-%
+%
% \begin{macrocode}
%<!ec> \DeclareFontShape{OT1}{lcmss}{m}{Iit}{%
%<ec> \DeclareFontShape{T1}{lcmss}{m}{Iit}{%
<->sub*lcmss/m/Isl}{}
% \end{macrocode}
-%
+%
% \begin{macrocode}
%<!ec> \DeclareFontShape{OT1}{lcmss}{bx}{n}{%
%<ec> \DeclareFontShape{T1}{lcmss}{bx}{n}{%
@@ -262,7 +262,7 @@
%<ec> eclb8%
}{}
% \end{macrocode}
-%
+%
% \begin{macrocode}
%<!ec> \DeclareFontShape{OT1}{lcmss}{bx}{In}{%
%<ec> \DeclareFontShape{T1}{lcmss}{bx}{In}{%
@@ -280,7 +280,7 @@
eclo8%
}{}
% \end{macrocode}
-%
+%
% \begin{macrocode}
\DeclareFontShape{T1}{lcmss}{bx}{Isl}{%
<13.82><16.59><19.907><23.89><28.66><34.4><41.28>%
@@ -291,7 +291,7 @@
\DeclareFontShape{T1}{lcmss}{bx}{it}{%
<->sub*lcmss/bx/sl}{}
% \end{macrocode}
-%
+%
% \begin{macrocode}
\DeclareFontShape{T1}{lcmss}{bx}{Iit}{%
<->sub*lcmss/bx/Isl}{}
@@ -314,7 +314,7 @@
%</!ec>
%</lcmss>
% \end{macrocode}
-%
+%
% \subsection{Computer Modern Typewriter}
%
% \begin{macrocode}
@@ -322,7 +322,7 @@
%<!ec> \DeclareFontFamily{OT1}{lcmtt}{\hyphenchar\font\m@ne}
%<ec> \DeclareFontFamily{T1}{lcmtt}{\hyphenchar\font\m@ne}
% \end{macrocode}
-%
+%
% \begin{macrocode}
%<!ec> \DeclareFontShape{OT1}{lcmtt}{m}{n}{%
%<ec> \DeclareFontShape{T1}{lcmtt}{m}{n}{%
@@ -331,7 +331,7 @@
%<ec> ecltt8%
}{}
% \end{macrocode}
-%
+%
% \begin{macrocode}
%<!ec> \DeclareFontShape{OT1}{lcmtt}{m}{In}{%
%<ec> \DeclareFontShape{T1}{lcmtt}{m}{In}{%
@@ -340,7 +340,7 @@
%<ec> iecltt8%
}{}
% \end{macrocode}
-%
+%
% \begin{macrocode}
%<!ec> \DeclareFontShape{OT1}{lcmtt}{m}{it}{%
%<ec> \DeclareFontShape{T1}{lcmtt}{m}{it}{%
@@ -362,47 +362,47 @@
%</!ec>
%</lcmtt>
% \end{macrocode}
-%
+%
% \subsection{Computer Modern Math}
%
% \begin{macrocode}
%<*lcmm>
\DeclareFontFamily{OML}{lcmm}{\skewchar\font'177}
% \end{macrocode}
-%
+%
% \begin{macrocode}
\DeclareFontShape{OML}{lcmm}{m}{it}{%
<7><8><10><12><13.82><16.59><19.907><23.89><28.66><34.4><41.28>cmmi8%
}{}
% \end{macrocode}
-%
+%
% \begin{macrocode}
\DeclareFontShape{OML}{lcmm}{m}{Iit}{%
<7><8><10><12><13.82><16.59><19.907><23.89><28.66><34.4><41.28>icmmi8%
}{}
%</lcmm>
% \end{macrocode}
-%
+%
% \subsection{Computer Modern Symbol}
%
% \begin{macrocode}
%<*lcmsy>
\DeclareFontFamily{OMS}{lcmsy}{\skewchar\font'60}
% \end{macrocode}
-%
+%
% \begin{macrocode}
\DeclareFontShape{OMS}{lcmsy}{m}{n}{%
<7><8><10><12><13.82><16.59><19.907><23.89><28.66><34.4><41.28>cmsy8%
}{}
% \end{macrocode}
-%
+%
% \begin{macrocode}
\DeclareFontShape{OMS}{lcmsy}{m}{In}{%
<7><8><10><12><13.82><16.59><19.907><23.89><28.66><34.4><41.28>icmsy8%
}{}
%</lcmsy>
% \end{macrocode}
-%
+%
% \subsection{Computer Modern large symbols}
%
% \changes{v2.1g}{1994/03/01}{Removed extra pair of curly braces
@@ -414,14 +414,14 @@
<->sfixed*[17.28]cmex10%
}{}
% \end{macrocode}
-%
+%
% \begin{macrocode}
\DeclareFontShape{OMX}{lcmex}{m}{In}{%
<->sfixed*[17.28]icmex10%
}{}
%</lcmex>
% \end{macrocode}
-%
+%
% \subsection{\LaTeX{} symbols}
%
% \changes{v2.2d}{1997/10/20}{Removed superfluous pair of braces at
@@ -433,14 +433,14 @@
<12><13.82><16.59><19.907><23.89><28.66><34.4><41.28>lasy8%
}{}
% \end{macrocode}
-%
+%
% \begin{macrocode}
\DeclareFontShape{U}{llasy}{m}{In}{%
<13.82><16.59><19.907><23.89><28.66><34.4><41.28>ilasy8%
}{}
%</llasy>
% \end{macrocode}
-%
+%
% \section{Setting defaults}
%
% The following statements go into the file \texttt{sfonts.def}
@@ -455,7 +455,7 @@
\DeclareFontSubstitution{OT1}{lcmss}{m}{n}
\input ot1lcmss.fd
% \end{macrocode}
-%
+%
% Ensure some suitable starting values but don't load any font
% yet. In the past this was implicitly done as part of
% \cs{DeclareErrorFont} but not any longer.
diff --git a/Master/texmf-dist/source/latex-dev/base/syntonly.ins b/Master/texmf-dist/source/latex-dev/base/syntonly.ins
index 018a1b2ebc7..c4a69c4101a 100644
--- a/Master/texmf-dist/source/latex-dev/base/syntonly.ins
+++ b/Master/texmf-dist/source/latex-dev/base/syntonly.ins
@@ -5,34 +5,34 @@
%%
%% Copyright (C) 1993-2020
%% The LaTeX3 Project and any individual authors listed elsewhere
-%% in this file.
-%%
+%% in this file.
+%%
%% This file is part of the LaTeX base system.
%% -------------------------------------------
-%%
+%%
%% It may be distributed and/or modified under the
%% conditions of the LaTeX Project Public License, either version 1.3c
%% of this license or (at your option) any later version.
%% The latest version of this license is in
%% https://www.latex-project.org/lppl.txt
-%% and version 1.3c or later is part of all distributions of LaTeX
+%% and version 1.3c or later is part of all distributions of LaTeX
%% version 2008 or later.
-%%
+%%
%% This file has the LPPL maintenance status "maintained".
-%%
+%%
%% As this file contains legal notices, it is NOT PERMITTED to modify
%% this file in any way that the legal information placed into
%% generated files is changed (i.e., the files generated when the
%% original file is executed). This restriction does not apply if
%% (parts of) the content is reused in a different WORK producing its
%% own generated files.
-%%
+%%
%% The list of all files belonging to the LaTeX base distribution is
%% given in the file `manifest.txt'. See also `legal.txt' for additional
%% information.
-%%
-%%
-%%
+%%
+%%
+%%
%%
%% --------------- start of docstrip commands ------------------
%%
@@ -50,7 +50,7 @@ reports for it can be opened at https://latex-project.org/bugs.html
Copyright (C) 1993-2020
The LaTeX3 Project and any individual authors listed elsewhere
-in this file.
+in this file.
This file was generated from file(s) of the LaTeX base system.
--------------------------------------------------------------
@@ -60,7 +60,7 @@ conditions of the LaTeX Project Public License, either version 1.3c
of this license or (at your option) any later version.
The latest version of this license is in
https://www.latex-project.org/lppl.txt
-and version 1.3c or later is part of all distributions of LaTeX
+and version 1.3c or later is part of all distributions of LaTeX
version 2008 or later.
This file has the LPPL maintenance status "maintained".
@@ -73,8 +73,8 @@ The list of all files belonging to the LaTeX base distribution is
given in the file `manifest.txt'. See also `legal.txt' for additional
information.
-The list of derived (unpacked) files belonging to the distribution
-and covered by LPPL is defined by the unpacking scripts (with
+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
@@ -85,4 +85,3 @@ extension .ins) which are part of the distribution.
\from{syntonly.dtx}{package}}
\endbatchfile
-
diff --git a/Master/texmf-dist/source/latex-dev/base/tulm.fdd b/Master/texmf-dist/source/latex-dev/base/tulm.fdd
index dfda332ce4f..9308d801ff2 100644
--- a/Master/texmf-dist/source/latex-dev/base/tulm.fdd
+++ b/Master/texmf-dist/source/latex-dev/base/tulm.fdd
@@ -2,29 +2,29 @@
%
% Copyright 2016-2019
% The LaTeX3 Project and any individual authors listed elsewhere
-% in this file.
-%
+% in this file.
+%
% This file is part of the LaTeX base system.
% -------------------------------------------
-%
+%
% It may be distributed and/or modified under the
% conditions of the LaTeX Project Public License, either version 1.3c
% of this license or (at your option) any later version.
% The latest version of this license is in
% https://www.latex-project.org/lppl.txt
-% and version 1.3c or later is part of all distributions of LaTeX
+% and version 1.3c or later is part of all distributions of LaTeX
% version 2008 or later.
-%
+%
% This file has the LPPL maintenance status "maintained".
-%
+%
% The list of all files belonging to the LaTeX base distribution is
% given in the file `manifest.txt'. See also `legal.txt' for additional
% information.
-%
-% The list of derived (unpacked) files belonging to the distribution
-% and covered by LPPL is defined by the unpacking scripts (with
+%
+% 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
%
%\iffalse This is a META comment
diff --git a/Master/texmf-dist/source/latex-dev/base/tulm.ins b/Master/texmf-dist/source/latex-dev/base/tulm.ins
index 5192ab474a9..9e32e39a63b 100644
--- a/Master/texmf-dist/source/latex-dev/base/tulm.ins
+++ b/Master/texmf-dist/source/latex-dev/base/tulm.ins
@@ -5,34 +5,34 @@
%%
%% Copyright (C) 2016-2020
%% The LaTeX3 Project and any individual authors listed elsewhere
-%% in this file.
-%%
+%% in this file.
+%%
%% This file is part of the LaTeX base system.
%% -------------------------------------------
-%%
+%%
%% It may be distributed and/or modified under the
%% conditions of the LaTeX Project Public License, either version 1.3c
%% of this license or (at your option) any later version.
%% The latest version of this license is in
%% https://www.latex-project.org/lppl.txt
-%% and version 1.3c or later is part of all distributions of LaTeX
+%% and version 1.3c or later is part of all distributions of LaTeX
%% version 2008 or later.
-%%
+%%
%% This file has the LPPL maintenance status "maintained".
-%%
+%%
%% As this file contains legal notices, it is NOT PERMITTED to modify
%% this file in any way that the legal information placed into
%% generated files is changed (i.e., the files generated when the
%% original file is executed). This restriction does not apply if
%% (parts of) the content is reused in a different WORK producing its
%% own generated files.
-%%
+%%
%% The list of all files belonging to the LaTeX base distribution is
%% given in the file `manifest.txt'. See also `legal.txt' for additional
%% information.
-%%
-%%
-%%
+%%
+%%
+%%
%%
%% --------------- start of docstrip commands ------------------
%%
@@ -50,7 +50,7 @@ reports for it can be opened at https://latex-project.org/bugs.html
Copyright (C) 2016-2020
The LaTeX3 Project and any individual authors listed elsewhere
-in this file.
+in this file.
This file was generated from file(s) of the LaTeX base system.
--------------------------------------------------------------
@@ -60,7 +60,7 @@ conditions of the LaTeX Project Public License, either version 1.3c
of this license or (at your option) any later version.
The latest version of this license is in
https://www.latex-project.org/lppl.txt
-and version 1.3c or later is part of all distributions of LaTeX
+and version 1.3c or later is part of all distributions of LaTeX
version 2008 or later.
This file may only be distributed together with a copy of the LaTeX
@@ -93,7 +93,7 @@ making successful document exchange impossible.
\file{tulmvtt.fd}{\from{tulm.fdd}{TUlmvtt}}
\file{tulmdh.fd}{\from{tulm.fdd}{TUlmdh}}}
-
+
\ifToplevel{
\Msg{***********************************************************}
\Msg{*}
@@ -108,6 +108,5 @@ making successful document exchange impossible.
\Msg{* Happy TeXing}
\Msg{***********************************************************}
}
-
-\endbatchfile
+\endbatchfile
diff --git a/Master/texmf-dist/source/latex-dev/base/unpack.ins b/Master/texmf-dist/source/latex-dev/base/unpack.ins
index cca77e20cb4..b03dd5c6b1b 100644
--- a/Master/texmf-dist/source/latex-dev/base/unpack.ins
+++ b/Master/texmf-dist/source/latex-dev/base/unpack.ins
@@ -5,34 +5,34 @@
%%
%% Copyright (C) 1993-2020
%% The LaTeX3 Project and any individual authors listed elsewhere
-%% in this file.
-%%
+%% in this file.
+%%
%% This file is part of the LaTeX base system.
%% -------------------------------------------
-%%
+%%
%% It may be distributed and/or modified under the
%% conditions of the LaTeX Project Public License, either version 1.3c
%% of this license or (at your option) any later version.
%% The latest version of this license is in
%% https://www.latex-project.org/lppl.txt
-%% and version 1.3c or later is part of all distributions of LaTeX
+%% and version 1.3c or later is part of all distributions of LaTeX
%% version 2008 or later.
-%%
+%%
%% This file has the LPPL maintenance status "maintained".
-%%
+%%
%% As this file contains legal notices, it is NOT PERMITTED to modify
%% this file in any way that the legal information placed into
%% generated files is changed (i.e., the files generated when the
%% original file is executed). This restriction does not apply if
%% (parts of) the content is reused in a different WORK producing its
%% own generated files.
-%%
+%%
%% The list of all files belonging to the LaTeX base distribution is
%% given in the file `manifest.txt'. See also `legal.txt' for additional
%% information.
-%%
-%%
-%%
+%%
+%%
+%%
%%
%% --------------- start of bootstrap commands ------------------
%%
@@ -82,7 +82,7 @@
\batchinput{ltoutenc.ins}
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%%% other classes and packages
\batchinput{classes.ins}
diff --git a/Master/texmf-dist/source/latex-dev/base/utf8ienc.dtx b/Master/texmf-dist/source/latex-dev/base/utf8ienc.dtx
index 525e461a675..8d454d1c718 100644
--- a/Master/texmf-dist/source/latex-dev/base/utf8ienc.dtx
+++ b/Master/texmf-dist/source/latex-dev/base/utf8ienc.dtx
@@ -223,7 +223,7 @@
%<*utf8>
% \end{macrocode}
% This is a temporary fix for the e-p\TeX{} / e-up\TeX{} engines that do not yet
-% have a |\ifincsname| primitive. Once this is available the the extra file will
+% have a |\ifincsname| primitive. Once this is available the extra file will
% be dropped.
% \changes{v1.2h}{2019/07/09}{Temp rollback fix for e-pTeX}
% \begin{macrocode}
@@ -235,7 +235,7 @@
\fi
\endinput
% \end{macrocode}
-%
+%
% \begin{macrocode}
\makeatletter
% \end{macrocode}
@@ -451,7 +451,7 @@
\else
\PackageError{inputenc}{Invalid UTF-8 byte sequence}%
\UTFviii@invalid@help
- \fi
+ \fi
% \end{macrocode}
%
% \begin{macrocode}
@@ -769,7 +769,7 @@
% the character os already active. The definition of |\UTFviii@tmp|
% looks slightly strange but is designed for the sequence of |\expandafter|
% in |\DeclareUnicodeCharacter|.
-%
+%
% \begin{macrocode}
\ifnum\count@<"A0\relax
\ifnum\catcode\count@=13
@@ -784,7 +784,7 @@
% The code below is derived from \texttt{xmltex} and generates the UTF-8 byte sequence
% for the number in |\count@|.
%
-% The reverse operation (just used in error messages)
+% The reverse operation (just used in error messages)
% has now been added as \cs{decode@UTFviii}.
% \begin{macrocode}
\else\ifnum\count@<"800\relax
@@ -889,16 +889,16 @@
\gdef\dec@de@UTFviii#1{%
\ifx\relax#1%
\else
- \ifnum`#1>"EF
+ \ifnum`#1>"EF
((((`#1-"F0)%
\else
- \ifnum`#1>"DF
+ \ifnum`#1>"DF
(((`#1-"E0)%
\else
- \ifnum`#1>"BF
+ \ifnum`#1>"BF
((`#1-"C0)%
\else
- \ifnum`#1>"7F
+ \ifnum`#1>"7F
)*64+(`#1-"80)%
\else
+`#1 %
@@ -1030,7 +1030,7 @@
% \end{macrocode}
% However, we don't know if there are font encodings still to be
% loaded (either with \texttt{fontenc} or directly with |\input| by
-% some some package). Font encoding files are loaded only if the
+% some package). Font encoding files are loaded only if the
% corresponding encoding has not been loaded yet, and they always
% begin with |\DeclareFontEncoding|. We now redefine the internal
% kernel version of the latter to load the Unicode file if available.
@@ -1806,8 +1806,8 @@
% \begin{macrocode}
%<all,ts1,utf8>\DeclareUnicodeCharacter{FEFF}{\ifhmode\nobreak\fi}
% \end{macrocode}
-%
-%
+%
+%
% \endgroup
% \subsection{Notes}
%
@@ -1932,7 +1932,7 @@
% This space is intentionally empty ...
%</utf8>
% \end{macrocode}
-%
+%
% \subsection{Old \texttt{utf8.def} file as a temp fix for p\TeX{} and friends}
%
%
diff --git a/Master/texmf-dist/source/latex-dev/graphics/color.dtx b/Master/texmf-dist/source/latex-dev/graphics/color.dtx
index 8de7d013a37..ad5df89a7ee 100644
--- a/Master/texmf-dist/source/latex-dev/graphics/color.dtx
+++ b/Master/texmf-dist/source/latex-dev/graphics/color.dtx
@@ -2,7 +2,7 @@
% \iffalse
%
%% color.dtx Copyright (C) 1994--1999 David Carlisle
-%% Copyright (C) 2005-2019 David Carlisle, LaTeX3 Project
+%% Copyright (C) 2005-2020 David Carlisle, LaTeX3 Project
%%
%% This file is part of the Standard LaTeX `Graphics Bundle'.
%% It may be distributed under the terms of the LaTeX Project Public
@@ -19,7 +19,7 @@
%<driver> \ProvidesFile{color.drv}
% \fi
% \ProvidesFile{color.dtx}
- [2016/07/10 v1.1e Standard LaTeX Color (DPC)]
+ [2019/11/23 v1.2a Standard LaTeX Color (DPC)]
%
% \iffalse
%<*driver>
@@ -462,10 +462,10 @@
% correctly.
% \changes{v0.3a}{1994/07/20}
% {Stop command being \cs{long}, and make robust.}
-% \changes{v0.3l}{1995/12/07}
-% {Add \cs{leavevmode}}
+% \changes{v1.2a}{2019/11/23}
+% {Add \cs{protected} gh/208}
% \begin{macrocode}
-\def\textcolor#1#{\@textcolor{#1}}
+\protected\def\textcolor#1#{\@textcolor{#1}}
\def\@textcolor#1#2#3{\protect\leavevmode{\color#1{#2}#3}}
% \end{macrocode}
% \end{macro}
@@ -481,8 +481,10 @@
% {end the group even if the colour command generates an error}
% \changes{v0.3c}{1994/09/19}
% {Use \cs{color} to parse arguments}
+% \changes{v1.2a}{2019/11/23}
+% {Add \cs{protected} gh/208}
% \begin{macrocode}
-\def\pagecolor{%
+\protected\def\pagecolor{%
\begingroup
\let\ignorespaces\endgroup
\let\set@color\set@page@color
@@ -497,8 +499,10 @@
%
% \changes{v1.1a}{2014/04/23}
% {add \cs{nopagecolor} graphics/3873}
+% \changes{v1.2a}{2019/11/23}
+% {Add \cs{protected} gh/208}
% \begin{macrocode}
-\def\nopagecolor{%
+\protected\def\nopagecolor{%
\@ifundefined{no@page@color}{%
\PackageInfo{color}{\string\nopagecolor\space is not supported}%
}{%
@@ -533,8 +537,10 @@
% {New internal implementation of colour commands}
% \changes{v0.3f}{1994/10/04}
% {Give info about redefinitions}
+% \changes{v1.2a}{2019/11/23}
+% {Add \cs{protected} gh/208}
% \begin{macrocode}
-\def\definecolor#1#2#3{%
+\protected\def\definecolor#1#2#3{%
\@ifundefined{color@#2}%
{\c@lor@error{model `#2'}}%
{\@ifundefined{\string\color @#1}{}%
@@ -589,8 +595,10 @@
% |[named]| all the time, just give the package option |usenames|, which
% will redefine |\DefineNamedColor|, so that the colour name is declared
% as a user-colour as well as a name in the `named' model.
+% \changes{v1.2a}{2019/11/23}
+% {Add \cs{protected} gh/208}
% \begin{macrocode}
-\def\DefineNamedColor#1#2#3#4{%
+\protected\def\DefineNamedColor#1#2#3#4{%
\@ifundefined{define@color@#1}%
{\c@lor@error{model `#1'}}%
{\@ifundefined{color@#3}%
@@ -684,8 +692,10 @@
% \changes{v0.2d}{1994/05/13}
% {Stop changing \cs{reset@font}. Use the new \cs{normalfont}
% instead.}
+% \changes{v1.2a}{2019/11/23}
+% {Add \cs{protected} gh/208}
% \begin{macrocode}
-\def\normalcolor{\let\current@color\default@color\set@color}
+\protected\def\normalcolor{\let\current@color\default@color\set@color}
% \end{macrocode}
% \end{macro}
%
@@ -751,8 +761,10 @@
% colour specifies the \emph{background} colour of the box.
% \changes{v0.3b}{1994/09/14}
% {New implementation}
+% \changes{v1.2a}{2019/11/23}
+% {Add \cs{protected} gh/208}
% \begin{macrocode}
-\def\colorbox#1#{\color@box{#1}}
+\protected\def\colorbox#1#{\color@box{#1}}
% \end{macrocode}
% \end{macro}
%
@@ -771,9 +783,11 @@
% colour model for both colours.
% \changes{v0.3b}{1994/09/14}
% {New implementation}
+% \changes{v1.2a}{2019/11/23}
+% {Add \cs{protected} gh/208}
% \begin{macro}{\fcolorbox}
% \begin{macrocode}
-\def\fcolorbox#1#{\color@fbox{#1}}
+\protected\def\fcolorbox#1#{\color@fbox{#1}}
% \end{macrocode}
%
% \begin{macrocode}
diff --git a/Master/texmf-dist/source/latex-dev/graphics/drivers.dtx b/Master/texmf-dist/source/latex-dev/graphics/drivers.dtx
index d693ebd27b0..9bf32f78a1f 100644
--- a/Master/texmf-dist/source/latex-dev/graphics/drivers.dtx
+++ b/Master/texmf-dist/source/latex-dev/graphics/drivers.dtx
@@ -3,7 +3,7 @@
%
%% drivers.dtx Copyright (C) 1994 David Carlisle Sebastian Rahtz
%% Copyright (C) 1995 1996 1997 1998 1999 David Carlisle
-%% Copyright (C) 2000-2019 David Carlisle, LaTeX3 Project
+%% Copyright (C) 2000-2020 David Carlisle, LaTeX3 Project
%%
%% This file is part of the Standard LaTeX `Graphics Bundle'.
%% It may be distributed under the terms of the LaTeX Project Public
diff --git a/Master/texmf-dist/source/latex-dev/graphics/epsfig.dtx b/Master/texmf-dist/source/latex-dev/graphics/epsfig.dtx
index f9197c7b1c9..8e883bd8df7 100644
--- a/Master/texmf-dist/source/latex-dev/graphics/epsfig.dtx
+++ b/Master/texmf-dist/source/latex-dev/graphics/epsfig.dtx
@@ -2,7 +2,7 @@
% \iffalse
%
%% epsfig.dtx Copyright (C) 1994-1996 1999 Sebastian Rahtz
-%% Copyright (C) 2000-2019 David Carlisle, LaTeX3 Project
+%% Copyright (C) 2000-2020 David Carlisle, LaTeX3 Project
%%
%% This file is part of the Standard LaTeX `Graphics Bundle'.
%% It may be distributed under the terms of the LaTeX Project Public
diff --git a/Master/texmf-dist/source/latex-dev/graphics/graphics.dtx b/Master/texmf-dist/source/latex-dev/graphics/graphics.dtx
index ac570c02278..b88ef1e0666 100644
--- a/Master/texmf-dist/source/latex-dev/graphics/graphics.dtx
+++ b/Master/texmf-dist/source/latex-dev/graphics/graphics.dtx
@@ -2,7 +2,7 @@
% \iffalse
%
%% graphics.dtx Copyright (C) 1994 David Carlisle Sebastian Rahtz
-%% Copyright (C) 1995-2019 David Carlisle, LaTeX3 Project
+%% Copyright (C) 1995-2020 David Carlisle, LaTeX3 Project
%%
%% This file is part of the Standard LaTeX `Graphics Bundle'.
%% It may be distributed under the terms of the LaTeX Project Public
@@ -25,7 +25,7 @@
%<driver> \ProvidesFile{graphics.drv}
% \fi
% \ProvidesFile{graphics.dtx}
- [2019/11/01 v1.3d Standard LaTeX Graphics (DPC,SPQR)]
+ [2019/11/30 v1.4a Standard LaTeX Graphics (DPC,SPQR)]
%
% \iffalse
%<*driver>
@@ -870,9 +870,10 @@
% \changes{v1.1a}{2017/03/17}
% {\cs{leavevmode} added before the group in \cs{Gin@iii} so that
% settings in \cs{everypar} are cleared}
+% \changes{v1.4a}{2019/11/30}{Add \cs{protected} gh/208}
% Top level command for the standard interface, just look for a |*|.
% \begin{macrocode}
-\def\includegraphics{%
+\protected\def\includegraphics{%
% \end{macrocode}
% Clear |\everypar| before starting a group.
% \begin{macrocode}
@@ -1081,7 +1082,7 @@
% \end{macrocode}
% \end{macro}
% \end{macro}
-%
+%
% \begin{macro}{\Ginclude@graphics}
% The main internal function implementing graphics file inclusion.
% |#1| is the file name.
@@ -1651,8 +1652,9 @@
% \changes{v0.7a}{1995/04/11}{\cs{leavevmode} added graphics/1521}
% \changes{v1.0n}{2001/07/07}
% {Made long (CAR) graphics/2908 and 3345}
+% \changes{v1.4a}{2019/11/30}{Add \cs{protected} gh/208}
% \begin{macrocode}
-\long\def\rotatebox#1#2{%
+\protected\long\def\rotatebox#1#2{%
\leavevmode
\Grot@setangle{#1}%
\setbox\z@\hbox{{#2}}%
@@ -1866,8 +1868,9 @@
% The top level |\scalebox|. If the vertical scale factor is omitted it
% defaults to the horizontal scale factor, |#1|.
% \changes{v0.3d}{1994/03/06}{Better support for negative arguments.}
+% \changes{v1.4a}{2019/11/30}{Add \cs{protected} gh/208}
% \begin{macrocode}
-\def\scalebox#1{%
+\protected\def\scalebox#1{%
\@ifnextchar[{\Gscale@box{#1}}{\Gscale@box{#1}[#1]}}
% \end{macrocode}
% \end{macro}
@@ -1905,8 +1908,9 @@
% \begin{macro}{\reflectbox}
% Just an abbreviation for the appropriate scale to get reflection.
% \changes{v0.3e}{1994/03/09}{Macro added}
+% \changes{v1.4a}{2019/11/30}{Add \cs{protected} gh/208}
% \begin{macrocode}
-\def\reflectbox{\Gscale@box-1[1]}
+\protected\def\reflectbox{\Gscale@box-1[1]}
% \end{macrocode}
% \end{macro}
%
@@ -1915,10 +1919,11 @@
% \changes{v0.3b}{1994/03/01}{Recode \cmd\resizebox.}
% \changes{v0.7b}{1995/04/27}
% {Add \cs{leavevmode} for graphics/1512}
+% \changes{v1.4a}{2019/11/30}{Add \cs{protected} gh/208}
% Look for a |*|, which specifies that a final vertical size refers to
% `height + depth' not just `height'.
% \begin{macrocode}
-\def\resizebox{%
+\protected\def\resizebox{%
\leavevmode
\@ifstar{\Gscale@@box\totalheight}{\Gscale@@box\height}}
% \end{macrocode}
diff --git a/Master/texmf-dist/source/latex-dev/graphics/graphicx.dtx b/Master/texmf-dist/source/latex-dev/graphics/graphicx.dtx
index 4134c4eed1f..3cf15925d3f 100644
--- a/Master/texmf-dist/source/latex-dev/graphics/graphicx.dtx
+++ b/Master/texmf-dist/source/latex-dev/graphics/graphicx.dtx
@@ -2,7 +2,7 @@
% \iffalse
%
%% graphicx.dtx Copyright (C) 1994 David Carlisle Sebastian Rahtz
-%% Copyright (C) 1995-2019 David Carlisle, LaTeX3 Project
+%% Copyright (C) 1995-2020 David Carlisle, LaTeX3 Project
%%
%% This file is part of the Standard LaTeX `Graphics Bundle'.
%% It may be distributed under the terms of the LaTeX Project Public
@@ -17,7 +17,7 @@
%<driver> \ProvidesFile{graphicx.drv}
% \fi
% \ProvidesFile{graphicx.dtx}
- [2017/06/01 v1.1a Enhanced LaTeX Graphics (DPC,SPQR)]
+ [2019/11/30 v1.2a Enhanced LaTeX Graphics (DPC,SPQR)]
%
% \iffalse
%<*driver>
@@ -167,7 +167,7 @@
% \item[quiet] Turns off writing information about graphics to the |.log|.
% \item[page] The page of a multi-page PDF graphic to be used.
% \item[interpolate] Enables interpolation of bitmap images by viewers.
-% \item[pagebox] Specifies which PDF box should be used for the natural image size, one of
+% \item[pagebox] Specifies which PDF box should be used for the natural image size, one of
% mediabox, cropbox, bleedbox, trimbox, artbox. The default is driver-specific.
% \end{description}
%
@@ -845,8 +845,9 @@
% Look for an optional argument.
% \changes{v0.3b}{1994/03/11}{Remove star form}
% \changes{v1.0g}{2014/04/25}{\cs{leavevmode} added graphics/1521}
+% \changes{v1.2a}{2019/11/30}{Add \cs{protected} gh/208}
% \begin{macrocode}
-\def\rotatebox{%
+\protected\def\rotatebox{%
\leavevmode
\@ifnextchar[\Grot@box@kv\Grot@box@std}
% \end{macrocode}
diff --git a/Master/texmf-dist/source/latex-dev/graphics/keyval.dtx b/Master/texmf-dist/source/latex-dev/graphics/keyval.dtx
index 1e1581eee36..dd1f542832c 100644
--- a/Master/texmf-dist/source/latex-dev/graphics/keyval.dtx
+++ b/Master/texmf-dist/source/latex-dev/graphics/keyval.dtx
@@ -1,7 +1,7 @@
%
% \iffalse
%% keyval.dtx Copyright (C) 1993 1994 1995 1997 1998 1999 David Carlisle
-%% Copyright (C) 2000-2019 David Carlisle, LaTeX3 Project
+%% Copyright (C) 2000-2020 David Carlisle, LaTeX3 Project
%%
%% This file is part of the Standard LaTeX `Graphics Bundle'.
%% It may be distributed under the terms of the LaTeX Project Public
diff --git a/Master/texmf-dist/source/latex-dev/graphics/lscape.dtx b/Master/texmf-dist/source/latex-dev/graphics/lscape.dtx
index a5a3dc3220f..e14462c9d42 100644
--- a/Master/texmf-dist/source/latex-dev/graphics/lscape.dtx
+++ b/Master/texmf-dist/source/latex-dev/graphics/lscape.dtx
@@ -2,7 +2,7 @@
% \iffalse
%
%% lscape.dtx Copyright (C) 1994 1999-2000 David Carlisle
-%% Copyright (C) 2000-2019 David Carlisle, LaTeX3 Project
+%% Copyright (C) 2000-2020 David Carlisle, LaTeX3 Project
%%
%% This file is part of the Standard LaTeX `Graphics Bundle'.
%% It may be distributed under the terms of the LaTeX Project Public
diff --git a/Master/texmf-dist/source/latex-dev/graphics/rotating.dtx b/Master/texmf-dist/source/latex-dev/graphics/rotating.dtx
index 149c19d049d..535f115594b 100644
--- a/Master/texmf-dist/source/latex-dev/graphics/rotating.dtx
+++ b/Master/texmf-dist/source/latex-dev/graphics/rotating.dtx
@@ -5,7 +5,7 @@
% File: rotating.dtx
%% Copyright (C) 1995--1999 Sebastian Rahtz and Leonor Barroca
%% Copyright (C) 2001--2003,2007--2009 Robin Fairbairns
-%% Copyright (C) 2016-2019 LaTeX3 Project
+%% Copyright (C) 2016-2020 LaTeX3 Project
%
% This work may be distributed and/or modified under the
% conditions of the LaTeX Project Public License, either version 1.3c
@@ -21,7 +21,7 @@
% This work consists of the file rotating.dtx
% and the derived file rotating.sty, and testing material
% rotex.tex and cat.eps
-%
+%
% \begin{macrocode}
\NeedsTeXFormat{LaTeX2e}
%<*dtx>
@@ -75,7 +75,7 @@
% note that rotation is typically \emph{not} visible in a DVI viewer:
% conversion to, and viewing, PostScript or PDF is necessary.
%
-% \section{Usage}
+% \section{Usage}
%
% \subsection{Package options}
%
@@ -114,7 +114,7 @@
% area of the document.)
%
% New rotated environments may be declared using the combined
-% facilities of the float and rotfloat packages.
+% facilities of the float and rotfloat packages.
%
% \subsection{Other environments and commands}
% The package provides other \LaTeX\ environments:
@@ -146,7 +146,7 @@
% \begin{tabular}{@{}llp{3in}@{}}
% \cs{rotFPtop} & \cs{rotFPbot} & Effect \\
% \hline
-% 0pt plus 1fil & 0pt plus 1fil & figure/table appears in middle
+% 0pt plus 1fil & 0pt plus 1fil & figure/table appears in middle
% (default value) \\
% 0pt & 0pt plus 1fil & figure/table appears with its top
% nearest the edge of the page \\
@@ -175,11 +175,11 @@
% Control figure orientation
% \begin{macrocode}
\DeclareOption{figuresleft}{%
- \@rot@twosidefalse
+ \@rot@twosidefalse
\def\rot@LR{0}%
}
\DeclareOption{figuresright}{%
- \@rot@twosidefalse
+ \@rot@twosidefalse
\def\rot@LR{-1}%
}
% \end{macrocode}
@@ -206,7 +206,7 @@
% A couple of commands for passing rotation direction around
% \begin{macrocode}
\newif\if@rot@twoside
-\if@twoside
+\if@twoside
\@rot@twosidetrue
\else
\@rot@twosidefalse
@@ -238,7 +238,7 @@
\def\rotdriver#1{\makeatletter\input{#1.def}\makeatother}
% \end{macrocode}
% \end{macro}
-%
+%
% The \texttt{r@tfl@t} counter is used when generating `labels' for
% determining what side of the page the float is on, in twoside mode.
% \begin{macrocode}
@@ -298,7 +298,7 @@
% \end{macrocode}
% \end{macro}
% \begin{macro}{\turnbox}
-% A macro version of the `rotate' environment.
+% A macro version of the `rotate' environment.
% \begin{macrocode}
\def\turnbox#1#2{%
\Grot@setangle{#1}%
@@ -315,13 +315,13 @@
% \section{Sideways figures and tables}
% Now for the macros to provide a complete
% environment for sideways figures and tables.
-% We define two environments |sidewaysfigure| and
+% We define two environments |sidewaysfigure| and
% |sidewaystable| that
% fit in with the normal table and figure floats. These are `fixed'
% environments that just do 90 degree rotation, but it would be easy
% to parameterize this to do other rotations if needed (the mind
% boggles\ldots)
-%
+%
% \begin{macro}{\@rotfloat}
% \begin{macro}{\@xrotfloat}
% \begin{macro}{\rot@float@box}
@@ -347,7 +347,7 @@
\@float{#1}[#2]%
% \end{macrocode}
% Set the float contents in
-% a box of width \cs{textheight} instead of \cs{columnwidth}.
+% a box of width \cs{textheight} instead of \cs{columnwidth}.
% \begin{macrocode}
\begin{lrbox}\rot@float@box
\begin{minipage}\textheight
@@ -366,7 +366,7 @@
% \begin{macrocode}
\def\end@rotfloat{%
% \end{macrocode}
-% If we are going to know whether pages are odd or even,
+% If we are going to know whether pages are odd or even,
% we need to use the a variant \cs{pageref} mechanism and our own
% specialised labels.
% \begin{macrocode}
@@ -388,18 +388,18 @@
\if@rot@twoside
\else
\let\R@@page\rot@LR
- \fi
- \ifthenelse{\isodd{\R@@page}}{%
+ \fi
+ \ifthenelse{\isodd{\R@@page}}{%
\if@rot@twoside
\rot@mess@toks\expandafter{\the\rot@mess@toks (right hand page)}%
\fi
- \vfill
+ \vfill
\@@line{%
\hskip\rotFPtop
\rotatebox{90}{\box\rot@float@box}%
\hskip\rotFPbot
}%
- }{%
+ }{%
\if@rot@twoside
\rot@mess@toks\expandafter{\the\rot@mess@toks (left hand page)}%
\fi
@@ -409,9 +409,9 @@
\hskip\rotFPtop
}%
\vfill
- }%
+ }%
\rot@message{\the\rot@mess@toks}
- }%
+ }%
\end@float
}
% \end{macrocode}
@@ -421,7 +421,7 @@
% \begin{macro}{\endsidewaysfigure}
% \begin{macro}{\sidewaystable}
% \begin{macro}{\endsidewaystable}
-% The following definitions set up two environments,
+% The following definitions set up two environments,
% \texttt{sidewaystable} and \texttt{sidewaysfigure}, which uses this
% type of float. Naturally, users may need to change these to suit
% their local style. Both contribute to the normal lists of figures
@@ -455,7 +455,7 @@
}
\def\end@rotdblfloat{%
% \end{macrocode}
-% If we are going to know whether pages are odd or even,
+% If we are going to know whether pages are odd or even,
% we need to use the \cs{pageref} mechanism, and labels. But
% Labels won't work \emph{unless} the user has put in a
% caption. Beware!
@@ -485,34 +485,34 @@
\if@rot@twoside
\else
\let\R@@page\rot@LR
- \fi
- \ifthenelse{\isodd{\R@@page}}{%
+ \fi
+ \ifthenelse{\isodd{\R@@page}}{%
\ifrot@messages
\if@rot@twoside
\rot@mess@toks\expandafter{\the\rot@mess@toks (right hand page)}%
\fi
\fi
- \vfill
+ \vfill
\@@line{%
\hskip\rotFPtop
\rotatebox{90}{\box\rot@float@box}%
\hskip\rotFPbot
}%
- }{%
+ }{%
\ifrot@messages
\if@rot@twoside
\rot@mess@toks\expandafter{\the\rot@mess@toks (left hand page)}%
\fi
- \fi%
+ \fi%
\@@line{%
\hskip\rotFPbot
\rotatebox{-90}{\box\rot@float@box}%
\hskip\rotFPtop
}%
\vfill
- }%
+ }%
\rot@message{\the\rot@mess@toks}%
- }%
+ }%
\end@dblfloat
}
% \end{macrocode}
diff --git a/Master/texmf-dist/source/latex-dev/graphics/trig.dtx b/Master/texmf-dist/source/latex-dev/graphics/trig.dtx
index 2b152578ad7..67f6c6a9703 100644
--- a/Master/texmf-dist/source/latex-dev/graphics/trig.dtx
+++ b/Master/texmf-dist/source/latex-dev/graphics/trig.dtx
@@ -1,6 +1,6 @@
% \iffalse
%% File: trig.dtx Copyright (C) 1993 1994 1995 1996 1997 1999 David Carlisle
-%% Copyright (C) 2000-2019 David Carlisle, LaTeX3 Project
+%% Copyright (C) 2000-2020 David Carlisle, LaTeX3 Project
%%
%% This file is part of the Standard LaTeX `Graphics Bundle'.
%% It may be distributed under the terms of the LaTeX Project Public
diff --git a/Master/texmf-dist/source/latex-dev/tools/afterpage.dtx b/Master/texmf-dist/source/latex-dev/tools/afterpage.dtx
index 3fa341aa531..600d221cb63 100644
--- a/Master/texmf-dist/source/latex-dev/tools/afterpage.dtx
+++ b/Master/texmf-dist/source/latex-dev/tools/afterpage.dtx
@@ -1,6 +1,6 @@
% \iffalse meta-comment
%
-% Copyright (C) 1993-2019
+% Copyright (C) 1993-2020
%
% The LaTeX3 Project and any individual authors listed elsewhere
% in this file.
diff --git a/Master/texmf-dist/source/latex-dev/tools/afterpage.ins b/Master/texmf-dist/source/latex-dev/tools/afterpage.ins
index 9764bdac6d8..96cba1ed0ca 100644
--- a/Master/texmf-dist/source/latex-dev/tools/afterpage.ins
+++ b/Master/texmf-dist/source/latex-dev/tools/afterpage.ins
@@ -3,31 +3,31 @@
%% driver files from the doc files in this package when run through
%% LaTeX or TeX.
%%
-%% Copyright (C) 1993-2019
+%% Copyright (C) 1993-2020
%% The LaTeX3 Project and any individual authors listed elsewhere
-%% in this file.
-%%
+%% in this file.
+%%
%% This file is part of the Standard LaTeX `Tools Bundle'.
%% -------------------------------------------------------
-%%
+%%
%% It may be distributed and/or modified under the
%% conditions of the LaTeX Project Public License, either version 1.3c
%% of this license or (at your option) any later version.
%% The latest version of this license is in
%% https://www.latex-project.org/lppl.txt
-%% and version 1.3c or later is part of all distributions of LaTeX
+%% and version 1.3c or later is part of all distributions of LaTeX
%% version 2005/12/01 or later.
-%%
+%%
%% As this file contains legal notices, it is NOT PERMITTED to modify
%% this file in any way that the legal information placed into
%% generated files is changed (i.e., the files generated when the
%% original file is executed). This restriction does not apply if
%% (parts of) the content is reused in a different WORK producing its
%% own generated files.
-%%
+%%
%% The list of all files belonging to the `Tools Bundle' is
%% given in the file `manifest.txt'.
-%%
+%%
%%
%% --------------- start of docstrip commands ------------------
%%
@@ -45,9 +45,9 @@ The source is maintained by the LaTeX Project team and bug
reports for it can be opened at https://latex-project.org/bugs/
(but please observe conditions on bug reports sent to that address!)
-Copyright (C) 1993-2019
+Copyright (C) 1993-2020
The LaTeX3 Project and any individual authors listed elsewhere
-in this file.
+in this file.
This file was generated from file(s) of the Standard LaTeX `Tools Bundle'.
--------------------------------------------------------------------------
@@ -57,7 +57,7 @@ conditions of the LaTeX Project Public License, either version 1.3c
of this license or (at your option) any later version.
The latest version of this license is in
https://www.latex-project.org/lppl.txt
-and version 1.3c or later is part of all distributions of LaTeX
+and version 1.3c or later is part of all distributions of LaTeX
version 2005/12/01 or later.
This file may only be distributed together with a copy of the LaTeX
diff --git a/Master/texmf-dist/source/latex-dev/tools/array.dtx b/Master/texmf-dist/source/latex-dev/tools/array.dtx
index 5590b0a1369..acfa5609373 100644
--- a/Master/texmf-dist/source/latex-dev/tools/array.dtx
+++ b/Master/texmf-dist/source/latex-dev/tools/array.dtx
@@ -1,6 +1,6 @@
% \iffalse meta-comment
%
-% Copyright (C) 1993-2019
+% Copyright (C) 1993-2020
%
% The LaTeX3 Project and any individual authors listed elsewhere
% in this file.
@@ -284,7 +284,7 @@
% \hline\hline
% w\{align\}\{width\} & Sets the cell content in a box of the
% specified \texttt{width} aligned according to
-% the \texttt{align} parameter which could be
+% the \texttt{align} parameter which could be
% either \texttt{l}, \texttt{c} or
% \texttt{r}. Works essentially like
% =\makebox[=width=][=align=]{=cell=}= so
@@ -633,10 +633,10 @@
% \texttt{m}. As a result that cell was vertically centered with that
% space inside, resulting in a strange offset. Since 2.4f, this space
% is now added after centering the cell.
-%
+%
% A similar problem happened when "\extrarowheight" was used. For that
% reason m-cells now manually position the cell content which
-% allows to ignore this extra space request during the vertical aligment.
+% allows to ignore this extra space request during the vertical aligment.
%
%
% \subsection{Bugs and Features}
@@ -1323,7 +1323,7 @@
% \changes{v2.4f}{2017/11/04}{Managing m-cells without \cs{vcenter}}
% \begin{macrocode}
% \let\do@row@strut\relax
-% \let\ar@align@mcell\relax
+% \let\ar@align@mcell\relax
% \end{macrocode}
% Now we remove possible $*$-forms in the user preamble with the
% command =\@xexpast=. As we already know, this command saves
@@ -1551,7 +1551,7 @@
\hfil
% \end{macrocode}
% We also add a space of 1sp just in case the first thing in the
-% cell is a command doing an =\unskip=.
+% cell is a command doing an =\unskip=.
% \changes{v2.4k}{2018/12/30}{Add extra \cs{hskip} to guard against an
% \cs{unskip} at the start of a c-column cell (gh/102)}
% \begin{macrocode}
@@ -1604,7 +1604,7 @@
% mode. Therefore we start with a~=$=.
% \changes{v2.4f}{2017/11/04}{Managing m-cells without \cs{vcenter}}
% \begin{macrocode}
- \setbox\ar@mcellbox\vbox
+ \setbox\ar@mcellbox\vbox
% \end{macrocode}
% The part of the templates which is the same in all three cases
% (\texttt{p}, \texttt{m} and \texttt{b})
@@ -1618,7 +1618,7 @@
% \changes{v2.4e}{2016/10/07}{Fixing SX68732}
% \changes{v2.4f}{2017/11/04}{Managing m-cells without \cs{vcenter}}
% \begin{macrocode}
- \@startpbox{\@nextchar}\insert@column \@endpbox
+ \@startpbox{\@nextchar}\insert@column \@endpbox
\ar@align@mcell
\do@row@strut \or
% \end{macrocode}
@@ -2296,7 +2296,7 @@
% environments (via =\multicolumn=) are impossible.
% For 25 years or so =\@halignto= was set globally (to save space on the
% save stack, but that was a mistake: if there is a tabular in the
-% output routine (e.g., in the running header) then that tabular is
+% output routine (e.g., in the running header) then that tabular is
% able overwrite the =\@halignto=
% setting of a tabular in the main text resulting in a very weird error.
% \changes{v2.4d}{2016/10/06}{\cs{@halignto} set locally (pr/4488)}
@@ -2613,7 +2613,7 @@
% it is the equivalent of the primitive "\show" command for macro
% definitions. All we need to do is locally redefine "\NC@do" to take
% its argument (say `C') and then "\show" the (slightly modified)
-% definition of "\NC@rewrite@C". Actually as the the list always
+% definition of "\NC@rewrite@C". Actually as the list always
% starts off with "\NC@do *" and we do not want to print the
% definition of the $*$-form, define "\NC@do" to throw away the first
% item in the list, and then redefine itself to print the rest of the
@@ -2729,9 +2729,9 @@
% \changes{v2.4f}{2017/11/04}{Managing m-cells without \cs{vcenter}}
% \begin{macrocode}
\def\@mkpream#1{\gdef\@preamble{}\@lastchclass 4 \@firstamptrue
- \let\@sharp\relax
+ \let\@sharp\relax
% \end{macrocode}
-%
+%
% \changes{v2.4j}{2018/11/13}{Do not expand argument of
% \cs{@startpbox} while building the tabular preamble (sx/459285)}
% The "\@startpbox" (which is called for "p", "m" or "b" columns)
@@ -2747,7 +2747,7 @@
\def\@startpbox##1{\unexpanded\expandafter{\expandafter
\@startpbox\expandafter{##1}}}\let\@endpbox\relax
\let\do@row@strut\relax
- \let\ar@align@mcell\relax
+ \let\ar@align@mcell\relax
% \end{macrocode}
% Now we remove possible $*$-forms and user-defined column
% specifiers in the user preamble by repeatedly executing the list
@@ -2953,7 +2953,7 @@
%
% The problem in this case is that if the optional argument "[b]"
% is used we do want the reference point of the tabular be at the
-% baseline of the last row but at the same time do want the the
+% baseline of the last row but at the same time do want the
% depth of this last line increased by "\extratabsurround" without
% changing the placement "\hline".
%
@@ -3076,7 +3076,7 @@
<{\end{lrbox}%
\let\hss\hfil
\makebox[#2][#1]{\unhbox\ar@cellbox}}}
-% \end{macrocode}
+% \end{macrocode}
% This is a bit sneaky, as it temporarily disables "\hss", but
% given that we know what goes into that box it should be
% sufficient.
@@ -3089,4 +3089,3 @@
% \Finale
%
\endinput
-
diff --git a/Master/texmf-dist/source/latex-dev/tools/bm.dtx b/Master/texmf-dist/source/latex-dev/tools/bm.dtx
index 2216dcea077..096f6c4bc2a 100644
--- a/Master/texmf-dist/source/latex-dev/tools/bm.dtx
+++ b/Master/texmf-dist/source/latex-dev/tools/bm.dtx
@@ -1,6 +1,6 @@
% \iffalse meta-comment
%
-% Copyright (C) 1993-2019
+% Copyright (C) 1993-2020
%
% The LaTeX3 Project and any individual authors listed elsewhere
% in this file.
@@ -837,7 +837,7 @@
\let\ifmmode\iftrue
% \end{macrocode}
% We have to ensure that the math alphabets have definitions that
-% correspond the the ``bold'' math version we are going to switch
+% correspond the ``bold'' math version we are going to switch
% to. As these definitions are globally assigned when a math
% version is changed it is likely that right now we have those of
% the normal math version active. Argument |#3| holds either
diff --git a/Master/texmf-dist/source/latex-dev/tools/bm.ins b/Master/texmf-dist/source/latex-dev/tools/bm.ins
index a148cb93efa..e963d1d88e2 100644
--- a/Master/texmf-dist/source/latex-dev/tools/bm.ins
+++ b/Master/texmf-dist/source/latex-dev/tools/bm.ins
@@ -3,31 +3,31 @@
%% driver files from the doc files in this package when run through
%% LaTeX or TeX.
%%
-%% Copyright (C) 1993-2019
+%% Copyright (C) 1993-2020
%% The LaTeX3 Project and any individual authors listed elsewhere
-%% in this file.
-%%
+%% in this file.
+%%
%% This file is part of the Standard LaTeX `Tools Bundle'.
%% -------------------------------------------------------
-%%
+%%
%% It may be distributed and/or modified under the
%% conditions of the LaTeX Project Public License, either version 1.3c
%% of this license or (at your option) any later version.
%% The latest version of this license is in
%% https://www.latex-project.org/lppl.txt
-%% and version 1.3c or later is part of all distributions of LaTeX
+%% and version 1.3c or later is part of all distributions of LaTeX
%% version 2005/12/01 or later.
-%%
+%%
%% As this file contains legal notices, it is NOT PERMITTED to modify
%% this file in any way that the legal information placed into
%% generated files is changed (i.e., the files generated when the
%% original file is executed). This restriction does not apply if
%% (parts of) the content is reused in a different WORK producing its
%% own generated files.
-%%
+%%
%% The list of all files belonging to the `Tools Bundle' is
%% given in the file `manifest.txt'.
-%%
+%%
%%
%% --------------- start of docstrip commands ------------------
%%
@@ -45,9 +45,9 @@ The source is maintained by the LaTeX Project team and bug
reports for it can be opened at https://latex-project.org/bugs/
(but please observe conditions on bug reports sent to that address!)
-Copyright (C) 1993-2019
+Copyright (C) 1993-2020
The LaTeX3 Project and any individual authors listed elsewhere
-in this file.
+in this file.
This file was generated from file(s) of the Standard LaTeX `Tools Bundle'.
--------------------------------------------------------------------------
@@ -57,7 +57,7 @@ conditions of the LaTeX Project Public License, either version 1.3c
of this license or (at your option) any later version.
The latest version of this license is in
https://www.latex-project.org/lppl.txt
-and version 1.3c or later is part of all distributions of LaTeX
+and version 1.3c or later is part of all distributions of LaTeX
version 2005/12/01 or later.
This file may only be distributed together with a copy of the LaTeX
diff --git a/Master/texmf-dist/source/latex-dev/tools/calc.dtx b/Master/texmf-dist/source/latex-dev/tools/calc.dtx
index 0bc90f736ba..62fe27489b2 100644
--- a/Master/texmf-dist/source/latex-dev/tools/calc.dtx
+++ b/Master/texmf-dist/source/latex-dev/tools/calc.dtx
@@ -1,6 +1,6 @@
% \iffalse meta-comment
%
-% Copyright (C) 1993-2019
+% Copyright (C) 1993-2020
%
% The LaTeX3 Project and any individual authors listed elsewhere
% in this file.
diff --git a/Master/texmf-dist/source/latex-dev/tools/dcolumn.dtx b/Master/texmf-dist/source/latex-dev/tools/dcolumn.dtx
index 38a4ab0da2c..1899cce5560 100644
--- a/Master/texmf-dist/source/latex-dev/tools/dcolumn.dtx
+++ b/Master/texmf-dist/source/latex-dev/tools/dcolumn.dtx
@@ -1,6 +1,6 @@
% \iffalse meta-comment
%
-% Copyright (C) 1993-2019
+% Copyright (C) 1993-2020
%
% The LaTeX3 Project and any individual authors listed elsewhere
% in this file.
diff --git a/Master/texmf-dist/source/latex-dev/tools/delarray.dtx b/Master/texmf-dist/source/latex-dev/tools/delarray.dtx
index 8814fc2a586..17cac2052cb 100644
--- a/Master/texmf-dist/source/latex-dev/tools/delarray.dtx
+++ b/Master/texmf-dist/source/latex-dev/tools/delarray.dtx
@@ -1,6 +1,6 @@
% \iffalse meta-comment
%
-% Copyright (C) 1993-2019
+% Copyright (C) 1993-2020
%
% The LaTeX3 Project and any individual authors listed elsewhere
% in this file.
diff --git a/Master/texmf-dist/source/latex-dev/tools/enumerate.dtx b/Master/texmf-dist/source/latex-dev/tools/enumerate.dtx
index 984d36d4157..3ce463e6015 100644
--- a/Master/texmf-dist/source/latex-dev/tools/enumerate.dtx
+++ b/Master/texmf-dist/source/latex-dev/tools/enumerate.dtx
@@ -1,6 +1,6 @@
% \iffalse meta-comment
%
-% Copyright (C) 1993-2019
+% Copyright (C) 1993-2020
%
% The LaTeX3 Project and any individual authors listed elsewhere
% in this file.
diff --git a/Master/texmf-dist/source/latex-dev/tools/fileerr.dtx b/Master/texmf-dist/source/latex-dev/tools/fileerr.dtx
index 3b5895a5f61..16a95e28203 100644
--- a/Master/texmf-dist/source/latex-dev/tools/fileerr.dtx
+++ b/Master/texmf-dist/source/latex-dev/tools/fileerr.dtx
@@ -1,6 +1,6 @@
% \iffalse meta-comment
%
-% Copyright (C) 1993-2019
+% Copyright (C) 1993-2020
%
% The LaTeX3 Project and any individual authors listed elsewhere
% in this file.
diff --git a/Master/texmf-dist/source/latex-dev/tools/fontsmpl.dtx b/Master/texmf-dist/source/latex-dev/tools/fontsmpl.dtx
index 961bdda71fc..a5fb2964a98 100644
--- a/Master/texmf-dist/source/latex-dev/tools/fontsmpl.dtx
+++ b/Master/texmf-dist/source/latex-dev/tools/fontsmpl.dtx
@@ -1,6 +1,6 @@
% \iffalse meta-comment
%
-% Copyright (C) 1993-2019
+% Copyright (C) 1993-2020
%
% The LaTeX3 Project and any individual authors listed elsewhere
% in this file.
diff --git a/Master/texmf-dist/source/latex-dev/tools/ftnright.dtx b/Master/texmf-dist/source/latex-dev/tools/ftnright.dtx
index 5739172f85d..e5fffdfcd92 100644
--- a/Master/texmf-dist/source/latex-dev/tools/ftnright.dtx
+++ b/Master/texmf-dist/source/latex-dev/tools/ftnright.dtx
@@ -1,6 +1,6 @@
% \iffalse meta-comment
%
-% Copyright (C) 1993-2019
+% Copyright (C) 1993-2020
%
% The LaTeX3 Project and any individual authors listed elsewhere
% in this file.
diff --git a/Master/texmf-dist/source/latex-dev/tools/indentfirst.dtx b/Master/texmf-dist/source/latex-dev/tools/indentfirst.dtx
index 16b99653cd7..7123be04c54 100644
--- a/Master/texmf-dist/source/latex-dev/tools/indentfirst.dtx
+++ b/Master/texmf-dist/source/latex-dev/tools/indentfirst.dtx
@@ -1,6 +1,6 @@
% \iffalse meta-comment
%
-% Copyright (C) 1993-2019
+% Copyright (C) 1993-2020
%
% The LaTeX3 Project and any individual authors listed elsewhere
% in this file.
diff --git a/Master/texmf-dist/source/latex-dev/tools/layout.dtx b/Master/texmf-dist/source/latex-dev/tools/layout.dtx
index 848eb54fb25..8918ffdca48 100644
--- a/Master/texmf-dist/source/latex-dev/tools/layout.dtx
+++ b/Master/texmf-dist/source/latex-dev/tools/layout.dtx
@@ -1,6 +1,6 @@
% \iffalse meta-comment
%
-% Copyright (C) 1993-2019
+% Copyright (C) 1993-2020
%
% The LaTeX3 Project and any individual authors listed elsewhere
% in this file.
diff --git a/Master/texmf-dist/source/latex-dev/tools/longtable.dtx b/Master/texmf-dist/source/latex-dev/tools/longtable.dtx
index 9a3b5c03b87..004d630fcec 100644
--- a/Master/texmf-dist/source/latex-dev/tools/longtable.dtx
+++ b/Master/texmf-dist/source/latex-dev/tools/longtable.dtx
@@ -1,6 +1,6 @@
% \iffalse meta-comment
%
-% Copyright (C) 1993-2019
+% Copyright (C) 1993-2020
%
% The LaTeX3 Project and any individual authors listed elsewhere
% in this file.
@@ -21,7 +21,7 @@
%
% \fi
% \iffalse
-%% File: longtable.dtx Copyright (C) 1990-2019 David Carlisle
+%% File: longtable.dtx Copyright (C) 1990-2020 David Carlisle
%
%<*dtx>
\ProvidesFile{longtable.dtx}
@@ -31,7 +31,7 @@
%<driver> \ProvidesFile{longtable.drv}
% \fi
% \ProvidesFile{longtable.dtx}
- [2019/02/06 v4.12 Multi-page Table package (DPC)]
+ [2020/01/07 v4.13 Multi-page Table package (DPC)]
%
% \iffalse
%<*driver>
@@ -635,9 +635,9 @@
% "\LTright"&
% Glue to the right of the table. \hfill("\fill")\\
% "\LTpre"&
-% Glue before the the table. \hfill("\bigskipamount")\\
+% Glue before the table. \hfill("\bigskipamount")\\
% "\LTpost"&
-% Glue after the the table. \hfill("\bigskipamount")\\
+% Glue after the table. \hfill("\bigskipamount")\\
% "\LTcapwidth"&
% The width of a parbox containing the caption.\hfill(4in)\\
% "LTchunksize"&
@@ -1212,6 +1212,8 @@
% \end{macro}
%
% \begin{macro}{\LT@start}
+% % \changes{v4.13}{2020/01/07}
+% {fix issue https://github.com/davidcarlisle/dpctex/issues/8}
% This macro starts the process of putting the table on the current
% page. It is not called until either a "\\" or "\endlongtable" command
% ends a chunk, as we do not know until that point which of the four
@@ -1219,11 +1221,12 @@
%
% It begins by redefining itself, so that the table is only started
% once! Until V3.04, was redefined to "\relax", now use "\endgraf" to
-% force the page-breaker to wake up.
+% force the page-breaker to wake up. The second "\endgraf" is there so
+% that "\pagetotal" is updated and so takes "\LTpre" into account.
% \begin{macrocode}
\def\LT@start{%
\let\LT@start\endgraf
- \endgraf\penalty\z@\vskip\LTpre
+ \endgraf\penalty\z@\vskip\LTpre\endgraf
% \end{macrocode}
% Start a new page if there is not enough room for the table head, foot,
% and one extra line.
@@ -2031,7 +2034,7 @@
% \end{macrocode}
% \end{macro}
%
-% \subsection{Commands for the the table head and foot}
+% \subsection{Commands for the table head and foot}
%
% \begin{macro}{\LT@end@hd@ft}
% The core of "\endhead" and friends. Store the current chunk in the
@@ -2127,7 +2130,7 @@
% \end{macrocode}
% \changes{v4.12}{2019/02/06}{Color group to match array package}
% \begin{macrocode}
- \color@endgroup
+ \color@endgroup
\egroup
\the\LT@p@ftn
\global\LT@p@ftn{}%
@@ -2151,4 +2154,3 @@
%
% \Finale
\endinput
-
diff --git a/Master/texmf-dist/source/latex-dev/tools/longtable.ins b/Master/texmf-dist/source/latex-dev/tools/longtable.ins
index 1fc3c12dfaa..7ada121ea95 100644
--- a/Master/texmf-dist/source/latex-dev/tools/longtable.ins
+++ b/Master/texmf-dist/source/latex-dev/tools/longtable.ins
@@ -3,31 +3,31 @@
%% driver files from the doc files in this package when run through
%% LaTeX or TeX.
%%
-%% Copyright (C) 1993-2019
+%% Copyright (C) 1993-2020
%% The LaTeX3 Project and any individual authors listed elsewhere
-%% in this file.
-%%
+%% in this file.
+%%
%% This file is part of the Standard LaTeX `Tools Bundle'.
%% -------------------------------------------------------
-%%
+%%
%% It may be distributed and/or modified under the
%% conditions of the LaTeX Project Public License, either version 1.3c
%% of this license or (at your option) any later version.
%% The latest version of this license is in
%% https://www.latex-project.org/lppl.txt
-%% and version 1.3c or later is part of all distributions of LaTeX
+%% and version 1.3c or later is part of all distributions of LaTeX
%% version 2005/12/01 or later.
-%%
+%%
%% As this file contains legal notices, it is NOT PERMITTED to modify
%% this file in any way that the legal information placed into
%% generated files is changed (i.e., the files generated when the
%% original file is executed). This restriction does not apply if
%% (parts of) the content is reused in a different WORK producing its
%% own generated files.
-%%
+%%
%% The list of all files belonging to the `Tools Bundle' is
%% given in the file `manifest.txt'.
-%%
+%%
%%
%% --------------- start of docstrip commands ------------------
%%
@@ -45,9 +45,9 @@ The source is maintained by the LaTeX Project team and bug
reports for it can be opened at https://latex-project.org/bugs/
(but please observe conditions on bug reports sent to that address!)
-Copyright (C) 1993-2019
+Copyright (C) 1993-2020
The LaTeX3 Project and any individual authors listed elsewhere
-in this file.
+in this file.
This file was generated from file(s) of the Standard LaTeX `Tools Bundle'.
--------------------------------------------------------------------------
@@ -57,7 +57,7 @@ conditions of the LaTeX Project Public License, either version 1.3c
of this license or (at your option) any later version.
The latest version of this license is in
https://www.latex-project.org/lppl.txt
-and version 1.3c or later is part of all distributions of LaTeX
+and version 1.3c or later is part of all distributions of LaTeX
version 2005/12/01 or later.
This file may only be distributed together with a copy of the LaTeX
diff --git a/Master/texmf-dist/source/latex-dev/tools/multicol.dtx b/Master/texmf-dist/source/latex-dev/tools/multicol.dtx
index 5adc4db0da1..39bccef2d78 100644
--- a/Master/texmf-dist/source/latex-dev/tools/multicol.dtx
+++ b/Master/texmf-dist/source/latex-dev/tools/multicol.dtx
@@ -470,7 +470,7 @@
% `\textsf{minrows}' (default 1). If set to a higher value then the
% balancing will have at least that many rows in the first column (and
% also all further columns until it runs outs of material).
-%
+%
% Additionally you can set another counter, the `\textsf{unbalance}'
% counter, to some positive \meta{number}. This will make all but the
% right-most column \meta{number} of lines longer than they would
@@ -1339,7 +1339,7 @@
% resetting the |\parshape| in case we are inside some list
% environment. The correct indentation for the \mc{} environment in
% such a case will be produced by moving the result to the right by
-% |\multicol@leftmargin| later on. If we would use the value of of
+% |\multicol@leftmargin| later on. If we would use the value of
% |\@totalleftmargin| directly then lists inside the \mc{}
% environment could cause a shift of the output.
% \changes{v1.4l}{1992/08/17}{saved \cs{@totalleftmargin}}
@@ -1720,7 +1720,7 @@
% remove any space at the end of the box as we don't want to use
% this in balancing. Because of the |\color@endgroup| this can't be
% done later in |\balance@columns| as the color command will hide
-% it.
+% it.
% \changes{v1.8c}{2013/11/03}{Add \cs{color@endgroup} to prevent color leak}
% \changes{v1.8f}{2014/06/19}{Discard spaces before adding \cs{color@endgroup}}
% \begin{macrocode}
@@ -1762,7 +1762,7 @@
\else
% \end{macrocode}
% If there was a |\columnbreak| on the very last line all material
-% will have been moved to the |\colbreak@box|. Thus the the galley
+% will have been moved to the |\colbreak@box|. Thus the galley
% will be empty and no output routine gets called so that the text
% is lost. To avoid this problem (though unlikely) we check if the
% current galley is empty and the |\colbreak@box| contains text and
@@ -1959,10 +1959,10 @@
% \end{macrocode}
% To allow checking whether some macro is used within the \mc{}
% environment the counter |\col@number| gets a default of |1|
-% outside the the environment.
+% outside the environment.
% \changes{v1.3d}{1991/10/23}{\cs{col@number} set to one}
-% \changes{v1.8o}{2016/02/08}{\cs{col@number} already initialized in the
-% kernel, so not initializing it in the package
+% \changes{v1.8o}{2016/02/08}{\cs{col@number} already initialized in the
+% kernel, so not initializing it in the package
% in case the document is in two-column (pr/4435)}
% \begin{macrocode}
%\col@number = 1
@@ -2197,12 +2197,12 @@
% would be allowed a depth of |\@maxdepth|. So we allow shrinking by
% that amount. This only makes a difference if the box would
% otherwise become overfull and shrinking never exceeds the
-% specified value, so we should be fine.
+% specified value, so we should be fine.
% \changes{v1.8h}{2014/09/12}{Macro added (pr/4395)}
% \changes{v1.8j}{2015/03/07}{Use only `0.0001fil' for stretching}
% \changes{v1.8x}{2019/10/15}{Use \cs{@maxdepth} not \cs{maxdepth} (gh/190)}
% \begin{macrocode}
-\def\vfilmaxdepth{\vskip \z@ \@plus .0001fil
+\def\vfilmaxdepth{\vskip \z@ \@plus .0001fil
\@minus \@maxdepth}
% \end{macrocode}
% \end{macro}
@@ -2252,7 +2252,7 @@
\splitmaxdepth\@maxdepth
% \end{macrocode}
% We also need to restrict |\boxmaxdepth| so that re-boxing is not
-% generating boxes with arbitrary depth.
+% generating boxes with arbitrary depth.
% \changes{v1.8j}{2015/03/07}{Set \cs{boxmaxdepth}}
% \begin{macrocode}
\boxmaxdepth\@maxdepth
@@ -2287,7 +2287,7 @@
% reestablished. However, in theory there is a possibility to sneak
% in a whole multicols environment into the running header
% definition. If that happens then it will also be affected by this
-% change---too bad I think.
+% change---too bad I think.
% \changes{v1.8a}{2011/12/20}{Support for \cs{enlargethispage}}
% \changes{v1.8v}{2018/12/27}{Removed dead code, the case where this
% can go wrong is too obscure to worry about it (gh/101)}
@@ -2446,7 +2446,7 @@
%
% Within the OR |\boxmaxdepth| needs to be unrestricted so we set it back
% now as it was changed above.
-% \changes{v1.8p}{2016/04/07}{Reset \cs{boxmaxdepth}}
+% \changes{v1.8p}{2016/04/07}{Reset \cs{boxmaxdepth}}
% \begin{macrocode}
\boxmaxdepth\maxdimen
\setbox\@cclv\vbox{\unvbox\partial@page
@@ -2480,7 +2480,7 @@
% Now we reset |\@colroom| to |\@colht| which is \LaTeX's
% saved value of |\textheight|.
% We also have to reset the recorded position of the last
-% |\marginpar| as well as the recorded size of in-text floats
+% |\marginpar| as well as the recorded size of in-text floats
% as we are now on a new page.
% \changes{v1.8d}{2014/04/23}{Reset \cs{@mparbottom} after page finishes}
% \changes{v1.8n}{2015/08/19}{Reset \cs{@textfloatsheight} after page finishes}
@@ -2617,7 +2617,7 @@
\ifnum\outputpenalty = -\@Mvi
\mult@info\@ne{End penalty of multicols seen}%
% \end{macrocode}
-% If we are at this point then have have to run the balancing code
+% If we are at this point then we have to run the balancing code
% (which was previously its own output routine). First we pretend
% that we had a normal forced breakpoint and then call
% |\balance@column@out|. The latter may be let to |\multi@column@out|
@@ -3006,7 +3006,7 @@
\vbadness\@M
% \end{macrocode}
% We also allow for overfull boxes while we trying to split the
-% columns. They can easily happen if we have objects with unusual depth.
+% columns. They can easily happen if we have objects with unusual depth.
% \changes{v1.8h}{2014/09/12}{Do not report overfull}
% \begin{macrocode}
\vfuzz \maxdimen
@@ -3258,7 +3258,7 @@
% If we have unprocessed forced breaks we normally reiterate with a
% larger column size to fit them in eventually. However, if there
% are simply too many of them (e.g., 3 forced breaks but only 2
-% columns to balance) then this will never succeed and and we would
+% columns to balance) then this will never succeed and we would
% continue growing the columns until we hit the largest possible
% column size. So in addition we check how big the column size is
% compared to available room and if we exceed this by
@@ -3315,7 +3315,7 @@
%</badness>
\advance\dimen@\p@
\repeat
-% \end{macrocode}
+% \end{macrocode}
% If we come out of the loop with the switch |forcedbreak@leftover|
% set to true then balancing has failed and we should cut a normal
% page. We indicate this below with |\too@badtrue| when any of the
@@ -3455,7 +3455,7 @@
% The new release now uses private box registers.
%
% There was in fact a bug in the new implementation because at one
-% point \LaTeX{} started to use the the extended registers and so
+% point \LaTeX{} started to use the extended registers and so
% jumped from below 255 to above omitting the boxes allocated for
% inserts and the output page box.
%
@@ -3470,7 +3470,7 @@
\count14=\@cclv
\fi
% \end{macrocode}
-%
+%
% \begin{macrocode}
\newbox\mult@rightbox
\newbox\mult@grightbox
@@ -3785,7 +3785,7 @@
%
% Special care is needed with handling |\vspace*| as that
% corresponds to |\penalty10000|, |\vskip <skip>|, followed by
-% |\vskip 0pt|. If we see this sequence going backwards in the the
+% |\vskip 0pt|. If we see this sequence going backwards in the
% vertical list we assume that this is a ``desired'' space. We
% therefore stop the recursion and reinsert the spaces.
%
@@ -3832,7 +3832,7 @@
% recurse.
% \begin{macrocode}
\vskip\@tempb\vskip\@tempa\relax
- \else
+ \else
\remove@discardable@items
\fi
\fi
@@ -3852,7 +3852,7 @@
\def\too@badtrue{\global\let\iftoo@bad\iftrue}
\def\too@badfalse{\global\let\iftoo@bad\iffalse}
% \end{macrocode}
-%
+%
% \changes{v1.8k}{2015/03/21}{The new switch}
% \begin{macrocode}
\newif\ifforcedbreak@leftover
@@ -3996,7 +3996,7 @@
% When ending the environment we simply end the inner
% \texttt{multicols} environment, except that we better also stick
% in some stretchable vertical glue so that the last column still
-% containing text is not vertically stretched out.
+% containing text is not vertically stretched out.
%
% We do this as follows: first we ensure that we are back in vertical mode
% and then we cancel out |\lastskip| if it was
@@ -4026,7 +4026,7 @@
\par
\ifdim\lastskip>\z@ \vskip-\lastskip \fi
\ifdim \prevdepth>\z@
- \vskip-\ifdim\prevdepth>\boxmaxdepth
+ \vskip-\ifdim\prevdepth>\boxmaxdepth
\boxmaxdepth
\else \prevdepth \fi
\fi
@@ -4343,9 +4343,9 @@
% \begin{macrocode}
\newcommand\@docolaction[4][1]{%
% \end{macrocode}
-%
-% How does the column number get associated with our label? We
-% do do this by writing another line into the aux file. Here are the
+%
+% How does the column number get associated with our label? We
+% do this by writing another line into the aux file. Here are the
% preparations.
% \begin{macrocode}
\edef\@docolactioncheck{\write\@auxout
@@ -4394,7 +4394,7 @@
% \begin{macrocode}
\newif\if@docolactionstar
% \end{macrocode}
-%
+%
% Because of extra data writing to the aux file the aux file will
% now contain something like the following after the document is
% processed the first time:
@@ -4480,5 +4480,3 @@
% \Finale
%
\endinput
-
-
diff --git a/Master/texmf-dist/source/latex-dev/tools/multicol.ins b/Master/texmf-dist/source/latex-dev/tools/multicol.ins
index 9fd6cbe6e9f..f872b83cdee 100644
--- a/Master/texmf-dist/source/latex-dev/tools/multicol.ins
+++ b/Master/texmf-dist/source/latex-dev/tools/multicol.ins
@@ -3,31 +3,31 @@
%% driver files from the doc files in this package when run through
%% LaTeX or TeX.
%%
-%% Copyright (C) 1993-2019
+%% Copyright (C) 1993-2020
%% The LaTeX3 Project and any individual authors listed elsewhere
-%% in this file.
-%%
+%% in this file.
+%%
%% This file is part of the Standard LaTeX `Tools Bundle'.
%% -------------------------------------------------------
-%%
+%%
%% It may be distributed and/or modified under the
%% conditions of the LaTeX Project Public License, either version 1.3c
%% of this license or (at your option) any later version.
%% The latest version of this license is in
%% https://www.latex-project.org/lppl.txt
-%% and version 1.3c or later is part of all distributions of LaTeX
+%% and version 1.3c or later is part of all distributions of LaTeX
%% version 2005/12/01 or later.
-%%
+%%
%% As this file contains legal notices, it is NOT PERMITTED to modify
%% this file in any way that the legal information placed into
%% generated files is changed (i.e., the files generated when the
%% original file is executed). This restriction does not apply if
%% (parts of) the content is reused in a different WORK producing its
%% own generated files.
-%%
+%%
%% The list of all files belonging to the `Tools Bundle' is
%% given in the file `manifest.txt'.
-%%
+%%
%%
%% --------------- start of docstrip commands ------------------
%%
@@ -45,9 +45,9 @@ The source is maintained by the LaTeX Project team and bug
reports for it can be opened at https://latex-project.org/bugs/
(but please observe conditions on bug reports sent to that address!)
-Copyright (C) 1993-2019
+Copyright (C) 1993-2020
The LaTeX3 Project and any individual authors listed elsewhere
-in this file.
+in this file.
This file was generated from file(s) of the Standard LaTeX `Tools Bundle'.
--------------------------------------------------------------------------
@@ -57,7 +57,7 @@ conditions of the LaTeX Project Public License, either version 1.3c
of this license or (at your option) any later version.
The latest version of this license is in
https://www.latex-project.org/lppl.txt
-and version 1.3c or later is part of all distributions of LaTeX
+and version 1.3c or later is part of all distributions of LaTeX
version 2005/12/01 or later.
This file may only be distributed together with a copy of the LaTeX
diff --git a/Master/texmf-dist/source/latex-dev/tools/rawfonts.dtx b/Master/texmf-dist/source/latex-dev/tools/rawfonts.dtx
index 0fd7dd5006e..9c5daa57a50 100644
--- a/Master/texmf-dist/source/latex-dev/tools/rawfonts.dtx
+++ b/Master/texmf-dist/source/latex-dev/tools/rawfonts.dtx
@@ -1,6 +1,6 @@
% \iffalse meta-comment
%
-% Copyright (C) 1993-2019
+% Copyright (C) 1993-2020
%
% The LaTeX3 Project and any individual authors listed elsewhere
% in this file.
diff --git a/Master/texmf-dist/source/latex-dev/tools/shellesc.dtx b/Master/texmf-dist/source/latex-dev/tools/shellesc.dtx
index 9706c5aa032..3b96c3e9ee3 100644
--- a/Master/texmf-dist/source/latex-dev/tools/shellesc.dtx
+++ b/Master/texmf-dist/source/latex-dev/tools/shellesc.dtx
@@ -1,6 +1,6 @@
% \iffalse
%% Source File: shellesc.dtx
-%% Copyright (C) 2015-2019
+%% Copyright (C) 2015-2020
%%
%% The LaTeX3 Project and any individual authors listed elsewhere
%% in this file.
@@ -49,7 +49,7 @@
% \changes{v0.2a}{2016/06/07}{Improve use with plain TeX}
% \section{Introduction}
%
-%
+%
% For many years web2c based \TeX\ implementations have used the syntax
% of the \verb|\write| command to access system commands by using a
% special stream 18 (streams above 15 can not be allocated to files in
@@ -96,7 +96,7 @@
% non-immediate \verb|\write18| in a document being ported to current
% Lua\TeX, you will need to change to use the
% \verb|\DelayedShellEscape| command.
-%
+%
% \section{Implementation}
%
% \begin{macrocode}
@@ -153,7 +153,7 @@
%
% \begin{macro}{\ShellEscape}
% \changes{v1.0a}{2019/10/13}{Lua logging for gh/195}
-% Execute the supplied tokens as a system dependent command, assuming
+% Execute the supplied tokens as a system dependent command, assuming
% such execution is allowed.
% \begin{macrocode}
\ifx\lastsavedimageresourcepages\@undefined
@@ -171,7 +171,7 @@
% \changes{v0.1c}{2016/04/29}{Define \cs{DelayedShellEscape} not \cs{ShellEscape}(UF)}
% \changes{v1.0a}{2019/10/13}{Lua logging for gh/195}
% Execute the supplied tokens as a system dependent command, when this
-% node is shipped out with the completed page, assuming
+% node is shipped out with the completed page, assuming
% such execution is allowed.
% \begin{macrocode}
\ifx\lastsavedimageresourcepages\@undefined
diff --git a/Master/texmf-dist/source/latex-dev/tools/showkeys.dtx b/Master/texmf-dist/source/latex-dev/tools/showkeys.dtx
index 6e2516856d5..59eb699ae81 100644
--- a/Master/texmf-dist/source/latex-dev/tools/showkeys.dtx
+++ b/Master/texmf-dist/source/latex-dev/tools/showkeys.dtx
@@ -1,6 +1,6 @@
% \iffalse meta-comment
%
-% Copyright (C) 1993-2019
+% Copyright (C) 1993-2020
%
% The LaTeX3 Project and any individual authors listed elsewhere
% in this file.
diff --git a/Master/texmf-dist/source/latex-dev/tools/somedefs.dtx b/Master/texmf-dist/source/latex-dev/tools/somedefs.dtx
index f73a45b7871..120ad980781 100644
--- a/Master/texmf-dist/source/latex-dev/tools/somedefs.dtx
+++ b/Master/texmf-dist/source/latex-dev/tools/somedefs.dtx
@@ -1,6 +1,6 @@
% \iffalse meta-comment
%
-% Copyright (C) 1993-2019
+% Copyright (C) 1993-2020
%
% The LaTeX3 Project and any individual authors listed elsewhere
% in this file.
diff --git a/Master/texmf-dist/source/latex-dev/tools/tabularx.dtx b/Master/texmf-dist/source/latex-dev/tools/tabularx.dtx
index ff8f3cec9a5..577730e665b 100644
--- a/Master/texmf-dist/source/latex-dev/tools/tabularx.dtx
+++ b/Master/texmf-dist/source/latex-dev/tools/tabularx.dtx
@@ -1,6 +1,6 @@
% \iffalse meta-comment
%
-% Copyright (C) 1993-2019
+% Copyright (C) 1993-2020
%
% The LaTeX3 Project and any individual authors listed elsewhere
% in this file.
@@ -31,7 +31,7 @@
%<driver> \ProvidesFile{tabularx.drv}
% \fi
% \ProvidesFile{tabularx.dtx}
- [2016/02/03 v2.11b `tabularx' package (DPC)]
+ [2020/01/15 v2.11c `tabularx' package (DPC)]
% \iffalse
%<*driver>
\documentclass{ltxdoc}
@@ -231,7 +231,7 @@
% Normally all {\ttfamily X} columns in a single table are set to the
% same width, however it is possible to make {\ttfamily tabularx} set
% them to different widths.
-% A preamble argument of
+% A preamble argument of
% "{>{\hsize=.5\hsize\linewidth=\hsize}X"\\
% " >{\hsize=1.5\hsize\linewidth=\hsize}X}"\\
% specifies two columns, the second will be three times as wide as the
@@ -341,8 +341,9 @@
% \end{macrocode}
% \changes{v2.02}{1995/03/20}
% {New local setting of \cs{TX@}}
-% \changes{v4.09}{1998/05/13}
+% \changes{v2.09}{1998/05/13}
% {Use \cs{setlength}, so that calc extensions apply. tools/2793}
+% \changes{v2.11c}{2020/01/15}{Delete duplicated . at end of message}
% Allow "\tabularx" "\endtabularx" (but not "\begin{tabularx}"
% "\end{tabularx}") to be used in "\newenvironment" definitions.
% \begin{macrocode}
@@ -351,11 +352,11 @@
% \end{macrocode}
% "\relax" added at v1.05 so that non-expandable length tokens, like
% "\textwidth" do not generate an extra space, and an overfull box.
-% "\relax" removed again at v4.09 in favour of "\setlength" so if you
+% "\relax" removed again at v2.09 in favour of "\setlength" so if you
% use the calc package you can use a width of "(\textwidth-12pt)/2".
% \begin{macrocode}
\setlength\TX@target{#1}%
- \TX@typeout{Target width: #1 = \the\TX@target.}%
+ \TX@typeout{Target width: #1 = \the\TX@target}%
\toks@{}\TX@get@body}
% \end{macrocode}
% \end{macro}
@@ -883,7 +884,7 @@
%
% Originally I followed Knuth, and had "\def\@tempa{##1}", however this
% did not allow "#" to appear in the argument. So in v1.04, I changed
-% this to to use a token register, and "\edef". This allows "#" appear,
+% this to use a token register, and "\edef". This allows "#" appear,
% but makes each one appear twice!, so later we loop through, replacing
% "##" by "#".
% \begin{macrocode}
diff --git a/Master/texmf-dist/source/latex-dev/tools/tabularx.ins b/Master/texmf-dist/source/latex-dev/tools/tabularx.ins
index 06308d77359..05effd3342e 100644
--- a/Master/texmf-dist/source/latex-dev/tools/tabularx.ins
+++ b/Master/texmf-dist/source/latex-dev/tools/tabularx.ins
@@ -3,31 +3,31 @@
%% driver files from the doc files in this package when run through
%% LaTeX or TeX.
%%
-%% Copyright (C) 1993-2019
+%% Copyright (C) 1993-2020
%% The LaTeX3 Project and any individual authors listed elsewhere
-%% in this file.
-%%
+%% in this file.
+%%
%% This file is part of the Standard LaTeX `Tools Bundle'.
%% -------------------------------------------------------
-%%
+%%
%% It may be distributed and/or modified under the
%% conditions of the LaTeX Project Public License, either version 1.3c
%% of this license or (at your option) any later version.
%% The latest version of this license is in
%% https://www.latex-project.org/lppl.txt
-%% and version 1.3c or later is part of all distributions of LaTeX
+%% and version 1.3c or later is part of all distributions of LaTeX
%% version 2005/12/01 or later.
-%%
+%%
%% As this file contains legal notices, it is NOT PERMITTED to modify
%% this file in any way that the legal information placed into
%% generated files is changed (i.e., the files generated when the
%% original file is executed). This restriction does not apply if
%% (parts of) the content is reused in a different WORK producing its
%% own generated files.
-%%
+%%
%% The list of all files belonging to the `Tools Bundle' is
%% given in the file `manifest.txt'.
-%%
+%%
%%
%% --------------- start of docstrip commands ------------------
%%
@@ -45,9 +45,9 @@ The source is maintained by the LaTeX Project team and bug
reports for it can be opened at https://latex-project.org/bugs/
(but please observe conditions on bug reports sent to that address!)
-Copyright (C) 1993-2019
+Copyright (C) 1993-2020
The LaTeX3 Project and any individual authors listed elsewhere
-in this file.
+in this file.
This file was generated from file(s) of the Standard LaTeX `Tools Bundle'.
--------------------------------------------------------------------------
@@ -57,7 +57,7 @@ conditions of the LaTeX Project Public License, either version 1.3c
of this license or (at your option) any later version.
The latest version of this license is in
https://www.latex-project.org/lppl.txt
-and version 1.3c or later is part of all distributions of LaTeX
+and version 1.3c or later is part of all distributions of LaTeX
version 2005/12/01 or later.
This file may only be distributed together with a copy of the LaTeX
diff --git a/Master/texmf-dist/source/latex-dev/tools/theorem.dtx b/Master/texmf-dist/source/latex-dev/tools/theorem.dtx
index 6f745d016ef..0df7dbb7649 100644
--- a/Master/texmf-dist/source/latex-dev/tools/theorem.dtx
+++ b/Master/texmf-dist/source/latex-dev/tools/theorem.dtx
@@ -1,6 +1,6 @@
% \iffalse meta-comment
%
-% Copyright (C) 1993-2019
+% Copyright (C) 1993-2020
%
% The LaTeX3 Project and any individual authors listed elsewhere
% in this file.
diff --git a/Master/texmf-dist/source/latex-dev/tools/tools.ins b/Master/texmf-dist/source/latex-dev/tools/tools.ins
index 12625e81662..5e978712215 100644
--- a/Master/texmf-dist/source/latex-dev/tools/tools.ins
+++ b/Master/texmf-dist/source/latex-dev/tools/tools.ins
@@ -3,31 +3,31 @@
%% driver files from the doc files in this package when run through
%% LaTeX or TeX.
%%
-%% Copyright (C) 1993-2019
+%% Copyright (C) 1993-2020
%% The LaTeX3 Project and any individual authors listed elsewhere
-%% in this file.
-%%
+%% in this file.
+%%
%% This file is part of the Standard LaTeX `Tools Bundle'.
%% -------------------------------------------------------
-%%
+%%
%% It may be distributed and/or modified under the
%% conditions of the LaTeX Project Public License, either version 1.3c
%% of this license or (at your option) any later version.
%% The latest version of this license is in
%% https://www.latex-project.org/lppl.txt
-%% and version 1.3c or later is part of all distributions of LaTeX
+%% and version 1.3c or later is part of all distributions of LaTeX
%% version 2005/12/01 or later.
-%%
+%%
%% As this file contains legal notices, it is NOT PERMITTED to modify
%% this file in any way that the legal information placed into
%% generated files is changed (i.e., the files generated when the
%% original file is executed). This restriction does not apply if
%% (parts of) the content is reused in a different WORK producing its
%% own generated files.
-%%
+%%
%% The list of all files belonging to the `Tools Bundle' is
%% given in the file `manifest.txt'.
-%%
+%%
%%
%% --------------- start of docstrip commands ------------------
%%
@@ -49,9 +49,9 @@ reports for it can be opened at https://latex-project.org/bugs/
(but please observe conditions on bug reports sent to that address!)
-Copyright (C) 1993-2019
+Copyright (C) 1993-2020
The LaTeX3 Project and any individual authors listed elsewhere
-in this file.
+in this file.
This file was generated from file(s) of the Standard LaTeX `Tools Bundle'.
--------------------------------------------------------------------------
@@ -61,7 +61,7 @@ conditions of the LaTeX Project Public License, either version 1.3c
of this license or (at your option) any later version.
The latest version of this license is in
https://www.latex-project.org/lppl.txt
-and version 1.3c or later is part of all distributions of LaTeX
+and version 1.3c or later is part of all distributions of LaTeX
version 2005/12/01 or later.
This file may only be distributed together with a copy of the LaTeX
@@ -166,7 +166,7 @@ given in the file `manifest.txt'.
\SimplePackage{layout}
-% Infix Arithmetic
+% Infix Arithmetic
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\SimplePackage{calc}
diff --git a/Master/texmf-dist/source/latex-dev/tools/trace.dtx b/Master/texmf-dist/source/latex-dev/tools/trace.dtx
index e808fdd4317..4a08f569bb5 100644
--- a/Master/texmf-dist/source/latex-dev/tools/trace.dtx
+++ b/Master/texmf-dist/source/latex-dev/tools/trace.dtx
@@ -1,6 +1,6 @@
% \iffalse meta-comment
%
-% Copyright (C) 1993-2019
+% Copyright (C) 1993-2020
%
% The LaTeX3 Project and any individual authors listed elsewhere
% in this file.
@@ -493,7 +493,7 @@
% turns on tracing of assignments and tracing of
% grouping.\footnote{These are my personal preference settings;
% \eTeX{} does in fact offer some more tracing switches and perhaps
-% one or or more of them should be added here as well.}
+% one or more of them should be added here as well.}
% To keep tracing at a minimum |\tracingassigns| should be turned
% on last (in fact like before we disassemble |\tracingall|
% and reorder it partially).
@@ -508,7 +508,7 @@
% \end{macrocode}
% We only change |\tracingoutput| if it hasn't already been enabled by
% |\showoutput|. If that's not the case, we set it to 2 so that we
-% can distingush the two cases.
+% can distingush the two cases.
% \changes{v1.1e}{2018/10/13}{Only reset \cs{tracingoutput} if not
% set by \cs{showoutput} earlier}
% \begin{macrocode}
@@ -519,7 +519,7 @@
\showboxdepth\maxdimen
\fi
% \end{macrocode}
-%
+%
% \begin{macrocode}
\errorstopmode
\tracingmacros\tw@
@@ -563,7 +563,7 @@
\showboxdepth\m@ne
\fi
% \end{macrocode}
-%
+%
% \begin{macrocode}
\tracingstats\@ne
\tracingparagraphs\z@
diff --git a/Master/texmf-dist/source/latex-dev/tools/varioref.dtx b/Master/texmf-dist/source/latex-dev/tools/varioref.dtx
index b8392c76f27..077103eb97a 100644
--- a/Master/texmf-dist/source/latex-dev/tools/varioref.dtx
+++ b/Master/texmf-dist/source/latex-dev/tools/varioref.dtx
@@ -1,6 +1,6 @@
% \iffalse meta-comment
%
-% Copyright (C) 1993-2019
+% Copyright (C) 1993-2020
%
% The LaTeX3 Project and any individual authors listed elsewhere
% in this file.
@@ -22,7 +22,7 @@
% \fi
% \iffalse
%% Package varioref to use with LaTeX2e
-%% Copyright (C) 1992-2019 Frank Mittelbach, all rights reserved.
+%% Copyright (C) 1992-2020 Frank Mittelbach, all rights reserved.
%%
%% For additions or updates to the language options please contact
%% the author at
@@ -40,7 +40,7 @@
%<package>\DeclareCurrentRelease{}{2019-10-01}
%<package>
%<package>\ProvidesPackage{varioref}
-%<package> [2019/11/05 v1.6c package for extended references (FMi)]
+%<package> [2020/01/23 v1.6c package for extended references (FMi)]
% \fi
%
%%
@@ -207,7 +207,7 @@
% to achieve the desired effect.
%
%
-% \DescribeMacro\vrefrange
+% \DescribeMacro\vrefrange
% This command is similar to |\vref| but it
% takes two mandatory arguments denoting a range to refer to (e.g., a
% sequences of figures or a sequence of equations, etc.). So if
@@ -497,7 +497,7 @@
% As mentioned above the package supports all standard options offered
% by the Babel system to customize the strings produced, it may also
% have a few not supported by babel, for a full list look
-% in section\vref{sec:impoptions}. In addition it offers the option
+% in section~\vref{sec:impoptions}. In addition it offers the option
% \texttt{draft} to turn error messages into warnings during
% development. The default \texttt{final} produces error message when
% a generated string falls onto a page boundary (see next section).
@@ -531,7 +531,7 @@
% \begin{quote}
% table 5 on the current \meta{page break} page
% \end{quote}
-% would would result in an error, which needs to be resolved by the
+% would result in an error, which needs to be resolved by the
% user by replacing the |\vref| command with an ordinary |\ref| just
% before the final run. This is not
% completely satisfactory but in such case no solution really is.
@@ -731,7 +731,7 @@
% easily, so you will see missing glyphs below. To see the real
% letters you have to look at the source or package file.
% \changes{v1.6b}{2019/09/08}{Option arabic added}
-% \begin{allowtofu}
+% \begin{allowtofu}
% \begin{macrocode}
\DeclareOption{arabic}
{\vref@addto\extrasarabic{%
@@ -745,7 +745,7 @@
\def\reftextlabelrange#1#2{\ref{#1} حتى~\ref{#2}}%
}}
% \end{macrocode}
-% \end{allowtofu}
+% \end{allowtofu}
% \changes{v1.2a}{1998/11/27}{Added austrian defaults (identical to german)}
% The austrian defaults are the same as the german ones.
% \begin{macrocode}
@@ -1803,7 +1803,7 @@
% user explicitly requested an empty text string using the optional
% argument we cancel any preceding space since in this case we are
% otherwise likely to end up with spaces one before and one after
-% |\vpageref|.
+% |\vpageref|.
% \changes{v1.2f}{2000/07/07}{Don't output space if optional argument
% empty (pr/3230)}
% \begin{macrocode}
@@ -1819,7 +1819,7 @@
% a space.
% \begin{macrocode}
\def\@tempc{#2}%
- \ifx\@tempc\@empty \else
+ \ifx\@tempc\@empty \else
#2\vref@space
\fi
% \end{macrocode}
@@ -1972,7 +1972,7 @@
% The \pkg{hyperref} package can then change the meaning of this
% command to suppress a hyperlink.
%
-% It is is also a good way to check if we are running with a new
+% It is also a good way to check if we are running with a new
% \pkg{varioref} by testing
%\begin{verbatim}
% \ifdefined\vp@gerefstar
@@ -2079,7 +2079,7 @@
% \end{macrocode}
% If option \texttt{space} is used then we remove a preceding space
% and add our own unbreakable space instead. Otherwise we don't do
-% any space-handling.
+% any space-handling.
% \begin{macrocode}
\if@vrefhandlespace
\unskip \nobreakspace
@@ -2100,7 +2100,7 @@
% After having handled (or not handled) the spacing we call
% |\vref@star| to scan the optional arguments and do the rest.
% If that command has been altered by \pkg{hyperref} then the
-% current one needs altering too and does the argument scanning explicitly.
+% current one needs altering too and does the argument scanning explicitly.
% \begin{macrocode}
\vref@star % in hyperref this needs to be explicit
}
@@ -2305,7 +2305,7 @@
{\Vr@f}}
% \end{macrocode}
% \end{macro}
-%
+%
% \begin{macro}{\Vref@star}
% \changes{v1.6a}{2019/08/25}{Command added to support hyperref better}
% \begin{macrocode}
@@ -2314,7 +2314,7 @@
\vpageref[#1]{#2}}
% \end{macrocode}
% \end{macro}
-%
+%
% \begin{macro}{\Vr@f}
% \changes{v1.4a}{2002/02/24}{Macro added}
% \changes{v1.4x}{2010/08/04}{Correct spacing -- same mistake as in \cs{vref}
@@ -2332,7 +2332,7 @@
% \begin{macro}{\vpagerefcompare}
-%
+%
% \changes{v1.6a}{2019/08/25}{Macro added}
% \begin{macrocode}
\DeclareRobustCommand\vpagerefcompare[2]{% label1, label2, TRUE, FALSE
@@ -2343,7 +2343,7 @@
\else
\expandafter\@secondoftwo
\fi
-}
+}
% \end{macrocode}
% \end{macro}
%
@@ -2385,7 +2385,7 @@
% True if the two pages have arabic page numbers are at most off by
% one so that |\vpageref| would produce a special string.
%
-% This is n some sense a general version of |\vpagerefnearby| for
+% This is in some sense a general version of |\vpagerefnearby| for
% use in more complex situations. I.e., if you try to determine if
% a larger set of references would be close to the current page and
% you use each time |\vpagerefnearby| then you generate a lot of
@@ -2449,4 +2449,3 @@
% \Finale
%
\endinput
-
diff --git a/Master/texmf-dist/source/latex-dev/tools/varioref.ins b/Master/texmf-dist/source/latex-dev/tools/varioref.ins
index e436202e4d0..951eedad891 100644
--- a/Master/texmf-dist/source/latex-dev/tools/varioref.ins
+++ b/Master/texmf-dist/source/latex-dev/tools/varioref.ins
@@ -3,31 +3,31 @@
%% driver files from the doc files in this package when run through
%% LaTeX or TeX.
%%
-%% Copyright (C) 1993-2019
+%% Copyright (C) 1993-2020
%% The LaTeX3 Project and any individual authors listed elsewhere
-%% in this file.
-%%
+%% in this file.
+%%
%% This file is part of the Standard LaTeX `Tools Bundle'.
%% -------------------------------------------------------
-%%
+%%
%% It may be distributed and/or modified under the
%% conditions of the LaTeX Project Public License, either version 1.3c
%% of this license or (at your option) any later version.
%% The latest version of this license is in
%% https://www.latex-project.org/lppl.txt
-%% and version 1.3c or later is part of all distributions of LaTeX
+%% and version 1.3c or later is part of all distributions of LaTeX
%% version 2008 or later.
-%%
+%%
%% As this file contains legal notices, it is NOT PERMITTED to modify
%% this file in any way that the legal information placed into
%% generated files is changed (i.e., the files generated when the
%% original file is executed). This restriction does not apply if
%% (parts of) the content is reused in a different WORK producing its
%% own generated files.
-%%
+%%
%% The list of all files belonging to the `Tools Bundle' is
%% given in the file `manifest.txt'.
-%%
+%%
%%
%% --------------- start of docstrip commands ------------------
%%
@@ -45,9 +45,9 @@ The source is maintained by the LaTeX Project team and bug
reports for it can be opened at https://latex-project.org/bugs/
(but please observe conditions on bug reports sent to that address!)
-Copyright (C) 1993-2019
+Copyright (C) 1993-2020
The LaTeX3 Project and any individual authors listed elsewhere
-in this file.
+in this file.
This file was generated from file(s) of the Standard LaTeX `Tools Bundle'.
--------------------------------------------------------------------------
@@ -57,7 +57,7 @@ conditions of the LaTeX Project Public License, either version 1.3c
of this license or (at your option) any later version.
The latest version of this license is in
https://www.latex-project.org/lppl.txt
-and version 1.3c or later is part of all distributions of LaTeX
+and version 1.3c or later is part of all distributions of LaTeX
version 2005/12/01 or later.
This file may only be distributed together with a copy of the LaTeX
diff --git a/Master/texmf-dist/source/latex-dev/tools/verbatim.dtx b/Master/texmf-dist/source/latex-dev/tools/verbatim.dtx
index b89bab7759e..121e2d4b39c 100644
--- a/Master/texmf-dist/source/latex-dev/tools/verbatim.dtx
+++ b/Master/texmf-dist/source/latex-dev/tools/verbatim.dtx
@@ -1,6 +1,6 @@
% \iffalse meta-comment
%
-% Copyright (C) 1993-2019
+% Copyright (C) 1993-2020
%
% The LaTeX3 Project and any individual authors listed elsewhere
% in this file.
@@ -14,7 +14,7 @@
% The latest version of this license is in
% https://www.latex-project.org/lppl.txt
% and version 1.3c or later is part of all distributions of LaTeX
-% version 2005/12/01 or later.
+% version 2008 or later.
%
% The list of all files belonging to the LaTeX `Tools Bundle' is
% given in the file `manifest.txt'.
@@ -828,7 +828,7 @@
% \begin{macrocode}
\@namedef{verbatim*}{\begingroup\@verbatim
% \end{macrocode}
-%
+%
% \changes{v1.5r}{2019/11/10}{Support kernel \cs{verbvisiblespace} (gh/212)}
% \begin{macrocode}
\@setupverbvisiblespace\@vobeyspaces
@@ -1488,7 +1488,7 @@
\else
% \end{macrocode}
% At this point we pass the name of the file to |\@addtofilelist|
-% so that its appears appears in the output of a |\listfiles|
+% so that its appears in the output of a |\listfiles|
% command.
% \changes{v1.5j}{1996/09/25}{Add \cs{@addtofilelist} and
% \cs{ProvidesFile} so that the name of the file
diff --git a/Master/texmf-dist/source/latex-dev/tools/xr.dtx b/Master/texmf-dist/source/latex-dev/tools/xr.dtx
index 97c4c68084e..a6b2ffd8193 100644
--- a/Master/texmf-dist/source/latex-dev/tools/xr.dtx
+++ b/Master/texmf-dist/source/latex-dev/tools/xr.dtx
@@ -1,6 +1,6 @@
% \iffalse meta-comment
%
-% Copyright (C) 1993-2019
+% Copyright (C) 1993-2020
%
% The LaTeX3 Project and any individual authors listed elsewhere
% in this file.
@@ -86,7 +86,7 @@
%
% As first suggested in Enrico Gregorio's |xcite| package, the current version
% also allows |\cite| to reference |\bibitem| in the external document.
-% For compatibility with |xcite|, |\externalcitedocument| is made available
+% For compatibility with |xcite|, |\externalcitedocument| is made available
% as an alias for |\externaldocument|
%
% \StopEventually{}
@@ -183,4 +183,3 @@
%
% \Finale
%
-
diff --git a/Master/texmf-dist/source/latex-dev/tools/xspace.dtx b/Master/texmf-dist/source/latex-dev/tools/xspace.dtx
index 0745caf5071..ebe8d0f9478 100644
--- a/Master/texmf-dist/source/latex-dev/tools/xspace.dtx
+++ b/Master/texmf-dist/source/latex-dev/tools/xspace.dtx
@@ -1,6 +1,6 @@
% \iffalse meta-comment
%
-% Copyright (C) 1993-2019
+% Copyright (C) 1993-2020
%
% The LaTeX3 Project and any individual authors listed elsewhere
% in this file.