From 87aba59c84e17b383ab231357b7f9e75330738a4 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Fri, 21 Jan 2022 22:49:34 +0000 Subject: l3kernel (21jan22) git-svn-id: svn://tug.org/texlive/trunk@61685 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/tex/latex/l3kernel/expl3-code.tex | 21 +++++++++++++++------ .../texmf-dist/tex/latex/l3kernel/expl3-generic.tex | 2 +- Master/texmf-dist/tex/latex/l3kernel/expl3.ltx | 2 +- Master/texmf-dist/tex/latex/l3kernel/expl3.sty | 2 +- Master/texmf-dist/tex/latex/l3kernel/l3doc.cls | 4 +++- 5 files changed, 21 insertions(+), 10 deletions(-) (limited to 'Master/texmf-dist/tex/latex/l3kernel') diff --git a/Master/texmf-dist/tex/latex/l3kernel/expl3-code.tex b/Master/texmf-dist/tex/latex/l3kernel/expl3-code.tex index 9978b7ca997..23d911d0fc0 100644 --- a/Master/texmf-dist/tex/latex/l3kernel/expl3-code.tex +++ b/Master/texmf-dist/tex/latex/l3kernel/expl3-code.tex @@ -70,7 +70,7 @@ %% and all files in that bundle must be distributed together. %% %% File: expl3.dtx -\def\ExplFileDate{2022-01-12}% +\def\ExplFileDate{2022-01-21}% \begingroup \def\next{\endgroup}% \expandafter\ifx\csname PackageError\endcsname\relax @@ -13278,6 +13278,11 @@ \l_keys_key_str } \__keys_default_set:n { true } + \cs_if_exist:cF { if#1 } + { + \cs:w newif \exp_after:wN \cs_end: + \cs:w if#1 \cs_end: + } } \cs_new_protected:Npn \__keys_meta_make:n #1 { @@ -13613,9 +13618,9 @@ \__keys_tmp:nn } \__keys_tmp:nn - { legacy_if:n } { if } - { tl_set:N } { store } - { usage:n } { usage } + { legacy_if_set:n } { if } + { tl_set:N } { store } + { usage:n } { usage } { \q_recursion_tail } { } \q_recursion_stop \group_end: @@ -28334,7 +28339,11 @@ \prg_new_conditional:Npnn \__color_if_defined:n #1 { T, F, TF } { \prop_if_exist:cTF { l__color_named_ #1 _prop } - \prg_return_true: + { + \prop_if_empty:cTF { l__color_named_ #1 _prop } + \prg_return_false: + \prg_return_true: + } \prg_return_false: } \cs_new:Npn \__color_model:N #1 { \exp_after:wN \use_i:nn #1 } @@ -28431,7 +28440,7 @@ } \cs_new_protected:Npn \__color_parse_aux:nN #1#2 { - \tl_if_exist:cTF { l__color_named_ #1 _prop } + \__color_if_defined:nTF {#1} { \__color_parse_set_eq:Nn #2 {#1} } { \__color_parse:Nw #2#1 ! \s__color_stop } \__color_check_model:N #2 diff --git a/Master/texmf-dist/tex/latex/l3kernel/expl3-generic.tex b/Master/texmf-dist/tex/latex/l3kernel/expl3-generic.tex index 9f390325b71..64b2f374e05 100644 --- a/Master/texmf-dist/tex/latex/l3kernel/expl3-generic.tex +++ b/Master/texmf-dist/tex/latex/l3kernel/expl3-generic.tex @@ -19,7 +19,7 @@ %% and all files in that bundle must be distributed together. %% %% File: expl3.dtx -\def\ExplFileDate{2022-01-12}% +\def\ExplFileDate{2022-01-21}% \let\ExplLoaderFileDate\ExplFileDate \begingroup \catcode`\_=11 diff --git a/Master/texmf-dist/tex/latex/l3kernel/expl3.ltx b/Master/texmf-dist/tex/latex/l3kernel/expl3.ltx index ffb97aff69e..081e49f0d96 100644 --- a/Master/texmf-dist/tex/latex/l3kernel/expl3.ltx +++ b/Master/texmf-dist/tex/latex/l3kernel/expl3.ltx @@ -19,7 +19,7 @@ %% and all files in that bundle must be distributed together. %% %% File: expl3.dtx -\def\ExplFileDate{2022-01-12}% +\def\ExplFileDate{2022-01-21}% \let\ExplLoaderFileDate\ExplFileDate \begingroup \catcode`\_=11 diff --git a/Master/texmf-dist/tex/latex/l3kernel/expl3.sty b/Master/texmf-dist/tex/latex/l3kernel/expl3.sty index dabb3f63c03..901c554c513 100644 --- a/Master/texmf-dist/tex/latex/l3kernel/expl3.sty +++ b/Master/texmf-dist/tex/latex/l3kernel/expl3.sty @@ -19,7 +19,7 @@ %% and all files in that bundle must be distributed together. %% %% File: expl3.dtx -\def\ExplFileDate{2022-01-12}% +\def\ExplFileDate{2022-01-21}% \let\ExplLoaderFileDate\ExplFileDate \ProvidesPackage{expl3} [% diff --git a/Master/texmf-dist/tex/latex/l3kernel/l3doc.cls b/Master/texmf-dist/tex/latex/l3kernel/l3doc.cls index ba396742e85..5a2c652ec30 100644 --- a/Master/texmf-dist/tex/latex/l3kernel/l3doc.cls +++ b/Master/texmf-dist/tex/latex/l3kernel/l3doc.cls @@ -20,7 +20,7 @@ %% %% File: l3doc.dtx \RequirePackage{expl3,calc} -\ProvidesExplClass{l3doc}{2018-04-30}{} +\ProvidesExplClass{l3doc}{2022-01-12}{} {L3 Experimental documentation class} \clist_new:N \g_docinput_clist \seq_new:N \g_doc_functions_seq @@ -1788,6 +1788,8 @@ } { #1 \endinput } } +\cs_if_exist:NT \MaybeStop + { \RenewCommandCopy \MaybeStop \StopEventually } \DeclareDocumentCommand \Finale { } { \tl_use:N \g__codedoc_finale_tl } \tl_new:N \g__codedoc_finale_tl -- cgit v1.2.3