diff options
author | Karl Berry <karl@freefriends.org> | 2024-06-02 20:26:39 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2024-06-02 20:26:39 +0000 |
commit | b0c666dbd315af330424f5d34739d7d4134d0c17 (patch) | |
tree | 0b0a60149691348e9cea719bb797b2c1587adfc6 /Master/texmf-dist/tex | |
parent | 5634f0473d32ab71b4fbaaf0a6870737c2cc6dcb (diff) |
latex2e (2jun24)
git-svn-id: svn://tug.org/texlive/trunk@71408 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex')
190 files changed, 6939 insertions, 1785 deletions
diff --git a/Master/texmf-dist/tex/latex/amsmath/amsbsy.sty b/Master/texmf-dist/tex/latex/amsmath/amsbsy.sty index 7fe98338670..8f9f97ed311 100644 --- a/Master/texmf-dist/tex/latex/amsmath/amsbsy.sty +++ b/Master/texmf-dist/tex/latex/amsmath/amsbsy.sty @@ -7,7 +7,7 @@ %% amsbsy.dtx %% %% Copyright (C) 1995, 1999 American Mathematical Society. -%% Copyright (C) 2016-2023 LaTeX Project and American Mathematical Society. +%% Copyright (C) 2016-2024 LaTeX Project and American Mathematical Society. %% %% This work may be distributed and/or modified under the %% conditions of the LaTeX Project Public License, either version 1.3c diff --git a/Master/texmf-dist/tex/latex/amsmath/amscd.sty b/Master/texmf-dist/tex/latex/amsmath/amscd.sty index 2b5c20ec5fc..a32842d8c3f 100644 --- a/Master/texmf-dist/tex/latex/amsmath/amscd.sty +++ b/Master/texmf-dist/tex/latex/amsmath/amscd.sty @@ -7,7 +7,7 @@ %% amscd.dtx %% %% Copyright (C) 1995, 1999 American Mathematical Society. -%% Copyright (C) 2016-2023 LaTeX Project and American Mathematical Society. +%% Copyright (C) 2016-2024 LaTeX Project and American Mathematical Society. %% %% This work may be distributed and/or modified under the %% conditions of the LaTeX Project Public License, either version 1.3c diff --git a/Master/texmf-dist/tex/latex/amsmath/amsgen.sty b/Master/texmf-dist/tex/latex/amsmath/amsgen.sty index 6ac9e8a7291..39240727511 100644 --- a/Master/texmf-dist/tex/latex/amsmath/amsgen.sty +++ b/Master/texmf-dist/tex/latex/amsmath/amsgen.sty @@ -7,7 +7,7 @@ %% amsgen.dtx %% %% Copyright (C) 1995, 1999 American Mathematical Society. -%% Copyright (C) 2016-2023 LaTeX Project and American Mathematical Society. +%% Copyright (C) 2016-2024 LaTeX Project and American Mathematical Society. %% %% This work may be distributed and/or modified under the %% conditions of the LaTeX Project Public License, either version 1.3c diff --git a/Master/texmf-dist/tex/latex/amsmath/amsmath-2018-12-01.sty b/Master/texmf-dist/tex/latex/amsmath/amsmath-2018-12-01.sty index ab45172a32d..ca5ac506fbc 100644 --- a/Master/texmf-dist/tex/latex/amsmath/amsmath-2018-12-01.sty +++ b/Master/texmf-dist/tex/latex/amsmath/amsmath-2018-12-01.sty @@ -1,4 +1,8 @@ %% +%% This is an old release of `amsmath.sty' used during rollback operations. +%% Do not use this file directly. +%% ============================== +%% %% This is file `amsmath.sty', %% generated with the docstrip utility. %% @@ -517,7 +521,7 @@ Foreign command \@backslashchar#1;\MessageBreak \else % \not \mathxxx \@xp\Umathch@\meaning@"0"\Umathch@ \ifgtest@ % if \Umathchar - \else % else not \Umathcar + \else % else not \Umathchar \@xp\macro@\meaning@@\macro@ \ifgtest@ % if macro test \@xp\not@\meaning@\not@ diff --git a/Master/texmf-dist/tex/latex/amsmath/amsmath.sty b/Master/texmf-dist/tex/latex/amsmath/amsmath.sty index 580461feb56..63f578290a7 100644 --- a/Master/texmf-dist/tex/latex/amsmath/amsmath.sty +++ b/Master/texmf-dist/tex/latex/amsmath/amsmath.sty @@ -7,7 +7,7 @@ %% amsmath.dtx %% %% Copyright (C) 1995, 1999, 2000, 2013 American Mathematical Society. -%% Copyright (C) 2016-2023 LaTeX Project and American Mathematical Society. +%% Copyright (C) 2016-2024 LaTeX Project and American Mathematical Society. %% %% This work may be distributed and/or modified under the %% conditions of the LaTeX Project Public License, either version 1.3c @@ -23,11 +23,10 @@ %% \NeedsTeXFormat{LaTeX2e}% LaTeX 2.09 can't be used (nor non-LaTeX) [1994/12/01]% LaTeX date must be December 1994 or later -\providecommand\DeclareRelease[3]{} -\providecommand\DeclareCurrentRelease[2]{} +\DeclareRelease{}{1994-06-01}{amsmath-2018-12-01.sty} \DeclareRelease{}{2018-12-01}{amsmath-2018-12-01.sty} \DeclareCurrentRelease{}{2019-04-01} -\ProvidesPackage{amsmath}[2023/05/13 v2.17o AMS math features] +\ProvidesPackage{amsmath}[2024/05/23 v2.17q AMS math features] \edef\@temp{\catcode 96=\number\catcode 96 } \catcode\string `\`=12 \def\do#1{\catcode\number`#1=\number\catcode`#1} @@ -531,7 +530,7 @@ Foreign command \@backslashchar#1;\MessageBreak \else % \not \mathxxx \@xp\Umathch@\meaning@"0"\Umathch@ \ifgtest@ % if \Umathchar - \else % else not \Umathcar + \else % else not \Umathchar \@xp\macro@\meaning@@\macro@ \ifgtest@ % if macro test \@xp\not@\meaning@\not@ @@ -1627,6 +1626,7 @@ and fix things up.} \make@display@tag \ifst@rred\else\global\@eqnswtrue\fi \global\advance\row@\@ne + \global\lineht@\z@ \cr } \def\calc@shift@gather{% diff --git a/Master/texmf-dist/tex/latex/amsmath/amsopn.sty b/Master/texmf-dist/tex/latex/amsmath/amsopn.sty index 1b9d4ec392c..f4ee5958472 100644 --- a/Master/texmf-dist/tex/latex/amsmath/amsopn.sty +++ b/Master/texmf-dist/tex/latex/amsmath/amsopn.sty @@ -7,7 +7,7 @@ %% amsopn.dtx %% %% Copyright (C) 1995, 1999 American Mathematical Society. -%% Copyright (C) 2016-2023 LaTeX Project and American Mathematical Society. +%% Copyright (C) 2016-2024 LaTeX Project and American Mathematical Society. %% %% This work may be distributed and/or modified under the %% conditions of the LaTeX Project Public License, either version 1.3c diff --git a/Master/texmf-dist/tex/latex/amsmath/amstext.sty b/Master/texmf-dist/tex/latex/amsmath/amstext.sty index 01c656d27c0..2cedcc35a82 100644 --- a/Master/texmf-dist/tex/latex/amsmath/amstext.sty +++ b/Master/texmf-dist/tex/latex/amsmath/amstext.sty @@ -7,7 +7,7 @@ %% amstext.dtx %% %% Copyright (C) 1995, 1999 American Mathematical Society. -%% Copyright (C) 2016-2023 LaTeX Project and American Mathematical Society. +%% Copyright (C) 2016-2024 LaTeX Project and American Mathematical Society. %% %% This work may be distributed and/or modified under the %% conditions of the LaTeX Project Public License, either version 1.3c diff --git a/Master/texmf-dist/tex/latex/amsmath/amsxtra.sty b/Master/texmf-dist/tex/latex/amsmath/amsxtra.sty index 52fcbe43ab1..43f10f187a8 100644 --- a/Master/texmf-dist/tex/latex/amsmath/amsxtra.sty +++ b/Master/texmf-dist/tex/latex/amsmath/amsxtra.sty @@ -7,7 +7,7 @@ %% amsxtra.dtx %% %% Copyright (C) 1995, 1999 American Mathematical Society. -%% Copyright (C) 2016-2023 LaTeX Project and American Mathematical Society. +%% Copyright (C) 2016-2024 LaTeX Project and American Mathematical Society. %% %% This work may be distributed and/or modified under the %% conditions of the LaTeX Project Public License, either version 1.3c diff --git a/Master/texmf-dist/tex/latex/base/alltt.sty b/Master/texmf-dist/tex/latex/base/alltt.sty index a20612f5d37..78c5e6a9241 100644 --- a/Master/texmf-dist/tex/latex/base/alltt.sty +++ b/Master/texmf-dist/tex/latex/base/alltt.sty @@ -49,7 +49,7 @@ %% \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{alltt} - [2021/01/29 v2.0g defines alltt environment] + [2024/02/08 v2.0g defines alltt environment] \begingroup \lccode`\~=`\' \lowercase{\endgroup diff --git a/Master/texmf-dist/tex/latex/base/ansinew.def b/Master/texmf-dist/tex/latex/base/ansinew.def index 83698b1e849..071d9a49f8c 100644 --- a/Master/texmf-dist/tex/latex/base/ansinew.def +++ b/Master/texmf-dist/tex/latex/base/ansinew.def @@ -43,7 +43,7 @@ %% extension .ins) which are part of the distribution. \ProvidesFile{ansinew.def} - [2021/02/14 v1.3d Input encoding file] + [2024/02/08 v1.3d Input encoding file] \ProvideTextCommandDefault{\textdegree}{\ensuremath{{^\circ}}} \ProvideTextCommandDefault{\textonehalf}{\ensuremath{\frac12}} \ProvideTextCommandDefault{\textonequarter}{\ensuremath{\frac14}} diff --git a/Master/texmf-dist/tex/latex/base/applemac.def b/Master/texmf-dist/tex/latex/base/applemac.def index 6d96c23caa6..85032040d8c 100644 --- a/Master/texmf-dist/tex/latex/base/applemac.def +++ b/Master/texmf-dist/tex/latex/base/applemac.def @@ -43,7 +43,7 @@ %% extension .ins) which are part of the distribution. \ProvidesFile{applemac.def} - [2021/02/14 v1.3d Input encoding file] + [2024/02/08 v1.3d Input encoding file] \ProvideTextCommandDefault{\textdegree}{\ensuremath{{^\circ}}} \ProvideTextCommandDefault{\textflorin}{\textit{f}} \ProvideTextCommandDefault{\textcent} diff --git a/Master/texmf-dist/tex/latex/base/article.cls b/Master/texmf-dist/tex/latex/base/article.cls index 9a3615247a5..869bdc0db41 100644 --- a/Master/texmf-dist/tex/latex/base/article.cls +++ b/Master/texmf-dist/tex/latex/base/article.cls @@ -43,7 +43,7 @@ %% extension .ins) which are part of the distribution. \NeedsTeXFormat{LaTeX2e}[1995/12/01] \ProvidesClass{article} - [2023/05/17 v1.4n + [2024/02/08 v1.4n Standard LaTeX document class] \newcommand\@ptsize{} \newif\if@restonecol diff --git a/Master/texmf-dist/tex/latex/base/ascii.def b/Master/texmf-dist/tex/latex/base/ascii.def index 1c924fc48dc..0f08f8091f8 100644 --- a/Master/texmf-dist/tex/latex/base/ascii.def +++ b/Master/texmf-dist/tex/latex/base/ascii.def @@ -43,7 +43,7 @@ %% extension .ins) which are part of the distribution. \ProvidesFile{ascii.def} - [2021/02/14 v1.3d Input encoding file] + [2024/02/08 v1.3d Input encoding file] \@inpenc@test \endinput %% diff --git a/Master/texmf-dist/tex/latex/base/atbegshi-ltx.sty b/Master/texmf-dist/tex/latex/base/atbegshi-ltx.sty index 034d1d13290..992a4278526 100644 --- a/Master/texmf-dist/tex/latex/base/atbegshi-ltx.sty +++ b/Master/texmf-dist/tex/latex/base/atbegshi-ltx.sty @@ -46,8 +46,6 @@ %% Frank Mittelbach, The LaTeX Project %% %%% From File: ltshipout.dtx -\providecommand\ltshipoutversion{v1.0n} -\providecommand\ltshipoutdate{2022/11/08} \ProvidesPackage{atbegshi-ltx} [2021/01/10 v1.0c Emulation of the original atbegshi^^Jpackage with kernel methods] diff --git a/Master/texmf-dist/tex/latex/base/atveryend-ltx.sty b/Master/texmf-dist/tex/latex/base/atveryend-ltx.sty index add6997a565..76d4e001d38 100644 --- a/Master/texmf-dist/tex/latex/base/atveryend-ltx.sty +++ b/Master/texmf-dist/tex/latex/base/atveryend-ltx.sty @@ -42,8 +42,6 @@ %% and covered by LPPL is defined by the unpacking scripts (with %% extension .ins) which are part of the distribution. %%% From File: ltfilehook.dtx -\providecommand\ltfilehookversion{v1.0o} -\providecommand\ltfilehookdate{2023/07/10} \ProvidesPackage{atveryend-ltx} [2020/08/19 v1.0a Emulation of the original atveryend package^^Jwith kernel methods] diff --git a/Master/texmf-dist/tex/latex/base/bk10.clo b/Master/texmf-dist/tex/latex/base/bk10.clo index 2de6c941b56..ba4701bead9 100644 --- a/Master/texmf-dist/tex/latex/base/bk10.clo +++ b/Master/texmf-dist/tex/latex/base/bk10.clo @@ -42,7 +42,7 @@ %% and covered by LPPL is defined by the unpacking scripts (with %% extension .ins) which are part of the distribution. \ProvidesFile{bk10.clo} - [2023/05/17 v1.4n + [2024/02/08 v1.4n Standard LaTeX file (size option)] \renewcommand\normalsize{% \@setfontsize\normalsize\@xpt\@xiipt diff --git a/Master/texmf-dist/tex/latex/base/bk11.clo b/Master/texmf-dist/tex/latex/base/bk11.clo index 9cac5edf370..c0a4a4420f1 100644 --- a/Master/texmf-dist/tex/latex/base/bk11.clo +++ b/Master/texmf-dist/tex/latex/base/bk11.clo @@ -42,7 +42,7 @@ %% and covered by LPPL is defined by the unpacking scripts (with %% extension .ins) which are part of the distribution. \ProvidesFile{bk11.clo} - [2023/05/17 v1.4n + [2024/02/08 v1.4n Standard LaTeX file (size option)] \renewcommand\normalsize{% \@setfontsize\normalsize\@xipt{13.6}% diff --git a/Master/texmf-dist/tex/latex/base/bk12.clo b/Master/texmf-dist/tex/latex/base/bk12.clo index 79562d99a94..c4a5e3c2457 100644 --- a/Master/texmf-dist/tex/latex/base/bk12.clo +++ b/Master/texmf-dist/tex/latex/base/bk12.clo @@ -42,7 +42,7 @@ %% and covered by LPPL is defined by the unpacking scripts (with %% extension .ins) which are part of the distribution. \ProvidesFile{bk12.clo} - [2023/05/17 v1.4n + [2024/02/08 v1.4n Standard LaTeX file (size option)] \renewcommand\normalsize{% \@setfontsize\normalsize\@xiipt{14.5}% diff --git a/Master/texmf-dist/tex/latex/base/book.cls b/Master/texmf-dist/tex/latex/base/book.cls index 020a4877320..2838b7f1ce3 100644 --- a/Master/texmf-dist/tex/latex/base/book.cls +++ b/Master/texmf-dist/tex/latex/base/book.cls @@ -43,7 +43,7 @@ %% extension .ins) which are part of the distribution. \NeedsTeXFormat{LaTeX2e}[1995/12/01] \ProvidesClass{book} - [2023/05/17 v1.4n + [2024/02/08 v1.4n Standard LaTeX document class] \newcommand\@ptsize{} \newif\if@restonecol diff --git a/Master/texmf-dist/tex/latex/base/checkencodingsubset.tex b/Master/texmf-dist/tex/latex/base/checkencodingsubset.tex new file mode 100644 index 00000000000..02410ad693a --- /dev/null +++ b/Master/texmf-dist/tex/latex/base/checkencodingsubset.tex @@ -0,0 +1,419 @@ +%% +%% This is file `checkencodingsubset.tex', +%% generated with the docstrip utility. +%% +%% The original source files were: +%% +%% lttextcomp.dtx (with options: `TS1check') +%% +%% 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-2024 +%% 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. +%%% From File: lttextcomp.dtx +\Providesfile{checkencodingsubset.tex} + [2024/01/27 v0.5a Figure out safe TS1 encoding subsets] +\let\typeoutdetails\typeout +\def\doesglyphexist#1#2{\iffontchar\testFont #1 0\else 1\relax \fi} +\def\glyphmissingdetails#1#2{\iffontchar\testFont #1 \else + \typeoutdetails{\space\space\space ==> \string#2 (#1) is missing}\fi} +\newif\ifsafesubencodingfound +\newif\ifcoremisses +\def\testgroup#1#2#3{% + \ifnum 0 = #1% + \ifnum #2<0 + \typeoutdetails{All glyphs in core exist}% + \else + \typeoutdetails{All glyphs between sub-encoding #2 and #3 exist}% + \fi + \else + \ifnum #2<0 + \typeoutdetails{**********************************}% + \typeoutdetails{Some glyphs are missing from core:}% + \coremissestrue + \ifsafesubencodingfound \else + \def\subencodingresult{#2}% + \fi + \else + \typeoutdetails{Some glyphs are missing from sub-encoding #2:}% + \ifsafesubencodingfound \else + \def\subencodingresult{#3}% + \fi + \fi + {\let\doesglyphexist \glyphmissingdetails #1}% + \safesubencodingfoundtrue + \fi +} +\def\currsubencoding#1{\csname TS1:\ifcsname TS1:#1\endcsname #1\else ?\fi\endcsname} +\DeclareFixedFont\cmrFont{TS1}{cmr}{m}{n}{10pt} +\def\testallgroups#1{% + \DeclareFixedFont\testFont{TS1}{#1}{m}{n}{10pt}% + \ifx\testFont\cmrFont + \typeout{***** Font family #1 not found ****}% + \else + \safesubencodingfoundfalse + \coremissesfalse + \typeoutdetails{^^J-----------------------------------------}% + \typeoutdetails{Testing font family #1^^J(currently TS1-sub-encoding + \currsubencoding{#1})}% + \typeout{-----------------------------------------}% + \testgroup{% + \doesglyphexist{21}{\texttwelveudash}% + \doesglyphexist{22}{\textthreequartersemdash}% + \doesglyphexist{134}{\textbardbl}% + \doesglyphexist{137}{\textcelsius}% + \doesglyphexist{178}{\texttwosuperior}% + \doesglyphexist{179}{\textthreesuperior}% + \doesglyphexist{185}{\textonesuperior}% + }{8}{9}% + \testgroup{% + \doesglyphexist{32}{\textblank}% + \doesglyphexist{148}{\textinterrobang}% + \doesglyphexist{149}{\textinterrobangdown}% + \doesglyphexist{191}{\texteuro}% + }{7}{8}% + \testgroup{% + \doesglyphexist{47}{\textfractionsolidus}% + \doesglyphexist{61}{\textminus}% + \doesglyphexist{87}{\textohm}% + \doesglyphexist{181}{\textmu}% + }{6}{7}% + \testgroup{% + \doesglyphexist{140}{\textflorin}% + \doesglyphexist{164}{\textcurrency}% + }{5}{6}% + \testgroup{% + \doesglyphexist{155}{\textnumero}% + \doesglyphexist{157}{\textestimated}% + }{4}{5}% + \testgroup{% + \doesglyphexist{24}{\textleftarrow}% + \doesglyphexist{25}{\textrightarrow}% + \doesglyphexist{94}{\textuparrow}% + \doesglyphexist{95}{\textdownarrow}% + \doesglyphexist{141}{\textcolonmonetary}% + \doesglyphexist{142}{\textwon}% + \doesglyphexist{146}{\textlira}% + \doesglyphexist{150}{\textdong}% + }{3}{4}% + \testgroup{% + \doesglyphexist{60}{\textlangle}% + \doesglyphexist{62}{\textrangle}% + }{2}{3}% + \testgroup{% + \doesglyphexist{0}{\capitalgrave}% + \doesglyphexist{1}{\capitalacute}% + \doesglyphexist{2}{\capitalcircumflex}% + \doesglyphexist{3}{\capitaltilde}% + \doesglyphexist{4}{\capitaldieresis}% + \doesglyphexist{5}{\capitalhungarumlaut}% + \doesglyphexist{6}{\capitalring}% + \doesglyphexist{7}{\capitalcaron}% + \doesglyphexist{8}{\capitalbreve}% + \doesglyphexist{9}{\capitalmacron}% + \doesglyphexist{10}{\capitaldotaccent}% + \doesglyphexist{11}{\capitalcedilla}% + \doesglyphexist{12}{\capitalogonek}% + \doesglyphexist{26}{\t}% + \doesglyphexist{27}{\capitaltie}% + \doesglyphexist{28}{\newtie}% + \doesglyphexist{29}{\capitalnewtie}% + \doesglyphexist{45}{\textdblhyphen}% + \doesglyphexist{48}{\textzerooldstyle}% + \doesglyphexist{49}{\textoneoldstyle}% + \doesglyphexist{50}{\texttwooldstyle}% + \doesglyphexist{51}{\textthreeoldstyle}% + \doesglyphexist{52}{\textfouroldstyle}% + \doesglyphexist{53}{\textfiveoldstyle}% + \doesglyphexist{54}{\textsixoldstyle}% + \doesglyphexist{55}{\textsevenoldstyle}% + \doesglyphexist{56}{\texteightoldstyle}% + \doesglyphexist{57}{\textnineoldstyle}% + \doesglyphexist{77}{\textmho}% + \doesglyphexist{79}{\textbigcircle}% + \doesglyphexist{91}{\textlbrackdbl}% + \doesglyphexist{93}{\textrbrackdbl}% + \doesglyphexist{96}{\textasciigrave}% + \doesglyphexist{98}{\textborn}% + \doesglyphexist{99}{\textdivorced}% + \doesglyphexist{100}{\textdied}% + \doesglyphexist{108}{\textleaf}% + \doesglyphexist{109}{\textmarried}% + \doesglyphexist{110}{\textmusicalnote}% + \doesglyphexist{126}{\texttildelow}% + \doesglyphexist{127}{\textdblhyphenchar}% + \doesglyphexist{128}{\textasciibreve}% + \doesglyphexist{129}{\textasciicaron}% + \doesglyphexist{175}{\textasciimacron}% + \doesglyphexist{130}{\textacutedbl}% + \doesglyphexist{131}{\textgravedbl}% + \doesglyphexist{138}{\textdollaroldstyle}% + \doesglyphexist{139}{\textcentoldstyle}% + \doesglyphexist{143}{\textnaira}% + \doesglyphexist{144}{\textguarani}% + \doesglyphexist{145}{\textpeso}% + \doesglyphexist{147}{\textrecipe}% + \doesglyphexist{152}{\textpertenthousand}% + \doesglyphexist{153}{\textpilcrow}% + \doesglyphexist{154}{\textbaht}% + \doesglyphexist{156}{\textdiscount}% + \doesglyphexist{158}{\textopenbullet}% + \doesglyphexist{159}{\textservicemark}% + \doesglyphexist{160}{\textlquill}% + \doesglyphexist{161}{\textrquill}% + \doesglyphexist{168}{\textasciidieresis}% + \doesglyphexist{171}{\textcopyleft}% + \doesglyphexist{173}{\textcircledP}% + \doesglyphexist{180}{\textasciiacute}% + \doesglyphexist{184}{\textreferencemark}% + \doesglyphexist{187}{\textsurd}% + }{1}{2}% + \testgroup{% + \doesglyphexist{79}{\textcircled}% this is not a proper test because the symbol is + % usually available but not usable + }{0}{1}% + \testgroup{% + \doesglyphexist{13}{\textquotestraightbase}% + \doesglyphexist{18}{\textquotestraightdblbase}% + \doesglyphexist{23}{\textcapitalcompwordmark}% + \doesglyphexist{31}{\textascendercompwordmark}% + \doesglyphexist{36}{\textdollar}% + \doesglyphexist{39}{\textquotesingle}% + \doesglyphexist{42}{\textasteriskcentered}% + \doesglyphexist{132}{\textdagger}% + \doesglyphexist{133}{\textdaggerdbl}% + \doesglyphexist{135}{\textperthousand}% + \doesglyphexist{136}{\textbullet}% + \doesglyphexist{151}{\texttrademark}% + \doesglyphexist{162}{\textcent}% + \doesglyphexist{163}{\textsterling}% + \doesglyphexist{165}{\textyen}% + \doesglyphexist{166}{\textbrokenbar}% + \doesglyphexist{167}{\textsection}% + \doesglyphexist{169}{\textcopyright}% + \doesglyphexist{170}{\textordfeminine}% + \doesglyphexist{172}{\textlnot}% + \doesglyphexist{174}{\textregistered}% + \doesglyphexist{176}{\textdegree}% + \doesglyphexist{177}{\textpm}% + \doesglyphexist{182}{\textparagraph}% + \doesglyphexist{183}{\textperiodcentered}% + \doesglyphexist{186}{\textordmasculine}% + \doesglyphexist{188}{\textonequarter}% + \doesglyphexist{189}{\textonehalf}% + \doesglyphexist{190}{\textthreequarters}% + \doesglyphexist{214}{\texttimes}% + \doesglyphexist{246}{\textdiv}% + }{-1}{0}% + \ifsafesubencodingfound\else + \def\subencodingresult{0}% + \fi + \typeoutdetails{-----------------------------------------}% + \typeout{TS1 encoding subset for #1\ifcoremisses \space(ignoring core misses)\fi + \space (\ifnum\subencodingresult = + \currsubencoding{#1} ok\else bad\fi)}% + \typeout{Use sub-encoding \subencodingresult + \ifnum\subencodingresult = \currsubencoding{#1}\else + \space (not \currsubencoding{#1})\fi} + \typeout{-----------------------------------------^^J}% + \fi +} +\long\def\testallkerneldefinedfamilies{% +\testallgroups{ccr}% {0} +\testallgroups{cmbr}% {0} +%%\testallgroups{cmr}% {0} % don't test this one as it is the fallback + % thus reports that the family is not found +\testallgroups{cmss}% {0} +\testallgroups{cmtl}% {0} +\testallgroups{cmtt}% {0} +\testallgroups{cmvtt}% {0} +\testallgroups{pxr}% {0} +\testallgroups{pxss}% {0} +\testallgroups{pxtt}% {0} +\testallgroups{qag}% {0} +\testallgroups{qbk}% {0} +\testallgroups{qcr}% {0} +\testallgroups{qcs}% {0} +\testallgroups{qhvc}% {0} +\testallgroups{qhv}% {0} +\testallgroups{qpl}% {0} +\testallgroups{qtm}% {0} +\testallgroups{qzc}% {0} +\testallgroups{txr}% {0} +\testallgroups{txss}% {0} +\testallgroups{txtt}% {0} +\testallgroups{zi4}% {9} +%% not installed normally + +\testallgroups{lato-LF}% {0} % with a bunch of tofu inside --- should probably be changed +\testallgroups{opensans-TLF}%{0} % with a bunch of tofu inside --- should probably be changed +\testallgroups{cantarell-TLF}% {0} % with a bunch of tofu inside --- should probably be changed +\testallgroups{fbb-LF}% {0} % missing centoldstyle ---> 2 +\testallgroups{tli}% {1} % with lots of tofu inside --- should probably be changed +\testallgroups{Alegreya-OsF}% {2} +\testallgroups{AlegreyaSans-OsF}% {2} +\testallgroups{DejaVuSans-TLF}% {2} +\testallgroups{DejaVuSansCondensed-TLF}% {2} +\testallgroups{DejaVuSansMono-TLF}% {2} this is missing \textfractionsolidus which makes it 7 really +\testallgroups{EBGaramond-LF}% {2} +\testallgroups{Tempora-TLF}% {2} +\testallgroups{Tempora-TOsF}% {2} +\testallgroups{Arimo-TLF}% {3} +\testallgroups{Crlt-TLF}% {3} changed from Carlito- +\testallgroups{FiraSans-LF}% {3} should be 4 +\testallgroups{IBMPlexSans-TLF}% {3} +\testallgroups{Merriwthr-OsF}% {3} changed from Merriweather- and should be 2 +\testallgroups{Montserrat-LF}% {3} now 2 +\testallgroups{MontserratAlternates-LF}%{3} now 2 +\testallgroups{SourceCodePro-TLF}% {3} +\testallgroups{SourceCodePro-TOsF}% {3} +\testallgroups{SourceSansPro-OsF}% {3} +\testallgroups{SourceSerifPro-LF}% {3} +\testallgroups{Tinos-TLF}% {3} +\testallgroups{AccanthisADFStdNoThree-LF}%{4} +\testallgroups{Cabin-TLF}% {4} +\testallgroups{Caladea-TLF}% {4} +\testallgroups{Chivo-LF}% {4} +\testallgroups{ClearSans-TLF}% {4} +\testallgroups{Coelacanth-LF}% {4} +\testallgroups{CrimsonPro-LF}% {4} +\testallgroups{FiraMono-TLF}% {4} +\testallgroups{FiraMono-TOsF}% {4} +\testallgroups{Go-TLF}% {4} +\testallgroups{GoMono-TLF}% {4} +\testallgroups{InriaSans-LF}% {4} +\testallgroups{InriaSerif-LF}% {4} +\testallgroups{LibertinusSans-LF}% {4} +\testallgroups{LibertinusSerif-LF}% {4} +\testallgroups{LibreBodoni-TLF}% {4} +\testallgroups{LibreFranklin-TLF}% {4} +\testallgroups{LinguisticsPro-LF}% {4} +\testallgroups{LinguisticsPro-OsF}% {4} +\testallgroups{LinuxBiolinumT-LF}% {4} +\testallgroups{LinuxLibertineT-LF}% {4} +\testallgroups{MerriwthrSans-OsF}% {4} name change and now 2 +\testallgroups{MintSpirit-LF}% {4} +\testallgroups{MintSpiritNoTwo-LF}% {4} +\testallgroups{PTMono-TLF}% {4} +\testallgroups{PTSans-TLF}% {4} +\testallgroups{PTSansCaption-TLF}% {4} +\testallgroups{PTSansNarrow-TLF}% {4} +\testallgroups{PTSerif-TLF}% {4} +\testallgroups{PTSerifCaption-TLF}% {4} +\testallgroups{Raleway-TLF}% {4} +\testallgroups{Raleway-TOsF}% {4} +\testallgroups{Roboto-LF}% {4} +\testallgroups{RobotoMono-TLF}% {4} +\testallgroups{RobotoSlab-TLF}% {4} +\testallgroups{Rosario-LF}% {4} +\testallgroups{SticksTooText-LF}% {4} +\testallgroups{UniversalisADFStd-LF}%{4} +\testallgroups{Almndr-OsF}% {5} name change +\testallgroups{Baskervaldx-LF}% {5} +\testallgroups{BaskervilleF-LF}% {5} now 2 +\testallgroups{Bttr-TLF}% {5} name changed from Bitter-... +\testallgroups{Cinzel-LF}% {5} +\testallgroups{CinzelDecorative-LF}%{5} +\testallgroups{DejaVuSerif-TLF}% {5} +\testallgroups{DejaVuSerifCondensed-TLF}% {5} +\testallgroups{GilliusADF-LF}% {5} +\testallgroups{charssil-TLF} %% missing should be 5 +\testallgroups{GilliusADFCond-LF}%{5} +\testallgroups{GilliusADFNoTwo-LF}%{5} +\testallgroups{GilliusADFNoTwoCond-LF}%{5} +\testallgroups{Lbstr-LF}% {5} name change and should be 7 +\testallgroups{OldStandard-TLF}% {5} +\testallgroups{PlyfrDisplay-LF}%{5} name change +\testallgroups{PlyfrDisplay-OsF}% {5} name change +\testallgroups{TheanoDidot-TLF}% {5} +\testallgroups{TheanoDidot-TOsF}% {5} +\testallgroups{TheanoModern-TLF}% {5} +\testallgroups{TheanoModern-TOsF}%{5} +\testallgroups{TheanoOldStyle-TLF}%{5} +\testallgroups{TheanoOldStyle-TOsF}%{5} +\testallgroups{Crimson-TLF}% {6} +\testallgroups{IBMPlexMono-TLF}% {6} now 3 +\testallgroups{IBMPlexSerif-TLF}% {6} now 3 +\testallgroups{LibertinusMono-TLF}%{6} should be 8 +\testallgroups{LibertinusSerifDisplay-LF}%{6} +\testallgroups{LinuxLibertineDisplayT-LF}%{6} +\testallgroups{LinuxLibertineMonoT-LF}%{6} +\testallgroups{LinuxLibertineMonoT-TLF}%{6} +\testallgroups{Ovrlck-LF}% {6} name changed +\testallgroups{CormorantGaramond-LF}%{7} +\testallgroups{Heuristica-TLF}% {7} +\testallgroups{Heuristica-TOsF}% {7} +\testallgroups{IMFELLEnglish-TLF}%{7} +\testallgroups{LibreBskvl-LF}% {7} %% wrong name LibreBaskerville-TLF +\testallgroups{LibreCsln-LF}% {7} changed from LibreCaslon- +\testallgroups{Mrcls-LF}% {7} %% wrong name Marcellus-LF +\testallgroups{NotoSans-LF}% {7} +\testallgroups{NotoSansMono-TLF}%{7} now 2 +\testallgroups{NotoSansMono-TOsF}%{7} now 2 +\testallgroups{NotoSerif-LF}% {7} +\testallgroups{Quattro-LF}% {7} changed from Quattrocento- +\testallgroups{QuattroSans-LF}% {7} changed from QuattrocentoSans- +\testallgroups{XCharter-TLF}% {7} now 2 +\testallgroups{XCharter-TOsF}% {7} now 2 +\testallgroups{erewhon-LF}% {7} now 2 +\testallgroups{ComicNeue-TLF}% {7} +\testallgroups{ComicNeueAngular-TLF}%{7} +\testallgroups{Frm-LF}%{7} % the superiors are missing; name changed from Forum-LF +\testallgroups{Cochineal-TLF}% {8} now 5 +\testallgroups{AlgolRevived-TLF}%{9} +} +\typeout{^^J=====================================================================} +\typeout{| Enter font family to check (or <enter> for kernel defined families)} +\typeout{=====================================================================} +\typein[\FontFamilyToCheck]{} +\if!\FontFamilyToCheck! + \typeout{=====================================================================} + \typeout{| Detailed output? (default no)} + \typeout{=====================================================================} + \typein[\Details]{} + \if!\Details! + \def\typeoutdetails#1{} + \else + \let\typeoutdetails\typeout + \fi + \testallkerneldefinedfamilies +\else + \let\typeoutdetails\typeout + \testallgroups\FontFamilyToCheck +\fi +\stop + +\endinput +%% +%% End of file `checkencodingsubset.tex'. diff --git a/Master/texmf-dist/tex/latex/base/cp1250.def b/Master/texmf-dist/tex/latex/base/cp1250.def index ed155f74097..a4dfaed86d7 100644 --- a/Master/texmf-dist/tex/latex/base/cp1250.def +++ b/Master/texmf-dist/tex/latex/base/cp1250.def @@ -43,7 +43,7 @@ %% extension .ins) which are part of the distribution. \ProvidesFile{cp1250.def} - [2021/02/14 v1.3d Input encoding file] + [2024/02/08 v1.3d Input encoding file] \ProvideTextCommandDefault{\textdegree}{\ensuremath{{^\circ}}} \ProvideTextCommandDefault{\textcurrency} {\TextSymbolUnavailable\textcurrency} diff --git a/Master/texmf-dist/tex/latex/base/cp1252.def b/Master/texmf-dist/tex/latex/base/cp1252.def index 970c3a6f47f..ae5a89e75cc 100644 --- a/Master/texmf-dist/tex/latex/base/cp1252.def +++ b/Master/texmf-dist/tex/latex/base/cp1252.def @@ -43,7 +43,7 @@ %% extension .ins) which are part of the distribution. \ProvidesFile{cp1252.def} - [2021/02/14 v1.3d Input encoding file] + [2024/02/08 v1.3d Input encoding file] \ProvideTextCommandDefault{\textdegree}{\ensuremath{{^\circ}}} \ProvideTextCommandDefault{\textonehalf}{\ensuremath{\frac12}} \ProvideTextCommandDefault{\textonequarter}{\ensuremath{\frac14}} diff --git a/Master/texmf-dist/tex/latex/base/cp1257.def b/Master/texmf-dist/tex/latex/base/cp1257.def index 3b3575fb9e8..78fdbcbdf76 100644 --- a/Master/texmf-dist/tex/latex/base/cp1257.def +++ b/Master/texmf-dist/tex/latex/base/cp1257.def @@ -43,7 +43,7 @@ %% extension .ins) which are part of the distribution. \ProvidesFile{cp1257.def} - [2021/02/14 v1.3d Input encoding file] + [2024/02/08 v1.3d Input encoding file] \ProvideTextCommandDefault{\textdegree}{\ensuremath{{^\circ}}} \ProvideTextCommandDefault{\textonehalf}{\ensuremath{\frac12}} \ProvideTextCommandDefault{\textonequarter}{\ensuremath{\frac14}} diff --git a/Master/texmf-dist/tex/latex/base/cp437.def b/Master/texmf-dist/tex/latex/base/cp437.def index cdbe6aa24a2..17a2a2e7784 100644 --- a/Master/texmf-dist/tex/latex/base/cp437.def +++ b/Master/texmf-dist/tex/latex/base/cp437.def @@ -43,7 +43,7 @@ %% extension .ins) which are part of the distribution. \ProvidesFile{cp437.def} - [2021/02/14 v1.3d Input encoding file] + [2024/02/08 v1.3d Input encoding file] \ProvideTextCommandDefault{\textdegree}{\ensuremath{{^\circ}}} \ProvideTextCommandDefault{\textflorin}{\textit{f}} \ProvideTextCommandDefault{\textpeseta}{Pt} diff --git a/Master/texmf-dist/tex/latex/base/cp437de.def b/Master/texmf-dist/tex/latex/base/cp437de.def index 488e06030a8..edaccf6a2f4 100644 --- a/Master/texmf-dist/tex/latex/base/cp437de.def +++ b/Master/texmf-dist/tex/latex/base/cp437de.def @@ -43,7 +43,7 @@ %% extension .ins) which are part of the distribution. \ProvidesFile{cp437de.def} - [2021/02/14 v1.3d Input encoding file] + [2024/02/08 v1.3d Input encoding file] \ProvideTextCommandDefault{\textdegree}{\ensuremath{{^\circ}}} \ProvideTextCommandDefault{\textflorin}{\textit{f}} \ProvideTextCommandDefault{\textpeseta}{Pt} diff --git a/Master/texmf-dist/tex/latex/base/cp850.def b/Master/texmf-dist/tex/latex/base/cp850.def index 51cc234105e..40f3cb6eea9 100644 --- a/Master/texmf-dist/tex/latex/base/cp850.def +++ b/Master/texmf-dist/tex/latex/base/cp850.def @@ -43,7 +43,7 @@ %% extension .ins) which are part of the distribution. \ProvidesFile{cp850.def} - [2021/02/14 v1.3d Input encoding file] + [2024/02/08 v1.3d Input encoding file] %% %% If you need a Euro symbol, try cp858 instead. %% diff --git a/Master/texmf-dist/tex/latex/base/cp852.def b/Master/texmf-dist/tex/latex/base/cp852.def index 8e677f1ea39..0fc6c20a561 100644 --- a/Master/texmf-dist/tex/latex/base/cp852.def +++ b/Master/texmf-dist/tex/latex/base/cp852.def @@ -43,7 +43,7 @@ %% extension .ins) which are part of the distribution. \ProvidesFile{cp852.def} - [2021/02/14 v1.3d Input encoding file] + [2024/02/08 v1.3d Input encoding file] \ProvideTextCommandDefault{\textdegree}{\ensuremath{{^\circ}}} \ProvideTextCommandDefault{\textonehalf}{\ensuremath{\frac12}} \ProvideTextCommandDefault{\textonequarter}{\ensuremath{\frac14}} diff --git a/Master/texmf-dist/tex/latex/base/cp858.def b/Master/texmf-dist/tex/latex/base/cp858.def index e04cd77c2fd..5760e667642 100644 --- a/Master/texmf-dist/tex/latex/base/cp858.def +++ b/Master/texmf-dist/tex/latex/base/cp858.def @@ -43,7 +43,7 @@ %% extension .ins) which are part of the distribution. \ProvidesFile{cp858.def} - [2021/02/14 v1.3d Input encoding file] + [2024/02/08 v1.3d Input encoding file] \ProvideTextCommandDefault{\textdegree}{\ensuremath{{^\circ}}} \ProvideTextCommandDefault{\textonehalf}{\ensuremath{\frac12}} \ProvideTextCommandDefault{\textonequarter}{\ensuremath{\frac14}} diff --git a/Master/texmf-dist/tex/latex/base/cp865.def b/Master/texmf-dist/tex/latex/base/cp865.def index 97073d5503a..dc86f46bde3 100644 --- a/Master/texmf-dist/tex/latex/base/cp865.def +++ b/Master/texmf-dist/tex/latex/base/cp865.def @@ -43,7 +43,7 @@ %% extension .ins) which are part of the distribution. \ProvidesFile{cp865.def} - [2021/02/14 v1.3d Input encoding file] + [2024/02/08 v1.3d Input encoding file] \ProvideTextCommandDefault{\textdegree}{\ensuremath{{^\circ}}} \ProvideTextCommandDefault{\textflorin}{\textit{f}} \ProvideTextCommandDefault{\textpeseta}{Pt} diff --git a/Master/texmf-dist/tex/latex/base/decmulti.def b/Master/texmf-dist/tex/latex/base/decmulti.def index 4611a96d330..ae98cc99728 100644 --- a/Master/texmf-dist/tex/latex/base/decmulti.def +++ b/Master/texmf-dist/tex/latex/base/decmulti.def @@ -43,7 +43,7 @@ %% extension .ins) which are part of the distribution. \ProvidesFile{decmulti.def} - [2021/02/14 v1.3d Input encoding file] + [2024/02/08 v1.3d Input encoding file] \ProvideTextCommandDefault{\textdegree}{\ensuremath{{^\circ}}} \ProvideTextCommandDefault{\textonehalf}{\ensuremath{\frac12}} \ProvideTextCommandDefault{\textonequarter}{\ensuremath{\frac14}} diff --git a/Master/texmf-dist/tex/latex/base/doc.sty b/Master/texmf-dist/tex/latex/base/doc.sty index 2fc93c11646..ea693f4ff1d 100644 --- a/Master/texmf-dist/tex/latex/base/doc.sty +++ b/Master/texmf-dist/tex/latex/base/doc.sty @@ -43,9 +43,8 @@ %% extension .ins) which are part of the distribution. \NeedsTeXFormat{LaTeX2e}[1994/12/01] -\providecommand\DeclareRelease[3]{} -\providecommand\DeclareCurrentRelease[2]{} - +\DeclareRelease{}{1994-06-01} + {doc-2016-02-15.sty} \DeclareRelease{v2.1g}{2016-02-15} {doc-2016-02-15.sty} \DeclareRelease{v2}{2021-06-01} @@ -53,11 +52,11 @@ \DeclareCurrentRelease{v3}{2022-06-01} \ProvidesPackage{doc} - [2022/11/13 v3.0m + [2024/04/26 v3.0p Standard LaTeX documentation package V3 (FMi)] %% %% Package `doc' to use with LaTeX 2e -%% Copyright (C) 1989-2022 Frank Mittelbach, all rights reserved. +%% Copyright (C) 1989-2023 Frank Mittelbach, all rights reserved. @@ -119,7 +118,7 @@ \blank@linetrue\@@par \penalty\interlinepenalty} \obeylines - \let\do\do@noligs \verbatim@nolig@list + \@noligs \let\do\@makeother \dospecials \global\@newlistfalse \global\@minipagefalse @@ -1140,6 +1139,10 @@ Maybe you wanted to use '\string\NewDocElement'?}% } +\def\doc@ignoredinfo#1#2{% + \PackageInfo{doc}{Doc element '#1/#2' declaration + ignored}% +} \newcommand\NewDocElement[3][]{% \@ifundefined{Print#2Name}% {\@ifundefined{PrintDescribe#2}% @@ -1152,6 +1155,18 @@ }\doc@declareerror {#2}{#3}% } +\newcommand\ProvideDocElement[3][]{% + \@ifundefined{Print#2Name}% + {\@ifundefined{PrintDescribe#2}% + {\@ifundefined{#3}% + {\@ifundefined{end#3}% + {\@NewDocElement{#1}}% + \doc@ignoredinfo + }\doc@ignoredinfo + }\doc@ignoredinfo + }\doc@ignoredinfo + {#2}{#3}% +} \newcommand\RenewDocElement[3][]{% \@ifundefined{Print#2Name}\doc@notdeclarederror {\@ifundefined{PrintDescribe#2}\doc@notdeclarederror diff --git a/Master/texmf-dist/tex/latex/base/docstrip.tex b/Master/texmf-dist/tex/latex/base/docstrip.tex index f1f2648933b..e96e04ef127 100644 --- a/Master/texmf-dist/tex/latex/base/docstrip.tex +++ b/Master/texmf-dist/tex/latex/base/docstrip.tex @@ -46,7 +46,7 @@ \def\filename{docstrip.dtx} \def\fileversion{v2.6b} \def\filedate{2022-09-03} -\def\docdate {2023-10-10} +\def\docdate {2024-02-08} %% %% The docstrip program for use with TeX. %% Copyright (C) 1989-1991 Frank Mittelbach diff --git a/Master/texmf-dist/tex/latex/base/fontenc.sty b/Master/texmf-dist/tex/latex/base/fontenc.sty index 967d60869b2..0eb19b6f6a0 100644 --- a/Master/texmf-dist/tex/latex/base/fontenc.sty +++ b/Master/texmf-dist/tex/latex/base/fontenc.sty @@ -90,7 +90,11 @@ {}{\PackageError{fontenc}% {Encoding file `\reserved@f' not found.% \MessageBreak - You might have misspelt the name of the encoding}% + You might have misspelled the name of the encoding + \MessageBreak + or a required support package (e.g., cyrillic) is + \MessageBreak + missing in your installation}% {Necessary code for this encoding was not loaded.\MessageBreak Thus calling the encoding later on will diff --git a/Master/texmf-dist/tex/latex/base/fontmath.cfg b/Master/texmf-dist/tex/latex/base/fontmath.cfg index 97eb5d1b095..eca079d15b3 100644 --- a/Master/texmf-dist/tex/latex/base/fontmath.cfg +++ b/Master/texmf-dist/tex/latex/base/fontmath.cfg @@ -35,11 +35,11 @@ %% the system are in the document `cfgguide.tex'. %% %% -%%% From File: fontdef.dtx +%%% From File: fontdef.dtx \ProvidesFile{fontmath.cfg} - [2021/01/15 v3.0i LaTeX Kernel -(Uncustomized math - font setup)] + [2024/02/09 v3.0i LaTeX Kernel + (Uncustomized math font setup) +] %% %% %% diff --git a/Master/texmf-dist/tex/latex/base/fontmath.ltx b/Master/texmf-dist/tex/latex/base/fontmath.ltx index 9566229fa0c..a7dd9cc44ad 100644 --- a/Master/texmf-dist/tex/latex/base/fontmath.ltx +++ b/Master/texmf-dist/tex/latex/base/fontmath.ltx @@ -35,11 +35,11 @@ %% the system are in the document `cfgguide.tex'. %% %% -%%% From File: fontdef.dtx +%%% From File: fontdef.dtx \ProvidesFile{fontmath.ltx} - [2021/01/15 v3.0i LaTeX Kernel -(Math - font setup)] + [2024/02/09 v3.0i LaTeX Kernel + (Math font setup) +] \typeout{=== Don't modify this file, use a .cfg file instead ===^^J} \DeclareFontEncoding{OML}{}{} \DeclareFontEncoding{OMS}{}{} diff --git a/Master/texmf-dist/tex/latex/base/fonttext.cfg b/Master/texmf-dist/tex/latex/base/fonttext.cfg index 762ec16b6a0..b37c4407d63 100644 --- a/Master/texmf-dist/tex/latex/base/fonttext.cfg +++ b/Master/texmf-dist/tex/latex/base/fonttext.cfg @@ -35,11 +35,11 @@ %% the system are in the document `cfgguide.tex'. %% %% -%%% From File: fontdef.dtx +%%% From File: fontdef.dtx \ProvidesFile{fonttext.cfg} - [2021/01/15 v3.0i LaTeX Kernel -(Uncustomized text - font setup)] + [2024/02/09 v3.0i LaTeX Kernel + (Uncustomized text font setup) +] %% %% %% diff --git a/Master/texmf-dist/tex/latex/base/fonttext.ltx b/Master/texmf-dist/tex/latex/base/fonttext.ltx index 0dfc76fff84..ec6ce8ed910 100644 --- a/Master/texmf-dist/tex/latex/base/fonttext.ltx +++ b/Master/texmf-dist/tex/latex/base/fonttext.ltx @@ -35,11 +35,11 @@ %% the system are in the document `cfgguide.tex'. %% %% -%%% From File: fontdef.dtx +%%% From File: fontdef.dtx \ProvidesFile{fonttext.ltx} - [2021/01/15 v3.0i LaTeX Kernel -(Text - font setup)] + [2024/02/09 v3.0i LaTeX Kernel + (Text font setup) +] \typeout{=== Don't modify this file, use a .cfg file instead ===^^J} \input {omlenc.def} \input {omsenc.def} diff --git a/Master/texmf-dist/tex/latex/base/ifthen.sty b/Master/texmf-dist/tex/latex/base/ifthen.sty index b093138e992..780b457e3f0 100644 --- a/Master/texmf-dist/tex/latex/base/ifthen.sty +++ b/Master/texmf-dist/tex/latex/base/ifthen.sty @@ -44,12 +44,12 @@ %% %% File `ifthen.dtx'. %% Copyright (C) 1991 by Leslie Lamport -%% Copyright (C) 1994-2001 LaTeX project, David Carlisle +%% Copyright (C) 1994-2024 LaTeX project, David Carlisle %% all rights reserved. %% \NeedsTeXFormat{LaTeX2e}[1994/12/01] \ProvidesPackage{ifthen} - [2022/04/13 v1.1d Standard LaTeX ifthen package (DPC)] + [2024/03/16 v1.1e Standard LaTeX ifthen package (DPC)] \def\TE@throw{\@ne=\@ne\noexpand\fi} \def\boolean#1#2{% \TE@throw\expandafter\noexpand\csname if#1\endcsname#2} @@ -77,11 +77,24 @@ \let\ref\@kernel@ref@exp}} {\def\TE@ref@exp{\def\@setref##1##2##3{% \ifx##1\relax\z@\else\expandafter##2##1\fi}}} +\begingroup +\lccode`\~`\> % +\catcode`\+\active +\lccode`\+`\< % +\catcode`\!\active +\lccode`\!`\= % +\lowercase{\endgroup +\def\TE@repl@active{% + \TE@repl~>% + \TE@repl+<% + \TE@repl!=% +} \long\def\ifthenelse#1{% \toks@{#1}% \TE@repl\or\TE@or \TE@repl\and\TE@and \TE@repl\not\TE@neg + \TE@repl@active \TE@repl\OR\TE@or \TE@repl\AND\TE@and \TE@repl\NOT\TE@neg @@ -101,7 +114,8 @@ \expandafter\@firstoftwo \else \expandafter\@secondoftwo - \fi} + \fi}% +} \def\TE@eval{\noexpand\TE@negatefalse\noexpand\iftrue\noexpand\ifnum} \newif\ifTE@val \newif\ifTE@negate diff --git a/Master/texmf-dist/tex/latex/base/inputenc.sty b/Master/texmf-dist/tex/latex/base/inputenc.sty index 14d7f35db8b..8d4a01b46d2 100644 --- a/Master/texmf-dist/tex/latex/base/inputenc.sty +++ b/Master/texmf-dist/tex/latex/base/inputenc.sty @@ -44,7 +44,7 @@ \NeedsTeXFormat{LaTeX2e}[1995/12/01] \ProvidesPackage{inputenc} - [2021/02/14 v1.3d Input encoding file] + [2024/02/08 v1.3d Input encoding file] \def\DeclareInputMath#1{% \@inpenc@test \bgroup diff --git a/Master/texmf-dist/tex/latex/base/latex.ltx b/Master/texmf-dist/tex/latex/base/latex.ltx index a2f5b66b067..11b32e404fc 100644 --- a/Master/texmf-dist/tex/latex/base/latex.ltx +++ b/Master/texmf-dist/tex/latex/base/latex.ltx @@ -14,6 +14,7 @@ %% lthooks.dtx (with options: `2ekernel') %% ltcmdhooks.dtx (with options: `2ekernel') %% ltsockets.dtx (with options: `2ekernel') +%% lttemplates.dtx (with options: `2ekernel') %% ltalloc.dtx (with options: `2ekernel') %% ltcntrl.dtx (with options: `2ekernel') %% lterror.dtx (with options: `2ekernel') @@ -54,6 +55,7 @@ %% ltfilehook.dtx (with options: `2ekernel') %% ltshipout.dtx (with options: `2ekernel') %% ltoutput.dtx (with options: `2ekernel') +%% lttagging.dtx (with options: `2ekernel') %% ltfinal.dtx (with options: `2ekernel') %% %% This is a generated file. @@ -693,7 +695,7 @@ \tracinggroups\z@ \tracingparagraphs\z@ \tracingmacros\z@ - \tracinglostchars\@ne + \tracinglostchars\tw@ \tracingpages\z@ \tracingstats\z@ }% @@ -707,8 +709,8 @@ %%% From File: ltvers.dtx \def\fmtname{LaTeX2e} \edef\fmtversion - {2023-11-01} -\def\patch@level{1} + {2024-06-01} +\def\patch@level{0} \edef\development@branch@name{} \iffalse \def\reserved@a#1/#2/#3\@nil{% @@ -1158,7 +1160,10 @@ \cs_gset_eq:NN \@expl@cs@to@str@@N \cs_to_str:N \cs_gset_eq:NN \@expl@str@if@eq@@nnTF \str_if_eq:nnTF \cs_gset_eq:NN \@expl@cs@prefix@spec@@N \cs_prefix_spec:N -\cs_gset_eq:NN \@expl@cs@argument@spec@@N \cs_argument_spec:N +\cs_if_exist:NTF \cs_parameter_spec:N + { \cs_gset_eq:NN \@expl@cs@parameter@spec@@N \cs_parameter_spec:N } + { \cs_gset_eq:NN \@expl@cs@parameter@spec@@N \cs_argument_spec:N } +\cs_gset_eq:NN \__kernel_cs_parameter_spec:N \@expl@cs@parameter@spec@@N \cs_gset_eq:NN \@expl@cs@replacement@spec@@N \cs_replacement_spec:N \cs_gset_eq:NN \@expl@str@map@function@@NN \str_map_function:NN \cs_gset_eq:NN \@expl@char@generate@@nn \char_generate:nn @@ -1648,7 +1653,7 @@ \long\def\@show@newcommand@aux#1#2#3{% \typeout{> \string#1=\@expl@cs@prefix@spec@@N#1macro:}% #3{default \string##1=\expandafter\detokenize\@gobblethree#2.^^J% - \@expl@cs@argument@spec@@N#1->\@expl@cs@replacement@spec@@N#1}} + \@expl@cs@parameter@spec@@N#1->\@expl@cs@replacement@spec@@N#1}} \long\def\@show@tokens#1{% \edef\reserved@a{#1}% \showtokens\expandafter @@ -1679,7 +1684,7 @@ \@show@environment@end#1} \long\def\@show@environment@begin#1{% \typeout{> \string\begin{\@expl@cs@to@str@@N#1}=environment:}% - \typeout{\@expl@cs@argument@spec@@N#1->% + \typeout{\@expl@cs@parameter@spec@@N#1->% \@expl@cs@replacement@spec@@N#1.^^J}} \long\def\@show@normalenv#1{% \@show@environment@begin#1% @@ -1690,12 +1695,12 @@ \long\def\@show@environment@end@aux#1#2{% \@show@tokens{\string\end{\@expl@cs@to@str@@N#2}% \ifx\relax#1=undefined% - \else:^^J\@expl@cs@argument@spec@@N#1->% + \else:^^J\@expl@cs@parameter@spec@@N#1->% \@expl@cs@replacement@spec@@N#1% \fi}} \def\@show@nonstop#1{% \typeout{> \string#1=\@expl@cs@prefix@spec@@N#1macro:^^J% - \@expl@cs@argument@spec@@N#1->\@expl@cs@replacement@spec@@N#1.}} + \@expl@cs@parameter@spec@@N#1->\@expl@cs@replacement@spec@@N#1.}} \def\@show@typeout#1{\typeout{> #1.^^J}} \def\@ifundefined#1{% \ifcsname#1\endcsname\@ifundefin@d@i\else\@ifundefin@d@ii\fi{#1}} @@ -1806,8 +1811,8 @@ \xdef#1{\the\toks@}% \endgroup} %%% From File: ltcmd.dtx -\def\ltcmdversion{v1.2a} -\def\ltcmddate{2023-08-19} +\def\ltcmdversion{v1.2e} +\def\ltcmddate{2024-04-17} \message{document commands,} \ExplSyntaxOn \tl_new:N \l__cmd_arg_spec_tl @@ -1888,8 +1893,6 @@ \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} @@ -1897,12 +1900,60 @@ \__cmd_break_point:n {#2} } \cs_new_eq:NN \__cmd_break_point:n \use_none:n -\cs_new_protected:Npn \__cmd_declare_cmd_code:Nnn +\cs_new:Npn \__cmd_all_m_check:n #1 + { \tl_map_function:nN {#1} \__cmd_all_m_check_aux:n } +\cs_new:Npn \__cmd_all_m_check_aux:n #1 { - \bool_if:NTF \l__cmd_grab_expandably_bool - { \__cmd_declare_cmd_code_expandable:Nnn } - { \__cmd_declare_cmd_code_aux:Nnn } + \str_if_eq:nnF {#1} { m } + { + \str_if_eq:nnF {#1} { + } + { X } + } + } +\cs_new_protected:Npn \__cmd_declare_cmd_code:Nnn #1#2 + { + \bool_lazy_any:nTF + { + { \l__cmd_environment_bool } + { + \bool_lazy_and_p:nn + { \l__cmd_some_short_bool } + { \l__cmd_some_long_bool } + } + { ! \tl_if_blank_p:e { \__cmd_all_m_check:n {#2} } } + } + { + \tl_set:Nx \l__cmd_fn_tl + { \exp_not:c { \l__cmd_function_tl \c_space_tl } } + \bool_if:NTF \l__cmd_grab_expandably_bool + { \__cmd_declare_cmd_code_expandable:Nnn } + { \__cmd_declare_cmd_code_aux:Nnn } + } + { \__cmd_declare_cmd_optimized:Nnn } + #1 {#2} } +\cs_new_protected:Npn \__cmd_declare_cmd_optimized:Nnn #1#2#3 + { + \bool_if:NTF \l__cmd_expandable_bool + { \cs_set_nopar:Npe } + { \cs_set_protected_nopar:Npe } + #1 + { + \exp_not:N \__cmd_start_optimized: + \exp_not:c { \l__cmd_function_tl \c_space_tl code } + } + \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 } + \bool_if:NF \l__cmd_some_long_bool { _nopar } + :Npn + } + \l__cmd_current_arg_int + {#3} + } +\cs_new:Npn \__cmd_start_optimized: { } \cs_new_protected:Npn \__cmd_declare_cmd_code_aux:Nnn #1#2#3 { \cs_generate_from_arg_count:cNnn @@ -2504,7 +2555,12 @@ \bool_if:NT \l__cmd_some_obey_spaces_bool { \msg_error:nnxx { cmd } { invalid-bang } - { \__cmd_environment_or_command: } { \tl_to_str:n {#1} } + { \__cmd_environment_or_command: } + { + \bool_if:NTF \l__cmd_obey_spaces_bool + { \tl_to_str:n {'#1'} } + { an~optional~argument~before~mandatory~ \tl_to_str:n {'#1'} } + } \__cmd_bad_def:wn } \tl_clear:N \l__cmd_last_delimiters_tl @@ -2826,9 +2882,10 @@ \use:x { \int_set:Nn \tex_escapechar:D { 92 } - \exp_not:N \__cmd_cmd_type_cases:NnnnnF \exp_not:N #2 + \exp_not:N \__cmd_cmd_type_cases:NnnnnnF \exp_not:N #2 { \__cmd_copy_command:nnNN } { \__cmd_copy_expandable:nnNN } + { \__cmd_copy_optimized:nnNN } { \__cmd_copy_environment:nnNN } { \__cmd_copy_environment_end:nnNN } { \__cmd_cant_copy:nwn { non-ltcmd } } @@ -2881,6 +2938,18 @@ #3 { \exp_after:wN \__cmd_copy_expandable:NnNNNNnnn #4 {#1} {#2} } } +\cs_new_protected:Npn \__cmd_copy_optimized:nnNN #1#2#3#4 + { + \cs_set_eq:cc { #1 ~ code } { #2 ~ code } + \token_if_protected_macro:NTF #4 + { \cs_set_protected_nopar:Npe } + { \cs_set_nopar:Npe } + #3 + { + \exp_not:N \__cmd_start_optimized: + \exp_not:c { #1 ~ code } + } + } \cs_new:Npn \__cmd_copy_expandable:NnNNNNnnn #1 #2 #3 #4 #5 #6 #7 #8 #9 { \exp_not:N #1 \exp_not:n { {#2} } @@ -3001,9 +3070,10 @@ \use:x { \int_set:Nn \tex_escapechar:D { 92 } - \exp_not:N \__cmd_cmd_type_cases:NnnnnF \exp_not:N #1 + \exp_not:N \__cmd_cmd_type_cases:NnnnnnF \exp_not:N #1 { \__cmd_show_command:N } { \__cmd_show_expandable:N } + { \__cmd_show_optimized:N } { \__cmd_show_environment:N } { \__cmd_show_environment_end:N } { \__cmd_cant_copy:nwn { non-ltcmd } } @@ -3037,6 +3107,43 @@ -> \cs_replacement_spec:N #4 } } +\cs_new_protected:Npn \__cmd_show_optimized:N #1 + { + \exp_args:Nc \__cmd_show_optimized:NN + { \cs_to_str:N #1 \c_space_tl code } + #1 + } +\cs_new_protected:Npn \__cmd_show_optimized:NN #1#2 + { + \cs_set:Npe \__cmd_show_optimized_aux:N ##1 + { + \c_space_tl \c_space_tl \c_hash_str ##1 : + \bool_lazy_or:nnT + { \token_if_long_macro_p:N #1 } + { \token_if_protected_long_macro_p:N #1 } + { + } m + \iow_newline: + } + \tl_show:e + { + \token_to_str:N #2 = + \bool_lazy_or:nnF + { \token_if_protected_macro_p:N #1 } + { \token_if_protected_long_macro_p:N #1 } + { expandable ~ } document~command: + \iow_newline: + \int_step_function:nN + { + \int_div_truncate:nn + { \tl_count:e { \cs_parameter_spec:N #1 } } + { 2 } + } + \__cmd_show_optimized_aux:N + -> + \cs_replacement_spec:N #1 + } + } +\cs_generate_variant:Nn \tl_count:n { e } \cs_new_protected:Npn \__cmd_show_environment:N #1 { \exp_after:wN \__cmd_show_environment:Nnnw #1 \q__cmd @@ -3604,7 +3711,12 @@ \tl_put_right:Nx \l__cmd_v_arg_tl { \token_if_active:NTF #1 - { \exp_not:N #1 } { \token_to_str:N #1 } + { \exp_not:N #1 } + { + \int_compare:nNnTF {`#1} = \tex_endlinechar:D + { \exp_not:N \obeyedline } + { \token_to_str:N #1 } + } } } \cs_new_protected:Npn \__cmd_grab_v_token_if_char:NTF #1 @@ -4075,30 +4187,31 @@ #1 {#2} {#4} \__cmd_tl_mapthread_loop:w #1#3 \q_mark } -\cs_new_protected:Npn \__cmd_cmd_type_cases:NnnnnF #1 #2 #3 #4 #5 #6 +\cs_new_protected:Npn \__cmd_cmd_type_cases:NnnnnnF #1 #2 #3 #4 #5 #6 #7 { \exp_args:Ne \str_case_e:nnF { - \exp_args:Nf \tl_if_empty:nT { \cs_argument_spec:N #1 } + \exp_args:Nf \tl_if_empty:nT { \__kernel_cs_parameter_spec:N #1 } { \exp_not:N \exp_not:n { \exp_not:e { \tl_head:N #1 } } } } { { \exp_not:N \__cmd_start:nNNnnn } {#2} { \exp_not:N \__cmd_start_expandable:nNNNNn } {#3} - { \exp_not:N \__cmd_start_env:nnnnn } {#4} + { \exp_not:N \__cmd_start_optimized: } {#4} + { \exp_not:N \__cmd_start_env:nnnnn } {#5} { \exp_after:wN \exp_not:N \cs:w environment~ \exp_last_unbraced:Ne \use_none:nnn { \cs_to_str:N #1 } ~end~aux \cs_end: - } {#5} + } {#6} } - {#6} + {#7} } \cs_new_protected:Npn \__kernel_cmd_if_xparse:NTF #1 { - \__cmd_cmd_type_cases:NnnnnF #1 - { } { } { } { } { \use_iii:nnn } + \__cmd_cmd_type_cases:NnnnnnF #1 + { } { } { } { } { } { \use_iii:nnn } \use_i:nn } \cs_new_protected:Npn \__cmd_peek_nonspace:NTF @@ -4154,10 +4267,8 @@ \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 } - ' + command ~ + ' \c_backslash_str \tl_to_str:N \l__cmd_function_tl ' } } \msg_new:nnnn { cmd } { arg-after-body } @@ -4249,7 +4360,7 @@ { Invalid~argument~prefix~'!'~in~#1. } { The~prefix~'!'~is~only~allowed~for~trailing~optional~arguments.~ - You~tried~to~apply~it~to~'#2'. + You~tried~to~apply~it~to~#2. \c__cmd_ignore_def_tl } \msg_new:nnnn { cmd } { not-definable } @@ -4539,8 +4650,6 @@ \ExplSyntaxOff %%% From File: lthooks.dtx -\def\lthooksversion{v1.1f} -\def\lthooksdate{2023/10/02} \ExplSyntaxOn \bool_new:N \g__hook_debug_bool \cs_new_eq:NN \__hook_debug:n \use_none:n @@ -4862,7 +4971,8 @@ \msg_error:nnnnn { hooks } { set-top-level } { for } { SetDefaultHookLabel } {#1} } - { \exp_args:Nx \__hook_set_default_label:n { \__hook_make_name:n {#1} } } + { \exp_args:Nx + \__hook_set_default_label:n { \__hook_make_name:n {#1} } } } \cs_new_protected:Npn \__hook_set_default_label:n #1 { @@ -4996,7 +5106,8 @@ \__hook_gput_next_do:nn {#1} } -\prg_new_protected_conditional:Npnn \__hook_try_declaring_generic_hook:wn +\prg_new_protected_conditional:Npnn + \__hook_try_declaring_generic_hook:wn #1 / #2 / #3 / #4 \scan_stop: #5 { TF } { \__hook_if_generic:nTF {#5} @@ -5082,7 +5193,8 @@ \str_if_eq:nnTF {#2} { top-level } { \__hook_toplevel_gset:nn {#1} { } } { - \prop_gpop:cnNF { g__hook_#1_code_prop } {#2} \l__hook_return_tl + \prop_gpop:cnNF { g__hook_#1_code_prop } + {#2} \l__hook_return_tl { \msg_warning:nnnn { hooks } { cannot-remove } {#1} {#2} } } } @@ -5093,7 +5205,8 @@ \__hook_if_deprecated_generic:nTF {#1} { \__hook_deprecated_generic_warn:n {#1} - \__hook_do_deprecated_generic:Nn \__hook_gremove_code:nn {#1} {#2} + \__hook_do_deprecated_generic:Nn + \__hook_gremove_code:nn {#1} {#2} } { \msg_warning:nnnn { hooks } { cannot-remove } {#1} {#2} } } @@ -5111,7 +5224,8 @@ {#1} {#2} } \cs_new_protected:Npn \__hook_cs_gput_right_fast:nnn #1 #2 #3 - { \cs_gset:cpx { __hook#1~#2 } { \exp_not:v { __hook#1~#2 } \exp_not:n {#3} } } + { \cs_gset:cpx { __hook#1~#2 } + { \exp_not:v { __hook#1~#2 } \exp_not:n {#3} } } \cs_new_protected:Npn \__hook_cs_gput_right_slow:nnn #1 #2 #3 { \cs_if_exist:cF { __hook#1~#2 } @@ -5195,7 +5309,8 @@ } \exp_last_unbraced:NNf \cs_set:Npn \__hook_tmp:w { \__hook_parameter:n {#1} } { } - \tl_set:Ne \l__hook_tmpa_tl { \__hook_braced_cs_parameter:n { __hook_tmp:w } } + \tl_set:Ne \l__hook_tmpa_tl + { \__hook_braced_cs_parameter:n { __hook_tmp:w } } \cs_gset_protected:Npx \__hook_normalise_fn:nn ##1 ##2 { \group_begin: @@ -5333,27 +5448,34 @@ } \cs_new_protected:Npn \__hook_rule_before_gset:nnn #1#2#3 { - \__hook_tl_gset:cx { g__hook_#1_rule_ \__hook_label_pair:nn {#2} {#3} _tl } + \__hook_tl_gset:cx + { g__hook_#1_rule_ \__hook_label_pair:nn {#2} {#3} _tl } { \__hook_label_ordered:nnTF {#2} {#3} { < } { > } } } \cs_new_eq:cN { __hook_rule_<_gset:nnn } \__hook_rule_before_gset:nnn \cs_new_protected:Npn \__hook_rule_after_gset:nnn #1#2#3 { - \__hook_tl_gset:cx { g__hook_#1_rule_ \__hook_label_pair:nn {#3} {#2} _tl } + \__hook_tl_gset:cx + { g__hook_#1_rule_ \__hook_label_pair:nn {#3} {#2} _tl } { \__hook_label_ordered:nnTF {#3} {#2} { < } { > } } } \cs_new_eq:cN { __hook_rule_>_gset:nnn } \__hook_rule_after_gset:nnn \cs_new_protected:Npn \__hook_rule_voids_gset:nnn #1#2#3 { - \__hook_tl_gset:cx { g__hook_#1_rule_ \__hook_label_pair:nn {#2} {#3} _tl } + \__hook_tl_gset:cx + { g__hook_#1_rule_ \__hook_label_pair:nn {#2} {#3} _tl } { \__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 } } @@ -5415,8 +5537,10 @@ { \__hook_code_gset:ne {#1} { - \exp_not:c { __hook_toplevel~#1 } \__hook_braced_parameter:n {#1} - \exp_not:c { __hook_next~#1 } \__hook_braced_parameter:n {#1} + \exp_not:c { __hook_toplevel~#1 } + \__hook_braced_parameter:n {#1} + \exp_not:c { __hook_next~#1 } + \__hook_braced_parameter:n {#1} } } { @@ -5493,7 +5617,8 @@ \int_compare:nNnT { \cs:w \__hook_tl_csname:n {##1} \cs_end: } = 0 { - \tl_set:cn { \__hook_tl_csname:n { \l__hook_rear_tl } } {##1} + \tl_set:cn + { \__hook_tl_csname:n { \l__hook_rear_tl } } {##1} \tl_set:Nn \l__hook_rear_tl {##1} } } @@ -5648,7 +5773,7 @@ hook~'#1' \__hook_if_disabled:nF {#1} { - \exp_args:Nf \__hook_print_args:nn {#1} + \exp_args:Nne \__hook_print_args:nn {#1} { \int_eval:n { \str_count:e { \__hook_parameter:n {#1} } / 3 } @@ -5883,19 +6008,22 @@ \cs_new_protected:Npn \hook_use_once:n #1 { \__hook_if_execute_immediately:nF {#1} - { \__hook_normalize_hook_args:Nn \__hook_use_once:nn { \use:n {#1} } { 0 } } + { \__hook_normalize_hook_args:Nn \__hook_use_once:nn + { \use:n {#1} } { 0 } } } \cs_new_protected:Npn \hook_use_once:nnw #1 #2 { \__hook_if_execute_immediately:nF {#1} - { \__hook_normalize_hook_args:Nn \__hook_use_once:nn { \use:n {#1} } {#2} } + { \__hook_normalize_hook_args:Nn \__hook_use_once:nn + { \use:n {#1} } {#2} } } \cs_new_protected:Npn \__hook_use_once:nn #1 #2 { \__hook_preamble_hook:n {#1} \__hook_use_once_set:n {#1} \__hook_replacing_args_false: - \__hook_cs_gput_right:nnn { _next } {#1} { \__hook_use_once_clear:n {#1} } + \__hook_cs_gput_right:nnn { _next } {#1} + { \__hook_use_once_clear:n {#1} } \__hook_replacing_args_reset: \__hook_if_usable:nTF {#1} { \__hook_use_initialized:n {#1} } @@ -6083,7 +6211,8 @@ { Cannot~add~code~to~disabled~hook~'#1'. } { The~hook~'#1'~you~tried~to~add~code~to~was~previously~disabled~ - with~\iow_char:N\\hook_disable_generic:n~or~\iow_char:N\\DisableGenericHook,~so~ + with~\iow_char:N\\hook_disable_generic:n~or~ + \iow_char:N\\DisableGenericHook,~so~ it~cannot~have~code~added~to~it. } \msg_new:nnn { hooks } { empty-label } @@ -6306,12 +6435,10 @@ \__hook_curr_name_pop: \ExplSyntaxOff %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -%% File: ltcmdhooks.dtx +%% From File: ltcmdhooks.dtx %% Copyright (C) 2020-2024 %% Frank Mittelbach, Phelype Oleinik, The LaTeX Project -%%% From File: ltcmdhooks.dtx -\def\ltcmdhooksversion{v1.0i} -\def\ltcmdhooksdate{2023/06/16} +%%% From File: lthooks.dtx \ExplSyntaxOn \tl_new:N \g_hook_patch_action_list_tl \int_new:N \l__hook_patch_num_args_int @@ -6449,7 +6576,7 @@ \__hook_patch_debug:x { ++~command~can~be~patched~without~rescanning } \int_set:Nn \l__hook_patch_num_args_int { - \exp_args:Nf \str_count:n { \cs_argument_spec:N #2 } / 2 + \exp_args:Nf \str_count:n { \__kernel_cs_parameter_spec:N #2 } / 2 \bool_if:NT #1 { -1 } } \int_compare:nNnTF { \l__hook_patch_num_args_int } > { \c_zero_int } @@ -6589,7 +6716,7 @@ { ~ \__hook_double_hashes:w } \cs_new_protected:Npn \__hook_retokenize_patch:Nnn #1 #2 #3 { - \str_if_eq:eeTF { \cs_argument_spec:N #1 } { } + \str_if_eq:eeTF { \__kernel_cs_parameter_spec:N #1 } { } { \__hook_patch_expand_redefine:NNnn \c_false_bool #1 {#2} {#3} } { \__hook_patch_debug:x { ..~command~can~only~be~patched~by~rescanning } @@ -6752,8 +6879,6 @@ \ExplSyntaxOff %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% %%% From File: ltsockets.dtx -\def\ltsocketsversion{0.9a} -\def\ltsocketsdate{2023-08-21} \ExplSyntaxOn \bool_new:N \g__socket_debug_bool \cs_new_eq:NN \__socket_debug:n \use_none:n @@ -6926,6 +7051,1187 @@ \cs_new_eq:NN \DebugSocketsOff \socket_debug_off: \ExplSyntaxOff %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +%%% From File: lttemplates.dtx +\message{templates,} +\ExplSyntaxOn +\tl_const:Nn \c__template_code_root_tl { template~code~>~ } +\tl_const:Nn \c__template_defaults_root_tl { template~defaults~>~ } +\tl_const:Nn \c__template_instances_root_tl { template~instance~>~ } +\tl_const:Nn \c__template_keytypes_root_tl { template~key~types~>~ } +\tl_const:Nn \c__template_key_order_root_tl { template~key~order~>~ } +\tl_const:Nn \c__template_values_root_tl { template~values~>~ } +\tl_const:Nn \c__template_vars_root_tl { template~vars~>~ } +\seq_const_from_clist:Nn \c__template_keytypes_arg_seq + { choice , function , instance } +\prop_new:N \g__template_type_prop +\tl_new:N \l__template_assignments_tl +\tl_new:N \l__template_default_tl +\bool_new:N \l__template_error_bool +\bool_new:N \l__template_global_bool +\tl_new:N \l__template_key_name_tl +\tl_new:N \l__template_keytype_tl +\tl_new:N \l__template_keytype_arg_tl +\tl_new:N \l__template_value_tl +\tl_new:N \l__template_var_tl +\prop_new:N \l__template_keytypes_prop +\seq_new:N \l__template_key_order_seq +\prop_new:N \l__template_values_prop +\prop_new:N \l__template_vars_prop +\clist_new:N \l__template_tmp_clist +\dim_new:N \l__template_tmp_dim +\int_new:N \l__template_tmp_int +\muskip_new:N \l__template_tmp_muskip +\skip_new:N \l__template_tmp_skip +\tl_new:N \l__template_tmp_tl +\scan_new:N \s__template_mark +\scan_new:N \s__template_stop +\quark_new:N \q__template_nil +\__kernel_quark_new_conditional:Nn \__template_quark_if_nil:N { F } +\cs_new_protected:Npn \__template_execute_if_arg_agree:nnT #1#2#3 + { + \prop_get:NnN \g__template_type_prop {#1} \l__template_tmp_tl + \int_compare:nNnTF {#2} = \l__template_tmp_tl + {#3} + { + \msg_error:nneee { template } { argument-number-mismatch } + {#1} { \l__template_tmp_tl } {#2} + } + } +\cs_new_protected:Npn \__template_execute_if_code_exist:nnT #1#2#3 + { + \cs_if_exist:cTF { \c__template_code_root_tl #1 / #2 } + {#3} + { \msg_error:nnnn { template } { no-template-code } {#1} {#2} } + } +\cs_new_protected:Npn \__template_execute_if_keytype_exist:nT #1#2 + { + \cs_if_exist:cTF { __template_store_value_ #1 :n } + {#2} + { \msg_error:nnn { template } { unknown-keytype } {#1} } + } +\cs_generate_variant:Nn \__template_execute_if_keytype_exist:nT { V } +\cs_new_protected:Npn \__template_execute_if_type_exist:nT #1#2 + { + \prop_if_in:NnTF \g__template_type_prop {#1} + {#2} + { \msg_error:nnn { template } { unknown-type } {#1} } + } +\cs_new_protected:Npn \__template_if_keys_exist:nnT #1#2#3 + { + \cs_if_exist:cTF { \c__template_keytypes_root_tl #1 / #2 } + {#3} + { \msg_error:nnnn { template } { unknown-template } {#1} {#2} } + } +\prg_new_conditional:Npnn \__template_if_key_value:n #1 { T , F , TF } + { + \str_if_eq:noTF { \KeyValue } { \tl_head:w #1 \q_nil \q_stop } + \prg_return_true: + \prg_return_false: + } +\prg_generate_conditional_variant:Nnn \__template_if_key_value:n { V } { T , F , TF } +\prg_new_conditional:Npnn \__template_if_instance_exist:nn #1#2 { T, F, TF } + { + \cs_if_exist:cTF { \c__template_instances_root_tl #1 / #2 } + \prg_return_true: + \prg_return_false: + } +\prg_new_conditional:Npnn \__template_if_use_template:n #1 { TF } + { + \str_if_eq:noTF { \UseTemplate } { \tl_head:w #1 \q_nil \q_stop } + \prg_return_true: + \prg_return_false: +} +\cs_new_protected:Npn \__template_store_defaults:nn #1#2 + { + \debug_suspend: + \prop_gclear_new:c { \c__template_defaults_root_tl #1 / #2 } + \prop_gset_eq:cN { \c__template_defaults_root_tl #1 / #2 } + \l__template_values_prop + \debug_resume: + } +\cs_new_protected:Npn \__template_store_keytypes:nn #1#2 + { + \debug_suspend: + \prop_if_exist:cTF { \c__template_keytypes_root_tl #1 / #2 } + { + \msg_info:nnnn { template } { declare-template-interface } {#1} {#2} + \prop_gclear:c { \c__template_keytypes_root_tl #1 / #2 } + } + { \prop_new:c { \c__template_keytypes_root_tl #1 / #2 } } + \prop_gset_eq:cN { \c__template_keytypes_root_tl #1 / #2 } + \l__template_keytypes_prop + \seq_gclear_new:c { \c__template_key_order_root_tl #1 / #2 } + \seq_gset_eq:cN { \c__template_key_order_root_tl #1 / #2 } + \l__template_key_order_seq + \debug_resume: + } +\cs_new_protected:Npn \__template_store_values:nn #1#2 + { + \debug_suspend: + \prop_clear_new:c { \c__template_values_root_tl #1 / #2 } + \prop_set_eq:cN { \c__template_values_root_tl #1 / #2 } + \l__template_values_prop + \debug_resume: + } +\cs_new_protected:Npn \__template_store_vars:nn #1#2 + { + \debug_suspend: + \prop_gclear_new:c { \c__template_vars_root_tl #1 / #2 } + \prop_gset_eq:cN { \c__template_vars_root_tl #1 / #2 } + \l__template_vars_prop + \debug_resume: + } +\cs_new_protected:Npn \__template_recover_defaults:nn #1#2 + { + \prop_if_exist:cTF + { \c__template_defaults_root_tl #1 / #2 } + { + \prop_set_eq:Nc \l__template_values_prop + { \c__template_defaults_root_tl #1 / #2 } + } + { \prop_clear:N \l__template_values_prop } + } +\cs_new_protected:Npn \__template_recover_keytypes:nn #1#2 + { + \prop_if_exist:cTF + { \c__template_keytypes_root_tl #1 / #2 } + { + \prop_set_eq:Nc \l__template_keytypes_prop + { \c__template_keytypes_root_tl #1 / #2 } + } + { \prop_clear:N \l__template_keytypes_prop } + \seq_if_exist:cTF { \c__template_key_order_root_tl #1 / #2 } + { + \seq_set_eq:Nc \l__template_key_order_seq + { \c__template_key_order_root_tl #1 / #2 } + } + { \seq_clear:N \l__template_key_order_seq } + } +\cs_new_protected:Npn \__template_recover_values:nn #1#2 + { + \prop_if_exist:cTF + { \c__template_values_root_tl #1 / #2 } + { + \prop_set_eq:Nc \l__template_values_prop + { \c__template_values_root_tl #1 / #2 } + } + { \prop_clear:N \l__template_values_prop } + } +\cs_new_protected:Npn \__template_recover_vars:nn #1#2 + { + \prop_if_exist:cTF + { \c__template_vars_root_tl #1 / #2 } + { + \prop_set_eq:Nc \l__template_vars_prop + { \c__template_vars_root_tl #1 / #2 } + } + { \prop_clear:N \l__template_vars_prop } + } +\cs_new_protected:Npn \__template_define_type:nn #1#2 + { + \prop_if_in:NnTF \g__template_type_prop {#1} + { \msg_error:nnn { template } { type-already-defined } {#1} } + { \__template_declare_type:nn {#1} {#2} } + } +\cs_new_protected:Npn \__template_declare_type:nn #1#2 + { + \int_set:Nn \l__template_tmp_int {#2} + \int_compare:nTF { 0 <= \l__template_tmp_int <= 9 } + { + \msg_info:nnnV { template } { declare-type } + {#1} \l__template_tmp_int + \prop_gput:NnV \g__template_type_prop {#1} + \l__template_tmp_int + } + { + \msg_error:nnnV { template } { bad-number-of-arguments } + {#1} \l__template_tmp_int + } + } +\cs_new_protected:Npn \__template_declare_template_keys:nnnn #1#2#3#4 + { + \__template_execute_if_type_exist:nT {#1} + { + \__template_execute_if_arg_agree:nnT {#1} {#3} + { + \prop_clear:N \l__template_values_prop + \prop_clear:N \l__template_keytypes_prop + \seq_clear:N \l__template_key_order_seq + \keyval_parse:NNn + \__template_parse_keys_elt:n \__template_parse_keys_elt:nn {#4} + \__template_store_defaults:nn {#1} {#2} + \__template_store_keytypes:nn {#1} {#2} + } + } + } +\cs_new_protected:Npn \__template_parse_keys_elt:n #1 + { + \__template_split_keytype:n {#1} + \bool_if:NF \l__template_error_bool + { + \__template_execute_if_keytype_exist:VT \l__template_keytype_tl + { + \seq_map_function:NN \c__template_keytypes_arg_seq + \__template_parse_keys_elt_aux:n + \bool_if:NF \l__template_error_bool + { + \seq_if_in:NoTF \l__template_key_order_seq + \l__template_key_name_tl + { + \msg_error:nnV { template } { duplicate-key-interface } + \l__template_key_name_tl + } + { \__template_parse_keys_elt_aux: } + } + } + } + } +\cs_new_protected:Npn \__template_parse_keys_elt_aux:n #1 + { + \str_if_eq:VnT \l__template_keytype_tl {#1} + { + \tl_if_empty:NT \l__template_keytype_arg_tl + { + \msg_error:nnn { template } { keytype-requires-argument } {#1} + \bool_set_true:N \l__template_error_bool + \seq_map_break: + } + } + } +\cs_new_protected:Npn \__template_parse_keys_elt_aux: + { + \tl_set:Ne \l__template_tmp_tl + { + \l__template_keytype_tl + \tl_if_empty:NF \l__template_keytype_arg_tl + { { \l__template_keytype_arg_tl } } + } + \prop_put:NVV \l__template_keytypes_prop \l__template_key_name_tl + \l__template_tmp_tl + \seq_put_right:NV \l__template_key_order_seq \l__template_key_name_tl + \str_if_eq:VnT \l__template_keytype_tl { choice } + { + \clist_if_in:NnT \l__template_keytype_arg_tl { unknown } + { \msg_error:nn { template } { choice-unknown-reserved } } + } + } +\cs_new_protected:Npn \__template_parse_keys_elt:nn #1#2 + { + \__template_parse_keys_elt:n {#1} + \use:c { __template_store_value_ \l__template_keytype_tl :n } {#2} + } +\cs_new_protected:Npe \__template_split_keytype:n #1 + { + \exp_not:N \bool_set_false:N \exp_not:N \l__template_error_bool + \tl_set:Nn \exp_not:N \l__template_tmp_tl {#1} + \tl_replace_all:Nnn \exp_not:N \l__template_tmp_tl { : } { \token_to_str:N : } + \tl_if_in:VnTF \exp_not:N \l__template_tmp_tl { \token_to_str:N : } + { + \exp_not:n + { + \tl_clear:N \l__template_key_name_tl + \exp_after:wN \__template_split_keytype_aux:w + \l__template_tmp_tl \s__template_stop + } + } + { + \exp_not:N \bool_set_true:N \exp_not:N \l__template_error_bool + \msg_error:nnn { template } { missing-keytype } {#1} + } + } +\use:e + { + \cs_new_protected:Npn \exp_not:N \__template_split_keytype_aux:w + #1 \token_to_str:N : #2 \s__template_stop + { + \tl_put_right:Ne \exp_not:N \l__template_key_name_tl + { + \exp_not:N \tl_trim_spaces:e + { \exp_not:N \tl_to_str:n {#1} } + } + \tl_if_in:nnTF {#2} { \token_to_str:N : } + { + \tl_put_right:Nn \exp_not:N \l__template_key_name_tl + { \token_to_str:N : } + \exp_not:N \__template_split_keytype_aux:w #2 \s__template_stop + } + { + \exp_not:N \tl_if_empty:NTF \exp_not:N \l__template_key_name_tl + { + \msg_error:nnn { template } { empty-key-name } + { \token_to_str:N : #2 } + } + { \exp_not:N \__template_split_keytype_arg:n {#2} } + } + } + } +\cs_new_protected:Npn \__template_split_keytype_arg:n #1 + { + \tl_set:Ne \l__template_keytype_tl { \tl_trim_spaces:n {#1} } + \tl_clear:N \l__template_keytype_arg_tl + \cs_set_protected:Npn \__template_split_keytype_arg_aux:n ##1 + { + \tl_if_in:nnT {#1} {##1} + { + \cs_set:Npn \__template_split_keytype_arg_aux:w + ####1 ##1 ####2 \s__template_stop + { + \tl_if_blank:nT {####1} + { + \tl_set:Ne \l__template_keytype_tl + { \tl_trim_spaces:n {##1} } + \tl_if_blank:nF {####2} + { + \tl_set:Ne \l__template_keytype_arg_tl + { \use:n ####2 } + } + \seq_map_break: + } + } + \__template_split_keytype_arg_aux:w #1 \s__template_stop + } + } + \seq_map_function:NN \c__template_keytypes_arg_seq + \__template_split_keytype_arg_aux:n + } +\cs_generate_variant:Nn \__template_split_keytype_arg:n { V } +\cs_new:Npn \__template_split_keytype_arg_aux:n #1 { } +\cs_new:Npn \__template_split_keytype_arg_aux:w #1 \s__template_stop { } +\cs_new_protected:Npn \__template_store_value_boolean:n #1 + { \prop_put:Non \l__template_values_prop \l__template_key_name_tl {#1} } +\cs_new_protected:Npn \__template_store_value:n #1 + { \prop_put:Non \l__template_values_prop \l__template_key_name_tl {#1} } +\cs_new_eq:NN \__template_store_value_choice:n \__template_store_value:n +\cs_new_eq:NN \__template_store_value_function:n \__template_store_value:n +\cs_new_eq:NN \__template_store_value_instance:n \__template_store_value:n +\cs_new_protected:Npn \__template_store_value_aux:Nn #1#2 + { \prop_put:Non \l__template_values_prop \l__template_key_name_tl {#2} } +\cs_new_protected:Npn \__template_store_value_integer:n + { \__template_store_value_aux:Nn \int_eval:n } +\cs_new_protected:Npn \__template_store_value_length:n + { \__template_store_value_aux:Nn \dim_eval:n } +\cs_new_protected:Npn \__template_store_value_muskip:n + { \__template_store_value_aux:Nn \muskip_eval:n } +\cs_new_protected:Npn \__template_store_value_real:n + { \__template_store_value_aux:Nn \fp_eval:n } +\cs_new_protected:Npn \__template_store_value_skip:n + { \__template_store_value_aux:Nn \skip_eval:n } +\cs_new_protected:Npn \__template_store_value_tokenlist:n + { \__template_store_value_aux:Nn \use:n } +\cs_new_eq:NN \__template_store_value_commalist:n \__template_store_value_tokenlist:n +\cs_new_protected:Npn \__template_declare_template_code:nnnnn #1#2#3#4#5 + { + \__template_execute_if_type_exist:nT {#1} + { + \__template_execute_if_arg_agree:nnT {#1} {#3} + { + \__template_if_keys_exist:nnT {#1} {#2} + { + \__template_store_key_implementation:nnn {#1} {#2} {#4} + \regex_match:nnTF { \c { AssignTemplateKeys } } {#5} + { \__template_declare_template_code:nnnn {#1} {#2} {#3} {#5} } + { + \__template_declare_template_code:nnnn + {#1} {#2} {#3} { \AssignTemplateKeys #5 } + } + } + } + } + } +\cs_new_protected:Npn \__template_declare_template_code:nnnn #1#2#3#4 + { + \cs_if_exist:cT { \c__template_code_root_tl #1 / #2 } + { \msg_info:nnnn { template } { declare-template-code } {#1} {#2} } + \cs_generate_from_arg_count:cNnn + { \c__template_code_root_tl #1 / #2 } + \cs_gset_protected:Npn {#3} {#4} + } +\cs_new_protected:Npn \__template_store_key_implementation:nnn #1#2#3 + { + \__template_recover_defaults:nn {#1} {#2} + \__template_recover_keytypes:nn {#1} {#2} + \prop_clear:N \l__template_vars_prop + \keyval_parse:nnn + { \__template_parse_vars_elt:n } { \__template_parse_vars_elt:nnn { #1 / #2 } } {#3} + \__template_store_vars:nn {#1} {#2} + \prop_map_inline:Nn \l__template_keytypes_prop + { \msg_error:nnnnn { template } { key-not-implemented } {##1} {#2} {#1} } + } +\cs_new_protected:Npn \__template_parse_vars_elt:n #1 + { \msg_error:nnn { template } { key-no-variable } {#1} } +\cs_new_protected:Npn \__template_parse_vars_elt:nnn #1#2#3 + { + \tl_set:Ne \l__template_key_name_tl + { \tl_trim_spaces:e { \tl_to_str:n {#2} } } + \prop_get:NVNTF \l__template_keytypes_prop + \l__template_key_name_tl + \l__template_keytype_tl + { + \__template_split_keytype_arg:V \l__template_keytype_tl + \__template_parse_vars_elt_aux:nn {#1} {#3} + \prop_remove:NV \l__template_keytypes_prop \l__template_key_name_tl + } + { \msg_error:nnn { template } { unknown-key } {#2} } + } +\cs_new_protected:Npn \__template_parse_vars_elt_aux:nn #1#2 + { + \__template_parse_vars_elt_aux:nw {#1} #2 global global \s__template_stop + } +\cs_new_protected:Npn \__template_parse_vars_elt_aux:nw + #1#2 global #3 global #4 \s__template_stop + { + \tl_if_blank:nTF {#4} + { \__template_parse_vars_elt_aux:nnn {#1} { } {#2} } + { + \tl_if_blank:nTF {#2} + { + \__template_parse_vars_elt_aux:nne + {#1} { global } { \tl_trim_spaces:n {#3} } + } + { \msg_error:nnn { template } { bad-variable } { #2 global #3 } } + } + } +\cs_new_protected:Npn \__template_parse_vars_elt_aux:nnn #1#2#3 + { + \str_case:VnF \l__template_keytype_tl + { + { choice } { \__template_implement_choices:nn {#1} {#3} } + { function } + { + \cs_if_exist:NF #3 + { \cs_new:Npn #3 { } } + \__template_parse_vars_elt_key:nn {#1} + { + .code:n = + { + \cs_generate_from_arg_count:NNnn + \exp_not:N #3 + \exp_not:c + { cs_ \str_if_eq:nnT {#1} { global } { g } set:Npn } + { \exp_not:V \l__template_keytype_arg_tl } + {##1} + } + } + \prop_put:NVn \l__template_vars_prop + \l__template_key_name_tl {#2#3} + } + { instance } + { + \__template_parse_vars_elt_key:nn {#1} + { + .code:n = + { + \exp_not:c + { cs_ \str_if_eq:nnT {#1} { global } { g } set:Npn } + \exp_not:N #3 { \UseInstance {##1} } + } + } + \prop_put:NVn \l__template_vars_prop + \l__template_key_name_tl {#2#3} + } + } + { + \tl_if_single:nTF {#3} + { + \cs_if_exist:NF #3 + { \use:c { \__template_map_var_type: _new:N } #3 } + \__template_parse_vars_elt_key:nn {#1} + { + . \__template_map_var_type: + _ \str_if_eq:nnT {#1} { global } { g } set:N + = \exp_not:N #3 + } + \prop_put:NVn \l__template_vars_prop + \l__template_key_name_tl {#2#3} + } + { \msg_error:nnn { template } { bad-variable } {#2#3} } + } + } +\cs_generate_variant:Nn \__template_parse_vars_elt_aux:nnn { nne } +\cs_new_protected:Npn \__template_parse_vars_elt_key:nn #1#2 + { + \keys_define:ne { template / #1 } + { \l__template_key_name_tl #2 } + } +\cs_new:Npn \__template_map_var_type: + { + \str_case:Vn \l__template_keytype_tl + { + { boolean } { bool } + { commalist } { clist } + { integer } { int } + { length } { dim } + { muskip } { muskip } + { real } { fp } + { skip } { skip } + { tokenlist } { tl } + } + } +\cs_new_protected:Npn \__template_implement_choices:nn #1#2 + { + \clist_set:NV \l__template_tmp_clist \l__template_keytype_arg_tl + \prop_put:NVn \l__template_vars_prop \l__template_key_name_tl { } + \keys_define:ne { template / #1 } { \l__template_key_name_tl .choice: } + \keyval_parse:nnn + { \__template_implement_choice_elt:n } + { \__template_implement_choice_elt:nnn {#1} } + {#2} + \prop_get:NVNT \l__template_values_prop \l__template_key_name_tl + \l__template_tmp_tl + { \__template_implement_choices_default: } + \clist_if_empty:NF \l__template_tmp_clist + { + \clist_map_inline:Nn \l__template_tmp_clist + { \msg_error:nnn { template } { choice-not-implemented } {##1} } + } + } +\cs_new_protected:Npn \__template_implement_choices_default: + { + \tl_set:Ne \l__template_tmp_tl + { \l__template_key_name_tl \c_space_tl \l__template_tmp_tl } + \prop_if_in:NVF \l__template_vars_prop \l__template_tmp_tl + { + \tl_set:Ne \l__template_tmp_tl + { \l__template_key_name_tl \c_space_tl \l__template_tmp_tl } + \prop_if_in:NVF \l__template_vars_prop \l__template_tmp_tl + { + \prop_get:NVN \l__template_keytypes_prop \l__template_key_name_tl + \l__template_tmp_tl + \__template_split_keytype_arg:V \l__template_tmp_tl + \prop_get:NVN \l__template_values_prop \l__template_key_name_tl + \l__template_tmp_tl + \msg_error:nnVV { template } { unknown-default-choice } + \l__template_key_name_tl + \l__template_key_name_tl + } + } + } +\cs_new_protected:Npn \__template_implement_choice_elt:nnn #1#2#3 + { + \clist_if_empty:NTF \l__template_tmp_clist + { + \str_if_eq:nnTF {#2} { unknown } + { \__template_implement_choice_elt_aux:nnn {#1} {#2} {#3} } + { \__template_implement_choice_elt_aux:n {#2} } + } + { + \clist_if_in:NnTF \l__template_tmp_clist {#2} + { + \clist_remove_all:Nn \l__template_tmp_clist {#2} + \__template_implement_choice_elt_aux:nnn {#1} {#2} {#3} + } + { \__template_implement_choice_elt_aux:n {#2} } + } + } +\cs_new_protected:Npn \__template_implement_choice_elt_aux:n #1 + { + \prop_get:NVN \l__template_keytypes_prop \l__template_key_name_tl + \l__template_tmp_tl + \__template_split_keytype_arg:V \l__template_tmp_tl + \msg_error:nnVn { template } { unknown-choice } \l__template_key_name_tl {#1} + } +\cs_new_protected:Npn \__template_implement_choice_elt_aux:nnn #1#2#3 + { + \keys_define:ne { template / #1 } + { \l__template_key_name_tl / #2 .code:n = { \exp_not:n {#3} } } + \tl_set:Ne \l__template_tmp_tl + { \l__template_key_name_tl \c_space_tl #2 } + \prop_put:NVn \l__template_vars_prop \l__template_tmp_tl {#3} + } +\cs_new_protected:Npn \__template_implement_choice_elt:n #1 + { + \msg_error:nnVn { template } { choice-requires-code } + \l__template_key_name_tl {#1} + } +\cs_new_protected:Npn \__template_edit_defaults:nnn #1#2#3 + { + \__template_if_keys_exist:nnT {#1} {#2} + { + \__template_recover_defaults:nn {#1} {#2} + \__template_parse_values:nnn {#1} {#2} {#3} + \__template_store_defaults:nn {#1} {#2} + } + } +\cs_new_protected:Npn \__template_parse_values:nnn #1#2#3 + { + \__template_recover_keytypes:nn {#1} {#2} + \keyval_parse:NNn + \__template_parse_values_elt:n \__template_parse_values_elt:nn {#3} + } +\cs_new_protected:Npn \__template_parse_values_elt:n #1 + { + \bool_set_true:N \l__template_error_bool + \msg_error:nnn { template } { key-no-value } {#1} + } +\cs_new_protected:Npn \__template_parse_values_elt:nn #1#2 + { + \tl_set:Ne \l__template_key_name_tl + { \tl_trim_spaces:e { \tl_to_str:n {#1} } } + \prop_get:NVNTF \l__template_keytypes_prop \l__template_key_name_tl + \l__template_tmp_tl + { \__template_parse_values_elt_aux:n {#2} } + { \msg_error:nnV { template } { unknown-key } \l__template_key_name_tl } + } +\cs_new_protected:Npn \__template_parse_values_elt_aux:n #1 + { + \__template_split_keytype_arg:V \l__template_tmp_tl + \use:c { __template_store_value_ \l__template_keytype_tl :n } {#1} + } +\cs_new_protected:Npn \__template_template_set_eq:nnn #1#2#3 + { + \__template_recover_defaults:nn {#1} {#3} + \__template_store_defaults:nn {#1} {#2} + \__template_recover_keytypes:nn {#1} {#3} + \__template_store_keytypes:nn {#1} {#2} + \__template_recover_vars:nn {#1} {#3} + \__template_store_vars:nn {#1} {#2} + \cs_if_exist:cT { \c__template_code_root_tl #1 / #2 } + { \msg_info:nnnn { template } { declare-template-code } {#1} {#2} } + \cs_gset_eq:cc { \c__template_code_root_tl #1 / #2 } + { \c__template_code_root_tl #1 / #3 } + } +\cs_new_protected:Npn \__template_declare_instance:nnnn #1#2#3#4 + { + \__template_execute_if_code_exist:nnT {#1} {#2} + { + \__template_recover_defaults:nn {#1} {#2} + \__template_recover_vars:nn {#1} {#2} + \__template_declare_instance_aux:nnnn {#1} {#2} {#3} {#4} + } + } +\cs_new_protected:Npn \__template_declare_instance_aux:nnnn #1#2#3#4 + { + \bool_set_false:N \l__template_error_bool + \__template_parse_values:nnn {#1} {#2} {#4} + \bool_if:NF \l__template_error_bool + { + \prop_put:Nnn \l__template_values_prop { from~template } {#2} + \__template_store_values:nn {#1} {#3} + \__template_convert_to_assignments: + \cs_if_exist:cT { \c__template_instances_root_tl #1 / #3 } + { \msg_info:nnnn { template } { declare-instance } {#3} {#1} } + \cs_set_protected:cpe { \c__template_instances_root_tl #1 / #3 } + { + \exp_not:N \__template_assignments_push:n + { \exp_not:V \l__template_assignments_tl } + \exp_not:c { \c__template_code_root_tl #1 / #2 } + } + } + } +\cs_new_protected:Npn \__template_instance_set_eq:nnn #1#2#3 + { + \__template_if_instance_exist:nnTF {#1} {#3} + { + \__template_recover_values:nn {#1} {#3} + \__template_store_values:nn {#1} {#2} + \cs_if_exist:cT { \c__template_instances_root_tl #1 / #2 } + { \msg_info:nnnn { template } { declare-instance } {#2} {#1} } + \cs_set_eq:cc { \c__template_instances_root_tl #1 / #2 } + { \c__template_instances_root_tl #1 / #3 } + } + { \msg_error:nnnn { template } { unknown-instance } {#1} {#3} } + } +\cs_new_protected:Npn \__template_edit_instance:nnn #1#2#3 + { + \__template_if_instance_exist:nnTF {#1} {#2} + { + \__template_recover_values:nn {#1} {#2} + \prop_get:NnN \l__template_values_prop { from~template } + \l__template_tmp_tl + \__template_edit_instance_aux:nVnn + {#1} \l__template_tmp_tl {#2} {#3} + } + { \msg_error:nnnn { template } { unknown-instance } {#1} {#2} } + } +\cs_new_protected:Npn \__template_edit_instance_aux:nnnn #1#2#3#4 + { + \__template_recover_vars:nn {#1} {#2} + \__template_declare_instance_aux:nnnn {#1} {#2} {#3} {#4} + } +\cs_generate_variant:Nn \__template_edit_instance_aux:nnnn { nV } +\cs_new_protected:Npn \__template_convert_to_assignments: + { + \tl_clear:N \l__template_assignments_tl + \seq_map_function:NN \l__template_key_order_seq + \__template_convert_to_assignments_aux:n + } +\cs_new_protected:Npn \__template_convert_to_assignments_aux:n #1 + { + \prop_get:NnN \l__template_keytypes_prop {#1} \l__template_tmp_tl + \__template_convert_to_assignments_aux:nV {#1} \l__template_tmp_tl + } +\cs_new_protected:Npn \__template_convert_to_assignments_aux:nn #1#2 + { + \prop_get:NnNT \l__template_values_prop {#1} \l__template_value_tl + { + \prop_get:NnNTF \l__template_vars_prop {#1} \l__template_var_tl + { + \__template_split_keytype_arg:n {#2} + \str_if_eq:VnF \l__template_keytype_tl { choice } + { + \str_if_eq:VnF \l__template_keytype_tl { code } + { \__template_find_global: } + } + \tl_set:Nn \l__template_key_name_tl {#1} + \cs_if_exist_use:cF { __template_assign_ \l__template_keytype_tl : } + { \__template_assign_variable: } + } + { \msg_error:nnn { template } { unknown-attribute } {#1} } + } + } +\cs_generate_variant:Nn \__template_convert_to_assignments_aux:nn { nV } +\cs_new_protected:Npn \__template_find_global: + { + \bool_set_false:N \l__template_global_bool + \tl_if_in:onT \l__template_var_tl { global } + { + \exp_after:wN \__template_find_global_aux:w \l__template_var_tl \s__template_stop + } + } +\cs_new_protected:Npn \__template_find_global_aux:w #1 global #2 \s__template_stop + { + \tl_set:Nn \l__template_var_tl {#2} + \bool_set_true:N \l__template_global_bool + } +\cs_new_protected:Npn \__template_use_template:nnn #1#2#3 + { + \__template_execute_if_code_exist:nnT {#1} {#2} + { + \__template_recover_defaults:nn {#1} {#2} + \__template_recover_vars:nn {#1} {#2} + \__template_parse_values:nnn {#1} {#2} {#3} + \__template_convert_to_assignments: + \use:c { \c__template_code_root_tl #1 / #2 } + } + } +\cs_new_protected:Npn \__template_assign_boolean: + { + \bool_if:NTF \l__template_global_bool + { \__template_assign_boolean_aux:n { bool_gset } } + { \__template_assign_boolean_aux:n { bool_set } } + } +\cs_new_protected:Npn \__template_assign_boolean_aux:n #1 + { + \__template_if_key_value:VTF \l__template_value_tl + { + \__template_key_to_value: + \tl_put_right:Ne \l__template_assignments_tl + { + \exp_not:c { #1 _eq:NN } + \exp_not:V \l__template_var_tl + \exp_not:V \l__template_value_tl + } + } + { + \tl_put_right:Ne \l__template_assignments_tl + { + \exp_not:c { #1 _ \l__template_value_tl :N } + \exp_not:V \l__template_var_tl + } + } + } +\cs_new_protected:Npn \__template_assign_choice: + { + \__template_assign_choice_aux:eF + { \l__template_key_name_tl \c_space_tl \l__template_value_tl } + { + \__template_assign_choice_aux:eF + { \l__template_key_name_tl \c_space_tl unknown } + { + \prop_get:NVN \l__template_keytypes_prop \l__template_key_name_tl + \l__template_tmp_tl + \__template_split_keytype_arg:V \l__template_tmp_tl + \msg_error:nnVV { template } { unknown-choice } + \l__template_key_name_tl + \l__template_value_tl + } + } + } +\cs_new_protected:Npn \__template_assign_choice_aux:nF #1 + { + \prop_get:NnNTF \l__template_vars_prop {#1} \l__template_tmp_tl + { \tl_put_right:NV \l__template_assignments_tl \l__template_tmp_tl } + } +\cs_generate_variant:Nn \__template_assign_choice_aux:nF { e } +\cs_new_protected:Npn \__template_assign_function: + { + \bool_if:NTF \l__template_global_bool + { \__template_assign_function_aux:N \cs_gset:Npn } + { \__template_assign_function_aux:N \cs_set:Npn } + } +\cs_new_protected:Npn \__template_assign_function_aux:N #1 + { + \tl_put_right:Ne \l__template_assignments_tl + { + \cs_generate_from_arg_count:NNnn + \exp_not:V \l__template_var_tl + \exp_not:N #1 + { \exp_not:V \l__template_keytype_arg_tl } + { \exp_not:V \l__template_value_tl } + } + } +\cs_new_protected:Npn \__template_assign_instance: + { + \bool_if:NTF \l__template_global_bool + { \__template_assign_instance_aux:N \cs_gset_protected:Npn } + { \__template_assign_instance_aux:N \cs_set_protected:Npn } + } +\cs_new_protected:Npn \__template_assign_instance_aux:N #1 + { + \tl_put_right:Ne \l__template_assignments_tl + { + \exp_not:N #1 \exp_not:V \l__template_var_tl + { + \__template_use_instance:nn + { \exp_not:V \l__template_keytype_arg_tl } + { \exp_not:V \l__template_value_tl } + } + } + } +\cs_new_protected:Npn \__template_assign_variable: + { + \__template_assign_variable:c + { + \__template_map_var_type: _ + \bool_if:NT \l__template_global_bool { g } set:Nn + } + } +\cs_new_protected:Npn \__template_assign_variable:N #1 + { + \__template_if_key_value:VT \l__template_value_tl + { \__template_key_to_value: } + \tl_put_right:Ne \l__template_assignments_tl + { + #1 \exp_not:V \l__template_var_tl + { \exp_not:V \l__template_value_tl } + } + } +\cs_generate_variant:Nn \__template_assign_variable:N { c } +\cs_new_protected:Npn \__template_key_to_value: + { \exp_after:wN \__template_key_to_value_auxi:w \l__template_value_tl } +\cs_new_protected:Npn \__template_key_to_value_auxi:w \KeyValue #1 + { + \tl_set:Ne \l__template_tmp_tl { \tl_trim_spaces:e { \tl_to_str:n {#1} } } + \prop_get:NVNTF \l__template_vars_prop \l__template_tmp_tl + \l__template_value_tl + { + \exp_after:wN \__template_key_to_value_auxii:w \l__template_value_tl + \s__template_mark global \q__template_nil \s__template_stop + } + { \msg_error:nnV { template } { unknown-attribute } \l__template_tmp_tl } + } +\cs_new_protected:Npn \__template_key_to_value_auxii:w #1 global #2#3 \s__template_stop + { + \__template_quark_if_nil:NF #2 + { \tl_set:Nn \l__template_value_tl {#2} } + } +\cs_new_protected:Npn \__template_use_instance:nn #1#2 + { + \__template_if_use_template:nTF {#2} + { \__template_use_instance_aux:nNnnn {#1} #2 } + { \__template_use_instance_aux:nn {#1} {#2} } + } +\cs_new_protected:Npn \__template_use_instance_aux:nNnnn #1#2#3#4#5 + { + \str_if_eq:nnTF {#1} {#3} + { \__template_use_template:nnn {#3} {#4} {#5} } + { \msg_error:nnnn { template } { type-mismatch } {#1} {#3} } +} +\cs_new_protected:Npn \__template_use_instance_aux:nn #1#2 + { + \__template_if_instance_exist:nnTF {#1} {#2} + { \use:c { \c__template_instances_root_tl #1 / #2 } } + { \msg_error:nnnn { template } { unknown-instance } {#1} {#2} } + } +\cs_new:Npn \__template_assignments_pop: { \l__template_assignments_tl } +\cs_new_protected:Npn \__template_assignments_push:n #1 + { \tl_set:Nn \l__template_assignments_tl {#1} } +\cs_new_protected:Npn \__template_show_code:nn #1#2 + { \cs_show:c { \c__template_code_root_tl #1 / #2 } } +\cs_new_protected:Npn \__template_show_defaults:nn #1#2 + { + \__template_if_keys_exist:nnT {#1} {#2} + { + \__template_recover_defaults:nn {#1} {#2} + \__template_show:Nnnn \l__template_values_prop + {#1} {#2} { default~values } + } + } +\cs_new_protected:Npn \__template_show_keytypes:nn #1#2 + { + \__template_if_keys_exist:nnT {#1} {#2} + { + \__template_recover_keytypes:nn {#1} {#2} + \__template_show:Nnnn \l__template_keytypes_prop + {#1} {#2} { interface } + } + } +\cs_new_protected:Npn \__template_show_vars:nn #1#2 + { + \__template_execute_if_code_exist:nnT {#1} {#2} + { + \__template_recover_vars:nn {#1} {#2} + \__template_show:Nnnn \l__template_vars_prop + {#1} {#2} { variable~mapping } + } + } +\cs_new_protected:Npn \__template_show:Nnnn #1#2#3#4 + { + \msg_show:nneeee { template } { show-attribute } + { \tl_to_str:n {#2} } + { \tl_to_str:n {#3} } + { \tl_to_str:n {#4} } + { \prop_map_function:NN #1 \msg_show_item_unbraced:nn } + } +\cs_new_protected:Npn \__template_show_values:nn #1#2 + { + \__template_if_instance_exist:nnT {#1} {#2} + { + \__template_recover_values:nn {#1} {#2} + \msg_show:nneee { template } { show-values } + { \tl_to_str:n {#1} } + { \tl_to_str:n {#2} } + { + \prop_map_function:NN \l__template_values_prop + \msg_show_item_unbraced:nn + } + } + } +\msg_new:nnnn { template } { argument-number-mismatch } + { Template~type~'#1'~takes~#2~argument(s). } + { + Templates~of~type~'#1'~require~#2~argument(s).\\ + You~have~tried~to~make~a~template~for~'#1'~ + with~#3~argument(s),~which~is~not~possible:~ + the~number~of~arguments~must~agree. + } +\msg_new:nnnn { template } { bad-number-of-arguments } + { Bad~number~of~arguments~for~template~type~'#1'. } + { + A~template~may~accept~between~0~and~9~arguments.\\ + You~asked~to~use~#2~arguments:~this~is~not~supported. + } +\msg_new:nnnn { template } { bad-variable } + { Incorrect~variable~description~'#1'. } + { + The~argument~'#1'~is~not~of~the~form \\ + ~~'<variable>'\\ + ~or~\\ + ~~'global~<variable>'.\\ + It~must~be~given~in~one~of~these~formats~to~be~used~in~a~template. + } +\msg_new:nnnn { template } { choice-not-implemented } + { The~choice~'#1'~has~no~implementation. } + { + Each~choice~listed~in~the~interface~for~a~template~must~ + have~an~implementation. + } +\msg_new:nnnn { template } { choice-no-code } + { The~choice~'#1'~requires~implementation~details. } + { + When~creating~template~code~using~\DeclareTemplateCode,~ + each~choice~name~must~have~an~associated~implementation.\\ + This~should~be~given~after~a~'='~sign:~LaTeX~did~not~find~one. + } +\msg_new:nnnn { template } { choice-requires-code } + { The~choice~'#2'~for~key~'#1'~requires~an~implementation. } + { + You~should~have~put:\\ + \ \ #1~:~choice~{~#2 = <code> ~} \\ + but~LaTeX~did~not~find~any~<code>. + } +\msg_new:nnnn { template } { duplicate-key-interface } + { Key~'#1'~appears~twice~in~interface~definition~\msg_line_context:. } + { + Each~key~can~only~have~one~interface~declared~in~a~template.\\ + LaTeX~found~two~interfaces~for~'#1'. + } +\msg_new:nnnn { template } { keytype-requires-argument } + { The~key~type~'#1'~requires~an~argument~\msg_line_context:. } + { + You~should~have~put:\\ + \ \ <key-name>~:~#1~{~<argument>~} \\ + but~LaTeX~did~not~find~an~<argument>. + } +\msg_new:nnnn { template } { invalid-keytype } + { The~key~'#1'~is~missing~a~key-type~\msg_line_context:. } + { + Each~key~in~a~template~requires~a~key-type,~given~in~the~form:\\ + \ \ <key>~:~<key-type>\\ + LaTeX~could~not~find~a~<key-type>~in~your~input. + } +\msg_new:nnnn { template } { key-no-value } + { The~key~'#1'~has~no~value~\msg_line_context:. } + { + When~creating~an~instance~of~a~template~ + every~key~listed~must~include~a~value:\\ + \ \ <key>~=~<value> + } +\msg_new:nnnn { template } { key-no-variable } + { The~key~'#1'~requires~implementation~details~\msg_line_context:. } + { + When~creating~template~code~using~\DeclareTemplateCode,~ + each~key~name~must~have~an~associated~implementation.\\ + This~should~be~given~after~a~'='~sign:~LaTeX~did~not~find~one. + } +\msg_new:nnnn { template } { key-not-implemented } + { Key~'#1'~has~no~implementation~\msg_line_context:. } + { + The~definition~of~key~implementations~for~template~'#2'~ + of~template~type~'#3'~does~not~include~any~details~for~key~'#1'.\\ + The~key~was~declared~in~the~interface~definition,~ + and~so~an~implementation~is~required. + } +\msg_new:nnnn { template } { missing-keytype } + { The~key~'#1'~is~missing~a~key-type~\msg_line_context:. } + { + Key~interface~definitions~should~be~of~the~form\\ + \ \ #1~:~<key-type>\\ + but~LaTeX~could~not~find~a~<key-type>. + } +\msg_new:nnnn { template } { no-template-code } + { + The~template~'#2'~of~type~'#1'~is~unknown~ + or~has~no~implementation. + } + { + There~is~no~code~available~for~the~template~name~given.\\ + This~should~be~given~using~\DeclareTemplateCode. + } +\msg_new:nnnn { template } { type-already-defined } + { Template~type~'#1'~already~defined. } + { + You~have~used~\NewTemplateType~ + with~a~template~type~that~has~already~been~defined. + } +\msg_new:nnnn { template } { type-mismatch } + { Template~types~'#1'~and~'#2'~do~not~agree. } + { + You~are~trying~to~use~a~template~directly~with~\UseInstance + (or~a~similar~function),~but~the~template~types~do~not~match. + } +\msg_new:nnnn { template } { unknown-attribute } + { The~template~attribute~'#1'~is~unknown. } + { + There~is~a~definition~in~the~current~template~reading\\ + \ \ \token_to_str:N \KeyValue {~#1~} \\ + but~there~is~no~key~called~'#1'. + } +\msg_new:nnnn { template } { unknown-choice } + { The~choice~'#2'~was~not~declared~for~key~'#1'. } + { + The~key~'#1'~takes~a~fixed~list~of~choices~ + and~this~list~does~not~include~'#2'. + } +\msg_new:nnnn { template } { unknown-default-choice } + { The~default~choice~'#2'~was~not~declared~for~key~'#1'. } + { + The~key~'#1'~takes~a~fixed~list~of~choices~ + and~this~list~does~not~include~'#2'. + } +\msg_new:nnnn { template } { unknown-instance } + { The~instance~'#2'~of~type~'#1'~is~unknown. } + { + You~have~asked~to~use~an~instance~'#2',~ + but~this~has~not~been~created. + } +\msg_new:nnnn { template } { unknown-key } + { Unknown~template~key~'#1'. } + { + The~key~'#1'~was~not~declared~in~the~interface~ + for~the~current~template. + } +\msg_new:nnnn { template } { unknown-keytype } + { The~key-type~'#1'~is~unknown. } + { + Valid~key-types~are:\\ + -~boolean;\\ + -~choice;\\ + -~commalist;\\ + -~function;\\ + -~instance;\\ + -~integer;\\ + -~length;\\ + -~muskip;\\ + -~real;\\ + -~skip;\\ + -~tokenlist. + } +\msg_new:nnnn { template } { unknown-type } + { The~template~type~'#1'~is~unknown. } + { + A~template~type~needs~to~be~defined~with~\NewTemplateType + prior~to~using~it. + } +\msg_new:nnnn { template } { unknown-template } + { The~template~'#2'~of~type~'#1'~is~unknown. } + { + No~interface~has~been~declared~for~a~template~ + '#2'~of~template~type~'#1'. + } +\msg_new:nnn { template } { declare-instance } + { Declaring~instance~~'#1'~of~type~#2~\msg_line_context:. } +\msg_new:nnn { template } { declare-template-code } + { Declaring~code~for~template~'#2'~of~template~type~'#1'~\msg_line_context:. } +\msg_new:nnn { template } { declare-template-interface } + { + Declaring~interface~for~template~'#2'~of~template~type~'#1'~ + \msg_line_context:. + } +\msg_new:nnn { template } { declare-type } + { Declaring~template~type~'#1'~taking~#2~argument(s)~\msg_line_context:. } +\msg_new:nnn { template } { show-attribute } + { + The~template~'#2'~of~type~'#1'~has~ + \tl_if_empty:nTF {#4} { no~#3. } { #3 : #4 } + } +\msg_new:nnn { template } { show-values } + { + The~instance~'#2'~of~type~'#1'~has~ + \tl_if_empty:nTF {#3} { no~values. } { values: #3 } + } +\prop_gput:Nnn \g_msg_module_type_prop { template } { LaTeX } +\cs_new_protected:Npn \NewTemplateType #1#2 + { \__template_define_type:nn {#1} {#2} } +\cs_new_protected:Npn \DeclareTemplateInterface #1#2#3#4 + { \__template_declare_template_keys:nnnn {#1} {#2} {#3} {#4} } +\cs_new_protected:Npn \DeclareTemplateCode #1#2#3#4#5 + { \__template_declare_template_code:nnnnn {#1} {#2} {#3} {#4} {#5} } +\cs_new_protected:Npn \DeclareTemplateCopy #1#2#3 + { \__template_template_set_eq:nnn {#1} {#2} {#3} } +\cs_new_protected:Npn \EditTemplateDefaults #1#2#3 + { \__template_edit_defaults:nnn {#1} {#2} {#3} } +\cs_new_protected:Npn \UseTemplate #1#2#3 + { \__template_use_template:nnn {#1} {#2} {#3} } +\cs_new_protected:Npn \DeclareInstance #1#2#3#4 + { \__template_declare_instance:nnnn {#1} {#3} {#2} {#4} } +\cs_new_protected:Npn \DeclareInstanceCopy #1#2#3 + { \__template_instance_set_eq:nnn {#1} {#2} {#3} } +\cs_new_protected:Npn \EditInstance #1#2#3 + { \__template_edit_instance:nnn {#1} {#2} {#3} } +\cs_new_protected:Npn \UseInstance #1#2 + { \__template_use_instance:nn {#1} {#2} } +\cs_new_protected:Npn \ShowTemplateCode #1#2 + { \__template_show_code:nn {#1} {#2} } +\cs_new_protected:Npn \ShowTemplateDefaults #1#2 + { \__template_show_defaults:nn {#1} {#2} } +\cs_new_protected:Npn \ShowTemplateInterface #1#2 + { \__template_show_keytypes:nn {#1} {#2} } +\cs_new_protected:Npn \ShowTemplateVariables #1#2 + { \__template_show_vars:nn {#1} {#2} } +\cs_new_protected:Npn \ShowInstanceValues #1#2 + { \__template_show_values:nn {#1} {#2} } +\cs_new:Npn \IfInstanceExistsTF #1#2 + { \__template_if_instance_exist:nnTF {#1} {#2} } +\cs_new:Npn \IfInstanceExistsT #1#2 + { \__template_if_instance_exist:nnT {#1} {#2} } +\cs_new:Npn \IfInstanceExistsF #1#2 + { \__template_if_instance_exist:nnF {#1} {#2} } +\cs_new_protected:Npn \KeyValue #1 {#1} +\cs_new_protected:Npn \AssignTemplateKeys { \__template_assignments_pop: } +\cs_new_protected:Npn \SetTemplateKeys #1#2#3 + { \keys_set_known:nnN { template / #1 / #2 } {#3} \l__template_tmp_clist } +\ExplSyntaxOff %%% From File: ltalloc.dtx \chardef\@xxxii=32 \mathchardef\@Mi=10001 @@ -7246,8 +8552,6 @@ Type H <return> for immediate help.}% %% Copyright (C) 2020-2024 %% Frank Mittelbach, The LaTeX Project %%% From File: ltpara.dtx -\def\ltparaversion{v1.0l} -\def\ltparadate{2023/01/30} \ExplSyntaxOn @@ -7276,7 +8580,7 @@ Type H <return> for immediate help.}% \@kernel@before@para@begin \hook_use:n {para/begin} \if_mode_horizontal: \else: - \msg_error:nnnn { hooks }{ para-mode }{begin}{vertical} \fi: + \msg_error:nnnn { hooks }{ para-mode }{begin}{horizontal} \fi: \__para_handle_indent: } \tex_everypar:D{\g__para_standard_everypar_tl} @@ -7347,7 +8651,7 @@ Type H <return> for immediate help.}% \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 +\everypar{\@nodocument} %% To get an error if text appears before the \document \msg_new:nnnn { hooks } { para-mode } { Illegal~mode~ change~ in~ hook~ 'para/#1'.\\ @@ -7377,8 +8681,6 @@ Type H <return> for immediate help.}% %% Copyright (C) 2021-2024 %% Frank Mittelbach, The LaTeX Project %%% From File: ltmeta.dtx -\def\ltmetaversion{v1.0b} -\def\ltmetadate{2022/05/18} \let \IfDocumentMetadataTF \@secondoftwo \protected\def\DocumentMetadata{% \InputIfFileExists{documentmetadata-support.ltx}% @@ -7963,7 +9265,15 @@ Type H <return> for immediate help.}% \@latex@warning@no@line{inputting `#1' instead of obsolete `#2'}} \@onlypreamble\@obsoletefile \let\@filelist\@gobble -\def\listfiles{% +\ExplSyntaxOn +\keys_define:nn { __kernel / listfiles } + { + hashes .legacy_if_set:n = @listfiles@hashes , + sizes .legacy_if_set:n = @listfiles@sizes + } +\ExplSyntaxOff +\NewDocumentCommand\listfiles{O{}}{% + \SetKeys[__kernel/listfiles]{#1}% \let\listfiles\relax \def\@listfiles##1##2##3##4##5##6##7##8##9\@@{% \def\reserved@d{\\}% @@ -7988,8 +9298,30 @@ Type H <return> for immediate help.}% \filename@area\filename@base\\\\\\\\\\\\\\\\\\\@@ \typeout{% \filename@area\reserved@a - \ifx\reserved@b\relax\else\@spaces\reserved@b\fi}}% + \ifx\reserved@b\relax\else\@spaces\reserved@b\fi + \ifnum0% + \if@listfiles@hashes1\fi + \if@listfiles@sizes1\fi + >0 % + ^^J\@spaces + (% + \if@listfiles@sizes + size \@dofilelist@size\@currname + \if@listfiles@hashes + , % + \fi + \fi + \if@listfiles@hashes + hash \@dofilelist@hash\@currname + \fi + )% + \fi + }}% \typeout{ ***********^^J}}} +\ExplSyntaxOn +\cs_new_eq:NN \@dofilelist@hash \file_mdfive_hash:n +\cs_new_eq:NN \@dofilelist@size \file_size:n +\ExplSyntaxOff \@onlypreamble\listfiles \let\@dofilelist\relax %%% From File: ltoutenc.dtx @@ -8294,8 +9626,14 @@ Type H <return> for immediate help.}% \@addtoreset{#1}{@ckpt}% \global\expandafter\let\csname p@#1\endcsname\@empty \expandafter - \gdef\csname the#1\expandafter\endcsname\expandafter - {\expandafter\@arabic\csname c@#1\endcsname}} + \ifx\csname the#1\endcsname\relax + \expandafter + \gdef\csname the#1\expandafter\endcsname\expandafter + {\expandafter\@arabic\csname c@#1\endcsname}% + \else + \@latex@warning{Command `\string\the#1' already + defined -- not changed}% + \fi} \def\@addtoreset#1#2{\expandafter\@cons\csname cl@#2\endcsname {{#1}}} \def\@removefromreset#1#2{% \@ifundefined{c@#2}\relax @@ -8918,7 +10256,7 @@ Type H <return> for immediate help.}% \def\@xxvpt{24.88} %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% %%% From File: ltfssaxes.dtx -%% Copyright (C) 1999-2020 Frank Mittelbach +%% Copyright (C) 2019-2020 Frank Mittelbach \def\DeclareFontSeriesChangeRule#1#2#3#4{% \@namedef{series@#1@#2}{{#3}{#4}}} \DeclareFontSeriesChangeRule {bc}{b}{bc}{} @@ -11691,8 +13029,7 @@ Type H <return> for immediate help.}% \DeclareEncodingSubset{TS1}{lmss} {1} \DeclareEncodingSubset{TS1}{lmssq} {1} \DeclareEncodingSubset{TS1}{lmvtt} {1} -\DeclareEncodingSubset{TS1}{lmtt} {1} % missing TM, SM and - % pertenthousand for some reason +\DeclareEncodingSubset{TS1}{lmtt} {1} % missing TM, SM and pertenthousand \DeclareEncodingSubset{TS1}{ptmx} {2} \DeclareEncodingSubset{TS1}{ptmj} {2} \DeclareEncodingSubset{TS1}{ul8} {2} @@ -11730,23 +13067,31 @@ Type H <return> for immediate help.}% \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}{fbb-*} {2} % missing centoldstyle \DeclareEncodingSubset{TS1}{Alegreya-*} {2} \DeclareEncodingSubset{TS1}{AlegreyaSans-*} {2} +\DeclareEncodingSubset{TS1}{BaskervilleF-*} {2} \DeclareEncodingSubset{TS1}{DejaVuSans-TLF} {2} \DeclareEncodingSubset{TS1}{DejaVuSansCondensed-TLF} {2} \DeclareEncodingSubset{TS1}{DejaVuSansMono-TLF} {2} \DeclareEncodingSubset{TS1}{EBGaramond-*} {2} +\DeclareEncodingSubset{TS1}{Merriwthr-OsF} {2} +\DeclareEncodingSubset{TS1}{MerriwthrSans-OsF} {2} +\DeclareEncodingSubset{TS1}{Montserrat-*} {2} +\DeclareEncodingSubset{TS1}{MontserratAlternates-*} {2} +\DeclareEncodingSubset{TS1}{NotoSansMono-TLF} {2} +\DeclareEncodingSubset{TS1}{NotoSansMono-TOsF} {2} \DeclareEncodingSubset{TS1}{Tempora-TLF} {2} \DeclareEncodingSubset{TS1}{Tempora-TOsF} {2} +\DeclareEncodingSubset{TS1}{XCharter-TLF} {2} +\DeclareEncodingSubset{TS1}{XCharter-TOsF} {2} +\DeclareEncodingSubset{TS1}{erewhon-*} {2} \DeclareEncodingSubset{TS1}{Arimo-TLF} {3} -\DeclareEncodingSubset{TS1}{Carlito-*} {3} -\DeclareEncodingSubset{TS1}{FiraSans-*} {3} +\DeclareEncodingSubset{TS1}{Crlt-*} {3} +\DeclareEncodingSubset{TS1}{IBMPlexMono-TLF} {3} \DeclareEncodingSubset{TS1}{IBMPlexSans-TLF} {3} -\DeclareEncodingSubset{TS1}{Merriweather-OsF} {3} -\DeclareEncodingSubset{TS1}{Montserrat-*} {3} -\DeclareEncodingSubset{TS1}{MontserratAlternates-*} {3} +\DeclareEncodingSubset{TS1}{IBMPlexSerif-TLF} {3} \DeclareEncodingSubset{TS1}{SourceCodePro-TLF} {3} \DeclareEncodingSubset{TS1}{SourceCodePro-TOsF} {3} \DeclareEncodingSubset{TS1}{SourceSansPro-*} {3} @@ -11761,6 +13106,7 @@ Type H <return> for immediate help.}% \DeclareEncodingSubset{TS1}{CrimsonPro-*} {4} \DeclareEncodingSubset{TS1}{FiraMono-TLF} {4} \DeclareEncodingSubset{TS1}{FiraMono-TOsF} {4} +\DeclareEncodingSubset{TS1}{FiraSans-*} {4} \DeclareEncodingSubset{TS1}{Go-TLF} {4} \DeclareEncodingSubset{TS1}{GoMono-TLF} {4} \DeclareEncodingSubset{TS1}{InriaSans-*} {4} @@ -11773,7 +13119,6 @@ Type H <return> for immediate help.}% \DeclareEncodingSubset{TS1}{LinguisticsPro-OsF} {4} \DeclareEncodingSubset{TS1}{LinuxBiolinumT-*} {4} \DeclareEncodingSubset{TS1}{LinuxLibertineT-*} {4} -\DeclareEncodingSubset{TS1}{MerriweatherSans-OsF} {4} \DeclareEncodingSubset{TS1}{MintSpirit-*} {4} \DeclareEncodingSubset{TS1}{MintSpiritNoTwo-*} {4} \DeclareEncodingSubset{TS1}{PTMono-TLF} {4} @@ -11790,57 +13135,50 @@ Type H <return> for immediate help.}% \DeclareEncodingSubset{TS1}{Rosario-*} {4} \DeclareEncodingSubset{TS1}{SticksTooText-*} {4} \DeclareEncodingSubset{TS1}{UniversalisADFStd-LF} {4} -\DeclareEncodingSubset{TS1}{Almendra-OsF} {5} +\DeclareEncodingSubset{TS1}{Almndr-OsF} {5} \DeclareEncodingSubset{TS1}{Baskervaldx-*} {5} -\DeclareEncodingSubset{TS1}{BaskervilleF-*} {5} -\DeclareEncodingSubset{TS1}{Bitter-TLF} {5} +\DeclareEncodingSubset{TS1}{Bttr-TLF} {5} \DeclareEncodingSubset{TS1}{Cinzel-LF} {5} \DeclareEncodingSubset{TS1}{CinzelDecorative-LF} {5} +\DeclareEncodingSubset{TS1}{Cochineal-*} {5} \DeclareEncodingSubset{TS1}{DejaVuSerif-TLF} {5} \DeclareEncodingSubset{TS1}{DejaVuSerifCondensed-TLF} {5} \DeclareEncodingSubset{TS1}{GilliusADF-LF} {5} \DeclareEncodingSubset{TS1}{GilliusADFCond-LF} {5} \DeclareEncodingSubset{TS1}{GilliusADFNoTwo-LF} {5} \DeclareEncodingSubset{TS1}{GilliusADFNoTwoCond-LF} {5} -\DeclareEncodingSubset{TS1}{LobsterTwo-LF} {5} \DeclareEncodingSubset{TS1}{OldStandard-TLF} {5} -\DeclareEncodingSubset{TS1}{PlayfairDisplay-TLF} {5} -\DeclareEncodingSubset{TS1}{PlayfairDisplay-TOsF} {5} +\DeclareEncodingSubset{TS1}{PlyfrDisplay-TLF} {5} +\DeclareEncodingSubset{TS1}{PlyfrDisplay-TOsF} {5} \DeclareEncodingSubset{TS1}{TheanoDidot-TLF} {5} \DeclareEncodingSubset{TS1}{TheanoDidot-TOsF} {5} \DeclareEncodingSubset{TS1}{TheanoModern-TLF} {5} \DeclareEncodingSubset{TS1}{TheanoModern-TOsF} {5} \DeclareEncodingSubset{TS1}{TheanoOldStyle-TLF} {5} \DeclareEncodingSubset{TS1}{TheanoOldStyle-TOsF} {5} +\DeclareEncodingSubset{TS1}{charssil-TLF} {5} \DeclareEncodingSubset{TS1}{Crimson-TLF} {6} -\DeclareEncodingSubset{TS1}{IBMPlexMono-TLF} {6} -\DeclareEncodingSubset{TS1}{IBMPlexSerif-TLF} {6} -\DeclareEncodingSubset{TS1}{LibertinusMono-TLF} {6} \DeclareEncodingSubset{TS1}{LibertinusSerifDisplay-LF}{6} \DeclareEncodingSubset{TS1}{LinuxLibertineDisplayT-*} {6} \DeclareEncodingSubset{TS1}{LinuxLibertineMonoT-LF} {6} \DeclareEncodingSubset{TS1}{LinuxLibertineMonoT-TLF} {6} -\DeclareEncodingSubset{TS1}{Overlock-LF} {6} +\DeclareEncodingSubset{TS1}{Ovrlck-LF} {6} +\DeclareEncodingSubset{TS1}{ComicNeue-TLF} {7} +\DeclareEncodingSubset{TS1}{ComicNeueAngular-TLF} {7} \DeclareEncodingSubset{TS1}{CormorantGaramond-*} {7} \DeclareEncodingSubset{TS1}{Heuristica-TLF} {7} \DeclareEncodingSubset{TS1}{Heuristica-TOsF} {7} \DeclareEncodingSubset{TS1}{IMFELLEnglish-TLF} {7} -\DeclareEncodingSubset{TS1}{LibreBaskerville-TLF} {7} -\DeclareEncodingSubset{TS1}{LibreCaslon-*} {7} -\DeclareEncodingSubset{TS1}{Marcellus-LF} {7} +\DeclareEncodingSubset{TS1}{LibreBskrvl-TLF} {7} +\DeclareEncodingSubset{TS1}{LibreCsln-*} {7} +\DeclareEncodingSubset{TS1}{Lbstr-LF} {7} +\DeclareEncodingSubset{TS1}{Mrcls-LF} {7} \DeclareEncodingSubset{TS1}{NotoSans-*} {7} -\DeclareEncodingSubset{TS1}{NotoSansMono-TLF} {7} -\DeclareEncodingSubset{TS1}{NotoSansMono-TOsF} {7} \DeclareEncodingSubset{TS1}{NotoSerif-*} {7} -\DeclareEncodingSubset{TS1}{Quattrocento-TLF} {7} -\DeclareEncodingSubset{TS1}{QuattrocentoSans-TLF} {7} -\DeclareEncodingSubset{TS1}{XCharter-TLF} {7} -\DeclareEncodingSubset{TS1}{XCharter-TOsF} {7} -\DeclareEncodingSubset{TS1}{erewhon-*} {7} -\DeclareEncodingSubset{TS1}{ComicNeue-TLF} {7} -\DeclareEncodingSubset{TS1}{ComicNeueAngular-TLF} {7} -\DeclareEncodingSubset{TS1}{Forum-LF} {7} % the superiors are missing -\DeclareEncodingSubset{TS1}{Cochineal-*} {8} +\DeclareEncodingSubset{TS1}{Quattro-LF} {7} +\DeclareEncodingSubset{TS1}{QuattroSans-LF} {7} +\DeclareEncodingSubset{TS1}{Frm-LF} {7} % the superiors are missing +\DeclareEncodingSubset{TS1}{LibertinusMono-TLF} {8} \DeclareEncodingSubset{TS1}{AlgolRevived-TLF} {9} \def\UseLegacyTextSymbols{% \DeclareTextSymbolDefault{\textasteriskcentered}{OMS}% @@ -11874,7 +13212,6 @@ Type H <return> for immediate help.}% \DeclareTextSymbolDefault{\textlegacysection}{OMS} - %%% From File: ltpageno.dtx \message{page nos.,} \countdef\c@page=0 \c@page=1 @@ -11949,12 +13286,7 @@ Type H <return> for immediate help.}% \NewDocumentCommand\Ref{s} {\IfBooleanTF{#1}{\@kernel@sRef}{\@kernel@Ref}} \def\@currentlabel{} -%% File: ltproperties.dtx -\def\ltpropertiesversion{1.0c} -\def\ltpropertiesdate{2023-10-15} - - - +%%% From File: ltproperties.dtx \ExplSyntaxOn \cs_new_protected:Npn \property_new:nnnn #1#2#3#4 { @@ -12007,7 +13339,7 @@ Type H <return> for immediate help.}% { \legacy_if:nT { @filesw } { - \iow_shipout_x:Nx \@auxout + \protected@write \@auxout {} { \token_to_str:N \new@label@record {#1} @@ -12119,7 +13451,9 @@ Type H <return> for immediate help.}% } } \prg_generate_conditional_variant:Nnn \property_if_exist:n {e} {TF} -\cs_new_eq:NN \IfPropertyExistTF \property_if_exist:eTF +\cs_new_eq:NN \IfPropertyExistsTF \property_if_exist:eTF +\cs_new:Npn \IfPropertyExistsT #1#2 {\property_if_exist:eTF {#1}{#2}{} } +\cs_new:Npn \IfPropertyExistsF #1 {\property_if_exist:eTF {#1}{} } \prg_new_conditional:Npnn \property_if_recorded:n #1 { p , T , F, TF } % #1 label { @@ -12132,7 +13466,9 @@ Type H <return> for immediate help.}% } } \prg_generate_conditional_variant:Nnn \property_if_recorded:n {e} {TF} -\cs_new_eq:NN \IfLabelExistTF \property_if_recorded:eTF +\cs_new_eq:NN \IfLabelExistsTF \property_if_recorded:eTF +\cs_new:Npn \IfLabelExistsT #1#2 {\property_if_exist:eTF {#1}{#2}{} } +\cs_new:Npn \IfLabelExistsF #1 {\property_if_exist:eTF {#1}{} } \prg_new_conditional:Npnn \property_if_recorded:nn #1#2 { p , T , F, TF } % #1 label #2 property { @@ -13334,7 +14670,16 @@ Type H <return> for immediate help.}% \box\@tempboxa \@end@tempboxa} \def\@finalstrut#1{% - \unskip\ifhmode\nobreak\fi\vrule\@width\z@\@height\z@\@depth\dp#1} + \unskip + \ifhmode \nobreak \vrule + \else + \ifdim \prevdepth=-\@m\p@ + \else + \vskip-\prevdepth + \fi + \hrule + \fi + \@width\z@\@height\z@\@depth\dp#1} \def\@@line{\hb@xt@\hsize} \DeclareRobustCommand\leftline[1]{\@@line{#1\hss}} \DeclareRobustCommand\rightline[1]{\@@line{\hss#1}} @@ -14129,7 +15474,7 @@ Type H <return> for immediate help.}% \global\@namedef{#1}{\@thm{#2}{#3}}% \global\@namedef{end#1}{\@endtheorem}}}} \def\@thm#1#2{% - \refstepcounter{#1}% + \@kernel@refstepcounter{#1}% \@ifnextchar[{\@ythm{#1}{#2}}{\@xthm{#1}{#2}}} \def\@xthm#1#2{% \@begintheorem{#2}{\csname the#1\endcsname}\ignorespaces} @@ -14138,9 +15483,9 @@ Type H <return> for immediate help.}% \def\@thmcounter#1{\noexpand\arabic{#1}} \def\@thmcountersep{.} \def\@begintheorem#1#2{\trivlist - \item[\hskip \labelsep{\bfseries #1\ #2}]\itshape} + \item[\MakeLinkTarget{\@currentcounter}\hskip \labelsep{\bfseries #1\ #2}]\itshape} \def\@opargbegintheorem#1#2#3{\trivlist - \item[\hskip \labelsep{\bfseries #1\ #2\ (#3)}]\itshape} + \item[\MakeLinkTarget{\@currentcounter}\hskip \labelsep{\bfseries #1\ #2\ (#3)}]\itshape} \def\@endtheorem{\endtrivlist} %%% From File: ltsect.dtx \message{title,} @@ -14731,8 +16076,6 @@ Type H <return> for immediate help.}% %% Copyright (C) 2022-2024 %% Frank Mittelbach, The LaTeX Project %%% From File: ltmarks.dtx -\def\ltmarksversion{v1.0d} -\def\ltmarksdate{2022/06/01} %% \end{function} \ExplSyntaxOn @@ -14770,42 +16113,87 @@ Type H <return> for immediate help.}% \tl_new:c { g__mark_last-column_top_ #1 _tl } \tl_new:c { g__mark_last-column_first_ #1 _tl } \tl_new:c { g__mark_last-column_last_ #1 _tl } + \tl_set:cn { g__mark_page_top_ #1 _tl }{ \__mark_id:n{0} } + \tl_set:cn { g__mark_page_first_ #1 _tl }{ \__mark_id:n{0} } + \tl_set:cn { g__mark_page_last_ #1 _tl }{ \__mark_id:n{0} } + \tl_set:cn { g__mark_previous-page_top_ #1 _tl }{ \__mark_id:n{0} } + \tl_set:cn { g__mark_previous-page_first_ #1 _tl }{ \__mark_id:n{0} } + \tl_set:cn { g__mark_previous-page_last_ #1 _tl }{ \__mark_id:n{0} } + \tl_set:cn { g__mark_column_top_ #1 _tl }{ \__mark_id:n{0} } + \tl_set:cn { g__mark_column_first_ #1 _tl }{ \__mark_id:n{0} } + \tl_set:cn { g__mark_column_last_ #1 _tl }{ \__mark_id:n{0} } + \tl_set:cn { g__mark_previous-column_top_ #1 _tl }{ \__mark_id:n{0} } + \tl_set:cn { g__mark_previous-column_first_ #1 _tl }{ \__mark_id:n{0} } + \tl_set:cn { g__mark_previous-column_last_ #1 _tl }{ \__mark_id:n{0} } + \tl_set:cn { g__mark_first-column_top_ #1 _tl }{ \__mark_id:n{0} } + \tl_set:cn { g__mark_first-column_first_ #1 _tl }{ \__mark_id:n{0} } + \tl_set:cn { g__mark_first-column_last_ #1 _tl }{ \__mark_id:n{0} } + \tl_set:cn { g__mark_last-column_top_ #1 _tl }{ \__mark_id:n{0} } + \tl_set:cn { g__mark_last-column_first_ #1 _tl }{ \__mark_id:n{0} } + \tl_set:cn { g__mark_last-column_last_ #1 _tl }{ \__mark_id:n{0} } } \box_new:N \l__mark_box +\box_new:N \l__mark_ii_box \tl_new:N \g__mark_tmp_tl \tl_new:N \g__mark_new_top_tl -\cs_new_protected:Npn \__mark_update_structure:nn #1#2 - { - \__mark_update_structure_alias:nn { previous-#1 } {#1} +\cs_new_protected:Npn \__mark_extract_and_handle_marks:nn #1#2 { \group_begin: \dim_set_eq:NN \tex_splitmaxdepth:D \c_max_dim \int_set_eq:NN \tex_vbadness:D \c_max_int \dim_set_eq:NN \tex_vfuzz:D \c_max_dim - \vbox_set_to_ht:Nnn \l__mark_box { -.5\c_max_dim } + \__mark_prepare_and_extract:nn {#1} {#2} + \group_end: + } +\cs_new_protected:Npn \__mark_prepare_and_extract:nn #1#2 { + \vbox_set:Nn \l__mark_box + { + #2 + \tex_unskip:D + \box_set_to_last:N \l__mark_box + \int_compare:nNnT \tex_lastnodetype:D < 0 { - #2 - \tex_unskip:D - \box_set_to_last:N \l__mark_box - \int_compare:nNnT \tex_lastnodetype:D < 0 - { - \box_if_vertical:NT \l__mark_box - { - \vbox_set_to_ht:Nnn \l__mark_box { -.5\c_max_dim } - { - \vbox_unpack:N \l__mark_box - \tex_kern:D \c_zero_dim % ensure that box - % is not empty - } - \int_compare:nNnT \tex_badness:D > 0 - { \vbox_unpack:N \l__mark_box } - } - } - \tex_kern:D \c_zero_dim + \box_if_vertical:NT \l__mark_box + { \vbox_unpack:N \l__mark_box } } - \int_compare:nNnTF \tex_badness:D > 0 - { - \vbox_set_split_to_ht:NNn \l__mark_box \l__mark_box \c_max_dim - \seq_map_inline:Nn \g__mark_classes_seq + } + \__mark_vbox_set_split_to_maxdimen:NN \l__mark_ii_box \l__mark_box + \box_if_empty:NTF \l__mark_box + { #1 } + { + \__mark_debug:n { \iow_term:x + { Marks:~ mark~ extraction~needs~ recursion~ + \msg_line_context: } } + \__mark_prepare_and_extract:nn {#1} + { \vbox_unpack:N \l__mark_ii_box + \vbox_unpack:N \l__mark_box } + } +} +\cs_set_eq:cN {Infinite~shrink~error~above~ignored~!}\c_max_dim +\cs_new_protected:Npx \__mark_vbox_set_split_to_maxdimen:NN #1#2 { + \tl_set:Ne \exp_not:N \l__mark_saved_parameters_tl + { + \tex_interactionmode:D + \exp_not:N \int_use:N \tex_interactionmode:D \scan_stop: + \tex_escapechar:D + \exp_not:N \int_use:N \tex_escapechar:D \scan_stop: + } + \tex_escapechar:D -1 \scan_stop: + \tex_interactionmode:D 0 \scan_stop: + \tex_setbox:D #1 \tex_vsplit:D #2 to + \exp_not:N \use:n { + \use:c{Infinite~shrink~error~above~ignored~!} + } + \exp_not:N \l__mark_saved_parameters_tl +} +\tl_new:N \l__mark_saved_parameters_tl +\cs_new_protected:Npn \__mark_update_structure_from_material:nn #1#2 { + \__mark_extract_and_handle_marks:nn + { \__mark_update_structure_from_splitmarks:n {#1} } + { #2 } +} +\cs_new_protected:Npn \__mark_update_structure_from_splitmarks:n #1 { + \__mark_update_structure_alias:nn { previous-#1 } {#1} + \seq_map_inline:Nn \g__mark_classes_seq { \tl_gset_eq:Nc \g__mark_new_top_tl { g__mark_#1_last_##1_tl } \tl_gset_eq:cN { g__mark_#1_top_##1_tl } \g__mark_new_top_tl @@ -14827,19 +16215,49 @@ Type H <return> for immediate help.}% } } } - } - { - \msg_error:nnn { mark } { infinite-shrinkage } {#1} - \seq_map_inline:Nn \g__mark_classes_seq +} +\cs_new_protected:Npn \__mark_get_marks_for_reinsertion:nNN #1#2#3 { + \tl_clear:N \g__mark_first_marks_tl + \tl_clear:N \g__mark_last_marks_tl + \__mark_extract_and_handle_marks:nn + \__mark_get_from_splitmarks: + { #1 } + \tl_set_eq:NN #2 \g__mark_first_marks_tl + \tl_set_eq:NN #3 \g__mark_last_marks_tl +} +\cs_new_protected:Npn \__mark_get_from_splitmarks: { + \seq_map_inline:Nn \g__mark_classes_seq { - \tl_gset_eq:cc { g__mark_#1_top_ ##1_tl } - { g__mark_#1_last_ ##1_tl } - \tl_gset_eq:cc { g__mark_#1_first_##1_tl } - { g__mark_#1_last_ ##1_tl } + \tl_gset:No \g__mark_tmp_tl + { \tex_splitbotmarks:D \use:c { c__mark_class_##1_mark } } + + \tl_if_empty:NTF \g__mark_tmp_tl + { + \__mark_debug:n { \iow_term:x { Marks:~no~ marks~ + for~ class~ '##1'~\msg_line_context: } } + } + { + \__mark_debug:n { \iow_term:x { Marks:~ extract~ last~ + mark~ for~ class~ '##1'~ =~ \g__mark_tmp_tl } } + \tl_gput_right:Ne \g__mark_last_marks_tl + { \mark_insert:nn {##1} { \g__mark_tmp_tl } } + \__mark_debug:n { \iow_term:x { Marks:~ extract~ first~ + mark~ for~ class~ '##1'~ =~ + \tex_splitfirstmarks:D + \use:c { c__mark_class_##1_mark } + } } + \tl_gput_right:Ne \g__mark_first_marks_tl + { \mark_insert:nn {##1} + { + \tex_splitfirstmarks:D + \use:c { c__mark_class_##1_mark } + } + } + } } - } - \group_end: - } +} +\tl_new:N \g__mark_first_marks_tl +\tl_new:N \g__mark_last_marks_tl \cs_new_protected:Npn \__mark_update_structure_alias:nn #1#2 { \seq_map_inline:Nn \g__mark_classes_seq { @@ -14869,14 +16287,16 @@ Type H <return> for immediate help.}% \group_begin: \@kernel@before@insertmark \hook_use:n { insertmark } - \unrestored@protected@xdef \g__mark_tmp_tl {#2} + \unrestored@protected@xdef \g__mark_tmp_tl + { + \__mark_id:n{ \int_use:N\g__mark_int } + #2 + } \__mark_debug:n{ \iow_term:x { Marks:~ set~#1~<-~ '\tl_to_str:V \g__mark_tmp_tl' ~ \msg_line_context: } } \tex_marks:D \use:c { c__mark_class_ #1 _mark } { - \tl_if_empty:NTF \g__mark_tmp_tl - { \exp_not:n { \prg_do_nothing: } } - { \exp_not:o { \g__mark_tmp_tl } } + \exp_not:o { \g__mark_tmp_tl } } \group_end: \if@nobreak\ifvmode\nobreak\fi\fi @@ -14886,15 +16306,23 @@ Type H <return> for immediate help.}% { \tl_to_str:n {#1} } } } +\cs_new_protected:Npn \__mark_id:n #1 { } +\int_new:N \g__mark_int \cs_new:Npn \@kernel@before@insertmark { \cs_set_eq:NN \label \scan_stop: \cs_set_eq:NN \index \scan_stop: \cs_set_eq:NN \glossary \scan_stop: + \int_compare:nNnTF \g__mark_int < {99999} + { \int_gincr:N \g__mark_int } + { \int_gzero:N \g__mark_int } + } \hook_new:n {insertmark} -\cs_new:Npn \mark_use_first:nn #1#2 { \exp_not:v { g__mark_#1_first_#2_tl } } -\cs_new:Npn \mark_use_last:nn #1#2 { \exp_not:v { g__mark_#1_last_#2_tl } } -\cs_new:Npn \mark_use_top:nn #1#2 { \exp_not:v { g__mark_#1_top_#2_tl } } +\cs_new:Npn \mark_use_first:nn #1#2 { \__mark_use:v { g__mark_#1_first_#2_tl } } +\cs_new:Npn \mark_use_last:nn #1#2 { \__mark_use:v { g__mark_#1_last_#2_tl } } +\cs_new:Npn \mark_use_top:nn #1#2 { \__mark_use:v { g__mark_#1_top_#2_tl } } +\cs_new:Npn \__mark_use:n #1 { \exp_not:o { \use_none:nn #1 } } +\cs_generate_variant:Nn \__mark_use:n { v } \prg_new_conditional:Npnn \mark_if_eq:nnnn #1#2#3#4 { T , F , TF } { \tl_if_eq:ccTF { g__mark_ #1 _#3_ #2 _tl } @@ -14934,15 +16362,6 @@ Type H <return> for immediate help.}% all~columns~have~been~assembled. \c__msg_return_text_tl } -\msg_new:nnnn { mark } { infinite-shrinkage } - { Infinite~shrinkage~found~in~'#1'. } - { - \c__msg_coding_error_text_tl - The~mark~region~'#1'~contains~some~infinite~negative~glue~ - allowing~it~to~shrink~to~an~arbitrary~size.~ - This~makes~it~impossible~to~split~the~region~apart~to~ - get~at~its~marks.~They~are~lost. - } \bool_new:N \g__mark_debug_bool \cs_new_eq:NN \__mark_debug:n \use_none:n \cs_new_protected:Npn \mark_debug_on: @@ -14995,6 +16414,9 @@ Type H <return> for immediate help.}% \seq_map_inline:Nn \g__mark_classes_seq { \__mark_class_status:nn {#1} {##1} } } +\cs_new_protected:Npn \ShowMarksAt #1 { + \__mark_debug:n { \__mark_status:n {#1} } +} \cs_new_eq:NN \NewMarkClass \mark_new_class:n \@onlypreamble \NewMarkClass \cs_new_eq:NN \InsertMark \mark_insert:nn @@ -15010,11 +16432,11 @@ Type H <return> for immediate help.}% \cs_new_protected:Npn \__mark_update_singlecol_structures: { \box_if_vertical:NTF \@outputbox { - \__mark_update_structure:nn {page} + \__mark_update_structure_from_material:nn {page} { \vbox_unpack:N \@outputbox } } { - \__mark_update_structure:nn {page} + \__mark_update_structure_from_material:nn {page} { \hbox_unpack:N \@outputbox } } \__mark_update_structure_alias:nn {previous-column}{previous-page} @@ -15038,11 +16460,11 @@ Type H <return> for immediate help.}% \cs_new_protected:Npn \__mark_update_dblcol_structures: { \box_if_vertical:NTF \@outputbox { - \__mark_update_structure:nn {column} + \__mark_update_structure_from_material:nn {column} { \vbox_unpack:N \@outputbox } } { - \__mark_update_structure:nn {column} + \__mark_update_structure_from_material:nn {column} { \hbox_unpack:N \@outputbox } } \legacy_if:nTF {@firstcolumn} @@ -15062,10 +16484,19 @@ Type H <return> for immediate help.}% { g__mark_page_last_ ##1 _tl } \tl_gset_eq:cc { g__mark_page_top_ ##1 _tl } { g__mark_first-column_top_ ##1 _tl } - \tl_gset_eq:cc { g__mark_ page_first_ ##1 _tl } + + \tl_if_eq:ccTF { g__mark_first-column_top_ ##1 _tl } { g__mark_first-column_first_ ##1 _tl } - \tl_gset_eq:cc { g__mark_page_last_ ##1 _tl } - { g__mark_last-column_last_ ##1 _tl } + { + \tl_gset_eq:cc { g__mark_page_first_ ##1 _tl } + { g__mark_last-column_first_ ##1 _tl } + } + { + \tl_gset_eq:cc { g__mark_page_first_ ##1 _tl } + { g__mark_first-column_first_ ##1 _tl } + } + \tl_gset_eq:cc { g__mark_page_last_ ##1 _tl } + { g__mark_last-column_last_ ##1 _tl } } } \__mark_debug:n @@ -15255,6 +16686,30 @@ Type H <return> for immediate help.}% \let \IfClassLoadedTF \@ifclassloaded \let \IfPackageLoadedWithOptionsTF \@ifpackagewith \let \IfClassLoadedWithOptionsTF \@ifclasswith +\def\IfPackageLoadedT #1#2{\IfPackageLoadedTF{#1}{#2}{}} +\def\IfPackageLoadedF #1{\IfPackageLoadedTF{#1}{}} +\def\IfClassLoadedT #1#2{\IfClassLoadedTF{#1}{#2}{}} +\def\IfClassLoadedF #1{\IfClassLoadedTF{#1}{}} +\def\IfPackageAtLeastT#1#2#3{\IfPackageAtLeastTF{#1}{#2}{#3}{}} +\def\IfPackageAtLeastF #1#2{\IfPackageAtLeastTF{#1}{#2}{}} +\def\IfClassAtLeastT #1#2#3{\IfClassAtLeastTF{#1}{#2}{#3}{}} +\def\IfClassAtLeastF #1#2{\IfClassAtLeastTF{#1}{#2}{}} +\def\IfFileAtLeastT #1#2#3{\IfFileAtLeastTF{#1}{#2}{#3}{}} +\def\IfFileAtLeastF #1#2{\IfFileAtLeastTF{#1}{#2}{}} +\def\IfFormatAtLeastT #1#2{\IfFormatAtLeastTF{#1}{#2}{}} +\def\IfFormatAtLeastF #1{\IfFormatAtLeastTF{#1}{}} +\def\IfPackageLoadedWithOptionsT #1#2#3{\IfPackageLoadedWithOptionsTF{#1}{#2}{#3}{}} +\def\IfPackageLoadedWithOptionsF #1#2{\IfPackageLoadedWithOptionsTF{#1}{#2}{}} +\def\IfClassLoadedWithOptionsT #1#2#3{\IfClassLoadedWithOptionsTF{#1}{#2}{#3}{}} +\def\IfClassLoadedWithOptionsF #1#2{\IfClassLoadedWithOptionsTF{#1}{#2}{}} +\def\IfFileLoadedTF#1{% + \expandafter\ifx\csname ver@#1\endcsname\relax + \expandafter\@secondoftwo + \else + \expandafter\@firstoftwo + \fi} +\def\IfFileLoadedT#1#2{\IfFileLoadedTF{#1}{#2}{}} +\def\IfFileLoadedF #1{\IfFileLoadedTF{#1}{}} \def\ProvidesPackage#1{% \xdef\@gtempa{#1}% \@expandtwoargs\@expl@str@if@eq@@nnTF @@ -15305,11 +16760,11 @@ Type H <return> for immediate help.}% \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\expandafter\endcsname - \expandafter{#2}}% - {\expandafter\g@addto@macro\csname @raw@opt@#3.#1\expandafter\endcsname - \expandafter{\expandafter,#2}}% + \@ifundefined{@raw@opt@#3.#1}% + {\expandafter\gdef\csname @raw@opt@#3.#1\expandafter\endcsname + \expandafter{#2}}% + {\expandafter\g@addto@macro\csname @raw@opt@#3.#1\expandafter\endcsname + \expandafter{\expandafter,#2}}% } \@onlypreamble\@pass@ptions \def\PassOptionsToPackage{\@pass@ptions\@pkgextension} @@ -15474,6 +16929,11 @@ Type H <return> for immediate help.}% \ifx#2\@empty\else\expandafter\zap@space\fi #2} \def\@fileswithoptions#1{% + \ifnum\currentgrouplevel>\z@ + \@latex@error + {Loading a class or package in a group}% + {Classes and packages should only be loaded at the top level}% + \fi \@ifnextchar[%] {\@fileswith@ptions#1}% {\@fileswith@ptions#1[]}} @@ -15524,9 +16984,12 @@ Type H <return> for immediate help.}% \@ifundefined{opt@handler@\@currname.\@currext} {\@onefilewithoptions@clashchk{#2}} {% - \expandafter\protected@edef\csname opt@\@currname.\@currext\endcsname + \expandafter\protected@edef + \csname opt@\@currname.\@currext\endcsname {\zap@space#2 \@empty}% - \@namedef{@raw@opt@\@currname.\@currext}{#2}% + \expandafter\def + \csname @raw@opt@\@currname.\@currext\expandafter\endcsname + \expandafter{#2}% \@nameuse{opt@handler@\@currname.\@currext}% }% }% @@ -16260,8 +17723,6 @@ Type H <return> for immediate help.}% { \__keys_options_expand_module:Nn \keys_set:nn {#1} {#2} } \ExplSyntaxOff %%% From File: ltfilehook.dtx -\providecommand\ltfilehookversion{v1.0o} -\providecommand\ltfilehookdate{2023/07/10} \ExplSyntaxOn \tl_new:N \CurrentFile \tl_new:N \CurrentFilePath @@ -16551,8 +18012,6 @@ Type H <return> for immediate help.}% %% Frank Mittelbach, The LaTeX Project %% %%% From File: ltshipout.dtx -\providecommand\ltshipoutversion{v1.0n} -\providecommand\ltshipoutdate{2022/11/08} \ExplSyntaxOn \bool_new:N \g__shipout_debug_bool \cs_new_eq:NN \__shipout_debug:n \use_none:n @@ -18070,6 +19529,198 @@ Type H <return> for immediate help.}% \let\topfigrule=\relax \let\botfigrule=\relax \let\dblfigrule=\relax +%%% From File: lttagging.dtx +\ExplSyntaxOn +\cs_new_eq:NN \SuspendTagging \use_none:n +\cs_new_eq:NN \ResumeTagging \use_none:n +\AddToHook{begindocument/before}{ + \cs_if_exist:NT \tag_stop:n + { + \cs_set:Npn \SuspendTagging #1 { + \tag_stop:n {#1} + } + \cs_set:Npn \ResumeTagging #1 { \tag_start:n {#1} } + } +} +\AddToHook{begindocument}[kernel]{ + \cs_if_exist:NF \tag_if_active:T + { + \prg_new_conditional:Npnn \tag_if_active: { p , T , TF, F } + { \prg_return_false: } + } +} +\cs_new_protected:Npn \tag_socket_use:n #1 { } +\cs_new_protected:Npn \tag_socket_use:nn #1#2 { } +\cs_new_protected:Npn \UseTaggingSocket #1 { + \int_case:nnF + { \int_use:c { c__socket_tagsupport/#1_args_int } } + { + 0 \prg_do_nothing: + 1 \use_none:n + 2 \use_none:nn + } + \ERRORusetaggingsocket % that should get a proper error message +} +\ExplSyntaxOff +\NewSocket{tagsupport/tbl/cell/begin}{0} +\NewSocket{tagsupport/tbl/cell/end}{0} +\NewSocket{tagsupport/tbl/row/begin}{0} +\NewSocket{tagsupport/tbl/row/end}{0} +\NewSocket{tagsupport/tbl/pcell/begin}{0} +\NewSocket{tagsupport/tbl/pcell/end}{0} +\NewSocket{tagsupport/tbl/init}{0} +\NewSocket{tagsupport/tbl/finalize}{0} + +\NewSocket{tagsupport/tbl/colspan}{1} + +\NewSocket{tagsupport/tbl/hmode/begin}{0} +\NewSocket{tagsupport/tbl/hmode/end}{0} +\NewSocket{tagsupport/tbl/vmode/begin}{0} +\NewSocket{tagsupport/tbl/vmode/end}{0} +\NewSocket{tagsupport/tbl/longtable/init}{0} +\NewSocket{tagsupport/tbl/longtable/finalize}{0} +\NewSocket{tagsupport/tbl/longtable/head}{0} +\NewSocket{tagsupport/tbl/longtable/foot}{0} +\ExplSyntaxOn +\int_new:N \g__tbl_col_int +\int_new:N \g__tbl_row_int +\tl_new:N \g__tbl_span_tl +\tl_new:N \g__tbl_table_cols_tl + +\tl_gset:Nn \g__tbl_span_tl {1} +\tl_gset:Nn \g__tbl_table_cols_tl {0} % indicates outer level +\tl_new:N \l__tbl_saved_col_tl +\tl_new:N \l__tbl_saved_row_tl +\tl_new:N \l__tbl_saved_span_tl +\tl_new:N \l__tbl_saved_table_cols_tl + +\tl_set:Nn \l__tbl_saved_col_tl{0} +\tl_set:Nn \l__tbl_saved_row_tl{0} +\tl_set:Nn \l__tbl_saved_span_tl{1} +\tl_set:Nn \l__tbl_saved_table_cols_tl{0} % indicates outer level +\int_new:N \g__tbl_missing_cells_int +\def\DebugTablesOn{ + \cs_set_eq:NN \__tbl_trace:n \typeout +} +\def\DebugTablesOff{ + \cs_set_eq:NN \__tbl_trace:n \use_none:n +} +\cs_new_eq:NN \__tbl_trace:n \use_none:n +\cs_new_protected:Npn \tbl_update_cell_data: { + \int_gadd:Nn \g__tbl_col_int { \g__tbl_span_tl } + \tl_gset:Nn \g__tbl_span_tl {1} +} +\cs_new:Npn \tbl_count_table_cols: { + \seq_set_split:NnV\l__tbl_tmpa_seq {&}\@preamble + \tl_gset:Ne \g__tbl_table_cols_tl { \seq_count:N \l__tbl_tmpa_seq } + \__tbl_trace:n { ==>~ Table~ has~ \g__tbl_table_cols_tl \space columns } +} +\seq_new:N \l__tbl_tmpa_seq +\cs_new:Npn \tbl_count_missing_cells:n #1 { + \tag_if_active:T { + \int_compare:nNnT \g__tbl_col_int > 0 + { + \int_gset:Nn \g__tbl_missing_cells_int + { + \g__tbl_table_cols_tl + - \g__tbl_col_int + - \g__tbl_span_tl + + 1 + } + \int_compare:nNnT \g__tbl_missing_cells_int < 0 \ERRORmissingcells % should not happen + \__tbl_trace:n{==>~ + (#1)~ + This~ row~ needs~ + \int_use:N \g__tbl_missing_cells_int \space + additional~ cell(s) + } + } + } +} +\cs_new_protected:Npn \tbl_save_outer_table_cols: { + \tl_set_eq:NN \l__tbl_saved_table_cols_tl \g__tbl_table_cols_tl +} +\cs_new_protected:Npn \tbl_init_cell_data_for_table: { + \tl_set:No \l__tbl_saved_col_tl {\int_use:N \g__tbl_col_int } + \tl_set:No \l__tbl_saved_row_tl {\int_use:N \g__tbl_row_int } + \tl_set_eq:NN \l__tbl_saved_span_tl \g__tbl_span_tl + \__tbl_trace:n { ==>~ saved~cell~data:~ + \l__tbl_saved_row_tl, + \l__tbl_saved_col_tl, + \l__tbl_saved_span_tl \space + ( + \int_compare:nNnTF \l__tbl_saved_table_cols_tl = 0 + { outer~ level } + { max:~ \l__tbl_saved_table_cols_tl } + ) + } + \int_gzero:N \g__tbl_row_int + \int_gzero:N \g__tbl_col_int + \tl_gset:Nn \g__tbl_span_tl {1} +} +\cs_new_protected:Npn \tbl_update_cell_data_for_next_row: { + \int_gincr:N \g__tbl_row_int % this row about to start + \int_gzero:N \g__tbl_col_int % we are before first col +} +\cs_new_protected:Npn \tbl_init_cell_data_for_row: { + \int_gset:Nn \g__tbl_col_int {1} + \tl_gset:Nn \g__tbl_span_tl {1} +} +\cs_new:Npn \tbl_if_row_was_started:T { + \int_compare:nNnT \g__tbl_col_int > 0 +} +\cs_new:Npn \tbl_if_row_was_started:TF { + \int_compare:nNnTF \g__tbl_col_int > 0 +} +\cs_new_protected:Npn \tbl_gzero_row_count: { + \int_gzero:N \g__tbl_row_int +} +\cs_new_protected:Npn \tbl_gincr_row_count: { + \int_gincr:N \g__tbl_row_int +} +\cs_new_protected:Npn \tbl_gdecr_row_count: { + \int_gdecr:N \g__tbl_row_int +} +\cs_new_protected:Npn \tbl_inbetween_rows: { + \int_gzero:N \g__tbl_col_int +} +\cs_new_protected:Npn \tbl_restore_outer_cell_data: { + \int_gset:Nn \g__tbl_col_int { \l__tbl_saved_col_tl } + \int_gset:Nn \g__tbl_row_int { \l__tbl_saved_row_tl } + \tl_gset_eq:NN \g__tbl_span_tl \l__tbl_saved_span_tl + \tl_gset_eq:NN \g__tbl_table_cols_tl \l__tbl_saved_table_cols_tl + \__tbl_trace:n { ==>~ restored~cell~data:~ + \int_use:N \g__tbl_row_int, + \int_use:N \g__tbl_col_int, + \l__tbl_saved_span_tl \space + ( + \int_compare:nNnTF \g__tbl_table_cols_tl = 0 + { outer~ level } + { max:~ \g__tbl_table_cols_tl } + ) + } +} +\cs_new_protected:Npn \tbl_update_multicolumn_cell_data:n #1 { + \int_compare:nNnTF \g__tbl_col_int = 0 + { + \UseTaggingSocket{tbl/row/begin} + \int_gset:Nn \g__tbl_col_int {1} + } + { + \int_gadd:Nn \g__tbl_col_int { \g__tbl_span_tl } + } + \tl_gset:Nn \g__tbl_span_tl {#1} +} +\cs_new:Npn \tbl_crcr:n #1 { + \int_compare:nNnT \g__tbl_col_int > 0 + { + \tbl_count_missing_cells:n {#1} + \cr + } +} +\ExplSyntaxOff +\let\@kernel@refstepcounter\refstepcounter +\def\hyper@nopatch@longtable{} %%% From File: ltfinal.dtx \tracingstats1 \newcount\@lowpenalty diff --git a/Master/texmf-dist/tex/latex/base/latexrelease.sty b/Master/texmf-dist/tex/latex/base/latexrelease.sty index 0c2d1a5bd96..efd9d37b40a 100644 --- a/Master/texmf-dist/tex/latex/base/latexrelease.sty +++ b/Master/texmf-dist/tex/latex/base/latexrelease.sty @@ -16,6 +16,7 @@ %% lthooks.dtx (with options: `latexrelease') %% ltcmdhooks.dtx (with options: `latexrelease') %% ltsockets.dtx (with options: `latexrelease') +%% lttemplates.dtx (with options: `latexrelease') %% ltalloc.dtx (with options: `latexrelease') %% ltcntrl.dtx (with options: `latexrelease') %% lterror.dtx (with options: `latexrelease') @@ -292,7 +293,7 @@ } %%% From File: ltvers.dtx \edef\latexreleaseversion - {2023-11-01} + {2024-06-01} \newif\if@includeinrelease \@includeinreleasefalse \def\IncludeInRelease#1{% @@ -570,25 +571,6 @@ of this package available from CTAN} "luatex", tex.extraprimitives("core","omega", "aleph", "luatex") ) - local i - local t = { } - for _,i in pairs(tex.extraprimitives("luatex")) do - if not string.match(i,"^U") then - if not string.match(i, "^luatex") then - table.insert(t,i) - end - else - if string.match(i,"^Uchar$") then - table.insert(t,i) - end - end - end - for _,i in pairs(t) do - tex.print( - "\noexpand\\let\noexpand\\" .. i - .. "\noexpand\\undefined" - ) - end } \EndIncludeInRelease \fi @@ -985,7 +967,7 @@ of this package available from CTAN} \tracinggroups\z@ \tracingparagraphs\z@ \tracingmacros\z@ - \tracinglostchars\@ne + \tracinglostchars\tw@ \tracingpages\z@ \tracingstats\z@ }% @@ -1362,7 +1344,10 @@ of this package available from CTAN} \cs_gset_eq:NN \@expl@cs@to@str@@N \cs_to_str:N \cs_gset_eq:NN \@expl@str@if@eq@@nnTF \str_if_eq:nnTF \cs_gset_eq:NN \@expl@cs@prefix@spec@@N \cs_prefix_spec:N -\cs_gset_eq:NN \@expl@cs@argument@spec@@N \cs_argument_spec:N +\cs_if_exist:NTF \cs_parameter_spec:N + { \cs_gset_eq:NN \@expl@cs@parameter@spec@@N \cs_parameter_spec:N } + { \cs_gset_eq:NN \@expl@cs@parameter@spec@@N \cs_argument_spec:N } +\cs_gset_eq:NN \__kernel_cs_parameter_spec:N \@expl@cs@parameter@spec@@N \cs_gset_eq:NN \@expl@cs@replacement@spec@@N \cs_replacement_spec:N \cs_gset_eq:NN \@expl@str@map@function@@NN \str_map_function:NN \cs_gset_eq:NN \@expl@char@generate@@nn \char_generate:nn @@ -1373,7 +1358,7 @@ of this package available from CTAN} \let \@expl@cs@to@str@@N \@undefined \let \@expl@str@if@eq@@nnTF \@undefined \let \@expl@cs@prefix@spec@@N \@undefined -\let \@expl@cs@argument@spec@@N \@undefined +\let \@expl@cs@parameter@spec@@N \@undefined \let \@expl@cs@replacement@spec@@N \@undefined \let \@expl@str@map@function@@NN \@undefined \EndIncludeInRelease @@ -1796,7 +1781,7 @@ of this package available from CTAN} \long\def\@show@newcommand@aux#1#2#3{% \typeout{> \string#1=\@expl@cs@prefix@spec@@N#1macro:}% #3{default \string##1=\expandafter\detokenize\@gobblethree#2.^^J% - \@expl@cs@argument@spec@@N#1->\@expl@cs@replacement@spec@@N#1}} + \@expl@cs@parameter@spec@@N#1->\@expl@cs@replacement@spec@@N#1}} \long\def\@show@tokens#1{% \edef\reserved@a{#1}% \showtokens\expandafter @@ -1844,7 +1829,7 @@ of this package available from CTAN} \@show@environment@end#1} \long\def\@show@environment@begin#1{% \typeout{> \string\begin{\@expl@cs@to@str@@N#1}=environment:}% - \typeout{\@expl@cs@argument@spec@@N#1->% + \typeout{\@expl@cs@parameter@spec@@N#1->% \@expl@cs@replacement@spec@@N#1.^^J}} \long\def\@show@normalenv#1{% \@show@environment@begin#1% @@ -1855,12 +1840,12 @@ of this package available from CTAN} \long\def\@show@environment@end@aux#1#2{% \@show@tokens{\string\end{\@expl@cs@to@str@@N#2}% \ifx\relax#1=undefined% - \else:^^J\@expl@cs@argument@spec@@N#1->% + \else:^^J\@expl@cs@parameter@spec@@N#1->% \@expl@cs@replacement@spec@@N#1% \fi}} \def\@show@nonstop#1{% \typeout{> \string#1=\@expl@cs@prefix@spec@@N#1macro:^^J% - \@expl@cs@argument@spec@@N#1->\@expl@cs@replacement@spec@@N#1.}} + \@expl@cs@parameter@spec@@N#1->\@expl@cs@replacement@spec@@N#1.}} \def\@show@typeout#1{\typeout{> #1.^^J}} \EndIncludeInRelease \IncludeInRelease{0000-00-00}{\ShowEnvironment} @@ -1997,8 +1982,8 @@ of this package available from CTAN} \EndIncludeInRelease %%% From File: ltcmd.dtx -\def\ltcmdversion{v1.2a} -\def\ltcmddate{2023-08-19} +\def\ltcmdversion{v1.2e} +\def\ltcmddate{2024-04-17} \edef\@latexrelease@catcode@null{\the\catcode`\^^@ } \catcode`\^^@=12 \ExplSyntaxOn @@ -2082,8 +2067,6 @@ of this package available from CTAN} \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} @@ -2091,12 +2074,60 @@ of this package available from CTAN} \__cmd_break_point:n {#2} } \cs_new_eq:NN \__cmd_break_point:n \use_none:n -\cs_new_protected:Npn \__cmd_declare_cmd_code:Nnn +\cs_new:Npn \__cmd_all_m_check:n #1 + { \tl_map_function:nN {#1} \__cmd_all_m_check_aux:n } +\cs_new:Npn \__cmd_all_m_check_aux:n #1 { - \bool_if:NTF \l__cmd_grab_expandably_bool - { \__cmd_declare_cmd_code_expandable:Nnn } - { \__cmd_declare_cmd_code_aux:Nnn } + \str_if_eq:nnF {#1} { m } + { + \str_if_eq:nnF {#1} { + } + { X } + } + } +\cs_new_protected:Npn \__cmd_declare_cmd_code:Nnn #1#2 + { + \bool_lazy_any:nTF + { + { \l__cmd_environment_bool } + { + \bool_lazy_and_p:nn + { \l__cmd_some_short_bool } + { \l__cmd_some_long_bool } + } + { ! \tl_if_blank_p:e { \__cmd_all_m_check:n {#2} } } + } + { + \tl_set:Nx \l__cmd_fn_tl + { \exp_not:c { \l__cmd_function_tl \c_space_tl } } + \bool_if:NTF \l__cmd_grab_expandably_bool + { \__cmd_declare_cmd_code_expandable:Nnn } + { \__cmd_declare_cmd_code_aux:Nnn } + } + { \__cmd_declare_cmd_optimized:Nnn } + #1 {#2} } +\cs_new_protected:Npn \__cmd_declare_cmd_optimized:Nnn #1#2#3 + { + \bool_if:NTF \l__cmd_expandable_bool + { \cs_set_nopar:Npe } + { \cs_set_protected_nopar:Npe } + #1 + { + \exp_not:N \__cmd_start_optimized: + \exp_not:c { \l__cmd_function_tl \c_space_tl code } + } + \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 } + \bool_if:NF \l__cmd_some_long_bool { _nopar } + :Npn + } + \l__cmd_current_arg_int + {#3} + } +\cs_new:Npn \__cmd_start_optimized: { } \cs_new_protected:Npn \__cmd_declare_cmd_code_aux:Nnn #1#2#3 { \cs_generate_from_arg_count:cNnn @@ -2698,7 +2729,12 @@ of this package available from CTAN} \bool_if:NT \l__cmd_some_obey_spaces_bool { \msg_error:nnxx { cmd } { invalid-bang } - { \__cmd_environment_or_command: } { \tl_to_str:n {#1} } + { \__cmd_environment_or_command: } + { + \bool_if:NTF \l__cmd_obey_spaces_bool + { \tl_to_str:n {'#1'} } + { an~optional~argument~before~mandatory~ \tl_to_str:n {'#1'} } + } \__cmd_bad_def:wn } \tl_clear:N \l__cmd_last_delimiters_tl @@ -3022,9 +3058,10 @@ of this package available from CTAN} \use:x { \int_set:Nn \tex_escapechar:D { 92 } - \exp_not:N \__cmd_cmd_type_cases:NnnnnF \exp_not:N #2 + \exp_not:N \__cmd_cmd_type_cases:NnnnnnF \exp_not:N #2 { \__cmd_copy_command:nnNN } { \__cmd_copy_expandable:nnNN } + { \__cmd_copy_optimized:nnNN } { \__cmd_copy_environment:nnNN } { \__cmd_copy_environment_end:nnNN } { \__cmd_cant_copy:nwn { non-ltcmd } } @@ -3100,6 +3137,18 @@ of this package available from CTAN} \IncludeInRelease{2020/10/01}{\__cmd_copy_expandable:nnNN}% {Support~\NewCommandCopy~in~ltcmd} \EndIncludeInRelease +\cs_new_protected:Npn \__cmd_copy_optimized:nnNN #1#2#3#4 + { + \cs_set_eq:cc { #1 ~ code } { #2 ~ code } + \token_if_protected_macro:NTF #4 + { \cs_set_protected_nopar:Npe } + { \cs_set_nopar:Npe } + #3 + { + \exp_not:N \__cmd_start_optimized: + \exp_not:c { #1 ~ code } + } + } \IncludeInRelease{2021/11/15}{\__cmd_copy:NN (part 2)}% {Support~\NewCommandCopy~in~ltcmd} \cs_new:Npn \__cmd_copy_expandable:NnNNNNnnn #1 #2 #3 #4 #5 #6 #7 #8 #9 @@ -3228,9 +3277,10 @@ of this package available from CTAN} \use:x { \int_set:Nn \tex_escapechar:D { 92 } - \exp_not:N \__cmd_cmd_type_cases:NnnnnF \exp_not:N #1 + \exp_not:N \__cmd_cmd_type_cases:NnnnnnF \exp_not:N #1 { \__cmd_show_command:N } { \__cmd_show_expandable:N } + { \__cmd_show_optimized:N } { \__cmd_show_environment:N } { \__cmd_show_environment_end:N } { \__cmd_cant_copy:nwn { non-ltcmd } } @@ -3284,6 +3334,43 @@ of this package available from CTAN} -> \cs_replacement_spec:N #4 } } +\cs_new_protected:Npn \__cmd_show_optimized:N #1 + { + \exp_args:Nc \__cmd_show_optimized:NN + { \cs_to_str:N #1 \c_space_tl code } + #1 + } +\cs_new_protected:Npn \__cmd_show_optimized:NN #1#2 + { + \cs_set:Npe \__cmd_show_optimized_aux:N ##1 + { + \c_space_tl \c_space_tl \c_hash_str ##1 : + \bool_lazy_or:nnT + { \token_if_long_macro_p:N #1 } + { \token_if_protected_long_macro_p:N #1 } + { + } m + \iow_newline: + } + \tl_show:e + { + \token_to_str:N #2 = + \bool_lazy_or:nnF + { \token_if_protected_macro_p:N #1 } + { \token_if_protected_long_macro_p:N #1 } + { expandable ~ } document~command: + \iow_newline: + \int_step_function:nN + { + \int_div_truncate:nn + { \tl_count:e { \cs_parameter_spec:N #1 } } + { 2 } + } + \__cmd_show_optimized_aux:N + -> + \cs_replacement_spec:N #1 + } + } +\cs_generate_variant:Nn \tl_count:n { e } \cs_new_protected:Npn \__cmd_show_environment:N #1 { \exp_after:wN \__cmd_show_environment:Nnnw #1 \q__cmd @@ -3850,6 +3937,24 @@ of this package available from CTAN} \__cmd_add_arg:o \c_novalue_tl } } +\IncludeInRelease{2024/06/01}{\__cmd_grab_v_aux_put:N}% + {Endlines~as~\obeyedline} +\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 } + { + \int_compare:nNnTF {`#1} = \tex_endlinechar:D + { \exp_not:N \obeyedline } + { \token_to_str:N #1 } + } + } + } +\EndIncludeInRelease +\IncludeInRelease{2020/10/01}{\__cmd_grab_v_aux_put:N}% + {Endlines~as~\obeyedline} \cs_new_protected:Npn \__cmd_grab_v_aux_put:N #1 { \tl_put_right:Nx \l__cmd_v_arg_tl @@ -3858,6 +3963,7 @@ of this package available from CTAN} { \exp_not:N #1 } { \token_to_str:N #1 } } } +\EndIncludeInRelease \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 @@ -4326,30 +4432,31 @@ of this package available from CTAN} #1 {#2} {#4} \__cmd_tl_mapthread_loop:w #1#3 \q_mark } -\cs_new_protected:Npn \__cmd_cmd_type_cases:NnnnnF #1 #2 #3 #4 #5 #6 +\cs_new_protected:Npn \__cmd_cmd_type_cases:NnnnnnF #1 #2 #3 #4 #5 #6 #7 { \exp_args:Ne \str_case_e:nnF { - \exp_args:Nf \tl_if_empty:nT { \cs_argument_spec:N #1 } + \exp_args:Nf \tl_if_empty:nT { \__kernel_cs_parameter_spec:N #1 } { \exp_not:N \exp_not:n { \exp_not:e { \tl_head:N #1 } } } } { { \exp_not:N \__cmd_start:nNNnnn } {#2} { \exp_not:N \__cmd_start_expandable:nNNNNn } {#3} - { \exp_not:N \__cmd_start_env:nnnnn } {#4} + { \exp_not:N \__cmd_start_optimized: } {#4} + { \exp_not:N \__cmd_start_env:nnnnn } {#5} { \exp_after:wN \exp_not:N \cs:w environment~ \exp_last_unbraced:Ne \use_none:nnn { \cs_to_str:N #1 } ~end~aux \cs_end: - } {#5} + } {#6} } - {#6} + {#7} } \cs_new_protected:Npn \__kernel_cmd_if_xparse:NTF #1 { - \__cmd_cmd_type_cases:NnnnnF #1 - { } { } { } { } { \use_iii:nnn } + \__cmd_cmd_type_cases:NnnnnnF #1 + { } { } { } { } { } { \use_iii:nnn } \use_i:nn } \cs_new_protected:Npn \__cmd_peek_nonspace:NTF @@ -4405,10 +4512,8 @@ of this package available from CTAN} \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 } - ' + command ~ + ' \c_backslash_str \tl_to_str:N \l__cmd_function_tl ' } } \msg_new:nnnn { cmd } { arg-after-body } @@ -4500,7 +4605,7 @@ of this package available from CTAN} { Invalid~argument~prefix~'!'~in~#1. } { The~prefix~'!'~is~only~allowed~for~trailing~optional~arguments.~ - You~tried~to~apply~it~to~'#2'. + You~tried~to~apply~it~to~#2. \c__cmd_ignore_def_tl } \msg_new:nnnn { cmd } { not-definable } @@ -4809,8 +4914,6 @@ of this package available from CTAN} \catcode`\^^@=\@latexrelease@catcode@null\relax %%% From File: lthooks.dtx -\def\lthooksversion{v1.1f} -\def\lthooksdate{2023/10/02} \ExplSyntaxOn \NewModuleRelease{2020/10/01}{lthooks} {The~hook~management~system} @@ -5281,7 +5384,8 @@ of this package available from CTAN} \msg_error:nnnnn { hooks } { set-top-level } { for } { SetDefaultHookLabel } {#1} } - { \exp_args:Nx \__hook_set_default_label:n { \__hook_make_name:n {#1} } } + { \exp_args:Nx + \__hook_set_default_label:n { \__hook_make_name:n {#1} } } } \cs_new_protected:Npn \__hook_set_default_label:n #1 { @@ -5388,7 +5492,8 @@ of this package available from CTAN} \IncludeInRelease{2020/10/01}{\hook_gput_code:nnn} {Providing~hooks} \cs_gset_protected:Npn \hook_gput_code:nnn #1 #2 - { \__hook_normalize_hook_args:Nnn \__hook_gput_code:nnn {#1} {#2} } + { \__hook_normalize_hook_args:Nnn + \__hook_gput_code:nnn {#1} {#2} } \cs_gset_protected:Npn \__hook_gput_code:nnn #1 #2 #3 { \__hook_if_execute_immediately:nTF {#1} @@ -5402,7 +5507,8 @@ of this package available from CTAN} { \__hook_if_disabled:nTF {#1} { \msg_error:nnn { hooks } { hook-disabled } {#1} } - { \__hook_try_declaring_generic_hook:nnn {#1} {#2} {#3} } + { \__hook_try_declaring_generic_hook:nnn + {#1} {#2} {#3} } } } } @@ -5414,7 +5520,8 @@ of this package available from CTAN} \on@line\space <-~ \tl_to_str:n{#3}} } \str_if_eq:nnTF {#2} { top-level } { - \str_if_eq:eeTF { top-level } { \__hook_currname_or_default: } + \str_if_eq:eeTF { top-level } + { \__hook_currname_or_default: } { \__hook_init_structure:n {#1} \__hook_tl_gput_right:cn { __hook_toplevel~#1 } {#3} @@ -5422,7 +5529,8 @@ of this package available from CTAN} { \msg_error:nnn { hooks } { misused-top-level } {#1} } } { - \prop_get:cnNTF { g__hook_#1_code_prop } {#2} \l__hook_return_tl + \prop_get:cnNTF + { g__hook_#1_code_prop } {#2} \l__hook_return_tl { \prop_gput:cno { g__hook_#1_code_prop } {#2} { \l__hook_return_tl #3 } @@ -5458,7 +5566,8 @@ of this package available from CTAN} \__hook_init_structure:n {#1} \__hook_hook_gput_code_do:nnn {#1} {#2} {#3} } -\IncludeInRelease{2023/06/01}{\__hook_try_declaring_generic_hook:nnn} +\IncludeInRelease{2023/06/01} + {\__hook_try_declaring_generic_hook:nnn} {Hooks~with~args} \cs_new_protected:Npn \__hook_try_declaring_generic_hook:nnn #1 { @@ -5475,54 +5584,66 @@ of this package available from CTAN} {#1} } \EndIncludeInRelease -\IncludeInRelease{2021/11/15}{\__hook_try_declaring_generic_hook:nnn} +\IncludeInRelease{2021/11/15} + {\__hook_try_declaring_generic_hook:nnn} {Standardise~generic~hook~names} \cs_gset_protected:Npn \__hook_try_declaring_generic_hook:nnn #1 { - \__hook_try_declaring_generic_hook:wnTF #1 / / / \scan_stop: {#1} + \__hook_try_declaring_generic_hook:wnTF #1 / / / \scan_stop: + {#1} \hook_gput_code:nnn \__hook_gput_undeclared_hook:nnn {#1} } -\cs_gset_protected:Npn \__hook_try_declaring_generic_next_hook:nn #1 +\cs_gset_protected:Npn + \__hook_try_declaring_generic_next_hook:nn #1 { - \__hook_try_declaring_generic_hook:wnTF #1 / / / \scan_stop: {#1} + \__hook_try_declaring_generic_hook:wnTF #1 / / / \scan_stop: + {#1} \hook_gput_next_code:nn \__hook_gput_next_do:nn {#1} } \EndIncludeInRelease -\IncludeInRelease{2020/10/01}{\__hook_try_declaring_generic_hook:nnn} +\IncludeInRelease{2020/10/01} + {\__hook_try_declaring_generic_hook:nnn} {Standardise~generic~hook~names} -\cs_new_protected:Npn \__hook_try_declaring_generic_hook:nnn #1 +\cs_new_protected:Npn + \__hook_try_declaring_generic_hook:nnn #1 { \__hook_try_declaring_generic_hook:nNNnn {#1} \hook_gput_code:nnn \__hook_gput_undeclared_hook:nnn } -\cs_new_protected:Npn \__hook_try_declaring_generic_next_hook:nn #1 +\cs_new_protected:Npn + \__hook_try_declaring_generic_next_hook:nn #1 { \__hook_try_declaring_generic_hook:nNNnn {#1} \hook_gput_next_code:nn \__hook_gput_next_do:nn } \cs_new_protected:Npn \__hook_try_declaring_generic_hook:nNNnn #1 { - \__hook_if_file_hook:wTF #1 / \s__hook_mark + \__hook_if_file_hook:wTF #1 / / \s__hook_mark { - \exp_args:Ne \__hook_try_declaring_generic_hook_split:nNNnn + \exp_args:Ne + \__hook_try_declaring_generic_hook_split:nNNnn { \exp_args:Ne \__hook_file_hook_normalize:n {#1} } } { \__hook_try_declaring_generic_hook_split:nNNnn {#1} } } -\cs_new_protected:Npn \__hook_try_declaring_generic_hook_split:nNNnn #1 #2 #3 +\cs_new_protected:Npn + \__hook_try_declaring_generic_hook_split:nNNnn #1 #2 #3 { - \__hook_try_declaring_generic_hook:wnTF #1 / / / \scan_stop: {#1} + \__hook_try_declaring_generic_hook:wnTF #1 / / / \scan_stop: + {#1} { #2 } { #3 } {#1} } \EndIncludeInRelease -\IncludeInRelease{2023/06/01}{\__hook_try_declaring_generic_hook:wn} +\IncludeInRelease{2023/06/01} + {\__hook_try_declaring_generic_hook:wn} {Hooks~with~args} -\prg_new_protected_conditional:Npnn \__hook_try_declaring_generic_hook:wn +\prg_new_protected_conditional:Npnn + \__hook_try_declaring_generic_hook:wn #1 / #2 / #3 / #4 \scan_stop: #5 { TF } { \__hook_if_generic:nTF {#5} @@ -5576,9 +5697,11 @@ of this package available from CTAN} #1 #2 { #3 / #5 / #4 } } \EndIncludeInRelease -\IncludeInRelease{2021/11/15}{\__hook_try_declaring_generic_hook:wn} +\IncludeInRelease{2021/11/15} + {\__hook_try_declaring_generic_hook:wn} {Standardise~generic~hook~names} -\prg_new_protected_conditional:Npnn \__hook_try_declaring_generic_hook:wn +\prg_new_protected_conditional:Npnn + \__hook_try_declaring_generic_hook:wn #1 / #2 / #3 / #4 \scan_stop: #5 { TF } { \__hook_if_generic:nTF {#5} @@ -5604,9 +5727,11 @@ of this package available from CTAN} } } \EndIncludeInRelease -\IncludeInRelease{2021/06/01}{\__hook_try_declaring_generic_hook:wn} +\IncludeInRelease{2021/06/01} + {\__hook_try_declaring_generic_hook:wn} {Support~cmd~hooks} -\prg_new_protected_conditional:Npnn \__hook_try_declaring_generic_hook:wn +\prg_new_protected_conditional:Npnn + \__hook_try_declaring_generic_hook:wn #1 / #2 / #3 / #4 \scan_stop: #5 { TF } { \tl_if_empty:nTF {#2} @@ -5620,10 +5745,12 @@ of this package available from CTAN} { \__hook_try_put_cmd_hook:n {#5} } \__hook_make_usable:n {#5} } - \prop_if_in:NnTF \c__hook_generics_reversed_ii_prop {#2} + \prop_if_in:NnTF + \c__hook_generics_reversed_ii_prop {#2} { \tl_gset:cn { g__hook_#5_reversed_tl } { - } } { - \prop_if_in:NnT \c__hook_generics_reversed_iii_prop {#3} + \prop_if_in:NnT + \c__hook_generics_reversed_iii_prop {#3} { \tl_gset:cn { g__hook_#5_reversed_tl } { - } } } \prg_return_true: @@ -5632,9 +5759,11 @@ of this package available from CTAN} } } \EndIncludeInRelease -\IncludeInRelease{2020/10/01}{\__hook_try_declaring_generic_hook:wn} +\IncludeInRelease{2020/10/01} + {\__hook_try_declaring_generic_hook:wn} {Support~cmd~hooks} -\prg_new_protected_conditional:Npnn \__hook_try_declaring_generic_hook:wn +\prg_new_protected_conditional:Npnn + \__hook_try_declaring_generic_hook:wn #1 / #2 / #3 / #4 \scan_stop: #5 { TF } { \tl_if_empty:nTF {#2} @@ -5643,10 +5772,12 @@ of this package available from CTAN} \prop_if_in:NnTF \c__hook_generics_prop {#1} { \__hook_if_declared:nF {#5} { \hook_new:n {#5} } - \prop_if_in:NnTF \c__hook_generics_reversed_ii_prop {#2} + \prop_if_in:NnTF + \c__hook_generics_reversed_ii_prop {#2} { \tl_gset:cn { g__hook_#5_reversed_tl } { - } } { - \prop_if_in:NnT \c__hook_generics_reversed_iii_prop {#3} + \prop_if_in:NnT + \c__hook_generics_reversed_iii_prop {#3} { \tl_gset:cn { g__hook_#5_reversed_tl } { - } } } \prg_return_true: @@ -5687,11 +5818,11 @@ of this package available from CTAN} { \__hook_strip_double_slash:n {#1} } \cs_new:Npn \__hook_strip_double_slash:n #1 { \__hook_strip_double_slash:w #1 // \s__hook_mark } -\cs_new:Npn \__hook_strip_double_slash:w #1/#2/#3 // #4 \s__hook_mark +\cs_new:Npn \__hook_strip_double_slash:w #1/#2/#3//#4\s__hook_mark { \tl_if_empty:nTF {#4} { #1/#2/#3 } - { \__hook_strip_double_slash:w #1/#2/#3 / #4 \s__hook_mark } + { \__hook_strip_double_slash:w #1/#2/#3 /#4\s__hook_mark } } \EndIncludeInRelease \IncludeInRelease{2021/11/15}{\c__hook_generics_prop} @@ -5722,9 +5853,12 @@ of this package available from CTAN} \EndIncludeInRelease \IncludeInRelease{2020/10/01}{\c__hook_generics_reversed_ii_prop} {Standardise~generic~hook~names} -\prop_const_from_keyval:Nn \c__hook_generics_reversed_ii_prop {after=,end=} -\prop_const_from_keyval:Nn \c__hook_generics_reversed_iii_prop {after=} -\prop_const_from_keyval:Nn \c__hook_generics_file_prop {before=,after=} +\prop_const_from_keyval:Nn + \c__hook_generics_reversed_ii_prop {after=,end=} +\prop_const_from_keyval:Nn + \c__hook_generics_reversed_iii_prop {after=} +\prop_const_from_keyval:Nn + \c__hook_generics_file_prop {before=,after=} \EndIncludeInRelease \IncludeInRelease{2023/06/01}{\c__hook_parameter_cmd/./before_tl} {Hooks~with~args} @@ -5752,7 +5886,8 @@ of this package available from CTAN} \str_if_eq:nnTF {#2} { top-level } { \__hook_toplevel_gset:nn {#1} { } } { - \prop_gpop:cnNF { g__hook_#1_code_prop } {#2} \l__hook_return_tl + \prop_gpop:cnNF { g__hook_#1_code_prop } + {#2} \l__hook_return_tl { \msg_warning:nnnn { hooks } { cannot-remove } {#1} {#2} } } } @@ -5763,7 +5898,8 @@ of this package available from CTAN} \__hook_if_deprecated_generic:nTF {#1} { \__hook_deprecated_generic_warn:n {#1} - \__hook_do_deprecated_generic:Nn \__hook_gremove_code:nn {#1} {#2} + \__hook_do_deprecated_generic:Nn + \__hook_gremove_code:nn {#1} {#2} } { \msg_warning:nnnn { hooks } { cannot-remove } {#1} {#2} } } @@ -5785,8 +5921,10 @@ of this package available from CTAN} \str_if_eq:nnTF {#2} { top-level } { \__hook_tl_gclear:c { __hook_toplevel~#1 } } { - \prop_gpop:cnNF { g__hook_#1_code_prop } {#2} \l__hook_return_tl - { \msg_warning:nnnn { hooks } { cannot-remove } {#1} {#2} } + \prop_gpop:cnNF { g__hook_#1_code_prop } + {#2} \l__hook_return_tl + { \msg_warning:nnnn { hooks } { cannot-remove } + {#1} {#2} } } } \__hook_if_usable:nT {#1} @@ -5796,9 +5934,11 @@ of this package available from CTAN} \__hook_if_deprecated_generic:nTF {#1} { \__hook_deprecated_generic_warn:n {#1} - \__hook_do_deprecated_generic:Nn \__hook_gremove_code:nn {#1} {#2} + \__hook_do_deprecated_generic:Nn + \__hook_gremove_code:nn {#1} {#2} } - { \msg_warning:nnnn { hooks } { cannot-remove } {#1} {#2} } + { \msg_warning:nnnn { hooks } { cannot-remove } + {#1} {#2} } } } \EndIncludeInRelease @@ -5817,7 +5957,8 @@ of this package available from CTAN} {#1} {#2} } \cs_new_protected:Npn \__hook_cs_gput_right_fast:nnn #1 #2 #3 - { \cs_gset:cpx { __hook#1~#2 } { \exp_not:v { __hook#1~#2 } \exp_not:n {#3} } } + { \cs_gset:cpx { __hook#1~#2 } + { \exp_not:v { __hook#1~#2 } \exp_not:n {#3} } } \cs_new_protected:Npn \__hook_cs_gput_right_slow:nnn #1 #2 #3 { \cs_if_exist:cF { __hook#1~#2 } @@ -5928,7 +6069,8 @@ of this package available from CTAN} } \exp_last_unbraced:NNf \cs_set:Npn \__hook_tmp:w { \__hook_parameter:n {#1} } { } - \tl_set:Ne \l__hook_tmpa_tl { \__hook_braced_cs_parameter:n { __hook_tmp:w } } + \tl_set:Ne \l__hook_tmpa_tl + { \__hook_braced_cs_parameter:n { __hook_tmp:w } } \cs_gset_protected:Npx \__hook_normalise_fn:nn ##1 ##2 { \group_begin: @@ -6114,8 +6256,8 @@ of this package available from CTAN} \__hook_if_deprecated_generic:nT {#1} { \__hook_deprecated_generic_warn:n {#1} - \__hook_do_deprecated_generic:Nn \__hook_gset_rule:nnnn {#1} - {#2} {#3} {#4} + \__hook_do_deprecated_generic:Nn \__hook_gset_rule:nnnn + {#1} {#2} {#3} {#4} \exp_after:wN \use_none:nnnnnnnnn \use_none:n } \__hook_init_structure:n {#1} @@ -6133,27 +6275,34 @@ of this package available from CTAN} \EndIncludeInRelease \cs_new_protected:Npn \__hook_rule_before_gset:nnn #1#2#3 { - \__hook_tl_gset:cx { g__hook_#1_rule_ \__hook_label_pair:nn {#2} {#3} _tl } + \__hook_tl_gset:cx + { g__hook_#1_rule_ \__hook_label_pair:nn {#2} {#3} _tl } { \__hook_label_ordered:nnTF {#2} {#3} { < } { > } } } \cs_new_eq:cN { __hook_rule_<_gset:nnn } \__hook_rule_before_gset:nnn \cs_new_protected:Npn \__hook_rule_after_gset:nnn #1#2#3 { - \__hook_tl_gset:cx { g__hook_#1_rule_ \__hook_label_pair:nn {#3} {#2} _tl } + \__hook_tl_gset:cx + { g__hook_#1_rule_ \__hook_label_pair:nn {#3} {#2} _tl } { \__hook_label_ordered:nnTF {#3} {#2} { < } { > } } } \cs_new_eq:cN { __hook_rule_>_gset:nnn } \__hook_rule_after_gset:nnn \cs_new_protected:Npn \__hook_rule_voids_gset:nnn #1#2#3 { - \__hook_tl_gset:cx { g__hook_#1_rule_ \__hook_label_pair:nn {#2} {#3} _tl } + \__hook_tl_gset:cx + { g__hook_#1_rule_ \__hook_label_pair:nn {#2} {#3} _tl } { \__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 } } @@ -6211,7 +6360,8 @@ of this package available from CTAN} {Hooks~with~args} \cs_gset_protected:Npn \__hook_initialize_all: { - \cs_gset_eq:NN \__hook_update_hook_code:n \__hook_initialize_hook_code:n + \cs_gset_eq:NN \__hook_update_hook_code:n + \__hook_initialize_hook_code:n \__hook_debug:n { \prop_gclear:N \g__hook_used_prop } \seq_map_inline:Nn \g__hook_all_seq { \__hook_update_hook_code:n {##1} } @@ -6221,7 +6371,8 @@ of this package available from CTAN} \prop_map_inline:Nn \g__hook_used_prop { \iow_term:x - { ^^J ~ ##1 ~ -> ~ \cs_replacement_spec:c { __hook~##1 } ~ } + { ^^J ~ ##1 ~ -> ~ + \cs_replacement_spec:c { __hook~##1 } ~ } } } \cs_gset_eq:NN \hook_use:n \__hook_use_initialized:n @@ -6243,8 +6394,10 @@ of this package available from CTAN} { \__hook_code_gset:ne {#1} { - \exp_not:c { __hook_toplevel~#1 } \__hook_braced_parameter:n {#1} - \exp_not:c { __hook_next~#1 } \__hook_braced_parameter:n {#1} + \exp_not:c { __hook_toplevel~#1 } + \__hook_braced_parameter:n {#1} + \exp_not:c { __hook_next~#1 } + \__hook_braced_parameter:n {#1} } } { @@ -6267,7 +6420,8 @@ of this package available from CTAN} \cs_gset_protected:Npn \__hook_initialize_hook_code:n #1 { \__hook_debug:n - { \iow_term:x { ^^J Update~code~for~hook~'#1' \on@line :^^J } } + { \iow_term:x { ^^J Update~code~for~hook~'#1' + \on@line :^^J } } \__hook_include_legacy_code_chunk:n {#1} \__hook_if_usable:nT {#1} { @@ -6281,15 +6435,21 @@ of this package available from CTAN} } { \__hook_if_reversed:nTF {#1} - { \cs_set_eq:NN \__hook_tl_gput:Nn \__hook_tl_gput_left:Nn - \cs_set_eq:NN \__hook_clist_gput:NV \clist_gput_left:NV } - { \cs_set_eq:NN \__hook_tl_gput:Nn \__hook_tl_gput_right:Nn - \cs_set_eq:NN \__hook_clist_gput:NV \clist_gput_right:NV } - \prop_set_eq:Nc \l__hook_work_prop { g__hook_#1_code_prop } + { \cs_set_eq:NN \__hook_tl_gput:Nn + \__hook_tl_gput_left:Nn + \cs_set_eq:NN \__hook_clist_gput:NV + \clist_gput_left:NV } + { \cs_set_eq:NN \__hook_tl_gput:Nn + \__hook_tl_gput_right:Nn + \cs_set_eq:NN \__hook_clist_gput:NV + \clist_gput_right:NV } + \prop_set_eq:Nc \l__hook_work_prop + { g__hook_#1_code_prop } \__hook_initialize_single:ccn { __hook~#1 } { g__hook_#1_labels_clist } {#1} \__hook_debug:n - { \exp_args:NNx \prop_gput:Nnn \g__hook_used_prop {#1} { } } + { \exp_args:NNx \prop_gput:Nnn \g__hook_used_prop + {#1} { } } } } } @@ -6356,7 +6516,8 @@ of this package available from CTAN} \int_compare:nNnT { \cs:w \__hook_tl_csname:n {##1} \cs_end: } = 0 { - \tl_set:cn { \__hook_tl_csname:n { \l__hook_rear_tl } } {##1} + \tl_set:cn + { \__hook_tl_csname:n { \l__hook_rear_tl } } {##1} \tl_set:Nn \l__hook_rear_tl {##1} } } @@ -6407,42 +6568,50 @@ of this package available from CTAN} {#3} } } - \__hook_debug:n { \__hook_debug_label_data:N \l__hook_work_prop } + \__hook_debug:n + { \__hook_debug_label_data:N \l__hook_work_prop } \tl_set:Nn \l__hook_rear_tl { 0 } \tl_set:cn { \__hook_tl_csname:n { 0 } } { 0 } \seq_map_inline:Nn \l__hook_labels_seq { - \int_compare:nNnT { \cs:w \__hook_tl_csname:n {##1} \cs_end: } = 0 - { - \tl_set:cn { \__hook_tl_csname:n { \l__hook_rear_tl } }{##1} - \tl_set:Nn \l__hook_rear_tl {##1} - } + \int_compare:nNnT + { \cs:w \__hook_tl_csname:n {##1} \cs_end: } = 0 + { + \tl_set:cn { \__hook_tl_csname:n + { \l__hook_rear_tl } } {##1} + \tl_set:Nn \l__hook_rear_tl {##1} + } } \tl_set_eq:Nc \l__hook_front_tl { \__hook_tl_csname:n { 0 } } \__hook_tl_gclear:N #1 \clist_gclear:N #2 - \bool_while_do:nn { ! \str_if_eq_p:Vn \l__hook_front_tl { 0 } } + \bool_while_do:nn + { ! \str_if_eq_p:Vn \l__hook_front_tl { 0 } } { \int_decr:N \l__hook_labels_int - \prop_get:NVN \l__hook_work_prop \l__hook_front_tl \l__hook_return_tl + \prop_get:NVN \l__hook_work_prop + \l__hook_front_tl \l__hook_return_tl \exp_args:NNV \__hook_tl_gput:Nn #1 \l__hook_return_tl \__hook_clist_gput:NV #2 \l__hook_front_tl - \__hook_debug:n{ \iow_term:x{Handled~ code~ for~ \l__hook_front_tl} } - \seq_map_inline:cn { \__hook_seq_csname:n { \l__hook_front_tl } } + \__hook_debug:n{ \iow_term:x + {Handled~ code~ for~ \l__hook_front_tl} } + \seq_map_inline:cn + { \__hook_seq_csname:n { \l__hook_front_tl } } { \tl_set:cx { \__hook_tl_csname:n {##1} } - { \int_eval:n - { \cs:w \__hook_tl_csname:n {##1} \cs_end: - 1 } - } + { \int_eval:n + { \cs:w \__hook_tl_csname:n {##1} \cs_end: - 1 } + } \int_compare:nNnT - { \cs:w \__hook_tl_csname:n {##1} \cs_end: } = 0 - { - \tl_set:cn { \__hook_tl_csname:n { \l__hook_rear_tl } } {##1} - \tl_set:Nn \l__hook_rear_tl {##1} - } + { \cs:w \__hook_tl_csname:n {##1} \cs_end: } = 0 + { + \tl_set:cn { \__hook_tl_csname:n + { \l__hook_rear_tl } } {##1} + \tl_set:Nn \l__hook_rear_tl {##1} + } } \tl_set_eq:Nc \l__hook_front_tl - { \__hook_tl_csname:n { \l__hook_front_tl } } + { \__hook_tl_csname:n { \l__hook_front_tl } } } \int_compare:nNnF \l__hook_labels_int = 0 { @@ -6451,7 +6620,8 @@ of this package available from CTAN} \__hook_debug_label_data:N \l__hook_work_prop \iow_term:x{====================} } - \exp_args:NNo \__hook_tl_gput:Nn #1 { \cs:w __hook_toplevel~#3 \cs_end: } + \exp_args:NNo \__hook_tl_gput:Nn #1 + { \cs:w __hook_toplevel~#3 \cs_end: } \__hook_tl_gput_right:No #1 { \cs:w __hook_next~#3 \cs_end: } } \cs_generate_variant:Nn \__hook_tl_gput_right:Nn { No } @@ -6588,7 +6758,7 @@ of this package available from CTAN} hook~'#1' \__hook_if_disabled:nF {#1} { - \exp_args:Nf \__hook_print_args:nn {#1} + \exp_args:Nne \__hook_print_args:nn {#1} { \int_eval:n { \str_count:e { \__hook_parameter:n {#1} } / 3 } @@ -6697,7 +6867,8 @@ of this package available from CTAN} } \__hook_preamble_hook:n {#1} \__hook_log_cmd:x - { ^^J ->~The~ \__hook_if_generic:nT {#1} { generic~ } hook~'#1': } + { ^^J ->~The~ \__hook_if_generic:nT + {#1} { generic~ } hook~'#1': } \__hook_if_usable:nF {#1} { \__hook_log_line:x { The~hook~is~not~declared. } } \__hook_if_disabled:nT {#1} @@ -6710,26 +6881,30 @@ of this package available from CTAN} { \__hook_log_line_indent:x { --- } } { \prop_map_inline:cn { g__hook_#1_code_prop } - { \__hook_log_line_indent:x { ##1~->~\tl_to_str:n {##2} } } + { \__hook_log_line_indent:x + { ##1~->~\tl_to_str:n {##2} } } } \__hook_log_line:x { Document-level~(top-level)~code \__hook_if_usable:nT {#1} - { ~(executed~\__hook_if_reversed:nTF {#1} {first} {last} ) } : + { ~(executed~ + \__hook_if_reversed:nTF {#1} {first} {last} ) } : } \__hook_log_line_indent:x { \tl_if_empty:cTF { __hook_toplevel~#1 } { --- } - { -> ~ \exp_args:Nv \tl_to_str:n { __hook_toplevel~#1 } } + { -> ~ \exp_args:Nv \tl_to_str:n + { __hook_toplevel~#1 } } } \__hook_log_line:x { Extra~code~for~next~invocation: } \__hook_log_line_indent:x { \tl_if_empty:cTF { __hook_next~#1 } { --- } - { ->~ \exp_args:Nv \__hook_log_next_code:n { __hook_next~#1 } } + { ->~ \exp_args:Nv \__hook_log_next_code:n + { __hook_next~#1 } } } \__hook_log_line:x { Rules: } \bool_set_true:N \l__hook_tmpa_bool @@ -6753,7 +6928,8 @@ of this package available from CTAN} { Execution~order \bool_if:NTF \l__hook_tmpa_bool - { \__hook_if_reversed:nT {#1} { ~(after~reversal) } } + { \__hook_if_reversed:nT + {#1}{ ~(after~reversal) } } { ~(after~ \__hook_if_reversed:nT {#1} { reversal~and~ } applying~rules) @@ -6764,16 +6940,19 @@ of this package available from CTAN} \@spaces \clist_if_empty:cTF { g__hook_#1_labels_clist } { --- } - { \clist_use:cn { g__hook_#1_labels_clist } { ,~ } } + { \clist_use:cn + { g__hook_#1_labels_clist } { ,~ } } } } { \__hook_log_line:x { Execution~order: } #2 { - \@spaces Not~set~because~the~hook~ \__hook_if_usable:nTF {#1} + \@spaces Not~set~because~the~hook~ + \__hook_if_usable:nTF {#1} { code~pool~is~empty } - { is~\__hook_if_disabled:nTF {#1} {disabled} {undeclared} } + { is~\__hook_if_disabled:nTF + {#1} {disabled} {undeclared} } } } } @@ -6863,7 +7042,8 @@ of this package available from CTAN} \IncludeInRelease{2020/10/01}{\hook_gput_next_code:nn} {Hooks~with~args} \cs_gset_protected:Npn \hook_gput_next_code:nn #1 - { \__hook_normalize_hook_args:Nn \__hook_gput_next_code:nn {#1} } + { \__hook_normalize_hook_args:Nn + \__hook_gput_next_code:nn {#1} } \cs_gset_protected:Npn \hook_gput_next_code_with_args:nn #1 #2 { } \EndIncludeInRelease \cs_new_protected:Npn \__hook_gput_next_code:nn #1 #2 @@ -6979,7 +7159,8 @@ of this package available from CTAN} \fi: \cs:w __hook~#1 \__hook_use_end: } -\cs_new:Npn \__hook_use_undefined:w #1 #2 __hook~#3 \__hook_use_end: +\cs_new:Npn \__hook_use_undefined:w + #1 #2 __hook~#3 \__hook_use_end: { #1 % fi \__hook_use:wn #3 / \s__hook_mark {#3} @@ -7039,12 +7220,13 @@ of this package available from CTAN} } \cs_new_protected:Npn \__hook_try_file_hook:n #1 { - \__hook_if_file_hook:wTF #1 / \s__hook_mark + \__hook_if_file_hook:wTF #1 / / \s__hook_mark { \exp_args:Ne \__hook_if_usable_use:n { \exp_args:Ne \__hook_file_hook_normalize:n {#1} } } - { \__hook_if_usable_use:n {#1} } % file/ generic hook (e.g. file/before) + { \__hook_if_usable_use:n {#1} } + % file/ generic hook (e.g. file/before) } \cs_new_protected:Npn \__hook_if_usable_use:n #1 { @@ -7060,12 +7242,14 @@ of this package available from CTAN} \cs_new_protected:Npn \hook_use_once:n #1 { \__hook_if_execute_immediately:nF {#1} - { \__hook_normalize_hook_args:Nn \__hook_use_once:nn { \use:n {#1} } { 0 } } + { \__hook_normalize_hook_args:Nn \__hook_use_once:nn + { \use:n {#1} } { 0 } } } \cs_new_protected:Npn \hook_use_once:nnw #1 #2 { \__hook_if_execute_immediately:nF {#1} - { \__hook_normalize_hook_args:Nn \__hook_use_once:nn { \use:n {#1} } {#2} } + { \__hook_normalize_hook_args:Nn \__hook_use_once:nn + { \use:n {#1} } {#2} } } \EndIncludeInRelease \IncludeInRelease{2020/10/01}{\hook_use_once:nnw} @@ -7073,7 +7257,8 @@ of this package available from CTAN} \cs_gset_protected:Npn \hook_use_once:n #1 { \__hook_if_execute_immediately:nF {#1} - { \__hook_normalize_hook_args:Nn \__hook_use_once:n { \use:n {#1} } } + { \__hook_normalize_hook_args:Nn \__hook_use_once:n + { \use:n {#1} } } } \cs_gset:Npn \hook_use_once:nnw #1 #2 { \use:c { use_none: \prg_replicate:nn {#2} { n } } } @@ -7085,7 +7270,8 @@ of this package available from CTAN} \__hook_preamble_hook:n {#1} \__hook_use_once_set:n {#1} \__hook_replacing_args_false: - \__hook_cs_gput_right:nnn { _next } {#1} { \__hook_use_once_clear:n {#1} } + \__hook_cs_gput_right:nnn { _next } {#1} + { \__hook_use_once_clear:n {#1} } \__hook_replacing_args_reset: \__hook_if_usable:nTF {#1} { \__hook_use_initialized:n {#1} } @@ -7333,7 +7519,8 @@ of this package available from CTAN} { Cannot~add~code~to~disabled~hook~'#1'. } { The~hook~'#1'~you~tried~to~add~code~to~was~previously~disabled~ - with~\iow_char:N\\hook_disable_generic:n~or~\iow_char:N\\DisableGenericHook,~so~ + with~\iow_char:N\\hook_disable_generic:n~or~ + \iow_char:N\\DisableGenericHook,~so~ it~cannot~have~code~added~to~it. } \msg_new:nnn { hooks } { empty-label } @@ -7442,7 +7629,7 @@ of this package available from CTAN} {Hooks~with~args} \cs_new_protected:Npn \NewHookWithArguments #1 #2 { } \cs_new_protected:Npn \NewReversedHookWithArguments #1 #2 { } -\cs_new_protected:Npn \NewMirroredHookPairWithArguments #1 #2 #3 { } +\cs_new_protected:Npn \NewMirroredHookPairWithArguments #1 #2 #3{} \EndIncludeInRelease \IncludeInRelease{2021/06/01}{\ActivateGenericHook} {Providing~hooks} @@ -7644,7 +7831,8 @@ of this package available from CTAN} \exp_args:No \exp_not:o { \cs:w __hook#1~#2 \exp_last_unbraced:Ne \cs_end: - { \__hook_braced_cs_parameter:n { __hook#1~#2 } } + { \__hook_braced_cs_parameter:n + { __hook#1~#2 } } } } } @@ -7659,12 +7847,10 @@ of this package available from CTAN} } \ExplSyntaxOff %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -%% File: ltcmdhooks.dtx +%% From File: ltcmdhooks.dtx %% Copyright (C) 2020-2024 %% Frank Mittelbach, Phelype Oleinik, The LaTeX Project -%%% From File: ltcmdhooks.dtx -\def\ltcmdhooksversion{v1.0i} -\def\ltcmdhooksdate{2023/06/16} +%%% From File: lthooks.dtx \ExplSyntaxOn \NewModuleRelease{2021/06/01}{ltcmdhooks} {The~hook~management~system~for~commands} @@ -7823,7 +8009,7 @@ of this package available from CTAN} \__hook_patch_debug:x { ++~command~can~be~patched~without~rescanning } \int_set:Nn \l__hook_patch_num_args_int { - \exp_args:Nf \str_count:n { \cs_argument_spec:N #2 } / 2 + \exp_args:Nf \str_count:n { \__kernel_cs_parameter_spec:N #2 } / 2 \bool_if:NT #1 { -1 } } \int_compare:nNnTF { \l__hook_patch_num_args_int } > { \c_zero_int } @@ -7898,7 +8084,7 @@ of this package available from CTAN} \__hook_patch_debug:x { ++~command~can~be~patched~without~rescanning } \int_set:Nn \l__hook_patch_num_args_int { - \exp_args:Nf \str_count:n { \cs_argument_spec:N #2 } / 2 + \exp_args:Nf \str_count:n { \__kernel_cs_parameter_spec:N #2 } / 2 \bool_if:NT #1 { -1 } } \int_compare:nNnTF { \l__hook_patch_num_args_int } > { \c_zero_int } @@ -8031,7 +8217,7 @@ of this package available from CTAN} { ~ \__hook_double_hashes:w } \cs_new_protected:Npn \__hook_retokenize_patch:Nnn #1 #2 #3 { - \str_if_eq:eeTF { \cs_argument_spec:N #1 } { } + \str_if_eq:eeTF { \__kernel_cs_parameter_spec:N #1 } { } { \__hook_patch_expand_redefine:NNnn \c_false_bool #1 {#2} {#3} } { \__hook_patch_debug:x { ..~command~can~only~be~patched~by~rescanning } @@ -8274,8 +8460,6 @@ of this package available from CTAN} \ExplSyntaxOff %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% %%% From File: ltsockets.dtx -\def\ltsocketsversion{0.9a} -\def\ltsocketsdate{2023-08-21} \ExplSyntaxOn \NewModuleRelease{2023/11/01}{ltsockets} {The~socket~management~system} @@ -8465,6 +8649,1192 @@ of this package available from CTAN} \EndModuleRelease \ExplSyntaxOff %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +%%% From File: lttemplates.dtx +\ExplSyntaxOn +\NewModuleRelease{2024/06/01}{lttemplates} + {Prototype~document~commands}% +\tl_const:Nn \c__template_code_root_tl { template~code~>~ } +\tl_const:Nn \c__template_defaults_root_tl { template~defaults~>~ } +\tl_const:Nn \c__template_instances_root_tl { template~instance~>~ } +\tl_const:Nn \c__template_keytypes_root_tl { template~key~types~>~ } +\tl_const:Nn \c__template_key_order_root_tl { template~key~order~>~ } +\tl_const:Nn \c__template_values_root_tl { template~values~>~ } +\tl_const:Nn \c__template_vars_root_tl { template~vars~>~ } +\seq_const_from_clist:Nn \c__template_keytypes_arg_seq + { choice , function , instance } +\prop_new:N \g__template_type_prop +\tl_new:N \l__template_assignments_tl +\tl_new:N \l__template_default_tl +\bool_new:N \l__template_error_bool +\bool_new:N \l__template_global_bool +\tl_new:N \l__template_key_name_tl +\tl_new:N \l__template_keytype_tl +\tl_new:N \l__template_keytype_arg_tl +\tl_new:N \l__template_value_tl +\tl_new:N \l__template_var_tl +\prop_new:N \l__template_keytypes_prop +\seq_new:N \l__template_key_order_seq +\prop_new:N \l__template_values_prop +\prop_new:N \l__template_vars_prop +\clist_new:N \l__template_tmp_clist +\dim_new:N \l__template_tmp_dim +\int_new:N \l__template_tmp_int +\muskip_new:N \l__template_tmp_muskip +\skip_new:N \l__template_tmp_skip +\tl_new:N \l__template_tmp_tl +\scan_new:N \s__template_mark +\scan_new:N \s__template_stop +\quark_new:N \q__template_nil +\__kernel_quark_new_conditional:Nn \__template_quark_if_nil:N { F } +\cs_new_protected:Npn \__template_execute_if_arg_agree:nnT #1#2#3 + { + \prop_get:NnN \g__template_type_prop {#1} \l__template_tmp_tl + \int_compare:nNnTF {#2} = \l__template_tmp_tl + {#3} + { + \msg_error:nneee { template } { argument-number-mismatch } + {#1} { \l__template_tmp_tl } {#2} + } + } +\cs_new_protected:Npn \__template_execute_if_code_exist:nnT #1#2#3 + { + \cs_if_exist:cTF { \c__template_code_root_tl #1 / #2 } + {#3} + { \msg_error:nnnn { template } { no-template-code } {#1} {#2} } + } +\cs_new_protected:Npn \__template_execute_if_keytype_exist:nT #1#2 + { + \cs_if_exist:cTF { __template_store_value_ #1 :n } + {#2} + { \msg_error:nnn { template } { unknown-keytype } {#1} } + } +\cs_generate_variant:Nn \__template_execute_if_keytype_exist:nT { V } +\cs_new_protected:Npn \__template_execute_if_type_exist:nT #1#2 + { + \prop_if_in:NnTF \g__template_type_prop {#1} + {#2} + { \msg_error:nnn { template } { unknown-type } {#1} } + } +\cs_new_protected:Npn \__template_if_keys_exist:nnT #1#2#3 + { + \cs_if_exist:cTF { \c__template_keytypes_root_tl #1 / #2 } + {#3} + { \msg_error:nnnn { template } { unknown-template } {#1} {#2} } + } +\prg_new_conditional:Npnn \__template_if_key_value:n #1 { T , F , TF } + { + \str_if_eq:noTF { \KeyValue } { \tl_head:w #1 \q_nil \q_stop } + \prg_return_true: + \prg_return_false: + } +\prg_generate_conditional_variant:Nnn \__template_if_key_value:n { V } { T , F , TF } +\prg_new_conditional:Npnn \__template_if_instance_exist:nn #1#2 { T, F, TF } + { + \cs_if_exist:cTF { \c__template_instances_root_tl #1 / #2 } + \prg_return_true: + \prg_return_false: + } +\prg_new_conditional:Npnn \__template_if_use_template:n #1 { TF } + { + \str_if_eq:noTF { \UseTemplate } { \tl_head:w #1 \q_nil \q_stop } + \prg_return_true: + \prg_return_false: +} +\cs_new_protected:Npn \__template_store_defaults:nn #1#2 + { + \debug_suspend: + \prop_gclear_new:c { \c__template_defaults_root_tl #1 / #2 } + \prop_gset_eq:cN { \c__template_defaults_root_tl #1 / #2 } + \l__template_values_prop + \debug_resume: + } +\cs_new_protected:Npn \__template_store_keytypes:nn #1#2 + { + \debug_suspend: + \prop_if_exist:cTF { \c__template_keytypes_root_tl #1 / #2 } + { + \msg_info:nnnn { template } { declare-template-interface } {#1} {#2} + \prop_gclear:c { \c__template_keytypes_root_tl #1 / #2 } + } + { \prop_new:c { \c__template_keytypes_root_tl #1 / #2 } } + \prop_gset_eq:cN { \c__template_keytypes_root_tl #1 / #2 } + \l__template_keytypes_prop + \seq_gclear_new:c { \c__template_key_order_root_tl #1 / #2 } + \seq_gset_eq:cN { \c__template_key_order_root_tl #1 / #2 } + \l__template_key_order_seq + \debug_resume: + } +\cs_new_protected:Npn \__template_store_values:nn #1#2 + { + \debug_suspend: + \prop_clear_new:c { \c__template_values_root_tl #1 / #2 } + \prop_set_eq:cN { \c__template_values_root_tl #1 / #2 } + \l__template_values_prop + \debug_resume: + } +\cs_new_protected:Npn \__template_store_vars:nn #1#2 + { + \debug_suspend: + \prop_gclear_new:c { \c__template_vars_root_tl #1 / #2 } + \prop_gset_eq:cN { \c__template_vars_root_tl #1 / #2 } + \l__template_vars_prop + \debug_resume: + } +\cs_new_protected:Npn \__template_recover_defaults:nn #1#2 + { + \prop_if_exist:cTF + { \c__template_defaults_root_tl #1 / #2 } + { + \prop_set_eq:Nc \l__template_values_prop + { \c__template_defaults_root_tl #1 / #2 } + } + { \prop_clear:N \l__template_values_prop } + } +\cs_new_protected:Npn \__template_recover_keytypes:nn #1#2 + { + \prop_if_exist:cTF + { \c__template_keytypes_root_tl #1 / #2 } + { + \prop_set_eq:Nc \l__template_keytypes_prop + { \c__template_keytypes_root_tl #1 / #2 } + } + { \prop_clear:N \l__template_keytypes_prop } + \seq_if_exist:cTF { \c__template_key_order_root_tl #1 / #2 } + { + \seq_set_eq:Nc \l__template_key_order_seq + { \c__template_key_order_root_tl #1 / #2 } + } + { \seq_clear:N \l__template_key_order_seq } + } +\cs_new_protected:Npn \__template_recover_values:nn #1#2 + { + \prop_if_exist:cTF + { \c__template_values_root_tl #1 / #2 } + { + \prop_set_eq:Nc \l__template_values_prop + { \c__template_values_root_tl #1 / #2 } + } + { \prop_clear:N \l__template_values_prop } + } +\cs_new_protected:Npn \__template_recover_vars:nn #1#2 + { + \prop_if_exist:cTF + { \c__template_vars_root_tl #1 / #2 } + { + \prop_set_eq:Nc \l__template_vars_prop + { \c__template_vars_root_tl #1 / #2 } + } + { \prop_clear:N \l__template_vars_prop } + } +\cs_new_protected:Npn \__template_define_type:nn #1#2 + { + \prop_if_in:NnTF \g__template_type_prop {#1} + { \msg_error:nnn { template } { type-already-defined } {#1} } + { \__template_declare_type:nn {#1} {#2} } + } +\cs_new_protected:Npn \__template_declare_type:nn #1#2 + { + \int_set:Nn \l__template_tmp_int {#2} + \int_compare:nTF { 0 <= \l__template_tmp_int <= 9 } + { + \msg_info:nnnV { template } { declare-type } + {#1} \l__template_tmp_int + \prop_gput:NnV \g__template_type_prop {#1} + \l__template_tmp_int + } + { + \msg_error:nnnV { template } { bad-number-of-arguments } + {#1} \l__template_tmp_int + } + } +\cs_new_protected:Npn \__template_declare_template_keys:nnnn #1#2#3#4 + { + \__template_execute_if_type_exist:nT {#1} + { + \__template_execute_if_arg_agree:nnT {#1} {#3} + { + \prop_clear:N \l__template_values_prop + \prop_clear:N \l__template_keytypes_prop + \seq_clear:N \l__template_key_order_seq + \keyval_parse:NNn + \__template_parse_keys_elt:n \__template_parse_keys_elt:nn {#4} + \__template_store_defaults:nn {#1} {#2} + \__template_store_keytypes:nn {#1} {#2} + } + } + } +\cs_new_protected:Npn \__template_parse_keys_elt:n #1 + { + \__template_split_keytype:n {#1} + \bool_if:NF \l__template_error_bool + { + \__template_execute_if_keytype_exist:VT \l__template_keytype_tl + { + \seq_map_function:NN \c__template_keytypes_arg_seq + \__template_parse_keys_elt_aux:n + \bool_if:NF \l__template_error_bool + { + \seq_if_in:NoTF \l__template_key_order_seq + \l__template_key_name_tl + { + \msg_error:nnV { template } { duplicate-key-interface } + \l__template_key_name_tl + } + { \__template_parse_keys_elt_aux: } + } + } + } + } +\cs_new_protected:Npn \__template_parse_keys_elt_aux:n #1 + { + \str_if_eq:VnT \l__template_keytype_tl {#1} + { + \tl_if_empty:NT \l__template_keytype_arg_tl + { + \msg_error:nnn { template } { keytype-requires-argument } {#1} + \bool_set_true:N \l__template_error_bool + \seq_map_break: + } + } + } +\cs_new_protected:Npn \__template_parse_keys_elt_aux: + { + \tl_set:Ne \l__template_tmp_tl + { + \l__template_keytype_tl + \tl_if_empty:NF \l__template_keytype_arg_tl + { { \l__template_keytype_arg_tl } } + } + \prop_put:NVV \l__template_keytypes_prop \l__template_key_name_tl + \l__template_tmp_tl + \seq_put_right:NV \l__template_key_order_seq \l__template_key_name_tl + \str_if_eq:VnT \l__template_keytype_tl { choice } + { + \clist_if_in:NnT \l__template_keytype_arg_tl { unknown } + { \msg_error:nn { template } { choice-unknown-reserved } } + } + } +\cs_new_protected:Npn \__template_parse_keys_elt:nn #1#2 + { + \__template_parse_keys_elt:n {#1} + \use:c { __template_store_value_ \l__template_keytype_tl :n } {#2} + } +\cs_new_protected:Npe \__template_split_keytype:n #1 + { + \exp_not:N \bool_set_false:N \exp_not:N \l__template_error_bool + \tl_set:Nn \exp_not:N \l__template_tmp_tl {#1} + \tl_replace_all:Nnn \exp_not:N \l__template_tmp_tl { : } { \token_to_str:N : } + \tl_if_in:VnTF \exp_not:N \l__template_tmp_tl { \token_to_str:N : } + { + \exp_not:n + { + \tl_clear:N \l__template_key_name_tl + \exp_after:wN \__template_split_keytype_aux:w + \l__template_tmp_tl \s__template_stop + } + } + { + \exp_not:N \bool_set_true:N \exp_not:N \l__template_error_bool + \msg_error:nnn { template } { missing-keytype } {#1} + } + } +\use:e + { + \cs_new_protected:Npn \exp_not:N \__template_split_keytype_aux:w + #1 \token_to_str:N : #2 \s__template_stop + { + \tl_put_right:Ne \exp_not:N \l__template_key_name_tl + { + \exp_not:N \tl_trim_spaces:e + { \exp_not:N \tl_to_str:n {#1} } + } + \tl_if_in:nnTF {#2} { \token_to_str:N : } + { + \tl_put_right:Nn \exp_not:N \l__template_key_name_tl + { \token_to_str:N : } + \exp_not:N \__template_split_keytype_aux:w #2 \s__template_stop + } + { + \exp_not:N \tl_if_empty:NTF \exp_not:N \l__template_key_name_tl + { + \msg_error:nnn { template } { empty-key-name } + { \token_to_str:N : #2 } + } + { \exp_not:N \__template_split_keytype_arg:n {#2} } + } + } + } +\cs_new_protected:Npn \__template_split_keytype_arg:n #1 + { + \tl_set:Ne \l__template_keytype_tl { \tl_trim_spaces:n {#1} } + \tl_clear:N \l__template_keytype_arg_tl + \cs_set_protected:Npn \__template_split_keytype_arg_aux:n ##1 + { + \tl_if_in:nnT {#1} {##1} + { + \cs_set:Npn \__template_split_keytype_arg_aux:w + ####1 ##1 ####2 \s__template_stop + { + \tl_if_blank:nT {####1} + { + \tl_set:Ne \l__template_keytype_tl + { \tl_trim_spaces:n {##1} } + \tl_if_blank:nF {####2} + { + \tl_set:Ne \l__template_keytype_arg_tl + { \use:n ####2 } + } + \seq_map_break: + } + } + \__template_split_keytype_arg_aux:w #1 \s__template_stop + } + } + \seq_map_function:NN \c__template_keytypes_arg_seq + \__template_split_keytype_arg_aux:n + } +\cs_generate_variant:Nn \__template_split_keytype_arg:n { V } +\cs_new:Npn \__template_split_keytype_arg_aux:n #1 { } +\cs_new:Npn \__template_split_keytype_arg_aux:w #1 \s__template_stop { } +\cs_new_protected:Npn \__template_store_value_boolean:n #1 + { \prop_put:Non \l__template_values_prop \l__template_key_name_tl {#1} } +\cs_new_protected:Npn \__template_store_value:n #1 + { \prop_put:Non \l__template_values_prop \l__template_key_name_tl {#1} } +\cs_new_eq:NN \__template_store_value_choice:n \__template_store_value:n +\cs_new_eq:NN \__template_store_value_function:n \__template_store_value:n +\cs_new_eq:NN \__template_store_value_instance:n \__template_store_value:n +\cs_new_protected:Npn \__template_store_value_aux:Nn #1#2 + { \prop_put:Non \l__template_values_prop \l__template_key_name_tl {#2} } +\cs_new_protected:Npn \__template_store_value_integer:n + { \__template_store_value_aux:Nn \int_eval:n } +\cs_new_protected:Npn \__template_store_value_length:n + { \__template_store_value_aux:Nn \dim_eval:n } +\cs_new_protected:Npn \__template_store_value_muskip:n + { \__template_store_value_aux:Nn \muskip_eval:n } +\cs_new_protected:Npn \__template_store_value_real:n + { \__template_store_value_aux:Nn \fp_eval:n } +\cs_new_protected:Npn \__template_store_value_skip:n + { \__template_store_value_aux:Nn \skip_eval:n } +\cs_new_protected:Npn \__template_store_value_tokenlist:n + { \__template_store_value_aux:Nn \use:n } +\cs_new_eq:NN \__template_store_value_commalist:n \__template_store_value_tokenlist:n +\cs_new_protected:Npn \__template_declare_template_code:nnnnn #1#2#3#4#5 + { + \__template_execute_if_type_exist:nT {#1} + { + \__template_execute_if_arg_agree:nnT {#1} {#3} + { + \__template_if_keys_exist:nnT {#1} {#2} + { + \__template_store_key_implementation:nnn {#1} {#2} {#4} + \regex_match:nnTF { \c { AssignTemplateKeys } } {#5} + { \__template_declare_template_code:nnnn {#1} {#2} {#3} {#5} } + { + \__template_declare_template_code:nnnn + {#1} {#2} {#3} { \AssignTemplateKeys #5 } + } + } + } + } + } +\cs_new_protected:Npn \__template_declare_template_code:nnnn #1#2#3#4 + { + \cs_if_exist:cT { \c__template_code_root_tl #1 / #2 } + { \msg_info:nnnn { template } { declare-template-code } {#1} {#2} } + \cs_generate_from_arg_count:cNnn + { \c__template_code_root_tl #1 / #2 } + \cs_gset_protected:Npn {#3} {#4} + } +\cs_new_protected:Npn \__template_store_key_implementation:nnn #1#2#3 + { + \__template_recover_defaults:nn {#1} {#2} + \__template_recover_keytypes:nn {#1} {#2} + \prop_clear:N \l__template_vars_prop + \keyval_parse:nnn + { \__template_parse_vars_elt:n } { \__template_parse_vars_elt:nnn { #1 / #2 } } {#3} + \__template_store_vars:nn {#1} {#2} + \prop_map_inline:Nn \l__template_keytypes_prop + { \msg_error:nnnnn { template } { key-not-implemented } {##1} {#2} {#1} } + } +\cs_new_protected:Npn \__template_parse_vars_elt:n #1 + { \msg_error:nnn { template } { key-no-variable } {#1} } +\cs_new_protected:Npn \__template_parse_vars_elt:nnn #1#2#3 + { + \tl_set:Ne \l__template_key_name_tl + { \tl_trim_spaces:e { \tl_to_str:n {#2} } } + \prop_get:NVNTF \l__template_keytypes_prop + \l__template_key_name_tl + \l__template_keytype_tl + { + \__template_split_keytype_arg:V \l__template_keytype_tl + \__template_parse_vars_elt_aux:nn {#1} {#3} + \prop_remove:NV \l__template_keytypes_prop \l__template_key_name_tl + } + { \msg_error:nnn { template } { unknown-key } {#2} } + } +\cs_new_protected:Npn \__template_parse_vars_elt_aux:nn #1#2 + { + \__template_parse_vars_elt_aux:nw {#1} #2 global global \s__template_stop + } +\cs_new_protected:Npn \__template_parse_vars_elt_aux:nw + #1#2 global #3 global #4 \s__template_stop + { + \tl_if_blank:nTF {#4} + { \__template_parse_vars_elt_aux:nnn {#1} { } {#2} } + { + \tl_if_blank:nTF {#2} + { + \__template_parse_vars_elt_aux:nne + {#1} { global } { \tl_trim_spaces:n {#3} } + } + { \msg_error:nnn { template } { bad-variable } { #2 global #3 } } + } + } +\cs_new_protected:Npn \__template_parse_vars_elt_aux:nnn #1#2#3 + { + \str_case:VnF \l__template_keytype_tl + { + { choice } { \__template_implement_choices:nn {#1} {#3} } + { function } + { + \cs_if_exist:NF #3 + { \cs_new:Npn #3 { } } + \__template_parse_vars_elt_key:nn {#1} + { + .code:n = + { + \cs_generate_from_arg_count:NNnn + \exp_not:N #3 + \exp_not:c + { cs_ \str_if_eq:nnT {#1} { global } { g } set:Npn } + { \exp_not:V \l__template_keytype_arg_tl } + {##1} + } + } + \prop_put:NVn \l__template_vars_prop + \l__template_key_name_tl {#2#3} + } + { instance } + { + \__template_parse_vars_elt_key:nn {#1} + { + .code:n = + { + \exp_not:c + { cs_ \str_if_eq:nnT {#1} { global } { g } set:Npn } + \exp_not:N #3 { \UseInstance {##1} } + } + } + \prop_put:NVn \l__template_vars_prop + \l__template_key_name_tl {#2#3} + } + } + { + \tl_if_single:nTF {#3} + { + \cs_if_exist:NF #3 + { \use:c { \__template_map_var_type: _new:N } #3 } + \__template_parse_vars_elt_key:nn {#1} + { + . \__template_map_var_type: + _ \str_if_eq:nnT {#1} { global } { g } set:N + = \exp_not:N #3 + } + \prop_put:NVn \l__template_vars_prop + \l__template_key_name_tl {#2#3} + } + { \msg_error:nnn { template } { bad-variable } {#2#3} } + } + } +\cs_generate_variant:Nn \__template_parse_vars_elt_aux:nnn { nne } +\cs_new_protected:Npn \__template_parse_vars_elt_key:nn #1#2 + { + \keys_define:ne { template / #1 } + { \l__template_key_name_tl #2 } + } +\cs_new:Npn \__template_map_var_type: + { + \str_case:Vn \l__template_keytype_tl + { + { boolean } { bool } + { commalist } { clist } + { integer } { int } + { length } { dim } + { muskip } { muskip } + { real } { fp } + { skip } { skip } + { tokenlist } { tl } + } + } +\cs_new_protected:Npn \__template_implement_choices:nn #1#2 + { + \clist_set:NV \l__template_tmp_clist \l__template_keytype_arg_tl + \prop_put:NVn \l__template_vars_prop \l__template_key_name_tl { } + \keys_define:ne { template / #1 } { \l__template_key_name_tl .choice: } + \keyval_parse:nnn + { \__template_implement_choice_elt:n } + { \__template_implement_choice_elt:nnn {#1} } + {#2} + \prop_get:NVNT \l__template_values_prop \l__template_key_name_tl + \l__template_tmp_tl + { \__template_implement_choices_default: } + \clist_if_empty:NF \l__template_tmp_clist + { + \clist_map_inline:Nn \l__template_tmp_clist + { \msg_error:nnn { template } { choice-not-implemented } {##1} } + } + } +\cs_new_protected:Npn \__template_implement_choices_default: + { + \tl_set:Ne \l__template_tmp_tl + { \l__template_key_name_tl \c_space_tl \l__template_tmp_tl } + \prop_if_in:NVF \l__template_vars_prop \l__template_tmp_tl + { + \tl_set:Ne \l__template_tmp_tl + { \l__template_key_name_tl \c_space_tl \l__template_tmp_tl } + \prop_if_in:NVF \l__template_vars_prop \l__template_tmp_tl + { + \prop_get:NVN \l__template_keytypes_prop \l__template_key_name_tl + \l__template_tmp_tl + \__template_split_keytype_arg:V \l__template_tmp_tl + \prop_get:NVN \l__template_values_prop \l__template_key_name_tl + \l__template_tmp_tl + \msg_error:nnVV { template } { unknown-default-choice } + \l__template_key_name_tl + \l__template_key_name_tl + } + } + } +\cs_new_protected:Npn \__template_implement_choice_elt:nnn #1#2#3 + { + \clist_if_empty:NTF \l__template_tmp_clist + { + \str_if_eq:nnTF {#2} { unknown } + { \__template_implement_choice_elt_aux:nnn {#1} {#2} {#3} } + { \__template_implement_choice_elt_aux:n {#2} } + } + { + \clist_if_in:NnTF \l__template_tmp_clist {#2} + { + \clist_remove_all:Nn \l__template_tmp_clist {#2} + \__template_implement_choice_elt_aux:nnn {#1} {#2} {#3} + } + { \__template_implement_choice_elt_aux:n {#2} } + } + } +\cs_new_protected:Npn \__template_implement_choice_elt_aux:n #1 + { + \prop_get:NVN \l__template_keytypes_prop \l__template_key_name_tl + \l__template_tmp_tl + \__template_split_keytype_arg:V \l__template_tmp_tl + \msg_error:nnVn { template } { unknown-choice } \l__template_key_name_tl {#1} + } +\cs_new_protected:Npn \__template_implement_choice_elt_aux:nnn #1#2#3 + { + \keys_define:ne { template / #1 } + { \l__template_key_name_tl / #2 .code:n = { \exp_not:n {#3} } } + \tl_set:Ne \l__template_tmp_tl + { \l__template_key_name_tl \c_space_tl #2 } + \prop_put:NVn \l__template_vars_prop \l__template_tmp_tl {#3} + } +\cs_new_protected:Npn \__template_implement_choice_elt:n #1 + { + \msg_error:nnVn { template } { choice-requires-code } + \l__template_key_name_tl {#1} + } +\cs_new_protected:Npn \__template_edit_defaults:nnn #1#2#3 + { + \__template_if_keys_exist:nnT {#1} {#2} + { + \__template_recover_defaults:nn {#1} {#2} + \__template_parse_values:nnn {#1} {#2} {#3} + \__template_store_defaults:nn {#1} {#2} + } + } +\cs_new_protected:Npn \__template_parse_values:nnn #1#2#3 + { + \__template_recover_keytypes:nn {#1} {#2} + \keyval_parse:NNn + \__template_parse_values_elt:n \__template_parse_values_elt:nn {#3} + } +\cs_new_protected:Npn \__template_parse_values_elt:n #1 + { + \bool_set_true:N \l__template_error_bool + \msg_error:nnn { template } { key-no-value } {#1} + } +\cs_new_protected:Npn \__template_parse_values_elt:nn #1#2 + { + \tl_set:Ne \l__template_key_name_tl + { \tl_trim_spaces:e { \tl_to_str:n {#1} } } + \prop_get:NVNTF \l__template_keytypes_prop \l__template_key_name_tl + \l__template_tmp_tl + { \__template_parse_values_elt_aux:n {#2} } + { \msg_error:nnV { template } { unknown-key } \l__template_key_name_tl } + } +\cs_new_protected:Npn \__template_parse_values_elt_aux:n #1 + { + \__template_split_keytype_arg:V \l__template_tmp_tl + \use:c { __template_store_value_ \l__template_keytype_tl :n } {#1} + } +\cs_new_protected:Npn \__template_template_set_eq:nnn #1#2#3 + { + \__template_recover_defaults:nn {#1} {#3} + \__template_store_defaults:nn {#1} {#2} + \__template_recover_keytypes:nn {#1} {#3} + \__template_store_keytypes:nn {#1} {#2} + \__template_recover_vars:nn {#1} {#3} + \__template_store_vars:nn {#1} {#2} + \cs_if_exist:cT { \c__template_code_root_tl #1 / #2 } + { \msg_info:nnnn { template } { declare-template-code } {#1} {#2} } + \cs_gset_eq:cc { \c__template_code_root_tl #1 / #2 } + { \c__template_code_root_tl #1 / #3 } + } +\cs_new_protected:Npn \__template_declare_instance:nnnn #1#2#3#4 + { + \__template_execute_if_code_exist:nnT {#1} {#2} + { + \__template_recover_defaults:nn {#1} {#2} + \__template_recover_vars:nn {#1} {#2} + \__template_declare_instance_aux:nnnn {#1} {#2} {#3} {#4} + } + } +\cs_new_protected:Npn \__template_declare_instance_aux:nnnn #1#2#3#4 + { + \bool_set_false:N \l__template_error_bool + \__template_parse_values:nnn {#1} {#2} {#4} + \bool_if:NF \l__template_error_bool + { + \prop_put:Nnn \l__template_values_prop { from~template } {#2} + \__template_store_values:nn {#1} {#3} + \__template_convert_to_assignments: + \cs_if_exist:cT { \c__template_instances_root_tl #1 / #3 } + { \msg_info:nnnn { template } { declare-instance } {#3} {#1} } + \cs_set_protected:cpe { \c__template_instances_root_tl #1 / #3 } + { + \exp_not:N \__template_assignments_push:n + { \exp_not:V \l__template_assignments_tl } + \exp_not:c { \c__template_code_root_tl #1 / #2 } + } + } + } +\cs_new_protected:Npn \__template_instance_set_eq:nnn #1#2#3 + { + \__template_if_instance_exist:nnTF {#1} {#3} + { + \__template_recover_values:nn {#1} {#3} + \__template_store_values:nn {#1} {#2} + \cs_if_exist:cT { \c__template_instances_root_tl #1 / #2 } + { \msg_info:nnnn { template } { declare-instance } {#2} {#1} } + \cs_set_eq:cc { \c__template_instances_root_tl #1 / #2 } + { \c__template_instances_root_tl #1 / #3 } + } + { \msg_error:nnnn { template } { unknown-instance } {#1} {#3} } + } +\cs_new_protected:Npn \__template_edit_instance:nnn #1#2#3 + { + \__template_if_instance_exist:nnTF {#1} {#2} + { + \__template_recover_values:nn {#1} {#2} + \prop_get:NnN \l__template_values_prop { from~template } + \l__template_tmp_tl + \__template_edit_instance_aux:nVnn + {#1} \l__template_tmp_tl {#2} {#3} + } + { \msg_error:nnnn { template } { unknown-instance } {#1} {#2} } + } +\cs_new_protected:Npn \__template_edit_instance_aux:nnnn #1#2#3#4 + { + \__template_recover_vars:nn {#1} {#2} + \__template_declare_instance_aux:nnnn {#1} {#2} {#3} {#4} + } +\cs_generate_variant:Nn \__template_edit_instance_aux:nnnn { nV } +\cs_new_protected:Npn \__template_convert_to_assignments: + { + \tl_clear:N \l__template_assignments_tl + \seq_map_function:NN \l__template_key_order_seq + \__template_convert_to_assignments_aux:n + } +\cs_new_protected:Npn \__template_convert_to_assignments_aux:n #1 + { + \prop_get:NnN \l__template_keytypes_prop {#1} \l__template_tmp_tl + \__template_convert_to_assignments_aux:nV {#1} \l__template_tmp_tl + } +\cs_new_protected:Npn \__template_convert_to_assignments_aux:nn #1#2 + { + \prop_get:NnNT \l__template_values_prop {#1} \l__template_value_tl + { + \prop_get:NnNTF \l__template_vars_prop {#1} \l__template_var_tl + { + \__template_split_keytype_arg:n {#2} + \str_if_eq:VnF \l__template_keytype_tl { choice } + { + \str_if_eq:VnF \l__template_keytype_tl { code } + { \__template_find_global: } + } + \tl_set:Nn \l__template_key_name_tl {#1} + \cs_if_exist_use:cF { __template_assign_ \l__template_keytype_tl : } + { \__template_assign_variable: } + } + { \msg_error:nnn { template } { unknown-attribute } {#1} } + } + } +\cs_generate_variant:Nn \__template_convert_to_assignments_aux:nn { nV } +\cs_new_protected:Npn \__template_find_global: + { + \bool_set_false:N \l__template_global_bool + \tl_if_in:onT \l__template_var_tl { global } + { + \exp_after:wN \__template_find_global_aux:w \l__template_var_tl \s__template_stop + } + } +\cs_new_protected:Npn \__template_find_global_aux:w #1 global #2 \s__template_stop + { + \tl_set:Nn \l__template_var_tl {#2} + \bool_set_true:N \l__template_global_bool + } +\cs_new_protected:Npn \__template_use_template:nnn #1#2#3 + { + \__template_execute_if_code_exist:nnT {#1} {#2} + { + \__template_recover_defaults:nn {#1} {#2} + \__template_recover_vars:nn {#1} {#2} + \__template_parse_values:nnn {#1} {#2} {#3} + \__template_convert_to_assignments: + \use:c { \c__template_code_root_tl #1 / #2 } + } + } +\cs_new_protected:Npn \__template_assign_boolean: + { + \bool_if:NTF \l__template_global_bool + { \__template_assign_boolean_aux:n { bool_gset } } + { \__template_assign_boolean_aux:n { bool_set } } + } +\cs_new_protected:Npn \__template_assign_boolean_aux:n #1 + { + \__template_if_key_value:VTF \l__template_value_tl + { + \__template_key_to_value: + \tl_put_right:Ne \l__template_assignments_tl + { + \exp_not:c { #1 _eq:NN } + \exp_not:V \l__template_var_tl + \exp_not:V \l__template_value_tl + } + } + { + \tl_put_right:Ne \l__template_assignments_tl + { + \exp_not:c { #1 _ \l__template_value_tl :N } + \exp_not:V \l__template_var_tl + } + } + } +\cs_new_protected:Npn \__template_assign_choice: + { + \__template_assign_choice_aux:eF + { \l__template_key_name_tl \c_space_tl \l__template_value_tl } + { + \__template_assign_choice_aux:eF + { \l__template_key_name_tl \c_space_tl unknown } + { + \prop_get:NVN \l__template_keytypes_prop \l__template_key_name_tl + \l__template_tmp_tl + \__template_split_keytype_arg:V \l__template_tmp_tl + \msg_error:nnVV { template } { unknown-choice } + \l__template_key_name_tl + \l__template_value_tl + } + } + } +\cs_new_protected:Npn \__template_assign_choice_aux:nF #1 + { + \prop_get:NnNTF \l__template_vars_prop {#1} \l__template_tmp_tl + { \tl_put_right:NV \l__template_assignments_tl \l__template_tmp_tl } + } +\cs_generate_variant:Nn \__template_assign_choice_aux:nF { e } +\cs_new_protected:Npn \__template_assign_function: + { + \bool_if:NTF \l__template_global_bool + { \__template_assign_function_aux:N \cs_gset:Npn } + { \__template_assign_function_aux:N \cs_set:Npn } + } +\cs_new_protected:Npn \__template_assign_function_aux:N #1 + { + \tl_put_right:Ne \l__template_assignments_tl + { + \cs_generate_from_arg_count:NNnn + \exp_not:V \l__template_var_tl + \exp_not:N #1 + { \exp_not:V \l__template_keytype_arg_tl } + { \exp_not:V \l__template_value_tl } + } + } +\cs_new_protected:Npn \__template_assign_instance: + { + \bool_if:NTF \l__template_global_bool + { \__template_assign_instance_aux:N \cs_gset_protected:Npn } + { \__template_assign_instance_aux:N \cs_set_protected:Npn } + } +\cs_new_protected:Npn \__template_assign_instance_aux:N #1 + { + \tl_put_right:Ne \l__template_assignments_tl + { + \exp_not:N #1 \exp_not:V \l__template_var_tl + { + \__template_use_instance:nn + { \exp_not:V \l__template_keytype_arg_tl } + { \exp_not:V \l__template_value_tl } + } + } + } +\cs_new_protected:Npn \__template_assign_variable: + { + \__template_assign_variable:c + { + \__template_map_var_type: _ + \bool_if:NT \l__template_global_bool { g } set:Nn + } + } +\cs_new_protected:Npn \__template_assign_variable:N #1 + { + \__template_if_key_value:VT \l__template_value_tl + { \__template_key_to_value: } + \tl_put_right:Ne \l__template_assignments_tl + { + #1 \exp_not:V \l__template_var_tl + { \exp_not:V \l__template_value_tl } + } + } +\cs_generate_variant:Nn \__template_assign_variable:N { c } +\cs_new_protected:Npn \__template_key_to_value: + { \exp_after:wN \__template_key_to_value_auxi:w \l__template_value_tl } +\cs_new_protected:Npn \__template_key_to_value_auxi:w \KeyValue #1 + { + \tl_set:Ne \l__template_tmp_tl { \tl_trim_spaces:e { \tl_to_str:n {#1} } } + \prop_get:NVNTF \l__template_vars_prop \l__template_tmp_tl + \l__template_value_tl + { + \exp_after:wN \__template_key_to_value_auxii:w \l__template_value_tl + \s__template_mark global \q__template_nil \s__template_stop + } + { \msg_error:nnV { template } { unknown-attribute } \l__template_tmp_tl } + } +\cs_new_protected:Npn \__template_key_to_value_auxii:w #1 global #2#3 \s__template_stop + { + \__template_quark_if_nil:NF #2 + { \tl_set:Nn \l__template_value_tl {#2} } + } +\cs_new_protected:Npn \__template_use_instance:nn #1#2 + { + \__template_if_use_template:nTF {#2} + { \__template_use_instance_aux:nNnnn {#1} #2 } + { \__template_use_instance_aux:nn {#1} {#2} } + } +\cs_new_protected:Npn \__template_use_instance_aux:nNnnn #1#2#3#4#5 + { + \str_if_eq:nnTF {#1} {#3} + { \__template_use_template:nnn {#3} {#4} {#5} } + { \msg_error:nnnn { template } { type-mismatch } {#1} {#3} } +} +\cs_new_protected:Npn \__template_use_instance_aux:nn #1#2 + { + \__template_if_instance_exist:nnTF {#1} {#2} + { \use:c { \c__template_instances_root_tl #1 / #2 } } + { \msg_error:nnnn { template } { unknown-instance } {#1} {#2} } + } +\cs_new:Npn \__template_assignments_pop: { \l__template_assignments_tl } +\cs_new_protected:Npn \__template_assignments_push:n #1 + { \tl_set:Nn \l__template_assignments_tl {#1} } +\cs_new_protected:Npn \__template_show_code:nn #1#2 + { \cs_show:c { \c__template_code_root_tl #1 / #2 } } +\cs_new_protected:Npn \__template_show_defaults:nn #1#2 + { + \__template_if_keys_exist:nnT {#1} {#2} + { + \__template_recover_defaults:nn {#1} {#2} + \__template_show:Nnnn \l__template_values_prop + {#1} {#2} { default~values } + } + } +\cs_new_protected:Npn \__template_show_keytypes:nn #1#2 + { + \__template_if_keys_exist:nnT {#1} {#2} + { + \__template_recover_keytypes:nn {#1} {#2} + \__template_show:Nnnn \l__template_keytypes_prop + {#1} {#2} { interface } + } + } +\cs_new_protected:Npn \__template_show_vars:nn #1#2 + { + \__template_execute_if_code_exist:nnT {#1} {#2} + { + \__template_recover_vars:nn {#1} {#2} + \__template_show:Nnnn \l__template_vars_prop + {#1} {#2} { variable~mapping } + } + } +\cs_new_protected:Npn \__template_show:Nnnn #1#2#3#4 + { + \msg_show:nneeee { template } { show-attribute } + { \tl_to_str:n {#2} } + { \tl_to_str:n {#3} } + { \tl_to_str:n {#4} } + { \prop_map_function:NN #1 \msg_show_item_unbraced:nn } + } +\cs_new_protected:Npn \__template_show_values:nn #1#2 + { + \__template_if_instance_exist:nnT {#1} {#2} + { + \__template_recover_values:nn {#1} {#2} + \msg_show:nneee { template } { show-values } + { \tl_to_str:n {#1} } + { \tl_to_str:n {#2} } + { + \prop_map_function:NN \l__template_values_prop + \msg_show_item_unbraced:nn + } + } + } +\msg_new:nnnn { template } { argument-number-mismatch } + { Template~type~'#1'~takes~#2~argument(s). } + { + Templates~of~type~'#1'~require~#2~argument(s).\\ + You~have~tried~to~make~a~template~for~'#1'~ + with~#3~argument(s),~which~is~not~possible:~ + the~number~of~arguments~must~agree. + } +\msg_new:nnnn { template } { bad-number-of-arguments } + { Bad~number~of~arguments~for~template~type~'#1'. } + { + A~template~may~accept~between~0~and~9~arguments.\\ + You~asked~to~use~#2~arguments:~this~is~not~supported. + } +\msg_new:nnnn { template } { bad-variable } + { Incorrect~variable~description~'#1'. } + { + The~argument~'#1'~is~not~of~the~form \\ + ~~'<variable>'\\ + ~or~\\ + ~~'global~<variable>'.\\ + It~must~be~given~in~one~of~these~formats~to~be~used~in~a~template. + } +\msg_new:nnnn { template } { choice-not-implemented } + { The~choice~'#1'~has~no~implementation. } + { + Each~choice~listed~in~the~interface~for~a~template~must~ + have~an~implementation. + } +\msg_new:nnnn { template } { choice-no-code } + { The~choice~'#1'~requires~implementation~details. } + { + When~creating~template~code~using~\DeclareTemplateCode,~ + each~choice~name~must~have~an~associated~implementation.\\ + This~should~be~given~after~a~'='~sign:~LaTeX~did~not~find~one. + } +\msg_new:nnnn { template } { choice-requires-code } + { The~choice~'#2'~for~key~'#1'~requires~an~implementation. } + { + You~should~have~put:\\ + \ \ #1~:~choice~{~#2 = <code> ~} \\ + but~LaTeX~did~not~find~any~<code>. + } +\msg_new:nnnn { template } { duplicate-key-interface } + { Key~'#1'~appears~twice~in~interface~definition~\msg_line_context:. } + { + Each~key~can~only~have~one~interface~declared~in~a~template.\\ + LaTeX~found~two~interfaces~for~'#1'. + } +\msg_new:nnnn { template } { keytype-requires-argument } + { The~key~type~'#1'~requires~an~argument~\msg_line_context:. } + { + You~should~have~put:\\ + \ \ <key-name>~:~#1~{~<argument>~} \\ + but~LaTeX~did~not~find~an~<argument>. + } +\msg_new:nnnn { template } { invalid-keytype } + { The~key~'#1'~is~missing~a~key-type~\msg_line_context:. } + { + Each~key~in~a~template~requires~a~key-type,~given~in~the~form:\\ + \ \ <key>~:~<key-type>\\ + LaTeX~could~not~find~a~<key-type>~in~your~input. + } +\msg_new:nnnn { template } { key-no-value } + { The~key~'#1'~has~no~value~\msg_line_context:. } + { + When~creating~an~instance~of~a~template~ + every~key~listed~must~include~a~value:\\ + \ \ <key>~=~<value> + } +\msg_new:nnnn { template } { key-no-variable } + { The~key~'#1'~requires~implementation~details~\msg_line_context:. } + { + When~creating~template~code~using~\DeclareTemplateCode,~ + each~key~name~must~have~an~associated~implementation.\\ + This~should~be~given~after~a~'='~sign:~LaTeX~did~not~find~one. + } +\msg_new:nnnn { template } { key-not-implemented } + { Key~'#1'~has~no~implementation~\msg_line_context:. } + { + The~definition~of~key~implementations~for~template~'#2'~ + of~template~type~'#3'~does~not~include~any~details~for~key~'#1'.\\ + The~key~was~declared~in~the~interface~definition,~ + and~so~an~implementation~is~required. + } +\msg_new:nnnn { template } { missing-keytype } + { The~key~'#1'~is~missing~a~key-type~\msg_line_context:. } + { + Key~interface~definitions~should~be~of~the~form\\ + \ \ #1~:~<key-type>\\ + but~LaTeX~could~not~find~a~<key-type>. + } +\msg_new:nnnn { template } { no-template-code } + { + The~template~'#2'~of~type~'#1'~is~unknown~ + or~has~no~implementation. + } + { + There~is~no~code~available~for~the~template~name~given.\\ + This~should~be~given~using~\DeclareTemplateCode. + } +\msg_new:nnnn { template } { type-already-defined } + { Template~type~'#1'~already~defined. } + { + You~have~used~\NewTemplateType~ + with~a~template~type~that~has~already~been~defined. + } +\msg_new:nnnn { template } { type-mismatch } + { Template~types~'#1'~and~'#2'~do~not~agree. } + { + You~are~trying~to~use~a~template~directly~with~\UseInstance + (or~a~similar~function),~but~the~template~types~do~not~match. + } +\msg_new:nnnn { template } { unknown-attribute } + { The~template~attribute~'#1'~is~unknown. } + { + There~is~a~definition~in~the~current~template~reading\\ + \ \ \token_to_str:N \KeyValue {~#1~} \\ + but~there~is~no~key~called~'#1'. + } +\msg_new:nnnn { template } { unknown-choice } + { The~choice~'#2'~was~not~declared~for~key~'#1'. } + { + The~key~'#1'~takes~a~fixed~list~of~choices~ + and~this~list~does~not~include~'#2'. + } +\msg_new:nnnn { template } { unknown-default-choice } + { The~default~choice~'#2'~was~not~declared~for~key~'#1'. } + { + The~key~'#1'~takes~a~fixed~list~of~choices~ + and~this~list~does~not~include~'#2'. + } +\msg_new:nnnn { template } { unknown-instance } + { The~instance~'#2'~of~type~'#1'~is~unknown. } + { + You~have~asked~to~use~an~instance~'#2',~ + but~this~has~not~been~created. + } +\msg_new:nnnn { template } { unknown-key } + { Unknown~template~key~'#1'. } + { + The~key~'#1'~was~not~declared~in~the~interface~ + for~the~current~template. + } +\msg_new:nnnn { template } { unknown-keytype } + { The~key-type~'#1'~is~unknown. } + { + Valid~key-types~are:\\ + -~boolean;\\ + -~choice;\\ + -~commalist;\\ + -~function;\\ + -~instance;\\ + -~integer;\\ + -~length;\\ + -~muskip;\\ + -~real;\\ + -~skip;\\ + -~tokenlist. + } +\msg_new:nnnn { template } { unknown-type } + { The~template~type~'#1'~is~unknown. } + { + A~template~type~needs~to~be~defined~with~\NewTemplateType + prior~to~using~it. + } +\msg_new:nnnn { template } { unknown-template } + { The~template~'#2'~of~type~'#1'~is~unknown. } + { + No~interface~has~been~declared~for~a~template~ + '#2'~of~template~type~'#1'. + } +\msg_new:nnn { template } { declare-instance } + { Declaring~instance~~'#1'~of~type~#2~\msg_line_context:. } +\msg_new:nnn { template } { declare-template-code } + { Declaring~code~for~template~'#2'~of~template~type~'#1'~\msg_line_context:. } +\msg_new:nnn { template } { declare-template-interface } + { + Declaring~interface~for~template~'#2'~of~template~type~'#1'~ + \msg_line_context:. + } +\msg_new:nnn { template } { declare-type } + { Declaring~template~type~'#1'~taking~#2~argument(s)~\msg_line_context:. } +\msg_new:nnn { template } { show-attribute } + { + The~template~'#2'~of~type~'#1'~has~ + \tl_if_empty:nTF {#4} { no~#3. } { #3 : #4 } + } +\msg_new:nnn { template } { show-values } + { + The~instance~'#2'~of~type~'#1'~has~ + \tl_if_empty:nTF {#3} { no~values. } { values: #3 } + } +\prop_gput:Nnn \g_msg_module_type_prop { template } { LaTeX } +\cs_new_protected:Npn \NewTemplateType #1#2 + { \__template_define_type:nn {#1} {#2} } +\cs_new_protected:Npn \DeclareTemplateInterface #1#2#3#4 + { \__template_declare_template_keys:nnnn {#1} {#2} {#3} {#4} } +\cs_new_protected:Npn \DeclareTemplateCode #1#2#3#4#5 + { \__template_declare_template_code:nnnnn {#1} {#2} {#3} {#4} {#5} } +\cs_new_protected:Npn \DeclareTemplateCopy #1#2#3 + { \__template_template_set_eq:nnn {#1} {#2} {#3} } +\cs_new_protected:Npn \EditTemplateDefaults #1#2#3 + { \__template_edit_defaults:nnn {#1} {#2} {#3} } +\cs_new_protected:Npn \UseTemplate #1#2#3 + { \__template_use_template:nnn {#1} {#2} {#3} } +\cs_new_protected:Npn \DeclareInstance #1#2#3#4 + { \__template_declare_instance:nnnn {#1} {#3} {#2} {#4} } +\cs_new_protected:Npn \DeclareInstanceCopy #1#2#3 + { \__template_instance_set_eq:nnn {#1} {#2} {#3} } +\cs_new_protected:Npn \EditInstance #1#2#3 + { \__template_edit_instance:nnn {#1} {#2} {#3} } +\cs_new_protected:Npn \UseInstance #1#2 + { \__template_use_instance:nn {#1} {#2} } +\cs_new_protected:Npn \ShowTemplateCode #1#2 + { \__template_show_code:nn {#1} {#2} } +\cs_new_protected:Npn \ShowTemplateDefaults #1#2 + { \__template_show_defaults:nn {#1} {#2} } +\cs_new_protected:Npn \ShowTemplateInterface #1#2 + { \__template_show_keytypes:nn {#1} {#2} } +\cs_new_protected:Npn \ShowTemplateVariables #1#2 + { \__template_show_vars:nn {#1} {#2} } +\cs_new_protected:Npn \ShowInstanceValues #1#2 + { \__template_show_values:nn {#1} {#2} } +\cs_new:Npn \IfInstanceExistsTF #1#2 + { \__template_if_instance_exist:nnTF {#1} {#2} } +\cs_new:Npn \IfInstanceExistsT #1#2 + { \__template_if_instance_exist:nnT {#1} {#2} } +\cs_new:Npn \IfInstanceExistsF #1#2 + { \__template_if_instance_exist:nnF {#1} {#2} } +\cs_new_protected:Npn \KeyValue #1 {#1} +\cs_new_protected:Npn \AssignTemplateKeys { \__template_assignments_pop: } +\cs_new_protected:Npn \SetTemplateKeys #1#2#3 + { \keys_set_known:nnN { template / #1 / #2 } {#3} \l__template_tmp_clist } +\IncludeInRelease{0000/00/00}{lttemplates}% + {Prototype~document~commands}% + +\EndModuleRelease +\ExplSyntaxOff %%% From File: ltalloc.dtx %%% From File: ltcntrl.dtx %%% From File: lterror.dtx @@ -8514,8 +9884,6 @@ of this package available from CTAN} %% Copyright (C) 2020-2024 %% Frank Mittelbach, The LaTeX Project %%% From File: ltpara.dtx -\def\ltparaversion{v1.0l} -\def\ltparadate{2023/01/30} \ExplSyntaxOn @@ -8548,7 +9916,7 @@ of this package available from CTAN} \@kernel@before@para@begin \hook_use:n {para/begin} \if_mode_horizontal: \else: - \msg_error:nnnn { hooks }{ para-mode }{begin}{vertical} \fi: + \msg_error:nnnn { hooks }{ para-mode }{begin}{horizontal} \fi: \__para_handle_indent: } \EndIncludeInRelease @@ -8572,7 +9940,7 @@ of this package available from CTAN} \@kernel@before@para@begin \hook_use:n {para/begin} \if_mode_horizontal: \else: - \msg_error:nnnn { hooks }{ para-mode }{begin}{vertical} \fi: + \msg_error:nnnn { hooks }{ para-mode }{begin}{horizontal} \fi: \__para_handle_indent: } \cs_set:Npn \__para_tmp:w #1#2#3#4#5 { } @@ -8651,7 +10019,7 @@ of this package available from CTAN} \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 +\everypar{\@nodocument} %% To get an error if text appears before the \document \msg_new:nnnn { hooks } { para-mode } { Illegal~mode~ change~ in~ hook~ 'para/#1'.\\ @@ -8698,8 +10066,6 @@ of this package available from CTAN} %% Copyright (C) 2021-2024 %% Frank Mittelbach, The LaTeX Project %%% From File: ltmeta.dtx -\def\ltmetaversion{v1.0b} -\def\ltmetadate{2022/05/18} \NewModuleRelease{2022/06/01}{ltmeta} {Document Metadata handling} \let \IfDocumentMetadataTF \@secondoftwo @@ -10346,7 +11712,7 @@ of this package available from CTAN} \EndIncludeInRelease %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% %%% From File: ltfssaxes.dtx -%% Copyright (C) 1999-2020 Frank Mittelbach +%% Copyright (C) 2019-2020 Frank Mittelbach \IncludeInRelease{2020/02/02}% {\DeclareFontSeriesChangeRule}{Series change rules}% \def\DeclareFontSeriesChangeRule#1#2#3#4{% @@ -12227,7 +13593,7 @@ of this package available from CTAN} \let\@defaultfamilyhook\@undefined \EndIncludeInRelease -%%% From File: fontdef.dtx +%%% From File: fontdef.dtx \IncludeInRelease{2017/01/01}% {\encodingdefault}{TU encoding default}% \ifx\Umathcode\@undefined @@ -12725,8 +14091,7 @@ 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 and - % pertenthousand for some reason +\DeclareEncodingSubset{TS1}{lmtt} {1} % missing TM, SM and pertenthousand \DeclareEncodingSubset{TS1}{ptmx} {2} \DeclareEncodingSubset{TS1}{ptmj} {2} \DeclareEncodingSubset{TS1}{ul8} {2} @@ -12764,23 +14129,31 @@ of this package available from CTAN} \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}{fbb-*} {2} % missing centoldstyle \DeclareEncodingSubset{TS1}{Alegreya-*} {2} \DeclareEncodingSubset{TS1}{AlegreyaSans-*} {2} +\DeclareEncodingSubset{TS1}{BaskervilleF-*} {2} \DeclareEncodingSubset{TS1}{DejaVuSans-TLF} {2} \DeclareEncodingSubset{TS1}{DejaVuSansCondensed-TLF} {2} \DeclareEncodingSubset{TS1}{DejaVuSansMono-TLF} {2} \DeclareEncodingSubset{TS1}{EBGaramond-*} {2} +\DeclareEncodingSubset{TS1}{Merriwthr-OsF} {2} +\DeclareEncodingSubset{TS1}{MerriwthrSans-OsF} {2} +\DeclareEncodingSubset{TS1}{Montserrat-*} {2} +\DeclareEncodingSubset{TS1}{MontserratAlternates-*} {2} +\DeclareEncodingSubset{TS1}{NotoSansMono-TLF} {2} +\DeclareEncodingSubset{TS1}{NotoSansMono-TOsF} {2} \DeclareEncodingSubset{TS1}{Tempora-TLF} {2} \DeclareEncodingSubset{TS1}{Tempora-TOsF} {2} +\DeclareEncodingSubset{TS1}{XCharter-TLF} {2} +\DeclareEncodingSubset{TS1}{XCharter-TOsF} {2} +\DeclareEncodingSubset{TS1}{erewhon-*} {2} \DeclareEncodingSubset{TS1}{Arimo-TLF} {3} -\DeclareEncodingSubset{TS1}{Carlito-*} {3} -\DeclareEncodingSubset{TS1}{FiraSans-*} {3} +\DeclareEncodingSubset{TS1}{Crlt-*} {3} +\DeclareEncodingSubset{TS1}{IBMPlexMono-TLF} {3} \DeclareEncodingSubset{TS1}{IBMPlexSans-TLF} {3} -\DeclareEncodingSubset{TS1}{Merriweather-OsF} {3} -\DeclareEncodingSubset{TS1}{Montserrat-*} {3} -\DeclareEncodingSubset{TS1}{MontserratAlternates-*} {3} +\DeclareEncodingSubset{TS1}{IBMPlexSerif-TLF} {3} \DeclareEncodingSubset{TS1}{SourceCodePro-TLF} {3} \DeclareEncodingSubset{TS1}{SourceCodePro-TOsF} {3} \DeclareEncodingSubset{TS1}{SourceSansPro-*} {3} @@ -12795,6 +14168,7 @@ of this package available from CTAN} \DeclareEncodingSubset{TS1}{CrimsonPro-*} {4} \DeclareEncodingSubset{TS1}{FiraMono-TLF} {4} \DeclareEncodingSubset{TS1}{FiraMono-TOsF} {4} +\DeclareEncodingSubset{TS1}{FiraSans-*} {4} \DeclareEncodingSubset{TS1}{Go-TLF} {4} \DeclareEncodingSubset{TS1}{GoMono-TLF} {4} \DeclareEncodingSubset{TS1}{InriaSans-*} {4} @@ -12807,7 +14181,6 @@ of this package available from CTAN} \DeclareEncodingSubset{TS1}{LinguisticsPro-OsF} {4} \DeclareEncodingSubset{TS1}{LinuxBiolinumT-*} {4} \DeclareEncodingSubset{TS1}{LinuxLibertineT-*} {4} -\DeclareEncodingSubset{TS1}{MerriweatherSans-OsF} {4} \DeclareEncodingSubset{TS1}{MintSpirit-*} {4} \DeclareEncodingSubset{TS1}{MintSpiritNoTwo-*} {4} \DeclareEncodingSubset{TS1}{PTMono-TLF} {4} @@ -12824,57 +14197,50 @@ of this package available from CTAN} \DeclareEncodingSubset{TS1}{Rosario-*} {4} \DeclareEncodingSubset{TS1}{SticksTooText-*} {4} \DeclareEncodingSubset{TS1}{UniversalisADFStd-LF} {4} -\DeclareEncodingSubset{TS1}{Almendra-OsF} {5} +\DeclareEncodingSubset{TS1}{Almndr-OsF} {5} \DeclareEncodingSubset{TS1}{Baskervaldx-*} {5} -\DeclareEncodingSubset{TS1}{BaskervilleF-*} {5} -\DeclareEncodingSubset{TS1}{Bitter-TLF} {5} +\DeclareEncodingSubset{TS1}{Bttr-TLF} {5} \DeclareEncodingSubset{TS1}{Cinzel-LF} {5} \DeclareEncodingSubset{TS1}{CinzelDecorative-LF} {5} +\DeclareEncodingSubset{TS1}{Cochineal-*} {5} \DeclareEncodingSubset{TS1}{DejaVuSerif-TLF} {5} \DeclareEncodingSubset{TS1}{DejaVuSerifCondensed-TLF} {5} \DeclareEncodingSubset{TS1}{GilliusADF-LF} {5} \DeclareEncodingSubset{TS1}{GilliusADFCond-LF} {5} \DeclareEncodingSubset{TS1}{GilliusADFNoTwo-LF} {5} \DeclareEncodingSubset{TS1}{GilliusADFNoTwoCond-LF} {5} -\DeclareEncodingSubset{TS1}{LobsterTwo-LF} {5} \DeclareEncodingSubset{TS1}{OldStandard-TLF} {5} -\DeclareEncodingSubset{TS1}{PlayfairDisplay-TLF} {5} -\DeclareEncodingSubset{TS1}{PlayfairDisplay-TOsF} {5} +\DeclareEncodingSubset{TS1}{PlyfrDisplay-TLF} {5} +\DeclareEncodingSubset{TS1}{PlyfrDisplay-TOsF} {5} \DeclareEncodingSubset{TS1}{TheanoDidot-TLF} {5} \DeclareEncodingSubset{TS1}{TheanoDidot-TOsF} {5} \DeclareEncodingSubset{TS1}{TheanoModern-TLF} {5} \DeclareEncodingSubset{TS1}{TheanoModern-TOsF} {5} \DeclareEncodingSubset{TS1}{TheanoOldStyle-TLF} {5} \DeclareEncodingSubset{TS1}{TheanoOldStyle-TOsF} {5} +\DeclareEncodingSubset{TS1}{charssil-TLF} {5} \DeclareEncodingSubset{TS1}{Crimson-TLF} {6} -\DeclareEncodingSubset{TS1}{IBMPlexMono-TLF} {6} -\DeclareEncodingSubset{TS1}{IBMPlexSerif-TLF} {6} -\DeclareEncodingSubset{TS1}{LibertinusMono-TLF} {6} \DeclareEncodingSubset{TS1}{LibertinusSerifDisplay-LF}{6} \DeclareEncodingSubset{TS1}{LinuxLibertineDisplayT-*} {6} \DeclareEncodingSubset{TS1}{LinuxLibertineMonoT-LF} {6} \DeclareEncodingSubset{TS1}{LinuxLibertineMonoT-TLF} {6} -\DeclareEncodingSubset{TS1}{Overlock-LF} {6} +\DeclareEncodingSubset{TS1}{Ovrlck-LF} {6} +\DeclareEncodingSubset{TS1}{ComicNeue-TLF} {7} +\DeclareEncodingSubset{TS1}{ComicNeueAngular-TLF} {7} \DeclareEncodingSubset{TS1}{CormorantGaramond-*} {7} \DeclareEncodingSubset{TS1}{Heuristica-TLF} {7} \DeclareEncodingSubset{TS1}{Heuristica-TOsF} {7} \DeclareEncodingSubset{TS1}{IMFELLEnglish-TLF} {7} -\DeclareEncodingSubset{TS1}{LibreBaskerville-TLF} {7} -\DeclareEncodingSubset{TS1}{LibreCaslon-*} {7} -\DeclareEncodingSubset{TS1}{Marcellus-LF} {7} +\DeclareEncodingSubset{TS1}{LibreBskrvl-TLF} {7} +\DeclareEncodingSubset{TS1}{LibreCsln-*} {7} +\DeclareEncodingSubset{TS1}{Lbstr-LF} {7} +\DeclareEncodingSubset{TS1}{Mrcls-LF} {7} \DeclareEncodingSubset{TS1}{NotoSans-*} {7} -\DeclareEncodingSubset{TS1}{NotoSansMono-TLF} {7} -\DeclareEncodingSubset{TS1}{NotoSansMono-TOsF} {7} \DeclareEncodingSubset{TS1}{NotoSerif-*} {7} -\DeclareEncodingSubset{TS1}{Quattrocento-TLF} {7} -\DeclareEncodingSubset{TS1}{QuattrocentoSans-TLF} {7} -\DeclareEncodingSubset{TS1}{XCharter-TLF} {7} -\DeclareEncodingSubset{TS1}{XCharter-TOsF} {7} -\DeclareEncodingSubset{TS1}{erewhon-*} {7} -\DeclareEncodingSubset{TS1}{ComicNeue-TLF} {7} -\DeclareEncodingSubset{TS1}{ComicNeueAngular-TLF} {7} -\DeclareEncodingSubset{TS1}{Forum-LF} {7} % the superiors are missing -\DeclareEncodingSubset{TS1}{Cochineal-*} {8} +\DeclareEncodingSubset{TS1}{Quattro-LF} {7} +\DeclareEncodingSubset{TS1}{QuattroSans-LF} {7} +\DeclareEncodingSubset{TS1}{Frm-LF} {7} % the superiors are missing +\DeclareEncodingSubset{TS1}{LibertinusMono-TLF} {8} \DeclareEncodingSubset{TS1}{AlgolRevived-TLF} {9} \def\UseLegacyTextSymbols{% \DeclareTextSymbolDefault{\textasteriskcentered}{OMS}% @@ -13112,7 +14478,6 @@ of this package available from CTAN} \EndModuleRelease - %%% From File: ltpageno.dtx %%% From File: ltxref.dtx \IncludeInRelease{2023/06/01}% @@ -13260,12 +14625,7 @@ of this package available from CTAN} \let\Ref\@undefined \EndIncludeInRelease -%% File: ltproperties.dtx -\def\ltpropertiesversion{1.0c} -\def\ltpropertiesdate{2023-10-15} - - - +%%% From File: ltproperties.dtx \ExplSyntaxOn \NewModuleRelease{2023/11/01}{ltproperties} {Cross-referencing~properties} @@ -13320,7 +14680,7 @@ of this package available from CTAN} { \legacy_if:nT { @filesw } { - \iow_shipout_x:Nx \@auxout + \protected@write \@auxout {} { \token_to_str:N \new@label@record {#1} @@ -13432,7 +14792,9 @@ of this package available from CTAN} } } \prg_generate_conditional_variant:Nnn \property_if_exist:n {e} {TF} -\cs_new_eq:NN \IfPropertyExistTF \property_if_exist:eTF +\cs_new_eq:NN \IfPropertyExistsTF \property_if_exist:eTF +\cs_new:Npn \IfPropertyExistsT #1#2 {\property_if_exist:eTF {#1}{#2}{} } +\cs_new:Npn \IfPropertyExistsF #1 {\property_if_exist:eTF {#1}{} } \prg_new_conditional:Npnn \property_if_recorded:n #1 { p , T , F, TF } % #1 label { @@ -13445,7 +14807,9 @@ of this package available from CTAN} } } \prg_generate_conditional_variant:Nnn \property_if_recorded:n {e} {TF} -\cs_new_eq:NN \IfLabelExistTF \property_if_recorded:eTF +\cs_new_eq:NN \IfLabelExistsTF \property_if_recorded:eTF +\cs_new:Npn \IfLabelExistsT #1#2 {\property_if_exist:eTF {#1}{#2}{} } +\cs_new:Npn \IfLabelExistsF #1 {\property_if_exist:eTF {#1}{} } \prg_new_conditional:Npnn \property_if_recorded:nn #1#2 { p , T , F, TF } % #1 label #2 property { @@ -13534,8 +14898,8 @@ of this package available from CTAN} \let \RefProperty \@undefined \let \RefUndefinedWarn \@undefined -\let \IfPropertyExistTF \@undefined -\let \IfLabelExistTF \@undefined +\let \IfPropertyExistsTF \@undefined +\let \IfLabelExistsTF \@undefined \let \IfPropertyRecordedTF \@undefined \let\new@label@record \@undefined @@ -14651,6 +16015,27 @@ of this package available from CTAN} \@ifnextchar[{\@rsbox{#1}}{\@irsbox{#1}[]}} \expandafter\let\csname raisebox \endcsname\@undefined \EndIncludeInRelease +\IncludeInRelease{2024/06/01}% + {\@finalstrut}{final strut correction}% +\def\@finalstrut#1{% + \unskip + \ifhmode \nobreak \vrule + \else + \ifdim \prevdepth=-\@m\p@ + \else + \vskip-\prevdepth + \fi + \hrule + \fi + \@width\z@\@height\z@\@depth\dp#1} +\EndIncludeInRelease +\IncludeInRelease{0000/00/00}% + {\@finalstrut}{final strut correction}% +\def\@finalstrut#1{% + \unskip\ifhmode\nobreak\fi + \vrule\@width\z@\@height\z@\@depth\dp#1} + +\EndIncludeInRelease %%% From File: lttab.dtx \IncludeInRelease{2020/10/01}% {\@itabcr}{Tabbing calc syntax}% @@ -15283,6 +16668,32 @@ of this package available from CTAN} \EndIncludeInRelease %%% From File: ltthm.dtx +\IncludeInRelease{2024/03/18}% + {\@thm}{no link target}% +\def\@thm#1#2{% + \@kernel@refstepcounter{#1}% + \@ifnextchar[{\@ythm{#1}{#2}}{\@xthm{#1}{#2}}} +\EndIncludeInRelease +\IncludeInRelease{0000/00/00}% + {\@thm}{no link target}% +\def\@thm#1#2{% + \refstepcounter{#1}% + \@ifnextchar[{\@ythm{#1}{#2}}{\@xthm{#1}{#2}}} +\EndIncludeInRelease +\IncludeInRelease{2024/03/18}% + {\@begintheorem}{add link targets}% +\def\@begintheorem#1#2{\trivlist + \item[\MakeLinkTarget{\@currentcounter}\hskip \labelsep{\bfseries #1\ #2}]\itshape} +\def\@opargbegintheorem#1#2#3{\trivlist + \item[\MakeLinkTarget{\@currentcounter}\hskip \labelsep{\bfseries #1\ #2\ (#3)}]\itshape} +\EndIncludeInRelease +\IncludeInRelease{0000/00/00}% + {\@begintheorem}{add link targets}% +\def\@begintheorem#1#2{\trivlist + \item[\hskip \labelsep{\bfseries #1\ #2}]\itshape} +\def\@opargbegintheorem#1#2#3{\trivlist + \item[\hskip \labelsep{\bfseries #1\ #2\ (#3)}]\itshape} +\EndIncludeInRelease %%% From File: ltsect.dtx \IncludeInRelease{2019/10/01}% {\title}{Make commands robust}% @@ -15773,8 +17184,6 @@ of this package available from CTAN} %% Copyright (C) 2022-2024 %% Frank Mittelbach, The LaTeX Project %%% From File: ltmarks.dtx -\def\ltmarksversion{v1.0d} -\def\ltmarksdate{2022/06/01} %% \end{function} \ExplSyntaxOn @@ -15813,42 +17222,84 @@ of this package available from CTAN} \tl_new:c { g__mark_last-column_top_ #1 _tl } \tl_new:c { g__mark_last-column_first_ #1 _tl } \tl_new:c { g__mark_last-column_last_ #1 _tl } + \tl_set:cn { g__mark_page_top_ #1 _tl }{ \__mark_id:n{0} } + \tl_set:cn { g__mark_page_first_ #1 _tl }{ \__mark_id:n{0} } + \tl_set:cn { g__mark_page_last_ #1 _tl }{ \__mark_id:n{0} } + \tl_set:cn { g__mark_previous-page_top_ #1 _tl }{ \__mark_id:n{0} } + \tl_set:cn { g__mark_previous-page_first_ #1 _tl }{ \__mark_id:n{0} } + \tl_set:cn { g__mark_previous-page_last_ #1 _tl }{ \__mark_id:n{0} } + \tl_set:cn { g__mark_column_top_ #1 _tl }{ \__mark_id:n{0} } + \tl_set:cn { g__mark_column_first_ #1 _tl }{ \__mark_id:n{0} } + \tl_set:cn { g__mark_column_last_ #1 _tl }{ \__mark_id:n{0} } + \tl_set:cn { g__mark_previous-column_top_ #1 _tl }{ \__mark_id:n{0} } + \tl_set:cn { g__mark_previous-column_first_ #1 _tl }{ \__mark_id:n{0} } + \tl_set:cn { g__mark_previous-column_last_ #1 _tl }{ \__mark_id:n{0} } + \tl_set:cn { g__mark_first-column_top_ #1 _tl }{ \__mark_id:n{0} } + \tl_set:cn { g__mark_first-column_first_ #1 _tl }{ \__mark_id:n{0} } + \tl_set:cn { g__mark_first-column_last_ #1 _tl }{ \__mark_id:n{0} } + \tl_set:cn { g__mark_last-column_top_ #1 _tl }{ \__mark_id:n{0} } + \tl_set:cn { g__mark_last-column_first_ #1 _tl }{ \__mark_id:n{0} } + \tl_set:cn { g__mark_last-column_last_ #1 _tl }{ \__mark_id:n{0} } } \box_new:N \l__mark_box +\box_new:N \l__mark_ii_box \tl_new:N \g__mark_tmp_tl \tl_new:N \g__mark_new_top_tl -\cs_new_protected:Npn \__mark_update_structure:nn #1#2 - { - \__mark_update_structure_alias:nn { previous-#1 } {#1} +\cs_new_protected:Npn \__mark_extract_and_handle_marks:nn #1#2 { \group_begin: \dim_set_eq:NN \tex_splitmaxdepth:D \c_max_dim \int_set_eq:NN \tex_vbadness:D \c_max_int \dim_set_eq:NN \tex_vfuzz:D \c_max_dim - \vbox_set_to_ht:Nnn \l__mark_box { -.5\c_max_dim } + \__mark_prepare_and_extract:nn {#1} {#2} + \group_end: + } +\cs_new_protected:Npn \__mark_prepare_and_extract:nn #1#2 { + \vbox_set:Nn \l__mark_box + { + #2 + \tex_unskip:D + \box_set_to_last:N \l__mark_box + \int_compare:nNnT \tex_lastnodetype:D < 0 { - #2 - \tex_unskip:D - \box_set_to_last:N \l__mark_box - \int_compare:nNnT \tex_lastnodetype:D < 0 - { - \box_if_vertical:NT \l__mark_box - { - \vbox_set_to_ht:Nnn \l__mark_box { -.5\c_max_dim } - { - \vbox_unpack:N \l__mark_box - \tex_kern:D \c_zero_dim % ensure that box - % is not empty - } - \int_compare:nNnT \tex_badness:D > 0 - { \vbox_unpack:N \l__mark_box } - } - } - \tex_kern:D \c_zero_dim + \box_if_vertical:NT \l__mark_box + { \vbox_unpack:N \l__mark_box } } - \int_compare:nNnTF \tex_badness:D > 0 - { - \vbox_set_split_to_ht:NNn \l__mark_box \l__mark_box \c_max_dim - \seq_map_inline:Nn \g__mark_classes_seq + } + \__mark_vbox_set_split_to_maxdimen:NN \l__mark_ii_box \l__mark_box + \box_if_empty:NTF \l__mark_box + { #1 } + { + \__mark_prepare_and_extract:nn {#1} + { \vbox_unpack:N \l__mark_ii_box + \vbox_unpack:N \l__mark_box } + } +} +\cs_set_eq:cN {Infinite~shrink~error~above~ignored~!}\c_max_dim +\cs_new_protected:Npx \__mark_vbox_set_split_to_maxdimen:NN #1#2 { + \tl_set:Ne \exp_not:N \l__mark_saved_parameters_tl + { + \tex_interactionmode:D + \exp_not:N \int_use:N \tex_interactionmode:D \scan_stop: + \tex_escapechar:D + \exp_not:N \int_use:N \tex_escapechar:D \scan_stop: + } + \tex_escapechar:D -1 \scan_stop: + \tex_interactionmode:D 0 \scan_stop: + \tex_setbox:D #1 \tex_vsplit:D #2 to + \exp_not:N \use:n { + \use:c{Infinite~shrink~error~above~ignored~!} + } + \exp_not:N \l__mark_saved_parameters_tl +} +\tl_new:N \l__mark_saved_parameters_tl +\cs_new_protected:Npn \__mark_update_structure_from_material:nn #1#2 { + \__mark_extract_and_handle_marks:nn + { \__mark_update_structure_from_splitmarks:n {#1} } + { #2 } +} +\cs_new_protected:Npn \__mark_update_structure_from_splitmarks:n #1 { + \__mark_update_structure_alias:nn { previous-#1 } {#1} + \seq_map_inline:Nn \g__mark_classes_seq { \tl_gset_eq:Nc \g__mark_new_top_tl { g__mark_#1_last_##1_tl } \tl_gset_eq:cN { g__mark_#1_top_##1_tl } \g__mark_new_top_tl @@ -15870,19 +17321,40 @@ of this package available from CTAN} } } } - } - { - \msg_error:nnn { mark } { infinite-shrinkage } {#1} - \seq_map_inline:Nn \g__mark_classes_seq +} +\cs_new_protected:Npn \__mark_get_marks_for_reinsertion:nNN #1#2#3 { + \tl_clear:N \g__mark_first_marks_tl + \tl_clear:N \g__mark_last_marks_tl + \__mark_extract_and_handle_marks:nn + \__mark_get_from_splitmarks: + { #1 } + \tl_set_eq:NN #2 \g__mark_first_marks_tl + \tl_set_eq:NN #3 \g__mark_last_marks_tl +} +\cs_new_protected:Npn \__mark_get_from_splitmarks: { + \seq_map_inline:Nn \g__mark_classes_seq { - \tl_gset_eq:cc { g__mark_#1_top_ ##1_tl } - { g__mark_#1_last_ ##1_tl } - \tl_gset_eq:cc { g__mark_#1_first_##1_tl } - { g__mark_#1_last_ ##1_tl } + \tl_gset:No \g__mark_tmp_tl + { \tex_splitbotmarks:D \use:c { c__mark_class_##1_mark } } + + \tl_if_empty:NTF \g__mark_tmp_tl + { + } + { + \tl_gput_right:Ne \g__mark_last_marks_tl + { \mark_insert:nn {##1} { \g__mark_tmp_tl } } + \tl_gput_right:Ne \g__mark_first_marks_tl + { \mark_insert:nn {##1} + { + \tex_splitfirstmarks:D + \use:c { c__mark_class_##1_mark } + } + } + } } - } - \group_end: - } +} +\tl_new:N \g__mark_first_marks_tl +\tl_new:N \g__mark_last_marks_tl \cs_new_protected:Npn \__mark_update_structure_alias:nn #1#2 { \seq_map_inline:Nn \g__mark_classes_seq { @@ -15912,12 +17384,14 @@ of this package available from CTAN} \group_begin: \@kernel@before@insertmark \hook_use:n { insertmark } - \unrestored@protected@xdef \g__mark_tmp_tl {#2} + \unrestored@protected@xdef \g__mark_tmp_tl + { + \__mark_id:n{ \int_use:N\g__mark_int } + #2 + } \tex_marks:D \use:c { c__mark_class_ #1 _mark } { - \tl_if_empty:NTF \g__mark_tmp_tl - { \exp_not:n { \prg_do_nothing: } } - { \exp_not:o { \g__mark_tmp_tl } } + \exp_not:o { \g__mark_tmp_tl } } \group_end: \if@nobreak\ifvmode\nobreak\fi\fi @@ -15927,15 +17401,23 @@ of this package available from CTAN} { \tl_to_str:n {#1} } } } +\cs_new_protected:Npn \__mark_id:n #1 { } +\int_new:N \g__mark_int \cs_new:Npn \@kernel@before@insertmark { \cs_set_eq:NN \label \scan_stop: \cs_set_eq:NN \index \scan_stop: \cs_set_eq:NN \glossary \scan_stop: + \int_compare:nNnTF \g__mark_int < {99999} + { \int_gincr:N \g__mark_int } + { \int_gzero:N \g__mark_int } + } \hook_new:n {insertmark} -\cs_new:Npn \mark_use_first:nn #1#2 { \exp_not:v { g__mark_#1_first_#2_tl } } -\cs_new:Npn \mark_use_last:nn #1#2 { \exp_not:v { g__mark_#1_last_#2_tl } } -\cs_new:Npn \mark_use_top:nn #1#2 { \exp_not:v { g__mark_#1_top_#2_tl } } +\cs_new:Npn \mark_use_first:nn #1#2 { \__mark_use:v { g__mark_#1_first_#2_tl } } +\cs_new:Npn \mark_use_last:nn #1#2 { \__mark_use:v { g__mark_#1_last_#2_tl } } +\cs_new:Npn \mark_use_top:nn #1#2 { \__mark_use:v { g__mark_#1_top_#2_tl } } +\cs_new:Npn \__mark_use:n #1 { \exp_not:o { \use_none:nn #1 } } +\cs_generate_variant:Nn \__mark_use:n { v } \prg_new_conditional:Npnn \mark_if_eq:nnnn #1#2#3#4 { T , F , TF } { \tl_if_eq:ccTF { g__mark_ #1 _#3_ #2 _tl } @@ -15975,15 +17457,6 @@ of this package available from CTAN} all~columns~have~been~assembled. \c__msg_return_text_tl } -\msg_new:nnnn { mark } { infinite-shrinkage } - { Infinite~shrinkage~found~in~'#1'. } - { - \c__msg_coding_error_text_tl - The~mark~region~'#1'~contains~some~infinite~negative~glue~ - allowing~it~to~shrink~to~an~arbitrary~size.~ - This~makes~it~impossible~to~split~the~region~apart~to~ - get~at~its~marks.~They~are~lost. - } \bool_new:N \g__mark_debug_bool \cs_new_eq:NN \__mark_debug:n \use_none:n \cs_new_protected:Npn \mark_debug_on: @@ -16003,6 +17476,8 @@ of this package available from CTAN} } \cs_new_eq:NN \DebugMarksOn \mark_debug_on: \cs_new_eq:NN \DebugMarksOff \mark_debug_off: +\cs_new_protected:Npn \ShowMarksAt #1 { +} \cs_new_eq:NN \NewMarkClass \mark_new_class:n \@onlypreamble \NewMarkClass \cs_new_eq:NN \InsertMark \mark_insert:nn @@ -16018,11 +17493,11 @@ of this package available from CTAN} \cs_new_protected:Npn \__mark_update_singlecol_structures: { \box_if_vertical:NTF \@outputbox { - \__mark_update_structure:nn {page} + \__mark_update_structure_from_material:nn {page} { \vbox_unpack:N \@outputbox } } { - \__mark_update_structure:nn {page} + \__mark_update_structure_from_material:nn {page} { \hbox_unpack:N \@outputbox } } \__mark_update_structure_alias:nn {previous-column}{previous-page} @@ -16033,11 +17508,11 @@ of this package available from CTAN} \cs_new_protected:Npn \__mark_update_dblcol_structures: { \box_if_vertical:NTF \@outputbox { - \__mark_update_structure:nn {column} + \__mark_update_structure_from_material:nn {column} { \vbox_unpack:N \@outputbox } } { - \__mark_update_structure:nn {column} + \__mark_update_structure_from_material:nn {column} { \hbox_unpack:N \@outputbox } } \legacy_if:nTF {@firstcolumn} @@ -16057,10 +17532,19 @@ of this package available from CTAN} { g__mark_page_last_ ##1 _tl } \tl_gset_eq:cc { g__mark_page_top_ ##1 _tl } { g__mark_first-column_top_ ##1 _tl } - \tl_gset_eq:cc { g__mark_ page_first_ ##1 _tl } + + \tl_if_eq:ccTF { g__mark_first-column_top_ ##1 _tl } { g__mark_first-column_first_ ##1 _tl } - \tl_gset_eq:cc { g__mark_page_last_ ##1 _tl } - { g__mark_last-column_last_ ##1 _tl } + { + \tl_gset_eq:cc { g__mark_page_first_ ##1 _tl } + { g__mark_last-column_first_ ##1 _tl } + } + { + \tl_gset_eq:cc { g__mark_page_first_ ##1 _tl } + { g__mark_first-column_first_ ##1 _tl } + } + \tl_gset_eq:cc { g__mark_page_last_ ##1 _tl } + { g__mark_last-column_last_ ##1 _tl } } } } @@ -16323,15 +17807,15 @@ of this package available from CTAN} }% \reserved@a} \EndIncludeInRelease -\IncludeInRelease{2021/11/15}% - {\IfPackageLoadedtTF}{Test package loading}% +\IncludeInRelease{2024/06/01}% + {\IfPackageLoadedTF}{Test package loading}% \let \IfPackageLoadedTF \@ifpackageloaded \let \IfClassLoadedTF \@ifclassloaded \let \IfPackageLoadedWithOptionsTF \@ifpackagewith \let \IfClassLoadedWithOptionsTF \@ifclasswith \EndIncludeInRelease \IncludeInRelease{0000/00/00}% - {\IfPackageLoadedtTF}{Test package loading}% + {\IfPackageLoadedTF}{Test package loading}% \let \IfPackageLoadedTF \@ifpackageloaded \let \IfClassLoadedTF \@ifclassloaded @@ -16339,6 +17823,63 @@ of this package available from CTAN} \let \IfClassLoadedWithOptionsTF \@ifclasswith \EndIncludeInRelease +\IncludeInRelease{2024/06/01}% + {\IfPackageLoadedT}{More conditionals}% +\def\IfPackageLoadedT #1#2{\IfPackageLoadedTF{#1}{#2}{}} +\def\IfPackageLoadedF #1{\IfPackageLoadedTF{#1}{}} +\def\IfClassLoadedT #1#2{\IfClassLoadedTF{#1}{#2}{}} +\def\IfClassLoadedF #1{\IfClassLoadedTF{#1}{}} +\def\IfPackageAtLeastT#1#2#3{\IfPackageAtLeastTF{#1}{#2}{#3}{}} +\def\IfPackageAtLeastF #1#2{\IfPackageAtLeastTF{#1}{#2}{}} +\def\IfClassAtLeastT #1#2#3{\IfClassAtLeastTF{#1}{#2}{#3}{}} +\def\IfClassAtLeastF #1#2{\IfClassAtLeastTF{#1}{#2}{}} +\def\IfFileAtLeastT #1#2#3{\IfFileAtLeastTF{#1}{#2}{#3}{}} +\def\IfFileAtLeastF #1#2{\IfFileAtLeastTF{#1}{#2}{}} +\def\IfFormatAtLeastT #1#2{\IfFormatAtLeastTF{#1}{#2}{}} +\def\IfFormatAtLeastF #1{\IfFormatAtLeastTF{#1}{}} +\def\IfPackageLoadedWithOptionsT #1#2#3{\IfPackageLoadedWithOptionsTF{#1}{#2}{#3}{}} +\def\IfPackageLoadedWithOptionsF #1#2{\IfPackageLoadedWithOptionsTF{#1}{#2}{}} +\def\IfClassLoadedWithOptionsT #1#2#3{\IfClassLoadedWithOptionsTF{#1}{#2}{#3}{}} +\def\IfClassLoadedWithOptionsF #1#2{\IfClassLoadedWithOptionsTF{#1}{#2}{}} +\def\IfFileLoadedTF#1{% + \expandafter\ifx\csname ver@#1\endcsname\relax + \expandafter\@secondoftwo + \else + \expandafter\@firstoftwo + \fi} +\def\IfFileLoadedT#1#2{\IfFileLoadedTF{#1}{#2}{}} +\def\IfFileLoadedF #1{\IfFileLoadedTF{#1}{}} +\EndIncludeInRelease +\IncludeInRelease{0000/00/00}% + {\IfPackageLoadedT}{More conditionals}% + +\def\IfPackageLoadedT #1#2{\IfPackageLoadedTF{#1}{#2}{}} +\def\IfPackageLoadedF #1{\IfPackageLoadedTF{#1}{}} +\def\IfClassLoadedT #1#2{\IfClassLoadedTF{#1}{#2}{}} +\def\IfClassLoadedF #1{\IfClassLoadedTF{#1}{}} +\def\IfPackageAtLeastT#1#2#3{\IfPackageAtLeastTF{#1}{#2}{#3}{}} +\def\IfPackageAtLeastF #1#2{\IfPackageAtLeastTF{#1}{#2}{}} +\def\IfClassAtLeastT #1#2#3{\IfClassAtLeastTF{#1}{#2}{#3}{}} +\def\IfClassAtLeastF #1#2{\IfClassAtLeastTF{#1}{#2}{}} +\def\IfFileAtLeastT #1#2#3{\IfFileAtLeastTF{#1}{#2}{#3}{}} +\def\IfFileAtLeastF #1#2{\IfFileAtLeastTF{#1}{#2}{}} +\def\IfFormatAtLeastT #1#2{\IfFormatAtLeastTF{#1}{#2}{}} +\def\IfFormatAtLeastF #1{\IfFormatAtLeastTF{#1}{}} +\def\IfPackageLoadedWithOptionsT #1#2#3{\IfPackageLoadedWithOptionsTF{#1}{#2}{#3}{}} +\def\IfPackageLoadedWithOptionsF #1#2{\IfPackageLoadedWithOptionsTF{#1}{#2}{}} +\def\IfClassLoadedWithOptionsT #1#2#3{\IfClassLoadedWithOptionsTF{#1}{#2}{#3}{}} +\def\IfClassLoadedWithOptionsF #1#2{\IfClassLoadedWithOptionsTF{#1}{#2}{}} + +\def\IfFileLoadedTF#1{% + \expandafter\ifx\csname ver@#1\endcsname\relax + \expandafter\@secondoftwo + \else + \expandafter\@firstoftwo + \fi} +\def\IfFileLoadedT#1#2{\IfFileLoadedTF{#1}{#2}{}} +\def\IfFileLoadedF #1{\IfFileLoadedTF{#1}{}} + +\EndIncludeInRelease \IncludeInRelease{2020/10/01}% {\ProvidesPackage}{Check name with \strcmp}% \def\ProvidesPackage#1{% @@ -16425,11 +17966,11 @@ of this package available from CTAN} \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\expandafter\endcsname - \expandafter{#2}}% - {\expandafter\g@addto@macro\csname @raw@opt@#3.#1\expandafter\endcsname - \expandafter{\expandafter,#2}}% + \@ifundefined{@raw@opt@#3.#1}% + {\expandafter\gdef\csname @raw@opt@#3.#1\expandafter\endcsname + \expandafter{#2}}% + {\expandafter\g@addto@macro\csname @raw@opt@#3.#1\expandafter\endcsname + \expandafter{\expandafter,#2}}% } \EndIncludeInRelease \IncludeInRelease{2020/10/01}{\@pass@ptions} @@ -16607,6 +18148,25 @@ of this package available from CTAN} \AtEndOfPackage{\let\@unprocessedoptions\relax}% \@loadwithoptions\@pkgextension\RequirePackage} \EndIncludeInRelease +\IncludeInRelease{2024/06/01}% + {\@fileswithoptions}{Check Group}% +\def\@fileswithoptions#1{% + \ifnum\currentgrouplevel>\z@ + \@latex@error + {Loading a class or package in a group}% + {Classes and packages should only be loaded at the top level}% + \fi + \@ifnextchar[%] + {\@fileswith@ptions#1}% + {\@fileswith@ptions#1[]}} +\EndIncludeInRelease +\IncludeInRelease{0000/00/00}% + {\@fileswithoptions}{Check Group}% +\def\@fileswithoptions#1{% + \@ifnextchar[%] + {\@fileswith@ptions#1}% + {\@fileswith@ptions#1[]}} +\EndIncludeInRelease \IncludeInRelease{2020/10/01}% {\@fileswith@pti@ns}{ifx tests in \@fileswith@pti@ns}% \def\@fileswith@pti@ns#1[#2]#3[#4]{% @@ -16707,9 +18267,12 @@ of this package available from CTAN} \@ifundefined{opt@handler@\@currname.\@currext} {\@onefilewithoptions@clashchk{#2}} {% - \expandafter\protected@edef\csname opt@\@currname.\@currext\endcsname + \expandafter\protected@edef + \csname opt@\@currname.\@currext\endcsname {\zap@space#2 \@empty}% - \@namedef{@raw@opt@\@currname.\@currext}{#2}% + \expandafter\def + \csname @raw@opt@\@currname.\@currext\expandafter\endcsname + \expandafter{#2}% \@nameuse{opt@handler@\@currname.\@currext}% }% }% @@ -17255,8 +18818,6 @@ of this package available from CTAN} \endgroup% \EndIncludeInRelease %%% From File: ltfilehook.dtx -\providecommand\ltfilehookversion{v1.0o} -\providecommand\ltfilehookdate{2023/07/10} \IncludeInRelease{2020/10/01}% {\CurrentFile}{Hook management file}% \ExplSyntaxOn @@ -17744,8 +19305,6 @@ of this package available from CTAN} %% Frank Mittelbach, The LaTeX Project %% %%% From File: ltshipout.dtx -\providecommand\ltshipoutversion{v1.0n} -\providecommand\ltshipoutdate{2022/11/08} \IncludeInRelease{2020/10/01}% {\shipout}{Hook management (shipout)}% \ExplSyntaxOn diff --git a/Master/texmf-dist/tex/latex/base/latin1.def b/Master/texmf-dist/tex/latex/base/latin1.def index d67159ac7a1..b4784628978 100644 --- a/Master/texmf-dist/tex/latex/base/latin1.def +++ b/Master/texmf-dist/tex/latex/base/latin1.def @@ -43,7 +43,7 @@ %% extension .ins) which are part of the distribution. \ProvidesFile{latin1.def} - [2021/02/14 v1.3d Input encoding file] + [2024/02/08 v1.3d Input encoding file] \ProvideTextCommandDefault{\textdegree}{\ensuremath{{^\circ}}} \ProvideTextCommandDefault{\textonehalf}{\ensuremath{\frac12}} \ProvideTextCommandDefault{\textonequarter}{\ensuremath{\frac14}} diff --git a/Master/texmf-dist/tex/latex/base/latin10.def b/Master/texmf-dist/tex/latex/base/latin10.def index 2798bafe20c..457b7112ab5 100644 --- a/Master/texmf-dist/tex/latex/base/latin10.def +++ b/Master/texmf-dist/tex/latex/base/latin10.def @@ -43,7 +43,7 @@ %% extension .ins) which are part of the distribution. \ProvidesFile{latin10.def} - [2021/02/14 v1.3d Input encoding file] + [2024/02/08 v1.3d Input encoding file] \ProvideTextCommandDefault{\textdegree}{\ensuremath{{^\circ}}} \ProvideTextCommandDefault{\texteuro} {\TextSymbolUnavailable\texteuro} diff --git a/Master/texmf-dist/tex/latex/base/latin2.def b/Master/texmf-dist/tex/latex/base/latin2.def index 4a9f180b85d..764c5d0de5d 100644 --- a/Master/texmf-dist/tex/latex/base/latin2.def +++ b/Master/texmf-dist/tex/latex/base/latin2.def @@ -43,7 +43,7 @@ %% extension .ins) which are part of the distribution. \ProvidesFile{latin2.def} - [2021/02/14 v1.3d Input encoding file] + [2024/02/08 v1.3d Input encoding file] \ProvideTextCommandDefault{\textdegree}{\ensuremath{{^\circ}}} \ProvideTextCommandDefault{\textcurrency} {\TextSymbolUnavailable\textcurrency} diff --git a/Master/texmf-dist/tex/latex/base/latin3.def b/Master/texmf-dist/tex/latex/base/latin3.def index 6494fa8d0c9..04e1030b37c 100644 --- a/Master/texmf-dist/tex/latex/base/latin3.def +++ b/Master/texmf-dist/tex/latex/base/latin3.def @@ -43,7 +43,7 @@ %% extension .ins) which are part of the distribution. \ProvidesFile{latin3.def} - [2021/02/14 v1.3d Input encoding file] + [2024/02/08 v1.3d Input encoding file] \ProvideTextCommandDefault{\textdegree}{\ensuremath{{^\circ}}} \ProvideTextCommandDefault{\textonehalf}{\ensuremath{\frac12}} \ProvideTextCommandDefault{\textcurrency} diff --git a/Master/texmf-dist/tex/latex/base/latin4.def b/Master/texmf-dist/tex/latex/base/latin4.def index 756b13c5b17..6e2739c8704 100644 --- a/Master/texmf-dist/tex/latex/base/latin4.def +++ b/Master/texmf-dist/tex/latex/base/latin4.def @@ -43,7 +43,7 @@ %% extension .ins) which are part of the distribution. \ProvidesFile{latin4.def} - [2021/02/14 v1.3d Input encoding file] + [2024/02/08 v1.3d Input encoding file] \ProvideTextCommandDefault{\textdegree}{\ensuremath{{^\circ}}} \ProvideTextCommandDefault{\textcurrency} {\TextSymbolUnavailable\textcurrency} diff --git a/Master/texmf-dist/tex/latex/base/latin5.def b/Master/texmf-dist/tex/latex/base/latin5.def index 1a7a910dc84..8a6fb46905b 100644 --- a/Master/texmf-dist/tex/latex/base/latin5.def +++ b/Master/texmf-dist/tex/latex/base/latin5.def @@ -43,7 +43,7 @@ %% extension .ins) which are part of the distribution. \ProvidesFile{latin5.def} - [2021/02/14 v1.3d Input encoding file] + [2024/02/08 v1.3d Input encoding file] \ProvideTextCommandDefault{\textdegree}{\ensuremath{{^\circ}}} \ProvideTextCommandDefault{\textonehalf}{\ensuremath{\frac12}} \ProvideTextCommandDefault{\textonequarter}{\ensuremath{\frac14}} diff --git a/Master/texmf-dist/tex/latex/base/latin9.def b/Master/texmf-dist/tex/latex/base/latin9.def index 7ab2e06defe..35e87e2e564 100644 --- a/Master/texmf-dist/tex/latex/base/latin9.def +++ b/Master/texmf-dist/tex/latex/base/latin9.def @@ -43,7 +43,7 @@ %% extension .ins) which are part of the distribution. \ProvidesFile{latin9.def} - [2021/02/14 v1.3d Input encoding file] + [2024/02/08 v1.3d Input encoding file] \ProvideTextCommandDefault{\textdegree}{\ensuremath{{^\circ}}} \ProvideTextCommandDefault{\textcent} {\TextSymbolUnavailable\textcent} diff --git a/Master/texmf-dist/tex/latex/base/ltluatex.tex b/Master/texmf-dist/tex/latex/base/ltluatex.tex index fe226566c4e..2747e4f56f3 100644 --- a/Master/texmf-dist/tex/latex/base/ltluatex.tex +++ b/Master/texmf-dist/tex/latex/base/ltluatex.tex @@ -46,9 +46,9 @@ \ProvidesFile\undefined\begingroup\def\ProvidesFile #1#2[#3]{\endgroup\immediate\write-1{File: #1 #3}} \fi -\ProvidesFile{ltluatex.tex}% -[2023/08/03 v1.2c - LuaTeX support for plain TeX (core) +\ProvidesFile{ltluatex.tex} +[2024/02/11 v1.2c + LuaTeX support for plain TeX (core)% ] \edef\etatcatcode{\the\catcode`\@} \catcode`\@=11 diff --git a/Master/texmf-dist/tex/latex/base/ltxdoc.cls b/Master/texmf-dist/tex/latex/base/ltxdoc.cls index 04b523685c2..adee1bf9604 100644 --- a/Master/texmf-dist/tex/latex/base/ltxdoc.cls +++ b/Master/texmf-dist/tex/latex/base/ltxdoc.cls @@ -43,7 +43,7 @@ %% extension .ins) which are part of the distribution. \NeedsTeXFormat{LaTeX2e} \ProvidesClass{ltxdoc} - [2023/03/28 v2.1j Standard LaTeX documentation class] + [2024/02/08 v2.1j Standard LaTeX documentation class] \DeclareOption{a5paper}{\@latexerr{Option not supported}% {}} \newif\ifltxdoc@load@cfg@ \ltxdoc@load@cfg@true diff --git a/Master/texmf-dist/tex/latex/base/macce.def b/Master/texmf-dist/tex/latex/base/macce.def index 91b44e7c300..49b810b1320 100644 --- a/Master/texmf-dist/tex/latex/base/macce.def +++ b/Master/texmf-dist/tex/latex/base/macce.def @@ -43,7 +43,7 @@ %% extension .ins) which are part of the distribution. \ProvidesFile{macce.def} - [2021/02/14 v1.3d Input encoding file] + [2024/02/08 v1.3d Input encoding file] \ProvideTextCommandDefault{\textdegree}{\ensuremath{{^\circ}}} \ProvideTextCommandDefault{\textdiv} {\TextSymbolUnavailable\textdiv} diff --git a/Master/texmf-dist/tex/latex/base/next.def b/Master/texmf-dist/tex/latex/base/next.def index 838ef3a1e85..6cc4d6aaae7 100644 --- a/Master/texmf-dist/tex/latex/base/next.def +++ b/Master/texmf-dist/tex/latex/base/next.def @@ -43,7 +43,7 @@ %% extension .ins) which are part of the distribution. \ProvidesFile{next.def} - [2021/02/14 v1.3d Input encoding file] + [2024/02/08 v1.3d Input encoding file] \ProvideTextCommandDefault{\textdegree}{\ensuremath{{^\circ}}} \ProvideTextCommandDefault{\textonehalf}{\ensuremath{\frac12}} \ProvideTextCommandDefault{\textonequarter}{\ensuremath{\frac14}} diff --git a/Master/texmf-dist/tex/latex/base/nfssfont.tex b/Master/texmf-dist/tex/latex/base/nfssfont.tex index e842311231d..464b881ffbb 100644 --- a/Master/texmf-dist/tex/latex/base/nfssfont.tex +++ b/Master/texmf-dist/tex/latex/base/nfssfont.tex @@ -41,8 +41,8 @@ %% 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. -\def\nfssfontfileversion{v2.2e} -\def\nfssfontfiledate{2020/11/26} +\def\nfssfontfileversion{v2.2f} +\def\nfssfontfiledate{2023/11/07} \documentclass{article} @@ -100,7 +100,7 @@ {\PackageWarningNoLine{nfssfont}% {Encoding file `\next' not found.% \MessageBreak - You might have misspelt the name of the encoding + You might have misspelled the name of the encoding \MessageBreak or perhaps this encoding is not a text encoding, \MessageBreak diff --git a/Master/texmf-dist/tex/latex/base/omllcmm.fd b/Master/texmf-dist/tex/latex/base/omllcmm.fd index e618dc4dba9..322903455a3 100644 --- a/Master/texmf-dist/tex/latex/base/omllcmm.fd +++ b/Master/texmf-dist/tex/latex/base/omllcmm.fd @@ -46,7 +46,7 @@ %% making successful document exchange impossible. %% \ProvidesFile{omllcmm.fd} - [2019/07/09 v2.2f Standard LaTeX slide font definitions] + [2023/12/02 v2.2f Standard LaTeX slide font definitions] \DeclareFontFamily{OML}{lcmm}{\skewchar\font'177} \DeclareFontShape{OML}{lcmm}{m}{it}{% <7><8><10><12><13.82><16.59><19.907><23.89><28.66><34.4><41.28>cmmi8% diff --git a/Master/texmf-dist/tex/latex/base/omslcmsy.fd b/Master/texmf-dist/tex/latex/base/omslcmsy.fd index 228771692bf..89295e21cd7 100644 --- a/Master/texmf-dist/tex/latex/base/omslcmsy.fd +++ b/Master/texmf-dist/tex/latex/base/omslcmsy.fd @@ -46,7 +46,7 @@ %% making successful document exchange impossible. %% \ProvidesFile{omslcmsy.fd} - [2019/07/09 v2.2f Standard LaTeX slide font definitions] + [2023/12/02 v2.2f Standard LaTeX slide font definitions] \DeclareFontFamily{OMS}{lcmsy}{\skewchar\font'60} \DeclareFontShape{OMS}{lcmsy}{m}{n}{% <7><8><10><12><13.82><16.59><19.907><23.89><28.66><34.4><41.28>cmsy8% diff --git a/Master/texmf-dist/tex/latex/base/omxlcmex.fd b/Master/texmf-dist/tex/latex/base/omxlcmex.fd index bece1a61196..12315a1fceb 100644 --- a/Master/texmf-dist/tex/latex/base/omxlcmex.fd +++ b/Master/texmf-dist/tex/latex/base/omxlcmex.fd @@ -46,7 +46,7 @@ %% making successful document exchange impossible. %% \ProvidesFile{omxlcmex.fd} - [2019/07/09 v2.2f Standard LaTeX slide font definitions] + [2023/12/02 v2.2f Standard LaTeX slide font definitions] \DeclareFontFamily{OMX}{lcmex}{} \DeclareFontShape{OMX}{lcmex}{m}{n}{% <->sfixed*[17.28]cmex10% diff --git a/Master/texmf-dist/tex/latex/base/ot1lcmss.fd b/Master/texmf-dist/tex/latex/base/ot1lcmss.fd index 07ce6b86fd7..d7a5cb11f79 100644 --- a/Master/texmf-dist/tex/latex/base/ot1lcmss.fd +++ b/Master/texmf-dist/tex/latex/base/ot1lcmss.fd @@ -46,7 +46,7 @@ %% making successful document exchange impossible. %% \ProvidesFile{ot1lcmss.fd} - [2019/07/09 v2.2f Standard LaTeX slide font definitions] + [2023/12/02 v2.2f Standard LaTeX slide font definitions] \DeclareFontFamily{OT1}{lcmss}{\hyphenchar\font45 } \DeclareFontShape{OT1}{lcmss}{m}{n}{% <7><8><10><12><13.82><16.59><19.907><23.89><28.66><34.4><41.28>% diff --git a/Master/texmf-dist/tex/latex/base/ot1lcmtt.fd b/Master/texmf-dist/tex/latex/base/ot1lcmtt.fd index cf1d558b503..2d6d825ffe8 100644 --- a/Master/texmf-dist/tex/latex/base/ot1lcmtt.fd +++ b/Master/texmf-dist/tex/latex/base/ot1lcmtt.fd @@ -46,7 +46,7 @@ %% making successful document exchange impossible. %% \ProvidesFile{ot1lcmtt.fd} - [2019/07/09 v2.2f Standard LaTeX slide font definitions] + [2023/12/02 v2.2f Standard LaTeX slide font definitions] \DeclareFontFamily{OT1}{lcmtt}{\hyphenchar\font\m@ne} \DeclareFontShape{OT1}{lcmtt}{m}{n}{% <13.82><16.59><19.907><23.89><28.66><34.4><41.28>% diff --git a/Master/texmf-dist/tex/latex/base/preload.cfg b/Master/texmf-dist/tex/latex/base/preload.cfg index ff607f13ddd..2e89d1f4e74 100644 --- a/Master/texmf-dist/tex/latex/base/preload.cfg +++ b/Master/texmf-dist/tex/latex/base/preload.cfg @@ -35,11 +35,11 @@ %% the system are in the document `cfgguide.tex'. %% %% -%%% From File: fontdef.dtx +%%% From File: fontdef.dtx \ProvidesFile{preload.cfg} - [2021/01/15 v3.0i LaTeX Kernel -(Uncustomized preload - font setup)] + [2024/02/09 v3.0i LaTeX Kernel + (Uncustomized preload font setup) +] %% %% %% diff --git a/Master/texmf-dist/tex/latex/base/report.cls b/Master/texmf-dist/tex/latex/base/report.cls index e4225d68c30..cb7a32f536d 100644 --- a/Master/texmf-dist/tex/latex/base/report.cls +++ b/Master/texmf-dist/tex/latex/base/report.cls @@ -43,7 +43,7 @@ %% extension .ins) which are part of the distribution. \NeedsTeXFormat{LaTeX2e}[1995/12/01] \ProvidesClass{report} - [2023/05/17 v1.4n + [2024/02/08 v1.4n Standard LaTeX document class] \newcommand\@ptsize{} \newif\if@restonecol diff --git a/Master/texmf-dist/tex/latex/base/sfonts.def b/Master/texmf-dist/tex/latex/base/sfonts.def index d87f757630a..f95ded8243e 100644 --- a/Master/texmf-dist/tex/latex/base/sfonts.def +++ b/Master/texmf-dist/tex/latex/base/sfonts.def @@ -36,7 +36,7 @@ %% %% \ProvidesFile{sfonts.def} - [2019/07/09 v2.2f Standard LaTeX slide font definitions] + [2023/12/02 v2.2f Standard LaTeX slide font definitions] \DeclareErrorFont{OT1}{lcmss}{m}{n}{19.907} \DeclareFontSubstitution{OT1}{lcmss}{m}{n} \input ot1lcmss.fd diff --git a/Master/texmf-dist/tex/latex/base/shortvrb.sty b/Master/texmf-dist/tex/latex/base/shortvrb.sty index 59c0d09a811..c0266dd6930 100644 --- a/Master/texmf-dist/tex/latex/base/shortvrb.sty +++ b/Master/texmf-dist/tex/latex/base/shortvrb.sty @@ -43,11 +43,11 @@ %% extension .ins) which are part of the distribution. \NeedsTeXFormat{LaTeX2e}[1994/12/01] \ProvidesPackage{shortvrb} - [2022/11/13 v3.0m + [2024/04/26 v3.0p Standard LaTeX documentation package V3 (FMi)] %% %% Package `doc' to use with LaTeX 2e -%% Copyright (C) 1989-2022 Frank Mittelbach, all rights reserved. +%% Copyright (C) 1989-2023 Frank Mittelbach, all rights reserved. diff --git a/Master/texmf-dist/tex/latex/base/size10.clo b/Master/texmf-dist/tex/latex/base/size10.clo index 9b20cf04dc8..11be942b3e9 100644 --- a/Master/texmf-dist/tex/latex/base/size10.clo +++ b/Master/texmf-dist/tex/latex/base/size10.clo @@ -42,7 +42,7 @@ %% and covered by LPPL is defined by the unpacking scripts (with %% extension .ins) which are part of the distribution. \ProvidesFile{size10.clo} - [2023/05/17 v1.4n + [2024/02/08 v1.4n Standard LaTeX file (size option)] \renewcommand\normalsize{% \@setfontsize\normalsize\@xpt\@xiipt diff --git a/Master/texmf-dist/tex/latex/base/size11.clo b/Master/texmf-dist/tex/latex/base/size11.clo index 090d88bb534..a36fb7931ba 100644 --- a/Master/texmf-dist/tex/latex/base/size11.clo +++ b/Master/texmf-dist/tex/latex/base/size11.clo @@ -42,7 +42,7 @@ %% and covered by LPPL is defined by the unpacking scripts (with %% extension .ins) which are part of the distribution. \ProvidesFile{size11.clo} - [2023/05/17 v1.4n + [2024/02/08 v1.4n Standard LaTeX file (size option)] \renewcommand\normalsize{% \@setfontsize\normalsize\@xipt{13.6}% diff --git a/Master/texmf-dist/tex/latex/base/size12.clo b/Master/texmf-dist/tex/latex/base/size12.clo index f83b35a0ebd..aa9f0808f73 100644 --- a/Master/texmf-dist/tex/latex/base/size12.clo +++ b/Master/texmf-dist/tex/latex/base/size12.clo @@ -42,7 +42,7 @@ %% and covered by LPPL is defined by the unpacking scripts (with %% extension .ins) which are part of the distribution. \ProvidesFile{size12.clo} - [2023/05/17 v1.4n + [2024/02/08 v1.4n Standard LaTeX file (size option)] \renewcommand\normalsize{% \@setfontsize\normalsize\@xiipt{14.5}% diff --git a/Master/texmf-dist/tex/latex/base/source2edoc.cls b/Master/texmf-dist/tex/latex/base/source2edoc.cls index 5f731af7ae8..48ae49b29a2 100644 --- a/Master/texmf-dist/tex/latex/base/source2edoc.cls +++ b/Master/texmf-dist/tex/latex/base/source2edoc.cls @@ -2,12 +2,12 @@ % This class is buggy and needs fixing \ProvidesClass{source2edoc} - [2022/04/03 v0.2c Quick hack to typeset source2.tex + [2024/02/14 v0.2e Quick hack to typeset source2.tex (not usable for anything else and buggy -- will vanish again)!] -\LoadClass{l3doc} +\LoadClass[kernel]{l3doc} \RemoveFromHook{begindocument}[l3doc] % drop the standard setting making " a shortverb \AddToHook{begindocument}{\MakeShortVerb \|} % but readd | as one @@ -50,84 +50,6 @@ } - -% some l3doc's def are buggy (already fixed there but not distributed yet) - -\RenewDocumentCommand \DocInclude { m } - { - \relax\clearpage - \docincludeaux - \IfFileExists{#1.fdd} - { \cs_set:Npn \currentfile{#1.fdd} } - { \cs_set:Npn \currentfile{#1.dtx} } - \int_compare:nNnTF \@auxout = \@partaux - { \@latexerr{\string\include\space cannot~be~nested}\@eha } - { \@docinclude {#1} } % <--- braces needed! - \int_compare:nNnF { \tex_currentgrouplevel:D } = { 0 } - { - \int_compare:nNnT { \tex_interactionmode:D } = { 0 } - { \int_set:Nn \tex_interactionmode:D { 1 } } - \msg_fatal:nnn { source2edoc } { missing-endgroup } {#1} - } - } -\msg_new:nnn { source2edoc } { missing-endgroup } - { - \str_if_eq:VnTF \@currenvir { document } - { - There~are~\int_use:N \tex_currentgrouplevel:D - \c_space_tl unclosed~groups~in~#1.dtx. - } - { - The~\@currenvir \c_space_tl environment~on~line~\@currenvline - \c_space_tl doesn't~have~a~matching~\iow_char:N\\end{\@currenvir}. - } - } -\cs_gset:Npn \@docinclude #1 - { - \clearpage - \immediate\write\@mainaux{\string\@input{#1.aux}} - \@tempswatrue - \if@partsw - \@tempswafalse - \cs_set:Npx \@tempb {#1} - \clist_map_inline:Nn \@partlist - { - \if_meaning:w \@tempa \@tempb - \@tempswatrue - \fi: - } - \fi - \if@tempswa - \cs_set_eq:NN \@auxout \@partaux - \immediate\openout\@partaux #1.aux - \immediate\write\@partaux{\relax} - \cs_set_eq:NN \@ltxdoc@PrintIndex \PrintIndex - \cs_set_eq:NN \PrintIndex \relax - \cs_set_eq:NN \@ltxdoc@PrintChanges \PrintChanges - \cs_set_eq:NN \PrintChanges \relax - \cs_set_eq:NN \@ltxdoc@theglossary \theglossary - \cs_set_eq:NN \@ltxdoc@endtheglossary \endtheglossary - \part{\currentfile} - { - \cs_set_eq:NN \ttfamily\relax - \cs_gset:Npx \filekey - { \filekey,~ \thepart = { \ttfamily \currentfile } } % <-- mising spaces considered harmful - } - \DocInput{\currentfile} - \cs_set_eq:NN \PrintIndex \@ltxdoc@PrintIndex - \cs_set_eq:NN \PrintChanges \@ltxdoc@PrintChanges - \cs_set_eq:NN \theglossary \@ltxdoc@theglossary - \cs_set_eq:NN \endtheglossary \@ltxdoc@endtheglossary - \clearpage - \@writeckpt{#1} - \immediate \closeout \@partaux - \else - \@nameuse{cp@#1} - \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 @@ -176,7 +98,7 @@ dd% \else\@ctrerr\fi} \def\docincludeaux{% - \def\thepart{\aalph{part}}\def\filesep{\thepart-}% + \def\thepart{\ifnum\value{part}<10 0\fi\arabic{part}}\def\filesep{\thepart-}% \let\filekey\@gobble \g@addto@macro\index@prologue{% \gdef\@oddfoot{\parbox[t]{\textwidth}{\strut\footnotesize @@ -303,6 +225,9 @@ Bug reports can be opened (category \texttt{#1}) at\\% \AddToHook{cmd/tableofcontents/after}{\global\let\tableofcontents\relax} +% pages > 1000 +\renewcommand\@pnumwidth{2em} + \InputIfFileExists{ltxdoc.cfg} {\typeout{*************************************^^J% * Local config file ltxdoc.cfg used^^J% diff --git a/Master/texmf-dist/tex/latex/base/structuredlog.sty b/Master/texmf-dist/tex/latex/base/structuredlog.sty index 030d37d849e..6473fbc96fd 100644 --- a/Master/texmf-dist/tex/latex/base/structuredlog.sty +++ b/Master/texmf-dist/tex/latex/base/structuredlog.sty @@ -42,8 +42,8 @@ %% and covered by LPPL is defined by the unpacking scripts (with %% extension .ins) which are part of the distribution. %%% From File: ltfilehook.dtx -\providecommand\ltfilehookversion{v1.0o} -\providecommand\ltfilehookdate{2023/07/10} +\def\ltfilehookdate{2024/03/13} +\def\ltfilehookversion{v1.0o} \ProvidesExplPackage {structuredlog}{\ltfilehookdate}{\ltfilehookversion} {Structuring the TeX transcript file} diff --git a/Master/texmf-dist/tex/latex/base/syntonly.sty b/Master/texmf-dist/tex/latex/base/syntonly.sty index 7f813b145c5..4d8aa24f88f 100644 --- a/Master/texmf-dist/tex/latex/base/syntonly.sty +++ b/Master/texmf-dist/tex/latex/base/syntonly.sty @@ -43,7 +43,7 @@ %% extension .ins) which are part of the distribution. %% \ProvidesPackage{syntonly} - [2017/06/30 v2.1e Standard LaTeX2e package] + [2024/02/08 v2.1e Standard LaTeX2e package] \font\dummyft@=dummy \relax \newif\ifsyntax@ \syntax@false diff --git a/Master/texmf-dist/tex/latex/base/t1lcmss.fd b/Master/texmf-dist/tex/latex/base/t1lcmss.fd index cd217b339df..17e05a62eb5 100644 --- a/Master/texmf-dist/tex/latex/base/t1lcmss.fd +++ b/Master/texmf-dist/tex/latex/base/t1lcmss.fd @@ -46,7 +46,7 @@ %% making successful document exchange impossible. %% \ProvidesFile{t1lcmss.fd} - [2019/07/09 v2.2f Standard LaTeX slide font definitions] + [2023/12/02 v2.2f Standard LaTeX slide font definitions] \DeclareFontFamily{T1}{lcmss}{} \DeclareFontShape{T1}{lcmss}{m}{n}{% <7><8><10><12><13.82><16.59><19.907><23.89><28.66><34.4><41.28>% diff --git a/Master/texmf-dist/tex/latex/base/t1lcmtt.fd b/Master/texmf-dist/tex/latex/base/t1lcmtt.fd index faaff8c4bd6..72ad4664b2e 100644 --- a/Master/texmf-dist/tex/latex/base/t1lcmtt.fd +++ b/Master/texmf-dist/tex/latex/base/t1lcmtt.fd @@ -46,7 +46,7 @@ %% making successful document exchange impossible. %% \ProvidesFile{t1lcmtt.fd} - [2019/07/09 v2.2f Standard LaTeX slide font definitions] + [2023/12/02 v2.2f Standard LaTeX slide font definitions] \DeclareFontFamily{T1}{lcmtt}{\hyphenchar\font\m@ne} \DeclareFontShape{T1}{lcmtt}{m}{n}{% <13.82><16.59><19.907><23.89><28.66><34.4><41.28>% diff --git a/Master/texmf-dist/tex/latex/base/textcomp-2018-08-11.sty b/Master/texmf-dist/tex/latex/base/textcomp-2018-08-11.sty index 252b6ff9790..b611d19a427 100644 --- a/Master/texmf-dist/tex/latex/base/textcomp-2018-08-11.sty +++ b/Master/texmf-dist/tex/latex/base/textcomp-2018-08-11.sty @@ -408,7 +408,6 @@ {\PackageInfo{textcomp}{Local configuration file used}}{} \fi - \endinput %% %% End of file `textcomp-2018-08-11.sty'. diff --git a/Master/texmf-dist/tex/latex/base/textcomp.sty b/Master/texmf-dist/tex/latex/base/textcomp.sty index ef41c70c0b8..df0d53634de 100644 --- a/Master/texmf-dist/tex/latex/base/textcomp.sty +++ b/Master/texmf-dist/tex/latex/base/textcomp.sty @@ -42,14 +42,12 @@ %% 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]{} - +\DeclareRelease{}{1997-12-01}{textcomp-2018-08-11.sty} \DeclareRelease{}{2018-08-11}{textcomp-2018-08-11.sty} \DeclareCurrentRelease{}{2020-02-02} \ProvidesPackage{textcomp} - [2020/02/02 v2.0n Standard LaTeX package] + [2024/04/24 v2.1b Standard LaTeX package] \NeedsTeXFormat{LaTeX2e}[2020/02/02] \DeclareOption{full}{\DeclareEncodingSubset{TS1}{?}{0}} \DeclareOption{almostfull}{\DeclareEncodingSubset{TS1}{?}{1}} @@ -74,12 +72,10 @@ {#1{#2}}{#3}% #5}% } -\ExecuteOptions{info} \ProcessOptions\relax \InputIfFileExists{textcomp.cfg} {\PackageInfo{textcomp}{Local configuration file used}}{} - \endinput %% %% End of file `textcomp.sty'. diff --git a/Master/texmf-dist/tex/latex/base/ullasy.fd b/Master/texmf-dist/tex/latex/base/ullasy.fd index 3dd0dfe4cbb..f244ab86e46 100644 --- a/Master/texmf-dist/tex/latex/base/ullasy.fd +++ b/Master/texmf-dist/tex/latex/base/ullasy.fd @@ -46,7 +46,7 @@ %% making successful document exchange impossible. %% \ProvidesFile{ullasy.fd} - [2019/07/09 v2.2f Standard LaTeX slide font definitions] + [2023/12/02 v2.2f Standard LaTeX slide font definitions] \DeclareFontFamily{U}{llasy}{} \DeclareFontShape{U}{llasy}{m}{n}{% <12><13.82><16.59><19.907><23.89><28.66><34.4><41.28>lasy8% diff --git a/Master/texmf-dist/tex/latex/cyrillic/t2aenc.def b/Master/texmf-dist/tex/latex/cyrillic/t2aenc.def index 01b2ffa1402..ddd2beadd01 100644 --- a/Master/texmf-dist/tex/latex/cyrillic/t2aenc.def +++ b/Master/texmf-dist/tex/latex/cyrillic/t2aenc.def @@ -38,7 +38,7 @@ %% \NeedsTeXFormat{LaTeX2e}[1998/12/01] \ProvidesFile{t2aenc.def} - [2022/06/11 v1.0j Cyrillic encoding definition file] + [2023/11/07 v1.0k Cyrillic encoding definition file] \DeclareFontEncoding{T2A}{}{} \DeclareFontSubstitution{\LastDeclaredEncoding}{cmr}{m}{n} \DeclareTextAccent{\`}{\LastDeclaredEncoding}{0} @@ -66,7 +66,7 @@ {\hmode@bgroup \o@lign{\relax#1\crcr\hidewidth\ltx@sh@ft{-1ex}.\hidewidth}\egroup} \DeclareTextCommand{\k}{\LastDeclaredEncoding}[1] - {\oalign{\null#1\crcr\hidewidth\char12}} + {\hmode@bgroup\oalign{\null#1\crcr\hidewidth\char12}\egroup} \DeclareTextCommand{\textperthousand}{\LastDeclaredEncoding} {\%\char 24 } \DeclareTextCommand{\textpertenthousand}{\LastDeclaredEncoding} diff --git a/Master/texmf-dist/tex/latex/cyrillic/t2benc.def b/Master/texmf-dist/tex/latex/cyrillic/t2benc.def index af5141f9638..14fae2fccd9 100644 --- a/Master/texmf-dist/tex/latex/cyrillic/t2benc.def +++ b/Master/texmf-dist/tex/latex/cyrillic/t2benc.def @@ -38,7 +38,7 @@ %% \NeedsTeXFormat{LaTeX2e}[1998/12/01] \ProvidesFile{t2benc.def} - [2022/06/11 v1.0j Cyrillic encoding definition file] + [2023/11/07 v1.0k Cyrillic encoding definition file] \DeclareFontEncoding{T2B}{}{} \DeclareFontSubstitution{\LastDeclaredEncoding}{cmr}{m}{n} \DeclareTextAccent{\`}{\LastDeclaredEncoding}{0} @@ -66,7 +66,7 @@ {\hmode@bgroup \o@lign{\relax#1\crcr\hidewidth\ltx@sh@ft{-1ex}.\hidewidth}\egroup} \DeclareTextCommand{\k}{\LastDeclaredEncoding}[1] - {\oalign{\null#1\crcr\hidewidth\char12}} + {\hmode@bgroup\oalign{\null#1\crcr\hidewidth\char12}\egroup} \DeclareTextCommand{\textperthousand}{\LastDeclaredEncoding} {\%\char 24 } \DeclareTextCommand{\textpertenthousand}{\LastDeclaredEncoding} diff --git a/Master/texmf-dist/tex/latex/cyrillic/t2cenc.def b/Master/texmf-dist/tex/latex/cyrillic/t2cenc.def index be5008d0f00..40b36ca1ad2 100644 --- a/Master/texmf-dist/tex/latex/cyrillic/t2cenc.def +++ b/Master/texmf-dist/tex/latex/cyrillic/t2cenc.def @@ -38,7 +38,7 @@ %% \NeedsTeXFormat{LaTeX2e}[1998/12/01] \ProvidesFile{t2cenc.def} - [2022/06/11 v1.0j Cyrillic encoding definition file] + [2023/11/07 v1.0k Cyrillic encoding definition file] \DeclareFontEncoding{T2C}{}{} \DeclareFontSubstitution{\LastDeclaredEncoding}{cmr}{m}{n} \DeclareTextAccent{\`}{\LastDeclaredEncoding}{0} @@ -66,7 +66,7 @@ {\hmode@bgroup \o@lign{\relax#1\crcr\hidewidth\ltx@sh@ft{-1ex}.\hidewidth}\egroup} \DeclareTextCommand{\k}{\LastDeclaredEncoding}[1] - {\oalign{\null#1\crcr\hidewidth\char12}} + {\hmode@bgroup\oalign{\null#1\crcr\hidewidth\char12}\egroup} \DeclareTextCommand{\textperthousand}{\LastDeclaredEncoding} {\%\char 24 } \DeclareTextCommand{\textpertenthousand}{\LastDeclaredEncoding} diff --git a/Master/texmf-dist/tex/latex/cyrillic/x2enc.def b/Master/texmf-dist/tex/latex/cyrillic/x2enc.def index 9684f6fe14f..779b9370230 100644 --- a/Master/texmf-dist/tex/latex/cyrillic/x2enc.def +++ b/Master/texmf-dist/tex/latex/cyrillic/x2enc.def @@ -38,7 +38,7 @@ %% \NeedsTeXFormat{LaTeX2e}[1998/12/01] \ProvidesFile{x2enc.def} - [2022/06/11 v1.0j Cyrillic encoding definition file] + [2023/11/07 v1.0k Cyrillic encoding definition file] \DeclareFontEncoding{X2}{}{} \DeclareFontSubstitution{\LastDeclaredEncoding}{cmr}{m}{n} \DeclareTextAccent{\`}{\LastDeclaredEncoding}{0} @@ -66,7 +66,7 @@ {\hmode@bgroup \o@lign{\relax#1\crcr\hidewidth\ltx@sh@ft{-1ex}.\hidewidth}\egroup} \DeclareTextCommand{\k}{\LastDeclaredEncoding}[1] - {\oalign{\null#1\crcr\hidewidth\char12}} + {\hmode@bgroup\oalign{\null#1\crcr\hidewidth\char12}\egroup} \DeclareTextCommand{\textperthousand}{\LastDeclaredEncoding} {\%\char 24 } \DeclareTextCommand{\textpertenthousand}{\LastDeclaredEncoding} diff --git a/Master/texmf-dist/tex/latex/firstaid/filehook-ltx.sty b/Master/texmf-dist/tex/latex/firstaid/filehook-ltx.sty index ffff6eb4d99..3b41426d703 100644 --- a/Master/texmf-dist/tex/latex/firstaid/filehook-ltx.sty +++ b/Master/texmf-dist/tex/latex/firstaid/filehook-ltx.sty @@ -11,7 +11,7 @@ %% (but please observe conditions on bug reports sent to that address!) %% %% -%% Copyright (C) 2020-2023 +%% Copyright (C) 2020-2024 %% The LaTeX Project and any individual authors listed elsewhere %% in this file. %% @@ -30,7 +30,7 @@ %% `First Aid Bundle'. You may however distribute the LaTeX `First Aid Bundle' %% without such generated files. %% -%% File: latex2e-first-aid-for-external-files.dtx (C) Copyright 2020-2023 +%% File: latex2e-first-aid-for-external-files.dtx (C) Copyright 2020-2024 %% %% The LaTeX Project and any individual authors listed elsewhere %% in this file. diff --git a/Master/texmf-dist/tex/latex/firstaid/latex2e-first-aid-for-external-files.ltx b/Master/texmf-dist/tex/latex/firstaid/latex2e-first-aid-for-external-files.ltx index 38aa7af9196..d2317b204af 100644 --- a/Master/texmf-dist/tex/latex/firstaid/latex2e-first-aid-for-external-files.ltx +++ b/Master/texmf-dist/tex/latex/firstaid/latex2e-first-aid-for-external-files.ltx @@ -11,7 +11,7 @@ %% (but please observe conditions on bug reports sent to that address!) %% %% -%% Copyright (C) 2020-2023 +%% Copyright (C) 2020-2024 %% The LaTeX Project and any individual authors listed elsewhere %% in this file. %% @@ -30,12 +30,12 @@ %% `First Aid Bundle'. You may however distribute the LaTeX `First Aid Bundle' %% without such generated files. %% -%% File: latex2e-first-aid-for-external-files.dtx (C) Copyright 2020-2023 +%% File: latex2e-first-aid-for-external-files.dtx (C) Copyright 2020-2024 %% %% The LaTeX Project and any individual authors listed elsewhere %% in this file. -\def\LaTeXFirstAidDate{2024/02/29} -\def\LaTeXFirstAidVersion{v1.1c} +\def\LaTeXFirstAidDate{2024/03/20} +\def\LaTeXFirstAidVersion{v1.1e} \ProvidesFile{latex2e-first-aid-for-external-files.ltx} [\LaTeXFirstAidDate\space \LaTeXFirstAidVersion\space LaTeX kernel fixes to external files and packages] @@ -170,16 +170,66 @@ \AddToHook{file/underscore.sty/after}[firstaid]{% \FirstAidNeededT{underscore}{sty}{2006/09/13}{\RequirePackage{underscore-ltx}}} \AddToHook{package/acro/after}[firstaid]{% - \FirstAidNeededT{acro}{sty}{2022/04/01 v3.8 typeset acronyms and other abbreviations (CN)} - {\UseName{prop_new:c}{l__acro_tmpa_prop}}% + \FirstAidNeededT{acro}{sty}{2022/04/01 v3.8 typeset acronyms + and other abbreviations (CN)} + {\UseName{prop_new:c}{l__acro_tmpa_prop}% + \acsetup{patch/longtable=false}% + }% } \AddToHook{package/chemformula/before}[firstaid]{% \RequirePackage{l3keys2e}% } \AddToHook{package/chemnum/after}[firstaid]{% - \FirstAidNeededT{chemnum}{sty}{2021/01/21 v1.3a a comprehensive approach for the numbering of chemical compounds (CN)} + \FirstAidNeededT{chemnum}{sty}{2021/01/21 v1.3a a comprehensive + approach for the numbering of chemical compounds (CN)} {\UseName{prop_new:c}{l__chemnum_tmpa_prop}}% } +\AddToHook{package/cleveref/after}[firstaid]{% + \FirstAidNeededT{cleveref}{sty}{2018/03/27 v0.21.4 Intelligent cross-referencing} + {% + \def\cref@getref#1#2{% + \expandafter\let\expandafter#2\csname r@#1@cref\endcsname% + \expandafter\expandafter\expandafter\def% + \expandafter\expandafter\expandafter#2% + \expandafter\expandafter\expandafter{% + \expandafter\@firstoffive#2}}% <-------- five + \def\cpageref@getref#1#2{% + \expandafter\let\expandafter#2\csname r@#1@cref\endcsname% + \expandafter\expandafter\expandafter\def% + \expandafter\expandafter\expandafter#2% + \expandafter\expandafter\expandafter{% + \expandafter\@secondoffive#2}}% <----------- five + \AddToHook{begindocument}[cleveref]{% + \def\label@noarg#1{% + \cref@old@label{#1}% + \@bsphack% + \edef\@tempa{{page}{\the\c@page}}% + \setcounter{page}{1}% + \edef\@tempb{\thepage}% + \expandafter\setcounter\@tempa% + \cref@constructprefix{page}{\cref@result}% + \protected@write\@auxout{}% + {\string\newlabel{#1@cref}{{\cref@currentlabel}% + {[\@tempb][\arabic{page}][\cref@result]\thepage}{}{}{}}}% <----- five + \@esphack}% + \def\label@optarg[#1]#2{% + \cref@old@label{#2}% + \@bsphack% + \edef\@tempa{{page}{\the\c@page}}% + \setcounter{page}{1}% + \edef\@tempb{\thepage}% + \expandafter\setcounter\@tempa% + \cref@constructprefix{page}{\cref@result}% + \protected@edef\cref@currentlabel{% + \expandafter\cref@override@label@type% + \cref@currentlabel\@nil{#1}}% + \protected@write\@auxout{}% + {\string\newlabel{#2@cref}{{\cref@currentlabel}% + {[\@tempb][\arabic{page}][\cref@result]\thepage}{}{}{}}}% <------- five + \@esphack}% + } + }% +} \endinput %% %% End of file `latex2e-first-aid-for-external-files.ltx'. diff --git a/Master/texmf-dist/tex/latex/firstaid/underscore-ltx.sty b/Master/texmf-dist/tex/latex/firstaid/underscore-ltx.sty index 3a0df981742..0c5afe8215b 100644 --- a/Master/texmf-dist/tex/latex/firstaid/underscore-ltx.sty +++ b/Master/texmf-dist/tex/latex/firstaid/underscore-ltx.sty @@ -11,7 +11,7 @@ %% (but please observe conditions on bug reports sent to that address!) %% %% -%% Copyright (C) 2020-2023 +%% Copyright (C) 2020-2024 %% The LaTeX Project and any individual authors listed elsewhere %% in this file. %% @@ -30,7 +30,7 @@ %% `First Aid Bundle'. You may however distribute the LaTeX `First Aid Bundle' %% without such generated files. %% -%% File: latex2e-first-aid-for-external-files.dtx (C) Copyright 2020-2023 +%% File: latex2e-first-aid-for-external-files.dtx (C) Copyright 2020-2024 %% %% The LaTeX Project and any individual authors listed elsewhere %% in this file. diff --git a/Master/texmf-dist/tex/latex/graphics/color.sty b/Master/texmf-dist/tex/latex/graphics/color.sty index 20399e9c24f..7083345d319 100644 --- a/Master/texmf-dist/tex/latex/graphics/color.sty +++ b/Master/texmf-dist/tex/latex/graphics/color.sty @@ -12,7 +12,7 @@ %% %% %% color.dtx Copyright (C) 1994--1999 David Carlisle -%% Copyright (C) 2005-2022 LaTeX Project +%% Copyright (C) 2005-2024 LaTeX Project %% The LaTeX Project and any individual authors listed elsewhere %% in this file. %% @@ -25,7 +25,7 @@ %% \NeedsTeXFormat{LaTeX2e}[1995/12/01] \ProvidesPackage{color} - [2022/01/06 v1.3d Standard LaTeX Color (DPC)] + [2024/01/14 v1.3d Standard LaTeX Color (DPC)] \edef\Gin@codes{% \catcode`\noexpand\^^A\the\catcode`\^^A\relax \catcode`\noexpand\"\the\catcode`\"\relax diff --git a/Master/texmf-dist/tex/latex/graphics/dvipdf.def b/Master/texmf-dist/tex/latex/graphics/dvipdf.def index ac5bdeabd45..54f14b9116d 100644 --- a/Master/texmf-dist/tex/latex/graphics/dvipdf.def +++ b/Master/texmf-dist/tex/latex/graphics/dvipdf.def @@ -8,7 +8,7 @@ %% %% drivers.dtx Copyright (C) 1994 David Carlisle Sebastian Rahtz %% Copyright (C) 1995 1996 1997 1998 1999 David Carlisle -%% Copyright (C) 2000-2022 LaTeX Project +%% Copyright (C) 2000-2024 LaTeX Project %% The LaTeX Project and any individual authors listed elsewhere %% in this file. %% diff --git a/Master/texmf-dist/tex/latex/graphics/dvipsnam.def b/Master/texmf-dist/tex/latex/graphics/dvipsnam.def index 2ec3c3c2bd7..9c3e261c281 100644 --- a/Master/texmf-dist/tex/latex/graphics/dvipsnam.def +++ b/Master/texmf-dist/tex/latex/graphics/dvipsnam.def @@ -8,7 +8,7 @@ %% %% drivers.dtx Copyright (C) 1994 David Carlisle Sebastian Rahtz %% Copyright (C) 1995 1996 1997 1998 1999 David Carlisle -%% Copyright (C) 2000-2022 LaTeX Project +%% Copyright (C) 2000-2024 LaTeX Project %% The LaTeX Project and any individual authors listed elsewhere %% in this file. %% diff --git a/Master/texmf-dist/tex/latex/graphics/dvipsone.def b/Master/texmf-dist/tex/latex/graphics/dvipsone.def index ba117bf2018..0b052c068fd 100644 --- a/Master/texmf-dist/tex/latex/graphics/dvipsone.def +++ b/Master/texmf-dist/tex/latex/graphics/dvipsone.def @@ -8,7 +8,7 @@ %% %% drivers.dtx Copyright (C) 1994 David Carlisle Sebastian Rahtz %% Copyright (C) 1995 1996 1997 1998 1999 David Carlisle -%% Copyright (C) 2000-2022 LaTeX Project +%% Copyright (C) 2000-2024 LaTeX Project %% The LaTeX Project and any individual authors listed elsewhere %% in this file. %% diff --git a/Master/texmf-dist/tex/latex/graphics/dviwin.def b/Master/texmf-dist/tex/latex/graphics/dviwin.def index 2a151f81cee..6dd22108a49 100644 --- a/Master/texmf-dist/tex/latex/graphics/dviwin.def +++ b/Master/texmf-dist/tex/latex/graphics/dviwin.def @@ -8,7 +8,7 @@ %% %% drivers.dtx Copyright (C) 1994 David Carlisle Sebastian Rahtz %% Copyright (C) 1995 1996 1997 1998 1999 David Carlisle -%% Copyright (C) 2000-2022 LaTeX Project +%% Copyright (C) 2000-2024 LaTeX Project %% The LaTeX Project and any individual authors listed elsewhere %% in this file. %% diff --git a/Master/texmf-dist/tex/latex/graphics/emtex.def b/Master/texmf-dist/tex/latex/graphics/emtex.def index 5c039362be2..2bb0144563d 100644 --- a/Master/texmf-dist/tex/latex/graphics/emtex.def +++ b/Master/texmf-dist/tex/latex/graphics/emtex.def @@ -8,7 +8,7 @@ %% %% drivers.dtx Copyright (C) 1994 David Carlisle Sebastian Rahtz %% Copyright (C) 1995 1996 1997 1998 1999 David Carlisle -%% Copyright (C) 2000-2022 LaTeX Project +%% Copyright (C) 2000-2024 LaTeX Project %% The LaTeX Project and any individual authors listed elsewhere %% in this file. %% diff --git a/Master/texmf-dist/tex/latex/graphics/epsfig.sty b/Master/texmf-dist/tex/latex/graphics/epsfig.sty index b12566de4b8..10bc2aa88e1 100644 --- a/Master/texmf-dist/tex/latex/graphics/epsfig.sty +++ b/Master/texmf-dist/tex/latex/graphics/epsfig.sty @@ -12,7 +12,7 @@ %% %% %% epsfig.dtx Copyright (C) 1994-1996 1999 Sebastian Rahtz -%% Copyright (C) 2000-2022 LaTeX Project +%% Copyright (C) 2000-2024 LaTeX Project %% The LaTeX Project and any individual authors listed elsewhere %% in this file. %% @@ -23,7 +23,7 @@ %% \NeedsTeXFormat{LaTeX2e}[1994/06/01] \ProvidesPackage{epsfig} - [2017/06/25 v1.7b (e)psfig emulation (SPQR)] + [2024/01/14 v1.7b (e)psfig emulation (SPQR)] \DeclareOption*{\PassOptionsToPackage{\CurrentOption}{graphicx}} \ProcessOptions \RequirePackage{graphicx} diff --git a/Master/texmf-dist/tex/latex/graphics/graphics-2017-06-25.sty b/Master/texmf-dist/tex/latex/graphics/graphics-2017-06-25.sty index 154867d99a4..24f64431247 100644 --- a/Master/texmf-dist/tex/latex/graphics/graphics-2017-06-25.sty +++ b/Master/texmf-dist/tex/latex/graphics/graphics-2017-06-25.sty @@ -1,4 +1,8 @@ %% +%% This is an old release of `graphics.sty' used during rollback operations. +%% Do not use this file directly. +%% ============================== +%% %% This is file `graphics.sty', %% generated with the docstrip utility. %% diff --git a/Master/texmf-dist/tex/latex/graphics/graphics.sty b/Master/texmf-dist/tex/latex/graphics/graphics.sty index e8f630bc665..9d6e6c3b176 100644 --- a/Master/texmf-dist/tex/latex/graphics/graphics.sty +++ b/Master/texmf-dist/tex/latex/graphics/graphics.sty @@ -12,7 +12,7 @@ %% %% %% graphics.dtx Copyright (C) 1994 David Carlisle Sebastian Rahtz -%% Copyright (C) 1995-2022 LaTeX Project +%% Copyright (C) 1995-2024 LaTeX Project %% The LaTeX Project and any individual authors listed elsewhere %% in this file. %% @@ -24,14 +24,13 @@ %% This file has the LPPL maintenance status "maintained". %% \NeedsTeXFormat{LaTeX2e}[1995/12/01] -\providecommand\DeclareRelease[3]{} -\providecommand\DeclareCurrentRelease[2]{} +\DeclareRelease{}{1994-06-01}{graphics-2017-06-25.sty} \DeclareRelease{}{2017-06-25}{graphics-2017-06-25.sty} \DeclareCurrentRelease{}{2019-10-01} \ProvidesPackage{graphics} - [2022/03/10 v1.4e Standard LaTeX Graphics (DPC,SPQR)] + [2024/05/23 v1.4g Standard LaTeX Graphics (DPC,SPQR)] \edef\Gin@codes{% \catcode`\noexpand\^^A\the\catcode`\^^A\relax \catcode`\noexpand\"\the\catcode`\"\relax diff --git a/Master/texmf-dist/tex/latex/graphics/graphicx.sty b/Master/texmf-dist/tex/latex/graphics/graphicx.sty index 7e9bf36eac2..de9d178cb06 100644 --- a/Master/texmf-dist/tex/latex/graphics/graphicx.sty +++ b/Master/texmf-dist/tex/latex/graphics/graphicx.sty @@ -12,7 +12,7 @@ %% %% %% graphicx.dtx Copyright (C) 1994 David Carlisle Sebastian Rahtz -%% Copyright (C) 1995-2022 LaTeX Project +%% Copyright (C) 1995-2024 LaTeX Project %% The LaTeX Project and any individual authors listed elsewhere %% in this file. %% diff --git a/Master/texmf-dist/tex/latex/graphics/keyval.sty b/Master/texmf-dist/tex/latex/graphics/keyval.sty index 064d47f6e41..c422add543c 100644 --- a/Master/texmf-dist/tex/latex/graphics/keyval.sty +++ b/Master/texmf-dist/tex/latex/graphics/keyval.sty @@ -12,7 +12,7 @@ %% %% %% keyval.dtx Copyright (C) 1993 1994 1995 1997 1998 1999 David Carlisle -%% Copyright (C) 2000-2022 David Carlisle, LaTeX Project +%% Copyright (C) 2000-2024 David Carlisle, LaTeX Project %% The LaTeX Project and any individual authors listed elsewhere %% in this file. %% diff --git a/Master/texmf-dist/tex/latex/graphics/lscape.sty b/Master/texmf-dist/tex/latex/graphics/lscape.sty index 9bf9a055221..372fdcea132 100644 --- a/Master/texmf-dist/tex/latex/graphics/lscape.sty +++ b/Master/texmf-dist/tex/latex/graphics/lscape.sty @@ -12,7 +12,7 @@ %% %% %% lscape.dtx Copyright (C) 1994 1999-2000 David Carlisle -%% Copyright (C) 2000-2022 LaTeX Project +%% Copyright (C) 2000-2024 LaTeX Project %% The LaTeX Project and any individual authors listed elsewhere %% in this file. %% diff --git a/Master/texmf-dist/tex/latex/graphics/pctex32.def b/Master/texmf-dist/tex/latex/graphics/pctex32.def index 51ef24852ab..92943879a60 100644 --- a/Master/texmf-dist/tex/latex/graphics/pctex32.def +++ b/Master/texmf-dist/tex/latex/graphics/pctex32.def @@ -8,7 +8,7 @@ %% %% drivers.dtx Copyright (C) 1994 David Carlisle Sebastian Rahtz %% Copyright (C) 1995 1996 1997 1998 1999 David Carlisle -%% Copyright (C) 2000-2022 LaTeX Project +%% Copyright (C) 2000-2024 LaTeX Project %% The LaTeX Project and any individual authors listed elsewhere %% in this file. %% diff --git a/Master/texmf-dist/tex/latex/graphics/pctexhp.def b/Master/texmf-dist/tex/latex/graphics/pctexhp.def index fbc7328acd1..f334eb179ab 100644 --- a/Master/texmf-dist/tex/latex/graphics/pctexhp.def +++ b/Master/texmf-dist/tex/latex/graphics/pctexhp.def @@ -8,7 +8,7 @@ %% %% drivers.dtx Copyright (C) 1994 David Carlisle Sebastian Rahtz %% Copyright (C) 1995 1996 1997 1998 1999 David Carlisle -%% Copyright (C) 2000-2022 LaTeX Project +%% Copyright (C) 2000-2024 LaTeX Project %% The LaTeX Project and any individual authors listed elsewhere %% in this file. %% diff --git a/Master/texmf-dist/tex/latex/graphics/pctexps.def b/Master/texmf-dist/tex/latex/graphics/pctexps.def index e41507e9e65..d8c324574b0 100644 --- a/Master/texmf-dist/tex/latex/graphics/pctexps.def +++ b/Master/texmf-dist/tex/latex/graphics/pctexps.def @@ -8,7 +8,7 @@ %% %% drivers.dtx Copyright (C) 1994 David Carlisle Sebastian Rahtz %% Copyright (C) 1995 1996 1997 1998 1999 David Carlisle -%% Copyright (C) 2000-2022 LaTeX Project +%% Copyright (C) 2000-2024 LaTeX Project %% The LaTeX Project and any individual authors listed elsewhere %% in this file. %% diff --git a/Master/texmf-dist/tex/latex/graphics/pctexwin.def b/Master/texmf-dist/tex/latex/graphics/pctexwin.def index 14ed41f19ba..a25c2a7265b 100644 --- a/Master/texmf-dist/tex/latex/graphics/pctexwin.def +++ b/Master/texmf-dist/tex/latex/graphics/pctexwin.def @@ -8,7 +8,7 @@ %% %% drivers.dtx Copyright (C) 1994 David Carlisle Sebastian Rahtz %% Copyright (C) 1995 1996 1997 1998 1999 David Carlisle -%% Copyright (C) 2000-2022 LaTeX Project +%% Copyright (C) 2000-2024 LaTeX Project %% The LaTeX Project and any individual authors listed elsewhere %% in this file. %% diff --git a/Master/texmf-dist/tex/latex/graphics/rotating.sty b/Master/texmf-dist/tex/latex/graphics/rotating.sty index 5d820526c93..5d4596be493 100644 --- a/Master/texmf-dist/tex/latex/graphics/rotating.sty +++ b/Master/texmf-dist/tex/latex/graphics/rotating.sty @@ -13,7 +13,7 @@ %% %% Copyright (C) 1995-1999 Sebastian Rahtz and Leonor Barroca %% Copyright (C) 2001-2003,2007-2009 Robin Fairbairns -%% Copyright (C) 2016-2022 LaTeX Project +%% Copyright (C) 2016-2024 LaTeX Project %% The LaTeX Project and any individual authors listed elsewhere %% in this file. \NeedsTeXFormat{LaTeX2e} diff --git a/Master/texmf-dist/tex/latex/graphics/tcidvi.def b/Master/texmf-dist/tex/latex/graphics/tcidvi.def index d17b6d85e09..2e0a032dcfc 100644 --- a/Master/texmf-dist/tex/latex/graphics/tcidvi.def +++ b/Master/texmf-dist/tex/latex/graphics/tcidvi.def @@ -8,7 +8,7 @@ %% %% drivers.dtx Copyright (C) 1994 David Carlisle Sebastian Rahtz %% Copyright (C) 1995 1996 1997 1998 1999 David Carlisle -%% Copyright (C) 2000-2022 LaTeX Project +%% Copyright (C) 2000-2024 LaTeX Project %% The LaTeX Project and any individual authors listed elsewhere %% in this file. %% diff --git a/Master/texmf-dist/tex/latex/graphics/trig.sty b/Master/texmf-dist/tex/latex/graphics/trig.sty index fb1eca9143f..b5114838368 100644 --- a/Master/texmf-dist/tex/latex/graphics/trig.sty +++ b/Master/texmf-dist/tex/latex/graphics/trig.sty @@ -12,7 +12,7 @@ %% %% %% File: trig.dtx Copyright (C) 1993-1999 David Carlisle -%% Copyright (C) 2000-2022 LaTeX Project +%% Copyright (C) 2000-2024 LaTeX Project %% The LaTeX Project and any individual authors listed elsewhere %% in this file. %% @@ -23,7 +23,7 @@ %% \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{trig} - [2021/08/11 v1.11 sin cos tan (DPC)] + [2023/12/02 v1.11 sin cos tan (DPC)] \chardef\nin@ty=90 \chardef\@clxxx=180 \chardef\@lxxi=71 diff --git a/Master/texmf-dist/tex/latex/graphics/truetex.def b/Master/texmf-dist/tex/latex/graphics/truetex.def index e2318fa531e..28f11e78c86 100644 --- a/Master/texmf-dist/tex/latex/graphics/truetex.def +++ b/Master/texmf-dist/tex/latex/graphics/truetex.def @@ -8,7 +8,7 @@ %% %% drivers.dtx Copyright (C) 1994 David Carlisle Sebastian Rahtz %% Copyright (C) 1995 1996 1997 1998 1999 David Carlisle -%% Copyright (C) 2000-2022 LaTeX Project +%% Copyright (C) 2000-2024 LaTeX Project %% The LaTeX Project and any individual authors listed elsewhere %% in this file. %% diff --git a/Master/texmf-dist/tex/latex/latex-lab/bib-latex-lab-testphase.ltx b/Master/texmf-dist/tex/latex/latex-lab/bib-latex-lab-testphase.ltx index b15043fd884..ee69798ec39 100644 --- a/Master/texmf-dist/tex/latex/latex-lab/bib-latex-lab-testphase.ltx +++ b/Master/texmf-dist/tex/latex/latex-lab/bib-latex-lab-testphase.ltx @@ -33,8 +33,8 @@ %% %% %% File: latex-lab-bib.dtx (C) Copyright 2023 LaTeX Project -\def\ltlabbibdate{2023-07-20} -\def\ltlabbibversion{0.81a} +\def\ltlabbibdate{2024-02-12} +\def\ltlabbibversion{0.81b} \ProvidesFile{bib-latex-lab-testphase.ltx} [\ltlabbibdate\space v\ltlabbibversion\space latex-lab wrapper bib] diff --git a/Master/texmf-dist/tex/latex/latex-lab/block-latex-lab-testphase.ltx b/Master/texmf-dist/tex/latex/latex-lab/block-latex-lab-testphase.ltx index 98dd43bb43d..937f08d1e1c 100644 --- a/Master/texmf-dist/tex/latex/latex-lab/block-latex-lab-testphase.ltx +++ b/Master/texmf-dist/tex/latex/latex-lab/block-latex-lab-testphase.ltx @@ -32,9 +32,9 @@ %% where one can also log issues in case there are any. %% %% -%% File: latex-lab-block.dtx (C) Copyright 2021-2023 LaTeX Project -\def\ltlabblockdate{2023-09-01} -\def\ltlabblockversion{0.8h} +%% File: latex-lab-block.dtx (C) Copyright 2021-2024 LaTeX Project +\def\ltlabblockdate{2024-03-23} +\def\ltlabblockversion{0.8n} \ProvidesFile{block-latex-lab-testphase.ltx} [\ltlabblockdate\space v\ltlabblockversion\space blockenv implementation] diff --git a/Master/texmf-dist/tex/latex/latex-lab/documentmetadata-support.ltx b/Master/texmf-dist/tex/latex/latex-lab/documentmetadata-support.ltx index fa6a346a3a8..91ae548e191 100644 --- a/Master/texmf-dist/tex/latex/latex-lab/documentmetadata-support.ltx +++ b/Master/texmf-dist/tex/latex/latex-lab/documentmetadata-support.ltx @@ -33,12 +33,18 @@ %% %% %% File: documentmetadata-support.dtx -\def\documentmetadatasupportversion{1.0f} -\def\documentmetadatasupportdate{2023-09-01} +\def\documentmetadatasupportversion{1.0h} +\def\documentmetadatasupportdate{2024-03-26} + \RequirePackage{pdfmanagement-testphase} \ExplSyntaxOn\makeatletter +\clist_if_exist:NF \g__pdfmanagement_firstaidoff_clist + { \clist_new:N \g__pdfmanagement_firstaidoff_clist } +\tl_if_exist:NF \g__pdfmanagement_testphase_tl + { \tl_new:N \g__pdfmanagement_testphase_tl } + \cs_set_protected:Npn \DocumentMetadata #1 { \cs_if_eq:NNTF \documentclass \@twoclasseserror @@ -54,10 +60,24 @@ \ExplSyntaxOn\makeatletter \file_input:n {l3backend-testphase-\c_sys_backend_str.def} \ExplSyntaxOff\makeatother - \keys_set_filter:nnn { document / metadata } { init } { lang=en-US, #1 } + \keys_set_filter:nnn { document / metadata } { init } { #1 } \bool_if:NT \g__pdfmanagement_active_bool { \PassOptionsToPackage{customdriver=hgeneric-testphase}{hyperref} + \g@addto@macro\@kernel@after@begindocument + { + \pdfdict_get:nnN {g__pdf_Core/Catalog}{Lang}\l__pdfmanagement_tmpa_tl + \quark_if_no_value:NT\l__pdfmanagement_tmpa_tl + { + \tl_if_empty:eTF { \BCPdata{main.language} } + { \tl_set:Ne \l__pdfmanagement_tmpb_tl { \BCPdata{language} } } + { \tl_set:Ne \l__pdfmanagement_tmpb_tl { \BCPdata{main.language} } } + \msg_warning:nne { meta } { lang-missing }{ \l__pdfmanagement_tmpb_tl } + \exp_last_unbraced:Ne + \AddToDocumentProperties{[document]{lang}{\l__pdfmanagement_tmpb_tl}} + \pdfmanagement_add:nne {Catalog} {Lang}{(\l__pdfmanagement_tmpb_tl)} + } + } } \hook_use_once:n {pdfmanagement/add} \cs_set_protected:Npn \DocumentMetadata ##1 @@ -105,7 +125,7 @@ % this uses internal command from pdfmeta, it should probably move there ... ,pdfstandard .code:n = { - \exp_args:Nnx + \exp_args:Nne \keys_set:nn {document / metadata} {_pdfstandard=\str_uppercase:n{#1}} } ,_pdfstandard .choices:nn = @@ -117,6 +137,30 @@ } \AddToDocumentProperties [document]{pdfstandard}{#1} } + ,_pdfstandard / A-4F .code:n = + { + \prop_if_exist:cTF { g__pdfmeta_standard_pdf/A-4F_prop } + { + \prop_gset_eq:Nc \g__pdfmeta_standard_prop { g__pdfmeta_standard_pdf/A-4F_prop } + } + { + \prop_gset_eq:Nc \g__pdfmeta_standard_prop { g__pdfmeta_standard_pdf/A-4_prop } + \prop_gput:Nnn \g__pdfmeta_standard_prop{conformance}{F} + } + \AddToDocumentProperties [document]{pdfstandard}{A-4F} + } + ,_pdfstandard / A-4E .code:n = + { + \prop_if_exist:cTF { g__pdfmeta_standard_pdf/A-4E_prop } + { + \prop_gset_eq:Nc \g__pdfmeta_standard_prop { g__pdfmeta_standard_pdf/A-4E_prop } + } + { + \prop_gset_eq:Nc \g__pdfmeta_standard_prop { g__pdfmeta_standard_pdf/A-4_prop } + \prop_gput:Nnn \g__pdfmeta_standard_prop{conformance}{E} + } + \AddToDocumentProperties [document]{pdfstandard}{A-4E} + } ,_pdfstandard / unknown .code:n = { \msg_warning:nnn{pdf}{unknown-standard}{#1} @@ -130,7 +174,7 @@ { \RequirePackage{tagpdf} \AddToDocumentProperties [document]{testphase/tagpdf}{loaded} - \tagpdfsetup{activate,paratagging,interwordspace} + \tagpdfsetup{activate,para/tagging,activate/spaces} \AddToDocumentProperties [document]{tagging}{active} \AddToDocumentProperties [document]{tagging/para}{active} \AddToDocumentProperties [document]{tagging/interwordspace}{active} @@ -167,7 +211,7 @@ package/tagpdf/after } { - \tagpdfsetup{paratagging-show} + \tagpdfsetup{debug/show=para} } } ,debug / log .code:n = @@ -177,7 +221,7 @@ package/tagpdf/after } { - \tagpdfsetup{log=#1} + \tagpdfsetup{debug/log=#1} } } ,debug / tagpdf .code:n = @@ -210,6 +254,11 @@ { LaTeX-lab~package~'#1'~not~found. } +\msg_new:nnn { meta } { lang-missing } + { + The~language~has~not~been~set~in~\token_to_str:N + \DocumentMetadata.\\Setting~it~to~'#1'~as~fallback. + } \ExplSyntaxOff\makeatother \endinput %% diff --git a/Master/texmf-dist/tex/latex/latex-lab/firstaid-latex-lab-testphase.ltx b/Master/texmf-dist/tex/latex/latex-lab/firstaid-latex-lab-testphase.ltx index f8719fcdfbf..7003ae1856d 100644 --- a/Master/texmf-dist/tex/latex/latex-lab/firstaid-latex-lab-testphase.ltx +++ b/Master/texmf-dist/tex/latex/latex-lab/firstaid-latex-lab-testphase.ltx @@ -32,9 +32,9 @@ %% where one can also log issues in case there are any. %% %% -%% File: latex-lab-firstaid.dtx (C) Copyright 2023 LaTeX Project -\def\ltlabfirstaiddate{2023-07-20} -\def\ltlabfirstaidversion{0.85a} +%% File: latex-lab-firstaid.dtx (C) Copyright 2023-2024 LaTeX Project +\def\ltlabfirstaiddate{2024-05-25} +\def\ltlabfirstaidversion{0.85d} \ProvidesFile{firstaid-latex-lab-testphase.ltx} [\ltlabfirstaiddate\space v\ltlabfirstaidversion\space diff --git a/Master/texmf-dist/tex/latex/latex-lab/float-latex-lab-testphase.ltx b/Master/texmf-dist/tex/latex/latex-lab/float-latex-lab-testphase.ltx index 3f8eefffbdd..59fdaa63d95 100644 --- a/Master/texmf-dist/tex/latex/latex-lab/float-latex-lab-testphase.ltx +++ b/Master/texmf-dist/tex/latex/latex-lab/float-latex-lab-testphase.ltx @@ -33,8 +33,8 @@ %% %% %% File: latex-lab-float.dtx (C) Copyright 2023 LaTeX Project -\def\ltlabfloatdate{2023-07-20} -\def\ltlabfloatversion{0.81a} +\def\ltlabfloatdate{2024-03-23} +\def\ltlabfloatversion{0.81e} \ProvidesFile{float-latex-lab-testphase.ltx} [\ltlabfloatdate\space v\ltlabfloatversion\space latex-lab wrapper float] diff --git a/Master/texmf-dist/tex/latex/latex-lab/graphic-latex-lab-testphase.ltx b/Master/texmf-dist/tex/latex/latex-lab/graphic-latex-lab-testphase.ltx index b8d2878c302..3cc259063d4 100644 --- a/Master/texmf-dist/tex/latex/latex-lab/graphic-latex-lab-testphase.ltx +++ b/Master/texmf-dist/tex/latex/latex-lab/graphic-latex-lab-testphase.ltx @@ -32,9 +32,9 @@ %% where one can also log issues in case there are any. %% %% -%% File: latex-lab-graphic.dtx (C) Copyright 2022-2023 LaTeX Project -\def\ltlabgraphicdate{2023-10-13} -\def\ltlabgraphicversion{0.80b} +%% File: latex-lab-graphic.dtx (C) Copyright 2022-2024 LaTeX Project +\def\ltlabgraphicdate{2024-03-13} +\def\ltlabgraphicversion{0.80d} \ProvidesFile{graphic-latex-lab-testphase.ltx} [\ltlabgraphicdate\space v\ltlabgraphicversion\space latex-lab wrapper graphic] diff --git a/Master/texmf-dist/tex/latex/latex-lab/latex-lab-amsmath.ltx b/Master/texmf-dist/tex/latex/latex-lab/latex-lab-amsmath.ltx index c2431ca4eff..cab7e10f301 100644 --- a/Master/texmf-dist/tex/latex/latex-lab/latex-lab-amsmath.ltx +++ b/Master/texmf-dist/tex/latex/latex-lab/latex-lab-amsmath.ltx @@ -34,7 +34,7 @@ %% %% File: latex-lab-amsmath.dtx \ProvidesFile{latex-lab-amsmath.ltx} - [2023-01-05 v0.1a amsmath adaptions] + [2024-02-12 v0.1b amsmath adaptions] \RequirePackage{tagpdf-base} \ExplSyntaxOn \AddToHook{package/amsmath/after} @@ -43,7 +43,7 @@ \def\intertext##1{% \ifvmode\else\\\@empty\fi \noalign{% - \penalty\postdisplaypenalty\vskip\belowdisplayskip + \penalty\postdisplaypenalty\vskip-\belowdisplayskip \vbox{ \ifmeasuring@\tag_stop:\fi \normalbaselines @@ -51,13 +51,87 @@ \else \parshape\@ne \@totalleftmargin \linewidth \fi \tag_mc_end_push: - \tagpdfsetup{paratag=Span}% + \tagpdfsetup{para/tag=P}% + \tagpdfparaOn \noindent\ignorespaces##1\par \tag_mc_begin_pop:n{}}% \penalty\predisplaypenalty\vskip\abovedisplayskip% }% }} } +\AddToHook{package/amstext/after} + { + \tag_if_active:T + { + \sys_if_engine_luatex:TF + { + \def\text@#1{{% + \ifcase\mathstyle + \hbox{{#1}}\or + \hbox{{#1}}\or + \hbox{{#1}}\or + \hbox{{#1}}\or + \hbox{{\let\f@size\sf@size\selectfont#1}}\or + \hbox{{\let\f@size\sf@size\selectfont#1}}\or + \hbox{{\let\f@size\ssf@size\selectfont#1}}\or + \hbox{{\let\f@size\ssf@size\selectfont#1}}\or + \ERROR + \fi + \check@mathfonts + }} + } + { + \def\text@#1 + {{ + \int_gincr:N\g__math_mathchoice_int + \tag_stop: + \mathchoice + { + \__math_tag_if_mathstyle:en{mathchoice-\int_use:N\g__math_mathchoice_int}{0} + \textdef@\displaystyle\f@size{#1} + } + { + \__math_tag_if_mathstyle:en{mathchoice-\int_use:N\g__math_mathchoice_int}{2} + \textdef@\textstyle\f@size{\firstchoice@false #1} + } + { + \__math_tag_if_mathstyle:en{mathchoice-\int_use:N\g__math_mathchoice_int}{4} + \textdef@\textstyle\sf@size{\firstchoice@false #1} + } + { + \__math_tag_if_mathstyle:en{mathchoice-\int_use:N\g__math_mathchoice_int}{6} + \textdef@\textstyle \ssf@size{\firstchoice@false #1} + } + \check@mathfonts + }} + } + } + } +\AddToHook{package/amsbsy/after} + { + \def\pmb@@#1#2#3{\leavevmode\hbox_set:Nn\l__math_tmpa_box{xxx#3} + \dimen@-\box_wd:N\l__math_tmpa_box + \kern-.5\ex@\box_use:N\l__math_tmpa_box + \tag_mc_end:\tag_mc_begin:n{artifact} + \tag_mc_reset_box:N\l__math_tmpa_box + \kern\dimen@\kern.25\ex@\raise.4\ex@\box_use:N\l__math_tmpa_box + \kern\dimen@\kern.25\ex@\box_use_drop:N\l__math_tmpa_box + \tag_mc_end:\tag_mc_begin:n{} + } + \def\pmb@#1#2{\hbox_set:Nn\l__math_tmpa_box{$\m@th#1{#2}$} + \setboxz@h{$\m@th#1\mkern.5mu$}\pmbraise@\wdz@ + \binrel@{#2} + \dimen@-\box_wd:N\l__math_tmpa_box + \binrel@@{ + \mkern-.8mu\box_use:N\l__math_tmpa_box + \tag_mc_end:\tag_mc_begin:n{artifact} + \tag_mc_reset_box:N\l__math_tmpa_box + \kern\dimen@\mkern.4mu\raise\pmbraise@\box_use:N\l__math_tmpa_box + \kern\dimen@\mkern.4mu\box_use_drop:N\l__math_tmpa_box + \tag_mc_end:\tag_mc_begin:n{} + } + } + } \ExplSyntaxOff \endinput %% diff --git a/Master/texmf-dist/tex/latex/latex-lab/latex-lab-footmisc.ltx b/Master/texmf-dist/tex/latex/latex-lab/latex-lab-footmisc.ltx index a4c95e4cb11..954efe086a5 100644 --- a/Master/texmf-dist/tex/latex/latex-lab/latex-lab-footmisc.ltx +++ b/Master/texmf-dist/tex/latex/latex-lab/latex-lab-footmisc.ltx @@ -33,8 +33,8 @@ %% %% %% File: latex-lab-footnotes.dtx -\def\ltlabfootnotedate{2023-09-04} -\def\ltlabfootnoteversion{0.8c} +\def\ltlabfootnotedate{2024-03-12} +\def\ltlabfootnoteversion{0.8d} %% %% Copyright (c) 1995-2011 Robin Fairbairns @@ -306,8 +306,9 @@ \else \ifFN@hangfoot - \long\def\@makefntext#1{% + \long\def\footmisc@hang@makefntext#1{% \bgroup + \SuspendTagging{footmisc}% \setbox\@tempboxa\hbox{% \ifdim\footnotemargin>\z@ \hb@xt@\footnotemargin{\@makefnmark\hss}% @@ -322,14 +323,23 @@ \parshape \@ne \leftmargin \linewidth \footnotesize \@setpar{{\@@par}}% + \ResumeTagging{footmisc}% \leavevmode - \llap{\box\@tempboxa}% + \UseSocket{tagsupport/fntext/mark}% + {\llap{% + \ifdim\footnotemargin>\z@ + \hb@xt@\footnotemargin{\@makefnmark\hss}% + \else + \@makefnmark + \fi + }}% \parskip\hangfootparskip\relax \parindent\hangfootparindent\relax \footnotelayout#1% \par \egroup } + \let \@makefntext \footmisc@hang@makefntext \else @@ -580,7 +590,6 @@ \endgroup \@footnotemark } - \endinput %% %% End of file `latex-lab-footmisc.ltx'. diff --git a/Master/texmf-dist/tex/latex/latex-lab/latex-lab-footnotes.ltx b/Master/texmf-dist/tex/latex/latex-lab/latex-lab-footnotes.ltx index 38876d0c908..2277a40c6f8 100644 --- a/Master/texmf-dist/tex/latex/latex-lab/latex-lab-footnotes.ltx +++ b/Master/texmf-dist/tex/latex/latex-lab/latex-lab-footnotes.ltx @@ -33,8 +33,8 @@ %% %% %% File: latex-lab-footnotes.dtx -\def\ltlabfootnotedate{2023-09-04} -\def\ltlabfootnoteversion{0.8c} +\def\ltlabfootnotedate{2024-03-12} +\def\ltlabfootnoteversion{0.8d} \ProvidesFile{latex-lab-footnotes.ltx} [\ltlabfootnotedate\space v\ltlabfootnoteversion\space @@ -95,7 +95,9 @@ \NewHook{fntext/begin} \NewHook{fntext/end} \bool_new:N \g_fnote_debug_bool -\bool_gset_true:N \g_fnote_debug_bool + +\cs_new_protected:Npn \DebugFNotesOn { \bool_gset_true:N \g_fnote_debug_bool } +\cs_new_protected:Npn \DebugFNotesOff { \bool_gset_false:N \g_fnote_debug_bool } \cs_new_protected:Npn \__fnote_debug_footnotemark: { \bool_if:NT \g_fnote_debug_bool @@ -274,10 +276,14 @@ \tl_if_in:NnTF \l__fnote_patch_tl { \hb@xt@ } { \cs_set_eq:NN \__fnote_tmp:w \__fnote_patch_hb@xt@:w } { - \tl_if_in:NnTF \l__fnote_patch_tl { \@makefnmark } - { \cs_set_eq:NN \__fnote_tmp:w \__fnote_patch_@makefnmark:w } - { \ERROR - \cs_set_eq:NN \__fnote_tmp:w \exp_stop_f: } + \tl_if_in:NnTF \l__fnote_patch_tl { \makebox } + { \cs_set_eq:NN \__fnote_tmp:w \__fnote_patch_makebox:w } + { + \tl_if_in:NnTF \l__fnote_patch_tl { \@makefnmark } + { \cs_set_eq:NN \__fnote_tmp:w \__fnote_patch_@makefnmark:w } + { \ERROR + \cs_set_eq:NN \__fnote_tmp:w \exp_stop_f: } + } } } \tl_set:Nf \l__fnote_patch_tl @@ -289,6 +295,8 @@ { \exp_stop_f: #1 \@makefntext@processX { \hbox #2 } } \cs_new:Npn \__fnote_patch_hb@xt@:w #1 \hb@xt@ #2 # { \exp_stop_f: #1 \@makefntext@processX { \hb@xt@ #2 } } +\cs_new:Npn \__fnote_patch_makebox:w #1 \makebox #2 # + { \exp_stop_f: #1 \@makefntext@processX { \makebox #2 } } \cs_new:Npn \__fnote_patch_@makefnmark:w #1 \@makefnmark { \exp_stop_f: #1 \@makefntext@processX { \use:n } { \@makefnmark } } \cs_new:Npn \@makefntext@processX #1#2{\UseSocket{tagsupport/fntext/mark}{#1{#2}}} @@ -300,7 +308,8 @@ \cs_set_eq:NN \@makefntext \fnote_makefntext:n } { - \__fnote_patch: + \cs_if_eq:NNF \@makefntext \footmisc@hang@makefntext + { \__fnote_patch: } } } diff --git a/Master/texmf-dist/tex/latex/latex-lab/latex-lab-kernel-changes.sty b/Master/texmf-dist/tex/latex/latex-lab/latex-lab-kernel-changes.sty index f2c99285c91..1282f9d899c 100644 --- a/Master/texmf-dist/tex/latex/latex-lab/latex-lab-kernel-changes.sty +++ b/Master/texmf-dist/tex/latex/latex-lab/latex-lab-kernel-changes.sty @@ -33,9 +33,9 @@ %% where one can also log issues in case there are any. %% %% -%% File: latex-lab-toc-kernel-changes.dtx (C) Copyright 2022-2023 LaTeX Project -\def\ltlabkerneldate{2023-10-16} -\def\ltlabkernelversion{0.85b} +%% File: latex-lab-toc-kernel-changes.dtx (C) Copyright 2022-2024 LaTeX Project +\def\ltlabkerneldate{2024-02-12} +\def\ltlabkernelversion{0.85c} \ProvidesPackage{latex-lab-kernel-changes} [\ltlabkerneldate\space v\ltlabkernelversion\space General kernel and class changes] @@ -89,9 +89,9 @@ } } \ExplSyntaxOff -%% File: latex-lab-sec.dtx (C) Copyright 2022-2023 LaTeX Project -\def\ltlabsecdate{2023-10-16} -\def\ltlabsecversion{0.84b} +%% File: latex-lab-sec.dtx (C) Copyright 2022-2024 LaTeX Project +\def\ltlabsecdate{2024-02-12} +\def\ltlabsecversion{0.84c} \ifdefined\directlua \ifnum\outputmode > 0 \pdfvariable gentounicode =1 @@ -116,11 +116,11 @@ \fi \IfBooleanTF {#1} { - \tl_gset:Nx \@currentHref {#3} + \tl_gset:Ne \@currentHref {#3} } { \int_gincr:N\g__kernel_target_int - \tl_gset:Nx \@currentHref {target*.\int_use:N\g__kernel_target_int} + \tl_gset:Ne \@currentHref {target*.\int_use:N\g__kernel_target_int} } } \ExplSyntaxOff diff --git a/Master/texmf-dist/tex/latex/latex-lab/latex-lab-math.ltx b/Master/texmf-dist/tex/latex/latex-lab/latex-lab-math.ltx index 1ced324bb10..343a184d379 100644 --- a/Master/texmf-dist/tex/latex/latex-lab/latex-lab-math.ltx +++ b/Master/texmf-dist/tex/latex/latex-lab/latex-lab-math.ltx @@ -33,24 +33,476 @@ %% %% %% File: latex-lab-math.dtx -\def\ltlabmathdate{2023-09-11} -\def\ltlabmathversion{0.5c} +\def\ltlabmathdate{2024-04-16} +\def\ltlabmathversion{0.5j} \ProvidesFile{latex-lab-math.ltx} [\ltlabmathdate\space v\ltlabmathversion\space Grab all the math(s) and tag it (experiments)] \AddToHook{begindocument/before}{\RequirePackage{latex-lab-testphase-block}} \ExplSyntaxOn -\tl_gput_right:Nn \@kernel@before@begindocument - { \RequirePackage { amsmath } } +\AddToHook{begindocument/before}{ \RequirePackage { amsmath } } \bool_new:N \l__math_collected_bool +\bool_new:N \l__math_fakemath_bool \tl_new:N \g__math_grabbed_env_tl \tl_new:N \g__math_grabbed_math_tl +\tl_new:N \l__math_tmpa_tl +\skip_new:N \l__math_tmpa_skip +\tl_new:N \l__math_content_alt_tl +\tl_new:N \l__math_content_actual_tl +\tl_new:N \l__math_content_AF_source_tl +\tl_new:N \l__math_content_AF_source_tmpa_tl +\tl_new:N \l__math_content_AF_mathml_tl +\cs_new_protected:Npn \__tag_tool_close_P: + { + \tag_if_active:T + { + \tag_mc_end: %end P-chunk, should perhaps be \tag_mc_end_push: ... + \__tag_gincr_para_end_int: + \__tag_check_para_end_show:nn{red}{} %debug: show para + \tag_struct_end: + } + } +\tl_new:N\l__math_attribute_class_tl +\tagpdfsetup + {role/new-attribute = {inline} {/O /Layout /Placement/Inline}, + role/new-attribute = {display} {/O /Layout /Placement/Block}, + } +\bool_new:N\l__tag_math_texsource_AF_bool +\bool_new:N\l__tag_math_texsource_pane_bool +\bool_new:N\l__tag_math_mathml_AF_bool +\bool_new:N\g__tag_math_mathml_AF_bool +\bool_new:N\l__tag_math_mathml_pane_bool +\bool_new:N\l__tag_math_alt_bool +\int_new:N\g__math_mathml_total_int +\int_new:N\g__math_mathml_int +\int_new:N\g__math_math_total_int +\int_new:N\g__math_mathml_AF_found_int +\int_new:N\g__math_mathml_AF_attached_int +\clist_new:N\l__tag_math_mathml_files_clist +\clist_put_right:Ne\l__tag_math_mathml_files_clist {\c_sys_jobname_str-mathml} + +\cs_new_protected:Npn \__math_AF_mml:nnnn #1 #2 #3 #4 + { + \int_gincr:N \g__math_mathml_total_int + \tl_if_exist:cF { g__math_mathml_#3_tl } + { + \int_gincr:N \g__math_mathml_int + \pdfdict_put:nne {l_pdffile/Filespec} {Desc}{(mathml-#1)} + \pdffile_embed_stream:nnN {#4}{mathml-#1.xml}\l__math_tmpa_tl + \bool_if:NT \l__tag_math_mathml_pane_bool + {\pdfmanagement_add:nne {Catalog/Names}{EmbeddedFiles}{\l__math_tmpa_tl}} + \tl_new:c{g__math_mathml_#3_tl} + \tl_gset_eq:cN{g__math_mathml_#3_tl}\l__math_tmpa_tl + } + } +\cs_new_protected:Npn \__math_AF_html_reader:w#1</h2>#2<p>#3</p>#4<p>#5</p>#6<math{ + \begingroup + \char_set_catcode_other:N\{ + \char_set_catcode_other:N\} + \char_set_catcode_other:N\# + \char_set_catcode_other:N\% + \__math_AF_html_reader_verb:w{#1}{#3}{#5}<math +} +\cs_new_protected:Npn\__math_AF_html_reader_verb:w#1#2#3#4~</div>{ + \endgroup + \__math_AF_mml:nnnn{#1}{#2}{#3}{#4} + } + +\socket_new:nn {tagsupport/math/mathml/write}{0} +\socket_new_plug:nnn{tagsupport/math/mathml/write}{On} + { + \str_set:NV\l__math_tmpa_str\l__math_content_AF_source_tl + \str_replace_all:Nnn\l__math_tmpa_str{&}{&} + \str_replace_all:Nnn\l__math_tmpa_str{<}{<} + \iow_now:Ne \g__math_writedummy_iow + { + \iow_newline: + <div> + \iow_newline: + <h2>\c_backslash_str mml\c_space_tl \int_use:N \g__math_math_total_int </h2> + \iow_newline: + <p>\l__math_tmpa_str</p> + \iow_newline: + <p>\l__math_content_hash_tl </p> + \iow_newline: + <math></math> + \iow_newline: + </div> + \iow_newline: + } + } + +\keys_define:nn { __tag / setup } + { + math/mathml/write-dummy .code:n = + { + \bool_gset_true:N \g__tag_math_mathml_AF_bool + \tl_if_exist:NF\g__math_writedummy_iow + { + \iow_new:N \g__math_writedummy_iow + \iow_open:Nn \g__math_writedummy_iow + { + \c_sys_jobname_str-mathml-dummy.html + } + \iow_now:Ne \g__math_writedummy_iow + { + <!DOCTYPE~html> + \iow_newline: + <html> + } + \AssignSocketPlug {tagsupport/math/mathml/write}{On} + \AddToHook{enddocument/afterlastpage} + { + \iow_now:Nn \g__math_writedummy_iow {</html>} + \iow_close:N \g__math_writedummy_iow + } + } + }, + math/mathml/write-dummy .usage:n=preamble + } +\box_new:N\l__math_tmpa_box +\cs_new_protected:Npn \__math_AF_process_mathml_files: + { + \hbox_set:Nn \l__math_tmpa_box + { + \pdfdict_put:nnn { l_pdffile/Filespec }{AFRelationship} { /Supplement } + \pdfdict_put:nne + { l_pdffile }{Subtype} + { \pdf_name_from_unicode_e:n{application/mathml+xml} } + \char_set_catcode_other:N \# + \cs_set_eq:NN\mml \__math_AF_html_reader:w + \clist_map_inline:Nn \l__tag_math_mathml_files_clist + { + \file_if_exist:nTF {##1.html} + { + \typeout{Info:~reading~mathml~file~##1} + \file_input:n {##1.html} + \bool_gset_true:N\g__tag_math_mathml_AF_bool + } + { + \typeout{Info:~mathml~file~##1~does~not~exist}%info message + } + } + } + \bool_if:NT\g__tag_math_mathml_AF_bool + { + \typeout{Info:~Activating~mathml~support} + \AssignSocketPlug{tagsupport/math/struct/begin}{test-mathml} + \AssignSocketPlug{tagsupport/math/struct/end}{test-mathml} + \AssignSocketPlug{tagsupport/math/substruct/begin}{single} + \AssignSocketPlug{tagsupport/math/substruct/end}{single} + \AddToHook{enddocument/info} + { + \iow_term:n{MathML~statistic} + \iow_term:n{================} + \iow_term:e{==>~\int_use:N\g__math_mathml_total_int\c_space_tl + MathML~fragments~read} + \iow_term:e{==>~\int_use:N\g__math_mathml_int\c_space_tl + different~MathML~fragments} + \iow_term:e{==>~\int_use:N\g__math_math_total_int\c_space_tl + math~fragments~found} + \iow_term:e{==>~\int_use:N\g__math_mathml_AF_found_int\c_space_tl + fitting~MathML~AF~found} + \iow_term:e{==>~\int_use:N\g__math_mathml_AF_attached_int\c_space_tl + MathML~AF~attached} + } + } + } +\AddToHook{begindocument}{\__math_AF_process_mathml_files:} +\int_new:N \l__math_mathstyle_int +\int_new:N \g__math_mathchoice_int +\property_new:nnnn{mathstyle}{now}{-1}{\int_use:N \l__math_mathstyle_int } +\cs_new_protected:Npn \__math_tag_if_mathstyle:nn #1 #2 + %#1 refers to label + %#2 is a number for the mathstyle (typically 0,2,4,6) + { + \int_set:Nn \l__math_mathstyle_int {#2} + \property_record:nn {#1} { mathstyle } + \int_compare:nNnTF { \property_ref:nn {#1}{ mathstyle} } = { #2 } + { \tag_start: }{ \tag_stop: } + } +\cs_generate_variant:Nn \__math_tag_if_mathstyle:nn {en} +\keys_define:nn { __tag / setup } + { + math/mathml/sources .clist_set:N = \l__tag_math_mathml_files_clist, + math/alt/use .bool_set:N = \l__tag_math_alt_bool, + viewer/pane/mathml .bool_set:N = \l__tag_math_mathml_pane_bool, + viewer/pane/mathml .initial:n = true, + viewer/pane/mathsource .bool_set:N = \l__tag_math_texsource_pane_bool, + math/mathml/AF .bool_set:N = \l__tag_math_mathml_AF_bool, + math/mathml/AF .initial:n = true, + math/tex/AF .bool_set:N = \l__tag_math_texsource_AF_bool, + math/tex/AF .initial:n = true + } +\socket_new:nn {tagsupport/math/inline/begin}{0} +\socket_new:nn {tagsupport/math/inline/end}{0} +\socket_new:nn {tagsupport/math/inline/formula/begin}{1} % +\socket_new:nn {tagsupport/math/inline/formula/end}{0} +\socket_new_plug:nnn + {tagsupport/math/inline/begin} + {MC} + {\tag_mc_end_push:} +\socket_new_plug:nnn + {tagsupport/math/inline/end} + {MC} + {\tag_mc_begin_pop:n{}} +\socket_new_plug:nnn + {tagsupport/math/inline/formula/begin} + {default} + { + \socket_use:n{tagsupport/math/content} + \socket_use:n{tagsupport/math/struct/begin} + % inner formula if multiple parts (not really implemented yet) + \socket_use:n{tagsupport/math/substruct/begin} + #1 + \socket_use:n{tagsupport/math/end} + } +\socket_new_plug:nnn + {tagsupport/math/inline/formula/end} + {default} + { + \socket_use:n{tagsupport/math/substruct/end} + \socket_use:n{tagsupport/math/struct/end} + } +\socket_new:nn {tagsupport/math/display/begin}{0} +\socket_new:nn {tagsupport/math/display/end}{0} +\socket_new:nn {tagsupport/math/display/formula/begin}{1} % +\socket_new:nn {tagsupport/math/display/formula/end}{0} + +\socket_new_plug:nnn + {tagsupport/math/display/begin} + {default} + { \__tag_tool_close_P: } +\socket_new_plug:nnn + {tagsupport/math/display/end} + {default} + { + } + +\socket_new_plug:nnn + {tagsupport/math/display/formula/begin} + {default} + { + \socket_use:n{tagsupport/math/content} + \socket_use:n{tagsupport/math/struct/begin} + \socket_use:n{tagsupport/math/substruct/begin} + #1 + \socket_use:n{tagsupport/math/end} + } +\socket_new_plug:nnn + {tagsupport/math/display/formula/end} + {default} + { + \socket_use:n{tagsupport/math/substruct/end} + \socket_use:n{tagsupport/math/struct/end} + } +\tl_new:N\l__math_content_template_tl +\tl_set:Nn \l__math_content_template_tl + { + LaTeX~ formula~ starts~ + \exp_not:N\begin{\g__math_grabbed_env_tl} + \c_space_tl + \exp_not:V\g__math_grabbed_math_tl + \c_space_tl + \exp_not:N\end{\g__math_grabbed_env_tl} + \c_space_tl LaTeX~ formula~ ends~ + } + +\tl_new:N\l__math_texsource_template_tl +\tl_const:Nn\c__math_inline_env_tl {math} +\tl_set:Nn \l__math_texsource_template_tl + { + \tl_if_eq:NNTF\g__math_grabbed_env_tl\c__math_inline_env_tl + { + $ + \exp_not:V\g__math_grabbed_math_tl + $ + } + { + \exp_not:N\begin{\g__math_grabbed_env_tl} + \exp_not:V\g__math_grabbed_math_tl + \exp_not:N\end{\g__math_grabbed_env_tl} + } + } + +\socket_new:nn {tagsupport/math/content}{0} +\socket_new_plug:nnn + {tagsupport/math/content} + {actual+source} + { + \tl_set:Ne\l__math_content_actual_tl + { + \l__math_content_template_tl + } + \tl_set:Ne \l__math_content_AF_source_tl + { + \l__math_texsource_template_tl + } + \tl_set:Nn \l__math_content_AF_mathml_tl {} + \tl_set:Nn \l__math_content_alt_tl {} + } +\socket_new_plug:nnn + {tagsupport/math/content} + {alt+source} + { + \tl_set:Ne\l__math_content_alt_tl + { + \l__math_content_template_tl + } + \tl_set:Ne \l__math_content_AF_source_tl + { + \l__math_texsource_template_tl + } + \tl_set:Nn \l__math_content_AF_mathml_tl {} + \tl_set:Nn \l__math_content_actual_tl {} + } +\socket_assign_plug:nn {tagsupport/math/content}{alt+source} +\socket_new:nn {tagsupport/math/struct/begin}{0} +\socket_new:nn {tagsupport/math/struct/end}{0} +\socket_new_plug:nnn + {tagsupport/math/struct/begin} + {default} + { + \bool_if:NTF\l__tag_math_texsource_AF_bool + { \tl_set_eq:NN \l__math_content_AF_source_tmpa_tl \l__math_content_AF_source_tl } + { \tl_clear:N \l__math_content_AF_source_tmpa_tl } + \tag_struct_begin:n + { + tag=Formula, + texsource = \l__math_content_AF_source_tmpa_tl, + title-o = \g__math_grabbed_env_tl, + actualtext = \l__math_content_actual_tl, + alt = \l__math_content_alt_tl + } + } +\socket_new_plug:nnn + {tagsupport/math/struct/end} + {default} + { \tag_struct_end: } + +\socket_assign_plug:nn {tagsupport/math/struct/begin}{default} +\socket_assign_plug:nn {tagsupport/math/struct/end}{default} +\cs_generate_variant:Nn \str_mdfive_hash:n {o} +\tl_new:N\l__math_content_hash_tl +\tl_new:N\l__math_grabbed_math_tl +\socket_new_plug:nnn + {tagsupport/math/struct/begin} + {test-mathml} + { + \int_gincr:N\g__math_math_total_int + \tl_set:Ne\l__math_content_hash_tl + {\str_mdfive_hash:o { \l__math_content_AF_source_tl }} + \tl_set_eq:NN\l__math_grabbed_math_tl\g__math_grabbed_math_tl + \tl_if_eq:NnTF\g__math_grabbed_env_tl {math} + { + \tl_set:Nn\l__math_attribute_class_tl{inline} + } + { + \tl_set:Nn\l__math_attribute_class_tl{display} + } + \bool_if:NF\l__tag_math_alt_bool + { \tl_set:Nn \l__math_content_alt_tl{} } + \tl_if_exist:cTF { g__math_mathml_ \l__math_content_hash_tl _tl } + { + \int_gincr:N\g__math_mathml_AF_found_int + \bool_if:NTF \l__tag_math_mathml_AF_bool + { + \int_gincr:N\g__math_mathml_AF_attached_int + \typeout {Inserting~mathml~with~Hash~\l__math_content_hash_tl} + } + { + \typeout {Ignoring~mathml~with~Hash~\l__math_content_hash_tl} + } + } + { + \typeout{WARNING:~mathml~missing~for~hash~\l__math_content_hash_tl} + } + \socket_use:n {tagsupport/math/mathml/write} % write hash if request + \bool_if:NTF\l__tag_math_texsource_AF_bool + { \tl_set_eq:NN \l__math_content_AF_source_tmpa_tl \l__math_content_AF_source_tl } + { \tl_clear:N \l__math_content_AF_source_tmpa_tl } + \tag_struct_begin:n + { + tag=Formula, + attribute-class=\l__math_attribute_class_tl, % + AFref = + \bool_if:NT\l__tag_math_mathml_AF_bool + { + \cs_if_exist_use:c {g__math_mathml_ \l__math_content_hash_tl _tl} + }, + texsource = \l__math_content_AF_source_tmpa_tl, % should be after mathml AF! + title-o = \g__math_grabbed_env_tl, % + alt = \l__math_content_alt_tl + } + } +\socket_new_plug:nnn + {tagsupport/math/struct/end} + {test-mathml} + { + \tag_struct_end: + } +\socket_new:nn {tagsupport/math/substruct/begin}{0} +\socket_new:nn {tagsupport/math/substruct/end}{0} +\socket_new_plug:nnn + {tagsupport/math/substruct/begin} + {default} + { \grabaformulapartandstart } +\socket_new_plug:nnn + {tagsupport/math/substruct/end} + {default} + { + \tagmcend + \if@subformulas + \tagstructend + \fi + } +\socket_assign_plug:nn {tagsupport/math/substruct/begin}{default} +\socket_assign_plug:nn {tagsupport/math/substruct/end}{default} + +\socket_new_plug:nnn + {tagsupport/math/substruct/begin} + {single} + { + \typeout{====>subpart~splitting~deactivated} + \typeout{====>grabbed~math=\meaning\g__math_grabbed_math_tl} + \tag_mc_begin:n{} + } +\socket_new_plug:nnn + {tagsupport/math/substruct/end} + {single} + { \tag_mc_end:} +\socket_new:nn {tagsupport/math/end}{0} + +\cs_new_protected:Npn \__tag_math_disable: + { + \socket_assign_plug:nn {tagsupport/math/inline/begin}{noop} + \socket_assign_plug:nn {tagsupport/math/inline/end}{noop} + \socket_assign_plug:nn {tagsupport/math/inline/formula/begin}{identity} + \socket_assign_plug:nn {tagsupport/math/inline/formula/end}{noop} + \socket_assign_plug:nn {tagsupport/math/display/begin}{noop} + \socket_assign_plug:nn {tagsupport/math/display/end}{noop} + \socket_assign_plug:nn {tagsupport/math/display/formula/begin}{identity} + \socket_assign_plug:nn {tagsupport/math/display/formula/end}{noop} + } +\cs_new_protected:Npn \__tag_math_enable: + { + \socket_assign_plug:nn {tagsupport/math/inline/begin}{MC} + \socket_assign_plug:nn {tagsupport/math/inline/end}{MC} + \socket_assign_plug:nn {tagsupport/math/inline/formula/begin}{default} + \socket_assign_plug:nn {tagsupport/math/inline/formula/end}{default} + \socket_assign_plug:nn {tagsupport/math/display/begin}{default} + \socket_assign_plug:nn {tagsupport/math/display/end}{default} + \socket_assign_plug:nn {tagsupport/math/display/formula/begin}{default} + \socket_assign_plug:nn {tagsupport/math/display/formula/end}{default} + } +\AtBeginDocument{\tag_if_active:T{\__tag_math_enable: }} \cs_new_protected:Npn \__math_process:nn #1#2 { \legacy_if:nF { measuring@ } { - \tl_if_in:nnF {#2} { \m@th } + \tl_if_in:nnTF {#2} { \m@th } + { \bool_set_true:N\l__math_fakemath_bool } { \tl_trim_spaces_apply:nN {#2} \__math_process_auxi:nn {#1} } } } @@ -70,62 +522,39 @@ \tl_if_blank:nF {#1} { \__math_process:nn { math } {#1} % $ - \legacy_if:nTF { measuring@ } - { #1 $ } - { - \tl_if_in:nnTF {#1} { \m@th } - { #1 $ } - { - \tagmcend %end P-chunk, in code: \tag_mc_end_push: - \@kernel@math@begin - #1 $ - \@kernel@math@end - \tagmcbegin{} % restart P-chunk (whatsits in pdftex) - } - } + \bool_lazy_or:nnTF + {\legacy_if_p:n { measuring@ }} + { \l__math_fakemath_bool } + { #1 $ } + { + \tag_socket_use:n {math/inline/begin} %end P-MC + \tag_socket_use:nn {math/inline/formula/begin}{#1} + $ + \tag_socket_use:n {math/inline/formula/end} + \tag_socket_use:n {math/inline/end} % restart P-MC + } } } - -\skip_new:N \l__math_tmpa_skip - \cs_new_protected:Npn \__math_grab_dollardollar:w % $$ #1 $$ { \tl_if_blank:nF {#1} { - \__math_tag_dollardollar_display:nn { equation* }{#1} - #1 + \__math_process:nn { equation* } {#1} + \socket_use:n {tagsupport/math/display/begin} + \socket_use:nn{tagsupport/math/display/formula/begin}{#1} $$ } } -\cs_new_protected:Npn \@kernel@close@P { - \tag_if_active:T - { - \tagmcend %end P-chunk, should perhaps be \tag_mc_end_push: ... - \int_gincr:N \g__tag_para_end_int - \bool_if:NT \l__tag_para_show_bool - { \tag_mc_begin:n{artifact} - \rlap{\color_select:n{red}\tiny\ \int_use:N\g__tag_para_end_int} - \tag_mc_end: - } - \tag_struct_end: - } -} - -\cs_new_protected:Npn \__math_tag_dollardollar_display:nn #1#2 { - \__math_process:nn {#1} {#2} - \@kernel@close@P - \@kernel@math@begin -%% -} - -\cs_new_protected:Npn \__math_tag_dollardollar_display_end: { - \tagpdfparaOff - \para_raw_end: - \tagpdfparaOn - \l__math_tmpa_skip \lastskip - \@kernel@math@end - \penalty \postdisplaypenalty +\cs_new_protected:Npn \__math_tag_dollardollar_display_end: + { + % \typeout{== tag dollarldollar display end} + % \ShowTagging{struct-stack} + \para_raw_end: + \tagpdfparaOn + \l__math_tmpa_skip \lastskip + \socket_use:n{tagsupport/math/display/formula/end} + \penalty \postdisplaypenalty \skip_vertical:n { -\l__math_tmpa_skip * 2 } \@doendpe % this has no \end{...} to take care of it } @@ -135,7 +564,6 @@ { \tl_if_blank:nF {#1} { - \__math_process:nn { math } {#1} $ #1 $ } \bool_set_false:N \l__math_collected_bool @@ -162,7 +590,7 @@ \keys_set:nn { __math } {#2} \cs_gset_eq:cc { __math_env_ #1 _begin: } {#1} \cs_gset_eq:cc { __math_env_ #1 _end: } { end #1 } - \ExpandArgs { nnx } \RenewDocumentEnvironment {#1} { b } + \ExpandArgs { nne } \RenewDocumentEnvironment {#1} { b } { \exp_not:N \bool_if:NTF \exp_not:N \l__math_collected_bool { @@ -171,28 +599,19 @@ \cs_if_exist:cTF { __math_env #1 _aux: } { \exp_not:c { __math_env #1 _aux: } - ####1 \exp_not:N \__math_env_end: {#1} + ##1 \exp_not:N \__math_env_end: {#1} } - { \exp_not:N \__math_process:nn {#1} {####1} } + { \exp_not:N \__math_process:nn {#1} {##1} } \exp_not:n { \@kernel@math@registered@begin } \bool_set_true:N \exp_not:N \l__math_collected_bool } \exp_not:c { __math_env_ #1 _begin: } - ####1 + ##1 \exp_not:c { __math_env_ #1 _end: } } - { - } - } - -\cs_set_protected:Npn \__cs_tmp:w #1 - { - \group_begin: - \exp_args:No \__cs_generate_internal_variant:n - { \tl_to_str:n {#1} } - \group_end: + { + } } -\__cs_tmp:w { nnxx } \cs_new_protected:Npn \math_register_halign_env:nn #1#2 { @@ -200,7 +619,7 @@ \keys_set:nn { __math } {#2} \cs_gset_eq:cc { __math_env_ #1 _begin: } {#1} \cs_gset_eq:cc { __math_env_ #1 _end: } { end #1 } - \ExpandArgs { nnxx } \RenewDocumentEnvironment {#1} { b } + \ExpandArgs { nnee } \RenewDocumentEnvironment {#1} { b } { \exp_not:N \bool_if:NTF \exp_not:N \l__math_collected_bool { @@ -209,27 +628,26 @@ \cs_if_exist:cTF { __math_env #1 _aux: } { \exp_not:c { __math_env #1 _aux: } - ####1 \exp_not:N \__math_env_end: {#1} + ##1 \exp_not:N \__math_env_end: {#1} } - { \exp_not:N \__math_process:nn {#1} {####1} } + { \exp_not:N \__math_process:nn {#1} {##1} } \exp_not:n { \@kernel@math@registered@begin } \bool_set_true:N \exp_not:N \l__math_collected_bool } \exp_not:c { __math_env_ #1 _begin: } - ####1 + ##1 + } + { + \exp_not:c { __math_env_ #1 _end: } } - { - \exp_not:c { __math_env_ #1 _end: } - } } - \cs_new_protected:Npn \math_register_odd_env:nn #1#2 { \tl_set:Nn \l__math_env_name_tl {#1} \keys_set:nn { __math } {#2} \cs_gset_eq:cc { __math_env_ #1 _begin: } {#1} \cs_gset_eq:cc { __math_env_ #1 _end: } { end #1 } - \ExpandArgs { nnxx } \RenewDocumentEnvironment {#1} { b } + \ExpandArgs { nnee } \RenewDocumentEnvironment {#1} { b } { \exp_not:N \bool_if:NTF \exp_not:N \l__math_collected_bool { @@ -238,14 +656,14 @@ \cs_if_exist:cTF { __math_env #1 _aux: } { \exp_not:c { __math_env #1 _aux: } - ####1 \exp_not:N \__math_env_end: {#1} + ##1 \exp_not:N \__math_env_end: {#1} } - { \exp_not:N \__math_process:nn {#1} {####1} } + { \exp_not:N \__math_process:nn {#1} {##1} } \exp_not:n { \@kernel@math@registered@begin } \bool_set_true:N \exp_not:N \l__math_collected_bool } \exp_not:c { __math_env_ #1 _begin: } - ####1 + ##1 } { \exp_not:c { __math_env_ #1 _end: } @@ -257,27 +675,31 @@ \cs_new:Npn \@kernel@math@registered@begin { \mode_if_vertical:TF { - \exp_args:Noo\str_if_eq:nnF \g__tag_struct_tag_tl { \l__tag_para_main_tag_tl } % needs correction! + \tag_if_active:T + { + \exp_args:Noo\str_if_eq:nnF \g__tag_struct_tag_tl { \l__tag_para_main_tag_tl } % needs correction! { \__block_beginpar_vmode: } % needs correction! + } } { - \@kernel@close@P + \__tag_tool_close_P: } - \@kernel@math@begin + \socket_use:nn{tagsupport/math/display/formula/begin}{} \tagpdfparaOff } \cs_new:Npn \@kernel@math@registered@end { \para_raw_end: \tagpdfparaOn - \@kernel@math@end + \socket_use:n{tagsupport/math/display/formula/end} \@endpetrue } \cs_new_protected:Npn \math_register_env:n #1 { \math_register_env:nn {#1} { } } + \NewDocumentCommand \RegisterMathEnvironment { O{} m } { \math_register_env:nn {#2} {#1} } \cs_new_protected:Npn \__math_env_forward:w #1 \__math_env_end: #2 @@ -311,47 +733,15 @@ { \cs_gset_protected:Npn \[ % \] { - \bool_if:NTF \l__math_collected_bool - { \begin { equation* } } - { \__math_grab_eqn:w } + \__math_grab_eqn:w + % \bool_if:NTF \l__math_collected_bool } % \[ \cs_gset_protected:Npn \] { - \bool_if:NTF \l__math_collected_bool - { \end{ equation* } } - { \@badmath } + \@badmath } } -\tl_new:N\tmpmathcontent - -\def\@kernel@math@begin { - \tl_gset:Nx\tmpmathcontent - { - LaTeX~ formula~ starts~ - \exp_not:N\begin{\g__math_grabbed_env_tl} - \space - \exp_not:V\g__math_grabbed_math_tl - \space - \exp_not:N\end{\g__math_grabbed_env_tl} - \space LaTeX~ formula~ ends~ - } - \tagstructbegin{tag=Formula, - AFinline-o=\tmpmathcontent, - title-o=\g__math_grabbed_env_tl, - actualtext=\tmpmathcontent - } - \grabaformulapartandstart -} -\def\@kernel@math@end { - \tagmcend - \if@subformulas - \tagstructend - \else - \fi - \tagstructend -} - \exp_args:No \tex_everymath:D { \tex_the:D \tex_everymath:D @@ -379,18 +769,34 @@ } \math_register_env:n { eqnarray } \math_register_env:n { eqnarray* } -\clist_map_inline:nn - { tabular } - { - \AddToHook{ env / #1 / begin } - { \bool_set_true:N \l__math_collected_bool } - } +\RequirePackage{array} +\tl_if_in:NnT\@tabular{$} + { + \def\@tabular{% + \leavevmode + \UseTaggingSocket{tbl/hmode/begin}% + \hbox \bgroup + \bool_set_true:N \l__math_collected_bool + $ + \bool_set_false:N \l__math_collected_bool + \col@sep\tabcolsep \let\d@llarbegin\begingroup + \let\d@llarend\endgroup + \@tabarray} + } \cs_new_eq:NN \__math_m@th: \m@th \cs_gset_protected:Npn \m@th { \bool_set_true:N \l__math_collected_bool \__math_m@th: } +\tl_gput_right:Nn\@kernel@before@begindocument + { + \bool_set_true:N\l__math_collected_bool + } +\tl_gput_right:Nn\@kernel@after@begindocument + { + \bool_set_false:N\l__math_collected_bool + } \tl_gput_right:Nn \@kernel@before@begindocument { \renewenvironment{gather*}{% @@ -467,6 +873,8 @@ \def\measuring@true{\let\ifmeasuring@\iftrue\tag_stop:} \math_register_halign_env:nn {align}{} \math_register_halign_env:nn {align*}{} + \math_register_halign_env:nn {alignat}{} + \math_register_halign_env:nn {alignat*}{} \math_register_halign_env:nn {flalign}{} \math_register_halign_env:nn {flalign*}{} \math_register_halign_env:nn {gather}{} @@ -487,26 +895,6 @@ \tagmcend \tagstructend \tagmcbegin{}% \fi } - \def\intertext@{% - \def\intertext##1{% - \ifvmode\else\\\@empty\fi - \noalign{% - \penalty\postdisplaypenalty\vskip-\belowdisplayskip - \vbox{ - \ifmeasuring@\tag_stop:\fi - \normalbaselines - \ifdim\linewidth=\columnwidth - \else \parshape\@ne \@totalleftmargin \linewidth - \fi - \tag_mc_end_push: - \tagpdfsetup{paratag=P}% - \tagpdfparaOn - \noindent\ignorespaces##1\par - \tag_mc_begin_pop:n{}}% - \penalty\predisplaypenalty\vskip\abovedisplayskip% - }% - } - } \@namedef{math@cr @ @ @ gather}{% \ifst@rred\nonumber\fi &\relax @@ -538,6 +926,11 @@ \restore@math@cr } +\cs_new:Npn \__math_split_at_nl:NN #1#2 { + \tl_set:Nf \l__math_tmpa_tl { + \exp_after:wN \__math_split_at_nl_first:w #1 \\ \q_nil \\ \s_stop } + \exp_after:wN \__math_split_at_nl_aux:nnNN \l__math_tmpa_tl #1 #2 +} \cs_new:Npn \__math_split_at_nl_first:w #1 \\ #2 \\ #3 \s_stop { \quark_if_nil:nTF {#2} @@ -547,8 +940,15 @@ #2 \\ #3 \s_stop } } -\cs_new:Npn \__math_split_chk_if_begin:ww #1 \begin #2 #3 \s_mark - #4 \\ \q_nil \\ \s_stop + +\cs_new_protected:Npn \__math_split_at_nl_aux:nnNN #1 #2 #3 #4 + { + \tl_gset:Nn #4 {#1} + \tl_gset:Nn #3 {#2} + } + +\cs_new:Npn \__math_split_chk_if_begin:ww + #1 \begin #2 #3 \s_mark #4 \\ \q_nil \\ \s_stop { \quark_if_nil:nTF {#2} { {#1} {#4} } @@ -558,7 +958,9 @@ { } { 1 } } } + \cs_new:Npn \__math_split_cleanup_begin_q_nil:w #1 \begin \q_nil {#1} + \cs_new:Npn \__math_split_collect_one_end:w #1 \end #2 #3 \s_stop #4 #5 { \exp_args:Nf \__math_split_check_count_begins:nnnn @@ -567,14 +969,16 @@ } \cs_new:Npn \__math_split_count_begins:n #1 { \int_eval:n { 0 \__math_split_count_begins:w #1 \begin \q_nil } } + \cs_new:Npn \__math_split_count_begins:w #1 \begin #2 { \quark_if_nil:nF {#2} { +1 \__math_split_count_begins:w } } + \cs_new:Npn \__math_split_check_count_begins:nnnn #1 #2 #3 #4 { \int_compare:nNnTF {#1} = {#2} { \exp_last_unbraced:Nf \__math_split_final_cleanup:nn - { \split:n { \__math_split_guard:n {#3} #4 } } + { \__math_split:n { \__math_split_guard:n {#3} #4 } } } { \exp_args:No \use_ii_i:nn @@ -594,28 +998,10 @@ { \exp_end: { #4 #1 } } { \__math_split_final_cleanup:w #3 \s_mark { #4 #1 #2 } } } -\NewDocumentCommand \splitnl { mm +m } - { - \tl_set:Nf \l_tmpa_tl { \split:n {#3} } - \show \l_tmpa_tl - \exp_after:wN \__splitnl_aux:nnNN \l_tmpa_tl #1 #2 - } -\cs_new:Npn \split:n #1 { +\cs_new:Npn \__math_split:n #1 { \__math_split_at_nl_first:w #1 \\ \q_nil \\ \s_stop } -\cs_new:Npn \__math_split_at_nl:NN #1#2 { - \tl_set:Nf \l_tmpa_tl { - \exp_after:wN \__math_split_at_nl_first:w #1 \\ \q_nil \\ \s_stop } - \exp_after:wN \__math_split_at_nl_aux:nnNN \l_tmpa_tl #1 #2 -} - -\cs_new_protected:Npn \__math_split_at_nl_aux:nnNN #1 #2 #3 #4 - { - \tl_gset:Nn #4 {#1} - \tl_gset:Nn #3 {#2} -} - \newif\if@subformulas \tl_new:N \result @@ -634,6 +1020,7 @@ \global\@subformulastrue \edef\resulttitle{\g__math_grabbed_env_tl\space (part)} \tagstructbegin{tag=Formula, + alt = subformula, title-o=\resulttitle } } diff --git a/Master/texmf-dist/tex/latex/latex-lab/latex-lab-mathpkg.ltx b/Master/texmf-dist/tex/latex/latex-lab/latex-lab-mathpkg.ltx index ca7d617a0a6..71a110c602f 100644 --- a/Master/texmf-dist/tex/latex/latex-lab/latex-lab-mathpkg.ltx +++ b/Master/texmf-dist/tex/latex/latex-lab/latex-lab-mathpkg.ltx @@ -35,7 +35,6 @@ %% File: latex-lab-mathpkg.dtx \ProvidesFile{latex-lab-mathpkg.ltx} [2023-01-05 v0.1a mathpkg adaptions] -\RequirePackage{tagpdf-base} \AddToHook{package/breqn/after}{ \RegisterMathEnvironment{dmath} \RegisterMathEnvironment{dgroup*} @@ -46,6 +45,23 @@ \AddToHook{package/cases/after}{ \RegisterMathEnvironment{subnumcases} } +\ExplSyntaxOn +\AddToHook{package/bm/after} + { + \def\bm@pmb@@#1#2#3{{% + \hbox_set:Nn\l__math_tmpa_box{$\m@th#1#3$}% + \dimen@#2\wd\tw@ + \rlap{\box_use:N\l__math_tmpa_box}% + \tag_mc_end:\tag_mc_begin:n{artifact} + \tag_mc_reset_box:N\l__math_tmpa_box + \kern\dimen@ + \raise1.5\dimen@\rlap{\box_use:N\l__math_tmpa_box}% + \kern\dimen@ + \box_use_drop:N\l__math_tmpa_box + \tag_mc_end:\tag_mc_begin:n{}% + }} + } +\ExplSyntaxOff \endinput %% %% End of file `latex-lab-mathpkg.ltx'. diff --git a/Master/texmf-dist/tex/latex/latex-lab/latex-lab-mathtools.ltx b/Master/texmf-dist/tex/latex/latex-lab/latex-lab-mathtools.ltx index 575490f5803..43663b8f9ef 100644 --- a/Master/texmf-dist/tex/latex/latex-lab/latex-lab-mathtools.ltx +++ b/Master/texmf-dist/tex/latex/latex-lab/latex-lab-mathtools.ltx @@ -60,7 +60,7 @@ \def\intertext##1{% \ifvmode\else\\\@empty\fi \noalign{% - \penalty\postdisplaypenalty\vskip\belowdisplayskip + \penalty\postdisplaypenalty\vskip-\belowdisplayskip \vskip-\lineskiplimit % CCS \vskip\normallineskiplimit % CCS \vskip\l_MT_above_intertext_sep @@ -77,7 +77,7 @@ \else \parshape\@ne \@totalleftmargin \linewidth \fi \tag_mc_end_push: - \tagpdfsetup{paratag=Span} + \tagpdfsetup{para/tag=Span} \noindent\ignorespaces##1\par \tag_mc_begin_pop:n{}}% \penalty\predisplaypenalty\vskip\abovedisplayskip% @@ -106,7 +106,8 @@ \parshape\@ne \@totalleftmargin \linewidth \MH_fi: \tag_mc_end_push: - \tagpdfsetup{paratag=Span} + \tagpdfsetup{para/tag=Span} + \tagpdfparaOn \noindent\ignorespaces#1\par \tag_mc_begin_pop:n{}} \penalty\predisplaypenalty\vskip\abovedisplayshortskip% @@ -134,7 +135,8 @@ \parshape\@ne \@totalleftmargin \linewidth \MH_fi: \tag_mc_end_push: - \tagpdfsetup{paratag=Span} + \tagpdfsetup{para/tag=P} + \tagpdfparaOn \noindent\ignorespaces#1\par \tag_mc_begin_pop:n{}}% \penalty\predisplaypenalty\vskip\abovedisplayshortskip% diff --git a/Master/texmf-dist/tex/latex/latex-lab/latex-lab-testphase-bib.sty b/Master/texmf-dist/tex/latex/latex-lab/latex-lab-testphase-bib.sty index 9261393042e..4cfa0b055c8 100644 --- a/Master/texmf-dist/tex/latex/latex-lab/latex-lab-testphase-bib.sty +++ b/Master/texmf-dist/tex/latex/latex-lab/latex-lab-testphase-bib.sty @@ -33,8 +33,8 @@ %% %% %% File: latex-lab-bib.dtx (C) Copyright 2023 LaTeX Project -\def\ltlabbibdate{2023-07-20} -\def\ltlabbibversion{0.81a} +\def\ltlabbibdate{2024-02-12} +\def\ltlabbibversion{0.81b} \ProvidesExplPackage {latex-lab-testphase-bib} {\ltlabbibdate} {\ltlabbibversion} {Code related to the tagging of bibliography and cite command} \RequirePackage{latex-lab-testphase-block} @@ -90,7 +90,7 @@ \AddToHookWithArguments{bibcite/before} { \tag_mc_end_push: - \exp_args:Nx\tagstructbegin{tag=Reference,ref=cite.#1\@extra@b@citeb} + \exp_args:Ne\tagstructbegin{tag=Reference,ref=cite.#1\@extra@b@citeb} \tagmcbegin{} } \AddToHookWithArguments{bibcite/after}[tag] @@ -118,7 +118,7 @@ { \leavevmode \tag_mc_end_push: - \exp_args:Nx\tag_struct_begin:n{tag=Reference,ref=cite.#1\@extra@b@citeb} + \exp_args:Ne\tag_struct_begin:n{tag=Reference,ref=cite.#1\@extra@b@citeb} \tag_mc_begin:n{} } \AddToHook{cmd/hyper@natlinkend/after} diff --git a/Master/texmf-dist/tex/latex/latex-lab/latex-lab-testphase-block.sty b/Master/texmf-dist/tex/latex/latex-lab/latex-lab-testphase-block.sty index 2764ca6d8bb..a4d646636fc 100644 --- a/Master/texmf-dist/tex/latex/latex-lab/latex-lab-testphase-block.sty +++ b/Master/texmf-dist/tex/latex/latex-lab/latex-lab-testphase-block.sty @@ -32,18 +32,16 @@ %% where one can also log issues in case there are any. %% %% -%% File: latex-lab-block.dtx (C) Copyright 2021-2023 LaTeX Project -\def\ltlabblockdate{2023-09-01} -\def\ltlabblockversion{0.8h} +%% File: latex-lab-block.dtx (C) Copyright 2021-2024 LaTeX Project +\def\ltlabblockdate{2024-03-23} +\def\ltlabblockversion{0.8n} \ProvidesPackage {latex-lab-testphase-block} [\ltlabblockdate\space v\ltlabblockversion\space blockenv implementation] -\RequirePackage{xtemplate} \RequirePackage{latex-lab-kernel-changes} \ExplSyntaxOn \tl_new:N \l__block_item_align_tl \tl_new:N\l__block_legacy_env_params_tl - \def\@doendpe{\@endpetrue \def\par { @@ -62,11 +60,11 @@ \cs_new_eq:NN \__kernel_displayblock_doendpe: \prg_do_nothing: \def\@endpetrue {\global\let\if@endpe\iftrue} \def\@endpefalse{\global\let\if@endpe\iffalse} -\DeclareObjectType{blockenv}{1} -\DeclareObjectType{block}{1} -\DeclareObjectType{para}{1} -\DeclareObjectType{list}{1} -\DeclareObjectType{item}{1} +\NewTemplateType{blockenv}{1} +\NewTemplateType{block}{1} +\NewTemplateType{para}{1} +\NewTemplateType{list}{1} +\NewTemplateType{item}{1} \DeclareTemplateInterface{blockenv}{display}{1} { env-name : tokenlist , @@ -119,7 +117,7 @@ item-instance : instance{item} = basic , item-skip : skip = \itemsep , item-penalty : integer = \UseName{@itempenalty} , - item-indent : length = 0pt , % was \itemindent + item-indent : length = \itemindent , label-width : length = \labelwidth , label-sep : length = \labelsep , legacy-support : boolean = false , @@ -301,14 +299,14 @@ \@definecounter {#2} \IfNoValueTF {#4} { % @ynthm - \tl_gset:cx { the #2 } + \tl_gset:ce { the #2 } { \@thmcounter{#2} } } { % @xnthm \@newctr{#1}[#4] - \tl_gset:cx { the #2 } + \tl_gset:ce { the #2 } { \expandafter\noexpand\csname the#4\endcsname \@thmcountersep @@ -517,7 +515,7 @@ fixed-word-spaces = \l__par_fixed_word_spaces_bool , % name?? final-hyphen-demerits = \finalhyphendemerits , cr-cmd = \\ , - para-class = \l_tag_para_attr_class_tl , + para-class = \l__tag_para_attr_class_tl , } { \tl_if_empty:nF {#1} { \SetTemplateKeys{para}{std}{#1} } @@ -814,8 +812,11 @@ \RenewDocumentCommand{\item}{ ={label}o } { \@inmatherr \item - \tl_if_empty:oTF \__block_item_instance:n %%FMi? - { \msg_error:nnn { __block } { item-in-nonlist } { \item[{#1}] } } + \cs_if_free:NTF \__block_item_instance:n + { + \@latex@error{Lonely~\string\item--perhaps~a~missing~ + list~environment}\@ehc + } { \legacy_if:nTF { @newlist } { \__kernel_list_item_begin: } @@ -1131,15 +1132,16 @@ \DeclareInstance{item}{description}{std} { label-format = \normalfont\bfseries #1 , + label-align = left } \tag_if_active:T { \tagpdfsetup { - newattribute = {justify} {/O /Layout /TextAlign/Justify}, - newattribute = {center} {/O /Layout /TextAlign/Center}, - newattribute = {raggedright}{/O /Layout /TextAlign/Start}, - newattribute = {raggedleft} {/O /Layout /TextAlign/End}, + role/new-attribute = {justify} {/O /Layout /TextAlign/Justify}, + role/new-attribute = {center} {/O /Layout /TextAlign/Center}, + role/new-attribute = {raggedright}{/O /Layout /TextAlign/Start}, + role/new-attribute = {raggedleft} {/O /Layout /TextAlign/End}, } } \DeclareInstance{para}{center}{std} @@ -1203,15 +1205,20 @@ { \int_compare:nNnT \l__block_flattened_level_int < 2 { - \int_gincr:N \g__tag_para_main_begin_int - \tagstructbegin{tag=\l__tag_para_main_tag_tl} + \__tag_gincr_para_main_begin_int: + \tag_struct_begin:n + { + tag=\l__tag_para_main_tag_tl, + attribute-class=\l__tag_para_main_attr_class_tl, + } + \__tag_para_main_store_struct: } } } \cs_set:Npn \__block_beginpar_hmode:N #1 { \tag_mc_end: - \int_gincr:N \g__tag_para_end_int + \__tag_gincr_para_end_int: \__block_debug_typeout:n{increment~ /P \on@line } \bool_if:NT \l__tag_para_show_bool { \tag_mc_begin:n{artifact} @@ -1234,7 +1241,7 @@ { \__block_debug_typeout:n{Structure-end~ \l__tag_para_main_tag_tl\space after~ displayblock \on@line } - \int_gincr:N \g__tag_para_main_end_int + \__tag_gincr_para_main_end_int: \tag_struct_end: %text-unit } } @@ -1257,16 +1264,21 @@ { \bool_if:NF \l__tag_para_flattened_bool { - \int_gincr:N \g__tag_para_main_begin_int - \tag_struct_begin:n{tag=\l__tag_para_main_tag_tl} + \__tag_gincr_para_main_begin_int: + \tag_struct_begin:n + { + tag=\l__tag_para_main_tag_tl, + attribute-class=\l__tag_para_main_attr_class_tl, + } + \__tag_para_main_store_struct: } } - \int_gincr:N \g__tag_para_begin_int + \__tag_gincr_para_begin_int: \__block_debug_typeout:n{increment~ P \on@line } \tag_struct_begin:n { tag=\l__tag_para_tag_tl - ,attribute-class=\l_tag_para_attr_class_tl + ,attribute-class=\l__tag_para_attr_class_tl } \__tag_check_para_begin_show:nn {green}{#1} \tag_mc_begin:n {} @@ -1274,15 +1286,20 @@ \cs_new_protected:Npn \__block_start_para_structure_unconditionally:n #1 { \bool_if:NF \l__tag_para_flattened_bool { - \int_gincr:N \g__tag_para_main_begin_int - \tag_struct_begin:n{tag=\l__tag_para_main_tag_tl} + \__tag_gincr_para_main_begin_int: + \tag_struct_begin:n + { + tag=\l__tag_para_main_tag_tl, + attribute-class=\l__tag_para_main_attr_class_tl, + } + \__tag_para_main_store_struct: } - \int_gincr:N \g__tag_para_begin_int + \__tag_gincr_para_begin_int: \__block_debug_typeout:n{increment~ P \on@line } \tag_struct_begin:n { tag=\l__tag_para_tag_tl - ,attribute-class=\l_tag_para_attr_class_tl + ,attribute-class=\l__tag_para_attr_class_tl } \__tag_check_para_begin_show:nn {green}{#1} \tag_mc_begin:n {} @@ -1292,14 +1309,14 @@ { \bool_if:NT \l__tag_para_bool { - \int_gincr:N \g__tag_para_end_int + \__tag_gincr_para_end_int: \__block_debug_typeout:n{increment~ /P \on@line } \tag_mc_end: \__tag_check_para_end_show:nn {red}{} \tag_struct_end: \bool_if:NF \l__tag_para_flattened_bool { - \int_gincr:N \g__tag_para_main_end_int + \__tag_gincr_para_main_end_int: \tag_struct_end: } } @@ -1334,7 +1351,7 @@ \DeclareRobustCommand*\begin[1]{% \UseHook{env/#1/before}% \@ifundefined{#1}% - {\def\reserved@a{\@latex@error{Environment #1 undefined}\@eha}}% + {\def\reserved@a{\@latex@error{Environment~#1~undefined}\@eha}}% {\def\reserved@a{\def\@currenvir{#1}% \edef\@currenvline{\on@line}% \@execute@begin@hook{#1}% @@ -1349,7 +1366,7 @@ { \bool_if:NF \l__tag_para_flattened_bool { - \int_gincr:N \g__tag_para_main_end_int + \__tag_gincr_para_main_end_int: \tag_struct_end: } \@endpefalse @@ -1369,7 +1386,7 @@ \__block_debug_typeout:n{block-end \on@line} \legacy_if:nT { @endpe } { - \int_gincr:N \g__tag_para_main_end_int + \__tag_gincr_para_main_end_int: \__block_debug_typeout:n{close~ /text-unit \on@line} \tagstructend } @@ -1384,11 +1401,11 @@ { \tagpdfsetup { + role/new-attribute = {itemize}{/O /List /ListNumbering/Unordered}, + role/new-attribute = {enumerate}{/O /List /ListNumbering/Ordered}, + role/new-attribute = {description}{/O /List /ListNumbering/Description}, % default if unknown - newattribute = {list}{/O /List /ListNumbering/None}, - newattribute = {itemize}{/O /List /ListNumbering/Unordered}, - newattribute = {enumerate}{/O /List /ListNumbering/Ordered}, - newattribute = {description}{/O /List /ListNumbering/Description}, + role/new-attribute = {list}{/O /List /ListNumbering/Unordered}, } } \def\LItag{LI} @@ -1413,7 +1430,7 @@ \cs_set:Npn \__block_list_item_end: { \legacy_if:nT { @endpe } { - \int_gincr:N \g__tag_para_main_end_int + \__tag_gincr_para_main_end_int: \tagstructend % text-unit } \tagstructend \tagstructend % end LBody, LI @@ -1421,7 +1438,7 @@ \cs_set:Npn \__block_list_end: { \legacy_if:nT { @endpe } { - \int_gincr:N \g__tag_para_main_end_int + \__tag_gincr_para_main_end_int: \tagstructend % text-unit \__block_debug_typeout:n{Structure-end~ P~ at~ list-end \on@line } } diff --git a/Master/texmf-dist/tex/latex/latex-lab/latex-lab-testphase-firstaid.sty b/Master/texmf-dist/tex/latex/latex-lab/latex-lab-testphase-firstaid.sty index 7ea7fe54bec..552dfee1832 100644 --- a/Master/texmf-dist/tex/latex/latex-lab/latex-lab-testphase-firstaid.sty +++ b/Master/texmf-dist/tex/latex/latex-lab/latex-lab-testphase-firstaid.sty @@ -32,14 +32,59 @@ %% where one can also log issues in case there are any. %% %% -%% File: latex-lab-firstaid.dtx (C) Copyright 2023 LaTeX Project -\def\ltlabfirstaiddate{2023-07-20} -\def\ltlabfirstaidversion{0.85a} +%% File: latex-lab-firstaid.dtx (C) Copyright 2023-2024 LaTeX Project +\def\ltlabfirstaiddate{2024-05-25} +\def\ltlabfirstaidversion{0.85d} \ProvidesPackage {latex-lab-testphase-firstaid} [% \ltlabfirstaiddate\space v\ltlabfirstaiddate\space Temporary patches to external packages needed for the tagging project] +\ExplSyntaxOn +\providecommand\FirstAidNeededT[3]{ + \exp_args:Ncx\str_if_eq:onF{ver@#1.#2}{#3} + { \typeout{==>~ First~ Aid~ for~ #1.#2~ no~ longer~ applied!^^J + \@spaces Expected:^^J + \@spaces\@spaces #3^^J + \@spaces but~ found:^^J + \@spaces\@spaces \use:c{ver@#1.#2}^^J + \@spaces so~ I'm~ assuming~ it~ got~ fixed. + } } + \exp_args:Ncx\str_if_eq:onT{ver@#1.#2}{#3} +} +\ExplSyntaxOff +\AddToHook{class/amsart/after} + {\def\@author{\authors}} +\AddToHook{class/amsbook/after} + {\def\@author{\authors}} +\AddToHook{package/verse/after}[latex-lab-firstaid]{% + \FirstAidNeededT{verse}{sty}{2014/05/10 v2.4b verse typesetting}% + {% + \AtBeginDocument{% + \renewenvironment{verse}[1][\linewidth]{% + \stepcounter{verse@envctr}% + \setcounter{poemline}{0}\refstepcounter{poemline}% + \setcounter{vslineno}{1}% + \let\\=\@vscentercr + \list{}{\itemsep \z@ + \itemindent -\vindent + \listparindent\itemindent + \parsep \stanzaskip + \ifdim #1 < \linewidth + \rightmargin \z@ + \setlength{\leftmargin}{\linewidth}% + \addtolength{\leftmargin}{-#1}% + \addtolength{\leftmargin}{-0.5\leftmargin}% + \else + \rightmargin \leftmargin + \fi + \addtolength{\leftmargin}{\vindent}}% + \item[]% + }% + {\endlist}% + }% + }% +} \AddToHook{file/blindtext.sty/after}[latex-lab-firstaid]{% \FirstAidNeededT{blindtext}{sty}{\blindfiledate\space\blindfileversion\space% blindtext-Package}% @@ -89,6 +134,31 @@ {\refstepcounter@optarg[#1]{#2}}% }% } +\ExplSyntaxOn +\AddToHook{package/booktabs/after} + { + \def\@cmidrulea{ + \multispan\@cmidla + &\multispan\@cmidlb + \unskip\hskip\cmrkern@l + { + \tag_mc_begin:n{artifact} + \CT@arc@\leaders\hrule \@height\@thisrulewidth\hfill\kern\z@} + \hskip\cmrkern@r + \tag_mc_end: \int_gdecr:N \g__tbl_row_int + \cr} + + \def\@cmidruleb{% + \multispan\@cmidlb + \unskip\hskip \cmrkern@l% + { + \tag_mc_begin:n{artifact} + \CT@arc@\leaders\hrule \@height\@thisrulewidth\hfill\kern\z@} + \hskip\cmrkern@r + \tag_mc_end: \int_gdecr:N \g__tbl_row_int + \cr} + } +\ExplSyntaxOff \endinput %% %% End of file `latex-lab-testphase-firstaid.sty'. diff --git a/Master/texmf-dist/tex/latex/latex-lab/latex-lab-testphase-float.sty b/Master/texmf-dist/tex/latex/latex-lab/latex-lab-testphase-float.sty index 8b38e4aedef..a944c944b20 100644 --- a/Master/texmf-dist/tex/latex/latex-lab/latex-lab-testphase-float.sty +++ b/Master/texmf-dist/tex/latex/latex-lab/latex-lab-testphase-float.sty @@ -33,8 +33,8 @@ %% %% %% File: latex-lab-float.dtx (C) Copyright 2023 LaTeX Project -\def\ltlabfloatdate{2023-07-20} -\def\ltlabfloatversion{0.81a} +\def\ltlabfloatdate{2024-03-23} +\def\ltlabfloatversion{0.81e} \ProvidesExplPackage {latex-lab-testphase-float} {\ltlabfloatdate} {\ltlabfloatversion} {Code related to the tagging of floats} \prop_new:N \g__tag_float_sect_prop @@ -51,7 +51,7 @@ \seq_map_inline:Nn\g__tag_float_types_seq { \tag_struct_begin:n{tag=##1s,stash} - \prop_gput:Nnx\g__tag_float_sect_prop {##1-struct}{\int_use:N\c@g__tag_struct_abs_int} + \prop_gput:Nne\g__tag_float_sect_prop {##1-struct}{\int_use:N\c@g__tag_struct_abs_int} \tag_struct_end: } } @@ -93,7 +93,7 @@ { \__tag_float_end: \__tag_float_begin: - \MakeLinkTarget[tagstructure]{g__tag_struct_abs_int} + \MakeLinkTarget*{floatstructure.\int_use:N\c@g__tag_struct_abs_int} } } @@ -120,12 +120,12 @@ { \exp_args:Ne \tag_struct_begin:n{tag=float,parent=0\prop_item:No\g__tag_float_sect_prop{\@captype-struct}}% - \prop_gput:Nxx \g__tag_float_sect_prop {\@captype-used}{true} + \prop_gput:Nee \g__tag_float_sect_prop {\@captype-used}{true} } { \tag_struct_begin:n{tag=float} } - \tl_set:Nx\@current@float@struct{\tag_get:n{struct_num}}% + \tl_set:Ne\@current@float@struct{\tag_get:n{struct_num}}% \typeout{Float structure: \@current@float@struct} } @@ -147,7 +147,7 @@ \fi \ifhmode \@bsphack - \@nameuse{__tag_float_stoppar:} %<---end P + \@nameuse{__tag_float_stop_par:}% <---end P \@floatpenalty -\@Mii \else \@floatpenalty-\@Miii @@ -198,7 +198,7 @@ \hsize\columnwidth \@parboxrestore \@floatboxreset - \MakeLinkTarget[tagstructure]{g__tag_struct_abs_int}% + \MakeLinkTarget*{floatstructure.\number\value{g__tag_struct_abs_int}}% }% \def\end@float{% \@endfloatbox @@ -214,7 +214,7 @@ \penalty\@floatpenalty \else \vadjust{\penalty -\@Miv \vbox{}\penalty\@floatpenalty}\@Esphack - \@nameuse{__tag_float_start_par:} %restart P safe here?? + \@nameuse{__tag_float_start_par:}% restart P safe here?? \fi \fi } @@ -234,7 +234,7 @@ \penalty\@floatpenalty \else \vadjust{\penalty -\@Miv \vbox{}\penalty\@floatpenalty}\@Esphack - \@nameuse{__tag_float_start_par:} %restart P safe here?? + \@nameuse{__tag_float_start_par:}% restart P safe here?? \fi \fi \else @@ -246,10 +246,17 @@ \let\@kernel@refstepcounter\refstepcounter %as long it is not in the kernel \def\caption{% \ifx\@captype\@undefined - \@latex@error{\noexpand\caption outside float}\@ehd + \@latex@error{\noexpand\caption\c_space_tl outside~float}\@ehd \expandafter\@gobble \else - \@kernel@refstepcounter\@captype + \tl_if_empty:NTF\@current@float@struct + { + \refstepcounter\@captype + } + { + \@kernel@refstepcounter\@captype + \xdef\@currentHref{floatstructure.\@current@float@struct}% + } \expandafter\@firstofone \fi {\@dblarg{\@caption\@captype}}% @@ -260,14 +267,18 @@ { \long\def\@makecaption#1#2{% \vskip\abovecaptionskip - \xdef\@currentHref{tagstructure.\@current@float@struct}% \tag_stop:n{caption} \sbox\@tempboxa{#1:~#2}% \tag_start:n{caption} \tagtool{para=false} + \tl_if_empty:NT \@current@float@struct + { \tl_set:Ne \@current@float@struct {\tag_get:n{struct_num}} } \tag_struct_begin:n{tag=Caption,parent=\@current@float@struct} - \seq_gpop_right:cN {g__tag_struct_kids_\@current@float@struct _seq}\l__tag_tmpa_tl - \seq_gput_left:cV {g__tag_struct_kids_\@current@float@struct _seq}\l__tag_tmpa_tl + \tag_if_active:T + { + \seq_gpop_right:cN {g__tag_struct_kids_\@current@float@struct _seq}\l__tag_tmpa_tl + \seq_gput_left:cV {g__tag_struct_kids_\@current@float@struct _seq}\l__tag_tmpa_tl + } \ifdim \wd\@tempboxa >\hsize \tag_struct_begin:n{tag=Lbl} \tag_mc_begin:n{} diff --git a/Master/texmf-dist/tex/latex/latex-lab/latex-lab-testphase-graphic.sty b/Master/texmf-dist/tex/latex/latex-lab/latex-lab-testphase-graphic.sty index 19aed304798..2ea6e529d73 100644 --- a/Master/texmf-dist/tex/latex/latex-lab/latex-lab-testphase-graphic.sty +++ b/Master/texmf-dist/tex/latex/latex-lab/latex-lab-testphase-graphic.sty @@ -32,12 +32,13 @@ %% where one can also log issues in case there are any. %% %% -%% File: latex-lab-graphic.dtx (C) Copyright 2022-2023 LaTeX Project -\def\ltlabgraphicdate{2023-10-13} -\def\ltlabgraphicversion{0.80b} +%% File: latex-lab-graphic.dtx (C) Copyright 2022-2024 LaTeX Project +\def\ltlabgraphicdate{2024-03-13} +\def\ltlabgraphicversion{0.80d} \ProvidesExplPackage {latex-lab-testphase-graphic} {\ltlabgraphicdate} {\ltlabgraphicversion} {Code related to the tagging of graphics} \RequirePackage{l3opacity} +\cs_generate_variant:Nn \__tag_prop_gput:Nnn {cne} \cs_new_protected:Npn\__tag_graphic_savepos:n #1 { \tex_savepos:D @@ -88,7 +89,7 @@ \msg_new:nnn {tag}{alt-text-missing} { Alternative~text~for~graphic~is~missing.\\ - Using~'#1'~instead + Using~the~file~name~'#1'~instead. } \cs_new_protected:Npn\Gin@tag@struct@begin { @@ -190,8 +191,9 @@ \wd\z@\Gin@req@width \Gin@tag@bbox@attribute %new \box\z@ + \fi \Gin@tag@struct@end %new - \fi} + } } \AddToHook{package/graphicx/after}[latex-lab] { @@ -559,7 +561,7 @@ {red} {\int_use:N\g__tag_graphic_int} } - \__tag_prop_gput:cnx + \__tag_prop_gput:cne { g__tag_struct_\int_eval:n {\c@g__tag_struct_abs_int}_prop } { A } { @@ -626,7 +628,7 @@ {red} {\int_use:N\g__tag_graphic_int} } - \__tag_prop_gput:cnx + \__tag_prop_gput:cne { g__tag_struct_\int_eval:n {\c@g__tag_struct_abs_int}_prop } { A } { diff --git a/Master/texmf-dist/tex/latex/latex-lab/latex-lab-testphase-marginpar.sty b/Master/texmf-dist/tex/latex/latex-lab/latex-lab-testphase-marginpar.sty new file mode 100644 index 00000000000..e40ab0ca2a8 --- /dev/null +++ b/Master/texmf-dist/tex/latex/latex-lab/latex-lab-testphase-marginpar.sty @@ -0,0 +1,109 @@ +%% +%% This is file `latex-lab-testphase-marginpar.sty', +%% generated with the docstrip utility. +%% +%% The original source files were: +%% +%% latex-lab-marginpar.dtx (with options: `package') +%% +%% This is a generated file. +%% +%% Copyright 2021-2023 LaTeX Project +%% +%% This file was generated from file(s) of the `LaTeX-lab Bundle'. +%% ------------------------------------------------------------------------------------ +%% +%% It may be distributed and/or modified under the +%% conditions of the LaTeX Project Public License, either version 1.3c +%% of this license or (at your option) any later version. +%% The latest version of this license is in +%% http://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 may only be distributed together with a copy of the LaTeX +%% `LaTeX-lab Bundle'. You may however distribute the `LaTeX-lab Bundle' +%% without such generated files. +%% +%% The newest sources can be found below +%% +%% https://github.com/latex3/latex2e/required/latex-lab +%% +%% where one can also log issues in case there are any. +%% +%% +%% File: latex-lab-marginpar.dtx +%% +\def\ltlabmarginpardate{2024-02-12} +\def\ltlabmarginparversion{0.85b} + +\ProvidesExplPackage {latex-lab-testphase-marginpar} {\ltlabmarginpardate} {\ltlabmarginparversion} + {Changes related to the tagging of the margin notes} +\int_new:N \g__kernel_marginpar_int +\socket_new:nn {tagsupport/marginpar/begin}{0} +\socket_new:nn {tagsupport/marginpar/end}{0} +\socket_new_plug:nnn {tagsupport/marginpar/begin}{default} + { + \if_mode_horizontal: + \tag_mc_end: + \tag_struct_begin:n{tag=Aside,parent=\g__tag_para_main_struct_tl}% + \else: + \tag_struct_begin:n{tag=Aside}% + \fi: + } +\socket_new_plug:nnn {tagsupport/marginpar/end}{default} + { + \tag_struct_end: + \if_mode_horizontal: \tag_mc_begin:n{} \fi: + } +\socket_assign_plug:nn {tagsupport/marginpar/begin}{default} +\socket_assign_plug:nn {tagsupport/marginpar/end}{default} + +\long\def \@savemarbox #1#2{% + \UseTaggingSocket{marginpar/begin} + \global\setbox #1% + \color@vbox + \vtop{% + \hsize\marginparwidth + \@parboxrestore + \@marginparreset + #2\par + \@minipagefalse + \outer@nobreak + }% + \color@endbox + \UseTaggingSocket{marginpar/end} +} +\long\def\@ympar#1{% + \@savemarbox\@marbox{#1}% + \global\setbox\@currbox\copy\@marbox + \tag_stop: + \@xympar + \tag_start:} +\long\def\@xmpar[#1]#2{% + \int_gincr:N\g__kernel_marginpar_int + \property_if_recorded:eTF { tag_marginpar-opt-\int_use:N\g__kernel_marginpar_int } + { + \@savemarbox\@marbox {#1 + \property_record:ee + { tag_marginpar-opt-\int_use:N\g__kernel_marginpar_int }{page} + }% + \tag_stop: + \@savemarbox\@currbox{#2}% + \tag_start: + } + { + \@savemarbox\@currbox{#2}% + \tag_stop: + \@savemarbox\@marbox{#1 + \property_record:ee + { tag_marginpar-opt-\int_use:N\g__kernel_marginpar_int }{page}} + \tag_start: + } + \tag_stop: + \@xympar + \tag_start: + } +\endinput +%% +%% End of file `latex-lab-testphase-marginpar.sty'. diff --git a/Master/texmf-dist/tex/latex/latex-lab/latex-lab-testphase-minipage.sty b/Master/texmf-dist/tex/latex/latex-lab/latex-lab-testphase-minipage.sty index 1f8c5eb5b42..3b35a7beb38 100644 --- a/Master/texmf-dist/tex/latex/latex-lab/latex-lab-testphase-minipage.sty +++ b/Master/texmf-dist/tex/latex/latex-lab/latex-lab-testphase-minipage.sty @@ -32,7 +32,8 @@ %% where one can also log issues in case there are any. %% %% -%% File: latex-lab-minipage.dtx (C) Copyright 2023 LaTeX Project +%% File: latex-lab-minipage.dtx +%% \def\ltlabminipagedate{2023-10-30} \def\ltlabminipageversion{0.81c} \ProvidesExplPackage {latex-lab-testphase-minipage} diff --git a/Master/texmf-dist/tex/latex/latex-lab/latex-lab-testphase-new-or-1.sty b/Master/texmf-dist/tex/latex/latex-lab/latex-lab-testphase-new-or-1.sty index 167c5d6130e..38bc8993446 100644 --- a/Master/texmf-dist/tex/latex/latex-lab/latex-lab-testphase-new-or-1.sty +++ b/Master/texmf-dist/tex/latex/latex-lab/latex-lab-testphase-new-or-1.sty @@ -32,7 +32,7 @@ %% where one can also log issues in case there are any. %% %% -%% File: latex-lab-new-or-1.dtx (C) Copyright 2020-2023 Frank Mittelbach +%% File: latex-lab-new-or-1.dtx (C) Copyright 2020-2024 Frank Mittelbach \def\ltlabneworIdate{2023-07-20} \def\ltlabneworIversion{0.85a} \ProvidesPackage{latex-lab-testphase-new-or-1} diff --git a/Master/texmf-dist/tex/latex/latex-lab/latex-lab-testphase-sec.sty b/Master/texmf-dist/tex/latex/latex-lab/latex-lab-testphase-sec.sty index 9e98894969c..6fee3cc5a94 100644 --- a/Master/texmf-dist/tex/latex/latex-lab/latex-lab-testphase-sec.sty +++ b/Master/texmf-dist/tex/latex/latex-lab/latex-lab-testphase-sec.sty @@ -32,9 +32,9 @@ %% where one can also log issues in case there are any. %% %% -%% File: latex-lab-sec.dtx (C) Copyright 2022-2023 LaTeX Project -\def\ltlabsecdate{2023-10-16} -\def\ltlabsecversion{0.84b} +%% File: latex-lab-sec.dtx (C) Copyright 2022-2024 LaTeX Project +\def\ltlabsecdate{2024-02-12} +\def\ltlabsecversion{0.84c} \ProvidesExplPackage {latex-lab-testphase-sec} {\ltlabsecdate} {\ltlabsecversion} {Code related to the tagging of sectioning commands} \RequirePackage{latex-lab-kernel-changes} @@ -50,7 +50,7 @@ tag= {\int_compare:nNnTF {#1}={-1}{Part}{Sect}} ,#2 } - \seq_gpush:Nx \g__tag_sec_stack_seq {{\g__tag_struct_tag_tl}{\int_eval:n{#1}}} + \seq_gpush:Ne \g__tag_sec_stack_seq {{\g__tag_struct_tag_tl}{\int_eval:n{#1}}} } \msg_new:nnn { tag } {wrong-sect-nesting} { @@ -74,7 +74,7 @@ \__tag_sec_end:n {#1} } { - \msg_warning:nnxx {tag}{wrong-sect-nesting} + \msg_warning:nnee {tag}{wrong-sect-nesting} { \exp_last_unbraced:NV\use_i:nn \l__tag_tmpa_tl } { \exp_last_unbraced:NV\use_i:nn \l__tag_tmpb_tl } } @@ -292,6 +292,7 @@ \cs_new_protected:Npn \@kernel@tag@hangfrom #1 { \tagstructbegin{tag=\l__tag_para_tag_tl} + \cs_if_exist_use:N \__tag_gincr_para_begin_int: \tagstructbegin{tag=Lbl} \setbox\@tempboxa \hbox diff --git a/Master/texmf-dist/tex/latex/latex-lab/latex-lab-testphase-table.sty b/Master/texmf-dist/tex/latex/latex-lab/latex-lab-testphase-table.sty index e6c89d16715..4af648e77c4 100644 --- a/Master/texmf-dist/tex/latex/latex-lab/latex-lab-testphase-table.sty +++ b/Master/texmf-dist/tex/latex/latex-lab/latex-lab-testphase-table.sty @@ -32,37 +32,29 @@ %% where one can also log issues in case there are any. %% %% -%% File: latex-lab-table.dtx (C) Copyright 2023 LaTeX Project -\def\ltlabtbldate{2023-10-30} -\def\ltlabtblversion{0.85d} +%% File: latex-lab-table.dtx (C) Copyright 2023-2024 LaTeX Project +\def\ltlabtbldate{2024-05-25} +\def\ltlabtblversion{0.85i} \ProvidesExplPackage {latex-lab-testphase-table} {\ltlabtbldate} {\ltlabtblversion} {Code related to the tagging of tables} \RequirePackage{array} \tl_new:N \l__tbl_celltag_tl \tl_set:Nn \l__tbl_celltag_tl {TD} +\tl_new:N \l__tbl_pcelltag_tl +\tl_set:Nn \l__tbl_pcelltag_tl {TD} \tl_new:N \l__tbl_rowtag_tl \tl_set:Nn \l__tbl_rowtag_tl {TR} +\tl_new:N \l__tbl_tabletag_tl +\tl_set:Nn \l__tbl_tabletag_tl {Table} \tl_new:N \l__tbl_cellattribute_tl \tl_set:Nn \l__tbl_cellattribute_tl {} \tl_new:N \l__tbl_rowattribute_tl \tl_set:Nn \l__tbl_rowattribute_tl {} -\int_new:N \g__tbl_missing_cells_int \clist_new:N \l__tbl_tmpa_clist -\seq_new:N \l__tbl_tmpa_seq \tl_new:N \l__tbl_tmpa_tl -\NewSocket{tagsupport/tblcell/begin}{0} -\NewSocket{tagsupport/tblcell/end}{0} -\NewSocket{tagsupport/tblrow/begin}{0} -\NewSocket{tagsupport/tblrow/end}{0} -\NewSocket{tagsupport/tbl/init}{0} -\NewSocket{tagsupport/tbl/finalize}{0} -\NewSocket{tagsupport/tbl/finalize/longtable}{0} -\NewSocket{tagsupport/tblhmode/begin}{0} -\NewSocket{tagsupport/tblhmode/end}{0} -\NewSocket{tagsupport/tblvmode/begin}{0} -\NewSocket{tagsupport/tblvmode/end}{0} -\NewSocketPlug{tagsupport/tblcell/begin}{TD} +\NewSocketPlug{tagsupport/tbl/cell/begin}{TD} { + \__tbl_show_curr_cell_data: \tag_struct_begin:n { tag =\l__tbl_celltag_tl, @@ -75,16 +67,17 @@ } \tag_mc_begin:n{} } -\NewSocketPlug{tagsupport/tblcell/end}{TD} +\NewSocketPlug{tagsupport/tbl/cell/end}{TD} { \tag_mc_end: \tag_struct_end: } -\NewSocketPlug{tagsupport/tblcell/begin}{TDpbox} +\NewSocketPlug{tagsupport/tbl/pcell/begin}{TDpbox} { + \__tbl_show_curr_cell_data: \tag_struct_begin:n { - tag =\l__tbl_celltag_tl, + tag =\l__tbl_pcelltag_tl, attribute-class =\l__tbl_cellattribute_tl } \seq_gput_right:Ne \g__tbl_struct_cur_seq { \tag_get:n {struct_num} } @@ -95,11 +88,11 @@ \tagpdfparaOn \tl_set:Nn \l__tag_para_main_tag_tl {Div} } -\NewSocketPlug{tagsupport/tblcell/end}{TDpbox} +\NewSocketPlug{tagsupport/tbl/pcell/end}{TDpbox} { \tag_struct_end: } -\NewSocketPlug{tagsupport/tblrow/begin}{TR} +\NewSocketPlug{tagsupport/tbl/row/begin}{TR} { \seq_gclear:N \g__tbl_struct_cur_seq \tag_struct_begin:n @@ -109,36 +102,53 @@ } \seq_gput_right:Ne \g__tbl_struct_rows_seq { \tag_get:n {struct_num} } } -\NewSocketPlug{tagsupport/tblrow/end}{TR} +\NewSocketPlug{tagsupport/tbl/row/end}{TR} { - \__tag_tbl_add_missing_cells:n { \g__tbl_missing_cells_int } + \tag_if_active:T + { + \__tbl_add_missing_cells: \seq_gput_right:Ne \g__tbl_struct_cells_seq { \seq_use:Nn \g__tbl_struct_cur_seq {,} } - \int_compare:nNnTF { \g__tbl_row_int } = { \seq_count:N\g__tbl_struct_cells_seq } + \int_compare:nNnTF { \g__tbl_row_int } = + { \seq_count:N \g__tbl_struct_cells_seq } { - \typeout + \__tbl_trace:n {==>~ stucture~stored~for~row~\int_use:N\g__tbl_row_int :~ \seq_use:Nn \g__tbl_struct_cur_seq {,} } } - { \ERROR } % should not happen ... + { \ERRORtbl/row } % should not happen ... \tag_struct_end: } + } \NewSocketPlug{tagsupport/tbl/init}{Table} { \tag_if_active:T { \bool_set_false:N \l__tag_para_bool + \__tbl_init_struct_data: } } \NewSocketPlug{tagsupport/tbl/finalize}{Table} { \__tbl_set_header_rows: + \__tbl_restore_struct_data: } -\NewSocketPlug{tagsupport/tbl/finalize/longtable}{Table} +\NewSocketPlug{tagsupport/tbl/longtable/init}{Table} + { + \seq_gclear:N\g__tbl_struct_rows_seq + \seq_gclear:N\g__tbl_struct_cells_seq + \seq_gclear:N\g__tbl_struct_cur_seq + \seq_gclear:N\g__tbl_LT@firsthead_rows_seq + \seq_gclear:N\g__tbl_LT@head_rows_seq + \seq_gclear:N\g__tbl_LT@lastfoot_rows_seq + \seq_gclear:N\g__tbl_LT@foot_rows_seq + } + +\NewSocketPlug{tagsupport/tbl/longtable/finalize}{Table} { \bool_lazy_and:nnTF { \seq_if_empty_p:N \g__tbl_LT@head_rows_seq } @@ -180,7 +190,7 @@ \prop_if_exist:cT { g__tag_struct_ \l__tbl_tmpa_tl _prop } { - \__tbl_struct_prop_gput:Vnn \l__tbl_tmpa_tl {S}{/Artifact} + \exp_args:No \__tag_struct_prop_gput:nnn {\l__tbl_tmpa_tl} {S}{/Artifact} } } } @@ -251,24 +261,35 @@ \prop_if_exist:cT { g__tag_struct_ \l__tbl_tmpa_tl _prop } { - \__tbl_struct_prop_gput:Vnn \l__tbl_tmpa_tl {S}{/Artifact} + \exp_args:No\__tag_struct_prop_gput:nnn {\l__tbl_tmpa_tl} {S}{/Artifact} } } } } } } -\NewSocketPlug{tagsupport/tblhmode/begin}{Table} +\NewSocketPlug{tagsupport/tbl/longtable/head}{Table} + { + \tagmcbegin{artifact} + \tag_mc_reset_box:N\LT@head + \tagmcend + } +\NewSocketPlug{tagsupport/tbl/longtable/foot}{Table} + { + \tagmcbegin{artifact} + \tag_mc_reset_box:N \LT@foot + \tagmcend + } +\NewSocketPlug{tagsupport/tbl/hmode/begin}{Table} { - \mode_leave_vertical: \tag_mc_end_push: \bool_lazy_and:nnT { \bool_if_exist_p:N \l__tag_para_bool } { \l__tag_para_bool } { \tag_struct_end:n { text } } - \tag_struct_begin:n {tag=Table} + \tag_struct_begin:n {tag=\l__tbl_tabletag_tl} \tl_gset:Ne \g__tbl_struct_table_tl { \tag_get:n {struct_num} } } -\NewSocketPlug{tagsupport/tblhmode/end}{Table} +\NewSocketPlug{tagsupport/tbl/hmode/end}{Table} { \tag_struct_end: \bool_lazy_and:nnT @@ -276,105 +297,113 @@ { \tag_struct_begin:n { tag=\l__tag_para_tag_tl } } \tag_mc_begin_pop:n{} } -\NewSocketPlug{tagsupport/tblvmode/begin}{Table} +\NewSocketPlug{tagsupport/tbl/vmode/begin}{Table} { - \tag_struct_begin:n {tag=Table} + \tag_struct_begin:n {tag=\l__tbl_tabletag_tl} \tl_gset:Ne \g__tbl_struct_table_tl { \tag_get:n {struct_num} } } -\NewSocketPlug{tagsupport/tblvmode/end}{Table} +\NewSocketPlug{tagsupport/tbl/vmode/end}{Table} { \tag_struct_end: \par } -\AddToHook{env/tabular/before} {\UseSocket{tagsupport/tblhmode/begin}} -\AddToHook{env/tabular/after} {\UseSocket{tagsupport/tblhmode/end}} -\AddToHook{env/tabular*/before} {\UseSocket{tagsupport/tblhmode/begin}} -\AddToHook{env/tabular*/after} {\UseSocket{tagsupport/tblhmode/end}} -\AddToHook{env/tabularx/before} {\UseSocket{tagsupport/tblhmode/begin}} -\AddToHook{env/tabularx/after} {\UseSocket{tagsupport/tblhmode/end}} -\AddToHook{env/longtable/before}{\UseSocket{tagsupport/tblvmode/begin}} -\AddToHook{env/longtable/after} {\UseSocket{tagsupport/tblvmode/end}} -\AddToHook{env/array/begin} {\__tag_tbl_disable:} -\tag_if_active:T - { \cs_generate_variant:Nn \__tag_attr_new_entry:nn {ee} } -\cs_new_protected:Npn \__tbl_set_colspan:n #1 +\NewSocketPlug{tagsupport/tbl/colspan}{code} { - \tag_if_active:T - { - \int_compare:nNnT {#1}>{1} - { - \prop_get:NeNF \g__tag_attr_entries_prop - {colspan-\int_eval:n{#1}} - \l__tbl_tmpa_tl - { - \__tag_attr_new_entry:ee - {colspan-\int_eval:n{#1}} - {/O /Table /ColSpan~\int_eval:n{#1}} - } - \tl_set:Ne \l__tbl_cellattribute_tl + \int_compare:nNnT {#1}>{1} + { + \prop_get:NeNF \g__tag_attr_entries_prop + {colspan-\int_eval:n{#1}} + \l__tbl_tmpa_tl + { + \__tag_attr_new_entry:ee {colspan-\int_eval:n{#1}} - } - } + {/O /Table /ColSpan~\int_eval:n{#1}} + } + \tl_set:Ne \l__tbl_cellattribute_tl + {colspan-\int_eval:n{#1}} + } } +\tag_if_active:T + { \cs_generate_variant:Nn \__tag_attr_new_entry:nn {ee} } + +\AddToHook{cmd/array/before}{\__tag_tbl_disable:} \cs_new_protected:Npn \__tag_tbl_disable: { - \AssignSocketPlug{tagsupport/tblcell/begin}{noop} - \AssignSocketPlug{tagsupport/tblcell/end}{noop} - \AssignSocketPlug{tagsupport/tblrow/begin}{noop} - \AssignSocketPlug{tagsupport/tblrow/end}{noop} + \AssignSocketPlug{tagsupport/tbl/cell/begin}{noop} + \AssignSocketPlug{tagsupport/tbl/cell/end}{noop} + \AssignSocketPlug{tagsupport/tbl/pcell/begin}{noop} + \AssignSocketPlug{tagsupport/tbl/pcell/end}{noop} + \AssignSocketPlug{tagsupport/tbl/row/begin}{noop} + \AssignSocketPlug{tagsupport/tbl/row/end}{noop} \AssignSocketPlug{tagsupport/tbl/init}{noop} \AssignSocketPlug{tagsupport/tbl/finalize}{noop} - \AssignSocketPlug{tagsupport/tbl/finalize/longtable}{noop} - \AssignSocketPlug{tagsupport/tblhmode/begin}{noop} - \AssignSocketPlug{tagsupport/tblhmode/end}{noop} - \AssignSocketPlug{tagsupport/tblvmode/begin}{noop} - \AssignSocketPlug{tagsupport/tblvmode/end}{noop} + \AssignSocketPlug{tagsupport/tbl/longtable/init}{noop} + \AssignSocketPlug{tagsupport/tbl/longtable/head}{noop} + \AssignSocketPlug{tagsupport/tbl/longtable/foot}{noop} + \AssignSocketPlug{tagsupport/tbl/longtable/finalize}{noop} + \AssignSocketPlug{tagsupport/tbl/hmode/begin}{noop} + \AssignSocketPlug{tagsupport/tbl/hmode/end}{noop} + \AssignSocketPlug{tagsupport/tbl/vmode/begin}{noop} + \AssignSocketPlug{tagsupport/tbl/vmode/end}{noop} + \AssignSocketPlug{tagsupport/tbl/colspan}{noop} } \cs_new_protected:Npn \__tag_tbl_enable: { - \AssignSocketPlug{tagsupport/tblcell/begin}{TD} - \AssignSocketPlug{tagsupport/tblcell/end}{TD} - \AssignSocketPlug{tagsupport/tblrow/begin}{TR} - \AssignSocketPlug{tagsupport/tblrow/end}{TR} + \AssignSocketPlug{tagsupport/tbl/cell/begin}{TD} + \AssignSocketPlug{tagsupport/tbl/cell/end}{TD} + \AssignSocketPlug{tagsupport/tbl/pcell/begin}{TDpbox} + \AssignSocketPlug{tagsupport/tbl/pcell/end}{TDpbox} + \AssignSocketPlug{tagsupport/tbl/row/begin}{TR} + \AssignSocketPlug{tagsupport/tbl/row/end}{TR} \AssignSocketPlug{tagsupport/tbl/init}{Table} \AssignSocketPlug{tagsupport/tbl/finalize}{Table} - \AssignSocketPlug{tagsupport/tbl/finalize/longtable}{Table} - \AssignSocketPlug{tagsupport/tblhmode/begin}{Table} - \AssignSocketPlug{tagsupport/tblhmode/end}{Table} - \AssignSocketPlug{tagsupport/tblvmode/begin}{Table} - \AssignSocketPlug{tagsupport/tblvmode/end}{Table} + \AssignSocketPlug{tagsupport/tbl/longtable/head}{Table} + \AssignSocketPlug{tagsupport/tbl/longtable/foot}{Table} + \AssignSocketPlug{tagsupport/tbl/longtable/init}{Table} + \AssignSocketPlug{tagsupport/tbl/longtable/finalize}{Table} + \AssignSocketPlug{tagsupport/tbl/hmode/begin}{Table} + \AssignSocketPlug{tagsupport/tbl/hmode/end}{Table} + \AssignSocketPlug{tagsupport/tbl/vmode/begin}{Table} + \AssignSocketPlug{tagsupport/tbl/vmode/end}{Table} + \AssignSocketPlug{tagsupport/tbl/colspan}{code} } \keys_define:nn { __tag / setup } { - table-tagging .choices:nn = { true, on } + table/tagging .choices:nn = { true, on } { \__tag_tbl_enable: }, - table-tagging .choices:nn = { false, off } + table/tagging .choices:nn = { false, off } { \__tag_tbl_disable: }, - table-tagging .default:n = true, - table-tagging .initial:n = true + table/tagging .choice:, + table/tagging / presentation .code:n = + { + \__tag_tbl_enable: + \tl_set:Nn\l__tbl_rowtag_tl {NonStruct} + \tl_set:Nn\l__tbl_pcelltag_tl {NonStruct} + \tl_set:Nn\l__tbl_celltag_tl {text} + \tl_set:Nn\l__tbl_tabletag_tl {Div} + \clist_clear:N \l__tbl_header_rows_clist + }, + table/tagging .default:n = true, + table/tagging .initial:n = true + } +\keys_define:nn { __tag / setup } + { + table-tagging .meta:n = {table/tagging={#1}} } -\AddToHook{begindocument} - { - \cs_if_exist:NT \@kernel@before@head - { - \tl_put_right:Nn \@kernel@before@head {\__tag_tbl_disable:} - \tl_put_right:Nn \@kernel@before@foot {\__tag_tbl_disable:} - } - } \AddToHook{begindocument} { \tag_if_active:T { \tagpdfsetup { - newattribute = + role/new-attribute = {TH-col}{/O /Table /Scope /Column}, - newattribute = + role/new-attribute = {TH-row}{/O /Table /Scope /Row}, - newattribute = + role/new-attribute = {TH-both}{/O /Table /Scope /Both}, } \seq_gput_left:Ne\g__tag_attr_class_used_seq @@ -387,15 +416,6 @@ } \clist_new:N \l__tbl_header_rows_clist -\cs_if_free:NTF \__tag_struct_prop_gput:nnn - { - \cs_new_protected:Npn \__tbl_struct_prop_gput:nnn #1#2#3 - { \prop_gput:cnn { g__tag_struct_#1_prop }{#2}{#3} } - } - { \cs_new_protected:Npn \__tbl_struct_prop_gput:nnn #1#2#3 - { \__tag_struct_prop_gput:nnn {#1}{#2}{#3} } - } -\cs_generate_variant:Nn \__tbl_struct_prop_gput:nnn {nne,Vnn} \cs_new_protected:Npn \__tbl_set_header_rows: { \clist_map_inline:Nn \l__tbl_header_rows_clist @@ -408,196 +428,47 @@ { \prop_if_exist:cT { g__tag_struct_####1_prop } { - \__tbl_struct_prop_gput:nnn{ ####1 }{S}{/TH} + \__tag_struct_prop_gput:nnn{ ####1 }{S}{/TH} \prop_get:cnNTF { g__tag_struct_####1_prop } { C } \l__tbl_tmpa_tl - {\__tbl_struct_prop_gput:nne{ ####1 }{C}{[/TH-col~\l__tbl_tmpa_tl]} } - {\__tbl_struct_prop_gput:nnn{ ####1 }{C}{/TH-col}} + {\__tag_struct_prop_gput:nne{ ####1 }{C}{[/TH-col~\l__tbl_tmpa_tl]} } + {\__tag_struct_prop_gput:nnn{ ####1 }{C}{/TH-col}} } } } } \keys_define:nn { __tag / setup } { - table-header-rows .clist_set:N = \l__tbl_header_rows_clist + table/header-rows .clist_set:N = \l__tbl_header_rows_clist, + table-header-rows .meta:n = {table/header-rows={#1}} } \cs_new_protected:Npn \__tbl_show_curr_cell_data: { - \typeout { ==>~ current~cell~data:~ - \int_use:N \g__tbl_row_int , - \int_use:N \g__tbl_col_int , - \g__tbl_span_tl - } -} -\def\insert@column{% - \__tbl_show_curr_cell_data: - \UseSocket{tagsupport/tblcell/begin}% - \the@toks \the \@tempcnta - \ignorespaces \@sharp \unskip - \the@toks \the \count@ \relax - \UseSocket{tagsupport/tblcell/end}% -} -\def\@classz{\@classx - \@tempcnta \count@ - \prepnext@tok - \@addtopreamble{\ifcase \@chnum - \hfil - \hskip1sp% - \d@llarbegin - \insert@column - \d@llarend \do@row@strut \hfil \or - \hskip1sp\d@llarbegin \insert@column \d@llarend \do@row@strut \hfil \or - \hfil\hskip1sp\d@llarbegin \insert@column \d@llarend \do@row@strut \or - \setbox\ar@mcellbox\vbox - \@startpbox{\@nextchar} - \AssignSocketPlug{tagsupport/tblcell/begin}{TDpbox} - \AssignSocketPlug{tagsupport/tblcell/end}{TDpbox} - \insert@column \@endpbox - \ar@align@mcell - \do@row@strut \or - \vtop \@startpbox{\@nextchar} - \AssignSocketPlug{tagsupport/tblcell/begin}{TDpbox} - \AssignSocketPlug{tagsupport/tblcell/end}{TDpbox} - \insert@column \@endpbox\do@row@strut \or - \vbox \@startpbox{\@nextchar} - \AssignSocketPlug{tagsupport/tblcell/begin}{TDpbox} - \AssignSocketPlug{tagsupport/tblcell/end}{TDpbox} - \insert@column \@endpbox\do@row@strut - \fi}\prepnext@tok} -\def\@array[#1]#2{% - \@tempdima \ht \strutbox - \advance \@tempdima by\extrarowheight - \setbox \@arstrutbox \hbox{\vrule - \@height \arraystretch \@tempdima - \@depth \arraystretch \dp \strutbox - \@width \z@}% - \tl_set_eq:NN \l__tbl_saved_table_cols_tl \g__tbl_table_cols_tl - \begingroup - \@mkpream{#2} - \__tbl_determine_table_cols: - \xdef\@preamble{% - \noexpand - \ar@ialign - \@halignto - \bgroup \@arstrut - \UseSocket{tagsupport/tblrow/begin}% - \__tbl_init_cell_data: - \@preamble - \tabskip \z@ \cr}% - \endgroup - \@arrayleft - \UseSocket{tagsupport/tbl/init} - \if #1t\vtop \else \if#1b\vbox \else \vcenter \fi \fi - \bgroup - \let \@sharp ##\let \protect \relax - \lineskip \z@ - \baselineskip \z@ - \m@th - \let\\\@arraycr \let\tabularnewline\\\let\par\@empty - \@preamble} -\let\@@array\@array -\cs_new_protected:Npn \__tbl_init_cell_data: { - \int_gset:Nn \g__tbl_col_int {1} - \tl_gset:Nn \g__tbl_span_tl {1} -} -\cs_new_protected:Npn \__tbl_update_cell_data: { - \int_gadd:Nn \g__tbl_col_int { \g__tbl_span_tl } - \tl_gset:Nn \g__tbl_span_tl {1} -} -\cs_new:Npn \__tbl_determine_table_cols: { - \seq_set_split:NnV\l__tbl_tmpa_seq {&}\@preamble - \tl_gset:Ne \g__tbl_table_cols_tl { \seq_count:N \l__tbl_tmpa_seq } - \typeout{ ==>~ Table~ has~ \g__tbl_table_cols_tl \space columns } -} -\protected\def\@arraycr{ - \relax - \__tbl_store_missing_cells:n{@arraycr} - % - \iffalse{\fi\ifnum 0=`}\fi - \@ifstar \@xarraycr \@xarraycr} -\cs_new:Npn \__tbl_store_missing_cells:n #1 { - \int_compare:nNnT \g__tbl_col_int > 0 - { - \int_gset:Nn \g__tbl_missing_cells_int - { - \g__tbl_table_cols_tl - - \g__tbl_col_int - - \g__tbl_span_tl - + 1 - } - \int_compare:nNnT \g__tbl_missing_cells_int < 0 \ERROR % should not happen - \typeout{==>~ - (#1)~ - This~ row~ needs~ - \int_use:N \g__tbl_missing_cells_int \space - additional~ cell(s) - } - } + \__tbl_trace:n { ==>~ current~cell~data:~ + \int_use:N \g__tbl_row_int , + \int_use:N \g__tbl_col_int , + \g__tbl_span_tl + } } -\cs_new:Npn \__tag_tbl_add_missing_cells:n #1 +\NewSocket{tbl/celldata/missingcount}{1} +\NewSocketPlug{tbl/celldata/missingcount}{code}{\tbl_count_missing_cells:n{#1}} +\AssignSocketPlug{tbl/celldata/missingcount}{code} + +\cs_new:Npn \__tbl_add_missing_cells: { - \int_compare:nNnT {#1}>{0} - { - \typeout{==>~ - ~Inserting~\int_eval:n{#1}~additional~cell(s)~into~previous~row:} - } - \int_step_inline:nn { #1 } + \int_compare:nNnT \g__tbl_missing_cells_int > 0 { - \UseSocket{tagsupport/tblcell/begin} - \UseSocket{tagsupport/tblcell/end} + \__tbl_trace:n {==>~ + ~Inserting~\int_use:N \g__tbl_missing_cells_int \space + additional~cell(s)~into~previous~row:} + \int_step_inline:nn { \g__tbl_missing_cells_int } + { + \UseTaggingSocket{tbl/cell/begin} + \UseTaggingSocket{tbl/cell/end} + } } } -\def\endarray{ - \__tbl_store_missing_cells:n{endarray} - \crcr \egroup - \UseSocket{tagsupport/tbl/finalize} - \int_gset:Nn \g__tbl_col_int { \l__tbl_saved_col_tl } - \int_gset:Nn \g__tbl_row_int { \l__tbl_saved_row_tl } - \tl_gset_eq:NN \g__tbl_span_tl \l__tbl_saved_span_tl - \tl_gset_eq:NN \g__tbl_table_cols_tl \l__tbl_saved_table_cols_tl - \tl_gset_eq:NN \g__tbl_struct_table_tl \l__tbl_saved_struct_table_tl - \seq_gset_eq:NN \g__tbl_struct_rows_seq \l__tbl_saved_struct_rows_seq - \seq_gset_eq:NN \g__tbl_struct_cells_seq\l__tbl_saved_struct_cells_seq - \seq_gset_eq:NN \g__tbl_struct_cur_seq \l__tbl_saved_struct_cur_seq - \typeout{==>~ restored~cell~data:~ - \int_use:N \g__tbl_row_int, - \int_use:N \g__tbl_col_int, - \l__tbl_saved_span_tl \space - ( - \int_compare:nNnTF \g__tbl_table_cols_tl = 0 - { outer~ level } - { max:~ \g__tbl_table_cols_tl } - ) - } - \egroup - \@arrayright \gdef\@preamble{}% -} -\def\@addamp { - \if@firstamp - \@firstampfalse - \else - \edef\@preamble{\@preamble & - \__tbl_update_cell_data: - } - \fi -} -\int_new:N \g__tbl_col_int -\int_new:N \g__tbl_row_int -\tl_new:N \g__tbl_span_tl -\tl_new:N \g__tbl_table_cols_tl - -\tl_gset:Nn \g__tbl_span_tl {1} -\tl_gset:Nn \g__tbl_table_cols_tl {0} % indicates outer level -\tl_new:N \l__tbl_saved_col_tl -\tl_new:N \l__tbl_saved_row_tl -\tl_new:N \l__tbl_saved_span_tl -\tl_new:N \l__tbl_saved_table_cols_tl - -\tl_set:Nn \l__tbl_saved_col_tl{0} -\tl_set:Nn \l__tbl_saved_row_tl{0} -\tl_set:Nn \l__tbl_saved_span_tl{1} -\tl_set:Nn \l__tbl_saved_table_cols_tl{0} % indicates outer level \tl_new:N \g__tbl_struct_table_tl \tl_new:N \l__tbl_saved_struct_table_tl \seq_new:N \g__tbl_struct_rows_seq @@ -606,300 +477,24 @@ \seq_new:N \l__tbl_saved_struct_cells_seq \seq_new:N \g__tbl_struct_cur_seq \seq_new:N \l__tbl_saved_struct_cur_seq -\def\ar@ialign{% - \tl_set:No \l__tbl_saved_col_tl {\int_use:N \g__tbl_col_int } - \tl_set:No \l__tbl_saved_row_tl {\int_use:N \g__tbl_row_int } - \tl_set_eq:NN \l__tbl_saved_span_tl \g__tbl_span_tl + +\cs_new_protected:Npn \__tbl_init_struct_data: { \tl_set_eq:NN \l__tbl_saved_struct_table_tl \g__tbl_struct_table_tl \seq_set_eq:NN \l__tbl_saved_struct_rows_seq \g__tbl_struct_rows_seq \seq_set_eq:NN \l__tbl_saved_struct_cells_seq \g__tbl_struct_cells_seq \seq_set_eq:NN \l__tbl_saved_struct_cur_seq \g__tbl_struct_cur_seq - \typeout{==>~ saved~cell~data:~ - \l__tbl_saved_row_tl, - \l__tbl_saved_col_tl, - \l__tbl_saved_span_tl \space - ( - \int_compare:nNnTF \l__tbl_saved_table_cols_tl = 0 - { outer~ level } - { max:~ \l__tbl_saved_table_cols_tl } - ) - } - \int_gzero:N \g__tbl_row_int - \int_gzero:N \g__tbl_col_int - \tl_gset:Nn \g__tbl_span_tl {1} \seq_gclear:N\g__tbl_struct_rows_seq \seq_gclear:N\g__tbl_struct_cells_seq \seq_gclear:N\g__tbl_struct_cur_seq - \everycr{% - \noalign{% - \int_compare:nNnT \g__tbl_col_int > 0 - { \UseSocket{tagsupport/tblrow/end} } - \int_gincr:N \g__tbl_row_int % this row about to start - \int_gzero:N \g__tbl_col_int % we are before first col - }% - }% - \tabskip\z@skip\halign} -\long\def\multicolumn#1#2#3{% - % alternative: determine first col with vmode test ... - % \ifvmode - % \multispan{#1}\typeout{A==> vmode}% - % \else - % \multispan{#1}\typeout{A==> not vmode} - % \fi - % but this makes the \crcr handling really complicated which would - % then need to become something like - % \ifvmode \expandafter \@gobble - % \else \expandafter \@iden \fi {\cr\noalign{do something}}% - % so not used. - % Instead: - \multispan{#1}\begingroup - \int_compare:nNnTF \g__tbl_col_int = 0 - { - \UseSocket{tagsupport/tblrow/begin} - \int_gset:Nn \g__tbl_col_int {1} - } - { - \int_gadd:Nn \g__tbl_col_int { \g__tbl_span_tl } - } - \tl_gset:Nn \g__tbl_span_tl {#1} - \def\@addamp{\if@firstamp\@firstampfalse \else - \@preamerr 5\fi}% - \@mkpream{#2}\@addtopreamble\@empty - \endgroup - \__tbl_set_colspan:n {#1} - \def\@sharp{#3}% - \@arstrut \@preamble - \null - \ignorespaces} -\let\@kernel@refstepcounter\refstepcounter -\def\hyper@nopatch@longtable{} -\def\__tbl_patch_LT@array[#1]#2{% - \UseSocket{tagsupport/tbl/init}% - \@kernel@refstepcounter{table}\stepcounter{LT@tables}% - \tl_gset:Ne \@currentHref {table.\cs_if_exist_use:N\theHtable} - \int_gzero:N \g__tbl_row_int - \seq_gclear:N\g__tbl_struct_rows_seq - \seq_gclear:N\g__tbl_struct_cells_seq - \seq_gclear:N\g__tbl_struct_cur_seq - \seq_gclear:N\g__tbl_LT@firsthead_rows_seq - \seq_gclear:N\g__tbl_LT@head_rows_seq - \seq_gclear:N\g__tbl_LT@lastfoot_rows_seq - \seq_gclear:N\g__tbl_LT@foot_rows_seq - \if l#1% - \LTleft\z@ \LTright\fill - \else\if r#1% - \LTleft\fill \LTright\z@ - \else\if c#1% - \LTleft\fill \LTright\fill - \fi\fi\fi - \let\LT@mcol\multicolumn - \let\LT@@tabarray\@tabarray - \let\LT@@hl\hline - \def\@tabarray{% - \let\hline\LT@@hl - \LT@@tabarray}% - \let\\\LT@tabularcr - \let\tabularnewline\\% - \def\newpage{\noalign{\break}}% - \def\pagebreak{\noalign{\ifnum`}=0\fi\@testopt{\LT@no@pgbk-}4}% - \def\nopagebreak{\noalign{\ifnum`}=0\fi\@testopt\LT@no@pgbk4}% - \let\hline\LT@hline \let\kill\LT@kill\let\caption\LT@caption - \@tempdima\ht\strutbox - \let\@endpbox\LT@endpbox - \ifx\extrarowheight\@undefined - \let\@acol\@tabacol - \let\@classz\@tabclassz \let\@classiv\@tabclassiv - \def\@startpbox{\vtop\LT@startpbox}% - \let\@@startpbox\@startpbox - \let\@@endpbox\@endpbox - \let\LT@LL@FM@cr\@tabularcr - \else - \advance\@tempdima\extrarowheight - \col@sep\tabcolsep - \let\@startpbox\LT@startpbox\let\LT@LL@FM@cr\@arraycr - \fi - \setbox\@arstrutbox\hbox{\vrule - \@height \arraystretch \@tempdima - \@depth \arraystretch \dp \strutbox - \@width \z@}% - \let\@sharp##\let\protect\relax - \begingroup - \@mkpream{#2}% - \__tbl_determine_table_cols: - \xdef\LT@bchunk{% - \int_gzero:N \g__tbl_col_int - \global\advance\c@LT@chunks\@ne - \global\LT@rows\z@\setbox\z@\vbox\bgroup - \LT@setprevdepth - \tabskip\LTleft \noexpand\halign to\hsize\bgroup - \tabskip\z@ \@arstrut - \UseSocket{tagsupport/tblrow/begin}% - \__tbl_init_cell_data: - \@preamble \tabskip\LTright \cr}% - \endgroup - \expandafter\LT@nofcols\LT@bchunk&\LT@nofcols - \LT@make@row - \m@th\let\par\@empty - \everycr{% - \noalign{% - \typeout{--longtable-->~chunk~row:~ \the\LT@rows \space - row:~ \the\g__tbl_row_int \space - column:~ \the\g__tbl_col_int - } - \int_compare:nNnT \g__tbl_col_int > 0 - { - \UseSocket{tagsupport/tblrow/end} - } - \int_gzero:N \g__tbl_col_int % before first col - \int_compare:nNnT \LT@rows < \LTchunksize - { \int_gincr:N \g__tbl_row_int } % this row about to start - }% - }% - \lineskip\z@\baselineskip\z@ - \LT@bchunk} -\def\__tbl_patch_endlongtable{% - \__tbl_store_missing_cells:n{endlongtable} - \crcr - \noalign{% - \UseSocket{tagsupport/tbl/finalize/longtable} - \int_gzero:N \g__tbl_row_int % this prevents considering the next - % \crcr as another row end. - \let\LT@entry\LT@entry@chop - \xdef\LT@save@row{\LT@save@row}}% - \LT@echunk - \LT@start - \unvbox\z@ - \LT@get@widths - \if@filesw - {\let\LT@entry\LT@entry@write\immediate\write\@auxout{% - \gdef\expandafter\noexpand - \csname LT@\romannumeral\c@LT@tables\endcsname - {\LT@save@row}}}% - \fi - \ifx\LT@save@row\LT@@save@row - \else - \LT@warn{Column~\@width s~have~changed\MessageBreak - in~table~\thetable}% - \LT@final@warn - \fi - \endgraf\penalty -\LT@end@pen - \ifvoid\LT@foot\else - \global\advance\vsize\ht\LT@foot - \global\advance\@colroom\ht\LT@foot - \dimen@\pagegoal\advance\dimen@\ht\LT@foot\pagegoal\dimen@ - \fi - \endgroup - \global\@mparbottom\z@ - \endgraf\penalty\z@\addvspace\LTpost - \ifvoid\footins\else\insert\footins{}\fi} -\def\__tbl_patch_LT@t@bularcr{% - \global\advance\LT@rows\@ne - \ifnum\LT@rows=\LTchunksize - \__tbl_store_missing_cells:n{echunk} - \gdef\LT@setprevdepth{% - \prevdepth\z@ - \global\let\LT@setprevdepth\relax}% - \expandafter\LT@xtabularcr - \else - \ifnum0=`{}\fi - \expandafter\LT@LL@FM@cr - \fi} +} -\def\__tbl_patch_LT@end@hd@ft#1{% - \__tbl_store_missing_cells:n{head/foot} - \int_step_inline:nn - { \LT@rows + 1 } - { - \seq_gput_left:ce - {g__tbl_\cs_to_str:N #1 _rows_seq } - { \int_eval:n {\g__tbl_row_int + 1 - ##1 } } - } - \int_gset:Nn \LT@rows { \LTchunksize } - \LT@echunk - \ifx\LT@start\endgraf - \LT@err - {Longtable head or foot not at start of table}% - {Increase LTchunksize}% - \fi - \setbox#1\box\z@ - \LT@get@widths - \LT@bchunk} +\cs_new_protected:Npn \__tbl_restore_struct_data: { + \tl_gset_eq:NN \g__tbl_struct_table_tl \l__tbl_saved_struct_table_tl + \seq_gset_eq:NN \g__tbl_struct_rows_seq \l__tbl_saved_struct_rows_seq + \seq_gset_eq:NN \g__tbl_struct_cells_seq\l__tbl_saved_struct_cells_seq + \seq_gset_eq:NN \g__tbl_struct_cur_seq \l__tbl_saved_struct_cur_seq +} -\def\__tbl_patch_LT@start{% - \let\LT@start\endgraf - \endgraf\penalty\z@\vskip\LTpre\endgraf - \ifdim \pagetotal<\pagegoal \else - \dimen@=\pageshrink - \advance \dimen@ 1sp % - \kern\dimen@\penalty 9999\endgraf \kern-\dimen@ - \fi - \dimen@\pagetotal - \advance\dimen@ \ht\ifvoid\LT@firsthead\LT@head\else\LT@firsthead\fi - \advance\dimen@ \dp\ifvoid\LT@firsthead\LT@head\else\LT@firsthead\fi - \advance\dimen@ \ht\LT@foot - \edef\LT@reset@vfuzz{\vfuzz\the\vfuzz\vbadness\the\vbadness\relax}% - \vfuzz\maxdimen - \vbadness\@M - \setbox\tw@\copy\z@ - \setbox\tw@\vsplit\tw@ to \ht\@arstrutbox - \setbox\tw@\vbox{\unvbox\tw@}% - \LT@reset@vfuzz - \advance\dimen@ \ht - \ifdim\ht\@arstrutbox>\ht\tw@\@arstrutbox\else\tw@\fi - \advance\dimen@\dp - \ifdim\dp\@arstrutbox>\dp\tw@\@arstrutbox\else\tw@\fi - \advance\dimen@ -\pagegoal - \ifdim \dimen@>\z@ - \vfil\break - \else - \ifdim\pageshrink>\z@\pageshrink\z@\fi - \fi - \global\@colroom\@colht - \ifvoid\LT@foot\else - \global\advance\vsize-\ht\LT@foot - \global\advance\@colroom-\ht\LT@foot - \dimen@\pagegoal\advance\dimen@-\ht\LT@foot\pagegoal\dimen@ - \maxdepth\z@ - \fi - \MakeLinkTarget{table} - \ifvoid\LT@firsthead\copy\LT@head\else\box\LT@firsthead\fi\nobreak - \tagmcbegin{artifact} - \tag_mc_reset_box:N\LT@head - \tagmcend - \output{\LT@output}} -\def\__tbl_patch_LT@output{% - \ifnum\outputpenalty <-\@Mi - \ifnum\outputpenalty > -\LT@end@pen - \LT@err{floats and marginpars not allowed in a longtable}\@ehc - \else - \setbox\z@\vbox{\unvbox\@cclv}% - \ifdim \ht\LT@lastfoot>\ht\LT@foot - \dimen@\pagegoal - \advance\dimen@\ht\LT@foot - \advance\dimen@-\ht\LT@lastfoot - \ifdim\dimen@<\ht\z@ - \setbox\@cclv\vbox{\unvbox\z@\copy\LT@foot\vss}% - \@makecol - \@outputpage - \global\vsize\@colroom - \setbox\z@\vbox{\box\LT@head}% - \fi - \fi - \unvbox\z@\box\ifvoid\LT@lastfoot\LT@foot\else\LT@lastfoot\fi - \tagmcbegin{artifact} - \tag_mc_reset_box:N \LT@foot - \tagmcend - \fi - \else - \setbox\@cclv\vbox{\unvbox\@cclv\copy\LT@foot\vss}% - \tagmcbegin{artifact} - \tag_mc_reset_box:N \LT@foot - \tagmcend - \@makecol - \@outputpage - \global\vsize\@colroom - \copy\LT@head\nobreak - \fi} \def\__tbl_patch_LT@makecaption#1#2#3{% \LT@mcol\LT@cols c{% % test can go after merge @@ -922,56 +517,10 @@ \hss}}} \AddToHook{package/longtable/after} { - \seq_new:N \g__tbl_LT@firsthead_rows_seq - \seq_new:N \g__tbl_LT@head_rows_seq - \seq_new:N \g__tbl_LT@lastfoot_rows_seq - \seq_new:N \g__tbl_LT@foot_rows_seq - \cs_set_eq:NN \LT@array\__tbl_patch_LT@array - \cs_set_eq:NN \endlongtable\__tbl_patch_endlongtable - \cs_set_eq:NN \LT@start\__tbl_patch_LT@start - \cs_set_eq:NN \LT@output\__tbl_patch_LT@output - \cs_set_eq:NN \LT@t@bularcr\__tbl_patch_LT@t@bularcr - \cs_set_eq:NN \LT@end@hd@ft\__tbl_patch_LT@end@hd@ft \cs_set_eq:NN \LT@makecaption\__tbl_patch_LT@makecaption } -\def\__tbl_patch_TX@endtabularx{% - \expandafter\expandafter\expandafter - \TX@find@endtabularxa\csname end\TX@\endcsname - \endtabularx\TX@\endtabularx\TX@find@endtabularxa - \expandafter\TX@newcol\expandafter{\tabularxcolumn{\TX@col@width}}% - \let\verb\TX@verb - \def\@elt##1{\global\value{##1}\the\value{##1}\relax}% - \edef\TX@ckpt{\cl@@ckpt}% - \let\@elt\relax - \TX@old@table\maxdimen - \TX@col@width\TX@target - \global\TX@cols\@ne - \TX@typeout@ - {\@spaces Table Width\@spaces Column Width\@spaces X Columns}% - \tag_stop:n{tabularx} - \TX@trial{\def\NC@rewrite@X{% - \global\advance\TX@cols\@ne\NC@find p{\TX@col@width}}}% - \loop - \TX@arith - \ifTX@ - \TX@trial{}% - \repeat - \tag_start:n{tabularx} - {\let\@footnotetext\TX@ftntext\let\@xfootnotenext\TX@xftntext - \csname tabular*\expandafter\endcsname\expandafter\TX@target - \the\toks@ - \csname endtabular*\endcsname}% - \global\TX@ftn\expandafter{\expandafter}\the\TX@ftn - \ifnum0=`{\fi}% - \expandafter\expandafter\expandafter - \TX@find@endtabularxbb - \expandafter\end\expandafter{\TX@}% - \endtabularx\TX@\endtabularx\TX@find@endtabularxb -} -\AddToHook{package/tabularx/after} - {\cs_set_eq:NN \TX@endtabularx\__tbl_patch_TX@endtabularx } \endinput %% %% End of file `latex-lab-testphase-table.sty'. diff --git a/Master/texmf-dist/tex/latex/latex-lab/latex-lab-testphase-text.sty b/Master/texmf-dist/tex/latex/latex-lab/latex-lab-testphase-text.sty index 7cae4fc4897..749ab3aa08a 100644 --- a/Master/texmf-dist/tex/latex/latex-lab/latex-lab-testphase-text.sty +++ b/Master/texmf-dist/tex/latex/latex-lab/latex-lab-testphase-text.sty @@ -32,7 +32,7 @@ %% where one can also log issues in case there are any. %% %% -%% File: latex-lab-text.dtx (C) Copyright 2023 LaTeX Project +%% File: latex-lab-text.dtx (C) Copyright 2023-2024 LaTeX Project \def\ltlabtextdate{2023-07-20} \def\ltlabtextversion{0.85a} diff --git a/Master/texmf-dist/tex/latex/latex-lab/latex-lab-testphase-title.sty b/Master/texmf-dist/tex/latex/latex-lab/latex-lab-testphase-title.sty new file mode 100644 index 00000000000..f3518622dfa --- /dev/null +++ b/Master/texmf-dist/tex/latex/latex-lab/latex-lab-testphase-title.sty @@ -0,0 +1,300 @@ +%% +%% This is file `latex-lab-testphase-title.sty', +%% generated with the docstrip utility. +%% +%% The original source files were: +%% +%% latex-lab-title.dtx (with options: `package') +%% +%% This is a generated file. +%% +%% Copyright 2021-2023 LaTeX Project +%% +%% This file was generated from file(s) of the `LaTeX-lab Bundle'. +%% ------------------------------------------------------------------------------------ +%% +%% It may be distributed and/or modified under the +%% conditions of the LaTeX Project Public License, either version 1.3c +%% of this license or (at your option) any later version. +%% The latest version of this license is in +%% http://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 may only be distributed together with a copy of the LaTeX +%% `LaTeX-lab Bundle'. You may however distribute the `LaTeX-lab Bundle' +%% without such generated files. +%% +%% The newest sources can be found below +%% +%% https://github.com/latex3/latex2e/required/latex-lab +%% +%% where one can also log issues in case there are any. +%% +%% +%% File: latex-lab-title.dtx (C) Copyright 2023-2024 LaTeX Project +\def\ltlabtitledate{2024-02-09} +\def\ltlabtitleversion{0.85c} + + +\ProvidesExplPackage {latex-lab-testphase-title} {\ltlabtitledate} {\ltlabtitleversion} + {Changes related to the tagging of the title} +\cs_new_protected:Npn \__tag_patch_thanks:n #1 + { + \rlap{\footnotemark} + \protected@xdef\@thanks{\@thanks + \protect\footnotetext[\the\c@footnote]{#1}} + } +\cs_new_protected:Npn \__tag_patch_maketitle: + { + \par + \begingroup + \cs_if_exist_use:N\__tag_tbl_disable: + \renewcommand\thefootnote{\@fnsymbol\c@footnote}% + \cs_set_eq:NN \thanks \__tag_patch_thanks:n + \if@twocolumn + \ifnum \col@number=\@ne + \@maketitle + \else + \twocolumn[\@maketitle]% + \fi + \else + \newpage + \global\@topnum\z@ % Prevents figures from going at top of page. + \@maketitle + \fi + \thispagestyle{plain}\@thanks + \endgroup + \setcounter{footnote}{0}% + \global\let\thanks\relax + \global\let\maketitle\relax + \global\let\@maketitle\relax + \global\let\@thanks\@empty + \global\let\@author\@empty + \global\let\@date\@empty + \global\let\@title\@empty + \global\let\title\relax + \global\let\author\relax + \global\let\date\relax + \global\let\and\relax + } +\cs_new_protected:Npn \__tag_patch_@maketitle: + { + \newpage + \null + \vskip 2em% + \begin{center}% + \let \footnote \thanks + \pdf_version_compare:NnTF > {1.7} + {{\LARGE \tag_struct_begin:n{tag=Title}\@title \par\tag_struct_end:}} + {{\LARGE \tagtool{paratag=Title}\@title \par}}% + \vskip 1.5em% + {\large + \lineskip .5em% + \begin{tabular}[t]{c}% + \@author + \end{tabular}\par}% + \vskip 1em% + {\large \@date}% + \end{center}% + \par + \vskip 1.5em + } + +\cs_new_protected:Npn \__tag_patch_maketitle_page: + {\begin{titlepage}% + \cs_if_exist_use:N\__tag_tbl_disable: + \let\footnotesize\small + \let\footnoterule\relax + \let \footnote \thanks + \null\vfil + \vskip 60\p@ + \begin{center}% + \pdf_version_compare:NnTF > {1.7} + {{\LARGE \tag_struct_begin:n{tag=Title}\@title \par\tag_struct_end:}} + {{\LARGE \tagtool{paratag=Title}\@title \par}}% + \vskip 3em% + {\large + \lineskip .75em% + \begin{tabular}[t]{c}% + \@author + \end{tabular}\par}% + \vskip 1.5em% + {\large \@date \par}% % Set date in \large size. + \end{center}\par + \@thanks + \vfil\null + \end{titlepage}% + \setcounter{footnote}{0}% + \global\let\thanks\relax + \global\let\maketitle\relax + \global\let\@thanks\@empty + \global\let\@author\@empty + \global\let\@date\@empty + \global\let\@title\@empty + \global\let\title\relax + \global\let\author\relax + \global\let\date\relax + \global\let\and\relax + } + +\AddToHook{class/article/after} + { + \if@titlepage + \cs_set_eq:NN \maketitle \__tag_patch_maketitle_page: + \else + \cs_set_eq:NN \maketitle \__tag_patch_maketitle: + \cs_set_eq:NN \@maketitle \__tag_patch_@maketitle: + \fi + } +\AddToHook{class/report/after} + { + \if@titlepage + \cs_set_eq:NN \maketitle \__tag_patch_maketitle_page: + \else + \cs_set_eq:NN \maketitle \__tag_patch_maketitle: + \cs_set_eq:NN \@maketitle \__tag_patch_@maketitle: + \fi + } +\AddToHook{class/book/after} + { + \if@titlepage + \cs_set_eq:NN \maketitle \__tag_patch_maketitle_page: + \else + \cs_set_eq:NN \maketitle \__tag_patch_maketitle: + \cs_set_eq:NN \@maketitle \__tag_patch_@maketitle: + \fi + } +\str_new:N \g__tag_title_tmpa_str +\str_new:N \l__tag_title_tmpa_str +\tl_new:N \l__tag_title_tmpa_tl +\seq_new:N \l__tag_title_tmpa_seq +\providecommand\texorpdfstring[2]{#1}% +\protected\def\@title{\@latex@error{No \noexpand\title given}\@ehc} +\protected\def\@author{\@latex@warning@no@line{No \noexpand\author given}} +\cs_new_protected:Npn \__tag_title_pdfstring:nnN #1 #2 #3 % #1 text, #2 e.g. utf16/hex + { + \group_begin: + \cs_set_eq:NN\texorpdfstring\use_ii:nn + \str_set:Ne \l__tag_title_tmpa_str {\text_purify:n { #1 } } + \pdf_string_from_unicode:nVN { #2 } \l__tag_title_tmpa_str \l__tag_title_tmpa_str + \str_gset_eq:NN \g__tag_title_tmpa_str\l__tag_title_tmpa_str + \group_end: + \str_set_eq:NN #3 \g__tag_title_tmpa_str + } +\cs_generate_variant:Nn\__tag_title_pdfstring:nnN {e} + +\tl_new:N \g__tag_title_title_tl +\RenewDocumentCommand\title{O{}m} + { + \gdef\@title{#2} + \tl_gset_eq:NN\g__tag_title_title_tl\@title + \keys_set:nn {hyp}{#1} + } +\regex_new:N\l__tag_title_optlang_regex +\regex_set:Nn\l__tag_title_optlang_regex {\A\[([A-Za-z\-]+)\](.*)} +\cs_generate_variant:Nn \regex_extract_once:NnN{NVN} +\cs_generate_variant:Nn \clist_item:nn {on} +\keys_define:nn { hyp } + { + pdftitle .code:n = + { + \tl_if_blank:nTF {#1} + { + \pdfmanagement_remove:nn {Info}{Title} + } + { + \tl_set:Ne\l__tag_title_tmpa_tl {\clist_item:on{#1}{1}} + \regex_extract_once:NVN + \l__tag_title_optlang_regex + \l__tag_title_tmpa_tl + \l__tag_title_tmpa_seq + \seq_if_empty:NTF\l__tag_title_tmpa_seq + { + \__tag_title_pdfstring:nnN {#1}{utf16/hex}\l__tag_title_tmpa_str + } + { + \__tag_title_pdfstring:enN + {\seq_item:Nn \l__tag_title_tmpa_seq{3}}{utf16/hex}\l__tag_title_tmpa_str + } + \str_if_eq:VnF\l__tag_title_tmpa_str{<FEFF>} + { + \pdfmanagement_add:nne {Info}{Title}{\l__tag_title_tmpa_str} + } + } + \AddToDocumentProperties[hyperref]{pdftitle}{#1} + } + ,pdfsubtitle .code:n = { \AddToDocumentProperties[hyperref]{pdfsubtitle}{#1} } + } +\tl_new:N \g__tag_title_author_tl +\RenewDocumentCommand\author{O{}m} + { + \gdef\@author{#2} + \tl_gset_eq:NN\g__tag_title_author_tl\@author + \keys_set:nn {hyp}{#1} + } + +\keys_define:nn { hyp } + { + pdfauthor .code:n = + { + \tl_if_blank:nTF {#1} + { + \pdfmanagement_remove:nn {Info}{Author} + } + { + \tl_set:Ne\l__tag_title_tmpa_tl {\clist_item:on{#1}{1}} + \regex_extract_once:NVN + \l__tag_title_optlang_regex + \l__tag_title_tmpa_tl + \l__tag_title_tmpa_seq + \seq_if_empty:NTF\l__tag_title_tmpa_seq + { + \__tag_title_pdfstring:nnN {#1}{utf16/hex}\l__tag_title_tmpa_str + } + { + \__tag_title_pdfstring:enN + {\seq_item:Nn \l__tag_title_tmpa_seq{3}}{utf16/hex}\l__tag_title_tmpa_str + } + \str_if_eq:VnF\l__tag_title_tmpa_str{<FEFF>} + { + \pdfmanagement_add:nne {Info}{Author}{\l__tag_title_tmpa_str} + } + } + \AddToDocumentProperties[hyperref]{pdfauthor}{#1} + } + } +\AddToHook{cmd/maketitle/before} + { + \tl_gset_eq:NN \g__tag_title_author_tl\@author + \tl_gset_eq:NN \g__tag_title_title_tl\@title + } +\AddToHook{shipout/lastpage} + { + \tl_if_empty:eT{\GetDocumentProperties{hyperref/pdftitle}} + { + \group_begin: + \cs_set_eq:NN\thanks \use_none:n + \str_set:Ne \l__tag_title_tmpa_str {\text_purify:n { \g__tag_title_title_tl } } + \keys_set:ne{hyp}{pdftitle={\exp_not:V\l__tag_title_tmpa_str}} + \group_end: + } + \tl_if_empty:eT{\GetDocumentProperties{hyperref/pdfauthor}} + { + \group_begin: + \cs_set_eq:NN\thanks \use_none:n + \cs_set:Npn \and {,} + \str_set:Ne \l__tag_title_tmpa_str {\text_purify:n { \g__tag_title_author_tl } } + \keys_set:ne{hyp}{pdfauthor={\exp_not:V\l__tag_title_tmpa_str}} + \group_end: + } + \tl_if_empty:eF{\GetDocumentProperties{document/pdfstandard-UA}} + { + \pdfmanagement_add:nnn {Catalog / ViewerPreferences } { DisplayDocTitle } { true } + } + } +\DeclareHookRule{shipout/lastpage}{latex-lab-testphase-title}{before}{pdfmanagement-testphase} + +\endinput +%% +%% End of file `latex-lab-testphase-title.sty'. diff --git a/Master/texmf-dist/tex/latex/latex-lab/latex-lab-testphase-toc.sty b/Master/texmf-dist/tex/latex/latex-lab/latex-lab-testphase-toc.sty index bf1cb9bb87f..e4cb035ba10 100644 --- a/Master/texmf-dist/tex/latex/latex-lab/latex-lab-testphase-toc.sty +++ b/Master/texmf-dist/tex/latex/latex-lab/latex-lab-testphase-toc.sty @@ -35,14 +35,14 @@ %% where one can also log issues in case there are any. %% %% -%% File: latex-lab-toc.dtx (C) Copyright 2022-2023 LaTeX Project +%% File: latex-lab-toc.dtx (C) Copyright 2022-2024 LaTeX Project \def\ltlabtocdate{2023-10-16} \def\ltlabtocversion{0.85b} \ProvidesExplPackage {latex-lab-testphase-toc} {\ltlabtocdate} {\ltlabtocversion} { Code related to the tagging of toc-like lists} -%% File: latex-lab-toc-kernel-changes.dtx (C) Copyright 2022-2023 LaTeX Project -\def\ltlabkerneldate{2023-10-16} -\def\ltlabkernelversion{0.85b} +%% File: latex-lab-toc-kernel-changes.dtx (C) Copyright 2022-2024 LaTeX Project +\def\ltlabkerneldate{2024-02-12} +\def\ltlabkernelversion{0.85c} \RequirePackage{latex-lab-kernel-changes} \def\@contentsline@cfgpoint@before#1#2#3#4{} \def\@contentsline@cfgpoint@after#1#2#3#4{} @@ -64,7 +64,7 @@ \makeatletter \@starttoc@cfgpoint@before{#1}% \@input{\jobname.#1}% - \@starttoc@cfgpoint@after{#1} + \@starttoc@cfgpoint@after{#1}% \if@filesw \expandafter\newwrite\csname tf@#1\endcsname \immediate\openout \csname tf@#1\endcsname \jobname.#1\relax @@ -275,7 +275,7 @@ \endgroup \fi} } -%% File: latex-lab-toc.dtx (C) Copyright 2022-2023 LaTeX Project +%% File: latex-lab-toc.dtx (C) Copyright 2022-2024 LaTeX Project \def\ltlabtocdate{2023-10-16} \def\ltlabtocversion{0.85b} \tl_new:N \l__tag_toc_tmpa_tl @@ -372,7 +372,7 @@ { \int_compare_p:nNn { \g__tag_toc_level_int } > {-100} } { \int_compare_p:nNn { \use:c{toclevel@#1} } > { \g__tag_toc_level_int } } { - \seq_gpush:Nx \g__tag_toc_stack_seq {{TOC}\use:c{toclevel@#1}} + \seq_gpush:Ne \g__tag_toc_stack_seq {{TOC}\use:c{toclevel@#1}} \tag_struct_begin:n{tag=TOC} } \int_compare:nNnT @@ -383,10 +383,10 @@ \int_gset:Nn \g__tag_toc_level_int { \use:c{toclevel@#1} } \group_begin: \text_declare_expand_equivalent:Nn \numberline \use_none:n - \exp_args:Nx \tag_struct_begin:n{tag=TOCI,title={\text_purify:n {#2}}} - \prop_gput:Nxx \g__tag_struct_ref_by_dest_prop + \exp_args:Ne \tag_struct_begin:n{tag=TOCI,title={\text_purify:n {#2}}} + \prop_gput:Nee \g__tag_struct_ref_by_dest_prop { \tag_get:n {struct_num} }{#3} - \seq_gpush:Nx \g__tag_toc_stack_seq {{TOCI}\use:c{toclevel@#1}} + \seq_gpush:Ne \g__tag_toc_stack_seq {{TOCI}\use:c{toclevel@#1}} \group_end: } } @@ -438,7 +438,7 @@ \def\@dottedtocline@cfgpoint@leaders#1{% \tag_mc_begin:n{artifact}\tag_stop:n{leaders}\nobreak#1\nobreak\tag_start:n{leaders}\tag_mc_end:} -%% File: latex-lab-toc-hyperref-changes.dtx (C) Copyright 2022-2023 LaTeX Project +%% File: latex-lab-toc-hyperref-changes.dtx (C) Copyright 2022-2024 LaTeX Project \def\ltlabtochyperdate{2023-07-20} \def\ltlabtochyperversion{0.85a} \def\hyper@nopatch@toc{} diff --git a/Master/texmf-dist/tex/latex/latex-lab/marginpar-latex-lab-testphase.ltx b/Master/texmf-dist/tex/latex/latex-lab/marginpar-latex-lab-testphase.ltx new file mode 100644 index 00000000000..a74a5f65ef3 --- /dev/null +++ b/Master/texmf-dist/tex/latex/latex-lab/marginpar-latex-lab-testphase.ltx @@ -0,0 +1,48 @@ +%% +%% This is file `marginpar-latex-lab-testphase.ltx', +%% generated with the docstrip utility. +%% +%% The original source files were: +%% +%% latex-lab-marginpar.dtx (with options: `latex-lab') +%% +%% This is a generated file. +%% +%% Copyright 2021-2023 LaTeX Project +%% +%% This file was generated from file(s) of the `LaTeX-lab Bundle'. +%% ------------------------------------------------------------------------------------ +%% +%% It may be distributed and/or modified under the +%% conditions of the LaTeX Project Public License, either version 1.3c +%% of this license or (at your option) any later version. +%% The latest version of this license is in +%% http://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 may only be distributed together with a copy of the LaTeX +%% `LaTeX-lab Bundle'. You may however distribute the `LaTeX-lab Bundle' +%% without such generated files. +%% +%% The newest sources can be found below +%% +%% https://github.com/latex3/latex2e/required/latex-lab +%% +%% where one can also log issues in case there are any. +%% +%% +%% File: latex-lab-marginpar.dtx +%% +\def\ltlabmarginpardate{2024-02-12} +\def\ltlabmarginparversion{0.85b} + +\ProvidesFile{marginpar-latex-lab-testphase.ltx} + [\ltlabmarginpardate\space v\ltlabmarginparversion\space + Changes related to the tagging of the margin notes] + +\RequirePackage{latex-lab-testphase-marginpar} + +\endinput +%% +%% End of file `marginpar-latex-lab-testphase.ltx'. diff --git a/Master/texmf-dist/tex/latex/latex-lab/minipage-latex-lab-testphase.ltx b/Master/texmf-dist/tex/latex/latex-lab/minipage-latex-lab-testphase.ltx index e309b479ed1..0cf1da13360 100644 --- a/Master/texmf-dist/tex/latex/latex-lab/minipage-latex-lab-testphase.ltx +++ b/Master/texmf-dist/tex/latex/latex-lab/minipage-latex-lab-testphase.ltx @@ -32,7 +32,8 @@ %% where one can also log issues in case there are any. %% %% -%% File: latex-lab-minipage.dtx (C) Copyright 2023 LaTeX Project +%% File: latex-lab-minipage.dtx +%% \def\ltlabminipagedate{2023-10-30} \def\ltlabminipageversion{0.81c} diff --git a/Master/texmf-dist/tex/latex/latex-lab/new-or-1-latex-lab-testphase.ltx b/Master/texmf-dist/tex/latex/latex-lab/new-or-1-latex-lab-testphase.ltx index 015487e4396..915a065c5e5 100644 --- a/Master/texmf-dist/tex/latex/latex-lab/new-or-1-latex-lab-testphase.ltx +++ b/Master/texmf-dist/tex/latex/latex-lab/new-or-1-latex-lab-testphase.ltx @@ -32,7 +32,7 @@ %% where one can also log issues in case there are any. %% %% -%% File: latex-lab-new-or-1.dtx (C) Copyright 2020-2023 Frank Mittelbach +%% File: latex-lab-new-or-1.dtx (C) Copyright 2020-2024 Frank Mittelbach \def\ltlabneworIdate{2023-07-20} \def\ltlabneworIversion{0.85a} \ProvidesFile{new-or-1-latex-lab-testphase.ltx} diff --git a/Master/texmf-dist/tex/latex/latex-lab/phase-I-latex-lab-testphase.ltx b/Master/texmf-dist/tex/latex/latex-lab/phase-I-latex-lab-testphase.ltx index c2f68512e79..a672afc5968 100644 --- a/Master/texmf-dist/tex/latex/latex-lab/phase-I-latex-lab-testphase.ltx +++ b/Master/texmf-dist/tex/latex/latex-lab/phase-I-latex-lab-testphase.ltx @@ -40,7 +40,7 @@ \RequirePackage{latex-lab-testphase-new-or-1} \RequirePackage{tagpdf} \AddToDocumentProperties [document]{testphase/tagpdf}{loaded} -\tagpdfsetup{activate,interwordspace} +\tagpdfsetup{activate,activate/spaces} \AddToDocumentProperties [document]{tagging}{active} \AddToDocumentProperties [document]{tagging/interwordspace}{active} \endinput diff --git a/Master/texmf-dist/tex/latex/latex-lab/phase-II-latex-lab-testphase.ltx b/Master/texmf-dist/tex/latex/latex-lab/phase-II-latex-lab-testphase.ltx index ff7e6dd7452..0958d99b119 100644 --- a/Master/texmf-dist/tex/latex/latex-lab/phase-II-latex-lab-testphase.ltx +++ b/Master/texmf-dist/tex/latex/latex-lab/phase-II-latex-lab-testphase.ltx @@ -41,7 +41,7 @@ \RequirePackage{latex-lab-testphase-new-or-2} \RequirePackage{tagpdf} \AddToDocumentProperties [document]{testphase/tagpdf}{loaded} -\tagpdfsetup{activate,paratagging,interwordspace} +\tagpdfsetup{activate,para/tagging,activate/spaces} \AddToDocumentProperties [document]{tagging/para}{active} \AddToDocumentProperties [document]{tagging}{active} \AddToDocumentProperties [document]{tagging/interwordspace}{active} diff --git a/Master/texmf-dist/tex/latex/latex-lab/phase-III-latex-lab-testphase.ltx b/Master/texmf-dist/tex/latex/latex-lab/phase-III-latex-lab-testphase.ltx index 2f7a38ef142..c782abde3ad 100644 --- a/Master/texmf-dist/tex/latex/latex-lab/phase-III-latex-lab-testphase.ltx +++ b/Master/texmf-dist/tex/latex/latex-lab/phase-III-latex-lab-testphase.ltx @@ -36,7 +36,7 @@ \ProvidesFile{phase-III-latex-lab-testphase.ltx} - [2023-07-20 v0.1b latex-lab wrapper phase-III] + [2024-02-12 v0.1c latex-lab wrapper phase-III] \input{phase-II-latex-lab-testphase.ltx} \IfFormatAtLeastTF{2023-06-01} { @@ -48,6 +48,7 @@ \RequirePackage{latex-lab-testphase-float} \RequirePackage{latex-lab-testphase-bib} \RequirePackage{latex-lab-testphase-text} + \RequirePackage{latex-lab-testphase-marginpar} } {\PackageWarning{latex-lab}{Testphase III needs newer format}{}} \endinput diff --git a/Master/texmf-dist/tex/latex/latex-lab/sec-latex-lab-testphase.ltx b/Master/texmf-dist/tex/latex/latex-lab/sec-latex-lab-testphase.ltx index bf39e9949f7..5cd6edae269 100644 --- a/Master/texmf-dist/tex/latex/latex-lab/sec-latex-lab-testphase.ltx +++ b/Master/texmf-dist/tex/latex/latex-lab/sec-latex-lab-testphase.ltx @@ -32,9 +32,9 @@ %% where one can also log issues in case there are any. %% %% -%% File: latex-lab-sec.dtx (C) Copyright 2022-2023 LaTeX Project -\def\ltlabsecdate{2023-10-16} -\def\ltlabsecversion{0.84b} +%% File: latex-lab-sec.dtx (C) Copyright 2022-2024 LaTeX Project +\def\ltlabsecdate{2024-02-12} +\def\ltlabsecversion{0.84c} \ProvidesFile{sec-latex-lab-testphase.ltx} [\ltlabsecdate\space v\ltlabsecversion\space latex-lab wrapper sec] diff --git a/Master/texmf-dist/tex/latex/latex-lab/table-latex-lab-testphase.ltx b/Master/texmf-dist/tex/latex/latex-lab/table-latex-lab-testphase.ltx index 850f3ffa110..b01da95717e 100644 --- a/Master/texmf-dist/tex/latex/latex-lab/table-latex-lab-testphase.ltx +++ b/Master/texmf-dist/tex/latex/latex-lab/table-latex-lab-testphase.ltx @@ -32,12 +32,13 @@ %% where one can also log issues in case there are any. %% %% -%% File: latex-lab-table.dtx (C) Copyright 2023 LaTeX Project -\def\ltlabtbldate{2023-10-30} -\def\ltlabtblversion{0.85d} +%% File: latex-lab-table.dtx (C) Copyright 2023-2024 LaTeX Project +\def\ltlabtbldate{2024-05-25} +\def\ltlabtblversion{0.85i} \ProvidesFile{table-latex-lab-testphase.ltx} [\ltlabtbldate\space v\ltlabtblversion\space latex-lab wrapper table] \RequirePackage{latex-lab-testphase-table} + \endinput %% %% End of file `table-latex-lab-testphase.ltx'. diff --git a/Master/texmf-dist/tex/latex/latex-lab/tabular-latex-lab-testphase.ltx b/Master/texmf-dist/tex/latex/latex-lab/tabular-latex-lab-testphase.ltx new file mode 100644 index 00000000000..67a80c992ab --- /dev/null +++ b/Master/texmf-dist/tex/latex/latex-lab/tabular-latex-lab-testphase.ltx @@ -0,0 +1,44 @@ +%% +%% This is file `tabular-latex-lab-testphase.ltx', +%% generated with the docstrip utility. +%% +%% The original source files were: +%% +%% latex-lab-table.dtx (with options: `latex-lab-alias') +%% +%% This is a generated file. +%% +%% Copyright 2021-2023 LaTeX Project +%% +%% This file was generated from file(s) of the `LaTeX-lab Bundle'. +%% ------------------------------------------------------------------------------------ +%% +%% It may be distributed and/or modified under the +%% conditions of the LaTeX Project Public License, either version 1.3c +%% of this license or (at your option) any later version. +%% The latest version of this license is in +%% http://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 may only be distributed together with a copy of the LaTeX +%% `LaTeX-lab Bundle'. You may however distribute the `LaTeX-lab Bundle' +%% without such generated files. +%% +%% The newest sources can be found below +%% +%% https://github.com/latex3/latex2e/required/latex-lab +%% +%% where one can also log issues in case there are any. +%% +%% +%% File: latex-lab-table.dtx (C) Copyright 2023-2024 LaTeX Project +\def\ltlabtbldate{2024-05-25} +\def\ltlabtblversion{0.85i} + +\ProvidesFile{tabular-latex-lab-testphase.ltx} + [\ltlabtbldate\space v\ltlabtblversion\space latex-lab wrapper tabular] +\RequirePackage{latex-lab-testphase-table} +\endinput +%% +%% End of file `tabular-latex-lab-testphase.ltx'. diff --git a/Master/texmf-dist/tex/latex/latex-lab/tagpdf-latex-lab-testphase.ltx b/Master/texmf-dist/tex/latex/latex-lab/tagpdf-latex-lab-testphase.ltx index 99866c0ee12..e7303e398e0 100644 --- a/Master/texmf-dist/tex/latex/latex-lab/tagpdf-latex-lab-testphase.ltx +++ b/Master/texmf-dist/tex/latex/latex-lab/tagpdf-latex-lab-testphase.ltx @@ -41,7 +41,7 @@ \RequirePackage{latex-lab-testphase-new-or-2} \RequirePackage{tagpdf} \AddToDocumentProperties [document]{testphase/tagpdf}{loaded} -\tagpdfsetup{activate,paratagging,interwordspace} +\tagpdfsetup{activate,para/tagging,activate/spaces} \AddToDocumentProperties [document]{tagging/para}{active} \AddToDocumentProperties [document]{tagging}{active} \AddToDocumentProperties [document]{tagging/interwordspace}{active} diff --git a/Master/texmf-dist/tex/latex/latex-lab/tagpdf-ns-latex-lab.def b/Master/texmf-dist/tex/latex/latex-lab/tagpdf-ns-latex-lab.def index ac71752ca07..13054a4f295 100644 --- a/Master/texmf-dist/tex/latex/latex-lab/tagpdf-ns-latex-lab.def +++ b/Master/texmf-dist/tex/latex/latex-lab/tagpdf-ns-latex-lab.def @@ -6,7 +6,8 @@ %% %% latex-lab-namespace.dtx (with options: `ns-latex-lab') %% -%% File: latex-lab-namespace.dtx (C) Copyright 2023 LaTeX Project +%% File: latex-lab-namespace.dtx +%% %% \ProvidesExplFile {tagpdf-ns-latex-lab.def} {2023-09-04} {0.8} %% {latex} {https://www.latex-project.org/ns/lab/2022}{} title, Title, pdf2, @@ -22,7 +23,7 @@ enumerate, L, pdf2, description, L, pdf2, quote, BlockQuote,pdf, quotation, BlockQuote,pdf, -verbatim, Div, pdf2, +verbatim, Div, pdf2, % overwritten by block item, LI, pdf2, itemlabel, Lbl, pdf2, itembody, LBody, pdf2, diff --git a/Master/texmf-dist/tex/latex/latex-lab/text-latex-lab-testphase.ltx b/Master/texmf-dist/tex/latex/latex-lab/text-latex-lab-testphase.ltx index 59d30103ae9..2615850378c 100644 --- a/Master/texmf-dist/tex/latex/latex-lab/text-latex-lab-testphase.ltx +++ b/Master/texmf-dist/tex/latex/latex-lab/text-latex-lab-testphase.ltx @@ -32,7 +32,7 @@ %% where one can also log issues in case there are any. %% %% -%% File: latex-lab-text.dtx (C) Copyright 2023 LaTeX Project +%% File: latex-lab-text.dtx (C) Copyright 2023-2024 LaTeX Project \def\ltlabtextdate{2023-07-20} \def\ltlabtextversion{0.85a} diff --git a/Master/texmf-dist/tex/latex/latex-lab/title-latex-lab-testphase.ltx b/Master/texmf-dist/tex/latex/latex-lab/title-latex-lab-testphase.ltx new file mode 100644 index 00000000000..17f603db23e --- /dev/null +++ b/Master/texmf-dist/tex/latex/latex-lab/title-latex-lab-testphase.ltx @@ -0,0 +1,49 @@ +%% +%% This is file `title-latex-lab-testphase.ltx', +%% generated with the docstrip utility. +%% +%% The original source files were: +%% +%% latex-lab-title.dtx (with options: `latex-lab') +%% +%% This is a generated file. +%% +%% Copyright 2021-2023 LaTeX Project +%% +%% This file was generated from file(s) of the `LaTeX-lab Bundle'. +%% ------------------------------------------------------------------------------------ +%% +%% It may be distributed and/or modified under the +%% conditions of the LaTeX Project Public License, either version 1.3c +%% of this license or (at your option) any later version. +%% The latest version of this license is in +%% http://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 may only be distributed together with a copy of the LaTeX +%% `LaTeX-lab Bundle'. You may however distribute the `LaTeX-lab Bundle' +%% without such generated files. +%% +%% The newest sources can be found below +%% +%% https://github.com/latex3/latex2e/required/latex-lab +%% +%% where one can also log issues in case there are any. +%% +%% +%% File: latex-lab-title.dtx (C) Copyright 2023-2024 LaTeX Project +\def\ltlabtitledate{2024-02-09} +\def\ltlabtitleversion{0.85c} + + + +\ProvidesFile{title-latex-lab-testphase.ltx} + [\ltlabtitledate\space v\ltlabtitleversion\space + Changes related to the tagging of the title] + +\RequirePackage{latex-lab-testphase-title} + +\endinput +%% +%% End of file `title-latex-lab-testphase.ltx'. diff --git a/Master/texmf-dist/tex/latex/latex-lab/toc-latex-lab-testphase.ltx b/Master/texmf-dist/tex/latex/latex-lab/toc-latex-lab-testphase.ltx index 1d7e70c5d79..8b2c05d329c 100644 --- a/Master/texmf-dist/tex/latex/latex-lab/toc-latex-lab-testphase.ltx +++ b/Master/texmf-dist/tex/latex/latex-lab/toc-latex-lab-testphase.ltx @@ -32,7 +32,7 @@ %% where one can also log issues in case there are any. %% %% -%% File: latex-lab-toc.dtx (C) Copyright 2022-2023 LaTeX Project +%% File: latex-lab-toc.dtx (C) Copyright 2022-2024 LaTeX Project \def\ltlabtocdate{2023-10-16} \def\ltlabtocversion{0.85b} \ProvidesFile{toc-latex-lab-testphase.ltx} diff --git a/Master/texmf-dist/tex/latex/tools/.tex b/Master/texmf-dist/tex/latex/tools/.tex index f3f759f1180..ff0d77e6fc4 100644 --- a/Master/texmf-dist/tex/latex/tools/.tex +++ b/Master/texmf-dist/tex/latex/tools/.tex @@ -13,7 +13,7 @@ %% (but please observe conditions on bug reports sent to that address!) %% %% -%% Copyright (C) 1993-2023 +%% Copyright (C) 1993-2024 %% The LaTeX Project and any individual authors listed elsewhere %% in this file. %% diff --git a/Master/texmf-dist/tex/latex/tools/afterpage.sty b/Master/texmf-dist/tex/latex/tools/afterpage.sty index 823f3ffa25c..2a487eac7e9 100644 --- a/Master/texmf-dist/tex/latex/tools/afterpage.sty +++ b/Master/texmf-dist/tex/latex/tools/afterpage.sty @@ -12,7 +12,7 @@ %% reports for it can be opened at https://latex-project.org/bugs/ %% (but please observe conditions on bug reports sent to that address!) %% -%% Copyright (C) 1993-2023 +%% Copyright (C) 1993-2024 %% The LaTeX Project and any individual authors listed elsewhere %% in this file. %% diff --git a/Master/texmf-dist/tex/latex/tools/array-2016-10-06.sty b/Master/texmf-dist/tex/latex/tools/array-2016-10-06.sty index f079fd4975d..ced72d2913c 100644 --- a/Master/texmf-dist/tex/latex/tools/array-2016-10-06.sty +++ b/Master/texmf-dist/tex/latex/tools/array-2016-10-06.sty @@ -1,5 +1,7 @@ %% -%% This is an old release of `array.sty', +%% This is an old release of `array.sty' used during rollback operations. +%% Do not use this file directly. +%% ============================== %% %% Copyright 1993-2016 %% The LaTeX Project and any individual authors listed elsewhere diff --git a/Master/texmf-dist/tex/latex/tools/array-2020-02-10.sty b/Master/texmf-dist/tex/latex/tools/array-2020-02-10.sty index 1243f25f747..5acd9c727e2 100644 --- a/Master/texmf-dist/tex/latex/tools/array-2020-02-10.sty +++ b/Master/texmf-dist/tex/latex/tools/array-2020-02-10.sty @@ -1,4 +1,8 @@ %% +%% This is an old release of `array.sty' used during rollback operations. +%% Do not use this file directly. +%% ============================== +%% %% This is file `array.sty', %% generated with the docstrip utility. %% @@ -38,11 +42,6 @@ %% Package `array' to use with LaTeX 2e %% Copyright (C) 1989-1998 Frank Mittelbach, all rights reserved. \NeedsTeXFormat{LaTeX2e}[1995/06/01] -\providecommand\DeclareRelease[3]{} -\providecommand\DeclareCurrentRelease[2]{} - -\DeclareRelease{}{2016-10-06}{array-2016-10-06.sty} -\DeclareCurrentRelease{}{2019-10-01} \ProvidesPackage{array} [2020/02/10 v2.4m Tabular extension package (FMi)] diff --git a/Master/texmf-dist/tex/latex/tools/array-2023-11-01.sty b/Master/texmf-dist/tex/latex/tools/array-2023-11-01.sty new file mode 100644 index 00000000000..b5267cffd23 --- /dev/null +++ b/Master/texmf-dist/tex/latex/tools/array-2023-11-01.sty @@ -0,0 +1,373 @@ +%% +%% This is an old release of `array.sty' used during rollback operations. +%% Do not use this file directly. +%% ============================== +%% +%% This is file `array.sty', +%% generated with the docstrip utility. +%% +%% The original source files were: +%% +%% array.dtx (with options: `package,ncols') +%% +%% This is a generated file. +%% +%% The source is maintained by the LaTeX Project team and bug +%% reports for it can be opened at https://latex-project.org/bugs/ +%% (but please observe conditions on bug reports sent to that address!) +%% +%% +%% Copyright (C) 1993-2023 +%% The LaTeX Project and any individual authors listed elsewhere +%% in this file. +%% +%% This file was generated from file(s) of the Standard LaTeX `Tools Bundle'. +%% -------------------------------------------------------------------------- +%% +%% It may be distributed and/or modified under the +%% conditions of the LaTeX Project Public License, either version 1.3c +%% of this license or (at your option) any later version. +%% The latest version of this license is in +%% https://www.latex-project.org/lppl.txt +%% and version 1.3c or later is part of all distributions of LaTeX +%% version 2005/12/01 or later. +%% +%% This file may only be distributed together with a copy of the LaTeX +%% `Tools Bundle'. You may however distribute the LaTeX `Tools Bundle' +%% without such generated files. +%% +%% The list of all files belonging to the LaTeX `Tools Bundle' is +%% given in the file `manifest.txt'. +%% +%% Package `array' to use with LaTeX 2e +%% Copyright (C) 1989-1998 Frank Mittelbach, all rights reserved. +\NeedsTeXFormat{LaTeX2e}[1995/06/01] + +\ProvidesPackage{array} + [2023/10/16 v2.5g Tabular extension package (FMi)] +%% + +\def\@addtopreamble#1{\xdef\@preamble{\@preamble #1}} +\def\@testpach{\@chclass + \ifnum \@lastchclass=6 \@ne \@chnum \@ne \else + \ifnum \@lastchclass=7 5 \else + \ifnum \@lastchclass=8 \tw@ \else + \ifnum \@lastchclass=9 \thr@@ + \else \z@ + \ifnum \@lastchclass = 10 \else + \edef\@nextchar{\expandafter\string\@nextchar}% + \@chnum + \if \@nextchar c\z@ \else + \if \@nextchar l\@ne \else + \if \@nextchar r\tw@ \else + \z@ \@chclass + \if\@nextchar |\@ne \else + \if \@nextchar !6 \else + \if \@nextchar @7 \else + \if \@nextchar <8 \else + \if \@nextchar >9 \else + 10 + \@chnum + \if \@nextchar m\thr@@\else + \if \@nextchar p4 \else + \if \@nextchar b5 \else + \z@ \@chclass \z@ \@preamerr \z@ \fi \fi \fi \fi + \fi \fi \fi \fi \fi \fi \fi \fi \fi \fi \fi \fi} +\def\@xexpast#1*#2#3#4\@@{% + \@tempcnta #2 + \toks@={#1}\@temptokena={#3}% + \let\the@toksz\relax \let\the@toks\relax + \def\@tempa{\the@toksz}% + \ifnum\@tempcnta >0 \@whilenum\@tempcnta >0\do + {\edef\@tempa{\@tempa\the@toks}\advance \@tempcnta \m@ne}% + \let \@tempb \@xexpast \else + \let \@tempb \@xexnoop \fi + \def\the@toksz{\the\toks@}\def\the@toks{\the\@temptokena}% + \edef\@tempa{\@tempa}% + \expandafter \@tempb \@tempa #4\@@} +\def\prepnext@tok{\advance \count@ \@ne + \toks\count@{}} +\def\save@decl{\toks\count@ \expandafter{\@nextchar}} +\def\insert@column{% + \the@toks \the \@tempcnta + \ignorespaces \@sharp \unskip + \the@toks \the \count@ \relax} +\newdimen\col@sep +\def\@acol{\@addtopreamble{\hskip\col@sep}} +\def\@classx{% + \ifcase \@lastchclass + \@acolampacol \or + \@addamp \@acol \or + \@acolampacol \or + \or + \@acol \@firstampfalse \or + \@addamp + \fi} +\def\@classz{\@classx + \@tempcnta \count@ + \prepnext@tok + \@addtopreamble{\ifcase \@chnum + \hfil + \hskip1sp% + \d@llarbegin + \insert@column + \d@llarend \do@row@strut \hfil \or + \hskip1sp\d@llarbegin \insert@column \d@llarend \do@row@strut \hfil \or + \hfil\hskip1sp\d@llarbegin \insert@column \d@llarend \do@row@strut \or + \setbox\ar@mcellbox\vbox + \@startpbox{\@nextchar}\insert@column \@endpbox + \ar@align@mcell + \do@row@strut \or + \vtop \@startpbox{\@nextchar}\insert@column \@endpbox\do@row@strut \or + \vbox \@startpbox{\@nextchar}\insert@column \@endpbox\do@row@strut + \fi}\prepnext@tok} + +\newbox\ar@mcellbox +\def\ar@align@mcell{% + \ifdim \ht\ar@mcellbox > \ht\strutbox + \begingroup + \dimen@\ht\ar@mcellbox + \advance\dimen@-\ht\@arstrutbox + \advance\dimen@\baselineskip + \lower.5\dimen@\box\ar@mcellbox + \endgroup + \else % assume one line and align at baseline + \box\ar@mcellbox + \fi} + +\def\@arrayrule{\@addtopreamble \vline} +\def\@classvii{\ifnum \@lastchclass = \thr@@ + \@preamerr \thr@@ \fi} +\def\@classvi{\ifcase \@lastchclass + \@acol \or + \@addtopreamble{\hskip \doublerulesep}\or + \@acol \or + \@classvii + \fi} +\def\@classii{\advance \count@ \m@ne + \save@decl\prepnext@tok} +\def\@classi{\@classvi + \ifcase \@chnum \@arrayrule \or + \@classv \fi} +\def\@startpbox#1{\bgroup + \color@begingroup + \setlength\hsize{#1}\@arrayparboxrestore + \everypar{% + \vrule \@height \ht\@arstrutbox \@width \z@ + \everypar{}}% + } +\def\@endpbox{\@finalstrut\@arstrutbox \par \color@endgroup \egroup\hfil} +\def\@array[#1]#2{% + \@tempdima \ht \strutbox + \advance \@tempdima by\extrarowheight + \setbox \@arstrutbox \hbox{\vrule + \@height \arraystretch \@tempdima + \@depth \arraystretch \dp \strutbox + \@width \z@}% + \begingroup + \@mkpream{#2}% + \xdef\@preamble{\noexpand \ialign \@halignto + \bgroup \@arstrut \@preamble + \tabskip \z@ \cr}% + \endgroup + \@arrayleft + \if #1t\vtop \else \if#1b\vbox \else \vcenter \fi \fi + \bgroup + \let \@sharp ##\let \protect \relax + \lineskip \z@ + \baselineskip \z@ + \m@th + \let\\\@arraycr \let\tabularnewline\\\let\par\@empty \@preamble} +\def\arraybackslash{\let\\\tabularnewline} +\newdimen \extrarowheight +\extrarowheight=0pt +\def\@arstrut{\unhcopy\@arstrutbox} +\protected\def\@arraycr{\relax\iffalse{\fi\ifnum 0=`}\fi + \@ifstar \@xarraycr \@xarraycr} +\def\@xarraycr{\@ifnextchar [% + \@argarraycr {\ifnum 0=`{}\fi\cr}} +\def\@argarraycr[#1]{\ifnum0=`{}\fi\ifdim #1>\z@ + \expandafter\@xargarraycr\else + \expandafter\@yargarraycr\fi{#1}} +\def\@xargarraycr#1{\unskip\gdef\do@row@strut + {\@tempdima #1\advance\@tempdima \dp\@arstrutbox + \vrule \@depth\@tempdima \@width\z@\global\let\do@row@strut\relax}% + \ifnum\@multicnt >\z@ \do@row@strut \fi + \cr} +\let\do@row@strut\relax +\long\def\multicolumn#1#2#3{% + \multispan{#1}\begingroup + \def\@addamp{\if@firstamp \@firstampfalse \else + \@preamerr 5\fi}% + \@mkpream{#2}\@addtopreamble\@empty + \endgroup + \def\@sharp{#3}% + \@arstrut \@preamble + \null + \ignorespaces} +\let\d@llarbegin\begingroup +\let\d@llarend\endgroup +\def\array{\col@sep\arraycolsep + \def\d@llarbegin{$}\let\d@llarend\d@llarbegin\def\@halignto{}% + \@tabarray} +\def\tabular{\def\@halignto{}\@tabular} +\expandafter\def\csname tabular*\endcsname#1{% + \setlength\dimen@{#1}% + \edef\@halignto{to\the\dimen@}\@tabular} +\def\@tabular{% + \leavevmode + \hbox \bgroup $\col@sep\tabcolsep \let\d@llarbegin\begingroup + \let\d@llarend\endgroup + \@tabarray} +\def\endtabular{\endarray\m@th $\egroup} +\expandafter\let\csname endtabular*\endcsname=\endtabular +\let\@ampacol=\relax \let\@expast=\relax +\let\@arrayclassiv=\relax \let\@arrayclassz=\relax +\let\@tabclassiv=\relax \let\@tabclassz=\relax +\let\@arrayacol=\relax \let\@tabacol=\relax +\let\@tabularcr=\relax \let\@@endpbox=\relax +\let\@argtabularcr=\relax \let\@xtabularcr=\relax +\def\@preamerr#1{\def\@tempd{{..} at wrong position: }% + \PackageError{array}{% + \ifcase #1 Illegal pream-token (\@nextchar): `c' used\or %0 + Missing arg: token ignored\or %1 + Empty preamble: `l' used\or %2 + >\@tempd token ignored\or %3 + <\@tempd changed to !{..}\or %4 + Only one column-spec. allowed.\fi}\@ehc} %5 +\def\newcolumntype#1{% + \edef\NC@char{\string#1}% + \@ifundefined{NC@find@\NC@char}% + {\@tfor\next:=<>clrmbp@!|\do + {% + \if\expandafter\noexpand\next\NC@char + \PackageWarning{array}% + {Redefining primitive column \NC@char}\fi}% + \NC@list\expandafter{\the\NC@list\NC@do#1}}% + {\PackageWarning{array}{Column \NC@char\space is already defined}}% + \@namedef{NC@find@\NC@char}##1#1{\NC@{##1}}% + \@ifnextchar[{\newcol@{\NC@char}}{\newcol@{\NC@char}[0]}} +\def\newcol@#1[#2]#3{\expandafter\@reargdef + \csname NC@rewrite@#1\endcsname[#2]{\NC@find#3}} +\def\NC@#1{% + \@temptokena\expandafter{\the\@temptokena#1}\futurelet\next\NC@ifend} +\def\NC@ifend{% + \ifx\next\relax + \else\@tempswatrue\expandafter\NC@rewrite\fi} +\def\NC@do#1{% + \expandafter\let\expandafter\NC@rewrite + \csname NC@rewrite@\string#1\endcsname + \expandafter\let\expandafter\NC@find + \csname NC@find@\string#1\endcsname + \expandafter\@temptokena\expandafter{\expandafter}% + \expandafter\NC@find\the\@temptokena#1\relax} +\def\showcols{{\def\NC@do##1{\let\NC@do\NC@show}\the\NC@list}} +\def\NC@show#1{% + \typeout{Column #1\expandafter\expandafter\expandafter\NC@strip + \expandafter\meaning\csname NC@rewrite@#1\endcsname\@@}} +\def\NC@strip#1:#2->#3 #4\@@{#2 -> #4} +\newtoks\NC@list +\newcolumntype{*}[2]{} +\long\@namedef{NC@rewrite@*}#1#2{% + \count@#1\relax + \loop + \ifnum\count@>\z@ + \advance\count@\m@ne + \@temptokena\expandafter{\the\@temptokena#2}% + \repeat + \NC@find} +\let\@xexpast\relax +\let\@xexnoop\relax +\def\save@decl{\toks \count@ = \expandafter\expandafter\expandafter + {\expandafter\@nextchar\the\toks\count@}} +\def\@mkpream#1{\gdef\@preamble{}\@lastchclass 4 \@firstamptrue + \let\@sharp\relax + \def\@startpbox##1{\unexpanded\expandafter{\expandafter + \@startpbox\expandafter{##1}}}\let\@endpbox\relax + \let\do@row@strut\relax + \let\ar@align@mcell\relax + \@temptokena{#1}\@tempswatrue + \@whilesw\if@tempswa\fi{\@tempswafalse\the\NC@list}% + \count@\m@ne + \let\the@toks\relax + \prepnext@tok + \expandafter \@tfor \expandafter \@nextchar + \expandafter :\expandafter =\the\@temptokena \do + {\@testpach + \ifcase \@chclass \@classz \or \@classi \or \@classii + \or \save@decl \or \or \@classv \or \@classvi + \or \@classvii \or \@classviii + \or \@classx + \or \@classx \fi + \@lastchclass\@chclass}% + \ifcase\@lastchclass + \@acol \or + \or + \@acol \or + \@preamerr \thr@@ \or + \@preamerr \tw@ \@addtopreamble\@sharp \or + \or + \else \@preamerr \@ne \fi + \def\the@toks{\the\toks}} +\let\@classix\relax +\def\@classviii{\ifnum \@lastchclass >\z@\ifnum\@lastchclass=\tw@\else + \@preamerr 4\@chclass 6 \@classvi \fi\fi} +\def\@classv{\save@decl + \expandafter\NC@ecs\@nextchar\extracolsep{}\extracolsep\@@@ + \@addtopreamble{\d@llarbegin\the@toks\the\count@\relax\d@llarend}% + \prepnext@tok} +\def\NC@ecs#1\extracolsep#2#3\extracolsep#4\@@@{\def\@tempa{#2}% + \ifx\@tempa\@empty\else\toks\count@={#1\tabskip#2\relax#3}\fi} +\def\@tabarray{\@ifnextchar[{\@@array}{\@@array[c]}} +\let\@@array\@array +\def\endarray{\crcr \egroup \egroup \@arrayright \gdef\@preamble{}} +\let\@arrayleft\@empty +\let\@arrayright\@empty +\newlength{\extratabsurround} +\setlength{\extratabsurround}{2pt} +\newlength{\backup@length} +\newcommand{\firsthline}{% + \multicolumn1{@{}c@{}}{% + \global\backup@length\ht\@arstrutbox + \global\advance\backup@length\dp\@arstrutbox + \global\advance\backup@length\arrayrulewidth + \raise\extratabsurround\copy\@arstrutbox + \kern-1sp% + }\\[-\backup@length]\hline +} +\newcommand{\lasthline}{\hline\multicolumn1{@{}c@{}}{% + \global\backup@length2\ht\@arstrutbox + \global\advance\backup@length2\dp\@arstrutbox + \global\advance\backup@length\arrayrulewidth + }\\[-\backup@length]% + \multicolumn1{@{}c@{}}{% + \lower\extratabsurround\copy\@arstrutbox + \kern-1sp% + }% +} +\CheckCommand*\@xhline{\ifx\reserved@a\hline + \vskip\doublerulesep + \vskip-\arrayrulewidth + \fi + \ifnum0=`{\fi}} +\renewcommand*\@xhline{\ifx\reserved@a\hline + \vskip\doublerulesep + \fi + \ifnum0=`{\fi}} + +\newsavebox\ar@cellbox +\newcolumntype{w}[2]{% + >{\begin{lrbox}\ar@cellbox\d@llarbegin}% + c% + <{\d@llarend \end{lrbox}% + \makebox[#2][#1]{\unhbox\ar@cellbox}}} + +\newcolumntype{W}[2] + {>{\begin{lrbox}\ar@cellbox\d@llarbegin}% + c% + <{\d@llarend\end{lrbox}% + \let\hss\hfil + \makebox[#2][#1]{\unhbox\ar@cellbox}}} +\endinput +%% +%% End of file `array.sty'. diff --git a/Master/texmf-dist/tex/latex/tools/array.sty b/Master/texmf-dist/tex/latex/tools/array.sty index cd6eee6a0fc..5010b2f1b43 100644 --- a/Master/texmf-dist/tex/latex/tools/array.sty +++ b/Master/texmf-dist/tex/latex/tools/array.sty @@ -13,7 +13,7 @@ %% (but please observe conditions on bug reports sent to that address!) %% %% -%% Copyright (C) 1993-2023 +%% Copyright (C) 1993-2024 %% The LaTeX Project and any individual authors listed elsewhere %% in this file. %% @@ -38,18 +38,21 @@ %% Package `array' to use with LaTeX 2e %% Copyright (C) 1989-1998 Frank Mittelbach, all rights reserved. \NeedsTeXFormat{LaTeX2e}[1995/06/01] -\providecommand\DeclareRelease[3]{} -\providecommand\DeclareCurrentRelease[2]{} +\DeclareRelease{}{1994-06-01}{array-2016-10-06.sty} \DeclareRelease{}{2016-10-06}{array-2016-10-06.sty} \DeclareRelease{v2.4}{2020-02-10}{array-2020-02-10.sty} -\DeclareCurrentRelease{}{2020-10-01} +\DeclareRelease{v2.5}{2023-11-01}{array-2023-11-01.sty} +\DeclareCurrentRelease{}{2024-06-01} +\NeedsTeXFormat{LaTeX2e}[2024/06/01] \ProvidesPackage{array} - [2023/10/16 v2.5g Tabular extension package (FMi)] + [2024/05/23 v2.6c Tabular extension package (FMi)] %% +\ExplSyntaxOn \def\@addtopreamble#1{\xdef\@preamble{\@preamble #1}} +\ExplSyntaxOff \def\@testpach{\@chclass \ifnum \@lastchclass=6 \@ne \@chnum \@ne \else \ifnum \@lastchclass=7 5 \else @@ -70,11 +73,12 @@ \if \@nextchar >9 \else 10 \@chnum - \if \@nextchar m\thr@@\else + \if \@nextchar m\thr@@ \else \if \@nextchar p4 \else \if \@nextchar b5 \else \z@ \@chclass \z@ \@preamerr \z@ \fi \fi \fi \fi \fi \fi \fi \fi \fi \fi \fi \fi \fi \fi \fi \fi} +\ExplSyntaxOn \def\@xexpast#1*#2#3#4\@@{% \@tempcnta #2 \toks@={#1}\@temptokena={#3}% @@ -91,9 +95,28 @@ \toks\count@{}} \def\save@decl{\toks\count@ \expandafter{\@nextchar}} \def\insert@column{% + \UseTaggingSocket{tbl/cell/begin}% + \the@toks \the \@tempcnta + \ignorespaces \@sharp \textonly@unskip + \the@toks \the \count@ \relax + \UseTaggingSocket{tbl/cell/end}% +} +\protected\def\textonly@unskip{\ifhmode\unskip\fi} +\def\insert@pcolumn{% + \UseTaggingSocket{tbl/pcell/begin}% \the@toks \the \@tempcnta \ignorespaces \@sharp \unskip - \the@toks \the \count@ \relax} + \the@toks \the \count@ \relax + \UseTaggingSocket{tbl/pcell/end}% +} +\def\@addamp { + \if@firstamp + \@firstampfalse + \else + \edef\@preamble{\@preamble & + \noexpand\tbl_update_cell_data: } + \fi +} \newdimen\col@sep \def\@acol{\@addtopreamble{\hskip\col@sep}} \def\@classx{% @@ -117,11 +140,11 @@ \hskip1sp\d@llarbegin \insert@column \d@llarend \do@row@strut \hfil \or \hfil\hskip1sp\d@llarbegin \insert@column \d@llarend \do@row@strut \or \setbox\ar@mcellbox\vbox - \@startpbox{\@nextchar}\insert@column \@endpbox + \@startpbox{\@nextchar}\insert@pcolumn \@endpbox \ar@align@mcell \do@row@strut \or - \vtop \@startpbox{\@nextchar}\insert@column \@endpbox\do@row@strut \or - \vbox \@startpbox{\@nextchar}\insert@column \@endpbox\do@row@strut + \vtop \@startpbox{\@nextchar}\insert@pcolumn \@endpbox\do@row@strut \or + \vbox \@startpbox{\@nextchar}\insert@pcolumn \@endpbox\do@row@strut \fi}\prepnext@tok} \newbox\ar@mcellbox @@ -159,18 +182,25 @@ \everypar{}}% } \def\@endpbox{\@finalstrut\@arstrutbox \par \color@endgroup \egroup\hfil} -\def\@array[#1]#2{% +\def\@array[#1]#2{ \@tempdima \ht \strutbox \advance \@tempdima by\extrarowheight \setbox \@arstrutbox \hbox{\vrule \@height \arraystretch \@tempdima \@depth \arraystretch \dp \strutbox \@width \z@}% + \tbl_save_outer_table_cols: \begingroup \@mkpream{#2}% - \xdef\@preamble{\noexpand \ialign \@halignto - \bgroup \@arstrut \@preamble - \tabskip \z@ \cr}% + \tbl_count_table_cols: + \xdef\@preamble{ + \noexpand \ar@ialign + \@halignto + \bgroup \@arstrut + \UseTaggingSocket{tbl/row/begin} + \tbl_init_cell_data_for_row: + \@preamble + \tabskip \z@ \cr} \endgroup \@arrayleft \if #1t\vtop \else \if#1b\vbox \else \vcenter \fi \fi @@ -178,14 +208,29 @@ \let \@sharp ##\let \protect \relax \lineskip \z@ \baselineskip \z@ - \m@th - \let\\\@arraycr \let\tabularnewline\\\let\par\@empty \@preamble} + \mathsurround \z@ + \let\\\@arraycr \let\tabularnewline\\\let\par\@empty + \UseTaggingSocket{tbl/init} + \@preamble +} +\def\ar@ialign{% + \tbl_init_cell_data_for_table: + \everycr{% + \noalign{% + \tbl_if_row_was_started:T { \UseTaggingSocket{tbl/row/end} } + \tbl_update_cell_data_for_next_row: + }% + }% + \tabskip\z@skip\halign} \def\arraybackslash{\let\\\tabularnewline} \newdimen \extrarowheight \extrarowheight=0pt \def\@arstrut{\unhcopy\@arstrutbox} -\protected\def\@arraycr{\relax\iffalse{\fi\ifnum 0=`}\fi +\protected\def\@arraycr { + \tbl_count_missing_cells:n {@arraycr} + \iffalse{\fi\ifnum 0=`}\fi \@ifstar \@xarraycr \@xarraycr} + \def\@xarraycr{\@ifnextchar [% \@argarraycr {\ifnum 0=`{}\fi\cr}} \def\@argarraycr[#1]{\ifnum0=`{}\fi\ifdim #1>\z@ @@ -199,10 +244,12 @@ \let\do@row@strut\relax \long\def\multicolumn#1#2#3{% \multispan{#1}\begingroup + \tbl_update_multicolumn_cell_data:n {#1} \def\@addamp{\if@firstamp \@firstampfalse \else \@preamerr 5\fi}% \@mkpream{#2}\@addtopreamble\@empty \endgroup + \UseTaggingSocket{tbl/colspan}{#1}% \def\@sharp{#3}% \@arstrut \@preamble \null @@ -218,10 +265,20 @@ \edef\@halignto{to\the\dimen@}\@tabular} \def\@tabular{% \leavevmode + \UseTaggingSocket{tbl/hmode/begin}% \hbox \bgroup $\col@sep\tabcolsep \let\d@llarbegin\begingroup \let\d@llarend\endgroup \@tabarray} -\def\endtabular{\endarray\m@th $\egroup} +\def\endarray { + \tbl_crcr:n{endarray} \egroup + \UseTaggingSocket{tbl/finalize} + \tbl_restore_outer_cell_data: + \egroup + \@arrayright \gdef\@preamble{}% +} +\def\endtabular{\endarray\m@th $\egroup + \UseTaggingSocket{tbl/hmode/end}% +} \expandafter\let\csname endtabular*\endcsname=\endtabular \let\@ampacol=\relax \let\@expast=\relax \let\@arrayclassiv=\relax \let\@arrayclassz=\relax @@ -237,6 +294,7 @@ >\@tempd token ignored\or %3 <\@tempd changed to !{..}\or %4 Only one column-spec. allowed.\fi}\@ehc} %5 +\ExplSyntaxOff % this is really oldstyle using \@tfor := \def\newcolumntype#1{% \edef\NC@char{\string#1}% \@ifundefined{NC@find@\NC@char}% @@ -249,6 +307,7 @@ {\PackageWarning{array}{Column \NC@char\space is already defined}}% \@namedef{NC@find@\NC@char}##1#1{\NC@{##1}}% \@ifnextchar[{\newcol@{\NC@char}}{\newcol@{\NC@char}[0]}} +\ExplSyntaxOn \def\newcol@#1[#2]#3{\expandafter\@reargdef \csname NC@rewrite@#1\endcsname[#2]{\NC@find#3}} \def\NC@#1{% @@ -265,9 +324,11 @@ \expandafter\NC@find\the\@temptokena#1\relax} \def\showcols{{\def\NC@do##1{\let\NC@do\NC@show}\the\NC@list}} \def\NC@show#1{% - \typeout{Column #1\expandafter\expandafter\expandafter\NC@strip + \typeout{Column~ #1\expandafter\expandafter\expandafter\NC@strip \expandafter\meaning\csname NC@rewrite@#1\endcsname\@@}} +\ExplSyntaxOff \def\NC@strip#1:#2->#3 #4\@@{#2 -> #4} +\ExplSyntaxOn \newtoks\NC@list \newcolumntype{*}[2]{} \long\@namedef{NC@rewrite@*}#1#2{% @@ -282,6 +343,7 @@ \let\@xexnoop\relax \def\save@decl{\toks \count@ = \expandafter\expandafter\expandafter {\expandafter\@nextchar\the\toks\count@}} +\ExplSyntaxOff % really oldstyle using \@tfor := \def\@mkpream#1{\gdef\@preamble{}\@lastchclass 4 \@firstamptrue \let\@sharp\relax \def\@startpbox##1{\unexpanded\expandafter{\expandafter @@ -311,18 +373,18 @@ \or \else \@preamerr \@ne \fi \def\the@toks{\the\toks}} +\ExplSyntaxOn \let\@classix\relax \def\@classviii{\ifnum \@lastchclass >\z@\ifnum\@lastchclass=\tw@\else \@preamerr 4\@chclass 6 \@classvi \fi\fi} \def\@classv{\save@decl - \expandafter\NC@ecs\@nextchar\extracolsep{}\extracolsep\@@@ + \expandafter\NC@ecs\@nextchar\extracolsep{}\extracolsep\@@__tbl \@addtopreamble{\d@llarbegin\the@toks\the\count@\relax\d@llarend}% \prepnext@tok} -\def\NC@ecs#1\extracolsep#2#3\extracolsep#4\@@@{\def\@tempa{#2}% +\def\NC@ecs#1\extracolsep#2#3\extracolsep#4\@@__tbl{\def\@tempa{#2}% \ifx\@tempa\@empty\else\toks\count@={#1\tabskip#2\relax#3}\fi} \def\@tabarray{\@ifnextchar[{\@@array}{\@@array[c]}} \let\@@array\@array -\def\endarray{\crcr \egroup \egroup \@arrayright \gdef\@preamble{}} \let\@arrayleft\@empty \let\@arrayright\@empty \newlength{\extratabsurround} @@ -370,6 +432,7 @@ <{\d@llarend\end{lrbox}% \let\hss\hfil \makebox[#2][#1]{\unhbox\ar@cellbox}}} +\ExplSyntaxOff \endinput %% %% End of file `array.sty'. diff --git a/Master/texmf-dist/tex/latex/tools/bm.sty b/Master/texmf-dist/tex/latex/tools/bm.sty index 8a136bd86d5..175a3c6e84e 100644 --- a/Master/texmf-dist/tex/latex/tools/bm.sty +++ b/Master/texmf-dist/tex/latex/tools/bm.sty @@ -12,7 +12,7 @@ %% reports for it can be opened at https://latex-project.org/bugs/ %% (but please observe conditions on bug reports sent to that address!) %% -%% Copyright (C) 1993-2023 +%% Copyright (C) 1993-2024 %% The LaTeX Project and any individual authors listed elsewhere %% in this file. %% @@ -34,13 +34,13 @@ %% The list of all files belonging to the LaTeX `Tools Bundle' is %% given in the file `manifest.txt'. %% -%% Copyright 1996 1997 1998 1999 2002 2003 2004 2016 2017 2019 2021 2022 +%% Copyright 1996 1997 1998 1999 2002 2003 2004 2016 2017 2019 2021 2022 2023 %% David Carlisle Frank Mittelbach %% %% Development of this package was commissioned by Y&Y Inc. \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{bm} - [2023/07/08 v1.2f Bold Symbol Support (DPC/FMi)] + [2023/12/19 v1.2f Bold Symbol Support (DPC/FMi)] \DeclareOption{nopmb}{\let\bm@pmb@\@firstofone} \DeclareOption{warn}{\def\bm@info{\PackageWarningNoLine{bm}}} \DeclareOption{info}{\def\bm@info#1{\PackageInfo{bm}{#1\@gobble}}} diff --git a/Master/texmf-dist/tex/latex/tools/calc.sty b/Master/texmf-dist/tex/latex/tools/calc.sty index d36e1a57ba6..42526027853 100644 --- a/Master/texmf-dist/tex/latex/tools/calc.sty +++ b/Master/texmf-dist/tex/latex/tools/calc.sty @@ -13,7 +13,7 @@ %% (but please observe conditions on bug reports sent to that address!) %% %% -%% Copyright (C) 1993-2023 +%% Copyright (C) 1993-2024 %% The LaTeX Project and any individual authors listed elsewhere %% in this file. %% diff --git a/Master/texmf-dist/tex/latex/tools/dcolumn.sty b/Master/texmf-dist/tex/latex/tools/dcolumn.sty index dccfaac71cb..552e282aa81 100644 --- a/Master/texmf-dist/tex/latex/tools/dcolumn.sty +++ b/Master/texmf-dist/tex/latex/tools/dcolumn.sty @@ -13,7 +13,7 @@ %% (but please observe conditions on bug reports sent to that address!) %% %% -%% Copyright (C) 1993-2023 +%% Copyright (C) 1993-2024 %% The LaTeX Project and any individual authors listed elsewhere %% in this file. %% diff --git a/Master/texmf-dist/tex/latex/tools/delarray.sty b/Master/texmf-dist/tex/latex/tools/delarray.sty index 7f98e7ca54d..a5b7f5c43fe 100644 --- a/Master/texmf-dist/tex/latex/tools/delarray.sty +++ b/Master/texmf-dist/tex/latex/tools/delarray.sty @@ -13,7 +13,7 @@ %% (but please observe conditions on bug reports sent to that address!) %% %% -%% Copyright (C) 1993-2023 +%% Copyright (C) 1993-2024 %% The LaTeX Project and any individual authors listed elsewhere %% in this file. %% diff --git a/Master/texmf-dist/tex/latex/tools/e.tex b/Master/texmf-dist/tex/latex/tools/e.tex index f527cdda628..987b7fc8fcf 100644 --- a/Master/texmf-dist/tex/latex/tools/e.tex +++ b/Master/texmf-dist/tex/latex/tools/e.tex @@ -13,7 +13,7 @@ %% (but please observe conditions on bug reports sent to that address!) %% %% -%% Copyright (C) 1993-2023 +%% Copyright (C) 1993-2024 %% The LaTeX Project and any individual authors listed elsewhere %% in this file. %% diff --git a/Master/texmf-dist/tex/latex/tools/enumerate.sty b/Master/texmf-dist/tex/latex/tools/enumerate.sty index 31a7b6d8d11..189b630df7d 100644 --- a/Master/texmf-dist/tex/latex/tools/enumerate.sty +++ b/Master/texmf-dist/tex/latex/tools/enumerate.sty @@ -13,7 +13,7 @@ %% (but please observe conditions on bug reports sent to that address!) %% %% -%% Copyright (C) 1993-2023 +%% Copyright (C) 1993-2024 %% The LaTeX Project and any individual authors listed elsewhere %% in this file. %% diff --git a/Master/texmf-dist/tex/latex/tools/fontsmpl.sty b/Master/texmf-dist/tex/latex/tools/fontsmpl.sty index 7795c1b0da2..781e333f1e5 100644 --- a/Master/texmf-dist/tex/latex/tools/fontsmpl.sty +++ b/Master/texmf-dist/tex/latex/tools/fontsmpl.sty @@ -13,7 +13,7 @@ %% (but please observe conditions on bug reports sent to that address!) %% %% -%% Copyright (C) 1993-2023 +%% Copyright (C) 1993-2024 %% The LaTeX Project and any individual authors listed elsewhere %% in this file. %% diff --git a/Master/texmf-dist/tex/latex/tools/fontsmpl.tex b/Master/texmf-dist/tex/latex/tools/fontsmpl.tex index 4ea37210957..8c1671492fd 100644 --- a/Master/texmf-dist/tex/latex/tools/fontsmpl.tex +++ b/Master/texmf-dist/tex/latex/tools/fontsmpl.tex @@ -13,7 +13,7 @@ %% (but please observe conditions on bug reports sent to that address!) %% %% -%% Copyright (C) 1993-2023 +%% Copyright (C) 1993-2024 %% The LaTeX Project and any individual authors listed elsewhere %% in this file. %% diff --git a/Master/texmf-dist/tex/latex/tools/ftnright.sty b/Master/texmf-dist/tex/latex/tools/ftnright.sty index fbae2b7949a..06d26677fbc 100644 --- a/Master/texmf-dist/tex/latex/tools/ftnright.sty +++ b/Master/texmf-dist/tex/latex/tools/ftnright.sty @@ -13,7 +13,7 @@ %% (but please observe conditions on bug reports sent to that address!) %% %% -%% Copyright (C) 1993-2023 +%% Copyright (C) 1993-2024 %% The LaTeX Project and any individual authors listed elsewhere %% in this file. %% diff --git a/Master/texmf-dist/tex/latex/tools/h.tex b/Master/texmf-dist/tex/latex/tools/h.tex index c7af478cf4a..e17174333b4 100644 --- a/Master/texmf-dist/tex/latex/tools/h.tex +++ b/Master/texmf-dist/tex/latex/tools/h.tex @@ -13,7 +13,7 @@ %% (but please observe conditions on bug reports sent to that address!) %% %% -%% Copyright (C) 1993-2023 +%% Copyright (C) 1993-2024 %% The LaTeX Project and any individual authors listed elsewhere %% in this file. %% diff --git a/Master/texmf-dist/tex/latex/tools/hhline.sty b/Master/texmf-dist/tex/latex/tools/hhline.sty index 97bb952b645..e4fb937acb8 100644 --- a/Master/texmf-dist/tex/latex/tools/hhline.sty +++ b/Master/texmf-dist/tex/latex/tools/hhline.sty @@ -13,7 +13,7 @@ %% (but please observe conditions on bug reports sent to that address!) %% %% -%% Copyright (C) 1993-2023 +%% Copyright (C) 1993-2024 %% The LaTeX Project and any individual authors listed elsewhere %% in this file. %% diff --git a/Master/texmf-dist/tex/latex/tools/indentfirst.sty b/Master/texmf-dist/tex/latex/tools/indentfirst.sty index be715f3d89b..68ba4564107 100644 --- a/Master/texmf-dist/tex/latex/tools/indentfirst.sty +++ b/Master/texmf-dist/tex/latex/tools/indentfirst.sty @@ -13,7 +13,7 @@ %% (but please observe conditions on bug reports sent to that address!) %% %% -%% Copyright (C) 1993-2023 +%% Copyright (C) 1993-2024 %% The LaTeX Project and any individual authors listed elsewhere %% in this file. %% diff --git a/Master/texmf-dist/tex/latex/tools/l3sys-query.sty b/Master/texmf-dist/tex/latex/tools/l3sys-query.sty new file mode 100644 index 00000000000..792ef9c0416 --- /dev/null +++ b/Master/texmf-dist/tex/latex/tools/l3sys-query.sty @@ -0,0 +1,124 @@ +%% +%% This is file `l3sys-query.sty', +%% generated with the docstrip utility. +%% +%% The original source files were: +%% +%% l3sys-query.dtx (with options: `package') +%% +%% This is a generated file. +%% +%% The source is maintained by the LaTeX Project team and bug +%% reports for it can be opened at https://latex-project.org/bugs/ +%% (but please observe conditions on bug reports sent to that address!) +%% +%% Copyright (C) 1993-2024 +%% The LaTeX Project and any individual authors listed elsewhere +%% in this file. +%% +%% This file was generated from file(s) of the Standard LaTeX `Tools Bundle'. +%% -------------------------------------------------------------------------- +%% +%% It may be distributed and/or modified under the +%% conditions of the LaTeX Project Public License, either version 1.3c +%% of this license or (at your option) any later version. +%% The latest version of this license is in +%% https://www.latex-project.org/lppl.txt +%% and version 1.3c or later is part of all distributions of LaTeX +%% version 2005/12/01 or later. +%% +%% This file may only be distributed together with a copy of the LaTeX +%% `Tools Bundle'. You may however distribute the LaTeX `Tools Bundle' +%% without such generated files. +%% +%% The list of all files belonging to the LaTeX `Tools Bundle' is +%% given in the file `manifest.txt'. +%% +%% Source File: l3sys-query.dtx +%% Copyright (C) 2024 +%% +%% The LaTeX Project and any individual authors listed elsewhere +%% in this file. +%% +%% This file may be distributed under the terms of the LPPL. +%% See README for details. +\ProvidesPackage{l3sys-query} + [2024-03-28 v1.0a LaTeX2e interface for l3sys file queries] +\ExplSyntaxOn +\sys_if_shell:F{ + \PackageWarningNoLine{l3sys-query} + {Shell ~Escape ~is ~disabled.\MessageBreak All ~queries ~will ~return ~empty ~results} + } +\NewDocumentCommand\QueryWorkingDirectory {m} { + \sys_get_query:nN {pwd} #1 +} +\tl_new:N\l_query_percent_tl +\tl_new:N\l_query_tilde_tl +\NewDocumentCommand\QueryFiles {} { + \group_begin: + \char_set_catcode_other:N \% + \char_set_catcode_other:N \^ + \QueryFiles_inner + } +\char_set_catcode_active:N \~ +\NewDocumentCommand\QueryFiles_inner {O{}m}{ + \group_end: + \tl_set:Nn\l_tmpa_tl{} + \cs_set_eq:NN \l_query_percent_tl \% + \cs_set_eq:NN \% \c_percent_str + \cs_set_eq:NN \l_query_tilde_tl ~ + \cs_set_eq:NN ~ \c_tilde_str + \keys_set:nn{QueryFiles}{#1} + \exp_args:NnV\sys_split_query:nnnN {ls} \l_tmpa_tl {#2} \l_tmpa_seq + \cs_set_eq:NN \% \l_query_percent_tl + \cs_set_eq:NN ~ \l_query_tilde_tl + \seq_map_inline:Nn\l_tmpa_seq +} +\NewDocumentCommand\QueryFilesTF {} { + \group_begin: + \char_set_catcode_other:N \% + \QueryFilesTF_inner + } +\NewDocumentCommand\QueryFilesTF_inner {O{}m}{ + \group_end: + \tl_set:Nn\l_tmpa_tl{} + \cs_set_eq:NN \l_query_percent_tl \% + \cs_set_eq:NN \% \c_percent_str + \cs_set_eq:NN \l_query_tilde_tl ~ + \cs_set_eq:NN ~ \c_tilde_str + \keys_set:nn{QueryFiles}{#1} + \exp_args:NnV\sys_split_query:nnnN {ls} \l_tmpa_tl {#2} \l_tmpa_seq + \cs_set_eq:NN \% \l_query_percent_tl + \cs_set_eq:NN ~ \l_query_tilde_tl + \seq_if_empty:NTF \l_tmpa_seq \use_iii:nnn \__queryfiles_aux:nnn +} +\char_set_catcode_space:N \~ +\cs_new:Npn \__queryfiles_aux:nnn #1#2#3 { + #2 + \seq_map_inline:Nn\l_tmpa_seq {#1} + } +\keys_define:nn {QueryFiles} { +recursive .code:n =\tl_put_right:Nn \l_tmpa_tl {--recursive ~ } , +recursive .value_forbidden:n = true , +ignore-case .code:n =\tl_put_right:Nn \l_tmpa_tl {--ignore-case ~ } , +ignore-case .value_forbidden:n = true , +reverse .code:n =\tl_put_right:Nn \l_tmpa_tl {--reverse ~ } , +reverse .value_forbidden:n = true , +exclude .code:n =\tl_put_right:Ne \l_tmpa_tl { + --exclude ~ + \sys_if_shell_restricted:F' + \exp_not:n{#1} + \sys_if_shell_restricted:F' + ~ } , +exclude .value_required:n = true , +type .choices:nn = {d,f} + {\tl_put_right:Nn \l_tmpa_tl {--type ~ #1 ~ }} , +sort .choices:nn = {date,name} +{\tl_put_right:Nn \l_tmpa_tl {--sort ~ #1 ~ }} , +pattern .code:n =\tl_put_right:Nn \l_tmpa_tl {--pattern ~ } , +pattern .value_forbidden:n = true , +} +\ExplSyntaxOff +\endinput +%% +%% End of file `l3sys-query.sty'. diff --git a/Master/texmf-dist/tex/latex/tools/layout.sty b/Master/texmf-dist/tex/latex/tools/layout.sty index 485dd89fac4..33d9bd36333 100644 --- a/Master/texmf-dist/tex/latex/tools/layout.sty +++ b/Master/texmf-dist/tex/latex/tools/layout.sty @@ -13,7 +13,7 @@ %% (but please observe conditions on bug reports sent to that address!) %% %% -%% Copyright (C) 1993-2023 +%% Copyright (C) 1993-2024 %% The LaTeX Project and any individual authors listed elsewhere %% in this file. %% diff --git a/Master/texmf-dist/tex/latex/tools/longtable-2020-01-07.sty b/Master/texmf-dist/tex/latex/tools/longtable-2020-01-07.sty index f79c691e104..fc7c3f42909 100644 --- a/Master/texmf-dist/tex/latex/tools/longtable-2020-01-07.sty +++ b/Master/texmf-dist/tex/latex/tools/longtable-2020-01-07.sty @@ -1,4 +1,8 @@ %% +%% This is an old release of `longtable.sty' used during rollback operations. +%% Do not use this file directly. +%% ============================== +%% %% This is file `longtable.sty', %% generated with the docstrip utility. %% diff --git a/Master/texmf-dist/tex/latex/tools/longtable.sty b/Master/texmf-dist/tex/latex/tools/longtable.sty index 0da756ace51..aa19b28096a 100644 --- a/Master/texmf-dist/tex/latex/tools/longtable.sty +++ b/Master/texmf-dist/tex/latex/tools/longtable.sty @@ -12,7 +12,7 @@ %% reports for it can be opened at https://latex-project.org/bugs/ %% (but please observe conditions on bug reports sent to that address!) %% -%% Copyright (C) 1993-2023 +%% Copyright (C) 1993-2024 %% The LaTeX Project and any individual authors listed elsewhere %% in this file. %% @@ -36,14 +36,14 @@ %% %% File: longtable.dtx Copyright (C) 1990-2020 David Carlisle \NeedsTeXFormat{LaTeX2e}[1995/06/01] -\providecommand\DeclareRelease[3]{} -\providecommand\DeclareCurrentRelease[2]{} + +\DeclareRelease{}{1994-06-01}{longtable-2020-01-07.sty} \DeclareRelease{v4.13}{2020-01-02}{longtable-2020-01-07.sty} \DeclareCurrentRelease{}{2020-02-07} \ProvidesPackage{longtable} - [2023-11-01 v4.19 Multi-page Table package (DPC)] + [2024-04-26 v4.20 Multi-page Table package (DPC)] \def\LT@err{\PackageError{longtable}} \def\LT@warn{\PackageWarning{longtable}} \def\LT@final@warn{% @@ -99,10 +99,16 @@ \if@twocolumn \LT@err{longtable not in 1-column mode}\@ehc \fi + \UseTaggingSocket{tbl/vmode/begin}% \begingroup \@ifnextchar[\LT@array{\LT@array[x]}} +\ExplSyntaxOn \def\LT@array[#1]#2{% - \refstepcounter{table}\stepcounter{LT@tables}% + \UseTaggingSocket{tbl/init} + \@kernel@refstepcounter{table}\stepcounter{LT@tables} + \tl_gset:Ne \@currentHref {table.\cs_if_exist_use:N\theHtable} + \tbl_gzero_row_count: + \UseTaggingSocket{tbl/longtable/init} \if l#1% \LTleft\z@ \LTright\fill \else\if r#1% @@ -116,7 +122,8 @@ \def\@tabarray{% \let\hline\LT@@hl \LT@@tabarray}% - \let\\\LT@tabularcr\let\tabularnewline\\% + \let\\\LT@tabularcr + \let\tabularnewline\\% \def\newpage{\noalign{\break}}% \def\pagebreak{\noalign{\ifnum`}=0\fi\@testopt{\LT@no@pgbk-}4}% \def\nopagebreak{\noalign{\ifnum`}=0\fi\@testopt\LT@no@pgbk4}% @@ -142,19 +149,41 @@ \let\@sharp##\let\protect\relax \begingroup \@mkpream{#2}% + \tbl_count_table_cols: \xdef\LT@bchunk{% + \tbl_inbetween_rows: \global\advance\c@LT@chunks\@ne \global\LT@rows\z@\setbox\z@\vbox\bgroup \LT@setprevdepth \tabskip\LTleft \noexpand\halign to\hsize\bgroup - \tabskip\z@ \@arstrut \@preamble \tabskip\LTright \cr}% + \tabskip\z@ \@arstrut + \UseTaggingSocket{tbl/row/begin}% + \tbl_init_cell_data_for_row: + \@preamble \tabskip\LTright \cr}% \endgroup \expandafter\LT@nofcols\LT@bchunk&\LT@nofcols \LT@make@row \m@th\let\par\@empty - \everycr{}\lineskip\z@\baselineskip\z@ + \everycr{% + \noalign{% + \__tbl_trace:n {--longtable-->~chunk~row:~ \the\LT@rows \space + row:~ \the\g__tbl_row_int \space + column:~ \the\g__tbl_col_int + } + \tbl_if_row_was_started:T + { + \UseTaggingSocket{tbl/row/end} + \tbl_inbetween_rows: + } + \int_compare:nNnT \LT@rows < \LTchunksize + { \tbl_gincr_row_count: } % next is row about to start + }% + }% + \lineskip\z@\baselineskip\z@ \LT@bchunk} +\ExplSyntaxOff \def\LT@no@pgbk#1[#2]{\penalty #1\@getpen{#2}\ifnum`{=0\fi}} +\ExplSyntaxOn \def\LT@start{% \let\LT@start\endgraf \endgraf\penalty\z@\vskip\LTpre\endgraf @@ -184,18 +213,23 @@ \else \ifdim\pageshrink>\z@\pageshrink\z@\fi \fi - \global\@colroom\@colht + \global\@colroom\@colht \ifvoid\LT@foot\else \global\advance\vsize-\ht\LT@foot \global\advance\@colroom-\ht\LT@foot \dimen@\pagegoal\advance\dimen@-\ht\LT@foot\pagegoal\dimen@ \maxdepth\z@ \fi + \MakeLinkTarget{table} \ifvoid\LT@firsthead\copy\LT@head\else\box\LT@firsthead\fi\nobreak + \UseTaggingSocket{tbl/longtable/head} \output{\LT@output}} +\ExplSyntaxOff +\ExplSyntaxOn \def\endlongtable{% - \crcr + \tbl_crcr:n {endlongtable} \noalign{% + \UseTaggingSocket{tbl/longtable/finalize} \let\LT@entry\LT@entry@chop \xdef\LT@save@row{\LT@save@row}}% \LT@echunk @@ -210,8 +244,8 @@ \fi \ifx\LT@save@row\LT@@save@row \else - \LT@warn{Column \@width s have changed\MessageBreak - in table \thetable}% + \LT@warn{Column~ widths~ have~ changed\MessageBreak + in~ table~ \thetable}% \LT@final@warn \fi \endgraf\penalty -\LT@end@pen @@ -223,7 +257,10 @@ \endgroup \global\@mparbottom\z@ \endgraf\penalty\z@\addvspace\LTpost - \ifvoid\footins\else\insert\footins{}\fi} + \ifvoid\footins\else\insert\footins{}\fi + \UseTaggingSocket{tbl/vmode/end}% +} +\ExplSyntaxOff \def\LT@nofcols#1&{% \futurelet\@let@token\LT@n@fcols} \def\LT@n@fcols{% @@ -241,9 +278,11 @@ {\LT@t@bularcr}} \let\LT@crcr\crcr \let\LT@setprevdepth\relax +\ExplSyntaxOn \def\LT@t@bularcr{% \global\advance\LT@rows\@ne \ifnum\LT@rows=\LTchunksize + \tbl_count_missing_cells:n {echunk} \gdef\LT@setprevdepth{% \prevdepth\z@ \global\let\LT@setprevdepth\relax}% @@ -252,6 +291,7 @@ \ifnum0=`{}\fi \expandafter\LT@LL@FM@cr \fi} +\ExplSyntaxOff \def\LT@xtabularcr{% \@ifnextchar[\LT@argtabularcr\LT@ntabularcr} \def\LT@ntabularcr{% @@ -370,6 +410,7 @@ \noalign{\ifnum0=`}\fi \penalty\@M \futurelet\@let@token\LT@@hline} +\ExplSyntaxOn \def\LT@@hline{% \ifx\@let@token\hline \global\let\@gtempa\@gobble @@ -381,11 +422,16 @@ \ifnum0=`{\fi}% \multispan\LT@cols \unskip\leaders\hrule\@height\arrayrulewidth\hfill\cr - \noalign{\LT@sep}% + \noalign{ + \tbl_gdecr_row_count: + \LT@sep} \multispan\LT@cols \unskip\leaders\hrule\@height\arrayrulewidth\hfill\cr - \noalign{\penalty\@M}% + \noalign{ + \tbl_gdecr_row_count: + \penalty\@M} \@gtempa} +\ExplSyntaxOff \def\LT@caption{% \noalign\bgroup \@ifnextchar[{\egroup\LT@c@ption\@firstofone}\LT@capti@n} @@ -411,10 +457,11 @@ \fi \endgraf\vskip\baselineskip}% \hss}}} +\ExplSyntaxOn \def\LT@output{% \ifnum\outputpenalty <-\@Mi \ifnum\outputpenalty > -\LT@end@pen - \LT@err{floats and marginpars not allowed in a longtable}\@ehc + \LT@err{floats~ and~ marginpars~ not~ allowed~ in~ a~ longtable}\@ehc \else \setbox\z@\vbox{\unvbox\@cclv}% \ifdim \ht\LT@lastfoot>\ht\LT@foot @@ -430,24 +477,50 @@ \fi \fi \unvbox\z@\box\ifvoid\LT@lastfoot\LT@foot\else\LT@lastfoot\fi + \UseTaggingSocket{tbl/longtable/foot} \fi \else \setbox\@cclv\vbox{\unvbox\@cclv\copy\LT@foot\vss}% + \UseTaggingSocket{tbl/longtable/foot} \@makecol \@outputpage \global\vsize\@colroom \copy\LT@head\nobreak \fi} +\ExplSyntaxOff +\ExplSyntaxOn \def\LT@end@hd@ft#1{% + \tbl_if_row_was_started:TF + { + \tbl_count_missing_cells:n {head/foot} + \int_step_inline:nn + { \LT@rows + 1 } + { + \seq_gput_left:ce + {g__tbl_\cs_to_str:N #1 _rows_seq } + { \int_eval:n {\g__tbl_row_int + 1 - ##1 } } + } + \int_gset:Nn \LT@rows { \LTchunksize } + } + + { + \crcr + \noalign{ + \tbl_gdecr_row_count: % undo the increment + \int_gset:Nn \LT@rows { \LTchunksize } + } + } \LT@echunk \ifx\LT@start\endgraf \LT@err - {Longtable head or foot not at start of table}% - {Increase LTchunksize}% + {Longtable~ head~ or~ foot~ not~ at~ start~ of~ table}% + {Increase~ LTchunksize}% \fi \setbox#1\box\z@ + \__tbl_trace:n {-->>~ Saving~\noexpand#1} \LT@get@widths \LT@bchunk} +\ExplSyntaxOff \def\endfirsthead{\LT@end@hd@ft\LT@firsthead} \def\endhead{\LT@end@hd@ft\LT@head} \def\endfoot{\LT@end@hd@ft\LT@foot} @@ -472,6 +545,12 @@ \long\def\LT@p@ftntext#1{% \edef\@tempa{\the\LT@p@ftn\noexpand\footnotetext[\the\c@footnote]}% \global\LT@p@ftn\expandafter{\@tempa{#1}}}% +\ExplSyntaxOn + \seq_new:N \g__tbl_LT@firsthead_rows_seq + \seq_new:N \g__tbl_LT@head_rows_seq + \seq_new:N \g__tbl_LT@lastfoot_rows_seq + \seq_new:N \g__tbl_LT@foot_rows_seq +\ExplSyntaxOff \endinput %% %% End of file `longtable.sty'. diff --git a/Master/texmf-dist/tex/latex/tools/multicol-2017-04-11.sty b/Master/texmf-dist/tex/latex/tools/multicol-2017-04-11.sty index 9e346656bbf..bdebc93db92 100644 --- a/Master/texmf-dist/tex/latex/tools/multicol-2017-04-11.sty +++ b/Master/texmf-dist/tex/latex/tools/multicol-2017-04-11.sty @@ -1,5 +1,7 @@ %% -%% This is an old release of `multicol.sty', +%% This is an old release of `multicol.sty' used during rollback operations. +%% Do not use this file directly. +%% ============================== %% %% The source is maintained by the LaTeX Project team and bug %% reports for it can be opened at http://latex-project.org/bugs.html diff --git a/Master/texmf-dist/tex/latex/tools/multicol-2019-10-01.sty b/Master/texmf-dist/tex/latex/tools/multicol-2019-10-01.sty index 221f62f68e6..fc8bda54793 100644 --- a/Master/texmf-dist/tex/latex/tools/multicol-2019-10-01.sty +++ b/Master/texmf-dist/tex/latex/tools/multicol-2019-10-01.sty @@ -1,6 +1,7 @@ -%% This is a rollback file for multicol to the last version within release 2019-10-01 -%% ======================= %% +%% This is an old release of `multicol.sty' used during rollback operations. +%% Do not use this file directly. +%% ============================== %% %% This is file `multicol.sty', %% generated with the docstrip utility. @@ -101,14 +102,6 @@ %% %% Frank.Mittelbach@latex-project.org %% -\NeedsTeXFormat{LaTeX2e}[2018-04-01] - -\providecommand\DeclareRelease[3]{} -\providecommand\DeclareCurrentRelease[2]{} - -\DeclareRelease{}{2017-04-11}{multicol-2017-04-11.sty} -\DeclareCurrentRelease{}{2018-04-01} - \ProvidesPackage{multicol} [2019/12/09 v1.8y multicolumn formatting (FMi)] %% diff --git a/Master/texmf-dist/tex/latex/tools/multicol.sty b/Master/texmf-dist/tex/latex/tools/multicol.sty index 4b97a784f51..ebe9ea853a8 100644 --- a/Master/texmf-dist/tex/latex/tools/multicol.sty +++ b/Master/texmf-dist/tex/latex/tools/multicol.sty @@ -12,7 +12,7 @@ %% reports for it can be opened at https://latex-project.org/bugs/ %% (but please observe conditions on bug reports sent to that address!) %% -%% Copyright (C) 1993-2023 +%% Copyright (C) 1993-2024 %% The LaTeX Project and any individual authors listed elsewhere %% in this file. %% @@ -98,18 +98,14 @@ %% %% Frank.Mittelbach@latex-project.org %% -\NeedsTeXFormat{LaTeX2e}[2018-04-01] - -\providecommand\DeclareRelease[3]{} -\providecommand\DeclareCurrentRelease[2]{} +\DeclareRelease{}{1994-06-01}{multicol-2017-04-11.sty} \DeclareRelease{}{2017-04-11}{multicol-2017-04-11.sty} \DeclareRelease{v1.8}{2019-10-01}{multicol-2019-10-01.sty} \DeclareCurrentRelease{}{2021-11-15} \ProvidesPackage{multicol} - [2023/03/30 v1.9f multicolumn formatting (FMi)] -%% + [2024/05/23 v1.9h multicolumn formatting (FMi)] \DeclareOption{twocolumn} {\PackageWarning{multicol}{May not work with the twocolumn option}} @@ -904,10 +900,17 @@ \begingroup \vbadness\@M \setbox#1\copy#1% - \setbox#1\vsplit#1to\maxdimen + \mc@get@all@box@marks #1% \set@keptmarks \endgroup } +\def\mc@get@all@box@marks #1{% + \setbox\@tempboxa\vsplit#1to\maxdimen + \ifvoid#1\else + \setbox#1\vbox{\unvbox\@tempboxa \unvbox#1}% + \mc@get@all@box@marks #1% + \fi +} \def\set@keptmarks{% \ifx\kept@firstmark\@empty \expandafter\gdef\expandafter diff --git a/Master/texmf-dist/tex/latex/tools/q.tex b/Master/texmf-dist/tex/latex/tools/q.tex index 6b478940cee..ef93425302e 100644 --- a/Master/texmf-dist/tex/latex/tools/q.tex +++ b/Master/texmf-dist/tex/latex/tools/q.tex @@ -13,7 +13,7 @@ %% (but please observe conditions on bug reports sent to that address!) %% %% -%% Copyright (C) 1993-2023 +%% Copyright (C) 1993-2024 %% The LaTeX Project and any individual authors listed elsewhere %% in this file. %% diff --git a/Master/texmf-dist/tex/latex/tools/r.tex b/Master/texmf-dist/tex/latex/tools/r.tex index cda1fb1951a..0031b8b56f8 100644 --- a/Master/texmf-dist/tex/latex/tools/r.tex +++ b/Master/texmf-dist/tex/latex/tools/r.tex @@ -13,7 +13,7 @@ %% (but please observe conditions on bug reports sent to that address!) %% %% -%% Copyright (C) 1993-2023 +%% Copyright (C) 1993-2024 %% The LaTeX Project and any individual authors listed elsewhere %% in this file. %% diff --git a/Master/texmf-dist/tex/latex/tools/rawfonts.sty b/Master/texmf-dist/tex/latex/tools/rawfonts.sty index e0ae4dadd37..1dec5d108fa 100644 --- a/Master/texmf-dist/tex/latex/tools/rawfonts.sty +++ b/Master/texmf-dist/tex/latex/tools/rawfonts.sty @@ -13,7 +13,7 @@ %% (but please observe conditions on bug reports sent to that address!) %% %% -%% Copyright (C) 1993-2023 +%% Copyright (C) 1993-2024 %% The LaTeX Project and any individual authors listed elsewhere %% in this file. %% diff --git a/Master/texmf-dist/tex/latex/tools/s.tex b/Master/texmf-dist/tex/latex/tools/s.tex index 30f05c6a854..67068e8f3ee 100644 --- a/Master/texmf-dist/tex/latex/tools/s.tex +++ b/Master/texmf-dist/tex/latex/tools/s.tex @@ -13,7 +13,7 @@ %% (but please observe conditions on bug reports sent to that address!) %% %% -%% Copyright (C) 1993-2023 +%% Copyright (C) 1993-2024 %% The LaTeX Project and any individual authors listed elsewhere %% in this file. %% diff --git a/Master/texmf-dist/tex/latex/tools/shellesc.sty b/Master/texmf-dist/tex/latex/tools/shellesc.sty index 6fbd004dfed..ddeb937bb21 100644 --- a/Master/texmf-dist/tex/latex/tools/shellesc.sty +++ b/Master/texmf-dist/tex/latex/tools/shellesc.sty @@ -13,7 +13,7 @@ %% (but please observe conditions on bug reports sent to that address!) %% %% -%% Copyright (C) 1993-2023 +%% Copyright (C) 1993-2024 %% The LaTeX Project and any individual authors listed elsewhere %% in this file. %% @@ -36,7 +36,7 @@ %% given in the file `manifest.txt'. %% %% Source File: shellesc.dtx -%% Copyright (C) 2015-2023 +%% Copyright (C) 2015-2024 %% %% The LaTeX Project and any individual authors listed elsewhere %% in this file. diff --git a/Master/texmf-dist/tex/latex/tools/showkeys-2014-10-28.sty b/Master/texmf-dist/tex/latex/tools/showkeys-2014-10-28.sty index b4d7b190287..9f465dff5c6 100644 --- a/Master/texmf-dist/tex/latex/tools/showkeys-2014-10-28.sty +++ b/Master/texmf-dist/tex/latex/tools/showkeys-2014-10-28.sty @@ -1,4 +1,8 @@ %% +%% This is an old release of `showkeys.sty' used during rollback operations. +%% Do not use this file directly. +%% ============================== +%% %% This is file `showkeys.sty', %% generated with the docstrip utility. %% diff --git a/Master/texmf-dist/tex/latex/tools/showkeys.sty b/Master/texmf-dist/tex/latex/tools/showkeys.sty index 090a8fb7875..67811019e39 100644 --- a/Master/texmf-dist/tex/latex/tools/showkeys.sty +++ b/Master/texmf-dist/tex/latex/tools/showkeys.sty @@ -13,7 +13,7 @@ %% (but please observe conditions on bug reports sent to that address!) %% %% -%% Copyright (C) 1993-2023 +%% Copyright (C) 1993-2024 %% The LaTeX Project and any individual authors listed elsewhere %% in this file. %% @@ -36,17 +36,15 @@ %% given in the file `manifest.txt'. %% %% File: showkeys.dtx Copyright (C) 1992-1997 David Carlisle -%% File: showkeys.dtx Copyright (C) 2006-2019 David Carlisle, LaTeX Project +%% File: showkeys.dtx Copyright (C) 2006-2024 David Carlisle, LaTeX Project \NeedsTeXFormat{LaTeX2e} -\providecommand\DeclareRelease[3]{} -\providecommand\DeclareCurrentRelease[2]{} - +\DeclareRelease{}{1994-06-01}{showkeys-2014-10-28.sty} \DeclareRelease{}{2014-10-28}{showkeys-2014-10-28.sty} \DeclareCurrentRelease{}{2022-06-01} \ProvidesPackage{showkeys} - [2023/07/08 v3.19 Show cite and label keys (DPC, MH)] + [2024/05/23 v3.21 Show cite and label keys (DPC, MH)] \DeclareOption{notref}{\let\SK@ref\@empty} \DeclareOption{notcite}{\let\SK@cite\@empty} \let\SK@refcolor\relax @@ -90,7 +88,7 @@ \global\setbox\@labels\hbox{% \llap{\SK@lab\SK@lab@relax \kern\@totalleftmargin\kern\marginparsep}% - \box\@labels}% + \unhbox\@labels}% \else \dimen@\prevdepth \nointerlineskip diff --git a/Master/texmf-dist/tex/latex/tools/somedefs.sty b/Master/texmf-dist/tex/latex/tools/somedefs.sty index d50478a051a..8c5226d39bc 100644 --- a/Master/texmf-dist/tex/latex/tools/somedefs.sty +++ b/Master/texmf-dist/tex/latex/tools/somedefs.sty @@ -13,7 +13,7 @@ %% (but please observe conditions on bug reports sent to that address!) %% %% -%% Copyright (C) 1993-2023 +%% Copyright (C) 1993-2024 %% The LaTeX Project and any individual authors listed elsewhere %% in this file. %% diff --git a/Master/texmf-dist/tex/latex/tools/tabularx.sty b/Master/texmf-dist/tex/latex/tools/tabularx.sty index 4079dc9f63e..9cedcd02754 100644 --- a/Master/texmf-dist/tex/latex/tools/tabularx.sty +++ b/Master/texmf-dist/tex/latex/tools/tabularx.sty @@ -12,7 +12,7 @@ %% reports for it can be opened at https://latex-project.org/bugs/ %% (but please observe conditions on bug reports sent to that address!) %% -%% Copyright (C) 1993-2023 +%% Copyright (C) 1993-2024 %% The LaTeX Project and any individual authors listed elsewhere %% in this file. %% @@ -37,7 +37,8 @@ %% File: tabularx.dtx Copyright (C) 1991-1999 2012 2014 2016 2017 David Carlisle \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{tabularx} - [2023/07/08 v2.11c `tabularx' package (DPC)] + [2023/12/11 v2.12a `tabularx' package (DPC)] +\NeedsTeXFormat{LaTeX2e}[2024/06/01] \DeclareOption{infoshow}{\AtEndOfPackage\tracingtabularx} \DeclareOption{debugshow}{\AtEndOfPackage\tracingtabularx} \ProcessOptions @@ -96,6 +97,7 @@ \global\TX@cols\@ne \TX@typeout@ {\@spaces Table Width\@spaces Column Width\@spaces X Columns}% + \SuspendTagging {tabularx}% \TX@trial{\def\NC@rewrite@X{% \global\advance\TX@cols\@ne\NC@find p{\TX@col@width}}}% \loop @@ -103,6 +105,7 @@ \ifTX@ \TX@trial{}% \repeat + \ResumeTagging {tabularx}% {\let\@footnotetext\TX@ftntext\let\@xfootnotenext\TX@xftntext \csname tabular*\expandafter\endcsname\expandafter\TX@target \the\toks@ @@ -167,7 +170,7 @@ \hfuzz\maxdimen \let\hbadness\@tempcnta \let\hfuzz\@tempdima - \expandafter\tabular\the\toks@ + \expandafter\tabular\the\toks@ \endtabular}% \TX@ckpt \TX@typeout@{\@spaces diff --git a/Master/texmf-dist/tex/latex/tools/thb.sty b/Master/texmf-dist/tex/latex/tools/thb.sty index 60ffb1140b8..7d78943b773 100644 --- a/Master/texmf-dist/tex/latex/tools/thb.sty +++ b/Master/texmf-dist/tex/latex/tools/thb.sty @@ -13,7 +13,7 @@ %% (but please observe conditions on bug reports sent to that address!) %% %% -%% Copyright (C) 1993-2023 +%% Copyright (C) 1993-2024 %% The LaTeX Project and any individual authors listed elsewhere %% in this file. %% diff --git a/Master/texmf-dist/tex/latex/tools/thc.sty b/Master/texmf-dist/tex/latex/tools/thc.sty index c8ddd8b16c3..7819ee2f44f 100644 --- a/Master/texmf-dist/tex/latex/tools/thc.sty +++ b/Master/texmf-dist/tex/latex/tools/thc.sty @@ -13,7 +13,7 @@ %% (but please observe conditions on bug reports sent to that address!) %% %% -%% Copyright (C) 1993-2023 +%% Copyright (C) 1993-2024 %% The LaTeX Project and any individual authors listed elsewhere %% in this file. %% diff --git a/Master/texmf-dist/tex/latex/tools/thcb.sty b/Master/texmf-dist/tex/latex/tools/thcb.sty index f6db2854666..d05f9459ae2 100644 --- a/Master/texmf-dist/tex/latex/tools/thcb.sty +++ b/Master/texmf-dist/tex/latex/tools/thcb.sty @@ -13,7 +13,7 @@ %% (but please observe conditions on bug reports sent to that address!) %% %% -%% Copyright (C) 1993-2023 +%% Copyright (C) 1993-2024 %% The LaTeX Project and any individual authors listed elsewhere %% in this file. %% diff --git a/Master/texmf-dist/tex/latex/tools/theorem.sty b/Master/texmf-dist/tex/latex/tools/theorem.sty index 5bbbe63e71a..565fe7344b0 100644 --- a/Master/texmf-dist/tex/latex/tools/theorem.sty +++ b/Master/texmf-dist/tex/latex/tools/theorem.sty @@ -13,7 +13,7 @@ %% (but please observe conditions on bug reports sent to that address!) %% %% -%% Copyright (C) 1993-2023 +%% Copyright (C) 1993-2024 %% The LaTeX Project and any individual authors listed elsewhere %% in this file. %% diff --git a/Master/texmf-dist/tex/latex/tools/thm.sty b/Master/texmf-dist/tex/latex/tools/thm.sty index 7c98832f830..26474e89142 100644 --- a/Master/texmf-dist/tex/latex/tools/thm.sty +++ b/Master/texmf-dist/tex/latex/tools/thm.sty @@ -13,7 +13,7 @@ %% (but please observe conditions on bug reports sent to that address!) %% %% -%% Copyright (C) 1993-2023 +%% Copyright (C) 1993-2024 %% The LaTeX Project and any individual authors listed elsewhere %% in this file. %% diff --git a/Master/texmf-dist/tex/latex/tools/thmb.sty b/Master/texmf-dist/tex/latex/tools/thmb.sty index 47babc61d69..eb8cdc7e396 100644 --- a/Master/texmf-dist/tex/latex/tools/thmb.sty +++ b/Master/texmf-dist/tex/latex/tools/thmb.sty @@ -13,7 +13,7 @@ %% (but please observe conditions on bug reports sent to that address!) %% %% -%% Copyright (C) 1993-2023 +%% Copyright (C) 1993-2024 %% The LaTeX Project and any individual authors listed elsewhere %% in this file. %% diff --git a/Master/texmf-dist/tex/latex/tools/thp.sty b/Master/texmf-dist/tex/latex/tools/thp.sty index 951bc8fa14c..1fc19ff5a99 100644 --- a/Master/texmf-dist/tex/latex/tools/thp.sty +++ b/Master/texmf-dist/tex/latex/tools/thp.sty @@ -13,7 +13,7 @@ %% (but please observe conditions on bug reports sent to that address!) %% %% -%% Copyright (C) 1993-2023 +%% Copyright (C) 1993-2024 %% The LaTeX Project and any individual authors listed elsewhere %% in this file. %% diff --git a/Master/texmf-dist/tex/latex/tools/trace.sty b/Master/texmf-dist/tex/latex/tools/trace.sty index 659039e7fee..00d42ef7af4 100644 --- a/Master/texmf-dist/tex/latex/tools/trace.sty +++ b/Master/texmf-dist/tex/latex/tools/trace.sty @@ -13,7 +13,7 @@ %% (but please observe conditions on bug reports sent to that address!) %% %% -%% Copyright (C) 1993-2023 +%% Copyright (C) 1993-2024 %% The LaTeX Project and any individual authors listed elsewhere %% in this file. %% diff --git a/Master/texmf-dist/tex/latex/tools/varioref-2016-02-16.sty b/Master/texmf-dist/tex/latex/tools/varioref-2016-02-16.sty index 747e89dc605..39cc4467a79 100644 --- a/Master/texmf-dist/tex/latex/tools/varioref-2016-02-16.sty +++ b/Master/texmf-dist/tex/latex/tools/varioref-2016-02-16.sty @@ -1,4 +1,8 @@ %% +%% This is an old release of `varioref.sty' used during rollback operations. +%% Do not use this file directly. +%% ============================== +%% %% This is file `varioref.sty', %% generated with the docstrip utility. %% diff --git a/Master/texmf-dist/tex/latex/tools/varioref.sty b/Master/texmf-dist/tex/latex/tools/varioref.sty index 5cf0a91c5ac..6b2f7cfd7ac 100644 --- a/Master/texmf-dist/tex/latex/tools/varioref.sty +++ b/Master/texmf-dist/tex/latex/tools/varioref.sty @@ -12,7 +12,7 @@ %% reports for it can be opened at https://latex-project.org/bugs/ %% (but please observe conditions on bug reports sent to that address!) %% -%% Copyright (C) 1993-2023 +%% Copyright (C) 1993-2024 %% The LaTeX Project and any individual authors listed elsewhere %% in this file. %% @@ -45,14 +45,13 @@ %% or open an issue at https://github.com/latex3/latex2e. %% \NeedsTeXFormat{LaTeX2e}[1995/05/16] -\providecommand\DeclareRelease[3]{} -\providecommand\DeclareCurrentRelease[2]{} +\DeclareRelease{}{1994-06-01}{varioref-2016-02-16.sty} \DeclareRelease{}{2016-02-16}{varioref-2016-02-16.sty} \DeclareCurrentRelease{}{2019-10-01} \ProvidesPackage{varioref} - [2022/01/09 v1.6f package for extended references (FMi)] + [2024/05/23 v1.6g package for extended references (FMi)] %% diff --git a/Master/texmf-dist/tex/latex/tools/verbatim.sty b/Master/texmf-dist/tex/latex/tools/verbatim.sty index ec527533e24..069ed64286b 100644 --- a/Master/texmf-dist/tex/latex/tools/verbatim.sty +++ b/Master/texmf-dist/tex/latex/tools/verbatim.sty @@ -13,7 +13,7 @@ %% (but please observe conditions on bug reports sent to that address!) %% %% -%% Copyright (C) 1993-2023 +%% Copyright (C) 1993-2024 %% The LaTeX Project and any individual authors listed elsewhere %% in this file. %% @@ -39,7 +39,7 @@ %% Copyright (C) 1989--2003 by Rainer Sch\"opf. All rights reserved. \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{verbatim} - [2023-11-06 v1.5v LaTeX2e package for verbatim enhancements] + [2024-01-22 v1.5x LaTeX2e package for verbatim enhancements] \@ifundefined{verbatim@@@}{}{\endinput} \newtoks\every@verbatim \every@verbatim={} @@ -205,7 +205,7 @@ \fi } \def\verbatiminput{\begingroup - \@ifstar{\verbatim@input\relax}% + \@ifstar{\verbatim@input{\@setupverbvisiblespace\@vobeyspaces}}% {\verbatim@input{\frenchspacing\@vobeyspaces}}} \def\verbatim@input#1#2{% \IfFileExists {#2}{% diff --git a/Master/texmf-dist/tex/latex/tools/verbtest.tex b/Master/texmf-dist/tex/latex/tools/verbtest.tex index 2bd3f6141fa..a5c40684c96 100644 --- a/Master/texmf-dist/tex/latex/tools/verbtest.tex +++ b/Master/texmf-dist/tex/latex/tools/verbtest.tex @@ -13,7 +13,7 @@ %% (but please observe conditions on bug reports sent to that address!) %% %% -%% Copyright (C) 1993-2023 +%% Copyright (C) 1993-2024 %% The LaTeX Project and any individual authors listed elsewhere %% in this file. %% diff --git a/Master/texmf-dist/tex/latex/tools/x.tex b/Master/texmf-dist/tex/latex/tools/x.tex index 1e903a79953..8c5e356a45b 100644 --- a/Master/texmf-dist/tex/latex/tools/x.tex +++ b/Master/texmf-dist/tex/latex/tools/x.tex @@ -13,7 +13,7 @@ %% (but please observe conditions on bug reports sent to that address!) %% %% -%% Copyright (C) 1993-2023 +%% Copyright (C) 1993-2024 %% The LaTeX Project and any individual authors listed elsewhere %% in this file. %% diff --git a/Master/texmf-dist/tex/latex/tools/xr-2023-07-04.sty b/Master/texmf-dist/tex/latex/tools/xr-2023-07-04.sty new file mode 100644 index 00000000000..15bfde169a2 --- /dev/null +++ b/Master/texmf-dist/tex/latex/tools/xr-2023-07-04.sty @@ -0,0 +1,84 @@ +%% +%% This is an old release of `xr.sty' used during rollback operations. +%% Do not use this file directly. +%% ============================== +%% +%% This is file `xr.sty', +%% generated with the docstrip utility. +%% +%% The original source files were: +%% +%% xr.dtx (with options: `package') +%% +%% This is a generated file. +%% +%% The source is maintained by the LaTeX Project team and bug +%% reports for it can be opened at https://latex-project.org/bugs/ +%% (but please observe conditions on bug reports sent to that address!) +%% +%% +%% Copyright (C) 1993-2023 +%% The LaTeX Project and any individual authors listed elsewhere +%% in this file. +%% +%% This file was generated from file(s) of the Standard LaTeX `Tools Bundle'. +%% -------------------------------------------------------------------------- +%% +%% It may be distributed and/or modified under the +%% conditions of the LaTeX Project Public License, either version 1.3c +%% of this license or (at your option) any later version. +%% The latest version of this license is in +%% https://www.latex-project.org/lppl.txt +%% and version 1.3c or later is part of all distributions of LaTeX +%% version 2005/12/01 or later. +%% +%% This file may only be distributed together with a copy of the LaTeX +%% `Tools Bundle'. You may however distribute the LaTeX `Tools Bundle' +%% without such generated files. +%% +%% The list of all files belonging to the LaTeX `Tools Bundle' is +%% given in the file `manifest.txt'. +%% +%% File: xr.dtx Copyright (C) 1993-2019 David Carlisle +\NeedsTeXFormat{LaTeX2e} +\ProvidesPackage{xr} + [2023-07-04 v5.06 eXternal References (DPC)] +\def\externaldocument{\@ifnextchar[\XR@{\XR@[]}} +\let\externalcitedocument\externaldocument +\def\XR@[#1]#2{{% + \makeatletter + \def\XR@prefix{#1}% + \set@curr@file{#2}% + \expandafter\XR@next\@curr@file.aux\relax\\}} +\def\XR@next#1\relax#2\\{% + \edef\XR@list{#2}% + \XR@loop{#1}} +\def\XR@aux{% + \ifx\XR@list\@empty\else\expandafter\XR@explist\fi} + +\def\XR@explist{\expandafter\XR@next\XR@list\\} +\def\XR@loop#1{\openin\@inputcheck{#1}\relax + \ifeof\@inputcheck + \PackageWarning{xr}{^^JNo file #1^^JLABELS NOT IMPORTED.^^J}% + \expandafter\XR@aux + \else + \PackageInfo{xr}{IMPORTING LABELS FROM #1}% + \expandafter\XR@read\fi} +\def\XR@read{% + \read\@inputcheck to\XR@line + \expandafter\XR@test\XR@line...\XR@} +\long\def\XR@test#1#2#3#4\XR@{% + \let\XR@tempa\@gobbletwo + \ifx#1\newlabel + \let\XR@tempa\@firstoftwo + \else\ifx#1\bibcite + \let\XR@tempa\@firstoftwo + \else\ifx#1\@input + \let\XR@tempa\@secondoftwo + \fi\fi\fi + \XR@tempa{#1{\XR@prefix#2}{#3}}{\edef\XR@list{\XR@list#2\relax}}% + \ifeof\@inputcheck\expandafter\XR@aux + \else\expandafter\XR@read\fi} +\endinput +%% +%% End of file `xr.sty'. diff --git a/Master/texmf-dist/tex/latex/tools/xr.sty b/Master/texmf-dist/tex/latex/tools/xr.sty index ece5e0df2d0..9e3f16cd92b 100644 --- a/Master/texmf-dist/tex/latex/tools/xr.sty +++ b/Master/texmf-dist/tex/latex/tools/xr.sty @@ -13,7 +13,7 @@ %% (but please observe conditions on bug reports sent to that address!) %% %% -%% Copyright (C) 1993-2023 +%% Copyright (C) 1993-2024 %% The LaTeX Project and any individual authors listed elsewhere %% in this file. %% @@ -35,17 +35,40 @@ %% The list of all files belonging to the LaTeX `Tools Bundle' is %% given in the file `manifest.txt'. %% -%% File: xr.dtx Copyright (C) 1993-2019 David Carlisle +%% File: xr.dtx Copyright (C) 1993-2024 David Carlisle \NeedsTeXFormat{LaTeX2e} +\DeclareRelease{v5}{2023-07-04}{xr-2023-07-04.sty} +\DeclareCurrentRelease{}{2024-04-10} \ProvidesPackage{xr} - [2023-07-04 v5.06 eXternal References (DPC)] -\def\externaldocument{\@ifnextchar[\XR@{\XR@[]}} + [2024-04-10 v6.00 eXternal References (DPC)] +\def\externaldocument{\@testopt\XR@cite{}} \let\externalcitedocument\externaldocument -\def\XR@[#1]#2{{% +\def\XR@cite[#1]{\@testopt{\XR@[#1]}{}} +\def\XR@[#1][#2]#3{\@testopt{\XR@@{#1}{#2}{#3}}{#3.\XR@ext}} +\def\XR@@nocite{nocite} +\long\def\@gobblefour #1#2#3#4{} +\long\def\@firstoffour #1#2#3#4{#1} +\long\def\@secondoffour#1#2#3#4{#2} +\long\def\@thirdoffour #1#2#3#4{#3} +\long\def\@fourthoffour #1#2#3#4{#4} +\def\XR@addURL#1{\XR@@dURL#1{}{}{}{}\\} +\def\XR@@dURL#1#2#3#4#5\\{% + \unexpanded{{#1}{#2}{#3}{#4}}{\XR@URL}% + }% +\providecommand\XR@ext{pdf} +\def\XR@@#1#2#3[#4]{{% \makeatletter \def\XR@prefix{#1}% - \set@curr@file{#2}% - \expandafter\XR@next\@curr@file.aux\relax\\}} + \def\XR@nocite{#2}% + \ifx\XR@nocite\XR@@nocite + \let\XR@bibcite\vadjust + \else + \let\XR@bibcite\bibcite + \fi + \def\XR@URL{#4}% + \set@curr@file{#3}% + \filename@parse\@curr@file + \XR@next\@curr@file.aux\relax\\}} \def\XR@next#1\relax#2\\{% \edef\XR@list{#2}% \XR@loop{#1}} @@ -64,15 +87,26 @@ \read\@inputcheck to\XR@line \expandafter\XR@test\XR@line...\XR@} \long\def\XR@test#1#2#3#4\XR@{% - \let\XR@tempa\@gobbletwo + \let\XR@tempa\@gobblefour \ifx#1\newlabel - \let\XR@tempa\@firstoftwo - \else\ifx#1\bibcite - \let\XR@tempa\@firstoftwo + \let\XR@tempa\@firstoffour + \else\ifx#1\XR@bibcite + \let\XR@tempa\@secondoffour \else\ifx#1\@input - \let\XR@tempa\@secondoftwo - \fi\fi\fi - \XR@tempa{#1{\XR@prefix#2}{#3}}{\edef\XR@list{\XR@list#2\relax}}% + \let\XR@tempa\@thirdoffour + \else\ifx#1\new@label@record + \let\XR@tempa\@fourthoffour + \fi\fi\fi\fi + \XR@tempa + {% + \expandafter\protected@xdef\csname r@\XR@prefix#2\endcsname{\XR@addURL{#3}}% + }% + {\expandafter\bibcite\expandafter{\XR@prefix#2}{#3}}% + {\edef\XR@list{\XR@list\filename@area#2\relax}}% + {% + \edef\next{\noexpand\new@label@record{\XR@prefix#2}{\unexpanded{#3}{xr-url}{\XR@URL}}}% + \next + } \ifeof\@inputcheck\expandafter\XR@aux \else\expandafter\XR@read\fi} \endinput diff --git a/Master/texmf-dist/tex/latex/tools/xspace.sty b/Master/texmf-dist/tex/latex/tools/xspace.sty index e95d6a1b698..7c4532b2a07 100644 --- a/Master/texmf-dist/tex/latex/tools/xspace.sty +++ b/Master/texmf-dist/tex/latex/tools/xspace.sty @@ -13,7 +13,7 @@ %% (but please observe conditions on bug reports sent to that address!) %% %% -%% Copyright (C) 1993-2023 +%% Copyright (C) 1993-2024 %% The LaTeX Project and any individual authors listed elsewhere %% in this file. %% |