[latex3-commits] [git/LaTeX3-latex3-latex3] master: Remove end-of-2018 deprecations (c96faed)

Joseph Wright joseph.wright at morningstar2.co.uk
Thu Dec 27 16:40:09 CET 2018


Repository : https://github.com/latex3/latex3
On branch  : master
Link       : https://github.com/latex3/latex3/commit/c96faed90a5a63ba84695190560bdacac1dfdacc

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

commit c96faed90a5a63ba84695190560bdacac1dfdacc
Author: Joseph Wright <joseph.wright at morningstar2.co.uk>
Date:   Thu Dec 27 15:40:09 2018 +0000

    Remove end-of-2018 deprecations


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

c96faed90a5a63ba84695190560bdacac1dfdacc
 l3kernel/CHANGELOG.md                   |    4 ++
 l3kernel/l3box.dtx                      |   23 ---------
 l3kernel/l3expan.dtx                    |   11 +----
 l3kernel/l3file.dtx                     |   79 -------------------------------
 l3kernel/l3int.dtx                      |   20 --------
 l3kernel/l3obsolete.txt                 |   36 +++++++-------
 l3kernel/l3sort.dtx                     |   12 -----
 l3kernel/testfiles/m3expan001.tlg       |   60 +++++++++++++++++------
 l3kernel/testfiles/m3expan002.tlg       |   28 +++++++++--
 l3kernel/testfiles/m3expl001.luatex.tlg |   17 -------
 l3kernel/testfiles/m3expl001.ptex.tlg   |   17 -------
 l3kernel/testfiles/m3expl001.tlg        |   17 -------
 l3kernel/testfiles/m3expl001.uptex.tlg  |   17 -------
 l3kernel/testfiles/m3expl001.xetex.tlg  |   17 -------
 l3kernel/testfiles/m3expl003.luatex.tlg |   17 -------
 l3kernel/testfiles/m3expl003.ptex.tlg   |   17 -------
 l3kernel/testfiles/m3expl003.tlg        |   17 -------
 l3kernel/testfiles/m3expl003.uptex.tlg  |   17 -------
 l3kernel/testfiles/m3expl003.xetex.tlg  |   17 -------
 19 files changed, 92 insertions(+), 351 deletions(-)

diff --git a/l3kernel/CHANGELOG.md b/l3kernel/CHANGELOG.md
index c0c8c70..551da67 100644
--- a/l3kernel/CHANGELOG.md
+++ b/l3kernel/CHANGELOG.md
@@ -7,6 +7,10 @@ this project uses date-based 'snapshot' version identifiers.
 
 ## [Unreleased]
 
+### Removed
+
+- Functions scheduled end 2018
+
 ## [2018-12-12]
 
 ### Changed
diff --git a/l3kernel/l3box.dtx b/l3kernel/l3box.dtx
index b0c545f..1360af3 100644
--- a/l3kernel/l3box.dtx
+++ b/l3kernel/l3box.dtx
@@ -2087,29 +2087,6 @@
 %    \end{macrocode}
 % \end{macro}
 %
-% \subsection{Deprecated functions}
-%
-% \begin{macro}[deprecated = 2018-12-31]{\box_resize:Nnn, \box_resize:cnn}
-% \begin{macro}[deprecated = 2018-12-31]{\box_use_clear:N, \box_use_clear:c}
-%    \begin{macrocode}
-\__kernel_patch_deprecation:nnNNpn
-  { 2018-12-31 } { \box_resize_to_wd_and_ht_plus_dp:Nnn }
-\cs_new_protected:Npn \box_resize:Nnn
-  { \box_resize_to_wd_and_ht_plus_dp:Nnn }
-\__kernel_patch_deprecation:nnNNpn
-  { 2018-12-31 } { \box_resize_to_wd_and_ht_plus_dp:cnn }
-\cs_new_protected:Npn \box_resize:cnn
-  { \box_resize_to_wd_and_ht_plus_dp:cnn }
-\__kernel_patch_deprecation:nnNNpn
-  { 2018-12-31 } { \box_use_drop:N }
-\cs_new_protected:Npn \box_use_clear:N { \box_use_drop:N }
-\__kernel_patch_deprecation:nnNNpn
-  { 2018-12-31 } { \box_use_drop:c }
-\cs_new_protected:Npn \box_use_clear:c { \box_use_drop:c }
-%    \end{macrocode}
-% \end{macro}
-% \end{macro}
-%
 %    \begin{macrocode}
 %</initex|package>
 %    \end{macrocode}
diff --git a/l3kernel/l3expan.dtx b/l3kernel/l3expan.dtx
index d4c07c4..c2bce5c 100644
--- a/l3kernel/l3expan.dtx
+++ b/l3kernel/l3expan.dtx
@@ -2346,8 +2346,7 @@
 %     \@@_generate_variant_loop_end:nwwwNNnn,
 %     \@@_generate_variant_loop_long:wNNnn,
 %     \@@_generate_variant_loop_invalid:NNwNNnn,
-%     \@@_generate_variant_loop_special:NNwNNnn,
-%     \@@_generate_variant_loop_warning:nnxxxx
+%     \@@_generate_variant_loop_special:NNwNNnn
 %   }
 %   \begin{arguments}
 %     \item Last few consecutive letters common between the base and
@@ -2400,10 +2399,6 @@
 %   breaking function takes the empty brace group in |#4| as its first
 %   argument: this empty brace group produces the correct signature for
 %   the full variant.
-%
-%   Since people seem to have tried generating |N| or |c|-type variants
-%   of |n|-type arguments, and |n|, |o|, |V|, |v|, |f|, |x| variants of
-%   |N|-type arguments, in those cases we only produce a warning.
 %    \begin{macrocode}
 \cs_new:Npn \@@_generate_variant_loop:nNwN #1#2#3 \q_mark #4
   {
@@ -2494,13 +2489,11 @@
     #3 \q_stop #4 #5 {#6} {#7}
     \exp_not:n
       {
-        \@@_generate_variant_loop_warning:nnxxxx
+        \__kernel_msg_error:nnxxxx
           { kernel } { deprecated-variant }
           {#7} { \token_to_str:N #5 } {#1} {#2}
       }
   }
-\cs_new_protected:Npn \@@_generate_variant_loop_warning:nnxxxx
-  { \__kernel_msg_warning:nnxxxx }
 %    \end{macrocode}
 % \end{macro}
 %
diff --git a/l3kernel/l3file.dtx b/l3kernel/l3file.dtx
index 23f34a1..3fee39f 100644
--- a/l3kernel/l3file.dtx
+++ b/l3kernel/l3file.dtx
@@ -2372,85 +2372,6 @@
   }
 %    \end{macrocode}
 %
