diff options
Diffstat (limited to 'Master/texmf-dist/tex')
26 files changed, 300 insertions, 184 deletions
diff --git a/Master/texmf-dist/tex/latex-dev/amsmath/amsmath.sty b/Master/texmf-dist/tex/latex-dev/amsmath/amsmath.sty index 2643979483b..49353c0aada 100644 --- a/Master/texmf-dist/tex/latex-dev/amsmath/amsmath.sty +++ b/Master/texmf-dist/tex/latex-dev/amsmath/amsmath.sty @@ -27,7 +27,7 @@ \providecommand\DeclareCurrentRelease[2]{} \DeclareRelease{}{2018-12-01}{amsmath-2018-12-01.sty} \DeclareCurrentRelease{}{2019-04-01} -\ProvidesPackage{amsmath}[2021/10/15 v2.17l AMS math features] +\ProvidesPackage{amsmath}[2022/02/03 v2.17m AMS math features] \edef\@temp{\catcode 96=\number\catcode 96 } \catcode\string `\`=12 \def\do#1{\catcode\number`#1=\number\catcode`#1} @@ -2695,13 +2695,13 @@ Cannot use `split' here;\MessageBreak trying to recover with `aligned'}% \endgroup } \iftagsleft@ - \def\shoveright#1{% + \protected\def\shoveright#1{% #1% \hfilneg \hskip\multlinegap } \else - \def\shoveright#1{% + \protected\def\shoveright#1{% #1% \hfilneg \iftag@ @@ -2716,12 +2716,11 @@ Cannot use `split' here;\MessageBreak trying to recover with `aligned'}% \fi } \fi - \if@fleqn \def\shoveleft#1{#1}% \else \iftagsleft@ - \def\shoveleft#1{% + \protected\def\shoveleft#1{% \setboxz@h{$\m@th\displaystyle{}#1$}% \setbox\@ne\hbox{$\m@th\displaystyle#1$}% \hfilneg @@ -2736,17 +2735,17 @@ Cannot use `split' here;\MessageBreak trying to recover with `aligned'}% \hskip\multlinegap \fi \hskip.5\wd\@ne - \hskip-.5\wdz@ + \hskip-.5\wdz@ \relax #1% } \else - \def\shoveleft#1{% + \protected\def\shoveleft#1{% \setboxz@h{$\m@th\displaystyle{}#1$}% \setbox\@ne\hbox{$\m@th\displaystyle#1$}% \hfilneg \hskip\multlinegap \hskip.5\wd\@ne - \hskip-.5\wdz@ + \hskip-.5\wdz@ \relax #1% } \fi diff --git a/Master/texmf-dist/tex/latex-dev/amsmath/amsopn.sty b/Master/texmf-dist/tex/latex-dev/amsmath/amsopn.sty index 1e5d1e98dbf..756929315a5 100644 --- a/Master/texmf-dist/tex/latex-dev/amsmath/amsopn.sty +++ b/Master/texmf-dist/tex/latex-dev/amsmath/amsopn.sty @@ -23,7 +23,7 @@ %% \NeedsTeXFormat{LaTeX2e}% LaTeX 2.09 can't be used (nor non-LaTeX) [1994/12/01]% LaTeX date must December 1994 or later -\ProvidesPackage{amsopn}[2021/08/26 v2.02 operator names] +\ProvidesPackage{amsopn}[2022/01/20 v2.03 operator names] \def\nolimits@{\@ifnextchar\limits{\nolimits\@gobble}{\nolimits}} \begingroup \catcode`\"=12 \ifx\Umathcode\@undefined @@ -87,7 +87,6 @@ \def\sup{\qopname\relax m{sup}} \def\tan{\qopname\relax o{tan}} \def\tanh{\qopname\relax o{tanh}} -\def\operator@font{\mathgroup\symoperators} \def\operatorfont{\operator@font} \def\operatornamewithlimits{\operatorname*} \def\varlim@#1#2{% diff --git a/Master/texmf-dist/tex/latex-dev/base/atveryend-ltx.sty b/Master/texmf-dist/tex/latex-dev/base/atveryend-ltx.sty index 1670a18a890..2f67da6c799 100644 --- a/Master/texmf-dist/tex/latex-dev/base/atveryend-ltx.sty +++ b/Master/texmf-dist/tex/latex-dev/base/atveryend-ltx.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.0l} -\providecommand\ltfilehookdate{2021/08/27} +\providecommand\ltfilehookversion{v1.0m} +\providecommand\ltfilehookdate{2022/03/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-dev/base/latex.ltx b/Master/texmf-dist/tex/latex-dev/base/latex.ltx index b9cf2952fca..bd313da2fe6 100644 --- a/Master/texmf-dist/tex/latex-dev/base/latex.ltx +++ b/Master/texmf-dist/tex/latex-dev/base/latex.ltx @@ -705,7 +705,7 @@ \def\fmtname{LaTeX2e} \edef\fmtversion {2022-06-01} -\def\patch@level{-2} +\def\patch@level{-3} \edef\development@branch@name{develop \the\year-\the\month-\the\day} \iffalse \def\reserved@a#1/#2/#3\@nil{% @@ -853,7 +853,7 @@ \GenericInfo{}{BEGIN module: \new@modulename\space (\new@moduledate)}% \GenericInfo{}{ \@spaces\@spaces\@spaces\space#3\@gobble}% \ifnum\sourceLaTeXdate<% - \expandafter\@parse@version\new@moduledate//00\@nil\relax + \expandafter\@parse@version\new@moduledate//00\@nil\relax \ifnum\expandafter\@parse@version\fmtversion//00\@nil<% \expandafter\@parse@version\new@moduledate//00\@nil\relax \GenericInfo{}{Skipping module \new@modulename}% @@ -868,7 +868,19 @@ \@skipping@moduletrue \expandafter\new@module@skip \fi} -\long\def\new@module@skip#1\IncludeInRelease{\IncludeInRelease} +\long\def\new@module@skip#1\IncludeInRelease{% + \long\def\reserved@a##1\EndModuleRelease{}% + \if\relax\detokenize\expandafter{\reserved@a#1{}{}\EndModuleRelease}\relax + \else + \@latex@error{Missing mandatory \string\IncludeInRelease{0000/00/00}}\@ehc + \expandafter\@secondoftwo + \fi + \@gobble + {\@expandtwoargs\IncludeInRelease + {0000/00/00}{\new@modulename}% + {ERROR! Emergency recovery}% + #1}% + \IncludeInRelease} \def\EndModuleRelease{% \ifx\new@modulename\@empty \@latex@error{Extra \string\EndModuleRelease.}\@eha @@ -1151,7 +1163,6 @@ \cs_new_eq:NN \dimeval \dim_eval:n \cs_new_eq:NN \skipeval \skip_eval:n \ExplSyntaxOff - \ExplSyntaxOn \cs_new_eq:NN \UseName \use:c \cs_new:Npn \ExpandArgs #1 @@ -1162,7 +1173,6 @@ \msg_new:nnn { kernel } { unknown-arg-expansion } { Unknown~arg~expansion~"#1" } \ExplSyntaxOff - %%% From File: ltdefns.dtx \def\two@digits#1{\ifnum#1<10 0\fi\number#1} \protected\long\def\typeout#1{\begingroup @@ -1720,8 +1730,8 @@ \xdef#1{\the\toks@}% \endgroup} %%% From File: ltcmd.dtx -\def\ltcmdversion{v1.0j} -\def\ltcmddate{2021-12-31} +\def\ltcmdversion{v1.0k} +\def\ltcmddate{2022-02-28} \message{document commands,} \ExplSyntaxOn \tl_new:N \l__cmd_arg_spec_tl @@ -4323,6 +4333,9 @@ \cs_new:Npn \IfValueF { \tl_if_novalue:nT } \cs_new:Npn \IfValueT { \tl_if_novalue:nF } \cs_new:Npn \IfValueTF #1#2#3 { \tl_if_novalue:nTF {#1} {#3} {#2} } +\cs_new_eq:NN \IfBlankF \tl_if_blank:nF +\cs_new_eq:NN \IfBlankT \tl_if_blank:nT +\cs_new_eq:NN \IfBlankTF \tl_if_blank:nTF \tl_new:N \ProcessedArgument \cs_new_eq:NN \ReverseBoolean \__cmd_bool_reverse:N \cs_new_eq:NN \SplitArgument \__cmd_split_argument:nnn @@ -13366,7 +13379,12 @@ Type H <return> for immediate help.}% \def\bibcite{\@newl@bel b} \let\citation\@gobble \DeclareRobustCommand\cite{% - \@ifnextchar [{\@tempswatrue\@citex}{\@tempswafalse\@citex[]}} + \@ifnextchar [{\@tempswatrue\@citex@checkblank}{\@tempswafalse\@citex@checkblank[]}} +\def\@citex@checkblank[#1]#2{% + \IfBlankTF {#2}% + {\@citex[#1]{\space}}% + {\@citex[#1]{#2}}% +} \def\@citex[#1]#2{\leavevmode \let\@citea\@empty \@cite{\@for\@citeb:=#2\do @@ -14363,7 +14381,7 @@ Type H <return> for immediate help.}% \__keys_tmp:nn } \__keys_tmp:nn - { code } { code } + { code:n } { code } { legacy_if_set:n } { if } { tl_set:N } { store } { usage:n } { usage } @@ -14374,15 +14392,17 @@ Type H <return> for immediate help.}% \clist_new:N \l__keys_options_clist \bool_new:N \l__keys_options_loading_bool \cs_new_protected:Npn \__keys_options:Nn #1#2 + { \__keys_options_expand_module:Nn \__keys_options:nN {#2} #1 } +\cs_new_protected:Npn \__keys_options:nN #1#2 { - \cs_gset_nopar:cpn { opt@fam@\@currname.\@currext } {#2} + \cs_gset_nopar:cpn { opt@fam@\@currname.\@currext } {#1} \cs_set_protected:Npn \__keys_option_end: { } \clist_clear:N \l__keys_options_clist - \__keys_options_global:Nn #1 {#2} + \__keys_options_global:Nn #2 {#1} \__keys_options_local: - \keys_if_exist:nnF {#2} { unknown } + \keys_if_exist:nnF {#1} { unknown } { - \keys_define:nn {#2} + \keys_define:nn {#1} { unknown .code:n = { @@ -14391,16 +14411,15 @@ Type H <return> for immediate help.}% } } \cs_set_protected:Npn \__keys_option_end: - { \keys_define:nn {#2} { unknown .undefine: } } + { \keys_define:nn {#1} { unknown .undefine: } } } \bool_set_true:N \l__keys_options_loading_bool - \keys_set:nV {#2} \l__keys_options_clist + \keys_set:nV {#1} \l__keys_options_clist \bool_set_false:N \l__keys_options_loading_bool \AtEndOfPackage { \cs_set_eq:NN \@unprocessedoptions \scan_stop: } \__keys_option_end: - \__keys_options_loaded:n {#2} + \__keys_options_loaded:n {#1} } -\cs_generate_variant:Nn \__keys_options:Nn { NV } \msg_new:nnnn { keys } { option-unknown } { Unknown~option~'#1'~for~package~#2. } { @@ -14464,25 +14483,30 @@ Type H <return> for immediate help.}% \cs_new:Npn \__keys_remove_equals:n #1 { \__keys_remove_equals:w #1 = \s__keys_stop } \cs_new:Npn \__keys_remove_equals:w #1 = #2 \s__keys_stop { \exp_not:n {#1} } -\NewDocumentCommand \DeclareKeys { o +m } - { - \IfNoValueTF {#1} - { \exp_args:NV \keys_define:nn \@currname } - { \keys_define:nn {#1} } - {#2} - } -\NewDocumentCommand \ProcessKeyOptions { o } +\cs_generate_variant:Nn \keys_define:nn { nx } +\cs_new_protected:Npn \__keys_options_expand_module:Nn #1#2 { - \IfNoValueTF {#1} - { \__keys_options:NV \c_true_bool \@currname } - { \__keys_options:Nn \c_true_bool {#1} } + \cs:w __keys_options_expand_module:nN \use:e { \cs_end: {#2} } #1 } -\NewDocumentCommand \ProcessKeyPackageOptions { o } +\cs_new_protected:Npn \__keys_options_expand_module:nN #1#2 + { #2 {#1} } +\NewDocumentCommand \DeclareKeys { O { \@currname } +m } + { \__keys_options_expand_module:Nn \keys_define:nn {#1} {#2} } +\NewDocumentCommand \DeclareUnknownKeyHandler { O { \@currname } +m } { - \IfNoValueTF {#1} - { \__keys_options:NV \c_false_bool \@currname } - { \__keys_options:Nn \c_false_bool {#1} } + \cs_set_protected:cpn { __keys_unknown_handler_ #1 :nn } ##1##2 {#2} + \__keys_options_expand_module:Nn \keys_define:nx {#1} + { + unknown .code:n = + \exp_not:N \exp_args:NV + \exp_not:c { __keys_unknown_handler_ #1 :nn } + \exp_not:N \l_keys_key_str {####1} + } } +\NewDocumentCommand \ProcessKeyOptions { O { \@currname } } + { \__keys_options:Nn \c_true_bool {#1} } +\NewDocumentCommand \ProcessKeyPackageOptions { O { \@currname } } + { \__keys_options:Nn \c_false_bool {#1} } \@onlypreamble \ProcessKeyOptions \@onlypreamble \ProcessKeyPackageOptions \cs_new_protected:Npn \__keys_options_loaded:n #1 @@ -14536,17 +14560,12 @@ Type H <return> for immediate help.}% LaTeX~was~asked~to~set~a~key~called~"#1",~but~this~is~only~allowed~ before~\begin{document}.~You~will~need~to~set~the~key~earlier. } -\NewDocumentCommand \SetKeys { o +m } - { - \IfNoValueTF {#1} - { \keys_set:Vn \@currname } - { \keys_set:nn {#1} } - {#2} - } +\NewDocumentCommand \SetKeys { O { \@currname } +m } + { \__keys_options_expand_module:Nn \keys_set:nn {#1} {#2} } \ExplSyntaxOff %%% From File: ltfilehook.dtx -\providecommand\ltfilehookversion{v1.0l} -\providecommand\ltfilehookdate{2021/08/27} +\providecommand\ltfilehookversion{v1.0m} +\providecommand\ltfilehookdate{2022/03/10} \ExplSyntaxOn \tl_new:N \CurrentFile \tl_new:N \CurrentFilePath @@ -14685,8 +14704,16 @@ Type H <return> for immediate help.}% \cs_new_eq:NN \undeclare@file@substitution \__filehook_subst_remove:n \ExplSyntaxOff \ExplSyntaxOff -\def\set@curr@file#1{% +\def\set@curr@file{% \begingroup + \set@curr@file@aux} +\edef\set@curr@file@nosearch{% + \begingroup + \let\noexpand\input@path\noexpand\@empty + \csname seq_clear:N\endcsname + \expandafter\noexpand\csname l_file_search_path_seq\endcsname + \noexpand\set@curr@file@aux} +\def\set@curr@file@aux#1{% \escapechar\m@ne \let\protect\string \edef~{\string~}% @@ -16650,23 +16677,23 @@ Type H <return> for immediate help.}% \uccode`\^^9e=`\^^d0 % d-bar \lccode`\^^[=`\^^[ % oe in OT1 \fi % End of reset block for 8-bit engines +\ExplSyntaxOn +\protected\def\@expl@text@lowercase@@n{\text_lowercase:n} +\protected\def\@expl@text@uppercase@@n{\text_uppercase:n} +\ExplSyntaxOff + +%% \begin{macrocode} \DeclareRobustCommand{\MakeUppercase}[1]{{% \def\i{I}\def\j{J}% \def\reserved@a##1##2{\let##1##2\reserved@a}% \expandafter\reserved@a\@uclclist\reserved@b{\reserved@b\@gobble}% - \let\UTF@two@octets@noexpand\@empty - \let\UTF@three@octets@noexpand\@empty - \let\UTF@four@octets@noexpand\@empty - \protected@edef\reserved@a{\uppercase{#1}}% + \protected@edef\reserved@a{\@expl@text@uppercase@@n{#1}}% \reserved@a }} \DeclareRobustCommand{\MakeLowercase}[1]{{% \def\reserved@a##1##2{\let##2##1\reserved@a}% \expandafter\reserved@a\@uclclist\reserved@b{\reserved@b\@gobble}% - \let\UTF@two@octets@noexpand\@empty - \let\UTF@three@octets@noexpand\@empty - \let\UTF@four@octets@noexpand\@empty - \protected@edef\reserved@a{\lowercase{#1}}% + \protected@edef\reserved@a{\@expl@text@lowercase@@n{#1}}% \reserved@a }} \def\@uclclist{\oe\OE\o\O\ae\AE diff --git a/Master/texmf-dist/tex/latex-dev/base/latexrelease.sty b/Master/texmf-dist/tex/latex-dev/base/latexrelease.sty index 596fc1062cd..616573fd46e 100644 --- a/Master/texmf-dist/tex/latex-dev/base/latexrelease.sty +++ b/Master/texmf-dist/tex/latex-dev/base/latexrelease.sty @@ -382,7 +382,7 @@ \GenericInfo{}{BEGIN module: \new@modulename\space (\new@moduledate)}% \GenericInfo{}{ \@spaces\@spaces\@spaces\space#3\@gobble}% \ifnum\sourceLaTeXdate<% - \expandafter\@parse@version\new@moduledate//00\@nil\relax + \expandafter\@parse@version\new@moduledate//00\@nil\relax \ifnum\expandafter\@parse@version\fmtversion//00\@nil<% \expandafter\@parse@version\new@moduledate//00\@nil\relax \GenericInfo{}{Skipping module \new@modulename}% @@ -397,7 +397,19 @@ \@skipping@moduletrue \expandafter\new@module@skip \fi} -\long\def\new@module@skip#1\IncludeInRelease{\IncludeInRelease} +\long\def\new@module@skip#1\IncludeInRelease{% + \long\def\reserved@a##1\EndModuleRelease{}% + \if\relax\detokenize\expandafter{\reserved@a#1{}{}\EndModuleRelease}\relax + \else + \@latex@error{Missing mandatory \string\IncludeInRelease{0000/00/00}}\@ehc + \expandafter\@secondoftwo + \fi + \@gobble + {\@expandtwoargs\IncludeInRelease + {0000/00/00}{\new@modulename}% + {ERROR! Emergency recovery}% + #1}% + \IncludeInRelease} \def\EndModuleRelease{% \ifx\new@modulename\@empty \@latex@error{Extra \string\EndModuleRelease.}\@eha @@ -408,7 +420,7 @@ \@skipping@modulefalse \fi} \ProvidesPackage{latexrelease} - [2021/04/29 v1.0n LaTeX release emulation and tests + [2022/02/28 v1.0o LaTeX release emulation and tests (including releases up to \latexreleaseversion)] \NeedsTeXFormat{LaTeX2e}[1996/06/01] \@ifundefined{sourceLaTeXdate}{% @@ -472,7 +484,7 @@ of this package available from CTAN} \catcode58=11 % : \catcode126=10 % ~ \catcode32=09 % <space> - \xdef\latexrelease@postexpl{\unexpanded{% + \xdef\latexrelease@postltexpl{\unexpanded{% \cs_gset_protected:Npn \__latexrelease_declare_command:w { \@star@or@long \__latexrelease_declare_command:Nw } \cs_gset_protected:Npn \__latexrelease_declare_command:Nw #1 @@ -512,26 +524,32 @@ of this package available from CTAN} { \cs_set_eq:NN #3 \tex_undefined:D \use:n } } \tl_clear_new:N \l__latexrelease_restores_tl -\cs_gset:Npn \__latexrelease_tmp:w #1 #2 +\cs_gset:Npn \__latexrelease_redefines:w #1 #2 { - \quark_if_recursion_tail_stop_do:Nn #1 - { \cs_undefine:N \__latexrelease_tmp:w } + \quark_if_recursion_tail_stop:N #1 \tl_put_right:Nn \l__latexrelease_restores_tl {#1} \cs_set_eq:cN { __latexrelease_ \cs_to_str:N #1 } #1 \cs_set_eq:NN #1 #2 - \__latexrelease_tmp:w + \__latexrelease_redefines:w } -\__latexrelease_tmp:w +\__latexrelease_redefines:w \__kernel_chk_if_free_cs:N \use_none:n \e@alloc \__latexrelease_e@alloc:NnnnnN \__kernel_msg_error:nnx \use_none:nnn \msg_new:nnnn \msg_gset:nnnn - \NewDocumentCommand \DeclareDocumentCommand + % \NewDocumentCommand \DeclareDocumentCommand % after ltcmd.dtx \newcommand \__latexrelease_declare_command:w \__kernel_msg_error:nnn \use_none:nnn % needed while redirect for kernel msgs doesn't work \q_recursion_tail \q_recursion_tail \q_recursion_stop \msg_redirect_name:nnn { hooks } { exists } { none } +\cs_gset_protected:Npn \latexrelease@postltcmd + { + \__latexrelease_redefines:w + \NewDocumentCommand \DeclareDocumentCommand + \q_recursion_tail \q_recursion_tail + \q_recursion_stop + } }}% \endgroup %%% From File: ltdirchk.dtx @@ -1333,6 +1351,7 @@ of this package available from CTAN} }% \input{expl3.ltx} \EndIncludeInRelease +\@ifundefined{ExplSyntaxOff}{}{\latexrelease@postltexpl} \IncludeInRelease{2020/10/01}{\@expl@cs@to@str@@N}% {expl3 macros added for the 2020-10-01 release}% \ExplSyntaxOn @@ -1366,7 +1385,6 @@ of this package available from CTAN} \IncludeInRelease{0000/00/00}% {\fpeval}{fp and int calculations}% - \let\fpeval\@undefined \let\inteval\@undefined \let\dimeval\@undefined @@ -1388,7 +1406,6 @@ of this package available from CTAN} \IncludeInRelease{0000/00/00}% {\ExpandArgs}{Some pre-expansion commands}% - \let\UseName\@undefined \let\ExpandArgs\@undefined \EndIncludeInRelease @@ -1872,8 +1889,8 @@ of this package available from CTAN} \EndIncludeInRelease %%% From File: ltcmd.dtx -\def\ltcmdversion{v1.0j} -\def\ltcmddate{2021-12-31} +\def\ltcmdversion{v1.0k} +\def\ltcmddate{2022-02-28} \edef\@latexrelease@catcode@null{\the\catcode`\^^@ } \catcode`\^^@=12 \ExplSyntaxOn @@ -4492,6 +4509,19 @@ of this package available from CTAN} \cs_new:Npn \IfValueF { \tl_if_novalue:nT } \cs_new:Npn \IfValueT { \tl_if_novalue:nF } \cs_new:Npn \IfValueTF #1#2#3 { \tl_if_novalue:nTF {#1} {#3} {#2} } +\IncludeInRelease{2022/06/01}% + {\IfBlankTF}{Testing~for~empty~or~blank}% +\cs_new_eq:NN \IfBlankF \tl_if_blank:nF +\cs_new_eq:NN \IfBlankT \tl_if_blank:nT +\cs_new_eq:NN \IfBlankTF \tl_if_blank:nTF +\EndIncludeInRelease +\IncludeInRelease{2021/11/15}% + {\IfBlankTF}{Testing~for~empty~or~blank}% +\cs_undefine:N \IfBlankF +\cs_undefine:N \IfBlankT +\cs_undefine:N \IfBlankTF + +\EndIncludeInRelease \tl_new:N \ProcessedArgument \cs_new_eq:NN \ReverseBoolean \__cmd_bool_reverse:N \cs_new_eq:NN \SplitArgument \__cmd_split_argument:nnn @@ -4518,7 +4548,7 @@ of this package available from CTAN} \EndModuleRelease \ExplSyntaxOff -\@ifundefined{ExplSyntaxOff}{}{\latexrelease@postexpl} +\@ifundefined{ExplSyntaxOff}{}{\latexrelease@postltcmd} \catcode`\^^@=\@latexrelease@catcode@null\relax %%% From File: lthooks.dtx @@ -12805,6 +12835,24 @@ of this package available from CTAN} \EndIncludeInRelease %%% From File: ltidxglo.dtx %%% From File: ltbibl.dtx +\IncludeInRelease{2022/06/01}% + {\cite}{check for blank}% +\DeclareRobustCommand\cite{% + \@ifnextchar [{\@tempswatrue\@citex@checkblank}{\@tempswafalse\@citex@checkblank[]}} +\def\@citex@checkblank[#1]#2{% + \IfBlankTF {#2}% + {\@citex[#1]{\space}}% + {\@citex[#1]{#2}}% +} +\EndIncludeInRelease +\IncludeInRelease{0000/00/00}% + {\cite}{check for blank}% + +\DeclareRobustCommand\cite{% + \@ifnextchar [{\@tempswatrue\@citex}{\@tempswafalse\@citex[]}} +\let\@citex@checkblank\@undefined + +\EndIncludeInRelease \IncludeInRelease{2021/06/01}% {\nocite}{Allow nocite in preamble}% \def\nocite#1{\@bsphack @@ -13971,8 +14019,8 @@ of this package available from CTAN} \endgroup% \EndIncludeInRelease %%% From File: ltfilehook.dtx -\providecommand\ltfilehookversion{v1.0l} -\providecommand\ltfilehookdate{2021/08/27} +\providecommand\ltfilehookversion{v1.0m} +\providecommand\ltfilehookdate{2022/03/10} \IncludeInRelease{2020/10/01}% {\CurrentFile}{Hook management file}% \ExplSyntaxOn @@ -14213,6 +14261,36 @@ of this package available from CTAN} \let \undeclare@file@substitution \@gobble \EndIncludeInRelease +\IncludeInRelease{2022/06/01}% + {\set@curr@file}{Setting current file name}% +\def\set@curr@file{% + \begingroup + \set@curr@file@aux} +\edef\set@curr@file@nosearch{% + \begingroup + \let\noexpand\input@path\noexpand\@empty + \csname seq_clear:N\endcsname + \expandafter\noexpand\csname l_file_search_path_seq\endcsname + \noexpand\set@curr@file@aux} +\def\set@curr@file@aux#1{% + \escapechar\m@ne + \let\protect\string + \edef~{\string~}% + \expandafter\def\csname\expandafter\endcsname + \expandafter{\csname\endcsname}% + \@expl@@@filehook@if@no@extension@@nTF{#1}% + {\@tempswatrue}{\@tempswafalse}% + \@kernel@make@file@csname\@curr@file + \@expl@@@filehook@resolve@file@subst@@w {#1}% + \@expl@@@filehook@if@file@replaced@@TF + {\@kernel@make@file@csname\@curr@file@reqd + \@expl@@@filehook@normalize@file@name@@w{#1}% + \if@tempswa \@expl@@@filehook@drop@extension@@N\@curr@file@reqd \fi}% + {\if@tempswa \@expl@@@filehook@drop@extension@@N\@curr@file \fi + \global\let\@curr@file@reqd\@curr@file}% + \@expl@@@filehook@clear@replacement@flag@@ + \endgroup} +\EndIncludeInRelease \IncludeInRelease{2021/06/01}% {\set@curr@file}{Setting current file name}% \def\set@curr@file#1{% @@ -14234,6 +14312,7 @@ of this package available from CTAN} \global\let\@curr@file@reqd\@curr@file}% \@expl@@@filehook@clear@replacement@flag@@ \endgroup} +\let\set@curr@file@nosearch\@undefined \EndIncludeInRelease \IncludeInRelease{2020/10/01}% {\set@curr@file}{Setting current file name}% @@ -14254,6 +14333,7 @@ of this package available from CTAN} \global\let\@curr@file@reqd\@curr@file}% \@expl@@@filehook@clear@replacement@flag@@ \endgroup} +\let\set@curr@file@nosearch\@undefined \EndIncludeInRelease \IncludeInRelease{2019/10/01}% {\set@curr@file}{Setting current file name}% @@ -14267,10 +14347,12 @@ of this package available from CTAN} \csname\@firstofone#1\@empty\endcsname}}% \endgroup } +\let\set@curr@file@nosearch\@undefined \EndIncludeInRelease \IncludeInRelease{0000/00/00}% {\set@curr@file}{Setting current file name}% \let\set@curr@file\@undefined +\let\set@curr@file@nosearch\@undefined \EndIncludeInRelease \IncludeInRelease{2020/10/01}% {\@kernel@make@file@csname}{Make file csname}% diff --git a/Master/texmf-dist/tex/latex-dev/base/lcyenc.dfu b/Master/texmf-dist/tex/latex-dev/base/lcyenc.dfu index 7bb30ad93df..ae384c6bc16 100644 --- a/Master/texmf-dist/tex/latex-dev/base/lcyenc.dfu +++ b/Master/texmf-dist/tex/latex-dev/base/lcyenc.dfu @@ -42,7 +42,7 @@ %% and covered by LPPL is defined by the unpacking scripts (with %% extension .ins) which are part of the distribution. \ProvidesFile{lcyenc.dfu} - [2021/12/13 v1.2o UTF-8 support] + [2022/02/13 v1.3a UTF-8 support] \DeclareUnicodeCharacter{00A4}{\textcurrency} \DeclareUnicodeCharacter{00AB}{\guillemotleft} \DeclareUnicodeCharacter{00BB}{\guillemotright} diff --git a/Master/texmf-dist/tex/latex-dev/base/ly1enc.dfu b/Master/texmf-dist/tex/latex-dev/base/ly1enc.dfu index 8f20ff00ecf..e5787d34b81 100644 --- a/Master/texmf-dist/tex/latex-dev/base/ly1enc.dfu +++ b/Master/texmf-dist/tex/latex-dev/base/ly1enc.dfu @@ -42,7 +42,7 @@ %% and covered by LPPL is defined by the unpacking scripts (with %% extension .ins) which are part of the distribution. \ProvidesFile{ly1enc.dfu} - [2021/12/13 v1.2o UTF-8 support] + [2022/02/13 v1.3a UTF-8 support] \DeclareUnicodeCharacter{00A0}{\nobreakspace} \DeclareUnicodeCharacter{00A1}{\textexclamdown} \DeclareUnicodeCharacter{00A2}{\textcent} diff --git a/Master/texmf-dist/tex/latex-dev/base/omsenc.dfu b/Master/texmf-dist/tex/latex-dev/base/omsenc.dfu index c949332b75a..69b17696cbb 100644 --- a/Master/texmf-dist/tex/latex-dev/base/omsenc.dfu +++ b/Master/texmf-dist/tex/latex-dev/base/omsenc.dfu @@ -42,7 +42,7 @@ %% and covered by LPPL is defined by the unpacking scripts (with %% extension .ins) which are part of the distribution. \ProvidesFile{omsenc.dfu} - [2021/12/13 v1.2o UTF-8 support] + [2022/02/13 v1.3a UTF-8 support] \DeclareUnicodeCharacter{00A7}{\textsection} \DeclareUnicodeCharacter{00B6}{\textparagraph} \DeclareUnicodeCharacter{00B7}{\textperiodcentered} diff --git a/Master/texmf-dist/tex/latex-dev/base/ot1enc.dfu b/Master/texmf-dist/tex/latex-dev/base/ot1enc.dfu index 24eb4158181..a152259e769 100644 --- a/Master/texmf-dist/tex/latex-dev/base/ot1enc.dfu +++ b/Master/texmf-dist/tex/latex-dev/base/ot1enc.dfu @@ -42,7 +42,7 @@ %% and covered by LPPL is defined by the unpacking scripts (with %% extension .ins) which are part of the distribution. \ProvidesFile{ot1enc.dfu} - [2021/12/13 v1.2o UTF-8 support] + [2022/02/13 v1.3a UTF-8 support] \DeclareUnicodeCharacter{00A0}{\nobreakspace} \DeclareUnicodeCharacter{00A1}{\textexclamdown} \DeclareUnicodeCharacter{00A3}{\textsterling} diff --git a/Master/texmf-dist/tex/latex-dev/base/ot2enc.dfu b/Master/texmf-dist/tex/latex-dev/base/ot2enc.dfu index a4da485ebb9..aa47cff7d0a 100644 --- a/Master/texmf-dist/tex/latex-dev/base/ot2enc.dfu +++ b/Master/texmf-dist/tex/latex-dev/base/ot2enc.dfu @@ -42,7 +42,7 @@ %% and covered by LPPL is defined by the unpacking scripts (with %% extension .ins) which are part of the distribution. \ProvidesFile{ot2enc.dfu} - [2021/12/13 v1.2o UTF-8 support] + [2022/02/13 v1.3a UTF-8 support] \DeclareUnicodeCharacter{00AB}{\guillemotleft} \DeclareUnicodeCharacter{00BB}{\guillemotright} \DeclareUnicodeCharacter{0131}{\i} diff --git a/Master/texmf-dist/tex/latex-dev/base/structuredlog.sty b/Master/texmf-dist/tex/latex-dev/base/structuredlog.sty index 37468669bf4..78bbf19b48e 100644 --- a/Master/texmf-dist/tex/latex-dev/base/structuredlog.sty +++ b/Master/texmf-dist/tex/latex-dev/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.0l} -\providecommand\ltfilehookdate{2021/08/27} +\providecommand\ltfilehookversion{v1.0m} +\providecommand\ltfilehookdate{2022/03/10} \ProvidesExplPackage {structuredlog}{\ltfilehookdate}{\ltfilehookversion} {Structuring the TeX transcript file} diff --git a/Master/texmf-dist/tex/latex-dev/base/t1enc.dfu b/Master/texmf-dist/tex/latex-dev/base/t1enc.dfu index 58307f44977..749d3d4a9bf 100644 --- a/Master/texmf-dist/tex/latex-dev/base/t1enc.dfu +++ b/Master/texmf-dist/tex/latex-dev/base/t1enc.dfu @@ -42,7 +42,7 @@ %% and covered by LPPL is defined by the unpacking scripts (with %% extension .ins) which are part of the distribution. \ProvidesFile{t1enc.dfu} - [2021/12/13 v1.2o UTF-8 support] + [2022/02/13 v1.3a UTF-8 support] \DeclareUnicodeCharacter{00A0}{\nobreakspace} \DeclareUnicodeCharacter{00A1}{\textexclamdown} \DeclareUnicodeCharacter{00A3}{\textsterling} diff --git a/Master/texmf-dist/tex/latex-dev/base/t2aenc.dfu b/Master/texmf-dist/tex/latex-dev/base/t2aenc.dfu index 7565ad750cf..c99141958f6 100644 --- a/Master/texmf-dist/tex/latex-dev/base/t2aenc.dfu +++ b/Master/texmf-dist/tex/latex-dev/base/t2aenc.dfu @@ -42,7 +42,7 @@ %% and covered by LPPL is defined by the unpacking scripts (with %% extension .ins) which are part of the distribution. \ProvidesFile{t2aenc.dfu} - [2021/12/13 v1.2o UTF-8 support] + [2022/02/13 v1.3a UTF-8 support] \DeclareUnicodeCharacter{00A4}{\textcurrency} \DeclareUnicodeCharacter{00A7}{\textsection} \DeclareUnicodeCharacter{00AB}{\guillemotleft} diff --git a/Master/texmf-dist/tex/latex-dev/base/t2benc.dfu b/Master/texmf-dist/tex/latex-dev/base/t2benc.dfu index 38d7d3b04b7..769650ecb4e 100644 --- a/Master/texmf-dist/tex/latex-dev/base/t2benc.dfu +++ b/Master/texmf-dist/tex/latex-dev/base/t2benc.dfu @@ -42,7 +42,7 @@ %% and covered by LPPL is defined by the unpacking scripts (with %% extension .ins) which are part of the distribution. \ProvidesFile{t2benc.dfu} - [2021/12/13 v1.2o UTF-8 support] + [2022/02/13 v1.3a UTF-8 support] \DeclareUnicodeCharacter{00A4}{\textcurrency} \DeclareUnicodeCharacter{00A7}{\textsection} \DeclareUnicodeCharacter{00AB}{\guillemotleft} diff --git a/Master/texmf-dist/tex/latex-dev/base/t2cenc.dfu b/Master/texmf-dist/tex/latex-dev/base/t2cenc.dfu index 3c45c22a8bd..bdd0aed8137 100644 --- a/Master/texmf-dist/tex/latex-dev/base/t2cenc.dfu +++ b/Master/texmf-dist/tex/latex-dev/base/t2cenc.dfu @@ -42,7 +42,7 @@ %% and covered by LPPL is defined by the unpacking scripts (with %% extension .ins) which are part of the distribution. \ProvidesFile{t2cenc.dfu} - [2021/12/13 v1.2o UTF-8 support] + [2022/02/13 v1.3a UTF-8 support] \DeclareUnicodeCharacter{00A4}{\textcurrency} \DeclareUnicodeCharacter{00A7}{\textsection} \DeclareUnicodeCharacter{00AB}{\guillemotleft} diff --git a/Master/texmf-dist/tex/latex-dev/base/ts1enc.dfu b/Master/texmf-dist/tex/latex-dev/base/ts1enc.dfu index 0e67a6cf154..cdf9b0c224d 100644 --- a/Master/texmf-dist/tex/latex-dev/base/ts1enc.dfu +++ b/Master/texmf-dist/tex/latex-dev/base/ts1enc.dfu @@ -42,7 +42,7 @@ %% and covered by LPPL is defined by the unpacking scripts (with %% extension .ins) which are part of the distribution. \ProvidesFile{ts1enc.dfu} - [2021/12/13 v1.2o UTF-8 support] + [2022/02/13 v1.3a UTF-8 support] \DeclareUnicodeCharacter{00A2}{\textcent} \DeclareUnicodeCharacter{00A3}{\textsterling} \DeclareUnicodeCharacter{00A4}{\textcurrency} diff --git a/Master/texmf-dist/tex/latex-dev/base/utf8.def b/Master/texmf-dist/tex/latex-dev/base/utf8.def index d26edefce1f..0492b2cf590 100644 --- a/Master/texmf-dist/tex/latex-dev/base/utf8.def +++ b/Master/texmf-dist/tex/latex-dev/base/utf8.def @@ -42,7 +42,7 @@ %% and covered by LPPL is defined by the unpacking scripts (with %% extension .ins) which are part of the distribution. \ProvidesFile{utf8.def} - [2021/12/13 v1.2o UTF-8 support] + [2022/02/13 v1.3a UTF-8 support] \ifx\ifincsname\@undefined % old e-pTeX or e-upTeX engines \input utf8-2018.def \expandafter\@firstofone @@ -83,13 +83,13 @@ \fi \UTFviii@four@octets@combine } -\long\def\UTF@two@octets@noexpand#1#2{\noexpand#2\noexpand} -\long\def\UTF@three@octets@noexpand#1#2#3{\noexpand#2\noexpand#3\noexpand} -\long\def\UTF@four@octets@noexpand#1#2#3#4{\noexpand#2\noexpand#3\noexpand#4\noexpand} +\long\def\UTF@two@octets@noexpand#1#2#3{\unexpanded{#2#3}} +\long\def\UTF@three@octets@noexpand#1#2#3#4{\unexpanded{#2#3#4}} +\long\def\UTF@four@octets@noexpand#1#2#3#4#5{\unexpanded{#2#3#4#5}} -\long\def\UTF@two@octets@string#1#2{\string#2\string} -\long\def\UTF@three@octets@string#1#2#3{\string#2\string#3\string} -\long\def\UTF@four@octets@string#1#2#3#4{\string#2\string#3\string#4\string} +\long\def\UTF@two@octets@string#1#2#3{\detokenize{#2#3}} +\long\def\UTF@three@octets@string#1#2#3#4{\detokenize{#2#3#4}} +\long\def\UTF@four@octets@string#1#2#3#4#5{\detokenize{#2#3#4#5}} \long\def\UTFviii@two@octets@combine#1#2{\expandafter \UTFviii@defined\csname u8:\string#1\string#2\endcsname} @@ -145,7 +145,13 @@ \expandafter\UTFviii@check@continue \fi } -\begingroup +\edef\reserved@a{% +\catcode`\noexpand\~=\the\catcode`\~\relax +\catcode`\noexpand\"=\the\catcode`\"\relax +\uccode`\noexpand\~=\the\uccode`\~\relax +\count@=\the\count@\relax +\@tempcnta=\the\@tempcnta\relax +\let\noexpand\reserved@a\relax} \catcode`\~13 \catcode`\"12 \def\UTFviii@loop{% @@ -155,7 +161,7 @@ \ifnum\count@<\@tempcnta \expandafter\UTFviii@loop \fi} - \def\UTFviii@tmp{\xdef~{\noexpand\UTFviii@undefined@err{:\string~}}} + \def\UTFviii@tmp{\protected\edef~{\noexpand\UTFviii@undefined@err{:\string~}}} \count@"1 \@tempcnta9 \UTFviii@loop @@ -167,25 +173,25 @@ \UTFviii@loop \count@"80 \@tempcnta"C2 - \def\UTFviii@tmp{\xdef~{\noexpand\UTFviii@invalid@err\string~}} + \def\UTFviii@tmp{\protected\edef~{\noexpand\UTFviii@invalid@err\string~}} \UTFviii@loop \count@"C2 \@tempcnta"E0 - \def\UTFviii@tmp{\xdef~{\noexpand\UTFviii@two@octets\noexpand~}} + \def\UTFviii@tmp{\protected\edef~{\noexpand\UTFviii@two@octets\noexpand~}} \UTFviii@loop \count@"E0 \@tempcnta"F0 - \def\UTFviii@tmp{\xdef~{\noexpand\UTFviii@three@octets\noexpand~}} + \def\UTFviii@tmp{\protected\edef~{\noexpand\UTFviii@three@octets\noexpand~}} \UTFviii@loop \count@"F0 \@tempcnta"F5 - \def\UTFviii@tmp{\xdef~{\noexpand\UTFviii@four@octets\noexpand~}} + \def\UTFviii@tmp{\protected\edef~{\noexpand\UTFviii@four@octets\noexpand~}} \UTFviii@loop \count@"F5 \@tempcnta"100 - \def\UTFviii@tmp{\xdef~{\noexpand\UTFviii@invalid@err\string~}} + \def\UTFviii@tmp{\protected\edef~{\noexpand\UTFviii@invalid@err\string~}} \UTFviii@loop -\endgroup +\reserved@a \@inpenc@test \ifx\@begindocumenthook\@undefined \makeatother diff --git a/Master/texmf-dist/tex/latex-dev/base/utf8enc.dfu b/Master/texmf-dist/tex/latex-dev/base/utf8enc.dfu index 3d4fa8010a8..450cfe80844 100644 --- a/Master/texmf-dist/tex/latex-dev/base/utf8enc.dfu +++ b/Master/texmf-dist/tex/latex-dev/base/utf8enc.dfu @@ -42,7 +42,7 @@ %% and covered by LPPL is defined by the unpacking scripts (with %% extension .ins) which are part of the distribution. \ProvidesFile{utf8enc.dfu} - [2021/12/13 v1.2o UTF-8 support] + [2022/02/13 v1.3a UTF-8 support] \DeclareUnicodeCharacter{00A0}{\nobreakspace} \DeclareUnicodeCharacter{00A1}{\textexclamdown} \DeclareUnicodeCharacter{00A2}{\textcent} diff --git a/Master/texmf-dist/tex/latex-dev/base/x2enc.dfu b/Master/texmf-dist/tex/latex-dev/base/x2enc.dfu index 5773bce8d04..1c2eea70ab4 100644 --- a/Master/texmf-dist/tex/latex-dev/base/x2enc.dfu +++ b/Master/texmf-dist/tex/latex-dev/base/x2enc.dfu @@ -42,7 +42,7 @@ %% and covered by LPPL is defined by the unpacking scripts (with %% extension .ins) which are part of the distribution. \ProvidesFile{x2enc.dfu} - [2021/12/13 v1.2o UTF-8 support] + [2022/02/13 v1.3a UTF-8 support] \DeclareUnicodeCharacter{00A4}{\textcurrency} \DeclareUnicodeCharacter{00A7}{\textsection} \DeclareUnicodeCharacter{00AB}{\guillemotleft} diff --git a/Master/texmf-dist/tex/latex-dev/firstaid/everysel-ltx.sty b/Master/texmf-dist/tex/latex-dev/firstaid/everysel-ltx.sty index 2480b6db3fa..d2f2d8d2d96 100644 --- a/Master/texmf-dist/tex/latex-dev/firstaid/everysel-ltx.sty +++ b/Master/texmf-dist/tex/latex-dev/firstaid/everysel-ltx.sty @@ -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-2021 +%% File: latex2e-first-aid-for-external-files.dtx (C) Copyright 2020-2022 %% %% The LaTeX Project and any individual authors listed elsewhere %% in this file. diff --git a/Master/texmf-dist/tex/latex-dev/firstaid/filehook-ltx.sty b/Master/texmf-dist/tex/latex-dev/firstaid/filehook-ltx.sty index 8ae26decc4f..2dfa89985a5 100644 --- a/Master/texmf-dist/tex/latex-dev/firstaid/filehook-ltx.sty +++ b/Master/texmf-dist/tex/latex-dev/firstaid/filehook-ltx.sty @@ -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-2021 +%% File: latex2e-first-aid-for-external-files.dtx (C) Copyright 2020-2022 %% %% The LaTeX Project and any individual authors listed elsewhere %% in this file. diff --git a/Master/texmf-dist/tex/latex-dev/firstaid/latex2e-first-aid-for-external-files.ltx b/Master/texmf-dist/tex/latex-dev/firstaid/latex2e-first-aid-for-external-files.ltx index cf96c582e7e..4f3e22c741f 100644 --- a/Master/texmf-dist/tex/latex-dev/firstaid/latex2e-first-aid-for-external-files.ltx +++ b/Master/texmf-dist/tex/latex-dev/firstaid/latex2e-first-aid-for-external-files.ltx @@ -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-2021 +%% File: latex2e-first-aid-for-external-files.dtx (C) Copyright 2020-2022 %% %% The LaTeX Project and any individual authors listed elsewhere %% in this file. -\def\LaTeXFirstAidDate{2021/11/11} -\def\LaTeXFirstAidVersion{v1.0q} +\def\LaTeXFirstAidDate{2022/02/20} +\def\LaTeXFirstAidVersion{v1.0r} \ProvidesFile{latex2e-first-aid-for-external-files.ltx} [\LaTeXFirstAidDate\space \LaTeXFirstAidVersion\space LaTeX kernel fixes to external files and packages] @@ -52,20 +52,6 @@ \exp_args:Ncx\str_if_eq:onT{ver@#1.#2}{#3} } \ExplSyntaxOff -\AddToHook{file/biditools.sty/after}[firstaid]{% - \FirstAidNeededT{biditools}{sty}% - {2020/05/13 v2 Programming tools for bidi package}% - {% - \def\firstaid@bidi@document@patch - \endgroup#1\begingroup#2\firstaid@bidi@document@patch - {\unexpanded{#1#2}}% - \edef\document{\expandafter\firstaid@bidi@document@patch\document - \firstaid@bidi@document@patch}% - \AddToHook{enddocument/info}% - {\let\bidi@AfterEndDocumentCheckLabelsRerun\@firstofone - \bidi@afterenddocumentchecklabelsrerunhook}% - }% -} \AddToHook{file/dinbrief.cls/after}[firstaid]{% \FirstAidNeededT{dinbrief}{cls}{2000/03/02 LaTeX2e class}% {\AddToHook{env/document/begin}{\begingroup}}% @@ -129,6 +115,22 @@ \@vwid@sift}% }% } +\AddToHook{file/german.sty/after}[firstaid]{% + \FirstAidNeededT{german}{sty}{1998/07/08 v2.5e Support for writing german texts (br)} + {% +\let\grmn@active@dq@\@active@dq +\def\@active@dq{\protect\grmn@active@dq@}% +\germanTeX +}% +} +\AddToHook{file/ngerman.sty/after}[firstaid]{% + \FirstAidNeededT{ngerman}{sty}{1998/07/08 v2.5e Support for writing german texts (br)} + {% +\let\grmn@active@dq@\@active@dq +\def\@active@dq{\protect\grmn@active@dq@}% +\ngermanTeX +}% +} \ExplSyntaxOn \sys_if_engine_luatex:T { diff --git a/Master/texmf-dist/tex/latex-dev/graphics/graphics.sty b/Master/texmf-dist/tex/latex-dev/graphics/graphics.sty index 1b4989643d6..e8f630bc665 100644 --- a/Master/texmf-dist/tex/latex-dev/graphics/graphics.sty +++ b/Master/texmf-dist/tex/latex-dev/graphics/graphics.sty @@ -31,7 +31,7 @@ \DeclareCurrentRelease{}{2019-10-01} \ProvidesPackage{graphics} - [2021/03/04 v1.4d Standard LaTeX Graphics (DPC,SPQR)] + [2022/03/10 v1.4e Standard LaTeX Graphics (DPC,SPQR)] \edef\Gin@codes{% \catcode`\noexpand\^^A\the\catcode`\^^A\relax \catcode`\noexpand\"\the\catcode`\"\relax @@ -171,25 +171,21 @@ \let\Gin@ext\relax \def\Gin@sepdefault{.} \edef\Gin@gzext{\detokenize{gz}} -\def\Gin@temp#1{% - \begingroup - \escapechar\m@ne - \xdef\@curr@file{\expandafter\string\csname #1\endcsname}% - \endgroup -} -\ifx\set@curr@file\@Gin@temp - \let\set@curr@file\@undefined -\fi -\ifx\set@curr@file\@undefined -\def\set@curr@file#1{% +\def\Gin@set@curr@file#1{% \begingroup \escapechar\m@ne \xdef\@curr@file{\expandafter\string\csname\@firstofone#1\@empty\endcsname}% - \endgroup -} -\def\quote@name#1{"\quote@@name#1\@gobble""} -\def\quote@@name#1"{#1\quote@@name} -\def\unquote@name#1{\quote@@name#1\@gobble"} + \endgroup} +\ifx\set@curr@file@nosearch\@undefined + \ifx\set@curr@file\@undefined + \def\quote@name#1{"\quote@@name#1\@gobble""} + \def\quote@@name#1"{#1\quote@@name} + \def\unquote@name#1{\quote@@name#1\@gobble"} + \else + \let\Gin@set@curr@file\set@curr@file + \fi +\else + \let\Gin@set@curr@file\set@curr@file@nosearch \fi \def\Ginclude@graphics#1{% \ifx\detokenize\@undefined\else @@ -197,7 +193,7 @@ \fi \begingroup \let\input@path\Ginput@path - \set@curr@file{#1}% + \Gin@set@curr@file{#1}% \expandafter\filename@parse\expandafter{\@curr@file}% \ifx\filename@ext\Gin@gzext \expandafter\filename@parse\expandafter{\filename@base}% diff --git a/Master/texmf-dist/tex/latex-dev/graphics/mathcolor.ltx b/Master/texmf-dist/tex/latex-dev/graphics/mathcolor.ltx index c7d15ccd930..c7588a3e195 100644 --- a/Master/texmf-dist/tex/latex-dev/graphics/mathcolor.ltx +++ b/Master/texmf-dist/tex/latex-dev/graphics/mathcolor.ltx @@ -13,14 +13,15 @@ %% %% File: mathcolor.dtx (C) Copyright 2021-2022 %%% From File: mathcolor.dtx -\def\mathcolorversion{v1.0a} -\def\mathcolordate{2022/01/07} +\def\mathcolorversion{v1.0b} +\def\mathcolordate{2022/01/28} \ifcsname mathcolor\endcsname \endinput \fi \ExplSyntaxOn \seq_new:N \g__mathcolor_seq \DeclareDocumentCommand \mathcolor { o m m } { + \mode_if_math:F { \non@alpherr {\mathcolor\space} } \seq_gpush:No \g__mathcolor_seq \current@color \group_insert_after:N \use_none:n \IfValueTF{#1} { \color[#1]{#2} }{ \color{#2} } diff --git a/Master/texmf-dist/tex/latex-dev/tools/array.sty b/Master/texmf-dist/tex/latex-dev/tools/array.sty index 225321efd22..6d72accba91 100644 --- a/Master/texmf-dist/tex/latex-dev/tools/array.sty +++ b/Master/texmf-dist/tex/latex-dev/tools/array.sty @@ -46,7 +46,7 @@ \DeclareCurrentRelease{}{2020-10-01} \ProvidesPackage{array} - [2021/10/04 v2.5f Tabular extension package (FMi)] + [2022/03/10 v2.5f Tabular extension package (FMi)] %% \def\@addtopreamble#1{\xdef\@preamble{\@preamble #1}} diff --git a/Master/texmf-dist/tex/latex/l3build/regression-test.tex b/Master/texmf-dist/tex/latex/l3build/regression-test.tex index 2a5c29ef383..0a1ef5fef23 100644 --- a/Master/texmf-dist/tex/latex/l3build/regression-test.tex +++ b/Master/texmf-dist/tex/latex/l3build/regression-test.tex @@ -246,46 +246,50 @@ \pdfmapfile{pdftex.map}% \fi \fi -\ifnum 0% - \ifx\pdfoutput\@undefined\else\ifnum\pdfoutput>0 1\fi\fi - \ifx\outputmode\@undefined\else\ifnum\outputmode>0 1\fi\fi - >0 % - \ifx\pdfvariable\@undefined - \pdfinfo{/Producer (\ifx\directlua\@undefined pdf\else Lua\fi TeX)} - \ifx\pdfinfoomitdate\@undefined\else - \pdfinfoomitdate = 1 % - \pdfsuppressptexinfo = \numexpr +\ifcsname pdfmeta_set_regression_data:\endcsname + \csname pdfmeta_set_regression_data:\endcsname +\else + \ifnum 0% + \ifx\pdfoutput\@undefined\else\ifnum\pdfoutput>0 1\fi\fi + \ifx\outputmode\@undefined\else\ifnum\outputmode>0 1\fi\fi + >0 % + \ifx\pdfvariable\@undefined + \pdfinfo{/Producer (\ifx\directlua\@undefined pdf\else Lua\fi TeX)} + \ifx\pdfinfoomitdate\@undefined\else + \pdfinfoomitdate = 1 % + \pdfsuppressptexinfo = \numexpr + 0 + + 1 % PTEX.Fullbanner + + 2 % PTEX.FileName + \relax + \pdftrailerid{} + \fi + \else + \pdfextension info{/Producer (LuaTeX)} + \pdfvariable suppressoptionalinfo \numexpr 0 - + 1 % PTEX.Fullbanner - + 2 % PTEX.FileName + + 1 % PTEX.Fullbanner + + 2 % PTEX.FileName + + 32 % CreationDate + + 64 % ModDate + + 512 % ID \relax - \pdftrailerid{} \fi \else - \pdfextension info{/Producer (LuaTeX)} - \pdfvariable suppressoptionalinfo \numexpr - 0 - + 1 % PTEX.Fullbanner - + 2 % PTEX.FileName - + 32 % CreationDate - + 64 % ModDate - + 512 % ID - \relax - \fi -\else - \ifx\XeTeXversion\@undefined - \special{! <</DocumentUUID (DocumentUUID)>> setpagedevice} - \special{! <</InstanceUUID (InstanceUUID)>> setpagedevice} - \else - \special{% - pdf: docinfo - << - /Creator (TeX) - /CreationDate () - /ModDate () - /Producer (xdvipdfmx) - >> - } + \ifx\XeTeXversion\@undefined + \special{! <</DocumentUUID (DocumentUUID)>> setpagedevice} + \special{! <</InstanceUUID (InstanceUUID)>> setpagedevice} + \else + \special{% + pdf: docinfo + << + /Creator (TeX) + /CreationDate () + /ModDate () + /Producer (xdvipdfmx) + >> + } + \fi \fi \fi \reset@catcodes |