[latex3-commits] [git/LaTeX3-latex3-latex2e] develop: Update l3kernel to 2021-06-18 (5287faa9)
Joseph Wright
joseph.wright at morningstar2.co.uk
Fri Jun 18 11:46:58 CEST 2021
Repository : https://github.com/latex3/latex2e
On branch : develop
Link : https://github.com/latex3/latex2e/commit/5287faa9ddcbe1c3d813fe6df030a64c944fe7dd
>---------------------------------------------------------------
commit 5287faa9ddcbe1c3d813fe6df030a64c944fe7dd
Author: Joseph Wright <joseph.wright at morningstar2.co.uk>
Date: Fri Jun 18 09:31:01 2021 +0100
Update l3kernel to 2021-06-18
>---------------------------------------------------------------
5287faa9ddcbe1c3d813fe6df030a64c944fe7dd
texmf/tex/latex/l3kernel/expl3-code.tex | 58 +++++++++++++++++++++++-------
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, 48 insertions(+), 16 deletions(-)
diff --git a/texmf/tex/latex/l3kernel/expl3-code.tex b/texmf/tex/latex/l3kernel/expl3-code.tex
index 90c113d9..aad1442b 100644
--- a/texmf/tex/latex/l3kernel/expl3-code.tex
+++ b/texmf/tex/latex/l3kernel/expl3-code.tex
@@ -70,7 +70,7 @@
%% and all files in that bundle must be distributed together.
%%
%% File: expl3.dtx
-\def\ExplFileDate{2021-06-01}%
+\def\ExplFileDate{2021-06-18}%
\begingroup
\def\next{\endgroup}%
\expandafter\ifx\csname PackageError\endcsname\relax
@@ -7468,7 +7468,7 @@
}
{
\tl_if_blank:nF {#1}
- { \tl_set:Nn \g__sys_backend_tl {#1} }
+ { \tl_gset:Nn \g__sys_backend_tl {#1} }
\__sys_load_backend_check:N \g__sys_backend_tl
\str_const:Nx \c_sys_backend_str { \g__sys_backend_tl }
\__kernel_sys_configuration_load:n
@@ -31355,7 +31355,6 @@
\exp_args:Ne \__text_expand_exclude:nN
{
\exp_not:V \l_text_math_arg_tl
- \exp_not:V \l_text_accents_tl
\exp_not:V \l_text_expand_exclude_tl
}
#1
@@ -31368,7 +31367,7 @@
\cs_new:Npn \__text_expand_exclude:NN #1#2
{
\__text_if_recursion_tail_stop_do:Nn #2
- { \__text_expand_letterlike:N #1 }
+ { \__text_expand_accent:N #1 }
\str_if_eq:nnTF {#1} {#2}
{
\__text_use_i_delimit_by_q_recursion_stop:nw
@@ -31381,6 +31380,26 @@
\__text_expand_store:n { #1 {#2} }
\__text_expand_loop:w
}
+\cs_new:Npn \__text_expand_accent:N #1
+ {
+ \exp_after:wN \__text_expand_accent:NN \exp_after:wN
+ #1 \l_text_accents_tl
+ \q__text_recursion_tail \q__text_recursion_stop
+ }
+\cs_new:Npn \__text_expand_accent:NN #1#2
+ {
+ \__text_if_recursion_tail_stop_do:Nn #2
+ { \__text_expand_letterlike:N #1 }
+ \cs_if_eq:NNTF #2 #1
+ {
+ \__text_use_i_delimit_by_q_recursion_stop:nw
+ {
+ \__text_expand_store:n {#1}
+ \__text_expand_loop:w
+ }
+ }
+ { \__text_expand_accent:NN #1 }
+ }
\cs_new:Npn \__text_expand_letterlike:N #1
{
\exp_after:wN \__text_expand_letterlike:NN \exp_after:wN
@@ -31884,7 +31903,7 @@
{ \sys_if_engine_luatex_p: }
{ \sys_if_engine_xetex_p: }
{
- \cs_new_eq:NN \__text_change_case_char_aux:nnnN
+ \cs_new_eq:NN \__text_change_case_char_auxi:nnnN
\__text_change_case_char:nnnN
\cs_gset:Npn \__text_change_case_char:nnnN #1#2#3#4
{
@@ -31892,20 +31911,33 @@
{
\int_compare:nNnTF { `#4 } < { "E0 }
{ \__text_change_case_char_UTFviii:nnnNN }
- {
- \int_compare:nNnTF { `#4 } < { "F0 }
- { \__text_change_case_char_UTFviii:nnnNNN }
- { \__text_change_case_char_UTFviii:nnnNNNN }
- }
- {#1} {#2} {#3} #4
+ { \__text_change_case_char_auxii:nnnN }
}
- { \__text_change_case_char_aux:nnnN {#1} {#2} {#3} #4 }
+ { \__text_change_case_char_auxi:nnnN }
+ {#1} {#2} {#3} #4
}
+ \sys_if_engine_pdftex:TF
+ {
+ \cs_new:Npn \__text_change_case_char_auxii:nnnN #1#2#3#4
+ {
+ \int_compare:nNnTF { `#4 } < { "F0 }
+ { \__text_change_case_char_UTFviii:nnnNNN }
+ { \__text_change_case_char_UTFviii:nnnNNNN }
+ {#1} {#2} {#3} #4
+ }
+ }
+ {
+ \cs_new:Npn \__text_change_case_char_auxii:nnnN #1#2#3#4
+ {
+ \__text_change_case_store:n {#4}
+ \use:c { __text_change_case_char_next_ #2 :nn } {#2} {#3}
+ }
+ }
\cs_new:Npn \__text_change_case_char_UTFviii:nnnNN #1#2#3#4#5
{ \__text_change_case_char_UTFviii:nnnn {#1} {#2} {#3} {#4#5} }
\cs_new:Npn \__text_change_case_char_UTFviii:nnnNNN #1#2#3#4#5#6
{ \__text_change_case_char_UTFviii:nnnn {#1} {#2} {#3} {#4#5#6} }
- \cs_new:Npn \__text_change_case_char_UTFviii:nnnNNNNN #1#2#3#4#5#6#7
+ \cs_new:Npn \__text_change_case_char_UTFviii:nnnNNNN #1#2#3#4#5#6#7
{ \__text_change_case_char_UTFviii:nnnn {#1} {#2} {#3} {#4#5#6#7} }
\cs_new:Npn \__text_change_case_char_UTFviii:nnnn #1#2#3#4
{
diff --git a/texmf/tex/latex/l3kernel/expl3-generic.tex b/texmf/tex/latex/l3kernel/expl3-generic.tex
index a575ebde..f271143c 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{2021-06-01}%
+\def\ExplFileDate{2021-06-18}%
\let\ExplLoaderFileDate\ExplFileDate
\begingroup
\catcode`\_=11
diff --git a/texmf/tex/latex/l3kernel/expl3.ltx b/texmf/tex/latex/l3kernel/expl3.ltx
index 979ecf97..d6690948 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{2021-06-01}%
+\def\ExplFileDate{2021-06-18}%
\let\ExplLoaderFileDate\ExplFileDate
\begingroup
\catcode`\_=11
diff --git a/texmf/tex/latex/l3kernel/expl3.sty b/texmf/tex/latex/l3kernel/expl3.sty
index ede8e327..4f528de6 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{2021-06-01}%
+\def\ExplFileDate{2021-06-18}%
\let\ExplLoaderFileDate\ExplFileDate
\ProvidesPackage{expl3}
[%
More information about the latex3-commits
mailing list.