-% \subsection{Deprecated functions}
-%
-% \begin{variable}[deprecated = 2018-12-31]{\g_file_current_name_tl}
-%   For removal after 2018-12-31.
-%   Contrarily to most other deprecated commands this is expandable
-%   so we need to put code by hand in two token lists.  We use
-%   \cs{tex_def:D} directly because \cs{g_file_current_name_tl} is made
-%   outer by \cs{debug_on:n} \texttt{\{deprecation\}}.
-%    \begin{macrocode}
-\tl_new:N \g_file_current_name_tl
-\tl_gset:Nn \g_file_current_name_tl { \g_file_curr_name_str }
-\__kernel_deprecation_code:nn
-  {
-    \__kernel_deprecation_error:Nnn \g_file_current_name_tl
-      { \g_file_curr_name_str } { 2018-12-31 }
-  }
-  { \tex_def:D \g_file_current_name_tl { \g_file_curr_name_str } }
-%    \end{macrocode}
-% \end{variable}
-%
-% \begin{macro}[deprecated = 2018-12-31]{\file_path_include:n}
-% \begin{macro}[deprecated = 2018-12-31]{\file_path_remove:n}
-%   Wrapper functions to manage the search path.
-%    \begin{macrocode}
-\__kernel_patch_deprecation:nnNNpn { 2018-12-31 }
-  { \seq_put_right:Nn \l_file_search_path_seq }
-\cs_new_protected:Npn \file_path_include:n #1
-  {
-    \__kernel_file_name_sanitize:nN {#1} \l_@@_full_name_str
-    \seq_if_in:NVF \l_file_search_path_seq \l_@@_full_name_str
-      { \seq_put_right:NV \l_file_search_path_seq \l_@@_full_name_str }
-  }
-\__kernel_patch_deprecation:nnNNpn { 2018-12-31 }
-  { \seq_remove_all:Nn \l_file_search_path_seq }
-\cs_new_protected:Npn \file_path_remove:n #1
-  {
-    \__kernel_file_name_sanitize:nN {#1} \l_@@_full_name_str
-    \seq_remove_all:NV \l_file_search_path_seq \l_@@_full_name_str
-  }
-%    \end{macrocode}
-% \end{macro}
-% \end{macro}
-%
-% \begin{macro}[deprecated = 2018-12-31]{\file_add_path:nN}
-%   For removal after 2018-12-31.
-%    \begin{macrocode}
-\__kernel_patch_deprecation:nnNNpn { 2018-12-31 } { \file_get_full_name:nN }
-\cs_new_protected:Npn \file_add_path:nN #1#2
-  {
-    \file_get_full_name:nN {#1} #2
-    \str_if_empty:NT #2
-      { \tl_set:Nn #2 { \q_no_value } }
-  }
-%    \end{macrocode}
-% \end{macro}
-%
-% \begin{macro}[deprecated = 2018-12-31]{\file_list:}
-%   Renamed to \cs{file_log_list:}.  For removal after 2018-12-31.
-%    \begin{macrocode}
-\__kernel_patch_deprecation:nnNNpn { 2018-12-31 } { \file_log_list: }
-\cs_new_protected:Npn \file_list:          { \file_log_list: }
-%    \end{macrocode}
-% \end{macro}
-%
-% \begin{macro}[added = 2014-08-22, updated = 2015-08-01, deprecated = 2018-12-31]
-%   {\ior_list_streams:, \ior_log_streams:, \iow_list_streams:, \iow_log_streams:}
-%   These got a more consistent naming.
-%    \begin{macrocode}
-\__kernel_patch_deprecation:nnNNpn { 2018-12-31 } { \ior_show_list: }
-\cs_new_protected:Npn \ior_list_streams:   { \ior_show_list: }
-\__kernel_patch_deprecation:nnNNpn { 2018-12-31 } { \ior_log_list: }
-\cs_new_protected:Npn \ior_log_streams:    { \ior_log_list: }
-\__kernel_patch_deprecation:nnNNpn { 2018-12-31 } { \iow_show_list: }
-\cs_new_protected:Npn \iow_list_streams:   { \iow_show_list: }
-\__kernel_patch_deprecation:nnNNpn { 2018-12-31 } { \iow_log_list: }
-\cs_new_protected:Npn \iow_log_streams:    { \iow_log_list: }
-%    \end{macrocode}
-% \end{macro}
-%
 %    \begin{macrocode}
 %</initex|package>
 %    \end{macrocode}
diff --git a/l3kernel/l3int.dtx b/l3kernel/l3int.dtx
index f9d75e4..9fe69d4 100644
--- a/l3kernel/l3int.dtx
+++ b/l3kernel/l3int.dtx
@@ -2557,26 +2557,6 @@
 %
 % \subsection{Deprecated}
 %
-% \begin{variable}[deprecated = 2018-12-31]{\c_minus_one}
-%   The actual allocation mechanism is in \pkg{l3alloc}.
-%   In package mode, reuse \tn{m at ne}.
-%   We also store in two global token lists some code for
-%   \cs{debug_on:n} \texttt{\{deprecation\}} and \cs{debug_off:n}
-%   \texttt{\{deprecation\}}.  For the
-%   latter, we need to locally set \cs{c_minus_one} back to the constant
-%   hence use a private name.  We use \cs{tex_let:D} directly because
-%   \cs{c_minus_one} (as all deprecated commands) is made outer by
-%   \cs{debug_on:n} \texttt{\{deprecation\}}.
-%    \begin{macrocode}
-%<package>\cs_gset_eq:NN \c_@@_minus_one \m at ne
-%<initex>\int_const:Nn \c_@@_minus_one { -1 }
-\cs_new_eq:NN \c_minus_one \c_@@_minus_one
-\__kernel_deprecation_code:nn
-  { \__kernel_deprecation_error:Nnn \c_minus_one { -1 } { 2018-12-31 } }
-  { \tex_let:D \c_minus_one \c_@@_minus_one }
-%    \end{macrocode}
-% \end{variable}
-%
 % \begin{variable}[deprecated = 2019-12-31]
 %   {
 %     \c_zero, \c_one, \c_two, \c_three, \c_four, \c_five, \c_six,
diff --git a/l3kernel/l3obsolete.txt b/l3kernel/l3obsolete.txt
index ae7702a..918569c 100644
--- a/l3kernel/l3obsolete.txt
+++ b/l3kernel/l3obsolete.txt
@@ -15,11 +15,6 @@ They will be removed from the sources at the end of the given year.
 --------------------------------------
 Function                   Expires end
 --------------------------------------
-\box_resize:cnn                   2018
-\box_resize:Nnn                   2018
-\box_use_clear:c                  2018
-\box_use_clear:N                  2018
-\c_minus_one                      2018
 \c_zero                           2019
 \c_one                            2019
 \c_two                            2019
@@ -44,15 +39,6 @@ Function                   Expires end
 \c_one_thousand                   2019
 \c_ten_thousand                   2019
 \etex_....:D                      2019
-\file_add_path:nN                 2018
-\file_list:                       2018
-\file_path_include:n              2018
-\file_path_remove:n               2018
-\g_file_current_name_tl           2018
-\ior_list_streams:                2018
-\ior_log_streams:                 2018
-\iow_list_streams:                2018
-\iow_log_streams:                 2018
 \lua_escape_x:n                   2019
 \lua_now_x:n                      2019
 \lua_shipout_x:n                  2019
@@ -62,8 +48,6 @@ Function                   Expires end
 \msg_term:n                       2019
 \pdftex_...:D                     2019
 \ptex_...:D                       2019
-\sort_ordered:                    2018
-\sort_reversed:                   2018
 \str_case_x:nn                    2019
 \str_case_x:nnF                   2019
 \str_case_x:nnT                   2019
@@ -77,8 +61,6 @@ Function                   Expires end
 \token_new:Nn                     2018
 \uptex_...:D                      2019
 \utex_...:D                       2019
-Variants of n into N/c            2018
-Variants of N into n/o/V/v/f/x    2018
 \xetex_...:D                      2019
 --------------------------------------
 
@@ -91,6 +73,10 @@ removed from the sources.
 ----------------------------------------------------------
 Function                                      Date removed
 ----------------------------------------------------------
+\box_resize:cnn                                 2018-12-27
+\box_resize:Nnn                                 2018-12-27
+\box_use_clear:c                                2018-12-27
+\box_use_clear:N                                2018-12-27
 \c_active_char_token                            2011-09-08
 \c_alignment_tab_token                          2011-09-08
 \c_empty_toks                                   2011-09-08
@@ -99,6 +85,7 @@ Function                                      Date removed
 \c_letter_token                                 2011-09-08
 \c_luatex_is_engine_bool                        2011-12-30
 \c_math_shift_token                             2011-09-08
+\c_minus_one                                    2018-12-27
 \c_other_char_token                             2011-09-08
 \c_pdftex_is_engine_bool                        2011-12-30
 \c_string_cctab                                 2012-06-30
@@ -213,8 +200,12 @@ Function                                      Date removed
 \dim_set_min:Nn                                 2013-01-08
 \ExplSyntaxNamesOff                             2013-01-08
 \ExplSyntaxNamesOn                              2013-01-08
+\file_add_path:nN                               2018-12-27
 \file_if_exist_input:nT                         2018-03-05
 \file_if_exist_input:nTF                        2018-03-05
+\file_list:                                     2018-12-27
+\file_path_include:n                            2018-12-27
+\file_path_remove:n                             2018-12-27
 \fp_abs:c                                       2014-05-28
 \fp_abs:N                                       2014-05-28
 \fp_compare:NNNF                                2014-05-28
@@ -274,6 +265,7 @@ Function                                      Date removed
 \fp_sin:Nn                                      2014-05-28
 \fp_tan:cn                                      2014-05-28
 \fp_tan:Nn                                      2014-05-28
+\g_file_current_name_tl                         2018-12-27
 \g_tmpa_toks                                    2011-09-08
 \g_tmpb_toks                                    2011-09-08
 \g_tmpc_toks                                    2011-09-08
@@ -301,10 +293,14 @@ Function                                      Date removed
 \int_value:w                                    2013-01-08
 \ior_get_str:NN                                 2018-03-05
 \ior_gto:NN                                     2013-07-28
+\ior_list_streams:                              2018-12-27
+\ior_log_streams:                               2018-12-27
 \ior_open_streams:                              2011-09-08
 \ior_str_gto:NN                                 2013-07-28
 \ior_str_to:NN                                  2013-07-28
 \ior_to:NN                                      2013-07-28
+\iow_list_streams:                              2018-12-27
+\iow_log_streams:                               2018-12-27
 \iow_now_buffer_safe:Nn                         2011-09-08
 \iow_now_buffer_safe:Nx                         2011-09-08
 \iow_now_when_avail:Nn                          2012-06-05
@@ -414,6 +410,8 @@ Function                                      Date removed
 \skip_if_infinite_glue:nF                       2013-01-08
 \skip_if_infinite_glue:nT                       2013-01-08
 \skip_if_infinite_glue:nTF                      2013-01-08
+\sort_ordered:                                  2018-12-27
+\sort_reversed:                                 2018-12-27
 \str_case:nnn                                   2015-07-14
 \str_case:onn                                   2015-07-14
 \str_case_x:nnn                                 2015-07-14
@@ -612,4 +610,6 @@ Function                                      Date removed
 [key property] .meta:x                          2013-07-10
 [key property] .value_forbidden:                2017-01-01
 [key property] .value_required:                 2017-01-01
+Variants of n into N/c                          2018-12-27
+Variants of N into n/o/V/v/f/x                  2018-12-27
 ----------------------------------------------------------
diff --git a/l3kernel/l3sort.dtx b/l3kernel/l3sort.dtx
index bb2d6f9..b7ff0d0 100644
--- a/l3kernel/l3sort.dtx
+++ b/l3kernel/l3sort.dtx
@@ -1074,18 +1074,6 @@
   }
 %    \end{macrocode}
 %
-% \subsection{Deprecated functions}
-%
-% \begin{macro}[deprecated = 2018-12-31]{\sort_ordered:, \sort_reversed:}
-%   These functions were renamed for consistency.
-%    \begin{macrocode}
-\__kernel_patch_deprecation:nnNNpn { 2018-12-31 } { \sort_return_same: }
-\cs_new_protected:Npn \sort_ordered: { \sort_return_same: }
-\__kernel_patch_deprecation:nnNNpn { 2018-12-31 } { \sort_return_swapped: }
-\cs_new_protected:Npn \sort_reversed: { \sort_return_swapped: }
-%    \end{macrocode}
-% \end{macro}
-%
 %    \begin{macrocode}
 %</initex|package>
 %    \end{macrocode}
diff --git a/l3kernel/testfiles/m3expan001.tlg b/l3kernel/testfiles/m3expan001.tlg
index 4182c51..9a498cc 100644
--- a/l3kernel/testfiles/m3expan001.tlg
+++ b/l3kernel/testfiles/m3expan001.tlg
@@ -12,12 +12,24 @@ Defining \foo:oo on line ...
 Defining \foo:VV on line ...
 Defining \foo:xx on line ...
 Defining \foo:cc on line ...
-LaTeX3 Warning: Variant form 'cc' deprecated for base form '\foo:nn'. One
-(LaTeX3)        should not change an argument from type 'n' to type 'c': use a
-(LaTeX3)        'v' variant?
-LaTeX3 Warning: Variant form 'cc' deprecated for base form '\foo:nn'. One
-(LaTeX3)        should not change an argument from type 'n' to type 'c': use a
-(LaTeX3)        'v' variant?
+! LaTeX3 Error: Variant form 'cc' deprecated for base form '\foo:nn'. One
+(LaTeX3)        should not change an argument from type 'n' to type 'c': use
+(LaTeX3)        a 'v' variant?
+Type <return> to continue.
+ ...                                              
+l. ...  { oo , VV , xx , cc , nx , fx , xf }
+LaTeX does not know anything more about this error, sorry.
+Try typing <return> to proceed.
+If that doesn't work, type X <return> to quit.
+! LaTeX3 Error: Variant form 'cc' deprecated for base form '\foo:nn'. One
+(LaTeX3)        should not change an argument from type 'n' to type 'c': use
+(LaTeX3)        a 'v' variant?
+Type <return> to continue.
+ ...                                              
+l. ...  { oo , VV , xx , cc , nx , fx , xf }
+LaTeX does not know anything more about this error, sorry.
+Try typing <return> to proceed.
+If that doesn't work, type X <return> to quit.
 Defining \foo:nx on line ...
 Defining \exp_args:Nfx on line ...
 Defining \foo:fx on line ...
@@ -167,18 +179,36 @@ undefined,undefined,
 TEST 10: Issue 418: changing N/n to incompatible variants
 ============================================================
 Defining \foobar:on on line ...
-LaTeX3 Warning: Variant form 'on' deprecated for base form '\foobar:Nn'. One
-(LaTeX3)        should not change an argument from type 'N' to type 'o': base
-(LaTeX3)        form only accepts a single token argument.
+! LaTeX3 Error: Variant form 'on' deprecated for base form '\foobar:Nn'. One
+(LaTeX3)        should not change an argument from type 'N' to type 'o':
+(LaTeX3)        base form only accepts a single token argument.
+Type <return> to continue.
+ ...                                              
+l. ...  }
+LaTeX does not know anything more about this error, sorry.
+Try typing <return> to proceed.
+If that doesn't work, type X <return> to quit.
 Defining \foobar:Nc on line ...
-LaTeX3 Warning: Variant form 'Nc' deprecated for base form '\foobar:Nn'. One
-(LaTeX3)        should not change an argument from type 'n' to type 'c': use a
-(LaTeX3)        'v' variant?
+! LaTeX3 Error: Variant form 'Nc' deprecated for base form '\foobar:Nn'. One
+(LaTeX3)        should not change an argument from type 'n' to type 'c': use
+(LaTeX3)        a 'v' variant?
+Type <return> to continue.
+ ...                                              
+l. ...  }
+LaTeX does not know anything more about this error, sorry.
+Try typing <return> to proceed.
+If that doesn't work, type X <return> to quit.
 Defining \exp_args:Nn on line ...
 Defining \foobar:nn on line ...
-LaTeX3 Warning: Variant form 'n' deprecated for base form '\foobar:Nn'. One
-(LaTeX3)        should not change an argument from type 'N' to type 'n': base
-(LaTeX3)        form only accepts a single token argument.
+! LaTeX3 Error: Variant form 'n' deprecated for base form '\foobar:Nn'. One
+(LaTeX3)        should not change an argument from type 'N' to type 'n':
+(LaTeX3)        base form only accepts a single token argument.
+Type <return> to continue.
+ ...                                              
+l. ...  }
+LaTeX does not know anything more about this error, sorry.
+Try typing <return> to proceed.
+If that doesn't work, type X <return> to quit.
 \long macro:->\exp_args:No \foobar:Nn ,\long macro:->\exp_args:NNc \foobar:Nn ,\long macro:->\exp_args:Nn \foobar:Nn ,
 ============================================================
 ============================================================
diff --git a/l3kernel/testfiles/m3expan002.tlg b/l3kernel/testfiles/m3expan002.tlg
index eeef228..315ae20 100644
--- a/l3kernel/testfiles/m3expan002.tlg
+++ b/l3kernel/testfiles/m3expan002.tlg
@@ -34,18 +34,36 @@ TEST 2: Leaving non-N/n-base letters unchanged is allowed
 Defining \foo:oNnTF on line ...
 Defining \exp_args:NnNo on line ...
 Defining \foo:oNoTF on line ...
-LaTeX3 Warning: Variant form 'oNoT' deprecated for base form '\foo:oNnTF'. One
-(LaTeX3)        should not change an argument from type 'o' to type 'o': base
-(LaTeX3)        form is already a variant.
+! LaTeX3 Error: Variant form 'oNoT' deprecated for base form '\foo:oNnTF'. One
+(LaTeX3)        should not change an argument from type 'o' to type 'o':
+(LaTeX3)        base form is already a variant.
+Type <return> to continue.
+ ...                                              
+l. ...  }
+LaTeX does not know anything more about this error, sorry.
+Try typing <return> to proceed.
+If that doesn't work, type X <return> to quit.
 Defining \exp_args:NnNx on line ...
 Defining \foo:oNxTF on line ...
