diff options
author | Karl Berry <karl@freefriends.org> | 2022-06-16 20:26:05 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2022-06-16 20:26:05 +0000 |
commit | a3b8e59816f3d95cf22196e6bf3309c6d699a871 (patch) | |
tree | c5394a9fa411b5f7ab3e0710c6dfa0e10a5d6990 /Master/texmf-dist/tex/latex | |
parent | 7a87410e74a9d342265d947c079f532ff0f087ad (diff) |
latex3 (16jun22)
git-svn-id: svn://tug.org/texlive/trunk@63614 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/latex')
9 files changed, 27 insertions, 19 deletions
diff --git a/Master/texmf-dist/tex/latex/l3kernel/expl3-code.tex b/Master/texmf-dist/tex/latex/l3kernel/expl3-code.tex index af28fe15d0e..baad0eaa9da 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-06-02}% +\def\ExplFileDate{2022-06-16}% \begingroup \def\next{\endgroup}% \expandafter\ifx\csname PackageError\endcsname\relax @@ -7262,7 +7262,8 @@ Type H <return> for immediate help}\def~{\errmessage{% \exp:w \exp_end_continue_f:w % ( \__bool_get_next:NN \use_i:nnnn #1 ) } -\cs_new:Npn \__bool_if_p_aux:w #1 \use_i:nnnn #2#3 {#2} +\cs_new:Npn \__bool_if_p_aux:w #1 \use_i:nnnn #2#3 + { \bool_if:NTF #2 \c_true_bool \c_false_bool } \cs_new:Npn \__bool_get_next:NN #1#2 { \use:c @@ -23586,6 +23587,7 @@ Type H <return> for immediate help}\def~{\errmessage{% \cs_new:Npn \__tl_analysis_char_arg_aux:Nw #1 ~ { #1 { ~ } } \cs_new_protected:Npn \peek_analysis_map_inline:n #1 { + \group_align_safe_begin: \int_gincr:N \g__kernel_prg_map_int \cs_set_protected:cpn { __tl_analysis_map_ \int_use:N \g__kernel_prg_map_int :nnN } @@ -23594,7 +23596,8 @@ Type H <return> for immediate help}\def~{\errmessage{% \group_end: #1 \__tl_peek_analysis_loop:NNn - \prg_break_point:Nn \peek_analysis_map_break: { } + \prg_break_point:Nn \peek_analysis_map_break: + { \group_align_safe_end: } } \__tl_peek_analysis_loop:NNn ? ? ? } diff --git a/Master/texmf-dist/tex/latex/l3kernel/expl3-generic.tex b/Master/texmf-dist/tex/latex/l3kernel/expl3-generic.tex index ea15ef184bb..75362e4ed27 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-06-02}% +\def\ExplFileDate{2022-06-16}% \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 28a894aebc8..1773d88c879 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-06-02}% +\def\ExplFileDate{2022-06-16}% \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 b610e5888ac..941b6d9d16c 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-06-02}% +\def\ExplFileDate{2022-06-16}% \let\ExplLoaderFileDate\ExplFileDate \ProvidesPackage{expl3} [% diff --git a/Master/texmf-dist/tex/latex/l3packages/l3keys2e/l3keys2e.sty b/Master/texmf-dist/tex/latex/l3packages/l3keys2e/l3keys2e.sty index 5c5d83a4ce8..0801f7516ad 100644 --- a/Master/texmf-dist/tex/latex/l3packages/l3keys2e/l3keys2e.sty +++ b/Master/texmf-dist/tex/latex/l3packages/l3keys2e/l3keys2e.sty @@ -32,7 +32,7 @@ }% \endinput } -\ProvidesExplPackage{l3keys2e}{2022-06-07}{} +\ProvidesExplPackage{l3keys2e}{2022-06-16}{} {LaTeX2e option processing using LaTeX3 keys} \cs_if_exist:NT \ProcessKeysOptions { \file_input_stop: } @@ -90,22 +90,27 @@ { \clist_map_inline:cn { opt@ \@currname . \@currext } { - \keys_if_exist:nxTF {#1} { \__keys_latexe_remove_equals:n {##1} } - { \clist_put_right:Nn \l__keys_latexe_options_clist {##1} } - { \clist_put_right:Nn \@unusedoptionlist {##1} } + \__keys_latexe_options_remove:enn + { \__keys_latexe_remove_equals:n {##1} } + {##1} {#1} } } } } +\cs_new_protected:Npn \__keys_latexe_options_remove:nnn #1#2#3 + { + \keys_if_exist:nnTF {#3} {#1} + { \clist_put_right:Nn \l__keys_latexe_options_clist {#2} } + { \clist_put_right:Nn \@unusedoptionlist {#1} } + } +\cs_generate_variant:Nn \__keys_latexe_options_remove:nnn { e } \cs_new_protected:Npn \__keys_latexe_options_package:n #1 { \clist_map_inline:Nn \@classoptionslist { - \keys_if_exist:nxT {#1} { \__keys_latexe_remove_equals:n {##1} } - { - \clist_put_right:Nn \l__keys_latexe_options_clist {##1} - \clist_remove_all:Nn \@unusedoptionlist {##1} - } + \__keys_latexe_options_remove:enn + { \__keys_latexe_remove_equals:n {##1} } + {##1} {#1} } } \cs_new_protected:Npn \__keys_latexe_options_local: diff --git a/Master/texmf-dist/tex/latex/l3packages/xfp/xfp.sty b/Master/texmf-dist/tex/latex/l3packages/xfp/xfp.sty index 2862e841200..9ea75822201 100644 --- a/Master/texmf-dist/tex/latex/l3packages/xfp/xfp.sty +++ b/Master/texmf-dist/tex/latex/l3packages/xfp/xfp.sty @@ -32,7 +32,7 @@ }% \endinput } -\ProvidesExplPackage{xfp}{2022-06-07}{} +\ProvidesExplPackage{xfp}{2022-06-16}{} {L3 Floating point unit} \ProvideExpandableDocumentCommand \fpeval { m } { \fp_eval:n {#1} } \ProvideExpandableDocumentCommand \inteval { m } { \int_eval:n {#1} } diff --git a/Master/texmf-dist/tex/latex/l3packages/xfrac/xfrac.sty b/Master/texmf-dist/tex/latex/l3packages/xfrac/xfrac.sty index 2b8b2563f78..223a37dfe15 100644 --- a/Master/texmf-dist/tex/latex/l3packages/xfrac/xfrac.sty +++ b/Master/texmf-dist/tex/latex/l3packages/xfrac/xfrac.sty @@ -34,7 +34,7 @@ \endinput } \RequirePackage{amstext,graphicx,l3keys2e,textcomp,xparse,xtemplate} -\ProvidesExplPackage{xfrac}{2022-06-07}{} +\ProvidesExplPackage{xfrac}{2022-06-16}{} {L3 Experimental split-level fractions} \keys_define:nn { xfrac } { diff --git a/Master/texmf-dist/tex/latex/l3packages/xparse/xparse.sty b/Master/texmf-dist/tex/latex/l3packages/xparse/xparse.sty index 9f964f2b619..d58f8b77b30 100644 --- a/Master/texmf-dist/tex/latex/l3packages/xparse/xparse.sty +++ b/Master/texmf-dist/tex/latex/l3packages/xparse/xparse.sty @@ -60,7 +60,7 @@ } } \ExplSyntaxOff -\ProvidesExplPackage{xparse}{2022-06-07}{} +\ProvidesExplPackage{xparse}{2022-06-16}{} {L3 Experimental document command parser} \clist_new:N \l__cmd_options_clist \DeclareOption* { \clist_put_right:NV \l__cmd_options_clist \CurrentOption } diff --git a/Master/texmf-dist/tex/latex/l3packages/xtemplate/xtemplate.sty b/Master/texmf-dist/tex/latex/l3packages/xtemplate/xtemplate.sty index 3d237efdb9d..65818826a02 100644 --- a/Master/texmf-dist/tex/latex/l3packages/xtemplate/xtemplate.sty +++ b/Master/texmf-dist/tex/latex/l3packages/xtemplate/xtemplate.sty @@ -32,7 +32,7 @@ }% \endinput } -\ProvidesExplPackage{xtemplate}{2022-06-07}{} +\ProvidesExplPackage{xtemplate}{2022-06-16}{} {L3 Experimental prototype document functions} \cs_generate_variant:Nn \keys_define:nn { nx } \cs_generate_variant:Nn \tl_trim_spaces:n { e } |