diff options
Diffstat (limited to 'Master/texmf-dist/tex')
226 files changed, 10315 insertions, 1465 deletions
diff --git a/Master/texmf-dist/tex/latex/base/alltt.sty b/Master/texmf-dist/tex/latex/base/alltt.sty index be1a5277dc8..21591058bc2 100644 --- a/Master/texmf-dist/tex/latex/base/alltt.sty +++ b/Master/texmf-dist/tex/latex/base/alltt.sty @@ -13,8 +13,8 @@ %% (but please observe conditions on bug reports sent to that address!) %% %% -%% Copyright (C) 1993-2020 -%% The LaTeX3 Project and any individual authors listed elsewhere +%% Copyright (C) 1993-2021 +%% The LaTeX Project and any individual authors listed elsewhere %% in this file. %% %% This file was generated from file(s) of the LaTeX base system. @@ -44,12 +44,12 @@ %% %% File `alltt.dtx'. %% Copyright (C) 1987 by Leslie Lamport -%% Copyright (C) 1994--1997 LaTeX3 project, Johannes Braams +%% Copyright (C) 1994-2021 LaTeX Project, Johannes Braams %% all rights reserved. %% \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{alltt} - [1997/06/16 v2.0g defines alltt environment] + [2021/01/29 v2.0g defines alltt environment] \begingroup \lccode`\~=`\' \lowercase{\endgroup diff --git a/Master/texmf-dist/tex/latex/base/ansinew.def b/Master/texmf-dist/tex/latex/base/ansinew.def index 33d64d13c22..240348a5b65 100644 --- a/Master/texmf-dist/tex/latex/base/ansinew.def +++ b/Master/texmf-dist/tex/latex/base/ansinew.def @@ -13,8 +13,8 @@ %% (but please observe conditions on bug reports sent to that address!) %% %% -%% Copyright (C) 1993-2020 -%% The LaTeX3 Project and any individual authors listed elsewhere +%% Copyright (C) 1993-2021 +%% The LaTeX Project and any individual authors listed elsewhere %% in this file. %% %% This file was generated from file(s) of the LaTeX base system. @@ -44,7 +44,7 @@ \ProvidesFile{ansinew.def} - [2020/08/01 v1.3d Input encoding file] + [2021/02/14 v1.3d Input encoding file] \ProvideTextCommandDefault{\textdegree}{\ensuremath{{^\circ}}} \ProvideTextCommandDefault{\textonehalf}{\ensuremath{\frac12}} \ProvideTextCommandDefault{\textonequarter}{\ensuremath{\frac14}} diff --git a/Master/texmf-dist/tex/latex/base/applemac.def b/Master/texmf-dist/tex/latex/base/applemac.def index 2e5ffe44afb..afffbb60c3f 100644 --- a/Master/texmf-dist/tex/latex/base/applemac.def +++ b/Master/texmf-dist/tex/latex/base/applemac.def @@ -13,8 +13,8 @@ %% (but please observe conditions on bug reports sent to that address!) %% %% -%% Copyright (C) 1993-2020 -%% The LaTeX3 Project and any individual authors listed elsewhere +%% Copyright (C) 1993-2021 +%% The LaTeX Project and any individual authors listed elsewhere %% in this file. %% %% This file was generated from file(s) of the LaTeX base system. @@ -44,7 +44,7 @@ \ProvidesFile{applemac.def} - [2020/08/01 v1.3d Input encoding file] + [2021/02/14 v1.3d Input encoding file] \ProvideTextCommandDefault{\textdegree}{\ensuremath{{^\circ}}} \ProvideTextCommandDefault{\textflorin}{\textit{f}} \ProvideTextCommandDefault{\textcent} diff --git a/Master/texmf-dist/tex/latex/base/article.cls b/Master/texmf-dist/tex/latex/base/article.cls index 024e49cf835..dcdec4055d7 100644 --- a/Master/texmf-dist/tex/latex/base/article.cls +++ b/Master/texmf-dist/tex/latex/base/article.cls @@ -13,8 +13,8 @@ %% (but please observe conditions on bug reports sent to that address!) %% %% -%% Copyright (C) 1993-2020 -%% The LaTeX3 Project and any individual authors listed elsewhere +%% Copyright (C) 1993-2021 +%% The LaTeX Project and any individual authors listed elsewhere %% in this file. %% %% This file was generated from file(s) of the LaTeX base system. @@ -43,7 +43,7 @@ %% extension .ins) which are part of the distribution. \NeedsTeXFormat{LaTeX2e}[1995/12/01] \ProvidesClass{article} - [2020/04/10 v1.4m + [2021/02/12 v1.4n Standard LaTeX document class] \newcommand\@ptsize{} \newif\if@restonecol @@ -355,7 +355,7 @@ \newcommand\labelitemi {\labelitemfont \textbullet} \newcommand\labelitemii {\labelitemfont \bfseries \textendash} \newcommand\labelitemiii{\labelitemfont \textasteriskcentered} -\newcommand\labelitemiv{ \labelitemfont \textperiodcentered} +\newcommand\labelitemiv {\labelitemfont \textperiodcentered} \newcommand\labelitemfont{\normalfont} \newenvironment{description} {\list{}{\labelwidth\z@ \itemindent-\leftmargin diff --git a/Master/texmf-dist/tex/latex/base/article.sty b/Master/texmf-dist/tex/latex/base/article.sty index f0b491dc4af..4d417986b0b 100644 --- a/Master/texmf-dist/tex/latex/base/article.sty +++ b/Master/texmf-dist/tex/latex/base/article.sty @@ -13,8 +13,8 @@ %% (but please observe conditions on bug reports sent to that address!) %% %% -%% Copyright (C) 1993-2020 -%% The LaTeX3 Project and any individual authors listed elsewhere +%% Copyright (C) 1993-2021 +%% The LaTeX Project and any individual authors listed elsewhere %% in this file. %% %% This file was generated from file(s) of the LaTeX base system. diff --git a/Master/texmf-dist/tex/latex/base/ascii.def b/Master/texmf-dist/tex/latex/base/ascii.def index ad9dabcaf17..51d807cde83 100644 --- a/Master/texmf-dist/tex/latex/base/ascii.def +++ b/Master/texmf-dist/tex/latex/base/ascii.def @@ -13,8 +13,8 @@ %% (but please observe conditions on bug reports sent to that address!) %% %% -%% Copyright (C) 1993-2020 -%% The LaTeX3 Project and any individual authors listed elsewhere +%% Copyright (C) 1993-2021 +%% The LaTeX Project and any individual authors listed elsewhere %% in this file. %% %% This file was generated from file(s) of the LaTeX base system. @@ -44,7 +44,7 @@ \ProvidesFile{ascii.def} - [2020/08/01 v1.3d Input encoding file] + [2021/02/14 v1.3d Input encoding file] \@inpenc@test \endinput %% diff --git a/Master/texmf-dist/tex/latex/base/atbegshi-ltx.sty b/Master/texmf-dist/tex/latex/base/atbegshi-ltx.sty index 28a8f04f6ee..672479a434c 100644 --- a/Master/texmf-dist/tex/latex/base/atbegshi-ltx.sty +++ b/Master/texmf-dist/tex/latex/base/atbegshi-ltx.sty @@ -13,8 +13,8 @@ %% (but please observe conditions on bug reports sent to that address!) %% %% -%% Copyright (C) 1993-2020 -%% The LaTeX3 Project and any individual authors listed elsewhere +%% Copyright (C) 1993-2021 +%% The LaTeX Project and any individual authors listed elsewhere %% in this file. %% %% This file was generated from file(s) of the LaTeX base system. @@ -42,14 +42,15 @@ %% and covered by LPPL is defined by the unpacking scripts (with %% extension .ins) which are part of the distribution. %% -%% File: ltshipout.dtx (C) Copyright 2020 Frank Mittelbach, LaTeX Team +%% Copyright (C) 2020-2021 +%% Frank Mittelbach, LaTeX Team %% %%% From File: ltshipout.dtx -\providecommand\ltshipoutversion{v1.0d} -\providecommand\ltshipoutdate{2020/11/24} +\providecommand\ltshipoutversion{v1.0i} +\providecommand\ltshipoutdate{2021/03/17} \ProvidesPackage{atbegshi-ltx} - [2020/08/17 v1.0a - Emulation of the original atbegshi package^^Jwith kernel methods] + [2021/01/10 v1.0c + Emulation of the original atbegshi^^Jpackage with kernel methods] \let \AtBeginShipoutBox \ShipoutBox \let \AtBeginShipoutInit \@empty \protected \def \AtBeginShipout {\AddToHook{shipout/before}} @@ -66,6 +67,7 @@ \let \AtBeginShipoutUpperLeftForeground \@expl@@@shipout@add@foreground@picture@@n \ExplSyntaxOn +\cs_new_eq:NN \AtBeginShipoutOriginalShipout \tex_shipout:D \cs_new:Npn \ShipoutBoxHeight { \dim_use:N \l_shipout_box_ht_dim } \cs_new:Npn \ShipoutBoxDepth { \dim_use:N \l_shipout_box_dp_dim } \cs_new:Npn \ShipoutBoxWidth { \dim_use:N \l_shipout_box_wd_dim } diff --git a/Master/texmf-dist/tex/latex/base/atveryend-ltx.sty b/Master/texmf-dist/tex/latex/base/atveryend-ltx.sty index 23954f055ca..d2ef0cbd8d7 100644 --- a/Master/texmf-dist/tex/latex/base/atveryend-ltx.sty +++ b/Master/texmf-dist/tex/latex/base/atveryend-ltx.sty @@ -13,8 +13,8 @@ %% (but please observe conditions on bug reports sent to that address!) %% %% -%% Copyright (C) 1993-2020 -%% The LaTeX3 Project and any individual authors listed elsewhere +%% Copyright (C) 1993-2021 +%% The LaTeX Project and any individual authors listed elsewhere %% in this file. %% %% This file was generated from file(s) of the LaTeX base system. @@ -41,12 +41,9 @@ %% The list of derived (unpacked) files belonging to the distribution %% and covered by LPPL is defined by the unpacking scripts (with %% extension .ins) which are part of the distribution. -%% -%% File: ltfilehook.dtx (C) Copyright 2020 Frank Mittelbach, -%% Phelype Oleinik & LaTeX Team %%% From File: ltfilehook.dtx -\providecommand\ltfilehookversion{v1.0e} -\providecommand\ltfilehookdate{2021/01/07} +\providecommand\ltfilehookversion{v1.0k} +\providecommand\ltfilehookdate{2021/05/25} \ProvidesPackage{atveryend-ltx} [2020/08/19 v1.0a Emulation of the original atvery package^^Jwith kernel methods] diff --git a/Master/texmf-dist/tex/latex/base/bezier.sty b/Master/texmf-dist/tex/latex/base/bezier.sty index 1d74f568913..81247a5d1ea 100644 --- a/Master/texmf-dist/tex/latex/base/bezier.sty +++ b/Master/texmf-dist/tex/latex/base/bezier.sty @@ -13,8 +13,8 @@ %% (but please observe conditions on bug reports sent to that address!) %% %% -%% Copyright (C) 1993-2020 -%% The LaTeX3 Project and any individual authors listed elsewhere +%% Copyright (C) 1993-2021 +%% The LaTeX Project and any individual authors listed elsewhere %% in this file. %% %% This file was generated from file(s) of the LaTeX base system. diff --git a/Master/texmf-dist/tex/latex/base/bk10.clo b/Master/texmf-dist/tex/latex/base/bk10.clo index da26bc70cf8..2c0f767465c 100644 --- a/Master/texmf-dist/tex/latex/base/bk10.clo +++ b/Master/texmf-dist/tex/latex/base/bk10.clo @@ -13,8 +13,8 @@ %% (but please observe conditions on bug reports sent to that address!) %% %% -%% Copyright (C) 1993-2020 -%% The LaTeX3 Project and any individual authors listed elsewhere +%% Copyright (C) 1993-2021 +%% The LaTeX Project and any individual authors listed elsewhere %% in this file. %% %% This file was generated from file(s) of the LaTeX base system. @@ -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} - [2020/04/10 v1.4m + [2021/02/12 v1.4n Standard LaTeX file (size option)] \renewcommand\normalsize{% \@setfontsize\normalsize\@xpt\@xiipt diff --git a/Master/texmf-dist/tex/latex/base/bk11.clo b/Master/texmf-dist/tex/latex/base/bk11.clo index 106db675aa6..1159de85bde 100644 --- a/Master/texmf-dist/tex/latex/base/bk11.clo +++ b/Master/texmf-dist/tex/latex/base/bk11.clo @@ -13,8 +13,8 @@ %% (but please observe conditions on bug reports sent to that address!) %% %% -%% Copyright (C) 1993-2020 -%% The LaTeX3 Project and any individual authors listed elsewhere +%% Copyright (C) 1993-2021 +%% The LaTeX Project and any individual authors listed elsewhere %% in this file. %% %% This file was generated from file(s) of the LaTeX base system. @@ -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} - [2020/04/10 v1.4m + [2021/02/12 v1.4n Standard LaTeX file (size option)] \renewcommand\normalsize{% \@setfontsize\normalsize\@xipt{13.6}% diff --git a/Master/texmf-dist/tex/latex/base/bk12.clo b/Master/texmf-dist/tex/latex/base/bk12.clo index 1f6bc54528b..0f9c2b473a9 100644 --- a/Master/texmf-dist/tex/latex/base/bk12.clo +++ b/Master/texmf-dist/tex/latex/base/bk12.clo @@ -13,8 +13,8 @@ %% (but please observe conditions on bug reports sent to that address!) %% %% -%% Copyright (C) 1993-2020 -%% The LaTeX3 Project and any individual authors listed elsewhere +%% Copyright (C) 1993-2021 +%% The LaTeX Project and any individual authors listed elsewhere %% in this file. %% %% This file was generated from file(s) of the LaTeX base system. @@ -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} - [2020/04/10 v1.4m + [2021/02/12 v1.4n Standard LaTeX file (size option)] \renewcommand\normalsize{% \@setfontsize\normalsize\@xiipt{14.5}% diff --git a/Master/texmf-dist/tex/latex/base/book.cls b/Master/texmf-dist/tex/latex/base/book.cls index 04ab96f3a11..fb4d4b16a28 100644 --- a/Master/texmf-dist/tex/latex/base/book.cls +++ b/Master/texmf-dist/tex/latex/base/book.cls @@ -13,8 +13,8 @@ %% (but please observe conditions on bug reports sent to that address!) %% %% -%% Copyright (C) 1993-2020 -%% The LaTeX3 Project and any individual authors listed elsewhere +%% Copyright (C) 1993-2021 +%% The LaTeX Project and any individual authors listed elsewhere %% in this file. %% %% This file was generated from file(s) of the LaTeX base system. @@ -43,7 +43,7 @@ %% extension .ins) which are part of the distribution. \NeedsTeXFormat{LaTeX2e}[1995/12/01] \ProvidesClass{book} - [2020/04/10 v1.4m + [2021/02/12 v1.4n Standard LaTeX document class] \newcommand\@ptsize{} \newif\if@restonecol @@ -457,7 +457,7 @@ \newcommand\labelitemi {\labelitemfont \textbullet} \newcommand\labelitemii {\labelitemfont \bfseries \textendash} \newcommand\labelitemiii{\labelitemfont \textasteriskcentered} -\newcommand\labelitemiv{ \labelitemfont \textperiodcentered} +\newcommand\labelitemiv {\labelitemfont \textperiodcentered} \newcommand\labelitemfont{\normalfont} \newenvironment{description} {\list{}{\labelwidth\z@ \itemindent-\leftmargin diff --git a/Master/texmf-dist/tex/latex/base/book.sty b/Master/texmf-dist/tex/latex/base/book.sty index f62b6631d54..ed98bc4ef8c 100644 --- a/Master/texmf-dist/tex/latex/base/book.sty +++ b/Master/texmf-dist/tex/latex/base/book.sty @@ -13,8 +13,8 @@ %% (but please observe conditions on bug reports sent to that address!) %% %% -%% Copyright (C) 1993-2020 -%% The LaTeX3 Project and any individual authors listed elsewhere +%% Copyright (C) 1993-2021 +%% The LaTeX Project and any individual authors listed elsewhere %% in this file. %% %% This file was generated from file(s) of the LaTeX base system. diff --git a/Master/texmf-dist/tex/latex/base/cp1250.def b/Master/texmf-dist/tex/latex/base/cp1250.def index 5abb61b3474..b2036392655 100644 --- a/Master/texmf-dist/tex/latex/base/cp1250.def +++ b/Master/texmf-dist/tex/latex/base/cp1250.def @@ -13,8 +13,8 @@ %% (but please observe conditions on bug reports sent to that address!) %% %% -%% Copyright (C) 1993-2020 -%% The LaTeX3 Project and any individual authors listed elsewhere +%% Copyright (C) 1993-2021 +%% The LaTeX Project and any individual authors listed elsewhere %% in this file. %% %% This file was generated from file(s) of the LaTeX base system. @@ -44,7 +44,7 @@ \ProvidesFile{cp1250.def} - [2020/08/01 v1.3d Input encoding file] + [2021/02/14 v1.3d Input encoding file] \ProvideTextCommandDefault{\textdegree}{\ensuremath{{^\circ}}} \ProvideTextCommandDefault{\textcurrency} {\TextSymbolUnavailable\textcurrency} diff --git a/Master/texmf-dist/tex/latex/base/cp1252.def b/Master/texmf-dist/tex/latex/base/cp1252.def index 030e195b356..811fa845bf4 100644 --- a/Master/texmf-dist/tex/latex/base/cp1252.def +++ b/Master/texmf-dist/tex/latex/base/cp1252.def @@ -13,8 +13,8 @@ %% (but please observe conditions on bug reports sent to that address!) %% %% -%% Copyright (C) 1993-2020 -%% The LaTeX3 Project and any individual authors listed elsewhere +%% Copyright (C) 1993-2021 +%% The LaTeX Project and any individual authors listed elsewhere %% in this file. %% %% This file was generated from file(s) of the LaTeX base system. @@ -44,7 +44,7 @@ \ProvidesFile{cp1252.def} - [2020/08/01 v1.3d Input encoding file] + [2021/02/14 v1.3d Input encoding file] \ProvideTextCommandDefault{\textdegree}{\ensuremath{{^\circ}}} \ProvideTextCommandDefault{\textonehalf}{\ensuremath{\frac12}} \ProvideTextCommandDefault{\textonequarter}{\ensuremath{\frac14}} diff --git a/Master/texmf-dist/tex/latex/base/cp1257.def b/Master/texmf-dist/tex/latex/base/cp1257.def index c43fdccd075..032caee7d3f 100644 --- a/Master/texmf-dist/tex/latex/base/cp1257.def +++ b/Master/texmf-dist/tex/latex/base/cp1257.def @@ -13,8 +13,8 @@ %% (but please observe conditions on bug reports sent to that address!) %% %% -%% Copyright (C) 1993-2020 -%% The LaTeX3 Project and any individual authors listed elsewhere +%% Copyright (C) 1993-2021 +%% The LaTeX Project and any individual authors listed elsewhere %% in this file. %% %% This file was generated from file(s) of the LaTeX base system. @@ -44,7 +44,7 @@ \ProvidesFile{cp1257.def} - [2020/08/01 v1.3d Input encoding file] + [2021/02/14 v1.3d Input encoding file] \ProvideTextCommandDefault{\textdegree}{\ensuremath{{^\circ}}} \ProvideTextCommandDefault{\textonehalf}{\ensuremath{\frac12}} \ProvideTextCommandDefault{\textonequarter}{\ensuremath{\frac14}} diff --git a/Master/texmf-dist/tex/latex/base/cp437.def b/Master/texmf-dist/tex/latex/base/cp437.def index 27acacdec92..4480f7610e4 100644 --- a/Master/texmf-dist/tex/latex/base/cp437.def +++ b/Master/texmf-dist/tex/latex/base/cp437.def @@ -13,8 +13,8 @@ %% (but please observe conditions on bug reports sent to that address!) %% %% -%% Copyright (C) 1993-2020 -%% The LaTeX3 Project and any individual authors listed elsewhere +%% Copyright (C) 1993-2021 +%% The LaTeX Project and any individual authors listed elsewhere %% in this file. %% %% This file was generated from file(s) of the LaTeX base system. @@ -44,7 +44,7 @@ \ProvidesFile{cp437.def} - [2020/08/01 v1.3d Input encoding file] + [2021/02/14 v1.3d Input encoding file] \ProvideTextCommandDefault{\textdegree}{\ensuremath{{^\circ}}} \ProvideTextCommandDefault{\textflorin}{\textit{f}} \ProvideTextCommandDefault{\textpeseta}{Pt} diff --git a/Master/texmf-dist/tex/latex/base/cp437de.def b/Master/texmf-dist/tex/latex/base/cp437de.def index ae78fc6d6ce..acc5a6a62a5 100644 --- a/Master/texmf-dist/tex/latex/base/cp437de.def +++ b/Master/texmf-dist/tex/latex/base/cp437de.def @@ -13,8 +13,8 @@ %% (but please observe conditions on bug reports sent to that address!) %% %% -%% Copyright (C) 1993-2020 -%% The LaTeX3 Project and any individual authors listed elsewhere +%% Copyright (C) 1993-2021 +%% The LaTeX Project and any individual authors listed elsewhere %% in this file. %% %% This file was generated from file(s) of the LaTeX base system. @@ -44,7 +44,7 @@ \ProvidesFile{cp437de.def} - [2020/08/01 v1.3d Input encoding file] + [2021/02/14 v1.3d Input encoding file] \ProvideTextCommandDefault{\textdegree}{\ensuremath{{^\circ}}} \ProvideTextCommandDefault{\textflorin}{\textit{f}} \ProvideTextCommandDefault{\textpeseta}{Pt} diff --git a/Master/texmf-dist/tex/latex/base/cp850.def b/Master/texmf-dist/tex/latex/base/cp850.def index d138dd3790a..7f6661530af 100644 --- a/Master/texmf-dist/tex/latex/base/cp850.def +++ b/Master/texmf-dist/tex/latex/base/cp850.def @@ -13,8 +13,8 @@ %% (but please observe conditions on bug reports sent to that address!) %% %% -%% Copyright (C) 1993-2020 -%% The LaTeX3 Project and any individual authors listed elsewhere +%% Copyright (C) 1993-2021 +%% The LaTeX Project and any individual authors listed elsewhere %% in this file. %% %% This file was generated from file(s) of the LaTeX base system. @@ -44,7 +44,7 @@ \ProvidesFile{cp850.def} - [2020/08/01 v1.3d Input encoding file] + [2021/02/14 v1.3d Input encoding file] %% %% If you need a Euro symbol, try cp858 instead. %% diff --git a/Master/texmf-dist/tex/latex/base/cp852.def b/Master/texmf-dist/tex/latex/base/cp852.def index 2878f5b1a2e..d7e359ac232 100644 --- a/Master/texmf-dist/tex/latex/base/cp852.def +++ b/Master/texmf-dist/tex/latex/base/cp852.def @@ -13,8 +13,8 @@ %% (but please observe conditions on bug reports sent to that address!) %% %% -%% Copyright (C) 1993-2020 -%% The LaTeX3 Project and any individual authors listed elsewhere +%% Copyright (C) 1993-2021 +%% The LaTeX Project and any individual authors listed elsewhere %% in this file. %% %% This file was generated from file(s) of the LaTeX base system. @@ -44,7 +44,7 @@ \ProvidesFile{cp852.def} - [2020/08/01 v1.3d Input encoding file] + [2021/02/14 v1.3d Input encoding file] \ProvideTextCommandDefault{\textdegree}{\ensuremath{{^\circ}}} \ProvideTextCommandDefault{\textonehalf}{\ensuremath{\frac12}} \ProvideTextCommandDefault{\textonequarter}{\ensuremath{\frac14}} diff --git a/Master/texmf-dist/tex/latex/base/cp858.def b/Master/texmf-dist/tex/latex/base/cp858.def index d159c74c35d..2de2a28e57a 100644 --- a/Master/texmf-dist/tex/latex/base/cp858.def +++ b/Master/texmf-dist/tex/latex/base/cp858.def @@ -13,8 +13,8 @@ %% (but please observe conditions on bug reports sent to that address!) %% %% -%% Copyright (C) 1993-2020 -%% The LaTeX3 Project and any individual authors listed elsewhere +%% Copyright (C) 1993-2021 +%% The LaTeX Project and any individual authors listed elsewhere %% in this file. %% %% This file was generated from file(s) of the LaTeX base system. @@ -44,7 +44,7 @@ \ProvidesFile{cp858.def} - [2020/08/01 v1.3d Input encoding file] + [2021/02/14 v1.3d Input encoding file] \ProvideTextCommandDefault{\textdegree}{\ensuremath{{^\circ}}} \ProvideTextCommandDefault{\textonehalf}{\ensuremath{\frac12}} \ProvideTextCommandDefault{\textonequarter}{\ensuremath{\frac14}} diff --git a/Master/texmf-dist/tex/latex/base/cp865.def b/Master/texmf-dist/tex/latex/base/cp865.def index a4cb3dda881..9d8baa0915d 100644 --- a/Master/texmf-dist/tex/latex/base/cp865.def +++ b/Master/texmf-dist/tex/latex/base/cp865.def @@ -13,8 +13,8 @@ %% (but please observe conditions on bug reports sent to that address!) %% %% -%% Copyright (C) 1993-2020 -%% The LaTeX3 Project and any individual authors listed elsewhere +%% Copyright (C) 1993-2021 +%% The LaTeX Project and any individual authors listed elsewhere %% in this file. %% %% This file was generated from file(s) of the LaTeX base system. @@ -44,7 +44,7 @@ \ProvidesFile{cp865.def} - [2020/08/01 v1.3d Input encoding file] + [2021/02/14 v1.3d Input encoding file] \ProvideTextCommandDefault{\textdegree}{\ensuremath{{^\circ}}} \ProvideTextCommandDefault{\textflorin}{\textit{f}} \ProvideTextCommandDefault{\textpeseta}{Pt} diff --git a/Master/texmf-dist/tex/latex/base/decmulti.def b/Master/texmf-dist/tex/latex/base/decmulti.def index 65c867a1773..82991e5080c 100644 --- a/Master/texmf-dist/tex/latex/base/decmulti.def +++ b/Master/texmf-dist/tex/latex/base/decmulti.def @@ -13,8 +13,8 @@ %% (but please observe conditions on bug reports sent to that address!) %% %% -%% Copyright (C) 1993-2020 -%% The LaTeX3 Project and any individual authors listed elsewhere +%% Copyright (C) 1993-2021 +%% The LaTeX Project and any individual authors listed elsewhere %% in this file. %% %% This file was generated from file(s) of the LaTeX base system. @@ -44,7 +44,7 @@ \ProvidesFile{decmulti.def} - [2020/08/01 v1.3d Input encoding file] + [2021/02/14 v1.3d Input encoding file] \ProvideTextCommandDefault{\textdegree}{\ensuremath{{^\circ}}} \ProvideTextCommandDefault{\textonehalf}{\ensuremath{\frac12}} \ProvideTextCommandDefault{\textonequarter}{\ensuremath{\frac14}} diff --git a/Master/texmf-dist/tex/latex/base/doc-v3beta.sty b/Master/texmf-dist/tex/latex/base/doc-v3beta.sty new file mode 100644 index 00000000000..eeac71568cf --- /dev/null +++ b/Master/texmf-dist/tex/latex/base/doc-v3beta.sty @@ -0,0 +1,1241 @@ +%% +%% This is file `doc-v3beta.sty', +%% generated with the docstrip utility. +%% +%% The original source files were: +%% +%% doc.dtx (with options: `package,beta') +%% +%% 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.html +%% (but please observe conditions on bug reports sent to that address!) +%% +%% +%% Copyright 1993-2018 +%% The LaTeX3 Project and any individual authors listed elsewhere +%% in this file. +%% +%% This file was generated from file(s) of the LaTeX base system. +%% -------------------------------------------------------------- +%% +%% It may be distributed and/or modified under the +%% conditions of the LaTeX Project Public License, either version 1.3c +%% of this license or (at your option) any later version. +%% The latest version of this license is in +%% https://www.latex-project.org/lppl.txt +%% and version 1.3c or later is part of all distributions of LaTeX +%% version 2005/12/01 or later. +%% +%% This file has the LPPL maintenance status "maintained". +%% +%% This file may only be distributed together with a copy of the LaTeX +%% base system. You may however distribute the LaTeX base system without +%% such generated files. +%% +%% The list of all files belonging to the LaTeX base distribution is +%% given in the file `manifest.txt'. See also `legal.txt' for additional +%% information. +%% +%% The list of derived (unpacked) files belonging to the distribution +%% and covered by LPPL is defined by the unpacking scripts (with +%% extension .ins) which are part of the distribution. +\NeedsTeXFormat{LaTeX2e}[1994/12/01] + +\providecommand\DeclareRelease[3]{} +\providecommand\DeclareCurrentRelease[2]{} + +\DeclareRelease{v2}{2016-02-15.sty} + {doc-2016-02-15.sty} +\DeclareCurrentRelease{v3}{2018-04-16} + +\ProvidesPackage{doc-v3beta} + [2021/02/07 v3.0e + Standard LaTeX documentation package V3 (FMi)] +%% +%% Package `doc' to use with LaTeX 2e +%% Copyright (C) 1989-2018 Frank Mittelbach, all rights reserved. + + + + + +\@ifundefined{macro@cnt}{}{\endinput} +\catcode`\^^A=14 +\AtBeginDocument{\catcode`\^^A=14\relax} +\RequirePackage{kvoptions} +\SetupKeyvalOptions{family=doc,prefix=doc@} +\DeclareBoolOption{noprint} +\DeclareBoolOption{noindex} +\DeclareBoolOption[true]{hyperref} +\DeclareBoolOption[true]{multicol} +\DeclareBoolOption[false]{debugshow} +\DeclareBoolOption[true]{toplevel} +\DeclareComplementaryOption{notoplevel}{toplevel} +\DeclareBoolOption{macrolike} +\DeclareComplementaryOption{envlike}{macrolike} +\DeclareStringOption{idxtype} +\DeclareStringOption{idxgroup} +\DeclareStringOption{printtype} +\DeclareBoolOption[false]{outer} +\ProcessKeyvalOptions* +\newif\ifscan@allowed \scan@allowedtrue +\def\SetupDoc#1{% + \setkeys{doc}{#1}% + \edef\doc@noprintdefault{\ifdoc@noprint true\else false\fi}% + \ifdoc@noindex + \def\doc@noindexdefault{true}% + \scan@allowedfalse + \else + \def\doc@noindexdefault{false}% + \fi +} +\SetupDoc{} % just save the default values +\def\macrocode{\macro@code + \frenchspacing \@vobeyspaces + \xmacro@code} +\def\macro@code{% + \topsep \MacrocodeTopsep + \@beginparpenalty \predisplaypenalty + \if@inlabel\leavevmode\fi + \trivlist \parskip \z@ \item[]% + \macro@font + \leftskip\@totalleftmargin \advance\leftskip\MacroIndent + \rightskip\z@ \parindent\z@ \parfillskip\@flushglue + \blank@linefalse \def\par{\ifblank@line + \leavevmode\fi + \blank@linetrue\@@par + \penalty\interlinepenalty} + \obeylines + \let\do\do@noligs \verbatim@nolig@list + \let\do\@makeother \dospecials + \global\@newlistfalse + \global\@minipagefalse + \ifcodeline@index + \everypar{\global\advance\c@CodelineNo\@ne + \llap{\theCodelineNo\ \hskip\@totalleftmargin}% + \check@module}% + \else \everypar{\check@module}% + \fi + \init@crossref} +\newif\ifblank@line +\def\endmacrocode{% + \ifpm@module \endgroup \pm@modulefalse \fi + \everypar{}% + \global\@inlabelfalse + \endtrivlist + \close@crossref} +\@ifundefined{MacroFont}{% + \if@compatibility + \def\MacroFont{\small + \usefont\encodingdefault + \ttdefault + \mddefault + \updefault + }% + \else + \def\MacroFont{\fontencoding\encodingdefault + \fontfamily\ttdefault + \fontseries\mddefault + \fontshape\updefault + \small}% + \fi + }{} +\@ifundefined{AltMacroFont}{% + \if@compatibility + \def\AltMacroFont{\small + \usefont\encodingdefault + \ttdefault + \mddefault + \sldefault + }% + \else + \def\AltMacroFont{\fontencoding\encodingdefault + \fontfamily\ttdefault + \fontseries\mddefault + \fontshape\sldefault + \small + }% + \fi + }{} +\AtBeginDocument{\let\macro@font\MacroFont} +\def\check@module{% + \ifcheck@modules + \ifpm@module \endgroup \pm@modulefalse \fi + \expandafter\futurelet\expandafter\next\expandafter\ch@percent + \fi} +\newif\ifpm@module +\def\DontCheckModules{\check@modulesfalse} +\def\CheckModules{\check@modulestrue} +\newif\ifcheck@modules \check@modulestrue +\def\ch@percent{% + \if \percentchar\next + \expandafter\check@angle + \fi} +\def\check@angle#1{\futurelet\next\ch@angle} +\begingroup +\catcode`\<\active +\gdef\ch@angle{\ifx<\next + \expandafter\ch@plus@etc + \else \percentchar \fi} +\gdef\ch@plus@etc<{\futurelet\next\check@plus@etc} +\gdef\check@plus@etc{% + \if +\next + \let\next\pm@module + \else\if -\next + \let\next\pm@module + \else\if *\next + \let\next\star@module + \else\if /\next + \let\next\slash@module + \else\ifx <\next + \percentchar + \else + \let\next\pm@module + \fi\fi\fi\fi\fi + \next} +\endgroup +\begingroup +\catcode`\~=\active +\lccode`\~=`\> +\lowercase{\gdef\pm@module#1~}{\pm@moduletrue + \Module{#1}\begingroup + \advance\guard@level\@ne + \ifnum\guard@level>\c@StandardModuleDepth\AltMacroFont\fi +} +\lowercase{\gdef\star@module#1~}{% + \Module{#1}% + \global \advance \guard@level\@ne + \ifnum \guard@level>\c@StandardModuleDepth + \global\let\macro@font=\AltMacroFont \macro@font + \fi} +\catcode`\>=\active +\gdef\slash@module#1>{% + \Module{#1}% + \global \advance \guard@level\m@ne + \ifnum \guard@level=\c@StandardModuleDepth + \global\let\macro@font\MacroFont \macro@font + \fi +} +\endgroup +\newcounter{StandardModuleDepth} +\newcount \guard@level + +\@ifundefined{Module}{% + \def\Module#1{\mod@math@codes$\langle\mathsf{#1}\rangle$} + }{} +\def\mod@math@codes{\mathcode`\|="226A \mathcode`\&="2026 + \mathcode`\-="702D \mathcode`\+="702B + \mathcode`\:="703A \mathcode`\=="703D } +\newskip\MacrocodeTopsep \MacrocodeTopsep = 3pt plus 1.2pt minus 1pt +\newdimen\MacroIndent +\settowidth\MacroIndent{\rmfamily\scriptsize 00\ } +\@namedef{macrocode*}{\macro@code\sxmacro@code} +\expandafter\let\csname endmacrocode*\endcsname = \endmacrocode +\catcode`\!=\catcode`\% ^^A In this section there must not be + ^^A any exclamation marks. + ^^A +\begingroup +\catcode`\|=\z@ \catcode`\[=\@ne \catcode`\]=\tw@ +\catcode`\{=12 \catcode`\}=12 +\catcode`\%=12 \catcode`\ =\active \catcode`\\=\active +!% \end{macrocode*} +! Next follows the actual definition of |\macro@code|; +! notice the +! use of the new escape character. We manage to get the argument +! surrounded by the string |\end{macrocode}|, but at the end +! however, in spite of the actual characters used during the +! definition of +! this macro, |\end| with the argument |{macrocode}| +! will be executed, to ensure a balanced environment. +! \begin{macrocode*} +|gdef|xmacro@code#1% \end{macrocode}[#1|end[macrocode]] +!% \end{macrocode*} +! \begin{macro}{\sxmacro@code} +! The definition of |\sxmacro@code| is completely analogous, +! only +! here a slightly different terminating string will be used. +! Note that the space is not active in this environment. +! \begin{macrocode} +|catcode`| =12 +|gdef|sxmacro@code#1% \end{macrocode*}[#1|end[macrocode*]] +!% \end{macrocode} +! because the |\catcode| changes have been made local by +! commencing a +! new group, there now follows the matching |\endgroup| +! in a rather +! unusual style of writing. +! \begin{macrocode} +|endgroup +!% \end{macrocode} +\catcode`\!=12 + +\reversemarginpar +\setlength\marginparpush{0pt} \setlength\marginparwidth{8pc} +\setlength\marginparsep{\labelsep} +{\catcode`\|=\z@ \catcode`\\=12 +|gdef|bslash{\}} +\def\verbatim{\@beginparpenalty \predisplaypenalty \@verbatim + \MacroFont \frenchspacing \@vobeyspaces \@xverbatim} +\@namedef{verbatim*}{\@beginparpenalty \predisplaypenalty \@verbatim + \MacroFont \@sxverbatim} +\def\@verbatim{\trivlist \item[]\if@minipage\else\vskip\parskip\fi + \leftskip\@totalleftmargin\rightskip\z@ + \parindent\z@\parfillskip\@flushglue\parskip\z@ + \@@par + \@tempswafalse + \def\par{\if@tempswa\hbox{}\fi\@tempswatrue\@@par + \penalty\interlinepenalty + \check@percent}% + \obeylines + \let\do\do@noligs \verbatim@nolig@list + \let\do\@makeother \dospecials} +{\catcode`\%=12 + \long\gdef\check@percent#1{\ifx #1%\let\next\@empty \else + \let\next=#1\fi \next}} +\def\verb{\relax\ifmmode\hbox\else\leavevmode\null\fi + \bgroup \let\do\do@noligs \verbatim@nolig@list + \ttfamily \verb@eol@error \let\do\@makeother \dospecials + \@ifstar{\@sverb}{\@vobeyspaces \frenchspacing \@sverb}} +\let\verb@balance@group\@empty + +\def\verb@egroup{\global\let\verb@balance@group\@empty\egroup} + +\begingroup + \obeylines% + \gdef\verb@eol@error{\obeylines% + \def^^M{\verb@egroup\@latex@error{% + Text for \noexpand\verb command ended by end of line}\@ehc}}% +\endgroup +\def\@sverb#1{% + \catcode`#1\active \lccode`\~`#1% + \gdef\verb@balance@group{\verb@egroup + \@latex@error{Illegal use of \noexpand\verb command}\@ehc}% + \aftergroup\verb@balance@group + \lowercase{\let~\verb@egroup}} +\def\verbatim@nolig@list{\do\`\do\<\do\>\do\,\do\'\do\-} +\def\do@noligs#1{% + \catcode`#1\active + \begingroup + \lccode`\~=`#1\relax + \lowercase{\endgroup\def~{\leavevmode\kern\z@\char`#1}}} +\newcount\macro@cnt \macro@cnt=0 +\newskip\MacroTopsep \MacroTopsep = 7pt plus 2pt minus 2pt +\begingroup +\catcode`\~\active +\gdef\SpecialEscapechar#1{% + \begingroup + \uccode`\~`#1% + \uppercase{\gdef\active@escape@char{~}}% + \escapechar\m@ne \xdef\special@escape@char{\string#1}% + \endgroup} +\endgroup +\begingroup \catcode`\|=\z@ \catcode`\\=\active +|gdef|init@crossref{|catcode`|\|active |let\|bslash + |MakePrivateLetters + |catcode|expandafter`|special@escape@char|active + |expandafter|let|active@escape@char|scan@macro} +|endgroup +\SpecialEscapechar{\\} +\@ifundefined{MakePrivateLetters} + {\let\MakePrivateLetters\makeatletter}{} +\def\close@crossref{\SpecialEscapechar\\} +\def\scan@macro{% + \special@escape@char + \step@checksum + \ifscan@allowed + \let\macro@namepart\@empty + \def\next{\futurelet\next\macro@switch}% + \else \let\next\@empty \fi + \next} +\def\DisableCrossrefs{\@bsphack\scan@allowedfalse\@esphack} +\def\EnableCrossrefs{\@bsphack\scan@allowedtrue + \def\DisableCrossrefs{\@bsphack\@esphack}\@esphack} +\def\macro@switch{\ifcat\noexpand\next a% + \let\next\macro@name + \else \let\next\short@macro \fi + \next} +\begingroup +\catcode`\&=12 +\gdef\short@macro#1{\begingroup + \uccode`\&=\expandafter`\string#1% + \uppercase{\def\x{\def\macro@namepart{&}}}% + \expandafter\endgroup\x + \maybe@index@short@macro\macro@namepart + \scan@allowedfalse#1% + \scan@allowedtrue } +\endgroup +\def\macro@name#1{\edef\macro@namepart{\macro@namepart#1}% + \futurelet\next\more@macroname} +\def\more@macroname{\ifcat\noexpand\next a% + \let\next\macro@name + \else \let\next\macro@finish \fi + \next} +\def\macro@finish{% + \macro@namepart + \maybe@index@macro \macro@namepart +} + +\RequirePackage{expl3} +\ExplSyntaxOn +\seq_new:N \l__doc_donotindex_seq +\prop_new:N \g__doc_idxtype_prop +\cs_new:Npn\__doc_trace:x { + \ifdoc@debugshow + \expandafter \iow_term:x + \else + \expandafter \use_none:n + \fi +} +\cs_new:Npn \doc_dont_index:n { + \group_begin: + \MakePrivateLetters + \__doc_dont_index:n +} +\cs_new:Npn \__doc_dont_index:n #1 { + \group_end: + \__doc_trace:x{Disable~ indexing~ for~ '\tl_to_str:n{#1}' } + \clist_map_function:nN {#1} \__doc_dont_index_aux:n +} +\cs_new:Npn \__doc_dont_index_aux:n #1 { + \seq_put_right:Nx \l__doc_donotindex_seq {\expandafter\@gobble \string#1} +} +\cs_set_eq:NN \DoNotIndex \doc_dont_index:n +\def \ShowIndexingState { + \__doc_trace:x{Show~ doc~ indexing~ state:} + \seq_show:N \l__doc_donotindex_seq + \prop_show:N \g__doc_idxtype_prop +} + +\cs_new:Npn \__doc_idxtype_put:Nn #1#2 { + \exp_args:Nx \__doc_idxtype_put:nn { \cs_to_str:N #1 }{#2} + \protected@write\@auxout{} + {\string\RecordIndexTypeAux {\string#1 }{#2} } +} +\cs_new:Npn \RecordIndexTypeAux #1#2 { + \exp_args:Nx \__doc_idxtype_put:nn { \cs_to_str:N #1 }{#2} +} +\AtEndDocument{ + \cs_set_eq:NN \RecordIndexTypeAux \use_none:nn +} +\cs_set_eq:NN \RecordIndexType \__doc_idxtype_put:Nn +\cs_new:Npn \__doc_idxtype_put_scan:nn #1#2 { + \exp_args:Nf \__doc_idxtype_put:nn { \tl_to_str:n {#1} }{#2} + \protected@write\@auxout{} + {\string\RecordIndexTypeAux {\bslash #1 }{#2} } +} +\cs_generate_variant:Nn \__doc_idxtype_put_scan:nn {o} +\cs_set_eq:NN \record@index@type@save \__doc_idxtype_put_scan:on +\cs_new:Npn \__doc_idxtype_put:nn #1#2 { + \exp_args:NNf + \seq_if_in:NnTF \l__doc_donotindex_seq {\tl_to_str:n{#1}} + { + \__doc_trace:x{Not~ recording~ index~ type~ for~ '\bslash #1' } + } + { + \__doc_trace:x{Recording~ index~ type~ for~ '\bslash #1' ~ as~ #2 } + \prop_gput:Nnn \g__doc_idxtype_prop {#1}{#2} + } +} +\cs_new:Npn \exp_args:co #1#2 + { \cs:w #1 \exp_after:wN \cs_end:\exp_after:wN {#2} } +\cs_generate_variant:Nn \tl_to_str:n {o} + +\cs_new:Npn \__doc_maybe_index:o #1 { + \exp_args:Nf \__doc_maybe_index_aux:nN { \tl_to_str:o {#1} } + \SpecialIndex +} +\cs_set_eq:NN \maybe@index@macro \__doc_maybe_index:o +\cs_new:Npn \__doc_maybe_index_short:o #1 { + \exp_args:Nf \__doc_maybe_index_aux:nN { \tl_to_str:o {#1} } + \SpecialShortIndex +} +\cs_set_eq:NN \maybe@index@short@macro \__doc_maybe_index_short:o +\cs_new:Npn \__doc_maybe_index_aux:nN #1#2 { + \__doc_trace:x{Searching~ for~ '\bslash #1'} + \seq_if_in:NnTF \l__doc_donotindex_seq {#1} + { + \__doc_trace:x{Not~ indexing~ '\bslash #1' } + } + { + \prop_get:NnNTF \g__doc_idxtype_prop {#1} \l__doc_idxtype_tl + { + \exp_args:Ncno \__doc_maybe_index_aux:Nnn + { Code \tl_use:N \l__doc_idxtype_tl Index } + {code} {\bslash #1} + } + { + \__doc_trace:x{Indexing~ '\bslash #1'\space (\string #2)} + \exp_args:No #2 {\bslash #1} + } + } +} +\cs_new:Npn \SpecialShortIndex #1 { + \@SpecialIndexHelper@ #1\@nil + \@bsphack + \ifdoc@noindex \else + \str_case_e:nnF {\@gtempa } + { + {\cs_to_str:N \^^M } {\def\reserved@a{ \string \space \actualchar } + \def\reserved@b { \space } + \let\reserved@c \@empty } + { } {\def\reserved@a{ \string \space \actualchar } + \def\reserved@b { \space } + \let\reserved@c \@empty } + {\c_left_brace_str} { \def\reserved@a{ \bgroup \actualchar } + \def\reserved@b { \c_left_brace_str } + \def\reserved@c { \noexpand\iffalse + \c_right_brace_str + \noexpand\fi } } + {\c_right_brace_str} { \def\reserved@a{ \egroup \actualchar + \noexpand\iffalse + \c_left_brace_str + \noexpand\fi } + \def\reserved@b { \c_right_brace_str } + \let\reserved@c \@empty } + {\verbatimchar} { \def\reserved@a{ \quotechar\verbatimchar + \actualchar } + \let\reserved@b \@empty + \def\reserved@c + { \string\texttt{\string\string\verbatimchar} } } + } + { \def\reserved@a {\quotechar \@gtempa \actualchar } + \def\reserved@b {\quotechar \@gtempa } + \let\reserved@c \@empty } + \special@index { + \reserved@a + \string\verb + \quotechar *\verbatimchar \quotechar \bslash + \reserved@b + \verbatimchar + \reserved@c + \encapchar code} + \fi + \@esphack +} + +\cs_new:Npn \__doc_maybe_index_aux:Nnn #1#2#3 { + \cs_if_exist:NTF #1 + { + \__doc_trace:x{Indexing~ '#3'\space as~ + \tl_use:N \l__doc_idxtype_tl } + #1{#2}{#3} + } + { + \PackageError{doc}{Doc~ element~ + '\tl_use:N \l__doc_idxtype_tl'~ unknown}% + + {When~ using~ '\string\RecordIndexType'~ the~ type~ must~ + be~ known~\MessageBreak + to~ the~ system,~ i.e.,~ declared~ via~ + '\string\NewDocElement'\MessageBreak + before~ it~ can~ be~ used~ in~ indexing.} + } +} +\ExplSyntaxOff +\@ifundefined{actualchar}{\def\actualchar{=}}{} +\@ifundefined{quotechar}{\def\quotechar{!}}{} +\@ifundefined{levelchar}{\def\levelchar{>}}{} +\@ifundefined{encapchar}{\def\encapchar{|}}{} +\@ifundefined{verbatimchar}{\def\verbatimchar{+}}{} +\begingroup + \catcode`\|=0 + \catcode`\\=12 + |gdef|@SpecialIndexHelper@#1#2|@nil{% + |if |noexpand#1\% + |gdef|@gtempa{#2}% + |else + |begingroup + |escapechar|m@ne + |expandafter|gdef|expandafter|@gtempa|expandafter{|string#1#2}% + |endgroup + |fi} +|endgroup +\def\SortIndex#1#2{% + \ifdoc@noindex\else + \index{#1\actualchar#2}% + \fi +} +\@ifundefined{LeftBraceIndex}{\def\LeftBraceIndex{% + \special@index{\bgroup\actualchar + \string\verb% % to fool emacs highlighting + \quotechar*\verbatimchar + \quotechar\bslash{\verbatimchar\string\iffalse}\string\fi}}}{} + +\@ifundefined{RightBraceIndex}{\def\RightBraceIndex{% + \special@index{\egroup\actualchar\string\iffalse{\string\fi + \string\verb% % to fool emacs highlighting + \quotechar*\verbatimchar\quotechar\bslash}\verbatimchar}}}{} +\@ifundefined{PercentIndex} + {\def\PercentIndex{\it@is@a\percentchar}}{} +\def\OldMakeindex{\def\PercentIndex{% + \special@index{\quotechar\percentchar\actualchar + \string\verb% % to fool emacs highlighting + \quotechar*\verbatimchar\quotechar\bslash + \percentchar\percentchar\verbatimchar}}} +{\catcode`\%=12 \gdef\percentchar{%}} +\def\it@is@a#1{\special@index{\quotechar #1\actualchar + \string\verb% % to fool emacs highlighting + \quotechar*\verbatimchar + \quotechar\bslash\quotechar#1\verbatimchar}} + +\newdimen\IndexMin \IndexMin = 80pt +\newcount\c@IndexColumns \c@IndexColumns = 3 +\ifdoc@multicol + \RequirePackage{multicol} + \renewenvironment{theindex} + {\begin{multicols}\c@IndexColumns[\index@prologue][\IndexMin]% + \IndexParms \let\item\@idxitem \ignorespaces}% + {\end{multicols}} +\else + \def\theindex{\@restonecoltrue\if@twocolumn\@restonecolfalse\fi + \columnseprule \z@ \columnsep 35\p@ + \twocolumn[\index@prologue]% + \IndexParms \let\item\@idxitem \ignorespaces} + \def\endtheindex{\if@restonecol\onecolumn\else\clearpage\fi} +\fi +\long\def\IndexPrologue#1{\@bsphack\def\index@prologue{#1}\@esphack} +\@ifundefined{index@prologue} + {\def\index@prologue{\section*{Index}% + \markboth{Index}{Index}% + Numbers written in italic refer to the page + where the corresponding entry is described; + numbers underlined refer to the + \ifcodeline@index + code line of the + \fi + definition; numbers in roman refer to the + \ifcodeline@index + code lines + \else + pages + \fi + where the entry is used. + }}{} +\@ifundefined{IndexParms} + {\def\IndexParms{% + \parindent \z@ + \columnsep 15pt + \parskip 0pt plus 1pt + \rightskip 15pt + \mathsurround \z@ + \parfillskip=-15pt + \small + \def\@idxitem{\par\hangindent 30pt}% + \def\subitem{\@idxitem\hspace*{15pt}}% + \def\subsubitem{\@idxitem\hspace*{25pt}}% + \def\indexspace{\par\vspace{10pt plus 2pt minus 3pt}}% + }}{} +\def\efill{\hfill\nopagebreak}% +\def\pfill{\unskip~% + \leaders\hbox to.6em{\hss .\hss}\hfill + \penalty500\strut\nobreak + \leaders\hbox to.6em{\hss .\hss}\hfil + ~\ignorespaces}% +\def\*{\leavevmode\lower.8ex\hbox{$\,\widetilde{\ }\,$}} +\@ifundefined{main}{\def\main#1{\underline{#1}}}{} +\@ifundefined{usage}{\def\usage#1{\textit{#1}}}{} +\@ifundefined{code}{\def\code#1{#1}}{} +\def\PrintIndex{\@input@{\jobname.ind}% + \global\let\PrintIndex\@empty} +\def\changes{\@bsphack\begingroup\@sanitize + \catcode`\\\z@ \catcode`\ 10 \MakePercentIgnore + \changes@} +\def\changes@#1#2#3{% + \protected@edef\@tempa{\noexpand\glossary{#1\levelchar + \ifx\saved@macroname\@empty + \quotechar!% + \actualchar + \generalname + \else + \saved@indexname + \actualchar + \string\verb% % to fool emacs highlighting + \quotechar*% + \verbatimchar\saved@macroname + \verbatimchar + \fi + :\levelchar #3}}% + \@tempa\endgroup\@esphack} +\def\saved@macroname{} +\def\saved@indexname{} +\def\generalname{General} +\let\RecordChanges\makeglossary +\newdimen\GlossaryMin \GlossaryMin = 80pt +\newcount\c@GlossaryColumns \c@GlossaryColumns = 2 +\ifdoc@multicol + \newenvironment{theglossary}{% + \begin{multicols}\c@GlossaryColumns + [\glossary@prologue][\GlossaryMin]% + \GlossaryParms \let\item\@idxitem \ignorespaces}% + {\end{multicols}} +\else + \newenvironment{theglossary}{% + \@restonecoltrue\if@twocolumn\@restonecolfalse\fi + \columnseprule \z@ \columnsep 35\p@ + \twocolumn[\glossary@prologue]% + \GlossaryParms \let\item\@idxitem \ignorespaces} + {\if@restonecol\onecolumn\else\clearpage\fi} +\fi +\long\def\GlossaryPrologue#1{\@bsphack + \def\glossary@prologue{#1}% + \@esphack} +\@ifundefined{glossary@prologue} + {\def\glossary@prologue{\section*{{Change History}}% + \markboth{{Change History}}{{Change History}}% + }}{} +\@ifundefined{GlossaryParms}{\let\GlossaryParms\IndexParms + \expandafter\def\expandafter\GlossaryParms\expandafter{\GlossaryParms + \rightskip 15pt plus 1fil + \parfillskip -15pt plus -1fil\relax} +}{} +\def\PrintChanges{\@input@{\jobname.gls}% + \global\let\PrintChanges\@empty} +\newcommand\AlsoImplementation{% + \long\def\MaybeStopHere##1{\@bsphack\gdef\Finale{##1% + \check@checksum}% + \init@checksum + \@esphack}% + } +\AlsoImplementation +\def\OnlyDescription{\@bsphack\long\def\MaybeStopHere##1{% + ##1\endinput}\@esphack} +\let\Finale\relax +\def\StopEventually{\MaybeStopHere} +\ifx\l@nohyphenation\undefined + \newlanguage\l@nohyphenation +\fi +\DeclareRobustCommand\meta[1]{% + \ensuremath\langle + \ifmmode \expandafter \nfss@text \fi + {% + \meta@font@select + \edef\meta@hyphen@restore + {\hyphenchar\the\font\the\hyphenchar\font}% + \hyphenchar\font\m@ne + \language\l@nohyphenation + #1\/% + \meta@hyphen@restore + }\ensuremath\rangle +} +\def\meta@font@select{\itshape} +\def\IndexInput#1{% + \begingroup \macro@code + \frenchspacing \@vobeyspaces + \input{#1}\endmacrocode + \endgroup} +\def\maketitle{\par + \begingroup \def \thefootnote {\fnsymbol {footnote}}% + \setcounter {footnote}\z@ + \def\@makefnmark{\hbox to\z@{$\m@th^{\@thefnmark}$\hss}}% + \long\def\@makefntext##1{\parindent 1em\noindent + \hbox to1.8em{\hss$\m@th^{\@thefnmark}$}##1}% + \if@twocolumn \twocolumn [\@maketitle ]% + \else \newpage \global \@topnum \z@ \@maketitle \fi + \thispagestyle{titlepage}\@thanks \endgroup + \setcounter {footnote}\z@ + \gdef\@date{\today}\gdef\@thanks{}% + \gdef\@author{}\gdef\@title{}} +\@ifundefined{ps@titlepage} + {\let\ps@titlepage=\ps@plain}{} +\def\MakeShortVerb{% + \@ifstar + {\def\@shortvrbdef{\verb*}\@MakeShortVerb}% + {\def\@shortvrbdef{\verb}\@MakeShortVerb}} +\def\@MakeShortVerb#1{% + \expandafter\ifx\csname cc\string#1\endcsname\relax + \@shortvrbinfo{Made }{#1}\@shortvrbdef + \add@special{#1}% + \expandafter + \xdef\csname cc\string#1\endcsname{\the\catcode`#1}% + \begingroup + \catcode`\~\active \lccode`\~`#1% + \lowercase{% + \global\expandafter\let + \csname ac\string#1\endcsname~% + \expandafter\gdef\expandafter~\expandafter{\@shortvrbdef~}}% + \endgroup + \global\catcode`#1\active + \else + \@shortvrbinfo\@empty{#1 already}% + {\@empty\verb% % to fool emacs highlighting + (*)}% + \fi} +\def\DeleteShortVerb#1{% + \expandafter\ifx\csname cc\string#1\endcsname\relax + \@shortvrbinfo\@empty{#1 not}% + {\@empty\verb% % to fool emacs highlighting + (*)}% + \else + \@shortvrbinfo{Deleted }{#1 as}% + {\@empty\verb% % to fool emacs + % highlighting + (*)}% + \rem@special{#1}% + \global\catcode`#1\csname cc\string#1\endcsname + \global \expandafter\let \csname cc\string#1\endcsname \relax + \ifnum\catcode`#1=\active + \begingroup + \catcode`\~\active \lccode`\~`#1% + \lowercase{% + \global\expandafter\let\expandafter~% + \csname ac\string#1\endcsname}% + \endgroup \fi \fi} +\def\@shortvrbinfo#1#2#3{% + \PackageInfo{doc}{% + #1\expandafter\@gobble\string#2 a short reference + for \expandafter\string#3}} +\def\add@special#1{% + \rem@special{#1}% + \expandafter\gdef\expandafter\dospecials\expandafter + {\dospecials \do #1}% + \expandafter\gdef\expandafter\@sanitize\expandafter + {\@sanitize \@makeother #1}} +\def\rem@special#1{% + \def\do##1{% + \ifnum`#1=`##1 \else \noexpand\do\noexpand##1\fi}% + \xdef\dospecials{\dospecials}% + \begingroup + \def\@makeother##1{% + \ifnum`#1=`##1 \else \noexpand\@makeother\noexpand##1\fi}% + \xdef\@sanitize{\@sanitize}% + \endgroup} +\def\init@checksum{\relax + \global\bslash@cnt\z@} +\def\check@checksum{\relax + \ifnum\check@sum>\m@ne + \ifnum\check@sum=\z@ + \typeout{**********************************}% + \typeout{* This macro file has no checksum!}% + \typeout{* The checksum should be \the\bslash@cnt!}% + \typeout{**********************************}% + \else + \ifnum\check@sum=\bslash@cnt + \typeout{*******************}% + \typeout{* Checksum passed *}% + \typeout{*******************}% + \else + \PackageError{doc}{Checksum not passed + (\the\check@sum<>\the\bslash@cnt)}% + {The file currently documented seems to be wrong.^^J% + Try to get a correct version.}% + \fi + \fi + \fi + \global\check@sum\m@ne} +\newcount\check@sum \check@sum = \m@ne +\newcount\bslash@cnt \bslash@cnt = \z@ +\def\CheckSum#1{\@bsphack\global\check@sum#1\relax\@esphack} +\def\step@checksum{\global\advance\bslash@cnt\@ne} +\def\CharacterTable{\begingroup \CharTableChanges \character@table} +\begingroup + \catcode`\~=11 + \gdef\character@table#1{\def\used~table{#1}% + \ifx\used~table\default~table + \typeout{***************************}% + \typeout{* Character table correct *}% + \typeout{***************************}% + \else + \PackageError{doc}{Character table corrupted} + {\the\wrong@table} + \show\default~table + \show\used~table + \fi + \endgroup} + \global\let\CharTableChanges\@empty + \makeatother + \gdef\default~table + {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z + Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z + Digits \0\1\2\3\4\5\6\7\8\9 + Exclamation \! Double quote \" Hash (number) \# + Dollar \$ Percent \% Ampersand \& + Acute accent \' Left paren \( Right paren \) + Asterisk \* Plus \+ Comma \, + Minus \- Point \. Solidus \/ + Colon \: Semicolon \; Less than \< + Equals \= Greater than \> Question mark \? + Commercial at \@ Left bracket \[ Backslash \\ + Right bracket \] Circumflex \^ Underscore \_ + Grave accent \` Left brace \{ Vertical bar \| + Right brace \} Tilde \~} +\endgroup + \newhelp\wrong@table{Some of the ASCII characters are corrupted.^^J + I now \string\show\space you both tables for comparison.} +\newif\ifcodeline@index \codeline@indexfalse +\let\CodelineNumbered\codeline@indextrue +\def\codeline@wrindex#1{\if@filesw + \begingroup + \set@display@protect + \immediate\write\@indexfile + {\string\indexentry{#1}% + {\number\c@CodelineNo}}% + \endgroup + \fi} +\let\special@index = \@gobble +\def\CodelineIndex{\makeindex + \codeline@indextrue + \let\special@index\codeline@wrindex} +\def\PageIndex{\makeindex + \codeline@indexfalse + \let\special@index\index} +\newcount\c@CodelineNo \c@CodelineNo\z@ +\@ifundefined{theCodelineNo} + {\ifx\selectfont\undefined + \def\theCodelineNo{\rmfamily\scriptsize\arabic{CodelineNo}}% + \else + \def\theCodelineNo{\reset@font\scriptsize\arabic{CodelineNo}}% + \fi} + {} + \tolerance=1000\relax +{ \catcode`\"=12 + \global\mathcode`\\="705C \global\mathcode`\@="7040 } +\@ifundefined{DocstyleParms}{}{\DocstyleParms} + \let\DocstyleParms\relax +\@ifundefined{AmSTeX} + {\def\AmSTeX{\leavevmode\hbox{$\mathcal A\kern-.2em\lower.376ex% + \hbox{$\mathcal M$}\kern-.2em\mathcal S$-\TeX}}}{} +\@ifundefined{BibTeX} + {\def\BibTeX{{\rmfamily B\kern-.05em% + \textsc{i\kern-.025em b}\kern-.08em% + T\kern-.1667em\lower.7ex\hbox{E}\kern-.125emX}}}{} +\@ifundefined{SliTeX} + {\def\SliTeX{{\rmfamily S\kern-.06emL\kern-.18em\raise.32ex\hbox + {\scshape i}\kern -.03em\TeX}}}{} +\@ifundefined{PlainTeX}{\def\PlainTeX{\textsc{Plain}\kern2pt\TeX}}{} +\@ifundefined{Web}{\def\Web{\textsc{Web}}}{} +\def\MakePercentIgnore{\catcode`\%9\relax} +\def\MakePercentComment{\catcode`\%14\relax} +\def\DocInput#1{\MakePercentIgnore\input{#1}\MakePercentComment} +\def\GetFileInfo#1{% + \def\filename{#1}% + \def\@tempb##1 ##2 ##3\relax##4\relax{% + \def\filedate{##1}% + \def\fileversion{##2}% + \def\fileinfo{##3}}% + \edef\@tempa{\csname ver@#1\endcsname}% + \expandafter\@tempb\@tempa\relax? ? \relax\relax} + +\ifdoc@hyperref + \let\PrintDescribeMacro \@empty + \let\PrintDescribeEnv \@empty + \let\PrintMacroName \@empty + \let\PrintEnvName \@empty + \let\SpecialUsageIndex \@empty + \let\SpecialEnvIndex \@empty + \expandafter\let\expandafter\doc@eoph@@k\csname doc.sty-h@@k\endcsname + \RequirePackage{hypdoc} + \expandafter\let\csname doc.sty-h@@k\endcsname\doc@eoph@@k + \let\PrintDescribeMacro \relax + \let\PrintDescribeEnv \relax + \let\PrintMacroName \relax + \let\PrintEnvName \relax + \def\doc@providetarget{\HD@target} + \def\doc@handleencap#1{\encapchar hdclindex{\the\c@HD@hypercount}{#1}} +\else + \let\doc@providetarget\@empty + \def\doc@handleencap#1{\encapchar #1} + \def\hdclindex#1#2{\ifx\@nil#2\@nil\else\csname #2\expandafter\endcsname\fi} + \def\hdpindex #1{\ifx\@nil#1\@nil\else\csname #1\expandafter\endcsname\fi} +\fi + + +\ExplSyntaxOn + +\long\def\@doc@env#1#2#3{ + \endgroup + \clist_map_inline:nn {#3} { \@doc@env@{#1}{#2}{##1} } +} + +\ExplSyntaxOff +\long\def\@doc@env@#1#2#3{% + \topsep\MacroTopsep + \trivlist + \edef\saved@macroname{\string#3}% + \if #1% + \edef\saved@indexname{\expandafter\@gobble\saved@macroname}% + \expandafter\ifx + \csname Code#2Index\endcsname + \CodeMacroIndex + \else + \record@index@type@save + {\saved@indexname}{#2}% + \fi + \else + \let\saved@indexname\saved@macroname + \fi + \def\makelabel##1{\llap{##1}}% + \if@inlabel + \let\@tempa\@empty + \count@\macro@cnt + \loop\ifnum\count@>\z@ + \edef\@tempa{\@tempa\hbox{\strut}}\advance\count@\m@ne + \repeat + \edef\makelabel##1{\llap{\vtop to\baselineskip{\@tempa\hbox{##1}\vss}}}% + \advance\macro@cnt\@ne + \else + \macro@cnt\@ne + \fi + \ifdoc@noprint + \item + \else + \edef\@tempa{% + \noexpand\item[% + \noexpand\doc@providetarget + \noexpand\strut + \noexpand\@nameuse{Print#2Name}{\saved@macroname}]}% + \@tempa + \fi + \ifdoc@noindex\else + \global\advance\c@CodelineNo\@ne + \csname SpecialMain#2Index\expandafter\endcsname + \expandafter{\saved@macroname}\nobreak + \global\advance\c@CodelineNo\m@ne + \fi + \if#1\expandafter\DoNotIndex \expandafter {\saved@macroname}\fi + \ignorespaces} + +\def\doc@env#1#2[#3]{% + \@nameuse{doc@noprint\doc@noprintdefault}% + \@nameuse{doc@noindex\doc@noindexdefault}% + \setkeys{doc}{#3}% + \begingroup + \ifdoc@outer + \catcode`\\12 + \fi + \MakePrivateLetters + \@doc@env{#1}{#2}% +} + +\def\@doc@describe#1#2{% + \ifdoc@noprint\else + \marginpar{\raggedleft + \strut + \doc@providetarget + \@nameuse{PrintDescribe#1}{#2}}% + \fi + \ifdoc@noindex\else + \@nameuse{Special#1Index}{#2}% + \fi + \@esphack + \endgroup + \ignorespaces} +\def\doc@describe#1[#2]{% + \leavevmode\@bsphack + \setkeys{doc}{#2}% + \@doc@describe{#1}} +\@ifundefined{temptokenb}{\newtoks\@temptokenb}{} +\def\doc@createspecialindexes#1#2#3{% + \@temptokena{\space (#2)}% + \@temptokenb{#3:}% + \@nameedef{SpecialMain#1Index}##1{% + \noexpand\@bsphack + \ifdoc@toplevel + \noexpand\special@index{##1\noexpand\actualchar + {\string\ttfamily\space##1}% + \ifx\@nil#2\@nil\else \the\@temptokena \fi + \noexpand\encapchar main}% + \fi + \ifx\@nil#3\@nil\else + \noexpand\special@index{\the\@temptokenb\noexpand\levelchar + ##1\noexpand\actualchar{\string\ttfamily\space##1}% + \noexpand\encapchar main}% + \fi + \noexpand\@esphack}% + \@nameedef{Special#1Index}##1{% + \noexpand\@bsphack + \ifdoc@toplevel + \noexpand\doc@providetarget + \noexpand\index{##1\noexpand\actualchar{\string\ttfamily\space##1}% + \ifx\@nil#2\@nil\else \the\@temptokena \fi + \noexpand\doc@handleencap{usage}}% + \fi + \ifx\@nil#3\@nil\else + \noexpand\index{\the\@temptokenb\noexpand\levelchar + ##1\noexpand\actualchar{\string\ttfamily\space##1}% + \noexpand\doc@handleencap{usage}}% + \fi + \noexpand\@esphack}} +\def\doc@createspecialmacrolikeindexes#1#2#3{% + \@temptokena{\space (#2)}% + \@temptokenb{#3:}% + \@nameedef{Code#1Index}##1##2{% + \noexpand\@SpecialIndexHelper@##2\noexpand\@nil + \noexpand\@bsphack + \noexpand\ifdoc@noindex\noexpand\else + \ifdoc@toplevel + \noexpand\special@index{\noexpand\@gtempa\noexpand\actualchar +\string\verb% % to fool emacs highlighting +\noexpand\quotechar*\noexpand\verbatimchar +\noexpand\bslash\noexpand\@gtempa\noexpand\verbatimchar +\ifx\@nil#2\@nil\else \the\@temptokena \fi +\noexpand\encapchar ##1}% + \fi + \ifx\@nil#3\@nil\else + \noexpand\special@index{\the\@temptokenb\noexpand\levelchar +\noexpand\@gtempa\noexpand\actualchar +\string\verb% % to fool emacs highlighting +\noexpand\quotechar*\noexpand\verbatimchar +\noexpand\bslash\noexpand\@gtempa\noexpand\verbatimchar +\noexpand\encapchar ##1}% + \fi + \noexpand\fi + \noexpand\@esphack}% + \@nameedef{SpecialMain#1Index}##1{% + \expandafter\noexpand\csname Code#1Index\endcsname + {main}{##1}}% + \@nameedef{Special#1Index}##1{% + \noexpand\@SpecialIndexHelper@##1\noexpand\@nil + \noexpand\@bsphack + \noexpand\ifdoc@noindex\noexpand\else + \ifdoc@toplevel + \noexpand\doc@providetarget + \noexpand\index{\noexpand\@gtempa\noexpand\actualchar +\string\verb% % to fool emacs highlighting +\noexpand\quotechar*\noexpand\verbatimchar +\noexpand\bslash\noexpand\@gtempa\noexpand\verbatimchar +\ifx\@nil#2\@nil\else \the\@temptokena \fi +\noexpand\doc@handleencap{usage}}% + \fi + \ifx\@nil#3\@nil\else + \noexpand\index{\the\@temptokenb\noexpand\levelchar +\noexpand\@gtempa\noexpand\actualchar +\string\verb% % to fool emacs highlighting +\noexpand\quotechar*\noexpand\verbatimchar +\noexpand\bslash\noexpand\@gtempa\noexpand\verbatimchar +\noexpand\doc@handleencap{usage}}% + \fi + \noexpand\fi + \noexpand\@esphack}} + +\def\doc@createdescribe#1{% + \@namedef{Describe#1}{% + \begingroup + \MakePrivateLetters + \@ifnextchar[%] + {\doc@describe{#1}}{\doc@describe{#1}[]}}} +\def\doc@createenv#1#2#3{% + \@namedef{#3}{% + \@ifnextchar[%] + {\doc@env{#1}{#2}}{\doc@env{#1}{#2}[]}}% + \@namedef{end#3}{\endtrivlist}% +} + +\def\@nameedef#1{\expandafter\edef\csname #1\endcsname} + + +\def\doc@declareerror#1#2{% + \PackageError{doc}{Doc element '#1/#2' already defined?\@gobble}% + {There is already a definition for + '\string\Print#1Name',\MessageBreak + '\string\PrintDescribe#1' + or the environment '#2'.\MessageBreak + Maybe you are overwriting something by mistake!\MessageBreak + Otherwise use '\string\RenewDocElement' instead.}% +} + +\def\doc@notdeclarederror#1#2{% + \PackageError{doc}{Doc element '#1/#2' unknown}% + {I expected an existing definition for + '\string\Print#1Name',\MessageBreak + '\string\PrintDescribe#1' and + the environment '#2' but\MessageBreak + not all of them are defined.\MessageBreak + Maybe you wanted to use + '\string\NewDocElement'?}% +} +\newcommand\NewDocElement[3][]{% + \@ifundefined{Print#2Name}% + {\@ifundefined{PrintDescribe#2}% + {\@ifundefined{#3}% + {\@ifundefined{end#3}% + {\@NewDocElement{#1}}% + \doc@declareerror + }\doc@declareerror + }\doc@declareerror + }\doc@declareerror + {#2}{#3}% +} +\newcommand\RenewDocElement[3][]{% + \@ifundefined{Print#2Name}\doc@notdeclarederror + {\@ifundefined{PrintDescribe#2}\doc@notdeclarederror + {\@ifundefined{#3}\doc@notdeclarederror + {\@ifundefined{end#3}\doc@notdeclarederror + {\@NewDocElement{#1}}% + }% + }% + }% + {#2}{#3}% +} +\def\@NewDocElement#1#2#3{% + \doc@macrolikefalse + \doc@topleveltrue + \def\doc@idxtype{#3}% + \def\doc@idxgroup{#3s}% + \let\doc@printtype\@empty + \setkeys{doc}{#1}% + \ifx\doc@printtype\@empty + \@temptokena{}% + \else + \@temptokena\expandafter{\expandafter + \textnormal\expandafter{\expandafter + \space\expandafter + (\doc@printtype)}}% + \fi + \@nameedef{Print#2Name}##1{% + {\noexpand\MacroFont + \ifdoc@macrolike + \noexpand\string + \fi + ##1% + \the\@temptokena + }}% + \expandafter\let\csname PrintDescribe#2\expandafter\endcsname + \csname Print#2Name\endcsname + \edef\doc@expr{% + \ifdoc@macrolike + \noexpand\doc@createspecialmacrolikeindexes + \else + \noexpand\doc@createspecialindexes + \fi + {#2}% + }% + \expandafter\expandafter\expandafter + \doc@expr + \expandafter\expandafter\expandafter + {\expandafter\doc@idxtype\expandafter}\expandafter + {\doc@idxgroup}% + \doc@createdescribe{#2}% + \ifdoc@macrolike + \doc@createenv{TT}{#2}{#3}% + \else + \doc@createenv{TF}{#2}{#3}% + \fi +} + + +\NewDocElement[macrolike = true , + idxtype = , + idxgroup = , + printtype = + ]{Macro}{macro} + +\def\SpecialMainIndex{\SpecialMainMacroIndex} + +\def\SpecialUsageIndex{\SpecialMacroIndex} + +\def\SpecialIndex {\CodeMacroIndex{code}} + +\NewDocElement[macrolike = false , + idxtype = env. , + idxgroup = environments , + printtype = \textit{env.} + ]{Env}{environment} + + +\DeclareRobustCommand\cs[1]{\texttt{\bslash #1}} + +\endinput +%% +%% End of file `doc-v3beta.sty'. diff --git a/Master/texmf-dist/tex/latex/base/doc.sty b/Master/texmf-dist/tex/latex/base/doc.sty index 417340cebc9..444849f2e76 100644 --- a/Master/texmf-dist/tex/latex/base/doc.sty +++ b/Master/texmf-dist/tex/latex/base/doc.sty @@ -13,8 +13,8 @@ %% (but please observe conditions on bug reports sent to that address!) %% %% -%% Copyright (C) 1993-2020 -%% The LaTeX3 Project and any individual authors listed elsewhere +%% Copyright (C) 1993-2021 +%% The LaTeX Project and any individual authors listed elsewhere %% in this file. %% %% This file was generated from file(s) of the LaTeX base system. @@ -43,11 +43,11 @@ %% extension .ins) which are part of the distribution. \NeedsTeXFormat{LaTeX2e}[1994/12/01] \ProvidesPackage{doc} - [2020/06/15 v2.1m + [2021/05/28 v2.1n Standard LaTeX documentation package (FMi)] %% %% Package `doc' to use with LaTeX 2e -%% Copyright (C) 1989-1999 Frank Mittelbach, all rights reserved. +%% Copyright (C) 1989-2020 Frank Mittelbach, all rights reserved. \@ifundefined{macro@cnt}{}{\endinput} \catcode`\^^A=14 \AtBeginDocument{\catcode`\^^A=14\relax} @@ -274,7 +274,7 @@ \obeylines% \gdef\verb@eol@error{\obeylines% \def^^M{\verb@egroup\@latex@error{% - Text for \noexpand\verb command ended by end of line}\@ehc}}% + \noexpand\verb ended by end of line}\@ehc}}% \endgroup \def\verbatim@nolig@list{\do\`\do\<\do\>\do\,\do\'\do\-} \def\do@noligs#1{% diff --git a/Master/texmf-dist/tex/latex/base/docstrip.tex b/Master/texmf-dist/tex/latex/base/docstrip.tex index e670198de27..a2ddc50ec35 100644 --- a/Master/texmf-dist/tex/latex/base/docstrip.tex +++ b/Master/texmf-dist/tex/latex/base/docstrip.tex @@ -13,8 +13,8 @@ %% (but please observe conditions on bug reports sent to that address!) %% %% -%% Copyright (C) 1993-2020 -%% The LaTeX3 Project and any individual authors listed elsewhere +%% Copyright (C) 1993-2021 +%% The LaTeX Project and any individual authors listed elsewhere %% in this file. %% %% This file was generated from file(s) of the LaTeX base system. @@ -45,8 +45,8 @@ \catcode`\}=2 \def\filename{docstrip.dtx} \def\fileversion{v2.6a} -\def\filedate{2020-07-07} -\def\docdate {2020-07-11} +\def\filedate{2020-11-23} +\def\docdate {2020-11-23} %% %% The docstrip program for use with TeX. %% Copyright (C) 1989-1991 Frank Mittelbach @@ -54,7 +54,7 @@ %% Frank Mittelbach %% Copyright (C) 1995 Marcin Woli\'nski %% Copyright (C) 1996-1997 Mark Wooding, Marcin Woli\'nski -%% Copyright (C) 1998-2020 LaTeX3 project and the above authors +%% Copyright (C) 1998-2021 LaTeX Project and the above authors. %% All rights are reserved. %% \catcode`\Z=\catcode`\% diff --git a/Master/texmf-dist/tex/latex/base/everyshi-ltx.sty b/Master/texmf-dist/tex/latex/base/everyshi-ltx.sty deleted file mode 100644 index 59c66825a24..00000000000 --- a/Master/texmf-dist/tex/latex/base/everyshi-ltx.sty +++ /dev/null @@ -1,68 +0,0 @@ -%% -%% This is file `everyshi-ltx.sty', -%% generated with the docstrip utility. -%% -%% The original source files were: -%% -%% ltshipout.dtx (with options: `everyshi-ltx') -%% -%% 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.html -%% (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 LaTeX base system. -%% -------------------------------------------------------------- -%% -%% It may be distributed and/or modified under the -%% conditions of the LaTeX Project Public License, either version 1.3c -%% of this license or (at your option) any later version. -%% The latest version of this license is in -%% https://www.latex-project.org/lppl.txt -%% and version 1.3c or later is part of all distributions of LaTeX -%% version 2008 or later. -%% -%% This file has the LPPL maintenance status "maintained". -%% -%% This file may only be distributed together with a copy of the LaTeX -%% base system. You may however distribute the LaTeX base system without -%% such generated files. -%% -%% The list of all files belonging to the LaTeX base distribution is -%% given in the file `manifest.txt'. See also `legal.txt' for additional -%% information. -%% -%% The list of derived (unpacked) files belonging to the distribution -%% and covered by LPPL is defined by the unpacking scripts (with -%% extension .ins) which are part of the distribution. -%% -%% File: ltshipout.dtx (C) Copyright 2020 Frank Mittelbach, LaTeX Team -%% -%%% From File: ltshipout.dtx -\providecommand\ltshipoutversion{v1.0d} -\providecommand\ltshipoutdate{2020/11/24} -\ProvidesPackage{everyshi-ltx} - [2020/08/17 v1.0a - Emulation of the original everyshi package^^Jwith kernel methods] -\protected \def \EveryShipout {\AddToHook{shipout/before}} -\protected \def \AtNextShipout {\AddToHookNext{shipout/before}} -%% -%% In normal circumstances the above emulation is sufficient and in -%% all known packages (we know of) that use everyshi it either works or -%% the packages have been adjusted. -%% -%% Code that directly manipulates box 255, however, might fail. -%% If that is the case look at the shipout hooks offered now as -%% they are normally sufficienct to avoid such minpulations (or -%% replace box 255 with \ShipoutBox in the code. -%% -%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -\endinput -%% -%% End of file `everyshi-ltx.sty'. diff --git a/Master/texmf-dist/tex/latex/base/exscale.sty b/Master/texmf-dist/tex/latex/base/exscale.sty index 06bca3638bf..8cd29c30905 100644 --- a/Master/texmf-dist/tex/latex/base/exscale.sty +++ b/Master/texmf-dist/tex/latex/base/exscale.sty @@ -13,8 +13,8 @@ %% (but please observe conditions on bug reports sent to that address!) %% %% -%% Copyright (C) 1993-2020 -%% The LaTeX3 Project and any individual authors listed elsewhere +%% Copyright (C) 1993-2021 +%% The LaTeX Project and any individual authors listed elsewhere %% in this file. %% %% This file was generated from file(s) of the LaTeX base system. diff --git a/Master/texmf-dist/tex/latex/base/fix-cm.sty b/Master/texmf-dist/tex/latex/base/fix-cm.sty index 6bf4862c3d4..5a955c85a78 100644 --- a/Master/texmf-dist/tex/latex/base/fix-cm.sty +++ b/Master/texmf-dist/tex/latex/base/fix-cm.sty @@ -13,8 +13,8 @@ %% (but please observe conditions on bug reports sent to that address!) %% %% -%% Copyright (C) 1993-2020 -%% The LaTeX3 Project and any individual authors listed elsewhere +%% Copyright (C) 1993-2021 +%% The LaTeX Project and any individual authors listed elsewhere %% in this file. %% %% This file was generated from file(s) of the LaTeX base system. @@ -43,7 +43,7 @@ %% extension .ins) which are part of the distribution. \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{fix-cm} - [2015/01/14 v1.1t fixes to LaTeX] + [2020/11/24 v1.1t fixes to LaTeX] %% \input{ts1enc.def} diff --git a/Master/texmf-dist/tex/latex/base/fixltx2e.sty b/Master/texmf-dist/tex/latex/base/fixltx2e.sty index 55709530da4..1ddd2c5c96c 100644 --- a/Master/texmf-dist/tex/latex/base/fixltx2e.sty +++ b/Master/texmf-dist/tex/latex/base/fixltx2e.sty @@ -13,8 +13,8 @@ %% (but please observe conditions on bug reports sent to that address!) %% %% -%% Copyright (C) 1993-2020 -%% The LaTeX3 Project and any individual authors listed elsewhere +%% Copyright (C) 1993-2021 +%% The LaTeX Project and any individual authors listed elsewhere %% in this file. %% %% This file was generated from file(s) of the LaTeX base system. diff --git a/Master/texmf-dist/tex/latex/base/flafter.sty b/Master/texmf-dist/tex/latex/base/flafter.sty index 4a0ce2244fb..951e5820aa6 100644 --- a/Master/texmf-dist/tex/latex/base/flafter.sty +++ b/Master/texmf-dist/tex/latex/base/flafter.sty @@ -13,8 +13,8 @@ %% (but please observe conditions on bug reports sent to that address!) %% %% -%% Copyright (C) 1993-2020 -%% The LaTeX3 Project and any individual authors listed elsewhere +%% Copyright (C) 1993-2021 +%% The LaTeX Project and any individual authors listed elsewhere %% in this file. %% %% This file was generated from file(s) of the LaTeX base system. diff --git a/Master/texmf-dist/tex/latex/base/fleqn.clo b/Master/texmf-dist/tex/latex/base/fleqn.clo index 35900b21998..9e7256d4e20 100644 --- a/Master/texmf-dist/tex/latex/base/fleqn.clo +++ b/Master/texmf-dist/tex/latex/base/fleqn.clo @@ -13,8 +13,8 @@ %% (but please observe conditions on bug reports sent to that address!) %% %% -%% Copyright (C) 1993-2020 -%% The LaTeX3 Project and any individual authors listed elsewhere +%% Copyright (C) 1993-2021 +%% The LaTeX Project and any individual authors listed elsewhere %% in this file. %% %% This file was generated from file(s) of the LaTeX base system. diff --git a/Master/texmf-dist/tex/latex/base/fleqn.sty b/Master/texmf-dist/tex/latex/base/fleqn.sty index 638b1597c6d..90158c02a1b 100644 --- a/Master/texmf-dist/tex/latex/base/fleqn.sty +++ b/Master/texmf-dist/tex/latex/base/fleqn.sty @@ -13,8 +13,8 @@ %% (but please observe conditions on bug reports sent to that address!) %% %% -%% Copyright (C) 1993-2020 -%% The LaTeX3 Project and any individual authors listed elsewhere +%% Copyright (C) 1993-2021 +%% The LaTeX Project and any individual authors listed elsewhere %% in this file. %% %% This file was generated from file(s) of the LaTeX base system. diff --git a/Master/texmf-dist/tex/latex/base/fltrace.sty b/Master/texmf-dist/tex/latex/base/fltrace.sty index 099ef14f8aa..b40772e3498 100644 --- a/Master/texmf-dist/tex/latex/base/fltrace.sty +++ b/Master/texmf-dist/tex/latex/base/fltrace.sty @@ -13,8 +13,8 @@ %% (but please observe conditions on bug reports sent to that address!) %% %% -%% Copyright (C) 1993-2020 -%% The LaTeX3 Project and any individual authors listed elsewhere +%% Copyright (C) 1993-2021 +%% The LaTeX Project and any individual authors listed elsewhere %% in this file. %% %% This file was generated from file(s) of the LaTeX base system. @@ -112,7 +112,7 @@ \global \advance \@colht \@tempdima \ifx \@dbltoplist \@empty \else - \@latexerr{Float(s) lost}\@ehb + \@latex@error{Float(s) lost}\@ehb \let \@dbltoplist \@empty \fi \@cons \@dbltoplist \@currbox diff --git a/Master/texmf-dist/tex/latex/base/fontenc.sty b/Master/texmf-dist/tex/latex/base/fontenc.sty index e59f6c80f54..ecc422cfe8a 100644 --- a/Master/texmf-dist/tex/latex/base/fontenc.sty +++ b/Master/texmf-dist/tex/latex/base/fontenc.sty @@ -13,8 +13,8 @@ %% (but please observe conditions on bug reports sent to that address!) %% %% -%% Copyright (C) 1993-2020 -%% The LaTeX3 Project and any individual authors listed elsewhere +%% Copyright (C) 1993-2021 +%% The LaTeX Project and any individual authors listed elsewhere %% in this file. %% %% This file was generated from file(s) of the LaTeX base system. @@ -43,7 +43,7 @@ %% extension .ins) which are part of the distribution. %%% From File: ltoutenc.dtx \ProvidesPackage{fontenc} - [2020/08/10 v2.0s + [2021/04/29 v2.0v Standard LaTeX package] \def\update@uclc@with@cyrillic{% \expandafter\def\expandafter\@uclclist\expandafter diff --git a/Master/texmf-dist/tex/latex/base/fontmath.cfg b/Master/texmf-dist/tex/latex/base/fontmath.cfg index 533c95e3b97..1bdec3f2425 100644 --- a/Master/texmf-dist/tex/latex/base/fontmath.cfg +++ b/Master/texmf-dist/tex/latex/base/fontmath.cfg @@ -8,8 +8,8 @@ %% %% This is a generated file. %% -%% Copyright (C) 1993-2020 -%% The LaTeX3 Project and any individual authors listed elsewhere +%% Copyright (C) 1993-2021 +%% The LaTeX Project and any individual authors listed elsewhere %% in this file. %% %% This file was generated from file(s) of the LaTeX base system. @@ -37,8 +37,8 @@ %% %%% From File: fontdef.dtx \ProvidesFile{fontmath.cfg} - [2020/08/01 v3.0i LaTeX Kernel -(Uncustomised math + [2021/01/15 v3.0i LaTeX Kernel +(Uncustomized math font setup)] %% %% diff --git a/Master/texmf-dist/tex/latex/base/fontmath.ltx b/Master/texmf-dist/tex/latex/base/fontmath.ltx index 003df16621e..3e7f2963b71 100644 --- a/Master/texmf-dist/tex/latex/base/fontmath.ltx +++ b/Master/texmf-dist/tex/latex/base/fontmath.ltx @@ -8,8 +8,8 @@ %% %% This is a generated file. %% -%% Copyright (C) 1993-2020 -%% The LaTeX3 Project and any individual authors listed elsewhere +%% Copyright (C) 1993-2021 +%% The LaTeX Project and any individual authors listed elsewhere %% in this file. %% %% This file was generated from file(s) of the LaTeX base system. @@ -37,7 +37,7 @@ %% %%% From File: fontdef.dtx \ProvidesFile{fontmath.ltx} - [2020/08/01 v3.0i LaTeX Kernel + [2021/01/15 v3.0i 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/base/fonttext.cfg b/Master/texmf-dist/tex/latex/base/fonttext.cfg index e404b80e993..d53d7db8fa4 100644 --- a/Master/texmf-dist/tex/latex/base/fonttext.cfg +++ b/Master/texmf-dist/tex/latex/base/fonttext.cfg @@ -8,8 +8,8 @@ %% %% This is a generated file. %% -%% Copyright (C) 1993-2020 -%% The LaTeX3 Project and any individual authors listed elsewhere +%% Copyright (C) 1993-2021 +%% The LaTeX Project and any individual authors listed elsewhere %% in this file. %% %% This file was generated from file(s) of the LaTeX base system. @@ -37,8 +37,8 @@ %% %%% From File: fontdef.dtx \ProvidesFile{fonttext.cfg} - [2020/08/01 v3.0i LaTeX Kernel -(Uncustomised text + [2021/01/15 v3.0i LaTeX Kernel +(Uncustomized text font setup)] %% %% diff --git a/Master/texmf-dist/tex/latex/base/fonttext.ltx b/Master/texmf-dist/tex/latex/base/fonttext.ltx index 24d26fe9492..fb78a273973 100644 --- a/Master/texmf-dist/tex/latex/base/fonttext.ltx +++ b/Master/texmf-dist/tex/latex/base/fonttext.ltx @@ -8,8 +8,8 @@ %% %% This is a generated file. %% -%% Copyright (C) 1993-2020 -%% The LaTeX3 Project and any individual authors listed elsewhere +%% Copyright (C) 1993-2021 +%% The LaTeX Project and any individual authors listed elsewhere %% in this file. %% %% This file was generated from file(s) of the LaTeX base system. @@ -37,7 +37,7 @@ %% %%% From File: fontdef.dtx \ProvidesFile{fonttext.ltx} - [2020/08/01 v3.0i LaTeX Kernel + [2021/01/15 v3.0i LaTeX Kernel (Text font setup)] \typeout{=== Don't modify this file, use a .cfg file instead ===^^J} diff --git a/Master/texmf-dist/tex/latex/base/graphpap.sty b/Master/texmf-dist/tex/latex/base/graphpap.sty index 8efcae32d96..9c5cbf867c9 100644 --- a/Master/texmf-dist/tex/latex/base/graphpap.sty +++ b/Master/texmf-dist/tex/latex/base/graphpap.sty @@ -13,8 +13,8 @@ %% (but please observe conditions on bug reports sent to that address!) %% %% -%% Copyright (C) 1993-2020 -%% The LaTeX3 Project and any individual authors listed elsewhere +%% Copyright (C) 1993-2021 +%% The LaTeX Project and any individual authors listed elsewhere %% in this file. %% %% This file was generated from file(s) of the LaTeX base system. diff --git a/Master/texmf-dist/tex/latex/base/hyphen.ltx b/Master/texmf-dist/tex/latex/base/hyphen.ltx index bc471d7c4df..0135fe91078 100644 --- a/Master/texmf-dist/tex/latex/base/hyphen.ltx +++ b/Master/texmf-dist/tex/latex/base/hyphen.ltx @@ -8,8 +8,8 @@ %% %% This is a generated file. %% -%% Copyright (C) 1993-2020 -%% The LaTeX3 Project and any individual authors listed elsewhere +%% Copyright (C) 1993-2021 +%% The LaTeX Project and any individual authors listed elsewhere %% in this file. %% %% This file was generated from file(s) of the LaTeX base system. diff --git a/Master/texmf-dist/tex/latex/base/idx.tex b/Master/texmf-dist/tex/latex/base/idx.tex index cbc233f63aa..8257396f81f 100644 --- a/Master/texmf-dist/tex/latex/base/idx.tex +++ b/Master/texmf-dist/tex/latex/base/idx.tex @@ -1,7 +1,7 @@ % \iffalse meta-comment % -% Copyright (C) 1993-2020 -% The LaTeX3 Project and any individual authors listed elsewhere +% Copyright (C) 1993-2021 +% The LaTeX Project and any individual authors listed elsewhere % in this file. % % This file is part of the LaTeX base system. diff --git a/Master/texmf-dist/tex/latex/base/ifthen.sty b/Master/texmf-dist/tex/latex/base/ifthen.sty index c5ffebfb6a3..ccb5dba4ea9 100644 --- a/Master/texmf-dist/tex/latex/base/ifthen.sty +++ b/Master/texmf-dist/tex/latex/base/ifthen.sty @@ -13,8 +13,8 @@ %% (but please observe conditions on bug reports sent to that address!) %% %% -%% Copyright (C) 1993-2020 -%% The LaTeX3 Project and any individual authors listed elsewhere +%% Copyright (C) 1993-2021 +%% The LaTeX Project and any individual authors listed elsewhere %% in this file. %% %% This file was generated from file(s) of the LaTeX base system. @@ -44,12 +44,12 @@ %% %% File `ifthen.dtx'. %% Copyright (C) 1991 by Leslie Lamport -%% Copyright (C) 1994-2001 LaTeX3 project, David Carlisle +%% Copyright (C) 1994-2001 LaTeX project, David Carlisle %% all rights reserved. %% \NeedsTeXFormat{LaTeX2e}[1994/12/01] \ProvidesPackage{ifthen} - [2014/09/29 v1.1c Standard LaTeX ifthen package (DPC)] + [2020/11/24 v1.1c Standard LaTeX ifthen package (DPC)] \def\TE@throw{\@ne=\@ne\noexpand\fi} \def\boolean#1#2{% \TE@throw\expandafter\noexpand\csname if#1\endcsname#2} diff --git a/Master/texmf-dist/tex/latex/base/inputenc.sty b/Master/texmf-dist/tex/latex/base/inputenc.sty index a8c8ab69b1c..92cd58d7b11 100644 --- a/Master/texmf-dist/tex/latex/base/inputenc.sty +++ b/Master/texmf-dist/tex/latex/base/inputenc.sty @@ -13,8 +13,8 @@ %% (but please observe conditions on bug reports sent to that address!) %% %% -%% Copyright (C) 1993-2020 -%% The LaTeX3 Project and any individual authors listed elsewhere +%% Copyright (C) 1993-2021 +%% The LaTeX Project and any individual authors listed elsewhere %% in this file. %% %% This file was generated from file(s) of the LaTeX base system. @@ -45,7 +45,7 @@ \NeedsTeXFormat{LaTeX2e}[1995/12/01] \ProvidesPackage{inputenc} - [2020/08/01 v1.3d Input encoding file] + [2021/02/14 v1.3d Input encoding file] \def\DeclareInputMath#1{% \@inpenc@test \bgroup diff --git a/Master/texmf-dist/tex/latex/base/lablst.tex b/Master/texmf-dist/tex/latex/base/lablst.tex index 195d578f8c8..da2d7dbceb7 100644 --- a/Master/texmf-dist/tex/latex/base/lablst.tex +++ b/Master/texmf-dist/tex/latex/base/lablst.tex @@ -1,7 +1,7 @@ % \iffalse meta-comment % -% Copyright (C) 1993-2020 -% The LaTeX3 Project and any individual authors listed elsewhere +% Copyright (C) 1993-2021 +% The LaTeX Project and any individual authors listed elsewhere % in this file. % % This file is part of the LaTeX base system. diff --git a/Master/texmf-dist/tex/latex/base/latex.ltx b/Master/texmf-dist/tex/latex/base/latex.ltx index 4580eb1083a..1224702a8dc 100644 --- a/Master/texmf-dist/tex/latex/base/latex.ltx +++ b/Master/texmf-dist/tex/latex/base/latex.ltx @@ -10,11 +10,14 @@ %% ltluatex.dtx (with options: `2ekernel') %% ltexpl.dtx (with options: `2ekernel') %% ltdefns.dtx (with options: `2ekernel') +%% ltcmd.dtx (with options: `2ekernel') %% lthooks.dtx (with options: `2ekernel') +%% ltcmdhooks.dtx (with options: `2ekernel') %% ltalloc.dtx (with options: `2ekernel') %% ltcntrl.dtx (with options: `2ekernel') %% lterror.dtx (with options: `2ekernel') %% ltpar.dtx (with options: `2ekernel') +%% ltpara.dtx (with options: `2ekernel') %% ltspace.dtx (with options: `2ekernel') %% ltlogos.dtx (with options: `2ekernel') %% ltfiles.dtx (with options: `2ekernel') @@ -55,8 +58,8 @@ %% (but please observe conditions on bug reports sent to that address!) %% %% -%% Copyright (C) 1993-2020 -%% The LaTeX3 Project and any individual authors listed elsewhere +%% Copyright (C) 1993-2021 +%% The LaTeX Project and any individual authors listed elsewhere %% in this file. %% %% This file was generated from file(s) of the LaTeX base system. @@ -483,6 +486,8 @@ \errmessage{No room for a new #3}% \fi} \def\newhelp#1#2{\newtoks#1#1\expandafter{\csname#2\endcsname}} +\newread\@inputcheck +\newwrite\@unused \newdimen\maxdimen \maxdimen=16383.99999pt % the largest legal <dimen> \newskip\hideskip \hideskip=-1000pt plus 1fill % negative but can grow \newdimen\p@ \p@=1pt % this saves macro space and time @@ -508,6 +513,12 @@ \finalhyphendemerits=5000 \adjdemerits=10000 \tracinglostchars=1 +\ifx\directlua\@undefined + % \tracingstacklevels=0 % added in 2021 +\else + \newcount\tracingstacklevels + % Code for \tracingstacklevels defined in ltfinal.dtx +\fi \uchyph=1 \defaulthyphenchar=`\- \defaultskewchar=-1 @@ -632,54 +643,25 @@ \gdef\loggingoutput{\tracingoutput\@ne \showboxbreadth\maxdimen\showboxdepth\maxdimen\errorstopmode} \gdef\showoutput{\loggingoutput\showoverfull} -\ifx\tracingscantokens\@undefined -\gdef\loggingall{% +\edef\loggingall{% \tracingstats\tw@ \tracingpages\@ne - \tracinglostchars\@ne - \tracingparagraphs\@ne - \errorcontextlines\maxdimen - \loggingoutput - \tracingmacros\tw@ - \tracingcommands\tw@ - \tracingrestores\@ne - }% -\else -\gdef\loggingall{% - \tracingstats\tw@ - \tracingpages\@ne - \tracinglostchars\tw@ + \tracinglostchars\thr@@ \tracingparagraphs\@ne \tracinggroups\@ne \tracingifs\@ne \tracingscantokens\@ne \tracingnesting\@ne \errorcontextlines\maxdimen - \loggingoutput + \ifdefined\tracingstacklevels \tracingstacklevels\maxdimen \fi + \noexpand \loggingoutput \tracingmacros\tw@ \tracingcommands\thr@@ \tracingrestores\@ne \tracingassigns\@ne }% -\fi -\gdef\tracingall{\showoverfull\loggingall} -\ifx\tracingscantokens\@undefined -\def\tracingnone{% - \tracingonline\z@ - \tracingcommands\z@ - \showboxdepth\m@ne - \showboxbreadth\m@ne - \tracingoutput\z@ - \errorcontextlines\m@ne - \tracingrestores\z@ - \tracingparagraphs\z@ - \tracingmacros\z@ - \tracinglostchars\@ne - \tracingpages\z@ - \tracingstats\z@ -}% -\else -\def\tracingnone{% +\def\tracingall{\showoverfull\loggingall} +\edef\tracingnone{% \tracingassigns\z@ \tracingrestores\z@ \tracingonline\z@ @@ -688,6 +670,7 @@ \showboxbreadth\m@ne \tracingoutput\z@ \errorcontextlines\m@ne + \ifdefined\tracingstacklevels \tracingstacklevels\z@ \fi \tracingnesting\z@ \tracingscantokens\z@ \tracingifs\z@ @@ -698,7 +681,6 @@ \tracingpages\z@ \tracingstats\z@ }% -\fi \def\hideoutput{% \tracingoutput\z@ \showboxbreadth\m@ne @@ -709,9 +691,9 @@ %%% From File: ltvers.dtx \def\fmtname{LaTeX2e} \edef\fmtversion - {2020-10-01} -\def\patch@level{4} -\edef\development@branch@name{} + {2021-06-01} +\def\patch@level{0} +\edef\development@branch@name{develop \the\year-\the\month-\the\day} \iffalse \def\reserved@a#1/#2/#3\@nil{% \count@\year @@ -738,28 +720,30 @@ \fi \ifnum0\ifnum\patch@level=0 \ifx\development@branch@name\@empty 1\fi\fi>0 % \everyjob\expandafter{\the\everyjob - \typeout{\fmtname \space<\fmtversion>}} + \typeout{\fmtname\space <\fmtversion>}} \immediate \write16{\fmtname \space<\fmtversion>} \else\ifnum\patch@level>0 \everyjob\expandafter{\the\everyjob - \typeout{\fmtname \space<\fmtversion> patch level \patch@level}} + \typeout{\fmtname\space <\fmtversion> patch level \patch@level}} \immediate - \write16{\fmtname \space<\fmtversion> patch level \patch@level} + \write16{\fmtname\space <\fmtversion> patch level \patch@level} \else \everyjob\expandafter{\the\everyjob - \typeout{\fmtname \space<\fmtversion> pre-release-\number-\patch@level\space - \ifx\development@branch@name\@undefined \else - \ifx\development@branch@name\@empty \else - \space (\development@branch@name\space branch)% + \typeout{\fmtname\space <\fmtversion> + pre-release-\number-\patch@level\space + \ifx\development@branch@name\@undefined \else + \ifx\development@branch@name\@empty \else + \space (\development@branch@name\space branch)% \fi \fi }} \immediate - \write16{\fmtname \space<\fmtversion> pre-release-\number-\patch@level\space - \ifx\development@branch@name\@undefined \else - \ifx\development@branch@name\@empty \else - \space (\development@branch@name\space branch)% + \write16{\fmtname\space <\fmtversion> + pre-release-\number-\patch@level\space + \ifx\development@branch@name\@undefined \else + \ifx\development@branch@name\@empty \else + \space (\development@branch@name\space branch)% \fi \fi } @@ -772,17 +756,37 @@ {There is an \string\EndIncludeRelease\space missing}% \@includeinreleasefalse \fi - \kernel@ifnextchar[% - {\@IncludeInRelease{#1}} - {\@IncludeInRelease{#1}[#1]}} + \ifnum0% + \ifx\new@moduledate\@empty\else 1\fi + \ifnum \expandafter\@parse@version#1//00\@nil=0 1\fi + =11 + \expandafter\@firstoftwo + \else + \expandafter\@secondoftwo + \fi + {\finish@module@release{#1}}% + {\kernel@ifnextchar[% + {\@IncludeInRelease{#1}} + {\@IncludeInRelease{#1}[#1]}}} +\def\finish@module@release#1#2#3{% + \toks@{[#1] #3}% + \ifnum\expandafter\@parse@version\new@moduledate//00\@nil + >\expandafter\@parse@version\fmtversion//00\@nil + \GenericInfo{}{Applying: \the\toks@}% + \else + \GenericInfo{}{Skipping: \the\toks@}% + \expandafter\gobble@finish@module@release + \fi} +\long\def\gobble@finish@module@release#1\EndModuleRelease{% + \EndModuleRelease} \def\@IncludeInRelease#1[#2]{\@IncludeInRele@se{#2}} \def\@IncludeInRele@se#1#2#3{% \toks@{[#1] #3}% \expandafter\ifx\csname\string#2+\@currname+IIR\endcsname\relax \ifnum\expandafter\@parse@version#1//00\@nil - >\expandafter\@parse@version\fmtversion//00\@nil + >\expandafter\@parse@version\fmtversion//00\@nil \GenericInfo{}{Skipping: \the\toks@}% - \expandafter\expandafter\expandafter\@gobble@IncludeInRelease + \expandafter\expandafter\expandafter\@gobble@IncludeInRelease \else \GenericInfo{}{Applying: \the\toks@}% \@includeinreleasetrue @@ -798,6 +802,9 @@ \@includeinreleasefalse \else \PackageError{latexrelease}{mis-matched EndIncludeInRelease}{}% +\fi +\if@skipping@module + \expandafter\new@module@skip \fi} \long\def\@gobble@IncludeInRelease#1\EndIncludeInRelease{% \@includeinreleasefalse @@ -807,6 +814,47 @@ #2#3\@end@check@IncludeInRelease{% \ifx\@check@IncludeInRelease#2\else \PackageError{latexrelease}{skipped IncludeInRelease for tag \string#2}{}% + \fi + \if@skipping@module + \expandafter\new@module@skip + \fi} +\let\if@skipping@module\iffalse +\def\@skipping@moduletrue{\let\if@skipping@module\iftrue} +\def\@skipping@modulefalse{\let\if@skipping@module\iffalse} +\let\new@modulename\@empty +\let\new@moduledate\@empty +\def\NewModuleRelease#1#2#3{% + \ifx\new@modulename\@empty \else + \@latex@error{Nested \noexpand\NewModuleRelease forbidden.}\@ehd \fi + \edef\new@moduledate{#1}% + \edef\new@modulename{#2}% + \GenericInfo{}{BEGIN module: \new@modulename\space (\new@moduledate)}% + \GenericInfo{}{ \@spaces\@spaces\@spaces\space#3\@gobble}% + \ifnum\sourceLaTeXdate<% + \expandafter\@parse@version\new@moduledate//00\@nil\relax + \ifnum\expandafter\@parse@version\fmtversion//00\@nil<% + \expandafter\@parse@version\new@moduledate//00\@nil\relax + \GenericInfo{}{Skipping module \new@modulename}% + \expandafter\expandafter + \expandafter\gobble@finish@module@release + \else + \GenericInfo{}{Applying module \new@modulename} + \@skipping@modulefalse + \fi + \else + \GenericInfo{}{Skipping module \new@modulename} + \@skipping@moduletrue + \expandafter\new@module@skip + \fi} +\long\def\new@module@skip#1\IncludeInRelease{\IncludeInRelease} +\def\EndModuleRelease{% + \ifx\new@modulename\@empty + \@latex@error{Extra \string\EndModuleRelease.}\@eha + \else + \GenericInfo{}{END module: \new@modulename\space (\new@moduledate)}% + \let\new@modulename\@empty + \let\new@moduledate\@empty + \@skipping@modulefalse \fi} %%% From File: ltluatex.dtx \ifx\directlua\@undefined\else @@ -988,12 +1036,17 @@ } \fi %%% From File: ltexpl.dtx -\let\@kernel@after@enddocument\@empty -\let\@kernel@after@enddocument@afterlastpage\@empty -\def\@expl@sys@load@backend@@{} -\def\@expl@push@filename@@{} -\def\@expl@push@filename@aux@@{} -\def\@expl@pop@filename@@{} +\ifx\@kernel@after@enddocument\@undefined + \let \@kernel@after@enddocument \@empty + \let \@kernel@after@enddocument@afterlastpage \@empty + \let \@kernel@before@begindocument \@empty + \let \@kernel@after@begindocument \@empty +\fi +\def\reserved@a#1{\ifdefined#1\else\def#1{}\fi} +\reserved@a\@expl@sys@load@backend@@ +\reserved@a\@expl@push@filename@@ +\reserved@a\@expl@push@filename@aux@@ +\reserved@a\@expl@pop@filename@@ \def\@expl@finalise@setup@@{} \long\def\@gobble#1{} \long\def\@firstofone#1{#1} @@ -1051,15 +1104,7 @@ \errmessage{LaTeX requires expl3}% \batchmode \read -1 to \reserved@a }% - {% - \input expl3.ltx - \ifdefined\NewDocumentCommand - \else - \IfFileExists{xparse.ltx} - {\input xparse.ltx } - {}% - \fi - }% + {\input expl3.ltx }% } \ExplSyntaxOn \cs_gset_eq:NN \@expl@cs@to@str@@N \cs_to_str:N @@ -1320,7 +1365,7 @@ \count@=\escapechar \escapechar=`\\ \@ifundefined{\expandafter\@gobble\string#1}{% - \@latex@error{The control sequence `\string#1' is undefined!% + \@latex@error{Command `\string#1' is undefined!% \MessageBreak There is nothing here to make robust}% \@eha }% @@ -1340,7 +1385,7 @@ \noexpand\protect\expandafter\noexpand \csname\expandafter\@gobble\string#1\space\endcsname}% }% - {\@latex@info{The control sequence `\string#1' is already robust}}% + {\@latex@info{Command `\string#1' is already robust}}% }% \escapechar=\count@ }% @@ -1626,12 +1671,2264 @@ \toks@\expandafter{#1#2}% \xdef#1{\the\toks@}% \endgroup} -%% -%% File: lthooks.dtx (C) Copyright 2020 Frank Mittelbach, -%% Phelype Oleinik & LaTeX Team +%%% From File: ltcmd.dtx +\def\ltcmdversion{v1.0e} +\def\ltcmddate{2021-05-24} +\message{document commands,} +\ExplSyntaxOn +\tl_new:N \l__cmd_arg_spec_tl +\tl_new:N \l__cmd_args_tl +\tl_new:N \l__cmd_args_i_tl +\tl_new:N \l__cmd_args_ii_tl +\int_new:N \l__cmd_current_arg_int +\bool_new:N \l__cmd_defaults_bool +\tl_new:N \l__cmd_defaults_tl +\bool_new:N \l__cmd_environment_bool +\str_new:N \l__cmd_environment_str +\bool_new:N \l__cmd_expandable_bool +\tl_new:N \l__cmd_expandable_aux_name_tl +\tl_set:Nn \l__cmd_expandable_aux_name_tl + { + \l__cmd_function_tl \c_space_tl + ( arg~ \int_use:N \l__cmd_current_arg_int ) + } +\int_new:N \g__cmd_grabber_int +\tl_new:N \l__cmd_fn_tl +\tl_new:N \l__cmd_fn_code_tl +\tl_new:N \l__cmd_function_tl +\bool_new:N \l__cmd_grab_expandably_bool +\bool_new:N \l__cmd_obey_spaces_bool +\tl_new:N \l__cmd_last_delimiters_tl +\bool_new:N \l__cmd_long_bool +\int_new:N \l__cmd_m_args_int +\bool_new:N \l__cmd_prefixed_bool +\tl_new:N \l__cmd_process_all_tl +\tl_new:N \l__cmd_process_one_tl +\bool_new:N \l__cmd_process_some_bool +\tl_new:N \l__cmd_saved_args_tl +\tl_new:N \l__cmd_signature_tl +\bool_new:N \l__cmd_some_obey_spaces_bool +\bool_new:N \l__cmd_some_long_bool +\bool_new:N \l__cmd_some_short_bool +\prop_new:N \l__cmd_tmp_prop +\tl_new:N \l__cmd_tmpa_tl +\tl_new:N \l__cmd_tmpb_tl +\cs_new_eq:NN \__cmd_tmp:w ? +\msg_redirect_module:nnn { cmd } { info } { none } +\prop_gput:Nnn \g_msg_module_type_prop { cmd } { LaTeX } +\cs_new_protected:Npn \__cmd_declare_cmd:Nnn + { + \bool_set_false:N \l__cmd_expandable_bool + \__cmd_declare_cmd_aux:Nnn + } +\cs_new_protected:Npn \__cmd_declare_expandable_cmd:Nnn + { + \bool_set_true:N \l__cmd_expandable_bool + \__cmd_declare_cmd_aux:Nnn + } +\cs_new_protected:Npn \__cmd_declare_cmd_aux:Nnn #1#2#3 + { + \cs_if_exist:NTF #1 + { + \msg_info:nnxx { cmd } { redefine-command } + { \token_to_str:N #1 } { \tl_to_str:n {#2} } + } + { + \bool_lazy_or:nnT + { \cs_if_exist_p:c { \cs_to_str:N #1 ~ code } } + { \cs_if_exist_p:c { \cs_to_str:N #1 ~ defaults } } + { + \msg_warning:nnx { cmd } { unsupported-let } + { \token_to_str:N #1 } + } + \msg_info:nnxx { cmd } { define-command } + { \token_to_str:N #1 } { \tl_to_str:n {#2} } + } + \bool_set_false:N \l__cmd_environment_bool + \__cmd_declare_cmd_internal:Nnnn #1 {#2} {#3} { } + } +\cs_new_protected:Npn \__cmd_declare_cmd_internal:Nnnn #1#2#3#4 + { + \tl_set:Nx \l__cmd_function_tl { \cs_to_str:N #1 } + \tl_set:Nx \l__cmd_fn_tl + { \exp_not:c { \l__cmd_function_tl \c_space_tl } } + \__cmd_normalize_arg_spec:n {#2} + \exp_args:No \__cmd_prepare_signature:n \l__cmd_arg_spec_tl + \__cmd_declare_cmd_code:Nnn #1 {#2} {#3} + #4 + \__cmd_break_point:n {#2} + } +\cs_generate_variant:Nn \__cmd_declare_cmd_internal:Nnnn { cnx } +\cs_new_eq:NN \__cmd_break_point:n \use_none:n +\cs_new_protected:Npn \__cmd_declare_cmd_code:Nnn + { + \bool_if:NTF \l__cmd_grab_expandably_bool + { \__cmd_declare_cmd_code_expandable:Nnn } + { \__cmd_declare_cmd_code_aux:Nnn } + } +\cs_new_protected:Npn \__cmd_declare_cmd_code_aux:Nnn #1#2#3 + { + \cs_generate_from_arg_count:cNnn + { \l__cmd_function_tl \c_space_tl code } + \cs_set_protected:Npn \l__cmd_current_arg_int {#3} + \cs_set_protected_nopar:Npx #1 + { + \bool_if:NTF \l__cmd_environment_bool + { + \__cmd_start_env:nnnnn { \exp_not:n {#2} } + { \l__cmd_environment_str } + } + { + \__cmd_start:nNNnnn { \exp_not:n {#2} } + \exp_not:c { \l__cmd_function_tl \c_space_tl } + \exp_not:c { \l__cmd_function_tl \c_space_tl code } + } + { \exp_not:o \l__cmd_signature_tl } + { + \bool_if:NT \l__cmd_defaults_bool + { \exp_not:o \l__cmd_defaults_tl } + } + { + \bool_if:NT \l__cmd_process_some_bool + { \exp_not:o \l__cmd_process_all_tl } + } + } + } +\cs_new_protected:Npn \__cmd_declare_cmd_code_expandable:Nnn #1#2#3 + { + \exp_args:Ncc \cs_generate_from_arg_count:NNnn + { \l__cmd_function_tl \c_space_tl code } + { cs_set \bool_if:NF \l__cmd_expandable_bool { _protected } :Npn } + \l__cmd_current_arg_int {#3} + \bool_if:NT \l__cmd_defaults_bool + { + \use:x + { + \cs_generate_from_arg_count:cNnn + { \l__cmd_function_tl \c_space_tl defaults } + \cs_set:Npn \l__cmd_current_arg_int + { \exp_not:o \l__cmd_defaults_tl } + } + } + \bool_if:NTF \l__cmd_expandable_bool + { \cs_set_nopar:Npx } { \cs_set_protected_nopar:Npx } #1 + { + \exp_not:N \__cmd_start_expandable:nNNNNn + { \exp_not:n {#2} } + \exp_not:c { \l__cmd_function_tl \c_space_tl } + \exp_not:c + { + \l__cmd_function_tl \c_space_tl + \bool_if:NT \l__cmd_some_short_bool + { \bool_if:NT \l__cmd_some_long_bool { \c_space_tl } } + } + \exp_not:c { \l__cmd_function_tl \c_space_tl code } + \bool_if:NTF \l__cmd_defaults_bool + { \exp_not:c { \l__cmd_function_tl \c_space_tl defaults } } + { ? } + { \exp_not:o \l__cmd_signature_tl } + } + \bool_if:NTF \l__cmd_some_long_bool + { + \bool_if:NT \l__cmd_some_short_bool + { + \cs_set_nopar:cpx { \l__cmd_function_tl \c_space_tl \c_space_tl } + ##1##2 { ##1 {##2} } + } + \cs_set:cpx + } + { \cs_set_nopar:cpx } + { \l__cmd_function_tl \c_space_tl } ##1##2 { ##1 {##2} } + } +\cs_new_protected:Npn \__cmd_declare_env:nnnn #1#2 + { + \str_set:Nx \l__cmd_environment_str {#1} + \str_set:Nx \l__cmd_environment_str + { \tl_trim_spaces:o { \l__cmd_environment_str } } + \cs_if_exist:cTF { \l__cmd_environment_str } + { + \msg_info:nnxx { cmd } { redefine-environment } + { \l__cmd_environment_str } { \tl_to_str:n {#2} } + } + { + \msg_info:nnxx { cmd } { define-environment } + { \l__cmd_environment_str } { \tl_to_str:n {#2} } + } + \bool_set_false:N \l__cmd_expandable_bool + \bool_set_true:N \l__cmd_environment_bool + \exp_args:NV \__cmd_declare_env_internal:nnnn + \l__cmd_environment_str {#2} + } +\cs_new_protected:Npn \__cmd_declare_env_internal:nnnn #1#2#3#4 + { + \__cmd_declare_cmd_internal:cnxn { environment~ #1 } {#2} + { + \cs_set_nopar:Npx \exp_not:c { environment~ #1 ~end~aux } + { + \exp_not:N \exp_not:N \exp_not:c { environment~ #1~end~aux~ } + \exp_not:n { \exp_not:o \l__cmd_args_tl } + } + \exp_not:n {#3} + } + { + \cs_set_nopar:cpx { environment~ #1 ~end } + { \exp_not:c { environment~ #1 ~end~aux } } + \cs_generate_from_arg_count:cNnn + { environment~ #1 ~end~aux~ } \cs_set:Npn + \l__cmd_current_arg_int {#4} + \cs_set_eq:cc {#1} { environment~ #1 } + \cs_set_eq:cc { end #1 } { environment~ #1 ~end } + } + } +\cs_new_protected:Npn \__cmd_start_env:nnnnn #1#2 + { + \conditionally@traceoff + \group_align_safe_begin: + \str_set:Nn \l__cmd_environment_str {#2} + \bool_set_true:N \l__cmd_environment_bool + \__cmd_start_aux:ccnnnn + { environment~ \l__cmd_environment_str \c_space_tl } + { environment~ \l__cmd_environment_str \c_space_tl code } + {#1} + } +\cs_new_protected:Npx \__cmd_start:nNNnnn #1#2#3 + { + \exp_not:c { xparse~function~is~not~expandable } + \exp_not:N \conditionally@traceoff + \exp_not:N \group_align_safe_begin: + \exp_not:n { \bool_set_false:N \l__cmd_environment_bool } + \exp_not:N \__cmd_start_aux:NNnnnn + #2 #3 {#1} + } +\cs_new_protected:Npn \__cmd_start_aux:NNnnnn #1#2#3#4#5#6 + { + \tl_clear:N \l__cmd_args_tl + \tl_set:Nn \l__cmd_fn_tl {#1} + \tl_set:Nn \l__cmd_fn_code_tl {#2} + \tl_set:Nn \l__cmd_defaults_tl {#5} + \tl_set:Nn \l__cmd_process_all_tl {#6} + #4 \__cmd_run_code: + } +\cs_generate_variant:Nn \__cmd_start_aux:NNnnnn { cc } +\cs_new_protected:Npn \__cmd_run_code: + { + \tl_if_empty:NF \l__cmd_defaults_tl { \__cmd_defaults: } + \tl_if_empty:NF \l__cmd_process_all_tl { \__cmd_args_process: } + \group_align_safe_end: + \conditionally@traceon + \exp_after:wN \l__cmd_fn_code_tl \l__cmd_args_tl + } +\cs_new_protected:Npn \__cmd_defaults: + { + \__cmd_defaults_def: + \tl_set_eq:NN \l__cmd_args_i_tl \l__cmd_args_tl + \__cmd_defaults_aux: \__cmd_defaults_aux: \__cmd_defaults_aux: + \__cmd_defaults_aux: \__cmd_defaults_aux: \__cmd_defaults_aux: + \__cmd_defaults_aux: \__cmd_defaults_aux: \__cmd_defaults_aux: + \__cmd_defaults_error:w + \q_recursion_stop + \tl_set_eq:NN \l__cmd_args_tl \l__cmd_args_i_tl + } +\cs_new_protected:Npn \__cmd_defaults_aux: + { + \tl_set:Nx \l__cmd_args_ii_tl + { \exp_after:wN \__cmd_tmp:w \l__cmd_args_i_tl } + \tl_if_eq:NNT \l__cmd_args_ii_tl \l__cmd_args_i_tl + { \use_none_delimit_by_q_recursion_stop:w } + \tl_set_eq:NN \l__cmd_args_i_tl \l__cmd_args_ii_tl + } +\cs_new_protected:Npn \__cmd_defaults_error:w \q_recursion_stop + { + \msg_error:nnx { cmd } { loop-in-defaults } + { \__cmd_environment_or_command: } + } +\cs_new_protected:Npn \__cmd_defaults_def: + { + \tl_clear:N \l__cmd_tmpa_tl + \int_zero:N \l__cmd_current_arg_int + \__cmd_tl_mapthread_function:NNN \l__cmd_args_tl \l__cmd_defaults_tl + \__cmd_defaults_def:nn + \cs_generate_from_arg_count:NNVo \__cmd_tmp:w \cs_set:Npn + \l__cmd_current_arg_int \l__cmd_tmpa_tl + } +\cs_generate_variant:Nn \cs_generate_from_arg_count:NNnn { NNVo } +\cs_new_protected:Npn \__cmd_defaults_def:nn + { + \int_incr:N \l__cmd_current_arg_int + \exp_args:NV \__cmd_defaults_def:nnn \l__cmd_current_arg_int + } +\cs_new_protected:Npn \__cmd_defaults_def:nnn #1#2#3 + { + \tl_put_right:Nx \l__cmd_tmpa_tl + { + { + \exp_not:N \exp_not:n + { + \tl_if_novalue:nTF {#2} + { \exp_not:o {#3} } + { \exp_not:n { ## #1 } } + } + } + } + } +\cs_new_protected:Npn \__cmd_args_process: + { + \tl_clear:N \l__cmd_args_ii_tl + \__cmd_tl_mapthread_function:NNN + \l__cmd_args_tl + \l__cmd_process_all_tl + \__cmd_args_process_loop:nn + \tl_set_eq:NN \l__cmd_args_tl \l__cmd_args_ii_tl + } +\cs_new_protected:Npn \__cmd_args_process_loop:nn #1#2 + { + \tl_set:Nn \ProcessedArgument {#1} + \tl_if_novalue:nF {#1} + { \tl_map_function:nN {#2} \__cmd_args_process_aux:n } + \tl_put_right:No \l__cmd_args_ii_tl + { \exp_after:wN { \ProcessedArgument } } + } +\cs_new_protected:Npn \__cmd_args_process_aux:n #1 + { + \cs_generate_from_arg_count:NNnn \__cmd_tmp:w \cs_set:Npn + { \tl_count:N \l__cmd_args_tl } {#1} + \exp_args:NNNo \exp_after:wN \__cmd_tmp:w \l__cmd_args_tl + { \ProcessedArgument } + } +\cs_new:Npn \__cmd_start_expandable:nNNNNn #1#2#3#4#5#6 + { + \group_align_safe_begin: + #6 \__cmd_end_expandable:NNw #5 #4 \q__cmd #2#3 + } +\cs_new:Npn \__cmd_end_expandable:NNw #1#2 + { \__cmd_end_expandable_aux:w #1#2 \prg_do_nothing: } +\cs_new:Npn \__cmd_end_expandable_aux:w #1#2#3 \q__cmd + { \exp_args:No \__cmd_end_expandable_aux:nNNNN {#3} #1 #2 } +\cs_new:Npn \__cmd_end_expandable_aux:nNNNN #1#2#3#4#5 + { + \token_if_eq_charcode:NNT ? #2 { \exp_after:wN \use_iv:nnnn } + \__cmd_end_expandable_defaults:nnnNNn {#1} { } {#1} #2#3 + { } { } { } { } { } { } { } { } { } { } + { + \msg_expandable_error:nnf { cmd } { loop-in-defaults } + { \exp_args:Nf \tl_trim_spaces:n { \token_to_str:N #4 } } + \use_iv:nnnn + } + \q_stop + } +\cs_new:Npn \__cmd_end_expandable_defaults:nnnNNn #1#2#3#4#5#6 + { + #6 + \str_if_eq:nnTF {#1} {#2} + { \use_i_delimit_by_q_stop:nw { \group_align_safe_end: #5 #1 } } + { + \exp_args:No \__cmd_tl_mapthread_function:nnN + { #4 #1 } {#3} + \__cmd_end_expandable_defaults:nnw + \__cmd_end_expandable_defaults:nnnNNn { } {#1} {#3} #4 #5 + } + } +\cs_new:Npn \__cmd_end_expandable_defaults:nnw #1#2 + { + \tl_if_novalue:nTF {#2} + { \exp_args:No \__cmd_end_expandable_defaults:nw {#1} } + { \__cmd_end_expandable_defaults:nw {#2} } + } +\cs_new:Npn \__cmd_end_expandable_defaults:nw + #1#2 \__cmd_end_expandable_defaults:nnnNNn #3 + { #2 \__cmd_end_expandable_defaults:nnnNNn { #3 {#1} } } +\cs_new_protected:Npn \__cmd_normalize_arg_spec:n #1 + { + \int_zero:N \l__cmd_current_arg_int + \tl_clear:N \l__cmd_last_delimiters_tl + \tl_clear:N \l__cmd_arg_spec_tl + \bool_set_true:N \l__cmd_grab_expandably_bool + \bool_set_false:N \l__cmd_obey_spaces_bool + \bool_set_false:N \l__cmd_long_bool + \bool_set_false:N \l__cmd_some_obey_spaces_bool + \bool_set_false:N \l__cmd_some_long_bool + \bool_set_false:N \l__cmd_some_short_bool + \__cmd_normalize_arg_spec_loop:n #1 + \q_recursion_tail \q_recursion_tail \q_recursion_tail \q_recursion_stop + \int_compare:nNnT \l__cmd_current_arg_int > 9 + { + \msg_error:nnxx { cmd } { too-many-arguments } + { \__cmd_environment_or_command: } { \tl_to_str:n {#1} } + \__cmd_bad_def:wn + } + \bool_if:NT \l__cmd_expandable_bool + { + \tl_if_empty:NF \l__cmd_last_delimiters_tl + { + \msg_error:nnxx { cmd } { expandable-ending-optional } + { \iow_char:N \\ \l__cmd_function_tl } { \tl_to_str:n {#1} } + \__cmd_bad_def:wn + } + } + \bool_if:NT \l__cmd_expandable_bool + { \bool_set_true:N \l__cmd_grab_expandably_bool } + \bool_if:NT \l__cmd_environment_bool + { \bool_set_false:N \l__cmd_grab_expandably_bool } + } +\cs_new_protected:Npn \__cmd_normalize_arg_spec_loop:n #1 + { + \quark_if_recursion_tail_stop:n {#1} + \int_incr:N \l__cmd_current_arg_int + \cs_if_exist_use:cF { __cmd_normalize_type_ \tl_to_str:n {#1} :w } + { + \bool_lazy_any:nTF + { + { \str_if_eq_p:nn {#1} { G } } + { \str_if_eq_p:nn {#1} { g } } + { \str_if_eq_p:nn {#1} { l } } + { \str_if_eq_p:nn {#1} { u } } + } + { + \msg_error:nnxx { cmd } { xparse-argument-type } + { \__cmd_environment_or_command: } { \tl_to_str:n {#1} } + } + { + \msg_error:nnxx { cmd } { unknown-argument-type } + { \__cmd_environment_or_command: } { \tl_to_str:n {#1} } + } + \__cmd_bad_def:wn + } + } +\cs_set_protected:Npn \__cmd_tmp:w #1 + { + \cs_new_protected:Npn \__cmd_normalize_type_d:w ##1##2 + { + \quark_if_recursion_tail_stop_do:nn {##2} { \__cmd_bad_arg_spec:wn } + \__cmd_normalize_type_D:w {##1} {##2} {#1} + } + \cs_new_protected:Npn \__cmd_normalize_type_e:w ##1 + { + \quark_if_recursion_tail_stop_do:nn {##1} { \__cmd_bad_arg_spec:wn } + \__cmd_normalize_type_E:w {##1} { } + } + \cs_new_protected:Npn \__cmd_normalize_type_o:w + { \__cmd_normalize_type_D:w [ ] {#1} } + \cs_new_protected:Npn \__cmd_normalize_type_O:w + { \__cmd_normalize_type_D:w [ ] } + \cs_new_protected:Npn \__cmd_normalize_type_r:w ##1##2 + { + \quark_if_recursion_tail_stop_do:nn {##2} { \__cmd_bad_arg_spec:wn } + \__cmd_normalize_type_R:w {##1} {##2} {#1} + } + \cs_new_protected:Npn \__cmd_normalize_type_s:w + { \__cmd_normalize_type_t:w * } + } +\exp_args:No \__cmd_tmp:w { \c_novalue_tl } +\cs_new_protected:cpn { __cmd_normalize_type_>:w } #1#2 + { + \quark_if_recursion_tail_stop_do:nn {#2} { \__cmd_bad_arg_spec:wn } + \bool_if:NT \l__cmd_expandable_bool + { + \msg_error:nnxx { cmd } { processor-in-expandable } + { \iow_char:N \\ \l__cmd_function_tl } { \tl_to_str:n {#1} } + \__cmd_bad_def:wn + } + \tl_put_right:Nx \l__cmd_arg_spec_tl { > { \tl_trim_spaces:n {#1} } } + \int_decr:N \l__cmd_current_arg_int + \bool_set_false:N \l__cmd_grab_expandably_bool + \__cmd_normalize_arg_spec_loop:n {#2} + } +\cs_new_protected:cpn { __cmd_normalize_type_+:w } #1 + { + \quark_if_recursion_tail_stop_do:nn {#1} { \__cmd_bad_arg_spec:wn } + \bool_if:NT \l__cmd_long_bool + { + \msg_error:nnxx { cmd } { two-markers } + { \__cmd_environment_or_command: } { + } + \__cmd_bad_def:wn + } + \bool_set_true:N \l__cmd_long_bool + \int_decr:N \l__cmd_current_arg_int + \__cmd_normalize_arg_spec_loop:n {#1} + } +\cs_new_protected:cpn { __cmd_normalize_type_!:w } #1 + { + \quark_if_recursion_tail_stop_do:nn {#1} { \__cmd_bad_arg_spec:wn } + \bool_if:NT \l__cmd_obey_spaces_bool + { + \msg_error:nnxx { cmd } { two-markers } + { \__cmd_environment_or_command: } { ! } + \__cmd_bad_def:wn + } + \bool_set_true:N \l__cmd_obey_spaces_bool + \bool_set_true:N \l__cmd_some_obey_spaces_bool + \int_decr:N \l__cmd_current_arg_int + \__cmd_normalize_arg_spec_loop:n {#1} + } +\cs_new_protected:Npn \__cmd_normalize_type_D:w #1#2#3 + { + \quark_if_recursion_tail_stop_do:nn {#3} { \__cmd_bad_arg_spec:wn } + \__cmd_single_token_check:n {#1} \__cmd_allowed_token_check:N #1 + \__cmd_single_token_check:n {#2} + \__cmd_add_arg_spec:n { D #1 #2 {#3} } + \tl_put_right:Nn \l__cmd_last_delimiters_tl {#1} + \bool_set_false:N \l__cmd_grab_expandably_bool + \__cmd_normalize_arg_spec_loop:n + } +\cs_new_protected:Npn \__cmd_normalize_type_E:w #1#2 + { + \quark_if_recursion_tail_stop_do:nn {#2} { \__cmd_bad_arg_spec:wn } + \tl_if_blank:nT {#1} { \__cmd_bad_arg_spec:wn } + \tl_map_function:nN {#1} \__cmd_single_token_check:n + \tl_map_function:nN {#1} \__cmd_allowed_token_check:N + \__cmd_normalize_E_unique_check:w #1 \q_nil \q_stop + \int_compare:nNnT { \tl_count:n {#2} } > { \tl_count:n {#1} } + { \__cmd_bad_arg_spec:wn } + \__cmd_add_arg_spec:n { E {#1} {#2} } + \tl_put_right:Nn \l__cmd_last_delimiters_tl {#1} + \bool_set_false:N \l__cmd_grab_expandably_bool + \int_add:Nn \l__cmd_current_arg_int { \tl_count:n {#1} - 1 } + \__cmd_normalize_arg_spec_loop:n + } +\cs_new_protected:Npn \__cmd_normalize_E_unique_check:w #1#2 \q_stop + { + \quark_if_nil:NF #1 + { + \tl_if_in:nnT {#2} {#1} { \__cmd_bad_arg_spec:wn } + \__cmd_normalize_E_unique_check:w #2 \q_stop + } + } +\cs_new_protected:Npn \__cmd_normalize_type_t:w #1 + { + \quark_if_recursion_tail_stop_do:Nn #1 { \__cmd_bad_arg_spec:wn } + \__cmd_single_token_check:n {#1} \__cmd_allowed_token_check:N #1 + \tl_put_right:Nx \l__cmd_arg_spec_tl + { + \bool_if:NT \l__cmd_obey_spaces_bool { ! } + t \exp_not:n {#1} + } + \tl_put_right:Nn \l__cmd_last_delimiters_tl {#1} + \bool_set_false:N \l__cmd_grab_expandably_bool + \bool_set_false:N \l__cmd_obey_spaces_bool + \bool_set_false:N \l__cmd_long_bool + \__cmd_normalize_arg_spec_loop:n + } +\cs_new_protected:Npn \__cmd_normalize_type_m:w + { + \__cmd_delimiter_check:nnn { } { m } { \iow_char:N \{ } + \__cmd_add_arg_spec_mandatory:n { m } + \__cmd_normalize_arg_spec_loop:n + } +\cs_new_protected:Npn \__cmd_normalize_type_R:w #1#2#3 + { + \quark_if_recursion_tail_stop_do:nn {#3} { \__cmd_bad_arg_spec:wn } + \__cmd_single_token_check:n {#1} \__cmd_allowed_token_check:N #1 + \__cmd_single_token_check:n {#2} + \__cmd_delimiter_check:nnn {#1} { R/r } { \tl_to_str:n {#1} } + \bool_set_false:N \l__cmd_grab_expandably_bool + \__cmd_add_arg_spec_mandatory:n { R #1 #2 {#3} } + \__cmd_normalize_arg_spec_loop:n + } +\cs_new_protected:Npn \__cmd_normalize_type_v:w + { + \__cmd_normalize_check_gv:N v + \__cmd_add_arg_spec_mandatory:n { v } + \__cmd_normalize_arg_spec_loop:n + } +\cs_new_protected:Npn \__cmd_normalize_type_b:w #1 + { + \bool_if:NF \l__cmd_environment_bool + { + \msg_error:nnxx { cmd } { invalid-command-arg } + { \__cmd_environment_or_command: } { b } + \__cmd_bad_def:wn + } + \tl_clear:N \l__cmd_last_delimiters_tl + \__cmd_add_arg_spec:n { b } + \quark_if_recursion_tail_stop:n {#1} + \msg_error:nnxx { cmd } { arg-after-body } + { \__cmd_environment_or_command: } + { \tl_to_str:n {#1} } + \__cmd_bad_def:wn + } +\cs_new_protected:Npn \__cmd_single_token_check:n #1 + { + \tl_trim_spaces_apply:nN {#1} \tl_if_single_token:nF + { + \msg_error:nnxx { cmd } { not-single-token } + { \__cmd_environment_or_command: } { \tl_to_str:n {#1} } + \__cmd_bad_def:wn + } + } +\cs_new_protected:Npn \__cmd_allowed_token_check:N #1 + { + \token_if_eq_meaning:NNTF #1 \c_group_begin_token + { \use:n } + { + \token_if_eq_meaning:NNTF #1 \c_group_end_token + { \use:n } + { \use_none:n } + } + { + \msg_error:nnxxx { cmd } { forbidden-implicit-group-token } + { \__cmd_environment_or_command: } { \tl_to_str:n {#1} } + { + \token_if_eq_meaning:NNTF #1 \c_group_begin_token + { begin } { end } + } + \__cmd_bad_def:wn + } + } +\cs_new_protected:Npn \__cmd_normalize_check_gv:N #1 + { + \bool_if:NT \l__cmd_expandable_bool + { + \msg_error:nnxx { cmd } { invalid-expandable-argument-type } + { \iow_char:N \\ \l__cmd_function_tl } { \tl_to_str:n {#1} } + \__cmd_bad_def:wn + } + \bool_set_false:N \l__cmd_grab_expandably_bool + } +\cs_new_protected:Npn \__cmd_normalize_check_lu:N #1 + { + \bool_if:NT \l__cmd_expandable_bool + { + \tl_if_empty:NF \l__cmd_last_delimiters_tl + { + \msg_error:nnxx { cmd } { invalid-after-optional-expandably } + { \iow_char:N \\ \l__cmd_function_tl } { \tl_to_str:n {#1} } + \__cmd_bad_def:wn + } + } + } +\cs_new_protected:Npn \__cmd_delimiter_check:nnn #1#2#3 + { + \tl_map_inline:Nn \l__cmd_last_delimiters_tl + { + \tl_if_eq:nnT {##1} {#1} + { + \msg_warning:nnxx { cmd } { optional-mandatory } + {#2} {#3} + } + } + } +\cs_new_protected:Npn \__cmd_bad_arg_spec:wn #1 \__cmd_break_point:n #2 + { + \msg_error:nnxx { cmd } { bad-arg-spec } + { \__cmd_environment_or_command: } { \tl_to_str:n {#2} } + } +\cs_new_protected:Npn \__cmd_bad_def:wn #1 \__cmd_break_point:n #2 { } +\cs_new_protected:Npn \__cmd_add_arg_spec:n #1 + { + \bool_lazy_and:nnT + { ! \l__cmd_long_bool } + { \l__cmd_some_long_bool } + { + \bool_if:NT \l__cmd_expandable_bool + { + \msg_error:nnx { cmd } { inconsistent-long } + { \iow_char:N \\ \l__cmd_function_tl } + \__cmd_bad_def:wn + } + \bool_set_false:N \l__cmd_grab_expandably_bool + } + \bool_if:NTF \l__cmd_long_bool + { \bool_set_true:N \l__cmd_some_long_bool } + { \bool_set_true:N \l__cmd_some_short_bool } + \tl_put_right:Nx \l__cmd_arg_spec_tl + { + \bool_if:NT \l__cmd_long_bool { + } + \bool_if:NT \l__cmd_obey_spaces_bool { ! } + \exp_not:n {#1} + } + \bool_set_false:N \l__cmd_long_bool + \bool_set_false:N \l__cmd_obey_spaces_bool + } +\cs_new_protected:Npn \__cmd_add_arg_spec_mandatory:n #1 + { + \bool_if:NT \l__cmd_some_obey_spaces_bool + { + \msg_error:nnxx { cmd } { non-trailing-obey-spaces } + { \__cmd_environment_or_command: } { \tl_to_str:n {#1} } + \__cmd_bad_def:wn + } + \tl_clear:N \l__cmd_last_delimiters_tl + \__cmd_add_arg_spec:n {#1} + } +\cs_new_protected:Npn \__cmd_prepare_signature:n #1 + { + \int_zero:N \l__cmd_current_arg_int + \bool_set_false:N \l__cmd_long_bool + \bool_set_false:N \l__cmd_obey_spaces_bool + \int_zero:N \l__cmd_m_args_int + \bool_set_false:N \l__cmd_defaults_bool + \tl_clear:N \l__cmd_defaults_tl + \tl_clear:N \l__cmd_process_all_tl + \tl_clear:N \l__cmd_process_one_tl + \bool_set_false:N \l__cmd_process_some_bool + \tl_clear:N \l__cmd_signature_tl + \__cmd_prepare_signature:N #1 \q_recursion_tail \q_recursion_stop + \bool_if:NF \l__cmd_expandable_bool { \__cmd_flush_m_args: } + } +\cs_new_protected:Npn \__cmd_prepare_signature:N + { + \bool_set_false:N \l__cmd_prefixed_bool + \__cmd_prepare_signature_bypass:N + } +\cs_new_protected:Npn \__cmd_prepare_signature_bypass:N #1 + { + \quark_if_recursion_tail_stop:N #1 + \use:c + { + __cmd_add + \bool_if:NT \l__cmd_grab_expandably_bool { _expandable } + _type_ \token_to_str:N #1 :w + } + } +\cs_new_protected:cpn { __cmd_add_type_+:w } + { + \__cmd_flush_m_args: + \bool_set_true:N \l__cmd_long_bool + \bool_set_true:N \l__cmd_prefixed_bool + \__cmd_prepare_signature_bypass:N + } +\cs_new_protected:cpn { __cmd_add_type_!:w } + { + \__cmd_flush_m_args: + \bool_set_true:N \l__cmd_obey_spaces_bool + \bool_set_true:N \l__cmd_prefixed_bool + \__cmd_prepare_signature_bypass:N + } +\cs_new_protected:cpn { __cmd_add_type_>:w } #1 + { + \__cmd_flush_m_args: + \bool_set_true:N \l__cmd_prefixed_bool + \bool_set_true:N \l__cmd_process_some_bool + \tl_put_left:Nn \l__cmd_process_one_tl { {#1} } + \__cmd_prepare_signature_bypass:N + } +\cs_new_protected:Npn \__cmd_add_type_b:w + { + \__cmd_flush_m_args: + \__cmd_add_default: + \__cmd_add_grabber:N b + \__cmd_prepare_signature:N + } +\cs_new_protected:Npn \__cmd_add_type_D:w #1#2#3 + { + \__cmd_flush_m_args: + \__cmd_add_default:n {#3} + \__cmd_add_grabber:N D + \tl_put_right:Nn \l__cmd_signature_tl { #1 #2 } + \__cmd_prepare_signature:N + } +\cs_new_protected:Npn \__cmd_add_type_E:w #1#2 + { + \__cmd_flush_m_args: + \__cmd_add_default_E:nn {#1} {#2} + \__cmd_add_grabber:N E + \tl_put_right:Nn \l__cmd_signature_tl { {#1} } + \__cmd_prepare_signature:N + } +\cs_new_protected:Npn \__cmd_add_type_m:w + { + \__cmd_add_default: + \bool_if:NTF \l__cmd_prefixed_bool + { \__cmd_add_grabber:N m } + { \int_incr:N \l__cmd_m_args_int } + \__cmd_prepare_signature:N + } +\cs_new_protected:Npn \__cmd_add_type_R:w #1#2#3 + { + \__cmd_flush_m_args: + \__cmd_add_default:n {#3} + \__cmd_add_grabber:N R + \tl_put_right:Nn \l__cmd_signature_tl { #1 #2 } + \__cmd_prepare_signature:N + } +\cs_new_protected:Npn \__cmd_add_type_t:w #1 + { + \__cmd_flush_m_args: + \__cmd_add_default: + \__cmd_add_grabber:N t + \tl_put_right:Nn \l__cmd_signature_tl {#1} + \__cmd_prepare_signature:N + } +\cs_new_protected:Npn \__cmd_add_type_v:w + { + \__cmd_flush_m_args: + \exp_args:No \__cmd_add_default:n \c_novalue_tl + \__cmd_add_grabber:N v + \__cmd_prepare_signature:N + } +\cs_new_protected:Npn \__cmd_flush_m_args: + { + \int_compare:nNnT \l__cmd_m_args_int > 0 + { + \tl_put_right:Nx \l__cmd_signature_tl + { \exp_not:c { __cmd_grab_m_ \int_use:N \l__cmd_m_args_int :w } } + \tl_put_right:Nx \l__cmd_process_all_tl + { \prg_replicate:nn { \l__cmd_m_args_int } { { } } } + } + \int_zero:N \l__cmd_m_args_int + } +\cs_new_protected:Npn \__cmd_add_grabber:N #1 + { + \tl_put_right:Nx \l__cmd_signature_tl + { + \exp_not:c + { + __cmd_grab_ #1 + \bool_if:NT \l__cmd_long_bool { _long } + \bool_if:NT \l__cmd_obey_spaces_bool { _obey_spaces } + :w + } + } + \bool_set_false:N \l__cmd_long_bool + \bool_set_false:N \l__cmd_obey_spaces_bool + \tl_put_right:Nx \l__cmd_process_all_tl + { { \exp_not:o \l__cmd_process_one_tl } } + \tl_clear:N \l__cmd_process_one_tl + } +\cs_new_protected:Npn \__cmd_add_default:n #1 + { + \tl_if_novalue:nTF {#1} + { \__cmd_add_default: } + { + \int_incr:N \l__cmd_current_arg_int + \bool_set_true:N \l__cmd_defaults_bool + \tl_put_right:Nn \l__cmd_defaults_tl { { \prg_do_nothing: #1 } } + } + } +\cs_new_protected:Npn \__cmd_add_default: + { + \int_incr:N \l__cmd_current_arg_int + \tl_put_right:Nn \l__cmd_defaults_tl { \c_novalue_tl } + } +\cs_new_protected:Npn \__cmd_add_default_E:nn #1#2 + { + \tl_map_function:nN {#2} \__cmd_add_default:n + \prg_replicate:nn + { \tl_count:n {#1} - \tl_count:n {#2} } + { \__cmd_add_default: } + } +\cs_new_protected:cpn { __cmd_add_expandable_type_+:w } + { + \bool_set_true:N \l__cmd_long_bool + \__cmd_prepare_signature:N + } +\cs_new_protected:Npn \__cmd_add_expandable_type_D:w + { \__cmd_add_expandable_type_D_aux:NNNn D } +\cs_new_protected:Npn \__cmd_add_expandable_type_D_aux:NNNn #1#2#3#4 + { + \__cmd_add_default:n {#4} + \tl_if_eq:nnTF {#2} {#3} + { \__cmd_add_expandable_type_D_aux:NN #1 #2 } + { \__cmd_add_expandable_type_D_aux:NNN #1 #2 #3 } + \__cmd_prepare_signature:N + } +\cs_new_protected:Npn \__cmd_add_expandable_type_D_aux:NNN #1#2#3 + { + \bool_if:NTF \l__cmd_long_bool + { \cs_set:cpx } + { \cs_set_nopar:cpx } + { \l__cmd_expandable_aux_name_tl } ##1 ##2 #2 ##3 \q__cmd ##4 #3 + { ##1 {##2} {##3} {##4} } + \__cmd_add_expandable_grabber:nn {#1} + { + \exp_not:c { \l__cmd_expandable_aux_name_tl } + \exp_not:n { #2 #3 } + } + } +\cs_new_protected:Npn \__cmd_add_expandable_type_D_aux:NN #1#2 + { + \bool_if:NTF \l__cmd_long_bool + { \cs_set:cpx } + { \cs_set_nopar:cpx } + { \l__cmd_expandable_aux_name_tl } ##1 #2 ##2 #2 + { ##1 {##2} } + \__cmd_add_expandable_grabber:nn { #1_alt } + { + \exp_not:c { \l__cmd_expandable_aux_name_tl } + \exp_not:n {#2} + } + } +\cs_new_protected:Npn \__cmd_add_expandable_type_E:w #1#2 + { + \__cmd_add_default_E:nn {#1} {#2} + \tl_clear:N \l__cmd_tmpb_tl + \tl_map_function:nN {#1} \__cmd_add_expandable_type_E_aux:n + \__cmd_add_expandable_grabber:nn + { E \bool_if:NT \l__cmd_long_bool { _long } } + { + { \exp_not:o \l__cmd_tmpb_tl } + { + \prg_replicate:nn { \tl_count:n {#1} } + { { \c_novalue_tl } } + } + } + \__cmd_prepare_signature:N + } +\cs_new_protected:Npn \__cmd_add_expandable_type_E_aux:n #1 + { + \__cmd_get_grabber:NN #1 \l__cmd_tmpa_tl + \tl_put_right:Nx \l__cmd_tmpb_tl + { \exp_not:o \l__cmd_tmpa_tl \exp_not:N #1 } + } +\cs_new_protected:Npn \__cmd_add_expandable_type_m:w + { + \__cmd_add_default: + \__cmd_add_expandable_grabber:nn + { m \bool_if:NT \l__cmd_long_bool { _long } } { } + \__cmd_prepare_signature:N + } +\cs_new_protected:Npn \__cmd_add_expandable_type_R:w + { \__cmd_add_expandable_type_D_aux:NNNn R } +\cs_new_protected:Npn \__cmd_add_expandable_type_t:w #1 + { + \__cmd_add_default: + \__cmd_get_grabber:NN #1 \l__cmd_tmpa_tl + \__cmd_add_expandable_grabber:nn { t } + { + \exp_not:o \l__cmd_tmpa_tl + \exp_not:N #1 + } + \__cmd_prepare_signature:N + } +\cs_new_protected:Npn \__cmd_add_expandable_grabber:nn #1#2 + { + \tl_put_right:Nx \l__cmd_signature_tl + { \exp_not:c { __cmd_expandable_grab_ #1 :w } #2 } + } +\cs_new_protected:Npn \__cmd_get_grabber:NN #1#2 + { + \cs_set:Npn \__cmd_tmp:w ##1 #1 {##1} + \exp_args:Nc \__cmd_get_grabber_auxi:NN + { __cmd_grabber_ \token_to_str:N #1 :w } #2 + } +\cs_new_protected:Npn \__cmd_get_grabber_auxi:NN #1#2 + { + \cs_if_eq:NNTF \__cmd_tmp:w #1 + { \tl_set:Nn #2 {#1} } + { + \cs_if_exist:NTF #1 + { + \int_gincr:N \g__cmd_grabber_int + \exp_args:Nc \__cmd_get_grabber_auxi:NN + { + __cmd_grabber_ + - \int_use:N \g__cmd_grabber_int :w + } + #2 + } + { \__cmd_get_grabber_auxii:NN #1 #2 } + } + } +\cs_new_protected:Npn \__cmd_get_grabber_auxii:NN #1#2 + { + \cs_set_eq:NN #1 \__cmd_tmp:w + \tl_set:Nn #2 {#1} + } +\cs_new_protected:Npn \__cmd_grab_b:w + { \__cmd_grab_b_aux:NNw \cs_set_protected_nopar:Npn \tl_trim_spaces:n } +\cs_new_protected:Npn \__cmd_grab_b_long:w + { \__cmd_grab_b_aux:NNw \cs_set_protected:Npn \tl_trim_spaces:n } +\cs_new_protected:Npn \__cmd_grab_b_obey_spaces:w + { \__cmd_grab_b_aux:NNw \cs_set_protected_nopar:Npn \exp_not:n } +\cs_new_protected:Npn \__cmd_grab_b_long_obey_spaces:w + { \__cmd_grab_b_aux:NNw \cs_set_protected:Npn \exp_not:n } +\cs_new_protected:Npn \__cmd_grab_b_aux:NNw #1#2#3 \__cmd_run_code: + { + \__cmd_grab_D_aux:NNnN \begin \end {#3} #1 + \tl_put_left:Nn \l__cmd_signature_tl { \__cmd_grab_b_end:Nw #2 } + \tl_set_eq:NN \l__cmd_saved_args_tl \l__cmd_args_tl + \tl_clear:N \l__cmd_args_tl + \exp_args:Nc \l__cmd_fn_tl { begin ~ } + } +\cs_new_protected:Npn \__cmd_grab_b_end:Nw #1#2 \__cmd_run_code: + { + \tl_set:Nx \l__cmd_args_tl + { + \exp_not:V \l__cmd_saved_args_tl + { \exp_after:wN #1 \l__cmd_args_tl } + } + #2 + \__cmd_run_code: + \end + } +\cs_new_protected:Npn \__cmd_grab_D:w #1#2#3 \__cmd_run_code: + { + \__cmd_grab_D_aux:NNnNN #1 #2 {#3} \cs_set_protected_nopar:Npn + \__cmd_peek_nonspace_remove:NTF + } +\cs_new_protected:Npn \__cmd_grab_D_long:w #1#2#3 \__cmd_run_code: + { + \__cmd_grab_D_aux:NNnNN #1 #2 {#3} \cs_set_protected:Npn + \__cmd_peek_nonspace_remove:NTF + } +\cs_new_protected:Npn \__cmd_grab_D_obey_spaces:w #1#2#3 \__cmd_run_code: + { + \__cmd_grab_D_aux:NNnNN #1 #2 {#3} \cs_set_protected_nopar:Npn + \__cmd_peek_meaning_remove:NTF + } +\cs_new_protected:Npn \__cmd_grab_D_long_obey_spaces:w #1#2#3 \__cmd_run_code: + { + \__cmd_grab_D_aux:NNnNN #1 #2 {#3} \cs_set_protected:Npn + \__cmd_peek_meaning_remove:NTF + } +\cs_new_protected:Npn \__cmd_grab_D_aux:NNnNN #1#2#3#4#5 + { + \__cmd_grab_D_aux:NNnN #1#2 {#3} #4 + #5 #1 + { \__cmd_grab_D_call:Nw #1 } + { \__cmd_add_arg:o \c_novalue_tl } + } +\cs_new_protected:Npn \__cmd_grab_D_aux:NNnN #1#2#3#4 + { + \tl_set:Nn \l__cmd_signature_tl {#3} + \exp_after:wN #4 \l__cmd_fn_tl ##1 #2 + { + \tl_if_in:nnTF {##1} {#1} + { \__cmd_grab_D_nested:NNnN #1 #2 {##1} #4 } + { + \tl_if_blank:oTF { \use_none:n ##1 } + { \__cmd_add_arg:o { \use_none:n ##1 } } + { + \str_if_eq:eeTF + { \exp_not:o { \use_none:n ##1 } } + { { \exp_not:o { \use_ii:nnn ##1 \q_nil } } } + { \__cmd_add_arg:o { \use_ii:nn ##1 } } + { \__cmd_add_arg:o { \use_none:n ##1 } } + } + } + } + } +\tl_new:N \l__cmd_nesting_a_tl +\tl_new:N \l__cmd_nesting_b_tl +\quark_new:N \q__cmd +\cs_new_protected:Npn \__cmd_grab_D_nested:NNnN #1#2#3#4 + { + \tl_clear:N \l__cmd_nesting_a_tl + \tl_clear:N \l__cmd_nesting_b_tl + \exp_after:wN #4 \l__cmd_fn_tl ##1 #1 ##2 \q__cmd ##3 #2 + { + \tl_put_right:No \l__cmd_nesting_a_tl { \use_none:n ##1 #1 } + \tl_put_right:No \l__cmd_nesting_b_tl { \use_i:nn #2 ##3 } + \tl_if_in:nnTF {##2} {#1} + { + \l__cmd_fn_tl + \q_nil ##2 \q__cmd \ERROR + } + { + \tl_put_right:Nx \l__cmd_nesting_a_tl + { \__cmd_grab_D_nested:w \q_nil ##2 \q_stop } + \tl_if_in:NnTF \l__cmd_nesting_b_tl {#1} + { + \tl_set_eq:NN \l__cmd_tmpa_tl \l__cmd_nesting_b_tl + \tl_clear:N \l__cmd_nesting_b_tl + \exp_after:wN \l__cmd_fn_tl \exp_after:wN + \q_nil \l__cmd_tmpa_tl \q_nil \q__cmd \ERROR + } + { + \tl_put_right:No \l__cmd_nesting_a_tl + \l__cmd_nesting_b_tl + \__cmd_add_arg:V \l__cmd_nesting_a_tl + } + } + } + \l__cmd_fn_tl #3 \q_nil \q__cmd \ERROR + } +\cs_new:Npn \__cmd_grab_D_nested:w #1 \q_nil \q_stop + { \exp_not:o { \use_none:n #1 } } +\cs_new_protected_nopar:Npn \__cmd_grab_D_call:Nw #1 + { + \token_if_eq_catcode:NNTF + #1 + { + \exp_after:wN \exp_after:wN \exp_after:wN + \l__cmd_fn_tl \char_generate:nn { `#1 } { 11 } + } + { + \__cmd_token_if_cs:NTF #1 + { + \exp_after:wN \l__cmd_fn_tl + \cs:w \cs_to_str:N #1 ~ \cs_end: + } + { + \exp_after:wN \l__cmd_fn_tl + \token_to_str:N #1 + } + } + } +\cs_new_protected:Npn \__cmd_grab_E:w #1#2 \__cmd_run_code: + { + \__cmd_grab_E:nnNN {#1} {#2} + \cs_set_protected_nopar:Npn + \__cmd_peek_nonspace_remove:NTF + } +\cs_new_protected:Npn \__cmd_grab_E_long:w #1#2 \__cmd_run_code: + { + \__cmd_grab_E:nnNN {#1} {#2} + \cs_set_protected:Npn + \__cmd_peek_nonspace_remove:NTF + } +\cs_new_protected:Npn \__cmd_grab_E_obey_spaces:w #1#2 \__cmd_run_code: + { + \__cmd_grab_E:nnNN {#1} {#2} + \cs_set_protected_nopar:Npn + \__cmd_peek_meaning_remove:NTF + } +\cs_new_protected:Npn \__cmd_grab_E_long_obey_spaces:w #1#2 \__cmd_run_code: + { + \__cmd_grab_E:nnNN {#1} {#2} + \cs_set_protected:Npn + \__cmd_peek_meaning_remove:NTF + } +\cs_new_protected:Npn \__cmd_grab_E:nnNN #1#2#3#4 + { + \exp_after:wN #3 \l__cmd_fn_tl ##1##2##3 + { + \prop_put:Nnn \l__cmd_tmp_prop {##1} {##3} + \__cmd_grab_E_loop:NnN #4 { } ##2 \q_recursion_stop + } + \prop_clear:N \l__cmd_tmp_prop + \tl_set:Nn \l__cmd_signature_tl {#2} + \cs_set_protected:Npn \__cmd_grab_E_finalise: + { + \tl_map_inline:nn {#1} + { + \prop_get:NnNF \l__cmd_tmp_prop {####1} \l__cmd_tmpb_tl + { \tl_set_eq:NN \l__cmd_tmpb_tl \c_novalue_tl } + \tl_put_right:Nx \l__cmd_args_tl + { { \exp_not:V \l__cmd_tmpb_tl } } + } + \l__cmd_signature_tl \__cmd_run_code: + } + \__cmd_grab_E_loop:NnN #4 { } #1 \q_recursion_tail \q_recursion_stop + } +\cs_new_protected:Npn \__cmd_grab_E_loop:NnN #1#2#3#4 \q_recursion_stop + { + \cs_if_eq:NNTF #3 \q_recursion_tail + { \__cmd_grab_E_finalise: } + { + #1 #3 + { \l__cmd_fn_tl #3 {#2#4} } + { \__cmd_grab_E_loop:NnN #1 {#2#3} #4 \q_recursion_stop } + } + } +\cs_new_protected:Npn \__cmd_grab_E_finalise: { } +\cs_new_protected:Npn \__cmd_grab_m:w #1 \__cmd_run_code: + { + \tl_set:Nn \l__cmd_signature_tl {#1} + \exp_after:wN \cs_set_protected_nopar:Npn \l__cmd_fn_tl ##1 + { \__cmd_add_arg:n {##1} } + \l__cmd_fn_tl + } +\cs_new_protected:Npn \__cmd_grab_m_long:w #1 \__cmd_run_code: + { + \tl_set:Nn \l__cmd_signature_tl {#1} + \exp_after:wN \cs_set_protected:Npn \l__cmd_fn_tl ##1 + { \__cmd_add_arg:n {##1} } + \l__cmd_fn_tl + } +\cs_new_protected_nopar:Npn \__cmd_grab_m_aux:Nnnnnnnnn #1#2#3#4#5#6#7#8#9 + { + \tl_put_right:No \l__cmd_args_tl + { #1 {#2} {#3} {#4} {#5} {#6} {#7} {#8} {#9} } + \l__cmd_signature_tl \__cmd_run_code: + } +\cs_new_protected:cpn { __cmd_grab_m_1:w } #1 \__cmd_run_code: + { + \tl_set:Nn \l__cmd_signature_tl {#1} + \exp_after:wN \cs_set_eq:NN \l__cmd_fn_tl \__cmd_grab_m_aux:Nnnnnnnnn + \l__cmd_fn_tl \use_none:nnnnnnn { } { } { } { } { } { } { } + } +\cs_new_protected:cpn { __cmd_grab_m_2:w } #1 \__cmd_run_code: + { + \tl_set:Nn \l__cmd_signature_tl {#1} + \exp_after:wN \cs_set_eq:NN \l__cmd_fn_tl \__cmd_grab_m_aux:Nnnnnnnnn + \l__cmd_fn_tl \use_none:nnnnnn { } { } { } { } { } { } + } +\cs_new_protected:cpn { __cmd_grab_m_3:w } #1 \__cmd_run_code: + { + \tl_set:Nn \l__cmd_signature_tl {#1} + \exp_after:wN \cs_set_eq:NN \l__cmd_fn_tl \__cmd_grab_m_aux:Nnnnnnnnn + \l__cmd_fn_tl \use_none:nnnnn { } { } { } { } { } + } +\cs_new_protected:cpn { __cmd_grab_m_4:w } #1 \__cmd_run_code: + { + \tl_set:Nn \l__cmd_signature_tl {#1} + \exp_after:wN \cs_set_eq:NN \l__cmd_fn_tl \__cmd_grab_m_aux:Nnnnnnnnn + \l__cmd_fn_tl \use_none:nnnn { } { } { } { } + } +\cs_new_protected:cpn { __cmd_grab_m_5:w } #1 \__cmd_run_code: + { + \tl_set:Nn \l__cmd_signature_tl {#1} + \exp_after:wN \cs_set_eq:NN \l__cmd_fn_tl \__cmd_grab_m_aux:Nnnnnnnnn + \l__cmd_fn_tl \use_none:nnn { } { } { } + } +\cs_new_protected:cpn { __cmd_grab_m_6:w } #1 \__cmd_run_code: + { + \tl_set:Nn \l__cmd_signature_tl {#1} + \exp_after:wN \cs_set_eq:NN \l__cmd_fn_tl \__cmd_grab_m_aux:Nnnnnnnnn + \l__cmd_fn_tl \use_none:nn { } { } + } +\cs_new_protected:cpn { __cmd_grab_m_7:w } #1 \__cmd_run_code: + { + \tl_set:Nn \l__cmd_signature_tl {#1} + \exp_after:wN \cs_set_eq:NN \l__cmd_fn_tl \__cmd_grab_m_aux:Nnnnnnnnn + \l__cmd_fn_tl \use_none:n { } + } +\cs_new_protected:cpn { __cmd_grab_m_8:w } #1 \__cmd_run_code: + { + \tl_set:Nn \l__cmd_signature_tl {#1} + \exp_after:wN \cs_set_eq:NN \l__cmd_fn_tl \__cmd_grab_m_aux:Nnnnnnnnn + \l__cmd_fn_tl \prg_do_nothing: + } +\cs_new_protected:cpx { __cmd_grab_m_9:w } + { + \exp_not:c { __cmd_grab_m_5:w } + \exp_not:c { __cmd_grab_m_4:w } + } +\cs_new_protected:Npn \__cmd_grab_R:w #1#2#3 \__cmd_run_code: + { \__cmd_grab_R_aux:NNnN #1 #2 {#3} \cs_set_protected_nopar:Npn } +\cs_new_protected:Npn \__cmd_grab_R_long:w #1#2#3 \__cmd_run_code: + { \__cmd_grab_R_aux:NNnN #1 #2 {#3} \cs_set_protected:Npn } +\cs_new_protected:Npn \__cmd_grab_R_aux:NNnN #1#2#3#4 + { + \__cmd_grab_D_aux:NNnN #1 #2 {#3} #4 + \__cmd_peek_nonspace_remove:NTF #1 + { \__cmd_grab_D_call:Nw #1 } + { + \msg_error:nnxx { cmd } { missing-required } + { \__cmd_environment_or_command: } + { \token_to_str:N #1 } + \__cmd_add_arg:o \c_novalue_tl + } + } +\cs_new_protected:Npn \__cmd_grab_t:w + { \__cmd_grab_t_aux:NNw \__cmd_peek_nonspace_remove:NTF } +\cs_new_protected:Npn \__cmd_grab_t_obey_spaces:w + { \__cmd_grab_t_aux:NNw \__cmd_peek_meaning_remove:NTF } +\cs_new_protected:Npn \__cmd_grab_t_aux:NNw #1#2#3 \__cmd_run_code: + { + \tl_set:Nn \l__cmd_signature_tl {#3} + \exp_after:wN \cs_set_protected:Npn \l__cmd_fn_tl + { + #1 #2 + { \__cmd_add_arg:n { \BooleanTrue } } + { \__cmd_add_arg:n { \BooleanFalse } } + } + \l__cmd_fn_tl + } +\tl_new:N \l__cmd_v_arg_tl +\cs_new_protected:Npn \__cmd_grab_v:w + { + \bool_set_false:N \l__cmd_long_bool + \__cmd_grab_v_aux:w + } +\cs_new_protected:Npn \__cmd_grab_v_long:w + { + \bool_set_true:N \l__cmd_long_bool + \__cmd_grab_v_aux:w + } +\cs_new_protected:Npn \__cmd_grab_v_aux:w #1 \__cmd_run_code: + { + \tl_set:Nn \l__cmd_signature_tl {#1} + \group_begin: + \tex_escapechar:D = 92 \scan_stop: + \tl_clear:N \l__cmd_v_arg_tl + \peek_remove_spaces:n + { + \peek_meaning_remove:NTF \c_group_begin_token + { + \group_align_safe_end: + \__cmd_grab_v_bgroup: + } + { + \peek_N_type:TF + { \__cmd_grab_v_aux_test:N } + { \__cmd_grab_v_aux_abort:n { } } + } + } + } +\cs_new_protected:Npn \__cmd_grab_v_group_end: + { + \exp_args:NNNo + \group_end: + \tl_set:Nn \l__cmd_v_arg_tl { \l__cmd_v_arg_tl } + } +\cs_new_protected:Npn \__cmd_grab_v_aux_test:N #1 + { + \__cmd_grab_v_token_if_char:NTF #1 + { + \__cmd_grab_v_aux_put:N #1 + \__cmd_grab_v_aux_catcodes: + \__cmd_grab_v_aux_loop:N #1 + } + { \__cmd_grab_v_aux_abort:n {#1} #1 } + } +\cs_new_protected:Npn \__cmd_grab_v_aux_loop:N #1 + { + \peek_N_type:TF + { \__cmd_grab_v_aux_loop:NN #1 } + { \__cmd_grab_v_aux_abort:n { } } + } +\cs_new_protected:Npn \__cmd_grab_v_aux_loop:NN #1#2 + { + \__cmd_grab_v_token_if_char:NTF #2 + { + \token_if_eq_charcode:NNTF #1 #2 + { \__cmd_grab_v_aux_loop_end: } + { + \__cmd_grab_v_aux_put:N #2 + \__cmd_grab_v_aux_loop:N #1 + } + } + { \__cmd_grab_v_aux_abort:n {#2} #2 } + } +\cs_new_protected:Npn \__cmd_grab_v_aux_loop_end: + { + \__cmd_grab_v_group_end: + \__cmd_add_arg:x { \tl_tail:N \l__cmd_v_arg_tl } + } +\int_new:N \l__cmd_v_nesting_int +\cs_new_protected:Npx \__cmd_grab_v_bgroup: + { + \exp_not:N \__cmd_grab_v_aux_catcodes: + \exp_not:n { \int_set:Nn \l__cmd_v_nesting_int { 1 } } + \exp_not:N \__cmd_grab_v_aux_put:N \iow_char:N \{ + \exp_not:N \__cmd_grab_v_bgroup_loop: + } +\cs_new_protected:Npn \__cmd_grab_v_bgroup_loop: + { + \peek_N_type:TF + { \__cmd_grab_v_bgroup_loop:N } + { \__cmd_grab_v_aux_abort:n { } } + } +\cs_new_protected:Npn \__cmd_grab_v_bgroup_loop:N #1 + { + \__cmd_grab_v_token_if_char:NTF #1 + { + \token_if_eq_charcode:NNTF \c_group_end_token #1 + { + \int_decr:N \l__cmd_v_nesting_int + \int_compare:nNnTF \l__cmd_v_nesting_int > 0 + { + \__cmd_grab_v_aux_put:N #1 + \__cmd_grab_v_bgroup_loop: + } + { \__cmd_grab_v_aux_loop_end: } + } + { + \token_if_eq_charcode:NNT \c_group_begin_token #1 + { \int_incr:N \l__cmd_v_nesting_int } + \__cmd_grab_v_aux_put:N #1 + \__cmd_grab_v_bgroup_loop: + } + } + { \__cmd_grab_v_aux_abort:n {#1} #1 } + } +\cs_new_protected:Npn \__cmd_grab_v_aux_catcodes: + { + \cs_set_eq:NN \do \char_set_catcode_other:N + \dospecials + \tex_endlinechar:D = `\^^M \scan_stop: + \bool_if:NTF \l__cmd_long_bool + { \char_set_catcode_other:n { \tex_endlinechar:D } } + { \char_set_catcode_parameter:n { \tex_endlinechar:D } } + } +\cs_new_protected:Npn \__cmd_grab_v_aux_abort:n #1 + { + \__cmd_grab_v_group_end: + \exp_after:wN \exp_after:wN \exp_after:wN + \peek_meaning_remove:NTF \char_generate:nn { \tex_endlinechar:D } { 6 } + { + \msg_error:nnxxx { cmd } { verbatim-newline } + { \__cmd_environment_or_command: } + { \tl_to_str:N \l__cmd_v_arg_tl } + { \tl_to_str:n {#1} } + \__cmd_add_arg:o \c_novalue_tl + } + { + \msg_error:nnxxx { cmd } { verbatim-tokenized } + { \__cmd_environment_or_command: } + { \tl_to_str:N \l__cmd_v_arg_tl } + { \tl_to_str:n {#1} } + \__cmd_add_arg:o \c_novalue_tl + } + } +\cs_new_protected:Npn \__cmd_grab_v_aux_put:N #1 + { + \tl_put_right:Nx \l__cmd_v_arg_tl + { + \token_if_active:NTF #1 + { \exp_not:N #1 } { \token_to_str:N #1 } + } + } +\cs_new_protected:Npn \__cmd_grab_v_token_if_char:NTF #1 + { \str_if_eq:eeTF { } { \str_tail:n {#1} } } +\cs_new_protected:Npn \__cmd_add_arg:n #1 + { + \tl_put_right:Nn \l__cmd_args_tl { {#1} } + \l__cmd_signature_tl \__cmd_run_code: + } +\cs_generate_variant:Nn \__cmd_add_arg:n { V , o , x } +\cs_new:Npn \__cmd_expandable_grab_D:w #1 \q__cmd #2#3 + { #2 { \__cmd_expandable_grab_D:NNNwNNn #1 \q__cmd #2 #3 } } +\cs_set_protected:Npn \__cmd_tmp:w #1 + { + \cs_new:Npn \__cmd_expandable_grab_D:NNNwNNn ##1##2##3##4 \q__cmd ##5##6##7 + { + \str_if_eq:nnTF {##2} {##7} + { + \str_if_eq:onTF + { ##1 { } { } ##7 ##2 \q__cmd ##3 } + { { } {##2} { } } + } + { \use_ii:nn } + { + ##1 + { \__cmd_expandable_grab_D:NNNwNNnnn ##1##2##3##4 \q__cmd ##5##6 } + \q_nil { } ##2 \ERROR \q__cmd \ERROR + } + { ##4 {#1} \q__cmd ##5 ##6 {##7} } + } + } +\exp_args:No \__cmd_tmp:w { \c_novalue_tl } +\cs_new:Npn \__cmd_expandable_grab_D:NNNwNNnnn #1#2#3#4 \q__cmd #5#6#7#8#9 + { + \exp_args:Nof \__cmd_expandable_grab_D:nnNNNwNN + { \use_ii:nn #7 #2 } + { \__cmd_expandable_grab_D:Nw #3 \exp_stop_f: #8 #9 } + #1#2#3 #4 \q__cmd #5 #6 + } +\cs_new:Npn \__cmd_expandable_grab_D:Nw #1#2 \ERROR \ERROR { #2 #1 } +\cs_new:Npn \__cmd_expandable_grab_D:nnNNNwNN #1#2#3#4#5#6 \q__cmd #7#8 + { + \exp_args:No \tl_if_empty:oTF + { #3 { \use_none:nnn } #2 \q__cmd #5 #4 \q__cmd #5 } + { + \tl_if_blank:oTF { \use_none:nn #1#2 } + { \__cmd_put_arg_expandable:ow { \use_none:nn #1#2 } } + { + \str_if_eq:eeTF + { \exp_not:o { \use_none:nn #1#2 } } + { { \exp_not:o { \use_iii:nnnn #1#2 \q_nil } } } + { \__cmd_put_arg_expandable:ow { \use_iii:nnn #1#2 } } + { \__cmd_put_arg_expandable:ow { \use_none:nn #1#2 } } + } + #6 \q__cmd #7 #8 + } + { + #3 + { \__cmd_expandable_grab_D:NNNwNNnnn #3#4#5#6 \q__cmd #7 #8 } + \q_nil {#1} #2 \ERROR \q__cmd \ERROR + } + } +\cs_new:Npn \__cmd_expandable_grab_D_alt:w #1 \q__cmd #2#3 + { #2 { \__cmd_expandable_grab_D_alt:NNwNNn #1 \q__cmd #2 #3 } } +\cs_set_protected:Npn \__cmd_tmp:w #1 + { + \cs_new:Npn \__cmd_expandable_grab_D_alt:NNwNNn ##1##2##3 \q__cmd ##4##5##6 + { + \str_if_eq:nnTF {##6} {##2} + { + \str_if_eq:onTF + { ##1 { } ##6 ##2 ##2 } + { { } ##2 } + } + { \use_ii:nn } + { + ##1 + { \__cmd_expandable_grab_D_alt:NNwn ##4 ##5 ##3 \q__cmd } + ##6 \ERROR + } + { ##3 {#1} \q__cmd ##4 ##5 {##6} } + } + } +\exp_args:No \__cmd_tmp:w { \c_novalue_tl } +\cs_new:Npn \__cmd_expandable_grab_D_alt:NNwn #1#2#3 \q__cmd #4 + { + \tl_if_blank:oTF { \use_none:n #4 } + { \__cmd_put_arg_expandable:ow { \use_none:n #4 } } + { + \str_if_eq:eeTF + { \exp_not:o { \use_none:n #4 } } + { { \exp_not:o { \use_ii:nnn #4 \q_nil } } } + { \__cmd_put_arg_expandable:ow { \use_ii:nn #4 } } + { \__cmd_put_arg_expandable:ow { \use_none:n #4 } } + } + #3 \q__cmd #1 #2 + } +\cs_new:Npn \__cmd_expandable_grab_E:w #1 \q__cmd #2#3 + { \__cmd_expandable_grab_E_aux:w #1 \q__cmd #2 #3 #3 } +\cs_new:Npn \__cmd_expandable_grab_E_long:w #1 \q__cmd #2#3 + { \__cmd_expandable_grab_E_aux:w #1 \q__cmd #2 #3 #2 } +\cs_new:Npn \__cmd_expandable_grab_E_aux:w #1 \q__cmd #2#3#4 + { #2 { \__cmd_expandable_grab_E_test:nnw #1 \q__cmd #2 #3 #4 } } +\cs_new:Npn \__cmd_expandable_grab_E_test:nnw #1#2#3 \q__cmd #4#5#6#7 + { + \__cmd_expandable_grab_E_loop:nnnNNw {#7} { } { } + #1 \q_nil \q_nil \q_nil \q_mark #2 \q_nil + #3 \q__cmd #4 #5 #6 + } +\cs_new:Npn \__cmd_expandable_grab_E_loop:nnnNNw + #1#2#3#4#5#6 \q_nil #7 \q_mark #8 + { + \quark_if_nil:NTF #4 + { \__cmd_expandable_grab_E_end:nnw {#1} {#3} } + { + \tl_if_novalue:nTF {#8} + { \str_if_eq:onTF { #4 { } #1 #5 } {#5} } + { \use_ii:nn } + { \__cmd_expandable_grab_E_find:w { #2 #4 #5 #6 } {#3} ~ } + { + \__cmd_expandable_grab_E_loop:nnnNNw + {#1} { #2 #4 #5 } { #3 {#8} } + #6 \q_nil #7 \q_mark + } + } + } +\cs_new:Npn \__cmd_expandable_grab_E_find:w #1 \q__cmd #2#3#4 + { #4 { \__cmd_expandable_grab_E_find:nnw #1 \q__cmd #2 #3 #4 } } +\cs_new:Npn \__cmd_expandable_grab_E_find:nnw #1#2#3 \q_nil #4 \q__cmd #5#6#7#8 + { \__cmd_expandable_grab_E_aux:w {#1} { #2 {#8} #3 } #4 \q__cmd #5 #6 #7 } +\cs_new:Npn \__cmd_expandable_grab_E_end:nnw #1#2#3 \q__cmd #4#5#6 + { #3 #2 \q__cmd #4 #5 {#1} } +\cs_new:Npn \__cmd_expandable_grab_m:w #1 \q__cmd #2#3 + { #3 { \__cmd_expandable_grab_m_aux:wNn #1 \q__cmd #2 #3 } } +\cs_new:Npn \__cmd_expandable_grab_m_long:w #1 \q__cmd #2#3 + { #2 { \__cmd_expandable_grab_m_aux:wNn #1 \q__cmd #2 #3 } } +\cs_new:Npn \__cmd_expandable_grab_m_aux:wNn #1 \q__cmd #2#3#4 + { #1 {#4} \q__cmd #2 #3 } +\cs_new:Npn \__cmd_expandable_grab_R:w #1 \q__cmd #2#3 + { #2 { \__cmd_expandable_grab_R_aux:NNNwNNn #1 \q__cmd #2#3 } } +\cs_set_protected:Npn \__cmd_tmp:w #1 + { + \cs_new:Npn \__cmd_expandable_grab_R_aux:NNNwNNn ##1##2##3##4 \q__cmd ##5##6##7 + { + \str_if_eq:nnTF {##7} {##2} + { + \str_if_eq:onTF + { ##1 { } { } ##7 ##2 \q__cmd ##3 } + { { } {##2} { } } + } + { \use_ii:nn } + { + ##1 + { \__cmd_expandable_grab_D:NNNwNNnnn ##1##2##3##4 \q__cmd ##5##6 } + \q_nil { } ##2 \ERROR \q__cmd \ERROR + } + { + \msg_expandable_error:nnff { cmd } { missing-required } + { \exp_args:Nf \tl_trim_spaces:n { \token_to_str:N ##5 } } + { \tl_to_str:n {##2} } + ##4 {#1} \q__cmd ##5 ##6 {##7} + } + } + } +\exp_args:No \__cmd_tmp:w { \c_novalue_tl } +\cs_new:Npn \__cmd_expandable_grab_R_alt:w #1 \q__cmd #2#3 + { #2 { \__cmd_expandable_grab_R_alt_aux:NNwNNn #1 \q__cmd #2#3 } } +\cs_set_protected:Npn \__cmd_tmp:w #1 + { + \cs_new:Npn \__cmd_expandable_grab_R_alt_aux:NNwNNn ##1##2##3 \q__cmd ##4##5##6 + { + \str_if_eq:nnTF {##6} {##2} + { + \str_if_eq:onTF + { ##1 { } ##6 ##2 ##2 } + { { } ##2 } + } + { \use_ii:nn } + { + ##1 + { \__cmd_expandable_grab_D_alt:NNwn ##4 ##5 ##3 \q__cmd } + ##6 \ERROR + } + { + \msg_expandable_error:nnff { cmd } { missing-required } + { \exp_args:Nf \tl_trim_spaces:n { \token_to_str:N ##4 } } + { \tl_to_str:n {##2} } + ##3 {#1} \q__cmd ##4 ##5 {##6} + } + } + } +\exp_args:No \__cmd_tmp:w { \c_novalue_tl } +\cs_new:Npn \__cmd_expandable_grab_t:w #1 \q__cmd #2#3 + { #2 { \__cmd_expandable_grab_t_aux:NNwn #1 \q__cmd #2 #3 } } +\cs_new:Npn \__cmd_expandable_grab_t_aux:NNwn #1#2#3 \q__cmd #4#5#6 + { + \str_if_eq:onTF { #1 { } #6 #2 } {#2} + { #3 { \BooleanTrue } \q__cmd #4 #5 } + { #3 { \BooleanFalse } \q__cmd #4 #5 {#6} } + } +\cs_new:Npn \__cmd_put_arg_expandable:nw #1#2 \q__cmd { #2 {#1} \q__cmd } +\cs_generate_variant:Nn \__cmd_put_arg_expandable:nw { o } +\cs_new_protected:Npn \__cmd_bool_reverse:N #1 + { + \bool_if:NTF #1 + { \tl_set:Nn \ProcessedArgument { \c_false_bool } } + { \tl_set:Nn \ProcessedArgument { \c_true_bool } } + } +\seq_new:N \l__cmd_split_list_seq +\tl_new:N \l__cmd_split_list_tl +\cs_new_protected:Npn \__cmd_split_list:nn #1#2 + { + \tl_if_single:nTF {#1} + { + \token_if_cs:NTF #1 + { \__cmd_split_list_multi:nn {#1} {#2} } + { \__cmd_split_list_single:Nn #1 {#2} } + } + { \__cmd_split_list_multi:nn {#1} {#2} } + } +\cs_new_protected:Npn \__cmd_split_list_multi:nn #1#2 + { + \seq_set_split:Nnn \l__cmd_split_list_seq {#1} {#2} + \tl_clear:N \ProcessedArgument + \seq_map_inline:Nn \l__cmd_split_list_seq + { \tl_put_right:Nn \ProcessedArgument { {##1} } } + } +\cs_generate_variant:Nn \__cmd_split_list_multi:nn { nV } +\group_begin: +\char_set_catcode_active:N \^^@ +\cs_new_protected:Npn \__cmd_split_list_single:Nn #1#2 + { + \tl_set:Nn \l__cmd_split_list_tl {#2} + \group_begin: + \char_set_lccode:nn { `\^^@ } { `#1 } + \tex_lowercase:D + { + \group_end: + \tl_replace_all:Nnn \l__cmd_split_list_tl { ^^@ } + } {#1} + \__cmd_split_list_multi:nV {#1} \l__cmd_split_list_tl + } +\group_end: +\cs_new_protected:Npn \__cmd_split_argument:nnn #1#2#3 + { + \__cmd_split_list:nn {#2} {#3} + \exp_args:Nf \__cmd_split_argument_aux:nnnn + { \tl_count:N \ProcessedArgument } + {#1} {#2} {#3} + } +\cs_new_protected:Npn \__cmd_split_argument_aux:nnnn #1#2#3#4 + { + \int_compare:nNnF {#1} = { #2 + 1 } + { + \int_compare:nNnTF {#1} > { #2 + 1 } + { + \tl_set:Nx \ProcessedArgument + { + \exp_last_unbraced:NnNo + \__cmd_split_argument_aux:n + { #2 + 1 } + \use_none_delimit_by_q_stop:w + \ProcessedArgument + \q_stop + } + \msg_error:nnxxx { cmd } { split-excess-tokens } + { \tl_to_str:n {#3} } { \int_eval:n { #2 + 1 } } + { \tl_to_str:n {#4} } + } + { + \tl_put_right:Nx \ProcessedArgument + { + \prg_replicate:nn { #2 + 1 - (#1) } + { { \exp_not:V \c_novalue_tl } } + } + } + } + } +\cs_new:Npn \__cmd_split_argument_aux:n #1 + { \prg_replicate:nn {#1} { \__cmd_split_argument_aux:wn } } +\cs_new:Npn \__cmd_split_argument_aux:wn #1 \use_none_delimit_by_q_stop:w #2 + { + \exp_not:n { {#2} } + #1 + \use_none_delimit_by_q_stop:w + } +\cs_new_protected:Npn \__cmd_trim_spaces:n #1 + { \tl_set:Nx \ProcessedArgument { \tl_trim_spaces:n {#1} } } +\cs_new_protected:Npn \__cmd_get_arg_spec_error:N #1 + { + \bool_set_false:N \l__cmd_environment_bool + \tl_set:Nn \l__cmd_fn_tl {#1} + \__cmd_get_arg_spec_error_aux:n { \cs_if_exist:NTF #1 } + } +\cs_new_protected:Npn \__cmd_get_arg_spec_error:n #1 + { + \bool_set_true:N \l__cmd_environment_bool + \str_set:Nx \l__cmd_environment_str {#1} + \__cmd_get_arg_spec_error_aux:n + { \cs_if_exist:cTF { \l__cmd_environment_str } } + } +\cs_new_protected:Npn \__cmd_get_arg_spec_error_aux:n #1 + { + #1 + { + \msg_error:nnx { cmd } { non-xparse } + { \__cmd_environment_or_command: } + } + { + \msg_error:nnx { cmd } { unknown } + { \__cmd_environment_or_command: } + } + } +\cs_new_protected:Npn \__cmd_get_arg_spec:NTF #1#2#3 + { + \__kernel_cmd_if_xparse:NTF #1 + { + \tl_set:Nx \ArgumentSpecification { \tl_item:Nn #1 { 2 } } + #2 + } + {#3} + } +\tl_new:N \ArgumentSpecification +\cs_new_protected:Npn \__cmd_get_arg_spec:N #1 + { + \__cmd_get_arg_spec:NTF #1 { } + { \__cmd_get_arg_spec_error:N #1 } + } +\cs_new_protected:Npn \__cmd_get_arg_spec:n #1 + { + \exp_args:Nc \__cmd_get_arg_spec:NTF + { environment~ \tl_to_str:n {#1} } + { } + { \__cmd_get_arg_spec_error:n {#1} } + } +\cs_new_protected:Npn \__cmd_show_arg_spec:N #1 + { + \__cmd_get_arg_spec:NTF #1 + { \tl_show:N \ArgumentSpecification } + { \__cmd_get_arg_spec_error:N #1 } + } +\cs_new_protected:Npn \__cmd_show_arg_spec:n #1 + { + \exp_args:Nc \__cmd_get_arg_spec:NTF + { environment~ \tl_to_str:n {#1} } + { \tl_show:N \ArgumentSpecification } + { \__cmd_get_arg_spec_error:n {#1} } + } +\cs_new_protected:Npn \__cmd_check_definable:nNT #1 + { \tl_trim_spaces_apply:nN {#1} \__cmd_check_definable_aux:nN } +\group_begin: + \char_set_catcode_active:n { `? } + \cs_new_protected:Npn \__cmd_check_definable_aux:nN #1#2 + { + \group_begin: + \tl_if_single_token:nTF {#1} + { + \int_set:Nn \tex_escapechar:D { 92 } + \exp_args:Nx \tl_if_empty:nTF + { \exp_args:No \str_tail:n { \token_to_str:N #1 } } + { + \exp_args:Nx \char_set_lccode:nn + { ` \str_head:n {#1} } { `? } + \tex_lowercase:D { \tl_if_eq:nnTF {#1} } { ? } + { \group_end: \use_iii:nnn } + { \group_end: \use_i:nnn } + } + { \group_end: \use_iii:nnn } + } + { \group_end: \use_ii:nnn } + { + \msg_error:nnxx { cmd } { not-definable } + { \tl_to_str:n {#1} } { \token_to_str:N #2 } + } + { + \msg_error:nnxx { cmd } { not-one-token } + { \tl_to_str:n {#1} } { \token_to_str:N #2 } + } + } +\group_end: +\cs_new_protected:Npn \__cmd_token_if_cs:NTF #1 + { + \group_begin: + \int_set:Nn \tex_escapechar:D { 92 } + \exp_args:Nx \tl_if_empty:nTF + { \exp_args:No \str_tail:n { \token_to_str:N #1 } } + { \group_end: \use_ii:nn } + { \group_end: \use_i:nn } + } +\cs_new:Npn \__cmd_tl_mapthread_function:NNN #1#2#3 + { + \exp_after:wN \exp_after:wN + \exp_after:wN \__cmd_tl_mapthread_loop:w + \exp_after:wN \exp_after:wN + \exp_after:wN #3 + \exp_after:wN #1 + \exp_after:wN \q_recursion_tail + \exp_after:wN \q_mark + #2 + \q_recursion_tail + \q_recursion_stop + } +\cs_new:Npn \__cmd_tl_mapthread_function:nnN #1#2#3 + { + \__cmd_tl_mapthread_loop:w #3 + #1 \q_recursion_tail \q_mark + #2 \q_recursion_tail \q_recursion_stop + } +\cs_new:Npn \__cmd_tl_mapthread_loop:w #1#2#3 \q_mark #4 + { + \quark_if_recursion_tail_stop:n {#2} + \quark_if_recursion_tail_stop:n {#4} + #1 {#2} {#4} + \__cmd_tl_mapthread_loop:w #1#3 \q_mark + } +\cs_new_protected:Npn \__kernel_cmd_if_xparse:NTF #1 + { + \exp_args:Nf \str_case_e:nnTF + { + \exp_args:Nf \tl_if_empty:nT { \cs_argument_spec:N #1 } + { + \exp_last_unbraced:Nf \__cmd_cmd_if_xparse_aux:w + { \cs_replacement_spec:N #1 } ~ \q_stop + } + } + { + { \token_to_str:N \__cmd_start:nNNnnn } { } + { \token_to_str:N \__cmd_start_expandable:nNNNNn } { } + { \token_to_str:N \__cmd_start_env:nnnnn } { } + } + } +\cs_new:Npn \__cmd_cmd_if_xparse_aux:w #1 ~ #2 \q_stop {#1} +\cs_new_protected:Npn \__cmd_peek_nonspace:NTF + { \__cmd_peek_nonspace_aux:nNNTF { } \__cmd_peek_meaning:NTF } +\cs_new_protected:Npn \__cmd_peek_nonspace_remove:NTF + { \__cmd_peek_nonspace_aux:nNNTF { } \__cmd_peek_meaning_remove:NTF } +\cs_new_protected:Npn \__cmd_peek_nonspace_aux:nNNTF #1#2#3#4#5 + { + \peek_meaning_remove:NTF \c_space_token + { \__cmd_peek_nonspace_aux:nNNTF { #1 ~ } #2 #3 {#4} {#5} } + { #2 #3 { #4 } { #5 #1 } } + } +\cs_new_protected:Npn \__cmd_peek_meaning:NTF + { \__cmd_peek_meaning_aux:NNTF \c_false_bool } +\cs_new_protected:Npn \__cmd_peek_meaning_remove:NTF + { \__cmd_peek_meaning_aux:NNTF \c_true_bool } +\cs_new_protected:Npn \__cmd_peek_meaning_aux:NNTF #1#2#3#4 + { + \tl_set:Nn \l__cmd_tmpa_tl {#3} + \tl_set:Nn \l__cmd_tmpb_tl {#4} + \peek_meaning:NTF #2 + { + \token_if_eq_meaning:NNTF #2 \c_group_begin_token + { \__cmd_peek_true_remove:Nw #1 } + { + \__cmd_token_if_cs:NTF #2 + { \__cmd_peek_cs_check_equal:NNN #1 #2 } + { \__cmd_peek_true_remove:Nw #1 } + } + } + { \l__cmd_tmpb_tl } + } +\cs_new_protected:Npn \__cmd_peek_cs_check_equal:NNN #1#2#3 + { + \str_if_eq:nnTF {#2} {#3} + { \__cmd_peek_true_remove:Nw #1 } + { \l__cmd_tmpb_tl } + #3 + } +\cs_new_protected:Npn \__cmd_peek_true_remove:Nw #1 + { + \bool_if:NTF #1 + { + \tex_afterassignment:D \l__cmd_tmpa_tl + \cs_set_eq:NN \__cmd_tmp:w + } + { \l__cmd_tmpa_tl } + } +\tl_const:Nn \c__cmd_ignore_def_tl + { \\ \\ LaTeX~will~ignore~this~entire~definition. } +\cs_new:Npn \__cmd_environment_or_command: + { + \bool_if:NTF \l__cmd_environment_bool + { environment ~ ' \l__cmd_environment_str ' } + { + command ~ ' + \exp_args:Nf \tl_trim_spaces:n + { \exp_after:wN \token_to_str:N \l__cmd_fn_tl } + ' + } + } +\msg_new:nnnn { cmd } { arg-after-body } + { In~the~definition~of~#1,~b~(body)~argument~must~be~last. } + { + The~'body'~argument~type~is~followed~by~'#2'~in~the~argument~ + specification~of~the~#1.~This~is~not~allowed. + \c__cmd_ignore_def_tl + } +\msg_new:nnnn { cmd } { bad-arg-spec } + { Bad~argument~specification~'#2'~for~#1. } + { + The~argument~specification~provided~was~not~valid:~ + one~or~more~mandatory~pieces~of~information~were~missing. + \c__cmd_ignore_def_tl + } +\msg_new:nnnn { cmd } { command-already-defined } + { Command~'#1'~already~defined! } + { + You~have~used~#2~ + with~a~command~that~already~has~a~definition. \\ \\ + The~existing~definition~of~'#1'~will~not~be~altered. + } +\msg_new:nnnn { cmd } { command-not-yet-defined } + { Command ~'#1'~not~yet~defined! } + { + You~have~used~#2~ + with~a~command~that~was~never~defined. + \c__cmd_ignore_def_tl + } +\msg_new:nnnn { cmd } { environment-already-defined } + { Environment~'#1'~already~defined! } + { + You~have~used~\NewDocumentEnvironment + with~an~environment~that~already~has~a~definition. \\ \\ + The~existing~definition~of~'#1'~will~not~be~altered. + } +\msg_new:nnnn { cmd } { environment-not-yet-defined } + { Environment~'#1'~not~yet~defined! } + { + You~have~used~\RenewDocumentEnvironment + with~an~environment~that~was~never~defined. + \c__cmd_ignore_def_tl + } +\msg_new:nnnn { cmd } { expandable-ending-optional } + { + Argument~specification~'#2'~for~expandable~command~'#1'~ + ends~with~optional~argument. + } + { + Expandable~commands~must~have~a~final~mandatory~argument~ + (or~no~arguments~at~all).~You~cannot~have~a~terminal~optional~ + argument~with~expandable~commands. + } +\msg_new:nnnn { cmd } { inconsistent-long } + { Inconsistent~long~arguments~for~expandable~command~'#1'. } + { + The~arguments~for~an~expandable~command~must~not~involve~short~ + arguments~after~long~arguments.~You~have~tried~to~mix~the~two~types. + } +\msg_new:nnnn { cmd } { invalid-command-arg } + { Argument~type~'#2'~not~available~for~#1. } + { + The~letter~'#2'~can~only~be~used~in~environment~argument~ + specifications,~not~for~commands. + \\ \\ + LaTeX~will~ignore~this~entire~definition. + } +\msg_new:nnnn { cmd } { invalid-expandable-argument-type } + { Argument~type~'#2'~not~available~for~expandable~command~'#1'. } + { + The~letter~'#2'~specifies~an~argument~type~which~cannot~be~used~ + in~an~expandable~command. + \c__cmd_ignore_def_tl + } +\msg_new:nnnn { cmd } { invalid-after-optional-expandably } + { + Argument~type~'#2'~not~available~after~optional~argument~ + for~expandable~command~'#1'. + } + { + The~letter~'#2'~specifies~an~argument~type~which~cannot~be~used~ + in~an~expandable~command~after~an~optional~argument. + \c__cmd_ignore_def_tl + } +\msg_new:nnnn { cmd } { non-trailing-obey-spaces } + { Prefix~'!'~used~before~mandatory~argument~'#2'~of~#1. } + { + The~prefix~'!'~can~only~apply~to~trailing~optional~arguments. + \c__cmd_ignore_def_tl + } +\msg_new:nnnn { cmd } { not-definable } + { First~argument~of~'#2'~must~be~a~command. } + { + The~first~argument~of~'#2'~should~be~the~document~command~that~will~ + be~defined.~The~provided~argument~'#1'~is~a~character.~Perhaps~a~ + backslash~is~missing? + \c__cmd_ignore_def_tl + } +\msg_new:nnnn { cmd } { not-one-token } + { First~argument~of~'#2'~must~be~a~command. } + { + The~first~argument~of~'#2'~should~be~the~document~command~that~will~ + be~defined.~The~provided~argument~'#1'~contains~more~than~one~ + token.~Perhaps~a~backslash~is~missing? + \c__cmd_ignore_def_tl + } +\msg_new:nnnn { cmd } { not-single-token } + { + Argument~delimiter~'#2'~for~the~#1~should~be~ + a~single~non-space~token. + } + { + The~argument~specification~provided~was~not~valid:~in~a~place~ + where~a~single~token~is~required,~LaTeX~found~'#2'. + \c__cmd_ignore_def_tl + } +\msg_new:nnnn { cmd } { forbidden-implicit-group-token } + { Argument~delimiter~'#2'~for~the~#1~is~not~allowed. } + { + The~argument~specification~provided~was~not~valid:~the~implicit~ + #3-group~token~'#2'~is~not~allowed~as~an~argument~delimiter. + \c__cmd_ignore_def_tl + } +\msg_new:nnnn { cmd } { processor-in-expandable } + { Argument~processor~'>{#2}'~cannot~be~used~for~the~expandable~command~'#1'. } + { + The~argument~specification~for~#1~contains~a~processor~function:~ + this~is~only~supported~for~standard~robust~commands. + \c__cmd_ignore_def_tl + } +\msg_new:nnnn { cmd } { too-many-arguments } + { Too~many~arguments~in~argument~specification~'#2'~of~#1. } + { + The~argument~specification~provided~has~more~than~9~arguments.~ + This~cannot~be~implemented. + \c__cmd_ignore_def_tl + } +\msg_new:nnnn { cmd } { two-markers } + { Two~'#2'~apply~to~the~same~argument~in~argument~specification~of~#1. } + { + The~argument~specification~provided~has~two~markers~'#2'~applying~ + to~the~same~argument;~these~are~redundant. + } +\msg_new:nnnn { cmd } { unknown-argument-type } + { Unknown~argument~type~'#2'~for~the~#1. } + { + The~letter~'#2'~does~not~specify~a~known~argument~type. + \c__cmd_ignore_def_tl + } +\msg_new:nnnn { cmd } { xparse-argument-type } + { Deprecated~argument~type~'#2'~for~the~#1~requires~xparse. } + { + The~letter~'#2'~specifies~a~known~argument~type~that~requires~ + the~xparse~package. + \c__cmd_ignore_def_tl + } +\msg_new:nnn { cmd } { if-boolean } + { Invalid~use~\iow_char:N\\IfBooleanTF~{#1} } +\msg_new:nnnn { cmd } { loop-in-defaults } + { Defaults~of~#1~have~circular~dependency. } + { + The~default~values~of~two~or~more~arguments~of~the~#1~ + depend~on~each~other~in~a~way~that~cannot~be~resolved. + } +\msg_new:nnnn { cmd } { missing-required } + { Missing~required~argument~for~#1. } + { + The~current~#1~expects~an~argument~starting~with~'#2'.~ + LaTeX~did~not~find~it,~and~will~insert~a~default~value~to~be~processed. + } +\msg_new:nnnn { cmd } { non-xparse } + { \str_uppercase:n #1~not~defined~using~xparse. } + { + You~have~asked~for~the~argument~specification~for~the~#1,~ + but~this~was~not~defined~using~xparse. + } +\msg_new:nnnn { cmd } { split-excess-tokens } + { Too~many~'#1'~tokens~when~trying~to~split~argument. } + { + LaTeX~was~asked~to~split~the~input~'#3'~ + at~each~occurrence~of~the~token~'#1',~up~to~a~maximum~of~#2~parts.~ + There~were~too~many~'#1'~tokens. + } +\msg_new:nnnn { cmd } { unknown } + { Unknown~document~#1. } + { + You~have~asked~for~the~argument~specification~for~the~#1,~ + but~it~is~not~defined. + } +\msg_new:nnnn { cmd } { verbatim-newline } + { Verbatim~argument~of~#1~ended~by~end~of~line. } + { + The~verbatim~argument~of~the~#1~cannot~contain~more~than~one~line,~ + but~the~end~ + of~the~current~line~has~been~reached.~You~may~have~forgotten~the~ + closing~delimiter. + \\ \\ + LaTeX~will~ignore~'#2'. + } +\msg_new:nnnn { cmd } { verbatim-tokenized } + { The~verbatim~#1~cannot~be~used~inside~an~argument. } + { + The~#1~takes~a~verbatim~argument.~ + It~may~not~appear~within~the~argument~of~another~function.~ + It~received~an~illegal~token \tl_if_empty:nF {#3} { ~'#3' } . + \\ \\ + LaTeX~will~ignore~'#2'. + } +\msg_new:nnn { cmd } { define-command } + { + Defining~command~#1~ + with~sig.~'#2'~\msg_line_context:. + } +\msg_new:nnn { cmd } { define-environment } + { + Defining~environment~'#1'~ + with~sig.~'#2'~\msg_line_context:. + } +\msg_new:nnn { cmd } { redefine-command } + { + Redefining~command~#1~ + with~sig.~'#2'~\msg_line_context:. + } +\msg_new:nnn { cmd } { redefine-environment } + { + Redefining~environment~'#1'~ + with~sig.~'#2'~\msg_line_context:. + } +\msg_new:nnn { cmd } { optional-mandatory } + { + Since~the~mandatory~argument~'#1'~has~the~same~delimiter~'#2'~ + as~a~previous~optional~argument,~it~will~not~be~possible~to~ + omit~all~optional~arguments~when~calling~this~command. + } +\msg_new:nnn { cmd } { unsupported-let } + { + The~command~'#1'~was~undefined~but~not~the~associated~commands~ + '#1~code'~and/or~'#1~defaults'.~Maybe~you~tried~using~ + \iow_char:N\\let.~This~may~lead~to~an~infinite~loop. + } +\cs_new_eq:NN \BooleanFalse \c_false_bool +\cs_new_eq:NN \BooleanTrue \c_true_bool +\cs_new_protected:Npn \NewDocumentCommand #1#2#3 + { + \__cmd_check_definable:nNT {#1} \NewDocumentCommand + { + \cs_if_exist:NTF #1 + { + \msg_error:nnxx { cmd } { command-already-defined } + { \use:nnn \token_to_str:N #1 { } } + { \token_to_str:N \NewDocumentCommand } + } + { \__cmd_declare_cmd:Nnn #1 {#2} {#3} } + } + } +\cs_new_protected:Npn \RenewDocumentCommand #1#2#3 + { + \__cmd_check_definable:nNT {#1} \RenewDocumentCommand + { + \cs_if_exist:NTF #1 + { \__cmd_declare_cmd:Nnn #1 {#2} {#3} } + { + \msg_error:nnxx { cmd } { command-not-yet-defined } + { \use:nnn \token_to_str:N #1 { } } + { \token_to_str:N \RenewDocumentCommand } + } + } + } +\cs_new_protected:Npn \ProvideDocumentCommand #1#2#3 + { + \__cmd_check_definable:nNT {#1} \ProvideDocumentCommand + { \cs_if_exist:NF #1 { \__cmd_declare_cmd:Nnn #1 {#2} {#3} } } + } +\cs_new_protected:Npn \DeclareDocumentCommand #1#2#3 + { + \__cmd_check_definable:nNT {#1} \DeclareDocumentCommand + { \__cmd_declare_cmd:Nnn #1 {#2} {#3} } + } +\cs_new_protected:Npn \NewDocumentEnvironment #1#2#3#4 + { + \cs_if_exist:cTF {#1} + { \msg_error:nnx { cmd } { environment-already-defined } {#1} } + { \__cmd_declare_env:nnnn {#1} {#2} {#3} {#4} } + } +\cs_new_protected:Npn \RenewDocumentEnvironment #1#2#3#4 + { + \cs_if_exist:cTF {#1} + { \__cmd_declare_env:nnnn {#1} {#2} {#3} {#4} } + { \msg_error:nnx { cmd } { environment-not-yet-defined } {#1} } + } +\cs_new_protected:Npn \ProvideDocumentEnvironment #1#2#3#4 + { \cs_if_exist:cF {#1} { \__cmd_declare_env:nnnn {#1} {#2} {#3} {#4} } } +\cs_new_protected:Npn \DeclareDocumentEnvironment #1#2#3#4 + { \__cmd_declare_env:nnnn {#1} {#2} {#3} {#4} } +\cs_new_protected:Npn \NewExpandableDocumentCommand #1#2#3 + { + \__cmd_check_definable:nNT {#1} \NewExpandableDocumentCommand + { + \cs_if_exist:NTF #1 + { + \msg_error:nnxx { cmd } { command-already-defined } + { \use:nnn \token_to_str:N #1 { } } + { \token_to_str:N \NewExpandableDocumentCommand } + } + { \__cmd_declare_expandable_cmd:Nnn #1 {#2} {#3} } + } + } +\cs_new_protected:Npn \RenewExpandableDocumentCommand #1#2#3 + { + \__cmd_check_definable:nNT {#1} \RenewExpandableDocumentCommand + { + \cs_if_exist:NTF #1 + { \__cmd_declare_expandable_cmd:Nnn #1 {#2} {#3} } + { + \msg_error:nnxx { cmd } { command-not-yet-defined } + { \use:nnn \token_to_str:N #1 { } } + { \token_to_str:N \RenewExpandableDocumentCommand } + } + } + } +\cs_new_protected:Npn \ProvideExpandableDocumentCommand #1#2#3 + { + \__cmd_check_definable:nNT {#1} \ProvideExpandableDocumentCommand + { + \cs_if_exist:NF #1 + { \__cmd_declare_expandable_cmd:Nnn #1 {#2} {#3} } + } + } +\cs_new_protected:Npn \DeclareExpandableDocumentCommand #1#2#3 + { + \__cmd_check_definable:nNT {#1} \DeclareExpandableDocumentCommand + { \__cmd_declare_expandable_cmd:Nnn #1 {#2} {#3} } + } +\cs_new:Npn \IfBooleanTF #1 + { + \tl_if_single:nF {#1} + { \prg_break:n { \use:n } } + \tl_if_single_token:nF #1 + { \prg_break:n { \use:n } } + \token_if_eq_meaning:NNT #1 \c_true_bool + { \prg_break:n { \use_ii:nnn } } + \token_if_eq_meaning:NNT #1 \c_false_bool + { \prg_break:n { \use_iii:nnn } } + \prg_break:n { \use:n } + \prg_break_point: + { + \msg_expandable_error:nnn { cmd } { if-boolean } {#1} + \use_ii:nn + } + } +\cs_new:Npn \IfBooleanT #1#2 { \IfBooleanTF {#1} {#2} { } } +\cs_new:Npn \IfBooleanF #1 { \IfBooleanTF {#1} { } } +\cs_new_eq:NN \IfNoValueF \tl_if_novalue:nF +\cs_new_eq:NN \IfNoValueT \tl_if_novalue:nT +\cs_new_eq:NN \IfNoValueTF \tl_if_novalue:nTF +\cs_new:Npn \IfValueF { \tl_if_novalue:nT } +\cs_new:Npn \IfValueT { \tl_if_novalue:nF } +\cs_new:Npn \IfValueTF #1#2#3 { \tl_if_novalue:nTF {#1} {#3} {#2} } +\tl_new:N \ProcessedArgument +\cs_new_eq:NN \ReverseBoolean \__cmd_bool_reverse:N +\cs_new_eq:NN \SplitArgument \__cmd_split_argument:nnn +\cs_new_eq:NN \SplitList \__cmd_split_list:nn +\cs_new_eq:NN \TrimSpaces \__cmd_trim_spaces:n +\cs_new_eq:NN \ProcessList \tl_map_function:nN +\cs_new_protected:Npn \GetDocumentCommandArgSpec #1 + { + \__cmd_check_definable:nNT {#1} \GetDocumentCommandArgSpec + { \__cmd_get_arg_spec:N #1 } + } +\cs_new_eq:NN \GetDocumentEnvironmentArgSpec \__cmd_get_arg_spec:n +\cs_new_protected:Npn \ShowDocumentCommandArgSpec #1 + { + \__cmd_check_definable:nNT {#1} \ShowDocumentCommandArgSpec + { \__cmd_show_arg_spec:N #1 } + } +\cs_new_eq:NN \ShowDocumentEnvironmentArgSpec \__cmd_show_arg_spec:n +\ExplSyntaxOff %%% From File: lthooks.dtx -\def\lthooksversion{v1.0h} -\def\lthooksdate{2021/01/07} +\def\lthooksversion{v1.0n} +\def\lthooksdate{2021/05/26} + \ExplSyntaxOn \bool_new:N \g__hook_debug_bool \cs_new_eq:NN \__hook_debug:n \use_none:n @@ -1696,24 +3993,34 @@ \cs_new_protected:Npn \__hook_tl_gclear:N #1 { \__hook_tl_gset_eq:NN #1 \c_empty_tl } \cs_generate_variant:Nn \__hook_tl_gclear:N { c } + + \cs_new_protected:Npn \hook_new:n #1 { \__hook_normalize_hook_args:Nn \__hook_new:n {#1} } \cs_new_protected:Npn \__hook_new:n #1 { - \hook_if_exist:nTF {#1} + \__hook_if_declared:nTF {#1} { \msg_error:nnn { hooks } { exists } {#1} } { + \tl_new:c { g__hook_#1_declared_tl } + \__hook_make_usable:n {#1} + } + } +\cs_new_protected:Npn \__hook_make_usable:n #1 + { + \tl_if_exist:cF { __hook~#1 } + { \seq_gput_right:Nn \g__hook_all_seq {#1} \tl_new:c { __hook~#1 } - \__hook_declare:n {#1} - \clist_new:c {g__hook_#1_labels_clist} + \__hook_init_structure:n {#1} + \clist_new:c { g__hook_#1_labels_clist } \tl_new:c { g__hook_#1_reversed_tl } \__hook_include_legacy_code_chunk:n {#1} - } + } } -\cs_new_protected:Npn \__hook_declare:n #1 +\cs_new_protected:Npn \__hook_init_structure:n #1 { - \__hook_if_exist:nF {#1} + \__hook_if_structure_exist:nF {#1} { \prop_new:c { g__hook_#1_code_prop } \tl_new:c { __hook_toplevel~#1 } @@ -1741,6 +4048,44 @@ } } } +\cs_new_protected:Npn \hook_disable:n #1 + { \__hook_normalize_hook_args:Nn \__hook_disable:n {#1} } +\cs_new_protected:Npn \__hook_disable:n #1 + { + \tl_gclear_new:c { g__hook_#1_declared_tl } + \cs_undefine:c { __hook~#1 } + } +\prg_new_conditional:Npnn \__hook_if_disabled:n #1 { p, T, F, TF } + { + \bool_lazy_and:nnTF + { \tl_if_exist_p:c { g__hook_#1_declared_tl } } + { ! \tl_if_exist_p:c { __hook~#1 } } + { \prg_return_true: } + { \prg_return_false: } + } +\cs_new_protected:Npn \hook_provide:n #1 + { \__hook_normalize_hook_args:Nn \__hook_provide:nn {#1} { } } +\cs_new_protected:Npn \hook_provide_reversed:n #1 + { \__hook_normalize_hook_args:Nn \__hook_provide:nn {#1} { - } } +\cs_new_protected:Npn \__hook_provide:nn #1 #2 + { + \__hook_if_disabled:nTF {#1} + { \msg_warning:nnn { hooks } { provide-disabled } {#1} } + { + \__hook_if_declared:nTF {#1} + { + \str_if_eq:eeF { \tl_use:c { g__hook_#1_reversed_tl } } {#2} + { \msg_error:nnn { hooks } { provide-error } {#1} } + } + { + \tl_new:c { g__hook_#1_declared_tl } + \__hook_make_usable:n {#1} + \tl_gset:cn { g__hook_#1_reversed_tl } {#2} + } + } + } +\cs_new_protected:Npn \hook_provide_pair:nn #1#2 + { \hook_provide:n {#1} \hook_provide_reversed:n {#2} } \cs_new:Npn \__hook_parse_label_default:n #1 { \tl_if_novalue:nTF {#1} @@ -1779,7 +4124,7 @@ { \tl_if_empty:NTF \@currname { - \msg_expandable_error:nnn { hooks } { should-not-happen } + \msg_expandable_error:nnn { kernel } { should-not-happen } { Empty~default~label. } \__hook_make_name:n { label-missing } } @@ -1836,12 +4181,16 @@ \__hook_if_marked_removal:nnTF {#1} {#2} { \__hook_unmark_removal:nn {#1} {#2} } { - \hook_if_exist:nTF {#1} + \__hook_if_usable:nTF {#1} { \__hook_hook_gput_code_do:nnn {#1} {#2} {#3} \__hook_update_hook_code:n {#1} } - { \__hook_try_declaring_generic_hook:nnn {#1} {#2} {#3} } + { + \__hook_if_disabled:nTF {#1} + { \msg_error:nnn { hooks } { hook-disabled } {#1} } + { \__hook_try_declaring_generic_hook:nnn {#1} {#2} {#3} } + } } } } @@ -1849,14 +4198,14 @@ \cs_new_protected:Npn \__hook_hook_gput_code_do:nnn #1 #2 #3 { \__hook_debug:n{\iow_term:x{****~ Add~ to~ - \hook_if_exist:nF {#1} { undeclared~ } + \__hook_if_usable:nF {#1} { undeclared~ } hook~ #1~ (#2) \on@line\space <-~ \tl_to_str:n{#3}} } \str_if_eq:nnTF {#2} { top-level } { \str_if_eq:eeTF { top-level } { \__hook_currname_or_default: } { - \__hook_declare:n {#1} + \__hook_init_structure:n {#1} \__hook_tl_gput_right:cn { __hook_toplevel~#1 } {#3} } { \msg_error:nnn { hooks } { misused-top-level } {#1} } @@ -1872,7 +4221,7 @@ } \cs_new_protected:Npn \__hook_gput_undeclared_hook:nnn #1 #2 #3 { - \__hook_declare:n {#1} + \__hook_init_structure:n {#1} \__hook_hook_gput_code_do:nnn {#1} {#2} {#3} } \cs_new_protected:Npn \__hook_try_declaring_generic_hook:nnn #1 @@ -1908,7 +4257,12 @@ { \prop_if_in:NnTF \c__hook_generics_prop {#1} { - \hook_if_exist:nF {#5} { \hook_new:n {#5} } + \__hook_if_usable:nF {#5} + { + \str_if_eq:nnT {#1} { cmd } + { \__hook_try_put_cmd_hook:n {#5} } + \__hook_make_usable:n {#5} + } \prop_if_in:NnTF \c__hook_generics_reversed_ii_prop {#2} { \tl_gset:cn { g__hook_#5_reversed_tl } { - } } { @@ -1948,7 +4302,7 @@ { \__hook_strip_double_slash:w #1/#2/#3 / #4 \s__hook_mark } } \prop_const_from_keyval:Nn \c__hook_generics_prop - {env=,file=,package=,class=,include=} + {cmd=,env=,file=,package=,class=,include=} \prop_const_from_keyval:Nn \c__hook_generics_reversed_ii_prop {after=,end=} \prop_const_from_keyval:Nn \c__hook_generics_reversed_iii_prop {after=} \prop_const_from_keyval:Nn \c__hook_generics_file_prop {before=,after=} @@ -1956,7 +4310,7 @@ { \__hook_normalize_hook_args:Nnn \__hook_gremove_code:nn {#1} {#2} } \cs_new_protected:Npn \__hook_gremove_code:nn #1 #2 { - \__hook_if_exist:nTF {#1} + \__hook_if_structure_exist:nTF {#1} { \str_if_eq:nnTF {#2} {*} { @@ -1974,7 +4328,7 @@ {#1} {#2} } } - \hook_if_exist:nT {#1} + \__hook_if_usable:nT {#1} { \__hook_update_hook_code:n {#1} } } { \__hook_mark_removal:nn {#1} {#2} } @@ -2009,7 +4363,7 @@ } \cs_new_protected:Npn \__hook_gset_rule:nnnn #1#2#3#4 { - \__hook_declare:n {#1} + \__hook_init_structure:n {#1} \__hook_rule_gclear:nnn {#1} {#2} {#4} \cs_if_exist_use:cTF { __hook_rule_#3_gset:nnn } { @@ -2037,9 +4391,11 @@ { \__hook_label_ordered:nnTF {#2} {#3} { -> } { <- } } } \cs_new_protected:cpn { __hook_rule_incompatible-error_gset:nnn } #1#2#3 - { \__hook_tl_gset:cn { g__hook_#1_rule_ \__hook_label_pair:nn {#2} {#3} _tl } { xE } } + { \__hook_tl_gset:cn { g__hook_#1_rule_ \__hook_label_pair:nn {#2} {#3} _tl } + { xE } } \cs_new_protected:cpn { __hook_rule_incompatible-warning_gset:nnn } #1#2#3 - { \__hook_tl_gset:cn { g__hook_#1_rule_ \__hook_label_pair:nn {#2} {#3} _tl } { xW } } + { \__hook_tl_gset:cn { g__hook_#1_rule_ \__hook_label_pair:nn {#2} {#3} _tl } + { xW } } \cs_new_protected:Npn \__hook_rule_unrelated_gset:nnn #1#2#3 { } \cs_new_protected:Npn \__hook_rule_gclear:nnn #1#2#3 { \cs_undefine:c { g__hook_#1_rule_ \__hook_label_pair:nn {#2} {#3} _tl } } @@ -2055,7 +4411,7 @@ { \if_int_compare:w \__hook_str_compare:nn {#1} {#2} > 0 \exp_stop_f: \prg_return_true: - \else + \else: \prg_return_false: \fi: } @@ -2089,7 +4445,7 @@ \__hook_debug:n{ \iow_term:x{^^JUpdate~ code~ for~ hook~ '#1' \on@line :^^J} } \__hook_include_legacy_code_chunk:n {#1} - \hook_if_exist:nT {#1} + \__hook_if_usable:nT {#1} { \prop_if_empty:cTF {g__hook_#1_code_prop} { @@ -2309,8 +4665,10 @@ { \__hook_preamble_hook:n {#1} \__hook_log_cmd:x { ^^J ->~The~hook~'#1': } - \hook_if_exist:nF {#1} - { \__hook_log_line:x { is~not~declared! } } + \__hook_if_usable:nF {#1} + { \__hook_log_line:x { The~hook~is~not~declared. } } + \__hook_if_disabled:nT {#1} + { \__hook_log_line:x { The~hook~is~disabled. } } \hook_if_empty:nTF {#1} { #2 { The~hook~is~empty } } { @@ -2324,7 +4682,7 @@ \__hook_log_line:x { Document-level~(top-level)~code - \hook_if_exist:nT {#1} + \__hook_if_usable:nT {#1} { ~(executed~\__hook_if_reversed:nTF {#1} {first} {last} ) } : } \__hook_log_line_indent:x @@ -2355,7 +4713,7 @@ \bool_if:NT \l__hook_tmpa_bool { \__hook_log_line_indent:x { --- } } \bool_lazy_and:nnTF - { \hook_if_exist_p:n {#1} } + { \__hook_if_usable_p:n {#1} } { ! \hook_if_empty_p:n {#1} } { \__hook_log_line:x @@ -2377,10 +4735,12 @@ } } { + \__hook_log_line:x { Execution~order: } #2 { - Hook~ \hook_if_exist:nTF {#1} - {code~pool~empty} {not~declared} + \@spaces Not~set~because~the~hook~ \__hook_if_usable:nTF {#1} + { code~pool~is~empty } + { is~\__hook_if_disabled:nTF {#1} {disabled} {undeclared} } } } } @@ -2436,10 +4796,14 @@ { \__hook_normalize_hook_args:Nn \__hook_gput_next_code:nn {#1} } \cs_new_protected:Npn \__hook_gput_next_code:nn #1 #2 { - \__hook_declare:n {#1} - \hook_if_exist:nTF {#1} - { \__hook_gput_next_do:nn {#1} {#2} } - { \__hook_try_declaring_generic_next_hook:nn {#1} {#2} } + \__hook_if_disabled:nTF {#1} + { \msg_error:nnn { hooks } { hook-disabled } {#1} } + { + \__hook_init_structure:n {#1} + \__hook_if_usable:nTF {#1} + { \__hook_gput_next_do:nn {#1} {#2} } + { \__hook_try_declaring_generic_next_hook:nn {#1} {#2} } + } } \cs_new_protected:Npn \__hook_gput_next_do:nn #1 { @@ -2491,12 +4855,12 @@ { \__hook_if_file_hook:wTF #1 / / \s__hook_mark { - \exp_args:Ne \__hook_if_exist_use:n + \exp_args:Ne \__hook_if_usable_use:n { \exp_args:Ne \__hook_file_hook_normalize:n {#1} } } - { \__hook_if_exist_use:n {#1} } % file/ generic hook (e.g. file/before) + { \__hook_if_usable_use:n {#1} } % file/ generic hook (e.g. file/before) } -\cs_new_protected:Npn \__hook_if_exist_use:n #1 +\cs_new_protected:Npn \__hook_if_usable_use:n #1 { \tl_if_exist:cT { __hook~#1 } { @@ -2516,9 +4880,10 @@ } \cs_new_protected:Npn \__hook_use_once_store:n #1 { \prop_gput:Nnn \g__hook_execute_immediately_prop {#1} { } } + \prg_new_conditional:Npnn \hook_if_empty:n #1 { p , T , F , TF } { - \__hook_if_exist:nTF {#1} + \__hook_if_structure_exist:nTF {#1} { \bool_lazy_and:nnTF { \prop_if_empty_p:c { g__hook_#1_code_prop } } @@ -2532,18 +4897,24 @@ } { \prg_return_true: } } -\prg_new_conditional:Npnn \hook_if_exist:n #1 { p , T , F , TF } +\prg_new_conditional:Npnn \__hook_if_usable:n #1 { p , T , F , TF } { \tl_if_exist:cTF { __hook~#1 } { \prg_return_true: } { \prg_return_false: } } -\prg_new_conditional:Npnn \__hook_if_exist:n #1 { p , T , F , TF } +\prg_new_conditional:Npnn \__hook_if_structure_exist:n #1 { p , T , F , TF } { \prop_if_exist:cTF { g__hook_#1_code_prop } { \prg_return_true: } { \prg_return_false: } } +\prg_new_conditional:Npnn \__hook_if_declared:n #1 { p, T, F, TF } + { + \tl_if_exist:cTF { g__hook_#1_declared_tl } + { \prg_return_true: } + { \prg_return_false: } + } \prg_new_conditional:Npnn \__hook_if_reversed:n #1 { p , T , F , TF } { \if_int_compare:w \cs:w g__hook_#1_reversed_tl \cs_end: 1 < 0 \exp_stop_f: @@ -2552,10 +4923,12 @@ \prg_return_false: \fi: } +\prop_gput:Nnn \g_msg_module_type_prop { hooks } { LaTeX } +\prop_gput:Nnn \g_msg_module_type_prop { kernel } { LaTeX } \msg_new:nnnn { hooks } { labels-incompatible } { - Labels~`#1'~and~`#2'~are~incompatible - \str_if_eq:nnF {#3} {??} { ~in~hook~`#3' } .~ + Labels~'#1'~and~'#2'~are~incompatible + \str_if_eq:nnF {#3} {??} { ~in~hook~'#3' } .~ \int_compare:nNnTF {#4} = { 1 } { The~ code~ for~ both~ labels~ will~ be~ dropped. } { You~ may~ see~ errors~ later. } @@ -2563,14 +4936,21 @@ { LaTeX~found~two~incompatible~labels~in~the~same~hook.~ This~indicates~an~incompatibility~between~packages. } \msg_new:nnnn { hooks } { exists } - { Hook~`#1'~ has~ already~ been~ declared. } + { Hook~'#1'~ has~ already~ been~ declared. } { There~ already~ exists~ a~ hook~ declaration~ with~ this~ name.\\ Please~ use~ a~ different~ name~ for~ your~ hook.} +\msg_new:nnnn { hooks } { hook-disabled } + { Cannot~add~code~to~disabled~hook~'#1'. } + { + The~hook~'#1'~you~tried~to~add~code~to~was~previously~disabled~ + with~\iow_char:N\\hook_disable:n~or~\iow_char:N\\DisableHook,~so~ + it~cannot~have~code~added~to~it. + } \msg_new:nnn { hooks } { empty-label } { Empty~code~label~\msg_line_context:.~ - Using~`\__hook_currname_or_default:'~instead. + Using~'\__hook_currname_or_default:'~instead. } \msg_new:nnn { hooks } { no-default-label } { @@ -2578,23 +4958,23 @@ This~command~was~ignored. } \msg_new:nnnn { hooks } { unknown-rule } - { Unknown~ relationship~ `#3'~ - between~ labels~ `#2'~ and~ `#4'~ - \str_if_eq:nnF {#1} {??} { ~in~hook~`#1' }. ~ + { Unknown~ relationship~ '#3'~ + between~ labels~ '#2'~ and~ '#4'~ + \str_if_eq:nnF {#1} {??} { ~in~hook~'#1' }. ~ Perhaps~ a~ missspelling? } { The~ relation~ used~ not~ known~ to~ the~ system.~ Allowed~ values~ are~ - `before'~ or~ `<',~ - `after'~ or~ `>',~ - `incompatible-warning',~ - `incompatible-error',~ - `voids'~ or~ - `unrelated'. + 'before'~ or~ '<',~ + 'after'~ or~ '>',~ + 'incompatible-warning',~ + 'incompatible-error',~ + 'voids'~ or~ + 'unrelated'. } \msg_new:nnnn { hooks } { misused-top-level } { - Illegal~\iow_char:N \\AddToHook{#1}[top-level]{...}.\\ + Illegal~use~of~\iow_char:N \\AddToHook{#1}[top-level]{...}.\\ 'top-level'~is~reserved~for~the~user's~document. } { @@ -2605,16 +4985,10 @@ } \msg_new:nnn { hooks } { set-top-level } { - You~cannot~change~the~default~label~#1~`top-level'.~Illegal \\ + You~cannot~change~the~default~label~#1~'top-level'.~Illegal \\ \use:nn { ~ } { ~ } \iow_char:N \\#2{#3} \\ \msg_line_context:. } -\msg_new:nnn { hooks } { ddhl-deprecated } - { - \iow_char:N \\DeclareDefaultHookLabel~is~deprecated.\\ - Use~\iow_char:N \\SetDefaultHookLabel~instead.\\ \\ - The~deprecated~name~will~be~removed~in~the~next~release. - } \msg_new:nnn { hooks } { extra-pop-label } { Extra~\iow_char:N \\PopDefaultHookLabel. \\ @@ -2623,16 +4997,36 @@ \msg_new:nnn { hooks } { missing-pop-label } { Missing~\iow_char:N \\PopDefaultHookLabel. \\ - The~label~`#1'~was~pushed~but~never~popped.~Something~is~wrong. + The~label~'#1'~was~pushed~but~never~popped.~Something~is~wrong. } -\msg_new:nnn { hooks } { should-not-happen } +\msg_new:nnn { kernel } { should-not-happen } { - ERROR!~This~should~not~happen.~#1 \\ + This~should~not~happen.~#1 \\ Please~report~at~https://github.com/latex3/latex2e. } +\msg_new:nnn { hooks } { provide-disabled } + { + Cannot~ provide~ hook~ '#1'~ because~ it~ is~ disabled! + } +\msg_new:nnnn { hooks } { provide-error } + { + Hook~'#1'~ already~ declared~ as~ a~ + \__hook_if_reversed:nTF {#1} { reversed } { normal }~ hook! + } + { + You~ attempted~ to~ provide~ the~ hook~'#1'~ as~ a~ + \__hook_if_reversed:nTF {#1} { normal } { reversed }~ hook,~ but~ it~ + was~ already~ previously~ declared~ as~ a~ + \__hook_if_reversed:nTF {#1} { reversed } { normal }~ hook.~ + A~ redeclaration~ is~ not~ possible. + } \NewDocumentCommand \NewHook { m }{ \hook_new:n {#1} } \NewDocumentCommand \NewReversedHook { m }{ \hook_new_reversed:n {#1} } \NewDocumentCommand \NewMirroredHookPair { mm }{ \hook_new_pair:nn {#1}{#2} } +\NewDocumentCommand \ProvideHook { m }{ \hook_provide:n {#1} } +\NewDocumentCommand \ProvideReversedHook { m }{ \hook_provide_reversed:n {#1} } +\NewDocumentCommand \ProvideMirroredHookPair { mm }{ \hook_provide_pair:nn {#1}{#2} } +\NewDocumentCommand \DisableHook { m }{ \hook_disable:n {#1} } \NewDocumentCommand \AddToHook { m o +m } { \hook_gput_code:nnn {#1} {#2} {#3} } \NewDocumentCommand \AddToHookNext { m +m } @@ -2694,11 +5088,6 @@ } { \tl_gset:Nn \g__hook_hook_curr_name_tl {#1} } } -\NewDocumentCommand \DeclareDefaultHookLabel { m } - { - \msg_error:nn { hooks } { ddhl-deprecated } - \SetDefaultHookLabel {#1} - } \NewDocumentCommand \PushDefaultHookLabel { m } { \__hook_curr_name_push:n {#1} } \NewDocumentCommand \PopDefaultHookLabel { } @@ -2722,15 +5111,325 @@ \@onlypreamble\DeclareDefaultHookRule \NewDocumentCommand \ClearHookRule { m m m } { \hook_gset_rule:nnnn {#1}{#2}{unrelated}{#3} } -\cs_new_eq:NN \IfHookExistsTF \hook_if_exist:nTF \cs_new_eq:NN \IfHookEmptyTF \hook_if_empty:nTF -%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%5 +\cs_new_eq:NN \IfHookExistsTF \__hook_if_usable:nTF +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \cs_new_eq:NN \@expl@@@initialize@all@@ \__hook_initialize_all: \cs_new_eq:NN \@expl@@@hook@curr@name@pop@@ \__hook_curr_name_pop: \ExplSyntaxOff %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +%% File: ltcmdhooks.dtx (C) Copyright 2020-2021 +%% Frank Mittelbach, Phelype Oleinik, LaTeX Team +%%% From File: ltcmdhooks.dtx +\def\ltcmdhooksversion{v1.0b} +\def\ltcmdhooksdate{2021/05/26} +\ExplSyntaxOn +\tl_new:N \g_hook_patch_action_list_tl +\int_new:N \l__hook_patch_num_args_int +\tl_new:N \l__hook_patch_prefixes_tl +\tl_new:N \l__hook_patch_param_text_tl +\tl_new:N \l__hook_patch_replacement_tl +\prop_new:N \g__hook_delayed_patches_prop +\cs_new_protected:Npn \__hook_patch_debug:x #1 + { \__hook_debug:n { \iow_term:x { [lthooks]~#1 } } } +\cs_generate_variant:Nn \tl_rescan:nn { nV } +\cs_new_protected:Npn \__hook_try_put_cmd_hook:n #1 + { \__hook_try_put_cmd_hook:w #1 / / / \s__hook_mark {#1} } +\cs_new_protected:Npn \__hook_try_put_cmd_hook:w + #1 / #2 / #3 / #4 \s__hook_mark #5 + { + \__hook_debug:n { \iow_term:n { ->~Adding~cmd~hook~to~'#2'~(#3): } } + \str_case:nnTF {#3} + { { before } { } { after } { } } + { \exp_args:Nc \__hook_patch_cmd_or_delay:Nnn {#2} {#2} {#3} } + { \msg_error:nnnn { hooks } { wrong-cmd-hook } {#2} {#3} } + } +\cs_new_protected:Npn \__hook_patch_cmd_or_delay:Nnn #1 #2 #3 + { + \__hook_debug:n { \iow_term:n { ->~Add~generic~cmd~hook~for~#2~(#3). } } + \__hook_debug:n + { \iow_term:n { !~In~the~preamble:~delaying. } } + \prop_gput:Nnn \g__hook_delayed_patches_prop { #2 / #3 } + { \__hook_cmd_try_patch:nn {#2} {#3} } + } +\cs_new_protected:Npn \__hook_cmd_begindocument_code: + { + \cs_gset_eq:NN \__hook_patch_cmd_or_delay:Nnn \__hook_patch_command:Nnn + \prop_map_function:NN \g__hook_delayed_patches_prop { \use_ii:nn } + \prop_gclear:N \g__hook_delayed_patches_prop + \cs_undefine:N \__hook_cmd_begindocument_code: + } +\g@addto@macro \@kernel@after@begindocument + { \__hook_cmd_begindocument_code: } +\cs_new_protected:Npn \__hook_cmd_try_patch:nn #1 #2 + { + \__hook_debug:n + { \iow_term:x { ->~\string\begin{document}~try~cmd / #1 / #2. } } + \__hook_if_declared:nTF { cmd / #1 / #2 } + { + \__hook_debug:n + { \iow_term:n { .->~Giving~up:~hook~already~created. } } + } + { + \cs_if_exist:cT {#1} + { \exp_args:Nc \__hook_patch_command:Nnn {#1} {#1} {#2} } + } + } +\cs_new_protected:Npn \__hook_patch_command:Nnn #1 #2 #3 + { + \__hook_patch_debug:x { analyzing~'\token_to_str:N #1' } + \__hook_patch_debug:x { \token_to_str:N #1 = \token_to_meaning:N #1 } + \__hook_patch_check:NNnn \cs_if_exist:NTF #1 { undef } + { + \__hook_patch_debug:x { ++~control~sequence~is~defined } + \__hook_patch_check:NNnn \token_if_macro:NTF #1 { macro } + { + \__hook_patch_debug:x { ++~control~sequence~is~a~macro } + \__hook_patch_check:NNnn \__hook_if_public_command:NTF #1 { expl3 } + { + \__hook_patch_debug:x { ++~macro~is~not~private } + \robust@command@act + \g_hook_patch_action_list_tl #1 + \__hook_retokenize_patch:Nnn { #1 {#2} {#3} } + } + } + } + } +\cs_new_protected:Npn \__hook_patch_check:NNnn #1 #2 #3 #4 + { + #1 #2 {#4} + { + \msg_error:nnxx { hooks } { cant-patch } + { \token_to_str:N #2 } {#3} + } + } +\use:x + { + \prg_new_protected_conditional:Npnn + \exp_not:N \__hook_if_public_command:N ##1 { TF } + { + \exp_not:N \exp_last_unbraced:Nf + \exp_not:N \__hook_if_public_command:w + { \exp_not:N \cs_to_str:N ##1 } + \tl_to_str:n { _ _ } \s__hook_mark + } + } +\exp_last_unbraced:NNNNo +\cs_new_protected:Npn \__hook_if_public_command:w + #1 \tl_to_str:n { _ _ } #2 \s__hook_mark + { + \tl_if_empty:nTF {#2} + { \prg_return_true: } + { \prg_return_false: } + } +\tl_gset:Nn \g_hook_patch_action_list_tl + { + { \@if@DeclareRobustCommand \__hook_patch_DeclareRobustCommand:Nnn } + { \@if@newcommand \__hook_patch_newcommand:Nnn } + { \__kernel_cmd_if_xparse:NTF \__hook_cmd_patch_xparse:Nnn } + } +\cs_new_protected:Npn \__hook_patch_DeclareRobustCommand:Nnn #1 + { + \exp_args:Nc \@if@newcommand { \cs_to_str:N #1 ~ } + { \exp_args:Nc \__hook_patch_newcommand:Nnn } + { \exp_args:NNc \__hook_patch_expand_redefine:NNnn \c_false_bool } + { \cs_to_str:N #1 ~ } + } +\cs_new_protected:Npn \__hook_patch_newcommand:Nnn #1 + { + \exp_args:NNc \__hook_patch_expand_redefine:NNnn \c_true_bool + { \c_backslash_str \cs_to_str:N #1 } + } +\cs_new_protected:Npn \__hook_cmd_patch_xparse:Nnn #1 + { + \exp_args:NNc \__hook_patch_expand_redefine:NNnn \c_false_bool + { \cs_to_str:N #1 ~ code } + } +\cs_new_protected:Npn \__hook_patch_expand_redefine:NNnn #1 #2 #3 #4 + { + \__hook_patch_debug:x { ++~command~can~be~patched~without~rescanning } + \int_set:Nn \l__hook_patch_num_args_int + { + \exp_args:Nf \str_count:n { \cs_argument_spec:N #2 } / 2 + \bool_if:NT #1 { -1 } + } + \int_compare:nNnTF { \l__hook_patch_num_args_int } > { \c_zero_int } + { + \tl_set:Nx \l__hook_patch_param_text_tl + { \bool_if:NTF #1 { [####1] } { ####1 } } + \tl_set:Nx \l__hook_patch_replacement_tl + { \bool_if:NTF #1 { [####1] } { {####1} } } + \int_step_inline:nnn { 2 } { \l__hook_patch_num_args_int } + { + \tl_put_right:Nn \l__hook_patch_param_text_tl { ## ####1 } + \tl_put_right:Nn \l__hook_patch_replacement_tl { { ## ####1 } } + } + } + { + \tl_clear:N \l__hook_patch_param_text_tl + \tl_clear:N \l__hook_patch_replacement_tl + } + \group_begin: + \int_set:Nn \tex_escapechar:D { `\/ } + \use:x + { + \group_end: + \tl_set:Nx \exp_not:N \l__hook_patch_prefixes_tl + { \exp_not:N \__hook_make_prefixes:w \cs_prefix_spec:N #2 / / } + } + \use:x + { + \l__hook_patch_prefixes_tl \tex_def:D + \exp_not:N #2 \exp_not:V \l__hook_patch_param_text_tl + { + \str_if_eq:nnT {#4} { before } + { \exp_not:N \UseHook { cmd / #3 / #4 } } + \exp_args:No \exp_not:o + { \exp_after:wN #2 \l__hook_patch_replacement_tl } + \str_if_eq:nnT {#4} { after } + { \exp_not:N \UseHook { cmd / #3 / #4 } } + } + } + } +\cs_new:Npn \__hook_make_prefixes:w / #1 / + { + \tl_if_empty:nF {#1} + { + \exp_not:c { tex_ \tl_trim_spaces:n {#1} :D } + \__hook_make_prefixes:w / + } + } +\cs_new_protected:Npn \__hook_retokenize_patch:Nnn #1 #2 #3 + { + \__hook_patch_debug:x { ..~command~can~only~be~patched~by~rescanning } + \str_if_eq:eeTF { \cs_argument_spec:N #1 } { } + { \__hook_patch_expand_redefine:NNnn \c_false_bool #1 {#2} {#3} } + { + \tl_set:Nx \l__hook_tmpa_tl + { + \int_compare:nNnTF { \char_value_catcode:n {`\@ } } = { 12 } + { \exp_not:N \makeatletter } { \exp_not:N \makeatother } + } + \tl_set:Nx \l__hook_tmpb_tl + { + \bool_if:NTF \l__kernel_expl_bool + { \ExplSyntaxOff } { \ExplSyntaxOn } + } + \use:x + { + \exp_not:N \__hook_try_patch_with_catcodes:Nnnnw + \exp_not:n { #1 {#2} {#3} } + { \prg_do_nothing: } + { \exp_not:V \l__hook_tmpa_tl } % @ + { \exp_not:V \l__hook_tmpb_tl } % _: + { + \exp_not:V \l__hook_tmpa_tl % @ + \exp_not:V \l__hook_tmpb_tl % _: + } + } + \q_recursion_tail \q_recursion_stop + { + \msg_error:nnxx { hooks } { cant-patch } + { \c_backslash_str #2 } { retok } + } + } + } +\cs_new_protected:Npn \__hook_try_patch_with_catcodes:Nnnnw #1 #2 #3 #4 + { + \quark_if_recursion_tail_stop_do:nn {#4} { \use:n } + \__hook_patch_debug:x { ++~trying~to~patch~by~retokenization } + \__hook_cmd_if_scanable:NnTF {#1} {#4} + { + \__hook_patch_debug:x { ++~macro~can~be~retokenized~cleanly } + \__hook_patch_debug:x { ==~retokenizing~macro~now } + \__hook_patch_retokenize:Nnnn #1 {#2} {#3} {#4} + \use_i_delimit_by_q_recursion_stop:nw \use_none:n + } + { + \__hook_patch_debug:x { --~macro~cannot~be~retokenized~cleanly } + \__hook_try_patch_with_catcodes:Nnnnw #1 {#2} {#3} + } + } +\cs_new_eq:NN \kerneltmpDoNotUse ! +\cs_new_protected:Npn \__hook_patch_required_catcodes: + { + \char_set_catcode_escape:N \\ + \char_set_catcode_group_begin:N \{ + \char_set_catcode_group_end:N \} + \char_set_catcode_parameter:N \# + % \int_set:Nn \tex_endlinechar:D { -1 } + % \int_set:Nn \tex_newlinechar:D { -1 } + } +\prg_new_protected_conditional:Npnn \__hook_cmd_if_scanable:Nn #1 #2 { TF } + { + \cs_set_eq:NN \kerneltmpDoNotUse \scan_stop: + \cs_set_eq:NN \__hook_tmp:w \scan_stop: + \use:x + { + \cs_set:Npn \__hook_tmp:w + ####1 \tl_to_str:n { macro: } ####2 -> ####3 \s__hook_mark + { ####1 \def \kerneltmpDoNotUse ####2 {####3} } + \tl_set:Nx \exp_not:N \l__hook_tmpa_tl + { \exp_not:N \__hook_tmp:w \token_to_meaning:N #1 \s__hook_mark } + } + \tl_rescan:nV { #2 \__hook_patch_required_catcodes: } \l__hook_tmpa_tl + \token_if_eq_meaning:NNTF #1 \kerneltmpDoNotUse + { \prg_return_true: } + { \prg_return_false: } + } +\cs_new_protected:Npn \__hook_patch_retokenize:Nnnn #1 #2 #3 #4 + { + \cs_set_eq:NN \kerneltmpDoNotUse \scan_stop: + \cs_set_eq:NN \__hook_tmp:w \scan_stop: + \use:x + { + \cs_set:Npn \__hook_tmp:w + ####1 \tl_to_str:n { macro: } ####2 -> ####3 \s__hook_mark + { + ####1 \def \kerneltmpDoNotUse ####2 + { + \str_if_eq:nnT {#3} { before } + { \token_to_str:N \UseHook { cmd / #2 / #3 } } + ####3 + \str_if_eq:nnT {#3} { after } + { \token_to_str:N \UseHook { cmd / #2 / #3 } } + } + } + \tl_set:Nx \exp_not:N \l__hook_tmpa_tl + { \exp_not:N \__hook_tmp:w \token_to_meaning:N #1 \s__hook_mark } + } + \tl_rescan:nV { #4 \__hook_patch_required_catcodes: } \l__hook_tmpa_tl + \cs_set_eq:NN #1 \kerneltmpDoNotUse + } +\msg_new:nnnn { hooks } { wrong-cmd-hook } + { + Generic~hook~`cmd/#1/#2'~is~invalid. + } + { + You~tried~to~add~a~generic~hook~to~command~\iow_char:N \\#1,~but~`#2'~ + is~an~invalid~component.~Only~`before'~or~`after'~are~allowed. + } +\msg_new:nnnn { hooks } { cant-patch } + { + Generic~hooks~cannot~be~added~to~'#1'. + } + { + You~tried~to~add~a~hook~to~'#1',~but~LaTeX~was~unable~to~ + patch~the~command~because~it~\__hook_unpatchable_cases:n {#2}. + } +\cs_new:Npn \__hook_unpatchable_cases:n #1 + { + \str_case:nn {#1} + { + { undef } { doesn't~exist } + { macro } { is~not~a~macro } + { expl3 } { is~a~private~expl3~macro } + { retok } { can't~be~retokenized~cleanly } + } + } +\ExplSyntaxOff %%% From File: ltalloc.dtx \chardef\@xxxii=32 \mathchardef\@Mi=10001 @@ -3021,6 +5720,133 @@ Type H <return> for immediate help.}% \def\@setpar#1{\def\par{#1}\def\@par{#1}} \def\@par{\let\par\@@par\par} \def\@restorepar{\def\par{\@par}} +%% File: ltpara.dtx (C) Copyright 2020-2021 +%%% From File: ltpara.dtx +\def\ltparaversion{v1.0g} +\def\ltparadate{2021/05/27} + + +\ExplSyntaxOn +\hook_new_pair:nn{para/before}{para/after} +\hook_new_pair:nn{para/begin}{para/end} +\let \@kernel@before@para@before \@empty +\let \@kernel@before@para@begin \@empty +\let \@kernel@after@para@end \@empty +\let \@kernel@after@para@after \@empty +\tl_new:N \g__para_standard_everypar_tl +\tl_gset:Nn \g__para_standard_everypar_tl { + \box_gset_to_last:N \g_para_indent_box + \group_begin: + \tex_par:D + \group_end: + \tex_everypar:D { \msg_error:nnnn { hooks }{ para-mode }{before}{vertical} } + \@kernel@before@para@before + \hook_use:n {para/before} + \group_begin: + \tex_everypar:D {} + \skip_zero:N \tex_parskip:D + \tex_noindent:D + \group_end: + \tex_everypar:D{\g__para_standard_everypar_tl} + \@kernel@before@para@begin + \hook_use:n {para/begin} + \if_mode_horizontal: \else: + \msg_error:nnnn { hooks }{ para-mode }{begin}{vertical} \fi: + \__para_handle_indent: +} +\tex_everypar:D{\g__para_standard_everypar_tl} +\newtoks \everypar + +\tl_gput_right:Nx \g__para_standard_everypar_tl { + \exp_not:N \the + \exp_not:N \toks + \the \allocationnumber + \c_space_tl +} +\box_new:N \g_para_indent_box + +\cs_new:Npn \__para_handle_indent: { + \box_use_drop:N \g_para_indent_box +} +\cs_new:Npn \para_omit_indent: { + \box_gclear:N \g_para_indent_box +} +\cs_set_eq:NN \IndentBox \g_para_indent_box +\cs_set_eq:NN \OmitIndent \para_omit_indent: +\cs_new_protected:Npn \para_end: { + \mode_if_horizontal:TF { + \mode_if_inner:F { + \tex_unskip:D + \hook_use:n{para/end} + \@kernel@after@para@end + \mode_if_horizontal:TF { + \if_int_compare:w 0 < \tex_lastnodetype:D + \tex_kern:D \c_zero_dim + \fi: + \tex_par:D + \hook_use:n{para/after} + \@kernel@after@para@after + } + { \msg_error:nnnn { hooks }{ para-mode }{end}{horizontal} } + } + } + \tex_par:D +} +\cs_new:Npn \para_raw_indent: { + \mode_if_vertical:TF + { + \tex_everypar:D { + \box_gset_to_last:N \g_para_indent_box + \tex_everypar:D { \g__para_standard_everypar_tl } + \__para_handle_indent: + \the\everypar } + } + { \msg_error:nn { kernel }{ raw-para } } + \tex_indent:D +} +\cs_new:Npn \para_raw_noindent: { + \mode_if_vertical:TF + { + \tex_everypar:D { + \tex_everypar:D { \g__para_standard_everypar_tl } + \the\everypar } + } + { \msg_error:nn { kernel }{ raw-para } } + \tex_noindent:D +} +\cs_new_eq:NN \para_raw_end: \tex_par:D +\cs_set_eq:NN \RawIndent \para_raw_indent: +\cs_set_eq:NN \RawNoindent \para_raw_noindent: +\cs_set_eq:NN \RawParEnd \para_raw_end: +\cs_set_eq:NN \par \para_end: +\cs_set_eq:NN \@@par \para_end: +\cs_set_eq:NN \endgraf \para_end: +\everypar{\@nodocument} %% To get an error if text appears before the +\msg_new:nnnn { hooks } { para-mode } + { + Illegal~mode~ change~ in~ hook~ 'para/#1'.\\ + Hook~ code~ did~ not~ remain~ in~ #2~ mode. + } + { + Paragraph~ hooks~ cannot~ change~ the~ TeX~ mode~ without~ causing~ + endless~ recursion.~ The~ hook~ code~ in~ 'para/#1'~ needs~ to~ stay~ + in~ #2~ mode,~ but~ it~ didn't.~ Examine~ the~ hook~ + code~ with~ \iow_char:N \\ShowHook~ to~ find~ the~ issue. + } +\msg_new:nnnn { kernel } { raw-para } + { + Not~ in~ vertical~ mode. + } + { + Starting~ a~ paragraph~ with~ \iow_char:N \\RawIndent~ or~ + \iow_char:N \\RawNoindent \\ + (or~ \iow_char:N \\para_raw_indent:~ or~ + \iow_char:N \\para_raw_noindent:)~ is~ only~ allowed \\ + if~ LaTeX~ is~ in~ vertical~ mode. + } + +\ExplSyntaxOff +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% %%% From File: ltspace.dtx \message{spacing,} \DeclareRobustCommand\pagebreak{\@testopt{\@no@pgbk-}4} @@ -3268,8 +6094,6 @@ Type H <return> for immediate help.}% \LaTeX\kern.15em2$_{\textstyle\varepsilon}$}} %%% From File: ltfiles.dtx \message{files,} -\newread\@inputcheck -\newwrite\@unused \newwrite\@mainaux \newwrite\@partaux \newif\if@filesw \@fileswtrue @@ -3342,8 +6166,6 @@ Type H <return> for immediate help.}% \let\expandafter\noexpand\csname __hook env/document/begin\endcsname \noexpand\@empty} -\let \@kernel@before@begindocument \@empty -\let \@kernel@after@begindocument \@empty \@onlypreamble\document \let\normalsfcodes\@empty @@ -3471,16 +6293,18 @@ Type H <return> for immediate help.}% \openin\@inputcheck"#1" % \ifeof\@inputcheck \ifx\input@path\@undefined - \def\reserved@a{#3}% + \let\reserved@a\@secondoftwo \else - \def\reserved@a{\@iffileonpath{#1}{#2}{#3}}% + \def\reserved@a{\@iffileonpath{#1}}% \fi \else \closein\@inputcheck \edef\@filef@und{"#1" }% - \def\reserved@a{#2}% + \let\reserved@a\@firstoftwo \fi - \reserved@a} + \expandafter\def\expandafter\reserved@a + \expandafter{\reserved@a{#2}{#3}}% +\reserved@a} \long\def\@iffileonpath#1{% \let\reserved@a\@secondoftwo \expandafter\@tfor\expandafter\reserved@b\expandafter @@ -4203,7 +7027,9 @@ Type H <return> for immediate help.}% \DeclareRobustCommand\usefont[4]{\fontencoding{#1}% \edef\f@family{#2}% \set@target@series{#3}% - \edef\f@shape{#4}\selectfont + \edef\f@shape{#4}% + \let\delayed@f@adjustment\@empty + \selectfont \ignorespaces} \DeclareRobustCommand\linespread[1] {\set@fontsize{#1}\f@size\f@baselineskip} @@ -4869,12 +7695,14 @@ Type H <return> for immediate help.}% \DeclareFontSeriesChangeRule {ulx}{?m}{ul}{} \DeclareFontSeriesChangeRule {ul}{?m}{ul}{} \DeclareFontSeriesChangeRule {x}{?m}{m}{} - - +\DeclareRobustCommand\fontseries[1]{\@forced@seriesfalse + \expandafter\def\expandafter\delayed@f@adjustment\expandafter + {\delayed@f@adjustment\delayed@merge@font@series{#1}}} +\let\delayed@f@adjustment\@empty +\DeclareRobustCommand\fontseriesforce[1]{\@forced@seriestrue + \expandafter\def\expandafter\delayed@f@adjustment\expandafter + {\delayed@f@adjustment\edef\f@series{#1}}} \newif\if@forced@series -\DeclareRobustCommand\fontseriesforce[1]{\@forced@seriestrue\edef\f@series{#1}} -\DeclareRobustCommand\fontseries[1]{\@forced@seriesfalse\merge@font@series{#1}} - \def\merge@font@series#1{% \expandafter\expandafter\expandafter \merge@font@series@ @@ -4882,13 +7710,11 @@ Type H <return> for immediate help.}% {#1}% \@nil } - \def\merge@font@series@#1#2#3\@nil{% \def\reserved@a{#3}% \ifx\reserved@a\@empty \set@target@series{#2}% \else - \maybe@load@fontshape \edef\reserved@a{\f@encoding /\f@family /#1/\f@shape}% \ifcsname \reserved@a \endcsname \set@target@series{#1}% @@ -4910,7 +7736,27 @@ Type H <return> for immediate help.}% using `\reserved@b' instead}% \fi } -\def\maybe@load@fontshape{\begingroup\try@load@fontshape\endgroup} +\def\merge@font@series@without@substitution#1{% + \expandafter\expandafter\expandafter + \merge@font@series@without@substitution@ + \csname series@\f@series @#1\endcsname + {#1}% + \@nil +} +\def\merge@font@series@without@substitution@#1#2#3\@nil{% + \def\reserved@a{#3}% + \ifx\reserved@a\@empty + \set@target@series{#2}% + \else + \set@target@series{#1}% + \fi +} +\let\delayed@merge@font@series\merge@font@series@without@substitution +\def\maybe@load@fontshape{% + \begingroup + \let \typeout \@font@info + \try@load@fontshape + \endgroup} \def\set@target@series#1{% \edef\f@series{#1}% \series@maybe@drop@one@m\f@series\f@series @@ -4989,8 +7835,13 @@ Type H <return> for immediate help.}% \DeclareFontShapeChangeRule {sw}{sc} {scsw} {} \DeclareFontShapeChangeRule {sw}{ulc} {sw} {} \DeclareFontShapeChangeRule {sw}{up} {n} {} -\DeclareRobustCommand\fontshape[1]{\merge@font@shape{#1}} -\DeclareRobustCommand\fontshapeforce[1]{\edef\f@shape{#1}} +\DeclareRobustCommand\fontshape[1] + {\expandafter\def\expandafter\delayed@f@adjustment\expandafter + {\delayed@f@adjustment\delayed@merge@font@shape{#1}}} +\DeclareRobustCommand\fontshapeforce[1] + {\expandafter\def\expandafter\delayed@f@adjustment\expandafter + {\delayed@f@adjustment\edef\f@shape{#1}}} + \def\merge@font@shape#1{% \expandafter\expandafter\expandafter \merge@font@shape@ @@ -5004,9 +7855,8 @@ Type H <return> for immediate help.}% \ifx\reserved@a\@empty \edef\f@shape{#2}% \else - \maybe@load@fontshape \edef\reserved@a{\f@encoding /\f@family /\f@series/#1}% - \ifcsname \reserved@a\endcsname + \ifcsname \reserved@a\endcsname \edef\f@shape{#1}% \else \ifcsname \f@encoding /\f@family /\f@series/#2\endcsname @@ -5019,6 +7869,22 @@ Type H <return> for immediate help.}% \fi \fi } +\def\merge@font@shape@without@substitution#1{% + \expandafter\expandafter\expandafter + \merge@font@shape@without@substitution@ + \csname shape@\f@shape @#1\endcsname + {#1}% + \@nil +} +\def\merge@font@shape@without@substitution@#1#2#3\@nil{% + \def\reserved@a{#3}% + \ifx\reserved@a\@empty + \edef\f@shape{#2}% + \else + \edef\f@shape{#1}% + \fi +} +\let\delayed@merge@font@shape\merge@font@shape@without@substitution \protected\def\normalshape {\not@math@alphabet\normalshape\relax \fontshape\shapedefault\selectfont}% @@ -5045,11 +7911,12 @@ Type H <return> for immediate help.}% {\not@math@alphabet\sscshape\relax \fontshape\sscdefault\selectfont}% } +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \g@addto@macro\@kernel@after@begindocument@before {\reinstall@nfss@defs\init@series@setup} %%% From File: ltfsstrc.dtx %% Copyright (C) 1989-97 by Frank Mittelbach and Rainer Sch\"opf. -%% Copyright (C) 1994-97 by LaTeX3 project. All rights reserved. +%% Copyright (C) 1994-97 by LaTeX Project. All rights reserved. \def\tracingfonts{% \@font@warning{Command \noexpand\tracingfonts not provided.\MessageBreak @@ -5083,17 +7950,39 @@ Type H <return> for immediate help.}% \get@external@font \fi\fi } + \DeclareRobustCommand\selectfont {% \ifx\f@linespread\baselinestretch \else \set@fontsize\baselinestretch\f@size\f@baselineskip \fi + \ifx\delayed@f@adjustment\@empty + \else + \let\f@shape@saved\f@shape + \let\f@series@saved\f@series + \delayed@f@adjustment + \maybe@load@fontshape + \ifcsname \f@encoding/\f@family/\f@series/\f@shape \endcsname + \else + \let\f@shape\f@shape@saved + \let\f@series\f@series@saved + \let\delayed@merge@font@shape\merge@font@shape + \let\delayed@merge@font@series\merge@font@series + \delayed@f@adjustment + \let\delayed@merge@font@shape\merge@font@shape@without@substitution + \let\delayed@merge@font@series\merge@font@series@without@substitution + \fi + \let\delayed@f@adjustment\@empty + \fi + \@forced@seriesfalse \xdef\font@name{% \csname\curr@fontshape/\f@size\endcsname}% \pickup@font \font@name + \UseHook{selectfont}% \size@update \enc@update } +\NewHook{selectfont} \def\set@fontsize#1#2#3{% \@defaultunits\@tempdimb#2pt\relax\@nnil \edef\f@size{\strip@pt\@tempdimb}% @@ -5471,7 +8360,7 @@ Type H <return> for immediate help.}% in version \math@version}% \@eha \fi - \else \expandafter\non@alpherr\fi + \else \expandafter\expandafter\expandafter\non@alpherr\fi \expandafter#1\ifx\math@bgroup\bgroup{#4}\else#4\fi }% } @@ -6439,16 +9328,12 @@ Type H <return> for immediate help.}% \@font@series@contexttrue \fi\fi\fi } - \newif\if@font@series@context - \def\DeclareEmphSequence#1{% \protected@edef\emfontdeclare@clist{\zap@space#1, \@empty\emforce\emreset}% } \let\emfontdeclare@clist\@empty - \DeclareRobustCommand\emreset{\upshape\ulcshape} - \DeclareRobustCommand\em{% \@nomath\em \ifx\emfontdeclare@clist\@empty @@ -6519,6 +9404,7 @@ Type H <return> for immediate help.}% \edef\f@family{\familydefault}% \edef\f@series{\seriesdefault}% \edef\f@shape{\shapedefault}% + \let\delayed@f@adjustment\@empty \UseHook{normalfont}% \@defaultfamilyhook % hookname from 2020/02 will vanish \selectfont} @@ -6542,8 +9428,8 @@ Type H <return> for immediate help.}% %% overwrite it in fontdef.cfg %% if necessary \fontfamily{cmr} -\fontseries{m} -\fontshape{n} +\def\f@series{m} % \fontseries{m} +\def\f@shape{n} % \fontshape{n} \fontsize{10}{10} \def\@fontenc@load@list{\@elt{T1,OT1}} \InputIfFileExists{fonttext.cfg} @@ -6713,6 +9599,7 @@ Type H <return> for immediate help.}% there is probably something wrong with the class file}\@eha } +%%% From File: lttextcomp.dtx \DeclareRobustCommand\legacyoldstylenums[1]{% \begingroup \spaceskip\fontdimen\tw@\font @@ -6749,7 +9636,6 @@ Type H <return> for immediate help.}% \egroup } \def\textcompsubstdefault{\rmsubstdefault} - \def\DeclareEncodingSubset#1#2{% \DeclareEncodingSubset@aux{#1}#2*\DeclareEncodingSubset@aux } @@ -6811,7 +9697,6 @@ Type H <return> for immediate help.}% \selectfont#1% \egroup } - \def\tc@fake@euro#1{% \leavevmode \@font@info{Faking \noexpand#1for font family @@ -6824,17 +9709,17 @@ Type H <return> for immediate help.}% \hbox{C}\crcr }% } - \def\tc@check@symbol{\CheckEncodingSubset\UseTextSymbol{TS1}\tc@subst} -\def\tc@check@accent#1{\CheckEncodingSubset\UseTextAccent{TS1}{\tc@swap@accent#1}} +\def\tc@check@accent#1{\CheckEncodingSubset\UseTextAccent + {TS1}{\tc@swap@accent#1}} \def\tc@swap@accent#1#2{\UseTextAccent{T1}#1} \DeclareTextSymbolDefault{\textdollar}{TS1} -\UndeclareTextCommand{\textdollar} {OT1} % don't use the OT1 def any longer +\UndeclareTextCommand{\textdollar}{OT1} % don't use the OT1 def any longer \DeclareTextSymbolDefault{\textsterling}{TS1} -\UndeclareTextCommand{\textsterling}{OT1} % don't use the OT1 def any longer +\UndeclareTextCommand{\textsterling}{OT1}% don't use the OT1 def any longer \DeclareTextSymbolDefault{\textperthousand}{TS1} -\UndeclareTextCommand{\textperthousand}{T1} % don't use the T1 def +\UndeclareTextCommand{\textperthousand}{T1} % don't use the T1 def \DeclareTextSymbolDefault{\textasteriskcentered}{TS1} \DeclareTextSymbolDefault{\textbullet}{TS1} \DeclareTextSymbolDefault{\textdaggerdbl}{TS1} @@ -6875,22 +9760,38 @@ Type H <return> for immediate help.}% \DeclareTextCommandDefault{\t} {\CheckEncodingSubset\UseTextAccent{TS1}{\UseTextAccent{OML}}2\t} \ifx\Umathcode\@undefined - \DeclareTextCommandDefault{\capitalacute} {\tc@check@accent{\'}2\capitalacute} - \DeclareTextCommandDefault{\capitalbreve} {\tc@check@accent{\u}2\capitalbreve} - \DeclareTextCommandDefault{\capitalcaron} {\tc@check@accent{\v}2\capitalcaron} - \DeclareTextCommandDefault{\capitalcedilla} {\tc@check@accent{\c}2\capitalcedilla} - \DeclareTextCommandDefault{\capitalcircumflex} {\tc@check@accent{\^}2\capitalcircumflex} - \DeclareTextCommandDefault{\capitaldieresis} {\tc@check@accent{\"}2\capitaldieresis} - \DeclareTextCommandDefault{\capitaldotaccent} {\tc@check@accent{\.}2\capitaldotaccent} - \DeclareTextCommandDefault{\capitalgrave} {\tc@check@accent{\`}2\capitalgrave} - \DeclareTextCommandDefault{\capitalhungarumlaut}{\tc@check@accent{\H}2\capitalhungarumlaut} - \DeclareTextCommandDefault{\capitalmacron} {\tc@check@accent{\=}2\capitalmacron} - \DeclareTextCommandDefault{\capitalogonek} {\tc@check@accent{\k}2\capitalogonek} - \DeclareTextCommandDefault{\capitalring} {\tc@check@accent{\r}2\capitalring} - \DeclareTextCommandDefault{\capitaltie} {\tc@check@accent{\t}2\capitaltie} - \DeclareTextCommandDefault{\capitaltilde} {\tc@check@accent{\~}2\capitaltilde} - \DeclareTextCommandDefault{\newtie} {\tc@check@accent{\t}2\newtie} - \DeclareTextCommandDefault{\capitalnewtie} {\tc@check@accent{\t}2\capitalnewtie} + \DeclareTextCommandDefault{\capitalacute} + {\tc@check@accent{\'}2\capitalacute} + \DeclareTextCommandDefault{\capitalbreve} + {\tc@check@accent{\u}2\capitalbreve} + \DeclareTextCommandDefault{\capitalcaron} + {\tc@check@accent{\v}2\capitalcaron} + \DeclareTextCommandDefault{\capitalcedilla} + {\tc@check@accent{\c}2\capitalcedilla} + \DeclareTextCommandDefault{\capitalcircumflex} + {\tc@check@accent{\^}2\capitalcircumflex} + \DeclareTextCommandDefault{\capitaldieresis} + {\tc@check@accent{\"}2\capitaldieresis} + \DeclareTextCommandDefault{\capitaldotaccent} + {\tc@check@accent{\.}2\capitaldotaccent} + \DeclareTextCommandDefault{\capitalgrave} + {\tc@check@accent{\`}2\capitalgrave} + \DeclareTextCommandDefault{\capitalhungarumlaut} + {\tc@check@accent{\H}2\capitalhungarumlaut} + \DeclareTextCommandDefault{\capitalmacron} + {\tc@check@accent{\=}2\capitalmacron} + \DeclareTextCommandDefault{\capitalogonek} + {\tc@check@accent{\k}2\capitalogonek} + \DeclareTextCommandDefault{\capitalring} + {\tc@check@accent{\r}2\capitalring} + \DeclareTextCommandDefault{\capitaltie} + {\tc@check@accent{\t}2\capitaltie} + \DeclareTextCommandDefault{\capitaltilde} + {\tc@check@accent{\~}2\capitaltilde} + \DeclareTextCommandDefault{\newtie} + {\tc@check@accent{\t}2\newtie} + \DeclareTextCommandDefault{\capitalnewtie} + {\tc@check@accent{\t}2\capitalnewtie} \else \DeclareTextCommandDefault\capitalacute{\@tabacckludge'} \DeclareTextCommandDefault\capitalbreve{\u} @@ -6909,86 +9810,163 @@ Type H <return> for immediate help.}% \DeclareTextCommandDefault\capitaltilde{\~} \DeclareTextCommandDefault\newtie{\t} \fi -\DeclareTextCommandDefault{\textlbrackdbl} {\tc@check@symbol2\textlbrackdbl} -\DeclareTextCommandDefault{\textrbrackdbl} {\tc@check@symbol2\textrbrackdbl} -\DeclareTextCommandDefault{\texteightoldstyle} {\tc@check@symbol2\texteightoldstyle} -\DeclareTextCommandDefault{\textfiveoldstyle} {\tc@check@symbol2\textfiveoldstyle} -\DeclareTextCommandDefault{\textfouroldstyle} {\tc@check@symbol2\textfouroldstyle} -\DeclareTextCommandDefault{\textnineoldstyle} {\tc@check@symbol2\textnineoldstyle} -\DeclareTextCommandDefault{\textoneoldstyle} {\tc@check@symbol2\textoneoldstyle} -\DeclareTextCommandDefault{\textsevenoldstyle} {\tc@check@symbol2\textsevenoldstyle} -\DeclareTextCommandDefault{\textsixoldstyle} {\tc@check@symbol2\textsixoldstyle} -\DeclareTextCommandDefault{\textthreeoldstyle} {\tc@check@symbol2\textthreeoldstyle} -\DeclareTextCommandDefault{\texttwooldstyle} {\tc@check@symbol2\texttwooldstyle} -\DeclareTextCommandDefault{\textzerooldstyle} {\tc@check@symbol2\textzerooldstyle} -\DeclareTextCommandDefault{\textacutedbl} {\tc@check@symbol2\textacutedbl} -\DeclareTextCommandDefault{\textasciiacute} {\tc@check@symbol2\textasciiacute} -\DeclareTextCommandDefault{\textasciibreve} {\tc@check@symbol2\textasciibreve} -\DeclareTextCommandDefault{\textasciicaron} {\tc@check@symbol2\textasciicaron} -\DeclareTextCommandDefault{\textasciidieresis} {\tc@check@symbol2\textasciidieresis} -\DeclareTextCommandDefault{\textasciigrave} {\tc@check@symbol2\textasciigrave} -\DeclareTextCommandDefault{\textasciimacron} {\tc@check@symbol2\textasciimacron} -\DeclareTextCommandDefault{\textgravedbl} {\tc@check@symbol2\textgravedbl} -\DeclareTextCommandDefault{\texttildelow} {\tc@check@symbol2\texttildelow} -\DeclareTextCommandDefault{\textbaht} {\tc@check@symbol2\textbaht} -\DeclareTextCommandDefault{\textbigcircle} {\tc@check@symbol2\textbigcircle} -\DeclareTextCommandDefault{\textborn} {\tc@check@symbol2\textborn} -\DeclareTextCommandDefault{\textcentoldstyle} {\tc@check@symbol2\textcentoldstyle} -\DeclareTextCommandDefault{\textcircledP} {\tc@check@symbol2\textcircledP} -\DeclareTextCommandDefault{\textcopyleft} {\tc@check@symbol2\textcopyleft} -\DeclareTextCommandDefault{\textdblhyphenchar} {\tc@check@symbol2\textdblhyphenchar} -\DeclareTextCommandDefault{\textdblhyphen} {\tc@check@symbol2\textdblhyphen} -\DeclareTextCommandDefault{\textdied} {\tc@check@symbol2\textdied} -\DeclareTextCommandDefault{\textdiscount} {\tc@check@symbol2\textdiscount} -\DeclareTextCommandDefault{\textdivorced} {\tc@check@symbol2\textdivorced} -\DeclareTextCommandDefault{\textdollaroldstyle} {\tc@check@symbol2\textdollaroldstyle} -\DeclareTextCommandDefault{\textguarani} {\tc@check@symbol2\textguarani} -\DeclareTextCommandDefault{\textleaf} {\tc@check@symbol2\textleaf} -\DeclareTextCommandDefault{\textlquill} {\tc@check@symbol2\textlquill} -\DeclareTextCommandDefault{\textmarried} {\tc@check@symbol2\textmarried} -\DeclareTextCommandDefault{\textmho} {\tc@check@symbol2\textmho} -\DeclareTextCommandDefault{\textmusicalnote} {\tc@check@symbol2\textmusicalnote} -\DeclareTextCommandDefault{\textnaira} {\tc@check@symbol2\textnaira} -\DeclareTextCommandDefault{\textopenbullet} {\tc@check@symbol2\textopenbullet} -\DeclareTextCommandDefault{\textpeso} {\tc@check@symbol2\textpeso} -\DeclareTextCommandDefault{\textpilcrow} {\tc@check@symbol2\textpilcrow} -\DeclareTextCommandDefault{\textrecipe} {\tc@check@symbol2\textrecipe} -\DeclareTextCommandDefault{\textreferencemark} {\tc@check@symbol2\textreferencemark} -\DeclareTextCommandDefault{\textrquill} {\tc@check@symbol2\textrquill} -\DeclareTextCommandDefault{\textservicemark} {\tc@check@symbol2\textservicemark} -\DeclareTextCommandDefault{\textsurd} {\tc@check@symbol2\textsurd} -\DeclareTextCommandDefault{\textpertenthousand} {\tc@check@symbol2\textpertenthousand} +\DeclareTextCommandDefault{\textlbrackdbl} + {\tc@check@symbol2\textlbrackdbl} +\DeclareTextCommandDefault{\textrbrackdbl} + {\tc@check@symbol2\textrbrackdbl} +\DeclareTextCommandDefault{\texteightoldstyle} + {\tc@check@symbol2\texteightoldstyle} +\DeclareTextCommandDefault{\textfiveoldstyle} + {\tc@check@symbol2\textfiveoldstyle} +\DeclareTextCommandDefault{\textfouroldstyle} + {\tc@check@symbol2\textfouroldstyle} +\DeclareTextCommandDefault{\textnineoldstyle} + {\tc@check@symbol2\textnineoldstyle} +\DeclareTextCommandDefault{\textoneoldstyle} + {\tc@check@symbol2\textoneoldstyle} +\DeclareTextCommandDefault{\textsevenoldstyle} + {\tc@check@symbol2\textsevenoldstyle} +\DeclareTextCommandDefault{\textsixoldstyle} + {\tc@check@symbol2\textsixoldstyle} +\DeclareTextCommandDefault{\textthreeoldstyle} + {\tc@check@symbol2\textthreeoldstyle} +\DeclareTextCommandDefault{\texttwooldstyle} + {\tc@check@symbol2\texttwooldstyle} +\DeclareTextCommandDefault{\textzerooldstyle} + {\tc@check@symbol2\textzerooldstyle} +\DeclareTextCommandDefault{\textacutedbl} + {\tc@check@symbol2\textacutedbl} +\DeclareTextCommandDefault{\textasciiacute} + {\tc@check@symbol2\textasciiacute} +\DeclareTextCommandDefault{\textasciibreve} + {\tc@check@symbol2\textasciibreve} +\DeclareTextCommandDefault{\textasciicaron} + {\tc@check@symbol2\textasciicaron} +\DeclareTextCommandDefault{\textasciidieresis} + {\tc@check@symbol2\textasciidieresis} +\DeclareTextCommandDefault{\textasciigrave} + {\tc@check@symbol2\textasciigrave} +\DeclareTextCommandDefault{\textasciimacron} + {\tc@check@symbol2\textasciimacron} +\DeclareTextCommandDefault{\textgravedbl} + {\tc@check@symbol2\textgravedbl} +\DeclareTextCommandDefault{\texttildelow} + {\tc@check@symbol2\texttildelow} +\DeclareTextCommandDefault{\textbaht} + {\tc@check@symbol2\textbaht} +\DeclareTextCommandDefault{\textbigcircle} + {\tc@check@symbol2\textbigcircle} +\DeclareTextCommandDefault{\textborn} + {\tc@check@symbol2\textborn} +\DeclareTextCommandDefault{\textcentoldstyle} + {\tc@check@symbol2\textcentoldstyle} +\DeclareTextCommandDefault{\textcircledP} + {\tc@check@symbol2\textcircledP} +\DeclareTextCommandDefault{\textcopyleft} + {\tc@check@symbol2\textcopyleft} +\DeclareTextCommandDefault{\textdblhyphenchar} + {\tc@check@symbol2\textdblhyphenchar} +\DeclareTextCommandDefault{\textdblhyphen} + {\tc@check@symbol2\textdblhyphen} +\DeclareTextCommandDefault{\textdied} + {\tc@check@symbol2\textdied} +\DeclareTextCommandDefault{\textdiscount} + {\tc@check@symbol2\textdiscount} +\DeclareTextCommandDefault{\textdivorced} + {\tc@check@symbol2\textdivorced} +\DeclareTextCommandDefault{\textdollaroldstyle} + {\tc@check@symbol2\textdollaroldstyle} +\DeclareTextCommandDefault{\textguarani} + {\tc@check@symbol2\textguarani} +\DeclareTextCommandDefault{\textleaf} + {\tc@check@symbol2\textleaf} +\DeclareTextCommandDefault{\textlquill} + {\tc@check@symbol2\textlquill} +\DeclareTextCommandDefault{\textmarried} + {\tc@check@symbol2\textmarried} +\DeclareTextCommandDefault{\textmho} + {\tc@check@symbol2\textmho} +\DeclareTextCommandDefault{\textmusicalnote} + {\tc@check@symbol2\textmusicalnote} +\DeclareTextCommandDefault{\textnaira} + {\tc@check@symbol2\textnaira} +\DeclareTextCommandDefault{\textopenbullet} + {\tc@check@symbol2\textopenbullet} +\DeclareTextCommandDefault{\textpeso} + {\tc@check@symbol2\textpeso} +\DeclareTextCommandDefault{\textpilcrow} + {\tc@check@symbol2\textpilcrow} +\DeclareTextCommandDefault{\textrecipe} + {\tc@check@symbol2\textrecipe} +\DeclareTextCommandDefault{\textreferencemark} + {\tc@check@symbol2\textreferencemark} +\DeclareTextCommandDefault{\textrquill} + {\tc@check@symbol2\textrquill} +\DeclareTextCommandDefault{\textservicemark} + {\tc@check@symbol2\textservicemark} +\DeclareTextCommandDefault{\textsurd} + {\tc@check@symbol2\textsurd} +\DeclareTextCommandDefault{\textpertenthousand} + {\tc@check@symbol2\textpertenthousand} \UndeclareTextCommand{\textpertenthousand}{T1} -\DeclareTextCommandDefault{\textlangle} {\tc@check@symbol3\textlangle} -\DeclareTextCommandDefault{\textrangle} {\tc@check@symbol3\textrangle} -\DeclareTextCommandDefault{\textcolonmonetary} {\tc@check@symbol4\textcolonmonetary} -\DeclareTextCommandDefault{\textdong} {\tc@check@symbol4\textdong} -\DeclareTextCommandDefault{\textdownarrow} {\tc@check@symbol4\textdownarrow} -\DeclareTextCommandDefault{\textleftarrow} {\tc@check@symbol4\textleftarrow} -\DeclareTextCommandDefault{\textlira} {\tc@check@symbol4\textlira} -\DeclareTextCommandDefault{\textrightarrow} {\tc@check@symbol4\textrightarrow} -\DeclareTextCommandDefault{\textuparrow} {\tc@check@symbol4\textuparrow} -\DeclareTextCommandDefault{\textwon} {\tc@check@symbol4\textwon} -\DeclareTextCommandDefault{\textestimated} {\tc@check@symbol5\textestimated} -\DeclareTextCommandDefault{\textnumero} {\tc@check@symbol5\textnumero} -\DeclareTextCommandDefault{\textflorin} {\tc@check@symbol6\textflorin} -\DeclareTextCommandDefault{\textcurrency} {\tc@check@symbol6\textcurrency} -\DeclareTextCommandDefault{\textfractionsolidus}{\tc@check@symbol7\textfractionsolidus} -\DeclareTextCommandDefault{\textohm} {\tc@check@symbol7\textohm} -\DeclareTextCommandDefault{\textmu} {\tc@check@symbol7\textmu} -\DeclareTextCommandDefault{\textminus} {\tc@check@symbol7\textminus} -\DeclareTextCommandDefault{\textblank} {\tc@check@symbol{8}\textblank} -\DeclareTextCommandDefault{\textinterrobangdown}{\tc@check@symbol{8}\textinterrobangdown} -\DeclareTextCommandDefault{\textinterrobang} {\tc@check@symbol{8}\textinterrobang} +\DeclareTextCommandDefault{\textlangle} + {\tc@check@symbol3\textlangle} +\DeclareTextCommandDefault{\textrangle} + {\tc@check@symbol3\textrangle} +\DeclareTextCommandDefault{\textcolonmonetary} + {\tc@check@symbol4\textcolonmonetary} +\DeclareTextCommandDefault{\textdong} + {\tc@check@symbol4\textdong} +\DeclareTextCommandDefault{\textdownarrow} + {\tc@check@symbol4\textdownarrow} +\DeclareTextCommandDefault{\textleftarrow} + {\tc@check@symbol4\textleftarrow} +\DeclareTextCommandDefault{\textlira} + {\tc@check@symbol4\textlira} +\DeclareTextCommandDefault{\textrightarrow} + {\tc@check@symbol4\textrightarrow} +\DeclareTextCommandDefault{\textuparrow} + {\tc@check@symbol4\textuparrow} +\DeclareTextCommandDefault{\textwon} + {\tc@check@symbol4\textwon} +\DeclareTextCommandDefault{\textestimated} + {\tc@check@symbol5\textestimated} +\DeclareTextCommandDefault{\textnumero} + {\tc@check@symbol5\textnumero} +\DeclareTextCommandDefault{\textflorin} + {\tc@check@symbol6\textflorin} +\DeclareTextCommandDefault{\textcurrency} + {\tc@check@symbol6\textcurrency} +\DeclareTextCommandDefault{\textfractionsolidus} + {\tc@check@symbol7\textfractionsolidus} +\DeclareTextCommandDefault{\textohm} + {\tc@check@symbol7\textohm} +\DeclareTextCommandDefault{\textmu} + {\tc@check@symbol7\textmu} +\DeclareTextCommandDefault{\textminus} + {\tc@check@symbol7\textminus} +\DeclareTextCommandDefault{\textblank} + {\tc@check@symbol{8}\textblank} +\DeclareTextCommandDefault{\textinterrobangdown} + {\tc@check@symbol{8}\textinterrobangdown} +\DeclareTextCommandDefault{\textinterrobang} + {\tc@check@symbol{8}\textinterrobang} \DeclareTextCommandDefault{\texteuro} - {\CheckEncodingSubset\UseTextSymbol{TS1}\tc@fake@euro{8}\texteuro} -\DeclareTextCommandDefault{\textcelsius}{\tc@check@symbol{9}\textcelsius} -\DeclareTextCommandDefault{\textonesuperior}{\tc@check@symbol{9}\textonesuperior} -\DeclareTextCommandDefault{\textthreequartersemdash}{\tc@check@symbol{9}\textthreequartersemdash} -\DeclareTextCommandDefault{\textthreesuperior}{\tc@check@symbol{9}\textthreesuperior} -\DeclareTextCommandDefault{\texttwelveudash}{\tc@check@symbol{9}\texttwelveudash} -\DeclareTextCommandDefault{\texttwosuperior}{\tc@check@symbol{9}\texttwosuperior} -\DeclareTextCommandDefault{\textbardbl}{\tc@check@symbol{9}\textbardbl} + {\CheckEncodingSubset\UseTextSymbol{TS1}\tc@fake@euro{8}\texteuro} +\DeclareTextCommandDefault{\textcelsius} + {\tc@check@symbol{9}\textcelsius} +\DeclareTextCommandDefault{\textonesuperior} + {\tc@check@symbol{9}\textonesuperior} +\DeclareTextCommandDefault{\textthreequartersemdash} + {\tc@check@symbol{9}\textthreequartersemdash} +\DeclareTextCommandDefault{\textthreesuperior} + {\tc@check@symbol{9}\textthreesuperior} +\DeclareTextCommandDefault{\texttwelveudash} + {\tc@check@symbol{9}\texttwelveudash} +\DeclareTextCommandDefault{\texttwosuperior} + {\tc@check@symbol{9}\texttwosuperior} +\DeclareTextCommandDefault{\textbardbl} + {\tc@check@symbol{9}\textbardbl} \ifx \Umathcode\@undefined \else \DeclareTextCommand{\textzerooldstyle} \UnicodeEncodingName{\oldstylenums{0}} @@ -7001,12 +9979,12 @@ Type H <return> for immediate help.}% \DeclareTextCommand{\textsevenoldstyle}\UnicodeEncodingName{\oldstylenums{7}} \DeclareTextCommand{\texteightoldstyle}\UnicodeEncodingName{\oldstylenums{8}} \DeclareTextCommand{\textnineoldstyle} \UnicodeEncodingName{\oldstylenums{9}} -\DeclareTextSymbol{\textpilcrow} \UnicodeEncodingName{"00B6} -\DeclareTextSymbol{\textborn} \UnicodeEncodingName{"002A} -\DeclareTextSymbol{\textdied} \UnicodeEncodingName{"2020} -\DeclareTextSymbol{\textlbrackdbl} \UnicodeEncodingName{"27E6} -\DeclareTextSymbol{\textrbrackdbl} \UnicodeEncodingName{"27E7} -\DeclareTextSymbol{\textguarani} \UnicodeEncodingName{"20B2} +\DeclareTextSymbol{\textpilcrow} \UnicodeEncodingName{"00B6} +\DeclareTextSymbol{\textborn} \UnicodeEncodingName{"002A} +\DeclareTextSymbol{\textdied} \UnicodeEncodingName{"2020} +\DeclareTextSymbol{\textlbrackdbl} \UnicodeEncodingName{"27E6} +\DeclareTextSymbol{\textrbrackdbl} \UnicodeEncodingName{"27E7} +\DeclareTextSymbol{\textguarani} \UnicodeEncodingName{"20B2} \DeclareTextSymbol{\textdollaroldstyle}{TS1}{138} \DeclareTextSymbol{\textcentoldstyle} {TS1}{139} \fi % --- END of Unicode engines specials @@ -7038,31 +10016,32 @@ Type H <return> for immediate help.}% \DeclareEncodingSubset{TS1}{lmss} {1} \DeclareEncodingSubset{TS1}{lmssq} {1} \DeclareEncodingSubset{TS1}{lmvtt} {1} -\DeclareEncodingSubset{TS1}{lmtt} {1} % missing TM, SM, pertenthousand for some reason +\DeclareEncodingSubset{TS1}{lmtt} {1} % missing TM, SM and + % pertenthousand for some reason \DeclareEncodingSubset{TS1}{ptmx} {2} \DeclareEncodingSubset{TS1}{ptmj} {2} \DeclareEncodingSubset{TS1}{ul8} {2} -\DeclareEncodingSubset{TS1}{bch} {5} % tofu for blank, ohm -\DeclareEncodingSubset{TS1}{futj} {5} % tofu for blank, interrobang/down, ohm -\DeclareEncodingSubset{TS1}{futs} {5} % tofu for blank, ohm -\DeclareEncodingSubset{TS1}{futx} {5} % probably (currently broken distrib) -\DeclareEncodingSubset{TS1}{pag} {5} % tofu for blank, interrobang/down, ohm -\DeclareEncodingSubset{TS1}{pbk} {5} % tofu for blank, interrobang/down, ohm -\DeclareEncodingSubset{TS1}{pcr} {5} % tofu for blank, interrobang/down, ohm -\DeclareEncodingSubset{TS1}{phv} {5} % tofu for blank, interrobang/down, ohm -\DeclareEncodingSubset{TS1}{pnc} {5} % tofu for blank, interrobang/down, ohm -\DeclareEncodingSubset{TS1}{pplj} {5} % tofu for blank -\DeclareEncodingSubset{TS1}{pplx} {5} % tofu for blank -\DeclareEncodingSubset{TS1}{ppl} {5} % tofu for blank interrobang/down -\DeclareEncodingSubset{TS1}{ptm} {5} % tofu for blank, interrobang/down, ohm -\DeclareEncodingSubset{TS1}{pzc} {5} % tofu for blank, interrobang/down, ohm -\DeclareEncodingSubset{TS1}{ul9} {5} % tofu for blank, interrobang/down, ohm -\DeclareEncodingSubset{TS1}{dayroms} {6} % tofu for blank, interrobang/down, ohm -\DeclareEncodingSubset{TS1}{dayrom} {6} % tofu for blank, interrobang/down, ohm -\DeclareEncodingSubset{TS1}{augie} {8} % really only missing euro -\DeclareEncodingSubset{TS1}{put} {8} -\DeclareEncodingSubset{TS1}{uag} {8} % probably (currently broken distrib) -\DeclareEncodingSubset{TS1}{ugq} {8} +\DeclareEncodingSubset{TS1}{bch} {5} % tofu for blank, ohm +\DeclareEncodingSubset{TS1}{futj}{5} % tofu for blank, interrobang/down, ohm +\DeclareEncodingSubset{TS1}{futs}{5} % tofu for blank, ohm +\DeclareEncodingSubset{TS1}{futx}{5} % probably (currently broken distrib) +\DeclareEncodingSubset{TS1}{pag} {5} % tofu for blank, interrobang/down, ohm +\DeclareEncodingSubset{TS1}{pbk} {5} % tofu for blank, interrobang/down, ohm +\DeclareEncodingSubset{TS1}{pcr} {5} % tofu for blank, interrobang/down, ohm +\DeclareEncodingSubset{TS1}{phv} {5} % tofu for blank, interrobang/down, ohm +\DeclareEncodingSubset{TS1}{pnc} {5} % tofu for blank, interrobang/down, ohm +\DeclareEncodingSubset{TS1}{pplj}{5} % tofu for blank +\DeclareEncodingSubset{TS1}{pplx}{5} % tofu for blank +\DeclareEncodingSubset{TS1}{ppl} {5} % tofu for blank interrobang/down +\DeclareEncodingSubset{TS1}{ptm} {5} % tofu for blank, interrobang/down, ohm +\DeclareEncodingSubset{TS1}{pzc} {5} % tofu for blank, interrobang/down, ohm +\DeclareEncodingSubset{TS1}{ul9} {5} % tofu for blank, interrobang/down, ohm +\DeclareEncodingSubset{TS1}{dayroms}{6} % tofu for blank, interrobang/down, ohm +\DeclareEncodingSubset{TS1}{dayrom} {6} % tofu for blank, interrobang/down, ohm +\DeclareEncodingSubset{TS1}{augie}{8} % really only missing euro +\DeclareEncodingSubset{TS1}{put} {8} +\DeclareEncodingSubset{TS1}{uag} {8} % probably (currently broken distrib) +\DeclareEncodingSubset{TS1}{ugq} {8} \DeclareEncodingSubset{TS1}{zi4} {9} \DeclareEncodingSubset{TS1}{hls} {5} \DeclareEncodingSubset{TS1}{hlst} {5} @@ -7073,11 +10052,11 @@ Type H <return> for immediate help.}% \DeclareEncodingSubset{TS1}{hlcn} {8} \DeclareEncodingSubset{TS1}{hlcw} {8} \DeclareEncodingSubset{TS1}{hlcf} {8} -\DeclareEncodingSubset{TS1}{lato-*} {0} % with a bunch of tofu inside -\DeclareEncodingSubset{TS1}{opensans-*} {0} % with a bunch of tofu inside -\DeclareEncodingSubset{TS1}{cantarell-*} {0} % with a bunch of tofu inside -\DeclareEncodingSubset{TS1}{fbb-*} {0} % missing centoldstyle -\DeclareEncodingSubset{TS1}{tli} {1} % with lots of tofu inside +\DeclareEncodingSubset{TS1}{lato-*} {0} % with a bunch of tofu inside +\DeclareEncodingSubset{TS1}{opensans-*} {0} % with a bunch of tofu inside +\DeclareEncodingSubset{TS1}{cantarell-*} {0} % with a bunch of tofu inside +\DeclareEncodingSubset{TS1}{fbb-*} {0} % missing centoldstyle +\DeclareEncodingSubset{TS1}{tli} {1} % with lots of tofu inside \DeclareEncodingSubset{TS1}{Alegreya-*} {2} \DeclareEncodingSubset{TS1}{AlegreyaSans-*} {2} \DeclareEncodingSubset{TS1}{DejaVuSans-TLF} {2} @@ -7185,7 +10164,7 @@ Type H <return> for immediate help.}% \DeclareEncodingSubset{TS1}{erewhon-*} {7} \DeclareEncodingSubset{TS1}{ComicNeue-TLF} {7} \DeclareEncodingSubset{TS1}{ComicNeueAngular-TLF} {7} -\DeclareEncodingSubset{TS1}{Forum-LF} {7} % the superiors are missing +\DeclareEncodingSubset{TS1}{Forum-LF} {7} % the superiors are missing \DeclareEncodingSubset{TS1}{Cochineal-*} {8} \DeclareEncodingSubset{TS1}{AlgolRevived-TLF} {9} \def\UseLegacyTextSymbols{% @@ -7279,6 +10258,7 @@ Type H <return> for immediate help.}% \@ignorefalse \let\ignorespacesafterend\@ignoretrue \def\enddocument{% + \@kernel@before@enddocument \UseOneTimeHook{enddocument}% \@kernel@after@enddocument \@checkend{document}% @@ -7328,6 +10308,7 @@ Type H <return> for immediate help.}% \fi \fi } +\def\@kernel@before@enddocument{\par} \def\@testdef #1#2#3{% \def\reserved@a{#3}\expandafter \ifx \csname #1@#2\endcsname \reserved@a \else \@tempswatrue \fi} @@ -7772,7 +10753,7 @@ Type H <return> for immediate help.}% } \let\@eqnsel=\relax \def\nonumber{\global\@eqnswfalse} -\def\@eqncr{% +\protected\def\@eqncr{% {\ifnum0=`}\fi \@ifstar{% \global\@eqpen\@M\@yeqncr @@ -7794,7 +10775,7 @@ Type H <return> for immediate help.}% \reserved@a \if@eqnsw\@eqnnum\stepcounter{equation}\fi \global\@eqnswtrue\global\@eqcnt\z@\cr} \let\@seqncr=\@eqncr -\@namedef{eqnarray*}{\def\@eqncr{\nonumber\@seqncr}\eqnarray} +\@namedef{eqnarray*}{\protected\def\@eqncr{\nonumber\@seqncr}\eqnarray} \@namedef{endeqnarray*}{\nonumber\endeqnarray} \def\lefteqn#1{\rlap{$\displaystyle #1$}} \DeclareRobustCommand{\ensuremath}{% @@ -8096,13 +11077,13 @@ Type H <return> for immediate help.}% \mb@b \kern\z@}} \let\set@color\relax -\let\color@begingroup\relax -\let\color@endgroup\relax -\let\color@setgroup\relax -\let\normalcolor\relax -\let\color@hbox\relax -\let\color@vbox\relax -\let\color@endbox\relax +\let\color@begingroup\begingroup +\def\color@endgroup{\endgraf\endgroup} +\def\color@setgroup{\color@begingroup} % changed further in color package +\let\normalcolor\relax % remains untouched; only changed in a color package +\def\color@hbox{\hbox\bgroup\color@begingroup} +\def\color@vbox{\vbox\bgroup\color@begingroup} +\def\color@endbox{\color@endgroup\egroup} \def\newsavebox#1{\@ifdefinable{#1}{\newbox#1}} \DeclareRobustCommand\savebox[1]{% \@ifnextchar(%) @@ -8299,6 +11280,7 @@ Type H <return> for immediate help.}% \color@begingroup \@makefntext{% \rule\z@\footnotesep\ignorespaces#1\@finalstrut\strutbox}% + \par \color@endgroup}} \newif\if@pboxsw \DeclareRobustCommand\rule{\@ifnextchar[\@rule{\@rule[\z@]}}% @@ -8402,7 +11384,7 @@ Type H <return> for immediate help.}% \def\@addfield{\global\setbox\@curline\hbox{\unhbox \@curline\unhbox\@curfield}} \def\@ifatmargin{\ifdim \wd\@curline =\z@} -\def\@tabcr{\@stopline \@ifstar{\penalty \@M \@xtabcr}\@xtabcr} +\protected\def\@tabcr{\@stopline \@ifstar{\penalty \@M \@xtabcr}\@xtabcr} \def\@xtabcr{\@ifnextchar[\@itabcr{\@startline\ignorespaces}} \def\@itabcr[#1]{\@vspace@calcify{#1}\@startline\ignorespaces} \def\tabbing{\lineskip \z@skip\let\>\@rtab\let\<\@ltab\let\=\@settab @@ -8520,14 +11502,14 @@ Type H <return> for immediate help.}% \lineskip\z@skip\baselineskip\z@skip \ifhmode \@preamerr\z@ \@@par\fi \@preamble} -\def\@arraycr{% +\protected\def\@arraycr{% ${\ifnum0=`}\fi\@ifstar\@xarraycr\@xarraycr} \def\@xarraycr{\@ifnextchar[\@argarraycr{\ifnum0=`{\fi}${}\cr}} \def\@argarraycr[#1]{% \ifnum0=`{\fi}${}\ifdim #1>\z@ \@xargarraycr{#1}\else \@yargarraycr{#1}\fi} \let\tabularnewline\relax -\def\@tabularcr{% +\protected\def\@tabularcr{% {\ifnum0=`}\fi\@ifstar\@xtabularcr\@xtabularcr} \def\@xtabularcr{\@ifnextchar[\@argtabularcr{\ifnum0=`{\fi}\cr}} \def\@argtabularcr[#1]{% @@ -8761,7 +11743,7 @@ Type H <return> for immediate help.}% \let\\\@stackcr \@ishortstack} \def\@ishortstack#1{\ialign{\mb@l {##}\unskip\mb@r\cr #1\crcr}\egroup} -\def\@stackcr{\@ifstar\@ixstackcr\@ixstackcr} +\protected\def\@stackcr{\@ifstar\@ixstackcr\@ixstackcr} \def\@ixstackcr{\@ifnextchar[\@istackcr{\cr\ignorespaces}} \def\@istackcr[#1]{\cr\noalign{\@vspace@calcify{#1}}\ignorespaces} \newif\if@negarg @@ -9535,7 +12517,7 @@ Type H <return> for immediate help.}% \hsize\marginparwidth \@parboxrestore \@marginparreset - #2% + #2\par \@minipagefalse \outer@nobreak }% @@ -9599,6 +12581,7 @@ Type H <return> for immediate help.}% \color@begingroup \@makefntext{% \rule\z@\footnotesep\ignorespaces#1\@finalstrut\strutbox}% + \par \color@endgroup}}% \def\footnotemark{% \@ifnextchar[\@xfootnotemark @@ -9629,6 +12612,12 @@ Type H <return> for immediate help.}% \@footnotetext} \def\@mpfn{footnote} \def\thempfn{\thefootnote} +\def\footref#1{% + \begingroup + \unrestored@protected@xdef\@thefnmark{\ref{#1}}% + \endgroup + \@footnotemark +} %%% From File: ltidxglo.dtx \message{index,} \def\makeindex{% @@ -9710,8 +12699,7 @@ Type H <return> for immediate help.}% \@ifundefined{b@\@citeb}{\G@refundefinedtrue \@latex@warning{Citation `\@citeb' undefined}}{}}% \else - \@latex@error{Cannot be used in preamble}\@eha - % \AtBeginDocument{\nocite{#1}} + \AddToHook{begindocument/end}[kernel]{\nocite{#1}}% \fi \@esphack} \expandafter\let\csname b@*\endcsname\@empty @@ -9783,6 +12771,7 @@ Type H <return> for immediate help.}% \let\@declaredoptions\@empty \let\@classoptionslist\relax \@onlypreamble\@classoptionslist +\let\@raw@classoptionslist\relax \let\@unusedoptionlist\@empty \@onlypreamble\@unusedoptionlist \let\CurrentOption\@empty @@ -9936,7 +12925,11 @@ Type H <return> for immediate help.}% \zap@space#2 \@empty}% \expandafter\let \csname opt@#3.#1\expandafter\endcsname - \csname opt@\reserved@a\endcsname} + \csname opt@\reserved@a\endcsname + \@ifundefined{@raw@opt@#3.#1}% + {\expandafter\gdef\csname @raw@opt@#3.#1\endcsname{#2}}% + {\expandafter\g@addto@macro\csname @raw@opt@#3.#1\endcsname{,#2}}% +} \@onlypreamble\@pass@ptions \def\PassOptionsToPackage{\@pass@ptions\@pkgextension} \def\PassOptionsToClass{\@pass@ptions\@clsextension} @@ -9955,11 +12948,12 @@ Type H <return> for immediate help.}% \@onlypreamble\DeclareOption \@onlypreamble\@declareoption \@onlypreamble\@defdefault@ds +\def\@remove@eq@value#1=#2\@nil{#1} \def\OptionNotUsed{% \ifx\@currext\@clsextension \xdef\@unusedoptionlist{% \ifx\@unusedoptionlist\@empty\else\@unusedoptionlist,\fi - \CurrentOption}% + \expandafter\@remove@eq@value\CurrentOption=\@nil}% \fi} \@onlypreamble\OptionNotUsed \def\ProcessOptions{% @@ -9982,14 +12976,15 @@ Type H <return> for immediate help.}% \@onlypreamble\@process@ptions \def\@xprocess@ptions{% \ifx\@currext\@clsextension\else + \ifx\@classoptionslist\relax\else \@for\CurrentOption:=\@classoptionslist\do{% \ifx\CurrentOption\@empty\else - \@expandtwoargs\in@{,\CurrentOption,}{,\@declaredoptions,}% - \ifin@ + \@ifundefined{ds@\CurrentOption}{}{% \@use@ption \expandafter\let\csname ds@\CurrentOption\endcsname\@empty - \fi + }% \fi}% + \fi \fi \@process@pti@ns} \@onlypreamble\@xprocess@ptions @@ -10010,7 +13005,8 @@ Type H <return> for immediate help.}% \def\@options{\ProcessOptions*} \@onlypreamble\@options \def\@use@ption{% - \@expandtwoargs\@removeelement\CurrentOption + \@expandtwoargs\@removeelement + {\expandafter\@remove@eq@value\CurrentOption=\@nil}% \@unusedoptionlist\@unusedoptionlist \csname ds@\CurrentOption\endcsname} \@onlypreamble\@use@ption @@ -10108,6 +13104,7 @@ Type H <return> for immediate help.}% \ifx#1\@clsextension \ifx\@classoptionslist\relax \xdef\@classoptionslist{\zap@space#2 \@empty}% + \gdef\@raw@classoptionslist{#2}% \def\reserved@a{% \@onefilewithoptions#3[{#2}][{#4}]#1% \@documentclasshook}% @@ -10369,14 +13366,12 @@ Type H <return> for immediate help.}% \let\write\@gobbletwo% \let\closeout\@gobble% \else% - \edef\reserved@a{#1}% - \edef\reserved@a{\detokenize\expandafter{\reserved@a}}% \edef\reserved@b{\detokenize\expandafter{\jobname}}% - \ifx\reserved@a\reserved@b% + \ifx\@curr@file\reserved@b% \@fileswtrue% \else% \edef\reserved@b{\reserved@b\detokenize{.tex}}% - \ifx\reserved@a\reserved@b + \ifx\@curr@file\reserved@b \@fileswtrue% \fi% \fi% @@ -10422,7 +13417,8 @@ Type H <return> for immediate help.}% \ifx\relax##1\relax% \else% \@latex@warning{Writing text `##1' before % - \string\end{\@currenvir}\MessageBreak as last line of \@curr@file}% + \string\end{\@currenvir}\MessageBreak + as last line of \@curr@file}% \immediate\write\reserved@c{##1}% \fi% \ifx\relax##2\relax% @@ -10646,12 +13642,9 @@ Type H <return> for immediate help.}% \expandafter\@secondoftwo \fi } -%% -%% File: ltfilehook.dtx (C) Copyright 2020 Frank Mittelbach, -%% Phelype Oleinik & LaTeX Team %%% From File: ltfilehook.dtx -\providecommand\ltfilehookversion{v1.0e} -\providecommand\ltfilehookdate{2021/01/07} +\providecommand\ltfilehookversion{v1.0k} +\providecommand\ltfilehookdate{2021/05/25} \ExplSyntaxOn \tl_new:N \CurrentFile \tl_new:N \CurrentFilePath @@ -10689,7 +13682,8 @@ Type H <return> for immediate help.}% \cs_new:Npn \__filehook_drop_extension_aux:nnn #1 #2 #3 { \tl_if_empty:nF {#1} { #1 / } #2 } \tl_new:N \l__filehook_internal_tl -\seq_new:N \g__filehook_input_file_seq +\seq_if_exist:NF \g__filehook_input_file_seq + { \seq_new:N \g__filehook_input_file_seq } \cs_new_protected:Npn \__filehook_file_push: { \seq_gpush:Nx \g__filehook_input_file_seq @@ -10703,7 +13697,7 @@ Type H <return> for immediate help.}% \seq_gpop:NNTF \g__filehook_input_file_seq \l__filehook_internal_tl { \exp_after:wN \__filehook_file_pop_assign:nnnn \l__filehook_internal_tl } { - \msg_error:nnn { hooks } { should-not-happen } + \msg_error:nnn { kernel } { should-not-happen } { Tried~to~pop~from~an~empty~file~name~stack. } } } @@ -10756,7 +13750,8 @@ Type H <return> for immediate help.}% @file-subst@ \__filehook_subst_file_normalize:Nn \use_ii_iii:nnn {#1} } - { \__filehook_subst_file_normalize:Nn \__filehook_file_name_compose:nnn {#2} } + { \__filehook_subst_file_normalize:Nn \__filehook_file_name_compose:nnn + {#2} } \group_end: } \cs_new_protected:Npn \__filehook_subst_remove:n #1 @@ -10789,6 +13784,8 @@ Type H <return> for immediate help.}% \def\set@curr@file#1{% \begingroup \escapechar\m@ne + \let\protect\string + \edef~{\string~}% \expandafter\def\csname\expandafter\endcsname \expandafter{\csname\endcsname}% \@expl@@@filehook@if@no@extension@@nTF{#1}% @@ -10911,7 +13908,7 @@ Type H <return> for immediate help.}% \cs_new_eq:NN \@expl@@@filehook@drop@extension@@N \__filehook_drop_extension:N \cs_new_eq:NN \@expl@@@filehook@file@push@@ - \__filehook_file_push: + \__filehook_file_push: \cs_new_eq:NN \@expl@@@filehook@file@pop@@ \__filehook_file_pop: \cs_new_eq:NN \@expl@@@filehook@file@pop@assign@@nnnn @@ -10920,11 +13917,12 @@ Type H <return> for immediate help.}% \declare@file@substitution{atveryend.sty}{atveryend-ltx.sty} %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% %% -%% File: ltshipout.dtx (C) Copyright 2020 Frank Mittelbach, LaTeX Team +%% Copyright (C) 2020-2021 +%% Frank Mittelbach, LaTeX Team %% %%% From File: ltshipout.dtx -\providecommand\ltshipoutversion{v1.0d} -\providecommand\ltshipoutdate{2020/11/24} +\providecommand\ltshipoutversion{v1.0i} +\providecommand\ltshipoutdate{2021/03/17} \ExplSyntaxOn \bool_new:N \g__shipout_debug_bool \cs_new_eq:NN \__shipout_debug:n \use_none:n @@ -10945,6 +13943,27 @@ Type H <return> for immediate help.}% } \box_new:N \l_shipout_box \cs_set_eq:NN \ShipoutBox \l_shipout_box +\box_new:N \l__shipout_raw_box +\sys_if_engine_luatex:TF + { + \newluafunction \__shipout_finalize_box: + \exp_args:Nx \everyjob { + \exp_not:V \everyjob + \exp_not:N \lua_now:n { + luatexbase.create_callback('pre_shipout_filter', 'list') + local~call, getbox, setbox = luatexbase.call_callback, tex.getbox, tex.setbox~ + lua.get_functions_table()[\the \__shipout_finalize_box:] = function() + local~result = call('pre_shipout_filter', getbox(\the \l_shipout_box)) + if~not (result == true) then~ + setbox(\the \l_shipout_box, result~or~nil) + end~ + end + } + } + \protected \luadef \__shipout_finalize_box: \the \__shipout_finalize_box: + } { + \cs_set_eq:NN \__shipout_finalize_box: \scan_stop: + } \cs_set_protected:Npn \__shipout_execute: { \tl_set:Nx \l__shipout_group_level_tl { \int_value:w \tex_currentgrouplevel:D } @@ -10956,26 +13975,43 @@ Type H <return> for immediate help.}% \cs_new:Npn \__shipout_execute_test_level: { \int_compare:nNnT \l__shipout_group_level_tl < \tex_currentgrouplevel:D - \tex_aftergroup:D - \__shipout_execute_cont: + \tex_aftergroup:D \__shipout_execute_cont: } \cs_new:Npn \__shipout_execute_cont: { - \box_if_empty:NTF \l_shipout_box - { \PackageWarning{ltshipout}{Ignoring~ void~ shipout~ box} } + \__shipout_execute_main_cont:Nnnn + \l_shipout_box + { \hook_use:n {shipout/before} } + { \hook_if_empty:nF {shipout/foreground} + { \__shipout_add_foreground_picture:n + { \hook_use:n {shipout/foreground} } } + \bool_lazy_and:nnF + { \hook_if_empty_p:n {shipout/background} } + { \tl_if_empty_p:N \@kernel@before@shipout@background } + { \__shipout_add_background_picture:n + { \@kernel@before@shipout@background + \hook_use:n {shipout/background} + \@kernel@after@shipout@background } + } + } + { \hook_use:n {shipout/after} } +} +\cs_new:Npn \__shipout_execute_main_cont:Nnnn #1#2#3#4 { + \box_if_empty:NTF #1 + { \@latex@warning{Ignoring~ void~ shipout~ box} } { - \bool_gset_false:N \g__shipout_discard_bool + % \DiscardShipoutBox on doc-level \cs_set_eq:NN \__shipout_saved_protect: \protect \set@typeset@protect - \__shipout_get_box_size:N \l_shipout_box - \hook_use:n {shipout/before} + \__shipout_get_box_size:N #1 + #2 \int_gincr:N \g_shipout_totalpages_int \bool_if:NTF \g__shipout_discard_bool - { \PackageInfo{ltshipout}{Completed~ page~ discarded} + { \@latex@info@no@line{Completed~ page~ discarded} \bool_gset_false:N \g__shipout_discard_bool \tex_deadcycles:D \c_zero_int } - { \box_if_empty:NTF \l_shipout_box - { \PackageWarning{ltshipout}{ + { \box_if_empty:NTF #1 + { \@latex@warning{ Shipout~ box~ was~ voided~ by~ hook,\MessageBreak ignoring~ shipout~ box } } @@ -10985,49 +14021,89 @@ Type H <return> for immediate help.}% \typeout{Absolute~ page~ =~ \int_use:N \g_shipout_readonly_int \space (target:~ \@abspage@last)} } - \__shipout_get_box_size:N \l_shipout_box - \hook_if_empty:nF {shipout/foreground} - { \__shipout_add_foreground_picture:n - { \hook_use:n {shipout/foreground} } } - \hook_if_empty:nF {shipout/background} - { \__shipout_add_background_picture:n - { \@kernel@before@shipout@background - \hook_use:n {shipout/background} } } - \__shipout_execute_firstpage_hook: + \__shipout_get_box_size:N #1 + \__shipout_run_firstpage_hook: + #3 + \__shipout_add_firstpage_specials: \int_compare:nNnT \@abspage@last = \g_shipout_readonly_int - { \hook_if_empty:nF {shipout/lastpage} + { \bool_lazy_and:nnF + { \hook_if_empty_p:n {shipout/lastpage} } + { \tl_if_empty_p:N \@kernel@after@shipout@lastpage } { \__shipout_debug:n { \typeout{Executing~ lastpage~ hook~ - on~ page~ \int_use:N \g_shipout_readonly_int } } - \__shipout_add_foreground_box:n { \UseHook{shipout/lastpage} - \@kernel@after@shipout@lastpage } + on~ page~ \int_use:N \g_shipout_readonly_int } } + \__shipout_add_foreground_box:n + { \UseHook{shipout/lastpage} + \@kernel@after@shipout@lastpage } } \bool_gset_true:N \g__shipout_lastpage_handled_bool } + \__shipout_finalize_box: \cs_set_eq:NN \protect \exp_not:N \tex_shipout:D \box_use:N \l_shipout_box + \__shipout_drop_firstpage_specials: + \set@typeset@protect + #4 } } \cs_set_eq:NN \protect \__shipout_saved_protect: } } +\cs_set_protected:Npn \__shipout_execute_raw: { + \tl_set:Nx \l__shipout_group_level_tl + { \int_value:w \tex_currentgrouplevel:D } + \tex_afterassignment:D \__shipout_execute_test_level_raw: + \tex_setbox:D \l__shipout_raw_box +} +\cs_new:Npn \__shipout_execute_test_level_raw: { + \int_compare:nNnT + \l__shipout_group_level_tl < \tex_currentgrouplevel:D + \tex_aftergroup:D \__shipout_execute_nohooks_cont: +} +\cs_new:Npn \__shipout_execute_nohooks_cont: { + \__shipout_execute_main_cont:Nnnn \l__shipout_raw_box + {} { \__shipout_debug:n{ \typeout{Doing~ raw~ shipout~ ...} } + \box_set_eq:NN \l_shipout_box \l__shipout_raw_box } {} +} + +\cs_gset_eq:NN \RawShipout \__shipout_execute_raw: \cs_new_eq:NN \__shipout_saved_protect: \protect \hook_new:n{shipout/before} +\hook_new:n{shipout/after} \hook_new:n{shipout/foreground} \hook_new:n{shipout/background} \hook_new:n{shipout/firstpage} \hook_new:n{shipout/lastpage} \let\@kernel@after@shipout@lastpage\@empty \let\@kernel@before@shipout@background\@empty -\cs_new:Npn \__shipout_execute_firstpage_hook: { - \hook_if_empty:nF {shipout/firstpage} - { \__shipout_add_background_box:n { \UseHook{shipout/firstpage} } } - \cs_gset_eq:NN \__shipout_execute_firstpage_hook: \prg_do_nothing: +\let\@kernel@after@shipout@background\@empty +\cs_new:Npn \__shipout_run_firstpage_hook: { + \hook_if_empty:nTF {shipout/firstpage} + { + \cs_gset_eq:NN \__shipout_add_firstpage_specials: \prg_do_nothing: + \cs_gset_eq:NN \__shipout_drop_firstpage_specials: \prg_do_nothing: + } + { + \hbox_set:Nn \l__shipout_firstpage_box { \UseHook{shipout/firstpage} } + } + \cs_gset_eq:NN \__shipout_run_firstpage_hook: \prg_do_nothing: \cs_gset:Npn \__shipout_add_firstpage_material:Nn ##1 ##2 { \@latex@warning{ First~ page~ is~ already~ shipped~ out,~ ignoring\MessageBreak \string##1 } } } +\cs_new:Npn \__shipout_add_firstpage_specials: { + \box_set_eq:NN \l__shipout_raw_box \l_shipout_box + \__shipout_add_background_box:n { \hbox_unpack_drop:N \l__shipout_firstpage_box } + \cs_gset_eq:NN \__shipout_add_firstpage_specials: \prg_do_nothing: +} +\cs_new:Npn \__shipout_drop_firstpage_specials: { + \box_set_eq:NN \l_shipout_box \l__shipout_raw_box + \cs_gset_eq:NN \__shipout_drop_firstpage_specials: \prg_do_nothing: + } + +\box_new:N \l__shipout_firstpage_box + \bool_new:N \g__shipout_lastpage_handled_bool \cs_new:Npn \__shipout_add_firstpage_material:Nn #1#2 { \AddToHook{shipout/firstpage}{#2} @@ -11036,8 +14112,8 @@ Type H <return> for immediate help.}% \dim_set:Nn \l_shipout_box_ht_dim { \box_ht:N #1 } \dim_set:Nn \l_shipout_box_dp_dim { \box_dp:N #1 } \dim_set:Nn \l_shipout_box_wd_dim { \box_wd:N #1 } - \dim_set:Nn \l_shipout_box_ht_plus_dp_dim { \l_shipout_box_ht_dim + - \l_shipout_box_dp_dim } + \dim_set:Nn \l_shipout_box_ht_plus_dp_dim + { \l_shipout_box_ht_dim + \l_shipout_box_dp_dim } } \dim_new:N \l_shipout_box_ht_dim \dim_new:N \l_shipout_box_dp_dim @@ -11243,7 +14319,8 @@ Type H <return> for immediate help.}% {\ifnum\@abspage@last<\maxdimen \xdef\PreviousTotalPages{\@abspage@last}\fi} \cs_new_eq:NN \DiscardShipoutBox \shipout_discard: -\cs_set_protected:Npn \AtBeginDvi {\__shipout_add_firstpage_material:Nn \AtBeginDvi} +\cs_set_protected:Npn \AtBeginDvi + {\__shipout_add_firstpage_material:Nn \AtBeginDvi} \cs_new_eq:NN \DebugShipoutsOn \shipout_debug_on: \cs_new_eq:NN \DebugShipoutsOff \shipout_debug_off: \cs_set_eq:NN \@expl@@@shipout@add@firstpage@material@@Nn @@ -11268,7 +14345,6 @@ Type H <return> for immediate help.}% and you can safely remove it.\MessageBreak Found on}} \declare@file@substitution{atbegshi.sty}{atbegshi-ltx.sty} -\declare@file@substitution{everyshi.sty}{everyshi-ltx.sty} %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% %%% From File: ltoutput.dtx \expandafter\let\csname ver@autoout1.sty\endcsname\fmtversion @@ -11451,7 +14527,7 @@ Type H <return> for immediate help.}% \global \advance \@colht \@tempdima \ifx \@dbltoplist \@empty \else - \@latexerr{Float(s) lost}\@ehb + \@latex@error{Float(s) lost}\@ehb \let \@dbltoplist \@empty \fi \@cons \@dbltoplist \@currbox @@ -11564,7 +14640,7 @@ Type H <return> for immediate help.}% \global \@colroom \@colht \ifx \@currlist\@empty \else - \@latexerr{Float(s) lost}\@ehb + \@latex@error{Float(s) lost}\@ehb \global \let \@currlist \@empty \fi \@makefcolumn\@deferlist @@ -12135,17 +15211,17 @@ Type H <return> for immediate help.}% \gdef\@enlargepage#1#2{% \@tempskipa#2\relax \ifdim \@tempskipa>.5\maxdimen - \@latexerr{Suggested\space extra\space height\space - (\the\@tempskipa)\space dangerously\space - large}\@eha + \@latex@error{Suggested\space extra\space height\space + (\the\@tempskipa)\space dangerously\space + large}\@eha \else \ifdim \vsize<.5\maxdimen \@bsphack \insert\@kludgeins{#1\vskip-\@tempskipa}% \@esphack \else - \@latexerr{Page\space height\space already\space - too\space large}\@eha + \@latex@error{Page\space height\space already\space + too\space large}\@eha \fi \fi } @@ -12357,6 +15433,33 @@ Type H <return> for immediate help.}% \countdef\xe@alloc@intercharclass=257 \xe@alloc@intercharclass=\z@ \fi +\ifx\directlua\@undefined +\else + \expanded{% + \everyjob{\the\everyjob + \noexpand%\directlua + \directlua{% + local function trace_stack_levels (input_ptr) + local tracingstacklevels = tex.count.tracingstacklevels + if tex.tracingmacros > 0 or input_ptr < tracingstacklevels then + if tracingstacklevels > 0 then + if input_ptr < tracingstacklevels then + return "\string\n\string~" .. string.rep(".",input_ptr) + else + return "\string~\string~" + end + else + return "\string\n" + end + else + return "" + end + end + luatexbase.add_to_callback('input_level_string', + trace_stack_levels,'tracingstacklevels') + }% + }}% +\fi \unitlength = 1pt \fboxsep = 3pt \fboxrule = .4pt @@ -12449,6 +15552,22 @@ Type H <return> for immediate help.}% \errmessage{} \def\font@submax{0pt} \fi +\ifx \pdfgentounicode \@undefined \else + \ifnum 0=0% + \ifdefined\pdftexversion + \ifnum \pdftexversion=140 \ifnum\pdftexrevision<22 1\fi\fi + \fi + \relax + \input glyphtounicode + \else + \begingroup + \everyeof{\noexpand}\endlinechar-1 + \edef\x{\endgroup + \everyjob{\the\everyjob\@@input glyphtounicode }% + }\x + \fi + \pdfgentounicode=1 +\fi \ifnum0% \ifx\Umathcode\@undefined\else 1\fi \ifx\mubyte\@undefined\else 1\fi diff --git a/Master/texmf-dist/tex/latex/base/latex209.def b/Master/texmf-dist/tex/latex/base/latex209.def index d69aad61ee0..ead6bf7d293 100644 --- a/Master/texmf-dist/tex/latex/base/latex209.def +++ b/Master/texmf-dist/tex/latex/base/latex209.def @@ -15,8 +15,8 @@ %% (but please observe conditions on bug reports sent to that address!) %% %% -%% Copyright (C) 1993-2020 -%% The LaTeX3 Project and any individual authors listed elsewhere +%% Copyright (C) 1993-2021 +%% The LaTeX Project and any individual authors listed elsewhere %% in this file. %% %% This file was generated from file(s) of the LaTeX base system. @@ -44,7 +44,7 @@ %% and covered by LPPL is defined by the unpacking scripts (with %% extension .ins) which are part of the distribution. \NeedsTeXFormat{LaTeX2e} -\ProvidesFile{latex209.def}[2020/08/21 v0.55 Standard LaTeX file] +\ProvidesFile{latex209.def}[2020/11/26 v0.55 Standard LaTeX file] \if@compatibility \expandafter\endinput \else diff --git a/Master/texmf-dist/tex/latex/base/latexrelease.sty b/Master/texmf-dist/tex/latex/base/latexrelease.sty index e2845a64520..ffb65fa9a3f 100644 --- a/Master/texmf-dist/tex/latex/base/latexrelease.sty +++ b/Master/texmf-dist/tex/latex/base/latexrelease.sty @@ -12,11 +12,14 @@ %% ltluatex.dtx (with options: `latexrelease') %% ltexpl.dtx (with options: `latexrelease') %% ltdefns.dtx (with options: `latexrelease') +%% ltcmd.dtx (with options: `latexrelease') %% lthooks.dtx (with options: `latexrelease') +%% ltcmdhooks.dtx (with options: `latexrelease') %% ltalloc.dtx (with options: `latexrelease') %% ltcntrl.dtx (with options: `latexrelease') %% lterror.dtx (with options: `latexrelease') %% ltpar.dtx (with options: `latexrelease') +%% ltpara.dtx (with options: `latexrelease') %% ltspace.dtx (with options: `latexrelease') %% ltlogos.dtx (with options: `latexrelease') %% ltfiles.dtx (with options: `latexrelease') @@ -51,6 +54,7 @@ %% ltoutput.dtx (with options: `latexrelease') %% ltfsscmp.dtx (with options: `latexrelease') %% ltfinal.dtx (with options: `latexrelease') +%% latexrelease.dtx (with options: `latexrelease-finish') %% %% This is a generated file. %% @@ -59,8 +63,8 @@ %% (but please observe conditions on bug reports sent to that address!) %% %% -%% Copyright (C) 1993-2020 -%% The LaTeX3 Project and any individual authors listed elsewhere +%% Copyright (C) 1993-2021 +%% The LaTeX Project and any individual authors listed elsewhere %% in this file. %% %% This file was generated from file(s) of the LaTeX base system. @@ -283,7 +287,7 @@ } %%% From File: ltvers.dtx \edef\latexreleaseversion - {2020-10-01} + {2021-06-01} \newif\if@includeinrelease \@includeinreleasefalse \def\IncludeInRelease#1{% @@ -292,17 +296,37 @@ {There is an \string\EndIncludeRelease\space missing}% \@includeinreleasefalse \fi - \kernel@ifnextchar[% - {\@IncludeInRelease{#1}} - {\@IncludeInRelease{#1}[#1]}} + \ifnum0% + \ifx\new@moduledate\@empty\else 1\fi + \ifnum \expandafter\@parse@version#1//00\@nil=0 1\fi + =11 + \expandafter\@firstoftwo + \else + \expandafter\@secondoftwo + \fi + {\finish@module@release{#1}}% + {\kernel@ifnextchar[% + {\@IncludeInRelease{#1}} + {\@IncludeInRelease{#1}[#1]}}} +\def\finish@module@release#1#2#3{% + \toks@{[#1] #3}% + \ifnum\expandafter\@parse@version\new@moduledate//00\@nil + >\expandafter\@parse@version\fmtversion//00\@nil + \GenericInfo{}{Applying: \the\toks@}% + \else + \GenericInfo{}{Skipping: \the\toks@}% + \expandafter\gobble@finish@module@release + \fi} +\long\def\gobble@finish@module@release#1\EndModuleRelease{% + \EndModuleRelease} \def\@IncludeInRelease#1[#2]{\@IncludeInRele@se{#2}} \def\@IncludeInRele@se#1#2#3{% \toks@{[#1] #3}% \expandafter\ifx\csname\string#2+\@currname+IIR\endcsname\relax \ifnum\expandafter\@parse@version#1//00\@nil - >\expandafter\@parse@version\fmtversion//00\@nil + >\expandafter\@parse@version\fmtversion//00\@nil \GenericInfo{}{Skipping: \the\toks@}% - \expandafter\expandafter\expandafter\@gobble@IncludeInRelease + \expandafter\expandafter\expandafter\@gobble@IncludeInRelease \else \GenericInfo{}{Applying: \the\toks@}% \@includeinreleasetrue @@ -318,6 +342,9 @@ \@includeinreleasefalse \else \PackageError{latexrelease}{mis-matched EndIncludeInRelease}{}% +\fi +\if@skipping@module + \expandafter\new@module@skip \fi} \long\def\@gobble@IncludeInRelease#1\EndIncludeInRelease{% \@includeinreleasefalse @@ -327,11 +354,55 @@ #2#3\@end@check@IncludeInRelease{% \ifx\@check@IncludeInRelease#2\else \PackageError{latexrelease}{skipped IncludeInRelease for tag \string#2}{}% + \fi + \if@skipping@module + \expandafter\new@module@skip + \fi} +\let\if@skipping@module\iffalse +\def\@skipping@moduletrue{\let\if@skipping@module\iftrue} +\def\@skipping@modulefalse{\let\if@skipping@module\iffalse} +\let\new@modulename\@empty +\let\new@moduledate\@empty +\def\NewModuleRelease#1#2#3{% + \ifx\new@modulename\@empty \else + \@latex@error{Nested \noexpand\NewModuleRelease forbidden.}\@ehd \fi + \edef\new@moduledate{#1}% + \edef\new@modulename{#2}% + \GenericInfo{}{BEGIN module: \new@modulename\space (\new@moduledate)}% + \GenericInfo{}{ \@spaces\@spaces\@spaces\space#3\@gobble}% + \ifnum\sourceLaTeXdate<% + \expandafter\@parse@version\new@moduledate//00\@nil\relax + \ifnum\expandafter\@parse@version\fmtversion//00\@nil<% + \expandafter\@parse@version\new@moduledate//00\@nil\relax + \GenericInfo{}{Skipping module \new@modulename}% + \expandafter\expandafter + \expandafter\gobble@finish@module@release + \else + \GenericInfo{}{Applying module \new@modulename} + \@skipping@modulefalse + \fi + \else + \GenericInfo{}{Skipping module \new@modulename} + \@skipping@moduletrue + \expandafter\new@module@skip + \fi} +\long\def\new@module@skip#1\IncludeInRelease{\IncludeInRelease} +\def\EndModuleRelease{% + \ifx\new@modulename\@empty + \@latex@error{Extra \string\EndModuleRelease.}\@eha + \else + \GenericInfo{}{END module: \new@modulename\space (\new@moduledate)}% + \let\new@modulename\@empty + \let\new@moduledate\@empty + \@skipping@modulefalse \fi} \ProvidesPackage{latexrelease} - [2018/05/08 v1.0k LaTeX release emulation and tests + [2021/04/29 v1.0n LaTeX release emulation and tests (including releases up to \latexreleaseversion)] \NeedsTeXFormat{LaTeX2e}[1996/06/01] +\@ifundefined{sourceLaTeXdate}{% + \edef\sourceLaTeXdate{% + \expandafter\@parse@version\fmtversion//00\@nil}}{}% \DeclareOption*{% \def\@IncludeInRelease#1[#2]{\@IncludeInRele@se{#1}}% \let\requestedpatchdate\CurrentOption} @@ -382,6 +453,76 @@ of this package available from CTAN} \fi \let\fmtversion\requestedpatchdate \let\currentLaTeXdate\requestedLaTeXdate +\csname ExplSyntaxOn\endcsname +\csname ExplSyntaxOff\endcsname +\begingroup + \endlinechar=-1 + \catcode95=11 % _ + \catcode58=11 % : + \catcode126=10 % ~ + \catcode32=09 % <space> + \xdef\latexrelease@postexpl{\unexpanded{% +\cs_gset_protected:Npn \__latexrelease_declare_command:w + { \@star@or@long \__latexrelease_declare_command:Nw } +\cs_gset_protected:Npn \__latexrelease_declare_command:Nw #1 + { \cs_if_exist:NTF #1 { \renew@command } { \new@command } #1 } +\cs_gset_protected:Npn \__latexrelease_e@alloc:NnnnnN #1 #2 #3 #4 #5 #6 + { + \cs_if_free:NTF #6 + { \use:n } + { + \exp_after:wN \__latexrelease_e@alloc:N + \token_to_meaning:N #6 \scan_stop: {#2} #6 + } + { \__latexrelease_e@alloc #1 {#2} {#3} {#4} {#5} #6 } + } +\cs_gset_protected:Npn \__latexrelease_e@alloc:N #1 + { + \if_int_compare:w 0 < 0 + \if_int_compare:w 10 < 9#1 ~ 1 \fi: + \if_charcode:w " #1 1 \fi: \exp_stop_f: + \tex_afterassignment:D \__latexrelease_e@alloc:w + \@tempcnta #1 + \use_i:nnn + \fi: + \use:n + { + \if_meaning:w \scan_stop: #1 + \exp_after:wN \use_iv:nnnn + \fi: + \__latexrelease_e@alloc:N + } + } +\cs_gset_protected:Npn \__latexrelease_e@alloc:w #1 \scan_stop: #2 #3 + { + #2 \__latexrelease_tmp:w = \@tempcnta + \token_if_eq_meaning:NNTF #3 \__latexrelease_tmp:w + { \int_set_eq:NN \allocationnumber \@tempcnta \use_none:n } + { \cs_set_eq:NN #3 \tex_undefined:D \use:n } + } +\tl_clear_new:N \l__latexrelease_restores_tl +\cs_gset:Npn \__latexrelease_tmp:w #1 #2 + { + \quark_if_recursion_tail_stop_do:Nn #1 + { \cs_undefine:N \__latexrelease_tmp:w } + \tl_put_right:Nn \l__latexrelease_restores_tl {#1} + \cs_set_eq:cN { __latexrelease_ \cs_to_str:N #1 } #1 + \cs_set_eq:NN #1 #2 + \__latexrelease_tmp:w + } +\__latexrelease_tmp:w + \__kernel_chk_if_free_cs:N \use_none:n + \e@alloc \__latexrelease_e@alloc:NnnnnN + \__kernel_msg_error:nnx \use_none:nnn + \msg_new:nnnn \msg_gset:nnnn + \NewDocumentCommand \DeclareDocumentCommand + \newcommand \__latexrelease_declare_command:w + \__kernel_msg_error:nnn \use_none:nnn % needed while redirect for kernel msgs doesn't work + \q_recursion_tail \q_recursion_tail + \q_recursion_stop +\msg_redirect_name:nnn { hooks } { exists } { none } + }}% +\endgroup %%% From File: ltdirchk.dtx \ifx\directlua\undefined\else \IncludeInRelease{2015/10/01}{\luatexluafunction} @@ -679,6 +820,45 @@ of this package available from CTAN} \global\chardef#1\allocationnumber \wlog{\string#1=\string\insert\the\allocationnumber}} \EndIncludeInRelease +\IncludeInRelease{2021/06/01}{\tracingstacklevels}% + {tracingstacklevels}% +\ifx\directlua\@undefined + % \tracingstacklevels=0 % added in 2021 +\else + \newcount\tracingstacklevels + % Code for \tracingstacklevels defined in ltfinal.dtx +\fi +\EndIncludeInRelease + +\IncludeInRelease{0000/00/00}{\tracingstacklevels}% + {tracingstacklevels}% +\ifx\directlua\@undefined +\else + \let\tracingstacklevels\@undefined +\fi +\EndIncludeInRelease +\IncludeInRelease{2021/06/01}{\loggingall} + {\tracingstacklevels and \tracinglostchars=3}% +\edef\loggingall{% + \tracingstats\tw@ + \tracingpages\@ne + \tracinglostchars\thr@@ + \tracingparagraphs\@ne + \tracinggroups\@ne + \tracingifs\@ne + \tracingscantokens\@ne + \tracingnesting\@ne + \errorcontextlines\maxdimen + \ifdefined\tracingstacklevels \tracingstacklevels\maxdimen \fi + \noexpand \loggingoutput + \tracingmacros\tw@ + \tracingcommands\thr@@ + \tracingrestores\@ne + \tracingassigns\@ne +}% +\def\tracingall{\showoverfull\loggingall} +\EndIncludeInRelease + \IncludeInRelease{2015/01/01}{\loggingall}{etex tracing}% \ifx\tracingscantokens\@undefined \gdef\loggingall{% @@ -712,6 +892,7 @@ of this package available from CTAN} \fi \gdef\tracingall{\showoverfull\loggingall} \EndIncludeInRelease + \IncludeInRelease{0000/00/00}{\loggingall}{etex tracing}% \gdef\loggingall{\tracingcommands\tw@\tracingstats\tw@ \tracingpages\@ne\tracinglostchars\@ne @@ -721,6 +902,30 @@ of this package available from CTAN} \EndIncludeInRelease \IncludeInRelease{2015/01/01}{\tracingnone}% {turn off etex tracing}% +\edef\tracingnone{% + \tracingassigns\z@ + \tracingrestores\z@ + \tracingonline\z@ + \tracingcommands\z@ + \showboxdepth\m@ne + \showboxbreadth\m@ne + \tracingoutput\z@ + \errorcontextlines\m@ne + \ifdefined\tracingstacklevels \tracingstacklevels\z@ \fi + \tracingnesting\z@ + \tracingscantokens\z@ + \tracingifs\z@ + \tracinggroups\z@ + \tracingparagraphs\z@ + \tracingmacros\z@ + \tracinglostchars\@ne + \tracingpages\z@ + \tracingstats\z@ +}% +\EndIncludeInRelease + +\IncludeInRelease{2015/01/01}{\tracingnone}% + {turn off etex tracing}% \ifx\tracingscantokens\@undefined \def\tracingnone{% \tracingonline\z@ @@ -757,6 +962,14 @@ of this package available from CTAN} \tracingstats\z@ }% \fi +\EndIncludeInRelease + +\IncludeInRelease{0000/00/00}{\tracingnone}% + {turn off etex tracing}% +\let\tracingnone\@undefined +\EndIncludeInRelease +\IncludeInRelease{2015/01/01}{\hideoutput}% + {hide output from tracing}% \def\hideoutput{% \tracingoutput\z@ \showboxbreadth\m@ne @@ -764,9 +977,9 @@ of this package available from CTAN} \tracingonline\m@ne }% \EndIncludeInRelease -\IncludeInRelease{0000/00/00}{\tracingnone}% - {turn off etex tracing}% -\let\tracingnone\@undefined + +\IncludeInRelease{0000/00/00}{\hideoutput}% + {hide output from tracing}% \let\hideoutput\@undefined \EndIncludeInRelease \ifx\directlua\@undefined\else @@ -980,21 +1193,28 @@ of this package available from CTAN} \fi %%% From File: ltexpl.dtx \IncludeInRelease{2020/10/01}% - {kernel@enddocument hooks}{Define kernel enddocument Hooks}% -\let\@kernel@after@enddocument\@empty -\let\@kernel@after@enddocument@afterlastpage\@empty + {kernel@enddocument hooks}{Define several kernel hooks} +\ifx\@kernel@after@enddocument\@undefined + \let \@kernel@after@enddocument \@empty + \let \@kernel@after@enddocument@afterlastpage \@empty + \let \@kernel@before@begindocument \@empty + \let \@kernel@after@begindocument \@empty +\fi \EndIncludeInRelease \IncludeInRelease{0000/00/00}% - {kernel@enddocument hooks}{Define kernel enddocument Hooks}% + {kernel@enddocument hooks}{Define several kernel hooks} \let\@kernel@after@enddocument\@undefined \let\@kernel@after@enddocument@afterlastpage\@undefined +\let\@kernel@before@begindocument\@undefined +\let\@kernel@after@begindocument\@undefined \EndIncludeInRelease \IncludeInRelease{2020/10/01}% {\@expl@sys@load@backend@@}{Roll forward support}% -\def\@expl@sys@load@backend@@{} -\def\@expl@push@filename@@{} -\def\@expl@push@filename@aux@@{} -\def\@expl@pop@filename@@{} +\def\reserved@a#1{\ifdefined#1\else\def#1{}\fi} +\reserved@a\@expl@sys@load@backend@@ +\reserved@a\@expl@push@filename@@ +\reserved@a\@expl@push@filename@aux@@ +\reserved@a\@expl@pop@filename@@ \EndIncludeInRelease \IncludeInRelease{2020/10/01}% {expl3}{Pre-load expl3}% @@ -1034,17 +1254,9 @@ of this package available from CTAN} --- I'm giving up!\MessageBreak\MessageBreak Note that manually loading the expl3 package\MessageBreak from your distribution is not enough}% - \@@end % die - }% - {% - \input expl3.ltx - \ifdefined\NewDocumentCommand - \else - \IfFileExists{xparse.ltx} - {\input xparse.ltx } - {}% - \fi + \batchmode \read -1 to \reserved@a }% + {\input expl3.ltx }% } \EndIncludeInRelease @@ -1068,14 +1280,6 @@ of this package available from CTAN} }% \input{expl3.ltx} \EndIncludeInRelease -\IncludeInRelease{2020/10/01}% - {\NewDocumentCommand}{Emergency loading xparse}% - -\ifdefined\NewDocumentCommand \else - \RequirePackage{xparse} -\fi - -\EndIncludeInRelease \IncludeInRelease{2020/10/01}{\@expl@cs@to@str@@N}% {expl3 macros added for the 2020-10-01 release}% \ExplSyntaxOn @@ -1122,7 +1326,7 @@ of this package available from CTAN} \count@=\escapechar \escapechar=`\\ \@ifundefined{\expandafter\@gobble\string#1}{% - \@latex@error{The control sequence `\string#1' is undefined!% + \@latex@error{Command `\string#1' is undefined!% \MessageBreak There is nothing here to make robust}% \@eha }% @@ -1142,7 +1346,7 @@ of this package available from CTAN} \noexpand\protect\expandafter\noexpand \csname\expandafter\@gobble\string#1\space\endcsname}% }% - {\@latex@info{The control sequence `\string#1' is already robust}}% + {\@latex@info{Command `\string#1' is already robust}}% }% \escapechar=\count@ }% @@ -1576,15 +1780,2281 @@ of this package available from CTAN} \kernel@make@fragile\underbar \EndIncludeInRelease -%% -%% File: lthooks.dtx (C) Copyright 2020 Frank Mittelbach, -%% Phelype Oleinik & LaTeX Team +%%% From File: ltcmd.dtx +\def\ltcmdversion{v1.0e} +\def\ltcmddate{2021-05-24} +\edef\@latexrelease@catcode@null{\the\catcode`\^^@ } +\catcode`\^^@=12 +\ExplSyntaxOn +\NewModuleRelease{2020/10/01}{ltcmd} + {Document~command~parser}% +\tl_new:N \l__cmd_arg_spec_tl +\tl_new:N \l__cmd_args_tl +\tl_new:N \l__cmd_args_i_tl +\tl_new:N \l__cmd_args_ii_tl +\int_new:N \l__cmd_current_arg_int +\bool_new:N \l__cmd_defaults_bool +\tl_new:N \l__cmd_defaults_tl +\bool_new:N \l__cmd_environment_bool +\str_new:N \l__cmd_environment_str +\bool_new:N \l__cmd_expandable_bool +\tl_new:N \l__cmd_expandable_aux_name_tl +\tl_set:Nn \l__cmd_expandable_aux_name_tl + { + \l__cmd_function_tl \c_space_tl + ( arg~ \int_use:N \l__cmd_current_arg_int ) + } +\int_new:N \g__cmd_grabber_int +\tl_new:N \l__cmd_fn_tl +\tl_new:N \l__cmd_fn_code_tl +\tl_new:N \l__cmd_function_tl +\bool_new:N \l__cmd_grab_expandably_bool +\bool_new:N \l__cmd_obey_spaces_bool +\tl_new:N \l__cmd_last_delimiters_tl +\bool_new:N \l__cmd_long_bool +\int_new:N \l__cmd_m_args_int +\bool_new:N \l__cmd_prefixed_bool +\tl_new:N \l__cmd_process_all_tl +\tl_new:N \l__cmd_process_one_tl +\bool_new:N \l__cmd_process_some_bool +\tl_new:N \l__cmd_saved_args_tl +\tl_new:N \l__cmd_signature_tl +\bool_new:N \l__cmd_some_obey_spaces_bool +\bool_new:N \l__cmd_some_long_bool +\bool_new:N \l__cmd_some_short_bool +\prop_new:N \l__cmd_tmp_prop +\tl_new:N \l__cmd_tmpa_tl +\tl_new:N \l__cmd_tmpb_tl +\cs_new_eq:NN \__cmd_tmp:w ? +\msg_redirect_module:nnn { cmd } { info } { none } +\prop_gput:Nnn \g_msg_module_type_prop { cmd } { LaTeX } +\cs_new_protected:Npn \__cmd_declare_cmd:Nnn + { + \bool_set_false:N \l__cmd_expandable_bool + \__cmd_declare_cmd_aux:Nnn + } +\cs_new_protected:Npn \__cmd_declare_expandable_cmd:Nnn + { + \bool_set_true:N \l__cmd_expandable_bool + \__cmd_declare_cmd_aux:Nnn + } +\cs_new_protected:Npn \__cmd_declare_cmd_aux:Nnn #1#2#3 + { + \cs_if_exist:NTF #1 + { + \msg_info:nnxx { cmd } { redefine-command } + { \token_to_str:N #1 } { \tl_to_str:n {#2} } + } + { + \bool_lazy_or:nnT + { \cs_if_exist_p:c { \cs_to_str:N #1 ~ code } } + { \cs_if_exist_p:c { \cs_to_str:N #1 ~ defaults } } + { + \msg_warning:nnx { cmd } { unsupported-let } + { \token_to_str:N #1 } + } + \msg_info:nnxx { cmd } { define-command } + { \token_to_str:N #1 } { \tl_to_str:n {#2} } + } + \bool_set_false:N \l__cmd_environment_bool + \__cmd_declare_cmd_internal:Nnnn #1 {#2} {#3} { } + } +\cs_new_protected:Npn \__cmd_declare_cmd_internal:Nnnn #1#2#3#4 + { + \tl_set:Nx \l__cmd_function_tl { \cs_to_str:N #1 } + \tl_set:Nx \l__cmd_fn_tl + { \exp_not:c { \l__cmd_function_tl \c_space_tl } } + \__cmd_normalize_arg_spec:n {#2} + \exp_args:No \__cmd_prepare_signature:n \l__cmd_arg_spec_tl + \__cmd_declare_cmd_code:Nnn #1 {#2} {#3} + #4 + \__cmd_break_point:n {#2} + } +\cs_generate_variant:Nn \__cmd_declare_cmd_internal:Nnnn { cnx } +\cs_new_eq:NN \__cmd_break_point:n \use_none:n +\cs_new_protected:Npn \__cmd_declare_cmd_code:Nnn + { + \bool_if:NTF \l__cmd_grab_expandably_bool + { \__cmd_declare_cmd_code_expandable:Nnn } + { \__cmd_declare_cmd_code_aux:Nnn } + } +\cs_new_protected:Npn \__cmd_declare_cmd_code_aux:Nnn #1#2#3 + { + \cs_generate_from_arg_count:cNnn + { \l__cmd_function_tl \c_space_tl code } + \cs_set_protected:Npn \l__cmd_current_arg_int {#3} + \cs_set_protected_nopar:Npx #1 + { + \bool_if:NTF \l__cmd_environment_bool + { + \__cmd_start_env:nnnnn { \exp_not:n {#2} } + { \l__cmd_environment_str } + } + { + \__cmd_start:nNNnnn { \exp_not:n {#2} } + \exp_not:c { \l__cmd_function_tl \c_space_tl } + \exp_not:c { \l__cmd_function_tl \c_space_tl code } + } + { \exp_not:o \l__cmd_signature_tl } + { + \bool_if:NT \l__cmd_defaults_bool + { \exp_not:o \l__cmd_defaults_tl } + } + { + \bool_if:NT \l__cmd_process_some_bool + { \exp_not:o \l__cmd_process_all_tl } + } + } + } +\cs_new_protected:Npn \__cmd_declare_cmd_code_expandable:Nnn #1#2#3 + { + \exp_args:Ncc \cs_generate_from_arg_count:NNnn + { \l__cmd_function_tl \c_space_tl code } + { cs_set \bool_if:NF \l__cmd_expandable_bool { _protected } :Npn } + \l__cmd_current_arg_int {#3} + \bool_if:NT \l__cmd_defaults_bool + { + \use:x + { + \cs_generate_from_arg_count:cNnn + { \l__cmd_function_tl \c_space_tl defaults } + \cs_set:Npn \l__cmd_current_arg_int + { \exp_not:o \l__cmd_defaults_tl } + } + } + \bool_if:NTF \l__cmd_expandable_bool + { \cs_set_nopar:Npx } { \cs_set_protected_nopar:Npx } #1 + { + \exp_not:N \__cmd_start_expandable:nNNNNn + { \exp_not:n {#2} } + \exp_not:c { \l__cmd_function_tl \c_space_tl } + \exp_not:c + { + \l__cmd_function_tl \c_space_tl + \bool_if:NT \l__cmd_some_short_bool + { \bool_if:NT \l__cmd_some_long_bool { \c_space_tl } } + } + \exp_not:c { \l__cmd_function_tl \c_space_tl code } + \bool_if:NTF \l__cmd_defaults_bool + { \exp_not:c { \l__cmd_function_tl \c_space_tl defaults } } + { ? } + { \exp_not:o \l__cmd_signature_tl } + } + \bool_if:NTF \l__cmd_some_long_bool + { + \bool_if:NT \l__cmd_some_short_bool + { + \cs_set_nopar:cpx { \l__cmd_function_tl \c_space_tl \c_space_tl } + ##1##2 { ##1 {##2} } + } + \cs_set:cpx + } + { \cs_set_nopar:cpx } + { \l__cmd_function_tl \c_space_tl } ##1##2 { ##1 {##2} } + } +\cs_new_protected:Npn \__cmd_declare_env:nnnn #1#2 + { + \str_set:Nx \l__cmd_environment_str {#1} + \str_set:Nx \l__cmd_environment_str + { \tl_trim_spaces:o { \l__cmd_environment_str } } + \cs_if_exist:cTF { \l__cmd_environment_str } + { + \msg_info:nnxx { cmd } { redefine-environment } + { \l__cmd_environment_str } { \tl_to_str:n {#2} } + } + { + \msg_info:nnxx { cmd } { define-environment } + { \l__cmd_environment_str } { \tl_to_str:n {#2} } + } + \bool_set_false:N \l__cmd_expandable_bool + \bool_set_true:N \l__cmd_environment_bool + \exp_args:NV \__cmd_declare_env_internal:nnnn + \l__cmd_environment_str {#2} + } +\cs_new_protected:Npn \__cmd_declare_env_internal:nnnn #1#2#3#4 + { + \__cmd_declare_cmd_internal:cnxn { environment~ #1 } {#2} + { + \cs_set_nopar:Npx \exp_not:c { environment~ #1 ~end~aux } + { + \exp_not:N \exp_not:N \exp_not:c { environment~ #1~end~aux~ } + \exp_not:n { \exp_not:o \l__cmd_args_tl } + } + \exp_not:n {#3} + } + { + \cs_set_nopar:cpx { environment~ #1 ~end } + { \exp_not:c { environment~ #1 ~end~aux } } + \cs_generate_from_arg_count:cNnn + { environment~ #1 ~end~aux~ } \cs_set:Npn + \l__cmd_current_arg_int {#4} + \cs_set_eq:cc {#1} { environment~ #1 } + \cs_set_eq:cc { end #1 } { environment~ #1 ~end } + } + } +\cs_new_protected:Npn \__cmd_start_env:nnnnn #1#2 + { + \conditionally@traceoff + \group_align_safe_begin: + \str_set:Nn \l__cmd_environment_str {#2} + \bool_set_true:N \l__cmd_environment_bool + \__cmd_start_aux:ccnnnn + { environment~ \l__cmd_environment_str \c_space_tl } + { environment~ \l__cmd_environment_str \c_space_tl code } + {#1} + } +\cs_new_protected:Npx \__cmd_start:nNNnnn #1#2#3 + { + \exp_not:c { xparse~function~is~not~expandable } + \exp_not:N \conditionally@traceoff + \exp_not:N \group_align_safe_begin: + \exp_not:n { \bool_set_false:N \l__cmd_environment_bool } + \exp_not:N \__cmd_start_aux:NNnnnn + #2 #3 {#1} + } +\cs_new_protected:Npn \__cmd_start_aux:NNnnnn #1#2#3#4#5#6 + { + \tl_clear:N \l__cmd_args_tl + \tl_set:Nn \l__cmd_fn_tl {#1} + \tl_set:Nn \l__cmd_fn_code_tl {#2} + \tl_set:Nn \l__cmd_defaults_tl {#5} + \tl_set:Nn \l__cmd_process_all_tl {#6} + #4 \__cmd_run_code: + } +\cs_generate_variant:Nn \__cmd_start_aux:NNnnnn { cc } +\cs_new_protected:Npn \__cmd_run_code: + { + \tl_if_empty:NF \l__cmd_defaults_tl { \__cmd_defaults: } + \tl_if_empty:NF \l__cmd_process_all_tl { \__cmd_args_process: } + \group_align_safe_end: + \conditionally@traceon + \exp_after:wN \l__cmd_fn_code_tl \l__cmd_args_tl + } +\cs_new_protected:Npn \__cmd_defaults: + { + \__cmd_defaults_def: + \tl_set_eq:NN \l__cmd_args_i_tl \l__cmd_args_tl + \__cmd_defaults_aux: \__cmd_defaults_aux: \__cmd_defaults_aux: + \__cmd_defaults_aux: \__cmd_defaults_aux: \__cmd_defaults_aux: + \__cmd_defaults_aux: \__cmd_defaults_aux: \__cmd_defaults_aux: + \__cmd_defaults_error:w + \q_recursion_stop + \tl_set_eq:NN \l__cmd_args_tl \l__cmd_args_i_tl + } +\cs_new_protected:Npn \__cmd_defaults_aux: + { + \tl_set:Nx \l__cmd_args_ii_tl + { \exp_after:wN \__cmd_tmp:w \l__cmd_args_i_tl } + \tl_if_eq:NNT \l__cmd_args_ii_tl \l__cmd_args_i_tl + { \use_none_delimit_by_q_recursion_stop:w } + \tl_set_eq:NN \l__cmd_args_i_tl \l__cmd_args_ii_tl + } +\cs_new_protected:Npn \__cmd_defaults_error:w \q_recursion_stop + { + \msg_error:nnx { cmd } { loop-in-defaults } + { \__cmd_environment_or_command: } + } +\cs_new_protected:Npn \__cmd_defaults_def: + { + \tl_clear:N \l__cmd_tmpa_tl + \int_zero:N \l__cmd_current_arg_int + \__cmd_tl_mapthread_function:NNN \l__cmd_args_tl \l__cmd_defaults_tl + \__cmd_defaults_def:nn + \cs_generate_from_arg_count:NNVo \__cmd_tmp:w \cs_set:Npn + \l__cmd_current_arg_int \l__cmd_tmpa_tl + } +\cs_generate_variant:Nn \cs_generate_from_arg_count:NNnn { NNVo } +\cs_new_protected:Npn \__cmd_defaults_def:nn + { + \int_incr:N \l__cmd_current_arg_int + \exp_args:NV \__cmd_defaults_def:nnn \l__cmd_current_arg_int + } +\cs_new_protected:Npn \__cmd_defaults_def:nnn #1#2#3 + { + \tl_put_right:Nx \l__cmd_tmpa_tl + { + { + \exp_not:N \exp_not:n + { + \tl_if_novalue:nTF {#2} + { \exp_not:o {#3} } + { \exp_not:n { ## #1 } } + } + } + } + } +\cs_new_protected:Npn \__cmd_args_process: + { + \tl_clear:N \l__cmd_args_ii_tl + \__cmd_tl_mapthread_function:NNN + \l__cmd_args_tl + \l__cmd_process_all_tl + \__cmd_args_process_loop:nn + \tl_set_eq:NN \l__cmd_args_tl \l__cmd_args_ii_tl + } +\cs_new_protected:Npn \__cmd_args_process_loop:nn #1#2 + { + \tl_set:Nn \ProcessedArgument {#1} + \tl_if_novalue:nF {#1} + { \tl_map_function:nN {#2} \__cmd_args_process_aux:n } + \tl_put_right:No \l__cmd_args_ii_tl + { \exp_after:wN { \ProcessedArgument } } + } +\cs_new_protected:Npn \__cmd_args_process_aux:n #1 + { + \cs_generate_from_arg_count:NNnn \__cmd_tmp:w \cs_set:Npn + { \tl_count:N \l__cmd_args_tl } {#1} + \exp_args:NNNo \exp_after:wN \__cmd_tmp:w \l__cmd_args_tl + { \ProcessedArgument } + } +\cs_new:Npn \__cmd_start_expandable:nNNNNn #1#2#3#4#5#6 + { + \group_align_safe_begin: + #6 \__cmd_end_expandable:NNw #5 #4 \q__cmd #2#3 + } +\cs_new:Npn \__cmd_end_expandable:NNw #1#2 + { \__cmd_end_expandable_aux:w #1#2 \prg_do_nothing: } +\cs_new:Npn \__cmd_end_expandable_aux:w #1#2#3 \q__cmd + { \exp_args:No \__cmd_end_expandable_aux:nNNNN {#3} #1 #2 } +\cs_new:Npn \__cmd_end_expandable_aux:nNNNN #1#2#3#4#5 + { + \token_if_eq_charcode:NNT ? #2 { \exp_after:wN \use_iv:nnnn } + \__cmd_end_expandable_defaults:nnnNNn {#1} { } {#1} #2#3 + { } { } { } { } { } { } { } { } { } { } + { + \msg_expandable_error:nnf { cmd } { loop-in-defaults } + { \exp_args:Nf \tl_trim_spaces:n { \token_to_str:N #4 } } + \use_iv:nnnn + } + \q_stop + } +\cs_new:Npn \__cmd_end_expandable_defaults:nnnNNn #1#2#3#4#5#6 + { + #6 + \str_if_eq:nnTF {#1} {#2} + { \use_i_delimit_by_q_stop:nw { \group_align_safe_end: #5 #1 } } + { + \exp_args:No \__cmd_tl_mapthread_function:nnN + { #4 #1 } {#3} + \__cmd_end_expandable_defaults:nnw + \__cmd_end_expandable_defaults:nnnNNn { } {#1} {#3} #4 #5 + } + } +\cs_new:Npn \__cmd_end_expandable_defaults:nnw #1#2 + { + \tl_if_novalue:nTF {#2} + { \exp_args:No \__cmd_end_expandable_defaults:nw {#1} } + { \__cmd_end_expandable_defaults:nw {#2} } + } +\cs_new:Npn \__cmd_end_expandable_defaults:nw + #1#2 \__cmd_end_expandable_defaults:nnnNNn #3 + { #2 \__cmd_end_expandable_defaults:nnnNNn { #3 {#1} } } +\cs_new_protected:Npn \__cmd_normalize_arg_spec:n #1 + { + \int_zero:N \l__cmd_current_arg_int + \tl_clear:N \l__cmd_last_delimiters_tl + \tl_clear:N \l__cmd_arg_spec_tl + \bool_set_true:N \l__cmd_grab_expandably_bool + \bool_set_false:N \l__cmd_obey_spaces_bool + \bool_set_false:N \l__cmd_long_bool + \bool_set_false:N \l__cmd_some_obey_spaces_bool + \bool_set_false:N \l__cmd_some_long_bool + \bool_set_false:N \l__cmd_some_short_bool + \__cmd_normalize_arg_spec_loop:n #1 + \q_recursion_tail \q_recursion_tail \q_recursion_tail \q_recursion_stop + \int_compare:nNnT \l__cmd_current_arg_int > 9 + { + \msg_error:nnxx { cmd } { too-many-arguments } + { \__cmd_environment_or_command: } { \tl_to_str:n {#1} } + \__cmd_bad_def:wn + } + \bool_if:NT \l__cmd_expandable_bool + { + \tl_if_empty:NF \l__cmd_last_delimiters_tl + { + \msg_error:nnxx { cmd } { expandable-ending-optional } + { \iow_char:N \\ \l__cmd_function_tl } { \tl_to_str:n {#1} } + \__cmd_bad_def:wn + } + } + \bool_if:NT \l__cmd_expandable_bool + { \bool_set_true:N \l__cmd_grab_expandably_bool } + \bool_if:NT \l__cmd_environment_bool + { \bool_set_false:N \l__cmd_grab_expandably_bool } + } +\cs_new_protected:Npn \__cmd_normalize_arg_spec_loop:n #1 + { + \quark_if_recursion_tail_stop:n {#1} + \int_incr:N \l__cmd_current_arg_int + \cs_if_exist_use:cF { __cmd_normalize_type_ \tl_to_str:n {#1} :w } + { + \bool_lazy_any:nTF + { + { \str_if_eq_p:nn {#1} { G } } + { \str_if_eq_p:nn {#1} { g } } + { \str_if_eq_p:nn {#1} { l } } + { \str_if_eq_p:nn {#1} { u } } + } + { + \msg_error:nnxx { cmd } { xparse-argument-type } + { \__cmd_environment_or_command: } { \tl_to_str:n {#1} } + } + { + \msg_error:nnxx { cmd } { unknown-argument-type } + { \__cmd_environment_or_command: } { \tl_to_str:n {#1} } + } + \__cmd_bad_def:wn + } + } +\cs_set_protected:Npn \__cmd_tmp:w #1 + { + \cs_new_protected:Npn \__cmd_normalize_type_d:w ##1##2 + { + \quark_if_recursion_tail_stop_do:nn {##2} { \__cmd_bad_arg_spec:wn } + \__cmd_normalize_type_D:w {##1} {##2} {#1} + } + \cs_new_protected:Npn \__cmd_normalize_type_e:w ##1 + { + \quark_if_recursion_tail_stop_do:nn {##1} { \__cmd_bad_arg_spec:wn } + \__cmd_normalize_type_E:w {##1} { } + } + \cs_new_protected:Npn \__cmd_normalize_type_o:w + { \__cmd_normalize_type_D:w [ ] {#1} } + \cs_new_protected:Npn \__cmd_normalize_type_O:w + { \__cmd_normalize_type_D:w [ ] } + \cs_new_protected:Npn \__cmd_normalize_type_r:w ##1##2 + { + \quark_if_recursion_tail_stop_do:nn {##2} { \__cmd_bad_arg_spec:wn } + \__cmd_normalize_type_R:w {##1} {##2} {#1} + } + \cs_new_protected:Npn \__cmd_normalize_type_s:w + { \__cmd_normalize_type_t:w * } + } +\exp_args:No \__cmd_tmp:w { \c_novalue_tl } +\cs_new_protected:cpn { __cmd_normalize_type_>:w } #1#2 + { + \quark_if_recursion_tail_stop_do:nn {#2} { \__cmd_bad_arg_spec:wn } + \bool_if:NT \l__cmd_expandable_bool + { + \msg_error:nnxx { cmd } { processor-in-expandable } + { \iow_char:N \\ \l__cmd_function_tl } { \tl_to_str:n {#1} } + \__cmd_bad_def:wn + } + \tl_put_right:Nx \l__cmd_arg_spec_tl { > { \tl_trim_spaces:n {#1} } } + \int_decr:N \l__cmd_current_arg_int + \bool_set_false:N \l__cmd_grab_expandably_bool + \__cmd_normalize_arg_spec_loop:n {#2} + } +\cs_new_protected:cpn { __cmd_normalize_type_+:w } #1 + { + \quark_if_recursion_tail_stop_do:nn {#1} { \__cmd_bad_arg_spec:wn } + \bool_if:NT \l__cmd_long_bool + { + \msg_error:nnxx { cmd } { two-markers } + { \__cmd_environment_or_command: } { + } + \__cmd_bad_def:wn + } + \bool_set_true:N \l__cmd_long_bool + \int_decr:N \l__cmd_current_arg_int + \__cmd_normalize_arg_spec_loop:n {#1} + } +\cs_new_protected:cpn { __cmd_normalize_type_!:w } #1 + { + \quark_if_recursion_tail_stop_do:nn {#1} { \__cmd_bad_arg_spec:wn } + \bool_if:NT \l__cmd_obey_spaces_bool + { + \msg_error:nnxx { cmd } { two-markers } + { \__cmd_environment_or_command: } { ! } + \__cmd_bad_def:wn + } + \bool_set_true:N \l__cmd_obey_spaces_bool + \bool_set_true:N \l__cmd_some_obey_spaces_bool + \int_decr:N \l__cmd_current_arg_int + \__cmd_normalize_arg_spec_loop:n {#1} + } +\cs_new_protected:Npn \__cmd_normalize_type_D:w #1#2#3 + { + \quark_if_recursion_tail_stop_do:nn {#3} { \__cmd_bad_arg_spec:wn } + \__cmd_single_token_check:n {#1} \__cmd_allowed_token_check:N #1 + \__cmd_single_token_check:n {#2} + \__cmd_add_arg_spec:n { D #1 #2 {#3} } + \tl_put_right:Nn \l__cmd_last_delimiters_tl {#1} + \bool_set_false:N \l__cmd_grab_expandably_bool + \__cmd_normalize_arg_spec_loop:n + } +\cs_new_protected:Npn \__cmd_normalize_type_E:w #1#2 + { + \quark_if_recursion_tail_stop_do:nn {#2} { \__cmd_bad_arg_spec:wn } + \tl_if_blank:nT {#1} { \__cmd_bad_arg_spec:wn } + \tl_map_function:nN {#1} \__cmd_single_token_check:n + \tl_map_function:nN {#1} \__cmd_allowed_token_check:N + \__cmd_normalize_E_unique_check:w #1 \q_nil \q_stop + \int_compare:nNnT { \tl_count:n {#2} } > { \tl_count:n {#1} } + { \__cmd_bad_arg_spec:wn } + \__cmd_add_arg_spec:n { E {#1} {#2} } + \tl_put_right:Nn \l__cmd_last_delimiters_tl {#1} + \bool_set_false:N \l__cmd_grab_expandably_bool + \int_add:Nn \l__cmd_current_arg_int { \tl_count:n {#1} - 1 } + \__cmd_normalize_arg_spec_loop:n + } +\cs_new_protected:Npn \__cmd_normalize_E_unique_check:w #1#2 \q_stop + { + \quark_if_nil:NF #1 + { + \tl_if_in:nnT {#2} {#1} { \__cmd_bad_arg_spec:wn } + \__cmd_normalize_E_unique_check:w #2 \q_stop + } + } +\cs_new_protected:Npn \__cmd_normalize_type_t:w #1 + { + \quark_if_recursion_tail_stop_do:Nn #1 { \__cmd_bad_arg_spec:wn } + \__cmd_single_token_check:n {#1} \__cmd_allowed_token_check:N #1 + \tl_put_right:Nx \l__cmd_arg_spec_tl + { + \bool_if:NT \l__cmd_obey_spaces_bool { ! } + t \exp_not:n {#1} + } + \tl_put_right:Nn \l__cmd_last_delimiters_tl {#1} + \bool_set_false:N \l__cmd_grab_expandably_bool + \bool_set_false:N \l__cmd_obey_spaces_bool + \bool_set_false:N \l__cmd_long_bool + \__cmd_normalize_arg_spec_loop:n + } +\cs_new_protected:Npn \__cmd_normalize_type_m:w + { + \__cmd_delimiter_check:nnn { } { m } { \iow_char:N \{ } + \__cmd_add_arg_spec_mandatory:n { m } + \__cmd_normalize_arg_spec_loop:n + } +\cs_new_protected:Npn \__cmd_normalize_type_R:w #1#2#3 + { + \quark_if_recursion_tail_stop_do:nn {#3} { \__cmd_bad_arg_spec:wn } + \__cmd_single_token_check:n {#1} \__cmd_allowed_token_check:N #1 + \__cmd_single_token_check:n {#2} + \__cmd_delimiter_check:nnn {#1} { R/r } { \tl_to_str:n {#1} } + \bool_set_false:N \l__cmd_grab_expandably_bool + \__cmd_add_arg_spec_mandatory:n { R #1 #2 {#3} } + \__cmd_normalize_arg_spec_loop:n + } +\cs_new_protected:Npn \__cmd_normalize_type_v:w + { + \__cmd_normalize_check_gv:N v + \__cmd_add_arg_spec_mandatory:n { v } + \__cmd_normalize_arg_spec_loop:n + } +\cs_new_protected:Npn \__cmd_normalize_type_b:w #1 + { + \bool_if:NF \l__cmd_environment_bool + { + \msg_error:nnxx { cmd } { invalid-command-arg } + { \__cmd_environment_or_command: } { b } + \__cmd_bad_def:wn + } + \tl_clear:N \l__cmd_last_delimiters_tl + \__cmd_add_arg_spec:n { b } + \quark_if_recursion_tail_stop:n {#1} + \msg_error:nnxx { cmd } { arg-after-body } + { \__cmd_environment_or_command: } + { \tl_to_str:n {#1} } + \__cmd_bad_def:wn + } +\cs_new_protected:Npn \__cmd_single_token_check:n #1 + { + \tl_trim_spaces_apply:nN {#1} \tl_if_single_token:nF + { + \msg_error:nnxx { cmd } { not-single-token } + { \__cmd_environment_or_command: } { \tl_to_str:n {#1} } + \__cmd_bad_def:wn + } + } +\cs_new_protected:Npn \__cmd_allowed_token_check:N #1 + { + \token_if_eq_meaning:NNTF #1 \c_group_begin_token + { \use:n } + { + \token_if_eq_meaning:NNTF #1 \c_group_end_token + { \use:n } + { \use_none:n } + } + { + \msg_error:nnxxx { cmd } { forbidden-implicit-group-token } + { \__cmd_environment_or_command: } { \tl_to_str:n {#1} } + { + \token_if_eq_meaning:NNTF #1 \c_group_begin_token + { begin } { end } + } + \__cmd_bad_def:wn + } + } +\cs_new_protected:Npn \__cmd_normalize_check_gv:N #1 + { + \bool_if:NT \l__cmd_expandable_bool + { + \msg_error:nnxx { cmd } { invalid-expandable-argument-type } + { \iow_char:N \\ \l__cmd_function_tl } { \tl_to_str:n {#1} } + \__cmd_bad_def:wn + } + \bool_set_false:N \l__cmd_grab_expandably_bool + } +\cs_new_protected:Npn \__cmd_normalize_check_lu:N #1 + { + \bool_if:NT \l__cmd_expandable_bool + { + \tl_if_empty:NF \l__cmd_last_delimiters_tl + { + \msg_error:nnxx { cmd } { invalid-after-optional-expandably } + { \iow_char:N \\ \l__cmd_function_tl } { \tl_to_str:n {#1} } + \__cmd_bad_def:wn + } + } + } +\cs_new_protected:Npn \__cmd_delimiter_check:nnn #1#2#3 + { + \tl_map_inline:Nn \l__cmd_last_delimiters_tl + { + \tl_if_eq:nnT {##1} {#1} + { + \msg_warning:nnxx { cmd } { optional-mandatory } + {#2} {#3} + } + } + } +\cs_new_protected:Npn \__cmd_bad_arg_spec:wn #1 \__cmd_break_point:n #2 + { + \msg_error:nnxx { cmd } { bad-arg-spec } + { \__cmd_environment_or_command: } { \tl_to_str:n {#2} } + } +\cs_new_protected:Npn \__cmd_bad_def:wn #1 \__cmd_break_point:n #2 { } +\cs_new_protected:Npn \__cmd_add_arg_spec:n #1 + { + \bool_lazy_and:nnT + { ! \l__cmd_long_bool } + { \l__cmd_some_long_bool } + { + \bool_if:NT \l__cmd_expandable_bool + { + \msg_error:nnx { cmd } { inconsistent-long } + { \iow_char:N \\ \l__cmd_function_tl } + \__cmd_bad_def:wn + } + \bool_set_false:N \l__cmd_grab_expandably_bool + } + \bool_if:NTF \l__cmd_long_bool + { \bool_set_true:N \l__cmd_some_long_bool } + { \bool_set_true:N \l__cmd_some_short_bool } + \tl_put_right:Nx \l__cmd_arg_spec_tl + { + \bool_if:NT \l__cmd_long_bool { + } + \bool_if:NT \l__cmd_obey_spaces_bool { ! } + \exp_not:n {#1} + } + \bool_set_false:N \l__cmd_long_bool + \bool_set_false:N \l__cmd_obey_spaces_bool + } +\cs_new_protected:Npn \__cmd_add_arg_spec_mandatory:n #1 + { + \bool_if:NT \l__cmd_some_obey_spaces_bool + { + \msg_error:nnxx { cmd } { non-trailing-obey-spaces } + { \__cmd_environment_or_command: } { \tl_to_str:n {#1} } + \__cmd_bad_def:wn + } + \tl_clear:N \l__cmd_last_delimiters_tl + \__cmd_add_arg_spec:n {#1} + } +\cs_new_protected:Npn \__cmd_prepare_signature:n #1 + { + \int_zero:N \l__cmd_current_arg_int + \bool_set_false:N \l__cmd_long_bool + \bool_set_false:N \l__cmd_obey_spaces_bool + \int_zero:N \l__cmd_m_args_int + \bool_set_false:N \l__cmd_defaults_bool + \tl_clear:N \l__cmd_defaults_tl + \tl_clear:N \l__cmd_process_all_tl + \tl_clear:N \l__cmd_process_one_tl + \bool_set_false:N \l__cmd_process_some_bool + \tl_clear:N \l__cmd_signature_tl + \__cmd_prepare_signature:N #1 \q_recursion_tail \q_recursion_stop + \bool_if:NF \l__cmd_expandable_bool { \__cmd_flush_m_args: } + } +\cs_new_protected:Npn \__cmd_prepare_signature:N + { + \bool_set_false:N \l__cmd_prefixed_bool + \__cmd_prepare_signature_bypass:N + } +\cs_new_protected:Npn \__cmd_prepare_signature_bypass:N #1 + { + \quark_if_recursion_tail_stop:N #1 + \use:c + { + __cmd_add + \bool_if:NT \l__cmd_grab_expandably_bool { _expandable } + _type_ \token_to_str:N #1 :w + } + } +\cs_new_protected:cpn { __cmd_add_type_+:w } + { + \__cmd_flush_m_args: + \bool_set_true:N \l__cmd_long_bool + \bool_set_true:N \l__cmd_prefixed_bool + \__cmd_prepare_signature_bypass:N + } +\cs_new_protected:cpn { __cmd_add_type_!:w } + { + \__cmd_flush_m_args: + \bool_set_true:N \l__cmd_obey_spaces_bool + \bool_set_true:N \l__cmd_prefixed_bool + \__cmd_prepare_signature_bypass:N + } +\cs_new_protected:cpn { __cmd_add_type_>:w } #1 + { + \__cmd_flush_m_args: + \bool_set_true:N \l__cmd_prefixed_bool + \bool_set_true:N \l__cmd_process_some_bool + \tl_put_left:Nn \l__cmd_process_one_tl { {#1} } + \__cmd_prepare_signature_bypass:N + } +\cs_new_protected:Npn \__cmd_add_type_b:w + { + \__cmd_flush_m_args: + \__cmd_add_default: + \__cmd_add_grabber:N b + \__cmd_prepare_signature:N + } +\cs_new_protected:Npn \__cmd_add_type_D:w #1#2#3 + { + \__cmd_flush_m_args: + \__cmd_add_default:n {#3} + \__cmd_add_grabber:N D + \tl_put_right:Nn \l__cmd_signature_tl { #1 #2 } + \__cmd_prepare_signature:N + } +\cs_new_protected:Npn \__cmd_add_type_E:w #1#2 + { + \__cmd_flush_m_args: + \__cmd_add_default_E:nn {#1} {#2} + \__cmd_add_grabber:N E + \tl_put_right:Nn \l__cmd_signature_tl { {#1} } + \__cmd_prepare_signature:N + } +\cs_new_protected:Npn \__cmd_add_type_m:w + { + \__cmd_add_default: + \bool_if:NTF \l__cmd_prefixed_bool + { \__cmd_add_grabber:N m } + { \int_incr:N \l__cmd_m_args_int } + \__cmd_prepare_signature:N + } +\cs_new_protected:Npn \__cmd_add_type_R:w #1#2#3 + { + \__cmd_flush_m_args: + \__cmd_add_default:n {#3} + \__cmd_add_grabber:N R + \tl_put_right:Nn \l__cmd_signature_tl { #1 #2 } + \__cmd_prepare_signature:N + } +\cs_new_protected:Npn \__cmd_add_type_t:w #1 + { + \__cmd_flush_m_args: + \__cmd_add_default: + \__cmd_add_grabber:N t + \tl_put_right:Nn \l__cmd_signature_tl {#1} + \__cmd_prepare_signature:N + } +\cs_new_protected:Npn \__cmd_add_type_v:w + { + \__cmd_flush_m_args: + \exp_args:No \__cmd_add_default:n \c_novalue_tl + \__cmd_add_grabber:N v + \__cmd_prepare_signature:N + } +\cs_new_protected:Npn \__cmd_flush_m_args: + { + \int_compare:nNnT \l__cmd_m_args_int > 0 + { + \tl_put_right:Nx \l__cmd_signature_tl + { \exp_not:c { __cmd_grab_m_ \int_use:N \l__cmd_m_args_int :w } } + \tl_put_right:Nx \l__cmd_process_all_tl + { \prg_replicate:nn { \l__cmd_m_args_int } { { } } } + } + \int_zero:N \l__cmd_m_args_int + } +\cs_new_protected:Npn \__cmd_add_grabber:N #1 + { + \tl_put_right:Nx \l__cmd_signature_tl + { + \exp_not:c + { + __cmd_grab_ #1 + \bool_if:NT \l__cmd_long_bool { _long } + \bool_if:NT \l__cmd_obey_spaces_bool { _obey_spaces } + :w + } + } + \bool_set_false:N \l__cmd_long_bool + \bool_set_false:N \l__cmd_obey_spaces_bool + \tl_put_right:Nx \l__cmd_process_all_tl + { { \exp_not:o \l__cmd_process_one_tl } } + \tl_clear:N \l__cmd_process_one_tl + } +\cs_new_protected:Npn \__cmd_add_default:n #1 + { + \tl_if_novalue:nTF {#1} + { \__cmd_add_default: } + { + \int_incr:N \l__cmd_current_arg_int + \bool_set_true:N \l__cmd_defaults_bool + \tl_put_right:Nn \l__cmd_defaults_tl { { \prg_do_nothing: #1 } } + } + } +\cs_new_protected:Npn \__cmd_add_default: + { + \int_incr:N \l__cmd_current_arg_int + \tl_put_right:Nn \l__cmd_defaults_tl { \c_novalue_tl } + } +\cs_new_protected:Npn \__cmd_add_default_E:nn #1#2 + { + \tl_map_function:nN {#2} \__cmd_add_default:n + \prg_replicate:nn + { \tl_count:n {#1} - \tl_count:n {#2} } + { \__cmd_add_default: } + } +\cs_new_protected:cpn { __cmd_add_expandable_type_+:w } + { + \bool_set_true:N \l__cmd_long_bool + \__cmd_prepare_signature:N + } +\cs_new_protected:Npn \__cmd_add_expandable_type_D:w + { \__cmd_add_expandable_type_D_aux:NNNn D } +\cs_new_protected:Npn \__cmd_add_expandable_type_D_aux:NNNn #1#2#3#4 + { + \__cmd_add_default:n {#4} + \tl_if_eq:nnTF {#2} {#3} + { \__cmd_add_expandable_type_D_aux:NN #1 #2 } + { \__cmd_add_expandable_type_D_aux:NNN #1 #2 #3 } + \__cmd_prepare_signature:N + } +\cs_new_protected:Npn \__cmd_add_expandable_type_D_aux:NNN #1#2#3 + { + \bool_if:NTF \l__cmd_long_bool + { \cs_set:cpx } + { \cs_set_nopar:cpx } + { \l__cmd_expandable_aux_name_tl } ##1 ##2 #2 ##3 \q__cmd ##4 #3 + { ##1 {##2} {##3} {##4} } + \__cmd_add_expandable_grabber:nn {#1} + { + \exp_not:c { \l__cmd_expandable_aux_name_tl } + \exp_not:n { #2 #3 } + } + } +\cs_new_protected:Npn \__cmd_add_expandable_type_D_aux:NN #1#2 + { + \bool_if:NTF \l__cmd_long_bool + { \cs_set:cpx } + { \cs_set_nopar:cpx } + { \l__cmd_expandable_aux_name_tl } ##1 #2 ##2 #2 + { ##1 {##2} } + \__cmd_add_expandable_grabber:nn { #1_alt } + { + \exp_not:c { \l__cmd_expandable_aux_name_tl } + \exp_not:n {#2} + } + } +\cs_new_protected:Npn \__cmd_add_expandable_type_E:w #1#2 + { + \__cmd_add_default_E:nn {#1} {#2} + \tl_clear:N \l__cmd_tmpb_tl + \tl_map_function:nN {#1} \__cmd_add_expandable_type_E_aux:n + \__cmd_add_expandable_grabber:nn + { E \bool_if:NT \l__cmd_long_bool { _long } } + { + { \exp_not:o \l__cmd_tmpb_tl } + { + \prg_replicate:nn { \tl_count:n {#1} } + { { \c_novalue_tl } } + } + } + \__cmd_prepare_signature:N + } +\cs_new_protected:Npn \__cmd_add_expandable_type_E_aux:n #1 + { + \__cmd_get_grabber:NN #1 \l__cmd_tmpa_tl + \tl_put_right:Nx \l__cmd_tmpb_tl + { \exp_not:o \l__cmd_tmpa_tl \exp_not:N #1 } + } +\cs_new_protected:Npn \__cmd_add_expandable_type_m:w + { + \__cmd_add_default: + \__cmd_add_expandable_grabber:nn + { m \bool_if:NT \l__cmd_long_bool { _long } } { } + \__cmd_prepare_signature:N + } +\cs_new_protected:Npn \__cmd_add_expandable_type_R:w + { \__cmd_add_expandable_type_D_aux:NNNn R } +\cs_new_protected:Npn \__cmd_add_expandable_type_t:w #1 + { + \__cmd_add_default: + \__cmd_get_grabber:NN #1 \l__cmd_tmpa_tl + \__cmd_add_expandable_grabber:nn { t } + { + \exp_not:o \l__cmd_tmpa_tl + \exp_not:N #1 + } + \__cmd_prepare_signature:N + } +\cs_new_protected:Npn \__cmd_add_expandable_grabber:nn #1#2 + { + \tl_put_right:Nx \l__cmd_signature_tl + { \exp_not:c { __cmd_expandable_grab_ #1 :w } #2 } + } +\cs_new_protected:Npn \__cmd_get_grabber:NN #1#2 + { + \cs_set:Npn \__cmd_tmp:w ##1 #1 {##1} + \exp_args:Nc \__cmd_get_grabber_auxi:NN + { __cmd_grabber_ \token_to_str:N #1 :w } #2 + } +\cs_new_protected:Npn \__cmd_get_grabber_auxi:NN #1#2 + { + \cs_if_eq:NNTF \__cmd_tmp:w #1 + { \tl_set:Nn #2 {#1} } + { + \cs_if_exist:NTF #1 + { + \int_gincr:N \g__cmd_grabber_int + \exp_args:Nc \__cmd_get_grabber_auxi:NN + { + __cmd_grabber_ + - \int_use:N \g__cmd_grabber_int :w + } + #2 + } + { \__cmd_get_grabber_auxii:NN #1 #2 } + } + } +\cs_new_protected:Npn \__cmd_get_grabber_auxii:NN #1#2 + { + \cs_set_eq:NN #1 \__cmd_tmp:w + \tl_set:Nn #2 {#1} + } +\cs_new_protected:Npn \__cmd_grab_b:w + { \__cmd_grab_b_aux:NNw \cs_set_protected_nopar:Npn \tl_trim_spaces:n } +\cs_new_protected:Npn \__cmd_grab_b_long:w + { \__cmd_grab_b_aux:NNw \cs_set_protected:Npn \tl_trim_spaces:n } +\cs_new_protected:Npn \__cmd_grab_b_obey_spaces:w + { \__cmd_grab_b_aux:NNw \cs_set_protected_nopar:Npn \exp_not:n } +\cs_new_protected:Npn \__cmd_grab_b_long_obey_spaces:w + { \__cmd_grab_b_aux:NNw \cs_set_protected:Npn \exp_not:n } +\cs_new_protected:Npn \__cmd_grab_b_aux:NNw #1#2#3 \__cmd_run_code: + { + \__cmd_grab_D_aux:NNnN \begin \end {#3} #1 + \tl_put_left:Nn \l__cmd_signature_tl { \__cmd_grab_b_end:Nw #2 } + \tl_set_eq:NN \l__cmd_saved_args_tl \l__cmd_args_tl + \tl_clear:N \l__cmd_args_tl + \exp_args:Nc \l__cmd_fn_tl { begin ~ } + } +\cs_new_protected:Npn \__cmd_grab_b_end:Nw #1#2 \__cmd_run_code: + { + \tl_set:Nx \l__cmd_args_tl + { + \exp_not:V \l__cmd_saved_args_tl + { \exp_after:wN #1 \l__cmd_args_tl } + } + #2 + \__cmd_run_code: + \end + } +\cs_new_protected:Npn \__cmd_grab_D:w #1#2#3 \__cmd_run_code: + { + \__cmd_grab_D_aux:NNnNN #1 #2 {#3} \cs_set_protected_nopar:Npn + \__cmd_peek_nonspace_remove:NTF + } +\cs_new_protected:Npn \__cmd_grab_D_long:w #1#2#3 \__cmd_run_code: + { + \__cmd_grab_D_aux:NNnNN #1 #2 {#3} \cs_set_protected:Npn + \__cmd_peek_nonspace_remove:NTF + } +\cs_new_protected:Npn \__cmd_grab_D_obey_spaces:w #1#2#3 \__cmd_run_code: + { + \__cmd_grab_D_aux:NNnNN #1 #2 {#3} \cs_set_protected_nopar:Npn + \__cmd_peek_meaning_remove:NTF + } +\cs_new_protected:Npn \__cmd_grab_D_long_obey_spaces:w #1#2#3 \__cmd_run_code: + { + \__cmd_grab_D_aux:NNnNN #1 #2 {#3} \cs_set_protected:Npn + \__cmd_peek_meaning_remove:NTF + } +\cs_new_protected:Npn \__cmd_grab_D_aux:NNnNN #1#2#3#4#5 + { + \__cmd_grab_D_aux:NNnN #1#2 {#3} #4 + #5 #1 + { \__cmd_grab_D_call:Nw #1 } + { \__cmd_add_arg:o \c_novalue_tl } + } +\cs_new_protected:Npn \__cmd_grab_D_aux:NNnN #1#2#3#4 + { + \tl_set:Nn \l__cmd_signature_tl {#3} + \exp_after:wN #4 \l__cmd_fn_tl ##1 #2 + { + \tl_if_in:nnTF {##1} {#1} + { \__cmd_grab_D_nested:NNnN #1 #2 {##1} #4 } + { + \tl_if_blank:oTF { \use_none:n ##1 } + { \__cmd_add_arg:o { \use_none:n ##1 } } + { + \str_if_eq:eeTF + { \exp_not:o { \use_none:n ##1 } } + { { \exp_not:o { \use_ii:nnn ##1 \q_nil } } } + { \__cmd_add_arg:o { \use_ii:nn ##1 } } + { \__cmd_add_arg:o { \use_none:n ##1 } } + } + } + } + } +\tl_new:N \l__cmd_nesting_a_tl +\tl_new:N \l__cmd_nesting_b_tl +\quark_new:N \q__cmd +\cs_new_protected:Npn \__cmd_grab_D_nested:NNnN #1#2#3#4 + { + \tl_clear:N \l__cmd_nesting_a_tl + \tl_clear:N \l__cmd_nesting_b_tl + \exp_after:wN #4 \l__cmd_fn_tl ##1 #1 ##2 \q__cmd ##3 #2 + { + \tl_put_right:No \l__cmd_nesting_a_tl { \use_none:n ##1 #1 } + \tl_put_right:No \l__cmd_nesting_b_tl { \use_i:nn #2 ##3 } + \tl_if_in:nnTF {##2} {#1} + { + \l__cmd_fn_tl + \q_nil ##2 \q__cmd \ERROR + } + { + \tl_put_right:Nx \l__cmd_nesting_a_tl + { \__cmd_grab_D_nested:w \q_nil ##2 \q_stop } + \tl_if_in:NnTF \l__cmd_nesting_b_tl {#1} + { + \tl_set_eq:NN \l__cmd_tmpa_tl \l__cmd_nesting_b_tl + \tl_clear:N \l__cmd_nesting_b_tl + \exp_after:wN \l__cmd_fn_tl \exp_after:wN + \q_nil \l__cmd_tmpa_tl \q_nil \q__cmd \ERROR + } + { + \tl_put_right:No \l__cmd_nesting_a_tl + \l__cmd_nesting_b_tl + \__cmd_add_arg:V \l__cmd_nesting_a_tl + } + } + } + \l__cmd_fn_tl #3 \q_nil \q__cmd \ERROR + } +\cs_new:Npn \__cmd_grab_D_nested:w #1 \q_nil \q_stop + { \exp_not:o { \use_none:n #1 } } +\cs_new_protected_nopar:Npn \__cmd_grab_D_call:Nw #1 + { + \token_if_eq_catcode:NNTF + #1 + { + \exp_after:wN \exp_after:wN \exp_after:wN + \l__cmd_fn_tl \char_generate:nn { `#1 } { 11 } + } + { + \__cmd_token_if_cs:NTF #1 + { + \exp_after:wN \l__cmd_fn_tl + \cs:w \cs_to_str:N #1 ~ \cs_end: + } + { + \exp_after:wN \l__cmd_fn_tl + \token_to_str:N #1 + } + } + } +\cs_new_protected:Npn \__cmd_grab_E:w #1#2 \__cmd_run_code: + { + \__cmd_grab_E:nnNN {#1} {#2} + \cs_set_protected_nopar:Npn + \__cmd_peek_nonspace_remove:NTF + } +\cs_new_protected:Npn \__cmd_grab_E_long:w #1#2 \__cmd_run_code: + { + \__cmd_grab_E:nnNN {#1} {#2} + \cs_set_protected:Npn + \__cmd_peek_nonspace_remove:NTF + } +\cs_new_protected:Npn \__cmd_grab_E_obey_spaces:w #1#2 \__cmd_run_code: + { + \__cmd_grab_E:nnNN {#1} {#2} + \cs_set_protected_nopar:Npn + \__cmd_peek_meaning_remove:NTF + } +\cs_new_protected:Npn \__cmd_grab_E_long_obey_spaces:w #1#2 \__cmd_run_code: + { + \__cmd_grab_E:nnNN {#1} {#2} + \cs_set_protected:Npn + \__cmd_peek_meaning_remove:NTF + } +\cs_new_protected:Npn \__cmd_grab_E:nnNN #1#2#3#4 + { + \exp_after:wN #3 \l__cmd_fn_tl ##1##2##3 + { + \prop_put:Nnn \l__cmd_tmp_prop {##1} {##3} + \__cmd_grab_E_loop:NnN #4 { } ##2 \q_recursion_stop + } + \prop_clear:N \l__cmd_tmp_prop + \tl_set:Nn \l__cmd_signature_tl {#2} + \cs_set_protected:Npn \__cmd_grab_E_finalise: + { + \tl_map_inline:nn {#1} + { + \prop_get:NnNF \l__cmd_tmp_prop {####1} \l__cmd_tmpb_tl + { \tl_set_eq:NN \l__cmd_tmpb_tl \c_novalue_tl } + \tl_put_right:Nx \l__cmd_args_tl + { { \exp_not:V \l__cmd_tmpb_tl } } + } + \l__cmd_signature_tl \__cmd_run_code: + } + \__cmd_grab_E_loop:NnN #4 { } #1 \q_recursion_tail \q_recursion_stop + } +\cs_new_protected:Npn \__cmd_grab_E_loop:NnN #1#2#3#4 \q_recursion_stop + { + \cs_if_eq:NNTF #3 \q_recursion_tail + { \__cmd_grab_E_finalise: } + { + #1 #3 + { \l__cmd_fn_tl #3 {#2#4} } + { \__cmd_grab_E_loop:NnN #1 {#2#3} #4 \q_recursion_stop } + } + } +\cs_new_protected:Npn \__cmd_grab_E_finalise: { } +\cs_new_protected:Npn \__cmd_grab_m:w #1 \__cmd_run_code: + { + \tl_set:Nn \l__cmd_signature_tl {#1} + \exp_after:wN \cs_set_protected_nopar:Npn \l__cmd_fn_tl ##1 + { \__cmd_add_arg:n {##1} } + \l__cmd_fn_tl + } +\cs_new_protected:Npn \__cmd_grab_m_long:w #1 \__cmd_run_code: + { + \tl_set:Nn \l__cmd_signature_tl {#1} + \exp_after:wN \cs_set_protected:Npn \l__cmd_fn_tl ##1 + { \__cmd_add_arg:n {##1} } + \l__cmd_fn_tl + } +\cs_new_protected_nopar:Npn \__cmd_grab_m_aux:Nnnnnnnnn #1#2#3#4#5#6#7#8#9 + { + \tl_put_right:No \l__cmd_args_tl + { #1 {#2} {#3} {#4} {#5} {#6} {#7} {#8} {#9} } + \l__cmd_signature_tl \__cmd_run_code: + } +\cs_new_protected:cpn { __cmd_grab_m_1:w } #1 \__cmd_run_code: + { + \tl_set:Nn \l__cmd_signature_tl {#1} + \exp_after:wN \cs_set_eq:NN \l__cmd_fn_tl \__cmd_grab_m_aux:Nnnnnnnnn + \l__cmd_fn_tl \use_none:nnnnnnn { } { } { } { } { } { } { } + } +\cs_new_protected:cpn { __cmd_grab_m_2:w } #1 \__cmd_run_code: + { + \tl_set:Nn \l__cmd_signature_tl {#1} + \exp_after:wN \cs_set_eq:NN \l__cmd_fn_tl \__cmd_grab_m_aux:Nnnnnnnnn + \l__cmd_fn_tl \use_none:nnnnnn { } { } { } { } { } { } + } +\cs_new_protected:cpn { __cmd_grab_m_3:w } #1 \__cmd_run_code: + { + \tl_set:Nn \l__cmd_signature_tl {#1} + \exp_after:wN \cs_set_eq:NN \l__cmd_fn_tl \__cmd_grab_m_aux:Nnnnnnnnn + \l__cmd_fn_tl \use_none:nnnnn { } { } { } { } { } + } +\cs_new_protected:cpn { __cmd_grab_m_4:w } #1 \__cmd_run_code: + { + \tl_set:Nn \l__cmd_signature_tl {#1} + \exp_after:wN \cs_set_eq:NN \l__cmd_fn_tl \__cmd_grab_m_aux:Nnnnnnnnn + \l__cmd_fn_tl \use_none:nnnn { } { } { } { } + } +\cs_new_protected:cpn { __cmd_grab_m_5:w } #1 \__cmd_run_code: + { + \tl_set:Nn \l__cmd_signature_tl {#1} + \exp_after:wN \cs_set_eq:NN \l__cmd_fn_tl \__cmd_grab_m_aux:Nnnnnnnnn + \l__cmd_fn_tl \use_none:nnn { } { } { } + } +\cs_new_protected:cpn { __cmd_grab_m_6:w } #1 \__cmd_run_code: + { + \tl_set:Nn \l__cmd_signature_tl {#1} + \exp_after:wN \cs_set_eq:NN \l__cmd_fn_tl \__cmd_grab_m_aux:Nnnnnnnnn + \l__cmd_fn_tl \use_none:nn { } { } + } +\cs_new_protected:cpn { __cmd_grab_m_7:w } #1 \__cmd_run_code: + { + \tl_set:Nn \l__cmd_signature_tl {#1} + \exp_after:wN \cs_set_eq:NN \l__cmd_fn_tl \__cmd_grab_m_aux:Nnnnnnnnn + \l__cmd_fn_tl \use_none:n { } + } +\cs_new_protected:cpn { __cmd_grab_m_8:w } #1 \__cmd_run_code: + { + \tl_set:Nn \l__cmd_signature_tl {#1} + \exp_after:wN \cs_set_eq:NN \l__cmd_fn_tl \__cmd_grab_m_aux:Nnnnnnnnn + \l__cmd_fn_tl \prg_do_nothing: + } +\cs_new_protected:cpx { __cmd_grab_m_9:w } + { + \exp_not:c { __cmd_grab_m_5:w } + \exp_not:c { __cmd_grab_m_4:w } + } +\cs_new_protected:Npn \__cmd_grab_R:w #1#2#3 \__cmd_run_code: + { \__cmd_grab_R_aux:NNnN #1 #2 {#3} \cs_set_protected_nopar:Npn } +\cs_new_protected:Npn \__cmd_grab_R_long:w #1#2#3 \__cmd_run_code: + { \__cmd_grab_R_aux:NNnN #1 #2 {#3} \cs_set_protected:Npn } +\cs_new_protected:Npn \__cmd_grab_R_aux:NNnN #1#2#3#4 + { + \__cmd_grab_D_aux:NNnN #1 #2 {#3} #4 + \__cmd_peek_nonspace_remove:NTF #1 + { \__cmd_grab_D_call:Nw #1 } + { + \msg_error:nnxx { cmd } { missing-required } + { \__cmd_environment_or_command: } + { \token_to_str:N #1 } + \__cmd_add_arg:o \c_novalue_tl + } + } +\cs_new_protected:Npn \__cmd_grab_t:w + { \__cmd_grab_t_aux:NNw \__cmd_peek_nonspace_remove:NTF } +\cs_new_protected:Npn \__cmd_grab_t_obey_spaces:w + { \__cmd_grab_t_aux:NNw \__cmd_peek_meaning_remove:NTF } +\cs_new_protected:Npn \__cmd_grab_t_aux:NNw #1#2#3 \__cmd_run_code: + { + \tl_set:Nn \l__cmd_signature_tl {#3} + \exp_after:wN \cs_set_protected:Npn \l__cmd_fn_tl + { + #1 #2 + { \__cmd_add_arg:n { \BooleanTrue } } + { \__cmd_add_arg:n { \BooleanFalse } } + } + \l__cmd_fn_tl + } +\tl_new:N \l__cmd_v_arg_tl +\cs_new_protected:Npn \__cmd_grab_v:w + { + \bool_set_false:N \l__cmd_long_bool + \__cmd_grab_v_aux:w + } +\cs_new_protected:Npn \__cmd_grab_v_long:w + { + \bool_set_true:N \l__cmd_long_bool + \__cmd_grab_v_aux:w + } +\cs_new_protected:Npn \__cmd_grab_v_aux:w #1 \__cmd_run_code: + { + \tl_set:Nn \l__cmd_signature_tl {#1} + \group_begin: + \tex_escapechar:D = 92 \scan_stop: + \tl_clear:N \l__cmd_v_arg_tl + \peek_remove_spaces:n + { + \peek_meaning_remove:NTF \c_group_begin_token + { + \group_align_safe_end: + \__cmd_grab_v_bgroup: + } + { + \peek_N_type:TF + { \__cmd_grab_v_aux_test:N } + { \__cmd_grab_v_aux_abort:n { } } + } + } + } +\cs_new_protected:Npn \__cmd_grab_v_group_end: + { + \exp_args:NNNo + \group_end: + \tl_set:Nn \l__cmd_v_arg_tl { \l__cmd_v_arg_tl } + } +\cs_new_protected:Npn \__cmd_grab_v_aux_test:N #1 + { + \__cmd_grab_v_token_if_char:NTF #1 + { + \__cmd_grab_v_aux_put:N #1 + \__cmd_grab_v_aux_catcodes: + \__cmd_grab_v_aux_loop:N #1 + } + { \__cmd_grab_v_aux_abort:n {#1} #1 } + } +\cs_new_protected:Npn \__cmd_grab_v_aux_loop:N #1 + { + \peek_N_type:TF + { \__cmd_grab_v_aux_loop:NN #1 } + { \__cmd_grab_v_aux_abort:n { } } + } +\cs_new_protected:Npn \__cmd_grab_v_aux_loop:NN #1#2 + { + \__cmd_grab_v_token_if_char:NTF #2 + { + \token_if_eq_charcode:NNTF #1 #2 + { \__cmd_grab_v_aux_loop_end: } + { + \__cmd_grab_v_aux_put:N #2 + \__cmd_grab_v_aux_loop:N #1 + } + } + { \__cmd_grab_v_aux_abort:n {#2} #2 } + } +\cs_new_protected:Npn \__cmd_grab_v_aux_loop_end: + { + \__cmd_grab_v_group_end: + \__cmd_add_arg:x { \tl_tail:N \l__cmd_v_arg_tl } + } +\int_new:N \l__cmd_v_nesting_int +\cs_new_protected:Npx \__cmd_grab_v_bgroup: + { + \exp_not:N \__cmd_grab_v_aux_catcodes: + \exp_not:n { \int_set:Nn \l__cmd_v_nesting_int { 1 } } + \exp_not:N \__cmd_grab_v_aux_put:N \iow_char:N \{ + \exp_not:N \__cmd_grab_v_bgroup_loop: + } +\cs_new_protected:Npn \__cmd_grab_v_bgroup_loop: + { + \peek_N_type:TF + { \__cmd_grab_v_bgroup_loop:N } + { \__cmd_grab_v_aux_abort:n { } } + } +\cs_new_protected:Npn \__cmd_grab_v_bgroup_loop:N #1 + { + \__cmd_grab_v_token_if_char:NTF #1 + { + \token_if_eq_charcode:NNTF \c_group_end_token #1 + { + \int_decr:N \l__cmd_v_nesting_int + \int_compare:nNnTF \l__cmd_v_nesting_int > 0 + { + \__cmd_grab_v_aux_put:N #1 + \__cmd_grab_v_bgroup_loop: + } + { \__cmd_grab_v_aux_loop_end: } + } + { + \token_if_eq_charcode:NNT \c_group_begin_token #1 + { \int_incr:N \l__cmd_v_nesting_int } + \__cmd_grab_v_aux_put:N #1 + \__cmd_grab_v_bgroup_loop: + } + } + { \__cmd_grab_v_aux_abort:n {#1} #1 } + } +\cs_new_protected:Npn \__cmd_grab_v_aux_catcodes: + { + \cs_set_eq:NN \do \char_set_catcode_other:N + \dospecials + \tex_endlinechar:D = `\^^M \scan_stop: + \bool_if:NTF \l__cmd_long_bool + { \char_set_catcode_other:n { \tex_endlinechar:D } } + { \char_set_catcode_parameter:n { \tex_endlinechar:D } } + } +\cs_new_protected:Npn \__cmd_grab_v_aux_abort:n #1 + { + \__cmd_grab_v_group_end: + \exp_after:wN \exp_after:wN \exp_after:wN + \peek_meaning_remove:NTF \char_generate:nn { \tex_endlinechar:D } { 6 } + { + \msg_error:nnxxx { cmd } { verbatim-newline } + { \__cmd_environment_or_command: } + { \tl_to_str:N \l__cmd_v_arg_tl } + { \tl_to_str:n {#1} } + \__cmd_add_arg:o \c_novalue_tl + } + { + \msg_error:nnxxx { cmd } { verbatim-tokenized } + { \__cmd_environment_or_command: } + { \tl_to_str:N \l__cmd_v_arg_tl } + { \tl_to_str:n {#1} } + \__cmd_add_arg:o \c_novalue_tl + } + } +\cs_new_protected:Npn \__cmd_grab_v_aux_put:N #1 + { + \tl_put_right:Nx \l__cmd_v_arg_tl + { + \token_if_active:NTF #1 + { \exp_not:N #1 } { \token_to_str:N #1 } + } + } +\cs_new_protected:Npn \__cmd_grab_v_token_if_char:NTF #1 + { \str_if_eq:eeTF { } { \str_tail:n {#1} } } +\cs_new_protected:Npn \__cmd_add_arg:n #1 + { + \tl_put_right:Nn \l__cmd_args_tl { {#1} } + \l__cmd_signature_tl \__cmd_run_code: + } +\cs_generate_variant:Nn \__cmd_add_arg:n { V , o , x } +\cs_new:Npn \__cmd_expandable_grab_D:w #1 \q__cmd #2#3 + { #2 { \__cmd_expandable_grab_D:NNNwNNn #1 \q__cmd #2 #3 } } +\cs_set_protected:Npn \__cmd_tmp:w #1 + { + \cs_new:Npn \__cmd_expandable_grab_D:NNNwNNn ##1##2##3##4 \q__cmd ##5##6##7 + { + \str_if_eq:nnTF {##2} {##7} + { + \str_if_eq:onTF + { ##1 { } { } ##7 ##2 \q__cmd ##3 } + { { } {##2} { } } + } + { \use_ii:nn } + { + ##1 + { \__cmd_expandable_grab_D:NNNwNNnnn ##1##2##3##4 \q__cmd ##5##6 } + \q_nil { } ##2 \ERROR \q__cmd \ERROR + } + { ##4 {#1} \q__cmd ##5 ##6 {##7} } + } + } +\exp_args:No \__cmd_tmp:w { \c_novalue_tl } +\cs_new:Npn \__cmd_expandable_grab_D:NNNwNNnnn #1#2#3#4 \q__cmd #5#6#7#8#9 + { + \exp_args:Nof \__cmd_expandable_grab_D:nnNNNwNN + { \use_ii:nn #7 #2 } + { \__cmd_expandable_grab_D:Nw #3 \exp_stop_f: #8 #9 } + #1#2#3 #4 \q__cmd #5 #6 + } +\cs_new:Npn \__cmd_expandable_grab_D:Nw #1#2 \ERROR \ERROR { #2 #1 } +\cs_new:Npn \__cmd_expandable_grab_D:nnNNNwNN #1#2#3#4#5#6 \q__cmd #7#8 + { + \exp_args:No \tl_if_empty:oTF + { #3 { \use_none:nnn } #2 \q__cmd #5 #4 \q__cmd #5 } + { + \tl_if_blank:oTF { \use_none:nn #1#2 } + { \__cmd_put_arg_expandable:ow { \use_none:nn #1#2 } } + { + \str_if_eq:eeTF + { \exp_not:o { \use_none:nn #1#2 } } + { { \exp_not:o { \use_iii:nnnn #1#2 \q_nil } } } + { \__cmd_put_arg_expandable:ow { \use_iii:nnn #1#2 } } + { \__cmd_put_arg_expandable:ow { \use_none:nn #1#2 } } + } + #6 \q__cmd #7 #8 + } + { + #3 + { \__cmd_expandable_grab_D:NNNwNNnnn #3#4#5#6 \q__cmd #7 #8 } + \q_nil {#1} #2 \ERROR \q__cmd \ERROR + } + } +\cs_new:Npn \__cmd_expandable_grab_D_alt:w #1 \q__cmd #2#3 + { #2 { \__cmd_expandable_grab_D_alt:NNwNNn #1 \q__cmd #2 #3 } } +\cs_set_protected:Npn \__cmd_tmp:w #1 + { + \cs_new:Npn \__cmd_expandable_grab_D_alt:NNwNNn ##1##2##3 \q__cmd ##4##5##6 + { + \str_if_eq:nnTF {##6} {##2} + { + \str_if_eq:onTF + { ##1 { } ##6 ##2 ##2 } + { { } ##2 } + } + { \use_ii:nn } + { + ##1 + { \__cmd_expandable_grab_D_alt:NNwn ##4 ##5 ##3 \q__cmd } + ##6 \ERROR + } + { ##3 {#1} \q__cmd ##4 ##5 {##6} } + } + } +\exp_args:No \__cmd_tmp:w { \c_novalue_tl } +\cs_new:Npn \__cmd_expandable_grab_D_alt:NNwn #1#2#3 \q__cmd #4 + { + \tl_if_blank:oTF { \use_none:n #4 } + { \__cmd_put_arg_expandable:ow { \use_none:n #4 } } + { + \str_if_eq:eeTF + { \exp_not:o { \use_none:n #4 } } + { { \exp_not:o { \use_ii:nnn #4 \q_nil } } } + { \__cmd_put_arg_expandable:ow { \use_ii:nn #4 } } + { \__cmd_put_arg_expandable:ow { \use_none:n #4 } } + } + #3 \q__cmd #1 #2 + } +\cs_new:Npn \__cmd_expandable_grab_E:w #1 \q__cmd #2#3 + { \__cmd_expandable_grab_E_aux:w #1 \q__cmd #2 #3 #3 } +\cs_new:Npn \__cmd_expandable_grab_E_long:w #1 \q__cmd #2#3 + { \__cmd_expandable_grab_E_aux:w #1 \q__cmd #2 #3 #2 } +\cs_new:Npn \__cmd_expandable_grab_E_aux:w #1 \q__cmd #2#3#4 + { #2 { \__cmd_expandable_grab_E_test:nnw #1 \q__cmd #2 #3 #4 } } +\cs_new:Npn \__cmd_expandable_grab_E_test:nnw #1#2#3 \q__cmd #4#5#6#7 + { + \__cmd_expandable_grab_E_loop:nnnNNw {#7} { } { } + #1 \q_nil \q_nil \q_nil \q_mark #2 \q_nil + #3 \q__cmd #4 #5 #6 + } +\cs_new:Npn \__cmd_expandable_grab_E_loop:nnnNNw + #1#2#3#4#5#6 \q_nil #7 \q_mark #8 + { + \quark_if_nil:NTF #4 + { \__cmd_expandable_grab_E_end:nnw {#1} {#3} } + { + \tl_if_novalue:nTF {#8} + { \str_if_eq:onTF { #4 { } #1 #5 } {#5} } + { \use_ii:nn } + { \__cmd_expandable_grab_E_find:w { #2 #4 #5 #6 } {#3} ~ } + { + \__cmd_expandable_grab_E_loop:nnnNNw + {#1} { #2 #4 #5 } { #3 {#8} } + #6 \q_nil #7 \q_mark + } + } + } +\cs_new:Npn \__cmd_expandable_grab_E_find:w #1 \q__cmd #2#3#4 + { #4 { \__cmd_expandable_grab_E_find:nnw #1 \q__cmd #2 #3 #4 } } +\cs_new:Npn \__cmd_expandable_grab_E_find:nnw #1#2#3 \q_nil #4 \q__cmd #5#6#7#8 + { \__cmd_expandable_grab_E_aux:w {#1} { #2 {#8} #3 } #4 \q__cmd #5 #6 #7 } +\cs_new:Npn \__cmd_expandable_grab_E_end:nnw #1#2#3 \q__cmd #4#5#6 + { #3 #2 \q__cmd #4 #5 {#1} } +\cs_new:Npn \__cmd_expandable_grab_m:w #1 \q__cmd #2#3 + { #3 { \__cmd_expandable_grab_m_aux:wNn #1 \q__cmd #2 #3 } } +\cs_new:Npn \__cmd_expandable_grab_m_long:w #1 \q__cmd #2#3 + { #2 { \__cmd_expandable_grab_m_aux:wNn #1 \q__cmd #2 #3 } } +\cs_new:Npn \__cmd_expandable_grab_m_aux:wNn #1 \q__cmd #2#3#4 + { #1 {#4} \q__cmd #2 #3 } +\cs_new:Npn \__cmd_expandable_grab_R:w #1 \q__cmd #2#3 + { #2 { \__cmd_expandable_grab_R_aux:NNNwNNn #1 \q__cmd #2#3 } } +\cs_set_protected:Npn \__cmd_tmp:w #1 + { + \cs_new:Npn \__cmd_expandable_grab_R_aux:NNNwNNn ##1##2##3##4 \q__cmd ##5##6##7 + { + \str_if_eq:nnTF {##7} {##2} + { + \str_if_eq:onTF + { ##1 { } { } ##7 ##2 \q__cmd ##3 } + { { } {##2} { } } + } + { \use_ii:nn } + { + ##1 + { \__cmd_expandable_grab_D:NNNwNNnnn ##1##2##3##4 \q__cmd ##5##6 } + \q_nil { } ##2 \ERROR \q__cmd \ERROR + } + { + \msg_expandable_error:nnff { cmd } { missing-required } + { \exp_args:Nf \tl_trim_spaces:n { \token_to_str:N ##5 } } + { \tl_to_str:n {##2} } + ##4 {#1} \q__cmd ##5 ##6 {##7} + } + } + } +\exp_args:No \__cmd_tmp:w { \c_novalue_tl } +\cs_new:Npn \__cmd_expandable_grab_R_alt:w #1 \q__cmd #2#3 + { #2 { \__cmd_expandable_grab_R_alt_aux:NNwNNn #1 \q__cmd #2#3 } } +\cs_set_protected:Npn \__cmd_tmp:w #1 + { + \cs_new:Npn \__cmd_expandable_grab_R_alt_aux:NNwNNn ##1##2##3 \q__cmd ##4##5##6 + { + \str_if_eq:nnTF {##6} {##2} + { + \str_if_eq:onTF + { ##1 { } ##6 ##2 ##2 } + { { } ##2 } + } + { \use_ii:nn } + { + ##1 + { \__cmd_expandable_grab_D_alt:NNwn ##4 ##5 ##3 \q__cmd } + ##6 \ERROR + } + { + \msg_expandable_error:nnff { cmd } { missing-required } + { \exp_args:Nf \tl_trim_spaces:n { \token_to_str:N ##4 } } + { \tl_to_str:n {##2} } + ##3 {#1} \q__cmd ##4 ##5 {##6} + } + } + } +\exp_args:No \__cmd_tmp:w { \c_novalue_tl } +\cs_new:Npn \__cmd_expandable_grab_t:w #1 \q__cmd #2#3 + { #2 { \__cmd_expandable_grab_t_aux:NNwn #1 \q__cmd #2 #3 } } +\cs_new:Npn \__cmd_expandable_grab_t_aux:NNwn #1#2#3 \q__cmd #4#5#6 + { + \str_if_eq:onTF { #1 { } #6 #2 } {#2} + { #3 { \BooleanTrue } \q__cmd #4 #5 } + { #3 { \BooleanFalse } \q__cmd #4 #5 {#6} } + } +\cs_new:Npn \__cmd_put_arg_expandable:nw #1#2 \q__cmd { #2 {#1} \q__cmd } +\cs_generate_variant:Nn \__cmd_put_arg_expandable:nw { o } +\cs_new_protected:Npn \__cmd_bool_reverse:N #1 + { + \bool_if:NTF #1 + { \tl_set:Nn \ProcessedArgument { \c_false_bool } } + { \tl_set:Nn \ProcessedArgument { \c_true_bool } } + } +\seq_new:N \l__cmd_split_list_seq +\tl_new:N \l__cmd_split_list_tl +\cs_new_protected:Npn \__cmd_split_list:nn #1#2 + { + \tl_if_single:nTF {#1} + { + \token_if_cs:NTF #1 + { \__cmd_split_list_multi:nn {#1} {#2} } + { \__cmd_split_list_single:Nn #1 {#2} } + } + { \__cmd_split_list_multi:nn {#1} {#2} } + } +\cs_new_protected:Npn \__cmd_split_list_multi:nn #1#2 + { + \seq_set_split:Nnn \l__cmd_split_list_seq {#1} {#2} + \tl_clear:N \ProcessedArgument + \seq_map_inline:Nn \l__cmd_split_list_seq + { \tl_put_right:Nn \ProcessedArgument { {##1} } } + } +\cs_generate_variant:Nn \__cmd_split_list_multi:nn { nV } +\group_begin: +\char_set_catcode_active:N \^^@ +\cs_new_protected:Npn \__cmd_split_list_single:Nn #1#2 + { + \tl_set:Nn \l__cmd_split_list_tl {#2} + \group_begin: + \char_set_lccode:nn { `\^^@ } { `#1 } + \tex_lowercase:D + { + \group_end: + \tl_replace_all:Nnn \l__cmd_split_list_tl { ^^@ } + } {#1} + \__cmd_split_list_multi:nV {#1} \l__cmd_split_list_tl + } +\group_end: +\cs_new_protected:Npn \__cmd_split_argument:nnn #1#2#3 + { + \__cmd_split_list:nn {#2} {#3} + \exp_args:Nf \__cmd_split_argument_aux:nnnn + { \tl_count:N \ProcessedArgument } + {#1} {#2} {#3} + } +\cs_new_protected:Npn \__cmd_split_argument_aux:nnnn #1#2#3#4 + { + \int_compare:nNnF {#1} = { #2 + 1 } + { + \int_compare:nNnTF {#1} > { #2 + 1 } + { + \tl_set:Nx \ProcessedArgument + { + \exp_last_unbraced:NnNo + \__cmd_split_argument_aux:n + { #2 + 1 } + \use_none_delimit_by_q_stop:w + \ProcessedArgument + \q_stop + } + \msg_error:nnxxx { cmd } { split-excess-tokens } + { \tl_to_str:n {#3} } { \int_eval:n { #2 + 1 } } + { \tl_to_str:n {#4} } + } + { + \tl_put_right:Nx \ProcessedArgument + { + \prg_replicate:nn { #2 + 1 - (#1) } + { { \exp_not:V \c_novalue_tl } } + } + } + } + } +\cs_new:Npn \__cmd_split_argument_aux:n #1 + { \prg_replicate:nn {#1} { \__cmd_split_argument_aux:wn } } +\cs_new:Npn \__cmd_split_argument_aux:wn #1 \use_none_delimit_by_q_stop:w #2 + { + \exp_not:n { {#2} } + #1 + \use_none_delimit_by_q_stop:w + } +\cs_new_protected:Npn \__cmd_trim_spaces:n #1 + { \tl_set:Nx \ProcessedArgument { \tl_trim_spaces:n {#1} } } +\cs_new_protected:Npn \__cmd_get_arg_spec_error:N #1 + { + \bool_set_false:N \l__cmd_environment_bool + \tl_set:Nn \l__cmd_fn_tl {#1} + \__cmd_get_arg_spec_error_aux:n { \cs_if_exist:NTF #1 } + } +\cs_new_protected:Npn \__cmd_get_arg_spec_error:n #1 + { + \bool_set_true:N \l__cmd_environment_bool + \str_set:Nx \l__cmd_environment_str {#1} + \__cmd_get_arg_spec_error_aux:n + { \cs_if_exist:cTF { \l__cmd_environment_str } } + } +\cs_new_protected:Npn \__cmd_get_arg_spec_error_aux:n #1 + { + #1 + { + \msg_error:nnx { cmd } { non-xparse } + { \__cmd_environment_or_command: } + } + { + \msg_error:nnx { cmd } { unknown } + { \__cmd_environment_or_command: } + } + } +\cs_new_protected:Npn \__cmd_get_arg_spec:NTF #1#2#3 + { + \__kernel_cmd_if_xparse:NTF #1 + { + \tl_set:Nx \ArgumentSpecification { \tl_item:Nn #1 { 2 } } + #2 + } + {#3} + } +\cs_new_eq:NN \__cmd_chk_if_free_cs:N \__kernel_chk_if_free_cs:N +\cs_gset_eq:NN \__kernel_chk_if_free_cs:N \use_none:n +\tl_new:N \ArgumentSpecification +\cs_new_protected:Npn \__cmd_get_arg_spec:N #1 + { + \__cmd_get_arg_spec:NTF #1 { } + { \__cmd_get_arg_spec_error:N #1 } + } +\cs_new_protected:Npn \__cmd_get_arg_spec:n #1 + { + \exp_args:Nc \__cmd_get_arg_spec:NTF + { environment~ \tl_to_str:n {#1} } + { } + { \__cmd_get_arg_spec_error:n {#1} } + } +\cs_new_protected:Npn \__cmd_show_arg_spec:N #1 + { + \__cmd_get_arg_spec:NTF #1 + { \tl_show:N \ArgumentSpecification } + { \__cmd_get_arg_spec_error:N #1 } + } +\cs_new_protected:Npn \__cmd_show_arg_spec:n #1 + { + \exp_args:Nc \__cmd_get_arg_spec:NTF + { environment~ \tl_to_str:n {#1} } + { \tl_show:N \ArgumentSpecification } + { \__cmd_get_arg_spec_error:n {#1} } + } +\cs_new_protected:Npn \__cmd_check_definable:nNT #1 + { \tl_trim_spaces_apply:nN {#1} \__cmd_check_definable_aux:nN } +\group_begin: + \char_set_catcode_active:n { `? } + \cs_new_protected:Npn \__cmd_check_definable_aux:nN #1#2 + { + \group_begin: + \tl_if_single_token:nTF {#1} + { + \int_set:Nn \tex_escapechar:D { 92 } + \exp_args:Nx \tl_if_empty:nTF + { \exp_args:No \str_tail:n { \token_to_str:N #1 } } + { + \exp_args:Nx \char_set_lccode:nn + { ` \str_head:n {#1} } { `? } + \tex_lowercase:D { \tl_if_eq:nnTF {#1} } { ? } + { \group_end: \use_iii:nnn } + { \group_end: \use_i:nnn } + } + { \group_end: \use_iii:nnn } + } + { \group_end: \use_ii:nnn } + { + \msg_error:nnxx { cmd } { not-definable } + { \tl_to_str:n {#1} } { \token_to_str:N #2 } + } + { + \msg_error:nnxx { cmd } { not-one-token } + { \tl_to_str:n {#1} } { \token_to_str:N #2 } + } + } +\group_end: +\cs_new_protected:Npn \__cmd_token_if_cs:NTF #1 + { + \group_begin: + \int_set:Nn \tex_escapechar:D { 92 } + \exp_args:Nx \tl_if_empty:nTF + { \exp_args:No \str_tail:n { \token_to_str:N #1 } } + { \group_end: \use_ii:nn } + { \group_end: \use_i:nn } + } +\cs_new:Npn \__cmd_tl_mapthread_function:NNN #1#2#3 + { + \exp_after:wN \exp_after:wN + \exp_after:wN \__cmd_tl_mapthread_loop:w + \exp_after:wN \exp_after:wN + \exp_after:wN #3 + \exp_after:wN #1 + \exp_after:wN \q_recursion_tail + \exp_after:wN \q_mark + #2 + \q_recursion_tail + \q_recursion_stop + } +\cs_new:Npn \__cmd_tl_mapthread_function:nnN #1#2#3 + { + \__cmd_tl_mapthread_loop:w #3 + #1 \q_recursion_tail \q_mark + #2 \q_recursion_tail \q_recursion_stop + } +\cs_new:Npn \__cmd_tl_mapthread_loop:w #1#2#3 \q_mark #4 + { + \quark_if_recursion_tail_stop:n {#2} + \quark_if_recursion_tail_stop:n {#4} + #1 {#2} {#4} + \__cmd_tl_mapthread_loop:w #1#3 \q_mark + } +\cs_new_protected:Npn \__kernel_cmd_if_xparse:NTF #1 + { + \exp_args:Nf \str_case_e:nnTF + { + \exp_args:Nf \tl_if_empty:nT { \cs_argument_spec:N #1 } + { + \exp_last_unbraced:Nf \__cmd_cmd_if_xparse_aux:w + { \cs_replacement_spec:N #1 } ~ \q_stop + } + } + { + { \token_to_str:N \__cmd_start:nNNnnn } { } + { \token_to_str:N \__cmd_start_expandable:nNNNNn } { } + { \token_to_str:N \__cmd_start_env:nnnnn } { } + } + } +\cs_new:Npn \__cmd_cmd_if_xparse_aux:w #1 ~ #2 \q_stop {#1} +\cs_new_protected:Npn \__cmd_peek_nonspace:NTF + { \__cmd_peek_nonspace_aux:nNNTF { } \__cmd_peek_meaning:NTF } +\cs_new_protected:Npn \__cmd_peek_nonspace_remove:NTF + { \__cmd_peek_nonspace_aux:nNNTF { } \__cmd_peek_meaning_remove:NTF } +\cs_new_protected:Npn \__cmd_peek_nonspace_aux:nNNTF #1#2#3#4#5 + { + \peek_meaning_remove:NTF \c_space_token + { \__cmd_peek_nonspace_aux:nNNTF { #1 ~ } #2 #3 {#4} {#5} } + { #2 #3 { #4 } { #5 #1 } } + } +\cs_new_protected:Npn \__cmd_peek_meaning:NTF + { \__cmd_peek_meaning_aux:NNTF \c_false_bool } +\cs_new_protected:Npn \__cmd_peek_meaning_remove:NTF + { \__cmd_peek_meaning_aux:NNTF \c_true_bool } +\cs_new_protected:Npn \__cmd_peek_meaning_aux:NNTF #1#2#3#4 + { + \tl_set:Nn \l__cmd_tmpa_tl {#3} + \tl_set:Nn \l__cmd_tmpb_tl {#4} + \peek_meaning:NTF #2 + { + \token_if_eq_meaning:NNTF #2 \c_group_begin_token + { \__cmd_peek_true_remove:Nw #1 } + { + \__cmd_token_if_cs:NTF #2 + { \__cmd_peek_cs_check_equal:NNN #1 #2 } + { \__cmd_peek_true_remove:Nw #1 } + } + } + { \l__cmd_tmpb_tl } + } +\cs_new_protected:Npn \__cmd_peek_cs_check_equal:NNN #1#2#3 + { + \str_if_eq:nnTF {#2} {#3} + { \__cmd_peek_true_remove:Nw #1 } + { \l__cmd_tmpb_tl } + #3 + } +\cs_new_protected:Npn \__cmd_peek_true_remove:Nw #1 + { + \bool_if:NTF #1 + { + \tex_afterassignment:D \l__cmd_tmpa_tl + \cs_set_eq:NN \__cmd_tmp:w + } + { \l__cmd_tmpa_tl } + } +\tl_const:Nn \c__cmd_ignore_def_tl + { \\ \\ LaTeX~will~ignore~this~entire~definition. } +\cs_new:Npn \__cmd_environment_or_command: + { + \bool_if:NTF \l__cmd_environment_bool + { environment ~ ' \l__cmd_environment_str ' } + { + command ~ ' + \exp_args:Nf \tl_trim_spaces:n + { \exp_after:wN \token_to_str:N \l__cmd_fn_tl } + ' + } + } +\msg_new:nnnn { cmd } { arg-after-body } + { In~the~definition~of~#1,~b~(body)~argument~must~be~last. } + { + The~'body'~argument~type~is~followed~by~'#2'~in~the~argument~ + specification~of~the~#1.~This~is~not~allowed. + \c__cmd_ignore_def_tl + } +\msg_new:nnnn { cmd } { bad-arg-spec } + { Bad~argument~specification~'#2'~for~#1. } + { + The~argument~specification~provided~was~not~valid:~ + one~or~more~mandatory~pieces~of~information~were~missing. + \c__cmd_ignore_def_tl + } +\msg_new:nnnn { cmd } { command-already-defined } + { Command~'#1'~already~defined! } + { + You~have~used~#2~ + with~a~command~that~already~has~a~definition. \\ \\ + The~existing~definition~of~'#1'~will~not~be~altered. + } +\msg_new:nnnn { cmd } { command-not-yet-defined } + { Command ~'#1'~not~yet~defined! } + { + You~have~used~#2~ + with~a~command~that~was~never~defined. + \c__cmd_ignore_def_tl + } +\msg_new:nnnn { cmd } { environment-already-defined } + { Environment~'#1'~already~defined! } + { + You~have~used~\NewDocumentEnvironment + with~an~environment~that~already~has~a~definition. \\ \\ + The~existing~definition~of~'#1'~will~not~be~altered. + } +\msg_new:nnnn { cmd } { environment-not-yet-defined } + { Environment~'#1'~not~yet~defined! } + { + You~have~used~\RenewDocumentEnvironment + with~an~environment~that~was~never~defined. + \c__cmd_ignore_def_tl + } +\msg_new:nnnn { cmd } { expandable-ending-optional } + { + Argument~specification~'#2'~for~expandable~command~'#1'~ + ends~with~optional~argument. + } + { + Expandable~commands~must~have~a~final~mandatory~argument~ + (or~no~arguments~at~all).~You~cannot~have~a~terminal~optional~ + argument~with~expandable~commands. + } +\msg_new:nnnn { cmd } { inconsistent-long } + { Inconsistent~long~arguments~for~expandable~command~'#1'. } + { + The~arguments~for~an~expandable~command~must~not~involve~short~ + arguments~after~long~arguments.~You~have~tried~to~mix~the~two~types. + } +\msg_new:nnnn { cmd } { invalid-command-arg } + { Argument~type~'#2'~not~available~for~#1. } + { + The~letter~'#2'~can~only~be~used~in~environment~argument~ + specifications,~not~for~commands. + \\ \\ + LaTeX~will~ignore~this~entire~definition. + } +\msg_new:nnnn { cmd } { invalid-expandable-argument-type } + { Argument~type~'#2'~not~available~for~expandable~command~'#1'. } + { + The~letter~'#2'~specifies~an~argument~type~which~cannot~be~used~ + in~an~expandable~command. + \c__cmd_ignore_def_tl + } +\msg_new:nnnn { cmd } { invalid-after-optional-expandably } + { + Argument~type~'#2'~not~available~after~optional~argument~ + for~expandable~command~'#1'. + } + { + The~letter~'#2'~specifies~an~argument~type~which~cannot~be~used~ + in~an~expandable~command~after~an~optional~argument. + \c__cmd_ignore_def_tl + } +\msg_new:nnnn { cmd } { non-trailing-obey-spaces } + { Prefix~'!'~used~before~mandatory~argument~'#2'~of~#1. } + { + The~prefix~'!'~can~only~apply~to~trailing~optional~arguments. + \c__cmd_ignore_def_tl + } +\msg_new:nnnn { cmd } { not-definable } + { First~argument~of~'#2'~must~be~a~command. } + { + The~first~argument~of~'#2'~should~be~the~document~command~that~will~ + be~defined.~The~provided~argument~'#1'~is~a~character.~Perhaps~a~ + backslash~is~missing? + \c__cmd_ignore_def_tl + } +\msg_new:nnnn { cmd } { not-one-token } + { First~argument~of~'#2'~must~be~a~command. } + { + The~first~argument~of~'#2'~should~be~the~document~command~that~will~ + be~defined.~The~provided~argument~'#1'~contains~more~than~one~ + token.~Perhaps~a~backslash~is~missing? + \c__cmd_ignore_def_tl + } +\msg_new:nnnn { cmd } { not-single-token } + { + Argument~delimiter~'#2'~for~the~#1~should~be~ + a~single~non-space~token. + } + { + The~argument~specification~provided~was~not~valid:~in~a~place~ + where~a~single~token~is~required,~LaTeX~found~'#2'. + \c__cmd_ignore_def_tl + } +\msg_new:nnnn { cmd } { forbidden-implicit-group-token } + { Argument~delimiter~'#2'~for~the~#1~is~not~allowed. } + { + The~argument~specification~provided~was~not~valid:~the~implicit~ + #3-group~token~'#2'~is~not~allowed~as~an~argument~delimiter. + \c__cmd_ignore_def_tl + } +\msg_new:nnnn { cmd } { processor-in-expandable } + { Argument~processor~'>{#2}'~cannot~be~used~for~the~expandable~command~'#1'. } + { + The~argument~specification~for~#1~contains~a~processor~function:~ + this~is~only~supported~for~standard~robust~commands. + \c__cmd_ignore_def_tl + } +\msg_new:nnnn { cmd } { too-many-arguments } + { Too~many~arguments~in~argument~specification~'#2'~of~#1. } + { + The~argument~specification~provided~has~more~than~9~arguments.~ + This~cannot~be~implemented. + \c__cmd_ignore_def_tl + } +\msg_new:nnnn { cmd } { two-markers } + { Two~'#2'~apply~to~the~same~argument~in~argument~specification~of~#1. } + { + The~argument~specification~provided~has~two~markers~'#2'~applying~ + to~the~same~argument;~these~are~redundant. + } +\msg_new:nnnn { cmd } { unknown-argument-type } + { Unknown~argument~type~'#2'~for~the~#1. } + { + The~letter~'#2'~does~not~specify~a~known~argument~type. + \c__cmd_ignore_def_tl + } +\msg_new:nnnn { cmd } { xparse-argument-type } + { Deprecated~argument~type~'#2'~for~the~#1~requires~xparse. } + { + The~letter~'#2'~specifies~a~known~argument~type~that~requires~ + the~xparse~package. + \c__cmd_ignore_def_tl + } +\msg_new:nnn { cmd } { if-boolean } + { Invalid~use~\iow_char:N\\IfBooleanTF~{#1} } +\msg_new:nnnn { cmd } { loop-in-defaults } + { Defaults~of~#1~have~circular~dependency. } + { + The~default~values~of~two~or~more~arguments~of~the~#1~ + depend~on~each~other~in~a~way~that~cannot~be~resolved. + } +\msg_new:nnnn { cmd } { missing-required } + { Missing~required~argument~for~#1. } + { + The~current~#1~expects~an~argument~starting~with~'#2'.~ + LaTeX~did~not~find~it,~and~will~insert~a~default~value~to~be~processed. + } +\msg_new:nnnn { cmd } { non-xparse } + { \str_uppercase:n #1~not~defined~using~xparse. } + { + You~have~asked~for~the~argument~specification~for~the~#1,~ + but~this~was~not~defined~using~xparse. + } +\msg_new:nnnn { cmd } { split-excess-tokens } + { Too~many~'#1'~tokens~when~trying~to~split~argument. } + { + LaTeX~was~asked~to~split~the~input~'#3'~ + at~each~occurrence~of~the~token~'#1',~up~to~a~maximum~of~#2~parts.~ + There~were~too~many~'#1'~tokens. + } +\msg_new:nnnn { cmd } { unknown } + { Unknown~document~#1. } + { + You~have~asked~for~the~argument~specification~for~the~#1,~ + but~it~is~not~defined. + } +\msg_new:nnnn { cmd } { verbatim-newline } + { Verbatim~argument~of~#1~ended~by~end~of~line. } + { + The~verbatim~argument~of~the~#1~cannot~contain~more~than~one~line,~ + but~the~end~ + of~the~current~line~has~been~reached.~You~may~have~forgotten~the~ + closing~delimiter. + \\ \\ + LaTeX~will~ignore~'#2'. + } +\msg_new:nnnn { cmd } { verbatim-tokenized } + { The~verbatim~#1~cannot~be~used~inside~an~argument. } + { + The~#1~takes~a~verbatim~argument.~ + It~may~not~appear~within~the~argument~of~another~function.~ + It~received~an~illegal~token \tl_if_empty:nF {#3} { ~'#3' } . + \\ \\ + LaTeX~will~ignore~'#2'. + } +\msg_new:nnn { cmd } { define-command } + { + Defining~command~#1~ + with~sig.~'#2'~\msg_line_context:. + } +\msg_new:nnn { cmd } { define-environment } + { + Defining~environment~'#1'~ + with~sig.~'#2'~\msg_line_context:. + } +\msg_new:nnn { cmd } { redefine-command } + { + Redefining~command~#1~ + with~sig.~'#2'~\msg_line_context:. + } +\msg_new:nnn { cmd } { redefine-environment } + { + Redefining~environment~'#1'~ + with~sig.~'#2'~\msg_line_context:. + } +\msg_new:nnn { cmd } { optional-mandatory } + { + Since~the~mandatory~argument~'#1'~has~the~same~delimiter~'#2'~ + as~a~previous~optional~argument,~it~will~not~be~possible~to~ + omit~all~optional~arguments~when~calling~this~command. + } +\msg_new:nnn { cmd } { unsupported-let } + { + The~command~'#1'~was~undefined~but~not~the~associated~commands~ + '#1~code'~and/or~'#1~defaults'.~Maybe~you~tried~using~ + \iow_char:N\\let.~This~may~lead~to~an~infinite~loop. + } +\cs_new_eq:NN \BooleanFalse \c_false_bool +\cs_new_eq:NN \BooleanTrue \c_true_bool +\cs_new_protected:Npn \NewDocumentCommand #1#2#3 + { + \__cmd_check_definable:nNT {#1} \NewDocumentCommand + { + \cs_if_exist:NTF #1 + { + \msg_error:nnxx { cmd } { command-already-defined } + { \use:nnn \token_to_str:N #1 { } } + { \token_to_str:N \NewDocumentCommand } + } + { \__cmd_declare_cmd:Nnn #1 {#2} {#3} } + } + } +\cs_new_protected:Npn \RenewDocumentCommand #1#2#3 + { + \__cmd_check_definable:nNT {#1} \RenewDocumentCommand + { + \cs_if_exist:NTF #1 + { \__cmd_declare_cmd:Nnn #1 {#2} {#3} } + { + \msg_error:nnxx { cmd } { command-not-yet-defined } + { \use:nnn \token_to_str:N #1 { } } + { \token_to_str:N \RenewDocumentCommand } + } + } + } +\cs_new_protected:Npn \ProvideDocumentCommand #1#2#3 + { + \__cmd_check_definable:nNT {#1} \ProvideDocumentCommand + { \cs_if_exist:NF #1 { \__cmd_declare_cmd:Nnn #1 {#2} {#3} } } + } +\cs_new_protected:Npn \DeclareDocumentCommand #1#2#3 + { + \__cmd_check_definable:nNT {#1} \DeclareDocumentCommand + { \__cmd_declare_cmd:Nnn #1 {#2} {#3} } + } +\cs_new_protected:Npn \NewDocumentEnvironment #1#2#3#4 + { + \cs_if_exist:cTF {#1} + { \msg_error:nnx { cmd } { environment-already-defined } {#1} } + { \__cmd_declare_env:nnnn {#1} {#2} {#3} {#4} } + } +\cs_new_protected:Npn \RenewDocumentEnvironment #1#2#3#4 + { + \cs_if_exist:cTF {#1} + { \__cmd_declare_env:nnnn {#1} {#2} {#3} {#4} } + { \msg_error:nnx { cmd } { environment-not-yet-defined } {#1} } + } +\cs_new_protected:Npn \ProvideDocumentEnvironment #1#2#3#4 + { \cs_if_exist:cF {#1} { \__cmd_declare_env:nnnn {#1} {#2} {#3} {#4} } } +\cs_new_protected:Npn \DeclareDocumentEnvironment #1#2#3#4 + { \__cmd_declare_env:nnnn {#1} {#2} {#3} {#4} } +\cs_new_protected:Npn \NewExpandableDocumentCommand #1#2#3 + { + \__cmd_check_definable:nNT {#1} \NewExpandableDocumentCommand + { + \cs_if_exist:NTF #1 + { + \msg_error:nnxx { cmd } { command-already-defined } + { \use:nnn \token_to_str:N #1 { } } + { \token_to_str:N \NewExpandableDocumentCommand } + } + { \__cmd_declare_expandable_cmd:Nnn #1 {#2} {#3} } + } + } +\cs_new_protected:Npn \RenewExpandableDocumentCommand #1#2#3 + { + \__cmd_check_definable:nNT {#1} \RenewExpandableDocumentCommand + { + \cs_if_exist:NTF #1 + { \__cmd_declare_expandable_cmd:Nnn #1 {#2} {#3} } + { + \msg_error:nnxx { cmd } { command-not-yet-defined } + { \use:nnn \token_to_str:N #1 { } } + { \token_to_str:N \RenewExpandableDocumentCommand } + } + } + } +\cs_new_protected:Npn \ProvideExpandableDocumentCommand #1#2#3 + { + \__cmd_check_definable:nNT {#1} \ProvideExpandableDocumentCommand + { + \cs_if_exist:NF #1 + { \__cmd_declare_expandable_cmd:Nnn #1 {#2} {#3} } + } + } +\cs_new_protected:Npn \DeclareExpandableDocumentCommand #1#2#3 + { + \__cmd_check_definable:nNT {#1} \DeclareExpandableDocumentCommand + { \__cmd_declare_expandable_cmd:Nnn #1 {#2} {#3} } + } +\cs_new:Npn \IfBooleanTF #1 + { + \tl_if_single:nF {#1} + { \prg_break:n { \use:n } } + \tl_if_single_token:nF #1 + { \prg_break:n { \use:n } } + \token_if_eq_meaning:NNT #1 \c_true_bool + { \prg_break:n { \use_ii:nnn } } + \token_if_eq_meaning:NNT #1 \c_false_bool + { \prg_break:n { \use_iii:nnn } } + \prg_break:n { \use:n } + \prg_break_point: + { + \msg_expandable_error:nnn { cmd } { if-boolean } {#1} + \use_ii:nn + } + } +\cs_new:Npn \IfBooleanT #1#2 { \IfBooleanTF {#1} {#2} { } } +\cs_new:Npn \IfBooleanF #1 { \IfBooleanTF {#1} { } } +\cs_new_eq:NN \IfNoValueF \tl_if_novalue:nF +\cs_new_eq:NN \IfNoValueT \tl_if_novalue:nT +\cs_new_eq:NN \IfNoValueTF \tl_if_novalue:nTF +\cs_new:Npn \IfValueF { \tl_if_novalue:nT } +\cs_new:Npn \IfValueT { \tl_if_novalue:nF } +\cs_new:Npn \IfValueTF #1#2#3 { \tl_if_novalue:nTF {#1} {#3} {#2} } +\tl_new:N \ProcessedArgument +\cs_new_eq:NN \ReverseBoolean \__cmd_bool_reverse:N +\cs_new_eq:NN \SplitArgument \__cmd_split_argument:nnn +\cs_new_eq:NN \SplitList \__cmd_split_list:nn +\cs_new_eq:NN \TrimSpaces \__cmd_trim_spaces:n +\cs_new_eq:NN \ProcessList \tl_map_function:nN +\cs_new_protected:Npn \GetDocumentCommandArgSpec #1 + { + \__cmd_check_definable:nNT {#1} \GetDocumentCommandArgSpec + { \__cmd_get_arg_spec:N #1 } + } +\cs_new_eq:NN \GetDocumentEnvironmentArgSpec \__cmd_get_arg_spec:n +\cs_new_protected:Npn \ShowDocumentCommandArgSpec #1 + { + \__cmd_check_definable:nNT {#1} \ShowDocumentCommandArgSpec + { \__cmd_show_arg_spec:N #1 } + } +\cs_new_eq:NN \ShowDocumentEnvironmentArgSpec \__cmd_show_arg_spec:n +\cs_gset_eq:NN \__kernel_chk_if_free_cs:N \__cmd_chk_if_free_cs:N +\cs_undefine:N \__cmd_chk_if_free_cs:N + +\IncludeInRelease{0000/00/00}{ltcmd}% + {Document~command~parser}% + +\EndModuleRelease +\ExplSyntaxOff +\@ifundefined{ExplSyntaxOff}{}{\latexrelease@postexpl} +\catcode`\^^@=\@latexrelease@catcode@null\relax %%% From File: lthooks.dtx -\def\lthooksversion{v1.0h} -\def\lthooksdate{2021/01/07} -\IncludeInRelease{2020/10/01}% - {\NewHook}{The hook management}% +\def\lthooksversion{v1.0n} +\def\lthooksdate{2021/05/26} + \ExplSyntaxOn +\NewModuleRelease{2020/10/01}{lthooks} + {The~hook~management~system} \bool_new:N \g__hook_debug_bool \cs_new_eq:NN \__hook_debug:n \use_none:n \cs_new_protected:Npn \hook_debug_on: @@ -1648,24 +4118,34 @@ of this package available from CTAN} \cs_new_protected:Npn \__hook_tl_gclear:N #1 { \__hook_tl_gset_eq:NN #1 \c_empty_tl } \cs_generate_variant:Nn \__hook_tl_gclear:N { c } + + \cs_new_protected:Npn \hook_new:n #1 { \__hook_normalize_hook_args:Nn \__hook_new:n {#1} } \cs_new_protected:Npn \__hook_new:n #1 { - \hook_if_exist:nTF {#1} + \__hook_if_declared:nTF {#1} { \msg_error:nnn { hooks } { exists } {#1} } { + \tl_new:c { g__hook_#1_declared_tl } + \__hook_make_usable:n {#1} + } + } +\cs_new_protected:Npn \__hook_make_usable:n #1 + { + \tl_if_exist:cF { __hook~#1 } + { \seq_gput_right:Nn \g__hook_all_seq {#1} \tl_new:c { __hook~#1 } - \__hook_declare:n {#1} - \clist_new:c {g__hook_#1_labels_clist} + \__hook_init_structure:n {#1} + \clist_new:c { g__hook_#1_labels_clist } \tl_new:c { g__hook_#1_reversed_tl } \__hook_include_legacy_code_chunk:n {#1} - } + } } -\cs_new_protected:Npn \__hook_declare:n #1 +\cs_new_protected:Npn \__hook_init_structure:n #1 { - \__hook_if_exist:nF {#1} + \__hook_if_structure_exist:nF {#1} { \prop_new:c { g__hook_#1_code_prop } \tl_new:c { __hook_toplevel~#1 } @@ -1693,6 +4173,64 @@ of this package available from CTAN} } } } +\IncludeInRelease{2021/06/01}% + {\hook_disable:n}{Disable~hooks} +\cs_new_protected:Npn \hook_disable:n #1 + { \__hook_normalize_hook_args:Nn \__hook_disable:n {#1} } +\cs_new_protected:Npn \__hook_disable:n #1 + { + \tl_gclear_new:c { g__hook_#1_declared_tl } + \cs_undefine:c { __hook~#1 } + } +\prg_new_conditional:Npnn \__hook_if_disabled:n #1 { p, T, F, TF } + { + \bool_lazy_and:nnTF + { \tl_if_exist_p:c { g__hook_#1_declared_tl } } + { ! \tl_if_exist_p:c { __hook~#1 } } + { \prg_return_true: } + { \prg_return_false: } + } +\EndIncludeInRelease +\IncludeInRelease{2020/10/01} + {\hook_disable:n}{Disable~hooks} + +\cs_new_protected:Npn \hook_disable:n #1 {} + +\EndIncludeInRelease +\IncludeInRelease{2021/06/01}% + {\hook_provide:n}{Providing~hooks} +\cs_new_protected:Npn \hook_provide:n #1 + { \__hook_normalize_hook_args:Nn \__hook_provide:nn {#1} { } } +\cs_new_protected:Npn \hook_provide_reversed:n #1 + { \__hook_normalize_hook_args:Nn \__hook_provide:nn {#1} { - } } +\cs_new_protected:Npn \__hook_provide:nn #1 #2 + { + \__hook_if_disabled:nTF {#1} + { \msg_warning:nnn { hooks } { provide-disabled } {#1} } + { + \__hook_if_declared:nTF {#1} + { + \str_if_eq:eeF { \tl_use:c { g__hook_#1_reversed_tl } } {#2} + { \msg_error:nnn { hooks } { provide-error } {#1} } + } + { + \tl_new:c { g__hook_#1_declared_tl } + \__hook_make_usable:n {#1} + \tl_gset:cn { g__hook_#1_reversed_tl } {#2} + } + } + } +\cs_new_protected:Npn \hook_provide_pair:nn #1#2 + { \hook_provide:n {#1} \hook_provide_reversed:n {#2} } +\EndIncludeInRelease +\IncludeInRelease{2020/10/01} + {\hook_provide:n}{Providing~hooks} + +\cs_new_protected:Npn \hook_provide_reversed:n #1 {} +\cs_new_protected:Npn \hook_provide:n #1 {} +\cs_new_protected:Npn \hook_provide_pair:nn #1#2 {} + +\EndIncludeInRelease \cs_new:Npn \__hook_parse_label_default:n #1 { \tl_if_novalue:nTF {#1} @@ -1731,7 +4269,7 @@ of this package available from CTAN} { \tl_if_empty:NTF \@currname { - \msg_expandable_error:nnn { hooks } { should-not-happen } + \msg_expandable_error:nnn { kernel } { should-not-happen } { Empty~default~label. } \__hook_make_name:n { label-missing } } @@ -1788,12 +4326,16 @@ of this package available from CTAN} \__hook_if_marked_removal:nnTF {#1} {#2} { \__hook_unmark_removal:nn {#1} {#2} } { - \hook_if_exist:nTF {#1} + \__hook_if_usable:nTF {#1} { \__hook_hook_gput_code_do:nnn {#1} {#2} {#3} \__hook_update_hook_code:n {#1} } - { \__hook_try_declaring_generic_hook:nnn {#1} {#2} {#3} } + { + \__hook_if_disabled:nTF {#1} + { \msg_error:nnn { hooks } { hook-disabled } {#1} } + { \__hook_try_declaring_generic_hook:nnn {#1} {#2} {#3} } + } } } } @@ -1801,14 +4343,14 @@ of this package available from CTAN} \cs_new_protected:Npn \__hook_hook_gput_code_do:nnn #1 #2 #3 { \__hook_debug:n{\iow_term:x{****~ Add~ to~ - \hook_if_exist:nF {#1} { undeclared~ } + \__hook_if_usable:nF {#1} { undeclared~ } hook~ #1~ (#2) \on@line\space <-~ \tl_to_str:n{#3}} } \str_if_eq:nnTF {#2} { top-level } { \str_if_eq:eeTF { top-level } { \__hook_currname_or_default: } { - \__hook_declare:n {#1} + \__hook_init_structure:n {#1} \__hook_tl_gput_right:cn { __hook_toplevel~#1 } {#3} } { \msg_error:nnn { hooks } { misused-top-level } {#1} } @@ -1824,7 +4366,7 @@ of this package available from CTAN} } \cs_new_protected:Npn \__hook_gput_undeclared_hook:nnn #1 #2 #3 { - \__hook_declare:n {#1} + \__hook_init_structure:n {#1} \__hook_hook_gput_code_do:nnn {#1} {#2} {#3} } \cs_new_protected:Npn \__hook_try_declaring_generic_hook:nnn #1 @@ -1852,6 +4394,8 @@ of this package available from CTAN} { #2 } { #3 } {#1} } +\IncludeInRelease{2021/06/01}% + {\__hook_try_declaring_generic_hook:wn}{Support~cmd~hooks} \prg_new_protected_conditional:Npnn \__hook_try_declaring_generic_hook:wn #1 / #2 / #3 / #4 \scan_stop: #5 { TF } { @@ -1860,7 +4404,12 @@ of this package available from CTAN} { \prop_if_in:NnTF \c__hook_generics_prop {#1} { - \hook_if_exist:nF {#5} { \hook_new:n {#5} } + \__hook_if_usable:nF {#5} + { + \str_if_eq:nnT {#1} { cmd } + { \__hook_try_put_cmd_hook:n {#5} } + \__hook_make_usable:n {#5} + } \prop_if_in:NnTF \c__hook_generics_reversed_ii_prop {#2} { \tl_gset:cn { g__hook_#5_reversed_tl } { - } } { @@ -1872,6 +4421,32 @@ of this package available from CTAN} { \prg_return_false: } } } +\EndIncludeInRelease +\IncludeInRelease{2020/10/01}% + {\__hook_try_declaring_generic_hook:wn}{Support~cmd~hooks} + +\prg_new_protected_conditional:Npnn \__hook_try_declaring_generic_hook:wn + #1 / #2 / #3 / #4 \scan_stop: #5 { TF } + { + \tl_if_empty:nTF {#2} + { \prg_return_false: } + { + \prop_if_in:NnTF \c__hook_generics_prop {#1} + { + \__hook_if_declared:nF {#5} { \hook_new:n {#5} } + \prop_if_in:NnTF \c__hook_generics_reversed_ii_prop {#2} + { \tl_gset:cn { g__hook_#5_reversed_tl } { - } } + { + \prop_if_in:NnT \c__hook_generics_reversed_iii_prop {#3} + { \tl_gset:cn { g__hook_#5_reversed_tl } { - } } + } + \prg_return_true: + } + { \prg_return_false: } + } + } + +\EndIncludeInRelease \prg_new_conditional:Npnn \__hook_if_file_hook:w #1 / #2 / #3 \s__hook_mark { TF } { @@ -1900,7 +4475,7 @@ of this package available from CTAN} { \__hook_strip_double_slash:w #1/#2/#3 / #4 \s__hook_mark } } \prop_const_from_keyval:Nn \c__hook_generics_prop - {env=,file=,package=,class=,include=} + {cmd=,env=,file=,package=,class=,include=} \prop_const_from_keyval:Nn \c__hook_generics_reversed_ii_prop {after=,end=} \prop_const_from_keyval:Nn \c__hook_generics_reversed_iii_prop {after=} \prop_const_from_keyval:Nn \c__hook_generics_file_prop {before=,after=} @@ -1908,7 +4483,7 @@ of this package available from CTAN} { \__hook_normalize_hook_args:Nnn \__hook_gremove_code:nn {#1} {#2} } \cs_new_protected:Npn \__hook_gremove_code:nn #1 #2 { - \__hook_if_exist:nTF {#1} + \__hook_if_structure_exist:nTF {#1} { \str_if_eq:nnTF {#2} {*} { @@ -1926,7 +4501,7 @@ of this package available from CTAN} {#1} {#2} } } - \hook_if_exist:nT {#1} + \__hook_if_usable:nT {#1} { \__hook_update_hook_code:n {#1} } } { \__hook_mark_removal:nn {#1} {#2} } @@ -1961,7 +4536,7 @@ of this package available from CTAN} } \cs_new_protected:Npn \__hook_gset_rule:nnnn #1#2#3#4 { - \__hook_declare:n {#1} + \__hook_init_structure:n {#1} \__hook_rule_gclear:nnn {#1} {#2} {#4} \cs_if_exist_use:cTF { __hook_rule_#3_gset:nnn } { @@ -1989,9 +4564,11 @@ of this package available from CTAN} { \__hook_label_ordered:nnTF {#2} {#3} { -> } { <- } } } \cs_new_protected:cpn { __hook_rule_incompatible-error_gset:nnn } #1#2#3 - { \__hook_tl_gset:cn { g__hook_#1_rule_ \__hook_label_pair:nn {#2} {#3} _tl } { xE } } + { \__hook_tl_gset:cn { g__hook_#1_rule_ \__hook_label_pair:nn {#2} {#3} _tl } + { xE } } \cs_new_protected:cpn { __hook_rule_incompatible-warning_gset:nnn } #1#2#3 - { \__hook_tl_gset:cn { g__hook_#1_rule_ \__hook_label_pair:nn {#2} {#3} _tl } { xW } } + { \__hook_tl_gset:cn { g__hook_#1_rule_ \__hook_label_pair:nn {#2} {#3} _tl } + { xW } } \cs_new_protected:Npn \__hook_rule_unrelated_gset:nnn #1#2#3 { } \cs_new_protected:Npn \__hook_rule_gclear:nnn #1#2#3 { \cs_undefine:c { g__hook_#1_rule_ \__hook_label_pair:nn {#2} {#3} _tl } } @@ -2007,7 +4584,7 @@ of this package available from CTAN} { \if_int_compare:w \__hook_str_compare:nn {#1} {#2} > 0 \exp_stop_f: \prg_return_true: - \else + \else: \prg_return_false: \fi: } @@ -2041,7 +4618,7 @@ of this package available from CTAN} \__hook_debug:n{ \iow_term:x{^^JUpdate~ code~ for~ hook~ '#1' \on@line :^^J} } \__hook_include_legacy_code_chunk:n {#1} - \hook_if_exist:nT {#1} + \__hook_if_usable:nT {#1} { \prop_if_empty:cTF {g__hook_#1_code_prop} { @@ -2261,8 +4838,10 @@ of this package available from CTAN} { \__hook_preamble_hook:n {#1} \__hook_log_cmd:x { ^^J ->~The~hook~'#1': } - \hook_if_exist:nF {#1} - { \__hook_log_line:x { is~not~declared! } } + \__hook_if_usable:nF {#1} + { \__hook_log_line:x { The~hook~is~not~declared. } } + \__hook_if_disabled:nT {#1} + { \__hook_log_line:x { The~hook~is~disabled. } } \hook_if_empty:nTF {#1} { #2 { The~hook~is~empty } } { @@ -2276,7 +4855,7 @@ of this package available from CTAN} \__hook_log_line:x { Document-level~(top-level)~code - \hook_if_exist:nT {#1} + \__hook_if_usable:nT {#1} { ~(executed~\__hook_if_reversed:nTF {#1} {first} {last} ) } : } \__hook_log_line_indent:x @@ -2307,7 +4886,7 @@ of this package available from CTAN} \bool_if:NT \l__hook_tmpa_bool { \__hook_log_line_indent:x { --- } } \bool_lazy_and:nnTF - { \hook_if_exist_p:n {#1} } + { \__hook_if_usable_p:n {#1} } { ! \hook_if_empty_p:n {#1} } { \__hook_log_line:x @@ -2329,10 +4908,12 @@ of this package available from CTAN} } } { + \__hook_log_line:x { Execution~order: } #2 { - Hook~ \hook_if_exist:nTF {#1} - {code~pool~empty} {not~declared} + \@spaces Not~set~because~the~hook~ \__hook_if_usable:nTF {#1} + { code~pool~is~empty } + { is~\__hook_if_disabled:nTF {#1} {disabled} {undeclared} } } } } @@ -2388,10 +4969,14 @@ of this package available from CTAN} { \__hook_normalize_hook_args:Nn \__hook_gput_next_code:nn {#1} } \cs_new_protected:Npn \__hook_gput_next_code:nn #1 #2 { - \__hook_declare:n {#1} - \hook_if_exist:nTF {#1} - { \__hook_gput_next_do:nn {#1} {#2} } - { \__hook_try_declaring_generic_next_hook:nn {#1} {#2} } + \__hook_if_disabled:nTF {#1} + { \msg_error:nnn { hooks } { hook-disabled } {#1} } + { + \__hook_init_structure:n {#1} + \__hook_if_usable:nTF {#1} + { \__hook_gput_next_do:nn {#1} {#2} } + { \__hook_try_declaring_generic_next_hook:nn {#1} {#2} } + } } \cs_new_protected:Npn \__hook_gput_next_do:nn #1 { @@ -2443,12 +5028,12 @@ of this package available from CTAN} { \__hook_if_file_hook:wTF #1 / / \s__hook_mark { - \exp_args:Ne \__hook_if_exist_use:n + \exp_args:Ne \__hook_if_usable_use:n { \exp_args:Ne \__hook_file_hook_normalize:n {#1} } } - { \__hook_if_exist_use:n {#1} } % file/ generic hook (e.g. file/before) + { \__hook_if_usable_use:n {#1} } % file/ generic hook (e.g. file/before) } -\cs_new_protected:Npn \__hook_if_exist_use:n #1 +\cs_new_protected:Npn \__hook_if_usable_use:n #1 { \tl_if_exist:cT { __hook~#1 } { @@ -2468,9 +5053,10 @@ of this package available from CTAN} } \cs_new_protected:Npn \__hook_use_once_store:n #1 { \prop_gput:Nnn \g__hook_execute_immediately_prop {#1} { } } + \prg_new_conditional:Npnn \hook_if_empty:n #1 { p , T , F , TF } { - \__hook_if_exist:nTF {#1} + \__hook_if_structure_exist:nTF {#1} { \bool_lazy_and:nnTF { \prop_if_empty_p:c { g__hook_#1_code_prop } } @@ -2484,18 +5070,24 @@ of this package available from CTAN} } { \prg_return_true: } } -\prg_new_conditional:Npnn \hook_if_exist:n #1 { p , T , F , TF } +\prg_new_conditional:Npnn \__hook_if_usable:n #1 { p , T , F , TF } { \tl_if_exist:cTF { __hook~#1 } { \prg_return_true: } { \prg_return_false: } } -\prg_new_conditional:Npnn \__hook_if_exist:n #1 { p , T , F , TF } +\prg_new_conditional:Npnn \__hook_if_structure_exist:n #1 { p , T , F , TF } { \prop_if_exist:cTF { g__hook_#1_code_prop } { \prg_return_true: } { \prg_return_false: } } +\prg_new_conditional:Npnn \__hook_if_declared:n #1 { p, T, F, TF } + { + \tl_if_exist:cTF { g__hook_#1_declared_tl } + { \prg_return_true: } + { \prg_return_false: } + } \prg_new_conditional:Npnn \__hook_if_reversed:n #1 { p , T , F , TF } { \if_int_compare:w \cs:w g__hook_#1_reversed_tl \cs_end: 1 < 0 \exp_stop_f: @@ -2504,10 +5096,12 @@ of this package available from CTAN} \prg_return_false: \fi: } +\prop_gput:Nnn \g_msg_module_type_prop { hooks } { LaTeX } +\prop_gput:Nnn \g_msg_module_type_prop { kernel } { LaTeX } \msg_new:nnnn { hooks } { labels-incompatible } { - Labels~`#1'~and~`#2'~are~incompatible - \str_if_eq:nnF {#3} {??} { ~in~hook~`#3' } .~ + Labels~'#1'~and~'#2'~are~incompatible + \str_if_eq:nnF {#3} {??} { ~in~hook~'#3' } .~ \int_compare:nNnTF {#4} = { 1 } { The~ code~ for~ both~ labels~ will~ be~ dropped. } { You~ may~ see~ errors~ later. } @@ -2515,14 +5109,21 @@ of this package available from CTAN} { LaTeX~found~two~incompatible~labels~in~the~same~hook.~ This~indicates~an~incompatibility~between~packages. } \msg_new:nnnn { hooks } { exists } - { Hook~`#1'~ has~ already~ been~ declared. } + { Hook~'#1'~ has~ already~ been~ declared. } { There~ already~ exists~ a~ hook~ declaration~ with~ this~ name.\\ Please~ use~ a~ different~ name~ for~ your~ hook.} +\msg_new:nnnn { hooks } { hook-disabled } + { Cannot~add~code~to~disabled~hook~'#1'. } + { + The~hook~'#1'~you~tried~to~add~code~to~was~previously~disabled~ + with~\iow_char:N\\hook_disable:n~or~\iow_char:N\\DisableHook,~so~ + it~cannot~have~code~added~to~it. + } \msg_new:nnn { hooks } { empty-label } { Empty~code~label~\msg_line_context:.~ - Using~`\__hook_currname_or_default:'~instead. + Using~'\__hook_currname_or_default:'~instead. } \msg_new:nnn { hooks } { no-default-label } { @@ -2530,23 +5131,23 @@ of this package available from CTAN} This~command~was~ignored. } \msg_new:nnnn { hooks } { unknown-rule } - { Unknown~ relationship~ `#3'~ - between~ labels~ `#2'~ and~ `#4'~ - \str_if_eq:nnF {#1} {??} { ~in~hook~`#1' }. ~ + { Unknown~ relationship~ '#3'~ + between~ labels~ '#2'~ and~ '#4'~ + \str_if_eq:nnF {#1} {??} { ~in~hook~'#1' }. ~ Perhaps~ a~ missspelling? } { The~ relation~ used~ not~ known~ to~ the~ system.~ Allowed~ values~ are~ - `before'~ or~ `<',~ - `after'~ or~ `>',~ - `incompatible-warning',~ - `incompatible-error',~ - `voids'~ or~ - `unrelated'. + 'before'~ or~ '<',~ + 'after'~ or~ '>',~ + 'incompatible-warning',~ + 'incompatible-error',~ + 'voids'~ or~ + 'unrelated'. } \msg_new:nnnn { hooks } { misused-top-level } { - Illegal~\iow_char:N \\AddToHook{#1}[top-level]{...}.\\ + Illegal~use~of~\iow_char:N \\AddToHook{#1}[top-level]{...}.\\ 'top-level'~is~reserved~for~the~user's~document. } { @@ -2557,16 +5158,10 @@ of this package available from CTAN} } \msg_new:nnn { hooks } { set-top-level } { - You~cannot~change~the~default~label~#1~`top-level'.~Illegal \\ + You~cannot~change~the~default~label~#1~'top-level'.~Illegal \\ \use:nn { ~ } { ~ } \iow_char:N \\#2{#3} \\ \msg_line_context:. } -\msg_new:nnn { hooks } { ddhl-deprecated } - { - \iow_char:N \\DeclareDefaultHookLabel~is~deprecated.\\ - Use~\iow_char:N \\SetDefaultHookLabel~instead.\\ \\ - The~deprecated~name~will~be~removed~in~the~next~release. - } \msg_new:nnn { hooks } { extra-pop-label } { Extra~\iow_char:N \\PopDefaultHookLabel. \\ @@ -2575,16 +5170,47 @@ of this package available from CTAN} \msg_new:nnn { hooks } { missing-pop-label } { Missing~\iow_char:N \\PopDefaultHookLabel. \\ - The~label~`#1'~was~pushed~but~never~popped.~Something~is~wrong. + The~label~'#1'~was~pushed~but~never~popped.~Something~is~wrong. } -\msg_new:nnn { hooks } { should-not-happen } +\msg_new:nnn { kernel } { should-not-happen } { - ERROR!~This~should~not~happen.~#1 \\ + This~should~not~happen.~#1 \\ Please~report~at~https://github.com/latex3/latex2e. } +\msg_new:nnn { hooks } { provide-disabled } + { + Cannot~ provide~ hook~ '#1'~ because~ it~ is~ disabled! + } +\msg_new:nnnn { hooks } { provide-error } + { + Hook~'#1'~ already~ declared~ as~ a~ + \__hook_if_reversed:nTF {#1} { reversed } { normal }~ hook! + } + { + You~ attempted~ to~ provide~ the~ hook~'#1'~ as~ a~ + \__hook_if_reversed:nTF {#1} { normal } { reversed }~ hook,~ but~ it~ + was~ already~ previously~ declared~ as~ a~ + \__hook_if_reversed:nTF {#1} { reversed } { normal }~ hook.~ + A~ redeclaration~ is~ not~ possible. + } \NewDocumentCommand \NewHook { m }{ \hook_new:n {#1} } \NewDocumentCommand \NewReversedHook { m }{ \hook_new_reversed:n {#1} } \NewDocumentCommand \NewMirroredHookPair { mm }{ \hook_new_pair:nn {#1}{#2} } +\IncludeInRelease{2021/06/01}% + {\hook_provide:n}{Providing~hooks} +\NewDocumentCommand \ProvideHook { m }{ \hook_provide:n {#1} } +\NewDocumentCommand \ProvideReversedHook { m }{ \hook_provide_reversed:n {#1} } +\NewDocumentCommand \ProvideMirroredHookPair { mm }{ \hook_provide_pair:nn {#1}{#2} } +\NewDocumentCommand \DisableHook { m }{ \hook_disable:n {#1} } +\EndIncludeInRelease +\IncludeInRelease{2020/10/01} + {\hook_provide:n}{Providing~hooks} + +\def \ProvideHook#1{} +\def \ProvideReversedHook#1{} +\def \ProvideMirroredHookPair#1#2{} + +\EndIncludeInRelease \NewDocumentCommand \AddToHook { m o +m } { \hook_gput_code:nnn {#1} {#2} {#3} } \NewDocumentCommand \AddToHookNext { m +m } @@ -2592,7 +5218,8 @@ of this package available from CTAN} \NewDocumentCommand \RemoveFromHook { m o } { \hook_gremove_code:nn {#1} {#2} } \tl_gset:Nn \g__hook_hook_curr_name_tl { top-level } -\seq_gput_right:Nn \g__hook_name_stack_seq { top-level } +\seq_if_empty:NT \g__hook_name_stack_seq + { \seq_gput_right:Nn \g__hook_name_stack_seq { top-level } } \cs_set_protected:Npn \__hook_tmp:w #1 #2 #3 { \quark_if_recursion_tail_stop:n {#1} @@ -2603,6 +5230,7 @@ of this package available from CTAN} \q_recursion_tail \q_recursion_tail \q_recursion_tail \q_recursion_stop \tl_gset:Nx \g__hook_hook_curr_name_tl { \@currname } +\seq_gpop_right:NN \g__hook_name_stack_seq \l__hook_tmpa_tl \cs_new_protected:Npn \__hook_curr_name_push:n #1 { \exp_args:Nx \__hook_curr_name_push_aux:n { \__hook_make_name:n {#1} } } \cs_new_protected:Npn \__hook_curr_name_push_aux:n #1 @@ -2657,11 +5285,6 @@ of this package available from CTAN} } { \tl_gset:Nn \g__hook_hook_curr_name_tl {#1} } } -\NewDocumentCommand \DeclareDefaultHookLabel { m } - { - \msg_error:nn { hooks } { ddhl-deprecated } - \SetDefaultHookLabel {#1} - } \NewDocumentCommand \PushDefaultHookLabel { m } { \__hook_curr_name_push:n {#1} } \NewDocumentCommand \PopDefaultHookLabel { } @@ -2685,21 +5308,21 @@ of this package available from CTAN} \@onlypreamble\DeclareDefaultHookRule \NewDocumentCommand \ClearHookRule { m m m } { \hook_gset_rule:nnnn {#1}{#2}{unrelated}{#3} } -\cs_new_eq:NN \IfHookExistsTF \hook_if_exist:nTF \cs_new_eq:NN \IfHookEmptyTF \hook_if_empty:nTF -%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%5 +\cs_new_eq:NN \IfHookExistsTF \__hook_if_usable:nTF +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \cs_new_eq:NN \@expl@@@initialize@all@@ \__hook_initialize_all: \cs_new_eq:NN \@expl@@@hook@curr@name@pop@@ \__hook_curr_name_pop: -\ExplSyntaxOff -\EndIncludeInRelease \IncludeInRelease{0000/00/00}% - {\NewHook}{The hook management}% + {lthooks}{The~hook~management}% -\def\NewHook#1{} -\def\NewReversedHook#1{} -\def\NewMirroredHookPair#1#2{} +\def \NewHook#1{} +\def \NewReversedHook#1{} +\def \NewMirroredHookPair#1#2{} + +\def \DisableHook #1{} \long\def\AddToHookNext#1#2{} @@ -2721,12 +5344,474 @@ of this package available from CTAN} \long\def \IfHookExistsTF #1#2#3{#3} \long\def \IfHookEmptyTF #1#2#3{#2} -\EndIncludeInRelease +\EndModuleRelease +\ExplSyntaxOff %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +%% File: ltcmdhooks.dtx (C) Copyright 2020-2021 +%% Frank Mittelbach, Phelype Oleinik, LaTeX Team +%%% From File: ltcmdhooks.dtx +\def\ltcmdhooksversion{v1.0b} +\def\ltcmdhooksdate{2021/05/26} +\ExplSyntaxOn +\NewModuleRelease{2021/06/01}{ltcmdhooks} + {The~hook~management~system~for~commands} +\tl_new:N \g_hook_patch_action_list_tl +\int_new:N \l__hook_patch_num_args_int +\tl_new:N \l__hook_patch_prefixes_tl +\tl_new:N \l__hook_patch_param_text_tl +\tl_new:N \l__hook_patch_replacement_tl +\prop_new:N \g__hook_delayed_patches_prop +\cs_new_protected:Npn \__hook_patch_debug:x #1 + { \__hook_debug:n { \iow_term:x { [lthooks]~#1 } } } +\cs_generate_variant:Nn \tl_rescan:nn { nV } +\cs_new_protected:Npn \__hook_try_put_cmd_hook:n #1 + { \__hook_try_put_cmd_hook:w #1 / / / \s__hook_mark {#1} } +\cs_new_protected:Npn \__hook_try_put_cmd_hook:w + #1 / #2 / #3 / #4 \s__hook_mark #5 + { + \__hook_debug:n { \iow_term:n { ->~Adding~cmd~hook~to~'#2'~(#3): } } + \str_case:nnTF {#3} + { { before } { } { after } { } } + { \exp_args:Nc \__hook_patch_cmd_or_delay:Nnn {#2} {#2} {#3} } + { \msg_error:nnnn { hooks } { wrong-cmd-hook } {#2} {#3} } + } +\cs_new_protected:Npn \__hook_patch_cmd_or_delay:Nnn #1 #2 #3 + { + \__hook_debug:n { \iow_term:n { ->~Add~generic~cmd~hook~for~#2~(#3). } } + \__hook_debug:n + { \iow_term:n { !~In~the~preamble:~delaying. } } + \prop_gput:Nnn \g__hook_delayed_patches_prop { #2 / #3 } + { \__hook_cmd_try_patch:nn {#2} {#3} } + } +\cs_new_protected:Npn \__hook_cmd_begindocument_code: + { + \cs_gset_eq:NN \__hook_patch_cmd_or_delay:Nnn \__hook_patch_command:Nnn + \prop_map_function:NN \g__hook_delayed_patches_prop { \use_ii:nn } + \prop_gclear:N \g__hook_delayed_patches_prop + \cs_undefine:N \__hook_cmd_begindocument_code: + } +\g@addto@macro \@kernel@after@begindocument + { \__hook_cmd_begindocument_code: } +\cs_new_protected:Npn \__hook_cmd_try_patch:nn #1 #2 + { + \__hook_debug:n + { \iow_term:x { ->~\string\begin{document}~try~cmd / #1 / #2. } } + \__hook_if_declared:nTF { cmd / #1 / #2 } + { + \__hook_debug:n + { \iow_term:n { .->~Giving~up:~hook~already~created. } } + } + { + \cs_if_exist:cT {#1} + { \exp_args:Nc \__hook_patch_command:Nnn {#1} {#1} {#2} } + } + } +\cs_new_protected:Npn \__hook_patch_command:Nnn #1 #2 #3 + { + \__hook_patch_debug:x { analyzing~'\token_to_str:N #1' } + \__hook_patch_debug:x { \token_to_str:N #1 = \token_to_meaning:N #1 } + \__hook_patch_check:NNnn \cs_if_exist:NTF #1 { undef } + { + \__hook_patch_debug:x { ++~control~sequence~is~defined } + \__hook_patch_check:NNnn \token_if_macro:NTF #1 { macro } + { + \__hook_patch_debug:x { ++~control~sequence~is~a~macro } + \__hook_patch_check:NNnn \__hook_if_public_command:NTF #1 { expl3 } + { + \__hook_patch_debug:x { ++~macro~is~not~private } + \robust@command@act + \g_hook_patch_action_list_tl #1 + \__hook_retokenize_patch:Nnn { #1 {#2} {#3} } + } + } + } + } +\cs_new_protected:Npn \__hook_patch_check:NNnn #1 #2 #3 #4 + { + #1 #2 {#4} + { + \msg_error:nnxx { hooks } { cant-patch } + { \token_to_str:N #2 } {#3} + } + } +\use:x + { + \prg_new_protected_conditional:Npnn + \exp_not:N \__hook_if_public_command:N ##1 { TF } + { + \exp_not:N \exp_last_unbraced:Nf + \exp_not:N \__hook_if_public_command:w + { \exp_not:N \cs_to_str:N ##1 } + \tl_to_str:n { _ _ } \s__hook_mark + } + } +\exp_last_unbraced:NNNNo +\cs_new_protected:Npn \__hook_if_public_command:w + #1 \tl_to_str:n { _ _ } #2 \s__hook_mark + { + \tl_if_empty:nTF {#2} + { \prg_return_true: } + { \prg_return_false: } + } +\tl_gset:Nn \g_hook_patch_action_list_tl + { + { \@if@DeclareRobustCommand \__hook_patch_DeclareRobustCommand:Nnn } + { \@if@newcommand \__hook_patch_newcommand:Nnn } + { \__kernel_cmd_if_xparse:NTF \__hook_cmd_patch_xparse:Nnn } + } +\cs_new_protected:Npn \__hook_patch_DeclareRobustCommand:Nnn #1 + { + \exp_args:Nc \@if@newcommand { \cs_to_str:N #1 ~ } + { \exp_args:Nc \__hook_patch_newcommand:Nnn } + { \exp_args:NNc \__hook_patch_expand_redefine:NNnn \c_false_bool } + { \cs_to_str:N #1 ~ } + } +\cs_new_protected:Npn \__hook_patch_newcommand:Nnn #1 + { + \exp_args:NNc \__hook_patch_expand_redefine:NNnn \c_true_bool + { \c_backslash_str \cs_to_str:N #1 } + } +\cs_new_protected:Npn \__hook_cmd_patch_xparse:Nnn #1 + { + \exp_args:NNc \__hook_patch_expand_redefine:NNnn \c_false_bool + { \cs_to_str:N #1 ~ code } + } +\cs_new_protected:Npn \__hook_patch_expand_redefine:NNnn #1 #2 #3 #4 + { + \__hook_patch_debug:x { ++~command~can~be~patched~without~rescanning } + \int_set:Nn \l__hook_patch_num_args_int + { + \exp_args:Nf \str_count:n { \cs_argument_spec:N #2 } / 2 + \bool_if:NT #1 { -1 } + } + \int_compare:nNnTF { \l__hook_patch_num_args_int } > { \c_zero_int } + { + \tl_set:Nx \l__hook_patch_param_text_tl + { \bool_if:NTF #1 { [####1] } { ####1 } } + \tl_set:Nx \l__hook_patch_replacement_tl + { \bool_if:NTF #1 { [####1] } { {####1} } } + \int_step_inline:nnn { 2 } { \l__hook_patch_num_args_int } + { + \tl_put_right:Nn \l__hook_patch_param_text_tl { ## ####1 } + \tl_put_right:Nn \l__hook_patch_replacement_tl { { ## ####1 } } + } + } + { + \tl_clear:N \l__hook_patch_param_text_tl + \tl_clear:N \l__hook_patch_replacement_tl + } + \group_begin: + \int_set:Nn \tex_escapechar:D { `\/ } + \use:x + { + \group_end: + \tl_set:Nx \exp_not:N \l__hook_patch_prefixes_tl + { \exp_not:N \__hook_make_prefixes:w \cs_prefix_spec:N #2 / / } + } + \use:x + { + \l__hook_patch_prefixes_tl \tex_def:D + \exp_not:N #2 \exp_not:V \l__hook_patch_param_text_tl + { + \str_if_eq:nnT {#4} { before } + { \exp_not:N \UseHook { cmd / #3 / #4 } } + \exp_args:No \exp_not:o + { \exp_after:wN #2 \l__hook_patch_replacement_tl } + \str_if_eq:nnT {#4} { after } + { \exp_not:N \UseHook { cmd / #3 / #4 } } + } + } + } +\cs_new:Npn \__hook_make_prefixes:w / #1 / + { + \tl_if_empty:nF {#1} + { + \exp_not:c { tex_ \tl_trim_spaces:n {#1} :D } + \__hook_make_prefixes:w / + } + } +\cs_new_protected:Npn \__hook_retokenize_patch:Nnn #1 #2 #3 + { + \__hook_patch_debug:x { ..~command~can~only~be~patched~by~rescanning } + \str_if_eq:eeTF { \cs_argument_spec:N #1 } { } + { \__hook_patch_expand_redefine:NNnn \c_false_bool #1 {#2} {#3} } + { + \tl_set:Nx \l__hook_tmpa_tl + { + \int_compare:nNnTF { \char_value_catcode:n {`\@ } } = { 12 } + { \exp_not:N \makeatletter } { \exp_not:N \makeatother } + } + \tl_set:Nx \l__hook_tmpb_tl + { + \bool_if:NTF \l__kernel_expl_bool + { \ExplSyntaxOff } { \ExplSyntaxOn } + } + \use:x + { + \exp_not:N \__hook_try_patch_with_catcodes:Nnnnw + \exp_not:n { #1 {#2} {#3} } + { \prg_do_nothing: } + { \exp_not:V \l__hook_tmpa_tl } % @ + { \exp_not:V \l__hook_tmpb_tl } % _: + { + \exp_not:V \l__hook_tmpa_tl % @ + \exp_not:V \l__hook_tmpb_tl % _: + } + } + \q_recursion_tail \q_recursion_stop + { + \msg_error:nnxx { hooks } { cant-patch } + { \c_backslash_str #2 } { retok } + } + } + } +\cs_new_protected:Npn \__hook_try_patch_with_catcodes:Nnnnw #1 #2 #3 #4 + { + \quark_if_recursion_tail_stop_do:nn {#4} { \use:n } + \__hook_patch_debug:x { ++~trying~to~patch~by~retokenization } + \__hook_cmd_if_scanable:NnTF {#1} {#4} + { + \__hook_patch_debug:x { ++~macro~can~be~retokenized~cleanly } + \__hook_patch_debug:x { ==~retokenizing~macro~now } + \__hook_patch_retokenize:Nnnn #1 {#2} {#3} {#4} + \use_i_delimit_by_q_recursion_stop:nw \use_none:n + } + { + \__hook_patch_debug:x { --~macro~cannot~be~retokenized~cleanly } + \__hook_try_patch_with_catcodes:Nnnnw #1 {#2} {#3} + } + } +\cs_new_eq:NN \kerneltmpDoNotUse ! +\cs_new_protected:Npn \__hook_patch_required_catcodes: + { + \char_set_catcode_escape:N \\ + \char_set_catcode_group_begin:N \{ + \char_set_catcode_group_end:N \} + \char_set_catcode_parameter:N \# + % \int_set:Nn \tex_endlinechar:D { -1 } + % \int_set:Nn \tex_newlinechar:D { -1 } + } +\prg_new_protected_conditional:Npnn \__hook_cmd_if_scanable:Nn #1 #2 { TF } + { + \cs_set_eq:NN \kerneltmpDoNotUse \scan_stop: + \cs_set_eq:NN \__hook_tmp:w \scan_stop: + \use:x + { + \cs_set:Npn \__hook_tmp:w + ####1 \tl_to_str:n { macro: } ####2 -> ####3 \s__hook_mark + { ####1 \def \kerneltmpDoNotUse ####2 {####3} } + \tl_set:Nx \exp_not:N \l__hook_tmpa_tl + { \exp_not:N \__hook_tmp:w \token_to_meaning:N #1 \s__hook_mark } + } + \tl_rescan:nV { #2 \__hook_patch_required_catcodes: } \l__hook_tmpa_tl + \token_if_eq_meaning:NNTF #1 \kerneltmpDoNotUse + { \prg_return_true: } + { \prg_return_false: } + } +\cs_new_protected:Npn \__hook_patch_retokenize:Nnnn #1 #2 #3 #4 + { + \cs_set_eq:NN \kerneltmpDoNotUse \scan_stop: + \cs_set_eq:NN \__hook_tmp:w \scan_stop: + \use:x + { + \cs_set:Npn \__hook_tmp:w + ####1 \tl_to_str:n { macro: } ####2 -> ####3 \s__hook_mark + { + ####1 \def \kerneltmpDoNotUse ####2 + { + \str_if_eq:nnT {#3} { before } + { \token_to_str:N \UseHook { cmd / #2 / #3 } } + ####3 + \str_if_eq:nnT {#3} { after } + { \token_to_str:N \UseHook { cmd / #2 / #3 } } + } + } + \tl_set:Nx \exp_not:N \l__hook_tmpa_tl + { \exp_not:N \__hook_tmp:w \token_to_meaning:N #1 \s__hook_mark } + } + \tl_rescan:nV { #4 \__hook_patch_required_catcodes: } \l__hook_tmpa_tl + \cs_set_eq:NN #1 \kerneltmpDoNotUse + } +\msg_new:nnnn { hooks } { wrong-cmd-hook } + { + Generic~hook~`cmd/#1/#2'~is~invalid. + } + { + You~tried~to~add~a~generic~hook~to~command~\iow_char:N \\#1,~but~`#2'~ + is~an~invalid~component.~Only~`before'~or~`after'~are~allowed. + } +\msg_new:nnnn { hooks } { cant-patch } + { + Generic~hooks~cannot~be~added~to~'#1'. + } + { + You~tried~to~add~a~hook~to~'#1',~but~LaTeX~was~unable~to~ + patch~the~command~because~it~\__hook_unpatchable_cases:n {#2}. + } +\cs_new:Npn \__hook_unpatchable_cases:n #1 + { + \str_case:nn {#1} + { + { undef } { doesn't~exist } + { macro } { is~not~a~macro } + { expl3 } { is~a~private~expl3~macro } + { retok } { can't~be~retokenized~cleanly } + } + } +\IncludeInRelease{0000/00/00}{ltcmdhooks}% + {The~hook~management~system~for~commands} + +\cs_set_eq:NN \__hook_cmd_begindocument_code: \prg_do_nothing: + +\EndModuleRelease +\ExplSyntaxOff %%% From File: ltalloc.dtx %%% From File: ltcntrl.dtx %%% From File: lterror.dtx %%% From File: ltpar.dtx +%% File: ltpara.dtx (C) Copyright 2020-2021 +%%% From File: ltpara.dtx +\def\ltparaversion{v1.0g} +\def\ltparadate{2021/05/27} + + +\ExplSyntaxOn +\NewModuleRelease{2021/06/01}{ltpara} + {Paragraph~handling~and~hooks} +\hook_new_pair:nn{para/before}{para/after} +\hook_new_pair:nn{para/begin}{para/end} +\let \@kernel@before@para@before \@empty +\let \@kernel@before@para@begin \@empty +\let \@kernel@after@para@end \@empty +\let \@kernel@after@para@after \@empty +\tl_new:N \g__para_standard_everypar_tl +\tl_gset:Nn \g__para_standard_everypar_tl { + \box_gset_to_last:N \g_para_indent_box + \group_begin: + \tex_par:D + \group_end: + \tex_everypar:D { \msg_error:nnnn { hooks }{ para-mode }{before}{vertical} } + \@kernel@before@para@before + \hook_use:n {para/before} + \group_begin: + \tex_everypar:D {} + \skip_zero:N \tex_parskip:D + \tex_noindent:D + \group_end: + \tex_everypar:D{\g__para_standard_everypar_tl} + \@kernel@before@para@begin + \hook_use:n {para/begin} + \if_mode_horizontal: \else: + \msg_error:nnnn { hooks }{ para-mode }{begin}{vertical} \fi: + \__para_handle_indent: +} +\tex_everypar:D{\g__para_standard_everypar_tl} +\newtoks \everypar + +\tl_gput_right:Nx \g__para_standard_everypar_tl { + \exp_not:N \the + \exp_not:N \toks + \the \allocationnumber + \c_space_tl +} +\box_new:N \g_para_indent_box + +\cs_new:Npn \__para_handle_indent: { + \box_use_drop:N \g_para_indent_box +} +\cs_new:Npn \para_omit_indent: { + \box_gclear:N \g_para_indent_box +} +\cs_set_eq:NN \IndentBox \g_para_indent_box +\cs_set_eq:NN \OmitIndent \para_omit_indent: +\cs_new_protected:Npn \para_end: { + \mode_if_horizontal:TF { + \mode_if_inner:F { + \tex_unskip:D + \hook_use:n{para/end} + \@kernel@after@para@end + \mode_if_horizontal:TF { + \if_int_compare:w 0 < \tex_lastnodetype:D + \tex_kern:D \c_zero_dim + \fi: + \tex_par:D + \hook_use:n{para/after} + \@kernel@after@para@after + } + { \msg_error:nnnn { hooks }{ para-mode }{end}{horizontal} } + } + } + \tex_par:D +} +\cs_new:Npn \para_raw_indent: { + \mode_if_vertical:TF + { + \tex_everypar:D { + \box_gset_to_last:N \g_para_indent_box + \tex_everypar:D { \g__para_standard_everypar_tl } + \__para_handle_indent: + \the\everypar } + } + { \msg_error:nn { kernel }{ raw-para } } + \tex_indent:D +} +\cs_new:Npn \para_raw_noindent: { + \mode_if_vertical:TF + { + \tex_everypar:D { + \tex_everypar:D { \g__para_standard_everypar_tl } + \the\everypar } + } + { \msg_error:nn { kernel }{ raw-para } } + \tex_noindent:D +} +\cs_new_eq:NN \para_raw_end: \tex_par:D +\cs_set_eq:NN \RawIndent \para_raw_indent: +\cs_set_eq:NN \RawNoindent \para_raw_noindent: +\cs_set_eq:NN \RawParEnd \para_raw_end: +\cs_set_eq:NN \par \para_end: +\cs_set_eq:NN \@@par \para_end: +\cs_set_eq:NN \endgraf \para_end: +\everypar{\@nodocument} %% To get an error if text appears before the +\msg_new:nnnn { hooks } { para-mode } + { + Illegal~mode~ change~ in~ hook~ 'para/#1'.\\ + Hook~ code~ did~ not~ remain~ in~ #2~ mode. + } + { + Paragraph~ hooks~ cannot~ change~ the~ TeX~ mode~ without~ causing~ + endless~ recursion.~ The~ hook~ code~ in~ 'para/#1'~ needs~ to~ stay~ + in~ #2~ mode,~ but~ it~ didn't.~ Examine~ the~ hook~ + code~ with~ \iow_char:N \\ShowHook~ to~ find~ the~ issue. + } +\msg_new:nnnn { kernel } { raw-para } + { + Not~ in~ vertical~ mode. + } + { + Starting~ a~ paragraph~ with~ \iow_char:N \\RawIndent~ or~ + \iow_char:N \\RawNoindent \\ + (or~ \iow_char:N \\para_raw_indent:~ or~ + \iow_char:N \\para_raw_noindent:)~ is~ only~ allowed \\ + if~ LaTeX~ is~ in~ vertical~ mode. + } + +\IncludeInRelease{0000/00/00}% + {ltpara}{Undo~hooks~for~paragraphs} + +\let \OmitIndent \@undefined +\let \IndentBox \@undefined +\let \RawIndent \@undefined +\let \RawNoindent \@undefined +\let \RawParEnd \@undefined + +\cs_set_eq:NN \par \tex_par:D +\cs_set_eq:NN \@@par \tex_par:D +\cs_set_eq:NN \endgraf \tex_par:D + +\EndModuleRelease +\ExplSyntaxOff +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% %%% From File: ltspace.dtx \IncludeInRelease{2019/10/01}% {\pagebreak}{Make commands robust}% @@ -3130,8 +6215,6 @@ of this package available from CTAN} \let\expandafter\noexpand\csname __hook env/document/begin\endcsname \noexpand\@empty} -\let \@kernel@before@begindocument \@empty -\let \@kernel@after@begindocument \@empty \EndIncludeInRelease \IncludeInRelease{2017/04/15}% @@ -3396,6 +6479,52 @@ of this package available from CTAN} \DeclareRobustCommand\IfFileExists[1]{% \set@curr@file{#1}% \expandafter\IfFileExists@\expandafter{\@curr@file}} +\EndIncludeInRelease +\IncludeInRelease{0000/00/00}% + {\quote@name}{Quote file names}% + +\let\quote@name\@undefined +\let\quote@@name\@undefined +\let\unquote@name\@undefined + +\long\def \IfFileExists#1#2#3{% + \openin\@inputcheck#1 % + \ifeof\@inputcheck + \ifx\input@path\@undefined + \def\reserved@a{#3}% + \else + \def\reserved@a{\@iffileonpath{#1}{#2}{#3}}% + \fi + \else + \closein\@inputcheck + \edef\@filef@und{#1 }% + \def\reserved@a{#2}% + \fi + \reserved@a} + +\EndIncludeInRelease +\IncludeInRelease{2021/06/01}% + {\IfFileExists@}{manage unbalanced conditionals} +\long\def \IfFileExists@#1#2#3{% + \openin\@inputcheck"#1" % + \ifeof\@inputcheck + \ifx\input@path\@undefined + \let\reserved@a\@secondoftwo + \else + \def\reserved@a{\@iffileonpath{#1}}% + \fi + \else + \closein\@inputcheck + \edef\@filef@und{"#1" }% + \let\reserved@a\@firstoftwo + \fi + \expandafter\def\expandafter\reserved@a + \expandafter{\reserved@a{#2}{#3}}% +\reserved@a} +\EndIncludeInRelease +\IncludeInRelease{2019/10/01}% + {\IfFileExists@}{manage unbalanced conditionals} + \long\def \IfFileExists@#1#2#3{% \openin\@inputcheck"#1" % \ifeof\@inputcheck @@ -3410,6 +6539,16 @@ of this package available from CTAN} \def\reserved@a{#2}% \fi \reserved@a} +\EndIncludeInRelease +\IncludeInRelease{0000/00/00}% + {\IfFileExists@}{manage unbalanced conditionals} + +\let\IfFileExists@\@undefined + + +\EndIncludeInRelease +\IncludeInRelease{2019/10/01}% + {\@iffileonpath}{Quote file names} \long\def\@iffileonpath#1{% \let\reserved@a\@secondoftwo \expandafter\@tfor\expandafter\reserved@b\expandafter @@ -3424,28 +6563,7 @@ of this package available from CTAN} \reserved@a} \EndIncludeInRelease \IncludeInRelease{0000/00/00}% - {\quote@name}{Quote file names}% - -\let\quote@name\@undefined -\let\quote@@name\@undefined -\let\unquote@name\@undefined - -\let\IfFileExists@\@undefined - -\long\def \IfFileExists#1#2#3{% - \openin\@inputcheck#1 % - \ifeof\@inputcheck - \ifx\input@path\@undefined - \def\reserved@a{#3}% - \else - \def\reserved@a{\@iffileonpath{#1}{#2}{#3}}% - \fi - \else - \closein\@inputcheck - \edef\@filef@und{#1 }% - \def\reserved@a{#2}% - \fi - \reserved@a} + {\quote@name}{Quote file names} \long\def\@iffileonpath#1{% \let\reserved@a\@secondoftwo @@ -3885,13 +7003,25 @@ of this package available from CTAN} }% \fi}% \EndIncludeInRelease +\IncludeInRelease{2021/06/01}% + {\usefont}{Force font face}% +\DeclareRobustCommand\usefont[4]{\fontencoding{#1}% + \edef\f@family{#2}% + \set@target@series{#3}% + \edef\f@shape{#4}% + \let\delayed@f@adjustment\@empty + \selectfont + \ignorespaces} +\EndIncludeInRelease \IncludeInRelease{2020/02/02}% {\usefont}{Drop m in usefont}% + \DeclareRobustCommand\usefont[4]{\fontencoding{#1}% \edef\f@family{#2}% \set@target@series{#3}% \edef\f@shape{#4}\selectfont \ignorespaces} + \EndIncludeInRelease \IncludeInRelease{0000/00/00}% {\usefont}{Drop m in usefont}% @@ -3919,7 +7049,7 @@ of this package available from CTAN} \let\LoadFontDefinitionFile\@undefined \EndIncludeInRelease \IncludeInRelease{2020/02/02}% - {\DeclareFontFamilySubstitution}{Provide family substituation}% + {\DeclareFontFamilySubstitution}{Provide family substitution}% \begingroup \nfss@catcodes \gdef\DeclareFontFamilySubstitution#1#2#3{% @@ -3950,7 +7080,7 @@ of this package available from CTAN} \endgroup \EndIncludeInRelease \IncludeInRelease{0000/00/00}% - {\DeclareFontFamilySubstitution}{Provide family substituation}% + {\DeclareFontFamilySubstitution}{Provide family substitution}% \let\DeclareFontFamilySubstitution\@undefined \EndIncludeInRelease @@ -3985,7 +7115,7 @@ of this package available from CTAN} } \EndIncludeInRelease \IncludeInRelease{2015/01/01}{\wrong@fontshape}% - {Font substituation in preamble}% + {Font substitution in preamble}% \def\wrong@fontshape{% \csname D@\f@encoding\endcsname % install defaults if in math \edef\reserved@a{\csname\curr@fontshape\endcsname}% @@ -4019,7 +7149,7 @@ of this package available from CTAN} \pickup@font} \EndIncludeInRelease \IncludeInRelease{0000/00/00}{\wrong@fontshape}% - {Font substituation in preamble}% + {Font substitution in preamble}% \def\wrong@fontshape{% \csname D@\f@encoding\endcsname \edef\reserved@a{\csname\curr@fontshape\endcsname}% @@ -4506,12 +7636,45 @@ of this package available from CTAN} \DeclareFontSeriesChangeRule {ulx}{?m}{ul}{} \DeclareFontSeriesChangeRule {ul}{?m}{ul}{} \DeclareFontSeriesChangeRule {x}{?m}{m}{} +\EndIncludeInRelease +\IncludeInRelease{0000/00/00}% + {\DeclareFontSeriesChangeRule}{Series change rules}% +\let\DeclareFontSeriesChangeRule\@undefined +\EndIncludeInRelease +\IncludeInRelease{2021/06/01}% + {\fontseries}{delay fontseries update}% +\DeclareRobustCommand\fontseries[1]{\@forced@seriesfalse + \expandafter\def\expandafter\delayed@f@adjustment\expandafter + {\delayed@f@adjustment\delayed@merge@font@series{#1}}} +\let\delayed@f@adjustment\@empty +\DeclareRobustCommand\fontseriesforce[1]{\@forced@seriestrue + \expandafter\def\expandafter\delayed@f@adjustment\expandafter + {\delayed@f@adjustment\edef\f@series{#1}}} \newif\if@forced@series -\DeclareRobustCommand\fontseriesforce[1]{\@forced@seriestrue\edef\f@series{#1}} -\DeclareRobustCommand\fontseries[1]{\@forced@seriesfalse\merge@font@series{#1}} +\EndIncludeInRelease +\IncludeInRelease{2020/02/02}% + {\fontseries}{delay fontseries update}% + +\DeclareRobustCommand\fontseries[1]{\@forced@seriesfalse + \merge@font@series{#1}} +\DeclareRobustCommand\fontseriesforce[1]{\@forced@seriestrue + \edef\f@series{#1}} +\let\delayed@f@adjustment\@undefined + +\expandafter\newif\csname if@forced@series\endcsname + +\EndIncludeInRelease +\IncludeInRelease{0000/00/00}% + {\fontseries}{delay fontseries update}% +\DeclareRobustCommand\fontseries[1]{\edef\f@series{#1}} +\let\fontseriesforce\@undefined + +\EndIncludeInRelease +\IncludeInRelease{2020/02/02}% + {\merge@font@series}{Merge series values}% \def\merge@font@series#1{% \expandafter\expandafter\expandafter \merge@font@series@ @@ -4519,13 +7682,11 @@ of this package available from CTAN} {#1}% \@nil } - \def\merge@font@series@#1#2#3\@nil{% \def\reserved@a{#3}% \ifx\reserved@a\@empty \set@target@series{#2}% \else - \maybe@load@fontshape \edef\reserved@a{\f@encoding /\f@family /#1/\f@shape}% \ifcsname \reserved@a \endcsname \set@target@series{#1}% @@ -4547,7 +7708,27 @@ of this package available from CTAN} using `\reserved@b' instead}% \fi } -\def\maybe@load@fontshape{\begingroup\try@load@fontshape\endgroup} +\def\merge@font@series@without@substitution#1{% + \expandafter\expandafter\expandafter + \merge@font@series@without@substitution@ + \csname series@\f@series @#1\endcsname + {#1}% + \@nil +} +\def\merge@font@series@without@substitution@#1#2#3\@nil{% + \def\reserved@a{#3}% + \ifx\reserved@a\@empty + \set@target@series{#2}% + \else + \set@target@series{#1}% + \fi +} +\let\delayed@merge@font@series\merge@font@series@without@substitution +\def\maybe@load@fontshape{% + \begingroup + \let \typeout \@font@info + \try@load@fontshape + \endgroup} \def\set@target@series#1{% \edef\f@series{#1}% \series@maybe@drop@one@m\f@series\f@series @@ -4570,7 +7751,25 @@ of this package available from CTAN} \def\series@drop@one@m#1m#2m#3\series@drop@one@m{% #1#2% } +\EndIncludeInRelease +\IncludeInRelease{0000/00/00}% + {\merge@font@series}{Merge series values}% + +\let\merge@font@series\@undefined +\let\merge@font@series@\@undefined +\let\@font@shape@subst@warning\@undefined +\let\merge@font@series@without@substitution\@undefined +\let\merge@font@series@without@substitution@\@undefined +\let\delayed@merge@font@series\@undefined +\let\maybe@load@fontshape\@undefined +\let\set@target@series\@undefined +\let\series@maybe@drop@one@m\@undefined +\let\series@drop@one@m\@undefined + +\EndIncludeInRelease +\IncludeInRelease{2020/02/02}% + {\DeclareFontShapeChangeRule}{Font shape change rules}% \def\DeclareFontShapeChangeRule #1#2#3#4{% \@namedef{shape@#1@#2}{{#3}{#4}}} \DeclareRobustCommand\ulcshape @@ -4626,8 +7825,45 @@ of this package available from CTAN} \DeclareFontShapeChangeRule {sw}{sc} {scsw} {} \DeclareFontShapeChangeRule {sw}{ulc} {sw} {} \DeclareFontShapeChangeRule {sw}{up} {n} {} +\EndIncludeInRelease +\IncludeInRelease{0000/00/00}% + {\DeclareFontShapeChangeRule}{Font shape change rules}% + +\let\DeclareFontShapeChangeRule\@undefined +\let\ulcshape\@undefined +\let\ulcdefault\@undefined +\let\swshape\@undefined +\let\swdefault\@undefined +\let\sscshape\@undefined +\let\sscdefault\@undefined + +\EndIncludeInRelease +\IncludeInRelease{2021/06/01}% + {\fontshape}{Font shape change}% +\DeclareRobustCommand\fontshape[1] + {\expandafter\def\expandafter\delayed@f@adjustment\expandafter + {\delayed@f@adjustment\delayed@merge@font@shape{#1}}} +\DeclareRobustCommand\fontshapeforce[1] + {\expandafter\def\expandafter\delayed@f@adjustment\expandafter + {\delayed@f@adjustment\edef\f@shape{#1}}} +\EndIncludeInRelease +\IncludeInRelease{2020/02/02}% + {\fontshape}{Font shape change}% + \DeclareRobustCommand\fontshape[1]{\merge@font@shape{#1}} \DeclareRobustCommand\fontshapeforce[1]{\edef\f@shape{#1}} + +\EndIncludeInRelease +\IncludeInRelease{0000/00/00}% + {\fontshape}{Font shape change}% + +\DeclareRobustCommand\fontshape [1]{\edef\f@shape{#1}} +\let\fontshapeforce\@undefined + +\EndIncludeInRelease + +\IncludeInRelease{2020/02/02}% + {\merge@font@shape}{Font shape change rules}% \def\merge@font@shape#1{% \expandafter\expandafter\expandafter \merge@font@shape@ @@ -4641,9 +7877,8 @@ of this package available from CTAN} \ifx\reserved@a\@empty \edef\f@shape{#2}% \else - \maybe@load@fontshape \edef\reserved@a{\f@encoding /\f@family /\f@series/#1}% - \ifcsname \reserved@a\endcsname + \ifcsname \reserved@a\endcsname \edef\f@shape{#1}% \else \ifcsname \f@encoding /\f@family /\f@series/#2\endcsname @@ -4656,6 +7891,22 @@ of this package available from CTAN} \fi \fi } +\def\merge@font@shape@without@substitution#1{% + \expandafter\expandafter\expandafter + \merge@font@shape@without@substitution@ + \csname shape@\f@shape @#1\endcsname + {#1}% + \@nil +} +\def\merge@font@shape@without@substitution@#1#2#3\@nil{% + \def\reserved@a{#3}% + \ifx\reserved@a\@empty + \edef\f@shape{#2}% + \else + \edef\f@shape{#1}% + \fi +} +\let\delayed@merge@font@shape\merge@font@shape@without@substitution \protected\def\normalshape {\not@math@alphabet\normalshape\relax \fontshape\shapedefault\selectfont}% @@ -4682,34 +7933,23 @@ of this package available from CTAN} {\not@math@alphabet\sscshape\relax \fontshape\sscdefault\selectfont}% } +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \EndIncludeInRelease \IncludeInRelease{0000/00/00}% - {\DeclareFontSeriesChangeRule}{Series change rules}% + {\merge@font@shape}{Font shape change rules}% -\DeclareRobustCommand\fontseries[1]{\edef\f@series{#1}} \DeclareRobustCommand\fontshape [1]{\edef\f@shape{#1}} -\let\fontseriesforce\@undefined \let\fontshapeforce\@undefined -\let\DeclareFontSeriesChangeRule\@undefined -\let\merge@font@series\@undefined -\let\merge@font@series@\@undefined -\let\@font@shape@subst@warning\@undefined -\let\maybe@load@fontshape\@undefined -\let\set@target@series\@undefined -\let\series@maybe@drop@one@m\@undefined -\let\series@drop@one@m\@undefined -\let\DeclareFontShapeChangeRule\@undefined \let\merge@font@shape\@undefined \let\merge@font@shape@\@undefined + +\let\merge@font@shape@without@substitution\@undefined +\let\merge@font@shape@without@substitution@\@undefined +\let\delayed@merge@font@shape\@undefined + \let\normalshape\@undefined -\let\ulcshape\@undefined -\let\ulcdefault\@undefined -\let\swshape\@undefined -\let\swdefault\@undefined -\let\sscshape\@undefined -\let\sscdefault\@undefined -\let\normalshape\@undefined + \let\reinstall@nfss@defs\relax \EndIncludeInRelease @@ -4727,7 +7967,59 @@ of this package available from CTAN} \EndIncludeInRelease %%% From File: ltfsstrc.dtx %% Copyright (C) 1989-97 by Frank Mittelbach and Rainer Sch\"opf. -%% Copyright (C) 1994-97 by LaTeX3 project. All rights reserved. +%% Copyright (C) 1994-97 by LaTeX Project. All rights reserved. + +\IncludeInRelease{2021/06/01}% + {\selectfont}{Add hook to \selectfont}% +\DeclareRobustCommand\selectfont + {% + \ifx\f@linespread\baselinestretch \else + \set@fontsize\baselinestretch\f@size\f@baselineskip \fi + \ifx\delayed@f@adjustment\@empty + \else + \let\f@shape@saved\f@shape + \let\f@series@saved\f@series + \delayed@f@adjustment + \maybe@load@fontshape + \ifcsname \f@encoding/\f@family/\f@series/\f@shape \endcsname + \else + \let\f@shape\f@shape@saved + \let\f@series\f@series@saved + \let\delayed@merge@font@shape\merge@font@shape + \let\delayed@merge@font@series\merge@font@series + \delayed@f@adjustment + \let\delayed@merge@font@shape\merge@font@shape@without@substitution + \let\delayed@merge@font@series\merge@font@series@without@substitution + \fi + \let\delayed@f@adjustment\@empty + \fi + \@forced@seriesfalse + \xdef\font@name{% + \csname\curr@fontshape/\f@size\endcsname}% + \pickup@font + \font@name + \UseHook{selectfont}% + \size@update + \enc@update + } +\NewHook{selectfont} +\EndIncludeInRelease +\IncludeInRelease{0000/00/00}% + {\selectfont}{Add hook to \selectfont}% + +\DeclareRobustCommand\selectfont + {% + \ifx\f@linespread\baselinestretch \else + \set@fontsize\baselinestretch\f@size\f@baselineskip \fi + \xdef\font@name{% + \csname\curr@fontshape/\f@size\endcsname}% + \pickup@font + \font@name + \size@update + \enc@update + } + +\EndIncludeInRelease \IncludeInRelease{2020/02/02}% {\@font@aliasinfo}{alias size function}% \DeclareSizeFunction{alias}{\sub@sfcnt\@font@aliasinfo} @@ -4824,7 +8116,7 @@ of this package available from CTAN} in version \math@version}% \@eha \fi - \else \expandafter\non@alpherr\fi + \else \expandafter\expandafter\expandafter\non@alpherr\fi \expandafter#1\ifx\math@bgroup\bgroup{#4}\else#4\fi }% } @@ -5279,6 +8571,9 @@ of this package available from CTAN} \prepare@family@series@update{tt}\ttdefault \@ttfamilyhook \selectfont} +\let\@rmfamilyhook\@empty +\let\@sffamilyhook\@empty +\let\@ttfamilyhook\@empty \EndIncludeInRelease @@ -5339,7 +8634,6 @@ of this package available from CTAN} \@font@series@contexttrue \fi\fi\fi } - \newif\if@font@series@context \EndIncludeInRelease \IncludeInRelease{0000/00/00}% @@ -5357,9 +8651,7 @@ of this package available from CTAN} \protected@edef\emfontdeclare@clist{\zap@space#1, \@empty\emforce\emreset}% } \let\emfontdeclare@clist\@empty - \DeclareRobustCommand\emreset{\upshape\ulcshape} - \DeclareRobustCommand\em{% \@nomath\em \ifx\emfontdeclare@clist\@empty @@ -5420,8 +8712,23 @@ of this package available from CTAN} \DeclareRobustCommand\symbol[1]{\char#1\relax} \EndIncludeInRelease -\IncludeInRelease{2020/02/02}% +\IncludeInRelease{2021/06/01}% + {\normalfont}{Add hook to \normalfont}% +\DeclareRobustCommand\normalfont{% + \fontencoding\encodingdefault + \edef\f@family{\familydefault}% + \edef\f@series{\seriesdefault}% + \edef\f@shape{\shapedefault}% + \let\delayed@f@adjustment\@empty + \UseHook{normalfont}% + \@defaultfamilyhook % hookname from 2020/02 will vanish + \selectfont} +\let\reset@font\normalfont +\EndIncludeInRelease + +\IncludeInRelease{2020/10/01}% {\normalfont}{Add hook to \normalfont}% + \DeclareRobustCommand\normalfont{% \fontencoding\encodingdefault \edef\f@family{\familydefault}% @@ -5430,8 +8737,28 @@ of this package available from CTAN} \UseHook{normalfont}% \@defaultfamilyhook % hookname from 2020/02 will vanish \selectfont} + +\let\reset@font\normalfont + +\EndIncludeInRelease + +\IncludeInRelease{2020/02/02}% + {\normalfont}{Add hook to \normalfont}% + +\DeclareRobustCommand\normalfont{% + \fontencoding\encodingdefault + \edef\f@family{\familydefault}% + \edef\f@series{\seriesdefault}% + \edef\f@shape{\shapedefault}% + \@defaultfamilyhook + \selectfont} + \let\reset@font\normalfont + +\let\@defaultfamilyhook\@empty + \EndIncludeInRelease + \IncludeInRelease{0000/00/00}% {\normalfont}{Add hook to \normalfont}% @@ -5525,8 +8852,9 @@ of this package available from CTAN} \let\textsw\@undefined \let\textssc\@undefined \EndIncludeInRelease -\IncludeInRelease{2020/02/02}% - {\oldstylenums}{Old style numerals}% +%%% From File: lttextcomp.dtx +\NewModuleRelease{2020/02/02}{lttextcomp} + {Text Companion symbols} \DeclareRobustCommand\legacyoldstylenums[1]{% \begingroup \spaceskip\fontdimen\tw@\font @@ -5563,24 +8891,6 @@ of this package available from CTAN} \egroup } \def\textcompsubstdefault{\rmsubstdefault} -\EndIncludeInRelease -\IncludeInRelease{0000/00/00}% - {\oldstylenums}{Old style numerals}% - -\DeclareRobustCommand\oldstylenums[1]{% - \begingroup - \spaceskip\fontdimen\tw@\font - \usefont{OML}{\rmdefault}{\f@series}{it}% - \mathgroup\symletters #1% - \endgroup -} -\let\legacyoldstylenums\@undefined -\def\textcompsubstdefault{cmr} - -\EndIncludeInRelease - -\IncludeInRelease{2020/02/02}% - {\DeclareEncodingSubset}{Text companion symbols}% \def\DeclareEncodingSubset#1#2{% \DeclareEncodingSubset@aux{#1}#2*\DeclareEncodingSubset@aux } @@ -5642,7 +8952,6 @@ of this package available from CTAN} \selectfont#1% \egroup } - \def\tc@fake@euro#1{% \leavevmode \@font@info{Faking \noexpand#1for font family @@ -5655,17 +8964,17 @@ of this package available from CTAN} \hbox{C}\crcr }% } - \def\tc@check@symbol{\CheckEncodingSubset\UseTextSymbol{TS1}\tc@subst} -\def\tc@check@accent#1{\CheckEncodingSubset\UseTextAccent{TS1}{\tc@swap@accent#1}} +\def\tc@check@accent#1{\CheckEncodingSubset\UseTextAccent + {TS1}{\tc@swap@accent#1}} \def\tc@swap@accent#1#2{\UseTextAccent{T1}#1} \DeclareTextSymbolDefault{\textdollar}{TS1} -\UndeclareTextCommand{\textdollar} {OT1} % don't use the OT1 def any longer +\UndeclareTextCommand{\textdollar}{OT1} % don't use the OT1 def any longer \DeclareTextSymbolDefault{\textsterling}{TS1} -\UndeclareTextCommand{\textsterling}{OT1} % don't use the OT1 def any longer +\UndeclareTextCommand{\textsterling}{OT1}% don't use the OT1 def any longer \DeclareTextSymbolDefault{\textperthousand}{TS1} -\UndeclareTextCommand{\textperthousand}{T1} % don't use the T1 def +\UndeclareTextCommand{\textperthousand}{T1} % don't use the T1 def \DeclareTextSymbolDefault{\textasteriskcentered}{TS1} \DeclareTextSymbolDefault{\textbullet}{TS1} \DeclareTextSymbolDefault{\textdaggerdbl}{TS1} @@ -5706,22 +9015,38 @@ of this package available from CTAN} \DeclareTextCommandDefault{\t} {\CheckEncodingSubset\UseTextAccent{TS1}{\UseTextAccent{OML}}2\t} \ifx\Umathcode\@undefined - \DeclareTextCommandDefault{\capitalacute} {\tc@check@accent{\'}2\capitalacute} - \DeclareTextCommandDefault{\capitalbreve} {\tc@check@accent{\u}2\capitalbreve} - \DeclareTextCommandDefault{\capitalcaron} {\tc@check@accent{\v}2\capitalcaron} - \DeclareTextCommandDefault{\capitalcedilla} {\tc@check@accent{\c}2\capitalcedilla} - \DeclareTextCommandDefault{\capitalcircumflex} {\tc@check@accent{\^}2\capitalcircumflex} - \DeclareTextCommandDefault{\capitaldieresis} {\tc@check@accent{\"}2\capitaldieresis} - \DeclareTextCommandDefault{\capitaldotaccent} {\tc@check@accent{\.}2\capitaldotaccent} - \DeclareTextCommandDefault{\capitalgrave} {\tc@check@accent{\`}2\capitalgrave} - \DeclareTextCommandDefault{\capitalhungarumlaut}{\tc@check@accent{\H}2\capitalhungarumlaut} - \DeclareTextCommandDefault{\capitalmacron} {\tc@check@accent{\=}2\capitalmacron} - \DeclareTextCommandDefault{\capitalogonek} {\tc@check@accent{\k}2\capitalogonek} - \DeclareTextCommandDefault{\capitalring} {\tc@check@accent{\r}2\capitalring} - \DeclareTextCommandDefault{\capitaltie} {\tc@check@accent{\t}2\capitaltie} - \DeclareTextCommandDefault{\capitaltilde} {\tc@check@accent{\~}2\capitaltilde} - \DeclareTextCommandDefault{\newtie} {\tc@check@accent{\t}2\newtie} - \DeclareTextCommandDefault{\capitalnewtie} {\tc@check@accent{\t}2\capitalnewtie} + \DeclareTextCommandDefault{\capitalacute} + {\tc@check@accent{\'}2\capitalacute} + \DeclareTextCommandDefault{\capitalbreve} + {\tc@check@accent{\u}2\capitalbreve} + \DeclareTextCommandDefault{\capitalcaron} + {\tc@check@accent{\v}2\capitalcaron} + \DeclareTextCommandDefault{\capitalcedilla} + {\tc@check@accent{\c}2\capitalcedilla} + \DeclareTextCommandDefault{\capitalcircumflex} + {\tc@check@accent{\^}2\capitalcircumflex} + \DeclareTextCommandDefault{\capitaldieresis} + {\tc@check@accent{\"}2\capitaldieresis} + \DeclareTextCommandDefault{\capitaldotaccent} + {\tc@check@accent{\.}2\capitaldotaccent} + \DeclareTextCommandDefault{\capitalgrave} + {\tc@check@accent{\`}2\capitalgrave} + \DeclareTextCommandDefault{\capitalhungarumlaut} + {\tc@check@accent{\H}2\capitalhungarumlaut} + \DeclareTextCommandDefault{\capitalmacron} + {\tc@check@accent{\=}2\capitalmacron} + \DeclareTextCommandDefault{\capitalogonek} + {\tc@check@accent{\k}2\capitalogonek} + \DeclareTextCommandDefault{\capitalring} + {\tc@check@accent{\r}2\capitalring} + \DeclareTextCommandDefault{\capitaltie} + {\tc@check@accent{\t}2\capitaltie} + \DeclareTextCommandDefault{\capitaltilde} + {\tc@check@accent{\~}2\capitaltilde} + \DeclareTextCommandDefault{\newtie} + {\tc@check@accent{\t}2\newtie} + \DeclareTextCommandDefault{\capitalnewtie} + {\tc@check@accent{\t}2\capitalnewtie} \else \DeclareTextCommandDefault\capitalacute{\@tabacckludge'} \DeclareTextCommandDefault\capitalbreve{\u} @@ -5740,86 +9065,163 @@ of this package available from CTAN} \DeclareTextCommandDefault\capitaltilde{\~} \DeclareTextCommandDefault\newtie{\t} \fi -\DeclareTextCommandDefault{\textlbrackdbl} {\tc@check@symbol2\textlbrackdbl} -\DeclareTextCommandDefault{\textrbrackdbl} {\tc@check@symbol2\textrbrackdbl} -\DeclareTextCommandDefault{\texteightoldstyle} {\tc@check@symbol2\texteightoldstyle} -\DeclareTextCommandDefault{\textfiveoldstyle} {\tc@check@symbol2\textfiveoldstyle} -\DeclareTextCommandDefault{\textfouroldstyle} {\tc@check@symbol2\textfouroldstyle} -\DeclareTextCommandDefault{\textnineoldstyle} {\tc@check@symbol2\textnineoldstyle} -\DeclareTextCommandDefault{\textoneoldstyle} {\tc@check@symbol2\textoneoldstyle} -\DeclareTextCommandDefault{\textsevenoldstyle} {\tc@check@symbol2\textsevenoldstyle} -\DeclareTextCommandDefault{\textsixoldstyle} {\tc@check@symbol2\textsixoldstyle} -\DeclareTextCommandDefault{\textthreeoldstyle} {\tc@check@symbol2\textthreeoldstyle} -\DeclareTextCommandDefault{\texttwooldstyle} {\tc@check@symbol2\texttwooldstyle} -\DeclareTextCommandDefault{\textzerooldstyle} {\tc@check@symbol2\textzerooldstyle} -\DeclareTextCommandDefault{\textacutedbl} {\tc@check@symbol2\textacutedbl} -\DeclareTextCommandDefault{\textasciiacute} {\tc@check@symbol2\textasciiacute} -\DeclareTextCommandDefault{\textasciibreve} {\tc@check@symbol2\textasciibreve} -\DeclareTextCommandDefault{\textasciicaron} {\tc@check@symbol2\textasciicaron} -\DeclareTextCommandDefault{\textasciidieresis} {\tc@check@symbol2\textasciidieresis} -\DeclareTextCommandDefault{\textasciigrave} {\tc@check@symbol2\textasciigrave} -\DeclareTextCommandDefault{\textasciimacron} {\tc@check@symbol2\textasciimacron} -\DeclareTextCommandDefault{\textgravedbl} {\tc@check@symbol2\textgravedbl} -\DeclareTextCommandDefault{\texttildelow} {\tc@check@symbol2\texttildelow} -\DeclareTextCommandDefault{\textbaht} {\tc@check@symbol2\textbaht} -\DeclareTextCommandDefault{\textbigcircle} {\tc@check@symbol2\textbigcircle} -\DeclareTextCommandDefault{\textborn} {\tc@check@symbol2\textborn} -\DeclareTextCommandDefault{\textcentoldstyle} {\tc@check@symbol2\textcentoldstyle} -\DeclareTextCommandDefault{\textcircledP} {\tc@check@symbol2\textcircledP} -\DeclareTextCommandDefault{\textcopyleft} {\tc@check@symbol2\textcopyleft} -\DeclareTextCommandDefault{\textdblhyphenchar} {\tc@check@symbol2\textdblhyphenchar} -\DeclareTextCommandDefault{\textdblhyphen} {\tc@check@symbol2\textdblhyphen} -\DeclareTextCommandDefault{\textdied} {\tc@check@symbol2\textdied} -\DeclareTextCommandDefault{\textdiscount} {\tc@check@symbol2\textdiscount} -\DeclareTextCommandDefault{\textdivorced} {\tc@check@symbol2\textdivorced} -\DeclareTextCommandDefault{\textdollaroldstyle} {\tc@check@symbol2\textdollaroldstyle} -\DeclareTextCommandDefault{\textguarani} {\tc@check@symbol2\textguarani} -\DeclareTextCommandDefault{\textleaf} {\tc@check@symbol2\textleaf} -\DeclareTextCommandDefault{\textlquill} {\tc@check@symbol2\textlquill} -\DeclareTextCommandDefault{\textmarried} {\tc@check@symbol2\textmarried} -\DeclareTextCommandDefault{\textmho} {\tc@check@symbol2\textmho} -\DeclareTextCommandDefault{\textmusicalnote} {\tc@check@symbol2\textmusicalnote} -\DeclareTextCommandDefault{\textnaira} {\tc@check@symbol2\textnaira} -\DeclareTextCommandDefault{\textopenbullet} {\tc@check@symbol2\textopenbullet} -\DeclareTextCommandDefault{\textpeso} {\tc@check@symbol2\textpeso} -\DeclareTextCommandDefault{\textpilcrow} {\tc@check@symbol2\textpilcrow} -\DeclareTextCommandDefault{\textrecipe} {\tc@check@symbol2\textrecipe} -\DeclareTextCommandDefault{\textreferencemark} {\tc@check@symbol2\textreferencemark} -\DeclareTextCommandDefault{\textrquill} {\tc@check@symbol2\textrquill} -\DeclareTextCommandDefault{\textservicemark} {\tc@check@symbol2\textservicemark} -\DeclareTextCommandDefault{\textsurd} {\tc@check@symbol2\textsurd} -\DeclareTextCommandDefault{\textpertenthousand} {\tc@check@symbol2\textpertenthousand} +\DeclareTextCommandDefault{\textlbrackdbl} + {\tc@check@symbol2\textlbrackdbl} +\DeclareTextCommandDefault{\textrbrackdbl} + {\tc@check@symbol2\textrbrackdbl} +\DeclareTextCommandDefault{\texteightoldstyle} + {\tc@check@symbol2\texteightoldstyle} +\DeclareTextCommandDefault{\textfiveoldstyle} + {\tc@check@symbol2\textfiveoldstyle} +\DeclareTextCommandDefault{\textfouroldstyle} + {\tc@check@symbol2\textfouroldstyle} +\DeclareTextCommandDefault{\textnineoldstyle} + {\tc@check@symbol2\textnineoldstyle} +\DeclareTextCommandDefault{\textoneoldstyle} + {\tc@check@symbol2\textoneoldstyle} +\DeclareTextCommandDefault{\textsevenoldstyle} + {\tc@check@symbol2\textsevenoldstyle} +\DeclareTextCommandDefault{\textsixoldstyle} + {\tc@check@symbol2\textsixoldstyle} +\DeclareTextCommandDefault{\textthreeoldstyle} + {\tc@check@symbol2\textthreeoldstyle} +\DeclareTextCommandDefault{\texttwooldstyle} + {\tc@check@symbol2\texttwooldstyle} +\DeclareTextCommandDefault{\textzerooldstyle} + {\tc@check@symbol2\textzerooldstyle} +\DeclareTextCommandDefault{\textacutedbl} + {\tc@check@symbol2\textacutedbl} +\DeclareTextCommandDefault{\textasciiacute} + {\tc@check@symbol2\textasciiacute} +\DeclareTextCommandDefault{\textasciibreve} + {\tc@check@symbol2\textasciibreve} +\DeclareTextCommandDefault{\textasciicaron} + {\tc@check@symbol2\textasciicaron} +\DeclareTextCommandDefault{\textasciidieresis} + {\tc@check@symbol2\textasciidieresis} +\DeclareTextCommandDefault{\textasciigrave} + {\tc@check@symbol2\textasciigrave} +\DeclareTextCommandDefault{\textasciimacron} + {\tc@check@symbol2\textasciimacron} +\DeclareTextCommandDefault{\textgravedbl} + {\tc@check@symbol2\textgravedbl} +\DeclareTextCommandDefault{\texttildelow} + {\tc@check@symbol2\texttildelow} +\DeclareTextCommandDefault{\textbaht} + {\tc@check@symbol2\textbaht} +\DeclareTextCommandDefault{\textbigcircle} + {\tc@check@symbol2\textbigcircle} +\DeclareTextCommandDefault{\textborn} + {\tc@check@symbol2\textborn} +\DeclareTextCommandDefault{\textcentoldstyle} + {\tc@check@symbol2\textcentoldstyle} +\DeclareTextCommandDefault{\textcircledP} + {\tc@check@symbol2\textcircledP} +\DeclareTextCommandDefault{\textcopyleft} + {\tc@check@symbol2\textcopyleft} +\DeclareTextCommandDefault{\textdblhyphenchar} + {\tc@check@symbol2\textdblhyphenchar} +\DeclareTextCommandDefault{\textdblhyphen} + {\tc@check@symbol2\textdblhyphen} +\DeclareTextCommandDefault{\textdied} + {\tc@check@symbol2\textdied} +\DeclareTextCommandDefault{\textdiscount} + {\tc@check@symbol2\textdiscount} +\DeclareTextCommandDefault{\textdivorced} + {\tc@check@symbol2\textdivorced} +\DeclareTextCommandDefault{\textdollaroldstyle} + {\tc@check@symbol2\textdollaroldstyle} +\DeclareTextCommandDefault{\textguarani} + {\tc@check@symbol2\textguarani} +\DeclareTextCommandDefault{\textleaf} + {\tc@check@symbol2\textleaf} +\DeclareTextCommandDefault{\textlquill} + {\tc@check@symbol2\textlquill} +\DeclareTextCommandDefault{\textmarried} + {\tc@check@symbol2\textmarried} +\DeclareTextCommandDefault{\textmho} + {\tc@check@symbol2\textmho} +\DeclareTextCommandDefault{\textmusicalnote} + {\tc@check@symbol2\textmusicalnote} +\DeclareTextCommandDefault{\textnaira} + {\tc@check@symbol2\textnaira} +\DeclareTextCommandDefault{\textopenbullet} + {\tc@check@symbol2\textopenbullet} +\DeclareTextCommandDefault{\textpeso} + {\tc@check@symbol2\textpeso} +\DeclareTextCommandDefault{\textpilcrow} + {\tc@check@symbol2\textpilcrow} +\DeclareTextCommandDefault{\textrecipe} + {\tc@check@symbol2\textrecipe} +\DeclareTextCommandDefault{\textreferencemark} + {\tc@check@symbol2\textreferencemark} +\DeclareTextCommandDefault{\textrquill} + {\tc@check@symbol2\textrquill} +\DeclareTextCommandDefault{\textservicemark} + {\tc@check@symbol2\textservicemark} +\DeclareTextCommandDefault{\textsurd} + {\tc@check@symbol2\textsurd} +\DeclareTextCommandDefault{\textpertenthousand} + {\tc@check@symbol2\textpertenthousand} \UndeclareTextCommand{\textpertenthousand}{T1} -\DeclareTextCommandDefault{\textlangle} {\tc@check@symbol3\textlangle} -\DeclareTextCommandDefault{\textrangle} {\tc@check@symbol3\textrangle} -\DeclareTextCommandDefault{\textcolonmonetary} {\tc@check@symbol4\textcolonmonetary} -\DeclareTextCommandDefault{\textdong} {\tc@check@symbol4\textdong} -\DeclareTextCommandDefault{\textdownarrow} {\tc@check@symbol4\textdownarrow} -\DeclareTextCommandDefault{\textleftarrow} {\tc@check@symbol4\textleftarrow} -\DeclareTextCommandDefault{\textlira} {\tc@check@symbol4\textlira} -\DeclareTextCommandDefault{\textrightarrow} {\tc@check@symbol4\textrightarrow} -\DeclareTextCommandDefault{\textuparrow} {\tc@check@symbol4\textuparrow} -\DeclareTextCommandDefault{\textwon} {\tc@check@symbol4\textwon} -\DeclareTextCommandDefault{\textestimated} {\tc@check@symbol5\textestimated} -\DeclareTextCommandDefault{\textnumero} {\tc@check@symbol5\textnumero} -\DeclareTextCommandDefault{\textflorin} {\tc@check@symbol6\textflorin} -\DeclareTextCommandDefault{\textcurrency} {\tc@check@symbol6\textcurrency} -\DeclareTextCommandDefault{\textfractionsolidus}{\tc@check@symbol7\textfractionsolidus} -\DeclareTextCommandDefault{\textohm} {\tc@check@symbol7\textohm} -\DeclareTextCommandDefault{\textmu} {\tc@check@symbol7\textmu} -\DeclareTextCommandDefault{\textminus} {\tc@check@symbol7\textminus} -\DeclareTextCommandDefault{\textblank} {\tc@check@symbol{8}\textblank} -\DeclareTextCommandDefault{\textinterrobangdown}{\tc@check@symbol{8}\textinterrobangdown} -\DeclareTextCommandDefault{\textinterrobang} {\tc@check@symbol{8}\textinterrobang} +\DeclareTextCommandDefault{\textlangle} + {\tc@check@symbol3\textlangle} +\DeclareTextCommandDefault{\textrangle} + {\tc@check@symbol3\textrangle} +\DeclareTextCommandDefault{\textcolonmonetary} + {\tc@check@symbol4\textcolonmonetary} +\DeclareTextCommandDefault{\textdong} + {\tc@check@symbol4\textdong} +\DeclareTextCommandDefault{\textdownarrow} + {\tc@check@symbol4\textdownarrow} +\DeclareTextCommandDefault{\textleftarrow} + {\tc@check@symbol4\textleftarrow} +\DeclareTextCommandDefault{\textlira} + {\tc@check@symbol4\textlira} +\DeclareTextCommandDefault{\textrightarrow} + {\tc@check@symbol4\textrightarrow} +\DeclareTextCommandDefault{\textuparrow} + {\tc@check@symbol4\textuparrow} +\DeclareTextCommandDefault{\textwon} + {\tc@check@symbol4\textwon} +\DeclareTextCommandDefault{\textestimated} + {\tc@check@symbol5\textestimated} +\DeclareTextCommandDefault{\textnumero} + {\tc@check@symbol5\textnumero} +\DeclareTextCommandDefault{\textflorin} + {\tc@check@symbol6\textflorin} +\DeclareTextCommandDefault{\textcurrency} + {\tc@check@symbol6\textcurrency} +\DeclareTextCommandDefault{\textfractionsolidus} + {\tc@check@symbol7\textfractionsolidus} +\DeclareTextCommandDefault{\textohm} + {\tc@check@symbol7\textohm} +\DeclareTextCommandDefault{\textmu} + {\tc@check@symbol7\textmu} +\DeclareTextCommandDefault{\textminus} + {\tc@check@symbol7\textminus} +\DeclareTextCommandDefault{\textblank} + {\tc@check@symbol{8}\textblank} +\DeclareTextCommandDefault{\textinterrobangdown} + {\tc@check@symbol{8}\textinterrobangdown} +\DeclareTextCommandDefault{\textinterrobang} + {\tc@check@symbol{8}\textinterrobang} \DeclareTextCommandDefault{\texteuro} - {\CheckEncodingSubset\UseTextSymbol{TS1}\tc@fake@euro{8}\texteuro} -\DeclareTextCommandDefault{\textcelsius}{\tc@check@symbol{9}\textcelsius} -\DeclareTextCommandDefault{\textonesuperior}{\tc@check@symbol{9}\textonesuperior} -\DeclareTextCommandDefault{\textthreequartersemdash}{\tc@check@symbol{9}\textthreequartersemdash} -\DeclareTextCommandDefault{\textthreesuperior}{\tc@check@symbol{9}\textthreesuperior} -\DeclareTextCommandDefault{\texttwelveudash}{\tc@check@symbol{9}\texttwelveudash} -\DeclareTextCommandDefault{\texttwosuperior}{\tc@check@symbol{9}\texttwosuperior} -\DeclareTextCommandDefault{\textbardbl}{\tc@check@symbol{9}\textbardbl} + {\CheckEncodingSubset\UseTextSymbol{TS1}\tc@fake@euro{8}\texteuro} +\DeclareTextCommandDefault{\textcelsius} + {\tc@check@symbol{9}\textcelsius} +\DeclareTextCommandDefault{\textonesuperior} + {\tc@check@symbol{9}\textonesuperior} +\DeclareTextCommandDefault{\textthreequartersemdash} + {\tc@check@symbol{9}\textthreequartersemdash} +\DeclareTextCommandDefault{\textthreesuperior} + {\tc@check@symbol{9}\textthreesuperior} +\DeclareTextCommandDefault{\texttwelveudash} + {\tc@check@symbol{9}\texttwelveudash} +\DeclareTextCommandDefault{\texttwosuperior} + {\tc@check@symbol{9}\texttwosuperior} +\DeclareTextCommandDefault{\textbardbl} + {\tc@check@symbol{9}\textbardbl} \ifx \Umathcode\@undefined \else \DeclareTextCommand{\textzerooldstyle} \UnicodeEncodingName{\oldstylenums{0}} @@ -5832,12 +9234,12 @@ of this package available from CTAN} \DeclareTextCommand{\textsevenoldstyle}\UnicodeEncodingName{\oldstylenums{7}} \DeclareTextCommand{\texteightoldstyle}\UnicodeEncodingName{\oldstylenums{8}} \DeclareTextCommand{\textnineoldstyle} \UnicodeEncodingName{\oldstylenums{9}} -\DeclareTextSymbol{\textpilcrow} \UnicodeEncodingName{"00B6} -\DeclareTextSymbol{\textborn} \UnicodeEncodingName{"002A} -\DeclareTextSymbol{\textdied} \UnicodeEncodingName{"2020} -\DeclareTextSymbol{\textlbrackdbl} \UnicodeEncodingName{"27E6} -\DeclareTextSymbol{\textrbrackdbl} \UnicodeEncodingName{"27E7} -\DeclareTextSymbol{\textguarani} \UnicodeEncodingName{"20B2} +\DeclareTextSymbol{\textpilcrow} \UnicodeEncodingName{"00B6} +\DeclareTextSymbol{\textborn} \UnicodeEncodingName{"002A} +\DeclareTextSymbol{\textdied} \UnicodeEncodingName{"2020} +\DeclareTextSymbol{\textlbrackdbl} \UnicodeEncodingName{"27E6} +\DeclareTextSymbol{\textrbrackdbl} \UnicodeEncodingName{"27E7} +\DeclareTextSymbol{\textguarani} \UnicodeEncodingName{"20B2} \DeclareTextSymbol{\textdollaroldstyle}{TS1}{138} \DeclareTextSymbol{\textcentoldstyle} {TS1}{139} \fi % --- END of Unicode engines specials @@ -5869,31 +9271,32 @@ of this package available from CTAN} \DeclareEncodingSubset{TS1}{lmss} {1} \DeclareEncodingSubset{TS1}{lmssq} {1} \DeclareEncodingSubset{TS1}{lmvtt} {1} -\DeclareEncodingSubset{TS1}{lmtt} {1} % missing TM, SM, pertenthousand for some reason +\DeclareEncodingSubset{TS1}{lmtt} {1} % missing TM, SM and + % pertenthousand for some reason \DeclareEncodingSubset{TS1}{ptmx} {2} \DeclareEncodingSubset{TS1}{ptmj} {2} \DeclareEncodingSubset{TS1}{ul8} {2} -\DeclareEncodingSubset{TS1}{bch} {5} % tofu for blank, ohm -\DeclareEncodingSubset{TS1}{futj} {5} % tofu for blank, interrobang/down, ohm -\DeclareEncodingSubset{TS1}{futs} {5} % tofu for blank, ohm -\DeclareEncodingSubset{TS1}{futx} {5} % probably (currently broken distrib) -\DeclareEncodingSubset{TS1}{pag} {5} % tofu for blank, interrobang/down, ohm -\DeclareEncodingSubset{TS1}{pbk} {5} % tofu for blank, interrobang/down, ohm -\DeclareEncodingSubset{TS1}{pcr} {5} % tofu for blank, interrobang/down, ohm -\DeclareEncodingSubset{TS1}{phv} {5} % tofu for blank, interrobang/down, ohm -\DeclareEncodingSubset{TS1}{pnc} {5} % tofu for blank, interrobang/down, ohm -\DeclareEncodingSubset{TS1}{pplj} {5} % tofu for blank -\DeclareEncodingSubset{TS1}{pplx} {5} % tofu for blank -\DeclareEncodingSubset{TS1}{ppl} {5} % tofu for blank interrobang/down -\DeclareEncodingSubset{TS1}{ptm} {5} % tofu for blank, interrobang/down, ohm -\DeclareEncodingSubset{TS1}{pzc} {5} % tofu for blank, interrobang/down, ohm -\DeclareEncodingSubset{TS1}{ul9} {5} % tofu for blank, interrobang/down, ohm -\DeclareEncodingSubset{TS1}{dayroms} {6} % tofu for blank, interrobang/down, ohm -\DeclareEncodingSubset{TS1}{dayrom} {6} % tofu for blank, interrobang/down, ohm -\DeclareEncodingSubset{TS1}{augie} {8} % really only missing euro -\DeclareEncodingSubset{TS1}{put} {8} -\DeclareEncodingSubset{TS1}{uag} {8} % probably (currently broken distrib) -\DeclareEncodingSubset{TS1}{ugq} {8} +\DeclareEncodingSubset{TS1}{bch} {5} % tofu for blank, ohm +\DeclareEncodingSubset{TS1}{futj}{5} % tofu for blank, interrobang/down, ohm +\DeclareEncodingSubset{TS1}{futs}{5} % tofu for blank, ohm +\DeclareEncodingSubset{TS1}{futx}{5} % probably (currently broken distrib) +\DeclareEncodingSubset{TS1}{pag} {5} % tofu for blank, interrobang/down, ohm +\DeclareEncodingSubset{TS1}{pbk} {5} % tofu for blank, interrobang/down, ohm +\DeclareEncodingSubset{TS1}{pcr} {5} % tofu for blank, interrobang/down, ohm +\DeclareEncodingSubset{TS1}{phv} {5} % tofu for blank, interrobang/down, ohm +\DeclareEncodingSubset{TS1}{pnc} {5} % tofu for blank, interrobang/down, ohm +\DeclareEncodingSubset{TS1}{pplj}{5} % tofu for blank +\DeclareEncodingSubset{TS1}{pplx}{5} % tofu for blank +\DeclareEncodingSubset{TS1}{ppl} {5} % tofu for blank interrobang/down +\DeclareEncodingSubset{TS1}{ptm} {5} % tofu for blank, interrobang/down, ohm +\DeclareEncodingSubset{TS1}{pzc} {5} % tofu for blank, interrobang/down, ohm +\DeclareEncodingSubset{TS1}{ul9} {5} % tofu for blank, interrobang/down, ohm +\DeclareEncodingSubset{TS1}{dayroms}{6} % tofu for blank, interrobang/down, ohm +\DeclareEncodingSubset{TS1}{dayrom} {6} % tofu for blank, interrobang/down, ohm +\DeclareEncodingSubset{TS1}{augie}{8} % really only missing euro +\DeclareEncodingSubset{TS1}{put} {8} +\DeclareEncodingSubset{TS1}{uag} {8} % probably (currently broken distrib) +\DeclareEncodingSubset{TS1}{ugq} {8} \DeclareEncodingSubset{TS1}{zi4} {9} \DeclareEncodingSubset{TS1}{hls} {5} \DeclareEncodingSubset{TS1}{hlst} {5} @@ -5904,11 +9307,11 @@ of this package available from CTAN} \DeclareEncodingSubset{TS1}{hlcn} {8} \DeclareEncodingSubset{TS1}{hlcw} {8} \DeclareEncodingSubset{TS1}{hlcf} {8} -\DeclareEncodingSubset{TS1}{lato-*} {0} % with a bunch of tofu inside -\DeclareEncodingSubset{TS1}{opensans-*} {0} % with a bunch of tofu inside -\DeclareEncodingSubset{TS1}{cantarell-*} {0} % with a bunch of tofu inside -\DeclareEncodingSubset{TS1}{fbb-*} {0} % missing centoldstyle -\DeclareEncodingSubset{TS1}{tli} {1} % with lots of tofu inside +\DeclareEncodingSubset{TS1}{lato-*} {0} % with a bunch of tofu inside +\DeclareEncodingSubset{TS1}{opensans-*} {0} % with a bunch of tofu inside +\DeclareEncodingSubset{TS1}{cantarell-*} {0} % with a bunch of tofu inside +\DeclareEncodingSubset{TS1}{fbb-*} {0} % missing centoldstyle +\DeclareEncodingSubset{TS1}{tli} {1} % with lots of tofu inside \DeclareEncodingSubset{TS1}{Alegreya-*} {2} \DeclareEncodingSubset{TS1}{AlegreyaSans-*} {2} \DeclareEncodingSubset{TS1}{DejaVuSans-TLF} {2} @@ -6016,7 +9419,7 @@ of this package available from CTAN} \DeclareEncodingSubset{TS1}{erewhon-*} {7} \DeclareEncodingSubset{TS1}{ComicNeue-TLF} {7} \DeclareEncodingSubset{TS1}{ComicNeueAngular-TLF} {7} -\DeclareEncodingSubset{TS1}{Forum-LF} {7} % the superiors are missing +\DeclareEncodingSubset{TS1}{Forum-LF} {7} % the superiors are missing \DeclareEncodingSubset{TS1}{Cochineal-*} {8} \DeclareEncodingSubset{TS1}{AlgolRevived-TLF} {9} \def\UseLegacyTextSymbols{% @@ -6050,9 +9453,19 @@ of this package available from CTAN} \DeclareTextSymbolDefault{\textlegacyperiodcentered}{OMS} \DeclareTextSymbolDefault{\textlegacysection}{OMS} -\EndIncludeInRelease + \IncludeInRelease{0000/00/00}% - {\DeclareEncodingSubset}{Text companion symbols}% + {lttextcomp}{Undefine text companion symbols}% + +\DeclareRobustCommand\oldstylenums[1]{% + \begingroup + \spaceskip\fontdimen\tw@\font + \usefont{OML}{\rmdefault}{\f@series}{it}% + \mathgroup\symletters #1% + \endgroup +} +\let\legacyoldstylenums\@undefined +\def\textcompsubstdefault{cmr} \let\DeclareEncodingSubset\@undefined \let\CheckEncodingSubset\@undefined @@ -6088,26 +9501,32 @@ of this package available from CTAN} \let\textbrokenbar\@undefined \let\textcelsius\@undefined \let\textcent\@undefined -\DeclareTextCommandDefault{\textcopyright}{\textcircled{c}} +\DeclareTextCommandDefault{\textcopyright} + {\textcircled{c}} \let\textdegree\@undefined \let\textdiv\@undefined \let\textlnot\@undefined \let\textonehalf\@undefined \let\textonequarter\@undefined \let\textonesuperior\@undefined -\DeclareTextCommandDefault{\textordfeminine}{\textsuperscript{a}} -\DeclareTextCommandDefault{\textordmasculine}{\textsuperscript{o}} +\DeclareTextCommandDefault{\textordfeminine} + {\textsuperscript{a}} +\DeclareTextCommandDefault{\textordmasculine} + {\textsuperscript{o}} \let\textpm\@undefined \let\textquotesingle\@undefined \let\textquotestraightbase\@undefined \let\textquotestraightdblbase\@undefined -\DeclareTextCommandDefault{\textregistered}{\textcircled{% - \check@mathfonts\fontsize\sf@size\z@\math@fontsfalse\selectfont R}} +\DeclareTextCommandDefault{\textregistered} + {\textcircled{% + \check@mathfonts\fontsize\sf@size\z@ + \math@fontsfalse\selectfont R}} \let\textthreequartersemdash\@undefined \let\textthreequarters\@undefined \let\textthreesuperior\@undefined \let\texttimes\@undefined -\DeclareTextCommandDefault{\texttrademark}{\textsuperscript{TM}} +\DeclareTextCommandDefault{\texttrademark} + {\textsuperscript{TM}} \let\texttwelveudash\@undefined \let\texttwosuperior\@undefined \let\textyen\@undefined @@ -6237,7 +9656,7 @@ of this package available from CTAN} \let\textlegacyperiodcentered\@undefined \let\textlegacysection\@undefined -\EndIncludeInRelease +\EndModuleRelease %%% From File: ltpageno.dtx @@ -6280,6 +9699,7 @@ of this package available from CTAN} \IncludeInRelease{2020/10/01}% {\enddocument}{Use Hooks}% \def\enddocument{% + \@kernel@before@enddocument \UseOneTimeHook{enddocument}% \@kernel@after@enddocument \@checkend{document}% @@ -6369,6 +9789,16 @@ of this package available from CTAN} \let\@enddocument@kernel@warnings\@undefined \EndIncludeInRelease +\IncludeInRelease{2021/06/01}% + {\@kernel@before@enddocument}{kernel before hook}% +\def\@kernel@before@enddocument{\par} +\EndIncludeInRelease +\IncludeInRelease{0000/00/00}% + {\@kernel@before@enddocument}{kernel before hook}% + +\let\@kernel@before@enddocument\@empty + +\EndIncludeInRelease \IncludeInRelease{2018/12/01}% {\protected@file@percent}{Mask line endings}% \protected\def\protected@file@percent{} @@ -6506,6 +9936,9 @@ of this package available from CTAN} \expandafter\endgroup\if@endpe\@doendpe\fi \if@ignore\@ignorefalse\ignorespaces\fi} +\expandafter\let\csname begin \endcsname\@undefined +\expandafter\let\csname end \endcsname\@undefined + \EndIncludeInRelease \IncludeInRelease{2020/10/01}% {\AtBeginEnvironment}{Hooks for environments}% @@ -6952,6 +10385,28 @@ of this package available from CTAN} \mb@b \kern\z@}} \EndIncludeInRelease +\IncludeInRelease{2021/06/01}% + {\color@begingroup}{color group settings}% +\let\color@begingroup\begingroup +\def\color@endgroup{\endgraf\endgroup} +\def\color@setgroup{\color@begingroup} % changed further in color package +\let\normalcolor\relax % remains untouched; only changed in a color package +\def\color@hbox{\hbox\bgroup\color@begingroup} +\def\color@vbox{\vbox\bgroup\color@begingroup} +\def\color@endbox{\color@endgroup\egroup} +\EndIncludeInRelease +\IncludeInRelease{0000/00/00}% + {\color@begingroup}{color group settings}% + +\let\color@begingroup\relax +\let\color@endgroup\relax +\let\color@setgroup\relax +\let\normalcolor\relax +\let\color@hbox\relax +\let\color@vbox\relax +\let\color@endbox\relax + +\EndIncludeInRelease \IncludeInRelease{2015/01/01}% {\savebox}{Make \savebox robust}% \DeclareRobustCommand\savebox[1]{% @@ -7031,6 +10486,39 @@ of this package available from CTAN} \baselineskip\normalbaselineskip \sloppy} \EndIncludeInRelease +\IncludeInRelease{2021/06/01}% + {\@mpfootnotetext}{footnotetext tagging}% +\long\def\@mpfootnotetext#1{% + \global\setbox\@mpfootins\vbox{% + \unvbox\@mpfootins + \reset@font\footnotesize + \hsize\columnwidth + \@parboxrestore + \protected@edef\@currentlabel + {\csname p@mpfootnote\endcsname\@thefnmark}% + \color@begingroup + \@makefntext{% + \rule\z@\footnotesep\ignorespaces#1\@finalstrut\strutbox}% + \par + \color@endgroup}} +\EndIncludeInRelease +\IncludeInRelease{0000/00/00}% + {\@mpfootnotetext}{footnotetext tagging}% + +\long\def\@mpfootnotetext#1{% + \global\setbox\@mpfootins\vbox{% + \unvbox\@mpfootins + \reset@font\footnotesize + \hsize\columnwidth + \@parboxrestore + \protected@edef\@currentlabel + {\csname p@mpfootnote\endcsname\@thefnmark}% + \color@begingroup + \@makefntext{% + \rule\z@\footnotesep\ignorespaces#1\@finalstrut\strutbox}% + \color@endgroup}} + +\EndIncludeInRelease \IncludeInRelease{2015/01/01}% {\rule}{Make \rule robust}% \DeclareRobustCommand\rule{\@ifnextchar[\@rule{\@rule[\z@]}}% @@ -7973,6 +11461,39 @@ of this package available from CTAN} \@fpbot \@dblfpbot }% \EndIncludeInRelease +\IncludeInRelease{2021/06/01}% + {\@savemarbox}{Explicit par for marginpar}% +\long\def \@savemarbox #1#2{% + \global\setbox #1% + \color@vbox + \vtop{% + \hsize\marginparwidth + \@parboxrestore + \@marginparreset + #2\par + \@minipagefalse + \outer@nobreak + }% + \color@endbox +} +\EndIncludeInRelease +\IncludeInRelease{0000/00/00}% + {\@savemarbox}{Explicit par for marginpar}% + +\long\def \@savemarbox #1#2{% + \global\setbox #1% + \color@vbox + \vtop{% + \hsize\marginparwidth + \@parboxrestore + \@marginparreset + #2% + \@minipagefalse + \outer@nobreak + }% + \color@endbox +} +\EndIncludeInRelease \IncludeInRelease{2020/10/01}% {\@textsuperscript}{superscript baseline}% \def\@textsuperscript#1{% @@ -8008,8 +11529,88 @@ of this package available from CTAN} {\@textsubscript}{subscript baseline}% \let\@textsubscript\@undefined \EndIncludeInRelease +\IncludeInRelease{2021/06/01}% + {\@footnotetext}{footnotetext tagging}% +\long\def\@footnotetext#1{\insert\footins{% + \reset@font\footnotesize + \interlinepenalty\interfootnotelinepenalty + \splittopskip\footnotesep + \splitmaxdepth \dp\strutbox \floatingpenalty \@MM + \hsize\columnwidth \@parboxrestore + \protected@edef\@currentlabel{% + \csname p@footnote\endcsname\@thefnmark + }% + \color@begingroup + \@makefntext{% + \rule\z@\footnotesep\ignorespaces#1\@finalstrut\strutbox}% + \par + \color@endgroup}}% +\EndIncludeInRelease +\IncludeInRelease{0000/00/00}% + {\@footnotetext}{footnotetext tagging}% + +\long\def\@footnotetext#1{\insert\footins{% + \reset@font\footnotesize + \interlinepenalty\interfootnotelinepenalty + \splittopskip\footnotesep + \splitmaxdepth \dp\strutbox \floatingpenalty \@MM + \hsize\columnwidth \@parboxrestore + \protected@edef\@currentlabel{% + \csname p@footnote\endcsname\@thefnmark + }% + \color@begingroup + \@makefntext{% + \rule\z@\footnotesep\ignorespaces#1\@finalstrut\strutbox}% + \color@endgroup}}% + +\EndIncludeInRelease +\IncludeInRelease{2021/06/01}% + {\footref}{Add footref}% +\def\footref#1{% + \begingroup + \unrestored@protected@xdef\@thefnmark{\ref{#1}}% + \endgroup + \@footnotemark +} +\EndIncludeInRelease +\IncludeInRelease{0000/00/00}% + {\footref}{Add footref}% + + % \let\footref\@undefined + +\EndIncludeInRelease %%% From File: ltidxglo.dtx %%% From File: ltbibl.dtx +\IncludeInRelease{2021/06/01}% + {\nocite}{Allow nocite in preamble}% +\def\nocite#1{\@bsphack + \ifx\@onlypreamble\document + \@for\@citeb:=#1\do{% + \edef\@citeb{\expandafter\@firstofone\@citeb}% + \if@filesw\immediate\write\@auxout{\string\citation{\@citeb}}\fi + \@ifundefined{b@\@citeb}{\G@refundefinedtrue + \@latex@warning{Citation `\@citeb' undefined}}{}}% + \else + \AddToHook{begindocument/end}[kernel]{\nocite{#1}}% + \fi + \@esphack} +\EndIncludeInRelease +\IncludeInRelease{0000/00/00}% + {\nocite}{Allow nocite in preamble}% + +\def\nocite#1{\@bsphack + \ifx\@onlypreamble\document + \@for\@citeb:=#1\do{% + \edef\@citeb{\expandafter\@firstofone\@citeb}% + \if@filesw\immediate\write\@auxout{\string\citation{\@citeb}}\fi + \@ifundefined{b@\@citeb}{\G@refundefinedtrue + \@latex@warning{Citation `\@citeb' undefined}}{}}% + \else + \@latex@error{Cannot be used in preamble}\@eha + \fi + \@esphack} + +\EndIncludeInRelease %%% From File: ltpage.dtx \IncludeInRelease{2019/10/01}% {\markboth}{Make commands robust}% @@ -8077,12 +11678,25 @@ of this package available from CTAN} \IncludeInRelease{0000/00/00}{\@pushfilename}% {Add \@expl@push@filename@@ and \@expl@push@filename@aux@@}% +\ifnum\sourceLaTeXdate<20200202\relax + \GenericInfo{}{Defining 00-00-00\string\@pushfilename.} \def\@pushfilename{% \xdef\@currnamestack{% {\@currname}% {\@currext}% {\the\catcode`\@}% \@currnamestack}} +\else + \GenericInfo{}{Defining 2020-02-02\string\@pushfilename.} +\def\@pushfilename{% + \@expl@push@filename@@ + \xdef\@currnamestack{% + {\@currname}% + {\@currext}% + {\the\catcode`\@}% + \@currnamestack}% + \@expl@push@filename@aux@@} +\fi \EndIncludeInRelease \@onlypreamble\@pushfilename @@ -8102,13 +11716,21 @@ of this package available from CTAN} \IncludeInRelease{0000/00/00}{\@popfilename}% {Add \@expl@push@filename@@ and \@expl@push@filename@aux@@}% +\ifnum\sourceLaTeXdate<20200202\relax + \GenericInfo{}{Defining 00-00-00\string\@popfilename.} \def\@popfilename{\expandafter\@p@pfilename\@currnamestack\@nil} +\else + \GenericInfo{}{Defining 2020-02-02\string\@popfilename.} +\def\@popfilename{\expandafter\@p@pfilename\@currnamestack\@nil + \@expl@pop@filename@@} +\fi \EndIncludeInRelease \@onlypreamble\@popfilename \IncludeInRelease{2020/10/01}{\@kernel@currpathstack}% {Add \@kernel@currpathstack}% \gdef\@kernel@currpathstack{} +\g@addto@macro\@kernel@currpathstack{{}} \def\@p@pfilepath#1{% \gdef\@currpath{#1}\@p@pfilepath@aux\@empty} \def\@p@pfilepath@aux#1\@nil{% @@ -8216,7 +11838,7 @@ of this package available from CTAN} \@ifnextchar[\@pr@videpackage{\@pr@videpackage[]}}%] \EndIncludeInRelease \IncludeInRelease{2020/10/01}% - {\@pr@videpackage}{Allow for package subsitution}% + {\@pr@videpackage}{Allow for package substitution}% \def\@pr@videpackage[#1]{% \expandafter\protected@xdef % <-- protected... \csname ver@\@currname.\@currext\endcsname{#1}% Loaded package @@ -8263,8 +11885,28 @@ of this package available from CTAN} \let\ProvidesClass\ProvidesPackage \@onlypreamble\ProvidesClass \EndIncludeInRelease +\IncludeInRelease{2021/06/01}% + {\@pass@ptions}{Raw option lists}% +\def\@pass@ptions#1#2#3{% + \@expl@@@filehook@set@curr@file@@nNN + {\@expl@@@filehook@resolve@file@subst@@w #3.#1\@nil}% + \reserved@a\reserved@b + \@expl@@@filehook@clear@replacement@flag@@ + \expandafter\xdef\csname opt@\reserved@a\endcsname{% + \@ifundefined{opt@\reserved@a}\@empty + {\csname opt@\reserved@a\endcsname,}% + \zap@space#2 \@empty}% + \expandafter\let + \csname opt@#3.#1\expandafter\endcsname + \csname opt@\reserved@a\endcsname + \@ifundefined{@raw@opt@#3.#1}% + {\expandafter\gdef\csname @raw@opt@#3.#1\endcsname{#2}}% + {\expandafter\g@addto@macro\csname @raw@opt@#3.#1\endcsname{,#2}}% +} +\EndIncludeInRelease \IncludeInRelease{2020/10/01}{\@pass@ptions} {Add file replacement in \@pass@ptions}% + \def\@pass@ptions#1#2#3{% \@expl@@@filehook@set@curr@file@@nNN {\@expl@@@filehook@resolve@file@subst@@w #3.#1\@nil}% @@ -8280,12 +11922,65 @@ of this package available from CTAN} \EndIncludeInRelease \IncludeInRelease{0000/00/00}{\@pass@ptions} {\@pass@ptions}% + \def\@pass@ptions#1#2#3{% \expandafter\xdef\csname opt@#3.#1\endcsname{% \@ifundefined{opt@#3.#1}\@empty {\csname opt@#3.#1\endcsname,}% \zap@space#2 \@empty}} \EndIncludeInRelease +\IncludeInRelease{2021/06/01}% + {\OptionNotUsed}{filter unused option list}% +\def\@remove@eq@value#1=#2\@nil{#1} +\def\OptionNotUsed{% + \ifx\@currext\@clsextension + \xdef\@unusedoptionlist{% + \ifx\@unusedoptionlist\@empty\else\@unusedoptionlist,\fi + \expandafter\@remove@eq@value\CurrentOption=\@nil}% + \fi} +\EndIncludeInRelease +\IncludeInRelease{0000/00/00}% + {\OptionNotUsed}{filter unused option list}% +\let\@remove@eq@value\@undefined +\def\OptionNotUsed{% + \ifx\@currext\@clsextension + \xdef\@unusedoptionlist{% + \ifx\@unusedoptionlist\@empty\else\@unusedoptionlist,\fi + \CurrentOption}% + \fi} +\EndIncludeInRelease +\IncludeInRelease{2021/06/01}% + {\@xprocess@ptions}{safer @xprocess@ptions}% +\def\@xprocess@ptions{% + \ifx\@currext\@clsextension\else + \ifx\@classoptionslist\relax\else + \@for\CurrentOption:=\@classoptionslist\do{% + \ifx\CurrentOption\@empty\else + \@ifundefined{ds@\CurrentOption}{}{% + \@use@ption + \expandafter\let\csname ds@\CurrentOption\endcsname\@empty + }% + \fi}% + \fi + \fi + \@process@pti@ns} +\EndIncludeInRelease +\IncludeInRelease{0000/00/00}% + {\@xprocess@ptions}{safer @xprocess@ptions}% +\let\@remove@eq@value\@undefined +\def\@xprocess@ptions{% + \ifx\@currext\@clsextension\else + \@for\CurrentOption:=\@classoptionslist\do{% + \ifx\CurrentOption\@empty\else + \@expandtwoargs\in@{,\CurrentOption,}{,\@declaredoptions,}% + \ifin@ + \@use@ption + \expandafter\let\csname ds@\CurrentOption\endcsname\@empty + \fi + \fi}% + \fi + \@process@pti@ns} +\EndIncludeInRelease \IncludeInRelease{2020/10/01}% {\@process@pti@ns}{Unused options issue}% \def\@process@pti@ns{% @@ -8318,6 +12013,21 @@ of this package available from CTAN} \let\@fileswith@pti@ns\@@fileswith@pti@ns \AtEndOfPackage{\let\@unprocessedoptions\relax}} \EndIncludeInRelease +\IncludeInRelease{2021/06/01}% + {\@use@ption}{filter unused option list}% +\def\@use@ption{% + \@expandtwoargs\@removeelement + {\expandafter\@remove@eq@value\CurrentOption=\@nil}% + \@unusedoptionlist\@unusedoptionlist + \csname ds@\CurrentOption\endcsname} +\EndIncludeInRelease +\IncludeInRelease{0000/00/00}% + {\@use@ption}{filter unused option list}% +\def\@use@ption{% + \@expandtwoargs\@removeelement\CurrentOption + \@unusedoptionlist\@unusedoptionlist + \csname ds@\CurrentOption\endcsname} +\EndIncludeInRelease \IncludeInRelease{2017/01/01}% {\ExecuteOptions}{Spaces in \ExecuteOptions}% \def\ExecuteOptions#1{% @@ -8353,6 +12063,34 @@ of this package available from CTAN} \AtEndOfPackage{\let\@unprocessedoptions\relax}% \@loadwithoptions\@pkgextension\RequirePackage} \EndIncludeInRelease +\IncludeInRelease{2020/10/01}% + {\@fileswith@pti@ns}{ifx tests in \@fileswith@pti@ns}% +\def\@fileswith@pti@ns#1[#2]#3[#4]{% + \ifx#1\@clsextension + \ifx\@classoptionslist\relax + \xdef\@classoptionslist{\zap@space#2 \@empty}% + \gdef\@raw@classoptionslist{#2}% + \def\reserved@a{% + \@onefilewithoptions#3[{#2}][{#4}]#1% + \@documentclasshook}% + \else + \def\reserved@a{% + \@onefilewithoptions#3[{#2}][{#4}]#1}% + \fi + \else + \def\reserved@b##1,{% + \ifx\@nnil##1\relax\else + \ifx\@nnil##1\@nnil\else + \noexpand\@onefilewithoptions##1[{#2}][{#4}]% + \noexpand\@pkgextension + \fi + \expandafter\reserved@b + \fi}% + \edef\reserved@a{\zap@space#3 \@empty}% + \edef\reserved@a{\expandafter\reserved@b\reserved@a,\@nnil,}% + \fi + \reserved@a} +\EndIncludeInRelease \IncludeInRelease{2017/01/01}% {\@fileswith@pti@ns}{ifx tests in \@fileswith@pti@ns}% \def\@fileswith@pti@ns#1[#2]#3[#4]{% @@ -8656,14 +12394,12 @@ of this package available from CTAN} \let\write\@gobbletwo% \let\closeout\@gobble% \else% - \edef\reserved@a{#1}% - \edef\reserved@a{\detokenize\expandafter{\reserved@a}}% \edef\reserved@b{\detokenize\expandafter{\jobname}}% - \ifx\reserved@a\reserved@b% + \ifx\@curr@file\reserved@b% \@fileswtrue% \else% \edef\reserved@b{\reserved@b\detokenize{.tex}}% - \ifx\reserved@a\reserved@b + \ifx\@curr@file\reserved@b \@fileswtrue% \fi% \fi% @@ -8709,7 +12445,8 @@ of this package available from CTAN} \ifx\relax##1\relax% \else% \@latex@warning{Writing text `##1' before % - \string\end{\@currenvir}\MessageBreak as last line of \@curr@file}% + \string\end{\@currenvir}\MessageBreak + as last line of \@curr@file}% \immediate\write\reserved@c{##1}% \fi% \ifx\relax##2\relax% @@ -8731,7 +12468,8 @@ of this package available from CTAN} \endgroup% \EndIncludeInRelease \IncludeInRelease{2019/10/01}% - {\filec@ntents}{Spaces in file names + optional arg}% + {\filec@ntents}{Spaces in file names + optional arg}% + \def\filecontents{\@tempswatrue\@fileswtrue \@ifnextchar[\filec@ntents@opt\filec@ntents } @@ -8861,7 +12599,7 @@ of this package available from CTAN} \endgroup% \EndIncludeInRelease \IncludeInRelease{0000/00/00}% - {\filec@ntents}{Spaces in file names + optional arg}% + {\filec@ntents}{Spaces in file names + optional arg}% \let\filec@ntents@opt \@undefined \let\filec@ntents@force \@undefined @@ -8950,12 +12688,9 @@ of this package available from CTAN} \noexpand\reserved@b##1\E\E\relax}}% \endgroup% \EndIncludeInRelease -%% -%% File: ltfilehook.dtx (C) Copyright 2020 Frank Mittelbach, -%% Phelype Oleinik & LaTeX Team %%% From File: ltfilehook.dtx -\providecommand\ltfilehookversion{v1.0e} -\providecommand\ltfilehookdate{2021/01/07} +\providecommand\ltfilehookversion{v1.0k} +\providecommand\ltfilehookdate{2021/05/25} \IncludeInRelease{2020/10/01}% {\CurrentFile}{Hook management file}% \ExplSyntaxOn @@ -9007,7 +12742,8 @@ of this package available from CTAN} \cs_new:Npn \__filehook_drop_extension_aux:nnn #1 #2 #3 { \tl_if_empty:nF {#1} { #1 / } #2 } \tl_new:N \l__filehook_internal_tl -\seq_new:N \g__filehook_input_file_seq +\seq_if_exist:NF \g__filehook_input_file_seq + { \seq_new:N \g__filehook_input_file_seq } \cs_new_protected:Npn \__filehook_file_push: { \seq_gpush:Nx \g__filehook_input_file_seq @@ -9021,7 +12757,7 @@ of this package available from CTAN} \seq_gpop:NNTF \g__filehook_input_file_seq \l__filehook_internal_tl { \exp_after:wN \__filehook_file_pop_assign:nnnn \l__filehook_internal_tl } { - \msg_error:nnn { hooks } { should-not-happen } + \msg_error:nnn { kernel } { should-not-happen } { Tried~to~pop~from~an~empty~file~name~stack. } } } @@ -9054,7 +12790,8 @@ of this package available from CTAN} { \tl_if_empty:nTF {#3} { \__file_parse_full_name_base:nw { } #2 . \s__file_stop {#1} } - { \__file_parse_full_name_area:nw { #1 / #2 } #3 \s__file_stop } + { \__file_parse_full_name_area:nw { #1 / #2 } + #3 \s__file_stop } } \cs_new:Npn \__file_parse_full_name_base:nw #1 #2 . #3 \s__file_stop { @@ -9068,7 +12805,8 @@ of this package available from CTAN} } { \__file_parse_full_name_tidy:nnnN {#1} { .#2 } } } - { \__file_parse_full_name_base:nw { #1 . #2 } #3 \s__file_stop } + { \__file_parse_full_name_base:nw { #1 . #2 } + #3 \s__file_stop } } \cs_new:Npn \__file_parse_full_name_tidy:nnnN #1 #2 #3 #4 { @@ -9133,6 +12871,7 @@ of this package available from CTAN} \long\def \InputIfFileExists#1#2{% \IfFileExists{#1}% {#2\@addtofilelist{#1}\@@input \@filef@und}} +\expandafter\let\csname InputIfFileExists \endcsname\@undefined \let\@input@file@exists@with@hooks\@undefined \let\unqu@tefilef@und\@undefined \EndIncludeInRelease @@ -9149,7 +12888,8 @@ of this package available from CTAN} @file-subst@ \__filehook_subst_file_normalize:Nn \use_ii_iii:nnn {#1} } - { \__filehook_subst_file_normalize:Nn \__filehook_file_name_compose:nnn {#2} } + { \__filehook_subst_file_normalize:Nn \__filehook_file_name_compose:nnn + {#2} } \group_end: } \cs_new_protected:Npn \__filehook_subst_remove:n #1 @@ -9185,10 +12925,32 @@ of this package available from CTAN} \IncludeInRelease{0000/00/00}% {\declare@file@substitution}{File substitution}% -\let \declare@file@substitution \@undefined -\let \undeclare@file@substitution \@undefined +\let \declare@file@substitution \@gobbletwo +\let \undeclare@file@substitution \@gobble \EndIncludeInRelease +\IncludeInRelease{2021/06/01}% + {\set@curr@file}{Setting current file name}% +\def\set@curr@file#1{% + \begingroup + \escapechar\m@ne + \let\protect\string + \edef~{\string~}% + \expandafter\def\csname\expandafter\endcsname + \expandafter{\csname\endcsname}% + \@expl@@@filehook@if@no@extension@@nTF{#1}% + {\@tempswatrue}{\@tempswafalse}% + \@kernel@make@file@csname\@curr@file + \@expl@@@filehook@resolve@file@subst@@w {#1}% + \@expl@@@filehook@if@file@replaced@@TF + {\@kernel@make@file@csname\@curr@file@reqd + \@expl@@@filehook@normalize@file@name@@w{#1}% + \if@tempswa \@expl@@@filehook@drop@extension@@N\@curr@file@reqd \fi}% + {\if@tempswa \@expl@@@filehook@drop@extension@@N\@curr@file \fi + \global\let\@curr@file@reqd\@curr@file}% + \@expl@@@filehook@clear@replacement@flag@@ + \endgroup} +\EndIncludeInRelease \IncludeInRelease{2020/10/01}% {\set@curr@file}{Setting current file name}% \def\set@curr@file#1{% @@ -9261,7 +13023,7 @@ of this package available from CTAN} \ExplSyntaxOff \EndIncludeInRelease \IncludeInRelease{2020/10/01}% - {\__filehook_resolve_file_subst:w}{Replace files detect loops}% + {\__filehook_resolve_file_subst:w}{Replace files detect loops}% \ExplSyntaxOn \cs_new:Npn \__filehook_resolve_file_subst:w #1 \@nil { \__filehook_file_parse_full_name:nN {#1} \__filehook_file_subst_begin:nnn } @@ -9282,7 +13044,7 @@ of this package available from CTAN} \ExplSyntaxOff \EndIncludeInRelease \IncludeInRelease{2020/10/01}% - {\__filehook_file_subst_tortoise_hare:nn}{Tortoise and Hare}% + {\__filehook_file_subst_tortoise_hare:nn}{Tortoise and Hare}% \ExplSyntaxOn \cs_new:Npn \__filehook_file_subst_tortoise_hare:nn #1 #2 #3 { @@ -9358,7 +13120,7 @@ of this package available from CTAN} \cs_new_eq:NN \@expl@@@filehook@drop@extension@@N \__filehook_drop_extension:N \cs_new_eq:NN \@expl@@@filehook@file@push@@ - \__filehook_file_push: + \__filehook_file_push: \cs_new_eq:NN \@expl@@@filehook@file@pop@@ \__filehook_file_pop: \cs_new_eq:NN \@expl@@@filehook@file@pop@assign@@nnnn @@ -9372,13 +13134,14 @@ of this package available from CTAN} \EndIncludeInRelease %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% %% -%% File: ltshipout.dtx (C) Copyright 2020 Frank Mittelbach, LaTeX Team +%% Copyright (C) 2020-2021 +%% Frank Mittelbach, LaTeX Team %% %%% From File: ltshipout.dtx -\providecommand\ltshipoutversion{v1.0d} -\providecommand\ltshipoutdate{2020/11/24} +\providecommand\ltshipoutversion{v1.0i} +\providecommand\ltshipoutdate{2021/03/17} \IncludeInRelease{2020/10/01}% - {\shipout}{Hook mangement (shipout)}% + {\shipout}{Hook management (shipout)}% \ExplSyntaxOn \bool_new:N \g__shipout_debug_bool \cs_new_eq:NN \__shipout_debug:n \use_none:n @@ -9399,6 +13162,27 @@ of this package available from CTAN} } \box_new:N \l_shipout_box \cs_set_eq:NN \ShipoutBox \l_shipout_box +\box_new:N \l__shipout_raw_box +\sys_if_engine_luatex:TF + { + \newluafunction \__shipout_finalize_box: + \exp_args:Nx \everyjob { + \exp_not:V \everyjob + \exp_not:N \lua_now:n { + luatexbase.create_callback('pre_shipout_filter', 'list') + local~call, getbox, setbox = luatexbase.call_callback, tex.getbox, tex.setbox~ + lua.get_functions_table()[\the \__shipout_finalize_box:] = function() + local~result = call('pre_shipout_filter', getbox(\the \l_shipout_box)) + if~not (result == true) then~ + setbox(\the \l_shipout_box, result~or~nil) + end~ + end + } + } + \protected \luadef \__shipout_finalize_box: \the \__shipout_finalize_box: + } { + \cs_set_eq:NN \__shipout_finalize_box: \scan_stop: + } \cs_set_protected:Npn \__shipout_execute: { \tl_set:Nx \l__shipout_group_level_tl { \int_value:w \tex_currentgrouplevel:D } @@ -9410,26 +13194,43 @@ of this package available from CTAN} \cs_new:Npn \__shipout_execute_test_level: { \int_compare:nNnT \l__shipout_group_level_tl < \tex_currentgrouplevel:D - \tex_aftergroup:D - \__shipout_execute_cont: + \tex_aftergroup:D \__shipout_execute_cont: } \cs_new:Npn \__shipout_execute_cont: { - \box_if_empty:NTF \l_shipout_box - { \PackageWarning{ltshipout}{Ignoring~ void~ shipout~ box} } + \__shipout_execute_main_cont:Nnnn + \l_shipout_box + { \hook_use:n {shipout/before} } + { \hook_if_empty:nF {shipout/foreground} + { \__shipout_add_foreground_picture:n + { \hook_use:n {shipout/foreground} } } + \bool_lazy_and:nnF + { \hook_if_empty_p:n {shipout/background} } + { \tl_if_empty_p:N \@kernel@before@shipout@background } + { \__shipout_add_background_picture:n + { \@kernel@before@shipout@background + \hook_use:n {shipout/background} + \@kernel@after@shipout@background } + } + } + { \hook_use:n {shipout/after} } +} +\cs_new:Npn \__shipout_execute_main_cont:Nnnn #1#2#3#4 { + \box_if_empty:NTF #1 + { \@latex@warning{Ignoring~ void~ shipout~ box} } { - \bool_gset_false:N \g__shipout_discard_bool + % \DiscardShipoutBox on doc-level \cs_set_eq:NN \__shipout_saved_protect: \protect \set@typeset@protect - \__shipout_get_box_size:N \l_shipout_box - \hook_use:n {shipout/before} + \__shipout_get_box_size:N #1 + #2 \int_gincr:N \g_shipout_totalpages_int \bool_if:NTF \g__shipout_discard_bool - { \PackageInfo{ltshipout}{Completed~ page~ discarded} + { \@latex@info@no@line{Completed~ page~ discarded} \bool_gset_false:N \g__shipout_discard_bool \tex_deadcycles:D \c_zero_int } - { \box_if_empty:NTF \l_shipout_box - { \PackageWarning{ltshipout}{ + { \box_if_empty:NTF #1 + { \@latex@warning{ Shipout~ box~ was~ voided~ by~ hook,\MessageBreak ignoring~ shipout~ box } } @@ -9439,49 +13240,89 @@ of this package available from CTAN} \typeout{Absolute~ page~ =~ \int_use:N \g_shipout_readonly_int \space (target:~ \@abspage@last)} } - \__shipout_get_box_size:N \l_shipout_box - \hook_if_empty:nF {shipout/foreground} - { \__shipout_add_foreground_picture:n - { \hook_use:n {shipout/foreground} } } - \hook_if_empty:nF {shipout/background} - { \__shipout_add_background_picture:n - { \@kernel@before@shipout@background - \hook_use:n {shipout/background} } } - \__shipout_execute_firstpage_hook: + \__shipout_get_box_size:N #1 + \__shipout_run_firstpage_hook: + #3 + \__shipout_add_firstpage_specials: \int_compare:nNnT \@abspage@last = \g_shipout_readonly_int - { \hook_if_empty:nF {shipout/lastpage} + { \bool_lazy_and:nnF + { \hook_if_empty_p:n {shipout/lastpage} } + { \tl_if_empty_p:N \@kernel@after@shipout@lastpage } { \__shipout_debug:n { \typeout{Executing~ lastpage~ hook~ - on~ page~ \int_use:N \g_shipout_readonly_int } } - \__shipout_add_foreground_box:n { \UseHook{shipout/lastpage} - \@kernel@after@shipout@lastpage } + on~ page~ \int_use:N \g_shipout_readonly_int } } + \__shipout_add_foreground_box:n + { \UseHook{shipout/lastpage} + \@kernel@after@shipout@lastpage } } \bool_gset_true:N \g__shipout_lastpage_handled_bool } + \__shipout_finalize_box: \cs_set_eq:NN \protect \exp_not:N \tex_shipout:D \box_use:N \l_shipout_box + \__shipout_drop_firstpage_specials: + \set@typeset@protect + #4 } } \cs_set_eq:NN \protect \__shipout_saved_protect: } } +\cs_set_protected:Npn \__shipout_execute_raw: { + \tl_set:Nx \l__shipout_group_level_tl + { \int_value:w \tex_currentgrouplevel:D } + \tex_afterassignment:D \__shipout_execute_test_level_raw: + \tex_setbox:D \l__shipout_raw_box +} +\cs_new:Npn \__shipout_execute_test_level_raw: { + \int_compare:nNnT + \l__shipout_group_level_tl < \tex_currentgrouplevel:D + \tex_aftergroup:D \__shipout_execute_nohooks_cont: +} +\cs_new:Npn \__shipout_execute_nohooks_cont: { + \__shipout_execute_main_cont:Nnnn \l__shipout_raw_box + {} { \__shipout_debug:n{ \typeout{Doing~ raw~ shipout~ ...} } + \box_set_eq:NN \l_shipout_box \l__shipout_raw_box } {} +} + +\cs_gset_eq:NN \RawShipout \__shipout_execute_raw: \cs_new_eq:NN \__shipout_saved_protect: \protect \hook_new:n{shipout/before} +\hook_new:n{shipout/after} \hook_new:n{shipout/foreground} \hook_new:n{shipout/background} \hook_new:n{shipout/firstpage} \hook_new:n{shipout/lastpage} \let\@kernel@after@shipout@lastpage\@empty \let\@kernel@before@shipout@background\@empty -\cs_new:Npn \__shipout_execute_firstpage_hook: { - \hook_if_empty:nF {shipout/firstpage} - { \__shipout_add_background_box:n { \UseHook{shipout/firstpage} } } - \cs_gset_eq:NN \__shipout_execute_firstpage_hook: \prg_do_nothing: +\let\@kernel@after@shipout@background\@empty +\cs_new:Npn \__shipout_run_firstpage_hook: { + \hook_if_empty:nTF {shipout/firstpage} + { + \cs_gset_eq:NN \__shipout_add_firstpage_specials: \prg_do_nothing: + \cs_gset_eq:NN \__shipout_drop_firstpage_specials: \prg_do_nothing: + } + { + \hbox_set:Nn \l__shipout_firstpage_box { \UseHook{shipout/firstpage} } + } + \cs_gset_eq:NN \__shipout_run_firstpage_hook: \prg_do_nothing: \cs_gset:Npn \__shipout_add_firstpage_material:Nn ##1 ##2 { \@latex@warning{ First~ page~ is~ already~ shipped~ out,~ ignoring\MessageBreak \string##1 } } } +\cs_new:Npn \__shipout_add_firstpage_specials: { + \box_set_eq:NN \l__shipout_raw_box \l_shipout_box + \__shipout_add_background_box:n { \hbox_unpack_drop:N \l__shipout_firstpage_box } + \cs_gset_eq:NN \__shipout_add_firstpage_specials: \prg_do_nothing: +} +\cs_new:Npn \__shipout_drop_firstpage_specials: { + \box_set_eq:NN \l_shipout_box \l__shipout_raw_box + \cs_gset_eq:NN \__shipout_drop_firstpage_specials: \prg_do_nothing: + } + +\box_new:N \l__shipout_firstpage_box + \bool_new:N \g__shipout_lastpage_handled_bool \cs_new:Npn \__shipout_add_firstpage_material:Nn #1#2 { \AddToHook{shipout/firstpage}{#2} @@ -9490,8 +13331,8 @@ of this package available from CTAN} \dim_set:Nn \l_shipout_box_ht_dim { \box_ht:N #1 } \dim_set:Nn \l_shipout_box_dp_dim { \box_dp:N #1 } \dim_set:Nn \l_shipout_box_wd_dim { \box_wd:N #1 } - \dim_set:Nn \l_shipout_box_ht_plus_dp_dim { \l_shipout_box_ht_dim + - \l_shipout_box_dp_dim } + \dim_set:Nn \l_shipout_box_ht_plus_dp_dim + { \l_shipout_box_ht_dim + \l_shipout_box_dp_dim } } \dim_new:N \l_shipout_box_ht_dim \dim_new:N \l_shipout_box_dp_dim @@ -9697,7 +13538,8 @@ of this package available from CTAN} {\ifnum\@abspage@last<\maxdimen \xdef\PreviousTotalPages{\@abspage@last}\fi} \cs_new_eq:NN \DiscardShipoutBox \shipout_discard: -\cs_set_protected:Npn \AtBeginDvi {\__shipout_add_firstpage_material:Nn \AtBeginDvi} +\cs_set_protected:Npn \AtBeginDvi + {\__shipout_add_firstpage_material:Nn \AtBeginDvi} \cs_new_eq:NN \DebugShipoutsOn \shipout_debug_on: \cs_new_eq:NN \DebugShipoutsOff \shipout_debug_off: \cs_set_eq:NN \@expl@@@shipout@add@firstpage@material@@Nn @@ -9713,13 +13555,14 @@ of this package available from CTAN} \ExplSyntaxOff \EndIncludeInRelease \IncludeInRelease{0000/00/00}% - {\shipout}{The hook management (shipout)}% + {\shipout}{Hook management (shipout)}% \ifcsname tex_shipout:D\endcsname \expandafter\let\expandafter\shipout \csname tex_shipout:D\endcsname \fi +\let \RawShipout\@undefined \let \ShipoutBox\@undefined \let \ReadonlyShipoutCounter \@undefined \let \c@totalpages \@undefined @@ -9743,13 +13586,6 @@ of this package available from CTAN} \let \ShipoutBoxDepth \@undefined \let \ShipoutBoxWidth \@undefined -\let \AtBeginShipoutDiscard \@undefined - -\let \AtBeginShipoutAddToBox \@undefined -\let \AtBeginShipoutAddToBoxForeground \@undefined -\let \AtBeginShipoutUpperLeft \@undefined -\let \AtBeginShipoutUpperLeftForeground \@undefined - \let \AtEndDvi \@undefined @@ -9875,7 +13711,7 @@ of this package available from CTAN} \global \@colroom \@colht \ifx \@currlist\@empty \else - \@latexerr{Float(s) lost}\@ehb + \@latex@error{Float(s) lost}\@ehb \global \let \@currlist \@empty \fi \@makefcolumn\@deferlist @@ -10774,6 +14610,47 @@ of this package available from CTAN} \xe@alloc@intercharclass=\thr@@ \fi \EndIncludeInRelease +\ifx\directlua\@undefined +\else + \directlua{% + if luatexbase.callbacktypes['input_level_string'] and % + luatexbase.in_callback('input_level_string','tracingstacklevels') then + luatexbase.remove_from_callback('input_level_string','tracingstacklevels') + end}% +\fi +\IncludeInRelease{2021/06/01}{trace_stack_levels}% + {Lua trace_stack_levels function}% +\ifx\directlua\@undefined +\else + \directlua{% + local function trace_stack_levels (input_ptr) + local tracingstacklevels = tex.count.tracingstacklevels + if tex.tracingmacros > 0 or input_ptr < tracingstacklevels then + if tracingstacklevels > 0 then + if input_ptr < tracingstacklevels then + return "\string\n\string~" .. string.rep(".",input_ptr) + else + return "\string~\string~" + end + else + return "\string\n" + end + else + return "" + end + end + if luatexbase.callbacktypes['input_level_string'] then + luatexbase.add_to_callback('input_level_string', + trace_stack_levels,'tracingstacklevels') + end + }% +\fi +\EndIncludeInRelease + +\IncludeInRelease{0000/00/00}{trace_stack_levels}% + {Lua trace_stack_levels function}% +% Nothing here +\EndIncludeInRelease \IncludeInRelease{2016/02/01}% {\XeTeXintercharclasses}{XeTeX character classes}% \ifx\XeTeXinterchartoks\undefined @@ -10832,13 +14709,26 @@ of this package available from CTAN} \fi \EndIncludeInRelease \IncludeInRelease{2017/04/15}% - {\document@default@language}{Save language for hyphenation}% + {\document@default@language}{Save language for hyphenation}% \let\document@default@language\m@ne \EndIncludeInRelease \IncludeInRelease{0000/00/00}% - {\document@default@language}{Save language for hyphenation}% + {\document@default@language}{Save language for hyphenation}% \let\document@default@language\@undefined \EndIncludeInRelease +\IncludeInRelease{2021/06/01}% + {\pdfgentounicode}{Preload glyphtounicode}% +\ifx \pdfgentounicode \@undefined \else + \input glyphtounicode + \pdfgentounicode=1 +\fi +\EndIncludeInRelease +\IncludeInRelease{0000/00/00}% + {\pdfgentounicode}{Preload glyphtounicode}% +\ifx \pdfgentounicode \@undefined \else + \pdfgentounicode=0 +\fi +\EndIncludeInRelease \IncludeInRelease{2018/04/01}% {\UTFviii@invalid}{UTF-8 default}% \ifnum0% @@ -10966,6 +14856,21 @@ of this package available from CTAN} \let\DeclareFontEncoding@saved\@undefined \let\inputencodingname\@undefined \EndIncludeInRelease +\@ifundefined{ExplSyntaxOn}% + {\let\ExplSyntaxOn\@undefined + \let\ExplSyntaxOff\@undefined + \@gobble}% + {\ExplSyntaxOn + \@firstofone}% + {% +\tl_map_inline:Nn \l__latexrelease_restores_tl + { + \cs_set_eq:Nc #1 { __latexrelease_ \cs_to_str:N #1 } + \cs_undefine:c { __latexrelease_ \cs_to_str:N #1 } + } +\tl_clear:N \l__latexrelease_restores_tl +\msg_redirect_name:nnn { hooks } { exists } { } + \ExplSyntaxOff}% \endinput %% %% End of file `latexrelease.sty'. diff --git a/Master/texmf-dist/tex/latex/base/latexsym.sty b/Master/texmf-dist/tex/latex/base/latexsym.sty index a4e536bda4b..2b9c796d7a9 100644 --- a/Master/texmf-dist/tex/latex/base/latexsym.sty +++ b/Master/texmf-dist/tex/latex/base/latexsym.sty @@ -13,8 +13,8 @@ %% (but please observe conditions on bug reports sent to that address!) %% %% -%% Copyright (C) 1993-2020 -%% The LaTeX3 Project and any individual authors listed elsewhere +%% Copyright (C) 1993-2021 +%% The LaTeX Project and any individual authors listed elsewhere %% in this file. %% %% This file was generated from file(s) of the LaTeX base system. diff --git a/Master/texmf-dist/tex/latex/base/latin1.def b/Master/texmf-dist/tex/latex/base/latin1.def index ef47b4d36e9..ed5a22f8014 100644 --- a/Master/texmf-dist/tex/latex/base/latin1.def +++ b/Master/texmf-dist/tex/latex/base/latin1.def @@ -13,8 +13,8 @@ %% (but please observe conditions on bug reports sent to that address!) %% %% -%% Copyright (C) 1993-2020 -%% The LaTeX3 Project and any individual authors listed elsewhere +%% Copyright (C) 1993-2021 +%% The LaTeX Project and any individual authors listed elsewhere %% in this file. %% %% This file was generated from file(s) of the LaTeX base system. @@ -44,7 +44,7 @@ \ProvidesFile{latin1.def} - [2020/08/01 v1.3d Input encoding file] + [2021/02/14 v1.3d Input encoding file] \ProvideTextCommandDefault{\textdegree}{\ensuremath{{^\circ}}} \ProvideTextCommandDefault{\textonehalf}{\ensuremath{\frac12}} \ProvideTextCommandDefault{\textonequarter}{\ensuremath{\frac14}} diff --git a/Master/texmf-dist/tex/latex/base/latin10.def b/Master/texmf-dist/tex/latex/base/latin10.def index 25eeb22d5b4..c92a028b4d7 100644 --- a/Master/texmf-dist/tex/latex/base/latin10.def +++ b/Master/texmf-dist/tex/latex/base/latin10.def @@ -13,8 +13,8 @@ %% (but please observe conditions on bug reports sent to that address!) %% %% -%% Copyright (C) 1993-2020 -%% The LaTeX3 Project and any individual authors listed elsewhere +%% Copyright (C) 1993-2021 +%% The LaTeX Project and any individual authors listed elsewhere %% in this file. %% %% This file was generated from file(s) of the LaTeX base system. @@ -44,7 +44,7 @@ \ProvidesFile{latin10.def} - [2020/08/01 v1.3d Input encoding file] + [2021/02/14 v1.3d Input encoding file] \ProvideTextCommandDefault{\textdegree}{\ensuremath{{^\circ}}} \ProvideTextCommandDefault{\texteuro} {\TextSymbolUnavailable\texteuro} diff --git a/Master/texmf-dist/tex/latex/base/latin2.def b/Master/texmf-dist/tex/latex/base/latin2.def index cabf30a3d40..08bd58131cf 100644 --- a/Master/texmf-dist/tex/latex/base/latin2.def +++ b/Master/texmf-dist/tex/latex/base/latin2.def @@ -13,8 +13,8 @@ %% (but please observe conditions on bug reports sent to that address!) %% %% -%% Copyright (C) 1993-2020 -%% The LaTeX3 Project and any individual authors listed elsewhere +%% Copyright (C) 1993-2021 +%% The LaTeX Project and any individual authors listed elsewhere %% in this file. %% %% This file was generated from file(s) of the LaTeX base system. @@ -44,7 +44,7 @@ \ProvidesFile{latin2.def} - [2020/08/01 v1.3d Input encoding file] + [2021/02/14 v1.3d Input encoding file] \ProvideTextCommandDefault{\textdegree}{\ensuremath{{^\circ}}} \ProvideTextCommandDefault{\textcurrency} {\TextSymbolUnavailable\textcurrency} diff --git a/Master/texmf-dist/tex/latex/base/latin3.def b/Master/texmf-dist/tex/latex/base/latin3.def index 909307dc280..2f631252795 100644 --- a/Master/texmf-dist/tex/latex/base/latin3.def +++ b/Master/texmf-dist/tex/latex/base/latin3.def @@ -13,8 +13,8 @@ %% (but please observe conditions on bug reports sent to that address!) %% %% -%% Copyright (C) 1993-2020 -%% The LaTeX3 Project and any individual authors listed elsewhere +%% Copyright (C) 1993-2021 +%% The LaTeX Project and any individual authors listed elsewhere %% in this file. %% %% This file was generated from file(s) of the LaTeX base system. @@ -44,7 +44,7 @@ \ProvidesFile{latin3.def} - [2020/08/01 v1.3d Input encoding file] + [2021/02/14 v1.3d Input encoding file] \ProvideTextCommandDefault{\textdegree}{\ensuremath{{^\circ}}} \ProvideTextCommandDefault{\textonehalf}{\ensuremath{\frac12}} \ProvideTextCommandDefault{\textcurrency} diff --git a/Master/texmf-dist/tex/latex/base/latin4.def b/Master/texmf-dist/tex/latex/base/latin4.def index b150ce4938c..5b5158d3a5c 100644 --- a/Master/texmf-dist/tex/latex/base/latin4.def +++ b/Master/texmf-dist/tex/latex/base/latin4.def @@ -13,8 +13,8 @@ %% (but please observe conditions on bug reports sent to that address!) %% %% -%% Copyright (C) 1993-2020 -%% The LaTeX3 Project and any individual authors listed elsewhere +%% Copyright (C) 1993-2021 +%% The LaTeX Project and any individual authors listed elsewhere %% in this file. %% %% This file was generated from file(s) of the LaTeX base system. @@ -44,7 +44,7 @@ \ProvidesFile{latin4.def} - [2020/08/01 v1.3d Input encoding file] + [2021/02/14 v1.3d Input encoding file] \ProvideTextCommandDefault{\textdegree}{\ensuremath{{^\circ}}} \ProvideTextCommandDefault{\textcurrency} {\TextSymbolUnavailable\textcurrency} diff --git a/Master/texmf-dist/tex/latex/base/latin5.def b/Master/texmf-dist/tex/latex/base/latin5.def index e91af0cccbd..303ab25ac9a 100644 --- a/Master/texmf-dist/tex/latex/base/latin5.def +++ b/Master/texmf-dist/tex/latex/base/latin5.def @@ -13,8 +13,8 @@ %% (but please observe conditions on bug reports sent to that address!) %% %% -%% Copyright (C) 1993-2020 -%% The LaTeX3 Project and any individual authors listed elsewhere +%% Copyright (C) 1993-2021 +%% The LaTeX Project and any individual authors listed elsewhere %% in this file. %% %% This file was generated from file(s) of the LaTeX base system. @@ -44,7 +44,7 @@ \ProvidesFile{latin5.def} - [2020/08/01 v1.3d Input encoding file] + [2021/02/14 v1.3d Input encoding file] \ProvideTextCommandDefault{\textdegree}{\ensuremath{{^\circ}}} \ProvideTextCommandDefault{\textonehalf}{\ensuremath{\frac12}} \ProvideTextCommandDefault{\textonequarter}{\ensuremath{\frac14}} diff --git a/Master/texmf-dist/tex/latex/base/latin9.def b/Master/texmf-dist/tex/latex/base/latin9.def index a420b7765ea..5fa9b02c000 100644 --- a/Master/texmf-dist/tex/latex/base/latin9.def +++ b/Master/texmf-dist/tex/latex/base/latin9.def @@ -13,8 +13,8 @@ %% (but please observe conditions on bug reports sent to that address!) %% %% -%% Copyright (C) 1993-2020 -%% The LaTeX3 Project and any individual authors listed elsewhere +%% Copyright (C) 1993-2021 +%% The LaTeX Project and any individual authors listed elsewhere %% in this file. %% %% This file was generated from file(s) of the LaTeX base system. @@ -44,7 +44,7 @@ \ProvidesFile{latin9.def} - [2020/08/01 v1.3d Input encoding file] + [2021/02/14 v1.3d Input encoding file] \ProvideTextCommandDefault{\textdegree}{\ensuremath{{^\circ}}} \ProvideTextCommandDefault{\textcent} {\TextSymbolUnavailable\textcent} diff --git a/Master/texmf-dist/tex/latex/base/lcyenc.dfu b/Master/texmf-dist/tex/latex/base/lcyenc.dfu index ef1e704f291..16352df052e 100644 --- a/Master/texmf-dist/tex/latex/base/lcyenc.dfu +++ b/Master/texmf-dist/tex/latex/base/lcyenc.dfu @@ -13,8 +13,8 @@ %% (but please observe conditions on bug reports sent to that address!) %% %% -%% Copyright (C) 1993-2020 -%% The LaTeX3 Project and any individual authors listed elsewhere +%% Copyright (C) 1993-2021 +%% The LaTeX Project and any individual authors listed elsewhere %% in this file. %% %% This file was generated from file(s) of the LaTeX base system. @@ -42,7 +42,7 @@ %% and covered by LPPL is defined by the unpacking scripts (with %% extension .ins) which are part of the distribution. \ProvidesFile{lcyenc.dfu} - [2019/11/14 v1.2k UTF-8 support for inputenc] + [2021/01/27 v1.2l UTF-8 support for inputenc] \DeclareUnicodeCharacter{00A4}{\textcurrency} \DeclareUnicodeCharacter{00AB}{\guillemotleft} \DeclareUnicodeCharacter{00BB}{\guillemotright} diff --git a/Master/texmf-dist/tex/latex/base/leqno.clo b/Master/texmf-dist/tex/latex/base/leqno.clo index 1c5fbfe4418..04f60c2c92c 100644 --- a/Master/texmf-dist/tex/latex/base/leqno.clo +++ b/Master/texmf-dist/tex/latex/base/leqno.clo @@ -13,8 +13,8 @@ %% (but please observe conditions on bug reports sent to that address!) %% %% -%% Copyright (C) 1993-2020 -%% The LaTeX3 Project and any individual authors listed elsewhere +%% Copyright (C) 1993-2021 +%% The LaTeX Project and any individual authors listed elsewhere %% in this file. %% %% This file was generated from file(s) of the LaTeX base system. diff --git a/Master/texmf-dist/tex/latex/base/leqno.sty b/Master/texmf-dist/tex/latex/base/leqno.sty index 98b15b6f9f7..84b15423671 100644 --- a/Master/texmf-dist/tex/latex/base/leqno.sty +++ b/Master/texmf-dist/tex/latex/base/leqno.sty @@ -13,8 +13,8 @@ %% (but please observe conditions on bug reports sent to that address!) %% %% -%% Copyright (C) 1993-2020 -%% The LaTeX3 Project and any individual authors listed elsewhere +%% Copyright (C) 1993-2021 +%% The LaTeX Project and any individual authors listed elsewhere %% in this file. %% %% This file was generated from file(s) of the LaTeX base system. diff --git a/Master/texmf-dist/tex/latex/base/letter.cls b/Master/texmf-dist/tex/latex/base/letter.cls index 9909ad61c3d..587e999eebc 100644 --- a/Master/texmf-dist/tex/latex/base/letter.cls +++ b/Master/texmf-dist/tex/latex/base/letter.cls @@ -13,8 +13,8 @@ %% (but please observe conditions on bug reports sent to that address!) %% %% -%% Copyright (C) 1993-2020 -%% The LaTeX3 Project and any individual authors listed elsewhere +%% Copyright (C) 1993-2021 +%% The LaTeX Project and any individual authors listed elsewhere %% in this file. %% %% This file was generated from file(s) of the LaTeX base system. @@ -43,7 +43,7 @@ %% extension .ins) which are part of the distribution. \NeedsTeXFormat{LaTeX2e}[1996/06/01] \ProvidesClass{letter} - [2020/03/11 v1.3b + [2021/03/05 v1.3c Standard LaTeX document class] \newcommand\@ptsize{} \DeclareOption{a4paper} @@ -228,7 +228,7 @@ \@date \end{tabular}\par}% \fi \vspace{2\parskip}% - {\raggedright \toname \\ \toaddress \par}% + {\raggedright \toname \expandafter\\\toaddress \par}% \vspace{2\parskip}% #1\par\nobreak} \newcommand\closing[1]{\par\nobreak\vspace{\parskip}% diff --git a/Master/texmf-dist/tex/latex/base/letter.sty b/Master/texmf-dist/tex/latex/base/letter.sty index e15565c0ea0..a41368b0e53 100644 --- a/Master/texmf-dist/tex/latex/base/letter.sty +++ b/Master/texmf-dist/tex/latex/base/letter.sty @@ -13,8 +13,8 @@ %% (but please observe conditions on bug reports sent to that address!) %% %% -%% Copyright (C) 1993-2020 -%% The LaTeX3 Project and any individual authors listed elsewhere +%% Copyright (C) 1993-2021 +%% The LaTeX Project and any individual authors listed elsewhere %% in this file. %% %% This file was generated from file(s) of the LaTeX base system. diff --git a/Master/texmf-dist/tex/latex/base/ltluatex.lua b/Master/texmf-dist/tex/latex/base/ltluatex.lua index dcbc5730258..193514467b2 100644 --- a/Master/texmf-dist/tex/latex/base/ltluatex.lua +++ b/Master/texmf-dist/tex/latex/base/ltluatex.lua @@ -13,8 +13,8 @@ -- (but please observe conditions on bug reports sent to that address!) -- -- --- Copyright 2015 --- The LaTeX3 Project and any individual authors listed elsewhere +-- Copyright (C) 2015-2021 +-- The LaTeX Project and any individual authors listed elsewhere -- in this file. -- -- This file was generated from file(s) of the LaTeX base system. @@ -324,6 +324,7 @@ local callbacktypes = callbacktypes or { glyph_stream_provider = exclusive, make_extensible = exclusive, font_descriptor_objnum_provider = exclusive, + input_level_string = exclusive, } luatexbase.callbacktypes=callbacktypes local callback_register = callback_register or callback.register diff --git a/Master/texmf-dist/tex/latex/base/ltluatex.tex b/Master/texmf-dist/tex/latex/base/ltluatex.tex index febfbd72510..90b6d2dfe7e 100644 --- a/Master/texmf-dist/tex/latex/base/ltluatex.tex +++ b/Master/texmf-dist/tex/latex/base/ltluatex.tex @@ -13,8 +13,8 @@ %% (but please observe conditions on bug reports sent to that address!) %% %% -%% Copyright (C) 1993-2020 -%% The LaTeX3 Project and any individual authors listed elsewhere +%% Copyright (C) 1993-2021 +%% The LaTeX Project and any individual authors listed elsewhere %% in this file. %% %% This file was generated from file(s) of the LaTeX base system. @@ -47,7 +47,7 @@ #1#2[#3]{\endgroup\immediate\write-1{File: #1 #3}} \fi \ProvidesFile{ltluatex.tex}% -[2020/09/25 v1.1s +[2021/04/18 v1.1t LuaTeX support for plain TeX (core) ] \edef\etatcatcode{\the\catcode`\@} diff --git a/Master/texmf-dist/tex/latex/base/ltnews.cls b/Master/texmf-dist/tex/latex/base/ltnews.cls index 632f0681175..9271b56f1c6 100644 --- a/Master/texmf-dist/tex/latex/base/ltnews.cls +++ b/Master/texmf-dist/tex/latex/base/ltnews.cls @@ -1,7 +1,7 @@ % \iffalse meta-comment % % Copyright 1993-2020 -% The LaTeX3 Project and any individual authors listed elsewhere +% The LaTeX Project and any individual authors listed elsewhere % in this file. % % This file is part of the LaTeX base system. @@ -35,7 +35,7 @@ % with LaTeX. The changes log is at the end of the file. % Copyright 1994-2004 -% Alan Jeffrey and the LaTeX3 project. +% Alan Jeffrey and the LaTeX Project. % This is a LaTeX2e document class. @@ -437,7 +437,7 @@ \newcommand{\indicia}{\renewcommand{\@indicia}} \newcommand{\@indicia}{% \LaTeXNews, and the \LaTeX{} software, - are brought to you by the \LaTeX3 Project Team; + are brought to you by the \LaTeX\ Project Team; Copyright \@year, all rights reserved. } diff --git a/Master/texmf-dist/tex/latex/base/ltxcheck.tex b/Master/texmf-dist/tex/latex/base/ltxcheck.tex index b96c884f3c3..9e013bc2af7 100644 --- a/Master/texmf-dist/tex/latex/base/ltxcheck.tex +++ b/Master/texmf-dist/tex/latex/base/ltxcheck.tex @@ -1,7 +1,7 @@ % \iffalse meta-comment % -% Copyright (C) 1993-2020 -% The LaTeX3 Project and any individual authors listed elsewhere +% Copyright (C) 1993-2021 +% The LaTeX Project and any individual authors listed elsewhere % in this file. % % This file is part of the LaTeX base system. @@ -29,7 +29,7 @@ % % \iffalse %% File `ltxcheck.tex'. -%% Copyright (C) 1994-1997 LaTeX3 project, David Carlisle +%% Copyright (C) 1994-1997 LaTeX Project, David Carlisle %% % LaTeX Test File. % ================ diff --git a/Master/texmf-dist/tex/latex/base/ltxdoc.cls b/Master/texmf-dist/tex/latex/base/ltxdoc.cls index d3941b3afde..2b9ff087857 100644 --- a/Master/texmf-dist/tex/latex/base/ltxdoc.cls +++ b/Master/texmf-dist/tex/latex/base/ltxdoc.cls @@ -13,8 +13,8 @@ %% (but please observe conditions on bug reports sent to that address!) %% %% -%% Copyright (C) 1993-2020 -%% The LaTeX3 Project and any individual authors listed elsewhere +%% Copyright (C) 1993-2021 +%% The LaTeX Project and any individual authors listed elsewhere %% in this file. %% %% This file was generated from file(s) of the LaTeX base system. @@ -43,7 +43,7 @@ %% extension .ins) which are part of the distribution. \NeedsTeXFormat{LaTeX2e} \ProvidesClass{ltxdoc} - [2020/10/04 v2.1b Standard LaTeX documentation class] + [2020/12/05 v2.1b Standard LaTeX documentation class] \DeclareOption{a5paper}{\@latexerr{Option not supported}% {}} \DeclareOption*{% diff --git a/Master/texmf-dist/tex/latex/base/ltxguide.cls b/Master/texmf-dist/tex/latex/base/ltxguide.cls index f70c91dcd95..b743fd9cdae 100644 --- a/Master/texmf-dist/tex/latex/base/ltxguide.cls +++ b/Master/texmf-dist/tex/latex/base/ltxguide.cls @@ -1,7 +1,7 @@ % \iffalse meta-comment % % Copyright 1993-2019 -% The LaTeX3 Project and any individual authors listed elsewhere +% The LaTeX Project and any individual authors listed elsewhere % in this file. % % This file is part of the LaTeX base system. @@ -34,7 +34,7 @@ % and `LaTeX2e for class and package writers'. The changes log is at % the end of the file. -% Copyright 1994 1999 Alan Jeffrey and the LaTeX3 project. +% Copyright 1994-1999 Alan Jeffrey and the LaTeX Project. % This is a LaTeX2e document class. diff --git a/Master/texmf-dist/tex/latex/base/ly1enc.dfu b/Master/texmf-dist/tex/latex/base/ly1enc.dfu index 52ee2e193be..787b1b7dfde 100644 --- a/Master/texmf-dist/tex/latex/base/ly1enc.dfu +++ b/Master/texmf-dist/tex/latex/base/ly1enc.dfu @@ -13,8 +13,8 @@ %% (but please observe conditions on bug reports sent to that address!) %% %% -%% Copyright (C) 1993-2020 -%% The LaTeX3 Project and any individual authors listed elsewhere +%% Copyright (C) 1993-2021 +%% The LaTeX Project and any individual authors listed elsewhere %% in this file. %% %% This file was generated from file(s) of the LaTeX base system. @@ -42,7 +42,7 @@ %% and covered by LPPL is defined by the unpacking scripts (with %% extension .ins) which are part of the distribution. \ProvidesFile{ly1enc.dfu} - [2019/11/14 v1.2k UTF-8 support for inputenc] + [2021/01/27 v1.2l UTF-8 support for inputenc] \DeclareUnicodeCharacter{00A0}{\nobreakspace} \DeclareUnicodeCharacter{00A1}{\textexclamdown} \DeclareUnicodeCharacter{00A2}{\textcent} diff --git a/Master/texmf-dist/tex/latex/base/macce.def b/Master/texmf-dist/tex/latex/base/macce.def index abe0c3f1d77..427568e1272 100644 --- a/Master/texmf-dist/tex/latex/base/macce.def +++ b/Master/texmf-dist/tex/latex/base/macce.def @@ -13,8 +13,8 @@ %% (but please observe conditions on bug reports sent to that address!) %% %% -%% Copyright (C) 1993-2020 -%% The LaTeX3 Project and any individual authors listed elsewhere +%% Copyright (C) 1993-2021 +%% The LaTeX Project and any individual authors listed elsewhere %% in this file. %% %% This file was generated from file(s) of the LaTeX base system. @@ -44,7 +44,7 @@ \ProvidesFile{macce.def} - [2020/08/01 v1.3d Input encoding file] + [2021/02/14 v1.3d Input encoding file] \ProvideTextCommandDefault{\textdegree}{\ensuremath{{^\circ}}} \ProvideTextCommandDefault{\textdiv} {\TextSymbolUnavailable\textdiv} diff --git a/Master/texmf-dist/tex/latex/base/makeidx.sty b/Master/texmf-dist/tex/latex/base/makeidx.sty index 3f34f5eb71b..518507399a7 100644 --- a/Master/texmf-dist/tex/latex/base/makeidx.sty +++ b/Master/texmf-dist/tex/latex/base/makeidx.sty @@ -13,8 +13,8 @@ %% (but please observe conditions on bug reports sent to that address!) %% %% -%% Copyright (C) 1993-2020 -%% The LaTeX3 Project and any individual authors listed elsewhere +%% Copyright (C) 1993-2021 +%% The LaTeX Project and any individual authors listed elsewhere %% in this file. %% %% This file was generated from file(s) of the LaTeX base system. diff --git a/Master/texmf-dist/tex/latex/base/minimal.cls b/Master/texmf-dist/tex/latex/base/minimal.cls index b38e4be093c..9024a23bca7 100644 --- a/Master/texmf-dist/tex/latex/base/minimal.cls +++ b/Master/texmf-dist/tex/latex/base/minimal.cls @@ -1,7 +1,7 @@ % \iffalse meta-comment % % Copyright 1993-2019 -% The LaTeX3 Project and any individual authors listed elsewhere +% The LaTeX Project and any individual authors listed elsewhere % in this file. % % This file is part of the LaTeX base system. diff --git a/Master/texmf-dist/tex/latex/base/newlfont.sty b/Master/texmf-dist/tex/latex/base/newlfont.sty index bf513a7c78a..e565a123ce8 100644 --- a/Master/texmf-dist/tex/latex/base/newlfont.sty +++ b/Master/texmf-dist/tex/latex/base/newlfont.sty @@ -13,8 +13,8 @@ %% (but please observe conditions on bug reports sent to that address!) %% %% -%% Copyright (C) 1993-2020 -%% The LaTeX3 Project and any individual authors listed elsewhere +%% Copyright (C) 1993-2021 +%% The LaTeX Project and any individual authors listed elsewhere %% in this file. %% %% This file was generated from file(s) of the LaTeX base system. diff --git a/Master/texmf-dist/tex/latex/base/next.def b/Master/texmf-dist/tex/latex/base/next.def index 7b17b7f14e8..196fa3f6998 100644 --- a/Master/texmf-dist/tex/latex/base/next.def +++ b/Master/texmf-dist/tex/latex/base/next.def @@ -13,8 +13,8 @@ %% (but please observe conditions on bug reports sent to that address!) %% %% -%% Copyright (C) 1993-2020 -%% The LaTeX3 Project and any individual authors listed elsewhere +%% Copyright (C) 1993-2021 +%% The LaTeX Project and any individual authors listed elsewhere %% in this file. %% %% This file was generated from file(s) of the LaTeX base system. @@ -44,7 +44,7 @@ \ProvidesFile{next.def} - [2020/08/01 v1.3d Input encoding file] + [2021/02/14 v1.3d Input encoding file] \ProvideTextCommandDefault{\textdegree}{\ensuremath{{^\circ}}} \ProvideTextCommandDefault{\textonehalf}{\ensuremath{\frac12}} \ProvideTextCommandDefault{\textonequarter}{\ensuremath{\frac14}} diff --git a/Master/texmf-dist/tex/latex/base/nfssfont.tex b/Master/texmf-dist/tex/latex/base/nfssfont.tex index 047231c3c06..b34ca1b83fc 100644 --- a/Master/texmf-dist/tex/latex/base/nfssfont.tex +++ b/Master/texmf-dist/tex/latex/base/nfssfont.tex @@ -13,8 +13,8 @@ %% (but please observe conditions on bug reports sent to that address!) %% %% -%% Copyright (C) 1993-2020 -%% The LaTeX3 Project and any individual authors listed elsewhere +%% Copyright (C) 1993-2021 +%% The LaTeX Project and any individual authors listed elsewhere %% in this file. %% %% This file was generated from file(s) of the LaTeX base system. @@ -42,7 +42,7 @@ %% and covered by LPPL is defined by the unpacking scripts (with %% extension .ins) which are part of the distribution. \def\nfssfontfileversion{v2.2e} -\def\nfssfontfiledate{2019/10/12} +\def\nfssfontfiledate{2020/11/26} \documentclass{article} diff --git a/Master/texmf-dist/tex/latex/base/oldlfont.sty b/Master/texmf-dist/tex/latex/base/oldlfont.sty index 902c1f91d56..eea01fefce2 100644 --- a/Master/texmf-dist/tex/latex/base/oldlfont.sty +++ b/Master/texmf-dist/tex/latex/base/oldlfont.sty @@ -13,8 +13,8 @@ %% (but please observe conditions on bug reports sent to that address!) %% %% -%% Copyright (C) 1993-2020 -%% The LaTeX3 Project and any individual authors listed elsewhere +%% Copyright (C) 1993-2021 +%% The LaTeX Project and any individual authors listed elsewhere %% in this file. %% %% This file was generated from file(s) of the LaTeX base system. diff --git a/Master/texmf-dist/tex/latex/base/omlcmm.fd b/Master/texmf-dist/tex/latex/base/omlcmm.fd index e5aa3aefad3..07fadc91b0c 100644 --- a/Master/texmf-dist/tex/latex/base/omlcmm.fd +++ b/Master/texmf-dist/tex/latex/base/omlcmm.fd @@ -13,8 +13,8 @@ %% (but please observe conditions on bug reports sent to that address!) %% %% -%% Copyright (C) 1993-2020 -%% The LaTeX3 Project and any individual authors listed elsewhere +%% Copyright (C) 1993-2021 +%% The LaTeX Project and any individual authors listed elsewhere %% in this file. %% %% This file was generated from file(s) of the LaTeX base system. diff --git a/Master/texmf-dist/tex/latex/base/omlcmr.fd b/Master/texmf-dist/tex/latex/base/omlcmr.fd index 07183d69d24..6a3eff2859a 100644 --- a/Master/texmf-dist/tex/latex/base/omlcmr.fd +++ b/Master/texmf-dist/tex/latex/base/omlcmr.fd @@ -13,8 +13,8 @@ %% (but please observe conditions on bug reports sent to that address!) %% %% -%% Copyright (C) 1993-2020 -%% The LaTeX3 Project and any individual authors listed elsewhere +%% Copyright (C) 1993-2021 +%% The LaTeX Project and any individual authors listed elsewhere %% in this file. %% %% This file was generated from file(s) of the LaTeX base system. diff --git a/Master/texmf-dist/tex/latex/base/omlenc.def b/Master/texmf-dist/tex/latex/base/omlenc.def index 0ec41965eb4..bf1bebaba3d 100644 --- a/Master/texmf-dist/tex/latex/base/omlenc.def +++ b/Master/texmf-dist/tex/latex/base/omlenc.def @@ -13,8 +13,8 @@ %% (but please observe conditions on bug reports sent to that address!) %% %% -%% Copyright (C) 1993-2020 -%% The LaTeX3 Project and any individual authors listed elsewhere +%% Copyright (C) 1993-2021 +%% The LaTeX Project and any individual authors listed elsewhere %% in this file. %% %% This file was generated from file(s) of the LaTeX base system. @@ -43,7 +43,7 @@ %% extension .ins) which are part of the distribution. %%% From File: ltoutenc.dtx \ProvidesFile{omlenc.def} - [2020/08/10 v2.0s + [2021/04/29 v2.0v Standard LaTeX file] \DeclareFontEncoding{OML}{}{} \DeclareTextSymbol{\textless}{OML}{`\<} diff --git a/Master/texmf-dist/tex/latex/base/omllcmm.fd b/Master/texmf-dist/tex/latex/base/omllcmm.fd index e6efbd4737d..69125a60371 100644 --- a/Master/texmf-dist/tex/latex/base/omllcmm.fd +++ b/Master/texmf-dist/tex/latex/base/omllcmm.fd @@ -13,8 +13,8 @@ %% (but please observe conditions on bug reports sent to that address!) %% %% -%% Copyright (C) 1993-2020 -%% The LaTeX3 Project and any individual authors listed elsewhere +%% Copyright (C) 1993-2021 +%% The LaTeX Project and any individual authors listed elsewhere %% in this file. %% %% This file was generated from file(s) of the LaTeX base system. diff --git a/Master/texmf-dist/tex/latex/base/omscmr.fd b/Master/texmf-dist/tex/latex/base/omscmr.fd index 38608ff45ad..8fbd8f9479c 100644 --- a/Master/texmf-dist/tex/latex/base/omscmr.fd +++ b/Master/texmf-dist/tex/latex/base/omscmr.fd @@ -13,8 +13,8 @@ %% (but please observe conditions on bug reports sent to that address!) %% %% -%% Copyright (C) 1993-2020 -%% The LaTeX3 Project and any individual authors listed elsewhere +%% Copyright (C) 1993-2021 +%% The LaTeX Project and any individual authors listed elsewhere %% in this file. %% %% This file was generated from file(s) of the LaTeX base system. diff --git a/Master/texmf-dist/tex/latex/base/omscmsy.fd b/Master/texmf-dist/tex/latex/base/omscmsy.fd index 531f251edfd..8e75eb83e24 100644 --- a/Master/texmf-dist/tex/latex/base/omscmsy.fd +++ b/Master/texmf-dist/tex/latex/base/omscmsy.fd @@ -13,8 +13,8 @@ %% (but please observe conditions on bug reports sent to that address!) %% %% -%% Copyright (C) 1993-2020 -%% The LaTeX3 Project and any individual authors listed elsewhere +%% Copyright (C) 1993-2021 +%% The LaTeX Project and any individual authors listed elsewhere %% in this file. %% %% This file was generated from file(s) of the LaTeX base system. diff --git a/Master/texmf-dist/tex/latex/base/omsenc.def b/Master/texmf-dist/tex/latex/base/omsenc.def index af45ce463ab..c07656fd9d4 100644 --- a/Master/texmf-dist/tex/latex/base/omsenc.def +++ b/Master/texmf-dist/tex/latex/base/omsenc.def @@ -13,8 +13,8 @@ %% (but please observe conditions on bug reports sent to that address!) %% %% -%% Copyright (C) 1993-2020 -%% The LaTeX3 Project and any individual authors listed elsewhere +%% Copyright (C) 1993-2021 +%% The LaTeX Project and any individual authors listed elsewhere %% in this file. %% %% This file was generated from file(s) of the LaTeX base system. @@ -43,7 +43,7 @@ %% extension .ins) which are part of the distribution. %%% From File: ltoutenc.dtx \ProvidesFile{omsenc.def} - [2020/08/10 v2.0s + [2021/04/29 v2.0v Standard LaTeX file] \DeclareFontEncoding{OMS}{}{} \DeclareTextSymbol{\textasteriskcentered}{OMS}{3} % "03 diff --git a/Master/texmf-dist/tex/latex/base/omsenc.dfu b/Master/texmf-dist/tex/latex/base/omsenc.dfu index f1297d99bf3..1a5e034ac8c 100644 --- a/Master/texmf-dist/tex/latex/base/omsenc.dfu +++ b/Master/texmf-dist/tex/latex/base/omsenc.dfu @@ -13,8 +13,8 @@ %% (but please observe conditions on bug reports sent to that address!) %% %% -%% Copyright (C) 1993-2020 -%% The LaTeX3 Project and any individual authors listed elsewhere +%% Copyright (C) 1993-2021 +%% The LaTeX Project and any individual authors listed elsewhere %% in this file. %% %% This file was generated from file(s) of the LaTeX base system. @@ -42,7 +42,7 @@ %% and covered by LPPL is defined by the unpacking scripts (with %% extension .ins) which are part of the distribution. \ProvidesFile{omsenc.dfu} - [2019/11/14 v1.2k UTF-8 support for inputenc] + [2021/01/27 v1.2l UTF-8 support for inputenc] \DeclareUnicodeCharacter{00A7}{\textsection} \DeclareUnicodeCharacter{00B6}{\textparagraph} \DeclareUnicodeCharacter{00B7}{\textperiodcentered} diff --git a/Master/texmf-dist/tex/latex/base/omslcmsy.fd b/Master/texmf-dist/tex/latex/base/omslcmsy.fd index 1d4961b841d..907216541ae 100644 --- a/Master/texmf-dist/tex/latex/base/omslcmsy.fd +++ b/Master/texmf-dist/tex/latex/base/omslcmsy.fd @@ -13,8 +13,8 @@ %% (but please observe conditions on bug reports sent to that address!) %% %% -%% Copyright (C) 1993-2020 -%% The LaTeX3 Project and any individual authors listed elsewhere +%% Copyright (C) 1993-2021 +%% The LaTeX Project and any individual authors listed elsewhere %% in this file. %% %% This file was generated from file(s) of the LaTeX base system. diff --git a/Master/texmf-dist/tex/latex/base/omxcmex.fd b/Master/texmf-dist/tex/latex/base/omxcmex.fd index 5ae6289a88c..20463d1b4b5 100644 --- a/Master/texmf-dist/tex/latex/base/omxcmex.fd +++ b/Master/texmf-dist/tex/latex/base/omxcmex.fd @@ -13,8 +13,8 @@ %% (but please observe conditions on bug reports sent to that address!) %% %% -%% Copyright (C) 1993-2020 -%% The LaTeX3 Project and any individual authors listed elsewhere +%% Copyright (C) 1993-2021 +%% The LaTeX Project and any individual authors listed elsewhere %% in this file. %% %% This file was generated from file(s) of the LaTeX base system. diff --git a/Master/texmf-dist/tex/latex/base/omxlcmex.fd b/Master/texmf-dist/tex/latex/base/omxlcmex.fd index c45a165fc9d..e4b873db00b 100644 --- a/Master/texmf-dist/tex/latex/base/omxlcmex.fd +++ b/Master/texmf-dist/tex/latex/base/omxlcmex.fd @@ -13,8 +13,8 @@ %% (but please observe conditions on bug reports sent to that address!) %% %% -%% Copyright (C) 1993-2020 -%% The LaTeX3 Project and any individual authors listed elsewhere +%% Copyright (C) 1993-2021 +%% The LaTeX Project and any individual authors listed elsewhere %% in this file. %% %% This file was generated from file(s) of the LaTeX base system. diff --git a/Master/texmf-dist/tex/latex/base/openbib.sty b/Master/texmf-dist/tex/latex/base/openbib.sty index 683ab9ebcef..fbfc7c63cd1 100644 --- a/Master/texmf-dist/tex/latex/base/openbib.sty +++ b/Master/texmf-dist/tex/latex/base/openbib.sty @@ -13,8 +13,8 @@ %% (but please observe conditions on bug reports sent to that address!) %% %% -%% Copyright (C) 1993-2020 -%% The LaTeX3 Project and any individual authors listed elsewhere +%% Copyright (C) 1993-2021 +%% The LaTeX Project and any individual authors listed elsewhere %% in this file. %% %% This file was generated from file(s) of the LaTeX base system. diff --git a/Master/texmf-dist/tex/latex/base/ot1cmdh.fd b/Master/texmf-dist/tex/latex/base/ot1cmdh.fd index a04c463e7fc..26ac2b7907b 100644 --- a/Master/texmf-dist/tex/latex/base/ot1cmdh.fd +++ b/Master/texmf-dist/tex/latex/base/ot1cmdh.fd @@ -13,8 +13,8 @@ %% (but please observe conditions on bug reports sent to that address!) %% %% -%% Copyright (C) 1993-2020 -%% The LaTeX3 Project and any individual authors listed elsewhere +%% Copyright (C) 1993-2021 +%% The LaTeX Project and any individual authors listed elsewhere %% in this file. %% %% This file was generated from file(s) of the LaTeX base system. diff --git a/Master/texmf-dist/tex/latex/base/ot1cmfib.fd b/Master/texmf-dist/tex/latex/base/ot1cmfib.fd index 5fda61099a7..3c6722a006c 100644 --- a/Master/texmf-dist/tex/latex/base/ot1cmfib.fd +++ b/Master/texmf-dist/tex/latex/base/ot1cmfib.fd @@ -13,8 +13,8 @@ %% (but please observe conditions on bug reports sent to that address!) %% %% -%% Copyright (C) 1993-2020 -%% The LaTeX3 Project and any individual authors listed elsewhere +%% Copyright (C) 1993-2021 +%% The LaTeX Project and any individual authors listed elsewhere %% in this file. %% %% This file was generated from file(s) of the LaTeX base system. diff --git a/Master/texmf-dist/tex/latex/base/ot1cmfr.fd b/Master/texmf-dist/tex/latex/base/ot1cmfr.fd index ca36d48efd3..6aca744d489 100644 --- a/Master/texmf-dist/tex/latex/base/ot1cmfr.fd +++ b/Master/texmf-dist/tex/latex/base/ot1cmfr.fd @@ -13,8 +13,8 @@ %% (but please observe conditions on bug reports sent to that address!) %% %% -%% Copyright (C) 1993-2020 -%% The LaTeX3 Project and any individual authors listed elsewhere +%% Copyright (C) 1993-2021 +%% The LaTeX Project and any individual authors listed elsewhere %% in this file. %% %% This file was generated from file(s) of the LaTeX base system. diff --git a/Master/texmf-dist/tex/latex/base/ot1cmr.fd b/Master/texmf-dist/tex/latex/base/ot1cmr.fd index 8bf20aa7597..c6721f95f5a 100644 --- a/Master/texmf-dist/tex/latex/base/ot1cmr.fd +++ b/Master/texmf-dist/tex/latex/base/ot1cmr.fd @@ -13,8 +13,8 @@ %% (but please observe conditions on bug reports sent to that address!) %% %% -%% Copyright (C) 1993-2020 -%% The LaTeX3 Project and any individual authors listed elsewhere +%% Copyright (C) 1993-2021 +%% The LaTeX Project and any individual authors listed elsewhere %% in this file. %% %% This file was generated from file(s) of the LaTeX base system. diff --git a/Master/texmf-dist/tex/latex/base/ot1cmss.fd b/Master/texmf-dist/tex/latex/base/ot1cmss.fd index e4ee29adcb2..4a93306e8d2 100644 --- a/Master/texmf-dist/tex/latex/base/ot1cmss.fd +++ b/Master/texmf-dist/tex/latex/base/ot1cmss.fd @@ -13,8 +13,8 @@ %% (but please observe conditions on bug reports sent to that address!) %% %% -%% Copyright (C) 1993-2020 -%% The LaTeX3 Project and any individual authors listed elsewhere +%% Copyright (C) 1993-2021 +%% The LaTeX Project and any individual authors listed elsewhere %% in this file. %% %% This file was generated from file(s) of the LaTeX base system. diff --git a/Master/texmf-dist/tex/latex/base/ot1cmtt.fd b/Master/texmf-dist/tex/latex/base/ot1cmtt.fd index 36634401ed8..4805f48894b 100644 --- a/Master/texmf-dist/tex/latex/base/ot1cmtt.fd +++ b/Master/texmf-dist/tex/latex/base/ot1cmtt.fd @@ -13,8 +13,8 @@ %% (but please observe conditions on bug reports sent to that address!) %% %% -%% Copyright (C) 1993-2020 -%% The LaTeX3 Project and any individual authors listed elsewhere +%% Copyright (C) 1993-2021 +%% The LaTeX Project and any individual authors listed elsewhere %% in this file. %% %% This file was generated from file(s) of the LaTeX base system. diff --git a/Master/texmf-dist/tex/latex/base/ot1cmvtt.fd b/Master/texmf-dist/tex/latex/base/ot1cmvtt.fd index 8d59476d881..eb64d4d8988 100644 --- a/Master/texmf-dist/tex/latex/base/ot1cmvtt.fd +++ b/Master/texmf-dist/tex/latex/base/ot1cmvtt.fd @@ -13,8 +13,8 @@ %% (but please observe conditions on bug reports sent to that address!) %% %% -%% Copyright (C) 1993-2020 -%% The LaTeX3 Project and any individual authors listed elsewhere +%% Copyright (C) 1993-2021 +%% The LaTeX Project and any individual authors listed elsewhere %% in this file. %% %% This file was generated from file(s) of the LaTeX base system. diff --git a/Master/texmf-dist/tex/latex/base/ot1enc.def b/Master/texmf-dist/tex/latex/base/ot1enc.def index c636ed38f8f..7ee4e30b0a8 100644 --- a/Master/texmf-dist/tex/latex/base/ot1enc.def +++ b/Master/texmf-dist/tex/latex/base/ot1enc.def @@ -13,8 +13,8 @@ %% (but please observe conditions on bug reports sent to that address!) %% %% -%% Copyright (C) 1993-2020 -%% The LaTeX3 Project and any individual authors listed elsewhere +%% Copyright (C) 1993-2021 +%% The LaTeX Project and any individual authors listed elsewhere %% in this file. %% %% This file was generated from file(s) of the LaTeX base system. @@ -43,7 +43,7 @@ %% extension .ins) which are part of the distribution. %%% From File: ltoutenc.dtx \ProvidesFile{ot1enc.def} - [2020/08/10 v2.0s + [2021/04/29 v2.0v Standard LaTeX file] \DeclareFontEncoding{OT1}{}{} \DeclareTextAccent{\"}{OT1}{127} @@ -77,6 +77,9 @@ \DeclareTextSymbol{\ss}{OT1}{25} \DeclareTextSymbol{\textemdash}{OT1}{124} \DeclareTextSymbol{\textendash}{OT1}{123} +\DeclareTextCommand{\textnonbreakinghyphen}{OT1}{\mbox{-}\nobreak\hskip\z@} +\DeclareTextCommand{\textfiguredash} {OT1}{\textendash} +\DeclareTextCommand{\texthorizontalbar} {OT1}{\textemdash} \DeclareTextCommand{\textexclamdown}{OT1}{!`} \DeclareTextCommand{\textquestiondown}{OT1}{?`} \DeclareTextSymbol{\textquotedblleft}{OT1}{92} diff --git a/Master/texmf-dist/tex/latex/base/ot1enc.dfu b/Master/texmf-dist/tex/latex/base/ot1enc.dfu index 1365270f0bc..47b772a33c2 100644 --- a/Master/texmf-dist/tex/latex/base/ot1enc.dfu +++ b/Master/texmf-dist/tex/latex/base/ot1enc.dfu @@ -13,8 +13,8 @@ %% (but please observe conditions on bug reports sent to that address!) %% %% -%% Copyright (C) 1993-2020 -%% The LaTeX3 Project and any individual authors listed elsewhere +%% Copyright (C) 1993-2021 +%% The LaTeX Project and any individual authors listed elsewhere %% in this file. %% %% This file was generated from file(s) of the LaTeX base system. @@ -42,7 +42,7 @@ %% and covered by LPPL is defined by the unpacking scripts (with %% extension .ins) which are part of the distribution. \ProvidesFile{ot1enc.dfu} - [2019/11/14 v1.2k UTF-8 support for inputenc] + [2021/01/27 v1.2l UTF-8 support for inputenc] \DeclareUnicodeCharacter{00A0}{\nobreakspace} \DeclareUnicodeCharacter{00A1}{\textexclamdown} \DeclareUnicodeCharacter{00A3}{\textsterling} diff --git a/Master/texmf-dist/tex/latex/base/ot1lcmss.fd b/Master/texmf-dist/tex/latex/base/ot1lcmss.fd index 7cefe8a4e8e..62ee74c309c 100644 --- a/Master/texmf-dist/tex/latex/base/ot1lcmss.fd +++ b/Master/texmf-dist/tex/latex/base/ot1lcmss.fd @@ -13,8 +13,8 @@ %% (but please observe conditions on bug reports sent to that address!) %% %% -%% Copyright (C) 1993-2020 -%% The LaTeX3 Project and any individual authors listed elsewhere +%% Copyright (C) 1993-2021 +%% The LaTeX Project and any individual authors listed elsewhere %% in this file. %% %% This file was generated from file(s) of the LaTeX base system. diff --git a/Master/texmf-dist/tex/latex/base/ot1lcmtt.fd b/Master/texmf-dist/tex/latex/base/ot1lcmtt.fd index a3bdbb8ecc8..680f6eb7b74 100644 --- a/Master/texmf-dist/tex/latex/base/ot1lcmtt.fd +++ b/Master/texmf-dist/tex/latex/base/ot1lcmtt.fd @@ -13,8 +13,8 @@ %% (but please observe conditions on bug reports sent to that address!) %% %% -%% Copyright (C) 1993-2020 -%% The LaTeX3 Project and any individual authors listed elsewhere +%% Copyright (C) 1993-2021 +%% The LaTeX Project and any individual authors listed elsewhere %% in this file. %% %% This file was generated from file(s) of the LaTeX base system. diff --git a/Master/texmf-dist/tex/latex/base/ot2enc.dfu b/Master/texmf-dist/tex/latex/base/ot2enc.dfu index 12884cf1d57..b06a06e1075 100644 --- a/Master/texmf-dist/tex/latex/base/ot2enc.dfu +++ b/Master/texmf-dist/tex/latex/base/ot2enc.dfu @@ -13,8 +13,8 @@ %% (but please observe conditions on bug reports sent to that address!) %% %% -%% Copyright (C) 1993-2020 -%% The LaTeX3 Project and any individual authors listed elsewhere +%% Copyright (C) 1993-2021 +%% The LaTeX Project and any individual authors listed elsewhere %% in this file. %% %% This file was generated from file(s) of the LaTeX base system. @@ -42,7 +42,7 @@ %% and covered by LPPL is defined by the unpacking scripts (with %% extension .ins) which are part of the distribution. \ProvidesFile{ot2enc.dfu} - [2019/11/14 v1.2k UTF-8 support for inputenc] + [2021/01/27 v1.2l UTF-8 support for inputenc] \DeclareUnicodeCharacter{00AB}{\guillemotleft} \DeclareUnicodeCharacter{00BB}{\guillemotright} \DeclareUnicodeCharacter{0131}{\i} diff --git a/Master/texmf-dist/tex/latex/base/ot4enc.def b/Master/texmf-dist/tex/latex/base/ot4enc.def index 48b4f7384a7..73b55c8f0a2 100644 --- a/Master/texmf-dist/tex/latex/base/ot4enc.def +++ b/Master/texmf-dist/tex/latex/base/ot4enc.def @@ -13,8 +13,8 @@ %% (but please observe conditions on bug reports sent to that address!) %% %% -%% Copyright (C) 1993-2020 -%% The LaTeX3 Project and any individual authors listed elsewhere +%% Copyright (C) 1993-2021 +%% The LaTeX Project and any individual authors listed elsewhere %% in this file. %% %% This file was generated from file(s) of the LaTeX base system. @@ -43,7 +43,7 @@ %% extension .ins) which are part of the distribution. %%% From File: ltoutenc.dtx \ProvidesFile{ot4enc.def} - [2020/08/10 v2.0s + [2021/04/29 v2.0v Standard LaTeX file] \DeclareFontEncoding{OT4}{}{} \DeclareFontSubstitution{OT4}{cmr}{m}{n} diff --git a/Master/texmf-dist/tex/latex/base/preload.cfg b/Master/texmf-dist/tex/latex/base/preload.cfg index d6cc4e40270..d27c68144fb 100644 --- a/Master/texmf-dist/tex/latex/base/preload.cfg +++ b/Master/texmf-dist/tex/latex/base/preload.cfg @@ -8,8 +8,8 @@ %% %% This is a generated file. %% -%% Copyright (C) 1993-2020 -%% The LaTeX3 Project and any individual authors listed elsewhere +%% Copyright (C) 1993-2021 +%% The LaTeX Project and any individual authors listed elsewhere %% in this file. %% %% This file was generated from file(s) of the LaTeX base system. @@ -37,8 +37,8 @@ %% %%% From File: fontdef.dtx \ProvidesFile{preload.cfg} - [2020/08/01 v3.0i LaTeX Kernel -(Uncustomised preload + [2021/01/15 v3.0i LaTeX Kernel +(Uncustomized preload font setup)] %% %% diff --git a/Master/texmf-dist/tex/latex/base/preload.ltx b/Master/texmf-dist/tex/latex/base/preload.ltx index 3e198173abe..14b6aa4caa1 100644 --- a/Master/texmf-dist/tex/latex/base/preload.ltx +++ b/Master/texmf-dist/tex/latex/base/preload.ltx @@ -8,8 +8,8 @@ %% %% This is a generated file. %% -%% Copyright (C) 1993-2020 -%% The LaTeX3 Project and any individual authors listed elsewhere +%% Copyright (C) 1993-2021 +%% The LaTeX Project and any individual authors listed elsewhere %% in this file. %% %% This file was generated from file(s) of the LaTeX base system. diff --git a/Master/texmf-dist/tex/latex/base/proc.cls b/Master/texmf-dist/tex/latex/base/proc.cls index 8ad03c06a9c..5c37ce55132 100644 --- a/Master/texmf-dist/tex/latex/base/proc.cls +++ b/Master/texmf-dist/tex/latex/base/proc.cls @@ -13,8 +13,8 @@ %% (but please observe conditions on bug reports sent to that address!) %% %% -%% Copyright (C) 1993-2020 -%% The LaTeX3 Project and any individual authors listed elsewhere +%% Copyright (C) 1993-2021 +%% The LaTeX Project and any individual authors listed elsewhere %% in this file. %% %% This file was generated from file(s) of the LaTeX base system. @@ -43,7 +43,7 @@ %% extension .ins) which are part of the distribution. \NeedsTeXFormat{LaTeX2e}[1995/12/01] \ProvidesClass{proc} - [2014/09/29 v1.3l + [2020/11/23 v1.3l Standard LaTeX document class] \DeclareOption{a5paper} {\ClassError{proc}{Option `a5paper' not supported}{}} diff --git a/Master/texmf-dist/tex/latex/base/proc.sty b/Master/texmf-dist/tex/latex/base/proc.sty index 5b1a028e38c..57614baef87 100644 --- a/Master/texmf-dist/tex/latex/base/proc.sty +++ b/Master/texmf-dist/tex/latex/base/proc.sty @@ -13,8 +13,8 @@ %% (but please observe conditions on bug reports sent to that address!) %% %% -%% Copyright (C) 1993-2020 -%% The LaTeX3 Project and any individual authors listed elsewhere +%% Copyright (C) 1993-2021 +%% The LaTeX Project and any individual authors listed elsewhere %% in this file. %% %% This file was generated from file(s) of the LaTeX base system. @@ -43,7 +43,7 @@ %% extension .ins) which are part of the distribution. \NeedsTeXFormat{LaTeX2e}[1995/12/01] \ProvidesFile{proc.sty} - [2014/09/29 v1.3l + [2020/11/23 v1.3l LaTeX 2.09 compatibility style option `proc'] \if@compatibility \else diff --git a/Master/texmf-dist/tex/latex/base/report.cls b/Master/texmf-dist/tex/latex/base/report.cls index 498b9b1fbdc..73daababc50 100644 --- a/Master/texmf-dist/tex/latex/base/report.cls +++ b/Master/texmf-dist/tex/latex/base/report.cls @@ -13,8 +13,8 @@ %% (but please observe conditions on bug reports sent to that address!) %% %% -%% Copyright (C) 1993-2020 -%% The LaTeX3 Project and any individual authors listed elsewhere +%% Copyright (C) 1993-2021 +%% The LaTeX Project and any individual authors listed elsewhere %% in this file. %% %% This file was generated from file(s) of the LaTeX base system. @@ -43,7 +43,7 @@ %% extension .ins) which are part of the distribution. \NeedsTeXFormat{LaTeX2e}[1995/12/01] \ProvidesClass{report} - [2020/04/10 v1.4m + [2021/02/12 v1.4n Standard LaTeX document class] \newcommand\@ptsize{} \newif\if@restonecol @@ -430,7 +430,7 @@ \newcommand\labelitemi {\labelitemfont \textbullet} \newcommand\labelitemii {\labelitemfont \bfseries \textendash} \newcommand\labelitemiii{\labelitemfont \textasteriskcentered} -\newcommand\labelitemiv{ \labelitemfont \textperiodcentered} +\newcommand\labelitemiv {\labelitemfont \textperiodcentered} \newcommand\labelitemfont{\normalfont} \newenvironment{description} {\list{}{\labelwidth\z@ \itemindent-\leftmargin diff --git a/Master/texmf-dist/tex/latex/base/report.sty b/Master/texmf-dist/tex/latex/base/report.sty index 031632600c4..26f3170f6d3 100644 --- a/Master/texmf-dist/tex/latex/base/report.sty +++ b/Master/texmf-dist/tex/latex/base/report.sty @@ -13,8 +13,8 @@ %% (but please observe conditions on bug reports sent to that address!) %% %% -%% Copyright (C) 1993-2020 -%% The LaTeX3 Project and any individual authors listed elsewhere +%% Copyright (C) 1993-2021 +%% The LaTeX Project and any individual authors listed elsewhere %% in this file. %% %% This file was generated from file(s) of the LaTeX base system. diff --git a/Master/texmf-dist/tex/latex/base/sfonts.def b/Master/texmf-dist/tex/latex/base/sfonts.def index 2972928b9be..ff087875c50 100644 --- a/Master/texmf-dist/tex/latex/base/sfonts.def +++ b/Master/texmf-dist/tex/latex/base/sfonts.def @@ -8,8 +8,8 @@ %% %% This is a generated file. %% -%% Copyright (C) 1993-2020 -%% The LaTeX3 Project and any individual authors listed elsewhere +%% Copyright (C) 1993-2021 +%% The LaTeX Project and any individual authors listed elsewhere %% in this file. %% %% This file was generated from file(s) of the LaTeX base system. diff --git a/Master/texmf-dist/tex/latex/base/shortvrb.sty b/Master/texmf-dist/tex/latex/base/shortvrb.sty index adeae1eca9d..1aa89066c06 100644 --- a/Master/texmf-dist/tex/latex/base/shortvrb.sty +++ b/Master/texmf-dist/tex/latex/base/shortvrb.sty @@ -13,8 +13,8 @@ %% (but please observe conditions on bug reports sent to that address!) %% %% -%% Copyright (C) 1993-2020 -%% The LaTeX3 Project and any individual authors listed elsewhere +%% Copyright (C) 1993-2021 +%% The LaTeX Project and any individual authors listed elsewhere %% in this file. %% %% This file was generated from file(s) of the LaTeX base system. @@ -43,11 +43,11 @@ %% extension .ins) which are part of the distribution. \NeedsTeXFormat{LaTeX2e}[1994/12/01] \ProvidesPackage{shortvrb} - [2020/06/15 v2.1m + [2021/05/28 v2.1n Standard LaTeX documentation package (FMi)] %% %% Package `doc' to use with LaTeX 2e -%% Copyright (C) 1989-1999 Frank Mittelbach, all rights reserved. +%% Copyright (C) 1989-2020 Frank Mittelbach, all rights reserved. \def\MakeShortVerb{% \@ifstar {\def\@shortvrbdef{\verb*}\@MakeShortVerb}% diff --git a/Master/texmf-dist/tex/latex/base/showidx.sty b/Master/texmf-dist/tex/latex/base/showidx.sty index 7d2b53c4a7d..d0a2967d8f6 100644 --- a/Master/texmf-dist/tex/latex/base/showidx.sty +++ b/Master/texmf-dist/tex/latex/base/showidx.sty @@ -13,8 +13,8 @@ %% (but please observe conditions on bug reports sent to that address!) %% %% -%% Copyright (C) 1993-2020 -%% The LaTeX3 Project and any individual authors listed elsewhere +%% Copyright (C) 1993-2021 +%% The LaTeX Project and any individual authors listed elsewhere %% in this file. %% %% This file was generated from file(s) of the LaTeX base system. diff --git a/Master/texmf-dist/tex/latex/base/size10.clo b/Master/texmf-dist/tex/latex/base/size10.clo index 4eb2ebde0ab..8e03dcfb069 100644 --- a/Master/texmf-dist/tex/latex/base/size10.clo +++ b/Master/texmf-dist/tex/latex/base/size10.clo @@ -13,8 +13,8 @@ %% (but please observe conditions on bug reports sent to that address!) %% %% -%% Copyright (C) 1993-2020 -%% The LaTeX3 Project and any individual authors listed elsewhere +%% Copyright (C) 1993-2021 +%% The LaTeX Project and any individual authors listed elsewhere %% in this file. %% %% This file was generated from file(s) of the LaTeX base system. @@ -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} - [2020/04/10 v1.4m + [2021/02/12 v1.4n Standard LaTeX file (size option)] \renewcommand\normalsize{% \@setfontsize\normalsize\@xpt\@xiipt diff --git a/Master/texmf-dist/tex/latex/base/size11.clo b/Master/texmf-dist/tex/latex/base/size11.clo index ee39dc8b448..a261d777333 100644 --- a/Master/texmf-dist/tex/latex/base/size11.clo +++ b/Master/texmf-dist/tex/latex/base/size11.clo @@ -13,8 +13,8 @@ %% (but please observe conditions on bug reports sent to that address!) %% %% -%% Copyright (C) 1993-2020 -%% The LaTeX3 Project and any individual authors listed elsewhere +%% Copyright (C) 1993-2021 +%% The LaTeX Project and any individual authors listed elsewhere %% in this file. %% %% This file was generated from file(s) of the LaTeX base system. @@ -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} - [2020/04/10 v1.4m + [2021/02/12 v1.4n Standard LaTeX file (size option)] \renewcommand\normalsize{% \@setfontsize\normalsize\@xipt{13.6}% diff --git a/Master/texmf-dist/tex/latex/base/size12.clo b/Master/texmf-dist/tex/latex/base/size12.clo index 9767c339fdc..8890acb340e 100644 --- a/Master/texmf-dist/tex/latex/base/size12.clo +++ b/Master/texmf-dist/tex/latex/base/size12.clo @@ -13,8 +13,8 @@ %% (but please observe conditions on bug reports sent to that address!) %% %% -%% Copyright (C) 1993-2020 -%% The LaTeX3 Project and any individual authors listed elsewhere +%% Copyright (C) 1993-2021 +%% The LaTeX Project and any individual authors listed elsewhere %% in this file. %% %% This file was generated from file(s) of the LaTeX base system. @@ -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} - [2020/04/10 v1.4m + [2021/02/12 v1.4n Standard LaTeX file (size option)] \renewcommand\normalsize{% \@setfontsize\normalsize\@xiipt{14.5}% diff --git a/Master/texmf-dist/tex/latex/base/slides.cls b/Master/texmf-dist/tex/latex/base/slides.cls index b2234aedf96..ffbdbdbff8f 100644 --- a/Master/texmf-dist/tex/latex/base/slides.cls +++ b/Master/texmf-dist/tex/latex/base/slides.cls @@ -13,8 +13,8 @@ %% (but please observe conditions on bug reports sent to that address!) %% %% -%% Copyright (C) 1993-2020 -%% The LaTeX3 Project and any individual authors listed elsewhere +%% Copyright (C) 1993-2021 +%% The LaTeX Project and any individual authors listed elsewhere %% in this file. %% %% This file was generated from file(s) of the LaTeX base system. @@ -43,7 +43,7 @@ %% extension .ins) which are part of the distribution. \NeedsTeXFormat{LaTeX2e}[1997/06/01] \ProvidesClass{slides} - [2020/02/20 v2.4b + [2020/11/23 v2.4b Standard LaTeX document class] \input{slides.def} \InputIfFileExists{sfonts.cfg} diff --git a/Master/texmf-dist/tex/latex/base/slides.def b/Master/texmf-dist/tex/latex/base/slides.def index 1cdda66467c..f23e9313989 100644 --- a/Master/texmf-dist/tex/latex/base/slides.def +++ b/Master/texmf-dist/tex/latex/base/slides.def @@ -13,8 +13,8 @@ %% (but please observe conditions on bug reports sent to that address!) %% %% -%% Copyright (C) 1993-2020 -%% The LaTeX3 Project and any individual authors listed elsewhere +%% Copyright (C) 1993-2021 +%% The LaTeX Project and any individual authors listed elsewhere %% in this file. %% %% This file was generated from file(s) of the LaTeX base system. @@ -42,7 +42,7 @@ %% and covered by LPPL is defined by the unpacking scripts (with %% extension .ins) which are part of the distribution. \ProvidesFile{slides.def} - [2020/02/20 v2.4b + [2020/11/23 v2.4b SLiTeX definitions] \message{hacks,} diff --git a/Master/texmf-dist/tex/latex/base/slides.sty b/Master/texmf-dist/tex/latex/base/slides.sty index 94ab3c0574b..4f9b69569bf 100644 --- a/Master/texmf-dist/tex/latex/base/slides.sty +++ b/Master/texmf-dist/tex/latex/base/slides.sty @@ -13,8 +13,8 @@ %% (but please observe conditions on bug reports sent to that address!) %% %% -%% Copyright (C) 1993-2020 -%% The LaTeX3 Project and any individual authors listed elsewhere +%% Copyright (C) 1993-2021 +%% The LaTeX Project and any individual authors listed elsewhere %% in this file. %% %% This file was generated from file(s) of the LaTeX base system. diff --git a/Master/texmf-dist/tex/latex/base/source2edoc.cls b/Master/texmf-dist/tex/latex/base/source2edoc.cls index e06108230da..ba6acf9f80e 100644 --- a/Master/texmf-dist/tex/latex/base/source2edoc.cls +++ b/Master/texmf-dist/tex/latex/base/source2edoc.cls @@ -2,7 +2,7 @@ % This class is buggy and needs fixing \ProvidesClass{source2edoc} - [2020/12/02 v0.2 Quick hack to typeset source2.tex + [2021/01/14 v0.2b Quick hack to typeset source2.tex (not usable for anything else and buggy -- will vanish again)!] \LoadClass{l3doc} @@ -106,6 +106,31 @@ \fi \cs_set_eq:NN \@auxout \@mainaux } + + +% change the setup here: we have a lot of long names so better run raggeded + +\cs_set_protected:Npn \__codedoc_macro_end_style:n #1 + { + \nobreak \noindent + { \raggedright\hangindent1pc \footnotesize ( \emph{#1} ) \par } + } + + +% next two declarations should move to l3doc.cls in the l3kernel eventually +% they should be ``new'' not ``set'' but to avoid getting in timing issues +% when they will be officially defined we use ``set'' here + +\cs_set_eq:NN \__codedoc_saved_detect_internals:N \__codedoc_detect_internals:N + +% maybe this change should be local so that it automatically reverts on \verb=\end{macro}= +% without the need to explicitly turn it on again. + +\cs_new_protected:Npn \InternalDetectionOff + { \cs_gset_eq:NN \__codedoc_detect_internals:N \use_none:n } +\cs_new_protected:Npn \InternalDetectionOn + { \cs_gset_eq:NN \__codedoc_detect_internals:N \__codedoc_saved_detect_internals:N } + \ExplSyntaxOff \def\partname{File} @@ -257,7 +282,7 @@ Bug reports can be opened (category \texttt{#1}) at\\% {} -%\errorstopmode +\errorstopmode \batchmode - + \endinput diff --git a/Master/texmf-dist/tex/latex/base/structuredlog.sty b/Master/texmf-dist/tex/latex/base/structuredlog.sty index bf5d7644a36..968059fd6d7 100644 --- a/Master/texmf-dist/tex/latex/base/structuredlog.sty +++ b/Master/texmf-dist/tex/latex/base/structuredlog.sty @@ -13,8 +13,8 @@ %% (but please observe conditions on bug reports sent to that address!) %% %% -%% Copyright (C) 1993-2020 -%% The LaTeX3 Project and any individual authors listed elsewhere +%% Copyright (C) 1993-2021 +%% The LaTeX Project and any individual authors listed elsewhere %% in this file. %% %% This file was generated from file(s) of the LaTeX base system. @@ -41,12 +41,9 @@ %% The list of derived (unpacked) files belonging to the distribution %% and covered by LPPL is defined by the unpacking scripts (with %% extension .ins) which are part of the distribution. -%% -%% File: ltfilehook.dtx (C) Copyright 2020 Frank Mittelbach, -%% Phelype Oleinik & LaTeX Team %%% From File: ltfilehook.dtx -\providecommand\ltfilehookversion{v1.0e} -\providecommand\ltfilehookdate{2021/01/07} +\providecommand\ltfilehookversion{v1.0k} +\providecommand\ltfilehookdate{2021/05/25} \ProvidesExplPackage {structuredlog}{\ltfilehookdate}{\ltfilehookversion} {Structuring the TeX transcript file} diff --git a/Master/texmf-dist/tex/latex/base/syntonly.sty b/Master/texmf-dist/tex/latex/base/syntonly.sty index edcccc1ac76..9ab639baeb7 100644 --- a/Master/texmf-dist/tex/latex/base/syntonly.sty +++ b/Master/texmf-dist/tex/latex/base/syntonly.sty @@ -13,8 +13,8 @@ %% (but please observe conditions on bug reports sent to that address!) %% %% -%% Copyright (C) 1993-2020 -%% The LaTeX3 Project and any individual authors listed elsewhere +%% Copyright (C) 1993-2021 +%% The LaTeX Project and any individual authors listed elsewhere %% in this file. %% %% This file was generated from file(s) of the LaTeX base system. diff --git a/Master/texmf-dist/tex/latex/base/t1cmdh.fd b/Master/texmf-dist/tex/latex/base/t1cmdh.fd index f07734e47f8..76625ef4a54 100644 --- a/Master/texmf-dist/tex/latex/base/t1cmdh.fd +++ b/Master/texmf-dist/tex/latex/base/t1cmdh.fd @@ -13,8 +13,8 @@ %% (but please observe conditions on bug reports sent to that address!) %% %% -%% Copyright (C) 1993-2020 -%% The LaTeX3 Project and any individual authors listed elsewhere +%% Copyright (C) 1993-2021 +%% The LaTeX Project and any individual authors listed elsewhere %% in this file. %% %% This file was generated from file(s) of the LaTeX base system. diff --git a/Master/texmf-dist/tex/latex/base/t1cmfib.fd b/Master/texmf-dist/tex/latex/base/t1cmfib.fd index 553501909ec..fda2cf71311 100644 --- a/Master/texmf-dist/tex/latex/base/t1cmfib.fd +++ b/Master/texmf-dist/tex/latex/base/t1cmfib.fd @@ -13,8 +13,8 @@ %% (but please observe conditions on bug reports sent to that address!) %% %% -%% Copyright (C) 1993-2020 -%% The LaTeX3 Project and any individual authors listed elsewhere +%% Copyright (C) 1993-2021 +%% The LaTeX Project and any individual authors listed elsewhere %% in this file. %% %% This file was generated from file(s) of the LaTeX base system. diff --git a/Master/texmf-dist/tex/latex/base/t1cmfr.fd b/Master/texmf-dist/tex/latex/base/t1cmfr.fd index 1864a55b5dd..f676a74f646 100644 --- a/Master/texmf-dist/tex/latex/base/t1cmfr.fd +++ b/Master/texmf-dist/tex/latex/base/t1cmfr.fd @@ -13,8 +13,8 @@ %% (but please observe conditions on bug reports sent to that address!) %% %% -%% Copyright (C) 1993-2020 -%% The LaTeX3 Project and any individual authors listed elsewhere +%% Copyright (C) 1993-2021 +%% The LaTeX Project and any individual authors listed elsewhere %% in this file. %% %% This file was generated from file(s) of the LaTeX base system. diff --git a/Master/texmf-dist/tex/latex/base/t1cmr.fd b/Master/texmf-dist/tex/latex/base/t1cmr.fd index 73d78e2a5a9..0432498ab98 100644 --- a/Master/texmf-dist/tex/latex/base/t1cmr.fd +++ b/Master/texmf-dist/tex/latex/base/t1cmr.fd @@ -13,8 +13,8 @@ %% (but please observe conditions on bug reports sent to that address!) %% %% -%% Copyright (C) 1993-2020 -%% The LaTeX3 Project and any individual authors listed elsewhere +%% Copyright (C) 1993-2021 +%% The LaTeX Project and any individual authors listed elsewhere %% in this file. %% %% This file was generated from file(s) of the LaTeX base system. diff --git a/Master/texmf-dist/tex/latex/base/t1cmss.fd b/Master/texmf-dist/tex/latex/base/t1cmss.fd index 2a58c065218..cdc1ac4e0d0 100644 --- a/Master/texmf-dist/tex/latex/base/t1cmss.fd +++ b/Master/texmf-dist/tex/latex/base/t1cmss.fd @@ -13,8 +13,8 @@ %% (but please observe conditions on bug reports sent to that address!) %% %% -%% Copyright (C) 1993-2020 -%% The LaTeX3 Project and any individual authors listed elsewhere +%% Copyright (C) 1993-2021 +%% The LaTeX Project and any individual authors listed elsewhere %% in this file. %% %% This file was generated from file(s) of the LaTeX base system. diff --git a/Master/texmf-dist/tex/latex/base/t1cmtt.fd b/Master/texmf-dist/tex/latex/base/t1cmtt.fd index bb64f53d43c..663fed9f465 100644 --- a/Master/texmf-dist/tex/latex/base/t1cmtt.fd +++ b/Master/texmf-dist/tex/latex/base/t1cmtt.fd @@ -13,8 +13,8 @@ %% (but please observe conditions on bug reports sent to that address!) %% %% -%% Copyright (C) 1993-2020 -%% The LaTeX3 Project and any individual authors listed elsewhere +%% Copyright (C) 1993-2021 +%% The LaTeX Project and any individual authors listed elsewhere %% in this file. %% %% This file was generated from file(s) of the LaTeX base system. diff --git a/Master/texmf-dist/tex/latex/base/t1cmvtt.fd b/Master/texmf-dist/tex/latex/base/t1cmvtt.fd index 0f75803ec54..0668e1095e8 100644 --- a/Master/texmf-dist/tex/latex/base/t1cmvtt.fd +++ b/Master/texmf-dist/tex/latex/base/t1cmvtt.fd @@ -13,8 +13,8 @@ %% (but please observe conditions on bug reports sent to that address!) %% %% -%% Copyright (C) 1993-2020 -%% The LaTeX3 Project and any individual authors listed elsewhere +%% Copyright (C) 1993-2021 +%% The LaTeX Project and any individual authors listed elsewhere %% in this file. %% %% This file was generated from file(s) of the LaTeX base system. diff --git a/Master/texmf-dist/tex/latex/base/t1enc.def b/Master/texmf-dist/tex/latex/base/t1enc.def index 56d77bc1a8b..dad5bdd3733 100644 --- a/Master/texmf-dist/tex/latex/base/t1enc.def +++ b/Master/texmf-dist/tex/latex/base/t1enc.def @@ -13,8 +13,8 @@ %% (but please observe conditions on bug reports sent to that address!) %% %% -%% Copyright (C) 1993-2020 -%% The LaTeX3 Project and any individual authors listed elsewhere +%% Copyright (C) 1993-2021 +%% The LaTeX Project and any individual authors listed elsewhere %% in this file. %% %% This file was generated from file(s) of the LaTeX base system. @@ -43,7 +43,7 @@ %% extension .ins) which are part of the distribution. %%% From File: ltoutenc.dtx \ProvidesFile{t1enc.def} - [2020/08/10 v2.0s + [2021/04/29 v2.0v Standard LaTeX file] \DeclareFontEncoding{T1}{}{} \DeclareTextAccent{\`}{T1}{0} @@ -147,6 +147,9 @@ \DeclareTextSymbol{\textdollar}{T1}{`\$} \DeclareTextSymbol{\textemdash}{T1}{22} \DeclareTextSymbol{\textendash}{T1}{21} +\DeclareTextCommand{\textnonbreakinghyphen}{T1}{\mbox{-}\nobreak\hskip\z@} +\DeclareTextCommand{\textfiguredash} {T1}{\textendash} +\DeclareTextCommand{\texthorizontalbar} {T1}{\textemdash} \DeclareTextSymbol{\textexclamdown}{T1}{189} \DeclareTextSymbol{\textgreater}{T1}{`\>} \DeclareTextSymbol{\textless}{T1}{`\<} diff --git a/Master/texmf-dist/tex/latex/base/t1enc.dfu b/Master/texmf-dist/tex/latex/base/t1enc.dfu index 8836763a17d..8b39c4840f1 100644 --- a/Master/texmf-dist/tex/latex/base/t1enc.dfu +++ b/Master/texmf-dist/tex/latex/base/t1enc.dfu @@ -13,8 +13,8 @@ %% (but please observe conditions on bug reports sent to that address!) %% %% -%% Copyright (C) 1993-2020 -%% The LaTeX3 Project and any individual authors listed elsewhere +%% Copyright (C) 1993-2021 +%% The LaTeX Project and any individual authors listed elsewhere %% in this file. %% %% This file was generated from file(s) of the LaTeX base system. @@ -42,7 +42,7 @@ %% and covered by LPPL is defined by the unpacking scripts (with %% extension .ins) which are part of the distribution. \ProvidesFile{t1enc.dfu} - [2019/11/14 v1.2k UTF-8 support for inputenc] + [2021/01/27 v1.2l UTF-8 support for inputenc] \DeclareUnicodeCharacter{00A0}{\nobreakspace} \DeclareUnicodeCharacter{00A1}{\textexclamdown} \DeclareUnicodeCharacter{00A3}{\textsterling} @@ -261,6 +261,15 @@ \DeclareUnicodeCharacter{02DB}{\k{}} \DeclareUnicodeCharacter{1E02}{\.B} \DeclareUnicodeCharacter{1E03}{\.b} +\DeclareUnicodeCharacter{1E0D}{\d d} +\DeclareUnicodeCharacter{1E25}{\d h} +\DeclareUnicodeCharacter{1E37}{\d l} +\DeclareUnicodeCharacter{1E43}{\d m} +\DeclareUnicodeCharacter{1E45}{\.n} +\DeclareUnicodeCharacter{1E47}{\d n} +\DeclareUnicodeCharacter{1E5B}{\d r} +\DeclareUnicodeCharacter{1E63}{\d s} +\DeclareUnicodeCharacter{1E6D}{\d t} \DeclareUnicodeCharacter{1E9E}{\SS} \DeclareUnicodeCharacter{200C}{\textcompwordmark} \DeclareUnicodeCharacter{2010}{-} diff --git a/Master/texmf-dist/tex/latex/base/t1enc.sty b/Master/texmf-dist/tex/latex/base/t1enc.sty index 76169192ed1..cc26edeb386 100644 --- a/Master/texmf-dist/tex/latex/base/t1enc.sty +++ b/Master/texmf-dist/tex/latex/base/t1enc.sty @@ -13,8 +13,8 @@ %% (but please observe conditions on bug reports sent to that address!) %% %% -%% Copyright (C) 1993-2020 -%% The LaTeX3 Project and any individual authors listed elsewhere +%% Copyright (C) 1993-2021 +%% The LaTeX Project and any individual authors listed elsewhere %% in this file. %% %% This file was generated from file(s) of the LaTeX base system. diff --git a/Master/texmf-dist/tex/latex/base/t1lcmss.fd b/Master/texmf-dist/tex/latex/base/t1lcmss.fd index 431e1a03f1c..974e58a4d6d 100644 --- a/Master/texmf-dist/tex/latex/base/t1lcmss.fd +++ b/Master/texmf-dist/tex/latex/base/t1lcmss.fd @@ -13,8 +13,8 @@ %% (but please observe conditions on bug reports sent to that address!) %% %% -%% Copyright (C) 1993-2020 -%% The LaTeX3 Project and any individual authors listed elsewhere +%% Copyright (C) 1993-2021 +%% The LaTeX Project and any individual authors listed elsewhere %% in this file. %% %% This file was generated from file(s) of the LaTeX base system. diff --git a/Master/texmf-dist/tex/latex/base/t1lcmtt.fd b/Master/texmf-dist/tex/latex/base/t1lcmtt.fd index 00595c283a5..442d99516a9 100644 --- a/Master/texmf-dist/tex/latex/base/t1lcmtt.fd +++ b/Master/texmf-dist/tex/latex/base/t1lcmtt.fd @@ -13,8 +13,8 @@ %% (but please observe conditions on bug reports sent to that address!) %% %% -%% Copyright (C) 1993-2020 -%% The LaTeX3 Project and any individual authors listed elsewhere +%% Copyright (C) 1993-2021 +%% The LaTeX Project and any individual authors listed elsewhere %% in this file. %% %% This file was generated from file(s) of the LaTeX base system. diff --git a/Master/texmf-dist/tex/latex/base/t2aenc.dfu b/Master/texmf-dist/tex/latex/base/t2aenc.dfu index a0f754f3f3c..770265c29ff 100644 --- a/Master/texmf-dist/tex/latex/base/t2aenc.dfu +++ b/Master/texmf-dist/tex/latex/base/t2aenc.dfu @@ -13,8 +13,8 @@ %% (but please observe conditions on bug reports sent to that address!) %% %% -%% Copyright (C) 1993-2020 -%% The LaTeX3 Project and any individual authors listed elsewhere +%% Copyright (C) 1993-2021 +%% The LaTeX Project and any individual authors listed elsewhere %% in this file. %% %% This file was generated from file(s) of the LaTeX base system. @@ -42,7 +42,7 @@ %% and covered by LPPL is defined by the unpacking scripts (with %% extension .ins) which are part of the distribution. \ProvidesFile{t2aenc.dfu} - [2019/11/14 v1.2k UTF-8 support for inputenc] + [2021/01/27 v1.2l UTF-8 support for inputenc] \DeclareUnicodeCharacter{00A4}{\textcurrency} \DeclareUnicodeCharacter{00A7}{\textsection} \DeclareUnicodeCharacter{00AB}{\guillemotleft} diff --git a/Master/texmf-dist/tex/latex/base/t2benc.dfu b/Master/texmf-dist/tex/latex/base/t2benc.dfu index 3fae1105d8b..7844383d2b7 100644 --- a/Master/texmf-dist/tex/latex/base/t2benc.dfu +++ b/Master/texmf-dist/tex/latex/base/t2benc.dfu @@ -13,8 +13,8 @@ %% (but please observe conditions on bug reports sent to that address!) %% %% -%% Copyright (C) 1993-2020 -%% The LaTeX3 Project and any individual authors listed elsewhere +%% Copyright (C) 1993-2021 +%% The LaTeX Project and any individual authors listed elsewhere %% in this file. %% %% This file was generated from file(s) of the LaTeX base system. @@ -42,7 +42,7 @@ %% and covered by LPPL is defined by the unpacking scripts (with %% extension .ins) which are part of the distribution. \ProvidesFile{t2benc.dfu} - [2019/11/14 v1.2k UTF-8 support for inputenc] + [2021/01/27 v1.2l UTF-8 support for inputenc] \DeclareUnicodeCharacter{00A4}{\textcurrency} \DeclareUnicodeCharacter{00A7}{\textsection} \DeclareUnicodeCharacter{00AB}{\guillemotleft} diff --git a/Master/texmf-dist/tex/latex/base/t2cenc.dfu b/Master/texmf-dist/tex/latex/base/t2cenc.dfu index 0865733e53a..7c16deaeaff 100644 --- a/Master/texmf-dist/tex/latex/base/t2cenc.dfu +++ b/Master/texmf-dist/tex/latex/base/t2cenc.dfu @@ -13,8 +13,8 @@ %% (but please observe conditions on bug reports sent to that address!) %% %% -%% Copyright (C) 1993-2020 -%% The LaTeX3 Project and any individual authors listed elsewhere +%% Copyright (C) 1993-2021 +%% The LaTeX Project and any individual authors listed elsewhere %% in this file. %% %% This file was generated from file(s) of the LaTeX base system. @@ -42,7 +42,7 @@ %% and covered by LPPL is defined by the unpacking scripts (with %% extension .ins) which are part of the distribution. \ProvidesFile{t2cenc.dfu} - [2019/11/14 v1.2k UTF-8 support for inputenc] + [2021/01/27 v1.2l UTF-8 support for inputenc] \DeclareUnicodeCharacter{00A4}{\textcurrency} \DeclareUnicodeCharacter{00A7}{\textsection} \DeclareUnicodeCharacter{00AB}{\guillemotleft} diff --git a/Master/texmf-dist/tex/latex/base/testpage.tex b/Master/texmf-dist/tex/latex/base/testpage.tex index b89ef81bbc5..ff17984ee12 100644 --- a/Master/texmf-dist/tex/latex/base/testpage.tex +++ b/Master/texmf-dist/tex/latex/base/testpage.tex @@ -1,7 +1,7 @@ % \iffalse meta-comment % -% Copyright (C) 1993-2020 -% The LaTeX3 Project and any individual authors listed elsewhere +% Copyright (C) 1993-2021 +% The LaTeX Project and any individual authors listed elsewhere % in this file. % % This file is part of the LaTeX base system. diff --git a/Master/texmf-dist/tex/latex/base/texsys.cfg b/Master/texmf-dist/tex/latex/base/texsys.cfg index b91299a8c73..442e3971df8 100644 --- a/Master/texmf-dist/tex/latex/base/texsys.cfg +++ b/Master/texmf-dist/tex/latex/base/texsys.cfg @@ -49,18 +49,20 @@ % |{}| group. % % +% \begin{sloppypar} % \DescribeMacro{\filename@parse} % After a call of the form: |\filename@parse{|\meta{filename}|}|, the -% three macros |\filename@area|,|\filename@base|,|\filename@ext| should +% three macros |\filename@area|, |\filename@base|, |\filename@ext| should % be defined to be the `area' (or directory), basename and % extension respectively. If there was no extension specified in % \meta{filename}, |\filename@ext| should be |\let| to |\relax| (so this % case may be tested with |\@ifundefined{filename@ext}| and, perhaps a % default extension substituted). +% \end{sloppypar} % % Normally one would not need to define this macro in |texsys.cfg| as % the automatic tests can supply parsers that work with UNIX and VMS -% syntax, as well as a basic parser that willcover many other cases. +% syntax, as well as a basic parser that will cover many other cases. % However some operating systems may need a `hand produced' parser % in which case it should be defined in this file. % diff --git a/Master/texmf-dist/tex/latex/base/textcomp-2018-08-11.sty b/Master/texmf-dist/tex/latex/base/textcomp-2018-08-11.sty index 2093af74c95..57659edefc1 100644 --- a/Master/texmf-dist/tex/latex/base/textcomp-2018-08-11.sty +++ b/Master/texmf-dist/tex/latex/base/textcomp-2018-08-11.sty @@ -13,8 +13,8 @@ %% (but please observe conditions on bug reports sent to that address!) %% %% -%% Copyright (C) 1993-2020 -%% The LaTeX3 Project and any individual authors listed elsewhere +%% Copyright (C) 1993-2021 +%% The LaTeX Project and any individual authors listed elsewhere %% in this file. %% %% This file was generated from file(s) of the LaTeX base system. @@ -41,7 +41,7 @@ %% The list of derived (unpacked) files belonging to the distribution %% and covered by LPPL is defined by the unpacking scripts (with %% extension .ins) which are part of the distribution. - +%%% From File: lttextcomp.dtx \ProvidesPackage{textcomp} [2018/08/11 v2.0j Standard LaTeX package] diff --git a/Master/texmf-dist/tex/latex/base/textcomp.sty b/Master/texmf-dist/tex/latex/base/textcomp.sty index b6e340e8195..dd443d4ccf4 100644 --- a/Master/texmf-dist/tex/latex/base/textcomp.sty +++ b/Master/texmf-dist/tex/latex/base/textcomp.sty @@ -13,8 +13,8 @@ %% (but please observe conditions on bug reports sent to that address!) %% %% -%% Copyright (C) 1993-2020 -%% The LaTeX3 Project and any individual authors listed elsewhere +%% Copyright (C) 1993-2021 +%% The LaTeX Project and any individual authors listed elsewhere %% in this file. %% %% This file was generated from file(s) of the LaTeX base system. @@ -41,7 +41,7 @@ %% The list of derived (unpacked) files belonging to the distribution %% and covered by LPPL is defined by the unpacking scripts (with %% extension .ins) which are part of the distribution. - +%%% From File: lttextcomp.dtx \providecommand\DeclareRelease[3]{} \providecommand\DeclareCurrentRelease[2]{} @@ -55,9 +55,12 @@ \DeclareOption{almostfull}{\DeclareEncodingSubset{TS1}{?}{1}} \DeclareOption{euro}{\DeclareEncodingSubset{TS1}{?}{8}} \DeclareOption{safe}{\DeclareEncodingSubset{TS1}{?}{9}} -\DeclareOption{error}{\gdef\tc@errorwarn{\PackageError{textcomp}}} -\DeclareOption{warn}{\gdef\tc@errorwarn#1#2{\PackageWarning{textcomp}{#1}}} -\DeclareOption{info}{\gdef\tc@errorwarn#1#2{\PackageInfo{textcomp}{#1}}} +\DeclareOption{error} + {\gdef\tc@errorwarn{\PackageError{textcomp}}} +\DeclareOption{warn} + {\gdef\tc@errorwarn#1#2{\PackageWarning{textcomp}{#1}}} +\DeclareOption{info} + {\gdef\tc@errorwarn#1#2{\PackageInfo{textcomp}{#1}}} \DeclareOption{quiet}{\gdef\tc@errorwarn#1#2{}} \DeclareOption{force}{% \def\CheckEncodingSubset#1#2#3#4#5{% diff --git a/Master/texmf-dist/tex/latex/base/tracefnt.sty b/Master/texmf-dist/tex/latex/base/tracefnt.sty index e8cc5e3d073..09146d4c0f0 100644 --- a/Master/texmf-dist/tex/latex/base/tracefnt.sty +++ b/Master/texmf-dist/tex/latex/base/tracefnt.sty @@ -13,8 +13,8 @@ %% (but please observe conditions on bug reports sent to that address!) %% %% -%% Copyright (C) 1993-2020 -%% The LaTeX3 Project and any individual authors listed elsewhere +%% Copyright (C) 1993-2021 +%% The LaTeX Project and any individual authors listed elsewhere %% in this file. %% %% This file was generated from file(s) of the LaTeX base system. @@ -43,10 +43,10 @@ %% extension .ins) which are part of the distribution. %%% From File: ltfsstrc.dtx %% Copyright (C) 1989-97 by Frank Mittelbach and Rainer Sch\"opf. -%% Copyright (C) 1994-97 by LaTeX3 project. All rights reserved. -\NeedsTeXFormat{LaTeX2e}[1995/05/16] +%% Copyright (C) 1994-97 by LaTeX Project. All rights reserved. +\NeedsTeXFormat{LaTeX2e}[2021/06/01] \ProvidesPackage{tracefnt} - [2019/10/11 v3.0l Standard LaTeX package (font tracing)] + [2020/12/22 v3.0n Standard LaTeX package (font tracing)] \newcount\tracingfonts \tracingfonts=0 \DeclareOption{errorshow}{% @@ -103,19 +103,60 @@ \csname\curr@fontshape\endcsname \relax } + \DeclareRobustCommand\selectfont {% \ifx\f@linespread\baselinestretch \else \set@fontsize\baselinestretch\f@size\f@baselineskip \fi + \ifx\delayed@f@adjustment\@empty + \else + \let\f@shape@saved\f@shape + \let\f@series@saved\f@series + \delayed@f@adjustment + \maybe@load@fontshape + \ifcsname \f@encoding/\f@family/\f@series/\f@shape \endcsname + \else + \let\f@shape\f@shape@saved + \let\f@series\f@series@saved + \let\delayed@merge@font@shape\merge@font@shape + \let\delayed@merge@font@series\merge@font@series + \delayed@f@adjustment + \let\delayed@merge@font@shape\merge@font@shape@without@substitution + \let\delayed@merge@font@series\merge@font@series@without@substitution + \fi + \let\delayed@f@adjustment\@empty + \fi + \@forced@seriesfalse \xdef\font@name{% \csname\curr@fontshape/\f@size\endcsname}% \pickup@font \font@name - \ifnum \tracingfonts>\tw@ - \@font@info{Switching to \font@name}\fi + \UseHook{selectfont}% \size@update \enc@update } +\AddToHook{selectfont} + {\ifnum \tracingfonts>\tw@ + \@font@info{Switching to \font@name}\fi} +\IncludeInRelease{2021/06/01}% + {\selectfont}{Add hook to \selectfont}% +\EndIncludeInRelease +\IncludeInRelease{0000/00/00}% + {\selectfont}{Add hook to \selectfont}% + +\DeclareRobustCommand\selectfont + {% + \ifx\f@linespread\baselinestretch \else + \set@fontsize\baselinestretch\f@size\f@baselineskip \fi + \xdef\font@name{% + \csname\curr@fontshape/\f@size\endcsname}% + \pickup@font + \font@name + \size@update + \enc@update + } + +\EndIncludeInRelease \def\set@fontsize#1#2#3{% \@defaultunits\@tempdimb#2pt\relax\@nnil \edef\f@size{\strip@pt\@tempdimb}% diff --git a/Master/texmf-dist/tex/latex/base/ts1cmr.fd b/Master/texmf-dist/tex/latex/base/ts1cmr.fd index 9f544029f5f..b5423d41e04 100644 --- a/Master/texmf-dist/tex/latex/base/ts1cmr.fd +++ b/Master/texmf-dist/tex/latex/base/ts1cmr.fd @@ -13,8 +13,8 @@ %% (but please observe conditions on bug reports sent to that address!) %% %% -%% Copyright (C) 1993-2020 -%% The LaTeX3 Project and any individual authors listed elsewhere +%% Copyright (C) 1993-2021 +%% The LaTeX Project and any individual authors listed elsewhere %% in this file. %% %% This file was generated from file(s) of the LaTeX base system. diff --git a/Master/texmf-dist/tex/latex/base/ts1cmss.fd b/Master/texmf-dist/tex/latex/base/ts1cmss.fd index 0c0a53b4cdf..86c99c5cb8d 100644 --- a/Master/texmf-dist/tex/latex/base/ts1cmss.fd +++ b/Master/texmf-dist/tex/latex/base/ts1cmss.fd @@ -13,8 +13,8 @@ %% (but please observe conditions on bug reports sent to that address!) %% %% -%% Copyright (C) 1993-2020 -%% The LaTeX3 Project and any individual authors listed elsewhere +%% Copyright (C) 1993-2021 +%% The LaTeX Project and any individual authors listed elsewhere %% in this file. %% %% This file was generated from file(s) of the LaTeX base system. diff --git a/Master/texmf-dist/tex/latex/base/ts1cmtt.fd b/Master/texmf-dist/tex/latex/base/ts1cmtt.fd index 26bfc44ce11..99d50809eb8 100644 --- a/Master/texmf-dist/tex/latex/base/ts1cmtt.fd +++ b/Master/texmf-dist/tex/latex/base/ts1cmtt.fd @@ -13,8 +13,8 @@ %% (but please observe conditions on bug reports sent to that address!) %% %% -%% Copyright (C) 1993-2020 -%% The LaTeX3 Project and any individual authors listed elsewhere +%% Copyright (C) 1993-2021 +%% The LaTeX Project and any individual authors listed elsewhere %% in this file. %% %% This file was generated from file(s) of the LaTeX base system. diff --git a/Master/texmf-dist/tex/latex/base/ts1cmvtt.fd b/Master/texmf-dist/tex/latex/base/ts1cmvtt.fd index 4b5e178e6b0..4d03d9713fb 100644 --- a/Master/texmf-dist/tex/latex/base/ts1cmvtt.fd +++ b/Master/texmf-dist/tex/latex/base/ts1cmvtt.fd @@ -13,8 +13,8 @@ %% (but please observe conditions on bug reports sent to that address!) %% %% -%% Copyright (C) 1993-2020 -%% The LaTeX3 Project and any individual authors listed elsewhere +%% Copyright (C) 1993-2021 +%% The LaTeX Project and any individual authors listed elsewhere %% in this file. %% %% This file was generated from file(s) of the LaTeX base system. diff --git a/Master/texmf-dist/tex/latex/base/ts1enc.def b/Master/texmf-dist/tex/latex/base/ts1enc.def index 2452b000d84..951a63a1d0a 100644 --- a/Master/texmf-dist/tex/latex/base/ts1enc.def +++ b/Master/texmf-dist/tex/latex/base/ts1enc.def @@ -13,8 +13,8 @@ %% (but please observe conditions on bug reports sent to that address!) %% %% -%% Copyright (C) 1993-2020 -%% The LaTeX3 Project and any individual authors listed elsewhere +%% Copyright (C) 1993-2021 +%% The LaTeX Project and any individual authors listed elsewhere %% in this file. %% %% This file was generated from file(s) of the LaTeX base system. @@ -78,7 +78,17 @@ \DeclareTextSymbol{\textblank}{TS1}{32} \DeclareTextSymbol{\textdollar}{TS1}{36} \DeclareTextSymbol{\textquotesingle}{TS1}{39} -\DeclareTextSymbol{\textasteriskcentered}{TS1}{42} +\DeclareTextCommand \textasteriskcentered{TS1}{% % and that's needed + \iffontchar\font 42 \char42 \else + \begingroup\fontencoding{T1}% + \fontsize + {\the\dimexpr1.3\dimexpr\f@size pt\relax}% + {\f@baselineskip}% + \selectfont + \raisebox{-0.7ex}[\dimexpr\height-0.7ex][0pt]{*}% + \endgroup + \fi +} \DeclareTextSymbol{\textdblhyphen}{TS1}{45} \DeclareTextSymbol{\textfractionsolidus}{TS1}{47} \DeclareTextSymbol{\textzerooldstyle}{TS1}{48} diff --git a/Master/texmf-dist/tex/latex/base/ts1enc.dfu b/Master/texmf-dist/tex/latex/base/ts1enc.dfu index 6d17800c12c..79645088774 100644 --- a/Master/texmf-dist/tex/latex/base/ts1enc.dfu +++ b/Master/texmf-dist/tex/latex/base/ts1enc.dfu @@ -13,8 +13,8 @@ %% (but please observe conditions on bug reports sent to that address!) %% %% -%% Copyright (C) 1993-2020 -%% The LaTeX3 Project and any individual authors listed elsewhere +%% Copyright (C) 1993-2021 +%% The LaTeX Project and any individual authors listed elsewhere %% in this file. %% %% This file was generated from file(s) of the LaTeX base system. @@ -42,7 +42,7 @@ %% and covered by LPPL is defined by the unpacking scripts (with %% extension .ins) which are part of the distribution. \ProvidesFile{ts1enc.dfu} - [2019/11/14 v1.2k UTF-8 support for inputenc] + [2021/01/27 v1.2l UTF-8 support for inputenc] \DeclareUnicodeCharacter{00A2}{\textcent} \DeclareUnicodeCharacter{00A3}{\textsterling} \DeclareUnicodeCharacter{00A4}{\textcurrency} diff --git a/Master/texmf-dist/tex/latex/base/tuenc.def b/Master/texmf-dist/tex/latex/base/tuenc.def index a9f8a27eb35..3bddf30c999 100644 --- a/Master/texmf-dist/tex/latex/base/tuenc.def +++ b/Master/texmf-dist/tex/latex/base/tuenc.def @@ -13,8 +13,8 @@ %% (but please observe conditions on bug reports sent to that address!) %% %% -%% Copyright (C) 1993-2020 -%% The LaTeX3 Project and any individual authors listed elsewhere +%% Copyright (C) 1993-2021 +%% The LaTeX Project and any individual authors listed elsewhere %% in this file. %% %% This file was generated from file(s) of the LaTeX base system. @@ -43,7 +43,7 @@ %% extension .ins) which are part of the distribution. %%% From File: ltoutenc.dtx \ProvidesFile{tuenc.def} - [2020/08/10 v2.0s + [2021/04/29 v2.0v Standard LaTeX file] \providecommand\UnicodeEncodingName{TU} \begingroup\expandafter\expandafter\expandafter\endgroup @@ -215,6 +215,12 @@ \DeclareTextSymbol{\textcompwordmark} \UnicodeEncodingName{"200C} \DeclareTextSymbol{\textendash} \UnicodeEncodingName{"2013} \DeclareTextSymbol{\textemdash} \UnicodeEncodingName{"2014} +\DeclareTextCommand{\textnonbreakinghyphen} \UnicodeEncodingName + {\iffontchar\font "2011 \char "2011 \else \mbox{-}\nobreak\hskip\z@ \fi} +\DeclareTextCommand{\textfiguredash} \UnicodeEncodingName + {\iffontchar\font "2012 \char "2012 \else \char "2013 \fi} +\DeclareTextCommand{\texthorizontalbar} \UnicodeEncodingName + {\iffontchar\font "2015 \char "2015 \else \char "2014 \fi} \DeclareTextSymbol{\textbardbl} \UnicodeEncodingName{"2016} \DeclareTextSymbol{\textquoteleft} \UnicodeEncodingName{"2018} \DeclareTextSymbol{\textquoteright} \UnicodeEncodingName{"2019} @@ -264,10 +270,10 @@ \iffontchar\font"2217 \char"2217 \else \begingroup \fontsize - {\the\dimexpr1.2\dimexpr\f@size pt\relax}% + {\the\dimexpr1.3\dimexpr\f@size pt\relax}% {\f@baselineskip}% \selectfont - \raisebox{-0.6ex}[\dimexpr\height-0.6ex][0pt]{*}% + \raisebox{-0.7ex}[\dimexpr\height-0.7ex][0pt]{*}% \endgroup \fi } @@ -482,8 +488,14 @@ \DeclareUnicodeComposite{\v} {o}{"01D2} \DeclareUnicodeComposite{\v} {U}{"01D3} \DeclareUnicodeComposite{\v} {u}{"01D4} +\DeclareUnicodeComposite{\'} \AE{"01FC} +\DeclareUnicodeComposite{\'} {Æ}{"01FC} +\DeclareUnicodeComposite{\'} \ae{"01FD} +\DeclareUnicodeComposite{\'} {æ}{"01FD} \DeclareUnicodeComposite{\=} \AE{"01E2} +\DeclareUnicodeComposite{\=} {Æ}{"01E2} \DeclareUnicodeComposite{\=} \ae{"01E3} +\DeclareUnicodeComposite{\=} {æ}{"01E3} \DeclareUnicodeComposite{\v} {G}{"01E6} \DeclareUnicodeComposite{\v} {g}{"01E7} \DeclareUnicodeComposite{\v} {K}{"01E8} diff --git a/Master/texmf-dist/tex/latex/base/tulmdh.fd b/Master/texmf-dist/tex/latex/base/tulmdh.fd index 3282577fcce..a7a89870404 100644 --- a/Master/texmf-dist/tex/latex/base/tulmdh.fd +++ b/Master/texmf-dist/tex/latex/base/tulmdh.fd @@ -13,8 +13,8 @@ %% (but please observe conditions on bug reports sent to that address!) %% %% -%% Copyright (C) 2016-2020 -%% The LaTeX3 Project and any individual authors listed elsewhere +%% Copyright (C) 2016-2021 +%% The LaTeX Project and any individual authors listed elsewhere %% in this file. %% %% This file was generated from file(s) of the LaTeX base system. diff --git a/Master/texmf-dist/tex/latex/base/tulmr.fd b/Master/texmf-dist/tex/latex/base/tulmr.fd index 42de38f2cab..ea6ff725291 100644 --- a/Master/texmf-dist/tex/latex/base/tulmr.fd +++ b/Master/texmf-dist/tex/latex/base/tulmr.fd @@ -13,8 +13,8 @@ %% (but please observe conditions on bug reports sent to that address!) %% %% -%% Copyright (C) 2016-2020 -%% The LaTeX3 Project and any individual authors listed elsewhere +%% Copyright (C) 2016-2021 +%% The LaTeX Project and any individual authors listed elsewhere %% in this file. %% %% This file was generated from file(s) of the LaTeX base system. diff --git a/Master/texmf-dist/tex/latex/base/tulmss.fd b/Master/texmf-dist/tex/latex/base/tulmss.fd index 87f2aa4d85b..13cdb78cd71 100644 --- a/Master/texmf-dist/tex/latex/base/tulmss.fd +++ b/Master/texmf-dist/tex/latex/base/tulmss.fd @@ -13,8 +13,8 @@ %% (but please observe conditions on bug reports sent to that address!) %% %% -%% Copyright (C) 2016-2020 -%% The LaTeX3 Project and any individual authors listed elsewhere +%% Copyright (C) 2016-2021 +%% The LaTeX Project and any individual authors listed elsewhere %% in this file. %% %% This file was generated from file(s) of the LaTeX base system. diff --git a/Master/texmf-dist/tex/latex/base/tulmssq.fd b/Master/texmf-dist/tex/latex/base/tulmssq.fd index 90b272637e6..a74bbbb905c 100644 --- a/Master/texmf-dist/tex/latex/base/tulmssq.fd +++ b/Master/texmf-dist/tex/latex/base/tulmssq.fd @@ -13,8 +13,8 @@ %% (but please observe conditions on bug reports sent to that address!) %% %% -%% Copyright (C) 2016-2020 -%% The LaTeX3 Project and any individual authors listed elsewhere +%% Copyright (C) 2016-2021 +%% The LaTeX Project and any individual authors listed elsewhere %% in this file. %% %% This file was generated from file(s) of the LaTeX base system. diff --git a/Master/texmf-dist/tex/latex/base/tulmtt.fd b/Master/texmf-dist/tex/latex/base/tulmtt.fd index f7f0a840c66..89a005a23b6 100644 --- a/Master/texmf-dist/tex/latex/base/tulmtt.fd +++ b/Master/texmf-dist/tex/latex/base/tulmtt.fd @@ -13,8 +13,8 @@ %% (but please observe conditions on bug reports sent to that address!) %% %% -%% Copyright (C) 2016-2020 -%% The LaTeX3 Project and any individual authors listed elsewhere +%% Copyright (C) 2016-2021 +%% The LaTeX Project and any individual authors listed elsewhere %% in this file. %% %% This file was generated from file(s) of the LaTeX base system. diff --git a/Master/texmf-dist/tex/latex/base/tulmvtt.fd b/Master/texmf-dist/tex/latex/base/tulmvtt.fd index 94a2c119189..c4cb02ae7fe 100644 --- a/Master/texmf-dist/tex/latex/base/tulmvtt.fd +++ b/Master/texmf-dist/tex/latex/base/tulmvtt.fd @@ -13,8 +13,8 @@ %% (but please observe conditions on bug reports sent to that address!) %% %% -%% Copyright (C) 2016-2020 -%% The LaTeX3 Project and any individual authors listed elsewhere +%% Copyright (C) 2016-2021 +%% The LaTeX Project and any individual authors listed elsewhere %% in this file. %% %% This file was generated from file(s) of the LaTeX base system. diff --git a/Master/texmf-dist/tex/latex/base/ucmr.fd b/Master/texmf-dist/tex/latex/base/ucmr.fd index 446e82a8ec4..7a31d3e558b 100644 --- a/Master/texmf-dist/tex/latex/base/ucmr.fd +++ b/Master/texmf-dist/tex/latex/base/ucmr.fd @@ -13,8 +13,8 @@ %% (but please observe conditions on bug reports sent to that address!) %% %% -%% Copyright (C) 1993-2020 -%% The LaTeX3 Project and any individual authors listed elsewhere +%% Copyright (C) 1993-2021 +%% The LaTeX Project and any individual authors listed elsewhere %% in this file. %% %% This file was generated from file(s) of the LaTeX base system. diff --git a/Master/texmf-dist/tex/latex/base/ucmss.fd b/Master/texmf-dist/tex/latex/base/ucmss.fd index 049e40a1dd1..c2ff37355f9 100644 --- a/Master/texmf-dist/tex/latex/base/ucmss.fd +++ b/Master/texmf-dist/tex/latex/base/ucmss.fd @@ -13,8 +13,8 @@ %% (but please observe conditions on bug reports sent to that address!) %% %% -%% Copyright (C) 1993-2020 -%% The LaTeX3 Project and any individual authors listed elsewhere +%% Copyright (C) 1993-2021 +%% The LaTeX Project and any individual authors listed elsewhere %% in this file. %% %% This file was generated from file(s) of the LaTeX base system. diff --git a/Master/texmf-dist/tex/latex/base/ucmtt.fd b/Master/texmf-dist/tex/latex/base/ucmtt.fd index 653ae9060f2..697308fe293 100644 --- a/Master/texmf-dist/tex/latex/base/ucmtt.fd +++ b/Master/texmf-dist/tex/latex/base/ucmtt.fd @@ -13,8 +13,8 @@ %% (but please observe conditions on bug reports sent to that address!) %% %% -%% Copyright (C) 1993-2020 -%% The LaTeX3 Project and any individual authors listed elsewhere +%% Copyright (C) 1993-2021 +%% The LaTeX Project and any individual authors listed elsewhere %% in this file. %% %% This file was generated from file(s) of the LaTeX base system. diff --git a/Master/texmf-dist/tex/latex/base/ulasy.fd b/Master/texmf-dist/tex/latex/base/ulasy.fd index 82f9583bcd2..281f91a67c3 100644 --- a/Master/texmf-dist/tex/latex/base/ulasy.fd +++ b/Master/texmf-dist/tex/latex/base/ulasy.fd @@ -13,8 +13,8 @@ %% (but please observe conditions on bug reports sent to that address!) %% %% -%% Copyright (C) 1993-2020 -%% The LaTeX3 Project and any individual authors listed elsewhere +%% Copyright (C) 1993-2021 +%% The LaTeX Project and any individual authors listed elsewhere %% in this file. %% %% This file was generated from file(s) of the LaTeX base system. diff --git a/Master/texmf-dist/tex/latex/base/ullasy.fd b/Master/texmf-dist/tex/latex/base/ullasy.fd index 0f4ed4eb608..a1e7fdaa0fa 100644 --- a/Master/texmf-dist/tex/latex/base/ullasy.fd +++ b/Master/texmf-dist/tex/latex/base/ullasy.fd @@ -13,8 +13,8 @@ %% (but please observe conditions on bug reports sent to that address!) %% %% -%% Copyright (C) 1993-2020 -%% The LaTeX3 Project and any individual authors listed elsewhere +%% Copyright (C) 1993-2021 +%% The LaTeX Project and any individual authors listed elsewhere %% in this file. %% %% This file was generated from file(s) of the LaTeX base system. diff --git a/Master/texmf-dist/tex/latex/base/utf8-2018.def b/Master/texmf-dist/tex/latex/base/utf8-2018.def index 461f47b5981..8ec9ee9174a 100644 --- a/Master/texmf-dist/tex/latex/base/utf8-2018.def +++ b/Master/texmf-dist/tex/latex/base/utf8-2018.def @@ -13,8 +13,8 @@ %% (but please observe conditions on bug reports sent to that address!) %% %% -%% Copyright (C) 1993-2020 -%% The LaTeX3 Project and any individual authors listed elsewhere +%% Copyright (C) 1993-2021 +%% The LaTeX Project and any individual authors listed elsewhere %% in this file. %% %% This file was generated from file(s) of the LaTeX base system. diff --git a/Master/texmf-dist/tex/latex/base/utf8.def b/Master/texmf-dist/tex/latex/base/utf8.def index a1db0c44563..0e2dc1a885a 100644 --- a/Master/texmf-dist/tex/latex/base/utf8.def +++ b/Master/texmf-dist/tex/latex/base/utf8.def @@ -13,8 +13,8 @@ %% (but please observe conditions on bug reports sent to that address!) %% %% -%% Copyright (C) 1993-2020 -%% The LaTeX3 Project and any individual authors listed elsewhere +%% Copyright (C) 1993-2021 +%% The LaTeX Project and any individual authors listed elsewhere %% in this file. %% %% This file was generated from file(s) of the LaTeX base system. @@ -42,7 +42,7 @@ %% and covered by LPPL is defined by the unpacking scripts (with %% extension .ins) which are part of the distribution. \ProvidesFile{utf8.def} - [2019/11/14 v1.2k UTF-8 support for inputenc] + [2021/01/27 v1.2l UTF-8 support for inputenc] \ifx\ifincsname\@undefined % old e-pTeX or e-upTeX engines \input utf8-2018.def \expandafter\@firstofone diff --git a/Master/texmf-dist/tex/latex/base/utf8enc.dfu b/Master/texmf-dist/tex/latex/base/utf8enc.dfu index 14b5be676a3..3d554a0bd02 100644 --- a/Master/texmf-dist/tex/latex/base/utf8enc.dfu +++ b/Master/texmf-dist/tex/latex/base/utf8enc.dfu @@ -13,8 +13,8 @@ %% (but please observe conditions on bug reports sent to that address!) %% %% -%% Copyright (C) 1993-2020 -%% The LaTeX3 Project and any individual authors listed elsewhere +%% Copyright (C) 1993-2021 +%% The LaTeX Project and any individual authors listed elsewhere %% in this file. %% %% This file was generated from file(s) of the LaTeX base system. @@ -42,7 +42,7 @@ %% and covered by LPPL is defined by the unpacking scripts (with %% extension .ins) which are part of the distribution. \ProvidesFile{utf8enc.dfu} - [2019/11/14 v1.2k UTF-8 support for inputenc] + [2021/01/27 v1.2l UTF-8 support for inputenc] \DeclareUnicodeCharacter{00A0}{\nobreakspace} \DeclareUnicodeCharacter{00A1}{\textexclamdown} \DeclareUnicodeCharacter{00A2}{\textcent} @@ -512,6 +512,15 @@ \DeclareUnicodeCharacter{0E3F}{\textbaht} \DeclareUnicodeCharacter{1E02}{\.B} \DeclareUnicodeCharacter{1E03}{\.b} +\DeclareUnicodeCharacter{1E0D}{\d d} +\DeclareUnicodeCharacter{1E25}{\d h} +\DeclareUnicodeCharacter{1E37}{\d l} +\DeclareUnicodeCharacter{1E43}{\d m} +\DeclareUnicodeCharacter{1E45}{\.n} +\DeclareUnicodeCharacter{1E47}{\d n} +\DeclareUnicodeCharacter{1E5B}{\d r} +\DeclareUnicodeCharacter{1E63}{\d s} +\DeclareUnicodeCharacter{1E6D}{\d t} \DeclareUnicodeCharacter{1E9E}{\SS} \DeclareUnicodeCharacter{200C}{\textcompwordmark} \DeclareUnicodeCharacter{2010}{-} diff --git a/Master/texmf-dist/tex/latex/base/x2enc.dfu b/Master/texmf-dist/tex/latex/base/x2enc.dfu index 33467ed565a..d01439dbbd6 100644 --- a/Master/texmf-dist/tex/latex/base/x2enc.dfu +++ b/Master/texmf-dist/tex/latex/base/x2enc.dfu @@ -13,8 +13,8 @@ %% (but please observe conditions on bug reports sent to that address!) %% %% -%% Copyright (C) 1993-2020 -%% The LaTeX3 Project and any individual authors listed elsewhere +%% Copyright (C) 1993-2021 +%% The LaTeX Project and any individual authors listed elsewhere %% in this file. %% %% This file was generated from file(s) of the LaTeX base system. @@ -42,7 +42,7 @@ %% and covered by LPPL is defined by the unpacking scripts (with %% extension .ins) which are part of the distribution. \ProvidesFile{x2enc.dfu} - [2019/11/14 v1.2k UTF-8 support for inputenc] + [2021/01/27 v1.2l UTF-8 support for inputenc] \DeclareUnicodeCharacter{00A4}{\textcurrency} \DeclareUnicodeCharacter{00A7}{\textsection} \DeclareUnicodeCharacter{00AB}{\guillemotleft} diff --git a/Master/texmf-dist/tex/latex/graphics/color.sty b/Master/texmf-dist/tex/latex/graphics/color.sty index 0f0b974689a..23c90207aa8 100644 --- a/Master/texmf-dist/tex/latex/graphics/color.sty +++ b/Master/texmf-dist/tex/latex/graphics/color.sty @@ -12,7 +12,9 @@ %% %% %% color.dtx Copyright (C) 1994--1999 David Carlisle -%% Copyright (C) 2005-2020 David Carlisle, LaTeX3 Project +%% Copyright (C) 2005-2021 +%% The LaTeX Project and any individual authors listed elsewhere +%% in this file. %% %% This file is part of the Standard LaTeX `Graphics Bundle'. %% It may be distributed under the terms of the LaTeX Project Public diff --git a/Master/texmf-dist/tex/latex/graphics/dvipdf.def b/Master/texmf-dist/tex/latex/graphics/dvipdf.def index 39d2d8f9835..04f533c35ae 100644 --- a/Master/texmf-dist/tex/latex/graphics/dvipdf.def +++ b/Master/texmf-dist/tex/latex/graphics/dvipdf.def @@ -8,7 +8,9 @@ %% %% drivers.dtx Copyright (C) 1994 David Carlisle Sebastian Rahtz %% Copyright (C) 1995 1996 1997 1998 1999 David Carlisle -%% Copyright (C) 2000-2020 David Carlisle, LaTeX3 Project +%% Copyright (C) 2000-2021 +%% The LaTeX Project and any individual authors listed elsewhere +%% in this file. %% %% This file is part of the Standard LaTeX `Graphics Bundle'. %% It may be distributed under the terms of the LaTeX Project Public diff --git a/Master/texmf-dist/tex/latex/graphics/dvipsnam.def b/Master/texmf-dist/tex/latex/graphics/dvipsnam.def index 06e7398272f..826161736cd 100644 --- a/Master/texmf-dist/tex/latex/graphics/dvipsnam.def +++ b/Master/texmf-dist/tex/latex/graphics/dvipsnam.def @@ -8,7 +8,9 @@ %% %% drivers.dtx Copyright (C) 1994 David Carlisle Sebastian Rahtz %% Copyright (C) 1995 1996 1997 1998 1999 David Carlisle -%% Copyright (C) 2000-2020 David Carlisle, LaTeX3 Project +%% Copyright (C) 2000-2021 +%% The LaTeX Project and any individual authors listed elsewhere +%% in this file. %% %% This file is part of the Standard LaTeX `Graphics Bundle'. %% It may be distributed under the terms of the LaTeX Project Public diff --git a/Master/texmf-dist/tex/latex/graphics/dvipsone.def b/Master/texmf-dist/tex/latex/graphics/dvipsone.def index b942a05ae3f..4918f74ba1f 100644 --- a/Master/texmf-dist/tex/latex/graphics/dvipsone.def +++ b/Master/texmf-dist/tex/latex/graphics/dvipsone.def @@ -8,7 +8,9 @@ %% %% drivers.dtx Copyright (C) 1994 David Carlisle Sebastian Rahtz %% Copyright (C) 1995 1996 1997 1998 1999 David Carlisle -%% Copyright (C) 2000-2020 David Carlisle, LaTeX3 Project +%% Copyright (C) 2000-2021 +%% The LaTeX Project and any individual authors listed elsewhere +%% in this file. %% %% This file is part of the Standard LaTeX `Graphics Bundle'. %% It may be distributed under the terms of the LaTeX Project Public diff --git a/Master/texmf-dist/tex/latex/graphics/dviwin.def b/Master/texmf-dist/tex/latex/graphics/dviwin.def index 07a34e4db2b..db6eac4074a 100644 --- a/Master/texmf-dist/tex/latex/graphics/dviwin.def +++ b/Master/texmf-dist/tex/latex/graphics/dviwin.def @@ -8,7 +8,9 @@ %% %% drivers.dtx Copyright (C) 1994 David Carlisle Sebastian Rahtz %% Copyright (C) 1995 1996 1997 1998 1999 David Carlisle -%% Copyright (C) 2000-2020 David Carlisle, LaTeX3 Project +%% Copyright (C) 2000-2021 +%% The LaTeX Project and any individual authors listed elsewhere +%% in this file. %% %% This file is part of the Standard LaTeX `Graphics Bundle'. %% It may be distributed under the terms of the LaTeX Project Public diff --git a/Master/texmf-dist/tex/latex/graphics/emtex.def b/Master/texmf-dist/tex/latex/graphics/emtex.def index c3d17aa20d0..d1d405dae14 100644 --- a/Master/texmf-dist/tex/latex/graphics/emtex.def +++ b/Master/texmf-dist/tex/latex/graphics/emtex.def @@ -8,7 +8,9 @@ %% %% drivers.dtx Copyright (C) 1994 David Carlisle Sebastian Rahtz %% Copyright (C) 1995 1996 1997 1998 1999 David Carlisle -%% Copyright (C) 2000-2020 David Carlisle, LaTeX3 Project +%% Copyright (C) 2000-2021 +%% The LaTeX Project and any individual authors listed elsewhere +%% in this file. %% %% This file is part of the Standard LaTeX `Graphics Bundle'. %% It may be distributed under the terms of the LaTeX Project Public diff --git a/Master/texmf-dist/tex/latex/graphics/epsfig.sty b/Master/texmf-dist/tex/latex/graphics/epsfig.sty index 114460d3493..bb0abac3949 100644 --- a/Master/texmf-dist/tex/latex/graphics/epsfig.sty +++ b/Master/texmf-dist/tex/latex/graphics/epsfig.sty @@ -12,7 +12,9 @@ %% %% %% epsfig.dtx Copyright (C) 1994-1996 1999 Sebastian Rahtz -%% Copyright (C) 2000-2020 David Carlisle, LaTeX3 Project +%% Copyright (C) 2000-2021 +%% The LaTeX Project and any individual authors listed elsewhere +%% in this file. %% %% This file is part of the Standard LaTeX `Graphics Bundle'. %% It may be distributed under the terms of the LaTeX Project Public diff --git a/Master/texmf-dist/tex/latex/graphics/graphics-2017-06-25.sty b/Master/texmf-dist/tex/latex/graphics/graphics-2017-06-25.sty index 5cfa5df4500..154867d99a4 100644 --- a/Master/texmf-dist/tex/latex/graphics/graphics-2017-06-25.sty +++ b/Master/texmf-dist/tex/latex/graphics/graphics-2017-06-25.sty @@ -12,7 +12,7 @@ %% %% %% graphics.dtx Copyright (C) 1994 David Carlisle Sebastian Rahtz -%% Copyright (C) 1995--2017 David Carlisle, LaTeX3 Project +%% Copyright (C) 1995--2017 David Carlisle, LaTeX Project %% %% This file is part of the Standard LaTeX `Graphics Bundle'. %% It may be distributed under the terms of the LaTeX Project Public diff --git a/Master/texmf-dist/tex/latex/graphics/graphics.sty b/Master/texmf-dist/tex/latex/graphics/graphics.sty index 86e3314d9a5..5d0292c3d08 100644 --- a/Master/texmf-dist/tex/latex/graphics/graphics.sty +++ b/Master/texmf-dist/tex/latex/graphics/graphics.sty @@ -12,7 +12,9 @@ %% %% %% graphics.dtx Copyright (C) 1994 David Carlisle Sebastian Rahtz -%% Copyright (C) 1995-2020 David Carlisle, LaTeX3 Project +%% Copyright (C) 1995-2021 +%% The LaTeX Project and any individual authors listed elsewhere +%% in this file. %% %% This file is part of the Standard LaTeX `Graphics Bundle'. %% It may be distributed under the terms of the LaTeX Project Public @@ -29,7 +31,7 @@ \DeclareCurrentRelease{}{2019-10-01} \ProvidesPackage{graphics} - [2020/08/30 v1.4c Standard LaTeX Graphics (DPC,SPQR)] + [2021/03/04 v1.4d Standard LaTeX Graphics (DPC,SPQR)] \edef\Gin@codes{% \catcode`\noexpand\^^A\the\catcode`\^^A\relax \catcode`\noexpand\"\the\catcode`\"\relax @@ -202,7 +204,7 @@ \ifx\filename@ext\relax \let\filename@ext\Gin@gzext \else - \edef\Gin@ext{\Gin@ext\Gin@sepdefault\Gin@gzext}% + \edef\filename@ext{\filename@ext\Gin@sepdefault\Gin@gzext}% \fi \fi \ifx\filename@ext\relax @@ -216,9 +218,10 @@ \ifx\Gin@ext\relax 1% \else \@ifundefined{Gin@rule@\Gin@ext}{1}{0}% \fi >0 - \let\Gin@ext\relax + \let\Gin@extsaved\Gin@ext \let\Gin@savedbase\filename@base \let\Gin@savedext\filename@ext + \let\Gin@ext\relax \edef\filename@base{\filename@base\Gin@sepdefault\filename@ext}% \let\filename@ext\relax \@for\Gin@temp:=\Gin@extensions\do{% @@ -226,6 +229,7 @@ \Gin@getbase\Gin@temp \fi}% \ifx\Gin@ext\relax + \let\Gin@ext\Gin@extsaved \let\filename@base\Gin@savedbase \let\filename@ext\Gin@savedext \fi diff --git a/Master/texmf-dist/tex/latex/graphics/graphicx.sty b/Master/texmf-dist/tex/latex/graphics/graphicx.sty index 9446a0a5c2f..0a259c8836f 100644 --- a/Master/texmf-dist/tex/latex/graphics/graphicx.sty +++ b/Master/texmf-dist/tex/latex/graphics/graphicx.sty @@ -12,7 +12,9 @@ %% %% %% graphicx.dtx Copyright (C) 1994 David Carlisle Sebastian Rahtz -%% Copyright (C) 1995-2020 David Carlisle, LaTeX3 Project +%% Copyright (C) 1995-2021 +%% The LaTeX Project and any individual authors listed elsewhere +%% in this file. %% %% This file is part of the Standard LaTeX `Graphics Bundle'. %% It may be distributed under the terms of the LaTeX Project Public @@ -21,7 +23,7 @@ %% \NeedsTeXFormat{LaTeX2e}[1995/12/01] \ProvidesPackage{graphicx} - [2020/09/09 v1.2b Enhanced LaTeX Graphics (DPC,SPQR)] + [2020/12/05 v1.2c Enhanced LaTeX Graphics (DPC,SPQR)] \DeclareOption{unknownkeysallowed} {\PassOptionsToPackage\CurrentOption{keyval}} \DeclareOption*{\PassOptionsToPackage\CurrentOption{graphics}} @@ -99,7 +101,7 @@ \define@key{Gin}{decodearray}{% \def\Gin@decode{#1}% } -\define@key{Gin}{quiet}{% +\define@key{Gin}{quiet}[]{% \let\Gin@log\@gobble } \define@key{Gin}{page}{% diff --git a/Master/texmf-dist/tex/latex/graphics/keyval.sty b/Master/texmf-dist/tex/latex/graphics/keyval.sty index ddb6c0a183e..97bbda4f480 100644 --- a/Master/texmf-dist/tex/latex/graphics/keyval.sty +++ b/Master/texmf-dist/tex/latex/graphics/keyval.sty @@ -12,7 +12,9 @@ %% %% %% keyval.dtx Copyright (C) 1993 1994 1995 1997 1998 1999 David Carlisle -%% Copyright (C) 2000-2020 David Carlisle, LaTeX3 Project +%% Copyright (C) 2000-2021 David Carlisle, LaTeX Project +%% The LaTeX Project and any individual authors listed elsewhere +%% in this file. %% %% This file is part of the Standard LaTeX `Graphics Bundle'. %% It may be distributed under the terms of the LaTeX Project Public diff --git a/Master/texmf-dist/tex/latex/graphics/lscape.sty b/Master/texmf-dist/tex/latex/graphics/lscape.sty index d9f2daee5a8..25342e422fc 100644 --- a/Master/texmf-dist/tex/latex/graphics/lscape.sty +++ b/Master/texmf-dist/tex/latex/graphics/lscape.sty @@ -12,7 +12,9 @@ %% %% %% lscape.dtx Copyright (C) 1994 1999-2000 David Carlisle -%% Copyright (C) 2000-2020 David Carlisle, LaTeX3 Project +%% Copyright (C) 2000-2021 +%% The LaTeX Project and any individual authors listed elsewhere +%% in this file. %% %% This file is part of the Standard LaTeX `Graphics Bundle'. %% It may be distributed under the terms of the LaTeX Project Public diff --git a/Master/texmf-dist/tex/latex/graphics/pctex32.def b/Master/texmf-dist/tex/latex/graphics/pctex32.def index 58c913cd023..5934c4c0a94 100644 --- a/Master/texmf-dist/tex/latex/graphics/pctex32.def +++ b/Master/texmf-dist/tex/latex/graphics/pctex32.def @@ -8,7 +8,9 @@ %% %% drivers.dtx Copyright (C) 1994 David Carlisle Sebastian Rahtz %% Copyright (C) 1995 1996 1997 1998 1999 David Carlisle -%% Copyright (C) 2000-2020 David Carlisle, LaTeX3 Project +%% Copyright (C) 2000-2021 +%% The LaTeX Project and any individual authors listed elsewhere +%% in this file. %% %% This file is part of the Standard LaTeX `Graphics Bundle'. %% It may be distributed under the terms of the LaTeX Project Public diff --git a/Master/texmf-dist/tex/latex/graphics/pctexhp.def b/Master/texmf-dist/tex/latex/graphics/pctexhp.def index 341204427d1..76e83d251c4 100644 --- a/Master/texmf-dist/tex/latex/graphics/pctexhp.def +++ b/Master/texmf-dist/tex/latex/graphics/pctexhp.def @@ -8,7 +8,9 @@ %% %% drivers.dtx Copyright (C) 1994 David Carlisle Sebastian Rahtz %% Copyright (C) 1995 1996 1997 1998 1999 David Carlisle -%% Copyright (C) 2000-2020 David Carlisle, LaTeX3 Project +%% Copyright (C) 2000-2021 +%% The LaTeX Project and any individual authors listed elsewhere +%% in this file. %% %% This file is part of the Standard LaTeX `Graphics Bundle'. %% It may be distributed under the terms of the LaTeX Project Public diff --git a/Master/texmf-dist/tex/latex/graphics/pctexps.def b/Master/texmf-dist/tex/latex/graphics/pctexps.def index 6920dcd739e..85f6f3a13de 100644 --- a/Master/texmf-dist/tex/latex/graphics/pctexps.def +++ b/Master/texmf-dist/tex/latex/graphics/pctexps.def @@ -8,7 +8,9 @@ %% %% drivers.dtx Copyright (C) 1994 David Carlisle Sebastian Rahtz %% Copyright (C) 1995 1996 1997 1998 1999 David Carlisle -%% Copyright (C) 2000-2020 David Carlisle, LaTeX3 Project +%% Copyright (C) 2000-2021 +%% The LaTeX Project and any individual authors listed elsewhere +%% in this file. %% %% This file is part of the Standard LaTeX `Graphics Bundle'. %% It may be distributed under the terms of the LaTeX Project Public diff --git a/Master/texmf-dist/tex/latex/graphics/pctexwin.def b/Master/texmf-dist/tex/latex/graphics/pctexwin.def index 198644d3b3b..cf44d184547 100644 --- a/Master/texmf-dist/tex/latex/graphics/pctexwin.def +++ b/Master/texmf-dist/tex/latex/graphics/pctexwin.def @@ -8,7 +8,9 @@ %% %% drivers.dtx Copyright (C) 1994 David Carlisle Sebastian Rahtz %% Copyright (C) 1995 1996 1997 1998 1999 David Carlisle -%% Copyright (C) 2000-2020 David Carlisle, LaTeX3 Project +%% Copyright (C) 2000-2021 +%% The LaTeX Project and any individual authors listed elsewhere +%% in this file. %% %% This file is part of the Standard LaTeX `Graphics Bundle'. %% It may be distributed under the terms of the LaTeX Project Public diff --git a/Master/texmf-dist/tex/latex/graphics/rotating.sty b/Master/texmf-dist/tex/latex/graphics/rotating.sty index 14ba6fb1427..7f3a2df8f47 100644 --- a/Master/texmf-dist/tex/latex/graphics/rotating.sty +++ b/Master/texmf-dist/tex/latex/graphics/rotating.sty @@ -11,9 +11,11 @@ %% (but please observe conditions on bug reports sent to that address!) %% %% -%% Copyright (C) 1995--1999 Sebastian Rahtz and Leonor Barroca -%% Copyright (C) 2001--2003,2007--2009 Robin Fairbairns -%% Copyright (C) 2016-2020 LaTeX3 Project +%% Copyright (C) 1995-1999 Sebastian Rahtz and Leonor Barroca +%% Copyright (C) 2001-2003,2007-2009 Robin Fairbairns +%% Copyright (C) 2016-2021 LaTeX Project +%% The LaTeX Project and any individual authors listed elsewhere +%% in this file. \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{rotating}% [2016/08/11 v2.16d diff --git a/Master/texmf-dist/tex/latex/graphics/tcidvi.def b/Master/texmf-dist/tex/latex/graphics/tcidvi.def index d4a93d43c38..805384f66e7 100644 --- a/Master/texmf-dist/tex/latex/graphics/tcidvi.def +++ b/Master/texmf-dist/tex/latex/graphics/tcidvi.def @@ -8,7 +8,9 @@ %% %% drivers.dtx Copyright (C) 1994 David Carlisle Sebastian Rahtz %% Copyright (C) 1995 1996 1997 1998 1999 David Carlisle -%% Copyright (C) 2000-2020 David Carlisle, LaTeX3 Project +%% Copyright (C) 2000-2021 +%% The LaTeX Project and any individual authors listed elsewhere +%% in this file. %% %% This file is part of the Standard LaTeX `Graphics Bundle'. %% It may be distributed under the terms of the LaTeX Project Public diff --git a/Master/texmf-dist/tex/latex/graphics/trig.sty b/Master/texmf-dist/tex/latex/graphics/trig.sty index 1cdc14cb7e3..1147ab46c79 100644 --- a/Master/texmf-dist/tex/latex/graphics/trig.sty +++ b/Master/texmf-dist/tex/latex/graphics/trig.sty @@ -11,8 +11,10 @@ %% (but please observe conditions on bug reports sent to that address!) %% %% -%% File: trig.dtx Copyright (C) 1993 1994 1995 1996 1997 1999 David Carlisle -%% Copyright (C) 2000-2020 David Carlisle, LaTeX3 Project +%% File: trig.dtx Copyright (C) 1993-1999 David Carlisle +%% Copyright (C) 2000-2021 +%% The LaTeX Project and any individual authors listed elsewhere +%% in this file. %% %% This file is part of the Standard LaTeX `Graphics Bundle'. %% It may be distributed under the terms of the LaTeX Project Public diff --git a/Master/texmf-dist/tex/latex/graphics/truetex.def b/Master/texmf-dist/tex/latex/graphics/truetex.def index 62a4742b863..a2d0fc970ea 100644 --- a/Master/texmf-dist/tex/latex/graphics/truetex.def +++ b/Master/texmf-dist/tex/latex/graphics/truetex.def @@ -8,7 +8,9 @@ %% %% drivers.dtx Copyright (C) 1994 David Carlisle Sebastian Rahtz %% Copyright (C) 1995 1996 1997 1998 1999 David Carlisle -%% Copyright (C) 2000-2020 David Carlisle, LaTeX3 Project +%% Copyright (C) 2000-2021 +%% The LaTeX Project and any individual authors listed elsewhere +%% in this file. %% %% This file is part of the Standard LaTeX `Graphics Bundle'. %% It may be distributed under the terms of the LaTeX Project Public diff --git a/Master/texmf-dist/tex/latex/tools/.tex b/Master/texmf-dist/tex/latex/tools/.tex index 7c09a5d9a99..c038ea6a9d5 100644 --- a/Master/texmf-dist/tex/latex/tools/.tex +++ b/Master/texmf-dist/tex/latex/tools/.tex @@ -13,8 +13,8 @@ %% (but please observe conditions on bug reports sent to that address!) %% %% -%% Copyright (C) 1993-2020 -%% The LaTeX3 Project and any individual authors listed elsewhere +%% Copyright (C) 1993-2021 +%% The LaTeX Project and any individual authors listed elsewhere %% in this file. %% %% This file was generated from file(s) of the Standard LaTeX `Tools Bundle'. diff --git a/Master/texmf-dist/tex/latex/tools/afterpage.sty b/Master/texmf-dist/tex/latex/tools/afterpage.sty index 5f1d6bc4df8..82fedf16cab 100644 --- a/Master/texmf-dist/tex/latex/tools/afterpage.sty +++ b/Master/texmf-dist/tex/latex/tools/afterpage.sty @@ -12,8 +12,8 @@ %% 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 +%% Copyright (C) 1993-2021 +%% The LaTeX Project and any individual authors listed elsewhere %% in this file. %% %% This file was generated from file(s) of the Standard LaTeX `Tools Bundle'. diff --git a/Master/texmf-dist/tex/latex/tools/array-2016-10-06.sty b/Master/texmf-dist/tex/latex/tools/array-2016-10-06.sty index 10fd5e8d17a..f079fd4975d 100644 --- a/Master/texmf-dist/tex/latex/tools/array-2016-10-06.sty +++ b/Master/texmf-dist/tex/latex/tools/array-2016-10-06.sty @@ -2,7 +2,7 @@ %% This is an old release of `array.sty', %% %% Copyright 1993-2016 -%% The LaTeX3 Project and any individual authors listed elsewhere +%% The LaTeX Project and any individual authors listed elsewhere %% in this file. %% %% This file was generated from file(s) of the Standard LaTeX `Tools Bundle'. diff --git a/Master/texmf-dist/tex/latex/tools/array-2020-02-10.sty b/Master/texmf-dist/tex/latex/tools/array-2020-02-10.sty index 9fddc0d490f..1243f25f747 100644 --- a/Master/texmf-dist/tex/latex/tools/array-2020-02-10.sty +++ b/Master/texmf-dist/tex/latex/tools/array-2020-02-10.sty @@ -14,7 +14,7 @@ %% %% %% Copyright (C) 1993-2020 -%% The LaTeX3 Project and any individual authors listed elsewhere +%% The LaTeX Project and any individual authors listed elsewhere %% in this file. %% %% This file was generated from file(s) of the Standard LaTeX `Tools Bundle'. diff --git a/Master/texmf-dist/tex/latex/tools/array.sty b/Master/texmf-dist/tex/latex/tools/array.sty index 28162839cb1..80b0241e965 100644 --- a/Master/texmf-dist/tex/latex/tools/array.sty +++ b/Master/texmf-dist/tex/latex/tools/array.sty @@ -13,8 +13,8 @@ %% (but please observe conditions on bug reports sent to that address!) %% %% -%% Copyright (C) 1993-2020 -%% The LaTeX3 Project and any individual authors listed elsewhere +%% Copyright (C) 1993-2021 +%% The LaTeX Project and any individual authors listed elsewhere %% in this file. %% %% This file was generated from file(s) of the Standard LaTeX `Tools Bundle'. @@ -46,7 +46,7 @@ \DeclareCurrentRelease{}{2020-10-01} \ProvidesPackage{array} - [2020/10/01 v2.5c Tabular extension package (FMi)] + [2021/04/20 v2.5e Tabular extension package (FMi)] %% \def\@addtopreamble#1{\xdef\@preamble{\@preamble #1}} @@ -158,7 +158,7 @@ \vrule \@height \ht\@arstrutbox \@width \z@ \everypar{}}% } -\def\@endpbox{\@finalstrut\@arstrutbox \color@endgroup \egroup\hfil} +\def\@endpbox{\@finalstrut\@arstrutbox \par \color@endgroup \egroup\hfil} \def\@array[#1]#2{% \@tempdima \ht \strutbox \advance \@tempdima by\extrarowheight @@ -184,7 +184,7 @@ \newdimen \extrarowheight \extrarowheight=0pt \def\@arstrut{\unhcopy\@arstrutbox} -\def\@arraycr{\relax\iffalse{\fi\ifnum 0=`}\fi +\protected\def\@arraycr{\relax\iffalse{\fi\ifnum 0=`}\fi \@ifstar \@xarraycr \@xarraycr} \def\@xarraycr{\@ifnextchar [% \@argarraycr {\ifnum 0=`{}\fi\cr}} diff --git a/Master/texmf-dist/tex/latex/tools/bm.sty b/Master/texmf-dist/tex/latex/tools/bm.sty index 40e02133d10..18b4c0c9661 100644 --- a/Master/texmf-dist/tex/latex/tools/bm.sty +++ b/Master/texmf-dist/tex/latex/tools/bm.sty @@ -12,8 +12,8 @@ %% 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 +%% Copyright (C) 1993-2021 +%% The LaTeX Project and any individual authors listed elsewhere %% in this file. %% %% This file was generated from file(s) of the Standard LaTeX `Tools Bundle'. @@ -40,11 +40,17 @@ %% Development of this package was commissioned by Y&Y Inc. \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{bm} - [2019/07/24 v1.2d Bold Symbol Support (DPC/FMi)] -\def\bm#1#2{% - \let\bm@pmb\install@mathalphabet - \let\bm@pmb@\getanddefine@fonts - \let\bm@pmb@@\or + [2021/04/25 v1.2e Bold Symbol Support (DPC/FMi)] +\DeclareOption{nopmb}{\let\bm@pmb@\@firstofone} +\DeclareOption{warn}{\def\bm@info{\PackageWarningNoLine{bm}}} +\DeclareOption{info}{\def\bm@info#1{\PackageInfo{bm}{#1\@gobble}}} +\DeclareOption{silent}{\let\bm@info\@gobble} +\ExecuteOptions{info} +\ProcessOptions\relax +\def\bm@setup#1#2{% + \let\bm@install@mathalphabet\install@mathalphabet + \let\bm@getanddefine@fonts\getanddefine@fonts + \let\bm@or\or \edef\bm@general{\f@encoding/\f@family/\f@series/\f@shape/\f@size}% \@tempcnta#2% \count@-\count18% @@ -65,6 +71,8 @@ \@tempb\csname mv@#1\endcsname\@nil \ifx\@tempa\@tempb \bm@define\m@ne + \bm@info{No #1 for \string##2% + \ifx\bm@pmb@\@firstofone\else, using \string\pmb\fi}% \else \edef\@tempa{sym#1\expandafter\@gobblefour\string##1}% \ifnum\@tempcnta<% @@ -105,7 +113,7 @@ \fi \fi \else - \PackageInfo{bm}% + \bm@info {Symbol font \@tempa\space already defined.\MessageBreak Not overwriting it}% \fi @@ -123,9 +131,9 @@ \z@ \noexpand\fi}% \expandafter\split@name\bm@general\@nil - \let\install@mathalphabet\bm@pmb - \let\getanddefine@fonts\bm@pmb@ - \let\or\bm@pmb@@} + \let\install@mathalphabet\bm@install@mathalphabet + \let\getanddefine@fonts\bm@getanddefine@fonts + \let\or\bm@or} \ifx\bmmax\@undefined \chardef\bmmax=4 \fi @@ -133,9 +141,9 @@ \def\bm@boldtable{\m@ne} \AtEndOfPackage{% \def\bm@gr@up#1#2{% - \bm@pmb{#2}}} + \bm@install@mathalphabet{#2}}} \else - \bm{bold}\bmmax + \bm@setup{bold}\bmmax \@ifundefined{symboldoperators} {} {\DeclareSymbolFontAlphabet\mathbf{boldoperators}} @@ -145,7 +153,7 @@ \fi \ifx\mv@heavy\@undefined \else - \bm{heavy}\hmmax + \bm@setup{heavy}\hmmax \fi \begingroup \catcode`\'=\active @@ -176,6 +184,7 @@ \expandafter\@secondoftwo \fi {##2##4}{##3{##4}}}% + \let\kernel@ifnextchar\@ifnextchar \def\GenericWarning##1##2{% \unvcopy{\GenericWarning{##1}{##2}}}% \def\GenericError##1##2##3##4{% @@ -357,6 +366,7 @@ \fi} \def\bm@pmb#1{% \bm@add{\bm@pmb@{#1}}} +\ifx\bm@pmb@\@firstofone\else \def\bm@pmb@#1{{% \setbox\tw@\hbox{$\m@th\mkern.4mu$}% \mathchoice @@ -372,6 +382,7 @@ \raise1.5\dimen@\rlap{\copy\z@}% \kern\dimen@ \box\z@}}% +\fi \def\bm@class{% \ifcase\count@ \or diff --git a/Master/texmf-dist/tex/latex/tools/calc.sty b/Master/texmf-dist/tex/latex/tools/calc.sty index 911377c5ff9..6c22fbd09e2 100644 --- a/Master/texmf-dist/tex/latex/tools/calc.sty +++ b/Master/texmf-dist/tex/latex/tools/calc.sty @@ -13,8 +13,8 @@ %% (but please observe conditions on bug reports sent to that address!) %% %% -%% Copyright (C) 1993-2020 -%% The LaTeX3 Project and any individual authors listed elsewhere +%% Copyright (C) 1993-2021 +%% The LaTeX Project and any individual authors listed elsewhere %% in this file. %% %% This file was generated from file(s) of the Standard LaTeX `Tools Bundle'. @@ -39,7 +39,7 @@ %% Copyright (C) 1992--1995 %% Kresten Krab Thorup and Frank Jensen. %% Copyright (C) 1997--2007 -%% Kresten Krab Thorup, Frank Jensen and the LaTeX3 Project. +%% Kresten Krab Thorup, Frank Jensen and the LaTeX Project. %% %% The original authors (fj@hugin.dk and krab@daimi.aau.dk) have %% contributed this package to the LaTeX distribution. diff --git a/Master/texmf-dist/tex/latex/tools/dcolumn.sty b/Master/texmf-dist/tex/latex/tools/dcolumn.sty index b7ad2fae0d9..c2c9c015830 100644 --- a/Master/texmf-dist/tex/latex/tools/dcolumn.sty +++ b/Master/texmf-dist/tex/latex/tools/dcolumn.sty @@ -13,8 +13,8 @@ %% (but please observe conditions on bug reports sent to that address!) %% %% -%% Copyright (C) 1993-2020 -%% The LaTeX3 Project and any individual authors listed elsewhere +%% Copyright (C) 1993-2021 +%% The LaTeX Project and any individual authors listed elsewhere %% in this file. %% %% This file was generated from file(s) of the Standard LaTeX `Tools Bundle'. diff --git a/Master/texmf-dist/tex/latex/tools/delarray.sty b/Master/texmf-dist/tex/latex/tools/delarray.sty index 818c74d6897..a6462bb3f07 100644 --- a/Master/texmf-dist/tex/latex/tools/delarray.sty +++ b/Master/texmf-dist/tex/latex/tools/delarray.sty @@ -13,8 +13,8 @@ %% (but please observe conditions on bug reports sent to that address!) %% %% -%% Copyright (C) 1993-2020 -%% The LaTeX3 Project and any individual authors listed elsewhere +%% Copyright (C) 1993-2021 +%% The LaTeX Project and any individual authors listed elsewhere %% in this file. %% %% This file was generated from file(s) of the Standard LaTeX `Tools Bundle'. diff --git a/Master/texmf-dist/tex/latex/tools/e.tex b/Master/texmf-dist/tex/latex/tools/e.tex index 35f01cb8d4d..06c8e3cc9aa 100644 --- a/Master/texmf-dist/tex/latex/tools/e.tex +++ b/Master/texmf-dist/tex/latex/tools/e.tex @@ -13,8 +13,8 @@ %% (but please observe conditions on bug reports sent to that address!) %% %% -%% Copyright (C) 1993-2020 -%% The LaTeX3 Project and any individual authors listed elsewhere +%% Copyright (C) 1993-2021 +%% The LaTeX Project and any individual authors listed elsewhere %% in this file. %% %% This file was generated from file(s) of the Standard LaTeX `Tools Bundle'. diff --git a/Master/texmf-dist/tex/latex/tools/enumerate.sty b/Master/texmf-dist/tex/latex/tools/enumerate.sty index c684a57fa36..def79b55503 100644 --- a/Master/texmf-dist/tex/latex/tools/enumerate.sty +++ b/Master/texmf-dist/tex/latex/tools/enumerate.sty @@ -13,8 +13,8 @@ %% (but please observe conditions on bug reports sent to that address!) %% %% -%% Copyright (C) 1993-2020 -%% The LaTeX3 Project and any individual authors listed elsewhere +%% Copyright (C) 1993-2021 +%% The LaTeX Project and any individual authors listed elsewhere %% in this file. %% %% This file was generated from file(s) of the Standard LaTeX `Tools Bundle'. diff --git a/Master/texmf-dist/tex/latex/tools/fontsmpl.sty b/Master/texmf-dist/tex/latex/tools/fontsmpl.sty index fca0cd5c10d..6d1a91b27af 100644 --- a/Master/texmf-dist/tex/latex/tools/fontsmpl.sty +++ b/Master/texmf-dist/tex/latex/tools/fontsmpl.sty @@ -13,8 +13,8 @@ %% (but please observe conditions on bug reports sent to that address!) %% %% -%% Copyright (C) 1993-2020 -%% The LaTeX3 Project and any individual authors listed elsewhere +%% Copyright (C) 1993-2021 +%% The LaTeX Project and any individual authors listed elsewhere %% in this file. %% %% This file was generated from file(s) of the Standard LaTeX `Tools Bundle'. diff --git a/Master/texmf-dist/tex/latex/tools/fontsmpl.tex b/Master/texmf-dist/tex/latex/tools/fontsmpl.tex index 1b0f4f81b24..b38c2be76b8 100644 --- a/Master/texmf-dist/tex/latex/tools/fontsmpl.tex +++ b/Master/texmf-dist/tex/latex/tools/fontsmpl.tex @@ -13,8 +13,8 @@ %% (but please observe conditions on bug reports sent to that address!) %% %% -%% Copyright (C) 1993-2020 -%% The LaTeX3 Project and any individual authors listed elsewhere +%% Copyright (C) 1993-2021 +%% The LaTeX Project and any individual authors listed elsewhere %% in this file. %% %% This file was generated from file(s) of the Standard LaTeX `Tools Bundle'. diff --git a/Master/texmf-dist/tex/latex/tools/ftnright.sty b/Master/texmf-dist/tex/latex/tools/ftnright.sty index b20cd23c4e1..a660f3a1b2a 100644 --- a/Master/texmf-dist/tex/latex/tools/ftnright.sty +++ b/Master/texmf-dist/tex/latex/tools/ftnright.sty @@ -13,8 +13,8 @@ %% (but please observe conditions on bug reports sent to that address!) %% %% -%% Copyright (C) 1993-2020 -%% The LaTeX3 Project and any individual authors listed elsewhere +%% Copyright (C) 1993-2021 +%% The LaTeX Project and any individual authors listed elsewhere %% in this file. %% %% This file was generated from file(s) of the Standard LaTeX `Tools Bundle'. diff --git a/Master/texmf-dist/tex/latex/tools/h.tex b/Master/texmf-dist/tex/latex/tools/h.tex index 9a9d64afd7a..7a735ae0f98 100644 --- a/Master/texmf-dist/tex/latex/tools/h.tex +++ b/Master/texmf-dist/tex/latex/tools/h.tex @@ -13,8 +13,8 @@ %% (but please observe conditions on bug reports sent to that address!) %% %% -%% Copyright (C) 1993-2020 -%% The LaTeX3 Project and any individual authors listed elsewhere +%% Copyright (C) 1993-2021 +%% The LaTeX Project and any individual authors listed elsewhere %% in this file. %% %% This file was generated from file(s) of the Standard LaTeX `Tools Bundle'. diff --git a/Master/texmf-dist/tex/latex/tools/hhline.sty b/Master/texmf-dist/tex/latex/tools/hhline.sty index ce516a69c3e..0520f916838 100644 --- a/Master/texmf-dist/tex/latex/tools/hhline.sty +++ b/Master/texmf-dist/tex/latex/tools/hhline.sty @@ -13,8 +13,8 @@ %% (but please observe conditions on bug reports sent to that address!) %% %% -%% Copyright (C) 1993-2020 -%% The LaTeX3 Project and any individual authors listed elsewhere +%% Copyright (C) 1993-2021 +%% The LaTeX Project and any individual authors listed elsewhere %% in this file. %% %% This file was generated from file(s) of the Standard LaTeX `Tools Bundle'. diff --git a/Master/texmf-dist/tex/latex/tools/indentfirst.sty b/Master/texmf-dist/tex/latex/tools/indentfirst.sty index 678ccfb3bcd..53ab0ee37ed 100644 --- a/Master/texmf-dist/tex/latex/tools/indentfirst.sty +++ b/Master/texmf-dist/tex/latex/tools/indentfirst.sty @@ -13,8 +13,8 @@ %% (but please observe conditions on bug reports sent to that address!) %% %% -%% Copyright (C) 1993-2020 -%% The LaTeX3 Project and any individual authors listed elsewhere +%% Copyright (C) 1993-2021 +%% The LaTeX Project and any individual authors listed elsewhere %% in this file. %% %% This file was generated from file(s) of the Standard LaTeX `Tools Bundle'. diff --git a/Master/texmf-dist/tex/latex/tools/layout.sty b/Master/texmf-dist/tex/latex/tools/layout.sty index 4805bace1d9..bf2d8584829 100644 --- a/Master/texmf-dist/tex/latex/tools/layout.sty +++ b/Master/texmf-dist/tex/latex/tools/layout.sty @@ -13,8 +13,8 @@ %% (but please observe conditions on bug reports sent to that address!) %% %% -%% Copyright (C) 1993-2020 -%% The LaTeX3 Project and any individual authors listed elsewhere +%% Copyright (C) 1993-2021 +%% The LaTeX Project and any individual authors listed elsewhere %% in this file. %% %% This file was generated from file(s) of the Standard LaTeX `Tools Bundle'. @@ -37,7 +37,7 @@ %% \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{layout} - [2014/10/28 v1.2c Show layout parameters] + [2021-03-10 v1.2e Show layout parameters] \DeclareOption{dutch}{% \def\Headertext{Kopregel} \def\Bodytext{Broodtekst} @@ -104,6 +104,22 @@ \def\oneinchtext{un pollice} \def\notshown{non mostrato} } +\DeclareOption{romanian}{% + \def\Headertext{Antet} + \def\Bodytext{Corp} + \def\Footertext{Subsol} + \def\MarginNotestext{Note\\ Marginale} + \def\oneinchtext{un inch} + \def\notshown{neafi\textcommabelow sat} + } +\DeclareOption{japanese}{% + \def\Headertext{天} + \def\Bodytext{基本版面} + \def\Footertext{地} + \def\MarginNotestext{傍\\注} + \def\oneinchtext{1インチ} + \def\notshown{非表示} + } \DeclareOption{verbose}{\let\LayOuttype\typeout} \DeclareOption{silent}{\let\LayOuttype\@gobble} \def\lay@value{} diff --git a/Master/texmf-dist/tex/latex/tools/longtable-2020-01-07.sty b/Master/texmf-dist/tex/latex/tools/longtable-2020-01-07.sty new file mode 100644 index 00000000000..f79c691e104 --- /dev/null +++ b/Master/texmf-dist/tex/latex/tools/longtable-2020-01-07.sty @@ -0,0 +1,448 @@ +%% +%% This is file `longtable.sty', +%% generated with the docstrip utility. +%% +%% The original source files were: +%% +%% longtable.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: longtable.dtx Copyright (C) 1990-2020 David Carlisle +\NeedsTeXFormat{LaTeX2e}[1995/06/01] +\ProvidesPackage{longtable} + [2020/01/07 v4.13 Multi-page Table package (DPC)] +\def\LT@err{\PackageError{longtable}} +\def\LT@warn{\PackageWarning{longtable}} +\def\LT@final@warn{% + \AtEndDocument{% + \LT@warn{Table \@width s have changed. Rerun LaTeX.\@gobbletwo}}% + \global\let\LT@final@warn\relax} +\DeclareOption{errorshow}{% + \def\LT@warn{\PackageInfo{longtable}}} +\DeclareOption{pausing}{% + \def\LT@warn#1{% + \LT@err{#1}{This is not really an error}}} +\DeclareOption{set}{} +\DeclareOption{final}{} +\ProcessOptions +\newskip\LTleft \LTleft=\fill +\newskip\LTright \LTright=\fill +\newskip\LTpre \LTpre=\bigskipamount +\newskip\LTpost \LTpost=\bigskipamount +\newcount\LTchunksize \LTchunksize=20 +\let\c@LTchunksize\LTchunksize +\newdimen\LTcapwidth \LTcapwidth=4in +\newbox\LT@head +\newbox\LT@firsthead +\newbox\LT@foot +\newbox\LT@lastfoot +\newcount\LT@cols +\newcount\LT@rows +\newcounter{LT@tables} +\newcounter{LT@chunks}[LT@tables] +\ifx\c@table\undefined + \newcounter{table} + \def\fnum@table{\tablename~\thetable} +\fi +\ifx\tablename\undefined + \def\tablename{Table} +\fi +\newtoks\LT@p@ftn +\mathchardef\LT@end@pen=30000 +\def\longtable{% + \par + \ifx\multicols\@undefined + \else + \ifnum\col@number>\@ne + \@twocolumntrue + \fi + \fi + \if@twocolumn + \LT@err{longtable not in 1-column mode}\@ehc + \fi + \begingroup + \@ifnextchar[\LT@array{\LT@array[x]}} +\def\LT@array[#1]#2{% + \refstepcounter{table}\stepcounter{LT@tables}% + \if l#1% + \LTleft\z@ \LTright\fill + \else\if r#1% + \LTleft\fill \LTright\z@ + \else\if c#1% + \LTleft\fill \LTright\fill + \fi\fi\fi + \let\LT@mcol\multicolumn + \let\LT@@tabarray\@tabarray + \let\LT@@hl\hline + \def\@tabarray{% + \let\hline\LT@@hl + \LT@@tabarray}% + \let\\\LT@tabularcr\let\tabularnewline\\% + \def\newpage{\noalign{\break}}% + \def\pagebreak{\noalign{\ifnum`}=0\fi\@testopt{\LT@no@pgbk-}4}% + \def\nopagebreak{\noalign{\ifnum`}=0\fi\@testopt\LT@no@pgbk4}% + \let\hline\LT@hline \let\kill\LT@kill\let\caption\LT@caption + \@tempdima\ht\strutbox + \let\@endpbox\LT@endpbox + \ifx\extrarowheight\@undefined + \let\@acol\@tabacol + \let\@classz\@tabclassz \let\@classiv\@tabclassiv + \def\@startpbox{\vtop\LT@startpbox}% + \let\@@startpbox\@startpbox + \let\@@endpbox\@endpbox + \let\LT@LL@FM@cr\@tabularcr + \else + \advance\@tempdima\extrarowheight + \col@sep\tabcolsep + \let\@startpbox\LT@startpbox\let\LT@LL@FM@cr\@arraycr + \fi + \setbox\@arstrutbox\hbox{\vrule + \@height \arraystretch \@tempdima + \@depth \arraystretch \dp \strutbox + \@width \z@}% + \let\@sharp##\let\protect\relax + \begingroup + \@mkpream{#2}% + \xdef\LT@bchunk{% + \global\advance\c@LT@chunks\@ne + \global\LT@rows\z@\setbox\z@\vbox\bgroup + \LT@setprevdepth + \tabskip\LTleft \noexpand\halign to\hsize\bgroup + \tabskip\z@ \@arstrut \@preamble \tabskip\LTright \cr}% + \endgroup + \expandafter\LT@nofcols\LT@bchunk&\LT@nofcols + \LT@make@row + \m@th\let\par\@empty + \everycr{}\lineskip\z@\baselineskip\z@ + \LT@bchunk} +\def\LT@no@pgbk#1[#2]{\penalty #1\@getpen{#2}\ifnum`{=0\fi}} +\def\LT@start{% + \let\LT@start\endgraf + \endgraf\penalty\z@\vskip\LTpre\endgraf + \dimen@\pagetotal + \advance\dimen@ \ht\ifvoid\LT@firsthead\LT@head\else\LT@firsthead\fi + \advance\dimen@ \dp\ifvoid\LT@firsthead\LT@head\else\LT@firsthead\fi + \advance\dimen@ \ht\LT@foot + \dimen@ii\vfuzz + \vfuzz\maxdimen + \setbox\tw@\copy\z@ + \setbox\tw@\vsplit\tw@ to \ht\@arstrutbox + \setbox\tw@\vbox{\unvbox\tw@}% + \vfuzz\dimen@ii + \advance\dimen@ \ht + \ifdim\ht\@arstrutbox>\ht\tw@\@arstrutbox\else\tw@\fi + \advance\dimen@\dp + \ifdim\dp\@arstrutbox>\dp\tw@\@arstrutbox\else\tw@\fi + \advance\dimen@ -\pagegoal + \ifdim \dimen@>\z@\vfil\break\fi + \global\@colroom\@colht + \ifvoid\LT@foot\else + \advance\vsize-\ht\LT@foot + \global\advance\@colroom-\ht\LT@foot + \dimen@\pagegoal\advance\dimen@-\ht\LT@foot\pagegoal\dimen@ + \maxdepth\z@ + \fi + \ifvoid\LT@firsthead\copy\LT@head\else\box\LT@firsthead\fi\nobreak + \output{\LT@output}} +\def\endlongtable{% + \crcr + \noalign{% + \let\LT@entry\LT@entry@chop + \xdef\LT@save@row{\LT@save@row}}% + \LT@echunk + \LT@start + \unvbox\z@ + \LT@get@widths + \if@filesw + {\let\LT@entry\LT@entry@write\immediate\write\@auxout{% + \gdef\expandafter\noexpand + \csname LT@\romannumeral\c@LT@tables\endcsname + {\LT@save@row}}}% + \fi + \ifx\LT@save@row\LT@@save@row + \else + \LT@warn{Column \@width s have changed\MessageBreak + in table \thetable}% + \LT@final@warn + \fi + \endgraf\penalty -\LT@end@pen + \endgroup + \global\@mparbottom\z@ + \pagegoal\vsize + \endgraf\penalty\z@\addvspace\LTpost + \ifvoid\footins\else\insert\footins{}\fi} +\def\LT@nofcols#1&{% + \futurelet\@let@token\LT@n@fcols} +\def\LT@n@fcols{% + \advance\LT@cols\@ne + \ifx\@let@token\LT@nofcols + \expandafter\@gobble + \else + \expandafter\LT@nofcols + \fi} +\def\LT@tabularcr{% + \relax\iffalse{\fi\ifnum0=`}\fi + \@ifstar + {\def\crcr{\LT@crcr\noalign{\nobreak}}\let\cr\crcr + \LT@t@bularcr}% + {\LT@t@bularcr}} +\let\LT@crcr\crcr +\let\LT@setprevdepth\relax +\def\LT@t@bularcr{% + \global\advance\LT@rows\@ne + \ifnum\LT@rows=\LTchunksize + \gdef\LT@setprevdepth{% + \prevdepth\z@\global + \global\let\LT@setprevdepth\relax}% + \expandafter\LT@xtabularcr + \else + \ifnum0=`{}\fi + \expandafter\LT@LL@FM@cr + \fi} +\def\LT@xtabularcr{% + \@ifnextchar[\LT@argtabularcr\LT@ntabularcr} +\def\LT@ntabularcr{% + \ifnum0=`{}\fi + \LT@echunk + \LT@start + \unvbox\z@ + \LT@get@widths + \LT@bchunk} +\def\LT@argtabularcr[#1]{% + \ifnum0=`{}\fi + \ifdim #1>\z@ + \unskip\@xargarraycr{#1}% + \else + \@yargarraycr{#1}% + \fi + \LT@echunk + \LT@start + \unvbox\z@ + \LT@get@widths + \LT@bchunk} +\def\LT@echunk{% + \crcr\LT@save@row\cr\egroup + \global\setbox\@ne\lastbox + \unskip + \egroup} +\def\LT@entry#1#2{% + \ifhmode\@firstofone{&}\fi\omit + \ifnum#1=\c@LT@chunks + \else + \kern#2\relax + \fi} +\def\LT@entry@chop#1#2{% + \noexpand\LT@entry + {\ifnum#1>\c@LT@chunks + 1}{0pt% + \else + #1}{#2% + \fi}} +\def\LT@entry@write{% + \noexpand\LT@entry^^J% + \@spaces} +\def\LT@kill{% + \LT@echunk + \LT@get@widths + \expandafter\LT@rebox\LT@bchunk} +\def\LT@rebox#1\bgroup{% + #1\bgroup + \unvbox\z@ + \unskip + \setbox\z@\lastbox} +\def\LT@blank@row{% + \xdef\LT@save@row{\expandafter\LT@build@blank + \romannumeral\number\LT@cols 001 }} +\def\LT@build@blank#1{% + \if#1m% + \noexpand\LT@entry{1}{0pt}% + \expandafter\LT@build@blank + \fi} +\def\LT@make@row{% + \global\expandafter\let\expandafter\LT@save@row + \csname LT@\romannumeral\c@LT@tables\endcsname + \ifx\LT@save@row\relax + \LT@blank@row + \else + {\let\LT@entry\or + \if!% + \ifcase\expandafter\expandafter\expandafter\LT@cols + \expandafter\@gobble\LT@save@row + \or + \else + \relax + \fi + !% + \else + \aftergroup\LT@blank@row + \fi}% + \fi} +\let\setlongtables\relax +\def\LT@get@widths{% + \setbox\tw@\hbox{% + \unhbox\@ne + \let\LT@old@row\LT@save@row + \global\let\LT@save@row\@empty + \count@\LT@cols + \loop + \unskip + \setbox\tw@\lastbox + \ifhbox\tw@ + \LT@def@row + \advance\count@\m@ne + \repeat}% + \ifx\LT@@save@row\@undefined + \let\LT@@save@row\LT@save@row + \fi} +\def\LT@def@row{% + \let\LT@entry\or + \edef\@tempa{% + \ifcase\expandafter\count@\LT@old@row + \else + {1}{0pt}% + \fi}% + \let\LT@entry\relax + \xdef\LT@save@row{% + \LT@entry + \expandafter\LT@max@sel\@tempa + \LT@save@row}} +\def\LT@max@sel#1#2{% + {\ifdim#2=\wd\tw@ + #1% + \else + \number\c@LT@chunks + \fi}% + {\the\wd\tw@}} +\def\LT@hline{% + \noalign{\ifnum0=`}\fi + \penalty\@M + \futurelet\@let@token\LT@@hline} +\def\LT@@hline{% + \ifx\@let@token\hline + \global\let\@gtempa\@gobble + \gdef\LT@sep{\penalty-\@medpenalty\vskip\doublerulesep}% + \else + \global\let\@gtempa\@empty + \gdef\LT@sep{\penalty-\@lowpenalty\vskip-\arrayrulewidth}% + \fi + \ifnum0=`{\fi}% + \multispan\LT@cols + \unskip\leaders\hrule\@height\arrayrulewidth\hfill\cr + \noalign{\LT@sep}% + \multispan\LT@cols + \unskip\leaders\hrule\@height\arrayrulewidth\hfill\cr + \noalign{\penalty\@M}% + \@gtempa} +\def\LT@caption{% + \noalign\bgroup + \@ifnextchar[{\egroup\LT@c@ption\@firstofone}\LT@capti@n} +\def\LT@c@ption#1[#2]#3{% + \LT@makecaption#1\fnum@table{#3}% + \def\@tempa{#2}% + \ifx\@tempa\@empty\else + {\let\\\space + \addcontentsline{lot}{table}{\protect\numberline{\thetable}{#2}}}% + \fi} +\def\LT@capti@n{% + \@ifstar + {\egroup\LT@c@ption\@gobble[]}% + {\egroup\@xdblarg{\LT@c@ption\@firstofone}}} +\def\LT@makecaption#1#2#3{% + \LT@mcol\LT@cols c{\hbox to\z@{\hss\parbox[t]\LTcapwidth{% + \sbox\@tempboxa{#1{#2: }#3}% + \ifdim\wd\@tempboxa>\hsize + #1{#2: }#3% + \else + \hbox to\hsize{\hfil\box\@tempboxa\hfil}% + \fi + \endgraf\vskip\baselineskip}% + \hss}}} +\def\LT@output{% + \ifnum\outputpenalty <-\@Mi + \ifnum\outputpenalty > -\LT@end@pen + \LT@err{floats and marginpars not allowed in a longtable}\@ehc + \else + \setbox\z@\vbox{\unvbox\@cclv}% + \ifdim \ht\LT@lastfoot>\ht\LT@foot + \dimen@\pagegoal + \advance\dimen@-\ht\LT@lastfoot + \ifdim\dimen@<\ht\z@ + \setbox\@cclv\vbox{\unvbox\z@\copy\LT@foot\vss}% + \@makecol + \@outputpage + \setbox\z@\vbox{\box\LT@head}% + \fi + \fi + \global\@colroom\@colht + \global\vsize\@colht + \vbox + {\unvbox\z@\box\ifvoid\LT@lastfoot\LT@foot\else\LT@lastfoot\fi}% + \fi + \else + \setbox\@cclv\vbox{\unvbox\@cclv\copy\LT@foot\vss}% + \@makecol + \@outputpage + \global\vsize\@colroom + \copy\LT@head\nobreak + \fi} +\def\LT@end@hd@ft#1{% + \LT@echunk + \ifx\LT@start\endgraf + \LT@err + {Longtable head or foot not at start of table}% + {Increase LTchunksize}% + \fi + \setbox#1\box\z@ + \LT@get@widths + \LT@bchunk} +\def\endfirsthead{\LT@end@hd@ft\LT@firsthead} +\def\endhead{\LT@end@hd@ft\LT@head} +\def\endfoot{\LT@end@hd@ft\LT@foot} +\def\endlastfoot{\LT@end@hd@ft\LT@lastfoot} +\def\LT@startpbox#1{% + \bgroup + \color@begingroup + \let\@footnotetext\LT@p@ftntext + \setlength\hsize{#1}% + \@arrayparboxrestore + \vrule \@height \ht\@arstrutbox \@width \z@} +\def\LT@endpbox{% + \@finalstrut\@arstrutbox + \color@endgroup + \egroup + \the\LT@p@ftn + \global\LT@p@ftn{}% + \hfil} +\def\LT@p@ftntext#1{% + \edef\@tempa{\the\LT@p@ftn\noexpand\footnotetext[\the\c@footnote]}% + \global\LT@p@ftn\expandafter{\@tempa{#1}}}% +\endinput +%% +%% End of file `longtable.sty'. diff --git a/Master/texmf-dist/tex/latex/tools/longtable.sty b/Master/texmf-dist/tex/latex/tools/longtable.sty index f79c691e104..7f8043b018a 100644 --- a/Master/texmf-dist/tex/latex/tools/longtable.sty +++ b/Master/texmf-dist/tex/latex/tools/longtable.sty @@ -12,8 +12,8 @@ %% 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 +%% Copyright (C) 1993-2021 +%% The LaTeX Project and any individual authors listed elsewhere %% in this file. %% %% This file was generated from file(s) of the Standard LaTeX `Tools Bundle'. @@ -36,8 +36,14 @@ %% %% File: longtable.dtx Copyright (C) 1990-2020 David Carlisle \NeedsTeXFormat{LaTeX2e}[1995/06/01] +\providecommand\DeclareRelease[3]{} +\providecommand\DeclareCurrentRelease[2]{} + +\DeclareRelease{v4.13}{2020-01-02}{longtable-2020-01-07.sty} +\DeclareCurrentRelease{}{2020-02-07} + \ProvidesPackage{longtable} - [2020/01/07 v4.13 Multi-page Table package (DPC)] + [2021-05-07 v4.16 Multi-page Table package (DPC)] \def\LT@err{\PackageError{longtable}} \def\LT@warn{\PackageWarning{longtable}} \def\LT@final@warn{% @@ -56,13 +62,14 @@ \newskip\LTright \LTright=\fill \newskip\LTpre \LTpre=\bigskipamount \newskip\LTpost \LTpost=\bigskipamount -\newcount\LTchunksize \LTchunksize=20 +\newcount\LTchunksize \LTchunksize=200 \let\c@LTchunksize\LTchunksize \newdimen\LTcapwidth \LTcapwidth=4in \newbox\LT@head \newbox\LT@firsthead \newbox\LT@foot \newbox\LT@lastfoot +\newbox\LT@gbox \newcount\LT@cols \newcount\LT@rows \newcounter{LT@tables} @@ -146,25 +153,35 @@ \def\LT@start{% \let\LT@start\endgraf \endgraf\penalty\z@\vskip\LTpre\endgraf + \ifdim \pagetotal<\pagegoal \else + \dimen@=\pageshrink + \advance \dimen@ 1sp % + \kern\dimen@\penalty 9999\endgraf \kern-\dimen@ + \fi \dimen@\pagetotal \advance\dimen@ \ht\ifvoid\LT@firsthead\LT@head\else\LT@firsthead\fi \advance\dimen@ \dp\ifvoid\LT@firsthead\LT@head\else\LT@firsthead\fi \advance\dimen@ \ht\LT@foot - \dimen@ii\vfuzz + \edef\LT@reset@vfuzz{\vfuzz\the\vfuzz\vbadness\the\vbadness\relax}% \vfuzz\maxdimen - \setbox\tw@\copy\z@ - \setbox\tw@\vsplit\tw@ to \ht\@arstrutbox - \setbox\tw@\vbox{\unvbox\tw@}% - \vfuzz\dimen@ii + \vbadness\@M + \setbox\tw@\copy\z@ + \setbox\tw@\vsplit\tw@ to \ht\@arstrutbox + \setbox\tw@\vbox{\unvbox\tw@}% + \LT@reset@vfuzz \advance\dimen@ \ht \ifdim\ht\@arstrutbox>\ht\tw@\@arstrutbox\else\tw@\fi \advance\dimen@\dp \ifdim\dp\@arstrutbox>\dp\tw@\@arstrutbox\else\tw@\fi \advance\dimen@ -\pagegoal - \ifdim \dimen@>\z@\vfil\break\fi + \ifdim \dimen@>\z@ + \vfil\break + \else + \ifdim\pageshrink>\z@\pageshrink\z@\fi + \fi \global\@colroom\@colht \ifvoid\LT@foot\else - \advance\vsize-\ht\LT@foot + \global\advance\vsize-\ht\LT@foot \global\advance\@colroom-\ht\LT@foot \dimen@\pagegoal\advance\dimen@-\ht\LT@foot\pagegoal\dimen@ \maxdepth\z@ @@ -193,9 +210,13 @@ \LT@final@warn \fi \endgraf\penalty -\LT@end@pen + \ifvoid\LT@foot\else + \global\advance\vsize\ht\LT@foot + \global\advance\@colroom\ht\LT@foot + \dimen@\pagegoal\advance\dimen@\ht\LT@foot\pagegoal\dimen@ + \fi \endgroup \global\@mparbottom\z@ - \pagegoal\vsize \endgraf\penalty\z@\addvspace\LTpost \ifvoid\footins\else\insert\footins{}\fi} \def\LT@nofcols#1&{% @@ -207,7 +228,7 @@ \else \expandafter\LT@nofcols \fi} -\def\LT@tabularcr{% +\protected\def\LT@tabularcr{% \relax\iffalse{\fi\ifnum0=`}\fi \@ifstar {\def\crcr{\LT@crcr\noalign{\nobreak}}\let\cr\crcr @@ -219,7 +240,7 @@ \global\advance\LT@rows\@ne \ifnum\LT@rows=\LTchunksize \gdef\LT@setprevdepth{% - \prevdepth\z@\global + \prevdepth\z@ \global\let\LT@setprevdepth\relax}% \expandafter\LT@xtabularcr \else @@ -249,7 +270,7 @@ \LT@bchunk} \def\LT@echunk{% \crcr\LT@save@row\cr\egroup - \global\setbox\@ne\lastbox + \global\setbox\LT@gbox\lastbox \unskip \egroup} \def\LT@entry#1#2{% @@ -307,7 +328,7 @@ \let\setlongtables\relax \def\LT@get@widths{% \setbox\tw@\hbox{% - \unhbox\@ne + \unhbox\LT@gbox \let\LT@old@row\LT@save@row \global\let\LT@save@row\@empty \count@\LT@cols @@ -368,7 +389,7 @@ \def\@tempa{#2}% \ifx\@tempa\@empty\else {\let\\\space - \addcontentsline{lot}{table}{\protect\numberline{\thetable}{#2}}}% + \addcontentsline{\ext@table}{table}{\protect\numberline{\thetable}{#2}}}% \fi} \def\LT@capti@n{% \@ifstar @@ -376,6 +397,7 @@ {\egroup\@xdblarg{\LT@c@ption\@firstofone}}} \def\LT@makecaption#1#2#3{% \LT@mcol\LT@cols c{\hbox to\z@{\hss\parbox[t]\LTcapwidth{% + \reset@font \sbox\@tempboxa{#1{#2: }#3}% \ifdim\wd\@tempboxa>\hsize #1{#2: }#3% @@ -392,18 +414,17 @@ \setbox\z@\vbox{\unvbox\@cclv}% \ifdim \ht\LT@lastfoot>\ht\LT@foot \dimen@\pagegoal + \advance\dimen@\ht\LT@foot \advance\dimen@-\ht\LT@lastfoot \ifdim\dimen@<\ht\z@ \setbox\@cclv\vbox{\unvbox\z@\copy\LT@foot\vss}% \@makecol \@outputpage + \global\vsize\@colroom \setbox\z@\vbox{\box\LT@head}% \fi \fi - \global\@colroom\@colht - \global\vsize\@colht - \vbox - {\unvbox\z@\box\ifvoid\LT@lastfoot\LT@foot\else\LT@lastfoot\fi}% + \unvbox\z@\box\ifvoid\LT@lastfoot\LT@foot\else\LT@lastfoot\fi \fi \else \setbox\@cclv\vbox{\unvbox\@cclv\copy\LT@foot\vss}% @@ -440,7 +461,7 @@ \the\LT@p@ftn \global\LT@p@ftn{}% \hfil} -\def\LT@p@ftntext#1{% +\long\def\LT@p@ftntext#1{% \edef\@tempa{\the\LT@p@ftn\noexpand\footnotetext[\the\c@footnote]}% \global\LT@p@ftn\expandafter{\@tempa{#1}}}% \endinput diff --git a/Master/texmf-dist/tex/latex/tools/multicol-2017-04-11.sty b/Master/texmf-dist/tex/latex/tools/multicol-2017-04-11.sty index c708ae6c486..9e346656bbf 100644 --- a/Master/texmf-dist/tex/latex/tools/multicol-2017-04-11.sty +++ b/Master/texmf-dist/tex/latex/tools/multicol-2017-04-11.sty @@ -6,7 +6,7 @@ %% (but please observe conditions on bug reports sent to that address!) %% %% Copyright 1993-2016 -%% The LaTeX3 Project and any individual authors listed elsewhere +%% The LaTeX Project and any individual authors listed elsewhere %% in this file. %% %% This file was generated from file(s) of the Standard LaTeX `Tools Bundle'. @@ -79,7 +79,7 @@ %% not for the payment of a license fee per se (which might or might %% not follow from this evaluation). %% -%% The license fee, if any, can be payed either to the LaTeX3 fund +%% The license fee, if any, can be payed either to the LaTeX fund %% (see ltx3info.txt in the base LaTeX distribution) or to the author of %% the program who can be contacted at %% diff --git a/Master/texmf-dist/tex/latex/tools/multicol.sty b/Master/texmf-dist/tex/latex/tools/multicol.sty index ad051a947a4..c0de0fe6823 100644 --- a/Master/texmf-dist/tex/latex/tools/multicol.sty +++ b/Master/texmf-dist/tex/latex/tools/multicol.sty @@ -12,8 +12,8 @@ %% 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 +%% Copyright (C) 1993-2021 +%% The LaTeX Project and any individual authors listed elsewhere %% in this file. %% %% This file was generated from file(s) of the Standard LaTeX `Tools Bundle'. @@ -92,7 +92,7 @@ %% not for the payment of a license fee per se (which might or might %% not follow from this evaluation). %% -%% The license fee, if any, can be payed either to the LaTeX3 fund +%% The license fee, if any, can be payed either to the LaTeX fund %% (see ltx3info.txt in the base LaTeX distribution) or to the author of %% the program who can be contacted at %% diff --git a/Master/texmf-dist/tex/latex/tools/q.tex b/Master/texmf-dist/tex/latex/tools/q.tex index 3b11a43450c..ff31f20ce84 100644 --- a/Master/texmf-dist/tex/latex/tools/q.tex +++ b/Master/texmf-dist/tex/latex/tools/q.tex @@ -13,8 +13,8 @@ %% (but please observe conditions on bug reports sent to that address!) %% %% -%% Copyright (C) 1993-2020 -%% The LaTeX3 Project and any individual authors listed elsewhere +%% Copyright (C) 1993-2021 +%% The LaTeX Project and any individual authors listed elsewhere %% in this file. %% %% This file was generated from file(s) of the Standard LaTeX `Tools Bundle'. diff --git a/Master/texmf-dist/tex/latex/tools/r.tex b/Master/texmf-dist/tex/latex/tools/r.tex index 80ef9281fd3..c0d314667a6 100644 --- a/Master/texmf-dist/tex/latex/tools/r.tex +++ b/Master/texmf-dist/tex/latex/tools/r.tex @@ -13,8 +13,8 @@ %% (but please observe conditions on bug reports sent to that address!) %% %% -%% Copyright (C) 1993-2020 -%% The LaTeX3 Project and any individual authors listed elsewhere +%% Copyright (C) 1993-2021 +%% The LaTeX Project and any individual authors listed elsewhere %% in this file. %% %% This file was generated from file(s) of the Standard LaTeX `Tools Bundle'. diff --git a/Master/texmf-dist/tex/latex/tools/rawfonts.sty b/Master/texmf-dist/tex/latex/tools/rawfonts.sty index e33ced89f86..8689f0634fc 100644 --- a/Master/texmf-dist/tex/latex/tools/rawfonts.sty +++ b/Master/texmf-dist/tex/latex/tools/rawfonts.sty @@ -13,8 +13,8 @@ %% (but please observe conditions on bug reports sent to that address!) %% %% -%% Copyright (C) 1993-2020 -%% The LaTeX3 Project and any individual authors listed elsewhere +%% Copyright (C) 1993-2021 +%% The LaTeX Project and any individual authors listed elsewhere %% in this file. %% %% This file was generated from file(s) of the Standard LaTeX `Tools Bundle'. diff --git a/Master/texmf-dist/tex/latex/tools/s.tex b/Master/texmf-dist/tex/latex/tools/s.tex index a2efe1d35f9..954601c8146 100644 --- a/Master/texmf-dist/tex/latex/tools/s.tex +++ b/Master/texmf-dist/tex/latex/tools/s.tex @@ -13,8 +13,8 @@ %% (but please observe conditions on bug reports sent to that address!) %% %% -%% Copyright (C) 1993-2020 -%% The LaTeX3 Project and any individual authors listed elsewhere +%% Copyright (C) 1993-2021 +%% The LaTeX Project and any individual authors listed elsewhere %% in this file. %% %% This file was generated from file(s) of the Standard LaTeX `Tools Bundle'. diff --git a/Master/texmf-dist/tex/latex/tools/shellesc.sty b/Master/texmf-dist/tex/latex/tools/shellesc.sty index a898d013712..d5df721ffc1 100644 --- a/Master/texmf-dist/tex/latex/tools/shellesc.sty +++ b/Master/texmf-dist/tex/latex/tools/shellesc.sty @@ -13,8 +13,8 @@ %% (but please observe conditions on bug reports sent to that address!) %% %% -%% Copyright (C) 1993-2020 -%% The LaTeX3 Project and any individual authors listed elsewhere +%% Copyright (C) 1993-2021 +%% The LaTeX Project and any individual authors listed elsewhere %% in this file. %% %% This file was generated from file(s) of the Standard LaTeX `Tools Bundle'. @@ -36,9 +36,9 @@ %% given in the file `manifest.txt'. %% %% Source File: shellesc.dtx -%% Copyright (C) 2015-2020 +%% Copyright (C) 2015-2021 %% -%% The LaTeX3 Project and any individual authors listed elsewhere +%% The LaTeX Project and any individual authors listed elsewhere %% in this file. %% %% This file may be distributed under the terms of the LPPL. diff --git a/Master/texmf-dist/tex/latex/tools/showkeys.sty b/Master/texmf-dist/tex/latex/tools/showkeys.sty index 80b28e14032..9bd00e52119 100644 --- a/Master/texmf-dist/tex/latex/tools/showkeys.sty +++ b/Master/texmf-dist/tex/latex/tools/showkeys.sty @@ -13,8 +13,8 @@ %% (but please observe conditions on bug reports sent to that address!) %% %% -%% Copyright (C) 1993-2020 -%% The LaTeX3 Project and any individual authors listed elsewhere +%% Copyright (C) 1993-2021 +%% The LaTeX Project and any individual authors listed elsewhere %% in this file. %% %% This file was generated from file(s) of the Standard LaTeX `Tools Bundle'. @@ -36,7 +36,7 @@ %% given in the file `manifest.txt'. %% %% File: showkeys.dtx Copyright (C) 1992-1997 David Carlisle -%% File: showkeys.dtx Copyright (C) 2006-2019 David Carlisle, LaTeX3 Project +%% File: showkeys.dtx Copyright (C) 2006-2019 David Carlisle, LaTeX Project \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{showkeys} [2014/10/28 v3.17 Show cite and label keys (DPC, MH)] diff --git a/Master/texmf-dist/tex/latex/tools/somedefs.sty b/Master/texmf-dist/tex/latex/tools/somedefs.sty index 8f59ac43ee1..320ec7306a3 100644 --- a/Master/texmf-dist/tex/latex/tools/somedefs.sty +++ b/Master/texmf-dist/tex/latex/tools/somedefs.sty @@ -13,8 +13,8 @@ %% (but please observe conditions on bug reports sent to that address!) %% %% -%% Copyright (C) 1993-2020 -%% The LaTeX3 Project and any individual authors listed elsewhere +%% Copyright (C) 1993-2021 +%% The LaTeX Project and any individual authors listed elsewhere %% in this file. %% %% This file was generated from file(s) of the Standard LaTeX `Tools Bundle'. diff --git a/Master/texmf-dist/tex/latex/tools/tabularx.sty b/Master/texmf-dist/tex/latex/tools/tabularx.sty index a99f6075901..31ef9883f9a 100644 --- a/Master/texmf-dist/tex/latex/tools/tabularx.sty +++ b/Master/texmf-dist/tex/latex/tools/tabularx.sty @@ -12,8 +12,8 @@ %% 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 +%% Copyright (C) 1993-2021 +%% The LaTeX Project and any individual authors listed elsewhere %% in this file. %% %% This file was generated from file(s) of the Standard LaTeX `Tools Bundle'. diff --git a/Master/texmf-dist/tex/latex/tools/thb.sty b/Master/texmf-dist/tex/latex/tools/thb.sty index 1959f0ebf65..9c62adecb90 100644 --- a/Master/texmf-dist/tex/latex/tools/thb.sty +++ b/Master/texmf-dist/tex/latex/tools/thb.sty @@ -13,8 +13,8 @@ %% (but please observe conditions on bug reports sent to that address!) %% %% -%% Copyright (C) 1993-2020 -%% The LaTeX3 Project and any individual authors listed elsewhere +%% Copyright (C) 1993-2021 +%% The LaTeX Project and any individual authors listed elsewhere %% in this file. %% %% This file was generated from file(s) of the Standard LaTeX `Tools Bundle'. diff --git a/Master/texmf-dist/tex/latex/tools/thc.sty b/Master/texmf-dist/tex/latex/tools/thc.sty index 820569e26f1..48ffefc37f6 100644 --- a/Master/texmf-dist/tex/latex/tools/thc.sty +++ b/Master/texmf-dist/tex/latex/tools/thc.sty @@ -13,8 +13,8 @@ %% (but please observe conditions on bug reports sent to that address!) %% %% -%% Copyright (C) 1993-2020 -%% The LaTeX3 Project and any individual authors listed elsewhere +%% Copyright (C) 1993-2021 +%% The LaTeX Project and any individual authors listed elsewhere %% in this file. %% %% This file was generated from file(s) of the Standard LaTeX `Tools Bundle'. diff --git a/Master/texmf-dist/tex/latex/tools/thcb.sty b/Master/texmf-dist/tex/latex/tools/thcb.sty index 9bc9b9f029d..b7a2ebeb003 100644 --- a/Master/texmf-dist/tex/latex/tools/thcb.sty +++ b/Master/texmf-dist/tex/latex/tools/thcb.sty @@ -13,8 +13,8 @@ %% (but please observe conditions on bug reports sent to that address!) %% %% -%% Copyright (C) 1993-2020 -%% The LaTeX3 Project and any individual authors listed elsewhere +%% Copyright (C) 1993-2021 +%% The LaTeX Project and any individual authors listed elsewhere %% in this file. %% %% This file was generated from file(s) of the Standard LaTeX `Tools Bundle'. diff --git a/Master/texmf-dist/tex/latex/tools/theorem.sty b/Master/texmf-dist/tex/latex/tools/theorem.sty index 6918fc4c0b4..6e6712e58dd 100644 --- a/Master/texmf-dist/tex/latex/tools/theorem.sty +++ b/Master/texmf-dist/tex/latex/tools/theorem.sty @@ -13,8 +13,8 @@ %% (but please observe conditions on bug reports sent to that address!) %% %% -%% Copyright (C) 1993-2020 -%% The LaTeX3 Project and any individual authors listed elsewhere +%% Copyright (C) 1993-2021 +%% The LaTeX Project and any individual authors listed elsewhere %% in this file. %% %% This file was generated from file(s) of the Standard LaTeX `Tools Bundle'. diff --git a/Master/texmf-dist/tex/latex/tools/thm.sty b/Master/texmf-dist/tex/latex/tools/thm.sty index 7c39a31c345..e3a1ee99ee4 100644 --- a/Master/texmf-dist/tex/latex/tools/thm.sty +++ b/Master/texmf-dist/tex/latex/tools/thm.sty @@ -13,8 +13,8 @@ %% (but please observe conditions on bug reports sent to that address!) %% %% -%% Copyright (C) 1993-2020 -%% The LaTeX3 Project and any individual authors listed elsewhere +%% Copyright (C) 1993-2021 +%% The LaTeX Project and any individual authors listed elsewhere %% in this file. %% %% This file was generated from file(s) of the Standard LaTeX `Tools Bundle'. diff --git a/Master/texmf-dist/tex/latex/tools/thmb.sty b/Master/texmf-dist/tex/latex/tools/thmb.sty index ed2db74a501..5552b61e422 100644 --- a/Master/texmf-dist/tex/latex/tools/thmb.sty +++ b/Master/texmf-dist/tex/latex/tools/thmb.sty @@ -13,8 +13,8 @@ %% (but please observe conditions on bug reports sent to that address!) %% %% -%% Copyright (C) 1993-2020 -%% The LaTeX3 Project and any individual authors listed elsewhere +%% Copyright (C) 1993-2021 +%% The LaTeX Project and any individual authors listed elsewhere %% in this file. %% %% This file was generated from file(s) of the Standard LaTeX `Tools Bundle'. diff --git a/Master/texmf-dist/tex/latex/tools/thp.sty b/Master/texmf-dist/tex/latex/tools/thp.sty index b2675102c16..628ce499d32 100644 --- a/Master/texmf-dist/tex/latex/tools/thp.sty +++ b/Master/texmf-dist/tex/latex/tools/thp.sty @@ -13,8 +13,8 @@ %% (but please observe conditions on bug reports sent to that address!) %% %% -%% Copyright (C) 1993-2020 -%% The LaTeX3 Project and any individual authors listed elsewhere +%% Copyright (C) 1993-2021 +%% The LaTeX Project and any individual authors listed elsewhere %% in this file. %% %% This file was generated from file(s) of the Standard LaTeX `Tools Bundle'. diff --git a/Master/texmf-dist/tex/latex/tools/trace.sty b/Master/texmf-dist/tex/latex/tools/trace.sty index 7796b5d71ab..e43c50706bb 100644 --- a/Master/texmf-dist/tex/latex/tools/trace.sty +++ b/Master/texmf-dist/tex/latex/tools/trace.sty @@ -13,8 +13,8 @@ %% (but please observe conditions on bug reports sent to that address!) %% %% -%% Copyright (C) 1993-2020 -%% The LaTeX3 Project and any individual authors listed elsewhere +%% Copyright (C) 1993-2021 +%% The LaTeX Project and any individual authors listed elsewhere %% in this file. %% %% This file was generated from file(s) of the Standard LaTeX `Tools Bundle'. @@ -41,7 +41,7 @@ %% \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{trace} - [2018/10/13 v1.1e trace LaTeX code] + [2021/04/18 v1.1f trace LaTeX code] \NeedsTeXFormat{LaTeX2e}[1998/12/01] \DeclareOption{logonly} {\let\tracingonline@p\z@} @@ -57,19 +57,20 @@ \tr@ce@n} %% \tracinglostchars\z@ - \def\tr@ce@n{% - \@tracingtrue + \edef\tr@ce@n{% + \noexpand\@tracingtrue \tracingstats\tw@ \tracingpages\@ne - \tracinglostchars\@ne + \tracinglostchars\thr@@ \tracingparagraphs\@ne \errorcontextlines\maxdimen - \ifnum\tracingoutput=\@ne - \else + \ifdefined\tracingstacklevels \tracingstacklevels\maxdimen \fi + \noexpand\ifnum\tracingoutput=\@ne + \noexpand\else \tracingoutput\tw@ \showboxbreadth\maxdimen \showboxdepth\maxdimen - \fi + \noexpand\fi \errorstopmode \tracingmacros\tw@ \tracinggroups\@ne @@ -78,18 +79,20 @@ \tracingassigns\@ne \tracingonline\tracingonline@p } - \def\conditionally@traceoff{% + \edef\conditionally@traceoff{% \tracingassigns\z@ \tracingrestores\z@ \tracingcommands\z@ \tracingpages\z@ \tracingmacros\z@ - \ifnum\tracingoutput=\tw@ + \noexpand\ifnum\tracingoutput=\tw@ \tracingoutput\z@ \showboxbreadth\m@ne \showboxdepth\m@ne - \fi + \noexpand\fi \tracingstats\@ne + \ifdefined\tracingstacklevels \tracingstacklevels\z@ \fi + \errorcontextlines\m@ne \tracingparagraphs\z@ \tracinggroups\z@ } diff --git a/Master/texmf-dist/tex/latex/tools/varioref-2016-02-16.sty b/Master/texmf-dist/tex/latex/tools/varioref-2016-02-16.sty index 054157117e8..747e89dc605 100644 --- a/Master/texmf-dist/tex/latex/tools/varioref-2016-02-16.sty +++ b/Master/texmf-dist/tex/latex/tools/varioref-2016-02-16.sty @@ -13,7 +13,7 @@ %% (but please observe conditions on bug reports sent to that address!) %% %% Copyright 1993-2017 -%% The LaTeX3 Project and any individual authors listed elsewhere +%% The LaTeX Project and any individual authors listed elsewhere %% in this file. %% %% This file was generated from file(s) of the Standard LaTeX `Tools Bundle'. diff --git a/Master/texmf-dist/tex/latex/tools/varioref.sty b/Master/texmf-dist/tex/latex/tools/varioref.sty index 657cf053a45..b3b21f897bd 100644 --- a/Master/texmf-dist/tex/latex/tools/varioref.sty +++ b/Master/texmf-dist/tex/latex/tools/varioref.sty @@ -12,8 +12,8 @@ %% 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 +%% Copyright (C) 1993-2021 +%% The LaTeX Project and any individual authors listed elsewhere %% in this file. %% %% This file was generated from file(s) of the Standard LaTeX `Tools Bundle'. diff --git a/Master/texmf-dist/tex/latex/tools/verbatim.sty b/Master/texmf-dist/tex/latex/tools/verbatim.sty index 647fe064567..debbe615025 100644 --- a/Master/texmf-dist/tex/latex/tools/verbatim.sty +++ b/Master/texmf-dist/tex/latex/tools/verbatim.sty @@ -13,8 +13,8 @@ %% (but please observe conditions on bug reports sent to that address!) %% %% -%% Copyright (C) 1993-2020 -%% The LaTeX3 Project and any individual authors listed elsewhere +%% Copyright (C) 1993-2021 +%% The LaTeX Project and any individual authors listed elsewhere %% in this file. %% %% This file was generated from file(s) of the Standard LaTeX `Tools Bundle'. diff --git a/Master/texmf-dist/tex/latex/tools/verbtest.tex b/Master/texmf-dist/tex/latex/tools/verbtest.tex index ecf90e591af..47aef3e4165 100644 --- a/Master/texmf-dist/tex/latex/tools/verbtest.tex +++ b/Master/texmf-dist/tex/latex/tools/verbtest.tex @@ -13,8 +13,8 @@ %% (but please observe conditions on bug reports sent to that address!) %% %% -%% Copyright (C) 1993-2020 -%% The LaTeX3 Project and any individual authors listed elsewhere +%% Copyright (C) 1993-2021 +%% The LaTeX Project and any individual authors listed elsewhere %% in this file. %% %% This file was generated from file(s) of the Standard LaTeX `Tools Bundle'. diff --git a/Master/texmf-dist/tex/latex/tools/x.tex b/Master/texmf-dist/tex/latex/tools/x.tex index 70293e61738..2c659372f75 100644 --- a/Master/texmf-dist/tex/latex/tools/x.tex +++ b/Master/texmf-dist/tex/latex/tools/x.tex @@ -13,8 +13,8 @@ %% (but please observe conditions on bug reports sent to that address!) %% %% -%% Copyright (C) 1993-2020 -%% The LaTeX3 Project and any individual authors listed elsewhere +%% Copyright (C) 1993-2021 +%% The LaTeX Project and any individual authors listed elsewhere %% in this file. %% %% This file was generated from file(s) of the Standard LaTeX `Tools Bundle'. diff --git a/Master/texmf-dist/tex/latex/tools/xr.sty b/Master/texmf-dist/tex/latex/tools/xr.sty index 3f448c9f21a..93fb1bbdb98 100644 --- a/Master/texmf-dist/tex/latex/tools/xr.sty +++ b/Master/texmf-dist/tex/latex/tools/xr.sty @@ -13,8 +13,8 @@ %% (but please observe conditions on bug reports sent to that address!) %% %% -%% Copyright (C) 1993-2020 -%% The LaTeX3 Project and any individual authors listed elsewhere +%% Copyright (C) 1993-2021 +%% The LaTeX Project and any individual authors listed elsewhere %% in this file. %% %% This file was generated from file(s) of the Standard LaTeX `Tools Bundle'. diff --git a/Master/texmf-dist/tex/latex/tools/xspace.sty b/Master/texmf-dist/tex/latex/tools/xspace.sty index 57a7e85ed98..d6cce437da9 100644 --- a/Master/texmf-dist/tex/latex/tools/xspace.sty +++ b/Master/texmf-dist/tex/latex/tools/xspace.sty @@ -13,8 +13,8 @@ %% (but please observe conditions on bug reports sent to that address!) %% %% -%% Copyright (C) 1993-2020 -%% The LaTeX3 Project and any individual authors listed elsewhere +%% Copyright (C) 1993-2021 +%% The LaTeX Project and any individual authors listed elsewhere %% in this file. %% %% This file was generated from file(s) of the Standard LaTeX `Tools Bundle'. |