-LaTeX3 Warning: Variant form 'oNxTF' deprecated for base form '\foo:oNnTF'.
+! LaTeX3 Error: Variant form 'oNxTF' deprecated for base form '\foo:oNnTF'.
 (LaTeX3)        One should not change an argument from type 'o' to type 'o':
 (LaTeX3)        base form is already a variant.
+Type <return> to continue.
+ ...                                              
+l. ...  }
+LaTeX does not know anything more about this error, sorry.
+Try typing <return> to proceed.
+If that doesn't work, type X <return> to quit.
 Defining \foo:ocnTF on line ...
-LaTeX3 Warning: Variant form 'ocnTF' deprecated for base form '\foo:oNnTF'.
+! LaTeX3 Error: Variant form 'ocnTF' deprecated for base form '\foo:oNnTF'.
 (LaTeX3)        One should not change an argument from type 'o' to type 'o':
 (LaTeX3)        base form is already a variant.
+Type <return> to continue.
+ ...                                              
+l. ...  }
+LaTeX does not know anything more about this error, sorry.
+Try typing <return> to proceed.
+If that doesn't work, type X <return> to quit.
 Variant \foo:oNnTF already defined; not changing it on line ...
 ! LaTeX3 Error: Variant form 'xNn' invalid for base form '\foo:oNnTF'.
 For immediate help type H <return>.
