diff options
Diffstat (limited to 'Master/texmf-dist/tex')
11 files changed, 26 insertions, 24 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} [% diff --git a/Master/texmf-dist/tex/latex/l3packages/l3keys2e/l3keys2e.sty b/Master/texmf-dist/tex/latex/l3packages/l3keys2e/l3keys2e.sty index cf5a6bd0921..53947c76f79 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}{2020-05-15}{} +\ProvidesExplPackage{l3keys2e}{2020-10-05}{} {LaTeX2e option processing using LaTeX3 keys} \cs_generate_variant:Nn \clist_put_right:Nn { Nv } \cs_generate_variant:Nn \keys_if_exist:nnT { nx } diff --git a/Master/texmf-dist/tex/latex/l3packages/xfp/xfp.sty b/Master/texmf-dist/tex/latex/l3packages/xfp/xfp.sty index 6731ed5ba80..bd10f91541e 100644 --- a/Master/texmf-dist/tex/latex/l3packages/xfp/xfp.sty +++ b/Master/texmf-dist/tex/latex/l3packages/xfp/xfp.sty @@ -33,7 +33,7 @@ \endinput } \RequirePackage{xparse} -\ProvidesExplPackage{xfp}{2020-05-15}{} +\ProvidesExplPackage{xfp}{2020-10-05}{} {L3 Floating point unit} \NewExpandableDocumentCommand \fpeval { m } { \fp_eval:n {#1} } \NewExpandableDocumentCommand \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 821e770c005..b6a78b09f29 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}{2020-05-15}{} +\ProvidesExplPackage{xfrac}{2020-10-05}{} {L3 Experimental split-level fractions} \keys_define:nn { xfrac } { diff --git a/Master/texmf-dist/tex/latex/l3packages/xparse/xparse.ltx b/Master/texmf-dist/tex/latex/l3packages/xparse/xparse.ltx index af239a7165f..ff0cc4ca42a 100644 --- a/Master/texmf-dist/tex/latex/l3packages/xparse/xparse.ltx +++ b/Master/texmf-dist/tex/latex/l3packages/xparse/xparse.ltx @@ -23,7 +23,7 @@ \message{xparse <2020-03-03>}% } \ExplSyntaxOn -\file_input:n { xparse-generic.tex } +\input { xparse-generic.tex } \ExplSyntaxOff %% %% diff --git a/Master/texmf-dist/tex/latex/l3packages/xparse/xparse.sty b/Master/texmf-dist/tex/latex/l3packages/xparse/xparse.sty index e14094269b7..9c03b4f0e14 100644 --- a/Master/texmf-dist/tex/latex/l3packages/xparse/xparse.sty +++ b/Master/texmf-dist/tex/latex/l3packages/xparse/xparse.sty @@ -32,7 +32,7 @@ }% \endinput } -\ProvidesExplPackage{xparse}{2020-05-15}{} +\ProvidesExplPackage{xparse}{2020-10-05}{} {L3 Experimental document command parser} \clist_new:N \l__xparse_options_clist \DeclareOption* { \clist_put_right:NV \l__xparse_options_clist \CurrentOption } @@ -45,7 +45,7 @@ \keys_set:nV { xparse } \l__xparse_options_clist \bool_if:NF \l__xparse_log_bool { \msg_redirect_module:nnn { LaTeX / xparse } { info } { none } } -\file_input:n { xparse-generic.tex } +\input { xparse-generic.tex } \cs_gset_protected:Npn \__xparse_normalize_arg_spec_loop:n #1 { \quark_if_recursion_tail_stop:n {#1} diff --git a/Master/texmf-dist/tex/latex/l3packages/xtemplate/xtemplate.sty b/Master/texmf-dist/tex/latex/l3packages/xtemplate/xtemplate.sty index a167884f1b5..98d25f542b9 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}{2020-05-15}{} +\ProvidesExplPackage{xtemplate}{2020-10-05}{} {L3 Experimental prototype document functions} \tl_const:Nn \c__xtemplate_code_root_tl { template~code~>~ } \tl_const:Nn \c__xtemplate_defaults_root_tl { template~defaults~>~ } |