l3kernel (5jan19)

git-svn-id: svn://tug.org/texlive/trunk@49620 c570f23f-e606-0410-a88d-b1316a301751

1 files changed, 169 insertions, 160 deletions

diff --git a/Master/texmf-dist/tex/latex/l3kernel/expl3-code.tex b/Master/texmf-dist/tex/latex/l3kernel/expl3-code.tex
index dddac0128ed..79b6ec56e25 100644
--- a/Master/texmf-dist/tex/latex/l3kernel/expl3-code.tex
+++ b/Master/texmf-dist/tex/latex/l3kernel/expl3-code.tex
@@ -62,8 +62,8 @@
 %% This file is part of the "l3kernel bundle" (The Work in LPPL)
 %% and all files in that bundle must be distributed together.
 %% 
-%% File: expl3.dtx Copyright (C) 1990-2018 The LaTeX3 Project
-\def\ExplFileDate{2018-12-12}%
+%% File: expl3.dtx Copyright (C) 1990-2019 The LaTeX3 Project
+\def\ExplFileDate{2019-01-01}%
 \begingroup
   \def\next{\endgroup}%
   \expandafter\ifx\csname PackageError\endcsname\relax
@@ -120,7 +120,7 @@
       \ExplFileDate\space
       L3 programming layer (code)%
   }%
-%% File: l3bootstrap.dtx Copyright (C) 2011-2017 The LaTeX3 project
+%% File: l3bootstrap.dtx Copyright (C) 2011-2019 The LaTeX3 project
 \begingroup
   \csname protected\endcsname\gdef\GetIdInfo
     {%
@@ -360,7 +360,7 @@
     \tex_endlinechar:D = 32 \scan_stop:
     \bool_set_true:N \l__kernel_expl_bool
   }
-%% File: l3names.dtx Copyright (C) 1990-2018 The LaTeX3 project
+%% File: l3names.dtx Copyright (C) 1990-2019 The LaTeX3 project
 \let \tex_global:D \global
 \let \tex_let:D    \let
 \begingroup
@@ -2108,7 +2108,7 @@
     }
   \__kernel_primitives:
 \tex_endgroup:D
-%% File: l3basics.dtx Copyright (C) 1990-2018 The LaTeX3 project
+%% File: l3basics.dtx Copyright (C) 1990-2019 The LaTeX3 project
 \tex_let:D \if_true:           \tex_iftrue:D
 \tex_let:D \if_false:          \tex_iffalse:D
 \tex_let:D \or:                \tex_or:D
@@ -3195,7 +3195,7 @@
 \cs_new_eq:NN \prg_break_point: \prg_do_nothing:
 \cs_new:Npn \prg_break: #1 \prg_break_point: { }
 \cs_new:Npn \prg_break:n #1#2 \prg_break_point: {#1}
-%% File: l3expan.dtx Copyright (C) 1990-2018 The LaTeX3 project
+%% File: l3expan.dtx Copyright (C) 1990-2019 The LaTeX3 project
 \cs_new:Npn \__exp_arg_next:nnn #1#2#3 { #2 \::: { #3 {#1} } }
 \cs_new:Npn \__exp_arg_next:Nnn #1#2#3 { #2 \::: { #3 #1 } }
 \cs_new:Npn \::: #1 {#1}
@@ -3955,13 +3955,11 @@
     #3 \q_stop #4 #5 {#6} {#7}
     \exp_not:n
       {
-        \__cs_generate_variant_loop_warning:nnxxxx
+        \__kernel_msg_error:nnxxxx
           { kernel } { deprecated-variant }
           {#7} { \token_to_str:N #5 } {#1} {#2}
       }
   }
-\cs_new_protected:Npn \__cs_generate_variant_loop_warning:nnxxxx
-  { \__kernel_msg_warning:nnxxxx }
 \cs_new:Npn \__cs_generate_variant_same:N #1
   {
     \if:w N #1 N \else:
@@ -4096,7 +4094,7 @@
       }
   }
 \cs_new:Npn \__cs_args_generate:n #1 { \exp_not:c { :: #1 } }