diff --git a/l3kernel/testfiles/m3expl001.luatex.tlg b/l3kernel/testfiles/m3expl001.luatex.tlg
index ba0b002..5138a7f 100644
--- a/l3kernel/testfiles/m3expl001.luatex.tlg
+++ b/l3kernel/testfiles/m3expl001.luatex.tlg
@@ -271,7 +271,6 @@ Defining \__cs_generate_variant_loop_end:nwwwNNnn on line ...
 Defining \__cs_generate_variant_loop_long:wNNnn on line ...
 Defining \__cs_generate_variant_loop_invalid:NNwNNnn on line ...
 Defining \__cs_generate_variant_loop_special:NNwNNnn on line ...
-Defining \__cs_generate_variant_loop_warning:nnxxxx on line ...
 Defining \__cs_generate_variant_same:N on line ...
 Defining \__cs_generate_variant:wwNN on line ...
 Defining \__cs_generate_internal_variant:n on line ...
@@ -1512,7 +1511,6 @@ Defining \g_tmpa_int on line ...
 \g_tmpa_int=\count...
 Defining \g_tmpb_int on line ...
 \g_tmpb_int=\count...
-Defining \c_minus_one on line ...
 Defining \__int_deprecated_constants:nn on line ...
 Defining \c_zero on line ...
 Defining \c_one on line ...
@@ -2922,15 +2920,6 @@ Defining message LaTeX/kernel/input-streams-exhausted on line ...
 Defining message LaTeX/kernel/output-streams-exhausted on line ...
 Defining message LaTeX/kernel/unbalanced-quote-in-filename on line ...
 Defining message LaTeX/kernel/iow-indent on line ...
-Defining \g_file_current_name_tl on line ...
-Defining \file_path_include:n on line ...
-Defining \file_path_remove:n on line ...
-Defining \file_add_path:nN on line ...
-Defining \file_list: on line ...
-Defining \ior_list_streams: on line ...
-Defining \ior_log_streams: on line ...
-Defining \iow_list_streams: on line ...
-Defining \iow_log_streams: on line ...
 Defining \if_dim:w on line ...
 Defining \__dim_eval:w on line ...
 Defining \__dim_eval_end: on line ...
@@ -4458,8 +4447,6 @@ Defining \__sort_too_long_error:NNw on line ...
 Defining message LaTeX/kernel/too-large on line ...
 Defining message LaTeX/kernel/return-none on line ...
 Defining message LaTeX/kernel/return-two on line ...
-Defining \sort_ordered: on line ...
-Defining \sort_reversed: on line ...
 Defining \s__tl on line ...
 Defining \l__tl_analysis_token on line ...
 Defining \l__tl_analysis_char_token on line ...
@@ -5245,10 +5232,6 @@ Defining \box_autosize_to_wd_and_ht_plus_dp:Nnn on line ...
 Defining \box_autosize_to_wd_and_ht_plus_dp:cnn on line ...
 Defining \__box_autosize:Nnnn on line ...
 Defining \__box_resize_common:N on line ...
-Defining \box_resize:Nnn on line ...
-Defining \box_resize:cnn on line ...
-Defining \box_use_clear:N on line ...
-Defining \box_use_clear:c on line ...
 Defining \color_group_begin: on line ...
 Defining \color_group_end: on line ...
 Defining \color_ensure_current: on line ...
