[latex3-commits] [git/LaTeX3-latex3-latex3] char: Generate chars with catcode as-supplied (e356bd0)

Joseph Wright joseph.wright at morningstar2.co.uk
Sun May 26 10:39:42 CEST 2019


Repository : https://github.com/latex3/latex3
On branch  : char
Link       : https://github.com/latex3/latex3/commit/e356bd05da1a619f0cba28aee041e10f922bc47a

>---------------------------------------------------------------

commit e356bd05da1a619f0cba28aee041e10f922bc47a
Author: Joseph Wright <joseph.wright at morningstar2.co.uk>
Date:   Sun May 26 09:30:38 2019 +0100

    Generate chars with catcode as-supplied


>---------------------------------------------------------------

e356bd05da1a619f0cba28aee041e10f922bc47a
 l3kernel/l3token.dtx                    |   93 ++++++++++++++++++++-----------
 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 ++--
 16 files changed, 143 insertions(+), 104 deletions(-)

diff --git a/l3kernel/l3token.dtx b/l3kernel/l3token.dtx
index 28061bc..b133d02 100644
--- a/l3kernel/l3token.dtx
+++ b/l3kernel/l3token.dtx
@@ -167,8 +167,7 @@
 %   is carried out with no context-dependence (\emph{cf.}~\cs{tl_upper_case:n},
 %   \emph{etc.}) The \texttt{str} versions always generate \enquote{other}
 %   (category code $12$) characters, whilst the standard versions generate
-%   characters with the currently-active category code (\emph{i.e.}~as if
-%   the character had been read directly here).
+%   characters with the category code of the supplied \meta{char}.
 % \end{function}
 %
 % \begin{variable}[added = 2011-09-05]{\c_catcode_other_space_tl}
@@ -1559,11 +1558,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,
@@ -1594,8 +1594,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 }
   }
@@ -1605,48 +1605,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 } } }
-\cs_if_exist:NF \tex_Uchar:D
+\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
@@ -1693,6 +1721,7 @@
 % \end{macro}
 % \end{macro}
 % \end{macro}
+% \end{macro}
 %
 % \begin{macro}{\c_catcode_other_space_tl}
 %   Create a space with category code $12$: an \enquote{other} space.
diff --git a/l3kernel/testfiles/m3char001.luatex.tlg b/l3kernel/testfiles/m3char001.luatex.tlg
index 54bf03e..934105c 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 aa0ca16..ab22848 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 8a0fb22..e4b693f 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 aa0ca16..ab22848 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 f1b4319..59a0bfb 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 6f32060..537eab4 100644
--- a/l3kernel/testfiles/m3expl001.luatex.tlg
+++ b/l3kernel/testfiles/m3expl001.luatex.tlg
@@ -2066,12 +2066,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 3ed201e..a0f10bb 100644
--- a/l3kernel/testfiles/m3expl001.ptex.tlg
+++ b/l3kernel/testfiles/m3expl001.ptex.tlg
@@ -2320,12 +2320,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 b0bf891..f6c37bc 100644
--- a/l3kernel/testfiles/m3expl001.tlg
+++ b/l3kernel/testfiles/m3expl001.tlg
@@ -2320,12 +2320,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 eb9b4c3..ce319bd 100644
--- a/l3kernel/testfiles/m3expl001.uptex.tlg
+++ b/l3kernel/testfiles/m3expl001.uptex.tlg
@@ -2320,12 +2320,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 06fe7d2..627344a 100644
--- a/l3kernel/testfiles/m3expl001.xetex.tlg
+++ b/l3kernel/testfiles/m3expl001.xetex.tlg
@@ -2064,12 +2064,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 6f32060..537eab4 100644
--- a/l3kernel/testfiles/m3expl003.luatex.tlg
+++ b/l3kernel/testfiles/m3expl003.luatex.tlg
@@ -2066,12 +2066,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 3ed201e..a0f10bb 100644
--- a/l3kernel/testfiles/m3expl003.ptex.tlg
+++ b/l3kernel/testfiles/m3expl003.ptex.tlg
@@ -2320,12 +2320,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 b0bf891..f6c37bc 100644
--- a/l3kernel/testfiles/m3expl003.tlg
+++ b/l3kernel/testfiles/m3expl003.tlg
@@ -2320,12 +2320,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 eb9b4c3..ce319bd 100644
--- a/l3kernel/testfiles/m3expl003.uptex.tlg
+++ b/l3kernel/testfiles/m3expl003.uptex.tlg
@@ -2320,12 +2320,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 06fe7d2..627344a 100644
--- a/l3kernel/testfiles/m3expl003.xetex.tlg
+++ b/l3kernel/testfiles/m3expl003.xetex.tlg
@@ -2064,12 +2064,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