latex-dev (27may20)

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

71 files changed, 3540 insertions, 460 deletions

diff --git a/Master/texmf-dist/tex/latex-dev/amsmath/amsmath-2018-12-01.sty b/Master/texmf-dist/tex/latex-dev/amsmath/amsmath-2018-12-01.sty
index f684834649e..6bcb03e2177 100644
--- a/Master/texmf-dist/tex/latex-dev/amsmath/amsmath-2018-12-01.sty
+++ b/Master/texmf-dist/tex/latex-dev/amsmath/amsmath-2018-12-01.sty
@@ -4,11 +4,11 @@
 %%
 %% The original source files were:
 %%
-%% amsmath.dtx 
-%% 
+%% amsmath.dtx
+%%
 %% Copyright 1995, 1999, 2000, 2013 American Mathematical Society.
 %% Copyright 2016 LaTeX3 Project and American Mathematical Society.
-%% 
+%%
 %% This work 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.
@@ -16,11 +16,11 @@
 %%   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.
-%% 
+%%
 %% This work has the LPPL maintenance status `maintained'.
-%% 
+%%
 %% The Current Maintainer of this work is the LaTeX3 project.
-%% 
+%%
 \NeedsTeXFormat{LaTeX2e}% LaTeX 2.09 can't be used (nor non-LaTeX)
 [1994/12/01]% LaTeX date must be December 1994 or later
 \ProvidesPackage{amsmath}[2018/12/01 v2.17b AMS math features]
diff --git a/Master/texmf-dist/tex/latex-dev/amsmath/amsmath.sty b/Master/texmf-dist/tex/latex-dev/amsmath/amsmath.sty
index 0b8113127e7..331d9225b72 100644
--- a/Master/texmf-dist/tex/latex-dev/amsmath/amsmath.sty
+++ b/Master/texmf-dist/tex/latex-dev/amsmath/amsmath.sty
@@ -27,7 +27,7 @@
 \providecommand\DeclareCurrentRelease[2]{}
 \DeclareRelease{}{2018-12-01}{amsmath-2018-12-01.sty}
 \DeclareCurrentRelease{}{2019-04-01}
-\ProvidesPackage{amsmath}[2019/11/16 v2.17d AMS math features]
+\ProvidesPackage{amsmath}[2020/03/17 v2.17g AMS math features]
 \edef\@temp{\catcode 96=\number\catcode 96 }
 \catcode\string `\`=12
 \def\do#1{\catcode\number`#1=\number\catcode`#1}
@@ -153,23 +153,29 @@ For additional information on amsmath, use the \lq ?\rq\space option.%
 \@ifundefined{inf@bad}{%
   \newcount\inf@bad \inf@bad=1000000 \relax
 }{}
+\let\tmspace\@undefined
+\let\,\@undefined
+\let\!\@undefined
+\let\:\@undefined
+\let\negmedspace\@undefined
+\let\negthickspace\@undefined
 \ifx\leavevmode@ifvmode\@undefined
-\DeclareRobustCommand{\tmspace}[3]{%
+\DeclareRobustCommand\tmspace[3]{%
   \ifmmode\mskip#1#2\else\kern#1#3\fi\relax}
 \else
-\DeclareRobustCommand{\tmspace}[3]{%
+\DeclareRobustCommand\tmspace[3]{%
   \ifmmode\mskip#1#2\else\leavevmode@ifvmode\kern#1#3\fi\relax}
 \fi
-\renewcommand{\,}{\tmspace+\thinmuskip{.1667em}}
+\DeclareRobustCommand\,{\tmspace+\thinmuskip{.1667em}}
 \let\thinspace\,
-\renewcommand{\!}{\tmspace-\thinmuskip{.1667em}}
+\DeclareRobustCommand\!{\tmspace-\thinmuskip{.1667em}}
 \let\negthinspace\!
-\renewcommand{\:}{\tmspace+\medmuskip{.2222em}}
+\DeclareRobustCommand\:{\tmspace+\medmuskip{.2222em}}
 \let\medspace\:
-\newcommand{\negmedspace}{\tmspace-\medmuskip{.2222em}}
-\renewcommand{\;}{\tmspace+\thickmuskip{.2777em}}
+\DeclareRobustCommand\negmedspace{\tmspace-\medmuskip{.2222em}}
+\renewcommand\;{\tmspace+\thickmuskip{.2777em}}
 \let\thickspace\;
-\newcommand{\negthickspace}{\tmspace-\thickmuskip{.2777em}}
+\DeclareRobustCommand\negthickspace{\tmspace-\thickmuskip{.2777em}}
 \newcommand{\mspace}[1]{\mskip#1\relax}
 \def\@tempa#1#2\@nil{%
   \ifx\delimiter#1\@tempcnta#2\relax\else\@tempcnta\z@\fi
@@ -177,9 +183,9 @@ For additional information on amsmath, use the \lq ?\rq\space option.%
 \@xp\@tempa\vert\@empty\@nil
 \ifnum\@tempcnta>\z@
   \advance\@tempcnta "4000000
-  \xdef\lvert{\delimiter\number\@tempcnta\space }
+  \protected\xdef\lvert{\delimiter\number\@tempcnta\space }
   \advance\@tempcnta "1000000
-  \xdef\rvert{\delimiter\number\@tempcnta\space }
+  \protected\xdef\rvert{\delimiter\number\@tempcnta\space }
 \else
   \ifx\@@undefined\lvert
     % Fall back to cmex encoding since we don't know what else to do.
@@ -192,9 +198,9 @@ For additional information on amsmath, use the \lq ?\rq\space option.%
 \@xp\@tempa\Vert\@empty\@nil
 \ifnum\@tempcnta>\z@
   \advance\@tempcnta "4000000
-  \xdef\lVert{\delimiter\number\@tempcnta\space }
+  \protected\xdef\lVert{\delimiter\number\@tempcnta\space }
   \advance\@tempcnta "1000000
-  \xdef\rVert{\delimiter\number\@tempcnta\space }
+  \protected\xdef\rVert{\delimiter\number\@tempcnta\space }
 \else
   \ifx\@@undefined\lVert
     \DeclareMathDelimiter{\lVert}
@@ -733,11 +739,11 @@ Foreign command \@backslashchar#1;\MessageBreak
 \DeclareFontEncoding{OML}{}{\noaccents@}
 \DeclareFontEncoding{OMS}{}{\noaccents@}
 \ams@newcommand{\dddot}[1]{%
-  {\mathop{#1}\limits^{\vbox to-1.4\ex@{\kern-\tw@\ex@
-   \hbox{\normalfont ...}\vss}}}}
+  {\mathop{\kern\z@#1}\limits^{\vbox to-1.4\ex@{\kern-\tw@\ex@
+   \hbox{\,\normalfont...}\vss}}}}
 \ams@newcommand{\ddddot}[1]{%
-  {\mathop{#1}\limits^{\vbox to-1.4\ex@{\kern-\tw@\ex@
-   \hbox{\normalfont....}\vss}}}}
+  {\mathop{\kern\z@#1}\limits^{\vbox to-1.4\ex@{\kern-\tw@\ex@
+   \hbox{\,\normalfont....}\vss}}}}
 \def\set@mathaccent#1#2#3#4{%
   \xdef#2{%
     \@nx\mathaccentV
@@ -1309,7 +1315,8 @@ and fix things up.}
             \nointerlineskip
             \vskip-\ht\strutbox@
             \vskip-\dp\strutbox@