diff --git a/l3kernel/testfiles/m3expl001.ptex.tlg b/l3kernel/testfiles/m3expl001.ptex.tlg
index 33e0ad6..4207756 100644
--- a/l3kernel/testfiles/m3expl001.ptex.tlg
+++ b/l3kernel/testfiles/m3expl001.ptex.tlg
@@ -308,7 +308,6 @@ Defining \__cs_generate_variant_loop_end:nwwwNNnn on line ...
 Defining \__cs_generate_variant_loop_long:wNNnn on line ...
 Defining \__cs_generate_variant_loop_invalid:NNwNNnn on line ...
 Defining \__cs_generate_variant_loop_special:NNwNNnn on line ...
-Defining \__cs_generate_variant_loop_warning:nnxxxx on line ...
 Defining \__cs_generate_variant_same:N on line ...
 Defining \__cs_generate_variant:wwNN on line ...
 Defining \__cs_generate_internal_variant:n on line ...
@@ -1548,7 +1547,6 @@ Defining \g_tmpa_int on line ...
 \g_tmpa_int=\count...
 Defining \g_tmpb_int on line ...
 \g_tmpb_int=\count...
-Defining \c_minus_one on line ...
 Defining \__int_deprecated_constants:nn on line ...
 Defining \c_zero on line ...
 Defining \c_one on line ...
@@ -3215,15 +3213,6 @@ Defining message LaTeX/kernel/input-streams-exhausted on line ...
 Defining message LaTeX/kernel/output-streams-exhausted on line ...
 Defining message LaTeX/kernel/unbalanced-quote-in-filename on line ...
 Defining message LaTeX/kernel/iow-indent on line ...
-Defining \g_file_current_name_tl on line ...
-Defining \file_path_include:n on line ...
-Defining \file_path_remove:n on line ...
-Defining \file_add_path:nN on line ...
-Defining \file_list: on line ...
-Defining \ior_list_streams: on line ...
-Defining \ior_log_streams: on line ...
-Defining \iow_list_streams: on line ...
-Defining \iow_log_streams: on line ...
 Defining \if_dim:w on line ...
 Defining \__dim_eval:w on line ...
 Defining \__dim_eval_end: on line ...
@@ -4752,8 +4741,6 @@ Defining \__sort_too_long_error:NNw on line ...
 Defining message LaTeX/kernel/too-large on line ...
 Defining message LaTeX/kernel/return-none on line ...
 Defining message LaTeX/kernel/return-two on line ...
-Defining \sort_ordered: on line ...
-Defining \sort_reversed: on line ...
 Defining \s__tl on line ...
 Defining \l__tl_analysis_token on line ...
 Defining \l__tl_analysis_char_token on line ...
@@ -5541,10 +5528,6 @@ Defining \box_autosize_to_wd_and_ht_plus_dp:Nnn on line ...
 Defining \box_autosize_to_wd_and_ht_plus_dp:cnn on line ...
 Defining \__box_autosize:Nnnn on line ...
 Defining \__box_resize_common:N on line ...
-Defining \box_resize:Nnn on line ...
-Defining \box_resize:cnn on line ...
-Defining \box_use_clear:N on line ...
-Defining \box_use_clear:c on line ...
 Defining \color_group_begin: on line ...
 Defining \color_group_end: on line ...
 Defining \color_ensure_current: on line ...
diff --git a/l3kernel/testfiles/m3expl001.tlg b/l3kernel/testfiles/m3expl001.tlg
index 520b825..853dd86 100644
--- a/l3kernel/testfiles/m3expl001.tlg
+++ b/l3kernel/testfiles/m3expl001.tlg
@@ -308,7 +308,6 @@ Defining \__cs_generate_variant_loop_end:nwwwNNnn on line ...
 Defining \__cs_generate_variant_loop_long:wNNnn on line ...
 Defining \__cs_generate_variant_loop_invalid:NNwNNnn on line ...
 Defining \__cs_generate_variant_loop_special:NNwNNnn on line ...
-Defining \__cs_generate_variant_loop_warning:nnxxxx on line ...
 Defining \__cs_generate_variant_same:N on line ...
 Defining \__cs_generate_variant:wwNN on line ...
 Defining \__cs_generate_internal_variant:n on line ...
@@ -1548,7 +1547,6 @@ Defining \g_tmpa_int on line ...
 \g_tmpa_int=\count...
 Defining \g_tmpb_int on line ...
 \g_tmpb_int=\count...
-Defining \c_minus_one on line ...
 Defining \__int_deprecated_constants:nn on line ...
 Defining \c_zero on line ...
 Defining \c_one on line ...
@@ -3215,15 +3213,6 @@ Defining message LaTeX/kernel/input-streams-exhausted on line ...
 Defining message LaTeX/kernel/output-streams-exhausted on line ...
 Defining message LaTeX/kernel/unbalanced-quote-in-filename on line ...
 Defining message LaTeX/kernel/iow-indent on line ...
-Defining \g_file_current_name_tl on line ...
-Defining \file_path_include:n on line ...
-Defining \file_path_remove:n on line ...
-Defining \file_add_path:nN on line ...
-Defining \file_list: on line ...
-Defining \ior_list_streams: on line ...
-Defining \ior_log_streams: on line ...
-Defining \iow_list_streams: on line ...
-Defining \iow_log_streams: on line ...
 Defining \if_dim:w on line ...
 Defining \__dim_eval:w on line ...
 Defining \__dim_eval_end: on line ...
@@ -4752,8 +4741,6 @@ Defining \__sort_too_long_error:NNw on line ...
 Defining message LaTeX/kernel/too-large on line ...
 Defining message LaTeX/kernel/return-none on line ...
 Defining message LaTeX/kernel/return-two on line ...
-Defining \sort_ordered: on line ...
-Defining \sort_reversed: on line ...
 Defining \s__tl on line ...
 Defining \l__tl_analysis_token on line ...
 Defining \l__tl_analysis_char_token on line ...
@@ -5541,10 +5528,6 @@ Defining \box_autosize_to_wd_and_ht_plus_dp:Nnn on line ...
 Defining \box_autosize_to_wd_and_ht_plus_dp:cnn on line ...
 Defining \__box_autosize:Nnnn on line ...
 Defining \__box_resize_common:N on line ...
-Defining \box_resize:Nnn on line ...
-Defining \box_resize:cnn on line ...
-Defining \box_use_clear:N on line ...
-Defining \box_use_clear:c on line ...
 Defining \color_group_begin: on line ...
 Defining \color_group_end: on line ...
 Defining \color_ensure_current: on line ...
diff --git a/l3kernel/testfiles/m3expl001.uptex.tlg b/l3kernel/testfiles/m3expl001.uptex.tlg
index 4470bf0..f9a7895 100644
--- a/l3kernel/testfiles/m3expl001.uptex.tlg
+++ b/l3kernel/testfiles/m3expl001.uptex.tlg
@@ -308,7 +308,6 @@ Defining \__cs_generate_variant_loop_end:nwwwNNnn on line ...
 Defining \__cs_generate_variant_loop_long:wNNnn on line ...
 Defining \__cs_generate_variant_loop_invalid:NNwNNnn on line ...
 Defining \__cs_generate_variant_loop_special:NNwNNnn on line ...
