[latex3-commits] [git/LaTeX3-latex3-latex3] master: Generate chars with catcode as-supplied (7060dbe2d)
Joseph Wright
joseph.wright at morningstar2.co.uk
Fri Aug 30 17:48:53 CEST 2019
Repository : https://github.com/latex3/latex3
On branch : master
Link : https://github.com/latex3/latex3/commit/7060dbe2d1865287bd9ef58c74e01e387070581c
>---------------------------------------------------------------
commit 7060dbe2d1865287bd9ef58c74e01e387070581c
Author: Joseph Wright <joseph.wright at morningstar2.co.uk>
Date: Fri Aug 30 16:48:48 2019 +0100
Generate chars with catcode as-supplied
>---------------------------------------------------------------
7060dbe2d1865287bd9ef58c74e01e387070581c
l3kernel/CHANGELOG.md | 1 +
l3kernel/l3candidates.dtx | 92 ++++++++++++++++++++++-----------
l3kernel/testfiles/m3char001.luatex.tlg | 4 +-
l3kernel/testfiles/m3char001.ptex.tlg | 12 ++---
l3kernel/testfiles/m3char001.tlg | 12 ++---
l3kernel/testfiles/m3char001.uptex.tlg | 12 ++---
l3kernel/testfiles/m3char001.xetex.tlg | 4 +-
l3kernel/testfiles/m3expl001.luatex.tlg | 11 ++--
l3kernel/testfiles/m3expl001.ptex.tlg | 11 ++--
l3kernel/testfiles/m3expl001.tlg | 11 ++--
l3kernel/testfiles/m3expl001.uptex.tlg | 11 ++--
l3kernel/testfiles/m3expl001.xetex.tlg | 11 ++--
l3kernel/testfiles/m3expl003.luatex.tlg | 11 ++--
l3kernel/testfiles/m3expl003.ptex.tlg | 11 ++--
l3kernel/testfiles/m3expl003.tlg | 11 ++--
l3kernel/testfiles/m3expl003.uptex.tlg | 11 ++--
l3kernel/testfiles/m3expl003.xetex.tlg | 11 ++--
17 files changed, 144 insertions(+), 103 deletions(-)
diff --git a/l3kernel/CHANGELOG.md b/l3kernel/CHANGELOG.md
index 0b4b25d93..8c6bb0c9a 100644
--- a/l3kernel/CHANGELOG.md
+++ b/l3kernel/CHANGELOG.md
@@ -14,6 +14,7 @@ this project uses date-based 'snapshot' version identifiers.
### Changed
- Moved `\prop_map_tokens:Nn` to stable
+- Generate chars with catcode as-supplied when case changing
## [2019-08-25]
diff --git a/l3kernel/l3candidates.dtx b/l3kernel/l3candidates.dtx
index 47f5b22fd..a73fb11ce 100644
--- a/l3kernel/l3candidates.dtx
+++ b/l3kernel/l3candidates.dtx
@@ -2486,11 +2486,12 @@
% }
% \begin{macro}[EXP]{\@@_change_case:nNN}
% \begin{macro}[EXP]{\@@_change_case:nN}
-% \begin{macro}[EXP]{\@@_change_case_multi:n, \@@_change_case_multi:v}
-% \begin{macro}[EXP]{\@@_change_case_multi:NNNw}
-% \begin{macro}[EXP]{\@@_change_case:NN}
+% \begin{macro}[EXP]{\@@_change_case_multi:nN, \@@_change_case_multi:vN}
+% \begin{macro}[EXP]{\@@_change_case_multi:NNNNw}
% \begin{macro}[EXP]{\@@_change_case:NNN}
-% \begin{macro}[EXP]{\@@_change_case:N}
+% \begin{macro}[EXP]{\@@_change_case:NNNN}
+% \begin{macro}[EXP]{\@@_change_case:NN}
+% \begin{macro}[EXP]{\@@_change_case_catcode:N}
% \begin{macro}[EXP]
% {
% \char_str_lower_case:N, \char_str_upper_case:N,
@@ -2521,8 +2522,8 @@
{
\tl_if_exist:cTF { c_@@_mixed_case_ \token_to_str:N #1 _tl }
{
- \@@_change_case_multi:v
- { c_@@_mixed_case_ \token_to_str:N #1 _tl }
+ \@@_change_case_multi:vN
+ { c_@@_mixed_case_ \token_to_str:N #1 _tl } #1
}
{ \char_upper_case:N #1 }
}
@@ -2532,48 +2533,76 @@
{
\tl_if_exist:cTF { c_@@_ #1 _case_ \token_to_str:N #3 _tl }
{
- \@@_change_case_multi:v
- { c_@@_ #1 _case_ \token_to_str:N #3 _tl }
+ \@@_change_case_multi:vN
+ { c_@@_ #1 _case_ \token_to_str:N #3 _tl } #3
}
{ \exp_args:Nf \@@_change_case:nN { #2 { `#3 } } #3 }
}
\cs_new:Npn \@@_change_case:nN #1#2
{
\int_compare:nNnTF {#1} = 0
- { \@@_change_case:N #2 }
- { \char_generate:nn {#1} { \char_value_catcode:n {#1} } }
+ { #2 }
+ { \char_generate:nn {#1} { \@@_change_case_catcode:N #2 } }
}
-\cs_new:Npn \@@_change_case_multi:n #1
- { \@@_change_case_multi:NNNw #1 \q_no_value \q_no_value \q_stop }
-\cs_new:Npn \@@_change_case_multi:NNNw #1#2#3#4 \q_stop
+\cs_new:Npn \@@_change_case_multi:nN #1#2
+ { \@@_change_case_multi:NNNNw #2 #1 \q_no_value \q_no_value \q_stop }
+\cs_generate_variant:Nn \@@_change_case_multi:nN { v }
+\cs_new:Npn \@@_change_case_multi:NNNNw #1#2#3#4#5 \q_stop
{
- \quark_if_no_value:NTF #3
+ \quark_if_no_value:NTF #4
{
- \quark_if_no_value:NTF #2
- { \@@_change_case:N #1 }
- { \@@_change_case:NN #1#2 }
+ \quark_if_no_value:NTF #3
+ { \@@_change_case:NN #1 #2 }
+ { \@@_change_case:NNN #1 #2#3 }
}
- { \@@_change_case:NNN #1#2#3 }
+ { \@@_change_case:NNNN #1 #2#3#4 }
}
-\cs_generate_variant:Nn \@@_change_case_multi:n { v }
-\cs_new:Npn \@@_change_case:NN #1#2
+\cs_new:Npn \@@_change_case:NNN #1#2#3
{
\exp_args:Nnf \use:nn
- { \@@_change_case:N #1 }
- { \@@_change_case:N #2 }
+ { \@@_change_case:NN #1 #2 }
+ { \@@_change_case:NN #1 #3 }
}
-\cs_new:Npn \@@_change_case:NNN #1#2#3
+\cs_new:Npn \@@_change_case:NNNN #1#2#3#4
{
\exp_args:Nnff \use:nnn
- { \@@_change_case:N #1 }
- { \@@_change_case:N #2 }
- { \@@_change_case:N #3 }
+ { \@@_change_case:NN #1 #2 }
+ { \@@_change_case:NN #1 #3 }
+ { \@@_change_case:NN #1 #4 }
}
-\cs_new:Npn \@@_change_case:N #1
- { \char_generate:nn { `#1 } { \char_value_catcode:n { `#1 } } }
-\bool_lazy_or:nnF { \sys_if_engine_luatex_p: } { \sys_if_engine_xetex_p: }
+\cs_new:Npn \@@_change_case:NN #1#2
+ { \char_generate:nn { `#2 } { \@@_change_case_catcode:N #1 } }
+\cs_new:Npn \@@_change_case_catcode:N #1
{
- \cs_set_eq:NN \@@_change_case:nN \use_ii:nn
+ \if_catcode:w \exp_not:N #1 \c_math_toggle_token
+ 3
+ \else:
+ \if_catcode:w \exp_not:N #1 \c_alignment_token
+ 4
+ \else:
+ \if_catcode:w \exp_not:N #1 \c_math_superscript_token
+ 7
+ \else:
+ \if_catcode:w \exp_not:N #1 \c_math_subscript_token
+ 8
+ \else:
+ \if_catcode:w \exp_not:N #1 \c_space_token
+ 10
+ \else:
+ \if_catcode:w \exp_not:N #1 \c_catcode_letter_token
+ 11
+ \else:
+ \if_catcode:w \exp_not:N #1 \c_catcode_other_token
+ 12
+ \else:
+ 13
+ \fi:
+ \fi:
+ \fi:
+ \fi:
+ \fi:
+ \fi:
+ \fi:
}
% \end{macrocode}
% Same story for the string version, except category code is easier
@@ -2603,7 +2632,7 @@
{ \tl_to_str:n {#2} }
{ \char_generate:nn {#1} { 12 } }
}
-\bool_lazy_or:nnF { \sys_if_engine_luatex_p: } { \sys_if_engine_xetex_p: }
+\cs_if_exist:NF \tex_Uchar:D
{
\cs_set:Npn \@@_str_change_case:nN #1#2
{ \tl_to_str:n {#2} }
@@ -2620,6 +2649,7 @@
% \end{macro}
% \end{macro}
% \end{macro}
+% \end{macro}
%
% \begin{macro}[EXP]{\char_codepoint_to_bytes:n}
% \begin{macro}[EXP]{\@@_codepoint_to_bytes_auxi:n}
diff --git a/l3kernel/testfiles/m3char001.luatex.tlg b/l3kernel/testfiles/m3char001.luatex.tlg
index 54bf03e91..934105c3e 100644
--- a/l3kernel/testfiles/m3char001.luatex.tlg
+++ b/l3kernel/testfiles/m3char001.luatex.tlg
@@ -571,7 +571,7 @@ The token list contains the tokens:
<recently read> }
l. ... }
The token list contains the tokens:
-> Q (the character Q).
+> Q (the letter Q).
<recently read> }
l. ... }
The token list contains the tokens:
@@ -579,7 +579,7 @@ The token list contains the tokens:
<recently read> }
l. ... }
The token list contains the tokens:
-> Q (the character Q).
+> Q (the letter Q).
<recently read> }
l. ... }
============================================================
diff --git a/l3kernel/testfiles/m3char001.ptex.tlg b/l3kernel/testfiles/m3char001.ptex.tlg
index aa0ca1685..ab2284843 100644
--- a/l3kernel/testfiles/m3char001.ptex.tlg
+++ b/l3kernel/testfiles/m3char001.ptex.tlg
@@ -585,7 +585,7 @@ The token list contains the tokens:
> * (the character *).
<recently read> }
l. ... }
-! Argument of \UTFviii at two@octets has an extra }.
+! Argument of \UTFviii at three@octets has an extra }.
<inserted text>
\par
l. ... }
@@ -596,7 +596,7 @@ I've just inserted will cause me to report a runaway
argument that might be the root of the problem. But if
your `}' was spurious, just type `2' and it will go away.
Runaway argument?
-! Paragraph ended before \UTFviii at two@octets was complete.
+! Paragraph ended before \UTFviii at three@octets was complete.
<to be read again>
\par
l. ... }
@@ -629,7 +629,7 @@ The token list contains the tokens:
> \par (control sequence=\par).
<recently read> }
l. ... }
-! Argument of \UTFviii at two@octets has an extra }.
+! Argument of \UTFviii at three@octets has an extra }.
<inserted text>
\par
l. ... }
@@ -640,7 +640,7 @@ I've just inserted will cause me to report a runaway
argument that might be the root of the problem. But if
your `}' was spurious, just type `2' and it will go away.
Runaway argument?
-! Paragraph ended before \UTFviii at two@octets was complete.
+! Paragraph ended before \UTFviii at three@octets was complete.
<to be read again>
\par
l. ... }
@@ -688,7 +688,7 @@ The token list contains the tokens:
<recently read> }
l. ... }
The token list contains the tokens:
-> Q (the character Q).
+> Q (the letter Q).
<recently read> }
l. ... }
The token list contains the tokens:
@@ -696,7 +696,7 @@ The token list contains the tokens:
<recently read> }
l. ... }
The token list contains the tokens:
-> Q (the character Q).
+> Q (the letter Q).
<recently read> }
l. ... }
============================================================
diff --git a/l3kernel/testfiles/m3char001.tlg b/l3kernel/testfiles/m3char001.tlg
index 8a0fb2207..e4b693fb1 100644
--- a/l3kernel/testfiles/m3char001.tlg
+++ b/l3kernel/testfiles/m3char001.tlg
@@ -585,7 +585,7 @@ The token list contains the tokens:
> * (the character *).
<recently read> }
l. ... }
-! Argument of \UTFviii at two@octets has an extra }.
+! Argument of \UTFviii at three@octets has an extra }.
<inserted text>
\par
l. ... }
@@ -596,7 +596,7 @@ I've just inserted will cause me to report a runaway
argument that might be the root of the problem. But if
your `}' was spurious, just type `2' and it will go away.
Runaway argument?
-! Paragraph ended before \UTFviii at two@octets was complete.
+! Paragraph ended before \UTFviii at three@octets was complete.
<to be read again>
\par
l. ... }
@@ -629,7 +629,7 @@ The token list contains the tokens:
> \par (control sequence=\par).
<recently read> }
l. ... }
-! Argument of \UTFviii at two@octets has an extra }.
+! Argument of \UTFviii at three@octets has an extra }.
<inserted text>
\par
l. ... }
@@ -640,7 +640,7 @@ I've just inserted will cause me to report a runaway
argument that might be the root of the problem. But if
your `}' was spurious, just type `2' and it will go away.
Runaway argument?
-! Paragraph ended before \UTFviii at two@octets was complete.
+! Paragraph ended before \UTFviii at three@octets was complete.
<to be read again>
\par
l. ... }
@@ -688,7 +688,7 @@ The token list contains the tokens:
<recently read> }
l. ... }
The token list contains the tokens:
-> Q (the character Q).
+> Q (the letter Q).
<recently read> }
l. ... }
The token list contains the tokens:
@@ -696,7 +696,7 @@ The token list contains the tokens:
<recently read> }
l. ... }
The token list contains the tokens:
-> Q (the character Q).
+> Q (the letter Q).
<recently read> }
l. ... }
============================================================
diff --git a/l3kernel/testfiles/m3char001.uptex.tlg b/l3kernel/testfiles/m3char001.uptex.tlg
index aa0ca1685..ab2284843 100644
--- a/l3kernel/testfiles/m3char001.uptex.tlg
+++ b/l3kernel/testfiles/m3char001.uptex.tlg
@@ -585,7 +585,7 @@ The token list contains the tokens:
> * (the character *).
<recently read> }
l. ... }
-! Argument of \UTFviii at two@octets has an extra }.
+! Argument of \UTFviii at three@octets has an extra }.
<inserted text>
\par
l. ... }
@@ -596,7 +596,7 @@ I've just inserted will cause me to report a runaway
argument that might be the root of the problem. But if
your `}' was spurious, just type `2' and it will go away.
Runaway argument?
-! Paragraph ended before \UTFviii at two@octets was complete.
+! Paragraph ended before \UTFviii at three@octets was complete.
<to be read again>
\par
l. ... }
@@ -629,7 +629,7 @@ The token list contains the tokens:
> \par (control sequence=\par).
<recently read> }
l. ... }
-! Argument of \UTFviii at two@octets has an extra }.
+! Argument of \UTFviii at three@octets has an extra }.
<inserted text>
\par
l. ... }
@@ -640,7 +640,7 @@ I've just inserted will cause me to report a runaway
argument that might be the root of the problem. But if
your `}' was spurious, just type `2' and it will go away.
Runaway argument?
-! Paragraph ended before \UTFviii at two@octets was complete.
+! Paragraph ended before \UTFviii at three@octets was complete.
<to be read again>
\par
l. ... }
@@ -688,7 +688,7 @@ The token list contains the tokens:
<recently read> }
l. ... }
The token list contains the tokens:
-> Q (the character Q).
+> Q (the letter Q).
<recently read> }
l. ... }
The token list contains the tokens:
@@ -696,7 +696,7 @@ The token list contains the tokens:
<recently read> }
l. ... }
The token list contains the tokens:
-> Q (the character Q).
+> Q (the letter Q).
<recently read> }
l. ... }
============================================================
diff --git a/l3kernel/testfiles/m3char001.xetex.tlg b/l3kernel/testfiles/m3char001.xetex.tlg
index f1b431927..59a0bfb1b 100644
--- a/l3kernel/testfiles/m3char001.xetex.tlg
+++ b/l3kernel/testfiles/m3char001.xetex.tlg
@@ -571,7 +571,7 @@ The token list contains the tokens:
<recently read> }
l. ... }
The token list contains the tokens:
-> Q (the character Q).
+> Q (the letter Q).
<recently read> }
l. ... }
The token list contains the tokens:
@@ -579,7 +579,7 @@ The token list contains the tokens:
<recently read> }
l. ... }
The token list contains the tokens:
-> Q (the character Q).
+> Q (the letter Q).
<recently read> }
l. ... }
============================================================
diff --git a/l3kernel/testfiles/m3expl001.luatex.tlg b/l3kernel/testfiles/m3expl001.luatex.tlg
index 1bf9aad08..4eb0e45fe 100644
--- a/l3kernel/testfiles/m3expl001.luatex.tlg
+++ b/l3kernel/testfiles/m3expl001.luatex.tlg
@@ -6492,12 +6492,13 @@ Defining \char_mixed_case:N on line ...
Defining \char_fold_case:N on line ...
Defining \__char_change_case:nNN on line ...
Defining \__char_change_case:nN on line ...
-Defining \__char_change_case_multi:n on line ...
-Defining \__char_change_case_multi:NNNw on line ...
-Defining \__char_change_case_multi:v on line ...
-Defining \__char_change_case:NN on line ...
+Defining \__char_change_case_multi:nN on line ...
+Defining \__char_change_case_multi:vN on line ...
+Defining \__char_change_case_multi:NNNNw on line ...
Defining \__char_change_case:NNN on line ...
-Defining \__char_change_case:N on line ...
+Defining \__char_change_case:NNNN on line ...
+Defining \__char_change_case:NN on line ...
+Defining \__char_change_case_catcode:N on line ...
Defining \char_str_lower_case:N on line ...
Defining \char_str_upper_case:N on line ...
Defining \char_str_mixed_case:N on line ...
diff --git a/l3kernel/testfiles/m3expl001.ptex.tlg b/l3kernel/testfiles/m3expl001.ptex.tlg
index 8c13179c5..01e2f2227 100644
--- a/l3kernel/testfiles/m3expl001.ptex.tlg
+++ b/l3kernel/testfiles/m3expl001.ptex.tlg
@@ -6486,12 +6486,13 @@ Defining \char_mixed_case:N on line ...
Defining \char_fold_case:N on line ...
Defining \__char_change_case:nNN on line ...
Defining \__char_change_case:nN on line ...
-Defining \__char_change_case_multi:n on line ...
-Defining \__char_change_case_multi:NNNw on line ...
-Defining \__char_change_case_multi:v on line ...
-Defining \__char_change_case:NN on line ...
+Defining \__char_change_case_multi:nN on line ...
+Defining \__char_change_case_multi:vN on line ...
+Defining \__char_change_case_multi:NNNNw on line ...
Defining \__char_change_case:NNN on line ...
-Defining \__char_change_case:N on line ...
+Defining \__char_change_case:NNNN on line ...
+Defining \__char_change_case:NN on line ...
+Defining \__char_change_case_catcode:N on line ...
Defining \char_str_lower_case:N on line ...
Defining \char_str_upper_case:N on line ...
Defining \char_str_mixed_case:N on line ...
diff --git a/l3kernel/testfiles/m3expl001.tlg b/l3kernel/testfiles/m3expl001.tlg
index bcd9cafb4..9ed1f198f 100644
--- a/l3kernel/testfiles/m3expl001.tlg
+++ b/l3kernel/testfiles/m3expl001.tlg
@@ -6486,12 +6486,13 @@ Defining \char_mixed_case:N on line ...
Defining \char_fold_case:N on line ...
Defining \__char_change_case:nNN on line ...
Defining \__char_change_case:nN on line ...
-Defining \__char_change_case_multi:n on line ...
-Defining \__char_change_case_multi:NNNw on line ...
-Defining \__char_change_case_multi:v on line ...
-Defining \__char_change_case:NN on line ...
+Defining \__char_change_case_multi:nN on line ...
+Defining \__char_change_case_multi:vN on line ...
+Defining \__char_change_case_multi:NNNNw on line ...
Defining \__char_change_case:NNN on line ...
-Defining \__char_change_case:N on line ...
+Defining \__char_change_case:NNNN on line ...
+Defining \__char_change_case:NN on line ...
+Defining \__char_change_case_catcode:N on line ...
Defining \char_str_lower_case:N on line ...
Defining \char_str_upper_case:N on line ...
Defining \char_str_mixed_case:N on line ...
diff --git a/l3kernel/testfiles/m3expl001.uptex.tlg b/l3kernel/testfiles/m3expl001.uptex.tlg
index cc3254d68..233f3459a 100644
--- a/l3kernel/testfiles/m3expl001.uptex.tlg
+++ b/l3kernel/testfiles/m3expl001.uptex.tlg
@@ -6482,12 +6482,13 @@ Defining \char_mixed_case:N on line ...
Defining \char_fold_case:N on line ...
Defining \__char_change_case:nNN on line ...
Defining \__char_change_case:nN on line ...
-Defining \__char_change_case_multi:n on line ...
-Defining \__char_change_case_multi:NNNw on line ...
-Defining \__char_change_case_multi:v on line ...
-Defining \__char_change_case:NN on line ...
+Defining \__char_change_case_multi:nN on line ...
+Defining \__char_change_case_multi:vN on line ...
+Defining \__char_change_case_multi:NNNNw on line ...
Defining \__char_change_case:NNN on line ...
-Defining \__char_change_case:N on line ...
+Defining \__char_change_case:NNNN on line ...
+Defining \__char_change_case:NN on line ...
+Defining \__char_change_case_catcode:N on line ...
Defining \char_str_lower_case:N on line ...
Defining \char_str_upper_case:N on line ...
Defining \char_str_mixed_case:N on line ...
diff --git a/l3kernel/testfiles/m3expl001.xetex.tlg b/l3kernel/testfiles/m3expl001.xetex.tlg
index 92a65e73b..b0eae5b02 100644
--- a/l3kernel/testfiles/m3expl001.xetex.tlg
+++ b/l3kernel/testfiles/m3expl001.xetex.tlg
@@ -6490,12 +6490,13 @@ Defining \char_mixed_case:N on line ...
Defining \char_fold_case:N on line ...
Defining \__char_change_case:nNN on line ...
Defining \__char_change_case:nN on line ...
-Defining \__char_change_case_multi:n on line ...
-Defining \__char_change_case_multi:NNNw on line ...
-Defining \__char_change_case_multi:v on line ...
-Defining \__char_change_case:NN on line ...
+Defining \__char_change_case_multi:nN on line ...
+Defining \__char_change_case_multi:vN on line ...
+Defining \__char_change_case_multi:NNNNw on line ...
Defining \__char_change_case:NNN on line ...
-Defining \__char_change_case:N on line ...
+Defining \__char_change_case:NNNN on line ...
+Defining \__char_change_case:NN on line ...
+Defining \__char_change_case_catcode:N on line ...
Defining \char_str_lower_case:N on line ...
Defining \char_str_upper_case:N on line ...
Defining \char_str_mixed_case:N on line ...
diff --git a/l3kernel/testfiles/m3expl003.luatex.tlg b/l3kernel/testfiles/m3expl003.luatex.tlg
index 1bf9aad08..4eb0e45fe 100644
--- a/l3kernel/testfiles/m3expl003.luatex.tlg
+++ b/l3kernel/testfiles/m3expl003.luatex.tlg
@@ -6492,12 +6492,13 @@ Defining \char_mixed_case:N on line ...
Defining \char_fold_case:N on line ...
Defining \__char_change_case:nNN on line ...
Defining \__char_change_case:nN on line ...
-Defining \__char_change_case_multi:n on line ...
-Defining \__char_change_case_multi:NNNw on line ...
-Defining \__char_change_case_multi:v on line ...
-Defining \__char_change_case:NN on line ...
+Defining \__char_change_case_multi:nN on line ...
+Defining \__char_change_case_multi:vN on line ...
+Defining \__char_change_case_multi:NNNNw on line ...
Defining \__char_change_case:NNN on line ...
-Defining \__char_change_case:N on line ...
+Defining \__char_change_case:NNNN on line ...
+Defining \__char_change_case:NN on line ...
+Defining \__char_change_case_catcode:N on line ...
Defining \char_str_lower_case:N on line ...
Defining \char_str_upper_case:N on line ...
Defining \char_str_mixed_case:N on line ...
diff --git a/l3kernel/testfiles/m3expl003.ptex.tlg b/l3kernel/testfiles/m3expl003.ptex.tlg
index 8c13179c5..01e2f2227 100644
--- a/l3kernel/testfiles/m3expl003.ptex.tlg
+++ b/l3kernel/testfiles/m3expl003.ptex.tlg
@@ -6486,12 +6486,13 @@ Defining \char_mixed_case:N on line ...
Defining \char_fold_case:N on line ...
Defining \__char_change_case:nNN on line ...
Defining \__char_change_case:nN on line ...
-Defining \__char_change_case_multi:n on line ...
-Defining \__char_change_case_multi:NNNw on line ...
-Defining \__char_change_case_multi:v on line ...
-Defining \__char_change_case:NN on line ...
+Defining \__char_change_case_multi:nN on line ...
+Defining \__char_change_case_multi:vN on line ...
+Defining \__char_change_case_multi:NNNNw on line ...
Defining \__char_change_case:NNN on line ...
-Defining \__char_change_case:N on line ...
+Defining \__char_change_case:NNNN on line ...
+Defining \__char_change_case:NN on line ...
+Defining \__char_change_case_catcode:N on line ...
Defining \char_str_lower_case:N on line ...
Defining \char_str_upper_case:N on line ...
Defining \char_str_mixed_case:N on line ...
diff --git a/l3kernel/testfiles/m3expl003.tlg b/l3kernel/testfiles/m3expl003.tlg
index bcd9cafb4..9ed1f198f 100644
--- a/l3kernel/testfiles/m3expl003.tlg
+++ b/l3kernel/testfiles/m3expl003.tlg
@@ -6486,12 +6486,13 @@ Defining \char_mixed_case:N on line ...
Defining \char_fold_case:N on line ...
Defining \__char_change_case:nNN on line ...
Defining \__char_change_case:nN on line ...
-Defining \__char_change_case_multi:n on line ...
-Defining \__char_change_case_multi:NNNw on line ...
-Defining \__char_change_case_multi:v on line ...
-Defining \__char_change_case:NN on line ...
+Defining \__char_change_case_multi:nN on line ...
+Defining \__char_change_case_multi:vN on line ...
+Defining \__char_change_case_multi:NNNNw on line ...
Defining \__char_change_case:NNN on line ...
-Defining \__char_change_case:N on line ...
+Defining \__char_change_case:NNNN on line ...
+Defining \__char_change_case:NN on line ...
+Defining \__char_change_case_catcode:N on line ...
Defining \char_str_lower_case:N on line ...
Defining \char_str_upper_case:N on line ...
Defining \char_str_mixed_case:N on line ...
diff --git a/l3kernel/testfiles/m3expl003.uptex.tlg b/l3kernel/testfiles/m3expl003.uptex.tlg
index cc3254d68..233f3459a 100644
--- a/l3kernel/testfiles/m3expl003.uptex.tlg
+++ b/l3kernel/testfiles/m3expl003.uptex.tlg
@@ -6482,12 +6482,13 @@ Defining \char_mixed_case:N on line ...
Defining \char_fold_case:N on line ...
Defining \__char_change_case:nNN on line ...
Defining \__char_change_case:nN on line ...
-Defining \__char_change_case_multi:n on line ...
-Defining \__char_change_case_multi:NNNw on line ...
-Defining \__char_change_case_multi:v on line ...
-Defining \__char_change_case:NN on line ...
+Defining \__char_change_case_multi:nN on line ...
+Defining \__char_change_case_multi:vN on line ...
+Defining \__char_change_case_multi:NNNNw on line ...
Defining \__char_change_case:NNN on line ...
-Defining \__char_change_case:N on line ...
+Defining \__char_change_case:NNNN on line ...
+Defining \__char_change_case:NN on line ...
+Defining \__char_change_case_catcode:N on line ...
Defining \char_str_lower_case:N on line ...
Defining \char_str_upper_case:N on line ...
Defining \char_str_mixed_case:N on line ...
diff --git a/l3kernel/testfiles/m3expl003.xetex.tlg b/l3kernel/testfiles/m3expl003.xetex.tlg
index 92a65e73b..b0eae5b02 100644
--- a/l3kernel/testfiles/m3expl003.xetex.tlg
+++ b/l3kernel/testfiles/m3expl003.xetex.tlg
@@ -6490,12 +6490,13 @@ Defining \char_mixed_case:N on line ...
Defining \char_fold_case:N on line ...
Defining \__char_change_case:nNN on line ...
Defining \__char_change_case:nN on line ...
-Defining \__char_change_case_multi:n on line ...
-Defining \__char_change_case_multi:NNNw on line ...
-Defining \__char_change_case_multi:v on line ...
-Defining \__char_change_case:NN on line ...
+Defining \__char_change_case_multi:nN on line ...
+Defining \__char_change_case_multi:vN on line ...
+Defining \__char_change_case_multi:NNNNw on line ...
Defining \__char_change_case:NNN on line ...
-Defining \__char_change_case:N on line ...
+Defining \__char_change_case:NNNN on line ...
+Defining \__char_change_case:NN on line ...
+Defining \__char_change_case_catcode:N on line ...
Defining \char_str_lower_case:N on line ...
Defining \char_str_upper_case:N on line ...
Defining \char_str_mixed_case:N on line ...
More information about the latex3-commits
mailing list