From 3aeabb285aafc636e2ce6657efe30fa08145072d Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Sat, 27 Feb 2021 21:53:07 +0000 Subject: latex-dev (27feb21) git-svn-id: svn://tug.org/texlive/trunk@57982 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/tex/latex-dev/base/alltt.sty | 6 +- Master/texmf-dist/tex/latex-dev/base/ansinew.def | 4 +- Master/texmf-dist/tex/latex-dev/base/applemac.def | 4 +- Master/texmf-dist/tex/latex-dev/base/article.cls | 6 +- Master/texmf-dist/tex/latex-dev/base/article.sty | 2 +- Master/texmf-dist/tex/latex-dev/base/ascii.def | 4 +- .../texmf-dist/tex/latex-dev/base/atbegshi-ltx.sty | 12 +- .../tex/latex-dev/base/atveryend-ltx.sty | 9 +- Master/texmf-dist/tex/latex-dev/base/bezier.sty | 2 +- Master/texmf-dist/tex/latex-dev/base/bk10.clo | 4 +- Master/texmf-dist/tex/latex-dev/base/bk11.clo | 4 +- Master/texmf-dist/tex/latex-dev/base/bk12.clo | 4 +- Master/texmf-dist/tex/latex-dev/base/book.cls | 6 +- Master/texmf-dist/tex/latex-dev/base/book.sty | 2 +- Master/texmf-dist/tex/latex-dev/base/cp1250.def | 4 +- Master/texmf-dist/tex/latex-dev/base/cp1252.def | 4 +- Master/texmf-dist/tex/latex-dev/base/cp1257.def | 4 +- Master/texmf-dist/tex/latex-dev/base/cp437.def | 4 +- Master/texmf-dist/tex/latex-dev/base/cp437de.def | 4 +- Master/texmf-dist/tex/latex-dev/base/cp850.def | 4 +- Master/texmf-dist/tex/latex-dev/base/cp852.def | 4 +- Master/texmf-dist/tex/latex-dev/base/cp858.def | 4 +- Master/texmf-dist/tex/latex-dev/base/cp865.def | 4 +- Master/texmf-dist/tex/latex-dev/base/decmulti.def | 4 +- .../texmf-dist/tex/latex-dev/base/doc-v3beta.sty | 1241 ++++++++ Master/texmf-dist/tex/latex-dev/base/doc.sty | 2 +- Master/texmf-dist/tex/latex-dev/base/docstrip.tex | 4 +- .../texmf-dist/tex/latex-dev/base/everyshi-ltx.sty | 68 - Master/texmf-dist/tex/latex-dev/base/exscale.sty | 2 +- Master/texmf-dist/tex/latex-dev/base/fix-cm.sty | 2 +- Master/texmf-dist/tex/latex-dev/base/fixltx2e.sty | 2 +- Master/texmf-dist/tex/latex-dev/base/flafter.sty | 2 +- Master/texmf-dist/tex/latex-dev/base/fleqn.clo | 2 +- Master/texmf-dist/tex/latex-dev/base/fleqn.sty | 2 +- Master/texmf-dist/tex/latex-dev/base/fltrace.sty | 2 +- Master/texmf-dist/tex/latex-dev/base/fontenc.sty | 4 +- Master/texmf-dist/tex/latex-dev/base/fontmath.cfg | 4 +- Master/texmf-dist/tex/latex-dev/base/fontmath.ltx | 4 +- Master/texmf-dist/tex/latex-dev/base/fonttext.cfg | 4 +- Master/texmf-dist/tex/latex-dev/base/fonttext.ltx | 4 +- Master/texmf-dist/tex/latex-dev/base/graphpap.sty | 2 +- Master/texmf-dist/tex/latex-dev/base/hyphen.ltx | 2 +- Master/texmf-dist/tex/latex-dev/base/idx.tex | 2 +- Master/texmf-dist/tex/latex-dev/base/ifthen.sty | 4 +- Master/texmf-dist/tex/latex-dev/base/inputenc.sty | 4 +- Master/texmf-dist/tex/latex-dev/base/lablst.tex | 2 +- Master/texmf-dist/tex/latex-dev/base/latex.ltx | 2962 ++++++++++++++++-- Master/texmf-dist/tex/latex-dev/base/latex209.def | 2 +- .../texmf-dist/tex/latex-dev/base/latexrelease.sty | 3279 ++++++++++++++++++-- Master/texmf-dist/tex/latex-dev/base/latexsym.sty | 2 +- Master/texmf-dist/tex/latex-dev/base/latin1.def | 4 +- Master/texmf-dist/tex/latex-dev/base/latin10.def | 4 +- Master/texmf-dist/tex/latex-dev/base/latin2.def | 4 +- Master/texmf-dist/tex/latex-dev/base/latin3.def | 4 +- Master/texmf-dist/tex/latex-dev/base/latin4.def | 4 +- Master/texmf-dist/tex/latex-dev/base/latin5.def | 4 +- Master/texmf-dist/tex/latex-dev/base/latin9.def | 4 +- Master/texmf-dist/tex/latex-dev/base/lcyenc.dfu | 4 +- Master/texmf-dist/tex/latex-dev/base/leqno.clo | 2 +- Master/texmf-dist/tex/latex-dev/base/leqno.sty | 2 +- Master/texmf-dist/tex/latex-dev/base/letter.cls | 2 +- Master/texmf-dist/tex/latex-dev/base/letter.sty | 2 +- Master/texmf-dist/tex/latex-dev/base/ltluatex.lua | 4 +- Master/texmf-dist/tex/latex-dev/base/ltluatex.tex | 4 +- Master/texmf-dist/tex/latex-dev/base/ltnews.cls | 6 +- Master/texmf-dist/tex/latex-dev/base/ltpara.ltx | 171 + Master/texmf-dist/tex/latex-dev/base/ltxcheck.tex | 4 +- Master/texmf-dist/tex/latex-dev/base/ltxdoc.cls | 2 +- Master/texmf-dist/tex/latex-dev/base/ltxguide.cls | 4 +- Master/texmf-dist/tex/latex-dev/base/ly1enc.dfu | 4 +- Master/texmf-dist/tex/latex-dev/base/macce.def | 4 +- Master/texmf-dist/tex/latex-dev/base/makeidx.sty | 2 +- Master/texmf-dist/tex/latex-dev/base/minimal.cls | 2 +- Master/texmf-dist/tex/latex-dev/base/newlfont.sty | 2 +- Master/texmf-dist/tex/latex-dev/base/next.def | 4 +- Master/texmf-dist/tex/latex-dev/base/nfssfont.tex | 2 +- Master/texmf-dist/tex/latex-dev/base/oldlfont.sty | 2 +- Master/texmf-dist/tex/latex-dev/base/omlcmm.fd | 2 +- Master/texmf-dist/tex/latex-dev/base/omlcmr.fd | 2 +- Master/texmf-dist/tex/latex-dev/base/omlenc.def | 4 +- Master/texmf-dist/tex/latex-dev/base/omllcmm.fd | 2 +- Master/texmf-dist/tex/latex-dev/base/omscmr.fd | 2 +- Master/texmf-dist/tex/latex-dev/base/omscmsy.fd | 2 +- Master/texmf-dist/tex/latex-dev/base/omsenc.def | 4 +- Master/texmf-dist/tex/latex-dev/base/omsenc.dfu | 4 +- Master/texmf-dist/tex/latex-dev/base/omslcmsy.fd | 2 +- Master/texmf-dist/tex/latex-dev/base/omxcmex.fd | 2 +- Master/texmf-dist/tex/latex-dev/base/omxlcmex.fd | 2 +- Master/texmf-dist/tex/latex-dev/base/openbib.sty | 2 +- Master/texmf-dist/tex/latex-dev/base/ot1cmdh.fd | 2 +- Master/texmf-dist/tex/latex-dev/base/ot1cmfib.fd | 2 +- Master/texmf-dist/tex/latex-dev/base/ot1cmfr.fd | 2 +- Master/texmf-dist/tex/latex-dev/base/ot1cmr.fd | 2 +- Master/texmf-dist/tex/latex-dev/base/ot1cmss.fd | 2 +- Master/texmf-dist/tex/latex-dev/base/ot1cmtt.fd | 2 +- Master/texmf-dist/tex/latex-dev/base/ot1cmvtt.fd | 2 +- Master/texmf-dist/tex/latex-dev/base/ot1enc.def | 7 +- Master/texmf-dist/tex/latex-dev/base/ot1enc.dfu | 4 +- Master/texmf-dist/tex/latex-dev/base/ot1lcmss.fd | 2 +- Master/texmf-dist/tex/latex-dev/base/ot1lcmtt.fd | 2 +- Master/texmf-dist/tex/latex-dev/base/ot2enc.dfu | 4 +- Master/texmf-dist/tex/latex-dev/base/ot4enc.def | 4 +- Master/texmf-dist/tex/latex-dev/base/preload.cfg | 4 +- Master/texmf-dist/tex/latex-dev/base/preload.ltx | 2 +- Master/texmf-dist/tex/latex-dev/base/proc.cls | 2 +- Master/texmf-dist/tex/latex-dev/base/proc.sty | 2 +- Master/texmf-dist/tex/latex-dev/base/report.cls | 6 +- Master/texmf-dist/tex/latex-dev/base/report.sty | 2 +- Master/texmf-dist/tex/latex-dev/base/sfonts.def | 2 +- Master/texmf-dist/tex/latex-dev/base/shortvrb.sty | 2 +- Master/texmf-dist/tex/latex-dev/base/showidx.sty | 2 +- Master/texmf-dist/tex/latex-dev/base/size10.clo | 4 +- Master/texmf-dist/tex/latex-dev/base/size11.clo | 4 +- Master/texmf-dist/tex/latex-dev/base/size12.clo | 4 +- Master/texmf-dist/tex/latex-dev/base/slides.cls | 2 +- Master/texmf-dist/tex/latex-dev/base/slides.def | 2 +- Master/texmf-dist/tex/latex-dev/base/slides.sty | 2 +- .../texmf-dist/tex/latex-dev/base/source2edoc.cls | 31 +- .../tex/latex-dev/base/structuredlog.sty | 9 +- Master/texmf-dist/tex/latex-dev/base/syntonly.sty | 2 +- Master/texmf-dist/tex/latex-dev/base/t1cmdh.fd | 2 +- Master/texmf-dist/tex/latex-dev/base/t1cmfib.fd | 2 +- Master/texmf-dist/tex/latex-dev/base/t1cmfr.fd | 2 +- Master/texmf-dist/tex/latex-dev/base/t1cmr.fd | 2 +- Master/texmf-dist/tex/latex-dev/base/t1cmss.fd | 2 +- Master/texmf-dist/tex/latex-dev/base/t1cmtt.fd | 2 +- Master/texmf-dist/tex/latex-dev/base/t1cmvtt.fd | 2 +- Master/texmf-dist/tex/latex-dev/base/t1enc.def | 7 +- Master/texmf-dist/tex/latex-dev/base/t1enc.dfu | 13 +- Master/texmf-dist/tex/latex-dev/base/t1enc.sty | 2 +- Master/texmf-dist/tex/latex-dev/base/t1lcmss.fd | 2 +- Master/texmf-dist/tex/latex-dev/base/t1lcmtt.fd | 2 +- Master/texmf-dist/tex/latex-dev/base/t2aenc.dfu | 4 +- Master/texmf-dist/tex/latex-dev/base/t2benc.dfu | 4 +- Master/texmf-dist/tex/latex-dev/base/t2cenc.dfu | 4 +- Master/texmf-dist/tex/latex-dev/base/testpage.tex | 2 +- Master/texmf-dist/tex/latex-dev/base/texsys.cfg | 4 +- .../tex/latex-dev/base/textcomp-2018-08-11.sty | 3 +- Master/texmf-dist/tex/latex-dev/base/textcomp.sty | 12 +- Master/texmf-dist/tex/latex-dev/base/tracefnt.sty | 4 +- Master/texmf-dist/tex/latex-dev/base/ts1cmr.fd | 2 +- Master/texmf-dist/tex/latex-dev/base/ts1cmss.fd | 2 +- Master/texmf-dist/tex/latex-dev/base/ts1cmtt.fd | 2 +- Master/texmf-dist/tex/latex-dev/base/ts1cmvtt.fd | 2 +- Master/texmf-dist/tex/latex-dev/base/ts1enc.def | 14 +- Master/texmf-dist/tex/latex-dev/base/ts1enc.dfu | 4 +- Master/texmf-dist/tex/latex-dev/base/tuenc.def | 14 +- Master/texmf-dist/tex/latex-dev/base/tulmdh.fd | 2 +- Master/texmf-dist/tex/latex-dev/base/tulmr.fd | 2 +- Master/texmf-dist/tex/latex-dev/base/tulmss.fd | 2 +- Master/texmf-dist/tex/latex-dev/base/tulmssq.fd | 2 +- Master/texmf-dist/tex/latex-dev/base/tulmtt.fd | 2 +- Master/texmf-dist/tex/latex-dev/base/tulmvtt.fd | 2 +- Master/texmf-dist/tex/latex-dev/base/ucmr.fd | 2 +- Master/texmf-dist/tex/latex-dev/base/ucmss.fd | 2 +- Master/texmf-dist/tex/latex-dev/base/ucmtt.fd | 2 +- Master/texmf-dist/tex/latex-dev/base/ulasy.fd | 2 +- Master/texmf-dist/tex/latex-dev/base/ullasy.fd | 2 +- Master/texmf-dist/tex/latex-dev/base/utf8-2018.def | 2 +- Master/texmf-dist/tex/latex-dev/base/utf8.def | 4 +- Master/texmf-dist/tex/latex-dev/base/utf8enc.dfu | 13 +- Master/texmf-dist/tex/latex-dev/base/x2enc.dfu | 4 +- 162 files changed, 7431 insertions(+), 858 deletions(-) create mode 100644 Master/texmf-dist/tex/latex-dev/base/doc-v3beta.sty delete mode 100644 Master/texmf-dist/tex/latex-dev/base/everyshi-ltx.sty create mode 100644 Master/texmf-dist/tex/latex-dev/base/ltpara.ltx (limited to 'Master/texmf-dist/tex/latex-dev/base') diff --git a/Master/texmf-dist/tex/latex-dev/base/alltt.sty b/Master/texmf-dist/tex/latex-dev/base/alltt.sty index 0c71d7c7d07..21591058bc2 100644 --- a/Master/texmf-dist/tex/latex-dev/base/alltt.sty +++ b/Master/texmf-dist/tex/latex-dev/base/alltt.sty @@ -14,7 +14,7 @@ %% %% %% Copyright (C) 1993-2021 -%% 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 LaTeX base system. @@ -44,12 +44,12 @@ %% %% File `alltt.dtx'. %% Copyright (C) 1987 by Leslie Lamport -%% Copyright (C) 1994--2020 LaTeX3 project, Johannes Braams +%% Copyright (C) 1994-2021 LaTeX Project, Johannes Braams %% all rights reserved. %% \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{alltt} - [2020/11/23 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-dev/base/ansinew.def b/Master/texmf-dist/tex/latex-dev/base/ansinew.def index fa53bcfcaec..240348a5b65 100644 --- a/Master/texmf-dist/tex/latex-dev/base/ansinew.def +++ b/Master/texmf-dist/tex/latex-dev/base/ansinew.def @@ -14,7 +14,7 @@ %% %% %% Copyright (C) 1993-2021 -%% 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 LaTeX base system. @@ -44,7 +44,7 @@ \ProvidesFile{ansinew.def} - [2020/11/26 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-dev/base/applemac.def b/Master/texmf-dist/tex/latex-dev/base/applemac.def index b2fb63ee0e4..afffbb60c3f 100644 --- a/Master/texmf-dist/tex/latex-dev/base/applemac.def +++ b/Master/texmf-dist/tex/latex-dev/base/applemac.def @@ -14,7 +14,7 @@ %% %% %% Copyright (C) 1993-2021 -%% 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 LaTeX base system. @@ -44,7 +44,7 @@ \ProvidesFile{applemac.def} - [2020/11/26 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-dev/base/article.cls b/Master/texmf-dist/tex/latex-dev/base/article.cls index d41f14718f8..dcdec4055d7 100644 --- a/Master/texmf-dist/tex/latex-dev/base/article.cls +++ b/Master/texmf-dist/tex/latex-dev/base/article.cls @@ -14,7 +14,7 @@ %% %% %% Copyright (C) 1993-2021 -%% 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 LaTeX base system. @@ -43,7 +43,7 @@ %% extension .ins) which are part of the distribution. \NeedsTeXFormat{LaTeX2e}[1995/12/01] \ProvidesClass{article} - [2020/11/23 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-dev/base/article.sty b/Master/texmf-dist/tex/latex-dev/base/article.sty index e9b6be2910f..4d417986b0b 100644 --- a/Master/texmf-dist/tex/latex-dev/base/article.sty +++ b/Master/texmf-dist/tex/latex-dev/base/article.sty @@ -14,7 +14,7 @@ %% %% %% Copyright (C) 1993-2021 -%% 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 LaTeX base system. diff --git a/Master/texmf-dist/tex/latex-dev/base/ascii.def b/Master/texmf-dist/tex/latex-dev/base/ascii.def index 2d1e17eb0ac..51d807cde83 100644 --- a/Master/texmf-dist/tex/latex-dev/base/ascii.def +++ b/Master/texmf-dist/tex/latex-dev/base/ascii.def @@ -14,7 +14,7 @@ %% %% %% Copyright (C) 1993-2021 -%% 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 LaTeX base system. @@ -44,7 +44,7 @@ \ProvidesFile{ascii.def} - [2020/11/26 v1.3d Input encoding file] + [2021/02/14 v1.3d Input encoding file] \@inpenc@test \endinput %% diff --git a/Master/texmf-dist/tex/latex-dev/base/atbegshi-ltx.sty b/Master/texmf-dist/tex/latex-dev/base/atbegshi-ltx.sty index 9430b81d7af..ae05a7a297e 100644 --- a/Master/texmf-dist/tex/latex-dev/base/atbegshi-ltx.sty +++ b/Master/texmf-dist/tex/latex-dev/base/atbegshi-ltx.sty @@ -14,7 +14,7 @@ %% %% %% Copyright (C) 1993-2021 -%% 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 LaTeX base system. @@ -42,13 +42,14 @@ %% 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,2021 Frank Mittelbach, LaTeX Team +%% Copyright (C) 2020-2021 +%% Frank Mittelbach, LaTeX Team %% %%% From File: ltshipout.dtx -\providecommand\ltshipoutversion{v1.0d} -\providecommand\ltshipoutdate{2020/12/06} +\providecommand\ltshipoutversion{v1.0i} +\providecommand\ltshipoutdate{2021/01/25} \ProvidesPackage{atbegshi-ltx} - [2020/10/15 v1.0b + [2021/01/10 v1.0c Emulation of the original atbegshi^^Jpackage with kernel methods] \let \AtBeginShipoutBox \ShipoutBox \let \AtBeginShipoutInit \@empty @@ -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-dev/base/atveryend-ltx.sty b/Master/texmf-dist/tex/latex-dev/base/atveryend-ltx.sty index 6091c23923e..543e9332dc5 100644 --- a/Master/texmf-dist/tex/latex-dev/base/atveryend-ltx.sty +++ b/Master/texmf-dist/tex/latex-dev/base/atveryend-ltx.sty @@ -14,7 +14,7 @@ %% %% %% Copyright (C) 1993-2021 -%% 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 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,2021 Frank Mittelbach, -%% Phelype Oleinik & LaTeX Team %%% From File: ltfilehook.dtx -\providecommand\ltfilehookversion{v1.0e} -\providecommand\ltfilehookdate{2021/01/07} +\providecommand\ltfilehookversion{v1.0g} +\providecommand\ltfilehookdate{2021/02/08} \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-dev/base/bezier.sty b/Master/texmf-dist/tex/latex-dev/base/bezier.sty index 14654debe06..81247a5d1ea 100644 --- a/Master/texmf-dist/tex/latex-dev/base/bezier.sty +++ b/Master/texmf-dist/tex/latex-dev/base/bezier.sty @@ -14,7 +14,7 @@ %% %% %% Copyright (C) 1993-2021 -%% 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 LaTeX base system. diff --git a/Master/texmf-dist/tex/latex-dev/base/bk10.clo b/Master/texmf-dist/tex/latex-dev/base/bk10.clo index 1170f54ed25..2c0f767465c 100644 --- a/Master/texmf-dist/tex/latex-dev/base/bk10.clo +++ b/Master/texmf-dist/tex/latex-dev/base/bk10.clo @@ -14,7 +14,7 @@ %% %% %% Copyright (C) 1993-2021 -%% 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 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/11/23 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-dev/base/bk11.clo b/Master/texmf-dist/tex/latex-dev/base/bk11.clo index 82d4a558e54..1159de85bde 100644 --- a/Master/texmf-dist/tex/latex-dev/base/bk11.clo +++ b/Master/texmf-dist/tex/latex-dev/base/bk11.clo @@ -14,7 +14,7 @@ %% %% %% Copyright (C) 1993-2021 -%% 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 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/11/23 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-dev/base/bk12.clo b/Master/texmf-dist/tex/latex-dev/base/bk12.clo index d55f3f7ad16..0f9c2b473a9 100644 --- a/Master/texmf-dist/tex/latex-dev/base/bk12.clo +++ b/Master/texmf-dist/tex/latex-dev/base/bk12.clo @@ -14,7 +14,7 @@ %% %% %% Copyright (C) 1993-2021 -%% 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 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/11/23 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-dev/base/book.cls b/Master/texmf-dist/tex/latex-dev/base/book.cls index 889039e127b..fb4d4b16a28 100644 --- a/Master/texmf-dist/tex/latex-dev/base/book.cls +++ b/Master/texmf-dist/tex/latex-dev/base/book.cls @@ -14,7 +14,7 @@ %% %% %% Copyright (C) 1993-2021 -%% 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 LaTeX base system. @@ -43,7 +43,7 @@ %% extension .ins) which are part of the distribution. \NeedsTeXFormat{LaTeX2e}[1995/12/01] \ProvidesClass{book} - [2020/11/23 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-dev/base/book.sty b/Master/texmf-dist/tex/latex-dev/base/book.sty index 3ff649cf110..ed98bc4ef8c 100644 --- a/Master/texmf-dist/tex/latex-dev/base/book.sty +++ b/Master/texmf-dist/tex/latex-dev/base/book.sty @@ -14,7 +14,7 @@ %% %% %% Copyright (C) 1993-2021 -%% 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 LaTeX base system. diff --git a/Master/texmf-dist/tex/latex-dev/base/cp1250.def b/Master/texmf-dist/tex/latex-dev/base/cp1250.def index c1ed319afd5..b2036392655 100644 --- a/Master/texmf-dist/tex/latex-dev/base/cp1250.def +++ b/Master/texmf-dist/tex/latex-dev/base/cp1250.def @@ -14,7 +14,7 @@ %% %% %% Copyright (C) 1993-2021 -%% 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 LaTeX base system. @@ -44,7 +44,7 @@ \ProvidesFile{cp1250.def} - [2020/11/26 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-dev/base/cp1252.def b/Master/texmf-dist/tex/latex-dev/base/cp1252.def index 2415991e74b..811fa845bf4 100644 --- a/Master/texmf-dist/tex/latex-dev/base/cp1252.def +++ b/Master/texmf-dist/tex/latex-dev/base/cp1252.def @@ -14,7 +14,7 @@ %% %% %% Copyright (C) 1993-2021 -%% 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 LaTeX base system. @@ -44,7 +44,7 @@ \ProvidesFile{cp1252.def} - [2020/11/26 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-dev/base/cp1257.def b/Master/texmf-dist/tex/latex-dev/base/cp1257.def index 4a8961cfc05..032caee7d3f 100644 --- a/Master/texmf-dist/tex/latex-dev/base/cp1257.def +++ b/Master/texmf-dist/tex/latex-dev/base/cp1257.def @@ -14,7 +14,7 @@ %% %% %% Copyright (C) 1993-2021 -%% 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 LaTeX base system. @@ -44,7 +44,7 @@ \ProvidesFile{cp1257.def} - [2020/11/26 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-dev/base/cp437.def b/Master/texmf-dist/tex/latex-dev/base/cp437.def index c8d954235f8..4480f7610e4 100644 --- a/Master/texmf-dist/tex/latex-dev/base/cp437.def +++ b/Master/texmf-dist/tex/latex-dev/base/cp437.def @@ -14,7 +14,7 @@ %% %% %% Copyright (C) 1993-2021 -%% 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 LaTeX base system. @@ -44,7 +44,7 @@ \ProvidesFile{cp437.def} - [2020/11/26 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-dev/base/cp437de.def b/Master/texmf-dist/tex/latex-dev/base/cp437de.def index 6db04a531e7..acc5a6a62a5 100644 --- a/Master/texmf-dist/tex/latex-dev/base/cp437de.def +++ b/Master/texmf-dist/tex/latex-dev/base/cp437de.def @@ -14,7 +14,7 @@ %% %% %% Copyright (C) 1993-2021 -%% 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 LaTeX base system. @@ -44,7 +44,7 @@ \ProvidesFile{cp437de.def} - [2020/11/26 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-dev/base/cp850.def b/Master/texmf-dist/tex/latex-dev/base/cp850.def index 5a9052a6632..7f6661530af 100644 --- a/Master/texmf-dist/tex/latex-dev/base/cp850.def +++ b/Master/texmf-dist/tex/latex-dev/base/cp850.def @@ -14,7 +14,7 @@ %% %% %% Copyright (C) 1993-2021 -%% 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 LaTeX base system. @@ -44,7 +44,7 @@ \ProvidesFile{cp850.def} - [2020/11/26 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-dev/base/cp852.def b/Master/texmf-dist/tex/latex-dev/base/cp852.def index 8eb18ad9e3c..d7e359ac232 100644 --- a/Master/texmf-dist/tex/latex-dev/base/cp852.def +++ b/Master/texmf-dist/tex/latex-dev/base/cp852.def @@ -14,7 +14,7 @@ %% %% %% Copyright (C) 1993-2021 -%% 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 LaTeX base system. @@ -44,7 +44,7 @@ \ProvidesFile{cp852.def} - [2020/11/26 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-dev/base/cp858.def b/Master/texmf-dist/tex/latex-dev/base/cp858.def index 11911df492d..2de2a28e57a 100644 --- a/Master/texmf-dist/tex/latex-dev/base/cp858.def +++ b/Master/texmf-dist/tex/latex-dev/base/cp858.def @@ -14,7 +14,7 @@ %% %% %% Copyright (C) 1993-2021 -%% 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 LaTeX base system. @@ -44,7 +44,7 @@ \ProvidesFile{cp858.def} - [2020/11/26 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-dev/base/cp865.def b/Master/texmf-dist/tex/latex-dev/base/cp865.def index fea2752ce9a..9d8baa0915d 100644 --- a/Master/texmf-dist/tex/latex-dev/base/cp865.def +++ b/Master/texmf-dist/tex/latex-dev/base/cp865.def @@ -14,7 +14,7 @@ %% %% %% Copyright (C) 1993-2021 -%% 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 LaTeX base system. @@ -44,7 +44,7 @@ \ProvidesFile{cp865.def} - [2020/11/26 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-dev/base/decmulti.def b/Master/texmf-dist/tex/latex-dev/base/decmulti.def index e50f32e9fba..82991e5080c 100644 --- a/Master/texmf-dist/tex/latex-dev/base/decmulti.def +++ b/Master/texmf-dist/tex/latex-dev/base/decmulti.def @@ -14,7 +14,7 @@ %% %% %% Copyright (C) 1993-2021 -%% 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 LaTeX base system. @@ -44,7 +44,7 @@ \ProvidesFile{decmulti.def} - [2020/11/26 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-dev/base/doc-v3beta.sty b/Master/texmf-dist/tex/latex-dev/base/doc-v3beta.sty new file mode 100644 index 00000000000..eeac71568cf --- /dev/null +++ b/Master/texmf-dist/tex/latex-dev/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-dev/base/doc.sty b/Master/texmf-dist/tex/latex-dev/base/doc.sty index 915d61596c8..87391f58d6e 100644 --- a/Master/texmf-dist/tex/latex-dev/base/doc.sty +++ b/Master/texmf-dist/tex/latex-dev/base/doc.sty @@ -14,7 +14,7 @@ %% %% %% Copyright (C) 1993-2021 -%% 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 LaTeX base system. diff --git a/Master/texmf-dist/tex/latex-dev/base/docstrip.tex b/Master/texmf-dist/tex/latex-dev/base/docstrip.tex index 9d1337b3bf2..a2ddc50ec35 100644 --- a/Master/texmf-dist/tex/latex-dev/base/docstrip.tex +++ b/Master/texmf-dist/tex/latex-dev/base/docstrip.tex @@ -14,7 +14,7 @@ %% %% %% Copyright (C) 1993-2021 -%% 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 LaTeX base system. @@ -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-dev/base/everyshi-ltx.sty b/Master/texmf-dist/tex/latex-dev/base/everyshi-ltx.sty deleted file mode 100644 index e23e82e7e1f..00000000000 --- a/Master/texmf-dist/tex/latex-dev/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-2021 -%% 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,2021 Frank Mittelbach, LaTeX Team -%% -%%% From File: ltshipout.dtx -\providecommand\ltshipoutversion{v1.0d} -\providecommand\ltshipoutdate{2020/12/06} -\ProvidesPackage{everyshi-ltx} - [2020/10/15 v1.0b - Emulation of the original everyshi^^Jpackage with 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 sufficient to avoid such manipulations (or -%% replace box 255 with \ShipoutBox in the code. -%% -%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -\endinput -%% -%% End of file `everyshi-ltx.sty'. diff --git a/Master/texmf-dist/tex/latex-dev/base/exscale.sty b/Master/texmf-dist/tex/latex-dev/base/exscale.sty index da7ea3d3ce8..8cd29c30905 100644 --- a/Master/texmf-dist/tex/latex-dev/base/exscale.sty +++ b/Master/texmf-dist/tex/latex-dev/base/exscale.sty @@ -14,7 +14,7 @@ %% %% %% Copyright (C) 1993-2021 -%% 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 LaTeX base system. diff --git a/Master/texmf-dist/tex/latex-dev/base/fix-cm.sty b/Master/texmf-dist/tex/latex-dev/base/fix-cm.sty index b7124ce7fe6..5a955c85a78 100644 --- a/Master/texmf-dist/tex/latex-dev/base/fix-cm.sty +++ b/Master/texmf-dist/tex/latex-dev/base/fix-cm.sty @@ -14,7 +14,7 @@ %% %% %% Copyright (C) 1993-2021 -%% 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 LaTeX base system. diff --git a/Master/texmf-dist/tex/latex-dev/base/fixltx2e.sty b/Master/texmf-dist/tex/latex-dev/base/fixltx2e.sty index 9ad5e461cbc..1ddd2c5c96c 100644 --- a/Master/texmf-dist/tex/latex-dev/base/fixltx2e.sty +++ b/Master/texmf-dist/tex/latex-dev/base/fixltx2e.sty @@ -14,7 +14,7 @@ %% %% %% Copyright (C) 1993-2021 -%% 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 LaTeX base system. diff --git a/Master/texmf-dist/tex/latex-dev/base/flafter.sty b/Master/texmf-dist/tex/latex-dev/base/flafter.sty index 40bee68166e..951e5820aa6 100644 --- a/Master/texmf-dist/tex/latex-dev/base/flafter.sty +++ b/Master/texmf-dist/tex/latex-dev/base/flafter.sty @@ -14,7 +14,7 @@ %% %% %% Copyright (C) 1993-2021 -%% 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 LaTeX base system. diff --git a/Master/texmf-dist/tex/latex-dev/base/fleqn.clo b/Master/texmf-dist/tex/latex-dev/base/fleqn.clo index 4005d9a926e..9e7256d4e20 100644 --- a/Master/texmf-dist/tex/latex-dev/base/fleqn.clo +++ b/Master/texmf-dist/tex/latex-dev/base/fleqn.clo @@ -14,7 +14,7 @@ %% %% %% Copyright (C) 1993-2021 -%% 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 LaTeX base system. diff --git a/Master/texmf-dist/tex/latex-dev/base/fleqn.sty b/Master/texmf-dist/tex/latex-dev/base/fleqn.sty index 18f97f798be..90158c02a1b 100644 --- a/Master/texmf-dist/tex/latex-dev/base/fleqn.sty +++ b/Master/texmf-dist/tex/latex-dev/base/fleqn.sty @@ -14,7 +14,7 @@ %% %% %% Copyright (C) 1993-2021 -%% 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 LaTeX base system. diff --git a/Master/texmf-dist/tex/latex-dev/base/fltrace.sty b/Master/texmf-dist/tex/latex-dev/base/fltrace.sty index 77759639b7a..1c1e3f24272 100644 --- a/Master/texmf-dist/tex/latex-dev/base/fltrace.sty +++ b/Master/texmf-dist/tex/latex-dev/base/fltrace.sty @@ -14,7 +14,7 @@ %% %% %% Copyright (C) 1993-2021 -%% 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 LaTeX base system. diff --git a/Master/texmf-dist/tex/latex-dev/base/fontenc.sty b/Master/texmf-dist/tex/latex-dev/base/fontenc.sty index 6525c55f142..0bf32c52c98 100644 --- a/Master/texmf-dist/tex/latex-dev/base/fontenc.sty +++ b/Master/texmf-dist/tex/latex-dev/base/fontenc.sty @@ -14,7 +14,7 @@ %% %% %% Copyright (C) 1993-2021 -%% 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 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/02/19 v2.0u Standard LaTeX package] \def\update@uclc@with@cyrillic{% \expandafter\def\expandafter\@uclclist\expandafter diff --git a/Master/texmf-dist/tex/latex-dev/base/fontmath.cfg b/Master/texmf-dist/tex/latex-dev/base/fontmath.cfg index 4eb3df74f3d..1bdec3f2425 100644 --- a/Master/texmf-dist/tex/latex-dev/base/fontmath.cfg +++ b/Master/texmf-dist/tex/latex-dev/base/fontmath.cfg @@ -9,7 +9,7 @@ %% This is a generated file. %% %% Copyright (C) 1993-2021 -%% 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 LaTeX base system. @@ -37,7 +37,7 @@ %% %%% From File: fontdef.dtx \ProvidesFile{fontmath.cfg} - [2020/11/24 v3.0i LaTeX Kernel + [2021/01/15 v3.0i LaTeX Kernel (Uncustomized math font setup)] %% diff --git a/Master/texmf-dist/tex/latex-dev/base/fontmath.ltx b/Master/texmf-dist/tex/latex-dev/base/fontmath.ltx index d3789b91529..3e7f2963b71 100644 --- a/Master/texmf-dist/tex/latex-dev/base/fontmath.ltx +++ b/Master/texmf-dist/tex/latex-dev/base/fontmath.ltx @@ -9,7 +9,7 @@ %% This is a generated file. %% %% Copyright (C) 1993-2021 -%% 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 LaTeX base system. @@ -37,7 +37,7 @@ %% %%% From File: fontdef.dtx \ProvidesFile{fontmath.ltx} - [2020/11/24 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-dev/base/fonttext.cfg b/Master/texmf-dist/tex/latex-dev/base/fonttext.cfg index 2bca55fcfea..d53d7db8fa4 100644 --- a/Master/texmf-dist/tex/latex-dev/base/fonttext.cfg +++ b/Master/texmf-dist/tex/latex-dev/base/fonttext.cfg @@ -9,7 +9,7 @@ %% This is a generated file. %% %% Copyright (C) 1993-2021 -%% 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 LaTeX base system. @@ -37,7 +37,7 @@ %% %%% From File: fontdef.dtx \ProvidesFile{fonttext.cfg} - [2020/11/24 v3.0i LaTeX Kernel + [2021/01/15 v3.0i LaTeX Kernel (Uncustomized text font setup)] %% diff --git a/Master/texmf-dist/tex/latex-dev/base/fonttext.ltx b/Master/texmf-dist/tex/latex-dev/base/fonttext.ltx index 64c969907a7..fb78a273973 100644 --- a/Master/texmf-dist/tex/latex-dev/base/fonttext.ltx +++ b/Master/texmf-dist/tex/latex-dev/base/fonttext.ltx @@ -9,7 +9,7 @@ %% This is a generated file. %% %% Copyright (C) 1993-2021 -%% 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 LaTeX base system. @@ -37,7 +37,7 @@ %% %%% From File: fontdef.dtx \ProvidesFile{fonttext.ltx} - [2020/11/24 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-dev/base/graphpap.sty b/Master/texmf-dist/tex/latex-dev/base/graphpap.sty index 1d7f9836f15..9c5cbf867c9 100644 --- a/Master/texmf-dist/tex/latex-dev/base/graphpap.sty +++ b/Master/texmf-dist/tex/latex-dev/base/graphpap.sty @@ -14,7 +14,7 @@ %% %% %% Copyright (C) 1993-2021 -%% 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 LaTeX base system. diff --git a/Master/texmf-dist/tex/latex-dev/base/hyphen.ltx b/Master/texmf-dist/tex/latex-dev/base/hyphen.ltx index 1e50f043e7f..0135fe91078 100644 --- a/Master/texmf-dist/tex/latex-dev/base/hyphen.ltx +++ b/Master/texmf-dist/tex/latex-dev/base/hyphen.ltx @@ -9,7 +9,7 @@ %% This is a generated file. %% %% Copyright (C) 1993-2021 -%% 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 LaTeX base system. diff --git a/Master/texmf-dist/tex/latex-dev/base/idx.tex b/Master/texmf-dist/tex/latex-dev/base/idx.tex index 89f8b1f9a01..8257396f81f 100644 --- a/Master/texmf-dist/tex/latex-dev/base/idx.tex +++ b/Master/texmf-dist/tex/latex-dev/base/idx.tex @@ -1,7 +1,7 @@ % \iffalse meta-comment % % Copyright (C) 1993-2021 -% 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-dev/base/ifthen.sty b/Master/texmf-dist/tex/latex-dev/base/ifthen.sty index e444453e80f..ccb5dba4ea9 100644 --- a/Master/texmf-dist/tex/latex-dev/base/ifthen.sty +++ b/Master/texmf-dist/tex/latex-dev/base/ifthen.sty @@ -14,7 +14,7 @@ %% %% %% Copyright (C) 1993-2021 -%% 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 LaTeX base system. @@ -44,7 +44,7 @@ %% %% 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] diff --git a/Master/texmf-dist/tex/latex-dev/base/inputenc.sty b/Master/texmf-dist/tex/latex-dev/base/inputenc.sty index 812b5bd809b..92cd58d7b11 100644 --- a/Master/texmf-dist/tex/latex-dev/base/inputenc.sty +++ b/Master/texmf-dist/tex/latex-dev/base/inputenc.sty @@ -14,7 +14,7 @@ %% %% %% Copyright (C) 1993-2021 -%% 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 LaTeX base system. @@ -45,7 +45,7 @@ \NeedsTeXFormat{LaTeX2e}[1995/12/01] \ProvidesPackage{inputenc} - [2020/11/26 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-dev/base/lablst.tex b/Master/texmf-dist/tex/latex-dev/base/lablst.tex index 643dd6b1f61..da2d7dbceb7 100644 --- a/Master/texmf-dist/tex/latex-dev/base/lablst.tex +++ b/Master/texmf-dist/tex/latex-dev/base/lablst.tex @@ -1,7 +1,7 @@ % \iffalse meta-comment % % Copyright (C) 1993-2021 -% 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-dev/base/latex.ltx b/Master/texmf-dist/tex/latex-dev/base/latex.ltx index 52ab96c7ab0..2d22e178de4 100644 --- a/Master/texmf-dist/tex/latex-dev/base/latex.ltx +++ b/Master/texmf-dist/tex/latex-dev/base/latex.ltx @@ -10,6 +10,7 @@ %% 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') %% ltalloc.dtx (with options: `2ekernel') %% ltcntrl.dtx (with options: `2ekernel') @@ -56,7 +57,7 @@ %% %% %% Copyright (C) 1993-2021 -%% 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 LaTeX base system. @@ -710,7 +711,7 @@ \def\fmtname{LaTeX2e} \edef\fmtversion {2021-05-01} -\def\patch@level{-1} +\def\patch@level{-2} \edef\development@branch@name{develop \the\year-\the\month-\the\day} \iffalse \def\reserved@a#1/#2/#3\@nil{% @@ -738,28 +739,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 } @@ -990,10 +993,11 @@ %%% 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@@{} +\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 +1055,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 @@ -1599,39 +1595,2296 @@ \fi }{}{}% } -\else - \let\-\@@hyph -\fi -\let\@dischyph=\- -\newif\if@includeinrelease -\@includeinreleasefalse -\MakeRobust\allowbreak -\MakeRobust\bigbreak -\MakeRobust\break -\MakeRobust\dotfill -\MakeRobust\frenchspacing -\MakeRobust\goodbreak -\MakeRobust\hrulefill -\MakeRobust\medbreak -\MakeRobust\nobreak -\MakeRobust\nonfrenchspacing -\MakeRobust\obeylines -\MakeRobust\obeyspaces -\MakeRobust\slash -\MakeRobust\smallbreak -\MakeRobust\strut -\MakeRobust\underbar -\long\def\g@addto@macro#1#2{% - \begingroup - \toks@\expandafter{#1#2}% - \xdef#1{\the\toks@}% - \endgroup} -%% -%% File: lthooks.dtx (C) Copyright 2020,2021 Frank Mittelbach, -%% Phelype Oleinik & LaTeX Team +\else + \let\-\@@hyph +\fi +\let\@dischyph=\- +\newif\if@includeinrelease +\@includeinreleasefalse +\MakeRobust\allowbreak +\MakeRobust\bigbreak +\MakeRobust\break +\MakeRobust\dotfill +\MakeRobust\frenchspacing +\MakeRobust\goodbreak +\MakeRobust\hrulefill +\MakeRobust\medbreak +\MakeRobust\nobreak +\MakeRobust\nonfrenchspacing +\MakeRobust\obeylines +\MakeRobust\obeyspaces +\MakeRobust\slash +\MakeRobust\smallbreak +\MakeRobust\strut +\MakeRobust\underbar +\long\def\g@addto@macro#1#2{% + \begingroup + \toks@\expandafter{#1#2}% + \xdef#1{\the\toks@}% + \endgroup} +%%% From File: ltcmd.dtx +\def\ltcmdversion{v1.0a} +\def\ltcmddate{2021/01/21} +\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 { LaTeX / ltcmd } { info } { none } +\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 + { + \__kernel_msg_info:nnxx { ltcmd } { 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 } } + { + \__kernel_msg_warning:nnx { ltcmd } { unsupported-let } + { \token_to_str:N #1 } + } + \__kernel_msg_info:nnxx { ltcmd } { 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 } + { + \__kernel_msg_info:nnxx { ltcmd } { redefine-environment } + { \l__cmd_environment_str } { \tl_to_str:n {#2} } + } + { + \__kernel_msg_info:nnxx { ltcmd } { 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 + { + \__kernel_msg_error:nnx { ltcmd } { 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 + { } { } { } { } { } { } { } { } { } { } + { + \__kernel_msg_expandable_error:nnf + { ltcmd } { 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 + { + \__kernel_msg_error:nnxx { ltcmd } { 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 + { + \__kernel_msg_error:nnxx { ltcmd } { 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 } } + } + { + \__kernel_msg_error:nnxx { ltcmd } { xparse-argument-type } + { \__cmd_environment_or_command: } { \tl_to_str:n {#1} } + } + { + \__kernel_msg_error:nnxx { ltcmd } { 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 + { + \__kernel_msg_error:nnxx { ltcmd } { 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 + { + \__kernel_msg_error:nnxx { ltcmd } { 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 + { + \__kernel_msg_error:nnxx { ltcmd } { 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 + { + \__kernel_msg_error:nnxx + { ltcmd } { 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} + \__kernel_msg_error:nnxx { ltcmd } { 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 + { + \__kernel_msg_error:nnxx { ltcmd } { 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 } + } + { + \__kernel_msg_error:nnxxx + { ltcmd } { 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 + { + \__kernel_msg_error:nnxx + { ltcmd } { 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 + { + \__kernel_msg_error:nnxx + { ltcmd } { 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} + { + \__kernel_msg_warning:nnxx { ltcmd } { optional-mandatory } + {#2} {#3} + } + } + } +\cs_new_protected:Npn \__cmd_bad_arg_spec:wn #1 \__cmd_break_point:n #2 + { + \__kernel_msg_error:nnxx { ltcmd } { 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 + { + \__kernel_msg_error:nnx { ltcmd } { 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 + { + \__kernel_msg_error:nnxx { ltcmd } { 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 } + { + \__kernel_msg_error:nnxx { ltcmd } { 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 } + { + \__kernel_msg_error:nnxxx { ltcmd } { 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 + } + { + \__kernel_msg_error:nnxxx { ltcmd } { 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 + } + { + \__kernel_msg_expandable_error:nnff + { ltcmd } { 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 + } + { + \__kernel_msg_expandable_error:nnff + { ltcmd } { 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 + } + \__kernel_msg_error:nnxxx { ltcmd } { 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 + { + \__kernel_msg_error:nnx { ltcmd } { non-xparse } + { \__cmd_environment_or_command: } + } + { + \__kernel_msg_error:nnx { ltcmd } { unknown } + { \__cmd_environment_or_command: } + } + } +\cs_new_protected:Npn \__cmd_get_arg_spec:NTF #1#2#3 + { + \__cmd_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 } + { + \__kernel_msg_error:nnxx { ltcmd } { not-definable } + { \tl_to_str:n {#1} } { \token_to_str:N #2 } + } + { + \__kernel_msg_error:nnxx { ltcmd } { 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 \__cmd_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 } + ' + } + } +\__kernel_msg_new:nnnn { ltcmd } { 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 + } +\__kernel_msg_new:nnnn { ltcmd } { 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 + } +\__kernel_msg_new:nnnn { ltcmd } { 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. + } +\__kernel_msg_new:nnnn { ltcmd } { 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 + } +\__kernel_msg_new:nnnn { ltcmd } { 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. + } +\__kernel_msg_new:nnnn { ltcmd } { 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 + } +\__kernel_msg_new:nnnn { ltcmd } { 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. + } +\__kernel_msg_new:nnnn { ltcmd } { 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. + } +\__kernel_msg_new:nnnn { ltcmd } { 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. + } +\__kernel_msg_new:nnnn { ltcmd } { 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 + } +\__kernel_msg_new:nnnn { ltcmd } { 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 + } +\__kernel_msg_new:nnnn { ltcmd } { 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 + } +\__kernel_msg_new:nnnn { ltcmd } { 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 + } +\__kernel_msg_new:nnnn { ltcmd } { 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 + } +\__kernel_msg_new:nnnn { ltcmd } { 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 + } +\__kernel_msg_new:nnnn { ltcmd } { 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 + } +\__kernel_msg_new:nnnn { ltcmd } { 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 + } +\__kernel_msg_new:nnnn { ltcmd } { 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 + } +\__kernel_msg_new:nnnn { ltcmd } { 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. + } +\__kernel_msg_new:nnnn { ltcmd } { 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 + } +\__kernel_msg_new:nnnn { ltcmd } { 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 + } +\__kernel_msg_new:nnn { ltcmd } { if-boolean } + { Invalid~use~\iow_char:N\\IfBooleanTF~{#1} } +\__kernel_msg_new:nnnn { ltcmd } { 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. + } +\__kernel_msg_new:nnnn { ltcmd } { 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. + } +\__kernel_msg_new:nnnn { ltcmd } { 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. + } +\__kernel_msg_new:nnnn { ltcmd } { 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. + } +\__kernel_msg_new:nnnn { ltcmd } { unknown } + { Unknown~document~#1. } + { + You~have~asked~for~the~argument~specification~for~the~#1,~ + but~it~is~not~defined. + } +\__kernel_msg_new:nnnn { ltcmd } { 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'. + } +\__kernel_msg_new:nnnn { ltcmd } { 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'. + } +\__kernel_msg_new:nnn { ltcmd } { define-command } + { + Defining~command~#1~ + with~sig.~'#2'~\msg_line_context:. + } +\__kernel_msg_new:nnn { ltcmd } { define-environment } + { + Defining~environment~'#1'~ + with~sig.~'#2'~\msg_line_context:. + } +\__kernel_msg_new:nnn { ltcmd } { redefine-command } + { + Redefining~command~#1~ + with~sig.~'#2'~\msg_line_context:. + } +\__kernel_msg_new:nnn { ltcmd } { redefine-environment } + { + Redefining~environment~'#1'~ + with~sig.~'#2'~\msg_line_context:. + } +\__kernel_msg_new:nnn { ltcmd } { 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. + } +\__kernel_msg_new:nnn { ltcmd } { 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 + { + \__kernel_msg_error:nnxx { ltcmd } { 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} } + { + \__kernel_msg_error:nnxx { ltcmd } { 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} + { \__kernel_msg_error:nnx { ltcmd } { 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} } + { \__kernel_msg_error:nnx { ltcmd } { 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 + { + \__kernel_msg_error:nnxx { ltcmd } { 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} } + { + \__kernel_msg_error:nnxx { ltcmd } { 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: + { + \__kernel_msg_expandable_error:nnn { ltcmd } { 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\lthooksdate{2021/01/15} \ExplSyntaxOn \bool_new:N \g__hook_debug_bool \cs_new_eq:NN \__hook_debug:n \use_none:n @@ -2037,9 +4290,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 } } @@ -5090,7 +7345,7 @@ Type H for immediate help.}% {\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 @@ -5533,7 +7788,7 @@ Type H 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 }% } @@ -6501,16 +8756,12 @@ Type H 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 @@ -6775,6 +9026,7 @@ Type H 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 @@ -6873,7 +9125,6 @@ Type H for immediate help.}% \selectfont#1% \egroup } - \def\tc@fake@euro#1{% \leavevmode \@font@info{Faking \noexpand#1for font family @@ -6886,17 +9137,17 @@ Type H 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} @@ -6937,22 +9188,38 @@ Type H 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} @@ -6971,86 +9238,163 @@ Type H 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}} @@ -7063,12 +9407,12 @@ Type H 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 @@ -7100,31 +9444,32 @@ Type H 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} @@ -7135,11 +9480,11 @@ Type H 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} @@ -7247,7 +9592,7 @@ Type H 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{% @@ -8160,13 +10505,13 @@ Type H 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(%) @@ -8363,6 +10708,7 @@ Type H 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@]}}% @@ -9599,7 +11945,7 @@ Type H for immediate help.}% \hsize\marginparwidth \@parboxrestore \@marginparreset - #2% + #2\par \@minipagefalse \outer@nobreak }% @@ -9663,6 +12009,7 @@ Type H for immediate help.}% \color@begingroup \@makefntext{% \rule\z@\footnotesep\ignorespaces#1\@finalstrut\strutbox}% + \par \color@endgroup}}% \def\footnotemark{% \@ifnextchar[\@xfootnotemark @@ -9693,6 +12040,18 @@ Type H for immediate help.}% \@footnotetext} \def\@mpfn{footnote} \def\thempfn{\thefootnote} +\def\footref#1{% + \begingroup + \unrestored@protected@xdef\@thefnmark{\ref{#1}}% + \endgroup + \@footnotemark +} +%%\IncludeInRelease{0000/00/00}% +%% {\footref}{Add footref}% +%% +%%\let\footref\@undefined +%% +%%\EndIncludeInRelease %%% From File: ltidxglo.dtx \message{index,} \def\makeindex{% @@ -9999,7 +12358,11 @@ Type H 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} @@ -10018,11 +12381,12 @@ Type H 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{% @@ -10073,7 +12437,8 @@ Type H 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 @@ -10171,6 +12536,7 @@ Type H 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}% @@ -10485,7 +12851,8 @@ Type H 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% @@ -10709,12 +13076,9 @@ Type H for immediate help.}% \expandafter\@secondoftwo \fi } -%% -%% File: ltfilehook.dtx (C) Copyright 2020,2021 Frank Mittelbach, -%% Phelype Oleinik & LaTeX Team %%% From File: ltfilehook.dtx -\providecommand\ltfilehookversion{v1.0e} -\providecommand\ltfilehookdate{2021/01/07} +\providecommand\ltfilehookversion{v1.0g} +\providecommand\ltfilehookdate{2021/02/08} \ExplSyntaxOn \tl_new:N \CurrentFile \tl_new:N \CurrentFilePath @@ -10819,7 +13183,8 @@ Type H 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 @@ -10852,6 +13217,7 @@ Type H for immediate help.}% \def\set@curr@file#1{% \begingroup \escapechar\m@ne + \let\protect\string \expandafter\def\csname\expandafter\endcsname \expandafter{\csname\endcsname}% \@expl@@@filehook@if@no@extension@@nTF{#1}% @@ -10983,11 +13349,12 @@ Type H for immediate help.}% \declare@file@substitution{atveryend.sty}{atveryend-ltx.sty} %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% %% -%% File: ltshipout.dtx (C) Copyright 2020,2021 Frank Mittelbach, LaTeX Team +%% Copyright (C) 2020-2021 +%% Frank Mittelbach, LaTeX Team %% %%% From File: ltshipout.dtx -\providecommand\ltshipoutversion{v1.0d} -\providecommand\ltshipoutdate{2020/12/06} +\providecommand\ltshipoutversion{v1.0i} +\providecommand\ltshipoutdate{2021/01/25} \ExplSyntaxOn \bool_new:N \g__shipout_debug_bool \cs_new_eq:NN \__shipout_debug:n \use_none:n @@ -11008,6 +13375,27 @@ Type H 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 } @@ -11019,26 +13407,43 @@ Type H 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 } } @@ -11048,53 +13453,89 @@ Type H 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} } } - \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} } } - \__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 { \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} @@ -11103,8 +13544,8 @@ Type H 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 @@ -11310,7 +13751,8 @@ Type H 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 @@ -11335,7 +13777,6 @@ Type H 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 @@ -12516,6 +14957,22 @@ Type H 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 @@ -12718,6 +15175,7 @@ Type H for immediate help.}% \let\@filelist\@gobble \def\@addtofilelist#1{\xdef\@filelist{\@filelist,#1}}% \@input{latex2e-first-aid-for-external-files.ltx} +\@input{ltpara.ltx} \makeatother \errorstopmode \dump diff --git a/Master/texmf-dist/tex/latex-dev/base/latex209.def b/Master/texmf-dist/tex/latex-dev/base/latex209.def index 68b6eebfdf9..ead6bf7d293 100644 --- a/Master/texmf-dist/tex/latex-dev/base/latex209.def +++ b/Master/texmf-dist/tex/latex-dev/base/latex209.def @@ -16,7 +16,7 @@ %% %% %% Copyright (C) 1993-2021 -%% 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 LaTeX base system. diff --git a/Master/texmf-dist/tex/latex-dev/base/latexrelease.sty b/Master/texmf-dist/tex/latex-dev/base/latexrelease.sty index af3b8833b6c..529e3cd6df3 100644 --- a/Master/texmf-dist/tex/latex-dev/base/latexrelease.sty +++ b/Master/texmf-dist/tex/latex-dev/base/latexrelease.sty @@ -12,6 +12,7 @@ %% 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') %% ltalloc.dtx (with options: `latexrelease') %% ltcntrl.dtx (with options: `latexrelease') @@ -60,7 +61,7 @@ %% %% %% Copyright (C) 1993-2021 -%% 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 LaTeX base system. @@ -329,9 +330,11 @@ \PackageError{latexrelease}{skipped IncludeInRelease for tag \string#2}{}% \fi} \ProvidesPackage{latexrelease} - [2020/12/06 v1.0k LaTeX release emulation and tests + [2021/01/23 v1.0l LaTeX release emulation and tests (including releases up to \latexreleaseversion)] \NeedsTeXFormat{LaTeX2e}[1996/06/01] +\edef\sourceLaTeXdate{% + \expandafter\@parse@version\fmtversion//00\@nil} \DeclareOption*{% \def\@IncludeInRelease#1[#2]{\@IncludeInRele@se{#1}}% \let\requestedpatchdate\CurrentOption} @@ -991,10 +994,11 @@ of this package available from CTAN} \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 +1038,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 @@ -1067,14 +1063,6 @@ of this package available from CTAN} \@gobbletwo }% \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}% @@ -1517,71 +1505,2353 @@ of this package available from CTAN} \fi }{}{}% } -\else - \let\-\@@hyph -\fi -\EndIncludeInRelease -\IncludeInRelease{2017/04/15}{\-}{Use \hyphenchar in \-}% -\DeclareRobustCommand{\-}{% - \discretionary{% - \char \ifnum\hyphenchar\font<\z@ - \defaulthyphenchar - \else - \hyphenchar\font - \fi - }{}{}% -} -\EndIncludeInRelease -\IncludeInRelease{0000/00/00}{\-}{Use \hyphenchar in \-}% -\def\-{\discretionary{-}{}{}} +\else + \let\-\@@hyph +\fi +\EndIncludeInRelease +\IncludeInRelease{2017/04/15}{\-}{Use \hyphenchar in \-}% +\DeclareRobustCommand{\-}{% + \discretionary{% + \char \ifnum\hyphenchar\font<\z@ + \defaulthyphenchar + \else + \hyphenchar\font + \fi + }{}{}% +} +\EndIncludeInRelease +\IncludeInRelease{0000/00/00}{\-}{Use \hyphenchar in \-}% +\def\-{\discretionary{-}{}{}} +\EndIncludeInRelease +\let\@dischyph=\- +\IncludeInRelease{2019/10/01}% + {\allowbreak}{Make various commands robust}% +\MakeRobust\allowbreak +\MakeRobust\bigbreak +\MakeRobust\break +\MakeRobust\dotfill +\MakeRobust\frenchspacing +\MakeRobust\goodbreak +\MakeRobust\hrulefill +\MakeRobust\medbreak +\MakeRobust\nobreak +\MakeRobust\nonfrenchspacing +\MakeRobust\obeylines +\MakeRobust\obeyspaces +\MakeRobust\slash +\MakeRobust\smallbreak +\MakeRobust\strut +\MakeRobust\underbar +\EndIncludeInRelease +\IncludeInRelease{0000/00/00}% + {\allowbreak}{Make various commands robust}% + +\kernel@make@fragile\allowbreak +\kernel@make@fragile\bigbreak +\kernel@make@fragile\break +\kernel@make@fragile\dotfill +\kernel@make@fragile\frenchspacing +\kernel@make@fragile\goodbreak +\kernel@make@fragile\hrulefill +\kernel@make@fragile\medbreak +\kernel@make@fragile\nobreak +\kernel@make@fragile\nonfrenchspacing +\kernel@make@fragile\obeylines +\kernel@make@fragile\obeyspaces +\kernel@make@fragile\slash +\kernel@make@fragile\smallbreak +\kernel@make@fragile\strut +\kernel@make@fragile\underbar + +\EndIncludeInRelease +%%% From File: ltcmd.dtx +\def\ltcmdversion{v1.0a} +\def\ltcmddate{2021/01/21} +\edef\@latexrelease@catcode@null{\the\catcode`\^^@ } +\catcode`\^^@=12 +\IncludeInRelease{2021/05/01}% + {\NewDocumentCommand}{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 { LaTeX / ltcmd } { info } { none } +\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 + { + \__kernel_msg_info:nnxx { ltcmd } { 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 } } + { + \__kernel_msg_warning:nnx { ltcmd } { unsupported-let } + { \token_to_str:N #1 } + } + \__kernel_msg_info:nnxx { ltcmd } { 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 } + { + \__kernel_msg_info:nnxx { ltcmd } { redefine-environment } + { \l__cmd_environment_str } { \tl_to_str:n {#2} } + } + { + \__kernel_msg_info:nnxx { ltcmd } { 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 + { + \__kernel_msg_error:nnx { ltcmd } { 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 + { } { } { } { } { } { } { } { } { } { } + { + \__kernel_msg_expandable_error:nnf + { ltcmd } { 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 + { + \__kernel_msg_error:nnxx { ltcmd } { 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 + { + \__kernel_msg_error:nnxx { ltcmd } { 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 } } + } + { + \__kernel_msg_error:nnxx { ltcmd } { xparse-argument-type } + { \__cmd_environment_or_command: } { \tl_to_str:n {#1} } + } + { + \__kernel_msg_error:nnxx { ltcmd } { 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 + { + \__kernel_msg_error:nnxx { ltcmd } { 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 + { + \__kernel_msg_error:nnxx { ltcmd } { 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 + { + \__kernel_msg_error:nnxx { ltcmd } { 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 + { + \__kernel_msg_error:nnxx + { ltcmd } { 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} + \__kernel_msg_error:nnxx { ltcmd } { 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 + { + \__kernel_msg_error:nnxx { ltcmd } { 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 } + } + { + \__kernel_msg_error:nnxxx + { ltcmd } { 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 + { + \__kernel_msg_error:nnxx + { ltcmd } { 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 + { + \__kernel_msg_error:nnxx + { ltcmd } { 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} + { + \__kernel_msg_warning:nnxx { ltcmd } { optional-mandatory } + {#2} {#3} + } + } + } +\cs_new_protected:Npn \__cmd_bad_arg_spec:wn #1 \__cmd_break_point:n #2 + { + \__kernel_msg_error:nnxx { ltcmd } { 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 + { + \__kernel_msg_error:nnx { ltcmd } { 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 + { + \__kernel_msg_error:nnxx { ltcmd } { 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 } + { + \__kernel_msg_error:nnxx { ltcmd } { 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 } + { + \__kernel_msg_error:nnxxx { ltcmd } { 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 + } + { + \__kernel_msg_error:nnxxx { ltcmd } { 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 + } + { + \__kernel_msg_expandable_error:nnff + { ltcmd } { 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 + } + { + \__kernel_msg_expandable_error:nnff + { ltcmd } { 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 + } + \__kernel_msg_error:nnxxx { ltcmd } { 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 + { + \__kernel_msg_error:nnx { ltcmd } { non-xparse } + { \__cmd_environment_or_command: } + } + { + \__kernel_msg_error:nnx { ltcmd } { unknown } + { \__cmd_environment_or_command: } + } + } +\cs_new_protected:Npn \__cmd_get_arg_spec:NTF #1#2#3 + { + \__cmd_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 } + { + \__kernel_msg_error:nnxx { ltcmd } { not-definable } + { \tl_to_str:n {#1} } { \token_to_str:N #2 } + } + { + \__kernel_msg_error:nnxx { ltcmd } { 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 \__cmd_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 } + ' + } + } +\__kernel_msg_new:nnnn { ltcmd } { 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 + } +\__kernel_msg_new:nnnn { ltcmd } { 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 + } +\__kernel_msg_new:nnnn { ltcmd } { 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. + } +\__kernel_msg_new:nnnn { ltcmd } { 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 + } +\__kernel_msg_new:nnnn { ltcmd } { 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. + } +\__kernel_msg_new:nnnn { ltcmd } { 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 + } +\__kernel_msg_new:nnnn { ltcmd } { 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. + } +\__kernel_msg_new:nnnn { ltcmd } { 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. + } +\__kernel_msg_new:nnnn { ltcmd } { 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. + } +\__kernel_msg_new:nnnn { ltcmd } { 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 + } +\__kernel_msg_new:nnnn { ltcmd } { 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 + } +\__kernel_msg_new:nnnn { ltcmd } { 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 + } +\__kernel_msg_new:nnnn { ltcmd } { 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 + } +\__kernel_msg_new:nnnn { ltcmd } { 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 + } +\__kernel_msg_new:nnnn { ltcmd } { 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 + } +\__kernel_msg_new:nnnn { ltcmd } { 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 + } +\__kernel_msg_new:nnnn { ltcmd } { 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 + } +\__kernel_msg_new:nnnn { ltcmd } { 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 + } +\__kernel_msg_new:nnnn { ltcmd } { 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. + } +\__kernel_msg_new:nnnn { ltcmd } { 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 + } +\__kernel_msg_new:nnnn { ltcmd } { 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 + } +\__kernel_msg_new:nnn { ltcmd } { if-boolean } + { Invalid~use~\iow_char:N\\IfBooleanTF~{#1} } +\__kernel_msg_new:nnnn { ltcmd } { 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. + } +\__kernel_msg_new:nnnn { ltcmd } { 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. + } +\__kernel_msg_new:nnnn { ltcmd } { 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. + } +\__kernel_msg_new:nnnn { ltcmd } { 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. + } +\__kernel_msg_new:nnnn { ltcmd } { unknown } + { Unknown~document~#1. } + { + You~have~asked~for~the~argument~specification~for~the~#1,~ + but~it~is~not~defined. + } +\__kernel_msg_new:nnnn { ltcmd } { 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'. + } +\__kernel_msg_new:nnnn { ltcmd } { 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'. + } +\__kernel_msg_new:nnn { ltcmd } { define-command } + { + Defining~command~#1~ + with~sig.~'#2'~\msg_line_context:. + } +\__kernel_msg_new:nnn { ltcmd } { define-environment } + { + Defining~environment~'#1'~ + with~sig.~'#2'~\msg_line_context:. + } +\__kernel_msg_new:nnn { ltcmd } { redefine-command } + { + Redefining~command~#1~ + with~sig.~'#2'~\msg_line_context:. + } +\__kernel_msg_new:nnn { ltcmd } { redefine-environment } + { + Redefining~environment~'#1'~ + with~sig.~'#2'~\msg_line_context:. + } +\__kernel_msg_new:nnn { ltcmd } { 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. + } +\__kernel_msg_new:nnn { ltcmd } { 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 + { + \__kernel_msg_error:nnxx { ltcmd } { 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} } + { + \__kernel_msg_error:nnxx { ltcmd } { 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} + { \__kernel_msg_error:nnx { ltcmd } { 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} } + { \__kernel_msg_error:nnx { ltcmd } { 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 + { + \__kernel_msg_error:nnxx { ltcmd } { 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} } + { + \__kernel_msg_error:nnxx { ltcmd } { 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: + { + \__kernel_msg_expandable_error:nnn { ltcmd } { 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 +\ExplSyntaxOff \EndIncludeInRelease -\let\@dischyph=\- -\IncludeInRelease{2019/10/01}% - {\allowbreak}{Make various commands robust}% -\MakeRobust\allowbreak -\MakeRobust\bigbreak -\MakeRobust\break -\MakeRobust\dotfill -\MakeRobust\frenchspacing -\MakeRobust\goodbreak -\MakeRobust\hrulefill -\MakeRobust\medbreak -\MakeRobust\nobreak -\MakeRobust\nonfrenchspacing -\MakeRobust\obeylines -\MakeRobust\obeyspaces -\MakeRobust\slash -\MakeRobust\smallbreak -\MakeRobust\strut -\MakeRobust\underbar +\catcode`\^^@=\@latexrelease@catcode@null\relax + +\IncludeInRelease{2020/10/01}% + {\NewDocumentCommand}{Document commands}% +\@ifundefined{NewDocumentCommand} + {% + \IfFileExists{xparse.ltx} + {\input xparse.ltx } + {\@latex@error{LaTeX requires xparse}\@ehd}% + } + {} \EndIncludeInRelease -\IncludeInRelease{0000/00/00}% - {\allowbreak}{Make various commands robust}% -\kernel@make@fragile\allowbreak -\kernel@make@fragile\bigbreak -\kernel@make@fragile\break -\kernel@make@fragile\dotfill -\kernel@make@fragile\frenchspacing -\kernel@make@fragile\goodbreak -\kernel@make@fragile\hrulefill -\kernel@make@fragile\medbreak -\kernel@make@fragile\nobreak -\kernel@make@fragile\nonfrenchspacing -\kernel@make@fragile\obeylines -\kernel@make@fragile\obeyspaces -\kernel@make@fragile\slash -\kernel@make@fragile\smallbreak -\kernel@make@fragile\strut -\kernel@make@fragile\underbar +\IncludeInRelease{0000/00/00}% + {\NewDocumentCommand}{Document commands}% \EndIncludeInRelease -%% -%% File: lthooks.dtx (C) Copyright 2020,2021 Frank Mittelbach, -%% Phelype Oleinik & LaTeX Team %%% From File: lthooks.dtx \def\lthooksversion{v1.0h} -\def\lthooksdate{2021/01/07} +\def\lthooksdate{2021/01/15} \IncludeInRelease{2020/10/01}% {\NewHook}{The hook management}% \ExplSyntaxOn @@ -1989,9 +4259,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 } } @@ -4527,8 +6799,10 @@ of this package available from CTAN} \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}} +\DeclareRobustCommand\fontseries[1]{\@forced@seriesfalse + \merge@font@series{#1}} +\DeclareRobustCommand\fontseriesforce[1]{\@forced@seriestrue + \edef\f@series{#1}} \let\delayed@f@adjustment\@undefined \ifx\@forced@seriestrue\@undefined \else @@ -4837,7 +7111,7 @@ 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/05/01}% {\selectfont}{Add hook to \selectfont}% @@ -4985,7 +7259,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 }% } @@ -5500,7 +7774,6 @@ of this package available from CTAN} \@font@series@contexttrue \fi\fi\fi } - \newif\if@font@series@context \EndIncludeInRelease \IncludeInRelease{0000/00/00}% @@ -5518,9 +7791,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 @@ -5686,6 +7957,7 @@ of this package available from CTAN} \let\textsw\@undefined \let\textssc\@undefined \EndIncludeInRelease +%%% From File: lttextcomp.dtx \IncludeInRelease{2020/02/02}% {\oldstylenums}{Old style numerals}% \DeclareRobustCommand\legacyoldstylenums[1]{% @@ -5803,7 +8075,6 @@ of this package available from CTAN} \selectfont#1% \egroup } - \def\tc@fake@euro#1{% \leavevmode \@font@info{Faking \noexpand#1for font family @@ -5816,17 +8087,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} @@ -5867,22 +8138,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} @@ -5901,86 +8188,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}} @@ -5993,12 +8357,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 @@ -6030,31 +8394,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} @@ -6065,11 +8430,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} @@ -6177,7 +8542,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{% @@ -6249,26 +8614,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 @@ -6678,6 +9049,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}% @@ -7123,6 +9497,28 @@ of this package available from CTAN} \hb@xt@ #1\unitlength{\mb@l #4\mb@r}% \mb@b \kern\z@}} +\EndIncludeInRelease +\IncludeInRelease{2021/05/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}% @@ -7203,6 +9599,39 @@ of this package available from CTAN} \baselineskip\normalbaselineskip \sloppy} \EndIncludeInRelease +\IncludeInRelease{2021/05/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@]}}% @@ -8145,6 +10574,39 @@ of this package available from CTAN} \@fpbot \@dblfpbot }% \EndIncludeInRelease +\IncludeInRelease{2021/05/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{% @@ -8180,6 +10642,56 @@ of this package available from CTAN} {\@textsubscript}{subscript baseline}% \let\@textsubscript\@undefined \EndIncludeInRelease +\IncludeInRelease{2021/05/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/05/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/05/01}% @@ -8311,6 +10823,7 @@ of this package available from CTAN} \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{% @@ -8465,8 +10978,28 @@ of this package available from CTAN} \let\ProvidesClass\ProvidesPackage \@onlypreamble\ProvidesClass \EndIncludeInRelease +\IncludeInRelease{2021/05/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}% @@ -8482,12 +11015,33 @@ 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/05/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{2020/10/01}% {\@process@pti@ns}{Unused options issue}% \def\@process@pti@ns{% @@ -8520,6 +11074,21 @@ of this package available from CTAN} \let\@fileswith@pti@ns\@@fileswith@pti@ns \AtEndOfPackage{\let\@unprocessedoptions\relax}} \EndIncludeInRelease +\IncludeInRelease{2021/05/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{% @@ -8555,6 +11124,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]{% @@ -8911,7 +11508,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% @@ -8933,7 +11531,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 } @@ -9063,7 +11662,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 @@ -9152,12 +11751,9 @@ of this package available from CTAN} \noexpand\reserved@b##1\E\E\relax}}% \endgroup% \EndIncludeInRelease -%% -%% File: ltfilehook.dtx (C) Copyright 2020,2021 Frank Mittelbach, -%% Phelype Oleinik & LaTeX Team %%% From File: ltfilehook.dtx -\providecommand\ltfilehookversion{v1.0e} -\providecommand\ltfilehookdate{2021/01/07} +\providecommand\ltfilehookversion{v1.0g} +\providecommand\ltfilehookdate{2021/02/08} \IncludeInRelease{2020/10/01}% {\CurrentFile}{Hook management file}% \ExplSyntaxOn @@ -9256,7 +11852,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 { @@ -9270,7 +11867,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 { @@ -9335,6 +11933,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 @@ -9351,7 +11950,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 @@ -9391,8 +11991,28 @@ of this package available from CTAN} \let \undeclare@file@substitution \@gobble \EndIncludeInRelease -\IncludeInRelease{2020/10/01}% +\IncludeInRelease{2021/05/01}% {\set@curr@file}{Setting current file name}% +\def\set@curr@file#1{% + \begingroup + \escapechar\m@ne + \let\protect\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}% \def\set@curr@file#1{% \begingroup \escapechar\m@ne @@ -9463,7 +12083,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 } @@ -9484,7 +12104,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 { @@ -9574,11 +12194,12 @@ of this package available from CTAN} \EndIncludeInRelease %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% %% -%% File: ltshipout.dtx (C) Copyright 2020,2021 Frank Mittelbach, LaTeX Team +%% Copyright (C) 2020-2021 +%% Frank Mittelbach, LaTeX Team %% %%% From File: ltshipout.dtx -\providecommand\ltshipoutversion{v1.0d} -\providecommand\ltshipoutdate{2020/12/06} +\providecommand\ltshipoutversion{v1.0i} +\providecommand\ltshipoutdate{2021/01/25} \IncludeInRelease{2020/10/01}% {\shipout}{Hook management (shipout)}% \ExplSyntaxOn @@ -9601,6 +12222,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 } @@ -9612,26 +12254,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 } } @@ -9641,53 +12300,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} } } - \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} } } - \__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 { \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} @@ -9696,8 +12391,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 @@ -9903,7 +12598,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 @@ -9926,6 +12622,7 @@ of this package available from CTAN} \csname tex_shipout:D\endcsname \fi +\let \RawShipout\@undefined \let \ShipoutBox\@undefined \let \ReadonlyShipoutCounter \@undefined \let \c@totalpages \@undefined @@ -9949,13 +12646,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 @@ -11038,13 +13728,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/05/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% diff --git a/Master/texmf-dist/tex/latex-dev/base/latexsym.sty b/Master/texmf-dist/tex/latex-dev/base/latexsym.sty index cf3321c31be..2b9c796d7a9 100644 --- a/Master/texmf-dist/tex/latex-dev/base/latexsym.sty +++ b/Master/texmf-dist/tex/latex-dev/base/latexsym.sty @@ -14,7 +14,7 @@ %% %% %% Copyright (C) 1993-2021 -%% 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 LaTeX base system. diff --git a/Master/texmf-dist/tex/latex-dev/base/latin1.def b/Master/texmf-dist/tex/latex-dev/base/latin1.def index e95eb613cf3..ed5a22f8014 100644 --- a/Master/texmf-dist/tex/latex-dev/base/latin1.def +++ b/Master/texmf-dist/tex/latex-dev/base/latin1.def @@ -14,7 +14,7 @@ %% %% %% Copyright (C) 1993-2021 -%% 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 LaTeX base system. @@ -44,7 +44,7 @@ \ProvidesFile{latin1.def} - [2020/11/26 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-dev/base/latin10.def b/Master/texmf-dist/tex/latex-dev/base/latin10.def index bea8fc7d559..c92a028b4d7 100644 --- a/Master/texmf-dist/tex/latex-dev/base/latin10.def +++ b/Master/texmf-dist/tex/latex-dev/base/latin10.def @@ -14,7 +14,7 @@ %% %% %% Copyright (C) 1993-2021 -%% 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 LaTeX base system. @@ -44,7 +44,7 @@ \ProvidesFile{latin10.def} - [2020/11/26 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-dev/base/latin2.def b/Master/texmf-dist/tex/latex-dev/base/latin2.def index c3168d406ea..08bd58131cf 100644 --- a/Master/texmf-dist/tex/latex-dev/base/latin2.def +++ b/Master/texmf-dist/tex/latex-dev/base/latin2.def @@ -14,7 +14,7 @@ %% %% %% Copyright (C) 1993-2021 -%% 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 LaTeX base system. @@ -44,7 +44,7 @@ \ProvidesFile{latin2.def} - [2020/11/26 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-dev/base/latin3.def b/Master/texmf-dist/tex/latex-dev/base/latin3.def index 78b494f8e0d..2f631252795 100644 --- a/Master/texmf-dist/tex/latex-dev/base/latin3.def +++ b/Master/texmf-dist/tex/latex-dev/base/latin3.def @@ -14,7 +14,7 @@ %% %% %% Copyright (C) 1993-2021 -%% 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 LaTeX base system. @@ -44,7 +44,7 @@ \ProvidesFile{latin3.def} - [2020/11/26 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-dev/base/latin4.def b/Master/texmf-dist/tex/latex-dev/base/latin4.def index e28298b46f4..5b5158d3a5c 100644 --- a/Master/texmf-dist/tex/latex-dev/base/latin4.def +++ b/Master/texmf-dist/tex/latex-dev/base/latin4.def @@ -14,7 +14,7 @@ %% %% %% Copyright (C) 1993-2021 -%% 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 LaTeX base system. @@ -44,7 +44,7 @@ \ProvidesFile{latin4.def} - [2020/11/26 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-dev/base/latin5.def b/Master/texmf-dist/tex/latex-dev/base/latin5.def index cd5add5ab0f..303ab25ac9a 100644 --- a/Master/texmf-dist/tex/latex-dev/base/latin5.def +++ b/Master/texmf-dist/tex/latex-dev/base/latin5.def @@ -14,7 +14,7 @@ %% %% %% Copyright (C) 1993-2021 -%% 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 LaTeX base system. @@ -44,7 +44,7 @@ \ProvidesFile{latin5.def} - [2020/11/26 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-dev/base/latin9.def b/Master/texmf-dist/tex/latex-dev/base/latin9.def index 4d56fe037dc..5fa9b02c000 100644 --- a/Master/texmf-dist/tex/latex-dev/base/latin9.def +++ b/Master/texmf-dist/tex/latex-dev/base/latin9.def @@ -14,7 +14,7 @@ %% %% %% Copyright (C) 1993-2021 -%% 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 LaTeX base system. @@ -44,7 +44,7 @@ \ProvidesFile{latin9.def} - [2020/11/26 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-dev/base/lcyenc.dfu b/Master/texmf-dist/tex/latex-dev/base/lcyenc.dfu index 143ba285d64..16352df052e 100644 --- a/Master/texmf-dist/tex/latex-dev/base/lcyenc.dfu +++ b/Master/texmf-dist/tex/latex-dev/base/lcyenc.dfu @@ -14,7 +14,7 @@ %% %% %% Copyright (C) 1993-2021 -%% 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 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} - [2020/11/26 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-dev/base/leqno.clo b/Master/texmf-dist/tex/latex-dev/base/leqno.clo index e7fa2c47238..04f60c2c92c 100644 --- a/Master/texmf-dist/tex/latex-dev/base/leqno.clo +++ b/Master/texmf-dist/tex/latex-dev/base/leqno.clo @@ -14,7 +14,7 @@ %% %% %% Copyright (C) 1993-2021 -%% 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 LaTeX base system. diff --git a/Master/texmf-dist/tex/latex-dev/base/leqno.sty b/Master/texmf-dist/tex/latex-dev/base/leqno.sty index cb1d1433737..84b15423671 100644 --- a/Master/texmf-dist/tex/latex-dev/base/leqno.sty +++ b/Master/texmf-dist/tex/latex-dev/base/leqno.sty @@ -14,7 +14,7 @@ %% %% %% Copyright (C) 1993-2021 -%% 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 LaTeX base system. diff --git a/Master/texmf-dist/tex/latex-dev/base/letter.cls b/Master/texmf-dist/tex/latex-dev/base/letter.cls index 9efb3925b32..34a7ae4b023 100644 --- a/Master/texmf-dist/tex/latex-dev/base/letter.cls +++ b/Master/texmf-dist/tex/latex-dev/base/letter.cls @@ -14,7 +14,7 @@ %% %% %% Copyright (C) 1993-2021 -%% 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 LaTeX base system. diff --git a/Master/texmf-dist/tex/latex-dev/base/letter.sty b/Master/texmf-dist/tex/latex-dev/base/letter.sty index 3b0f8618a4f..a41368b0e53 100644 --- a/Master/texmf-dist/tex/latex-dev/base/letter.sty +++ b/Master/texmf-dist/tex/latex-dev/base/letter.sty @@ -14,7 +14,7 @@ %% %% %% Copyright (C) 1993-2021 -%% 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 LaTeX base system. diff --git a/Master/texmf-dist/tex/latex-dev/base/ltluatex.lua b/Master/texmf-dist/tex/latex-dev/base/ltluatex.lua index dcbc5730258..ee7fcd3df22 100644 --- a/Master/texmf-dist/tex/latex-dev/base/ltluatex.lua +++ b/Master/texmf-dist/tex/latex-dev/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. diff --git a/Master/texmf-dist/tex/latex-dev/base/ltluatex.tex b/Master/texmf-dist/tex/latex-dev/base/ltluatex.tex index c4a1d93c476..74e4779a415 100644 --- a/Master/texmf-dist/tex/latex-dev/base/ltluatex.tex +++ b/Master/texmf-dist/tex/latex-dev/base/ltluatex.tex @@ -14,7 +14,7 @@ %% %% %% Copyright (C) 1993-2021 -%% 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 LaTeX base system. @@ -47,7 +47,7 @@ #1#2[#3]{\endgroup\immediate\write-1{File: #1 #3}} \fi \ProvidesFile{ltluatex.tex}% -[2020/12/06 v1.1s +[2021/01/15 v1.1s LuaTeX support for plain TeX (core) ] \edef\etatcatcode{\the\catcode`\@} diff --git a/Master/texmf-dist/tex/latex-dev/base/ltnews.cls b/Master/texmf-dist/tex/latex-dev/base/ltnews.cls index 632f0681175..9271b56f1c6 100644 --- a/Master/texmf-dist/tex/latex-dev/base/ltnews.cls +++ b/Master/texmf-dist/tex/latex-dev/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-dev/base/ltpara.ltx b/Master/texmf-dist/tex/latex-dev/base/ltpara.ltx new file mode 100644 index 00000000000..b56859f471e --- /dev/null +++ b/Master/texmf-dist/tex/latex-dev/base/ltpara.ltx @@ -0,0 +1,171 @@ +%% +%% This is file `ltpara.ltx', +%% generated with the docstrip utility. +%% +%% The original source files were: +%% +%% ltpara.dtx (with options: `2ekernel') +%% +%% 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-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. +%% -------------------------------------------------------------- +%% +%% 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: ltpara.dtx (C) Copyright 2020-2021 +%%% From File: lthooks.dtx +\def\ltparaversion{v1.0d} +\def\ltparadate{2021/02/18} + + +\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_indentation_box + \group_begin: + \tex_par:D + \group_end: + \tex_everypar:D { \__kernel_msg_error:nnnn {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} + \cs_set_eq:NN \__para_handle_indent: \__para_add_indentation_box: + \@kernel@before@para@begin + \hook_use:n {para/begin} + \if_mode_horizontal: \else: + \__kernel_msg_error:nnnn {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_indentation_box + +\cs_new:Npn \__para_add_indentation_box: { + \box_use_drop:N \g_para_indentation_box +} +\cs_new_eq:NN \__para_handle_indent: \__para_add_indentation_box: +\cs_new:Npn \para_suppress_indentation: { + \cs_set_eq:NN \__para_handle_indent: \prg_do_nothing: +} +\cs_set_eq:NN \IndentationBox \g_para_indentation_box +\cs_set_eq:NN \SuppressIndentationBox \para_suppress_indentation: +\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 + } + { \__kernel_msg_error:nnnn {para}{mode}{end}{horizontal} } + } + } + \tex_par:D +} +\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 +\__kernel_msg_new:nnnn {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~ \ShowHook~ to~ find~ the~ issue. + } +\ExplSyntaxOff +\IfFormatAtLeastTF{2021/05/01}{} +{ +\long\def \@savemarbox #1#2{% + \global\setbox #1% + \color@vbox + \vtop{% + \hsize\marginparwidth + \@parboxrestore + \@marginparreset + #2\par % <-- needed + \@minipagefalse + \outer@nobreak + }% + \color@endbox +} +\newcounter{paracnt} +\def\@kernel@before@para@begin{% + \stepcounter{paracnt}% + \typeout{PARA: \arabic{paracnt} start + (\@currenvir\space level\on@line)}% +} +\def\@kernel@after@para@end {% + \typeout{PARA: \arabic{paracnt} end \space\space + (\@currenvir\space level\on@line)}% + \addtocounter{paracnt}{-1}% +} +\let\color@begingroup\begingroup +\def\color@endgroup{\endgraf\endgroup} +\def\color@setgroup{\color@begingroup} % \def\color@setgroup{\color@begingroup\set@color} +\def\color@hbox{\hbox\bgroup\color@begingroup} +\def\color@vbox{\vbox\bgroup\color@begingroup} +\def\color@endbox{\color@endgroup\egroup} +} +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +\endinput +%% +%% End of file `ltpara.ltx'. diff --git a/Master/texmf-dist/tex/latex-dev/base/ltxcheck.tex b/Master/texmf-dist/tex/latex-dev/base/ltxcheck.tex index 478f9ea107e..9e013bc2af7 100644 --- a/Master/texmf-dist/tex/latex-dev/base/ltxcheck.tex +++ b/Master/texmf-dist/tex/latex-dev/base/ltxcheck.tex @@ -1,7 +1,7 @@ % \iffalse meta-comment % % Copyright (C) 1993-2021 -% 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. @@ -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-dev/base/ltxdoc.cls b/Master/texmf-dist/tex/latex-dev/base/ltxdoc.cls index 676f7da8c47..2b9ff087857 100644 --- a/Master/texmf-dist/tex/latex-dev/base/ltxdoc.cls +++ b/Master/texmf-dist/tex/latex-dev/base/ltxdoc.cls @@ -14,7 +14,7 @@ %% %% %% Copyright (C) 1993-2021 -%% 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 LaTeX base system. diff --git a/Master/texmf-dist/tex/latex-dev/base/ltxguide.cls b/Master/texmf-dist/tex/latex-dev/base/ltxguide.cls index f70c91dcd95..b743fd9cdae 100644 --- a/Master/texmf-dist/tex/latex-dev/base/ltxguide.cls +++ b/Master/texmf-dist/tex/latex-dev/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-dev/base/ly1enc.dfu b/Master/texmf-dist/tex/latex-dev/base/ly1enc.dfu index 9da3e927b15..787b1b7dfde 100644 --- a/Master/texmf-dist/tex/latex-dev/base/ly1enc.dfu +++ b/Master/texmf-dist/tex/latex-dev/base/ly1enc.dfu @@ -14,7 +14,7 @@ %% %% %% Copyright (C) 1993-2021 -%% 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 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} - [2020/11/26 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-dev/base/macce.def b/Master/texmf-dist/tex/latex-dev/base/macce.def index b7a5a66341d..427568e1272 100644 --- a/Master/texmf-dist/tex/latex-dev/base/macce.def +++ b/Master/texmf-dist/tex/latex-dev/base/macce.def @@ -14,7 +14,7 @@ %% %% %% Copyright (C) 1993-2021 -%% 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 LaTeX base system. @@ -44,7 +44,7 @@ \ProvidesFile{macce.def} - [2020/11/26 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-dev/base/makeidx.sty b/Master/texmf-dist/tex/latex-dev/base/makeidx.sty index 6e896541bd3..518507399a7 100644 --- a/Master/texmf-dist/tex/latex-dev/base/makeidx.sty +++ b/Master/texmf-dist/tex/latex-dev/base/makeidx.sty @@ -14,7 +14,7 @@ %% %% %% Copyright (C) 1993-2021 -%% 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 LaTeX base system. diff --git a/Master/texmf-dist/tex/latex-dev/base/minimal.cls b/Master/texmf-dist/tex/latex-dev/base/minimal.cls index b38e4be093c..9024a23bca7 100644 --- a/Master/texmf-dist/tex/latex-dev/base/minimal.cls +++ b/Master/texmf-dist/tex/latex-dev/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-dev/base/newlfont.sty b/Master/texmf-dist/tex/latex-dev/base/newlfont.sty index d6531049cd8..e565a123ce8 100644 --- a/Master/texmf-dist/tex/latex-dev/base/newlfont.sty +++ b/Master/texmf-dist/tex/latex-dev/base/newlfont.sty @@ -14,7 +14,7 @@ %% %% %% Copyright (C) 1993-2021 -%% 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 LaTeX base system. diff --git a/Master/texmf-dist/tex/latex-dev/base/next.def b/Master/texmf-dist/tex/latex-dev/base/next.def index 3c0443ba43a..196fa3f6998 100644 --- a/Master/texmf-dist/tex/latex-dev/base/next.def +++ b/Master/texmf-dist/tex/latex-dev/base/next.def @@ -14,7 +14,7 @@ %% %% %% Copyright (C) 1993-2021 -%% 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 LaTeX base system. @@ -44,7 +44,7 @@ \ProvidesFile{next.def} - [2020/11/26 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-dev/base/nfssfont.tex b/Master/texmf-dist/tex/latex-dev/base/nfssfont.tex index 7125ea7b06c..b34ca1b83fc 100644 --- a/Master/texmf-dist/tex/latex-dev/base/nfssfont.tex +++ b/Master/texmf-dist/tex/latex-dev/base/nfssfont.tex @@ -14,7 +14,7 @@ %% %% %% Copyright (C) 1993-2021 -%% 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 LaTeX base system. diff --git a/Master/texmf-dist/tex/latex-dev/base/oldlfont.sty b/Master/texmf-dist/tex/latex-dev/base/oldlfont.sty index f26f4fc7cd9..eea01fefce2 100644 --- a/Master/texmf-dist/tex/latex-dev/base/oldlfont.sty +++ b/Master/texmf-dist/tex/latex-dev/base/oldlfont.sty @@ -14,7 +14,7 @@ %% %% %% Copyright (C) 1993-2021 -%% 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 LaTeX base system. diff --git a/Master/texmf-dist/tex/latex-dev/base/omlcmm.fd b/Master/texmf-dist/tex/latex-dev/base/omlcmm.fd index e273aecfb80..07fadc91b0c 100644 --- a/Master/texmf-dist/tex/latex-dev/base/omlcmm.fd +++ b/Master/texmf-dist/tex/latex-dev/base/omlcmm.fd @@ -14,7 +14,7 @@ %% %% %% Copyright (C) 1993-2021 -%% 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 LaTeX base system. diff --git a/Master/texmf-dist/tex/latex-dev/base/omlcmr.fd b/Master/texmf-dist/tex/latex-dev/base/omlcmr.fd index ae720c81bf0..6a3eff2859a 100644 --- a/Master/texmf-dist/tex/latex-dev/base/omlcmr.fd +++ b/Master/texmf-dist/tex/latex-dev/base/omlcmr.fd @@ -14,7 +14,7 @@ %% %% %% Copyright (C) 1993-2021 -%% 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 LaTeX base system. diff --git a/Master/texmf-dist/tex/latex-dev/base/omlenc.def b/Master/texmf-dist/tex/latex-dev/base/omlenc.def index 659fbd8b9be..3b3ea0cbfc3 100644 --- a/Master/texmf-dist/tex/latex-dev/base/omlenc.def +++ b/Master/texmf-dist/tex/latex-dev/base/omlenc.def @@ -14,7 +14,7 @@ %% %% %% Copyright (C) 1993-2021 -%% 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 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/02/19 v2.0u Standard LaTeX file] \DeclareFontEncoding{OML}{}{} \DeclareTextSymbol{\textless}{OML}{`\<} diff --git a/Master/texmf-dist/tex/latex-dev/base/omllcmm.fd b/Master/texmf-dist/tex/latex-dev/base/omllcmm.fd index ed295c8fd9e..69125a60371 100644 --- a/Master/texmf-dist/tex/latex-dev/base/omllcmm.fd +++ b/Master/texmf-dist/tex/latex-dev/base/omllcmm.fd @@ -14,7 +14,7 @@ %% %% %% Copyright (C) 1993-2021 -%% 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 LaTeX base system. diff --git a/Master/texmf-dist/tex/latex-dev/base/omscmr.fd b/Master/texmf-dist/tex/latex-dev/base/omscmr.fd index 23a80f449f2..8fbd8f9479c 100644 --- a/Master/texmf-dist/tex/latex-dev/base/omscmr.fd +++ b/Master/texmf-dist/tex/latex-dev/base/omscmr.fd @@ -14,7 +14,7 @@ %% %% %% Copyright (C) 1993-2021 -%% 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 LaTeX base system. diff --git a/Master/texmf-dist/tex/latex-dev/base/omscmsy.fd b/Master/texmf-dist/tex/latex-dev/base/omscmsy.fd index a1935d289da..8e75eb83e24 100644 --- a/Master/texmf-dist/tex/latex-dev/base/omscmsy.fd +++ b/Master/texmf-dist/tex/latex-dev/base/omscmsy.fd @@ -14,7 +14,7 @@ %% %% %% Copyright (C) 1993-2021 -%% 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 LaTeX base system. diff --git a/Master/texmf-dist/tex/latex-dev/base/omsenc.def b/Master/texmf-dist/tex/latex-dev/base/omsenc.def index 1d7e1179ece..10f60116098 100644 --- a/Master/texmf-dist/tex/latex-dev/base/omsenc.def +++ b/Master/texmf-dist/tex/latex-dev/base/omsenc.def @@ -14,7 +14,7 @@ %% %% %% Copyright (C) 1993-2021 -%% 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 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/02/19 v2.0u Standard LaTeX file] \DeclareFontEncoding{OMS}{}{} \DeclareTextSymbol{\textasteriskcentered}{OMS}{3} % "03 diff --git a/Master/texmf-dist/tex/latex-dev/base/omsenc.dfu b/Master/texmf-dist/tex/latex-dev/base/omsenc.dfu index e5b8df6a011..1a5e034ac8c 100644 --- a/Master/texmf-dist/tex/latex-dev/base/omsenc.dfu +++ b/Master/texmf-dist/tex/latex-dev/base/omsenc.dfu @@ -14,7 +14,7 @@ %% %% %% Copyright (C) 1993-2021 -%% 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 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} - [2020/11/26 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-dev/base/omslcmsy.fd b/Master/texmf-dist/tex/latex-dev/base/omslcmsy.fd index 69e8e150390..907216541ae 100644 --- a/Master/texmf-dist/tex/latex-dev/base/omslcmsy.fd +++ b/Master/texmf-dist/tex/latex-dev/base/omslcmsy.fd @@ -14,7 +14,7 @@ %% %% %% Copyright (C) 1993-2021 -%% 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 LaTeX base system. diff --git a/Master/texmf-dist/tex/latex-dev/base/omxcmex.fd b/Master/texmf-dist/tex/latex-dev/base/omxcmex.fd index cb3112cea69..20463d1b4b5 100644 --- a/Master/texmf-dist/tex/latex-dev/base/omxcmex.fd +++ b/Master/texmf-dist/tex/latex-dev/base/omxcmex.fd @@ -14,7 +14,7 @@ %% %% %% Copyright (C) 1993-2021 -%% 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 LaTeX base system. diff --git a/Master/texmf-dist/tex/latex-dev/base/omxlcmex.fd b/Master/texmf-dist/tex/latex-dev/base/omxlcmex.fd index 0705762d8fd..e4b873db00b 100644 --- a/Master/texmf-dist/tex/latex-dev/base/omxlcmex.fd +++ b/Master/texmf-dist/tex/latex-dev/base/omxlcmex.fd @@ -14,7 +14,7 @@ %% %% %% Copyright (C) 1993-2021 -%% 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 LaTeX base system. diff --git a/Master/texmf-dist/tex/latex-dev/base/openbib.sty b/Master/texmf-dist/tex/latex-dev/base/openbib.sty index e8cb4d012b8..fbfc7c63cd1 100644 --- a/Master/texmf-dist/tex/latex-dev/base/openbib.sty +++ b/Master/texmf-dist/tex/latex-dev/base/openbib.sty @@ -14,7 +14,7 @@ %% %% %% Copyright (C) 1993-2021 -%% 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 LaTeX base system. diff --git a/Master/texmf-dist/tex/latex-dev/base/ot1cmdh.fd b/Master/texmf-dist/tex/latex-dev/base/ot1cmdh.fd index bea346a5e43..26ac2b7907b 100644 --- a/Master/texmf-dist/tex/latex-dev/base/ot1cmdh.fd +++ b/Master/texmf-dist/tex/latex-dev/base/ot1cmdh.fd @@ -14,7 +14,7 @@ %% %% %% Copyright (C) 1993-2021 -%% 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 LaTeX base system. diff --git a/Master/texmf-dist/tex/latex-dev/base/ot1cmfib.fd b/Master/texmf-dist/tex/latex-dev/base/ot1cmfib.fd index 9a716f994a9..3c6722a006c 100644 --- a/Master/texmf-dist/tex/latex-dev/base/ot1cmfib.fd +++ b/Master/texmf-dist/tex/latex-dev/base/ot1cmfib.fd @@ -14,7 +14,7 @@ %% %% %% Copyright (C) 1993-2021 -%% 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 LaTeX base system. diff --git a/Master/texmf-dist/tex/latex-dev/base/ot1cmfr.fd b/Master/texmf-dist/tex/latex-dev/base/ot1cmfr.fd index 7aa6eb1e7d9..6aca744d489 100644 --- a/Master/texmf-dist/tex/latex-dev/base/ot1cmfr.fd +++ b/Master/texmf-dist/tex/latex-dev/base/ot1cmfr.fd @@ -14,7 +14,7 @@ %% %% %% Copyright (C) 1993-2021 -%% 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 LaTeX base system. diff --git a/Master/texmf-dist/tex/latex-dev/base/ot1cmr.fd b/Master/texmf-dist/tex/latex-dev/base/ot1cmr.fd index a119e352b3d..c6721f95f5a 100644 --- a/Master/texmf-dist/tex/latex-dev/base/ot1cmr.fd +++ b/Master/texmf-dist/tex/latex-dev/base/ot1cmr.fd @@ -14,7 +14,7 @@ %% %% %% Copyright (C) 1993-2021 -%% 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 LaTeX base system. diff --git a/Master/texmf-dist/tex/latex-dev/base/ot1cmss.fd b/Master/texmf-dist/tex/latex-dev/base/ot1cmss.fd index 4936418d6ef..4a93306e8d2 100644 --- a/Master/texmf-dist/tex/latex-dev/base/ot1cmss.fd +++ b/Master/texmf-dist/tex/latex-dev/base/ot1cmss.fd @@ -14,7 +14,7 @@ %% %% %% Copyright (C) 1993-2021 -%% 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 LaTeX base system. diff --git a/Master/texmf-dist/tex/latex-dev/base/ot1cmtt.fd b/Master/texmf-dist/tex/latex-dev/base/ot1cmtt.fd index 726339b4485..4805f48894b 100644 --- a/Master/texmf-dist/tex/latex-dev/base/ot1cmtt.fd +++ b/Master/texmf-dist/tex/latex-dev/base/ot1cmtt.fd @@ -14,7 +14,7 @@ %% %% %% Copyright (C) 1993-2021 -%% 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 LaTeX base system. diff --git a/Master/texmf-dist/tex/latex-dev/base/ot1cmvtt.fd b/Master/texmf-dist/tex/latex-dev/base/ot1cmvtt.fd index 3956ce2c4ac..eb64d4d8988 100644 --- a/Master/texmf-dist/tex/latex-dev/base/ot1cmvtt.fd +++ b/Master/texmf-dist/tex/latex-dev/base/ot1cmvtt.fd @@ -14,7 +14,7 @@ %% %% %% Copyright (C) 1993-2021 -%% 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 LaTeX base system. diff --git a/Master/texmf-dist/tex/latex-dev/base/ot1enc.def b/Master/texmf-dist/tex/latex-dev/base/ot1enc.def index c788f7b3a48..00c70e7e971 100644 --- a/Master/texmf-dist/tex/latex-dev/base/ot1enc.def +++ b/Master/texmf-dist/tex/latex-dev/base/ot1enc.def @@ -14,7 +14,7 @@ %% %% %% Copyright (C) 1993-2021 -%% 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 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/02/19 v2.0u 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-dev/base/ot1enc.dfu b/Master/texmf-dist/tex/latex-dev/base/ot1enc.dfu index 3bbccdf44e8..47b772a33c2 100644 --- a/Master/texmf-dist/tex/latex-dev/base/ot1enc.dfu +++ b/Master/texmf-dist/tex/latex-dev/base/ot1enc.dfu @@ -14,7 +14,7 @@ %% %% %% Copyright (C) 1993-2021 -%% 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 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} - [2020/11/26 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-dev/base/ot1lcmss.fd b/Master/texmf-dist/tex/latex-dev/base/ot1lcmss.fd index e7f8575c06a..62ee74c309c 100644 --- a/Master/texmf-dist/tex/latex-dev/base/ot1lcmss.fd +++ b/Master/texmf-dist/tex/latex-dev/base/ot1lcmss.fd @@ -14,7 +14,7 @@ %% %% %% Copyright (C) 1993-2021 -%% 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 LaTeX base system. diff --git a/Master/texmf-dist/tex/latex-dev/base/ot1lcmtt.fd b/Master/texmf-dist/tex/latex-dev/base/ot1lcmtt.fd index c1622e5275e..680f6eb7b74 100644 --- a/Master/texmf-dist/tex/latex-dev/base/ot1lcmtt.fd +++ b/Master/texmf-dist/tex/latex-dev/base/ot1lcmtt.fd @@ -14,7 +14,7 @@ %% %% %% Copyright (C) 1993-2021 -%% 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 LaTeX base system. diff --git a/Master/texmf-dist/tex/latex-dev/base/ot2enc.dfu b/Master/texmf-dist/tex/latex-dev/base/ot2enc.dfu index c0bd827716b..b06a06e1075 100644 --- a/Master/texmf-dist/tex/latex-dev/base/ot2enc.dfu +++ b/Master/texmf-dist/tex/latex-dev/base/ot2enc.dfu @@ -14,7 +14,7 @@ %% %% %% Copyright (C) 1993-2021 -%% 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 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} - [2020/11/26 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-dev/base/ot4enc.def b/Master/texmf-dist/tex/latex-dev/base/ot4enc.def index d02eec0069b..bb1644e5b28 100644 --- a/Master/texmf-dist/tex/latex-dev/base/ot4enc.def +++ b/Master/texmf-dist/tex/latex-dev/base/ot4enc.def @@ -14,7 +14,7 @@ %% %% %% Copyright (C) 1993-2021 -%% 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 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/02/19 v2.0u Standard LaTeX file] \DeclareFontEncoding{OT4}{}{} \DeclareFontSubstitution{OT4}{cmr}{m}{n} diff --git a/Master/texmf-dist/tex/latex-dev/base/preload.cfg b/Master/texmf-dist/tex/latex-dev/base/preload.cfg index f6caf34a9f8..d27c68144fb 100644 --- a/Master/texmf-dist/tex/latex-dev/base/preload.cfg +++ b/Master/texmf-dist/tex/latex-dev/base/preload.cfg @@ -9,7 +9,7 @@ %% This is a generated file. %% %% Copyright (C) 1993-2021 -%% 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 LaTeX base system. @@ -37,7 +37,7 @@ %% %%% From File: fontdef.dtx \ProvidesFile{preload.cfg} - [2020/11/24 v3.0i LaTeX Kernel + [2021/01/15 v3.0i LaTeX Kernel (Uncustomized preload font setup)] %% diff --git a/Master/texmf-dist/tex/latex-dev/base/preload.ltx b/Master/texmf-dist/tex/latex-dev/base/preload.ltx index ead5eaa04f6..14b6aa4caa1 100644 --- a/Master/texmf-dist/tex/latex-dev/base/preload.ltx +++ b/Master/texmf-dist/tex/latex-dev/base/preload.ltx @@ -9,7 +9,7 @@ %% This is a generated file. %% %% Copyright (C) 1993-2021 -%% 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 LaTeX base system. diff --git a/Master/texmf-dist/tex/latex-dev/base/proc.cls b/Master/texmf-dist/tex/latex-dev/base/proc.cls index 91472bce6c8..5c37ce55132 100644 --- a/Master/texmf-dist/tex/latex-dev/base/proc.cls +++ b/Master/texmf-dist/tex/latex-dev/base/proc.cls @@ -14,7 +14,7 @@ %% %% %% Copyright (C) 1993-2021 -%% 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 LaTeX base system. diff --git a/Master/texmf-dist/tex/latex-dev/base/proc.sty b/Master/texmf-dist/tex/latex-dev/base/proc.sty index 80e9fa43b64..57614baef87 100644 --- a/Master/texmf-dist/tex/latex-dev/base/proc.sty +++ b/Master/texmf-dist/tex/latex-dev/base/proc.sty @@ -14,7 +14,7 @@ %% %% %% Copyright (C) 1993-2021 -%% 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 LaTeX base system. diff --git a/Master/texmf-dist/tex/latex-dev/base/report.cls b/Master/texmf-dist/tex/latex-dev/base/report.cls index a41434ba6a3..73daababc50 100644 --- a/Master/texmf-dist/tex/latex-dev/base/report.cls +++ b/Master/texmf-dist/tex/latex-dev/base/report.cls @@ -14,7 +14,7 @@ %% %% %% Copyright (C) 1993-2021 -%% 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 LaTeX base system. @@ -43,7 +43,7 @@ %% extension .ins) which are part of the distribution. \NeedsTeXFormat{LaTeX2e}[1995/12/01] \ProvidesClass{report} - [2020/11/23 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-dev/base/report.sty b/Master/texmf-dist/tex/latex-dev/base/report.sty index 760e03540a0..26f3170f6d3 100644 --- a/Master/texmf-dist/tex/latex-dev/base/report.sty +++ b/Master/texmf-dist/tex/latex-dev/base/report.sty @@ -14,7 +14,7 @@ %% %% %% Copyright (C) 1993-2021 -%% 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 LaTeX base system. diff --git a/Master/texmf-dist/tex/latex-dev/base/sfonts.def b/Master/texmf-dist/tex/latex-dev/base/sfonts.def index 693847cff7c..ff087875c50 100644 --- a/Master/texmf-dist/tex/latex-dev/base/sfonts.def +++ b/Master/texmf-dist/tex/latex-dev/base/sfonts.def @@ -9,7 +9,7 @@ %% This is a generated file. %% %% Copyright (C) 1993-2021 -%% 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 LaTeX base system. diff --git a/Master/texmf-dist/tex/latex-dev/base/shortvrb.sty b/Master/texmf-dist/tex/latex-dev/base/shortvrb.sty index 6ddbc524ac2..aeaa46f12ee 100644 --- a/Master/texmf-dist/tex/latex-dev/base/shortvrb.sty +++ b/Master/texmf-dist/tex/latex-dev/base/shortvrb.sty @@ -14,7 +14,7 @@ %% %% %% Copyright (C) 1993-2021 -%% 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 LaTeX base system. diff --git a/Master/texmf-dist/tex/latex-dev/base/showidx.sty b/Master/texmf-dist/tex/latex-dev/base/showidx.sty index 24e04e2bc32..d0a2967d8f6 100644 --- a/Master/texmf-dist/tex/latex-dev/base/showidx.sty +++ b/Master/texmf-dist/tex/latex-dev/base/showidx.sty @@ -14,7 +14,7 @@ %% %% %% Copyright (C) 1993-2021 -%% 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 LaTeX base system. diff --git a/Master/texmf-dist/tex/latex-dev/base/size10.clo b/Master/texmf-dist/tex/latex-dev/base/size10.clo index 3f79aa9a523..8e03dcfb069 100644 --- a/Master/texmf-dist/tex/latex-dev/base/size10.clo +++ b/Master/texmf-dist/tex/latex-dev/base/size10.clo @@ -14,7 +14,7 @@ %% %% %% Copyright (C) 1993-2021 -%% 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 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/11/23 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-dev/base/size11.clo b/Master/texmf-dist/tex/latex-dev/base/size11.clo index 4afd1dc573e..a261d777333 100644 --- a/Master/texmf-dist/tex/latex-dev/base/size11.clo +++ b/Master/texmf-dist/tex/latex-dev/base/size11.clo @@ -14,7 +14,7 @@ %% %% %% Copyright (C) 1993-2021 -%% 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 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/11/23 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-dev/base/size12.clo b/Master/texmf-dist/tex/latex-dev/base/size12.clo index e8ea337e419..8890acb340e 100644 --- a/Master/texmf-dist/tex/latex-dev/base/size12.clo +++ b/Master/texmf-dist/tex/latex-dev/base/size12.clo @@ -14,7 +14,7 @@ %% %% %% Copyright (C) 1993-2021 -%% 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 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/11/23 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-dev/base/slides.cls b/Master/texmf-dist/tex/latex-dev/base/slides.cls index 4960406f11e..ffbdbdbff8f 100644 --- a/Master/texmf-dist/tex/latex-dev/base/slides.cls +++ b/Master/texmf-dist/tex/latex-dev/base/slides.cls @@ -14,7 +14,7 @@ %% %% %% Copyright (C) 1993-2021 -%% 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 LaTeX base system. diff --git a/Master/texmf-dist/tex/latex-dev/base/slides.def b/Master/texmf-dist/tex/latex-dev/base/slides.def index a49e4953da9..f23e9313989 100644 --- a/Master/texmf-dist/tex/latex-dev/base/slides.def +++ b/Master/texmf-dist/tex/latex-dev/base/slides.def @@ -14,7 +14,7 @@ %% %% %% Copyright (C) 1993-2021 -%% 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 LaTeX base system. diff --git a/Master/texmf-dist/tex/latex-dev/base/slides.sty b/Master/texmf-dist/tex/latex-dev/base/slides.sty index 24619dd803b..4f9b69569bf 100644 --- a/Master/texmf-dist/tex/latex-dev/base/slides.sty +++ b/Master/texmf-dist/tex/latex-dev/base/slides.sty @@ -14,7 +14,7 @@ %% %% %% Copyright (C) 1993-2021 -%% 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 LaTeX base system. diff --git a/Master/texmf-dist/tex/latex-dev/base/source2edoc.cls b/Master/texmf-dist/tex/latex-dev/base/source2edoc.cls index e06108230da..ba6acf9f80e 100644 --- a/Master/texmf-dist/tex/latex-dev/base/source2edoc.cls +++ b/Master/texmf-dist/tex/latex-dev/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-dev/base/structuredlog.sty b/Master/texmf-dist/tex/latex-dev/base/structuredlog.sty index 81523e133bb..e945e76549d 100644 --- a/Master/texmf-dist/tex/latex-dev/base/structuredlog.sty +++ b/Master/texmf-dist/tex/latex-dev/base/structuredlog.sty @@ -14,7 +14,7 @@ %% %% %% Copyright (C) 1993-2021 -%% 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 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,2021 Frank Mittelbach, -%% Phelype Oleinik & LaTeX Team %%% From File: ltfilehook.dtx -\providecommand\ltfilehookversion{v1.0e} -\providecommand\ltfilehookdate{2021/01/07} +\providecommand\ltfilehookversion{v1.0g} +\providecommand\ltfilehookdate{2021/02/08} \ProvidesExplPackage {structuredlog}{\ltfilehookdate}{\ltfilehookversion} {Structuring the TeX transcript file} diff --git a/Master/texmf-dist/tex/latex-dev/base/syntonly.sty b/Master/texmf-dist/tex/latex-dev/base/syntonly.sty index ade90aa4d58..9ab639baeb7 100644 --- a/Master/texmf-dist/tex/latex-dev/base/syntonly.sty +++ b/Master/texmf-dist/tex/latex-dev/base/syntonly.sty @@ -14,7 +14,7 @@ %% %% %% Copyright (C) 1993-2021 -%% 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 LaTeX base system. diff --git a/Master/texmf-dist/tex/latex-dev/base/t1cmdh.fd b/Master/texmf-dist/tex/latex-dev/base/t1cmdh.fd index c5527d66e0c..76625ef4a54 100644 --- a/Master/texmf-dist/tex/latex-dev/base/t1cmdh.fd +++ b/Master/texmf-dist/tex/latex-dev/base/t1cmdh.fd @@ -14,7 +14,7 @@ %% %% %% Copyright (C) 1993-2021 -%% 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 LaTeX base system. diff --git a/Master/texmf-dist/tex/latex-dev/base/t1cmfib.fd b/Master/texmf-dist/tex/latex-dev/base/t1cmfib.fd index cd85c741bb6..fda2cf71311 100644 --- a/Master/texmf-dist/tex/latex-dev/base/t1cmfib.fd +++ b/Master/texmf-dist/tex/latex-dev/base/t1cmfib.fd @@ -14,7 +14,7 @@ %% %% %% Copyright (C) 1993-2021 -%% 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 LaTeX base system. diff --git a/Master/texmf-dist/tex/latex-dev/base/t1cmfr.fd b/Master/texmf-dist/tex/latex-dev/base/t1cmfr.fd index 755a9ef9967..f676a74f646 100644 --- a/Master/texmf-dist/tex/latex-dev/base/t1cmfr.fd +++ b/Master/texmf-dist/tex/latex-dev/base/t1cmfr.fd @@ -14,7 +14,7 @@ %% %% %% Copyright (C) 1993-2021 -%% 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 LaTeX base system. diff --git a/Master/texmf-dist/tex/latex-dev/base/t1cmr.fd b/Master/texmf-dist/tex/latex-dev/base/t1cmr.fd index d7a04885469..0432498ab98 100644 --- a/Master/texmf-dist/tex/latex-dev/base/t1cmr.fd +++ b/Master/texmf-dist/tex/latex-dev/base/t1cmr.fd @@ -14,7 +14,7 @@ %% %% %% Copyright (C) 1993-2021 -%% 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 LaTeX base system. diff --git a/Master/texmf-dist/tex/latex-dev/base/t1cmss.fd b/Master/texmf-dist/tex/latex-dev/base/t1cmss.fd index 63868ccad56..cdc1ac4e0d0 100644 --- a/Master/texmf-dist/tex/latex-dev/base/t1cmss.fd +++ b/Master/texmf-dist/tex/latex-dev/base/t1cmss.fd @@ -14,7 +14,7 @@ %% %% %% Copyright (C) 1993-2021 -%% 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 LaTeX base system. diff --git a/Master/texmf-dist/tex/latex-dev/base/t1cmtt.fd b/Master/texmf-dist/tex/latex-dev/base/t1cmtt.fd index 7ddc82dbf5e..663fed9f465 100644 --- a/Master/texmf-dist/tex/latex-dev/base/t1cmtt.fd +++ b/Master/texmf-dist/tex/latex-dev/base/t1cmtt.fd @@ -14,7 +14,7 @@ %% %% %% Copyright (C) 1993-2021 -%% 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 LaTeX base system. diff --git a/Master/texmf-dist/tex/latex-dev/base/t1cmvtt.fd b/Master/texmf-dist/tex/latex-dev/base/t1cmvtt.fd index b55669f4d5f..0668e1095e8 100644 --- a/Master/texmf-dist/tex/latex-dev/base/t1cmvtt.fd +++ b/Master/texmf-dist/tex/latex-dev/base/t1cmvtt.fd @@ -14,7 +14,7 @@ %% %% %% Copyright (C) 1993-2021 -%% 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 LaTeX base system. diff --git a/Master/texmf-dist/tex/latex-dev/base/t1enc.def b/Master/texmf-dist/tex/latex-dev/base/t1enc.def index 9c030f76f20..f59a16678ed 100644 --- a/Master/texmf-dist/tex/latex-dev/base/t1enc.def +++ b/Master/texmf-dist/tex/latex-dev/base/t1enc.def @@ -14,7 +14,7 @@ %% %% %% Copyright (C) 1993-2021 -%% 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 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/02/19 v2.0u 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-dev/base/t1enc.dfu b/Master/texmf-dist/tex/latex-dev/base/t1enc.dfu index 3081cd6db97..8b39c4840f1 100644 --- a/Master/texmf-dist/tex/latex-dev/base/t1enc.dfu +++ b/Master/texmf-dist/tex/latex-dev/base/t1enc.dfu @@ -14,7 +14,7 @@ %% %% %% Copyright (C) 1993-2021 -%% 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 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} - [2020/11/26 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-dev/base/t1enc.sty b/Master/texmf-dist/tex/latex-dev/base/t1enc.sty index badbd1bdd99..cc26edeb386 100644 --- a/Master/texmf-dist/tex/latex-dev/base/t1enc.sty +++ b/Master/texmf-dist/tex/latex-dev/base/t1enc.sty @@ -14,7 +14,7 @@ %% %% %% Copyright (C) 1993-2021 -%% 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 LaTeX base system. diff --git a/Master/texmf-dist/tex/latex-dev/base/t1lcmss.fd b/Master/texmf-dist/tex/latex-dev/base/t1lcmss.fd index cc18c9df5f1..974e58a4d6d 100644 --- a/Master/texmf-dist/tex/latex-dev/base/t1lcmss.fd +++ b/Master/texmf-dist/tex/latex-dev/base/t1lcmss.fd @@ -14,7 +14,7 @@ %% %% %% Copyright (C) 1993-2021 -%% 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 LaTeX base system. diff --git a/Master/texmf-dist/tex/latex-dev/base/t1lcmtt.fd b/Master/texmf-dist/tex/latex-dev/base/t1lcmtt.fd index c1c79d4192a..442d99516a9 100644 --- a/Master/texmf-dist/tex/latex-dev/base/t1lcmtt.fd +++ b/Master/texmf-dist/tex/latex-dev/base/t1lcmtt.fd @@ -14,7 +14,7 @@ %% %% %% Copyright (C) 1993-2021 -%% 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 LaTeX base system. diff --git a/Master/texmf-dist/tex/latex-dev/base/t2aenc.dfu b/Master/texmf-dist/tex/latex-dev/base/t2aenc.dfu index 2bcecf5423d..770265c29ff 100644 --- a/Master/texmf-dist/tex/latex-dev/base/t2aenc.dfu +++ b/Master/texmf-dist/tex/latex-dev/base/t2aenc.dfu @@ -14,7 +14,7 @@ %% %% %% Copyright (C) 1993-2021 -%% 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 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} - [2020/11/26 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-dev/base/t2benc.dfu b/Master/texmf-dist/tex/latex-dev/base/t2benc.dfu index 44c95e2142d..7844383d2b7 100644 --- a/Master/texmf-dist/tex/latex-dev/base/t2benc.dfu +++ b/Master/texmf-dist/tex/latex-dev/base/t2benc.dfu @@ -14,7 +14,7 @@ %% %% %% Copyright (C) 1993-2021 -%% 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 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} - [2020/11/26 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-dev/base/t2cenc.dfu b/Master/texmf-dist/tex/latex-dev/base/t2cenc.dfu index ad8b5fd86a2..7c16deaeaff 100644 --- a/Master/texmf-dist/tex/latex-dev/base/t2cenc.dfu +++ b/Master/texmf-dist/tex/latex-dev/base/t2cenc.dfu @@ -14,7 +14,7 @@ %% %% %% Copyright (C) 1993-2021 -%% 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 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} - [2020/11/26 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-dev/base/testpage.tex b/Master/texmf-dist/tex/latex-dev/base/testpage.tex index d8af7d0bc13..ff17984ee12 100644 --- a/Master/texmf-dist/tex/latex-dev/base/testpage.tex +++ b/Master/texmf-dist/tex/latex-dev/base/testpage.tex @@ -1,7 +1,7 @@ % \iffalse meta-comment % % Copyright (C) 1993-2021 -% 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-dev/base/texsys.cfg b/Master/texmf-dist/tex/latex-dev/base/texsys.cfg index 80f3922ced8..442e3971df8 100644 --- a/Master/texmf-dist/tex/latex-dev/base/texsys.cfg +++ b/Master/texmf-dist/tex/latex-dev/base/texsys.cfg @@ -49,14 +49,16 @@ % |{}| 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 diff --git a/Master/texmf-dist/tex/latex-dev/base/textcomp-2018-08-11.sty b/Master/texmf-dist/tex/latex-dev/base/textcomp-2018-08-11.sty index a5486ed5f2a..947c26fb0b3 100644 --- a/Master/texmf-dist/tex/latex-dev/base/textcomp-2018-08-11.sty +++ b/Master/texmf-dist/tex/latex-dev/base/textcomp-2018-08-11.sty @@ -14,7 +14,7 @@ %% %% %% Copyright (C) 1993-2021 -%% 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 LaTeX base system. @@ -41,6 +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-dev/base/textcomp.sty b/Master/texmf-dist/tex/latex-dev/base/textcomp.sty index a661dc51dd0..8db7c8b1d86 100644 --- a/Master/texmf-dist/tex/latex-dev/base/textcomp.sty +++ b/Master/texmf-dist/tex/latex-dev/base/textcomp.sty @@ -14,7 +14,7 @@ %% %% %% Copyright (C) 1993-2021 -%% 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 LaTeX base system. @@ -41,6 +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 +56,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-dev/base/tracefnt.sty b/Master/texmf-dist/tex/latex-dev/base/tracefnt.sty index 80c946dd4a5..cd7f60a26d5 100644 --- a/Master/texmf-dist/tex/latex-dev/base/tracefnt.sty +++ b/Master/texmf-dist/tex/latex-dev/base/tracefnt.sty @@ -14,7 +14,7 @@ %% %% %% Copyright (C) 1993-2021 -%% 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 LaTeX base system. @@ -43,7 +43,7 @@ %% 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. +%% Copyright (C) 1994-97 by LaTeX Project. All rights reserved. \NeedsTeXFormat{LaTeX2e}[2021/05/01] \ProvidesPackage{tracefnt} [2020/12/22 v3.0n Standard LaTeX package (font tracing)] diff --git a/Master/texmf-dist/tex/latex-dev/base/ts1cmr.fd b/Master/texmf-dist/tex/latex-dev/base/ts1cmr.fd index af455e29461..b5423d41e04 100644 --- a/Master/texmf-dist/tex/latex-dev/base/ts1cmr.fd +++ b/Master/texmf-dist/tex/latex-dev/base/ts1cmr.fd @@ -14,7 +14,7 @@ %% %% %% Copyright (C) 1993-2021 -%% 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 LaTeX base system. diff --git a/Master/texmf-dist/tex/latex-dev/base/ts1cmss.fd b/Master/texmf-dist/tex/latex-dev/base/ts1cmss.fd index fe41d0ee84d..86c99c5cb8d 100644 --- a/Master/texmf-dist/tex/latex-dev/base/ts1cmss.fd +++ b/Master/texmf-dist/tex/latex-dev/base/ts1cmss.fd @@ -14,7 +14,7 @@ %% %% %% Copyright (C) 1993-2021 -%% 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 LaTeX base system. diff --git a/Master/texmf-dist/tex/latex-dev/base/ts1cmtt.fd b/Master/texmf-dist/tex/latex-dev/base/ts1cmtt.fd index c310d1fd418..99d50809eb8 100644 --- a/Master/texmf-dist/tex/latex-dev/base/ts1cmtt.fd +++ b/Master/texmf-dist/tex/latex-dev/base/ts1cmtt.fd @@ -14,7 +14,7 @@ %% %% %% Copyright (C) 1993-2021 -%% 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 LaTeX base system. diff --git a/Master/texmf-dist/tex/latex-dev/base/ts1cmvtt.fd b/Master/texmf-dist/tex/latex-dev/base/ts1cmvtt.fd index da0aaddfd12..4d03d9713fb 100644 --- a/Master/texmf-dist/tex/latex-dev/base/ts1cmvtt.fd +++ b/Master/texmf-dist/tex/latex-dev/base/ts1cmvtt.fd @@ -14,7 +14,7 @@ %% %% %% Copyright (C) 1993-2021 -%% 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 LaTeX base system. diff --git a/Master/texmf-dist/tex/latex-dev/base/ts1enc.def b/Master/texmf-dist/tex/latex-dev/base/ts1enc.def index c219a085286..951a63a1d0a 100644 --- a/Master/texmf-dist/tex/latex-dev/base/ts1enc.def +++ b/Master/texmf-dist/tex/latex-dev/base/ts1enc.def @@ -14,7 +14,7 @@ %% %% %% Copyright (C) 1993-2021 -%% 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 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-dev/base/ts1enc.dfu b/Master/texmf-dist/tex/latex-dev/base/ts1enc.dfu index da02f5cc485..79645088774 100644 --- a/Master/texmf-dist/tex/latex-dev/base/ts1enc.dfu +++ b/Master/texmf-dist/tex/latex-dev/base/ts1enc.dfu @@ -14,7 +14,7 @@ %% %% %% Copyright (C) 1993-2021 -%% 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 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} - [2020/11/26 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-dev/base/tuenc.def b/Master/texmf-dist/tex/latex-dev/base/tuenc.def index 727c54082ce..90ebea4f728 100644 --- a/Master/texmf-dist/tex/latex-dev/base/tuenc.def +++ b/Master/texmf-dist/tex/latex-dev/base/tuenc.def @@ -14,7 +14,7 @@ %% %% %% Copyright (C) 1993-2021 -%% 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 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/02/19 v2.0u 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 } diff --git a/Master/texmf-dist/tex/latex-dev/base/tulmdh.fd b/Master/texmf-dist/tex/latex-dev/base/tulmdh.fd index 24f085dff63..a7a89870404 100644 --- a/Master/texmf-dist/tex/latex-dev/base/tulmdh.fd +++ b/Master/texmf-dist/tex/latex-dev/base/tulmdh.fd @@ -14,7 +14,7 @@ %% %% %% Copyright (C) 2016-2021 -%% 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 LaTeX base system. diff --git a/Master/texmf-dist/tex/latex-dev/base/tulmr.fd b/Master/texmf-dist/tex/latex-dev/base/tulmr.fd index e8ee09ce5b8..ea6ff725291 100644 --- a/Master/texmf-dist/tex/latex-dev/base/tulmr.fd +++ b/Master/texmf-dist/tex/latex-dev/base/tulmr.fd @@ -14,7 +14,7 @@ %% %% %% Copyright (C) 2016-2021 -%% 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 LaTeX base system. diff --git a/Master/texmf-dist/tex/latex-dev/base/tulmss.fd b/Master/texmf-dist/tex/latex-dev/base/tulmss.fd index ff704b2ff8b..13cdb78cd71 100644 --- a/Master/texmf-dist/tex/latex-dev/base/tulmss.fd +++ b/Master/texmf-dist/tex/latex-dev/base/tulmss.fd @@ -14,7 +14,7 @@ %% %% %% Copyright (C) 2016-2021 -%% 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 LaTeX base system. diff --git a/Master/texmf-dist/tex/latex-dev/base/tulmssq.fd b/Master/texmf-dist/tex/latex-dev/base/tulmssq.fd index 251f1ce3186..a74bbbb905c 100644 --- a/Master/texmf-dist/tex/latex-dev/base/tulmssq.fd +++ b/Master/texmf-dist/tex/latex-dev/base/tulmssq.fd @@ -14,7 +14,7 @@ %% %% %% Copyright (C) 2016-2021 -%% 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 LaTeX base system. diff --git a/Master/texmf-dist/tex/latex-dev/base/tulmtt.fd b/Master/texmf-dist/tex/latex-dev/base/tulmtt.fd index 16d66fd2587..89a005a23b6 100644 --- a/Master/texmf-dist/tex/latex-dev/base/tulmtt.fd +++ b/Master/texmf-dist/tex/latex-dev/base/tulmtt.fd @@ -14,7 +14,7 @@ %% %% %% Copyright (C) 2016-2021 -%% 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 LaTeX base system. diff --git a/Master/texmf-dist/tex/latex-dev/base/tulmvtt.fd b/Master/texmf-dist/tex/latex-dev/base/tulmvtt.fd index 164b8598a84..c4cb02ae7fe 100644 --- a/Master/texmf-dist/tex/latex-dev/base/tulmvtt.fd +++ b/Master/texmf-dist/tex/latex-dev/base/tulmvtt.fd @@ -14,7 +14,7 @@ %% %% %% Copyright (C) 2016-2021 -%% 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 LaTeX base system. diff --git a/Master/texmf-dist/tex/latex-dev/base/ucmr.fd b/Master/texmf-dist/tex/latex-dev/base/ucmr.fd index 823b3eb8909..7a31d3e558b 100644 --- a/Master/texmf-dist/tex/latex-dev/base/ucmr.fd +++ b/Master/texmf-dist/tex/latex-dev/base/ucmr.fd @@ -14,7 +14,7 @@ %% %% %% Copyright (C) 1993-2021 -%% 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 LaTeX base system. diff --git a/Master/texmf-dist/tex/latex-dev/base/ucmss.fd b/Master/texmf-dist/tex/latex-dev/base/ucmss.fd index af7d9771448..c2ff37355f9 100644 --- a/Master/texmf-dist/tex/latex-dev/base/ucmss.fd +++ b/Master/texmf-dist/tex/latex-dev/base/ucmss.fd @@ -14,7 +14,7 @@ %% %% %% Copyright (C) 1993-2021 -%% 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 LaTeX base system. diff --git a/Master/texmf-dist/tex/latex-dev/base/ucmtt.fd b/Master/texmf-dist/tex/latex-dev/base/ucmtt.fd index 2a8e7edd6d1..697308fe293 100644 --- a/Master/texmf-dist/tex/latex-dev/base/ucmtt.fd +++ b/Master/texmf-dist/tex/latex-dev/base/ucmtt.fd @@ -14,7 +14,7 @@ %% %% %% Copyright (C) 1993-2021 -%% 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 LaTeX base system. diff --git a/Master/texmf-dist/tex/latex-dev/base/ulasy.fd b/Master/texmf-dist/tex/latex-dev/base/ulasy.fd index 08d2185b829..281f91a67c3 100644 --- a/Master/texmf-dist/tex/latex-dev/base/ulasy.fd +++ b/Master/texmf-dist/tex/latex-dev/base/ulasy.fd @@ -14,7 +14,7 @@ %% %% %% Copyright (C) 1993-2021 -%% 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 LaTeX base system. diff --git a/Master/texmf-dist/tex/latex-dev/base/ullasy.fd b/Master/texmf-dist/tex/latex-dev/base/ullasy.fd index 811fb927b55..a1e7fdaa0fa 100644 --- a/Master/texmf-dist/tex/latex-dev/base/ullasy.fd +++ b/Master/texmf-dist/tex/latex-dev/base/ullasy.fd @@ -14,7 +14,7 @@ %% %% %% Copyright (C) 1993-2021 -%% 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 LaTeX base system. diff --git a/Master/texmf-dist/tex/latex-dev/base/utf8-2018.def b/Master/texmf-dist/tex/latex-dev/base/utf8-2018.def index 91bf3bdb180..8ec9ee9174a 100644 --- a/Master/texmf-dist/tex/latex-dev/base/utf8-2018.def +++ b/Master/texmf-dist/tex/latex-dev/base/utf8-2018.def @@ -14,7 +14,7 @@ %% %% %% Copyright (C) 1993-2021 -%% 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 LaTeX base system. diff --git a/Master/texmf-dist/tex/latex-dev/base/utf8.def b/Master/texmf-dist/tex/latex-dev/base/utf8.def index 90a267a5dec..0e2dc1a885a 100644 --- a/Master/texmf-dist/tex/latex-dev/base/utf8.def +++ b/Master/texmf-dist/tex/latex-dev/base/utf8.def @@ -14,7 +14,7 @@ %% %% %% Copyright (C) 1993-2021 -%% 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 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} - [2020/11/26 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-dev/base/utf8enc.dfu b/Master/texmf-dist/tex/latex-dev/base/utf8enc.dfu index b95713ee3bb..3d554a0bd02 100644 --- a/Master/texmf-dist/tex/latex-dev/base/utf8enc.dfu +++ b/Master/texmf-dist/tex/latex-dev/base/utf8enc.dfu @@ -14,7 +14,7 @@ %% %% %% Copyright (C) 1993-2021 -%% 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 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} - [2020/11/26 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-dev/base/x2enc.dfu b/Master/texmf-dist/tex/latex-dev/base/x2enc.dfu index 72224b6b795..d01439dbbd6 100644 --- a/Master/texmf-dist/tex/latex-dev/base/x2enc.dfu +++ b/Master/texmf-dist/tex/latex-dev/base/x2enc.dfu @@ -14,7 +14,7 @@ %% %% %% Copyright (C) 1993-2021 -%% 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 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} - [2020/11/26 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} -- cgit v1.2.3