-Defining \__cs_generate_variant_loop_warning:nnxxxx on line ...
 Defining \__cs_generate_variant_same:N on line ...
 Defining \__cs_generate_variant:wwNN on line ...
 Defining \__cs_generate_internal_variant:n on line ...
@@ -1548,7 +1547,6 @@ Defining \g_tmpa_int on line ...
 \g_tmpa_int=\count...
 Defining \g_tmpb_int on line ...
 \g_tmpb_int=\count...
-Defining \c_minus_one on line ...
 Defining \__int_deprecated_constants:nn on line ...
 Defining \c_zero on line ...
 Defining \c_one on line ...
@@ -3215,15 +3213,6 @@ Defining message LaTeX/kernel/input-streams-exhausted on line ...
 Defining message LaTeX/kernel/output-streams-exhausted on line ...
 Defining message LaTeX/kernel/unbalanced-quote-in-filename on line ...
 Defining message LaTeX/kernel/iow-indent on line ...
-Defining \g_file_current_name_tl on line ...
-Defining \file_path_include:n on line ...
-Defining \file_path_remove:n on line ...
-Defining \file_add_path:nN on line ...
-Defining \file_list: on line ...
-Defining \ior_list_streams: on line ...
-Defining \ior_log_streams: on line ...
-Defining \iow_list_streams: on line ...
-Defining \iow_log_streams: on line ...
 Defining \if_dim:w on line ...
 Defining \__dim_eval:w on line ...
 Defining \__dim_eval_end: on line ...
@@ -4751,8 +4740,6 @@ Defining \__sort_too_long_error:NNw on line ...
 Defining message LaTeX/kernel/too-large on line ...
 Defining message LaTeX/kernel/return-none on line ...
 Defining message LaTeX/kernel/return-two on line ...
-Defining \sort_ordered: on line ...
-Defining \sort_reversed: on line ...
 Defining \s__tl on line ...
 Defining \l__tl_analysis_token on line ...
 Defining \l__tl_analysis_char_token on line ...
@@ -5538,10 +5525,6 @@ Defining \box_autosize_to_wd_and_ht_plus_dp:Nnn on line ...
 Defining \box_autosize_to_wd_and_ht_plus_dp:cnn on line ...
 Defining \__box_autosize:Nnnn on line ...
 Defining \__box_resize_common:N on line ...
-Defining \box_resize:Nnn on line ...
-Defining \box_resize:cnn on line ...
-Defining \box_use_clear:N on line ...
-Defining \box_use_clear:c on line ...
 Defining \color_group_begin: on line ...
 Defining \color_group_end: on line ...
 Defining \color_ensure_current: on line ...
diff --git a/l3kernel/testfiles/m3expl001.xetex.tlg b/l3kernel/testfiles/m3expl001.xetex.tlg
index e065887..f35651e 100644
--- a/l3kernel/testfiles/m3expl001.xetex.tlg
+++ b/l3kernel/testfiles/m3expl001.xetex.tlg
@@ -308,7 +308,6 @@ Defining \__cs_generate_variant_loop_end:nwwwNNnn on line ...
 Defining \__cs_generate_variant_loop_long:wNNnn on line ...
 Defining \__cs_generate_variant_loop_invalid:NNwNNnn on line ...
 Defining \__cs_generate_variant_loop_special:NNwNNnn on line ...
-Defining \__cs_generate_variant_loop_warning:nnxxxx on line ...
 Defining \__cs_generate_variant_same:N on line ...
 Defining \__cs_generate_variant:wwNN on line ...
 Defining \__cs_generate_internal_variant:n on line ...
@@ -1548,7 +1547,6 @@ Defining \g_tmpa_int on line ...
 \g_tmpa_int=\count...
 Defining \g_tmpb_int on line ...
 \g_tmpb_int=\count...
-Defining \c_minus_one on line ...
 Defining \__int_deprecated_constants:nn on line ...
 Defining \c_zero on line ...
 Defining \c_one on line ...
@@ -2960,15 +2958,6 @@ Defining message LaTeX/kernel/input-streams-exhausted on line ...
 Defining message LaTeX/kernel/output-streams-exhausted on line ...
 Defining message LaTeX/kernel/unbalanced-quote-in-filename on line ...
 Defining message LaTeX/kernel/iow-indent on line ...
-Defining \g_file_current_name_tl on line ...
-Defining \file_path_include:n on line ...
-Defining \file_path_remove:n on line ...
-Defining \file_add_path:nN on line ...
-Defining \file_list: on line ...
-Defining \ior_list_streams: on line ...
-Defining \ior_log_streams: on line ...
-Defining \iow_list_streams: on line ...
-Defining \iow_log_streams: on line ...
 Defining \if_dim:w on line ...
 Defining \__dim_eval:w on line ...
 Defining \__dim_eval_end: on line ...
@@ -4469,8 +4458,6 @@ Defining \__sort_too_long_error:NNw on line ...
 Defining message LaTeX/kernel/too-large on line ...
 Defining message LaTeX/kernel/return-none on line ...
 Defining message LaTeX/kernel/return-two on line ...
-Defining \sort_ordered: on line ...
-Defining \sort_reversed: on line ...
 Defining \s__tl on line ...
 Defining \l__tl_analysis_token on line ...
 Defining \l__tl_analysis_char_token on line ...
@@ -5256,10 +5243,6 @@ Defining \box_autosize_to_wd_and_ht_plus_dp:Nnn on line ...
 Defining \box_autosize_to_wd_and_ht_plus_dp:cnn on line ...
 Defining \__box_autosize:Nnnn on line ...
 Defining \__box_resize_common:N on line ...
-Defining \box_resize:Nnn on line ...
-Defining \box_resize:cnn on line ...
-Defining \box_use_clear:N on line ...
-Defining \box_use_clear:c on line ...
 Defining \color_group_begin: on line ...
 Defining \color_group_end: on line ...
 Defining \color_ensure_current: on line ...
diff --git a/l3kernel/testfiles/m3expl003.luatex.tlg b/l3kernel/testfiles/m3expl003.luatex.tlg
index ba0b002..5138a7f 100644
--- a/l3kernel/testfiles/m3expl003.luatex.tlg
+++ b/l3kernel/testfiles/m3expl003.luatex.tlg
@@ -271,7 +271,6 @@ Defining \__cs_generate_variant_loop_end:nwwwNNnn on line ...
 Defining \__cs_generate_variant_loop_long:wNNnn on line ...
 Defining \__cs_generate_variant_loop_invalid:NNwNNnn on line ...
 Defining \__cs_generate_variant_loop_special:NNwNNnn on line ...
-Defining \__cs_generate_variant_loop_warning:nnxxxx on line ...
 Defining \__cs_generate_variant_same:N on line ...
 Defining \__cs_generate_variant:wwNN on line ...
 Defining \__cs_generate_internal_variant:n on line ...
@@ -1512,7 +1511,6 @@ Defining \g_tmpa_int on line ...
 \g_tmpa_int=\count...
 Defining \g_tmpb_int on line ...
 \g_tmpb_int=\count...
-Defining \c_minus_one on line ...
 Defining \__int_deprecated_constants:nn on line ...
 Defining \c_zero on line ...
 Defining \c_one on line ...
@@ -2922,15 +2920,6 @@ Defining message LaTeX/kernel/input-streams-exhausted on line ...
 Defining message LaTeX/kernel/output-streams-exhausted on line ...
 Defining message LaTeX/kernel/unbalanced-quote-in-filename on line ...
 Defining message LaTeX/kernel/iow-indent on line ...
