diff options
Diffstat (limited to 'Master/texmf-dist/tex/latex/l3kernel/expl3-code.tex')
-rw-r--r-- | Master/texmf-dist/tex/latex/l3kernel/expl3-code.tex | 19 |
1 files changed, 8 insertions, 11 deletions
diff --git a/Master/texmf-dist/tex/latex/l3kernel/expl3-code.tex b/Master/texmf-dist/tex/latex/l3kernel/expl3-code.tex index 7807eb086be..14b325957ff 100644 --- a/Master/texmf-dist/tex/latex/l3kernel/expl3-code.tex +++ b/Master/texmf-dist/tex/latex/l3kernel/expl3-code.tex @@ -69,7 +69,7 @@ %% and all files in that bundle must be distributed together. %% %% File: expl3.dtx -\def\ExplFileDate{2020-09-24}% +\def\ExplFileDate{2020-10-05}% \begingroup \def\next{\endgroup}% \expandafter\ifx\csname PackageError\endcsname\relax @@ -28446,7 +28446,9 @@ \exp_not:N \str_if_eq:nnTF {#1} { \exp_not:N \protect } { \exp_not:N \__text_expand_protect:N } { - \cs_if_exist:cTF { @current@cmd } + \bool_lazy_and:nnTF + { \cs_if_exist_p:N \fmtname } + { \str_if_eq_p:Vn \fmtname { LaTeX2e } } { \exp_not:N \__text_expand_encoding:N #1 } { \exp_not:N \__text_expand_replace:N #1 } } @@ -28471,16 +28473,11 @@ } \cs_new:Npn \__text_expand_encoding:N #1 { - \cs_if_eq:NNTF #1 \@current@cmd + \bool_lazy_or:nnTF + { \cs_if_eq_p:NN #1 \@current@cmd } + { \cs_if_eq_p:NN #1 \@changed@cmd } { \exp_after:wN \__text_expand_loop:w \__text_expand_encoding_escape:NN } - { - \cs_if_eq:NNTF #1 \@changed@cmd - { - \exp_after:wN \__text_expand_loop:w - \__text_expand_encoding_escape:NN - } - { \__text_expand_replace:N #1 } - } + { \__text_expand_replace:N #1 } } \cs_new:Npn \__text_expand_encoding_escape:NN #1#2 { \exp_not:n {#1} } \cs_new:Npn \__text_expand_replace:N #1 |