-%% File: l3tl.dtx Copyright (C) 1990-2018 The LaTeX3 Project
+%% File: l3tl.dtx Copyright (C) 1990-2019 The LaTeX3 Project
 \cs_new_protected:Npn \tl_new:N #1
   {
     \__kernel_chk_if_free_cs:N #1
@@ -5116,7 +5114,7 @@
 \tl_new:N \g_tmpb_tl
 \tl_new:N \l_tmpa_tl
 \tl_new:N \l_tmpb_tl
-%% File: l3str.dtx Copyright (C) 2011-2018 The LaTeX3 Project
+%% File: l3str.dtx Copyright (C) 2011-2019 The LaTeX3 Project
 \group_begin:
   \cs_set_protected:Npn \__str_tmp:n #1
     {
@@ -5763,7 +5761,7 @@
 \cs_new:Npn \str_if_eq_x:nnF { \str_if_eq:eeF }
 \__kernel_patch_deprecation:nnNNpn { 2019-12-31 } { \str_if_eq:eeTF }
 \cs_new:Npn \str_if_eq_x:nnTF { \str_if_eq:eeTF }
-%% File: l3quark.dtx Copyright (C) 1990-2018 The LaTeX3 Project
+%% File: l3quark.dtx Copyright (C) 1990-2019 The LaTeX3 Project
 \__kernel_patch:nnNNpn { \__kernel_chk_var_scope:NN q #1 } { }
 \cs_new_protected:Npn \quark_new:N #1
   {
@@ -5881,7 +5879,7 @@
   }
 \scan_new:N \s_stop
 \cs_new:Npn \use_none_delimit_by_s_stop:w #1 \s_stop { }
-%% File: l3seq.dtx Copyright (C) 1990-2018 The LaTeX3 Project
+%% File: l3seq.dtx Copyright (C) 1990-2019 The LaTeX3 Project
 \scan_new:N \s__seq
 \cs_new:Npn \__seq_item:n
   {
@@ -6431,7 +6429,7 @@
 \seq_new:N \l_tmpb_seq
 \seq_new:N \g_tmpa_seq
 \seq_new:N \g_tmpb_seq
-%% File: l3int.dtx Copyright (C) 1990-2018 The LaTeX3 Project
+%% File: l3int.dtx Copyright (C) 1990-2019 The LaTeX3 Project
 \cs_new_eq:NN \int_value:w      \tex_number:D
 \cs_new_eq:NN \__int_eval:w       \tex_numexpr:D
 \cs_new_eq:NN \__int_eval_end:    \tex_relax:D
@@ -7304,11 +7302,6 @@
 \int_new:N \l_tmpb_int
 \int_new:N \g_tmpa_int
 \int_new:N \g_tmpb_int
-\cs_gset_eq:NN \c__int_minus_one \m@ne
-\cs_new_eq:NN \c_minus_one \c__int_minus_one
-\__kernel_deprecation_code:nn
-  { \__kernel_deprecation_error:Nnn \c_minus_one { -1 } { 2018-12-31 } }
-  { \tex_let:D \c_minus_one \c__int_minus_one }
 \cs_new_protected:Npn \__int_deprecated_constants:nn #1#2
   {
     #1 \c_zero                   {   0 } #2
@@ -7350,7 +7343,7 @@
       { \exp_stop_f: }
   }
 \cs_new_eq:NN \__int_value:w \int_value:w
-%% File: l3flag.dtx Copyright (C) 2011-2018 The LaTeX3 Project
+%% File: l3flag.dtx Copyright (C) 2011-2019 The LaTeX3 Project
 \cs_new_protected:Npn \flag_new:n #1
   {
     \cs_new:cpn { flag~#1 } ##1 ;
@@ -7425,7 +7418,7 @@
     \cs:w flag~#1 \exp_after:wN \cs_end:
     \int_value:w \flag_height:n {#1} ;
   }
-%% File: l3prg.dtx Copyright (C) 2005-2018 The LaTeX3 Project
+%% File: l3prg.dtx Copyright (C) 2005-2019 The LaTeX3 Project
 \cs_new_eq:NN \if_bool:N      \tex_ifodd:D
 \cs_new_eq:NN \if_predicate:w \tex_ifodd:D
 \cs_new_protected:Npn \bool_new:N #1 { \cs_new_eq:NN #1 \c_false_bool }
@@ -7726,7 +7719,7 @@
 \cs_new:Npn \__prg_break: #1 \__prg_break_point: { }
 \__kernel_patch_deprecation:nnNNpn { 2019-12-31 } { \prg_break:n }
 \cs_new:Npn \__prg_break:n #1#2 \__prg_break_point: {#1}
-%% File: l3sys.dtx Copyright (C) 2015-2018 The LaTeX3 Project
+%% File: l3sys.dtx Copyright (C) 2015-2019 The LaTeX3 Project
 \str_const:Nx \c_sys_jobname_str { \tex_jobname:D }
 \int_const:Nn \c_sys_minute_int
   { \int_mod:nn { \tex_time:D } { 60 } }
@@ -7785,7 +7778,7 @@
   { \cs_if_exist_p:N \tex_uniformdeviate:D }
 %% File: l3clist.dtx Copyright (C) 2004-2011 Frank Mittelbach,
 %%                                 The LaTeX3 project
-%%                             (C) 2012-2018 The LaTeX3 Project
+%%                             (C) 2012-2019 The LaTeX3 Project
 \cs_new_eq:NN \c_empty_clist \c_empty_tl
 \tl_new:N \l__clist_internal_clist
 \cs_new_protected:Npn \__clist_tmp:w { }
@@ -8373,7 +8366,7 @@
 \clist_new:N \l_tmpb_clist
 \clist_new:N \g_tmpa_clist
 \clist_new:N \g_tmpb_clist
-%% File: l3token.dtx Copyright (C) 2005-2018 The LaTeX3 Project
+%% File: l3token.dtx Copyright (C) 2005-2019 The LaTeX3 Project
 \cs_new_protected:Npn \char_set_catcode:nn #1#2
   { \tex_catcode:D \int_eval:n {#1} = \int_eval:n {#2} \exp_stop_f: }
 \cs_new:Npn \char_value_catcode:n #1
@@ -9061,9 +9054,7 @@
       }
       { \scan_stop: }
   }
-\__kernel_patch_deprecation:nnNNpn { 2018-12-31 } { \cs_new_eq:NN }
-\cs_new_protected:Npn \token_new:Nn #1#2 { \cs_new_eq:NN #1 #2 }
-%% File: l3prop.dtx Copyright (C) 1990-2018 The LaTeX3 Project
+%% File: l3prop.dtx Copyright (C) 1990-2019 The LaTeX3 Project
 \scan_new:N \s__prop
 \cs_new:Npn \__prop_pair:wn #1 \s__prop #2
   { \__kernel_msg_expandable_error:nn { kernel } { misused-prop } }
@@ -9376,7 +9367,7 @@
           { } { }
       }
   }
-%% File: l3msg.dtx Copyright (C) 2009-2018 The LaTeX3 Project
+%% File: l3msg.dtx Copyright (C) 2009-2019 The LaTeX3 Project
 \tl_new:N \l__msg_tmp_tl
 \str_new:N \l__msg_name_str
 \str_new:N \l__msg_text_str
@@ -10380,7 +10371,7 @@
           }
       }
   }
-%% File: l3file.dtx Copyright (C) 1990-2018 The LaTeX3 Project
+%% File: l3file.dtx Copyright (C) 1990-2019 The LaTeX3 Project
 \tl_new:N  \l__ior_internal_tl
 \int_const:Nn \c_term_ior { 16 }
 \seq_new:N \g__ior_streams_seq
@@ -10664,7 +10655,7 @@
     { \tl_to_str:n { \^^I \^^O \^^W \^^_ \^^W \^^R \^^A \^^P } }
 \group_end:
 \tl_map_inline:nn
-  { { end } { newline } { indent } { unindent } }
+  { { end } { newline } { allow_break } { indent } { unindent } }
   {
     \tl_const:cx { c__iow_wrap_ #1 _marker_tl }
       {
@@ -10673,6 +10664,17 @@
         \c_catcode_other_space_tl
       }
   }
+\cs_new_protected:Npn \iow_allow_break:
+  {
+    \__kernel_msg_error:nnnn { kernel } { iow-indent }
+      { \iow_wrap:nnnN } { \iow_allow_break: }
+  }
+\cs_new:Npx \__iow_allow_break: { \c__iow_wrap_allow_break_marker_tl }
+\cs_new:Npn \__iow_allow_break_error:
+  {
+    \__kernel_msg_expandable_error:nnnn { kernel } { iow-indent }
+      { \iow_wrap:nnnN } { \iow_allow_break: }
+  }
 \cs_new_protected:Npn \iow_indent:n #1
   {
     \__kernel_msg_error:nnnnn { kernel } { iow-indent }
@@ -10704,10 +10706,12 @@
       \int_set:Nn \tex_escapechar:D { 92 }
       \cs_set_eq:NN \\ \iow_newline:
       \cs_set_eq:NN \  \c_catcode_other_space_tl
+      \cs_set_eq:NN \iow_allow_break: \__iow_allow_break:
       \cs_set_eq:NN \iow_indent:n \__iow_indent:n
       #3
       \cs_set_eq:NN \protect \token_to_str:N
       \tl_set:Nx \l__iow_wrap_tl {#1}
+      \cs_set_eq:NN \iow_allow_break: \__iow_allow_break_error:
       \cs_set_eq:NN \iow_indent:n \__iow_indent_error:n
       \tl_set:Nx \l__iow_newline_tl { \iow_newline: #2 }
       \tl_set:Nx \l__iow_newline_tl { \tl_to_str:N \l__iow_newline_tl }
@@ -10887,6 +10891,15 @@
           #1 #2 \q_stop
       }
   }
+\cs_new_protected:Npn \__iow_wrap_allow_break:n #1
+  {
+    \tl_set:Nx \l__iow_line_tl
+      { \l__iow_line_tl \__iow_wrap_trim:N \l__iow_line_part_tl }
+    \bool_set_false:N \l__iow_line_break_bool
+    \tl_if_empty:NTF \l__iow_line_part_tl
+      { \__iow_wrap_chunk:nw {#1} }
+      { \exp_args:Nf \__iow_wrap_chunk:nw { \int_eval:n { #1 + 1 } } }
+  }
 \cs_new_protected:Npn \__iow_wrap_indent:n #1
   {
     \tl_put_right:Nx \l__iow_line_tl { \l__iow_line_part_tl }
@@ -10929,10 +10942,15 @@
       }
     \tl_clear:N \l__iow_line_tl
   }
-\cs_new:Npn \__iow_wrap_trim:N #1
-  { \tl_if_empty:NF #1 { \exp_after:wN \__iow_wrap_trim:w #1 \q_stop } }
-\exp_last_unbraced:NNNNo
-  \cs_new:Npn \__iow_wrap_trim:w #1 \c_catcode_other_space_tl \q_stop {#1}
+\cs_set_protected:Npn \__iow_tmp:w #1
+  {
+    \cs_new:Npn \__iow_wrap_trim:N ##1
+      { \exp_after:wN \__iow_wrap_trim:w ##1 \q_mark #1 \q_mark \q_stop }
+    \cs_new:Npn \__iow_wrap_trim:w ##1 #1 \q_mark
+      { \__iow_wrap_trim_aux:w ##1 \q_mark }
+    \cs_new:Npn \__iow_wrap_trim_aux:w ##1 \q_mark ##2 \q_stop {##1}
+  }
+\exp_args:NV \__iow_tmp:w \c_catcode_other_space_tl
 \tl_new:N \l__file_internal_tl
 \ior_new:N \g__file_internal_ior
 \str_new:N \g_file_curr_dir_str
@@ -11193,51 +11211,11 @@
   { Only~#1 (arg~1)~allows~#2 }
   {
     The~command~#2 can~only~be~used~in~messages~
-    which~will~be~wrapped~using~#1.~
-    It~was~called~with~argument~'#3'.
+    which~will~be~wrapped~using~#1.
+    \tl_if_empty:nF {#3} { ~ It~was~called~with~argument~'#3'. }
   }
-\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 } }
-\__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__file_full_name_str
-    \seq_if_in:NVF \l_file_search_path_seq \l__file_full_name_str
-      { \seq_put_right:NV \l_file_search_path_seq \l__file_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__file_full_name_str
-    \seq_remove_all:NV \l_file_search_path_seq \l__file_full_name_str
-  }
-\__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 } }
-  }
-\__kernel_patch_deprecation:nnNNpn { 2018-12-31 } { \file_log_list: }
-\cs_new_protected:Npn \file_list:          { \file_log_list: }
-\__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: }
 %% File: l3skip.dtx Copyright (C) 2004-2011 Frank Mittelbach, The LaTeX3 Project
-%%                            (C) 2012-2018 The LaTeX3 Project
+%%                            (C) 2012-2019 The LaTeX3 Project
 \cs_new_eq:NN \if_dim:w      \tex_ifdim:D
 \cs_new_eq:NN \__dim_eval:w      \tex_dimexpr:D
 \cs_new_eq:NN \__dim_eval_end:   \tex_relax:D
@@ -11858,7 +11836,7 @@
 \muskip_new:N \l_tmpb_muskip
 \muskip_new:N \g_tmpa_muskip
 \muskip_new:N \g_tmpb_muskip
-%% File: l3keys.dtx Copyright (C) 2006-2018 The LaTeX3 Project
+%% File: l3keys.dtx Copyright (C) 2006-2019 The LaTeX3 Project
 \tl_new:N \l__keyval_key_tl
 \tl_new:N \l__keyval_value_tl
 \tl_new:N \l__keyval_sanitise_tl
@@ -12807,7 +12785,7 @@
       { is~undefined. }
       { has~the~properties: #2 . }
   }
-%% File: l3intarray.dtx Copyright (C) 2017-2018 The LaTeX3 Project
+%% File: l3intarray.dtx Copyright (C) 2017-2019 The LaTeX3 Project
 \cs_new_eq:NN \__intarray_entry:w \tex_fontdimen:D
 \cs_new_eq:NN \__intarray_count:w \tex_hyphenchar:D
 \int_new:N \l__intarray_loop_int
@@ -13038,8 +13016,8 @@
           { \intarray_gset_rand:Nnn #1 {#2} {#3} }
       }
   }
-%% File: l3fp.dtx Copyright (C) 2011-2018 The LaTeX3 Project
-%% File: l3fp-aux.dtx Copyright(C) 2011-2018 The LaTeX3 Project
+%% File: l3fp.dtx Copyright (C) 2011-2019 The LaTeX3 Project
+%% File: l3fp-aux.dtx Copyright(C) 2011-2019 The LaTeX3 Project
 \cs_new_eq:NN \__fp_int_eval:w \tex_numexpr:D
 \cs_new_eq:NN \__fp_int_eval_end: \scan_stop:
 \cs_new_eq:NN \__fp_int_to_roman:w \tex_romannumeral:D
@@ -13448,7 +13426,7 @@
     '\token_to_str:N \fp_to_tl:N',~or~other~
     conversion~functions.
   }
-%% File: l3fp-traps.dtx Copyright (C) 2011-2014,2016,2017 The LaTeX3 Project
+%% File: l3fp-traps.dtx Copyright (C) 2011-2014,2016-2019 The LaTeX3 Project
 \flag_new:n { fp_invalid_operation }
 \flag_new:n { fp_division_by_zero }
 \flag_new:n { fp_overflow }
@@ -13618,7 +13596,7 @@
   { Invalid~operation~ (#1) #3 (#2) }
 \__kernel_msg_new:nnn { kernel } { fp-unknown-type }
   { Unknown~type~for~'#1' }
-%% File: l3fp-round.dtx Copyright(C) 2011-2018 The LaTeX3 Project
+%% File: l3fp-round.dtx Copyright(C) 2011-2019 The LaTeX3 Project
 \cs_new:Npn \__fp_parse_word_trunc:N
   { \__fp_parse_function:NNN \__fp_round_o:Nw \__fp_round_to_zero:NNN }
 \cs_new:Npn \__fp_parse_word_floor:N
@@ -13897,7 +13875,7 @@
     \exp_after:wN \__fp_exp_after_o:w \exp:w \exp_end_continue_f:w
     \__fp_sanitize:Nw #1#2; {1000}{0000}{0000}{0000};
   }
-%% File: l3fp-parse.dtx Copyright (C) 2011-2018 The LaTeX3 Project
+%% File: l3fp-parse.dtx Copyright (C) 2011-2019 The LaTeX3 Project
 \int_const:Nn \c__fp_prec_func_int   { 16 }
 \int_const:Nn \c__fp_prec_hatii_int  { 14 }
 \int_const:Nn \c__fp_prec_hat_int    { 13 }
@@ -15229,7 +15207,7 @@
     \__kernel_msg_new:nnn { kernel } { fp-robust-cmd }
       { Robust~command~#1 invalid~in~fp~expression! }
   }
-%% File: l3fp-assign.dtx Copyright (C) 2011-2017 The LaTeX3 project
+%% File: l3fp-assign.dtx Copyright (C) 2011-2019 The LaTeX3 project
 \cs_new_protected:Npn \fp_new:N #1
   { \cs_new_eq:NN #1 \c_zero_fp }
 \cs_generate_variant:Nn \fp_new:N {c}
@@ -15287,7 +15265,7 @@
 \fp_new:N \l_tmpb_fp
 \fp_new:N \g_tmpa_fp
 \fp_new:N \g_tmpb_fp
-%% File: l3fp-logic.dtx Copyright (C) 2011-2018 The LaTeX3 Project
+%% File: l3fp-logic.dtx Copyright (C) 2011-2019 The LaTeX3 Project
 \cs_new:Npn \__fp_parse_word_max:N
   { \__fp_parse_function:NNN \__fp_minmax_o:Nw 2 }
 \cs_new:Npn \__fp_parse_word_min:N
@@ -15695,7 +15673,7 @@
     \__fp_exp_after_array_f:w #3 \s__fp_stop
     #4 #1
   }
-%% File: l3fp-basics.dtx Copyright (C) 2011-2014,2016-2018 The LaTeX3 Project
+%% File: l3fp-basics.dtx Copyright (C) 2011-2014,2016-2019 The LaTeX3 Project
 \cs_new:Npn \__fp_parse_word_abs:N
   { \__fp_parse_unary_function:NNN \__fp_set_sign_o:w 0 }
 \cs_new:Npn \__fp_parse_word_logb:N
@@ -16516,7 +16494,7 @@
   }
 \__fp_tmp:w +
 \__fp_tmp:w -
-%% File: l3fp-extended.dtx Copyright (C) 2011-2018 The LaTeX3 Project
+%% File: l3fp-extended.dtx Copyright (C) 2011-2019 The LaTeX3 Project
 \tl_const:Nn \c__fp_one_fixed_tl
   { {10000} {0000} {0000} {0000} {0000} {0000} ; }
 \cs_new:Npn \__fp_fixed_continue:wn #1; #2 { #2 #1; }
@@ -16955,7 +16933,7 @@
       \exp_after:wN \__fp_basics_pack_low:NNNNNw
       \int_value:w \__fp_int_eval:w 1 #3#4 + 1 ;
   }
-%% File: l3fp-expo.dtx Copyright (C) 2011-2018 The LaTeX3 Project
+%% File: l3fp-expo.dtx Copyright (C) 2011-2019 The LaTeX3 Project
 \cs_new:Npn \__fp_parse_word_exp:N
   { \__fp_parse_unary_function:NNN \__fp_exp_o:w ? }
 \cs_new:Npn \__fp_parse_word_ln:N
@@ -17628,7 +17606,7 @@
       1
     \fi:
   }
-%% File: l3fp-trig.dtx Copyright (C) 2011-2018 The LaTeX3 Project
+%% File: l3fp-trig.dtx Copyright (C) 2011-2019 The LaTeX3 Project
 \tl_map_inline:nn
   {
     {acos} {acsc} {asec} {asin}
@@ -18504,7 +18482,7 @@
         { \__fp_asin_auxi_o:NnNww #1 {#3} #4 }
       }
   }
-%% File: l3fp-convert.dtx Copyright(C) 2011-2018 The LaTeX3 Project
+%% File: l3fp-convert.dtx Copyright(C) 2011-2019 The LaTeX3 Project
 \cs_new:Npn \__fp_tuple_convert:Nw #1 \s__fp_tuple \__fp_tuple_chk:w #2 ;
   {
     \int_case:nnF { \__fp_array_count:n {#2} }
@@ -18816,7 +18794,7 @@
                  }
     \exp_not:N \__fp_array_to_clist_loop:Nw
   }
-%% File: l3fp-random.dtx Copyright (C) 2016-2018 The LaTeX3 Project
+%% File: l3fp-random.dtx Copyright (C) 2016-2019 The LaTeX3 Project
 \cs_new:Npn \__fp_parse_word_rand:N
   { \__fp_parse_function:NNN \__fp_rand_o:Nw ? }
 \cs_new:Npn \__fp_parse_word_randint:N
@@ -18926,19 +18904,27 @@
         \__fp_randint_auxii:wn #2 ;
         { \__fp_randint_auxii:wn #1 ; \__fp_randint_auxiii_o:ww }
       }
-    \cs_new:Npn \__fp_randint_auxii:wn \s__fp \__fp_chk:w 1#1#2#3 ;
+    \cs_new:Npn \__fp_randint_auxii:wn \s__fp \__fp_chk:w #1#2#3#4 ;
       {
-        \exp_after:wN \__fp_ep_to_fixed:wwn
-        \int_value:w \__fp_int_eval:w
-          #2 - \c__fp_prec_int , #3 {0000} {0000} ;
+        \if_meaning:w 0 #1
+          \exp_after:wN \use_i:nn
+        \else:
+          \exp_after:wN \use_ii:nn
+        \fi:
+        { \exp_after:wN \__fp_fixed_continue:wn \c__fp_one_fixed_tl }
         {
-          \if_meaning:w 0 #1
-            \exp_after:wN \use_i:nnnn
-            \exp_after:wN \__fp_fixed_add_one:wN
-          \fi:
-          \exp_after:wN \__fp_fixed_sub:wwn \c__fp_one_fixed_tl
+          \exp_after:wN \__fp_ep_to_fixed:wwn
+          \int_value:w \__fp_int_eval:w
+            #3 - \c__fp_prec_int , #4 {0000} {0000} ;
+          {
+            \if_meaning:w 0 #2
+              \exp_after:wN \use_i:nnnn
+              \exp_after:wN \__fp_fixed_add_one:wN
+            \fi:
+            \exp_after:wN \__fp_fixed_sub:wwn \c__fp_one_fixed_tl
+          }
+          \__fp_fixed_continue:wn
         }
-        \__fp_fixed_continue:wn
       }
     \cs_new:Npn \__fp_randint_auxiii_o:ww #1 ; #2 ;
       {
@@ -19100,7 +19086,7 @@
         \fi:
       }
   }
-%% File: l3fparray.dtx Copyright (C) 2018 The LaTeX3 Project
+%% File: l3fparray.dtx Copyright (C) 2018-2019 The LaTeX3 Project
 \int_new:N \g__fp_array_int
 \int_new:N \l__fp_array_loop_int
 \cs_new_protected:Npn \fparray_new:Nn #1#2
@@ -19267,7 +19253,7 @@
   }
 \cs_new:Npn \__fp_array_item_normal:w #1 #2#3#4#5 #6 ; #7 ; #8 ; #9
   { #9 \s__fp \__fp_chk:w 1 #1 {#8} #7 {#2#3#4#5} {#6} ; }
-%% File l3sort.dtx (C) Copyright 2012-2018 The LaTeX3 Project
+%% File l3sort.dtx (C) Copyright 2012-2019 The LaTeX3 Project
 \seq_new:N \g__sort_internal_seq
 \tl_new:N \g__sort_internal_tl
 \int_new:N \l__sort_length_int
@@ -19472,34 +19458,46 @@
       { \tex_the:D \tex_toks:D \exp_after:wN \l__sort_A_int \exp_after:wN }
       \exp_after:wN { \tex_the:D \tex_toks:D \l__sort_C_int }
     \prg_do_nothing:
-    \__sort_return_mark:N
-    \__sort_return_mark:N
+    \__sort_return_mark:w
+    \__sort_return_mark:w
+    \q_mark
     \__sort_return_none_error:
   }
-\cs_new_protected:Npn \sort_return_same: #1 \__sort_return_mark:N
+\cs_new_protected:Npn \sort_return_same:
+    #1 \__sort_return_mark:w #2 \q_mark
   {
     #1
-    \__sort_return_mark:N
-    \__sort_return_two_error:w \__sort_return_same:
+    #2
+    \__sort_return_two_error:
+    \__sort_return_mark:w
+    \q_mark
+    \__sort_return_same:w
   }
-\cs_new_protected:Npn \sort_return_swapped: #1 \__sort_return_mark:N
+\cs_new_protected:Npn \sort_return_swapped:
+    #1 \__sort_return_mark:w #2 \q_mark
   {
     #1
-    \__sort_return_mark:N
-    \__sort_return_two_error:w \__sort_return_swapped:
+    #2
+    \__sort_return_two_error:
+    \__sort_return_mark:w
+    \q_mark
+    \__sort_return_swapped:w
   }
-\cs_new_protected:Npn \__sort_return_mark:N #1 { }
+\cs_new_protected:Npn \__sort_return_mark:w #1 \q_mark { }
 \cs_new_protected:Npn \__sort_return_none_error:
   {
     \__kernel_msg_error:nnxx { kernel } { return-none }
       { \tex_the:D \tex_toks:D \l__sort_A_int }
       { \tex_the:D \tex_toks:D \l__sort_C_int }
-    \__sort_return_same:
+    \__sort_return_same:w \__sort_return_none_error:
+  }
+\cs_new_protected:Npn \__sort_return_two_error:
+  {
+    \__kernel_msg_error:nnxx { kernel } { return-two }
+      { \tex_the:D \tex_toks:D \l__sort_A_int }
+      { \tex_the:D \tex_toks:D \l__sort_C_int }
   }
-\cs_new_protected:Npn \__sort_return_two_error:w
-    #1 \__sort_return_none_error:
-  { \__kernel_msg_error:nn { kernel } { return-two } }
-\cs_new_protected:Npn \__sort_return_same:
+\cs_new_protected:Npn \__sort_return_same:w #1 \__sort_return_none_error:
   {
     \tex_toks:D \l__sort_B_int \tex_toks:D \l__sort_C_int
     \int_decr:N \l__sort_B_int
@@ -19509,7 +19507,7 @@
     \fi:
     \__sort_merge_blocks_aux:
   }
-\cs_new_protected:Npn \__sort_return_swapped:
+\cs_new_protected:Npn \__sort_return_swapped:w #1 \__sort_return_none_error:
   {
     \tex_toks:D \l__sort_B_int \tex_toks:D \l__sort_A_int
     \int_decr:N \l__sort_B_int
@@ -19666,16 +19664,12 @@
 \__kernel_msg_new:nnnn { kernel } { return-two }
   { The~comparison~code~returned~multiple~times. }
   {
-    When~sorting~a~list,~the~code~to~compare~items~called~
+    When~sorting~a~list,~the~code~to~compare~items~#1~and~#2~called~
     \iow_char:N\\sort_return_same: ~or~
     \iow_char:N\\sort_return_swapped: ~multiple~times.~
     Exactly~one~of~these~should~be~called.
   }
-\__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: }
-%% File: l3tl-analysis.dtx Copyright (C) 2011-2018 The LaTeX3 Project
+%% File: l3tl-analysis.dtx Copyright (C) 2011-2019 The LaTeX3 Project
 \scan_new:N \s__tl
 \cs_new_eq:NN \l__tl_analysis_token ?
 \cs_new_eq:NN \l__tl_analysis_char_token ?
@@ -20114,7 +20108,7 @@
   { \tl_analysis_show:n }
 \cs_new_protected:Npn \tl_show_analysis:n #1
   { \tl_analysis_show:n {#1} }
-%% File: l3regex.dtx Copyright (C) 2011-2018 The LaTeX3 Project
+%% File: l3regex.dtx Copyright (C) 2011-2019 The LaTeX3 Project
 \cs_new_eq:NN \__regex_int_eval:w \tex_numexpr:D
 \cs_new_protected:Npn \__regex_standard_escapechar:
   { \int_set:Nn \tex_escapechar:D { `\\ } }
@@ -23385,7 +23379,7 @@
       }
   }
   { }
-%% File: l3box.dtx Copyright (C) 2005-2018 The LaTeX3 Project
+%% File: l3box.dtx Copyright (C) 2005-2019 The LaTeX3 Project
 \cs_new_eq:NN \__box_dim_eval:w \tex_dimexpr:D
 \__kernel_patch_args:nNNpn
   {
@@ -23713,6 +23707,14 @@
 \__kernel_patch:nnNNpn { \__kernel_chk_var_local:N #1 } { }
 \cs_new_protected:Npn \vbox_set_split_to_ht:NNn #1#2#3
   { \tex_setbox:D #1 \tex_vsplit:D #2 to \__box_dim_eval:n {#3} }
+\cs_generate_variant:Nn \vbox_set_split_to_ht:NNn { c , Nc , cc }
+\__kernel_patch:nnNNpn { \__kernel_chk_var_global:N #1 } { }
+\cs_new_protected:Npn \vbox_gset_split_to_ht:NNn #1#2#3
+  {
+    \tex_global:D \tex_setbox:D #1
+      \tex_vsplit:D #2 to \__box_dim_eval:n {#3}
+  }
+\cs_generate_variant:Nn \vbox_gset_split_to_ht:NNn { c , Nc , cc }
 \fp_new:N \l__box_angle_fp
 \fp_new:N \l__box_cos_fp
 \fp_new:N \l__box_sin_fp
@@ -24012,21 +24014,7 @@
           }
       }
   }
-\__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 }
-%% File: l3color-base.dtx Copyright(C) 2011,2012,2014,2016-2018 The LaTeX3 Project
+%% File: l3color-base.dtx Copyright(C) 2011,2012,2014,2016-2019 The LaTeX3 Project
 \cs_new_eq:NN \color_group_begin: \group_begin:
 \cs_new_eq:NN \color_group_end:   \group_end:
 \cs_new_protected:Npn \color_ensure_current:
@@ -24049,7 +24037,7 @@
   { \driver_color_spot:nn {#1} {#2} }
 \tl_new:N \l__color_current_tl
 \tl_set:Nn \l__color_current_tl { gray~0 }
-%% File: l3coffins.dtx Copyright(C) 2010-2018 The LaTeX3 Project
+%% File: l3coffins.dtx Copyright(C) 2010-2019 The LaTeX3 Project
 \box_new:N \l__coffin_internal_box
 \dim_new:N \l__coffin_internal_dim
 \tl_new:N  \l__coffin_internal_tl
@@ -24876,7 +24864,7 @@
     Size~of~coffin~#1 : #2 \\
     Poles~of~coffin~#1 : #3 .
   }
-%% File: l3luatex.dtx Copyright (C) 2010-2018 The LaTeX3 Project
+%% File: l3luatex.dtx Copyright (C) 2010-2019 The LaTeX3 Project
 \cs_new_eq:NN \__lua_escape:n  \tex_luaescapestring:D
 \cs_new_eq:NN \__lua_now:n     \tex_directlua:D
 \cs_new_eq:NN \__lua_shipout:n \tex_latelua:D
@@ -24925,7 +24913,7 @@
 \cs_new:Npn \lua_escape_x:n #1 { \__lua_escape:n {#1} }
 \__kernel_patch_deprecation:nnNNpn { 2019-12-31 } { \lua_shipout_e:n }
 \cs_new_protected:Npn \lua_shipout_x:n #1 { \__lua_shipout:n {#1} }
-%% File: l3unicode.dtx Copyright (C) 2018 The LaTeX3 Project
+%% File: l3unicode.dtx Copyright (C) 2018-2019 The LaTeX3 Project
 \ior_new:N \g__char_data_ior
 \bool_lazy_or:nnTF { \sys_if_engine_luatex_p: } { \sys_if_engine_xetex_p: }
   {
@@ -25064,7 +25052,7 @@
       \ior_close:N \g__char_data_ior
     \group_end:
   }
-%% File: l3candidates.dtx Copyright (C) 2012-2018 The LaTeX3 Project
+%% File: l3candidates.dtx Copyright (C) 2012-2019 The LaTeX3 Project
 \cs_new_protected:Npn \mode_leave_vertical:
   {
     \if_mode_vertical:
@@ -27296,7 +27284,7 @@
     \tl_put_right:Nn \l__peek_collect_tl {#1}
     \exp_after:wN \__peek_true_remove:w
   }
-%% File: l3deprecation.dtx (C) Copyright 2017-2018 The LaTeX3 Project
+%% File: l3deprecation.dtx (C) Copyright 2017-2019 The LaTeX3 Project
 \cs_new_protected:Npn \__kernel_deprecation_error:Nnn #1#2#3
   {
     \tex_protected:D \tex_outer:D \tex_edef:D #1
@@ -27309,14 +27297,34 @@
           { \tl_to_str:n {#3} } { \token_to_str:N #1 } { \tl_to_str:n {#2} }
       }
   }
-\__kernel_deprecation_error:Nnn \file_if_exist_input:nT
-  { \file_if_exist:nT and~ \file_input:n } { 2018-03-05 }
-\__kernel_deprecation_error:Nnn \file_if_exist_input:nTF
-  { \file_if_exist:nT and~ \file_input:n } { 2018-03-05 }
+\__kernel_deprecation_error:Nnn \box_resize:cnn
+  { \box_resize_to_wd_and_ht_plus_dp:cnn } { 2018-12-27 }
+\__kernel_deprecation_error:Nnn \box_resize:Nnn
+  { \box_resize_to_wd_and_ht_plus_dp:Nnn } { 2018-12-27 }
+\__kernel_deprecation_error:Nnn \box_use_clear:c
+  { \box_use_drop:c } { 2018-12-27 }
+\__kernel_deprecation_error:Nnn \box_use_clear:N
+  { \box_use_drop:N } { 2018-12-27 }
 \__kernel_deprecation_error:Nnn \c_job_name_tl
   { \c_sys_jobname_str } { 2017-01-01 }
+\__kernel_deprecation_error:Nnn \c_minus_one
+  { -1 } { 2018-12-27 }
 \__kernel_deprecation_error:Nnn \dim_case:nnn
   { \dim_case:nnF } { 2015-07-14 }
+\__kernel_deprecation_error:Nnn \file_add_path:nN
+  { \file_get_full_name:nN } { 2018-12-27 }
+\__kernel_deprecation_error:Nnn \file_if_exist_input:nT
+  { \file_if_exist:nT and~ \file_input:n } { 2018-03-05 }
+\__kernel_deprecation_error:Nnn \file_if_exist_input:nTF
+  { \file_if_exist:nT and~ \file_input:n } { 2018-03-05 }
+\__kernel_deprecation_error:Nnn \file_list:
+  { \file_log_list: } { 2018-12-27 }
+\__kernel_deprecation_error:Nnn \file_path_include:n
+  { \seq_put_right:Nn \l_file_search_path_seq } { 2018-12-27 }
+\__kernel_deprecation_error:Nnn \file_path_remove:n
+  { \seq_remove_all:Nn \l_file_search_path_seq } { 2018-12-27 }
+\__kernel_deprecation_error:Nnn \g_file_current_name_tl
+  { \g_file_current_name_str } { 2018-12-27 }
 \__kernel_deprecation_error:Nnn \int_case:nnn
   { \int_case:nnF } { 2015-07-14 }
 \__kernel_deprecation_error:Nnn \int_from_binary:n
@@ -27333,6 +27341,10 @@
   { \int_to_oct:n } { 2016-01-05 }
 \__kernel_deprecation_error:Nnn \ior_get_str:NN
   { \ior_str_get:NN } { 2018-03-05 }
+\__kernel_deprecation_error:Nnn \ior_list_streams:
+  { \ior_show_list: } { 2018-12-27 }
+\__kernel_deprecation_error:Nnn \ior_log_streams:
+  { \ior_log_list: } { 2018-12-27 }
 \__kernel_deprecation_error:Nnn \luatex_if_engine_p:
   { \sys_if_engine_luatex_p: } { 2017-01-01 }
 \__kernel_deprecation_error:Nnn \luatex_if_engine:F
@@ -27359,6 +27371,10 @@
   { } { 2015-07-14 }
 \__kernel_deprecation_error:Nnn \scan_align_safe_stop:
   { protected~commands } { 2017-01-01 }
+\__kernel_deprecation_error:Nnn \sort_ordered:
+  { \sort_return_same: } { 2018-12-27 }
+\__kernel_deprecation_error:Nnn \sort_reversed:
+  { \sort_return_swapped: } { 2018-12-27 }
 \__kernel_deprecation_error:Nnn \str_case:nnn
   { \str_case:nnF } { 2015-07-14 }
 \__kernel_deprecation_error:Nnn \str_case:onn
@@ -27373,6 +27389,8 @@
   { \tex_lowercase:D } { 2018-03-05 }
 \__kernel_deprecation_error:Nnn \tl_to_uppercase:n
   { \tex_uppercase:D } { 2018-03-05 }
+\__kernel_deprecation_error:Nnn \token_new:Nn
+  { \cs_new_eq:NN } { 2018-12-29 }
 \__kernel_deprecation_error:Nnn \xetex_if_engine_p:
   { \sys_if_engine_xetex_p: } { 2017-01-01 }
 \__kernel_deprecation_error:Nnn \xetex_if_engine:F
@@ -27381,15 +27399,6 @@
   { \sys_if_engine_xetex:T } { 2017-01-01 }
 \__kernel_deprecation_error:Nnn \xetex_if_engine:TF
   { \sys_if_engine_xetex:TF } { 2017-01-01 }
-\__kernel_deprecation_code:nn
-  {
-    \cs_set_protected:Npn \__cs_generate_variant_loop_warning:nnxxxx
-      { \__kernel_msg_error:nnxxxx }
-  }
-  {
-    \cs_set_protected:Npn \__cs_generate_variant_loop_warning:nnxxxx
-      { \__kernel_msg_warning:nnxxxx }
-  }
 \cs_new_protected:Npn \__deprecation_primitive:NN #1#2 { }
 \exp_last_unbraced:NNNNo
   \cs_new:Npn \__deprecation_primitive:w #1 { \token_to_str:N _ } { }