-            \vbox{\noindent\hbox to\displaywidth{\hbox to#1{\strut@\hfill}}}%
+            \vbox{\noindent\hbox to\displaywidth{%
+                           \hbox to#1{\strut@\hfill}}}%
             \prevdepth\dimen@
         \fi
     }%
@@ -1378,13 +1385,31 @@ and fix things up.}
   \fi
   \next@ \cr
 }
+\def\ams@start@box#1{%
+  \edef\reserved@a{\csname ams@pos@\expandafter\detokenize
+    \expandafter{\romannumeral-`\0#1}\endcsname}%
+  \expandafter\ifx\reserved@a\relax
+     \PackageWarning{amsmath}{%
+       Bracket group \detokenize{[#1]} at formula start!\MessageBreak
+       It could be a misspelled positional argument.\MessageBreak
+       If it belongs to the formula add a \relax in\MessageBreak
+        front to hide it}%
+     \def\ams@return@opt@arg{[#1]}\vcenter
+  \else
+     \let\ams@return@opt@arg\@empty\reserved@a
+  \fi
+}
+\def\ams@pos@t{\vtop}
+\def\ams@pos@b{\vbox}
+\def\ams@pos@c{\vcenter}
+\let\ams@pos@\ams@pos@c
 \newcommand{\start@aligned}[2]{%
     \RIfM@\else
         \nonmatherr@{\begin{\@currenvir}}%
     \fi
     \savecolumn@ % Assumption: called inside a group
     \alignedspace@left
-    \if #1t\vtop \else \if#1b \vbox \else \vcenter \fi \fi \bgroup
+      \ams@start@box{#1}\bgroup
         \maxfields@#2\relax
         \ifnum\maxfields@>\m@ne
             \multiply\maxfields@\tw@
@@ -1409,6 +1434,7 @@ and fix things up.}
             \hfil
             \tabskip\alignsep@
             \crcr
+          \ams@return@opt@arg
 }
 \def\math@cr@@@alignedat{%
     \ifnum\column@>\maxfields@
@@ -1448,12 +1474,13 @@ and fix things up.}
         \nonmatherr@{\begin{gathered}}%
     \fi
     \alignedspace@left
-    \if #1t\vtop \else \if#1b\vbox \else \vcenter \fi\fi \bgroup
+    \ams@start@box{#1}\bgroup
         \Let@ \chardef\dspbrk@context\@ne \restore@math@cr
         \spread@equation
         \ialign\bgroup
             \hfil\strut@$\m@th\displaystyle##$\hfil
             \crcr
+    \ams@return@opt@arg
 }{%
   \endaligned
 }
diff --git a/Master/texmf-dist/tex/latex-dev/amsmath/amstex.sty b/Master/texmf-dist/tex/latex-dev/amsmath/amstex.sty
index edb57c1214a..6ce36f52c9c 100644
--- a/Master/texmf-dist/tex/latex-dev/amsmath/amstex.sty
+++ b/Master/texmf-dist/tex/latex-dev/amsmath/amstex.sty
@@ -11,9 +11,9 @@
 %   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.
-% 
+%
 % This work has the LPPL maintenance status `maintained'.
-% 
+%
 % The Current Maintainer of this work is the LaTeX3 Project.
 %
 % \fi
diff --git a/Master/texmf-dist/tex/latex-dev/base/ansinew.def b/Master/texmf-dist/tex/latex-dev/base/ansinew.def
index c752eaab491..6566937cbf5 100644
--- a/Master/texmf-dist/tex/latex-dev/base/ansinew.def
+++ b/Master/texmf-dist/tex/latex-dev/base/ansinew.def
@@ -44,7 +44,7 @@
 
 
   \ProvidesFile{ansinew.def}
-   [2018/08/11 v1.3c Input encoding file]
+   [2020/04/14 v1.3c Input encoding file]
 \ProvideTextCommandDefault{\textdegree}{\ensuremath{{^\circ}}}
 \ProvideTextCommandDefault{\textonehalf}{\ensuremath{\frac12}}
 \ProvideTextCommandDefault{\textonequarter}{\ensuremath{\frac14}}
diff --git a/Master/texmf-dist/tex/latex-dev/base/applemac.def b/Master/texmf-dist/tex/latex-dev/base/applemac.def
index e311bb2bd9b..ec766878912 100644
--- a/Master/texmf-dist/tex/latex-dev/base/applemac.def
+++ b/Master/texmf-dist/tex/latex-dev/base/applemac.def
@@ -44,7 +44,7 @@
 
 
   \ProvidesFile{applemac.def}
-   [2018/08/11 v1.3c Input encoding file]
+   [2020/04/14 v1.3c Input encoding file]
 \ProvideTextCommandDefault{\textdegree}{\ensuremath{{^\circ}}}
 \ProvideTextCommandDefault{\textflorin}{\textit{f}}
 \ProvideTextCommandDefault{\textcent}
diff --git a/Master/texmf-dist/tex/latex-dev/base/article.cls b/Master/texmf-dist/tex/latex-dev/base/article.cls
index 5aafd282345..024e49cf835 100644
--- a/Master/texmf-dist/tex/latex-dev/base/article.cls
+++ b/Master/texmf-dist/tex/latex-dev/base/article.cls
@@ -43,70 +43,70 @@
 %% extension .ins) which are part of the distribution.
 \NeedsTeXFormat{LaTeX2e}[1995/12/01]
 \ProvidesClass{article}
-              [2019/12/20 v1.4l
+              [2020/04/10 v1.4m
  Standard LaTeX document class]
 \newcommand\@ptsize{}
 \newif\if@restonecol
 \newif\if@titlepage
 \@titlepagefalse
 \if@compatibility\else
-\DeclareOption{a4paper}
-   {\setlength\paperheight {297mm}%
-    \setlength\paperwidth  {210mm}}
-\DeclareOption{a5paper}
-   {\setlength\paperheight {210mm}%
-    \setlength\paperwidth  {148mm}}
-\DeclareOption{b5paper}
-   {\setlength\paperheight {250mm}%
-    \setlength\paperwidth  {176mm}}
-\DeclareOption{letterpaper}
-   {\setlength\paperheight {11in}%
-    \setlength\paperwidth  {8.5in}}
-\DeclareOption{legalpaper}
-   {\setlength\paperheight {14in}%
-    \setlength\paperwidth  {8.5in}}
-\DeclareOption{executivepaper}
-   {\setlength\paperheight {10.5in}%
-    \setlength\paperwidth  {7.25in}}
-\DeclareOption{landscape}
-   {\setlength\@tempdima   {\paperheight}%
-    \setlength\paperheight {\paperwidth}%
-    \setlength\paperwidth  {\@tempdima}}
+  \DeclareOption{a4paper}
+     {\setlength\paperheight {297mm}%
+      \setlength\paperwidth  {210mm}}
+  \DeclareOption{a5paper}
+     {\setlength\paperheight {210mm}%
+      \setlength\paperwidth  {148mm}}
+  \DeclareOption{b5paper}
+     {\setlength\paperheight {250mm}%
+      \setlength\paperwidth  {176mm}}
+  \DeclareOption{letterpaper}
+     {\setlength\paperheight {11in}%
+      \setlength\paperwidth  {8.5in}}
+  \DeclareOption{legalpaper}
+     {\setlength\paperheight {14in}%
+      \setlength\paperwidth  {8.5in}}
+  \DeclareOption{executivepaper}
+     {\setlength\paperheight {10.5in}%
+      \setlength\paperwidth  {7.25in}}
+  \DeclareOption{landscape}
+     {\setlength\@tempdima   {\paperheight}%
+      \setlength\paperheight {\paperwidth}%
+      \setlength\paperwidth  {\@tempdima}}
 \fi
 \if@compatibility
   \renewcommand\@ptsize{0}
 \else
-\DeclareOption{10pt}{\renewcommand\@ptsize{0}}
+  \DeclareOption{10pt}{\renewcommand\@ptsize{0}}
 \fi
 \DeclareOption{11pt}{\renewcommand\@ptsize{1}}
 \DeclareOption{12pt}{\renewcommand\@ptsize{2}}
 \if@compatibility\else
-\DeclareOption{oneside}{\@twosidefalse \@mparswitchfalse}
+  \DeclareOption{oneside}{\@twosidefalse \@mparswitchfalse}
 \fi
 \DeclareOption{twoside}{\@twosidetrue  \@mparswitchtrue}
 \DeclareOption{draft}{\setlength\overfullrule{5pt}}
 \if@compatibility\else
-\DeclareOption{final}{\setlength\overfullrule{0pt}}
+  \DeclareOption{final}{\setlength\overfullrule{0pt}}
 \fi
 \DeclareOption{titlepage}{\@titlepagetrue}
 \if@compatibility\else
-\DeclareOption{notitlepage}{\@titlepagefalse}
+  \DeclareOption{notitlepage}{\@titlepagefalse}
 \fi
 \if@compatibility\else
-\DeclareOption{onecolumn}{\@twocolumnfalse}
+  \DeclareOption{onecolumn}{\@twocolumnfalse}
 \fi
 \DeclareOption{twocolumn}{\@twocolumntrue}
 \DeclareOption{leqno}{\input{leqno.clo}}
 \DeclareOption{fleqn}{\input{fleqn.clo}}
 \DeclareOption{openbib}{%
   \AtEndOfPackage{%
-   \renewcommand\@openbib@code{%
+    \renewcommand\@openbib@code{%
       \advance\leftmargin\bibindent
       \itemindent -\bibindent
       \listparindent \itemindent
       \parsep \z@
       }%
-   \renewcommand\newblock{\par}}%
+    \renewcommand\newblock{\par}}%
 }
 \ExecuteOptions{letterpaper,10pt,oneside,onecolumn,final}
 \ProcessOptions
@@ -166,7 +166,7 @@
     \let\sectionmark\@gobble
     \let\subsectionmark\@gobble
     }
-  \if@titlepage
+\if@titlepage
   \newcommand\maketitle{\begin{titlepage}%
   \let\footnotesize\small
   \let\footnoterule\relax
@@ -198,41 +198,41 @@
   \global\let\author\relax
   \global\let\date\relax
   \global\let\and\relax
-}
+  }
 \else
-\newcommand\maketitle{\par
-  \begingroup
-    \renewcommand\thefootnote{\@fnsymbol\c@footnote}%
-    \def\@makefnmark{\rlap{\@textsuperscript{\normalfont\@thefnmark}}}%
-    \long\def\@makefntext##1{\parindent 1em\noindent
-            \hb@xt@1.8em{%
+  \newcommand\maketitle{\par
+    \begingroup
+      \renewcommand\thefootnote{\@fnsymbol\c@footnote}%
+      \def\@makefnmark{\rlap{\@textsuperscript{\normalfont\@thefnmark}}}%
+      \long\def\@makefntext##1{\parindent 1em\noindent
+              \hb@xt@1.8em{%
                 \hss\@textsuperscript{\normalfont\@thefnmark}}##1}%
-    \if@twocolumn
-      \ifnum \col@number=\@ne
-        \@maketitle
+      \if@twocolumn
+        \ifnum \col@number=\@ne
+          \@maketitle
+        \else
+          \twocolumn[\@maketitle]%
+        \fi
       \else
-        \twocolumn[\@maketitle]%
-      \fi
-    \else
       \newpage
-      \global\@topnum\z@   % Prevents figures from going at top of page.
-      \@maketitle
-    \fi
-    \thispagestyle{plain}\@thanks
-  \endgroup
-  \setcounter{footnote}{0}%
-  \global\let\thanks\relax
-  \global\let\maketitle\relax
-  \global\let\@maketitle\relax
-  \global\let\@thanks\@empty
-  \global\let\@author\@empty
-  \global\let\@date\@empty
-  \global\let\@title\@empty
-  \global\let\title\relax
-  \global\let\author\relax
-  \global\let\date\relax
-  \global\let\and\relax
-}
+        \global\@topnum\z@   % Prevents figures from going at top of page.
+        \@maketitle
+      \fi
+      \thispagestyle{plain}\@thanks
+    \endgroup
+    \setcounter{footnote}{0}%
+    \global\let\thanks\relax
+    \global\let\maketitle\relax
+    \global\let\@maketitle\relax
+    \global\let\@thanks\@empty
+    \global\let\@author\@empty
+    \global\let\@date\@empty
+    \global\let\@title\@empty
+    \global\let\title\relax
+    \global\let\author\relax
+    \global\let\date\relax
+    \global\let\and\relax
+  }
 \def\@maketitle{%
   \newpage
   \null
@@ -407,7 +407,7 @@
                 \item\relax}
                {\endlist}
 \if@compatibility
-\newenvironment{titlepage}
+  \newenvironment{titlepage}
     {%
       \if@twocolumn
         \@restonecoltrue\onecolumn
@@ -420,7 +420,7 @@
     {\if@restonecol\twocolumn \else \newpage \fi
     }
 \else
-\newenvironment{titlepage}
+  \newenvironment{titlepage}
     {%
       \if@twocolumn
         \@restonecoltrue\onecolumn
diff --git a/Master/texmf-dist/tex/latex-dev/base/ascii.def b/Master/texmf-dist/tex/latex-dev/base/ascii.def
index fdedbdf44bb..36a8db17b8f 100644
--- a/Master/texmf-dist/tex/latex-dev/base/ascii.def
+++ b/Master/texmf-dist/tex/latex-dev/base/ascii.def
@@ -44,7 +44,7 @@
 
 
  \ProvidesFile{ascii.def}
-   [2018/08/11 v1.3c Input encoding file]
+   [2020/04/14 v1.3c Input encoding file]
 \@inpenc@test
 \endinput
 %%
diff --git a/Master/texmf-dist/tex/latex-dev/base/bk10.clo b/Master/texmf-dist/tex/latex-dev/base/bk10.clo
index 944d2f09543..da26bc70cf8 100644
--- a/Master/texmf-dist/tex/latex-dev/base/bk10.clo
+++ b/Master/texmf-dist/tex/latex-dev/base/bk10.clo
@@ -42,7 +42,7 @@
 %% and covered by LPPL is defined by the unpacking scripts (with
 %% extension .ins) which are part of the distribution.
 \ProvidesFile{bk10.clo}
-              [2019/12/20 v1.4l
+              [2020/04/10 v1.4m
       Standard LaTeX file (size option)]
 \renewcommand\normalsize{%
    \@setfontsize\normalsize\@xpt\@xiipt
@@ -97,7 +97,7 @@
 \setlength\topskip   {10\p@}
 \setlength\footskip{.35in}
 \if@compatibility \setlength\maxdepth{4\p@} \else
-\setlength\maxdepth{.5\topskip} \fi
+  \setlength\maxdepth{.5\topskip} \fi
 \if@compatibility
   \if@twocolumn
     \setlength\textwidth{410\p@}
@@ -137,7 +137,7 @@
 \fi
 \addtolength\textheight{\topskip}
 \if@twocolumn
- \setlength\marginparsep {10\p@}
+  \setlength\marginparsep {10\p@}
 \else
   \setlength\marginparsep{7\p@}
 \fi
diff --git a/Master/texmf-dist/tex/latex-dev/base/bk11.clo b/Master/texmf-dist/tex/latex-dev/base/bk11.clo
index 9baaf6777cc..106db675aa6 100644
--- a/Master/texmf-dist/tex/latex-dev/base/bk11.clo
+++ b/Master/texmf-dist/tex/latex-dev/base/bk11.clo
@@ -42,7 +42,7 @@
 %% and covered by LPPL is defined by the unpacking scripts (with
 %% extension .ins) which are part of the distribution.
 \ProvidesFile{bk11.clo}
-              [2019/12/20 v1.4l
+              [2020/04/10 v1.4m
       Standard LaTeX file (size option)]
 \renewcommand\normalsize{%
    \@setfontsize\normalsize\@xipt{13.6}%
@@ -97,7 +97,7 @@
 \setlength\topskip   {11\p@}
 \setlength\footskip{.38in}
 \if@compatibility \setlength\maxdepth{4\p@} \else
-\setlength\maxdepth{.5\topskip} \fi
+  \setlength\maxdepth{.5\topskip} \fi
 \if@compatibility
   \if@twocolumn
     \setlength\textwidth{410\p@}
@@ -137,7 +137,7 @@
 \fi
 \addtolength\textheight{\topskip}
 \if@twocolumn
- \setlength\marginparsep {10\p@}
+  \setlength\marginparsep {10\p@}
 \else
   \setlength\marginparsep{7\p@}
 \fi
diff --git a/Master/texmf-dist/tex/latex-dev/base/bk12.clo b/Master/texmf-dist/tex/latex-dev/base/bk12.clo
index a395ceda8ff..1f6bc54528b 100644
--- a/Master/texmf-dist/tex/latex-dev/base/bk12.clo
+++ b/Master/texmf-dist/tex/latex-dev/base/bk12.clo
@@ -42,7 +42,7 @@
 %% and covered by LPPL is defined by the unpacking scripts (with
 %% extension .ins) which are part of the distribution.
 \ProvidesFile{bk12.clo}
-              [2019/12/20 v1.4l
+              [2020/04/10 v1.4m
       Standard LaTeX file (size option)]
 \renewcommand\normalsize{%
    \@setfontsize\normalsize\@xiipt{14.5}%
@@ -97,7 +97,7 @@
 \setlength\topskip   {12\p@}
 \setlength\footskip{30\p@}
 \if@compatibility \setlength\maxdepth{4\p@} \else
-\setlength\maxdepth{.5\topskip} \fi
+  \setlength\maxdepth{.5\topskip} \fi
 \if@compatibility
   \if@twocolumn
     \setlength\textwidth{410\p@}
@@ -137,7 +137,7 @@
 \fi
 \addtolength\textheight{\topskip}
 \if@twocolumn
- \setlength\marginparsep {10\p@}
+  \setlength\marginparsep {10\p@}
 \else
   \setlength\marginparsep{7\p@}
 \fi
diff --git a/Master/texmf-dist/tex/latex-dev/base/book.cls b/Master/texmf-dist/tex/latex-dev/base/book.cls
index ee6cf9119f1..04ab96f3a11 100644
--- a/Master/texmf-dist/tex/latex-dev/base/book.cls
+++ b/Master/texmf-dist/tex/latex-dev/base/book.cls
@@ -43,7 +43,7 @@
 %% extension .ins) which are part of the distribution.
 \NeedsTeXFormat{LaTeX2e}[1995/12/01]
 \ProvidesClass{book}
-              [2019/12/20 v1.4l
+              [2020/04/10 v1.4m
  Standard LaTeX document class]
 \newcommand\@ptsize{}
 \newif\if@restonecol
@@ -52,47 +52,47 @@
 \newif\if@openright
 \newif\if@mainmatter \@mainmattertrue
 \if@compatibility\else
-\DeclareOption{a4paper}
-   {\setlength\paperheight {297mm}%
-    \setlength\paperwidth  {210mm}}
-\DeclareOption{a5paper}
-   {\setlength\paperheight {210mm}%
-    \setlength\paperwidth  {148mm}}
-\DeclareOption{b5paper}
-   {\setlength\paperheight {250mm}%
-    \setlength\paperwidth  {176mm}}
-\DeclareOption{letterpaper}
-   {\setlength\paperheight {11in}%
-    \setlength\paperwidth  {8.5in}}
-\DeclareOption{legalpaper}
-   {\setlength\paperheight {14in}%
-    \setlength\paperwidth  {8.5in}}
-\DeclareOption{executivepaper}
-   {\setlength\paperheight {10.5in}%
-    \setlength\paperwidth  {7.25in}}
-\DeclareOption{landscape}
-   {\setlength\@tempdima   {\paperheight}%
-    \setlength\paperheight {\paperwidth}%
-    \setlength\paperwidth  {\@tempdima}}
+  \DeclareOption{a4paper}
+     {\setlength\paperheight {297mm}%
+      \setlength\paperwidth  {210mm}}
+  \DeclareOption{a5paper}
+     {\setlength\paperheight {210mm}%
+      \setlength\paperwidth  {148mm}}
+  \DeclareOption{b5paper}
+     {\setlength\paperheight {250mm}%
+      \setlength\paperwidth  {176mm}}
+  \DeclareOption{letterpaper}
+     {\setlength\paperheight {11in}%
+      \setlength\paperwidth  {8.5in}}
+  \DeclareOption{legalpaper}
+     {\setlength\paperheight {14in}%
+      \setlength\paperwidth  {8.5in}}
+  \DeclareOption{executivepaper}
+     {\setlength\paperheight {10.5in}%
+      \setlength\paperwidth  {7.25in}}
+  \DeclareOption{landscape}
+     {\setlength\@tempdima   {\paperheight}%
+      \setlength\paperheight {\paperwidth}%
+      \setlength\paperwidth  {\@tempdima}}
 \fi
 \if@compatibility
   \renewcommand\@ptsize{0}
 \else
-\DeclareOption{10pt}{\renewcommand\@ptsize{0}}
+  \DeclareOption{10pt}{\renewcommand\@ptsize{0}}
 \fi
 \DeclareOption{11pt}{\renewcommand\@ptsize{1}}
 \DeclareOption{12pt}{\renewcommand\@ptsize{2}}
 \if@compatibility\else
-\DeclareOption{oneside}{\@twosidefalse \@mparswitchfalse}
+  \DeclareOption{oneside}{\@twosidefalse \@mparswitchfalse}
 \fi
 \DeclareOption{twoside}{\@twosidetrue  \@mparswitchtrue}
 \DeclareOption{draft}{\setlength\overfullrule{5pt}}
 \if@compatibility\else
-\DeclareOption{final}{\setlength\overfullrule{0pt}}
+  \DeclareOption{final}{\setlength\overfullrule{0pt}}
 \fi
 \DeclareOption{titlepage}{\@titlepagetrue}
 \if@compatibility\else
-\DeclareOption{notitlepage}{\@titlepagefalse}
+  \DeclareOption{notitlepage}{\@titlepagefalse}
 \fi
 \if@compatibility
 \@openrighttrue
@@ -101,20 +101,20 @@
 \DeclareOption{openany}{\@openrightfalse}
 \fi
 \if@compatibility\else
-\DeclareOption{onecolumn}{\@twocolumnfalse}
+  \DeclareOption{onecolumn}{\@twocolumnfalse}
 \fi
 \DeclareOption{twocolumn}{\@twocolumntrue}
 \DeclareOption{leqno}{\input{leqno.clo}}
 \DeclareOption{fleqn}{\input{fleqn.clo}}
 \DeclareOption{openbib}{%
   \AtEndOfPackage{%
-   \renewcommand\@openbib@code{%
+    \renewcommand\@openbib@code{%
       \advance\leftmargin\bibindent
       \itemindent -\bibindent
       \listparindent \itemindent
       \parsep \z@
       }%
-   \renewcommand\newblock{\par}}%
+    \renewcommand\newblock{\par}}%
 }
 \ExecuteOptions{letterpaper,10pt,twoside,onecolumn,final,openright}
 \ProcessOptions
@@ -178,7 +178,7 @@
     \let\chaptermark\@gobble
     \let\sectionmark\@gobble
     }
-  \if@titlepage
+\if@titlepage
   \newcommand\maketitle{\begin{titlepage}%
   \let\footnotesize\small
   \let\footnoterule\relax
@@ -210,41 +210,41 @@
   \global\let\author\relax
   \global\let\date\relax
   \global\let\and\relax
-}
+  }
 \else
-\newcommand\maketitle{\par
-  \begingroup
-    \renewcommand\thefootnote{\@fnsymbol\c@footnote}%
-    \def\@makefnmark{\rlap{\@textsuperscript{\normalfont\@thefnmark}}}%
-    \long\def\@makefntext##1{\parindent 1em\noindent
-            \hb@xt@1.8em{%
+  \newcommand\maketitle{\par
+    \begingroup
+      \renewcommand\thefootnote{\@fnsymbol\c@footnote}%
+      \def\@makefnmark{\rlap{\@textsuperscript{\normalfont\@thefnmark}}}%
+      \long\def\@makefntext##1{\parindent 1em\noindent
+              \hb@xt@1.8em{%
                 \hss\@textsuperscript{\normalfont\@thefnmark}}##1}%
-    \if@twocolumn
-      \ifnum \col@number=\@ne
-        \@maketitle
+      \if@twocolumn
+        \ifnum \col@number=\@ne
+          \@maketitle
+        \else
+          \twocolumn[\@maketitle]%
+        \fi
       \else
-        \twocolumn[\@maketitle]%
-      \fi
-    \else
       \newpage
-      \global\@topnum\z@   % Prevents figures from going at top of page.
-      \@maketitle
-    \fi
-    \thispagestyle{plain}\@thanks
-  \endgroup
-  \setcounter{footnote}{0}%
-  \global\let\thanks\relax
-  \global\let\maketitle\relax
-  \global\let\@maketitle\relax
-  \global\let\@thanks\@empty
-  \global\let\@author\@empty
-  \global\let\@date\@empty
-  \global\let\@title\@empty
-  \global\let\title\relax
-  \global\let\author\relax
-  \global\let\date\relax
-  \global\let\and\relax
-}
+        \global\@topnum\z@   % Prevents figures from going at top of page.
+        \@maketitle
+      \fi
+      \thispagestyle{plain}\@thanks
+    \endgroup
+    \setcounter{footnote}{0}%
+    \global\let\thanks\relax
+    \global\let\maketitle\relax
+    \global\let\@maketitle\relax
+    \global\let\@thanks\@empty
+    \global\let\@author\@empty
+    \global\let\@date\@empty
+    \global\let\@title\@empty
+    \global\let\title\relax
+    \global\let\author\relax
+    \global\let\date\relax
+    \global\let\and\relax
+  }
 \def\@maketitle{%
   \newpage
   \null
@@ -486,7 +486,7 @@
                 \item\relax}
                {\endlist}
 \if@compatibility
-\newenvironment{titlepage}
+  \newenvironment{titlepage}
     {%
       \cleardoublepage
       \if@twocolumn
@@ -500,7 +500,7 @@
     {\if@restonecol\twocolumn \else \newpage \fi
     }
 \else
-\newenvironment{titlepage}
+  \newenvironment{titlepage}
     {%
       \cleardoublepage
       \if@twocolumn
diff --git a/Master/texmf-dist/tex/latex-dev/base/cp1250.def b/Master/texmf-dist/tex/latex-dev/base/cp1250.def
index 77385c63f9e..8a5af690ee1 100644
--- a/Master/texmf-dist/tex/latex-dev/base/cp1250.def
+++ b/Master/texmf-dist/tex/latex-dev/base/cp1250.def
@@ -44,7 +44,7 @@
 
 
   \ProvidesFile{cp1250.def}
-   [2018/08/11 v1.3c Input encoding file]
+   [2020/04/14 v1.3c Input encoding file]
 \ProvideTextCommandDefault{\textdegree}{\ensuremath{{^\circ}}}
 \ProvideTextCommandDefault{\textcurrency}
    {\TextSymbolUnavailable\textcurrency}
diff --git a/Master/texmf-dist/tex/latex-dev/base/cp1252.def b/Master/texmf-dist/tex/latex-dev/base/cp1252.def
index 9d6cc6e6bd7..25fd56921d8 100644
--- a/Master/texmf-dist/tex/latex-dev/base/cp1252.def
+++ b/Master/texmf-dist/tex/latex-dev/base/cp1252.def
@@ -44,7 +44,7 @@
 
 
   \ProvidesFile{cp1252.def}
-   [2018/08/11 v1.3c Input encoding file]
+   [2020/04/14 v1.3c Input encoding file]
 \ProvideTextCommandDefault{\textdegree}{\ensuremath{{^\circ}}}
 \ProvideTextCommandDefault{\textonehalf}{\ensuremath{\frac12}}
 \ProvideTextCommandDefault{\textonequarter}{\ensuremath{\frac14}}
diff --git a/Master/texmf-dist/tex/latex-dev/base/cp1257.def b/Master/texmf-dist/tex/latex-dev/base/cp1257.def
index 7aab61dbafb..3163db13e96 100644
--- a/Master/texmf-dist/tex/latex-dev/base/cp1257.def
+++ b/Master/texmf-dist/tex/latex-dev/base/cp1257.def
@@ -44,7 +44,7 @@
 
 
   \ProvidesFile{cp1257.def}
-   [2018/08/11 v1.3c Input encoding file]
+   [2020/04/14 v1.3c Input encoding file]
 \ProvideTextCommandDefault{\textdegree}{\ensuremath{{^\circ}}}
 \ProvideTextCommandDefault{\textonehalf}{\ensuremath{\frac12}}
 \ProvideTextCommandDefault{\textonequarter}{\ensuremath{\frac14}}
diff --git a/Master/texmf-dist/tex/latex-dev/base/cp437.def b/Master/texmf-dist/tex/latex-dev/base/cp437.def
index d7ffdf20abd..9d77a80416d 100644
--- a/Master/texmf-dist/tex/latex-dev/base/cp437.def
+++ b/Master/texmf-dist/tex/latex-dev/base/cp437.def
@@ -44,7 +44,7 @@
 
 
   \ProvidesFile{cp437.def}
-   [2018/08/11 v1.3c Input encoding file]
+   [2020/04/14 v1.3c Input encoding file]
 \ProvideTextCommandDefault{\textdegree}{\ensuremath{{^\circ}}}
 \ProvideTextCommandDefault{\textflorin}{\textit{f}}
 \ProvideTextCommandDefault{\textpeseta}{Pt}
diff --git a/Master/texmf-dist/tex/latex-dev/base/cp437de.def b/Master/texmf-dist/tex/latex-dev/base/cp437de.def
index 7d014543bf0..fbedd5f6e36 100644
--- a/Master/texmf-dist/tex/latex-dev/base/cp437de.def
+++ b/Master/texmf-dist/tex/latex-dev/base/cp437de.def
@@ -44,7 +44,7 @@
 
 
   \ProvidesFile{cp437de.def}
-   [2018/08/11 v1.3c Input encoding file]
+   [2020/04/14 v1.3c Input encoding file]
 \ProvideTextCommandDefault{\textdegree}{\ensuremath{{^\circ}}}
 \ProvideTextCommandDefault{\textflorin}{\textit{f}}
 \ProvideTextCommandDefault{\textpeseta}{Pt}
diff --git a/Master/texmf-dist/tex/latex-dev/base/cp850.def b/Master/texmf-dist/tex/latex-dev/base/cp850.def
index 0d052ec0a36..51a1c051a8e 100644
--- a/Master/texmf-dist/tex/latex-dev/base/cp850.def
+++ b/Master/texmf-dist/tex/latex-dev/base/cp850.def
@@ -44,7 +44,7 @@
 
 
   \ProvidesFile{cp850.def}
-   [2018/08/11 v1.3c Input encoding file]
+   [2020/04/14 v1.3c Input encoding file]
 %%
 %% If you need a Euro symbol, try cp858 instead.
 %%
diff --git a/Master/texmf-dist/tex/latex-dev/base/cp852.def b/Master/texmf-dist/tex/latex-dev/base/cp852.def
index 17723bc6b1d..7c348373ab8 100644
--- a/Master/texmf-dist/tex/latex-dev/base/cp852.def
+++ b/Master/texmf-dist/tex/latex-dev/base/cp852.def
@@ -44,7 +44,7 @@
 
 
   \ProvidesFile{cp852.def}
-   [2018/08/11 v1.3c Input encoding file]
+   [2020/04/14 v1.3c Input encoding file]
 \ProvideTextCommandDefault{\textdegree}{\ensuremath{{^\circ}}}
 \ProvideTextCommandDefault{\textonehalf}{\ensuremath{\frac12}}
 \ProvideTextCommandDefault{\textonequarter}{\ensuremath{\frac14}}
diff --git a/Master/texmf-dist/tex/latex-dev/base/cp858.def b/Master/texmf-dist/tex/latex-dev/base/cp858.def
index 44e1d84aad6..f06cbdc6706 100644
--- a/Master/texmf-dist/tex/latex-dev/base/cp858.def
+++ b/Master/texmf-dist/tex/latex-dev/base/cp858.def
@@ -44,7 +44,7 @@
 
 
   \ProvidesFile{cp858.def}
-   [2018/08/11 v1.3c Input encoding file]
+   [2020/04/14 v1.3c Input encoding file]
 \ProvideTextCommandDefault{\textdegree}{\ensuremath{{^\circ}}}
 \ProvideTextCommandDefault{\textonehalf}{\ensuremath{\frac12}}
 \ProvideTextCommandDefault{\textonequarter}{\ensuremath{\frac14}}
diff --git a/Master/texmf-dist/tex/latex-dev/base/cp865.def b/Master/texmf-dist/tex/latex-dev/base/cp865.def
index 2ce27481a70..b5bd9b0e135 100644
--- a/Master/texmf-dist/tex/latex-dev/base/cp865.def
+++ b/Master/texmf-dist/tex/latex-dev/base/cp865.def
@@ -44,7 +44,7 @@
 
 
   \ProvidesFile{cp865.def}
-   [2018/08/11 v1.3c Input encoding file]
+   [2020/04/14 v1.3c Input encoding file]
 \ProvideTextCommandDefault{\textdegree}{\ensuremath{{^\circ}}}
 \ProvideTextCommandDefault{\textflorin}{\textit{f}}
 \ProvideTextCommandDefault{\textpeseta}{Pt}
diff --git a/Master/texmf-dist/tex/latex-dev/base/decmulti.def b/Master/texmf-dist/tex/latex-dev/base/decmulti.def
index b7b98db366b..6513defd020 100644
--- a/Master/texmf-dist/tex/latex-dev/base/decmulti.def
+++ b/Master/texmf-dist/tex/latex-dev/base/decmulti.def
@@ -44,7 +44,7 @@
 
 
  \ProvidesFile{decmulti.def}
-   [2018/08/11 v1.3c Input encoding file]
+   [2020/04/14 v1.3c Input encoding file]
 \ProvideTextCommandDefault{\textdegree}{\ensuremath{{^\circ}}}
 \ProvideTextCommandDefault{\textonehalf}{\ensuremath{\frac12}}
 \ProvideTextCommandDefault{\textonequarter}{\ensuremath{\frac14}}
diff --git a/Master/texmf-dist/tex/latex-dev/base/docstrip.tex b/Master/texmf-dist/tex/latex-dev/base/docstrip.tex
index feb04768b2c..127c7c6e371 100644
--- a/Master/texmf-dist/tex/latex-dev/base/docstrip.tex
+++ b/Master/texmf-dist/tex/latex-dev/base/docstrip.tex
@@ -44,8 +44,8 @@
 \catcode`\{=1
 \catcode`\}=2
 \def\filename{docstrip.dtx}
-\def\fileversion{2.5g}
-\def\filedate{2018/05/03}
+\def\fileversion{v2.5h}
+\def\filedate{2020/04/18}
 \def\docdate {2018/05/03}
 %%
 %% The docstrip program for use with TeX.
@@ -219,13 +219,18 @@ Z
 \bgroup\edef\x{\egroup
  \def\noexpand\@stripstr\string\s@{}}
 \x
+\def\quote@name#1{"\quote@@name#1\@gobble""}
+\def\quote@@name#1"{#1\quote@@name}
 \chardef\stream@closed=16
 \def\StreamOpen#1{%
   \chardef#1=\stream@closed
   \def\s@do##1{\ifnum##1=0
     \chardef#1=\expandafter\@stripstr\string##1 %
     \global\chardef##1=1 %
-    \immediate\openout#1=\csname pth@\@stripstring#1\endcsname %
+    \edef\q@curr@file{%
+      \expandafter\expandafter\expandafter\quote@name
+      \expandafter\expandafter\expandafter{\csname pth@\@stripstring#1\endcsname}}
+    \immediate\openout#1=\q@curr@file\relax
     \@streamfound
     \fi}
   \@outputstreams
diff --git a/Master/texmf-dist/tex/latex-dev/base/fontenc.sty b/Master/texmf-dist/tex/latex-dev/base/fontenc.sty
index 85d45461b2b..edba0ae7b5e 100644
--- a/Master/texmf-dist/tex/latex-dev/base/fontenc.sty
+++ b/Master/texmf-dist/tex/latex-dev/base/fontenc.sty
@@ -43,7 +43,7 @@
 %% extension .ins) which are part of the distribution.
 %%% From File: ltoutenc.dtx
 \ProvidesPackage{fontenc}
- [2020/02/11 v2.0o
+ [2020/04/22 v2.0p
                         Standard LaTeX package]
 \def\update@uclc@with@cyrillic{%
  \expandafter\def\expandafter\@uclclist\expandafter
diff --git a/Master/texmf-dist/tex/latex-dev/base/fontmath.cfg b/Master/texmf-dist/tex/latex-dev/base/fontmath.cfg
index 0ced57368ab..f3a35d15ebc 100644
--- a/Master/texmf-dist/tex/latex-dev/base/fontmath.cfg
+++ b/Master/texmf-dist/tex/latex-dev/base/fontmath.cfg
@@ -37,7 +37,7 @@
 %% 
 %%% From File: fontdef.dtx
 \ProvidesFile{fontmath.cfg}
-           [2020/02/11 v3.0g LaTeX Kernel
+           [2020/04/24 v3.0h LaTeX Kernel
 (Uncustomised math
            font setup)]
 %%
diff --git a/Master/texmf-dist/tex/latex-dev/base/fontmath.ltx b/Master/texmf-dist/tex/latex-dev/base/fontmath.ltx
index 008e3dfa85a..ecf8ec365b5 100644
--- a/Master/texmf-dist/tex/latex-dev/base/fontmath.ltx
+++ b/Master/texmf-dist/tex/latex-dev/base/fontmath.ltx
@@ -37,7 +37,7 @@
 %% 
 %%% From File: fontdef.dtx
 \ProvidesFile{fontmath.ltx}
-           [2020/02/11 v3.0g LaTeX Kernel
+           [2020/04/24 v3.0h LaTeX Kernel
 (Math
            font setup)]
 \typeout{=== Don't modify this file, use a .cfg file instead ===^^J}
diff --git a/Master/texmf-dist/tex/latex-dev/base/fonttext.cfg b/Master/texmf-dist/tex/latex-dev/base/fonttext.cfg
index cccff529eb8..9c985ee193f 100644
--- a/Master/texmf-dist/tex/latex-dev/base/fonttext.cfg
+++ b/Master/texmf-dist/tex/latex-dev/base/fonttext.cfg
@@ -37,7 +37,7 @@
 %% 
 %%% From File: fontdef.dtx
 \ProvidesFile{fonttext.cfg}
-           [2020/02/11 v3.0g LaTeX Kernel
+           [2020/04/24 v3.0h LaTeX Kernel
 (Uncustomised text
            font setup)]
 %%
diff --git a/Master/texmf-dist/tex/latex-dev/base/fonttext.ltx b/Master/texmf-dist/tex/latex-dev/base/fonttext.ltx
index ab8e0d2c9c8..6b5127e8361 100644
--- a/Master/texmf-dist/tex/latex-dev/base/fonttext.ltx
+++ b/Master/texmf-dist/tex/latex-dev/base/fonttext.ltx
@@ -37,7 +37,7 @@
 %% 
 %%% From File: fontdef.dtx
 \ProvidesFile{fonttext.ltx}
-           [2020/02/11 v3.0g LaTeX Kernel
+           [2020/04/24 v3.0h LaTeX Kernel
 (Text
            font setup)]
 \typeout{=== Don't modify this file, use a .cfg file instead ===^^J}
@@ -93,15 +93,18 @@
 \newcommand\sfdefault{lmss}
 \newcommand\ttdefault{lmtt}
 \fi
-\newcommand\bfdefault{b}  % overwritten below
-\newcommand\mddefault{m}
+\newcommand\bfdefault{b}  % overwritten below (for rollback)
+\newcommand\mddefault{m}  % overwritten below (for rollback)
 \newcommand\itdefault{it}
 \newcommand\sldefault{sl}
 \newcommand\scdefault{sc}
-\newcommand\updefault{up}  % overwritten below
+\newcommand\updefault{up}  % overwritten below (for rollback)
 
 \renewcommand\updefault{up}
-\renewcommand\bfdefault{b}
+\renewcommand\bfdefault{b\@empty}
+\renewcommand\mddefault{m\@empty}
+\let\bfdefault@previous\bfdefault
+\let\mddefault@previous\mddefault
 \newcommand\familydefault{\rmdefault}
 \newcommand\seriesdefault{\mddefault}
 \newcommand\shapedefault{n}
diff --git a/Master/texmf-dist/tex/latex-dev/base/inputenc.sty b/Master/texmf-dist/tex/latex-dev/base/inputenc.sty
index fc59f521002..3d914c8a882 100644
--- a/Master/texmf-dist/tex/latex-dev/base/inputenc.sty
+++ b/Master/texmf-dist/tex/latex-dev/base/inputenc.sty
@@ -45,7 +45,7 @@
 
 \NeedsTeXFormat{LaTeX2e}[1995/12/01]
 \ProvidesPackage{inputenc}
-   [2018/08/11 v1.3c Input encoding file]
+   [2020/04/14 v1.3c Input encoding file]
 \def\DeclareInputMath#1{%
    \@inpenc@test
    \bgroup
diff --git a/Master/texmf-dist/tex/latex-dev/base/latex.ltx b/Master/texmf-dist/tex/latex-dev/base/latex.ltx
index 716c9e21c85..fa463159956 100644
--- a/Master/texmf-dist/tex/latex-dev/base/latex.ltx
+++ b/Master/texmf-dist/tex/latex-dev/base/latex.ltx
@@ -710,7 +710,7 @@
 \def\fmtname{LaTeX2e}
 \edef\fmtversion
    {2020-10-01}
-\def\patch@level{-5}
+\def\patch@level{-6}
 \edef\development@branch@name{develop \the\year-\the\month-\the\day}
 \iffalse
 \def\reserved@a#1/#2/#3\@nil{%
@@ -810,8 +810,10 @@
   \fi}
 %%% From File: ltdefns.dtx
 \def\two@digits#1{\ifnum#1<10 0\fi\number#1}
-\def\typeout#1{\begingroup\set@display@protect
-    \immediate\write\@unused{#1}\endgroup}
+\protected\long\def\typeout#1{\begingroup
+  \set@display@protect
+  \def\par{^^J^^J}%
+  \immediate\write\@unused{#1}\endgroup}
 \newlinechar`\^^J
 \let\@@par=\par
 \let\@@hyph=\-
@@ -1146,15 +1148,19 @@
 \DeclareRobustCommand\makeatother{\catcode`\@12\relax}
 
 \def\@latex@info#1{}
-\DeclareRobustCommand{\-}{%
-  \discretionary{%
-    \char \ifnum\hyphenchar\font<\z@
-            \defaulthyphenchar
-          \else
-            \hyphenchar\font
-          \fi
-               }{}{}%
-}
+\ifx\directlua\@undefined
+  \DeclareRobustCommand{\-}{%
+    \discretionary{%
+      \char \ifnum\hyphenchar\font<\z@
+              \defaulthyphenchar
+            \else
+              \hyphenchar\font
+            \fi
+                 }{}{}%
+  }
+\else
+  \let\-\@@hyph
+\fi
 \let\@dischyph=\-
 \newif\if@includeinrelease
 \@includeinreleasefalse
@@ -1505,12 +1511,14 @@ Type  H <return>  for immediate help.}%
              \@xnewline}%
   \@xnewline}
 \let\\\@normalcr
+\def\@vspace@calcify#1{\begingroup\setlength\skip@{#1}\vskip\skip@\endgroup}
+
 \DeclareRobustCommand\newline{\@normalcr\relax}
 \def\@xnewline{\@ifnextchar[% ] bracket matching
                   \@newline
                  {\@gnewline\relax}}
 \def\@newline[#1]{\let \reserved@e \vadjust
-                   \@gnewline {\vskip #1}}
+                   \@gnewline {\@vspace@calcify{#1}}}
 \def\@gnewline #1{%
   \ifvmode
     \@nolnerr
@@ -1574,9 +1582,9 @@ Type  H <return>  for immediate help.}%
   \ifvmode
      \if@minipage\else
        \ifdim \lastskip =\z@
-         \vskip #1\relax
+         \@vspace@calcify{#1}%
        \else
-       \@tempskipb#1\relax
+       \setlength\@tempskipb{#1}%
          \@xaddvskip
        \fi
      \fi
@@ -1617,12 +1625,12 @@ Type  H <return>  for immediate help.}%
 \DeclareRobustCommand\vspace{\@ifstar\@vspacer\@vspace}
 \def\@vspace #1{%
   \ifvmode
-    \vskip #1
+    \@vspace@calcify{#1}%
     \vskip\z@skip
    \else
      \@bsphack
      \vadjust{\@restorepar
-              \vskip #1
+              \@vspace@calcify{#1}%
               \vskip\z@skip
               }%
      \@esphack
@@ -1632,7 +1640,7 @@ Type  H <return>  for immediate help.}%
     \dimen@\prevdepth
     \hrule \@height\z@
     \nobreak
-    \vskip #1
+    \@vspace@calcify{#1}%
     \vskip\z@skip
     \prevdepth\dimen@
   \else
@@ -1640,7 +1648,7 @@ Type  H <return>  for immediate help.}%
     \vadjust{\@restorepar
              \hrule \@height\z@
              \nobreak
-             \vskip #1
+             \@vspace@calcify{#1}%
              \vskip\z@skip}%
     \@esphack
   \fi}
@@ -1669,24 +1677,24 @@ Type  H <return>  for immediate help.}%
 \catcode `\~=13
 \def~{\nobreakspace{}}
 \expandafter\let\expandafter\@xobeysp\csname nobreakspace \endcsname
-\DeclareRobustCommand{\,}{%
-   \relax\ifmmode\mskip\thinmuskip\else\thinspace\fi
-}
 \def\@{\spacefactor\@m{}}%
 \DeclareRobustCommand\hspace{\@ifstar\@hspacer\@hspace}
-\def\@hspace#1{\hskip #1\relax}
+\def\@hspace#1{\begingroup\setlength\skip@{#1}\hskip\skip@\endgroup}
+
 \def\@hspacer#1{\vrule \@width\z@\nobreak
-                \hskip #1\hskip \z@skip}
+                \@hspace{#1}\hskip \z@skip}
 \newskip\fill
 \fill = 0pt plus 1fill
 \def\stretch#1{\z@ \@plus #1fill\relax}
-\DeclareRobustCommand\thinspace{\leavevmode@ifvmode\kern .16667em }
-\DeclareRobustCommand\negthinspace{\leavevmode@ifvmode\kern-.16667em }
 \DeclareRobustCommand\enspace{\leavevmode@ifvmode\kern.5em }
 \protected\def\leavevmode@ifvmode{\ifvmode\expandafter\indent\fi}
 \def\enskip{\hskip.5em\relax}
 \def\quad{\hskip1em\relax}
 \def\qquad{\hskip2em\relax}
+\ifx\Umathcode\@undefined\else
+  \catcode "AD=13
+  \def^^ad{\-}
+\fi
 {\catcode`\^^M=13 \gdef\obeycr{\catcode`\^^M13 \def^^M{\\\relax}%
     \@gobblecr}%
 {\catcode`\^^M=13 \gdef\@gobblecr{\@ifnextchar
@@ -1793,22 +1801,32 @@ Type  H <return>  for immediate help.}%
 \let\@auxout=\@mainaux
 \def\includeonly#1{%
   \@partswtrue
-  \set@curr@file{\zap@space#1 \@empty}%
-  \let\@partlist\@curr@file
+  \let\@partlist\@empty
+  \@for\reserved@a:=#1 \do
+    {
+      \expandafter\set@curr@file@trim@spaces\expandafter{\reserved@a}%
+      \ifx\@partlist\@empty
+        \edef\@partlist{\@curr@file}%
+      \else
+        \edef\@partlist{\@partlist,\@curr@file}%
+      \fi
+    }%
   }
 \@onlypreamble\includeonly
 \def\include#1{\relax
   \ifnum\@auxout=\@partaux
     \@latex@error{\string\include\space cannot be nested}\@eha
   \else
-  \set@curr@file{#1 }%
-  \expandafter\@include\@curr@file
+    \set@curr@file@trim@spaces{#1}%
+    \expandafter\@include\expandafter{\@curr@file} % deliberate space
   \fi}
+\def\set@curr@file@trim@spaces#1{%
+  \@expl@tl@trim@spaces@apply@@nN {#1} \set@curr@file }
 
 \def\@include#1 {%
   \clearpage
   \if@filesw
-    \immediate\write\@mainaux{\string\@input{#1.aux}}%
+    \immediate\write\@mainaux{\string\@input{"#1.aux"}}%
   \fi
   \@tempswatrue
   \if@partsw
@@ -1820,7 +1838,7 @@ Type  H <return>  for immediate help.}%
   \if@tempswa
     \let\@auxout\@partaux
     \if@filesw
-      \immediate\openout\@partaux #1.aux
+      \immediate\openout\@partaux "#1.aux"
       \immediate\write\@partaux{\relax}%
     \fi
     \@input@{#1.tex}%
@@ -3314,7 +3332,7 @@ Type  H <return>  for immediate help.}%
     ,ulm,elm,lm,slm,mm,sbm,bm,ebm,ubm,muc,mec,mc,msc,msx,mx,mex,mux,{}{},#1,}%
   \edef\in@@{\the\series@check@toks}%
   \ifx\in@@\@empty
-    \def#2{#1}%
+    \edef#2{#1}%
   \else
     \edef#2{\expandafter\series@drop@one@m #1m\series@drop@one@m}%
   \fi
@@ -3860,7 +3878,7 @@ Type  H <return>  for immediate help.}%
         \@eha
   \fi
  \else \expandafter\non@alpherr\fi
- #1{#4}%
+ \expandafter#1\ifx\math@bgroup\bgroup{#4}\else#4\fi
  }%
 }
 \def\process@table{%
@@ -3900,10 +3918,10 @@ Type  H <return>  for immediate help.}%
        \fi
     \endgroup
     \let\select@group\document@select@group
-    \fontencoding{\encodingdefault}%
-    \fontfamily{\familydefault}%
-    \fontseries{\seriesdefault}%
-    \fontshape{\shapedefault}%
+    \fontencoding\encodingdefault
+    \edef\f@family{\familydefault}%
+    \edef\f@series{\seriesdefault}%
+    \edef\f@shape{\shapedefault}%
  \everyjob{}%
 }
 \@onlypreamble\process@table
@@ -4618,7 +4636,9 @@ Type  H <return>  for immediate help.}%
     \ifcsname #2series\endcsname           % supported are
                                            % \[md/bf]default
       \expandafter\def
-         \csname #2default\endcsname{#3}%
+        \csname #2default\endcsname{#3\@empty}%
+      \expandafter\def
+        \csname #2default@previous\endcsname{#3\@empty}%
     \else
        \@latex@error{Wrong syntax for \string\DeclareFontSeriesDefault}%
           {Mandatory first argument must be 'md'  or 'bf'.}
@@ -4654,12 +4674,21 @@ Type  H <return>  for immediate help.}%
   \edef\ttdef@ult{\ttdefault}%
   \series@maybe@drop@one@m\bfdefault\bfdef@ult
   \series@maybe@drop@one@m\mddefault\mddef@ult
-  \edef\famdef@ult{\familydefault}%
+  \@expandfontdefaultshook
 }
 
 \DeclareRobustCommand\bfseries{%
   \not@math@alphabet\bfseries\mathbf
   \expand@font@defaults
+  \ifx\bfdefault\bfdefault@previous\else
+    \expandafter\def\expandafter\bfdefault
+                    \expandafter{\bfdefault\@empty}%
+    \let\bfseries@previous\bfdefault
+    \let\bfseries@rm\bfdef@ult
+    \let\bfseries@sf\bfdef@ult
+    \let\bfseries@tt\bfdef@ult
+    \@setbfseriesdefaultshook
+  \fi
     \ifx\f@family\rmdef@ult      \fontseries\bfseries@rm
     \else\ifx\f@family\sfdef@ult \fontseries\bfseries@sf
     \else\ifx\f@family\ttdef@ult \fontseries\bfseries@tt
@@ -4671,6 +4700,14 @@ Type  H <return>  for immediate help.}%
 \DeclareRobustCommand\mdseries{%
   \not@math@alphabet\mdseries\relax
   \expand@font@defaults
+  \ifx\mddefault\mddefault@previous\else
+    \expandafter\def\expandafter\mddefault\expandafter{\mddefault\@empty}%
+    \let\mdseries@previous\mddefault
+    \let\mdseries@rm\mddef@ult
+    \let\mdseries@sf\mddef@ult
+    \let\mdseries@tt\mddef@ult
+    \@setmdseriesdefaultshook
+  \fi
     \ifx\f@family\rmdef@ult      \fontseries\mdseries@rm
     \else\ifx\f@family\sfdef@ult \fontseries\mdseries@sf
     \else\ifx\f@family\ttdef@ult \fontseries\mdseries@tt
@@ -4694,6 +4731,9 @@ Type  H <return>  for immediate help.}%
    \prepare@family@series@update{tt}\ttdefault
    \@ttfamilyhook
    \selectfont}
+\let\@expandfontdefaultshook\@empty
+\let\@setbfseriesdefaultshook\@empty
+\let\@setmdseriesdefaultshook\@empty
 \let\@rmfamilyhook\@empty
 \let\@sffamilyhook\@empty
 \let\@ttfamilyhook\@empty
@@ -4756,14 +4796,44 @@ Type  H <return>  for immediate help.}%
   \ifx\bfseries@tt@kernel\bfseries@tt
     \expandafter\in@\expandafter{\ttdefault}{cmr,cmss,cmtt,lcmss,lcmtt,lmr,lmss,lmtt}%
     \ifin@ \else \def\bfseries@tt{b}\fi\fi
-
-  \expand@font@defaults
-  \ifx\famdef@ult\rmdef@ult      \rmfamily
-  \else\ifx\famdef@ult\sfdef@ult \sffamily
-  \else\ifx\famdef@ult\ttdef@ult \ttfamily
-  \fi\fi\fi
+  \reset@font
+  \ifx\seriesdefault\seriesdefault@kernel
+    \mdseries
+    \let\seriesdefault\f@series
+  \fi
 }%
 \expandafter\let\csname ver@mweights.sty\endcsname\fmtversion
+\DeclareRobustCommand\IfFontSeriesContextTF[1]{%
+  \expand@font@defaults
+  \@font@series@contextfalse
+  \def\requested@test@context{#1}%
+  \expandafter\edef\csname ??def@ult\endcsname{\f@family}%
+  \let\@elt\test@font@series@context
+      \@meta@family@list
+      \@elt{??}%
+  \let\@elt\relax
+  \if@font@series@context
+  \expandafter\@firstoftwo
+  \else
+  \expandafter\@secondoftwo
+  \fi
+}
+
+\def\test@font@series@context#1{%
+  \edef\reserved@a{\csname #1def@ult\endcsname}%
+  \ifx\f@family\reserved@a
+    \let\@elt\@gobble
+    \expandafter\ifx
+                \csname\requested@test@context series@#1\endcsname\f@series
+      \@font@series@contexttrue
+    \else
+      \expandafter\ifx
+                  \csname\requested@test@context def@ult\endcsname\f@series
+        \@font@series@contexttrue
+  \fi\fi\fi
+}
+
+\newif\if@font@series@context
 
 \def\DeclareEmphSequence#1{%
   \protected@edef\emfontdeclare@clist{\zap@space#1, \@empty\emforce\emreset}%
@@ -4899,6 +4969,8 @@ Type  H <return>  for immediate help.}%
             }
            {\input{preload.ltx}}
 \let\@addtofilelist\@gobble
+\expandafter\def\expandafter\seriesdefault\expandafter{\seriesdefault\@empty}
+\let\seriesdefault@kernel\seriesdefault
 \let\@acci\' \let\@accii\` \let\@acciii\=
 %%% From File: ltfntcmd.dtx
 %%
@@ -5213,22 +5285,22 @@ Type  H <return>  for immediate help.}%
   \DeclareTextCommandDefault{\newtie}             {\tc@check@accent{\t}2\newtie}
   \DeclareTextCommandDefault{\capitalnewtie}      {\tc@check@accent{\t}2\capitalnewtie}
 \else
-  \def\capitalacute{\@tabacckludge'}
-  \def\capitalbreve{\u}
-  \def\capitalcaron{\v}
-  \def\capitalcedilla{\c}
-  \def\capitalcircumflex{\^}
-  \def\capitaldieresis{\"}
-  \def\capitaldotaccent{\.}
-  \def\capitalgrave{\@tabacckludge`}
-  \def\capitalhungarumlaut{\H}
-  \def\capitalmacron{\@tabacckludge=}
-  \def\capitalnewtie{\t}
-  \def\capitalogonek{\k}
-  \def\capitalring{\r}
-  \def\capitaltie{\t}
-  \def\capitaltilde{\~}
-  \def\newtie{\t}
+  \DeclareTextCommandDefault\capitalacute{\@tabacckludge'}
+  \DeclareTextCommandDefault\capitalbreve{\u}
+  \DeclareTextCommandDefault\capitalcaron{\v}
+  \DeclareTextCommandDefault\capitalcedilla{\c}
+  \DeclareTextCommandDefault\capitalcircumflex{\^}
+  \DeclareTextCommandDefault\capitaldieresis{\"}
+  \DeclareTextCommandDefault\capitaldotaccent{\.}
+  \DeclareTextCommandDefault\capitalgrave{\@tabacckludge`}
+  \DeclareTextCommandDefault\capitalhungarumlaut{\H}
+  \DeclareTextCommandDefault\capitalmacron{\@tabacckludge=}
+  \DeclareTextCommandDefault\capitalnewtie{\t}
+  \DeclareTextCommandDefault\capitalogonek{\k}
+  \DeclareTextCommandDefault\capitalring{\r}
+  \DeclareTextCommandDefault\capitaltie{\t}
+  \DeclareTextCommandDefault\capitaltilde{\~}
+  \DeclareTextCommandDefault\newtie{\t}
 \fi
 \DeclareTextCommandDefault{\textlbrackdbl}      {\tc@check@symbol2\textlbrackdbl}
 \DeclareTextCommandDefault{\textrbrackdbl}      {\tc@check@symbol2\textrbrackdbl}
@@ -5583,6 +5655,7 @@ Type  H <return>  for immediate help.}%
          {\string\newlabel{#1}{{\@currentlabel}{\thepage}}}%
   \@esphack}
 \def\refstepcounter#1{\stepcounter{#1}%
+    \edef\@currentcounter{#1}%
     \protected@edef\@currentlabel
        {\csname p@#1\expandafter\endcsname\csname the#1\endcsname}%
 }
@@ -5697,7 +5770,7 @@ Type  H <return>  for immediate help.}%
        \par\@ifstar{\nobreak\@xcentercr}\@xcentercr}
 \def\@xcentercr{\addvspace{-\parskip}\@ifnextchar
     [\@icentercr\ignorespaces}
-\def\@icentercr[#1]{\vskip #1\ignorespaces}
+\def\@icentercr[#1]{\@vspace@calcify{#1}\ignorespaces}
 \def\center{\trivlist \centering\item\relax}
 \def\endcenter{\endtrivlist}
 \DeclareRobustCommand\centering{%
@@ -5765,7 +5838,12 @@ Type  H <return>  for immediate help.}%
 }
 
 \newbox\@verbvisiblespacebox
-\def\@sverb#1{%
+\@namedef{verbatim*}{\@verbatim
+  \@setupverbvisiblespace
+  \frenchspacing\@vobeyspaces\@sxverbatim}
+\expandafter\let\csname endverbatim*\endcsname =\endverbatim
+\def\@sverb#1{\if\noexpand#1 \expandafter\@sverb\else\@@sverb{#1}\fi}
+\def\@@sverb#1{%
   \catcode`#1\active
   \lccode`\~`#1%
   \gdef\verb@balance@group{\verb@egroup
@@ -5775,10 +5853,6 @@ Type  H <return>  for immediate help.}%
   \ifnum\catcode`\ =\active
   \else  \@setupverbvisiblespace \@vobeyspaces \fi
 }
-\@namedef{verbatim*}{\@verbatim
-  \@setupverbvisiblespace
-  \frenchspacing\@vobeyspaces\@sxverbatim}
-\expandafter\let\csname endverbatim*\endcsname =\endverbatim
 \def\@makeother#1{\catcode`#112\relax}
 \let\verb@balance@group\@empty
 \def\verb@egroup{\global\let\verb@balance@group\@empty\egroup}
@@ -5947,11 +6021,21 @@ Type  H <return>  for immediate help.}%
     #1\crcr}}
 \let\sp=^
 \let\sb=_
-\def\>{\mskip\medmuskip}
-\def\;{\mskip\thickmuskip}
-\def\!{\mskip-\thinmuskip}
+
+\DeclareRobustCommand\tmspace[3]{%
+  \ifmmode\mskip#1#2\else\leavevmode@ifvmode\kern#1#3\fi\relax}
+\DeclareRobustCommand\,{\tmspace+\thinmuskip{.16667em}}
+\let\thinspace\,
+\DeclareRobustCommand\!{\tmspace-\thinmuskip{.16667em}}
+\let\negthinspace\!
+\DeclareRobustCommand\:{\tmspace+\medmuskip{.2222em}}
+\let\medspace\:
+\let\>=\:
+\DeclareRobustCommand\negmedspace{\tmspace-\medmuskip{.2222em}}
+\DeclareRobustCommand\;{\tmspace+\thickmuskip{.2777em}}
+\let\thickspace\;
+\DeclareRobustCommand\negthickspace{\tmspace-\thickmuskip{.2777em}}
 \DeclareRobustCommand\*{\discretionary{\thinspace\the\textfont2\char2}{}{}}
-\let\:=\>
 \def\active@math@prime{^\bgroup\prim@s}
 {\catcode`\'=\active \global\let'\active@math@prime}
 \def\prim@s{%
@@ -6051,7 +6135,7 @@ Type  H <return>  for immediate help.}%
 \def\@xeqncr[#1]{%
    \ifnum0=`{\fi}%
    \@@eqncr
-   \noalign{\penalty\@eqpen\vskip\jot\vskip #1\relax}%
+   \noalign{\penalty\@eqpen\vskip\jot\@vspace@calcify{#1}}%
 }
 \def\@@eqncr{\let\reserved@a\relax
     \ifcase\@eqcnt \def\reserved@a{& & &}\or \def\reserved@a{& &}%
@@ -6611,6 +6695,7 @@ Type  H <return>  for immediate help.}%
 \DeclareRobustCommand\centerline[1]{\@@line{\hss#1\hss}}
 \DeclareRobustCommand\rlap[1]{\hb@xt@\z@{#1\hss}}
 \DeclareRobustCommand\llap[1]{\hb@xt@\z@{\hss#1}}
+\DeclareRobustCommand\clap[1]{\hb@xt@\z@{\hss#1\hss}}
 %%% From File: lttab.dtx
 \expandafter\let\csname ver@autotabg.sty\endcsname\fmtversion
 \newdimen\@gtempa
@@ -6668,7 +6753,7 @@ Type  H <return>  for immediate help.}%
 \def\@ifatmargin{\ifdim \wd\@curline =\z@}
 \def\@tabcr{\@stopline \@ifstar{\penalty \@M \@xtabcr}\@xtabcr}
 \def\@xtabcr{\@ifnextchar[\@itabcr{\@startline\ignorespaces}}
-\def\@itabcr[#1]{\vskip #1\@startline\ignorespaces}
+\def\@itabcr[#1]{\@vspace@calcify{#1}\@startline\ignorespaces}
 \def\tabbing{\lineskip \z@skip\let\>\@rtab\let\<\@ltab\let\=\@settab
      \let\+\@tabplus\let\-\@tabminus\let\`\@tabrj\let\'\@tablab
      \let\\=\@tabcr
@@ -6803,7 +6888,7 @@ Type  H <return>  for immediate help.}%
     \fi}
 \def\@xargarraycr#1{\@tempdima #1\advance\@tempdima \dp \@arstrutbox
    \vrule \@height\z@ \@depth\@tempdima \@width\z@ \cr}
-\def\@yargarraycr#1{\cr\noalign{\vskip #1}}
+\def\@yargarraycr#1{\cr\noalign{\@vspace@calcify{#1}}}
 \long\def\multicolumn#1#2#3{\multispan{#1}\begingroup
   \@mkpream{#2}%
   \def\@sharp{#3}\set@typeset@protect
@@ -6996,9 +7081,11 @@ Type  H <return>  for immediate help.}%
      \advance\@xdim#1\unitlength\advance\@ydim#2\unitlength}%
   \ignorespaces}
 \def\@killglue{\unskip\@whiledim \lastskip >\z@\do{\unskip}}
-\DeclareRobustCommand\thinlines{\let\@linefnt\tenln \let\@circlefnt\tencirc
+\DeclareRobustCommand\thinlines{\let\@linefnt\tenln
+  \let\@circlefnt\tencirc
   \@wholewidth\fontdimen8\tenln \@halfwidth .5\@wholewidth}
-\DeclareRobustCommand\thicklines{\let\@linefnt\tenlnw \let\@circlefnt\tencircw
+\DeclareRobustCommand\thicklines{\let\@linefnt\tenlnw
+  \let\@circlefnt\tencircw
   \@wholewidth\fontdimen8\tenlnw \@halfwidth .5\@wholewidth}
 \DeclareRobustCommand\linethickness[1]
    {\@wholewidth #1\relax \@halfwidth .5\@wholewidth \ignorespaces}
@@ -7014,7 +7101,7 @@ Type  H <return>  for immediate help.}%
 \def\@ishortstack#1{\ialign{\mb@l {##}\unskip\mb@r\cr #1\crcr}\egroup}
 \def\@stackcr{\@ifstar\@ixstackcr\@ixstackcr}
 \def\@ixstackcr{\@ifnextchar[\@istackcr{\cr\ignorespaces}}
-\def\@istackcr[#1]{\cr\noalign{\vskip #1}\ignorespaces}
+\def\@istackcr[#1]{\cr\noalign{\@vspace@calcify{#1}}\ignorespaces}
 \newif\if@negarg
 \def\line(#1,#2)#3{\@xarg #1\relax \@yarg #2\relax
   \@linelen #3\unitlength
@@ -7806,11 +7893,11 @@ Type  H <return>  for immediate help.}%
 \DeclareRobustCommand*\textsuperscript[1]{%
   \@textsuperscript{\selectfont#1}}
 \def\@textsuperscript#1{%
-  {\m@th\ensuremath{^{\mbox{\fontsize\sf@size\z@#1}}}}}
+  {\m@th\ensuremath{^{\mbox{\fontsize\sf@size\sf@size#1}}}}}
 \DeclareRobustCommand*\textsubscript[1]{%
   \@textsubscript{\selectfont#1}}%
 \def\@textsubscript#1{%
-  {\m@th\ensuremath{_{\mbox{\fontsize\sf@size\z@#1}}}}}
+  {\m@th\ensuremath{_{\mbox{\fontsize\sf@size\sf@size#1}}}}}
 \newdimen\footnotesep
 \def\footnote{\@ifnextchar[\@xfootnote{\stepcounter\@mpfn
      \protected@xdef\@thefnmark{\thempfn}%
@@ -9127,6 +9214,12 @@ Type  H <return>  for immediate help.}%
 \def\@ifclasslater{\@ifl@ter\@clsextension}
 \@onlypreamble\@ifpackagelater
 \@onlypreamble\@ifclasslater
+\def\IfFormatAtLeastTF{\@ifl@t@r\fmtversion}
+\let\IfPackageAtLeastTF\@ifpackagelater
+\let\IfClassAtLeastTF\@ifclasslater
+\@onlypreamble\IfFormatAtLeastTF
+\@onlypreamble\IfPackageAtLeastTF
+\@onlypreamble\IfClassAtLeastTF
 \def\@ifl@ter#1#2{%
   \expandafter\@ifl@t@r
     \csname ver@#2.#1\endcsname}
@@ -9272,7 +9365,9 @@ Type  H <return>  for immediate help.}%
     \expandafter\let\csname ds@\CurrentOption\endcsname\relax}%
   \let\CurrentOption\@empty
   \let\@fileswith@pti@ns\@@fileswith@pti@ns
-  \AtEndOfPackage{\let\@unprocessedoptions\relax}}
+  \AtEndOfPackage{\expandafter\let
+                     \csname unprocessedoptions-\@currname.\@currext\endcsname
+                     \relax}}
 \@onlypreamble\@process@pti@ns
 \def\@options{\ProcessOptions*}
 \@onlypreamble\@options
@@ -9318,9 +9413,12 @@ Type  H <return>  for immediate help.}%
   \@loadwithoptions\@clsextension\LoadClass}
 \@onlypreamble\LoadClassWithOptions
 \def\RequirePackageWithOptions{%
-  \AtEndOfPackage{\let\@unprocessedoptions\relax}%
+  \AtEndOfPackage{\expandafter\let
+                    \csname unprocessedoptions-\@currname.\@currext\endcsname
+                    \relax}%
   \@loadwithoptions\@pkgextension\RequirePackage}
 \@onlypreamble\RequirePackageWithOptions
+
 \def\usepackage#1#{%
   \@latex@error
     {\noexpand \usepackage before \string\documentclass}%
@@ -9425,11 +9523,19 @@ Type  H <return>  for immediate help.}%
          {\@currname.\@currext}%
          {}%
          {\@missingfileerror\@currname\@currext}%
-    \let\@unprocessedoptions\@@unprocessedoptions
+    \expandafter\let\csname unprocessedoptions-\@currname.\@currext\endcsname
+                    \@@unprocessedoptions
     \csname\@currname.\@currext-h@@k\endcsname
     \expandafter\let\csname\@currname.\@currext-h@@k\endcsname
               \@undefined
-    \@unprocessedoptions}%
+    \ifx\@unprocessedoptions\relax
+      \let\@unprocessedoptions\@undefined
+    \else
+      \csname unprocessedoptions-\@currname.\@currext\endcsname
+    \fi
+    \expandafter\let
+        \csname unprocessedoptions-\@currname.\@currext\endcsname
+       \@undefined}%
     \@ifl@ter\@currext{#1}{#3}{}%
       {\@latex@warning@no@line
          {You have requested,\on@line,
@@ -9443,6 +9549,7 @@ Type  H <return>  for immediate help.}%
     \@reset@ptions}%
   \reserved@a}
 \@onlypreamble\@onefilewithoptions
+\let\@unprocessedoptions\@undefined
 \let\@@fileswith@pti@ns\@fileswith@pti@ns
 \@onlypreamble\@@fileswith@pti@ns
 \def\@reset@ptions{%
diff --git a/Master/texmf-dist/tex/latex-dev/base/latexrelease.sty b/Master/texmf-dist/tex/latex-dev/base/latexrelease.sty
index 3f688abfcec..11831f0601c 100644
--- a/Master/texmf-dist/tex/latex-dev/base/latexrelease.sty
+++ b/Master/texmf-dist/tex/latex-dev/base/latexrelease.sty
@@ -443,6 +443,19 @@ of this package available from CTAN}
     \edef\filename@base{#1}}
 \EndIncludeInRelease
 %%% From File: ltdefns.dtx
+\IncludeInRelease{2020/10/01}%
+                 {\typeout}{Allow "par" in \typeout}%
+\protected\long\def\typeout#1{\begingroup
+  \set@display@protect
+  \def\par{^^J^^J}%
+  \immediate\write\@unused{#1}\endgroup}
+\EndIncludeInRelease
+\IncludeInRelease{0000/00/00}%
+                 {\typeout}{Allow "par" in \typeout}%
+
+\def\typeout#1{\begingroup\set@display@protect
+    \immediate\write\@unused{#1}\endgroup}
+\EndIncludeInRelease
 \IncludeInRelease{2019/10/01}{\MakeRobust}{\MakeRobust}%
 \def\MakeRobust#1{%
   \@ifundefined{\expandafter\@gobble\string#1}{%
@@ -548,6 +561,21 @@ of this package available from CTAN}
     \expandafter\@secondoftwo
   \fi}
 \EndIncludeInRelease
+\IncludeInRelease{2020/10/01}{\-}{Use primitive \- in Lua\LaTeX}%
+\ifx\directlua\@undefined
+  \DeclareRobustCommand{\-}{%
+    \discretionary{%
+      \char \ifnum\hyphenchar\font<\z@
+              \defaulthyphenchar
+            \else
+              \hyphenchar\font
+            \fi
+                 }{}{}%
+  }
+\else
+  \let\-\@@hyph
+\fi
+\EndIncludeInRelease
 \IncludeInRelease{2017/04/15}{\-}{Use \hyphenchar in \-}%
 \DeclareRobustCommand{\-}{%
   \discretionary{%
@@ -558,12 +586,11 @@ of this package available from CTAN}
           \fi
                }{}{}%
 }
-\let\@dischyph=\-
 \EndIncludeInRelease
 \IncludeInRelease{0000/00/00}{\-}{Use \hyphenchar in \-}%
 \def\-{\discretionary{-}{}{}}
-\let\@dischyph=\-
 \EndIncludeInRelease
+\let\@dischyph=\-
 \IncludeInRelease{2019/10/01}%
                  {\allowbreak}{Make various commands robust}%
 \MakeRobust\allowbreak
@@ -729,6 +756,15 @@ of this package available from CTAN}
 \expandafter\let\csname raisebox \endcsname\@undefined
 \EndIncludeInRelease
 %%% From File: lttab.dtx
+\IncludeInRelease{2020/10/01}%
+                 {\@itabcr}{Tabbing calc syntax}%
+\def\@itabcr[#1]{\@vspace@calcify{#1}\@startline\ignorespaces}
+\EndIncludeInRelease
+\IncludeInRelease{0000/00/00}%
+                 {\@itabcr}{Tabbing calc syntax}%
+
+\def\@itabcr[#1]{\vskip #1\@startline\ignorespaces}
+\EndIncludeInRelease
 \IncludeInRelease{2019/10/01}%
                  {\pushtabs}{Make commands robust}%
 \DeclareRobustCommand\pushtabs{%
@@ -756,6 +792,15 @@ of this package available from CTAN}
 \kernel@make@fragile\kill
 
 \EndIncludeInRelease
+\IncludeInRelease{2020/10/01}%
+                 {\@yargarraycr}{tabular support calc syntax}%
+\def\@yargarraycr#1{\cr\noalign{\@vspace@calcify{#1}}}
+\EndIncludeInRelease
+\IncludeInRelease{0000/00/00}%
+                 {\@yargarraycr}{tabular support calc syntax}%
+
+\def\@yargarraycr#1{\cr\noalign{\vskip #1}}
+\EndIncludeInRelease
 %%% From File: ltmath.dtx
 \IncludeInRelease{2019/10/01}%
                  {\vphantom}{Make commands robust}%
@@ -814,6 +859,36 @@ of this package available from CTAN}
 \kernel@make@fragile\pmatrix
 
 \EndIncludeInRelease
+\IncludeInRelease{2020/10/01}%
+                 {\tmspace}{amsmath spacing commands}%
+\DeclareRobustCommand\tmspace[3]{%
+  \ifmmode\mskip#1#2\else\leavevmode@ifvmode\kern#1#3\fi\relax}
+\DeclareRobustCommand\,{\tmspace+\thinmuskip{.16667em}}
+\let\thinspace\,
+\DeclareRobustCommand\!{\tmspace-\thinmuskip{.16667em}}
+\let\negthinspace\!
+\DeclareRobustCommand\:{\tmspace+\medmuskip{.2222em}}
+\let\medspace\:
+\let\>=\:
+\DeclareRobustCommand\negmedspace{\tmspace-\medmuskip{.2222em}}
+\DeclareRobustCommand\;{\tmspace+\thickmuskip{.2777em}}
+\let\thickspace\;
+\DeclareRobustCommand\negthickspace{\tmspace-\thickmuskip{.2777em}}
+\EndIncludeInRelease
+\IncludeInRelease{0000/00/00}%
+                 {\tmspace}{amsmath spacing commands}%
+
+\let\tmspace\@undefined
+\DeclareRobustCommand{\,}{%
+   \relax\ifmmode\mskip\thinmuskip\else\thinspace\fi}
+\DeclareRobustCommand\thinspace{\leavevmode@ifvmode\kern .16667em }
+\DeclareRobustCommand\negthinspace{\leavevmode@ifvmode\kern-.16667em }
+\def\>{\mskip\medmuskip}
+\let\:=\>
+\def\;{\mskip\thickmuskip}
+\def\!{\mskip-\thinmuskip}
+
+\EndIncludeInRelease
 \IncludeInRelease{2015/01/01}{\(}{Make \( robust}%
 \DeclareRobustCommand\({%
   \relax\ifmmode\@badmath\else$\fi}%
@@ -880,7 +955,33 @@ of this package available from CTAN}
 }%
 \expandafter\let\csname\string] \endcsname\@undefined
 \EndIncludeInRelease
+\IncludeInRelease{2020/10/01}%
+                 {\@xeqncr}{eqnarray support calc syntax}%
+\def\@xeqncr[#1]{%
+   \ifnum0=`{\fi}%
+   \@@eqncr
+   \noalign{\penalty\@eqpen\vskip\jot\@vspace@calcify{#1}}%
+}
+\EndIncludeInRelease
+\IncludeInRelease{0000/00/00}%
+                 {\@xeqncr}{eqnarray support calc syntax}%
+
+\def\@xeqncr[#1]{%
+   \ifnum0=`{\fi}%
+   \@@eqncr
+   \noalign{\penalty\@eqpen\vskip\jot\vskip #1\relax}%
+}
+\EndIncludeInRelease
 %%% From File: ltpictur.dtx
+\IncludeInRelease{2020/10/01}%
+                 {\@istackcr}{\shortstack calc support}%
+\def\@istackcr[#1]{\cr\noalign{\@vspace@calcify{#1}}\ignorespaces}
+\EndIncludeInRelease
+\IncludeInRelease{0000/00/00}%
+                 {\@istackcr}{\shortstack calc support}%
+
+\def\@istackcr[#1]{\cr\noalign{\vskip #1}\ignorespaces}
+\EndIncludeInRelease
 \IncludeInRelease{2016/03/31}%
                  {\@ovhlinetrue}%
                  {Avoid almost zero length leaders}%
@@ -1191,21 +1292,50 @@ of this package available from CTAN}
   \global\let\do\noexpand
   \ignorespaces}
 \EndIncludeInRelease
+\IncludeInRelease{2020/10/01}%
+                 {\includeonly}{Spaces in file names}%
+\def\includeonly#1{%
+  \@partswtrue
+  \let\@partlist\@empty
+  \@for\reserved@a:=#1 \do
+    {
+      \expandafter\set@curr@file@trim@spaces\expandafter{\reserved@a}%
+      \ifx\@partlist\@empty
+        \edef\@partlist{\@curr@file}%
+      \else
+        \edef\@partlist{\@partlist,\@curr@file}%
+      \fi
+    }%
+  }
+\@onlypreamble\includeonly
+\def\include#1{\relax
+  \ifnum\@auxout=\@partaux
+    \@latex@error{\string\include\space cannot be nested}\@eha
+  \else
+    \set@curr@file@trim@spaces{#1}%
+    \expandafter\@include\expandafter{\@curr@file} % deliberate space
+  \fi}
+\def\set@curr@file@trim@spaces#1{%
+  \@expl@tl@trim@spaces@apply@@nN {#1} \set@curr@file }
+\EndIncludeInRelease
 \IncludeInRelease{2019/10/01}%
                  {\includeonly}{Spaces in file names}%
+
 \def\includeonly#1{%
   \@partswtrue
   \set@curr@file{\zap@space#1 \@empty}%
   \let\@partlist\@curr@file
   }
-\@onlypreamble\includeonly
+
 \def\include#1{\relax
   \ifnum\@auxout=\@partaux
     \@latex@error{\string\include\space cannot be nested}\@eha
   \else
-  \set@curr@file{#1 }%
-  \expandafter\@include\@curr@file
+    \set@curr@file{#1 }%
+    \expandafter\@include\@curr@file
   \fi}
+
+\let\set@curr@file@trim@spaces\@undefined
 \EndIncludeInRelease
 \IncludeInRelease{0000/00/00}%
                  {\includeonly}{Spaces in file names}%
@@ -1219,6 +1349,72 @@ of this package available from CTAN}
   \else \@include#1 \fi}
 
 \EndIncludeInRelease
+\IncludeInRelease{2020/10/01}%
+                 {\@include}{Spaces in file names}%
+\def\@include#1 {%
+  \clearpage
+  \if@filesw
+    \immediate\write\@mainaux{\string\@input{"#1.aux"}}%
+  \fi
+  \@tempswatrue
+  \if@partsw
+    \@tempswafalse
+    \edef\reserved@b{#1}%
+    \@for\reserved@a:=\@partlist\do
+      {\ifx\reserved@a\reserved@b\@tempswatrue\fi}%
+  \fi
+  \if@tempswa
+    \let\@auxout\@partaux
+    \if@filesw
+      \immediate\openout\@partaux "#1.aux"
+      \immediate\write\@partaux{\relax}%
+    \fi
+    \@input@{#1.tex}%
+    \clearpage
+    \@writeckpt{#1}%
+    \if@filesw
+      \immediate\closeout\@partaux
+    \fi
+  \else
+    \deadcycles\z@
+    \@nameuse{cp@#1}%
+  \fi
+  \let\@auxout\@mainaux}
+\EndIncludeInRelease
+
+\IncludeInRelease{0000/00/00}%
+                 {\@include}{Spaces in file names}%
+\def\@include#1 {%
+  \clearpage
+  \if@filesw
+    \immediate\write\@mainaux{\string\@input{#1.aux}}%
+  \fi
+  \@tempswatrue
+  \if@partsw
+    \@tempswafalse
+    \edef\reserved@b{#1}%
+    \@for\reserved@a:=\@partlist\do
+      {\ifx\reserved@a\reserved@b\@tempswatrue\fi}%
+  \fi
+  \if@tempswa
+    \let\@auxout\@partaux
+    \if@filesw
+      \immediate\openout\@partaux #1.aux
+      \immediate\write\@partaux{\relax}%
+    \fi
+    \@input@{#1.tex}%
+    \clearpage
+    \@writeckpt{#1}%
+    \if@filesw
+      \immediate\closeout\@partaux
+    \fi
+  \else
+    \deadcycles\z@
+    \@nameuse{cp@#1}%
+  \fi
+  \let\@auxout\@mainaux}
+
+\EndIncludeInRelease
 \IncludeInRelease{2019/10/01}%
                  {\set@curr@file}{Quote file names}%
 \def\set@curr@file#1{%
@@ -1777,16 +1973,39 @@ of this package available from CTAN}
   \@fpbot \@dblfpbot
 }%
 \EndIncludeInRelease
+\IncludeInRelease{2020/10/01}%
+                 {\@textsuperscript}{superscript baseline}%
+\def\@textsuperscript#1{%
+  {\m@th\ensuremath{^{\mbox{\fontsize\sf@size\sf@size#1}}}}}
+\EndIncludeInRelease
+\IncludeInRelease{0000/00/00}%
+                 {\@textsuperscript}{superscript baseline}%
+
+\def\@textsuperscript#1{%
+  {\m@th\ensuremath{^{\mbox{\fontsize\sf@size\z@#1}}}}}
+\EndIncludeInRelease
 \IncludeInRelease{2015/01/01}%
                  {\textsubscript}{\textsubscript}%
 \DeclareRobustCommand*\textsubscript[1]{%
   \@textsubscript{\selectfont#1}}%
-\def\@textsubscript#1{%
-  {\m@th\ensuremath{_{\mbox{\fontsize\sf@size\z@#1}}}}}
 \EndIncludeInRelease
 \IncludeInRelease{0000/00/00}%
                  {\textsubscript}{\textsubscript}%
 \let\textsubscript\@undefined
+\EndIncludeInRelease
+\IncludeInRelease{2020/10/01}%
+                 {\@textsubscript}{subscript baseline}%
+\def\@textsubscript#1{%
+  {\m@th\ensuremath{_{\mbox{\fontsize\sf@size\sf@size#1}}}}}
+\EndIncludeInRelease
+\IncludeInRelease{2015/01/01}%
+                 {\@textsubscript}{subscript baseline}%
+
+\def\@textsubscript#1{%
+  {\m@th\ensuremath{_{\mbox{\fontsize\sf@size\z@#1}}}}}
+\EndIncludeInRelease
+\IncludeInRelease{0000/00/00}%
+                 {\@textsubscript}{subscript baseline}%
 \let\@textsubscript\@undefined
 \EndIncludeInRelease
 %%% From File: ltidxglo.dtx
@@ -2609,6 +2828,21 @@ of this package available from CTAN}
 }%
 \EndIncludeInRelease
 %%% From File: ltclass.dtx
+\IncludeInRelease{2020/10/01}%
+                 {\IfFormatAtLeastTF}{Test format date}%
+\def\IfFormatAtLeastTF{\@ifl@t@r\fmtversion}
+\let\IfPackageAtLeastTF\@ifpackagelater
+\let\IfClassAtLeastTF\@ifclasslater
+\@onlypreamble\IfFormatAtLeastTF
+\@onlypreamble\IfPackageAtLeastTF
+\@onlypreamble\IfClassAtLeastTF
+\EndIncludeInRelease
+\IncludeInRelease{0000/00/00}%
+                 {\IfFormatAtLeastTF}{Test format date}%
+\def\IfFormatAtLeastTF{\@ifl@t@r\fmtversion}
+\let\IfPackageAtLeastTF\@ifpackagelater
+\let\IfClassAtLeastTF\@ifclasslater
+\EndIncludeInRelease
 \IncludeInRelease{2018/04/01}%
                  {\@ifl@t@r}{Guard against bad input}%
 \def\@ifl@t@r#1#2{%
@@ -2692,6 +2926,38 @@ of this package available from CTAN}
 \let\protected@wlog\@undefined
 
 \EndIncludeInRelease
+\IncludeInRelease{2020/10/01}%
+                 {\@process@pti@ns}{Unused options issue}%
+\def\@process@pti@ns{%
+  \@for\CurrentOption:=\@curroptions\do{%
+    \@ifundefined{ds@\CurrentOption}%
+      {\@use@ption
+       \default@ds}%
+      \@use@ption}%
+  \@for\CurrentOption:=\@declaredoptions\do{%
+    \expandafter\let\csname ds@\CurrentOption\endcsname\relax}%
+  \let\CurrentOption\@empty
+  \let\@fileswith@pti@ns\@@fileswith@pti@ns
+  \AtEndOfPackage{\expandafter\let
+                     \csname unprocessedoptions-\@currname.\@currext\endcsname
+                     \relax}}
+\@onlypreamble\@process@pti@ns
+\EndIncludeInRelease
+\IncludeInRelease{0000/00/00}%
+                 {\@process@pti@ns}{Unused options issue}%
+
+\def\@process@pti@ns{%
+  \@for\CurrentOption:=\@curroptions\do{%
+    \@ifundefined{ds@\CurrentOption}%
+      {\@use@ption
+       \default@ds}%
+      \@use@ption}%
+  \@for\CurrentOption:=\@declaredoptions\do{%
+    \expandafter\let\csname ds@\CurrentOption\endcsname\relax}%
+  \let\CurrentOption\@empty
+  \let\@fileswith@pti@ns\@@fileswith@pti@ns
+  \AtEndOfPackage{\let\@unprocessedoptions\relax}}
+\EndIncludeInRelease
 \IncludeInRelease{2017/01/01}%
                  {\ExecuteOptions}{Spaces in \ExecuteOptions}%
 \def\ExecuteOptions#1{%
@@ -2711,6 +2977,22 @@ of this package available from CTAN}
     \edef\CurrentOption{##1}}%
   \expandafter\reserved@a\CurrentOption\@nil}
 \EndIncludeInRelease
+\IncludeInRelease{2020/10/01}%
+                 {\RequirePackageWithOptions}{Unused options issue}%
+\def\RequirePackageWithOptions{%
+  \AtEndOfPackage{\expandafter\let
+                    \csname unprocessedoptions-\@currname.\@currext\endcsname
+                    \relax}%
+  \@loadwithoptions\@pkgextension\RequirePackage}
+\@onlypreamble\RequirePackageWithOptions
+\EndIncludeInRelease
+\IncludeInRelease{0000/00/00}%
+                 {\RequirePackageWithOptions}{Unused options issue}%
+
+\def\RequirePackageWithOptions{%
+  \AtEndOfPackage{\let\@unprocessedoptions\relax}%
+  \@loadwithoptions\@pkgextension\RequirePackage}
+\EndIncludeInRelease
 \IncludeInRelease{2017/01/01}%
         {\@fileswith@pti@ns}{ifx tests in \@fileswith@pti@ns}%
 \def\@fileswith@pti@ns#1[#2]#3[#4]{%
@@ -2766,6 +3048,121 @@ of this package available from CTAN}
   \fi
   \reserved@a}
 \EndIncludeInRelease
+\IncludeInRelease{2020/10/01}%
+                 {\@onefilewithoptions}{Unused options issue}%
+\def\@onefilewithoptions#1[#2][#3]#4{%
+  \@pushfilename
+  \xdef\@currname{#1}%
+  \global\let\@currext#4%
+  \let\CurrentOption\@empty
+  \@reset@ptions
+  \makeatletter
+  \def\reserved@a{%
+    \@ifl@aded\@currext{#1}%
+      {\@if@ptions\@currext{#1}{#2}{}%
+        {\@latex@error
+            {Option clash for \@cls@pkg\space #1}%
+            {The package #1 has already been loaded
+             with options:\MessageBreak
+             \space\space[\@ptionlist{#1.\@currext}]\MessageBreak
+             There has now been an attempt to load it
+              with options\MessageBreak
+             \space\space[#2]\MessageBreak
+             Adding the global options:\MessageBreak
+             \space\space
+                  \@ptionlist{#1.\@currext},#2\MessageBreak
+             to your \noexpand\documentclass declaration may fix this.%
+             \MessageBreak
+             Try typing \space <return> \space to proceed.}}}%
+      {\@pass@ptions\@currext{#2}{#1}%
+       \global\expandafter
+       \let\csname ver@\@currname.\@currext\endcsname\@empty
+       \expandafter\let\csname\@currname.\@currext-h@@k\endcsname\@empty
+       \InputIfFileExists
+         {\@currname.\@currext}%
+         {}%
+         {\@missingfileerror\@currname\@currext}%
+    \expandafter\let\csname unprocessedoptions-\@currname.\@currext\endcsname
+                    \@@unprocessedoptions
+    \csname\@currname.\@currext-h@@k\endcsname
+    \expandafter\let\csname\@currname.\@currext-h@@k\endcsname
+              \@undefined
+    \ifx\@unprocessedoptions\relax
+      \let\@unprocessedoptions\@undefined
+    \else
+      \csname unprocessedoptions-\@currname.\@currext\endcsname
+    \fi
+    \expandafter\let
+        \csname unprocessedoptions-\@currname.\@currext\endcsname
+       \@undefined}%
+    \@ifl@ter\@currext{#1}{#3}{}%
+      {\@latex@warning@no@line
+         {You have requested,\on@line,
+          version\MessageBreak
+            `#3' of \@cls@pkg\space #1,\MessageBreak
+          but only version\MessageBreak
+           `\csname ver@#1.\@currext\endcsname'\MessageBreak
+          is available}}%
+    \ifx\@currext\@clsextension\let\LoadClass\@twoloadclasserror\fi
+    \@popfilename
+    \@reset@ptions}%
+  \reserved@a}
+\@onlypreamble\@onefilewithoptions
+\let\@unprocessedoptions\@undefined
+\EndIncludeInRelease
+\IncludeInRelease{0000/00/00}%
+                 {\@onefilewithoptions}{Unused options issue}%
+
+\def\load@onefilewithoptions#1[#2][#3]#4{%
+  \@pushfilename
+  \xdef\@currname{#1}%
+  \global\let\@currext#4%
+  \let\CurrentOption\@empty
+  \@reset@ptions
+  \makeatletter
+  \def\reserved@a{%
+    \@ifl@aded\@currext{#1}%
+      {\@if@ptions\@currext{#1}{#2}{}%
+        {\@latex@error
+            {Option clash for \@cls@pkg\space #1}%
+            {The package #1 has already been loaded
+             with options:\MessageBreak
+             \space\space[\@ptionlist{#1.\@currext}]\MessageBreak
+             There has now been an attempt to load it
+              with options\MessageBreak
+             \space\space[#2]\MessageBreak
+             Adding the global options:\MessageBreak
+             \space\space
+                  \@ptionlist{#1.\@currext},#2\MessageBreak
+             to your \noexpand\documentclass declaration may fix this.%
+             \MessageBreak
+             Try typing \space <return> \space to proceed.}}}%
+      {\@pass@ptions\@currext{#2}{#1}%
+       \global\expandafter
+       \let\csname ver@\@currname.\@currext\endcsname\@empty
+       \expandafter\let\csname\@currname.\@currext-h@@k\endcsname\@empty
+       \InputIfFileExists
+         {\@currname.\@currext}%
+         {}%
+         {\@missingfileerror\@currname\@currext}%
+    \let\@unprocessedoptions\@@unprocessedoptions
+    \csname\@currname.\@currext-h@@k\endcsname
+    \expandafter\let\csname\@currname.\@currext-h@@k\endcsname
+              \@undefined
+    \@unprocessedoptions}%
+    \@ifl@ter\@currext{#1}{#3}{}%
+      {\@latex@warning@no@line
+         {You have requested,\on@line,
+          version\MessageBreak
+            `#3' of \@cls@pkg\space #1,\MessageBreak
+          but only version\MessageBreak
+           `\csname ver@#1.\@currext\endcsname'\MessageBreak
+          is available}}%
+    \ifx\@currext\@clsextension\let\LoadClass\@twoloadclasserror\fi
+    \@popfilename
+    \@reset@ptions}%
+  \reserved@a}
+\EndIncludeInRelease
 \IncludeInRelease{2019/10/01}%
                  {\filec@ntents}{Spaces in file names + optional arg}%
 \def\filecontents{\@tempswatrue\@fileswtrue
@@ -3035,6 +3432,26 @@ of this package available from CTAN}
      \csname\expandafter\@gobble\string\\ \endcsname
 
 \EndIncludeInRelease
+\IncludeInRelease{2020/10/01}%
+                 {\@vspace@calcify}{Add calc support}%
+\def\@vspace@calcify#1{\begingroup\setlength\skip@{#1}\vskip\skip@\endgroup}
+\EndIncludeInRelease
+\IncludeInRelease{0000/00/00}%
+                 {\@vspace@calcify}{Add calc support}%
+
+\let\@vspace@calcify\@undefined
+\EndIncludeInRelease
+\IncludeInRelease{2020/10/01}%
+                 {\@newline}{\newline calc support}%
+\def\@newline[#1]{\let \reserved@e \vadjust
+                   \@gnewline {\@vspace@calcify{#1}}}
+\EndIncludeInRelease
+\IncludeInRelease{0000/00/00}%
+                 {\@newline}{\newline calc support}%
+
+\def\@newline[#1]{\let \reserved@e \vadjust
+                   \@gnewline {\vskip #1}}
+\EndIncludeInRelease
 \IncludeInRelease{2018/10/10}%
                  {\@esphack}{hyphenation and nobreak after space hack}%
 \def\@esphack{%
@@ -3115,6 +3532,39 @@ of this package available from CTAN}
     \fi
    \fi}%
 \EndIncludeInRelease
+\IncludeInRelease{2020/10/01}%
+                 {\addvspace}{\addvspace calc support}%
+\def\addvspace#1{%
+  \ifvmode
+     \if@minipage\else
+       \ifdim \lastskip =\z@
+         \@vspace@calcify{#1}%
+       \else
+       \setlength\@tempskipb{#1}%
+         \@xaddvskip
+       \fi
+     \fi
+  \else
+    \@noitemerr
+  \fi}
+\EndIncludeInRelease
+\IncludeInRelease{0000/00/00}%
+                 {\addvspace}{\addvspace calc support}%
+
+\def\addvspace#1{%
+  \ifvmode
+     \if@minipage\else
+       \ifdim \lastskip =\z@
+         \vskip #1\relax
+       \else
+       \@tempskipb#1\relax
+         \@xaddvskip
+       \fi
+     \fi
+  \else
+    \@noitemerr
+  \fi}
+\EndIncludeInRelease
 \IncludeInRelease{2015/01/01}%
                  {\addpenalty}{\addpenalty}%
 \def\addpenalty#1{%
@@ -3171,6 +3621,71 @@ of this package available from CTAN}
     \@noitemerr
   \fi}%
 \EndIncludeInRelease
+\IncludeInRelease{2020/10/01}%
+                 {\@vspace}{Support calc in \vspace}%
+\def\@vspace #1{%
+  \ifvmode
+    \@vspace@calcify{#1}%
+    \vskip\z@skip
+   \else
+     \@bsphack
+     \vadjust{\@restorepar
+              \@vspace@calcify{#1}%
+              \vskip\z@skip
+              }%
+     \@esphack
+   \fi}
+\def\@vspacer#1{%
+  \ifvmode
+    \dimen@\prevdepth
+    \hrule \@height\z@
+    \nobreak
+    \@vspace@calcify{#1}%
+    \vskip\z@skip
+    \prevdepth\dimen@
+  \else
+    \@bsphack
+    \vadjust{\@restorepar
+             \hrule \@height\z@
+             \nobreak
+             \@vspace@calcify{#1}%
+             \vskip\z@skip}%
+    \@esphack
+  \fi}
+\EndIncludeInRelease
+\IncludeInRelease{0000/00/00}%
+                 {\@vspace}{Support calc in \vspace}%
+
+\def\@vspace #1{%
+  \ifvmode
+    \vskip #1
+    \vskip\z@skip
+   \else
+     \@bsphack
+     \vadjust{\@restorepar
+              \vskip #1
+              \vskip\z@skip
+              }%
+     \@esphack
+   \fi}
+\def\@vspacer#1{%
+  \ifvmode
+    \dimen@\prevdepth
+    \hrule \@height\z@
+    \nobreak
+    \vskip #1
+    \vskip\z@skip
+    \prevdepth\dimen@
+  \else
+    \@bsphack
+    \vadjust{\@restorepar
+             \hrule \@height\z@
+             \nobreak
+             \vskip #1
+             \vskip\z@skip}%
+    \@esphack
+  \fi}
+\EndIncludeInRelease
 \IncludeInRelease{2015/01/01}%
                  {\@}{Space after \@}%
 \def\@{\spacefactor\@m{}}%
@@ -3179,10 +3694,18 @@ of this package available from CTAN}
                  {\@}{Space after \@}%
 \def\@{\spacefactor\@m}%
 \EndIncludeInRelease
+\IncludeInRelease{2020/10/01}%
+                 {\@hspace}{Support calc with \hspace}%
+\def\@hspace#1{\begingroup\setlength\skip@{#1}\hskip\skip@\endgroup}
+\EndIncludeInRelease
+\IncludeInRelease{0000/00/00}%
+                 {\@hspace}{Support calc with \hspace}%
+
+
+\def\@hspace#1{\hskip #1\relax}
+\EndIncludeInRelease
 \IncludeInRelease{2018/12/01}%
                  {\thinspace}{Start LR-mode}%
-\DeclareRobustCommand\thinspace{\leavevmode@ifvmode\kern .16667em }
-\DeclareRobustCommand\negthinspace{\leavevmode@ifvmode\kern-.16667em }
 \DeclareRobustCommand\enspace{\leavevmode@ifvmode\kern.5em }
 \protected\def\leavevmode@ifvmode{\ifvmode\expandafter\indent\fi}
 \EndIncludeInRelease
@@ -3564,8 +4087,38 @@ of this package available from CTAN}
  }%
 }
 \EndIncludeInRelease
+\IncludeInRelease{2020/10/01}
+  {\document@select@group}{\document@select@group}%
+\def\document@select@group#1#2#3#4{%
+ \ifx\math@bgroup\bgroup\else\relax\expandafter\@firstofone\fi
+ {%
+ \ifmmode
+   \ifnum\csname c@mv@\math@version\endcsname<\e@mathgroup@top
+     \begingroup
+       \escapechar\m@ne
+       \getanddefine@fonts{\csname c@mv@\math@version\endcsname}#3%
+       \globaldefs\@ne  \math@fonts
+     \endgroup
+     \expandafter\extract@alph@from@version
+         \csname mv@\math@version\expandafter\endcsname
+         \expandafter{\number\csname
+                       c@mv@\math@version\endcsname}%
+          #1%
+     \global\advance\csname c@mv@\math@version\endcsname\@ne
+   \else
+     \let#1\relax
+     \@latex@error{Too many math alphabets used
+                   in version \math@version}%
+        \@eha
+  \fi
+ \else \expandafter\non@alpherr\fi
+ \expandafter#1\ifx\math@bgroup\bgroup{#4}\else#4\fi
+ }%
+}
+\EndIncludeInRelease
 \IncludeInRelease{2015/01/01}
   {\document@select@group}{\document@select@group}%
+
 \def\document@select@group#1#2#3#4{%
  \ifx\math@bgroup\bgroup\else\relax\expandafter\@firstofone\fi
  {%
@@ -3593,8 +4146,10 @@ of this package available from CTAN}
  }%
 }
 \EndIncludeInRelease
+
 \IncludeInRelease{0000/00/00}
   {\document@select@group}{\document@select@group}%
+
 \def\document@select@group#1#2#3#4{%
  \ifx\math@bgroup\bgroup\else\relax\expandafter\@firstofone\fi
  {%
@@ -3756,7 +4311,9 @@ of this package available from CTAN}
     \ifcsname #2series\endcsname           % supported are
                                            % \[md/bf]default
       \expandafter\def
-         \csname #2default\endcsname{#3}%
+        \csname #2default\endcsname{#3\@empty}%
+      \expandafter\def
+        \csname #2default@previous\endcsname{#3\@empty}%
     \else
        \@latex@error{Wrong syntax for \string\DeclareFontSeriesDefault}%
           {Mandatory first argument must be 'md'  or 'bf'.}
@@ -3792,12 +4349,21 @@ of this package available from CTAN}
   \edef\ttdef@ult{\ttdefault}%
   \series@maybe@drop@one@m\bfdefault\bfdef@ult
   \series@maybe@drop@one@m\mddefault\mddef@ult
-  \edef\famdef@ult{\familydefault}%
+  \@expandfontdefaultshook
 }
 
 \DeclareRobustCommand\bfseries{%
   \not@math@alphabet\bfseries\mathbf
   \expand@font@defaults
+  \ifx\bfdefault\bfdefault@previous\else
+    \expandafter\def\expandafter\bfdefault
+                    \expandafter{\bfdefault\@empty}%
+    \let\bfseries@previous\bfdefault
+    \let\bfseries@rm\bfdef@ult
+    \let\bfseries@sf\bfdef@ult
+    \let\bfseries@tt\bfdef@ult
+    \@setbfseriesdefaultshook
+  \fi
     \ifx\f@family\rmdef@ult      \fontseries\bfseries@rm
     \else\ifx\f@family\sfdef@ult \fontseries\bfseries@sf
     \else\ifx\f@family\ttdef@ult \fontseries\bfseries@tt
@@ -3809,6 +4375,14 @@ of this package available from CTAN}
 \DeclareRobustCommand\mdseries{%
   \not@math@alphabet\mdseries\relax
   \expand@font@defaults
+  \ifx\mddefault\mddefault@previous\else
+    \expandafter\def\expandafter\mddefault\expandafter{\mddefault\@empty}%
+    \let\mdseries@previous\mddefault
+    \let\mdseries@rm\mddef@ult
+    \let\mdseries@sf\mddef@ult
+    \let\mdseries@tt\mddef@ult
+    \@setmdseriesdefaultshook
+  \fi
     \ifx\f@family\rmdef@ult      \fontseries\mdseries@rm
     \else\ifx\f@family\sfdef@ult \fontseries\mdseries@sf
     \else\ifx\f@family\ttdef@ult \fontseries\mdseries@tt
@@ -3832,6 +4406,9 @@ of this package available from CTAN}
    \prepare@family@series@update{tt}\ttdefault
    \@ttfamilyhook
    \selectfont}
+\let\@expandfontdefaultshook\@empty
+\let\@setbfseriesdefaultshook\@empty
+\let\@setmdseriesdefaultshook\@empty
 \let\@rmfamilyhook\@empty
 \let\@sffamilyhook\@empty
 \let\@ttfamilyhook\@empty
@@ -3894,12 +4471,11 @@ of this package available from CTAN}
   \ifx\bfseries@tt@kernel\bfseries@tt
     \expandafter\in@\expandafter{\ttdefault}{cmr,cmss,cmtt,lcmss,lcmtt,lmr,lmss,lmtt}%
     \ifin@ \else \def\bfseries@tt{b}\fi\fi
-
-  \expand@font@defaults
-  \ifx\famdef@ult\rmdef@ult      \rmfamily
-  \else\ifx\famdef@ult\sfdef@ult \sffamily
-  \else\ifx\famdef@ult\ttdef@ult \ttfamily
-  \fi\fi\fi
+  \reset@font
+  \ifx\seriesdefault\seriesdefault@kernel
+    \mdseries
+    \let\seriesdefault\f@series
+  \fi
 }%
 \expandafter\let\csname ver@mweights.sty\endcsname\fmtversion
 \EndIncludeInRelease
@@ -3935,6 +4511,9 @@ of this package available from CTAN}
         {\not@math@alphabet\ttfamily\mathtt
          \fontfamily\ttdefault\selectfont}
 
+\let\@expandfontdefaultshook\@undefined
+\let\@setbfseriesdefaultshook\@undefined
+\let\@setmdseriesdefaultshook\@undefined
 \let\@rmfamilyhook\@undefined
 \let\@sffamilyhook\@undefined
 \let\@ttfamilyhook\@undefined
@@ -3945,6 +4524,49 @@ of this package available from CTAN}
 \let\init@series@setup\relax
 
 \EndIncludeInRelease
+\IncludeInRelease{2020/10/01}%
+                 {\IfFontSeriesContext}{Font series context}%
+\DeclareRobustCommand\IfFontSeriesContextTF[1]{%
+  \expand@font@defaults
+  \@font@series@contextfalse
+  \def\requested@test@context{#1}%
+  \expandafter\edef\csname ??def@ult\endcsname{\f@family}%
+  \let\@elt\test@font@series@context
+      \@meta@family@list
+      \@elt{??}%
+  \let\@elt\relax
+  \if@font@series@context
+  \expandafter\@firstoftwo
+  \else
+  \expandafter\@secondoftwo
+  \fi
+}
+
+\def\test@font@series@context#1{%
+  \edef\reserved@a{\csname #1def@ult\endcsname}%
+  \ifx\f@family\reserved@a
+    \let\@elt\@gobble
+    \expandafter\ifx
+                \csname\requested@test@context series@#1\endcsname\f@series
+      \@font@series@contexttrue
+    \else
+      \expandafter\ifx
+                  \csname\requested@test@context def@ult\endcsname\f@series
+        \@font@series@contexttrue
+  \fi\fi\fi
+}
+
+\newif\if@font@series@context
+\EndIncludeInRelease
+\IncludeInRelease{0000/00/00}%
+                 {\IfFontSeriesContext}{Font series context}%
+
+\let\IfFontSeriesContextTF\@undefined
+\let\test@font@series@context\@undefined
+\let\if@font@series@context\@undefined
+\let\@font@series@contexttrue\@undefined
+\let\@font@series@contextfalse\@undefined
+\EndIncludeInRelease
 \IncludeInRelease{2020/02/02}%
                  {\DeclareEmphSequence}{Nested emph}%
 \def\DeclareEmphSequence#1{%
@@ -4072,13 +4694,19 @@ of this package available from CTAN}
 \IncludeInRelease{2020/02/02}%
                  {\updefault}{font defaults change}%
 \renewcommand\updefault{up}
-\renewcommand\bfdefault{b}
+\renewcommand\bfdefault{b\@empty}
+\renewcommand\mddefault{m\@empty}
+\let\bfdefault@previous\bfdefault
+\let\mddefault@previous\mddefault
 \EndIncludeInRelease
 \IncludeInRelease{0000/00/00}%
                  {\updefault}{font defaults change}%
 
 \renewcommand\updefault{n}
 \renewcommand\bfdefault{bx}
+
+\let\bfdefault@previous\undefined
+\let\mddefault@previous\undefined
 \EndIncludeInRelease
 \IncludeInRelease{2018/12/01}%
                  {\Big}{Start LR-mode}%
@@ -4311,22 +4939,22 @@ of this package available from CTAN}
   \DeclareTextCommandDefault{\newtie}             {\tc@check@accent{\t}2\newtie}
   \DeclareTextCommandDefault{\capitalnewtie}      {\tc@check@accent{\t}2\capitalnewtie}
 \else
-  \def\capitalacute{\@tabacckludge'}
-  \def\capitalbreve{\u}
-  \def\capitalcaron{\v}
-  \def\capitalcedilla{\c}
-  \def\capitalcircumflex{\^}
-  \def\capitaldieresis{\"}
-  \def\capitaldotaccent{\.}
-  \def\capitalgrave{\@tabacckludge`}
-  \def\capitalhungarumlaut{\H}
-  \def\capitalmacron{\@tabacckludge=}
-  \def\capitalnewtie{\t}
-  \def\capitalogonek{\k}
-  \def\capitalring{\r}
-  \def\capitaltie{\t}
-  \def\capitaltilde{\~}
-  \def\newtie{\t}
+  \DeclareTextCommandDefault\capitalacute{\@tabacckludge'}
+  \DeclareTextCommandDefault\capitalbreve{\u}
+  \DeclareTextCommandDefault\capitalcaron{\v}
+  \DeclareTextCommandDefault\capitalcedilla{\c}
+  \DeclareTextCommandDefault\capitalcircumflex{\^}
+  \DeclareTextCommandDefault\capitaldieresis{\"}
+  \DeclareTextCommandDefault\capitaldotaccent{\.}
+  \DeclareTextCommandDefault\capitalgrave{\@tabacckludge`}
+  \DeclareTextCommandDefault\capitalhungarumlaut{\H}
+  \DeclareTextCommandDefault\capitalmacron{\@tabacckludge=}
+  \DeclareTextCommandDefault\capitalnewtie{\t}
+  \DeclareTextCommandDefault\capitalogonek{\k}
+  \DeclareTextCommandDefault\capitalring{\r}
+  \DeclareTextCommandDefault\capitaltie{\t}
+  \DeclareTextCommandDefault\capitaltilde{\~}
+  \DeclareTextCommandDefault\newtie{\t}
 \fi
 \DeclareTextCommandDefault{\textlbrackdbl}      {\tc@check@symbol2\textlbrackdbl}
 \DeclareTextCommandDefault{\textrbrackdbl}      {\tc@check@symbol2\textrbrackdbl}
@@ -5574,7 +6202,7 @@ of this package available from CTAN}
     ,ulm,elm,lm,slm,mm,sbm,bm,ebm,ubm,muc,mec,mc,msc,msx,mx,mex,mux,{}{},#1,}%
   \edef\in@@{\the\series@check@toks}%
   \ifx\in@@\@empty
-    \def#2{#1}%
+    \edef#2{#1}%
   \else
     \edef#2{\expandafter\series@drop@one@m #1m\series@drop@one@m}%
   \fi
@@ -5890,11 +6518,22 @@ of this package available from CTAN}
 \EndIncludeInRelease
 %%% From File: ltpageno.dtx
 %%% From File: ltxref.dtx
+\IncludeInRelease{2020/10/01}%
+                 {\refstepcounter}{Add \@currentcounter}%
+\def\refstepcounter#1{\stepcounter{#1}%
+    \edef\@currentcounter{#1}%
+    \protected@edef\@currentlabel
+       {\csname p@#1\expandafter\endcsname\csname the#1\endcsname}%
+}
+\def\labelformat#1{\expandafter\def\csname p@#1\endcsname##1}
+\DeclareRobustCommand\Ref[1]{\protected@edef\@tempa{\ref{#1}}%
+   \expandafter\MakeUppercase\@tempa}
+\EndIncludeInRelease
 \IncludeInRelease{2019/10/01}%
                  {\refstepcounter}{Add \labelformat and \Ref}%
 \def\refstepcounter#1{\stepcounter{#1}%
     \protected@edef\@currentlabel
-       {\csname p@#1\expandafter\endcsname\csname the#1\endcsname}%
+      {\csname p@#1\expandafter\endcsname\csname the#1\endcsname}%
 }
 \def\labelformat#1{\expandafter\def\csname p@#1\endcsname##1}
 \DeclareRobustCommand\Ref[1]{\protected@edef\@tempa{\ref{#1}}%
@@ -6003,6 +6642,15 @@ of this package available from CTAN}
        \par\@ifstar{\nobreak\@xcentercr}\@xcentercr}
 
 \EndIncludeInRelease
+\IncludeInRelease{2020/10/01}%
+                 {\@icentercr}{centering, etc support calc}%
+\def\@icentercr[#1]{\@vspace@calcify{#1}\ignorespaces}
+\EndIncludeInRelease
+\IncludeInRelease{0000/00/00}%
+                 {\@icentercr}{centering, etc support calc}%
+
+\def\@icentercr[#1]{\vskip #1\ignorespaces}
+\EndIncludeInRelease
 \IncludeInRelease{2019/10/01}%
                  {\centering}{Make commands robust}%
 \DeclareRobustCommand\centering{%
@@ -6069,7 +6717,7 @@ of this package available from CTAN}
 }
 \EndIncludeInRelease
 \IncludeInRelease{2018/12/01}%
-                 {\verbvisiblespace}{Setup visible space for verb}%
+                 {\verbvisiblespace}{Setup visible space for \verb}%
 \DeclareRobustCommand\asciispace{\char 32 }
 \ifx\Umathcode\@undefined
   \let\verbvisiblespace\asciispace                                % Pdftex version
@@ -6089,23 +6737,13 @@ of this package available from CTAN}
 }
 
 \newbox\@verbvisiblespacebox
-\def\@sverb#1{%
-  \catcode`#1\active
-  \lccode`\~`#1%
-  \gdef\verb@balance@group{\verb@egroup
-     \@latex@error{\noexpand\verb illegal in command argument}\@ehc}%
-  \aftergroup\verb@balance@group
-  \lowercase{\let~\verb@egroup}%
-  \ifnum\catcode`\ =\active
-  \else  \@setupverbvisiblespace \@vobeyspaces \fi
-}
 \@namedef{verbatim*}{\@verbatim
   \@setupverbvisiblespace
   \frenchspacing\@vobeyspaces\@sxverbatim}
 \expandafter\let\csname endverbatim*\endcsname =\endverbatim
 \EndIncludeInRelease
 \IncludeInRelease{0000/00/00}%
-                 {\verbvisiblespace}{Setup visible space for verb}%
+                 {\verbvisiblespace}{Setup visible space for \verb}%
 
 \@namedef{verbatim*}{\@verbatim\@sxverbatim}
 
@@ -6113,7 +6751,39 @@ of this package available from CTAN}
 \let\verbvisiblespace      \@undefined
 \let\@setupverbvisiblespace\@undefined
 \let\@verbvisiblespacebox  \@undefined
+\EndIncludeInRelease
+\IncludeInRelease{2020/10/01}%
+                 {\@sverb}{Drop spaces before \verb delimiter}%
+\def\@sverb#1{\if\noexpand#1 \expandafter\@sverb\else\@@sverb{#1}\fi}
+\def\@@sverb#1{%
+  \catcode`#1\active
+  \lccode`\~`#1%
+  \gdef\verb@balance@group{\verb@egroup
+     \@latex@error{\noexpand\verb illegal in command argument}\@ehc}%
+  \aftergroup\verb@balance@group
+  \lowercase{\let~\verb@egroup}%
+  \ifnum\catcode`\ =\active
+  \else  \@setupverbvisiblespace \@vobeyspaces \fi
+}
+\EndIncludeInRelease
+\IncludeInRelease{2018/12/01}%
+                 {\@sverb}{Setup visible space for \verb}%
+
+\def\@sverb#1{%
+  \catcode`#1\active
+  \lccode`\~`#1%
+  \gdef\verb@balance@group{\verb@egroup
+     \@latex@error{\noexpand\verb illegal in command argument}\@ehc}%
+  \aftergroup\verb@balance@group
+  \lowercase{\let~\verb@egroup}%
+  \ifnum\catcode`\ =\active
+  \else  \@setupverbvisiblespace \@vobeyspaces \fi
+}
+\let\@@sverb\@undefined
+\EndIncludeInRelease
 
+\IncludeInRelease{0000/00/00}%
+                 {\@sverb}{Setup visible space for \verb}%
 \def\@sverb#1{%
   \catcode`#1\active
   \lccode`\~`#1%
@@ -6375,6 +7045,20 @@ of this package available from CTAN}
   \GenericInfo{}{Skipping: expl3 code already part of the format}
 \fi
 \EndIncludeInRelease
+\IncludeInRelease{2020/10/01}%
+                 {\@expl@tl@trim@spaces@apply@@nN}
+                 {l3 macro for use in include}%
+\ExplSyntaxOn
+\cs_new_eq:NN \@expl@tl@trim@spaces@apply@@nN \tl_trim_spaces_apply:nN
+\ExplSyntaxOff
+\EndIncludeInRelease
+\IncludeInRelease{0000/00/00}%
+                 {\@expl@tl@trim@spaces@apply@@nN}
+                 {l3 macro for use in include}%
+
+\let\@expl@tl@trim@spaces@apply@@nN\@undefined
+
+\EndIncludeInRelease
 %%% From File: ltfinal.dtx
 \IncludeInRelease{2015/01/01}%
                  {\newmarks}{Extended Allocation}%
diff --git a/Master/texmf-dist/tex/latex-dev/base/latin1.def b/Master/texmf-dist/tex/latex-dev/base/latin1.def
index 642230dda3d..b9395bd996f 100644
--- a/Master/texmf-dist/tex/latex-dev/base/latin1.def
+++ b/Master/texmf-dist/tex/latex-dev/base/latin1.def
@@ -44,7 +44,7 @@
 
 
  \ProvidesFile{latin1.def}
-   [2018/08/11 v1.3c Input encoding file]
+   [2020/04/14 v1.3c Input encoding file]
 \ProvideTextCommandDefault{\textdegree}{\ensuremath{{^\circ}}}
 \ProvideTextCommandDefault{\textonehalf}{\ensuremath{\frac12}}
 \ProvideTextCommandDefault{\textonequarter}{\ensuremath{\frac14}}
diff --git a/Master/texmf-dist/tex/latex-dev/base/latin10.def b/Master/texmf-dist/tex/latex-dev/base/latin10.def
index 7ee0cf07d15..8e8c3222f4f 100644
--- a/Master/texmf-dist/tex/latex-dev/base/latin10.def
+++ b/Master/texmf-dist/tex/latex-dev/base/latin10.def
@@ -44,7 +44,7 @@
 
 
  \ProvidesFile{latin10.def}
-   [2018/08/11 v1.3c Input encoding file]
+   [2020/04/14 v1.3c Input encoding file]
 \ProvideTextCommandDefault{\textdegree}{\ensuremath{{^\circ}}}
 \ProvideTextCommandDefault{\texteuro}
    {\TextSymbolUnavailable\texteuro}
diff --git a/Master/texmf-dist/tex/latex-dev/base/latin2.def b/Master/texmf-dist/tex/latex-dev/base/latin2.def
index 79f500e43fa..d02ee9b7008 100644
--- a/Master/texmf-dist/tex/latex-dev/base/latin2.def
+++ b/Master/texmf-dist/tex/latex-dev/base/latin2.def
@@ -44,7 +44,7 @@
 
 
  \ProvidesFile{latin2.def}
-   [2018/08/11 v1.3c Input encoding file]
+   [2020/04/14 v1.3c Input encoding file]
 \ProvideTextCommandDefault{\textdegree}{\ensuremath{{^\circ}}}
 \ProvideTextCommandDefault{\textcurrency}
    {\TextSymbolUnavailable\textcurrency}
diff --git a/Master/texmf-dist/tex/latex-dev/base/latin3.def b/Master/texmf-dist/tex/latex-dev/base/latin3.def
index 39ba31667d2..327b8a92324 100644
--- a/Master/texmf-dist/tex/latex-dev/base/latin3.def
+++ b/Master/texmf-dist/tex/latex-dev/base/latin3.def
@@ -44,7 +44,7 @@
 
 
  \ProvidesFile{latin3.def}
-   [2018/08/11 v1.3c Input encoding file]
+   [2020/04/14 v1.3c Input encoding file]
 \ProvideTextCommandDefault{\textdegree}{\ensuremath{{^\circ}}}
 \ProvideTextCommandDefault{\textonehalf}{\ensuremath{\frac12}}
 \ProvideTextCommandDefault{\textcurrency}
diff --git a/Master/texmf-dist/tex/latex-dev/base/latin4.def b/Master/texmf-dist/tex/latex-dev/base/latin4.def
index 48659524cbe..26a6d6a0c29 100644
--- a/Master/texmf-dist/tex/latex-dev/base/latin4.def
+++ b/Master/texmf-dist/tex/latex-dev/base/latin4.def
@@ -44,7 +44,7 @@
 
 
  \ProvidesFile{latin4.def}
-   [2018/08/11 v1.3c Input encoding file]
+   [2020/04/14 v1.3c Input encoding file]
 \ProvideTextCommandDefault{\textdegree}{\ensuremath{{^\circ}}}
 \ProvideTextCommandDefault{\textcurrency}
    {\TextSymbolUnavailable\textcurrency}
diff --git a/Master/texmf-dist/tex/latex-dev/base/latin5.def b/Master/texmf-dist/tex/latex-dev/base/latin5.def
index 58216b83e87..c6a3bd69cdc 100644
--- a/Master/texmf-dist/tex/latex-dev/base/latin5.def
+++ b/Master/texmf-dist/tex/latex-dev/base/latin5.def
@@ -44,7 +44,7 @@
 
 
  \ProvidesFile{latin5.def}
-   [2018/08/11 v1.3c Input encoding file]
+   [2020/04/14 v1.3c Input encoding file]
 \ProvideTextCommandDefault{\textdegree}{\ensuremath{{^\circ}}}
 \ProvideTextCommandDefault{\textonehalf}{\ensuremath{\frac12}}
 \ProvideTextCommandDefault{\textonequarter}{\ensuremath{\frac14}}
diff --git a/Master/texmf-dist/tex/latex-dev/base/latin9.def b/Master/texmf-dist/tex/latex-dev/base/latin9.def
index 24c78ad859e..8cea14f5e92 100644
--- a/Master/texmf-dist/tex/latex-dev/base/latin9.def
+++ b/Master/texmf-dist/tex/latex-dev/base/latin9.def
@@ -44,7 +44,7 @@
 
 
  \ProvidesFile{latin9.def}
-   [2018/08/11 v1.3c Input encoding file]
+   [2020/04/14 v1.3c Input encoding file]
 \ProvideTextCommandDefault{\textdegree}{\ensuremath{{^\circ}}}
 \ProvideTextCommandDefault{\textcent}
    {\TextSymbolUnavailable\textcent}
diff --git a/Master/texmf-dist/tex/latex-dev/base/letter.cls b/Master/texmf-dist/tex/latex-dev/base/letter.cls
index 4d1d1476ae7..9909ad61c3d 100644
--- a/Master/texmf-dist/tex/latex-dev/base/letter.cls
+++ b/Master/texmf-dist/tex/latex-dev/base/letter.cls
@@ -43,7 +43,7 @@
 %% extension .ins) which are part of the distribution.
 \NeedsTeXFormat{LaTeX2e}[1996/06/01]
 \ProvidesClass{letter}
-              [2014/09/29 v1.2z
+              [2020/03/11 v1.3b
                Standard LaTeX document class]
 \newcommand\@ptsize{}
 \DeclareOption{a4paper}
@@ -150,17 +150,17 @@
       \let\@oddhead\@empty
       \def\@oddfoot{\normalfont\hfil\thepage\hfil}%
       \def\@evenfoot{\normalfont\hfil\thepage\hfil}}
-\newcommand*{\name}[1]{\def\fromname{#1}}
-\newcommand*{\signature}[1]{\def\fromsig{#1}}
-\newcommand*{\address}[1]{\def\fromaddress{#1}}
-\newcommand*{\location}[1]{\def\fromlocation{#1}}
-\newcommand*{\telephone}[1]{\def\telephonenum{#1}}
+\newcommand*\name[1]{\def\fromname{#1}}
+\newcommand*\signature[1]{\def\fromsig{#1}}
+\newcommand*\address[1]{\def\fromaddress{#1}}
+\newcommand*\location[1]{\def\fromlocation{#1}}
+\newcommand*\telephone[1]{\def\telephonenum{#1}}
 \name{}
 \signature{}
 \address{}
 \location{}
 \telephone{}
-\newcommand*{\makelabels}{%
+\newcommand*\makelabels{%
   \AtBeginDocument{%
      \let\@startlabels\startlabels
      \let\@mlabel\mlabel
@@ -195,7 +195,7 @@
   \fi}
 \long\def\@xproc #1\\#2@@@{\def\toname{#1}\def\toaddress{#2}}
 \long\def\@yproc #1\\#2@@@{\def\toaddress{#2}}
-\newcommand*{\stopbreaks}{%
+\newcommand*\stopbreaks{%
   \interlinepenalty\@M
   \def\par{\@@par\nobreak}%
   \let\\\@nobreakcr
@@ -209,7 +209,7 @@
     \@bsphack\vadjust{\nobreak\vskip #1}\@esphack
   \fi}
 \def\@nobreakcr{\@ifstar{\@normalcr*}{\@normalcr*}}
-\newcommand*{\startbreaks}{%
+\newcommand*\startbreaks{%
   \let\\\@normalcr
   \interlinepenalty 200%
   \def\par{\@@par\penalty 200\relax}}
@@ -218,7 +218,7 @@
 \newdimen\indentedwidth
 \indentedwidth=\textwidth
 \advance\indentedwidth -\longindentation
-\newcommand*{\opening}[1]{\ifx\@empty\fromaddress
+\newcommand*\opening[1]{\ifx\@empty\fromaddress
   \thispagestyle{firstpage}%
     {\raggedleft\@date\par}%
   \else  % home address
@@ -231,7 +231,7 @@
   {\raggedright \toname \\ \toaddress \par}%
   \vspace{2\parskip}%
   #1\par\nobreak}
-\newcommand{\closing}[1]{\par\nobreak\vspace{\parskip}%
+\newcommand\closing[1]{\par\nobreak\vspace{\parskip}%
   \stopbreaks
   \noindent
   \ifx\@empty\fromaddress\else
@@ -243,21 +243,21 @@
        \else \fromsig \fi\strut}%
    \par}
 \medskipamount=\parskip
-\newcommand*{\cc}[1]{%
+\newcommand*\cc[1]{%
   \par\noindent
   \parbox[t]{\textwidth}{%
     \@hangfrom{\normalfont\ccname: }%
     \ignorespaces #1\strut}\par}
-\newcommand*{\encl}[1]{%
+\newcommand*\encl[1]{%
   \par\noindent
   \parbox[t]{\textwidth}{%
     \@hangfrom{\normalfont\enclname: }%
     \ignorespaces #1\strut}\par}
-\newcommand*{\ps}{\par\startbreaks}
-\newcommand*{\stopletter}{}
-\newcommand*{\returnaddress}{}
+\newcommand*\ps{\par\startbreaks}
+\newcommand*\stopletter{}
+\newcommand*\returnaddress{}
 \newcount\labelcount
-\newcommand*{\startlabels}{\labelcount\z@
+\newcommand*\startlabels{\labelcount\z@
   \pagestyle{empty}%
   \let\@texttop\relax
   \topmargin -50\p@
@@ -281,16 +281,16 @@
   \parindent \z@
   \twocolumn\relax}
 \let\@startlabels=\relax
-\newcommand*{\mlabel}[2]{%
+\newcommand*\mlabel[2]{%
   \parbox[b][2in][c]{262\p@}{\strut\ignorespaces #2}%
   }
 \let\@mlabel=\@gobbletwo
-\setlength\leftmargini  {2.5em}
+\setlength\leftmargini   {2.5em}
 \setlength\leftmarginii  {2.2em}
 \setlength\leftmarginiii {1.87em}
 \setlength\leftmarginiv  {1.7em}
-\setlength\leftmarginv  {1em}
-\setlength\leftmarginvi {1em}
+\setlength\leftmarginv   {1em}
+\setlength\leftmarginvi  {1em}
 \setlength\leftmargin    {\leftmargini}
 \setlength  \labelsep  {5\p@}
 \setlength  \labelwidth{\leftmargini}
@@ -333,16 +333,17 @@
 \renewcommand\p@enumii{\theenumi}
 \renewcommand\p@enumiii{\theenumi(\theenumii)}
 \renewcommand\p@enumiv{\p@enumiii\theenumiii}
-\newcommand\labelitemi{\textbullet}
-\newcommand\labelitemii{\normalfont\bfseries \textendash}
-\newcommand\labelitemiii{\textasteriskcentered}
-\newcommand\labelitemiv{\textperiodcentered}
+\newcommand\labelitemi  {\labelitemfont \textbullet}
+\newcommand\labelitemii {\labelitemfont \bfseries \textendash}
+\newcommand\labelitemiii{\labelitemfont \textasteriskcentered}
+\newcommand\labelitemiv {\labelitemfont \textperiodcentered}
+\newcommand\labelitemfont{\normalfont}
 \newenvironment{description}
                {\list{}{\labelwidth\z@ \itemindent-\leftmargin
                         \let\makelabel\descriptionlabel}}
                {\endlist}
-\newcommand*{\descriptionlabel}[1]{\hspace\labelsep
-                                \normalfont\bfseries #1}
+\newcommand*\descriptionlabel[1]{\hspace\labelsep
+                                 \normalfont\bfseries #1}
 \newenvironment{verse}
                {\let\\=\@centercr
                 \list{}{\setlength\itemsep{\z@}%
@@ -384,15 +385,15 @@
   \kern-\p@
   \hrule \@width .4\columnwidth
   \kern .6\p@}
-\long\def\@makefntext#1{%
+\newcommand\@makefntext[1]{%
     \noindent
     \hangindent 5\p@
     \hb@xt@5\p@{\hss\@makefnmark}#1}
-\newcommand*{\ccname}{cc}
-\newcommand*{\enclname}{encl}
-\newcommand*{\pagename}{Page}
-\newcommand*{\headtoname}{To}
-\newcommand*{\today}{\ifcase\month\or
+\newcommand*\ccname{cc}
+\newcommand*\enclname{encl}
+\newcommand*\pagename{Page}
+\newcommand*\headtoname{To}
+\newcommand*\today{\ifcase\month\or
   January\or February\or March\or April\or May\or June\or
   July\or August\or September\or October\or November\or December\fi
   \space\number\day, \number\year}
diff --git a/Master/texmf-dist/tex/latex-dev/base/lppl.tex b/Master/texmf-dist/tex/latex-dev/base/lppl.tex
new file mode 100644
index 00000000000..c2a54c1532d
--- /dev/null
+++ b/Master/texmf-dist/tex/latex-dev/base/lppl.tex
@@ -0,0 +1,511 @@
+%
+% Copyright 1999 2002-2011 LaTeX3 Project
+%    Everyone is allowed to distribute verbatim copies of this
+%    license document, but modification of it is not allowed.
+%
+%
+% If you wish to load it as part of a ``doc'' source, you have to
+% ensure that a) % is a comment character and b) that short verb
+% characters are being turned off, i.e.,
+%
+%   \DeleteShortVerb{\'}   % or whatever was made a shorthand
+%   \MakePercentComment
+%   \input{lppl}
+%   \MakePercentIgnore
+%   \MakeShortVerb{\'}     % turn it on again if necessary
+%
+%
+% By default the license is produced with \section* as the highest
+% heading level. If this is not appropriate for the document in which
+% it is included define the commands listed below before loading this
+% document, e.g., for inclusion as a separate chapter define:
+%
+%  \providecommand{\LPPLsection}{\chapter*}
+%  \providecommand{\LPPLsubsection}{\section*}
+%  \providecommand{\LPPLsubsubsection}{\subsection*}
+%  \providecommand{\LPPLparagraph}{\subsubsection*}
+%
+%
+% To allow cross-referencing the headings \label's have been attached
+% to them, all starting with ``LPPL:''. As by default headings without
+% numbers are produced, this will only allow page references.
+% However, you can use the titleref package to produce textual
+% references or you change the definitions of \LPPLsection, and
+% friends to generated numbered headings.
+%
+%
+% We want it to be possible that this file can be processed by
+% (pdf)LaTeX on its own, or that this file can be included in another
+% LaTeX document without any modification whatsoever.
+% Hence the little test below.
+%
+%
+\makeatletter
+\ifx\@preamblecmds\@notprerr
+  % In this case the preamble has already been processed so this file
+  % is loaded as part of another document; just enclose everything in
+  % a group
+  \let\LPPLicense\bgroup
+  \let\endLPPLicense\egroup
+\else
+  % In this case the preamble has not been processed yet so this file
+  % is processed by itself.
+  \documentclass{article}
+  \let\LPPLicense\document
+  \let\endLPPLicense\enddocument
+\fi
+\makeatother
+
+
+\begin{LPPLicense}
+  \providecommand{\LPPLsection}{\section*}
+  \providecommand{\LPPLsubsection}{\subsection*}
+  \providecommand{\LPPLsubsubsection}{\subsubsection*}
+  \providecommand{\LPPLparagraph}{\paragraph*}
+  \providecommand*{\LPPLfile}[1]{\texttt{#1}}
+  \providecommand*{\LPPLdocfile}[1]{`\LPPLfile{#1.tex}'}
+  \providecommand*{\LPPL}{\textsc{lppl}}
+
+  \LPPLsection{The \LaTeX\ Project Public License}
+  \label{LPPL:LPPL}
+
+  \emph{LPPL Version 1.3c  2008-05-04}
+
+  \textbf{Copyright 1999, 2002--2008 \LaTeX3 Project}
+  \begin{quotation}
+    Everyone is allowed to distribute verbatim copies of this
+    license document, but modification of it is not allowed.
+  \end{quotation}
+
+  \LPPLsubsection{Preamble}
+  \label{LPPL:Preamble}
+
+  The \LaTeX\ Project Public License (\LPPL) is the primary license
+  under which the \LaTeX\ kernel and the base \LaTeX\ packages are
+  distributed.
+
+  You may use this license for any work of which you hold the
+  copyright and which you wish to distribute.  This license may be
+  particularly suitable if your work is \TeX-related (such as a
+  \LaTeX\ package), but it is written in such a way that you can use
+  it even if your work is unrelated to \TeX.
+
+  The section `WHETHER AND HOW TO DISTRIBUTE WORKS UNDER THIS
+  LICENSE', below, gives instructions, examples, and recommendations
+  for authors who are considering distributing their works under this
+  license.
+
+  This license gives conditions under which a work may be distributed
+  and modified, as well as conditions under which modified versions of
+  that work may be distributed.
+
+  We, the \LaTeX3 Project, believe that the conditions below give you
+  the freedom to make and distribute modified versions of your work
+  that conform with whatever technical specifications you wish while
+  maintaining the availability, integrity, and reliability of that
+  work.  If you do not see how to achieve your goal while meeting
+  these conditions, then read the document \LPPLdocfile{cfgguide} and
+  \LPPLdocfile{modguide} in the base \LaTeX\ distribution for suggestions.
+
+
+  \LPPLsubsection{Definitions}
+  \label{LPPL:Definitions}
+
+  In this license document the following terms are used:
+
+  \begin{description}
+  \item[Work] Any work being distributed under this License.
+
+  \item[Derived Work] Any work that under any applicable law is
+    derived from the Work.
+
+  \item[Modification] Any procedure that produces a Derived Work under
+    any applicable law -- for example, the production of a file
+    containing an original file associated with the Work or a
+    significant portion of such a file, either verbatim or with
+    modifications and/or translated into another language.
+
+  \item[Modify] To apply any procedure that produces a Derived Work
+    under any applicable law.
+
+  \item[Distribution] Making copies of the Work available from one
+    person to another, in whole or in part.  Distribution includes
+    (but is not limited to) making any electronic components of the
+    Work accessible by file transfer protocols such as \textsc{ftp} or
+    \textsc{http} or by shared file systems such as Sun's Network File
+    System (\textsc{nfs}).
+
+  \item[Compiled Work] A version of the Work that has been processed
+    into a form where it is directly usable on a computer system.
+    This processing may include using installation facilities provided
+    by the Work, transformations of the Work, copying of components of
+    the Work, or other activities.  Note that modification of any
+    installation facilities provided by the Work constitutes
+    modification of the Work.
+
+  \item[Current Maintainer] A person or persons nominated as such
+    within the Work.  If there is no such explicit nomination then it
+    is the `Copyright Holder' under any applicable law.
+
+  \item[Base Interpreter] A program or process that is normally needed
+    for running or interpreting a part or the whole of the Work.
+
+    A Base Interpreter may depend on external components but these are
+    not considered part of the Base Interpreter provided that each
+    external component clearly identifies itself whenever it is used
+    interactively.  Unless explicitly specified when applying the
+    license to the Work, the only applicable Base Interpreter is a
+    `\LaTeX-Format' or in the case of files belonging to the
+    `\LaTeX-format' a program implementing the `\TeX{} language'.
+  \end{description}
+
+  \LPPLsubsection{Conditions on Distribution and Modification}
+  \label{LPPL:Conditions}
+
+  \begin{enumerate}
+  \item Activities other than distribution and/or modification of the
+    Work are not covered by this license; they are outside its scope.
+    In particular, the act of running the Work is not restricted and
+    no requirements are made concerning any offers of support for the
+    Work.
+
+  \item\label{LPPL:item:distribute} You may distribute a complete, unmodified
+    copy of the Work as you received it.  Distribution of only part of
+    the Work is considered modification of the Work, and no right to
+    distribute such a Derived Work may be assumed under the terms of
+    this clause.
+
+  \item You may distribute a Compiled Work that has been generated
+    from a complete, unmodified copy of the Work as distributed under
+    Clause~\ref{LPPL:item:distribute} above, as long as that Compiled Work is
+    distributed in such a way that the recipients may install the
+    Compiled Work on their system exactly as it would have been
+    installed if they generated a Compiled Work directly from the
+    Work.
+
+  \item\label{LPPL:item:currmaint} If you are the Current Maintainer of the
+    Work, you may, without restriction, modify the Work, thus creating
+    a Derived Work.  You may also distribute the Derived Work without
+    restriction, including Compiled Works generated from the Derived
+    Work.  Derived Works distributed in this manner by the Current
+    Maintainer are considered to be updated versions of the Work.
+
+  \item If you are not the Current Maintainer of the Work, you may
+    modify your copy of the Work, thus creating a Derived Work based
+    on the Work, and compile this Derived Work, thus creating a
+    Compiled Work based on the Derived Work.
+
+  \item\label{LPPL:item:conditions} If you are not the Current Maintainer
+    of the
+    Work, you may distribute a Derived Work provided the following
+    conditions are met for every component of the Work unless that
+    component clearly states in the copyright notice that it is exempt
+    from that condition.  Only the Current Maintainer is allowed to
+    add such statements of exemption to a component of the Work.
+    \begin{enumerate}
+    \item If a component of this Derived Work can be a direct
+      replacement for a component of the Work when that component is
+      used with the Base Interpreter, then, wherever this component of
+      the Work identifies itself to the user when used interactively
+      with that Base Interpreter, the replacement component of this
+      Derived Work clearly and unambiguously identifies itself as a
+      modified version of this component to the user when used
+      interactively with that Base Interpreter.
+
+    \item\label{LPPL:item:changelog} Every component of the Derived Work
+      contains prominent
+      notices detailing the nature of the changes to that component,
+      or a prominent reference to another file that is distributed as
+      part of the Derived Work and that contains a complete and
+      accurate log of the changes.
+
+    \item No information in the Derived Work implies that any persons,
+      including (but not limited to) the authors of the original
+      version of the Work, provide any support, including (but not
+      limited to) the reporting and handling of errors, to recipients
+      of the Derived Work unless those persons have stated explicitly
+      that they do provide such support for the Derived Work.
+
+    \item\label{LPPL:item:unmodifiedcopy} You distribute at least one of
+      the following with the Derived Work:
+      \begin{enumerate}
+      \item A complete, unmodified copy of the Work; if your
+        distribution of a modified component is made by offering
+        access to copy the modified component from a designated place,
+        then offering equivalent access to copy the Work from the same
+        or some similar place meets this condition, even though third
+        parties are not compelled to copy the Work along with the
+        modified component;
+
+      \item Information that is sufficient to obtain a complete,
+        unmodified copy of the Work.
+      \end{enumerate}
+    \end{enumerate}
+  \item If you are not the Current Maintainer of the Work, you may
+    distribute a Compiled Work generated from a Derived Work, as long
+    as the Derived Work is distributed to all recipients of the
+    Compiled Work, and as long as the conditions of
+    Clause~\ref{LPPL:item:conditions}, above, are met with regard to the
+    Derived Work.
+
+  \item The conditions above are not intended to prohibit, and hence
+    do not apply to, the modification, by any method, of any component
+    so that it becomes identical to an updated version of that
+    component of the Work as it is distributed by the Current
+    Maintainer under Clause~\ref{LPPL:item:currmaint}, above.
+
+  \item Distribution of the Work or any Derived Work in an alternative
+    format, where the Work or that Derived Work (in whole or in part)
+    is then produced by applying some process to that format, does not
+    relax or nullify any sections of this license as they pertain to
+    the results of applying that process.
+
+  \item
+    \begin{enumerate}
+    \item A Derived Work may be distributed under a different license
+      provided that license itself honors the conditions listed in
+      Clause~\ref{LPPL:item:conditions} above, in regard to the Work, though it
+      does not have to honor the rest of the conditions in this
+      license.
+
+    \item If a Derived Work is distributed under a different license,
+      that Derived Work must provide sufficient documentation as part
+      of itself to allow each recipient of that Derived Work to honor
+      the restrictions in Clause~\ref{LPPL:item:conditions} above, concerning
+      changes from the Work.
+    \end{enumerate}
+  \item This license places no restrictions on works that are
+    unrelated to the Work, nor does this license place any
+    restrictions on aggregating such works with the Work by any means.
+
+  \item Nothing in this license is intended to, or may be used to,
+    prevent complete compliance by all parties with all applicable
+    laws.
+  \end{enumerate}
+
+  \LPPLsubsection{No Warranty}
+  \label{LPPL:Warranty}
+
+  There is no warranty for the Work.  Except when otherwise stated in
+  writing, the Copyright Holder provides the Work `as is', without
+  warranty of any kind, either expressed or implied, including, but
+  not limited to, the implied warranties of merchantability and
+  fitness for a particular purpose.  The entire risk as to the quality
+  and performance of the Work is with you.  Should the Work prove
+  defective, you assume the cost of all necessary servicing, repair,
+  or correction.
+
+  In no event unless required by applicable law or agreed to in
+  writing will The Copyright Holder, or any author named in the
+  components of the Work, or any other party who may distribute and/or
+  modify the Work as permitted above, be liable to you for damages,
+  including any general, special, incidental or consequential damages
+  arising out of any use of the Work or out of inability to use the
+  Work (including, but not limited to, loss of data, data being
+  rendered inaccurate, or losses sustained by anyone as a result of
+  any failure of the Work to operate with any other programs), even if
+  the Copyright Holder or said author or said other party has been
+  advised of the possibility of such damages.
+
+  \LPPLsubsection{Maintenance of The Work}
+  \label{LPPL:Maintenance}
+
+  The Work has the status `author-maintained' if the Copyright Holder
+  explicitly and prominently states near the primary copyright notice
+  in the Work that the Work can only be maintained by the Copyright
+  Holder or simply that it is `author-maintained'.
+
+  The Work has the status `maintained' if there is a Current
+  Maintainer who has indicated in the Work that they are willing to
+  receive error reports for the Work (for example, by supplying a
+  valid e-mail address). It is not required for the Current Maintainer
+  to acknowledge or act upon these error reports.
+
+  The Work changes from status `maintained' to `unmaintained' if there
+  is no Current Maintainer, or the person stated to be Current
+  Maintainer of the work cannot be reached through the indicated means
+  of communication for a period of six months, and there are no other
+  significant signs of active maintenance.
+
+  You can become the Current Maintainer of the Work by agreement with
+  any existing Current Maintainer to take over this role.
+
+  If the Work is unmaintained, you can become the Current Maintainer
+  of the Work through the following steps:
+  \begin{enumerate}
+  \item Make a reasonable attempt to trace the Current Maintainer (and
+    the Copyright Holder, if the two differ) through the means of an
+    Internet or similar search.
+  \item If this search is successful, then enquire whether the Work is
+    still maintained.
+    \begin{enumerate}
+    \item If it is being maintained, then ask the Current Maintainer
+      to update their communication data within one month.
+
+    \item\label{LPPL:item:intention} If the search is unsuccessful or
+      no action to resume active maintenance is taken by the Current
+      Maintainer, then announce within the pertinent community your
+      intention to take over maintenance.  (If the Work is a \LaTeX{}
+      work, this could be done, for example, by posting to
+      \texttt{comp.text.tex}.)
+    \end{enumerate}
+  \item {}
+    \begin{enumerate}
+    \item If the Current Maintainer is reachable and agrees to pass
+      maintenance of the Work to you, then this takes effect
+      immediately upon announcement.
+
+    \item\label{LPPL:item:announce} If the Current Maintainer is not
+      reachable and the Copyright Holder agrees that maintenance of
+      the Work be passed to you, then this takes effect immediately
+      upon announcement.
+    \end{enumerate}
+  \item\label{LPPL:item:change} If you make an `intention
+    announcement' as described in~\ref{LPPL:item:intention} above and
+    after three months your intention is challenged neither by the
+    Current Maintainer nor by the Copyright Holder nor by other
+    people, then you may arrange for the Work to be changed so as to
+    name you as the (new) Current Maintainer.
+
+  \item If the previously unreachable Current Maintainer becomes
+    reachable once more within three months of a change completed
+    under the terms of~\ref{LPPL:item:announce}
+    or~\ref{LPPL:item:change}, then that Current Maintainer must
+    become or remain the Current Maintainer upon request provided they
+    then update their communication data within one month.
+  \end{enumerate}
+  A change in the Current Maintainer does not, of itself, alter the
+  fact that the Work is distributed under the \LPPL\ license.
+
+  If you become the Current Maintainer of the Work, you should
+  immediately provide, within the Work, a prominent and unambiguous
+  statement of your status as Current Maintainer.  You should also
+  announce your new status to the same pertinent community as
+  in~\ref{LPPL:item:intention} above.
+
+  \LPPLsubsection{Whether and How to Distribute Works under This License}
+  \label{LPPL:Distribute}
+
+  This section contains important instructions, examples, and
+  recommendations for authors who are considering distributing their
+  works under this license.  These authors are addressed as `you' in
+  this section.
+
+  \LPPLsubsubsection{Choosing This License or Another License}
+  \label{LPPL:Choosing}
+
+  If for any part of your work you want or need to use
+  \emph{distribution} conditions that differ significantly from those
+  in this license, then do not refer to this license anywhere in your
+  work but, instead, distribute your work under a different license.
+  You may use the text of this license as a model for your own
+  license, but your license should not refer to the \LPPL\ or
+  otherwise give the impression that your work is distributed under
+  the \LPPL.
+
+  The document \LPPLdocfile{modguide} in the base \LaTeX\ distribution
+  explains the motivation behind the conditions of this license.  It
+  explains, for example, why distributing \LaTeX\ under the
+  \textsc{gnu} General Public License (\textsc{gpl}) was considered
+  inappropriate.  Even if your work is unrelated to \LaTeX, the
+  discussion in \LPPLdocfile{modguide} may still be relevant, and authors
+  intending to distribute their works under any license are encouraged
+  to read it.
+
+  \LPPLsubsubsection{A Recommendation on Modification Without Distribution}
+  \label{LPPL:WithoutDistribution}
+
+  It is wise never to modify a component of the Work, even for your
+  own personal use, without also meeting the above conditions for
+  distributing the modified component.  While you might intend that
+  such modifications will never be distributed, often this will happen
+  by accident -- you may forget that you have modified that component;
+  or it may not occur to you when allowing others to access the
+  modified version that you are thus distributing it and violating the
+  conditions of this license in ways that could have legal
+  implications and, worse, cause problems for the community.  It is
+  therefore usually in your best interest to keep your copy of the
+  Work identical with the public one.  Many works provide ways to
+  control the behavior of that work without altering any of its
+  licensed components.
+
+  \LPPLsubsubsection{How to Use This License}
+  \label{LPPL:HowTo}
+
+  To use this license, place in each of the components of your work
+  both an explicit copyright notice including your name and the year
+  the work was authored and/or last substantially modified.  Include
+  also a statement that the distribution and/or modification of that
+  component is constrained by the conditions in this license.
+
+  Here is an example of such a notice and statement:
+\begin{verbatim}
+  %% pig.dtx
+  %% Copyright 2005 M. Y. Name
+  %
+  % This work may be distributed and/or modified under the
+  % conditions of the LaTeX Project Public License, either version 1.3
+  % of this license or (at your option) any later version.
+  % The latest version of this license is in
+  %   https://www.latex-project.org/lppl.txt
+  % and version 1.3 or later is part of all distributions of LaTeX
+  % version 2005/12/01 or later.
+  %
+  % This work has the LPPL maintenance status `maintained'.
+  %
+  % The Current Maintainer of this work is M. Y. Name.
+  %
+  % This work consists of the files pig.dtx and pig.ins
+  % and the derived file pig.sty.
+\end{verbatim}
+
+  Given such a notice and statement in a file, the conditions given in
+  this license document would apply, with the `Work' referring to the
+  three files `\LPPLfile{pig.dtx}', `\LPPLfile{pig.ins}', and
+  `\LPPLfile{pig.sty}' (the last being generated from
+  `\LPPLfile{pig.dtx}' using `\LPPLfile{pig.ins}'), the `Base
+  Interpreter' referring to any `\LaTeX-Format', and both `Copyright
+  Holder' and `Current Maintainer' referring to the person `M. Y.
+  Name'.
+
+  If you do not want the Maintenance section of \LPPL\ to apply to
+  your Work, change `maintained' above into `author-maintained'.
+  However, we recommend that you use `maintained' as the Maintenance
+  section was added in order to ensure that your Work remains useful
+  to the community even when you can no longer maintain and support it
+  yourself.
+
+  \LPPLsubsubsection{Derived Works That Are Not Replacements}
+  \label{LPPL:NotReplacements}
+
+  Several clauses of the \LPPL\ specify means to provide reliability
+  and stability for the user community. They therefore concern
+  themselves with the case that a Derived Work is intended to be used
+  as a (compatible or incompatible) replacement of the original
+  Work. If this is not the case (e.g., if a few lines of code are
+  reused for a completely different task), then clauses
+  \ref{LPPL:item:changelog} and \ref{LPPL:item:unmodifiedcopy}
+  shall not apply.
+
+  \LPPLsubsubsection{Important Recommendations}
+  \label{LPPL:Recommendations}
+
+  \LPPLparagraph{Defining What Constitutes the Work}
+
+  The \LPPL\ requires that distributions of the Work contain all the
+  files of the Work.  It is therefore important that you provide a way
+  for the licensee to determine which files constitute the Work.  This
+  could, for example, be achieved by explicitly listing all the files
+  of the Work near the copyright notice of each file or by using a
+  line such as:
+\begin{verbatim}
+    % This work consists of all files listed in manifest.txt.
+\end{verbatim}
+  in that place.  In the absence of an unequivocal list it might be
+  impossible for the licensee to determine what is considered by you
+  to comprise the Work and, in such a case, the licensee would be
+  entitled to make reasonable conjectures as to which files comprise
+  the Work.
+
+\end{LPPLicense}
+\endinput
diff --git a/Master/texmf-dist/tex/latex-dev/base/ltexpl.ltx b/Master/texmf-dist/tex/latex-dev/base/ltexpl.ltx
index 10d06c1f529..b0e023f3337 100644
--- a/Master/texmf-dist/tex/latex-dev/base/ltexpl.ltx
+++ b/Master/texmf-dist/tex/latex-dev/base/ltexpl.ltx
@@ -72,6 +72,9 @@
 \else
   \GenericInfo{}{Skipping: expl3 code already part of the format}
 \fi
+\ExplSyntaxOn
+\cs_new_eq:NN \@expl@tl@trim@spaces@apply@@nN \tl_trim_spaces_apply:nN
+\ExplSyntaxOff
 \endinput
 %%
 %% End of file `ltexpl.ltx'.
diff --git a/Master/texmf-dist/tex/latex-dev/base/ltluatex.lua b/Master/texmf-dist/tex/latex-dev/base/ltluatex.lua
index 96a507047c3..93138cc8a17 100644
--- a/Master/texmf-dist/tex/latex-dev/base/ltluatex.lua
+++ b/Master/texmf-dist/tex/latex-dev/base/ltluatex.lua
@@ -545,7 +545,9 @@ local function remove_from_callback(name, description)
   )
   if #l == 0 then
     callbacklist[name] = nil
-    callback_register(name, nil)
+    if user_callbacks_defaults[name] == nil then
+      callback_register(name, nil)
+    end
   end
   return cb.func,cb.description
 end
diff --git a/Master/texmf-dist/tex/latex-dev/base/ltluatex.tex b/Master/texmf-dist/tex/latex-dev/base/ltluatex.tex
index 73b3528e674..2930f1876e6 100644
--- a/Master/texmf-dist/tex/latex-dev/base/ltluatex.tex
+++ b/Master/texmf-dist/tex/latex-dev/base/ltluatex.tex
@@ -47,7 +47,7 @@
   #1#2[#3]{\endgroup\immediate\write-1{File: #1 #3}}
 \fi
 \ProvidesFile{ltluatex.tex}
-[2020/02/02 v1.1l
+[2020/03/07 v1.1m
   LuaTeX support for plain TeX (core)
 ]
 \edef\etatcatcode{\the\catcode`\@}
diff --git a/Master/texmf-dist/tex/latex-dev/base/macce.def b/Master/texmf-dist/tex/latex-dev/base/macce.def
index 9d769f7f2fa..4ec47fa44fa 100644
--- a/Master/texmf-dist/tex/latex-dev/base/macce.def
+++ b/Master/texmf-dist/tex/latex-dev/base/macce.def
@@ -44,7 +44,7 @@
 
 
   \ProvidesFile{macce.def}
-   [2018/08/11 v1.3c Input encoding file]
+   [2020/04/14 v1.3c Input encoding file]
 \ProvideTextCommandDefault{\textdegree}{\ensuremath{{^\circ}}}
 \ProvideTextCommandDefault{\textdiv}
    {\TextSymbolUnavailable\textdiv}
diff --git a/Master/texmf-dist/tex/latex-dev/base/next.def b/Master/texmf-dist/tex/latex-dev/base/next.def
index 3ccc2d137d6..076c516a7ef 100644
--- a/Master/texmf-dist/tex/latex-dev/base/next.def
+++ b/Master/texmf-dist/tex/latex-dev/base/next.def
@@ -44,7 +44,7 @@
 
 
   \ProvidesFile{next.def}
-   [2018/08/11 v1.3c Input encoding file]
+   [2020/04/14 v1.3c Input encoding file]
 \ProvideTextCommandDefault{\textdegree}{\ensuremath{{^\circ}}}
 \ProvideTextCommandDefault{\textonehalf}{\ensuremath{\frac12}}
 \ProvideTextCommandDefault{\textonequarter}{\ensuremath{\frac14}}
diff --git a/Master/texmf-dist/tex/latex-dev/base/omlenc.def b/Master/texmf-dist/tex/latex-dev/base/omlenc.def
index 266f9c9eb5b..765daa54137 100644
--- a/Master/texmf-dist/tex/latex-dev/base/omlenc.def
+++ b/Master/texmf-dist/tex/latex-dev/base/omlenc.def
@@ -43,7 +43,7 @@
 %% extension .ins) which are part of the distribution.
 %%% From File: ltoutenc.dtx
 \ProvidesFile{omlenc.def}
- [2020/02/11 v2.0o
+ [2020/04/22 v2.0p
       Standard LaTeX file]
 \DeclareFontEncoding{OML}{}{}
 \DeclareTextSymbol{\textless}{OML}{`\<}
diff --git a/Master/texmf-dist/tex/latex-dev/base/omsenc.def b/Master/texmf-dist/tex/latex-dev/base/omsenc.def
index b62514c1d3c..bdac7f76c57 100644
--- a/Master/texmf-dist/tex/latex-dev/base/omsenc.def
+++ b/Master/texmf-dist/tex/latex-dev/base/omsenc.def
@@ -43,7 +43,7 @@
 %% extension .ins) which are part of the distribution.
 %%% From File: ltoutenc.dtx
 \ProvidesFile{omsenc.def}
- [2020/02/11 v2.0o
+ [2020/04/22 v2.0p
       Standard LaTeX file]
 \DeclareFontEncoding{OMS}{}{}
 \DeclareTextSymbol{\textasteriskcentered}{OMS}{3}   % "03
diff --git a/Master/texmf-dist/tex/latex-dev/base/ot1enc.def b/Master/texmf-dist/tex/latex-dev/base/ot1enc.def
index 087bb545493..7a2bccd2711 100644
--- a/Master/texmf-dist/tex/latex-dev/base/ot1enc.def
+++ b/Master/texmf-dist/tex/latex-dev/base/ot1enc.def
@@ -43,7 +43,7 @@
 %% extension .ins) which are part of the distribution.
 %%% From File: ltoutenc.dtx
 \ProvidesFile{ot1enc.def}
- [2020/02/11 v2.0o
+ [2020/04/22 v2.0p
       Standard LaTeX file]
 \DeclareFontEncoding{OT1}{}{}
 \DeclareTextAccent{\"}{OT1}{127}
diff --git a/Master/texmf-dist/tex/latex-dev/base/ot4enc.def b/Master/texmf-dist/tex/latex-dev/base/ot4enc.def
index 4ee0bd0bc9c..f46bb97fbb9 100644
--- a/Master/texmf-dist/tex/latex-dev/base/ot4enc.def
+++ b/Master/texmf-dist/tex/latex-dev/base/ot4enc.def
@@ -43,7 +43,7 @@
 %% extension .ins) which are part of the distribution.
 %%% From File: ltoutenc.dtx
 \ProvidesFile{ot4enc.def}
- [2020/02/11 v2.0o
+ [2020/04/22 v2.0p
       Standard LaTeX file]
 \DeclareFontEncoding{OT4}{}{}
 \DeclareFontSubstitution{OT4}{cmr}{m}{n}
diff --git a/Master/texmf-dist/tex/latex-dev/base/preload.cfg b/Master/texmf-dist/tex/latex-dev/base/preload.cfg
index 02d8cb532ef..f90763b3e7d 100644
--- a/Master/texmf-dist/tex/latex-dev/base/preload.cfg
+++ b/Master/texmf-dist/tex/latex-dev/base/preload.cfg
@@ -37,7 +37,7 @@
 %% 
 %%% From File: fontdef.dtx
 \ProvidesFile{preload.cfg}
-           [2020/02/11 v3.0g LaTeX Kernel
+           [2020/04/24 v3.0h LaTeX Kernel
 (Uncustomised preload
            font setup)]
 %%
diff --git a/Master/texmf-dist/tex/latex-dev/base/report.cls b/Master/texmf-dist/tex/latex-dev/base/report.cls
index 40280cb9cdb..498b9b1fbdc 100644
--- a/Master/texmf-dist/tex/latex-dev/base/report.cls
+++ b/Master/texmf-dist/tex/latex-dev/base/report.cls
@@ -43,7 +43,7 @@
 %% extension .ins) which are part of the distribution.
 \NeedsTeXFormat{LaTeX2e}[1995/12/01]
 \ProvidesClass{report}
-              [2019/12/20 v1.4l
+              [2020/04/10 v1.4m
  Standard LaTeX document class]
 \newcommand\@ptsize{}
 \newif\if@restonecol
@@ -51,47 +51,47 @@
 \@titlepagetrue
 \newif\if@openright
 \if@compatibility\else
-\DeclareOption{a4paper}
-   {\setlength\paperheight {297mm}%
-    \setlength\paperwidth  {210mm}}
-\DeclareOption{a5paper}
-   {\setlength\paperheight {210mm}%
-    \setlength\paperwidth  {148mm}}
-\DeclareOption{b5paper}
-   {\setlength\paperheight {250mm}%
-    \setlength\paperwidth  {176mm}}
-\DeclareOption{letterpaper}
-   {\setlength\paperheight {11in}%
-    \setlength\paperwidth  {8.5in}}
-\DeclareOption{legalpaper}
-   {\setlength\paperheight {14in}%
-    \setlength\paperwidth  {8.5in}}
-\DeclareOption{executivepaper}
-   {\setlength\paperheight {10.5in}%
-    \setlength\paperwidth  {7.25in}}
-\DeclareOption{landscape}
-   {\setlength\@tempdima   {\paperheight}%
-    \setlength\paperheight {\paperwidth}%
-    \setlength\paperwidth  {\@tempdima}}
+  \DeclareOption{a4paper}
+     {\setlength\paperheight {297mm}%
+      \setlength\paperwidth  {210mm}}
+  \DeclareOption{a5paper}
+     {\setlength\paperheight {210mm}%
+      \setlength\paperwidth  {148mm}}
+  \DeclareOption{b5paper}
+     {\setlength\paperheight {250mm}%
+      \setlength\paperwidth  {176mm}}
+  \DeclareOption{letterpaper}
+     {\setlength\paperheight {11in}%
+      \setlength\paperwidth  {8.5in}}
+  \DeclareOption{legalpaper}
+     {\setlength\paperheight {14in}%
+      \setlength\paperwidth  {8.5in}}
+  \DeclareOption{executivepaper}
+     {\setlength\paperheight {10.5in}%
+      \setlength\paperwidth  {7.25in}}
+  \DeclareOption{landscape}
+     {\setlength\@tempdima   {\paperheight}%
+      \setlength\paperheight {\paperwidth}%
+      \setlength\paperwidth  {\@tempdima}}
 \fi
 \if@compatibility
   \renewcommand\@ptsize{0}
 \else
-\DeclareOption{10pt}{\renewcommand\@ptsize{0}}
+  \DeclareOption{10pt}{\renewcommand\@ptsize{0}}
 \fi
 \DeclareOption{11pt}{\renewcommand\@ptsize{1}}
 \DeclareOption{12pt}{\renewcommand\@ptsize{2}}
 \if@compatibility\else
-\DeclareOption{oneside}{\@twosidefalse \@mparswitchfalse}
+  \DeclareOption{oneside}{\@twosidefalse \@mparswitchfalse}
 \fi
 \DeclareOption{twoside}{\@twosidetrue  \@mparswitchtrue}
 \DeclareOption{draft}{\setlength\overfullrule{5pt}}
 \if@compatibility\else
-\DeclareOption{final}{\setlength\overfullrule{0pt}}
+  \DeclareOption{final}{\setlength\overfullrule{0pt}}
 \fi
 \DeclareOption{titlepage}{\@titlepagetrue}
 \if@compatibility\else
-\DeclareOption{notitlepage}{\@titlepagefalse}
+  \DeclareOption{notitlepage}{\@titlepagefalse}
 \fi
 \if@compatibility
 \else
@@ -99,20 +99,20 @@
 \DeclareOption{openany}{\@openrightfalse}
 \fi
 \if@compatibility\else
-\DeclareOption{onecolumn}{\@twocolumnfalse}
+  \DeclareOption{onecolumn}{\@twocolumnfalse}
 \fi
 \DeclareOption{twocolumn}{\@twocolumntrue}
 \DeclareOption{leqno}{\input{leqno.clo}}
 \DeclareOption{fleqn}{\input{fleqn.clo}}
 \DeclareOption{openbib}{%
   \AtEndOfPackage{%
-   \renewcommand\@openbib@code{%
+    \renewcommand\@openbib@code{%
       \advance\leftmargin\bibindent
       \itemindent -\bibindent
       \listparindent \itemindent
       \parsep \z@
       }%
-   \renewcommand\newblock{\par}}%
+    \renewcommand\newblock{\par}}%
 }
 \ExecuteOptions{letterpaper,10pt,oneside,onecolumn,final,openany}
 \ProcessOptions
@@ -172,7 +172,7 @@
     \let\chaptermark\@gobble
     \let\sectionmark\@gobble
     }
-  \if@titlepage
+\if@titlepage
   \newcommand\maketitle{\begin{titlepage}%
   \let\footnotesize\small
   \let\footnoterule\relax
@@ -204,41 +204,41 @@
   \global\let\author\relax
   \global\let\date\relax
   \global\let\and\relax
-}
+  }
 \else
-\newcommand\maketitle{\par
-  \begingroup
-    \renewcommand\thefootnote{\@fnsymbol\c@footnote}%
-    \def\@makefnmark{\rlap{\@textsuperscript{\normalfont\@thefnmark}}}%
-    \long\def\@makefntext##1{\parindent 1em\noindent
-            \hb@xt@1.8em{%
+  \newcommand\maketitle{\par
+    \begingroup
+      \renewcommand\thefootnote{\@fnsymbol\c@footnote}%
+      \def\@makefnmark{\rlap{\@textsuperscript{\normalfont\@thefnmark}}}%
+      \long\def\@makefntext##1{\parindent 1em\noindent
+              \hb@xt@1.8em{%
                 \hss\@textsuperscript{\normalfont\@thefnmark}}##1}%
-    \if@twocolumn
-      \ifnum \col@number=\@ne
-        \@maketitle
+      \if@twocolumn
+        \ifnum \col@number=\@ne
+          \@maketitle
+        \else
+          \twocolumn[\@maketitle]%
+        \fi
       \else
-        \twocolumn[\@maketitle]%
-      \fi
-    \else
       \newpage
-      \global\@topnum\z@   % Prevents figures from going at top of page.
-      \@maketitle
-    \fi
-    \thispagestyle{plain}\@thanks
-  \endgroup
-  \setcounter{footnote}{0}%
-  \global\let\thanks\relax
-  \global\let\maketitle\relax
-  \global\let\@maketitle\relax
-  \global\let\@thanks\@empty
-  \global\let\@author\@empty
-  \global\let\@date\@empty
-  \global\let\@title\@empty
-  \global\let\title\relax
-  \global\let\author\relax
-  \global\let\date\relax
-  \global\let\and\relax
-}
+        \global\@topnum\z@   % Prevents figures from going at top of page.
+        \@maketitle
+      \fi
+      \thispagestyle{plain}\@thanks
+    \endgroup
+    \setcounter{footnote}{0}%
+    \global\let\thanks\relax
+    \global\let\maketitle\relax
+    \global\let\@maketitle\relax
+    \global\let\@thanks\@empty
+    \global\let\@author\@empty
+    \global\let\@date\@empty
+    \global\let\@title\@empty
+    \global\let\title\relax
+    \global\let\author\relax
+    \global\let\date\relax
+    \global\let\and\relax
+  }
 \def\@maketitle{%
   \newpage
   \null
@@ -482,7 +482,7 @@
                 \item\relax}
                {\endlist}
 \if@compatibility
-\newenvironment{titlepage}
+  \newenvironment{titlepage}
     {%
       \if@twocolumn
         \@restonecoltrue\onecolumn
@@ -495,7 +495,7 @@
     {\if@restonecol\twocolumn \else \newpage \fi
     }
 \else
-\newenvironment{titlepage}
+  \newenvironment{titlepage}
     {%
       \if@twocolumn
         \@restonecoltrue\onecolumn
diff --git a/Master/texmf-dist/tex/latex-dev/base/size10.clo b/Master/texmf-dist/tex/latex-dev/base/size10.clo
index eb31188c880..4eb2ebde0ab 100644
--- a/Master/texmf-dist/tex/latex-dev/base/size10.clo
+++ b/Master/texmf-dist/tex/latex-dev/base/size10.clo
@@ -42,7 +42,7 @@
 %% and covered by LPPL is defined by the unpacking scripts (with
 %% extension .ins) which are part of the distribution.
 \ProvidesFile{size10.clo}
-              [2019/12/20 v1.4l
+              [2020/04/10 v1.4m
       Standard LaTeX file (size option)]
 \renewcommand\normalsize{%
    \@setfontsize\normalsize\@xpt\@xiipt
@@ -97,7 +97,7 @@
 \setlength\topskip   {10\p@}
 \setlength\footskip{30\p@}
 \if@compatibility \setlength\maxdepth{4\p@} \else
-\setlength\maxdepth{.5\topskip} \fi
+  \setlength\maxdepth{.5\topskip} \fi
 \if@compatibility
   \if@twocolumn
     \setlength\textwidth{410\p@}
@@ -137,7 +137,7 @@
 \fi
 \addtolength\textheight{\topskip}
 \if@twocolumn
- \setlength\marginparsep {10\p@}
+  \setlength\marginparsep {10\p@}
 \else
   \setlength\marginparsep{11\p@}
 \fi
diff --git a/Master/texmf-dist/tex/latex-dev/base/size11.clo b/Master/texmf-dist/tex/latex-dev/base/size11.clo
index f1f8a2235d9..ee39dc8b448 100644
--- a/Master/texmf-dist/tex/latex-dev/base/size11.clo
+++ b/Master/texmf-dist/tex/latex-dev/base/size11.clo
@@ -42,7 +42,7 @@
 %% and covered by LPPL is defined by the unpacking scripts (with
 %% extension .ins) which are part of the distribution.
 \ProvidesFile{size11.clo}
-              [2019/12/20 v1.4l
+              [2020/04/10 v1.4m
       Standard LaTeX file (size option)]
 \renewcommand\normalsize{%
    \@setfontsize\normalsize\@xipt{13.6}%
@@ -97,7 +97,7 @@
 \setlength\topskip   {11\p@}
 \setlength\footskip{30\p@}
 \if@compatibility \setlength\maxdepth{4\p@} \else
-\setlength\maxdepth{.5\topskip} \fi
+  \setlength\maxdepth{.5\topskip} \fi
 \if@compatibility
   \if@twocolumn
     \setlength\textwidth{410\p@}
@@ -137,7 +137,7 @@
 \fi
 \addtolength\textheight{\topskip}
 \if@twocolumn
- \setlength\marginparsep {10\p@}
+  \setlength\marginparsep {10\p@}
 \else
   \setlength\marginparsep{10\p@}
 \fi
diff --git a/Master/texmf-dist/tex/latex-dev/base/size12.clo b/Master/texmf-dist/tex/latex-dev/base/size12.clo
index 559db07e04f..9767c339fdc 100644
--- a/Master/texmf-dist/tex/latex-dev/base/size12.clo
+++ b/Master/texmf-dist/tex/latex-dev/base/size12.clo
@@ -42,7 +42,7 @@
 %% and covered by LPPL is defined by the unpacking scripts (with
 %% extension .ins) which are part of the distribution.
 \ProvidesFile{size12.clo}
-              [2019/12/20 v1.4l
+              [2020/04/10 v1.4m
       Standard LaTeX file (size option)]
 \renewcommand\normalsize{%
    \@setfontsize\normalsize\@xiipt{14.5}%
@@ -97,7 +97,7 @@
 \setlength\topskip   {12\p@}
 \setlength\footskip{30\p@}
 \if@compatibility \setlength\maxdepth{4\p@} \else
-\setlength\maxdepth{.5\topskip} \fi
+  \setlength\maxdepth{.5\topskip} \fi
 \if@compatibility
   \if@twocolumn
     \setlength\textwidth{410\p@}
@@ -137,7 +137,7 @@
 \fi
 \addtolength\textheight{\topskip}
 \if@twocolumn
- \setlength\marginparsep {10\p@}
+  \setlength\marginparsep {10\p@}
 \else
   \setlength\marginparsep{10\p@}
 \fi
diff --git a/Master/texmf-dist/tex/latex-dev/base/t1enc.def b/Master/texmf-dist/tex/latex-dev/base/t1enc.def
index 0a983d455ca..7ec2d48d443 100644
--- a/Master/texmf-dist/tex/latex-dev/base/t1enc.def
+++ b/Master/texmf-dist/tex/latex-dev/base/t1enc.def
@@ -43,7 +43,7 @@
 %% extension .ins) which are part of the distribution.
 %%% From File: ltoutenc.dtx
 \ProvidesFile{t1enc.def}
- [2020/02/11 v2.0o
+ [2020/04/22 v2.0p
       Standard LaTeX file]
 \DeclareFontEncoding{T1}{}{}
 \DeclareTextAccent{\`}{T1}{0}
diff --git a/Master/texmf-dist/tex/latex-dev/base/tuenc.def b/Master/texmf-dist/tex/latex-dev/base/tuenc.def
index 88093dba94a..7305cc90dca 100644
--- a/Master/texmf-dist/tex/latex-dev/base/tuenc.def
+++ b/Master/texmf-dist/tex/latex-dev/base/tuenc.def
@@ -43,7 +43,7 @@
 %% extension .ins) which are part of the distribution.
 %%% From File: ltoutenc.dtx
 \ProvidesFile{tuenc.def}
- [2020/02/11 v2.0o
+ [2020/04/22 v2.0p
       Standard LaTeX file]
 \providecommand\UnicodeEncodingName{TU}
 \begingroup\expandafter\expandafter\expandafter\endgroup
@@ -475,7 +475,7 @@
 \DeclareUnicodeComposite{\textcommabelow}{T}{"021A}
 \DeclareUnicodeComposite{\textcommabelow}{t}{"021B}
 \DeclareUnicodeComposite{\=}             {Y}{"0232}
-\DeclareUnicodeComposite{\=}             {y}{"0232}
+\DeclareUnicodeComposite{\=}             {y}{"0233}
 \DeclareUnicodeComposite{\.}             {B}{"1E02}
 \DeclareUnicodeComposite{\.}             {b}{"1E03}
 \DeclareUnicodeComposite{\d}             {B}{"1E04}
diff --git a/Master/texmf-dist/tex/latex-dev/graphics/color.sty b/Master/texmf-dist/tex/latex-dev/graphics/color.sty
index 7973f8428ff..0f0b974689a 100644
--- a/Master/texmf-dist/tex/latex-dev/graphics/color.sty
+++ b/Master/texmf-dist/tex/latex-dev/graphics/color.sty
@@ -23,7 +23,7 @@
 %%
 \NeedsTeXFormat{LaTeX2e}[1995/12/01]
 \ProvidesPackage{color}
-          [2019/11/23 v1.2a Standard LaTeX Color (DPC)]
+          [2020/02/24 v1.2b Standard LaTeX Color (DPC)]
 \edef\Gin@codes{%
  \catcode`\noexpand\^^A\the\catcode`\^^A\relax
  \catcode`\noexpand\"\the\catcode`\"\relax
@@ -124,7 +124,7 @@
     {\c@lor@error{model `#1'}}%
     {\@ifundefined{color@#3}%
       {\c@lor@error{model `#3'}}%
-      {\@ifundefined{c@lor@#1@#2}{}%
+      {\@ifundefined{col@#2}{}%
         {\PackageInfo{color}{Redefining color #2 in named color model}}%
       \csname color@#3\endcsname\@tempa{#4}%
       \csname define@color@#1\endcsname{#2}\@tempa
diff --git a/Master/texmf-dist/tex/latex-dev/tools/.tex b/Master/texmf-dist/tex/latex-dev/tools/.tex
new file mode 100644
index 00000000000..7c09a5d9a99
--- /dev/null
+++ b/Master/texmf-dist/tex/latex-dev/tools/.tex
@@ -0,0 +1,41 @@
+%%
+%% This is file `.tex',
+%% generated with the docstrip utility.
+%%
+%% The original source files were:
+%%
+%% fileerr.dtx  (with options: `return')
+%% 
+%% This is a generated file.
+%% 
+%% 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-2020
+%% The LaTeX3 Project and any individual authors listed elsewhere
+%% in this file.
+%% 
+%% This file was generated from file(s) 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
+%% version 2005/12/01 or later.
+%% 
+%% This file may only be distributed together with a copy of the LaTeX
+%% `Tools Bundle'. You may however distribute the LaTeX `Tools Bundle'
+%% without such generated files.
+%% 
+%% The list of all files belonging to the LaTeX `Tools Bundle' is
+%% given in the file `manifest.txt'.
+%% 
+ \message{File ignored}
+\endinput
+%%
+%% End of file `.tex'.
diff --git a/Master/texmf-dist/tex/latex-dev/tools/array-2020-02-10.sty b/Master/texmf-dist/tex/latex-dev/tools/array-2020-02-10.sty
new file mode 100644
index 00000000000..9fddc0d490f
--- /dev/null
+++ b/Master/texmf-dist/tex/latex-dev/tools/array-2020-02-10.sty
@@ -0,0 +1,374 @@
+%%
+%% This is file `array.sty',
+%% generated with the docstrip utility.
+%%
+%% The original source files were:
+%%
+%% array.dtx  (with options: `package,ncols')
+%% 
+%% This is a generated file.
+%% 
+%% 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-2020
+%% The LaTeX3 Project and any individual authors listed elsewhere
+%% in this file.
+%% 
+%% This file was generated from file(s) 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
+%% version 2005/12/01 or later.
+%% 
+%% This file may only be distributed together with a copy of the LaTeX
+%% `Tools Bundle'. You may however distribute the LaTeX `Tools Bundle'
+%% without such generated files.
+%% 
+%% The list of all files belonging to the LaTeX `Tools Bundle' is
+%% given in the file `manifest.txt'.
+%% 
+%% Package `array' to use with LaTeX 2e
+%% Copyright (C) 1989-1998 Frank Mittelbach, all rights reserved.
+\NeedsTeXFormat{LaTeX2e}[1995/06/01]
+\providecommand\DeclareRelease[3]{}
+\providecommand\DeclareCurrentRelease[2]{}
+
+\DeclareRelease{}{2016-10-06}{array-2016-10-06.sty}
+\DeclareCurrentRelease{}{2019-10-01}
+
+\ProvidesPackage{array}
+         [2020/02/10 v2.4m Tabular extension package (FMi)]
+%%
+
+\def\@addtopreamble#1{\xdef\@preamble{\@preamble #1}}
+\def\@testpach{\@chclass
+ \ifnum \@lastchclass=6 \@ne \@chnum \@ne \else
+  \ifnum \@lastchclass=7 5 \else
+   \ifnum \@lastchclass=8 \tw@ \else
+    \ifnum \@lastchclass=9 \thr@@
+   \else \z@
+   \ifnum \@lastchclass = 10 \else
+   \edef\@nextchar{\expandafter\string\@nextchar}%
+   \@chnum
+   \if \@nextchar c\z@ \else
+    \if \@nextchar l\@ne \else
+     \if \@nextchar r\tw@ \else
+   \z@ \@chclass
+   \if\@nextchar |\@ne \else
+    \if \@nextchar !6 \else
+     \if \@nextchar @7 \else
+      \if \@nextchar <8 \else
+       \if \@nextchar >9 \else
+  10
+  \@chnum
+  \if \@nextchar m\thr@@\else
+   \if \@nextchar p4 \else
+    \if \@nextchar b5 \else
+   \z@ \@chclass \z@ \@preamerr \z@ \fi \fi \fi \fi
+   \fi \fi  \fi  \fi  \fi  \fi  \fi \fi \fi \fi \fi \fi}
+\def\@xexpast#1*#2#3#4\@@{%
+   \@tempcnta #2
+   \toks@={#1}\@temptokena={#3}%
+   \let\the@toksz\relax \let\the@toks\relax
+   \def\@tempa{\the@toksz}%
+   \ifnum\@tempcnta >0 \@whilenum\@tempcnta >0\do
+     {\edef\@tempa{\@tempa\the@toks}\advance \@tempcnta \m@ne}%
+       \let \@tempb \@xexpast \else
+       \let \@tempb \@xexnoop \fi
+   \def\the@toksz{\the\toks@}\def\the@toks{\the\@temptokena}%
+   \edef\@tempa{\@tempa}%
+   \expandafter \@tempb \@tempa #4\@@}
+\def\prepnext@tok{\advance \count@ \@ne
+   \toks\count@{}}
+\def\save@decl{\toks\count@ \expandafter{\@nextchar}}
+\def\insert@column{%
+   \the@toks \the \@tempcnta
+   \ignorespaces \@sharp \unskip
+   \the@toks \the \count@ \relax}
+\newdimen\col@sep
+\def\@acol{\@addtopreamble{\hskip\col@sep}}
+\def\@classx{%
+  \ifcase \@lastchclass
+  \@acolampacol \or
+  \@addamp \@acol \or
+  \@acolampacol \or
+  \or
+  \@acol \@firstampfalse \or
+  \@addamp
+  \fi}
+\def\@classz{\@classx
+   \@tempcnta \count@
+   \prepnext@tok
+   \@addtopreamble{\ifcase \@chnum
+      \hfil
+      \hskip1sp%
+      \d@llarbegin
+      \insert@column
+      \d@llarend \do@row@strut \hfil \or
+      \hskip1sp\d@llarbegin \insert@column \d@llarend \do@row@strut \hfil \or
+      \hfil\hskip1sp\d@llarbegin \insert@column \d@llarend \do@row@strut \or
+    \setbox\ar@mcellbox\vbox
+    \@startpbox{\@nextchar}\insert@column \@endpbox
+    \ar@align@mcell
+    \do@row@strut \or
+   \vtop \@startpbox{\@nextchar}\insert@column \@endpbox\do@row@strut \or
+   \vbox \@startpbox{\@nextchar}\insert@column \@endpbox\do@row@strut
+  \fi}\prepnext@tok}
+
+\newbox\ar@mcellbox
+\def\ar@align@mcell{%
+  \ifdim \ht\ar@mcellbox > \ht\@arstrutbox
+    \begingroup
+     \dimen@\ht\ar@mcellbox
+     \advance\dimen@-\ht\@arstrutbox
+     \advance\dimen@\baselineskip
+     \lower.5\dimen@\box\ar@mcellbox
+    \endgroup
+  \else % assume one line and align at baseline
+    \box\ar@mcellbox
+  \fi}
+
+\def\@arrayrule{\@addtopreamble \vline}
+\def\@classvii{\ifnum \@lastchclass = \thr@@
+   \@preamerr \thr@@ \fi}
+\def\@classvi{\ifcase \@lastchclass
+      \@acol \or
+      \@addtopreamble{\hskip \doublerulesep}\or
+      \@acol \or
+      \@classvii
+      \fi}
+\def\@classii{\advance \count@ \m@ne
+   \save@decl\prepnext@tok}
+\def\@classi{\@classvi
+   \ifcase \@chnum \@arrayrule \or
+      \@classv \fi}
+\def\@startpbox#1{\bgroup
+  \color@begingroup
+  \setlength\hsize{#1}\@arrayparboxrestore
+   \everypar{%
+      \vrule \@height \ht\@arstrutbox \@width \z@
+      \everypar{}}%
+   }
+\def\@endpbox{\@finalstrut\@arstrutbox \color@endgroup \egroup\hfil}
+\def\@array[#1]#2{%
+  \@tempdima \ht \strutbox
+  \advance \@tempdima by\extrarowheight
+  \setbox \@arstrutbox \hbox{\vrule
+             \@height \arraystretch \@tempdima
+             \@depth \arraystretch \dp \strutbox
+             \@width \z@}%
+  \begingroup
+  \@mkpream{#2}%
+  \xdef\@preamble{\noexpand \ialign \@halignto
+                  \bgroup \@arstrut \@preamble
+                          \tabskip \z@ \cr}%
+  \endgroup
+  \@arrayleft
+  \if #1t\vtop \else \if#1b\vbox \else \vcenter \fi \fi
+  \bgroup
+  \let \@sharp ##\let \protect \relax
+  \lineskip \z@
+  \baselineskip \z@
+  \m@th
+  \let\\\@arraycr \let\tabularnewline\\\let\par\@empty \@preamble}
+\def\arraybackslash{\let\\\tabularnewline}
+\newdimen \extrarowheight
+\extrarowheight=0pt
+\def\@arstrut{\unhcopy\@arstrutbox}
+\def\@arraycr{\relax\iffalse{\fi\ifnum 0=`}\fi
+  \@ifstar \@xarraycr \@xarraycr}
+\def\@xarraycr{\@ifnextchar [%
+  \@argarraycr {\ifnum 0=`{}\fi\cr}}
+\def\@argarraycr[#1]{\ifnum0=`{}\fi\ifdim #1>\z@
+  \expandafter\@xargarraycr\else
+  \expandafter\@yargarraycr\fi{#1}}
+\def\@xargarraycr#1{\unskip\gdef\do@row@strut
+ {\@tempdima #1\advance\@tempdima \dp\@arstrutbox
+   \vrule \@depth\@tempdima \@width\z@\global\let\do@row@strut\relax}%
+ %    \begin{macrocode}
+   \ifnum\@multicnt >\z@ \do@row@strut \fi
+   \cr}
+\let\do@row@strut\relax
+\def\@yargarraycr#1{\cr\noalign{\vskip #1}}
+\long\def\multicolumn#1#2#3{%
+   \multispan{#1}\begingroup
+   \def\@addamp{\if@firstamp \@firstampfalse \else
+                \@preamerr 5\fi}%
+   \@mkpream{#2}\@addtopreamble\@empty
+   \endgroup
+   \def\@sharp{#3}%
+   \@arstrut \@preamble
+   \null
+   \ignorespaces}
+\let\d@llarbegin\begingroup
+\let\d@llarend\endgroup
+\def\array{\col@sep\arraycolsep
+  \def\d@llarbegin{$}\let\d@llarend\d@llarbegin\def\@halignto{}%
+  \@tabarray}
+\def\tabular{\def\@halignto{}\@tabular}
+\expandafter\def\csname tabular*\endcsname#1{%
+       \setlength\dimen@{#1}%
+       \edef\@halignto{to\the\dimen@}\@tabular}
+\def\@tabular{%
+  \leavevmode
+  \hbox \bgroup $\col@sep\tabcolsep \let\d@llarbegin\begingroup
+                                    \let\d@llarend\endgroup
+  \@tabarray}
+\def\endtabular{\endarray $\egroup}
+\expandafter\let\csname endtabular*\endcsname=\endtabular
+\let\@ampacol=\relax        \let\@expast=\relax
+\let\@arrayclassiv=\relax   \let\@arrayclassz=\relax
+\let\@tabclassiv=\relax     \let\@tabclassz=\relax
+\let\@arrayacol=\relax      \let\@tabacol=\relax
+\let\@tabularcr=\relax      \let\@@endpbox=\relax
+\let\@argtabularcr=\relax   \let\@xtabularcr=\relax
+\def\@preamerr#1{\def\@tempd{{..} at wrong position: }%
+   \PackageError{array}{%
+   \ifcase #1 Illegal pream-token (\@nextchar): `c' used\or %0
+    Missing arg: token ignored\or                           %1
+    Empty preamble: `l' used\or                             %2
+    >\@tempd token ignored\or                               %3
+    <\@tempd changed to !{..}\or                            %4
+    Only one column-spec. allowed.\fi}\@ehc}                %5
+\def\newcolumntype#1{%
+  \edef\NC@char{\string#1}%
+  \@ifundefined{NC@find@\NC@char}%
+    {\@tfor\next:=<>clrmbp@!|\do
+      {%
+        \if\expandafter\noexpand\next\NC@char
+        \PackageWarning{array}%
+                       {Redefining primitive column \NC@char}\fi}%
+     \NC@list\expandafter{\the\NC@list\NC@do#1}}%
+    {\PackageWarning{array}{Column \NC@char\space is already defined}}%
+  \@namedef{NC@find@\NC@char}##1#1{\NC@{##1}}%
+  \@ifnextchar[{\newcol@{\NC@char}}{\newcol@{\NC@char}[0]}}
+\def\newcol@#1[#2]#3{\expandafter\@reargdef
+     \csname NC@rewrite@#1\endcsname[#2]{\NC@find#3}}
+\def\NC@#1{%
+  \@temptokena\expandafter{\the\@temptokena#1}\futurelet\next\NC@ifend}
+\def\NC@ifend{%
+  \ifx\next\relax
+    \else\@tempswatrue\expandafter\NC@rewrite\fi}
+\def\NC@do#1{%
+  \expandafter\let\expandafter\NC@rewrite
+    \csname NC@rewrite@\string#1\endcsname
+  \expandafter\let\expandafter\NC@find
+    \csname NC@find@\string#1\endcsname
+  \expandafter\@temptokena\expandafter{\expandafter}%
+        \expandafter\NC@find\the\@temptokena#1\relax}
+\def\showcols{{\def\NC@do##1{\let\NC@do\NC@show}\the\NC@list}}
+\def\NC@show#1{%
+  \typeout{Column #1\expandafter\expandafter\expandafter\NC@strip
+  \expandafter\meaning\csname NC@rewrite@#1\endcsname\@@}}
+\def\NC@strip#1:#2->#3 #4\@@{#2 -> #4}
+\newtoks\NC@list
+\newcolumntype{*}[2]{}
+\long\@namedef{NC@rewrite@*}#1#2{%
+  \count@#1\relax
+  \loop
+  \ifnum\count@>\z@
+  \advance\count@\m@ne
+  \@temptokena\expandafter{\the\@temptokena#2}%
+  \repeat
+  \NC@find}
+\let\@xexpast\relax
+\let\@xexnoop\relax
+\def\save@decl{\toks \count@ = \expandafter\expandafter\expandafter
+                  {\expandafter\@nextchar\the\toks\count@}}
+\def\@mkpream#1{\gdef\@preamble{}\@lastchclass 4 \@firstamptrue
+   \let\@sharp\relax
+   \def\@startpbox##1{\unexpanded\expandafter{\expandafter
+                      \@startpbox\expandafter{##1}}}\let\@endpbox\relax
+   \let\do@row@strut\relax
+   \let\ar@align@mcell\relax
+   \@temptokena{#1}\@tempswatrue
+   \@whilesw\if@tempswa\fi{\@tempswafalse\the\NC@list}%
+   \count@\m@ne
+   \let\the@toks\relax
+   \prepnext@tok
+   \expandafter \@tfor \expandafter \@nextchar
+    \expandafter :\expandafter =\the\@temptokena \do
+   {\@testpach
+   \ifcase \@chclass \@classz \or \@classi \or \@classii
+     \or \save@decl \or \or \@classv \or \@classvi
+     \or \@classvii \or \@classviii
+     \or \@classx
+     \or \@classx \fi
+   \@lastchclass\@chclass}%
+   \ifcase\@lastchclass
+   \@acol \or
+   \or
+   \@acol \or
+   \@preamerr \thr@@ \or
+   \@preamerr \tw@ \@addtopreamble\@sharp \or
+   \or
+   \else  \@preamerr \@ne \fi
+   \def\the@toks{\the\toks}}
+\let\@classix\relax
+\def\@classviii{\ifnum \@lastchclass >\z@\ifnum\@lastchclass=\tw@\else
+      \@preamerr 4\@chclass 6 \@classvi \fi\fi}
+\def\@classv{\save@decl
+   \expandafter\NC@ecs\@nextchar\extracolsep{}\extracolsep\@@@
+   \@addtopreamble{\d@llarbegin\the@toks\the\count@\relax\d@llarend}%
+   \prepnext@tok}
+\def\NC@ecs#1\extracolsep#2#3\extracolsep#4\@@@{\def\@tempa{#2}%
+  \ifx\@tempa\@empty\else\toks\count@={#1\tabskip#2\relax#3}\fi}
+\def\@tabarray{\@ifnextchar[{\@@array}{\@@array[c]}}
+\let\@@array\@array
+\def\endarray{\crcr \egroup \egroup \@arrayright \gdef\@preamble{}}
+\let\@arrayleft\@empty
+\let\@arrayright\@empty
+\newlength{\extratabsurround}
+\setlength{\extratabsurround}{2pt}
+\newlength{\backup@length}
+\newcommand{\firsthline}{%
+  \multicolumn1c{%
+    \global\backup@length\ht\@arstrutbox
+    \global\advance\backup@length\dp\@arstrutbox
+    \global\advance\backup@length\arrayrulewidth
+     \raise\extratabsurround\copy\@arstrutbox
+    }\\[-\backup@length]\hline
+}
+\newcommand{\lasthline}{\hline\multicolumn1c{%
+    \global\backup@length2\ht\@arstrutbox
+    \global\advance\backup@length2\dp\@arstrutbox
+    \global\advance\backup@length\arrayrulewidth
+    }\\[-\backup@length]%
+    \multicolumn1c{%
+       \lower\extratabsurround\copy\@arstrutbox
+       }%
+}
+\CheckCommand*\@xhline{\ifx\reserved@a\hline
+               \vskip\doublerulesep
+               \vskip-\arrayrulewidth
+             \fi
+      \ifnum0=`{\fi}}
+\renewcommand*\@xhline{\ifx\reserved@a\hline
+               \vskip\doublerulesep
+             \fi
+      \ifnum0=`{\fi}}
+
+\newsavebox\ar@cellbox
+\newcolumntype{w}[2]{%
+  >{\begin{lrbox}\ar@cellbox}%
+  c%
+  <{\end{lrbox}%
+    \makebox[#2][#1]{\unhbox\ar@cellbox}}}
+
+\newcolumntype{W}[2]
+  {>{\begin{lrbox}\ar@cellbox}%
+   c%
+   <{\end{lrbox}%
+   \let\hss\hfil
+   \makebox[#2][#1]{\unhbox\ar@cellbox}}}
+\endinput
+%%
+%% End of file `array.sty'.
diff --git a/Master/texmf-dist/tex/latex-dev/tools/array.sty b/Master/texmf-dist/tex/latex-dev/tools/array.sty
index 9fddc0d490f..cbf82052b2c 100644
--- a/Master/texmf-dist/tex/latex-dev/tools/array.sty
+++ b/Master/texmf-dist/tex/latex-dev/tools/array.sty
@@ -42,10 +42,11 @@
 \providecommand\DeclareCurrentRelease[2]{}
 
 \DeclareRelease{}{2016-10-06}{array-2016-10-06.sty}
-\DeclareCurrentRelease{}{2019-10-01}
+\DeclareRelease{v2.4}{2020-02-10}{array-2020-02-10.sty}
+\DeclareCurrentRelease{}{2020-10-01}
 
 \ProvidesPackage{array}
-         [2020/02/10 v2.4m Tabular extension package (FMi)]
+         [2020/10/01 v2.5b Tabular extension package (FMi)]
 %%
 
 \def\@addtopreamble#1{\xdef\@preamble{\@preamble #1}}
@@ -197,7 +198,6 @@
    \ifnum\@multicnt >\z@ \do@row@strut \fi
    \cr}
 \let\do@row@strut\relax
-\def\@yargarraycr#1{\cr\noalign{\vskip #1}}
 \long\def\multicolumn#1#2#3{%
    \multispan{#1}\begingroup
    \def\@addamp{\if@firstamp \@firstampfalse \else
@@ -358,15 +358,15 @@
 
 \newsavebox\ar@cellbox
 \newcolumntype{w}[2]{%
-  >{\begin{lrbox}\ar@cellbox}%
+  >{\begin{lrbox}\ar@cellbox\d@llarbegin}%
   c%
-  <{\end{lrbox}%
+  <{\d@llarend \end{lrbox}%
     \makebox[#2][#1]{\unhbox\ar@cellbox}}}
 
 \newcolumntype{W}[2]
-  {>{\begin{lrbox}\ar@cellbox}%
+  {>{\begin{lrbox}\ar@cellbox\d@llarbegin}%
    c%
-   <{\end{lrbox}%
+   <{\d@llarend\end{lrbox}%
    \let\hss\hfil
    \makebox[#2][#1]{\unhbox\ar@cellbox}}}
 \endinput
diff --git a/Master/texmf-dist/tex/latex-dev/tools/calc.sty b/Master/texmf-dist/tex/latex-dev/tools/calc.sty
new file mode 100644
index 00000000000..911377c5ff9
--- /dev/null
+++ b/Master/texmf-dist/tex/latex-dev/tools/calc.sty
@@ -0,0 +1,289 @@
+%%
+%% This is file `calc.sty',
+%% generated with the docstrip utility.
+%%
+%% The original source files were:
+%%
+%% calc.dtx  (with options: `package')
+%% 
+%% This is a generated file.
+%% 
+%% 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-2020
+%% The LaTeX3 Project and any individual authors listed elsewhere
+%% in this file.
+%% 
+%% This file was generated from file(s) 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
+%% version 2005/12/01 or later.
+%% 
+%% This file may only be distributed together with a copy of the LaTeX
+%% `Tools Bundle'. You may however distribute the LaTeX `Tools Bundle'
+%% without such generated files.
+%% 
+%% The list of all files belonging to the LaTeX `Tools Bundle' is
+%% given in the file `manifest.txt'.
+%% 
+%% File `calc.dtx'.
+%% Copyright (C) 1992--1995
+%%          Kresten Krab Thorup and Frank Jensen.
+%% Copyright (C) 1997--2007
+%%          Kresten Krab Thorup, Frank Jensen and the LaTeX3 Project.
+%%
+%% The original authors (fj@hugin.dk and  krab@daimi.aau.dk) have
+%% contributed this package to the LaTeX distribution.
+%% Problems with this package should now be sent using latexbug.tex to
+%% the normal LaTeX bug report address.
+\NeedsTeXFormat{LaTeX2e}
+\ProvidesPackage{calc}
+          [2017/05/25 v4.3 Infix arithmetic (KKT,FJ)]
+\def\calc@assign@generic#1#2#3#4{\let\calc@A#1\let\calc@B#2%
+    \calc@open(#4!%
+    \global\calc@A\calc@B\endgroup#3\calc@B}
+\def\calc@assign@count{\calc@assign@generic\calc@Acount\calc@Bcount}
+\def\calc@assign@dimen{\calc@assign@generic\calc@Adimen\calc@Bdimen}
+\def\calc@assign@skip{\calc@assign@generic\calc@Askip\calc@Bskip}
+\newcount\calc@Acount   \newcount\calc@Bcount
+\newdimen\calc@Adimen   \newdimen\calc@Bdimen
+\newskip\calc@Askip     \newskip\calc@Bskip
+\def\setcounter#1#2{\@ifundefined{c@#1}{\@nocounterr{#1}}%
+   {\calc@assign@count{\global\csname c@#1\endcsname}{#2}}}
+  \def\addtocounter#1#2{\@ifundefined{c@#1}{\@nocounterr{#1}}%
+    {\calc@assign@count{\global\advance\csname c@#1\endcsname}{#2}}}%
+  \def\stepcounter#1{\@ifundefined {c@#1}%
+    {\@nocounterr {#1}}%
+    {\global\advance\csname c@#1\endcsname \@ne
+    \begingroup
+      \let\@elt\@stpelt \csname cl@#1\endcsname
+    \endgroup}}%
+\@ifpackageloaded{amstext}{%
+ \expandafter\def\expandafter\stepcounter
+    \expandafter#\expandafter1\expandafter{%
+    \expandafter\iffirstchoice@\stepcounter{#1}\fi
+ }
+ \expandafter\def\expandafter\addtocounter
+    \expandafter#\expandafter1\expandafter#\expandafter2\expandafter{%
+    \expandafter\iffirstchoice@\addtocounter{#1}{#2}\fi
+ }
+}{}
+\DeclareRobustCommand\setlength{\calc@assign@skip}
+\DeclareRobustCommand\addtolength[1]{\calc@assign@skip{\advance#1}}
+\def\calc@pre@scan#1{%
+  \expandafter\@calc@pre@scan\romannumeral-`\a#1}
+\def\@calc@pre@scan#1{%
+  \ifx(#1%
+    \expandafter\calc@open
+  \else
+    \ifx\widthof#1%
+      \expandafter\expandafter\expandafter\calc@textsize
+    \else
+      \ifx\maxof#1%
+        \expandafter\expandafter\expandafter\expandafter
+        \expandafter\expandafter\expandafter\calc@maxmin@addsub
+      \else
+        \calc@numeric% no \expandafter needed for this one.
+      \fi
+    \fi
+  \fi
+  #1}
+\def\calc@open({\begingroup\aftergroup\calc@initB
+   \begingroup\aftergroup\calc@initB
+   \calc@pre@scan}
+\def\calc@initB{\calc@B\calc@A}
+\def\calc@numeric{\afterassignment\calc@post@scan \global\calc@A}
+\@for\reserved@a:=widthof,heightof,depthof,totalheightof,maxof,minof\do
+{\@ifundefined{\reserved@a}{}{%
+  \PackageError{calc}{%
+  The\space calc\space package\space reserves\space the\space
+  command\space name\space `\@backslashchar\reserved@a'\MessageBreak
+  but\space it\space has\space already\space been\space defined\space
+  with\space the\space meaning\MessageBreak
+  `\expandafter\meaning\csname\reserved@a\endcsname'.\MessageBreak
+  This\space original\space definition\space will\space be\space lost}%
+  {If\space you\space need\space a\space command\space with\space
+  this\space definition,\space you\space must\space use\space a\space
+  different\space name.}}%
+}
+\let\widthof\ignorespaces
+\let\heightof\ignorespaces
+\let\depthof\ignorespaces
+\let\totalheightof\ignorespaces
+\def\calc@textsize #1#2{%
+  \begingroup
+    \let\widthof\wd
+    \let\heightof\ht
+    \let\depthof\dp
+    \def\totalheightof{\ht\dp}%
+    \expandafter\@settodim\expandafter{#1}%
+      {\global\calc@A}%
+      {%
+       \let\widthof\ignorespaces
+       \let\heightof\ignorespaces
+       \let\depthof\ignorespaces
+       \let\totalheightof\ignorespaces
+       #2}%
+  \endgroup
+  \calc@post@scan}
+\def\calc@post@scan#1{%
+ \expandafter\@calc@post@scan\romannumeral-`\a#1}
+\def\@calc@post@scan#1{%
+  \ifx#1!\let\calc@next\endgroup \else
+    \ifx#1+\let\calc@next\calc@add \else
+      \ifx#1-\let\calc@next\calc@subtract \else
+        \ifx#1*\let\calc@next\calc@multiplyx \else
+          \ifx#1/\let\calc@next\calc@dividex \else
+            \ifx#1)\let\calc@next\calc@close \else
+              \ifx#1\relax\let\calc@next\calc@post@scan \else
+                \def\calc@next{\calc@error#1}%
+              \fi
+            \fi
+          \fi
+        \fi
+      \fi
+    \fi
+  \fi
+  \calc@next}
+\def\calc@add{\calc@generic@add\calc@addAtoB}
+\def\calc@subtract{\calc@generic@add\calc@subtractAfromB}
+\def\calc@generic@add#1{\endgroup\global\calc@A\calc@B\endgroup
+   \begingroup\aftergroup#1\begingroup\aftergroup\calc@initB
+   \calc@pre@scan}
+\def\calc@addAtoB{\advance\calc@B\calc@A}
+\def\calc@subtractAfromB{\advance\calc@B-\calc@A}
+\ifx\real\@undefined\let\real\relax\fi
+\ifx\ratio\@undefined\let\ratio\relax\fi
+\def\calc@ratio@x{\ratio}
+\def\calc@real@x{\real}
+\def\calc@multiplyx#1{\def\calc@tmp{#1}%
+  \ifx\calc@tmp\calc@ratio@x \let\calc@next\calc@ratio@multiply \else
+    \ifx\calc@tmp\calc@real@x \let\calc@next\calc@real@multiply \else
+      \ifx\maxof#1\let\calc@next\calc@maxmin@multiply \else
+        \let\calc@next\calc@multiply
+      \fi
+    \fi
+  \fi
+  \calc@next#1}
+\def\calc@dividex#1{\def\calc@tmp{#1}%
+  \ifx\calc@tmp\calc@ratio@x \let\calc@next\calc@ratio@divide \else
+    \ifx\calc@tmp\calc@real@x \let\calc@next\calc@real@divide \else
+      \ifx\maxof#1\let\calc@next\calc@maxmin@divide \else
+        \let\calc@next\calc@divide
+      \fi
+    \fi
+  \fi
+  \calc@next#1}
+\def\calc@multiply{\calc@generic@multiply\calc@multiplyBbyA}
+\def\calc@divide{\calc@generic@multiply\calc@divideBbyA}
+\def\calc@generic@multiply#1{\endgroup\begingroup
+   \let\calc@A\calc@Acount \let\calc@B\calc@Bcount
+   \aftergroup#1\calc@pre@scan}
+\def\calc@multiplyBbyA{\multiply\calc@B\calc@Acount}
+\def\calc@divideBbyA{\divide\calc@B\calc@Acount}
+\def\calc@close
+   {\endgroup\global\calc@A\calc@B
+    \endgroup\global\calc@A\calc@B
+    \calc@post@scan}
+\def\calc@ratio@multiply\ratio{\calc@ratio@evaluate}
+\def\calc@ratio@divide\ratio#1#2{\calc@ratio@evaluate{#2}{#1}}
+\newcount\calc@Ccount
+\let\calc@numerator=\calc@Bcount
+\let\calc@denominator=\calc@Ccount
+\def\calc@ratio@evaluate#1#2{%
+   \endgroup\begingroup
+      \calc@assign@dimen\calc@numerator{#1}%
+      \calc@assign@dimen\calc@denominator{#2}%
+      \gdef\calc@the@ratio{}%
+      \ifnum\calc@numerator<0 \calc@numerator-\calc@numerator
+         \gdef\calc@the@ratio{-}%
+      \fi
+      \ifnum\calc@denominator<0 \calc@denominator-\calc@denominator
+         \xdef\calc@the@ratio{\calc@the@ratio-}%
+      \fi
+      \calc@Acount\calc@numerator
+      \divide\calc@Acount\calc@denominator
+      \xdef\calc@the@ratio{\calc@the@ratio\number\calc@Acount.}%
+      \calc@next@digit \calc@next@digit \calc@next@digit
+      \calc@next@digit \calc@next@digit \calc@next@digit
+   \endgroup
+   \calc@multiply@by@real\calc@the@ratio
+   \begingroup
+   \calc@post@scan}
+\def\calc@next@digit{%
+      \multiply\calc@Acount\calc@denominator
+      \advance\calc@numerator -\calc@Acount
+      \multiply\calc@numerator 10
+      \calc@Acount\calc@numerator
+      \divide\calc@Acount\calc@denominator
+      \xdef\calc@the@ratio{\calc@the@ratio\number\calc@Acount}}
+\def\calc@multiply@by@real#1{\calc@Bdimen #1\calc@B \calc@B\calc@Bdimen}
+\def\calc@real@multiply\real#1{\endgroup
+   \calc@multiply@by@real{#1}\begingroup
+   \calc@post@scan}
+\def\calc@real@divide\real#1{\calc@ratio@evaluate{1pt}{#1pt}}
+\let\maxof\@@italiccorr
+\let\minof\@@italiccorr
+\newskip\calc@Cskip
+\newif\ifcalc@count@
+\def\calc@maxmin@addsub#1#2#3{\begingroup
+  \ifx\calc@A\calc@Acount%
+    \calc@count@true
+  \else
+    \calc@count@false
+  \fi
+  \calc@maxmin@generic#1{#2}{#3}%
+  \endgroup
+  \calc@post@scan
+}
+\def\calc@maxmin@generic#1#2#3{%
+  \begingroup
+    \ifcalc@count@
+      \calc@assign@count\calc@Ccount{#2}%
+      \calc@assign@count\calc@Bcount{#3}%
+      \def\minof{<}\def\maxof{>}%
+      \global\calc@A\ifnum\calc@Ccount#1\calc@Bcount
+        \calc@Ccount\else\calc@Bcount\fi
+    \else
+      \calc@assign@skip\calc@Cskip{#2}%
+      \calc@assign@skip\calc@Bskip{#3}%
+      \def\minof{<}\def\maxof{>}%
+      \global\calc@A\ifdim\calc@Cskip#1\calc@Bskip
+        \calc@Cskip\else\calc@Bskip\fi
+    \fi
+  \endgroup
+}
+\def\calc@maxmin@divmul#1#2#3#4{%
+  \endgroup\begingroup
+  \calc@count@true
+  \aftergroup#1%
+  \calc@maxmin@generic#2{#3}{#4}%
+  \endgroup\begingroup
+  \calc@post@scan
+}
+\def\calc@maxmin@multiply{\calc@maxmin@divmul\calc@multiplyBbyA}
+\def\calc@maxmin@divide  {\calc@maxmin@divmul\calc@divideBbyA}
+\def\calc@error#1{%
+   \PackageError{calc}%
+     {`#1' invalid at this point}%
+     {I expected to see one of: + - * / )}}
+\def\@settodim#1#2#3{%
+  \setbox\@tempboxa\hbox{{#3}}%
+  \dimen@ii=\z@
+  \@tf@r\reserved@a #1\do{%
+  \advance\dimen@ii\reserved@a\@tempboxa}%
+  #2=\dimen@ii
+  \setbox\@tempboxa\box\voidb@x}
+\def\settototalheight{\@settodim{\ht\dp}}
+\endinput
+%%
+%% End of file `calc.sty'.
diff --git a/Master/texmf-dist/tex/latex-dev/tools/e.tex b/Master/texmf-dist/tex/latex-dev/tools/e.tex
new file mode 100644
index 00000000000..35f01cb8d4d
--- /dev/null
+++ b/Master/texmf-dist/tex/latex-dev/tools/e.tex
@@ -0,0 +1,41 @@
+%%
+%% This is file `e.tex',
+%% generated with the docstrip utility.
+%%
+%% The original source files were:
+%%
+%% fileerr.dtx  (with options: `edit')
+%% 
+%% This is a generated file.
+%% 
+%% 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-2020
+%% The LaTeX3 Project and any individual authors listed elsewhere
+%% in this file.
+%% 
+%% This file was generated from file(s) 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
+%% version 2005/12/01 or later.
+%% 
+%% This file may only be distributed together with a copy of the LaTeX
+%% `Tools Bundle'. You may however distribute the LaTeX `Tools Bundle'
+%% without such generated files.
+%% 
+%% The list of all files belonging to the LaTeX `Tools Bundle' is
+%% given in the file `manifest.txt'.
+%% 
+  \batchmode \errmessage{}\csname @@end\endcsname \end
+\endinput
+%%
+%% End of file `e.tex'.
diff --git a/Master/texmf-dist/tex/latex-dev/tools/h.tex b/Master/texmf-dist/tex/latex-dev/tools/h.tex
new file mode 100644
index 00000000000..9a9d64afd7a
--- /dev/null
+++ b/Master/texmf-dist/tex/latex-dev/tools/h.tex
@@ -0,0 +1,48 @@
+%%
+%% This is file `h.tex',
+%% generated with the docstrip utility.
+%%
+%% The original source files were:
+%%
+%% fileerr.dtx  (with options: `help')
+%% 
+%% This is a generated file.
+%% 
+%% 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-2020
+%% The LaTeX3 Project and any individual authors listed elsewhere
+%% in this file.
+%% 
+%% This file was generated from file(s) 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
+%% version 2005/12/01 or later.
+%% 
+%% This file may only be distributed together with a copy of the LaTeX
+%% `Tools Bundle'. You may however distribute the LaTeX `Tools Bundle'
+%% without such generated files.
+%% 
+%% The list of all files belonging to the LaTeX `Tools Bundle' is
+%% given in the file `manifest.txt'.
+%% 
+\newlinechar=`\^^J
+\message{! The file name provided could not be found.^^J%
+Use `<enter>' to continue processing,^^J%
+`S' to scroll  future errors^^J%
+`R' to run without stopping,^^J%
+`Q' to run quietly,^^J%
+or `X' to terminate TeX}
+\errmessage{}
+\endinput
+%%
+%% End of file `h.tex'.
diff --git a/Master/texmf-dist/tex/latex-dev/tools/indentfirst.sty b/Master/texmf-dist/tex/latex-dev/tools/indentfirst.sty
new file mode 100644
index 00000000000..678ccfb3bcd
--- /dev/null
+++ b/Master/texmf-dist/tex/latex-dev/tools/indentfirst.sty
@@ -0,0 +1,46 @@
+%%
+%% This is file `indentfirst.sty',
+%% generated with the docstrip utility.
+%%
+%% The original source files were:
+%%
+%% indentfirst.dtx  (with options: `package')
+%% 
+%% This is a generated file.
+%% 
+%% 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-2020
+%% The LaTeX3 Project and any individual authors listed elsewhere
+%% in this file.
+%% 
+%% This file was generated from file(s) 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
+%% version 2005/12/01 or later.
+%% 
+%% This file may only be distributed together with a copy of the LaTeX
+%% `Tools Bundle'. You may however distribute the LaTeX `Tools Bundle'
+%% without such generated files.
+%% 
+%% The list of all files belonging to the LaTeX `Tools Bundle' is
+%% given in the file `manifest.txt'.
+%% 
+%% File: indent.dtx Copyright (C) 1991-1994 David Carlisle
+\NeedsTeXFormat{LaTeX2e}
+\ProvidesPackage{indentfirst}
+         [1995/11/23 v1.03 Indent first paragraph (DPC)]
+\let\@afterindentfalse\@afterindenttrue
+\@afterindenttrue
+\endinput
+%%
+%% End of file `indentfirst.sty'.
diff --git a/Master/texmf-dist/tex/latex-dev/tools/layout.sty b/Master/texmf-dist/tex/latex-dev/tools/layout.sty
new file mode 100644
index 00000000000..4805bace1d9
--- /dev/null
+++ b/Master/texmf-dist/tex/latex-dev/tools/layout.sty
@@ -0,0 +1,457 @@
+%%
+%% This is file `layout.sty',
+%% generated with the docstrip utility.
+%%
+%% The original source files were:
+%%
+%% layout.dtx  (with options: `package')
+%% 
+%% This is a generated file.
+%% 
+%% 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-2020
+%% The LaTeX3 Project and any individual authors listed elsewhere
+%% in this file.
+%% 
+%% This file was generated from file(s) 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
+%% version 2005/12/01 or later.
+%% 
+%% This file may only be distributed together with a copy of the LaTeX
+%% `Tools Bundle'. You may however distribute the LaTeX `Tools Bundle'
+%% without such generated files.
+%% 
+%% The list of all files belonging to the LaTeX `Tools Bundle' is
+%% given in the file `manifest.txt'.
+%% 
+\NeedsTeXFormat{LaTeX2e}
+\ProvidesPackage{layout}
+                [2014/10/28 v1.2c Show layout parameters]
+\DeclareOption{dutch}{%
+  \def\Headertext{Kopregel}
+  \def\Bodytext{Broodtekst}
+  \def\Footertext{Voetregel}
+  \def\MarginNotestext{Marge\\Notities}
+  \def\oneinchtext{een inch}
+  \def\notshown{niet getoond}
+  }
+\DeclareOption{german}{%
+  \def\Headertext{Kopfzeile}
+  \def\Bodytext{Haupttext}
+  \def\Footertext{Fu{\ss}zeile}
+  \def\MarginNotestext{Rand-\\ notizen}
+  \def\oneinchtext{ein Zoll}
+  \def\notshown{ohne Abbildung}
+  }
+\DeclareOption{ngerman}{\ExecuteOptions{german}}
+\DeclareOption{english}{%
+  \def\Headertext{Header}
+  \def\Bodytext{Body}
+  \def\Footertext{Footer}
+  \def\MarginNotestext{Margin\\Notes}
+  \def\oneinchtext{one inch}
+  \def\notshown{not shown}
+  }
+\DeclareOption{french}{%
+  \def\Headertext{Ent\^{e}te}
+  \def\Bodytext{Corps}
+  \def\Footertext{Pied de page}
+  \def\MarginNotestext{Marge\\Notes}
+  \def\oneinchtext{un pouce}
+  \def\notshown{non affich\'{e}}
+  }
+\DeclareOption{francais}{\ExecuteOptions{french}}
+\DeclareOption{spanish}{%
+  \def\Headertext{Encabezamiento}
+  \def\Bodytext{Cuerpo}
+  \def\Footertext{Pie de p\'agina}
+  \def\MarginNotestext{Notas\\ Marginales}
+  \def\oneinchtext{una pulgada}
+  \def\notshown{no mostradas}
+  }
+\DeclareOption{portuguese}{%
+  \def\Headertext{Cabe\c{c}alho}
+  \def\Bodytext{Corpo}
+  \def\Footertext{Rodap\'e}
+  \def\MarginNotestext{Notas\\ Marginais}
+  \def\oneinchtext{uma polegada}
+  \def\notshown{n\~ao mostradas}
+  }
+\DeclareOption{brazilian}{%
+  \def\Headertext{Cabe\c{c}alho}
+  \def\Bodytext{Corpo}
+  \def\Footertext{Rodap\'e}
+  \def\MarginNotestext{Notas\\ Marginais}
+  \def\oneinchtext{uma polegada}
+  \def\notshown{n\~ao mostradas}
+  }
+\DeclareOption{italian}{%
+  \def\Headertext{Testatina}
+  \def\Bodytext{Corpo}
+  \def\Footertext{Piedino}
+  \def\MarginNotestext{Note\\ Marginali}
+  \def\oneinchtext{un pollice}
+  \def\notshown{non mostrato}
+  }
+\DeclareOption{verbose}{\let\LayOuttype\typeout}
+\DeclareOption{silent}{\let\LayOuttype\@gobble}
+\def\lay@value{}
+\DeclareOption{integers}{%
+  \renewcommand*{\lay@value}[2]{%
+    \expandafter\number\csname #1@#2\endcsname pt}}
+\DeclareOption{reals}{%
+  \renewcommand*{\lay@value}[2]{\the\csname #2\endcsname}}
+\ExecuteOptions{english,silent,integers}
+\ProcessOptions
+\newcommand\LayOutbs{}
+\chardef\LayOutbs`\\
+\def\ConvertToCount#1#2{%
+  #1=#2
+  \divide #1 by 65536}
+\def\SetToHalf#1#2{#1=#2\relax\divide#1by\tw@}
+\def\SetToQuart#1#2{#1=#2\relax\divide#1by4}
+\def\Identify#1{%
+  \put(\PositionX,\PositionY){\circle{20}}
+  \put(\PositionX,\PositionY){\makebox(0,0){\tiny #1}}
+}
+\def\InsideHArrow#1{{%
+  \ArrowLength = #1
+  \divide\ArrowLength by \tw@
+  \advance\ArrowLength by -10
+  \advance\PositionX by -10
+  \ifnum\ArrowLength<\z@
+    \put(\PositionX,\PositionY){\vector(1,0){-\ArrowLength}}
+    \advance\PositionX by 20
+    \put(\PositionX,\PositionY){\vector(-1,0){-\ArrowLength}}
+  \else
+    \put(\PositionX,\PositionY){\vector(-1,0){\ArrowLength}}
+    \advance\PositionX by 20
+    \put(\PositionX,\PositionY){\vector(+1,0){\ArrowLength}}
+  \fi
+}}
+\def\InsideVArrow#1{{%
+  \ArrowLength = #1
+  \divide\ArrowLength by \tw@
+  \advance\ArrowLength by -10
+  \advance\PositionY by -10
+  \put(\PositionX,\PositionY){\vector(0,-1){\ArrowLength}}
+  \advance\PositionY by 20
+  \put(\PositionX,\PositionY){\vector(0,+1){\ArrowLength}}
+}}
+\def\OutsideHArrow#1#2#3{{%
+  \PositionX = #1
+  \advance\PositionX by #3
+  \put(\PositionX,\PositionY){\vector(-1,0){#3}}
+  \PositionX = #1 \advance\PositionX-#2
+  \advance\PositionX by -#3
+  \put(\PositionX,\PositionY){\vector(+1,0){#3}}
+}}
+\def\OutsideVArrow#1#2#3#4{{%
+  \PositionY = #1
+  \advance\PositionY by -#3
+  \put(\PositionX,\PositionY){\vector(0,+1){#3}}
+  \PositionY = #1
+  \advance\PositionY#2
+  \advance\PositionY#4
+  \put(\PositionX,\PositionY){\vector(0,-1){#4}}
+}}
+\def\Show#1#2{\LayOutbs #2 = \lay@value{#1}{#2}}
+\def\Type#1#2{%
+  \LayOuttype{#2 = \lay@value{#1}{#2}}}
+\newcount\oneinch
+\oneinch=72
+\newcount\cnt@paperwidth
+\newcount\cnt@paperheight
+\ConvertToCount\cnt@paperwidth\paperwidth
+\ConvertToCount\cnt@paperheight\paperheight
+\newcount\cnt@hoffset
+\newcount\cnt@voffset
+\ConvertToCount\cnt@hoffset\hoffset
+\ConvertToCount\cnt@voffset\voffset
+\newcount\cnt@textheight
+\newcount\cnt@textwidth
+\newcount\cnt@topmargin
+\newcount\cnt@oddsidemargin
+\newcount\cnt@evensidemargin
+\newcount\cnt@headheight
+\newcount\cnt@headsep
+\newcount\cnt@marginparsep
+\newcount\cnt@marginparwidth
+\newcount\cnt@marginparpush
+\newcount\cnt@footskip
+\newcount\fheight
+\fheight=12
+\newcount\ref@top
+\ref@top=\cnt@paperheight \advance\ref@top by -\oneinch
+\newcount\ref@hoffset
+\newcount\ref@voffset
+\ref@hoffset=\cnt@hoffset  \advance\cnt@hoffset by \oneinch
+\ref@voffset=\cnt@voffset
+\cnt@voffset=\ref@top
+\advance\cnt@voffset by -\ref@voffset
+\newcount\ref@head
+\newcount\ref@body
+\newcount\ref@foot
+\newcount\ref@margin
+\newcount\ref@marginwidth
+\newcount\ref@marginpar
+\newcount\Interval
+\newcount\ExtraYPos
+\newcount\PositionX
+\newcount\PositionY
+\newcount\ArrowLength
+\def\lay@getvalues{%
+  \ConvertToCount\cnt@textheight\textheight
+  \ConvertToCount\cnt@textwidth\textwidth
+  \ConvertToCount\cnt@topmargin\topmargin
+  \ConvertToCount\cnt@oddsidemargin\oddsidemargin
+  \ConvertToCount\cnt@evensidemargin\evensidemargin
+  \ConvertToCount\cnt@headheight\headheight
+  \ConvertToCount\cnt@headsep\headsep
+  \ConvertToCount\cnt@marginparsep\marginparsep
+  \ConvertToCount\cnt@marginparwidth\marginparwidth
+  \ConvertToCount\cnt@marginparpush\marginparpush
+  \ConvertToCount\cnt@footskip\footskip
+  \ref@head=\ref@top
+    \advance\ref@head by -\ref@voffset
+    \advance\ref@head by -\cnt@topmargin
+    \advance\ref@head by -\cnt@headheight
+  \ref@body=\ref@head
+    \advance\ref@body by -\cnt@headsep
+    \advance\ref@body by -\cnt@textheight
+  \ref@foot=\ref@body
+    \advance\ref@foot by -\cnt@footskip
+  }
+\AtBeginDocument{\lay@getvalues}
+\newcommand\layout{%
+  \@ifstar{\lay@getvalues\lay@xlayout}{\lay@xlayout}}
+\def\lay@xlayout{%
+  \lay@layout
+  \if@twoside
+    \lay@layout
+  \fi}
+\newcommand\lay@layout{%
+  \thispagestyle{empty}
+  \if@twoside
+    \ifodd\count\z@
+      \typeout{Two-sided document style, odd page.}
+      \ref@marginwidth=\cnt@oddsidemargin
+      \ref@marginpar=\oneinch
+      \advance\ref@marginpar by \ref@hoffset
+      \advance\ref@marginpar by \cnt@oddsidemargin
+      \ref@margin\ref@marginpar
+      \if@reversemargin
+        \advance\ref@marginpar by -\cnt@marginparsep
+        \advance\ref@marginpar by -\cnt@marginparwidth
+      \else
+        \advance\ref@marginpar by \cnt@textwidth
+        \advance\ref@marginpar by \cnt@marginparsep
+      \fi
+    \else
+  \typeout{Two-sided document style, even page.}
+      \ref@marginwidth=\cnt@evensidemargin
+      \ref@marginpar=\oneinch
+      \advance\ref@marginpar by \ref@hoffset
+      \advance\ref@marginpar by \cnt@evensidemargin
+      \ref@margin\ref@marginpar
+      \if@reversemargin
+        \advance\ref@marginpar by \cnt@textwidth
+        \advance\ref@marginpar by \cnt@marginparsep
+      \else
+        \advance\ref@marginpar by -\cnt@marginparsep
+        \advance\ref@marginpar by -\cnt@marginparwidth
+      \fi
+    \fi
+  \else
+    \typeout{One-sided document style.}
+    \ref@marginwidth=\cnt@oddsidemargin
+    \ref@marginpar=\oneinch
+    \advance\ref@marginpar by \ref@hoffset
+    \advance\ref@marginpar by \cnt@oddsidemargin
+    \ref@margin\ref@marginpar
+    \if@reversemargin
+      \advance\ref@marginpar by -\cnt@marginparsep
+      \advance\ref@marginpar by -\cnt@marginparwidth
+    \else
+      \advance\ref@marginpar by \cnt@textwidth
+      \advance\ref@marginpar by \cnt@marginparsep
+    \fi
+  \fi
+  \setlength{\unitlength}{.5pt}
+  \begin{picture}(\cnt@paperwidth,\cnt@paperheight)
+    \centering
+    \thicklines
+    \put(0,0){\framebox(\cnt@paperwidth,\cnt@paperheight){\mbox{}}}
+    \put(0,\cnt@voffset){\dashbox{10}(\cnt@paperwidth,0){\mbox{}}}
+    \put(\cnt@hoffset,0){\dashbox{10}(0,\cnt@paperheight){\mbox{}}}
+    \put(\ref@margin,\ref@head){%
+      \framebox(\cnt@textwidth,\cnt@headheight)%
+        {\footnotesize\Headertext}}
+    \put(\ref@margin,\ref@body){%
+      \framebox(\cnt@textwidth,\cnt@textheight){\Bodytext}}
+    \put(\ref@margin,\ref@foot){%
+      \framebox(\cnt@textwidth,\fheight){\footnotesize\Footertext}}
+    \put(\ref@marginpar,\ref@body){%
+      \framebox(\cnt@marginparwidth,\cnt@textheight)%
+               {\footnotesize\shortstack{\MarginNotestext}}}
+    \thinlines
+    \SetToHalf\PositionX\cnt@textwidth
+    \advance\PositionX by \ref@margin
+    \PositionY = \ref@body
+    \advance\PositionY by 50
+    \Identify{8}
+    \InsideHArrow\cnt@textwidth
+    \SetToHalf\PositionY\cnt@textheight
+    \advance\PositionY by \ref@body
+    \PositionX = \cnt@textwidth
+    \divide\PositionX by 5
+    \multiply \PositionX by 4
+    \advance\PositionX by \ref@margin
+    \Identify{7}
+    \InsideVArrow\cnt@textheight
+    \PositionY = 50
+    \SetToHalf\PositionX\cnt@hoffset
+    \Identify{1}
+    \InsideHArrow\cnt@hoffset
+    \SetToQuart\PositionY\cnt@textheight
+    \advance\PositionY by \ref@body
+    \ifnum\ref@marginwidth > 0
+      \OutsideHArrow\ref@margin\ref@marginwidth{20}
+      \PositionX = \cnt@hoffset
+    \else
+      \OutsideHArrow\cnt@hoffset{-\ref@marginwidth}{20}
+      \PositionX = \ref@margin
+    \fi
+    \advance\PositionX by -30
+    \Identify{3}
+    \SetToQuart\PositionY\cnt@textheight
+    \advance\PositionY by \ref@body
+    \advance\PositionY by 30
+    \SetToHalf\PositionX\cnt@marginparwidth
+    \advance\PositionX by \ref@marginpar
+    \Identify{10}
+    \InsideHArrow\cnt@marginparwidth
+    \advance\PositionY by 30
+    \if@twoside
+      \if@reversemargin
+        \ifodd\count\z@
+          \OutsideHArrow\ref@margin\cnt@marginparsep{20}
+          \PositionX = \ref@margin
+        \else
+          \OutsideHArrow\ref@marginpar\cnt@marginparsep{20}
+          \PositionX = \ref@marginpar
+        \fi
+      \else
+        \ifodd\count\z@
+          \OutsideHArrow\ref@marginpar\cnt@marginparsep{20}
+          \PositionX = \ref@marginpar
+        \else
+          \OutsideHArrow\ref@margin\cnt@marginparsep{20}
+          \PositionX = \ref@margin
+        \fi
+      \fi
+    \else
+      \if@reversemargin
+        \OutsideHArrow\ref@margin\cnt@marginparsep{20}
+        \PositionX = \ref@margin
+      \else
+        \OutsideHArrow\ref@marginpar\cnt@marginparsep{20}
+        \PositionX = \ref@marginpar
+      \fi
+    \fi
+    \advance\PositionX by -\cnt@marginparsep
+    \advance\PositionX by -30
+    \Identify{9}
+    \PositionX = \cnt@textwidth
+    \divide\PositionX by 8
+    \advance\PositionX by \ref@margin
+    \OutsideVArrow\ref@foot\cnt@footskip{20}{20}
+    \PositionY = \ref@foot
+    \advance\PositionY by \cnt@footskip
+    \advance\PositionY by 30
+    \Identify{11}
+    \PositionX = \cnt@paperwidth
+    \advance\PositionX by -50
+    \PositionY = \cnt@paperheight
+    \ExtraYPos = \PositionY
+    \advance\ExtraYPos by -\cnt@voffset
+    \advance\PositionY by \cnt@voffset
+    \divide\PositionY by \tw@
+    \Identify{2}
+    \InsideVArrow\ExtraYPos
+    \Interval = \cnt@textwidth
+    \divide\Interval by 8
+    \PositionX = \ref@margin
+    \advance\PositionX by \Interval
+    \ifnum\cnt@topmargin > \z@
+      \ExtraYPos = \ref@head
+      \advance\ExtraYPos\cnt@headheight
+      \OutsideVArrow\ExtraYPos\cnt@topmargin{20}{20}
+      \PositionY = \ExtraYPos
+      \advance\PositionY by \cnt@topmargin
+    \else
+      \ExtraYPos = \cnt@voffset
+      \OutsideVArrow\ExtraYPos{-\cnt@topmargin}{20}{20}
+      \PositionY = \ExtraYPos
+      \advance\PositionY by -\cnt@topmargin
+    \fi
+    \advance\PositionY by 30
+    \Identify{4}
+    \advance\PositionX by \Interval
+    \OutsideVArrow\ref@head\cnt@headheight{20}{20}
+    \PositionY = \ref@head
+    \advance\PositionY by \cnt@headheight
+    \advance\PositionY by 30
+    \Identify{5}
+    \advance\PositionX by \Interval
+    \ExtraYPos=\ref@body
+    \advance\ExtraYPos\cnt@textheight
+    \OutsideVArrow\ExtraYPos\cnt@headsep{20}{20}
+    \PositionY = \ref@body
+    \advance\PositionY by \cnt@textheight
+    \advance\PositionY by -30
+    \Identify{6}
+  \end{picture}
+
+  \medskip
+  \vtop to 0pt{%
+    \@minipagerestore\footnotesize\ttfamily
+    \begin{tabular}{@{}rl@{\hspace{20pt}}rl}
+      1 & \oneinchtext\ + \LayOutbs\texttt{hoffset}
+        & 2 & \oneinchtext\ + \LayOutbs\texttt{voffset} \\
+      3 & \if@twoside
+            \ifodd\count\z@ \Show{cnt}{oddsidemargin}
+            \else \Show{cnt}{evensidemargin}
+            \fi
+          \else
+            \Show{cnt}{oddsidemargin}
+          \fi                    & 4 & \Show{cnt}{topmargin} \\
+      5 & \Show{cnt}{headheight} & 6 & \Show{cnt}{headsep} \\
+      7 & \Show{cnt}{textheight} & 8 & \Show{cnt}{textwidth} \\
+      9 & \Show{cnt}{marginparsep}&10& \Show{cnt}{marginparwidth} \\
+      11& \Show{cnt}{footskip}   &   & \Show{cnt}{marginparpush}
+       \rlap{(\notshown)}\\
+        & \Show{ref}{hoffset}    &   & \Show{ref}{voffset} \\
+        & \Show{cnt}{paperwidth} &   & \Show{cnt}{paperheight} \\
+
+  \end{tabular}\vss}
+  \Type{ref}{hoffset}
+  \Type{ref}{voffset}
+  \Type{cnt}{textheight}
+  \Type{cnt}{textwidth}
+  \newpage
+}
+\endinput
+%%
+%% End of file `layout.sty'.
diff --git a/Master/texmf-dist/tex/latex-dev/tools/q.tex b/Master/texmf-dist/tex/latex-dev/tools/q.tex
new file mode 100644
index 00000000000..3b11a43450c
--- /dev/null
+++ b/Master/texmf-dist/tex/latex-dev/tools/q.tex
@@ -0,0 +1,42 @@
+%%
+%% This is file `q.tex',
+%% generated with the docstrip utility.
+%%
+%% The original source files were:
+%%
+%% fileerr.dtx  (with options: `batch')
+%% 
+%% This is a generated file.
+%% 
+%% 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-2020
+%% The LaTeX3 Project and any individual authors listed elsewhere
+%% in this file.
+%% 
+%% This file was generated from file(s) 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
+%% version 2005/12/01 or later.
+%% 
+%% This file may only be distributed together with a copy of the LaTeX
+%% `Tools Bundle'. You may however distribute the LaTeX `Tools Bundle'
+%% without such generated files.
+%% 
+%% The list of all files belonging to the LaTeX `Tools Bundle' is
+%% given in the file `manifest.txt'.
+%% 
+ \message{File ignored}
+             \batchmode
+\endinput
+%%
+%% End of file `q.tex'.
diff --git a/Master/texmf-dist/tex/latex-dev/tools/r.tex b/Master/texmf-dist/tex/latex-dev/tools/r.tex
new file mode 100644
index 00000000000..80ef9281fd3
--- /dev/null
+++ b/Master/texmf-dist/tex/latex-dev/tools/r.tex
@@ -0,0 +1,42 @@
+%%
+%% This is file `r.tex',
+%% generated with the docstrip utility.
+%%
+%% The original source files were:
+%%
+%% fileerr.dtx  (with options: `run')
+%% 
+%% This is a generated file.
+%% 
+%% 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-2020
+%% The LaTeX3 Project and any individual authors listed elsewhere
+%% in this file.
+%% 
+%% This file was generated from file(s) 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
+%% version 2005/12/01 or later.
+%% 
+%% This file may only be distributed together with a copy of the LaTeX
+%% `Tools Bundle'. You may however distribute the LaTeX `Tools Bundle'
+%% without such generated files.
+%% 
+%% The list of all files belonging to the LaTeX `Tools Bundle' is
+%% given in the file `manifest.txt'.
+%% 
+ \message{File ignored}
+               \nonstopmode
+\endinput
+%%
+%% End of file `r.tex'.
diff --git a/Master/texmf-dist/tex/latex-dev/tools/s.tex b/Master/texmf-dist/tex/latex-dev/tools/s.tex
new file mode 100644
index 00000000000..a2efe1d35f9
--- /dev/null
+++ b/Master/texmf-dist/tex/latex-dev/tools/s.tex
@@ -0,0 +1,42 @@
+%%
+%% This is file `s.tex',
+%% generated with the docstrip utility.
+%%
+%% The original source files were:
+%%
+%% fileerr.dtx  (with options: `scroll')
+%% 
+%% This is a generated file.
+%% 
+%% 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-2020
+%% The LaTeX3 Project and any individual authors listed elsewhere
+%% in this file.
+%% 
+%% This file was generated from file(s) 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
+%% version 2005/12/01 or later.
+%% 
+%% This file may only be distributed together with a copy of the LaTeX
+%% `Tools Bundle'. You may however distribute the LaTeX `Tools Bundle'
+%% without such generated files.
+%% 
+%% The list of all files belonging to the LaTeX `Tools Bundle' is
+%% given in the file `manifest.txt'.
+%% 
+ \message{File ignored}
+            \scrollmode
+\endinput
+%%
+%% End of file `s.tex'.
diff --git a/Master/texmf-dist/tex/latex-dev/tools/shellesc.sty b/Master/texmf-dist/tex/latex-dev/tools/shellesc.sty
new file mode 100644
index 00000000000..a898d013712
--- /dev/null
+++ b/Master/texmf-dist/tex/latex-dev/tools/shellesc.sty
@@ -0,0 +1,132 @@
+%%
+%% This is file `shellesc.sty',
+%% generated with the docstrip utility.
+%%
+%% The original source files were:
+%%
+%% shellesc.dtx  (with options: `package')
+%% 
+%% This is a generated file.
+%% 
+%% 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-2020
+%% The LaTeX3 Project and any individual authors listed elsewhere
+%% in this file.
+%% 
+%% This file was generated from file(s) 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
+%% version 2005/12/01 or later.
+%% 
+%% This file may only be distributed together with a copy of the LaTeX
+%% `Tools Bundle'. You may however distribute the LaTeX `Tools Bundle'
+%% without such generated files.
+%% 
+%% The list of all files belonging to the LaTeX `Tools Bundle' is
+%% given in the file `manifest.txt'.
+%% 
+%% Source File: shellesc.dtx
+%% Copyright (C) 2015-2020
+%%
+%% The LaTeX3 Project and any individual authors listed elsewhere
+%% in this file.
+%%
+%% This file may be distributed under the terms of the LPPL.
+%% See README for details.
+\ifx\ProvidesPackage\undefined
+\def\next#1#2[#3]{\wlog{#2 #3}}
+\ifx\PackageInfo\undefined\def\PackageInfo#1#2{\wlog{#1: #2}}\fi
+\ifx\PackageWarning\undefined\def\PackageWarning#1#2{\wlog{#1: #2}}\fi
+\expandafter\next\fi
+\ProvidesPackage{shellesc}
+       [2019/11/08 v1.0c unified shell escape interface for LaTeX]
+\chardef\shellesc@quotecat\catcode`\"
+\chardef\shellesc@underscorecat\catcode`\_
+\@makeother\"
+\@makeother\_
+\chardef\ShellEscapeStatus
+  \ifx\pdfshellescape\@undefined
+    \ifx\shellescape\@undefined
+      \ifx\directlua\@undefined
+        \z@
+      \else
+        \directlua{%
+          tex.sprint((status.shell_escape or os.execute()) .. " ")}
+      \fi
+    \else
+      \shellescape
+    \fi
+  \else
+    \pdfshellescape
+  \fi
+\ifcase\ShellEscapeStatus
+  \PackageWarning{shellesc}{Shell escape disabled}
+\or
+  \PackageInfo   {shellesc}{Unrestricted shell escape enabled}
+\else
+  \PackageInfo   {shellesc}{Restricted shell escape enabled}
+\fi
+\ifx\lastsavedimageresourcepages\@undefined
+  \protected\def\ShellEscape{\immediate\write18 }
+\else
+  \protected\def\ShellEscape{\directlua\ShellEscape@Lua}
+\fi
+\ifx\lastsavedimageresourcepages\@undefined
+  \protected\def\DelayedShellEscape{\relax\write18 }
+\else
+  \protected\def\DelayedShellEscape{\latelua\ShellEscape@Lua}
+\fi
+\ifx\directlua\@undefined\else
+\protected\def\ShellEscape@Lua#1{{%
+local status, msg = os.execute("\luaescapestring{#1}")%
+if status == nil then
+    texio.write_nl("log",%
+      "runsystem(" .. "\luaescapestring{#1}"%
+       .. ")...(" .. msg .. ")\string\n")
+  elseif status == 0 then
+    texio.write_nl("log",%
+      "runsystem(" .. "\luaescapestring{#1}"%
+      .. ")...executed\string\n")
+  else
+    texio.write_nl("log",%
+      "runsystem(" .. "\luaescapestring{#1}"%
+       .. ")...failed " .. (msg or "") .. "\string\n")
+  end
+}}
+\fi
+\ifx\lastsavedimageresourcepages\@undefined
+ \catcode`\"\shellesc@quotecat
+ \catcode`\_\shellesc@underscorecat
+ \expandafter\endinput
+\fi
+\directlua{%
+shellesc = shellesc or {}
+local function write_or_execute()
+  local s = token.scan_int()
+  if (s==18) then
+     tex.sprint(\the\numexpr\catcodetable@atletter\relax,
+                "\string\\ShellEscape ")
+  else
+     tex.sprint(\the\numexpr\catcodetable@atletter\relax,
+                "\string\\shellesc@write " .. s)
+  end
+end
+shellesc.write_or_execute=write_or_execute
+}
+\let\shellesc@write\write
+\protected\def\write{\directlua{shellesc.write_or_execute()}}
+\catcode`\"\shellesc@quotecat
+\catcode`\_\shellesc@underscorecat
+\endinput
+%%
+%% End of file `shellesc.sty'.
diff --git a/Master/texmf-dist/tex/latex-dev/tools/trace.sty b/Master/texmf-dist/tex/latex-dev/tools/trace.sty
new file mode 100644
index 00000000000..7796b5d71ab
--- /dev/null
+++ b/Master/texmf-dist/tex/latex-dev/tools/trace.sty
@@ -0,0 +1,141 @@
+%%
+%% This is file `trace.sty',
+%% generated with the docstrip utility.
+%%
+%% The original source files were:
+%%
+%% trace.dtx  (with options: `package')
+%% 
+%% This is a generated file.
+%% 
+%% 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-2020
+%% The LaTeX3 Project and any individual authors listed elsewhere
+%% in this file.
+%% 
+%% This file was generated from file(s) 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
+%% version 2005/12/01 or later.
+%% 
+%% This file may only be distributed together with a copy of the LaTeX
+%% `Tools Bundle'. You may however distribute the LaTeX `Tools Bundle'
+%% without such generated files.
+%% 
+%% The list of all files belonging to the LaTeX `Tools Bundle' is
+%% given in the file `manifest.txt'.
+%% 
+%%
+%% (C) Copyright (C) 1999-2019 Frank Mittelbach
+%% All rights reserved.
+%%
+\NeedsTeXFormat{LaTeX2e}
+\ProvidesPackage{trace}
+          [2018/10/13 v1.1e trace LaTeX code]
+\NeedsTeXFormat{LaTeX2e}[1998/12/01]
+\DeclareOption{logonly}
+   {\let\tracingonline@p\z@}
+\let\tracingonline@p\@ne
+\DeclareOption{full}
+    {\AtEndOfPackage{\let\conditionally@traceoff\@empty
+                     \let\conditionally@traceon\@empty
+                     \let\traceon\tr@ce@n
+    }}
+\ProcessOptions\relax
+\newif\if@tracing
+\def\traceon{\let\conditionally@traceoff\unconditionally@traceoff
+             \tr@ce@n}
+
+%% \tracinglostchars\z@
+  \def\tr@ce@n{%
+    \@tracingtrue
+    \tracingstats\tw@
+    \tracingpages\@ne
+    \tracinglostchars\@ne
+    \tracingparagraphs\@ne
+    \errorcontextlines\maxdimen
+    \ifnum\tracingoutput=\@ne
+    \else
+      \tracingoutput\tw@
+      \showboxbreadth\maxdimen
+      \showboxdepth\maxdimen
+    \fi
+    \errorstopmode
+    \tracingmacros\tw@
+    \tracinggroups\@ne
+    \tracingrestores\@ne
+    \tracingcommands\tw@
+    \tracingassigns\@ne
+    \tracingonline\tracingonline@p
+  }
+  \def\conditionally@traceoff{%
+    \tracingassigns\z@
+    \tracingrestores\z@
+    \tracingcommands\z@
+    \tracingpages\z@
+    \tracingmacros\z@
+    \ifnum\tracingoutput=\tw@
+      \tracingoutput\z@
+      \showboxbreadth\m@ne
+      \showboxdepth\m@ne
+    \fi
+    \tracingstats\@ne
+    \tracingparagraphs\z@
+    \tracinggroups\z@
+  }
+\let\unconditionally@traceoff\conditionally@traceoff
+\def\tracingall{\let\conditionally@traceoff\@empty
+  \let\tracingonline@p\@ne
+  \tr@ce@n
+}
+\def\traceoff{\unconditionally@traceoff \@tracingfalse}
+\def\conditionally@traceon{\if@tracing \expandafter \traceon \fi}
+\def\calc@open({\begingroup
+   \conditionally@traceoff
+   \aftergroup\calc@initB
+   \begingroup\aftergroup\calc@initB
+   \calc@pre@scan}
+\def\define@newfont{%
+  \begingroup
+    \conditionally@traceoff
+    \let\typeout\@font@info
+    \escapechar\m@ne
+    \expandafter\expandafter\expandafter
+       \split@name\expandafter\string\font@name\@nil
+      \try@load@fontshape % try always
+    \expandafter\ifx
+       \csname\curr@fontshape\endcsname \relax
+      \wrong@fontshape\else
+      \extract@font\fi
+  \endgroup}
+\frozen@everymath =
+   {\conditionally@traceoff \check@mathfonts \conditionally@traceon
+    \the\everymath}
+\frozen@everydisplay =
+   {\conditionally@traceoff \check@mathfonts \conditionally@traceon
+    \the\everydisplay}
+\def \maybe@ic@ {%
+  \ifdim \fontdimen\@ne\font>\z@
+  \else
+    \conditionally@traceoff
+    \maybe@ictrue
+    \expandafter\@tfor\expandafter\reserved@a\expandafter:\expandafter=%
+        \nocorrlist
+    \do \t@st@ic
+    \ifmaybe@ic \sw@slant \fi
+    \conditionally@traceon
+  \fi
+}
+\endinput
+%%
+%% End of file `trace.sty'.
diff --git a/Master/texmf-dist/tex/latex-dev/tools/x.tex b/Master/texmf-dist/tex/latex-dev/tools/x.tex
new file mode 100644
index 00000000000..70293e61738
--- /dev/null
+++ b/Master/texmf-dist/tex/latex-dev/tools/x.tex
@@ -0,0 +1,41 @@
+%%
+%% This is file `x.tex',
+%% generated with the docstrip utility.
+%%
+%% The original source files were:
+%%
+%% fileerr.dtx  (with options: `exit')
+%% 
+%% This is a generated file.
+%% 
+%% 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-2020
+%% The LaTeX3 Project and any individual authors listed elsewhere
+%% in this file.
+%% 
+%% This file was generated from file(s) 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
+%% version 2005/12/01 or later.
+%% 
+%% This file may only be distributed together with a copy of the LaTeX
+%% `Tools Bundle'. You may however distribute the LaTeX `Tools Bundle'
+%% without such generated files.
+%% 
+%% The list of all files belonging to the LaTeX `Tools Bundle' is
+%% given in the file `manifest.txt'.
+%% 
+  \batchmode \errmessage{}\csname @@end\endcsname \end
+\endinput
+%%
+%% End of file `x.tex'.
diff --git a/Master/texmf-dist/tex/latex-dev/tools/xr.sty b/Master/texmf-dist/tex/latex-dev/tools/xr.sty
index 0344f194e3d..41aba6c624b 100644
--- a/Master/texmf-dist/tex/latex-dev/tools/xr.sty
+++ b/Master/texmf-dist/tex/latex-dev/tools/xr.sty
@@ -38,13 +38,14 @@
 %% File: xr.dtx Copyright (C) 1993-2019 David Carlisle
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesPackage{xr}
-         [2019/07/22 v5.05 eXternal References (DPC)]
+         [2020-05-10 v5.06 eXternal References (DPC)]
 \def\externaldocument{\@ifnextchar[\XR@{\XR@[]}}
 \let\externalcitedocument\externaldocument
 \def\XR@[#1]#2{{%
   \makeatletter
   \def\XR@prefix{#1}%
-  \XR@next#2.aux\relax\\}}
+  \set@curr@file@trim@spaces{#2}%
+  \expandafter\XR@next\@curr@file.aux\relax\\}}
 \def\XR@next#1\relax#2\\{%
   \edef\XR@list{#2}%
   \XR@loop{#1}}
@@ -52,7 +53,7 @@
   \ifx\XR@list\@empty\else\expandafter\XR@explist\fi}
 
 \def\XR@explist{\expandafter\XR@next\XR@list\\}
-\def\XR@loop#1{\openin\@inputcheck#1\relax
+\def\XR@loop#1{\openin\@inputcheck{#1}\relax
   \ifeof\@inputcheck
     \PackageWarning{xr}{^^JNo file #1^^JLABELS NOT IMPORTED.^^J}%
     \expandafter\XR@aux