summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/latex/l3kernel/expl3-code.tex
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2019-09-19 20:46:32 +0000
committerKarl Berry <karl@freefriends.org>2019-09-19 20:46:32 +0000
commitbaf4b7dab9fc6d675d83c88ccfd7ca7824c38355 (patch)
treef0662e22786e1298055567645b110894653667d9 /Master/texmf-dist/tex/latex/l3kernel/expl3-code.tex
parente86345f5dc9769da6df2b57003f79e20506092cd (diff)
l3 (19sep19)
git-svn-id: svn://tug.org/texlive/trunk@52129 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/latex/l3kernel/expl3-code.tex')
-rw-r--r--Master/texmf-dist/tex/latex/l3kernel/expl3-code.tex45
1 files changed, 26 insertions, 19 deletions
diff --git a/Master/texmf-dist/tex/latex/l3kernel/expl3-code.tex b/Master/texmf-dist/tex/latex/l3kernel/expl3-code.tex
index 8ebdd18b374..f3b73e82953 100644
--- a/Master/texmf-dist/tex/latex/l3kernel/expl3-code.tex
+++ b/Master/texmf-dist/tex/latex/l3kernel/expl3-code.tex
@@ -65,7 +65,7 @@
%% and all files in that bundle must be distributed together.
%%
%% File: expl3.dtx
-\def\ExplFileDate{2019-09-08}%
+\def\ExplFileDate{2019-09-19}%
\begingroup
\def\next{\endgroup}%
\expandafter\ifx\csname PackageError\endcsname\relax
@@ -27306,24 +27306,28 @@
\bool_lazy_or:nnTF { \sys_if_engine_luatex_p: } { \sys_if_engine_xetex_p: }
{
\group_begin:
- \cs_set_eq:NN \__char_generate:w \tex_Uchar:D
+ \cs_set:Npn \__char_generate_char:n #1
+ { \tex_detokenize:D \tex_expandafter:D { \tex_Uchar:D " #1 } }
\cs_set:Npx \__char_generate:n #1
{
- \sys_if_engine_luatex:TF
+ \exp_not:N \tex_unexpanded:D \exp_not:N \exp_after:wN
{
- \exp_not:N \lua_now:e
+ \sys_if_engine_luatex:TF
{
- l3kernel.charcat
- (
- \exp_not:N \tex_number:D #1 ,
- \exp_not:N \tex_the:D \tex_catcode:D #1
- )
+ \exp_not:N \tex_directlua:D
+ {
+ l3kernel.charcat
+ (
+ \exp_not:N \tex_number:D #1 ,
+ \exp_not:N \tex_the:D \tex_catcode:D #1
+ )
+ }
+ }
+ {
+ \exp_not:N \tex_Ucharcat:D
+ #1 ~
+ \tex_catcode:D #1 ~
}
- }
- {
- \exp_not:N \tex_Ucharcat:D
- #1 ~
- \tex_catcode:D #1 ~
}
}
\ior_open:Nn \g__char_data_ior { UnicodeData.txt }
@@ -27338,7 +27342,7 @@
\cs_set_nopar:Npn \l__char_tmpb_tl {#5}
\reverse_if:N \if_meaning:w \l__char_tmpa_tl \l__char_tmpb_tl
\tl_const:cx
- { c__char_mixed_case_ \__char_generate:w "#1 _tl }
+ { c__char_mixed_case_ \__char_generate_char:n {#1} _tl }
{ \__char_generate:n { "#7 } }
\fi:
\fi:
@@ -27358,7 +27362,7 @@
\reverse_if:N \if_int_compare:w
\char_value_lccode:n {"#1} = "#3 ~
\tl_const:cx
- { c__char_fold_case_ \__char_generate:w "#1 _tl }
+ { c__char_fold_case_ \__char_generate_char:n {#1} _tl }
{ \__char_generate:n { "#3 } }
\fi:
\else:
@@ -27369,7 +27373,7 @@
}
\cs_set_protected:Npn \__char_data_auxii:w #1 ~ #2 ~ #3 ~ #4 \q_stop
{
- \tl_const:cx { c__char_fold_case_ \__char_generate:w "#1 _tl }
+ \tl_const:cx { c__char_fold_case_ \__char_generate_char:n {#1} _tl }
{
\__char_generate:n { "#2 }
\__char_generate:n { "#3 }
@@ -27398,7 +27402,7 @@
{
\tl_if_empty:nF {#4}
{
- \tl_const:cx { c__char_ #2 _case_ \__char_generate:w "#1 _tl }
+ \tl_const:cx { c__char_ #2 _case_ \__char_generate_char:n {#1} _tl }
{
\__char_generate:n { "#3 }
\__char_generate:n { "#4 }
@@ -28873,7 +28877,10 @@
{
\group_begin:
\cs_set:Npn \__tl_tmp:n #1
- { \char_generate:nn {#1} { \char_value_catcode:n {#1} } }
+ {
+ \exp_after:wN \exp_after:wN \exp_after:wN \exp_not:N
+ \char_generate:nn {#1} { \char_value_catcode:n {#1} }
+ }
\tl_const:Nx \c__tl_std_sigma_tl { \__tl_tmp:n { "03C3 } }
\tl_const:Nx \c__tl_final_sigma_tl { \__tl_tmp:n { "03C2 } }
\tl_const:Nx \c__tl_accents_lt_tl