diff options
Diffstat (limited to 'Master/texmf-dist/tex')
4 files changed, 47 insertions, 23 deletions
diff --git a/Master/texmf-dist/tex/latex/l3kernel/expl3-code.tex b/Master/texmf-dist/tex/latex/l3kernel/expl3-code.tex index 258d04764b3..cccdd856c92 100644 --- a/Master/texmf-dist/tex/latex/l3kernel/expl3-code.tex +++ b/Master/texmf-dist/tex/latex/l3kernel/expl3-code.tex @@ -71,7 +71,7 @@ %% and all files in that bundle must be distributed together. %% %% File: expl3.dtx -\def\ExplFileDate{2022-10-26}% +\def\ExplFileDate{2022-11-02}% \begingroup \def\next{\endgroup}% \expandafter\ifx\csname PackageError\endcsname\relax @@ -248,16 +248,24 @@ Type H <return> for immediate help}\def~{\errmessage{% \protected\def\noexpand\ExplSyntaxOff{}% \catcode 9 = \the\catcode 9\relax \catcode 32 = \the\catcode 32\relax + \catcode 34 = \the\catcode 34\relax + \catcode 38 = \the\catcode 38\relax \catcode 58 = \the\catcode 58\relax + \catcode 94 = \the\catcode 94\relax \catcode 95 = \the\catcode 95\relax + \catcode 124 = \the\catcode 124\relax \catcode 126 = \the\catcode 126\relax \endlinechar = \the\endlinechar\relax \chardef\csname\detokenize{l__kernel_expl_bool}\endcsname = 0\relax }% -\catcode 9 = 9\relax -\catcode 32 = 9\relax -\catcode 58 = 11\relax -\catcode 95 = 11\relax +\catcode 9 = 9\relax +\catcode 32 = 9\relax +\catcode 34 = 12\relax +\catcode 38 = 4\relax +\catcode 58 = 11\relax +\catcode 94 = 7\relax +\catcode 95 = 11\relax +\catcode 124 = 12\relax \catcode 126 = 10\relax \endlinechar = 32\relax \chardef\l__kernel_expl_bool = 1\relax @@ -267,10 +275,14 @@ Type H <return> for immediate help}\def~{\errmessage{% { \cs_set_protected:Npx \ExplSyntaxOff { - \char_set_catcode:nn { 9 } { \char_value_catcode:n { 9 } } - \char_set_catcode:nn { 32 } { \char_value_catcode:n { 32 } } - \char_set_catcode:nn { 58 } { \char_value_catcode:n { 58 } } - \char_set_catcode:nn { 95 } { \char_value_catcode:n { 95 } } + \char_set_catcode:nn { 9 } { \char_value_catcode:n { 9 } } + \char_set_catcode:nn { 32 } { \char_value_catcode:n { 32 } } + \char_set_catcode:nn { 34 } { \char_value_catcode:n { 34 } } + \char_set_catcode:nn { 38 } { \char_value_catcode:n { 38 } } + \char_set_catcode:nn { 58 } { \char_value_catcode:n { 58 } } + \char_set_catcode:nn { 94 } { \char_value_catcode:n { 94 } } + \char_set_catcode:nn { 95 } { \char_value_catcode:n { 95 } } + \char_set_catcode:nn { 124 } { \char_value_catcode:n { 124 } } \char_set_catcode:nn { 126 } { \char_value_catcode:n { 126 } } \tex_endlinechar:D = \tex_the:D \tex_endlinechar:D \scan_stop: @@ -278,10 +290,14 @@ Type H <return> for immediate help}\def~{\errmessage{% \cs_set_protected:Npn \ExplSyntaxOff { } } } - \char_set_catcode_ignore:n { 9 } % tab - \char_set_catcode_ignore:n { 32 } % space - \char_set_catcode_letter:n { 58 } % colon - \char_set_catcode_letter:n { 95 } % underscore + \char_set_catcode_ignore:n { 9 } % tab + \char_set_catcode_ignore:n { 32 } % space + \char_set_catcode_other:n { 34 } % double quote + \char_set_catcode_alignment:n { 38 } % ampersand + \char_set_catcode_letter:n { 58 } % colon + \char_set_catcode_math_superscript:n { 94 } % circumflex + \char_set_catcode_letter:n { 95 } % underscore + \char_set_catcode_other:n { 124 } % pipe \char_set_catcode_space:n { 126 } % tilde \tex_endlinechar:D = 32 \scan_stop: \bool_set_true:N \l__kernel_expl_bool @@ -1634,10 +1650,14 @@ Type H <return> for immediate help}\def~{\errmessage{% #1 \q__prg_recursion_stop { } \cs_set_protected:Npn \prg_set_conditional:Npnn { \__prg_generate_conditional_parm:NNNpnn \cs_set:Npn e } +\cs_set_protected:Npn \prg_gset_conditional:Npnn + { \__prg_generate_conditional_parm:NNNpnn \cs_gset:Npn e } \cs_set_protected:Npn \prg_new_conditional:Npnn { \__prg_generate_conditional_parm:NNNpnn \cs_new:Npn e } \cs_set_protected:Npn \prg_set_protected_conditional:Npnn { \__prg_generate_conditional_parm:NNNpnn \cs_set_protected:Npn p } +\cs_set_protected:Npn \prg_gset_protected_conditional:Npnn + { \__prg_generate_conditional_parm:NNNpnn \cs_gset_protected:Npn p } \cs_set_protected:Npn \prg_new_protected_conditional:Npnn { \__prg_generate_conditional_parm:NNNpnn \cs_new_protected:Npn p } \cs_set_protected:Npn \__prg_generate_conditional_parm:NNNpnn #1#2#3#4# @@ -1651,10 +1671,14 @@ Type H <return> for immediate help}\def~{\errmessage{% } \cs_set_protected:Npn \prg_set_conditional:Nnn { \__prg_generate_conditional_count:NNNnn \cs_set:Npn e } +\cs_set_protected:Npn \prg_gset_conditional:Nnn + { \__prg_generate_conditional_count:NNNnn \cs_set:Npn e } \cs_set_protected:Npn \prg_new_conditional:Nnn { \__prg_generate_conditional_count:NNNnn \cs_new:Npn e } \cs_set_protected:Npn \prg_set_protected_conditional:Nnn { \__prg_generate_conditional_count:NNNnn \cs_set_protected:Npn p } +\cs_set_protected:Npn \prg_gset_protected_conditional:Nnn + { \__prg_generate_conditional_count:NNNnn \cs_gset_protected:Npn p } \cs_set_protected:Npn \prg_new_protected_conditional:Nnn { \__prg_generate_conditional_count:NNNnn \cs_new_protected:Npn p } \cs_set_protected:Npn \__prg_generate_conditional_count:NNNnn #1#2#3 @@ -29545,27 +29569,27 @@ Type H <return> for immediate help}\def~{\errmessage{% } } } -\cs_new_protected:Npn \__color_model_init:nnnn #1#2#3#4 +\cs_new_protected:Npn \__color_model_init:nnn #1#2#3 { \int_gincr:N \g__color_model_int \clist_map_inline:nn { fill , stroke , select } { \cs_new_protected:cpx { __color_backend_ ##1 _ #1 :n } ####1 { - \exp_not:c { __color_backend_ ##1 _ #3 :nn } + \exp_not:c { __color_backend_ ##1 _ #2 :nn } { color \int_use:N \g__color_model_int } {####1} } } \cs_new_protected:cpx { __color_model_ #1 _white: } { \prop_put:Nnn \exp_not:N \l__color_named_white_prop {#1} - { \exp_not:n {#4} } + { \exp_not:n {#3} } \exp_not:N \int_compare:nNnF { \tex_currentgrouplevel:D } = 0 { \group_insert_after:N \exp_not:c { __color_model_ #1 _ white: } } } \use:c { __color_model_ #1 _white: } } -\cs_generate_variant:Nn \__color_model_init:nnnn { nnnx } +\cs_generate_variant:Nn \__color_model_init:nnn { nnx } \cs_new_protected:Npn \__color_model_separation:n #1 { \prop_get:NnNTF \l__color_internal_prop { name } @@ -29615,7 +29639,7 @@ Type H <return> for immediate help}\def~{\errmessage{% \cs_new_protected:Npn \__color_model_separation:w #1 , #2 , #3 , #4 , #5 \s__color_stop #6#7#8 { - \__color_model_init:nnnn {#6} { 1 } { separation } { 0 } + \__color_model_init:nnn {#6} { separation } { 0 } \cs_new_eq:cN { __color_parse_mix_ #6 :nw } \__color_parse_mix_gray:nw \cs_new:cpn { __color_parse_model_ #6 :w } ##1 , ##2 \s__color_stop { {#6} { \__color_parse_number:n {##1} } } @@ -29757,7 +29781,7 @@ Type H <return> for immediate help}\def~{\errmessage{% } \cs_new_protected:Npn \__color_model_devicen:nnnn #1#2#3#4 { - \__color_model_init:nnnx {#4} {#1} { devicen } + \__color_model_init:nnx {#4} { devicen } { 0 \prg_replicate:nn { #1 - 1 } { ~ 0 } } @@ -30112,7 +30136,7 @@ Type H <return> for immediate help}\def~{\errmessage{% } \cs_new_protected:Npn \__color_model_iccbased_aux:nnnnnn #1#2#3#4#5#6 { - \__color_model_init:nnnn {#5} {#1} { iccbased } {#3} + \__color_model_init:nnn {#5} { iccbased } {#3} \tl_const:cn { c__color_fallback_ #5 _tl } { gray } \cs_new:cpn { __color_convert_ #5 _gray:w } ##1 \s__color_stop { 0 } \cs_new:cpn { __color_convert_gray_ #5 :w } ##1 \s__color_stop { #2 } diff --git a/Master/texmf-dist/tex/latex/l3kernel/expl3-generic.tex b/Master/texmf-dist/tex/latex/l3kernel/expl3-generic.tex index e8f06e6860d..65cec1b9a54 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-10-26}% +\def\ExplFileDate{2022-11-02}% \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 0d2454e44f9..185aad89df8 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-10-26}% +\def\ExplFileDate{2022-11-02}% \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 8518152bd16..d44f4f90598 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-10-26}% +\def\ExplFileDate{2022-11-02}% \let\ExplLoaderFileDate\ExplFileDate \ProvidesPackage{expl3} [% |