[latex3-commits] [git/LaTeX3-latex3-latex2e] develop: Update expl3 to 2020-02-11 (a9daeede)
Joseph Wright
joseph.wright at morningstar2.co.uk
Tue Feb 11 15:27:53 CET 2020
Repository : https://github.com/latex3/latex2e
On branch : develop
Link : https://github.com/latex3/latex2e/commit/a9daeede0f4ba0f52157e8b9ac3a68e5d54d95ba
>---------------------------------------------------------------
commit a9daeede0f4ba0f52157e8b9ac3a68e5d54d95ba
Author: Joseph Wright <joseph.wright at morningstar2.co.uk>
Date: Tue Feb 11 14:27:53 2020 +0000
Update expl3 to 2020-02-11
>---------------------------------------------------------------
a9daeede0f4ba0f52157e8b9ac3a68e5d54d95ba
texmf/tex/latex/l3kernel/expl3-code.tex | 84 ++++++++++++++++++++++++++----
texmf/tex/latex/l3kernel/expl3-generic.tex | 2 +-
texmf/tex/latex/l3kernel/expl3.ltx | 2 +-
texmf/tex/latex/l3kernel/expl3.sty | 2 +-
4 files changed, 76 insertions(+), 14 deletions(-)
diff --git a/texmf/tex/latex/l3kernel/expl3-code.tex b/texmf/tex/latex/l3kernel/expl3-code.tex
index 043647b1..e5cf8f23 100644
--- a/texmf/tex/latex/l3kernel/expl3-code.tex
+++ b/texmf/tex/latex/l3kernel/expl3-code.tex
@@ -67,7 +67,7 @@
%% and all files in that bundle must be distributed together.
%%
%% File: expl3.dtx
-\def\ExplFileDate{2020-02-08}%
+\def\ExplFileDate{2020-02-11}%
\begingroup
\def\next{\endgroup}%
\expandafter\ifx\csname PackageError\endcsname\relax
@@ -12869,6 +12869,13 @@
\cs_new_protected:Npn \__keys_cmd_set:nn #1#2
{ \cs_set_protected:cpn { \c__keys_code_root_str #1 } ##1 {#2} }
\cs_generate_variant:Nn \__keys_cmd_set:nn { nx , Vn , Vo }
+\cs_new_protected:Npn \__keys_cs_set:NNpn #1#2#3#
+ {
+ \cs_set_protected:cpx { \c__keys_code_root_str \l_keys_path_str } ##1
+ { #1 \exp_not:N #2 \exp_not:n {#3} {##1} }
+ \use_none:n
+ }
+\cs_generate_variant:Nn \__keys_cs_set:NNpn { Nc }
\cs_new_protected:Npn \__keys_default_set:n #1
{
\tl_if_empty:nTF {#1}
@@ -13048,6 +13055,22 @@
{ \__keys_variable_set:NnnN #1 { clist } { g } n }
\cs_new_protected:cpn { \c__keys_props_root_str .clist_gset:c } #1
{ \__keys_variable_set:cnnN {#1} { clist } { g } n }
+\cs_new_protected:cpn { \c__keys_props_root_str .cs_set:Np } #1
+ { \__keys_cs_set:NNpn \cs_set:Npn #1 { } }
+\cs_new_protected:cpn { \c__keys_props_root_str .cs_set:cp } #1
+ { \__keys_cs_set:Ncpn \cs_set:Npn #1 { } }
+\cs_new_protected:cpn { \c__keys_props_root_str .cs_set_protected:Np } #1
+ { \__keys_cs_set:NNpn \cs_set_protected:Npn #1 { } }
+\cs_new_protected:cpn { \c__keys_props_root_str .cs_set_protected:cp } #1
+ { \__keys_cs_set:Ncpn \cs_set_protected:Npn #1 { } }
+\cs_new_protected:cpn { \c__keys_props_root_str .cs_gset:Np } #1
+ { \__keys_cs_set:NNpn \cs_gset:Npn #1 { } }
+\cs_new_protected:cpn { \c__keys_props_root_str .cs_gset:cp } #1
+ { \__keys_cs_set:Ncpn \cs_gset:Npn #1 { } }
+\cs_new_protected:cpn { \c__keys_props_root_str .cs_gset_protected:Np } #1
+ { \__keys_cs_set:NNpn \cs_gset_protected:Npn #1 { } }
+\cs_new_protected:cpn { \c__keys_props_root_str .cs_gset_protected:cp } #1
+ { \__keys_cs_set:Ncpn \cs_gset_protected:Npn #1 { } }
\cs_new_protected:cpn { \c__keys_props_root_str .default:n } #1
{ \__keys_default_set:n {#1} }
\cs_new_protected:cpn { \c__keys_props_root_str .default:V } #1
@@ -27875,7 +27898,7 @@
\tl_set:Nn \l_text_math_delims_tl { $ $ \( \) }
\tl_new:N \l_text_expand_exclude_tl
\tl_set:Nn \l_text_expand_exclude_tl
- { \cite \label \ref }
+ { \begin \cite \end \label \ref }
\tl_new:N \l__text_math_mode_tl
\tex_chardef:D \c__text_chardef_space_token = `\ %
\tex_mathchardef:D \c__text_mathchardef_space_token = `\ %
@@ -28109,11 +28132,15 @@
}
{ \__text_expand_letterlike:NN #1 }
}
-\cs_new:Npn \__text_expand_cs:N #1
+\cs_new:Npx \__text_expand_cs:N #1
{
- \str_if_eq:nnTF {#1} { \protect }
- { \__text_expand_protect:N }
- { \__text_expand_replace:N #1 }
+ \exp_not:N \str_if_eq:nnTF {#1} { \exp_not:N \protect }
+ { \exp_not:N \__text_expand_protect:N }
+ {
+ \cs_if_exist:cTF { @current at cmd }
+ { \exp_not:N \__text_expand_encoding:N #1 }
+ { \exp_not:N \__text_expand_replace:N #1 }
+ }
}
\cs_new:Npn \__text_expand_protect:N #1
{
@@ -28133,6 +28160,20 @@
{ \__text_expand_store:n { \protect #1 } }
\__text_expand_loop:w
}
+\cs_new:Npn \__text_expand_encoding:N #1
+ {
+ \cs_if_eq:NNTF #1 \@current at cmd
+ { \exp_after:wN \__text_expand_loop:w \__text_expand_encoding_escape:NN }
+ {
+ \cs_if_eq:NNTF #1 \@changed at cmd
+ {
+ \exp_after:wN \__text_expand_loop:w
+ \__text_expand_encoding_escape:NN
+ }
+ { \__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
{
\bool_lazy_and:nnTF
@@ -28175,11 +28216,6 @@
\tl_set:cn { l__text_expand_ \token_to_str:N #1 _tl } {#2}
}
\cs_generate_variant:Nn \text_declare_expand_equivalent:Nn { c }
-\cs_new:Npn \__text_expand_textcomp:NN #1#2 { \exp_not:n {#1} }
-\text_declare_expand_equivalent:cn { ?-cmd } { \__text_expand_textcomp:NN }
-\text_declare_expand_equivalent:cn { T1-cmd } { \__text_expand_textcomp:NN }
-\text_declare_expand_equivalent:cn { TS1-cmd } { \__text_expand_textcomp:NN }
-\text_declare_expand_equivalent:cn { TU-cmd } { \__text_expand_textcomp:NN }
%% File: l3text-case.dtx
\cs_new:Npn \text_lowercase:n #1
{ \__text_change_case:nnn { lower } { } {#1} }
@@ -29158,6 +29194,32 @@
\tl_const:cn { c__text_uppercase_ \token_to_str:N \i _tl } { I }
\tl_const:cn { c__text_uppercase_ \token_to_str:N \j _tl } { J }
\group_end:
+\cs_if_exist:cT { @uclclist }
+ {
+ \AtBeginDocument
+ {
+ \group_begin:
+ \cs_set_protected:Npn \__text_change_case_setup:NN #1#2
+ {
+ \quark_if_recursion_tail_stop:N #1
+ \cs_if_exist:cF { c__text_uppercase_ \token_to_str:N #1 _tl }
+ {
+ \tl_const:cn { c__text_uppercase_ \token_to_str:N #1 _tl }
+ { #2 }
+ }
+ \cs_if_exist:cF { c__text_lowercase_ \token_to_str:N #2 _tl }
+ {
+ \tl_const:cn { c__text_lowercase_ \token_to_str:N #2 _tl }
+ { #1 }
+ }
+ \__text_change_case_setup:NN
+ }
+ \exp_after:wN \__text_change_case_setup:NN \@uclclist
+ \q_recursion_tail ?
+ \q_recursion_stop
+ \group_end:
+ }
+ }
%% File: l3candidates.dtx
\cs_new_protected:Npn \box_clip:N #1
{ \hbox_set:Nn #1 { \__box_backend_clip:N #1 } }
diff --git a/texmf/tex/latex/l3kernel/expl3-generic.tex b/texmf/tex/latex/l3kernel/expl3-generic.tex
index 8fa72ac8..7e0773ef 100644
--- a/texmf/tex/latex/l3kernel/expl3-generic.tex
+++ b/texmf/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-02-08}%
+\def\ExplFileDate{2020-02-11}%
\let\ExplLoaderFileDate\ExplFileDate
\begingroup
\def\tempa{LaTeX2e}%
diff --git a/texmf/tex/latex/l3kernel/expl3.ltx b/texmf/tex/latex/l3kernel/expl3.ltx
index ffd8f808..f5559810 100644
--- a/texmf/tex/latex/l3kernel/expl3.ltx
+++ b/texmf/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-02-08}%
+\def\ExplFileDate{2020-02-11}%
\let\ExplLoaderFileDate\ExplFileDate
\everyjob\expandafter{\the\everyjob
\message{L3 programming layer <\ExplFileDate>}%
diff --git a/texmf/tex/latex/l3kernel/expl3.sty b/texmf/tex/latex/l3kernel/expl3.sty
index ac546568..b468305c 100644
--- a/texmf/tex/latex/l3kernel/expl3.sty
+++ b/texmf/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-02-08}%
+\def\ExplFileDate{2020-02-11}%
\let\ExplLoaderFileDate\ExplFileDate
\ProvidesPackage{expl3}
[%
More information about the latex3-commits
mailing list.