-Defining \g_file_current_name_tl on line ...
-Defining \file_path_include:n on line ...
-Defining \file_path_remove:n on line ...
-Defining \file_add_path:nN on line ...
-Defining \file_list: on line ...
-Defining \ior_list_streams: on line ...
-Defining \ior_log_streams: on line ...
-Defining \iow_list_streams: on line ...
-Defining \iow_log_streams: on line ...
 Defining \if_dim:w on line ...
 Defining \__dim_eval:w on line ...
 Defining \__dim_eval_end: on line ...
@@ -4458,8 +4447,6 @@ Defining \__sort_too_long_error:NNw on line ...
 Defining message LaTeX/kernel/too-large on line ...
 Defining message LaTeX/kernel/return-none on line ...
 Defining message LaTeX/kernel/return-two on line ...
-Defining \sort_ordered: on line ...
-Defining \sort_reversed: on line ...
 Defining \s__tl on line ...
 Defining \l__tl_analysis_token on line ...
 Defining \l__tl_analysis_char_token on line ...
@@ -5245,10 +5232,6 @@ Defining \box_autosize_to_wd_and_ht_plus_dp:Nnn on line ...
 Defining \box_autosize_to_wd_and_ht_plus_dp:cnn on line ...
 Defining \__box_autosize:Nnnn on line ...
 Defining \__box_resize_common:N on line ...
-Defining \box_resize:Nnn on line ...
-Defining \box_resize:cnn on line ...
-Defining \box_use_clear:N on line ...
-Defining \box_use_clear:c on line ...
 Defining \color_group_begin: on line ...
 Defining \color_group_end: on line ...
 Defining \color_ensure_current: on line ...
diff --git a/l3kernel/testfiles/m3expl003.ptex.tlg b/l3kernel/testfiles/m3expl003.ptex.tlg
index 33e0ad6..4207756 100644
--- a/l3kernel/testfiles/m3expl003.ptex.tlg
+++ b/l3kernel/testfiles/m3expl003.ptex.tlg
@@ -308,7 +308,6 @@ Defining \__cs_generate_variant_loop_end:nwwwNNnn on line ...
 Defining \__cs_generate_variant_loop_long:wNNnn on line ...
 Defining \__cs_generate_variant_loop_invalid:NNwNNnn on line ...
 Defining \__cs_generate_variant_loop_special:NNwNNnn on line ...
-Defining \__cs_generate_variant_loop_warning:nnxxxx on line ...
 Defining \__cs_generate_variant_same:N on line ...
 Defining \__cs_generate_variant:wwNN on line ...
 Defining \__cs_generate_internal_variant:n on line ...
@@ -1548,7 +1547,6 @@ Defining \g_tmpa_int on line ...
 \g_tmpa_int=\count...
 Defining \g_tmpb_int on line ...
 \g_tmpb_int=\count...
-Defining \c_minus_one on line ...
 Defining \__int_deprecated_constants:nn on line ...
 Defining \c_zero on line ...
 Defining \c_one on line ...
@@ -3215,15 +3213,6 @@ Defining message LaTeX/kernel/input-streams-exhausted on line ...
 Defining message LaTeX/kernel/output-streams-exhausted on line ...
 Defining message LaTeX/kernel/unbalanced-quote-in-filename on line ...
 Defining message LaTeX/kernel/iow-indent on line ...
-Defining \g_file_current_name_tl on line ...
-Defining \file_path_include:n on line ...
-Defining \file_path_remove:n on line ...
-Defining \file_add_path:nN on line ...
-Defining \file_list: on line ...
-Defining \ior_list_streams: on line ...
-Defining \ior_log_streams: on line ...
-Defining \iow_list_streams: on line ...
-Defining \iow_log_streams: on line ...
 Defining \if_dim:w on line ...
 Defining \__dim_eval:w on line ...
 Defining \__dim_eval_end: on line ...
@@ -4752,8 +4741,6 @@ Defining \__sort_too_long_error:NNw on line ...
 Defining message LaTeX/kernel/too-large on line ...
 Defining message LaTeX/kernel/return-none on line ...
 Defining message LaTeX/kernel/return-two on line ...
-Defining \sort_ordered: on line ...
-Defining \sort_reversed: on line ...
 Defining \s__tl on line ...
 Defining \l__tl_analysis_token on line ...
 Defining \l__tl_analysis_char_token on line ...
@@ -5541,10 +5528,6 @@ Defining \box_autosize_to_wd_and_ht_plus_dp:Nnn on line ...
 Defining \box_autosize_to_wd_and_ht_plus_dp:cnn on line ...
 Defining \__box_autosize:Nnnn on line ...
 Defining \__box_resize_common:N on line ...
-Defining \box_resize:Nnn on line ...
-Defining \box_resize:cnn on line ...
-Defining \box_use_clear:N on line ...
-Defining \box_use_clear:c on line ...
 Defining \color_group_begin: on line ...
 Defining \color_group_end: on line ...
 Defining \color_ensure_current: on line ...
diff --git a/l3kernel/testfiles/m3expl003.tlg b/l3kernel/testfiles/m3expl003.tlg
index 520b825..853dd86 100644
--- a/l3kernel/testfiles/m3expl003.tlg
+++ b/l3kernel/testfiles/m3expl003.tlg
@@ -308,7 +308,6 @@ Defining \__cs_generate_variant_loop_end:nwwwNNnn on line ...
 Defining \__cs_generate_variant_loop_long:wNNnn on line ...
 Defining \__cs_generate_variant_loop_invalid:NNwNNnn on line ...
 Defining \__cs_generate_variant_loop_special:NNwNNnn on line ...
-Defining \__cs_generate_variant_loop_warning:nnxxxx on line ...
 Defining \__cs_generate_variant_same:N on line ...
 Defining \__cs_generate_variant:wwNN on line ...
 Defining \__cs_generate_internal_variant:n on line ...
@@ -1548,7 +1547,6 @@ Defining \g_tmpa_int on line ...
 \g_tmpa_int=\count...
 Defining \g_tmpb_int on line ...
 \g_tmpb_int=\count...
-Defining \c_minus_one on line ...
 Defining \__int_deprecated_constants:nn on line ...
 Defining \c_zero on line ...
 Defining \c_one on line ...
@@ -3215,15 +3213,6 @@ Defining message LaTeX/kernel/input-streams-exhausted on line ...
 Defining message LaTeX/kernel/output-streams-exhausted on line ...
 Defining message LaTeX/kernel/unbalanced-quote-in-filename on line ...
 Defining message LaTeX/kernel/iow-indent on line ...
-Defining \g_file_current_name_tl on line ...
-Defining \file_path_include:n on line ...
-Defining \file_path_remove:n on line ...
-Defining \file_add_path:nN on line ...
-Defining \file_list: on line ...
-Defining \ior_list_streams: on line ...
-Defining \ior_log_streams: on line ...
-Defining \iow_list_streams: on line ...
-Defining \iow_log_streams: on line ...
 Defining \if_dim:w on line ...
 Defining \__dim_eval:w on line ...
 Defining \__dim_eval_end: on line ...
@@ -4752,8 +4741,6 @@ Defining \__sort_too_long_error:NNw on line ...
 Defining message LaTeX/kernel/too-large on line ...
 Defining message LaTeX/kernel/return-none on line ...
 Defining message LaTeX/kernel/return-two on line ...
