diff options
author | Karl Berry <karl@freefriends.org> | 2020-10-05 20:55:13 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2020-10-05 20:55:13 +0000 |
commit | 0a6a10589966c07c10f5ddaa83aa57e4f8bcc9d4 (patch) | |
tree | ab4fba8cb51631f0b798b2242dc7bb8386009397 /Master/texmf-dist/tex/latex/l3kernel | |
parent | 2d7e71c150a2b05cdfb3f5bf685e4255640b0760 (diff) |
l3 (5oct20)
git-svn-id: svn://tug.org/texlive/trunk@56556 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/latex/l3kernel')
-rw-r--r-- | Master/texmf-dist/tex/latex/l3kernel/expl3-code.tex | 19 | ||||
-rw-r--r-- | Master/texmf-dist/tex/latex/l3kernel/expl3-generic.tex | 2 | ||||
-rw-r--r-- | Master/texmf-dist/tex/latex/l3kernel/expl3.ltx | 2 | ||||
-rw-r--r-- | Master/texmf-dist/tex/latex/l3kernel/expl3.lua | 11 | ||||
-rw-r--r-- | Master/texmf-dist/tex/latex/l3kernel/expl3.sty | 2 |
5 files changed, 19 insertions, 17 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 diff --git a/Master/texmf-dist/tex/latex/l3kernel/expl3-generic.tex b/Master/texmf-dist/tex/latex/l3kernel/expl3-generic.tex index 9b4cd0935d0..40c3052e2c3 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{2020-09-24}% +\def\ExplFileDate{2020-10-05}% \let\ExplLoaderFileDate\ExplFileDate \begingroup \catcode`\>=12 diff --git a/Master/texmf-dist/tex/latex/l3kernel/expl3.ltx b/Master/texmf-dist/tex/latex/l3kernel/expl3.ltx index 558342f78c2..ce9b23c55c6 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{2020-09-24}% +\def\ExplFileDate{2020-10-05}% \let\ExplLoaderFileDate\ExplFileDate \begingroup \catcode`\>=12 diff --git a/Master/texmf-dist/tex/latex/l3kernel/expl3.lua b/Master/texmf-dist/tex/latex/l3kernel/expl3.lua index a60086c340f..5b23084328a 100644 --- a/Master/texmf-dist/tex/latex/l3kernel/expl3.lua +++ b/Master/texmf-dist/tex/latex/l3kernel/expl3.lua @@ -259,12 +259,17 @@ local luacmd do end end -- File: l3names.dtx +local minus_tok = token.new(string.byte'-', 12) +local zero_tok = token.new(string.byte'0', 12) +local one_tok = token.new(string.byte'1', 12) luacmd('tex_strcmp:D', function() local first = scan_string() local second = scan_string() - write(first == second and '0' - or first < second and '-1' - or '1') + if first < second then + put_next(minus_tok, one_tok) + else + put_next(first == second and zero_tok or one_tok) + end end, 'global') local cprint = tex.cprint luacmd('tex_Ucharcat:D', function() diff --git a/Master/texmf-dist/tex/latex/l3kernel/expl3.sty b/Master/texmf-dist/tex/latex/l3kernel/expl3.sty index d9cb4aa5ce4..ffbfbb6ee8f 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{2020-09-24}% +\def\ExplFileDate{2020-10-05}% \let\ExplLoaderFileDate\ExplFileDate \ProvidesPackage{expl3} [% |