-Defining \sort_ordered: on line ...
-Defining \sort_reversed: on line ...
 Defining \s__tl on line ...
 Defining \l__tl_analysis_token on line ...
 Defining \l__tl_analysis_char_token on line ...
@@ -5541,10 +5528,6 @@ Defining \box_autosize_to_wd_and_ht_plus_dp:Nnn on line ...
 Defining \box_autosize_to_wd_and_ht_plus_dp:cnn on line ...
 Defining \__box_autosize:Nnnn on line ...
 Defining \__box_resize_common:N on line ...
-Defining \box_resize:Nnn on line ...
-Defining \box_resize:cnn on line ...
-Defining \box_use_clear:N on line ...
-Defining \box_use_clear:c on line ...
 Defining \color_group_begin: on line ...
 Defining \color_group_end: on line ...
 Defining \color_ensure_current: on line ...
diff --git a/l3kernel/testfiles/m3expl003.uptex.tlg b/l3kernel/testfiles/m3expl003.uptex.tlg
index 4470bf0..f9a7895 100644
--- a/l3kernel/testfiles/m3expl003.uptex.tlg
+++ b/l3kernel/testfiles/m3expl003.uptex.tlg
@@ -308,7 +308,6 @@ Defining \__cs_generate_variant_loop_end:nwwwNNnn on line ...
 Defining \__cs_generate_variant_loop_long:wNNnn on line ...
 Defining \__cs_generate_variant_loop_invalid:NNwNNnn on line ...
 Defining \__cs_generate_variant_loop_special:NNwNNnn on line ...
-Defining \__cs_generate_variant_loop_warning:nnxxxx on line ...
 Defining \__cs_generate_variant_same:N on line ...
 Defining \__cs_generate_variant:wwNN on line ...
 Defining \__cs_generate_internal_variant:n on line ...
@@ -1548,7 +1547,6 @@ Defining \g_tmpa_int on line ...
 \g_tmpa_int=\count...
 Defining \g_tmpb_int on line ...
 \g_tmpb_int=\count...
-Defining \c_minus_one on line ...
 Defining \__int_deprecated_constants:nn on line ...
 Defining \c_zero on line ...
 Defining \c_one on line ...
@@ -3215,15 +3213,6 @@ Defining message LaTeX/kernel/input-streams-exhausted on line ...
 Defining message LaTeX/kernel/output-streams-exhausted on line ...
 Defining message LaTeX/kernel/unbalanced-quote-in-filename on line ...
 Defining message LaTeX/kernel/iow-indent on line ...
-Defining \g_file_current_name_tl on line ...
-Defining \file_path_include:n on line ...
-Defining \file_path_remove:n on line ...
-Defining \file_add_path:nN on line ...
-Defining \file_list: on line ...
-Defining \ior_list_streams: on line ...
-Defining \ior_log_streams: on line ...
-Defining \iow_list_streams: on line ...
-Defining \iow_log_streams: on line ...
 Defining \if_dim:w on line ...
 Defining \__dim_eval:w on line ...
 Defining \__dim_eval_end: on line ...
@@ -4751,8 +4740,6 @@ Defining \__sort_too_long_error:NNw on line ...
 Defining message LaTeX/kernel/too-large on line ...
 Defining message LaTeX/kernel/return-none on line ...
 Defining message LaTeX/kernel/return-two on line ...
-Defining \sort_ordered: on line ...
-Defining \sort_reversed: on line ...
 Defining \s__tl on line ...
 Defining \l__tl_analysis_token on line ...
 Defining \l__tl_analysis_char_token on line ...
@@ -5538,10 +5525,6 @@ Defining \box_autosize_to_wd_and_ht_plus_dp:Nnn on line ...
 Defining \box_autosize_to_wd_and_ht_plus_dp:cnn on line ...
 Defining \__box_autosize:Nnnn on line ...
 Defining \__box_resize_common:N on line ...
-Defining \box_resize:Nnn on line ...
-Defining \box_resize:cnn on line ...
-Defining \box_use_clear:N on line ...
-Defining \box_use_clear:c on line ...
 Defining \color_group_begin: on line ...
 Defining \color_group_end: on line ...
 Defining \color_ensure_current: on line ...
diff --git a/l3kernel/testfiles/m3expl003.xetex.tlg b/l3kernel/testfiles/m3expl003.xetex.tlg
index e065887..f35651e 100644
--- a/l3kernel/testfiles/m3expl003.xetex.tlg
+++ b/l3kernel/testfiles/m3expl003.xetex.tlg
@@ -308,7 +308,6 @@ Defining \__cs_generate_variant_loop_end:nwwwNNnn on line ...
 Defining \__cs_generate_variant_loop_long:wNNnn on line ...
 Defining \__cs_generate_variant_loop_invalid:NNwNNnn on line ...
 Defining \__cs_generate_variant_loop_special:NNwNNnn on line ...
-Defining \__cs_generate_variant_loop_warning:nnxxxx on line ...
 Defining \__cs_generate_variant_same:N on line ...
 Defining \__cs_generate_variant:wwNN on line ...
 Defining \__cs_generate_internal_variant:n on line ...
@@ -1548,7 +1547,6 @@ Defining \g_tmpa_int on line ...
 \g_tmpa_int=\count...
 Defining \g_tmpb_int on line ...
 \g_tmpb_int=\count...
-Defining \c_minus_one on line ...
 Defining \__int_deprecated_constants:nn on line ...
 Defining \c_zero on line ...
 Defining \c_one on line ...
@@ -2960,15 +2958,6 @@ Defining message LaTeX/kernel/input-streams-exhausted on line ...
 Defining message LaTeX/kernel/output-streams-exhausted on line ...
 Defining message LaTeX/kernel/unbalanced-quote-in-filename on line ...
 Defining message LaTeX/kernel/iow-indent on line ...
-Defining \g_file_current_name_tl on line ...
-Defining \file_path_include:n on line ...
-Defining \file_path_remove:n on line ...
-Defining \file_add_path:nN on line ...
-Defining \file_list: on line ...
-Defining \ior_list_streams: on line ...
-Defining \ior_log_streams: on line ...
-Defining \iow_list_streams: on line ...
-Defining \iow_log_streams: on line ...
 Defining \if_dim:w on line ...
 Defining \__dim_eval:w on line ...
 Defining \__dim_eval_end: on line ...
@@ -4469,8 +4458,6 @@ Defining \__sort_too_long_error:NNw on line ...
 Defining message LaTeX/kernel/too-large on line ...
 Defining message LaTeX/kernel/return-none on line ...
 Defining message LaTeX/kernel/return-two on line ...
-Defining \sort_ordered: on line ...
-Defining \sort_reversed: on line ...
 Defining \s__tl on line ...
 Defining \l__tl_analysis_token on line ...
 Defining \l__tl_analysis_char_token on line ...
@@ -5256,10 +5243,6 @@ Defining \box_autosize_to_wd_and_ht_plus_dp:Nnn on line ...
 Defining \box_autosize_to_wd_and_ht_plus_dp:cnn on line ...
 Defining \__box_autosize:Nnnn on line ...
 Defining \__box_resize_common:N on line ...
-Defining \box_resize:Nnn on line ...
-Defining \box_resize:cnn on line ...
-Defining \box_use_clear:N on line ...
-Defining \box_use_clear:c on line ...
 Defining \color_group_begin: on line ...
 Defining \color_group_end: on line ...
 Defining \color_ensure_current: on line ...





More information about the latex3-commits mailing list