[latex3-commits] [git/LaTeX3-latex3-latex3] debug: Cherry-pick end-2018 deprecation changes (dc057d5ef)

Joseph Wright joseph.wright at morningstar2.co.uk
Wed Sep 18 22:52:19 CEST 2019


Repository : https://github.com/latex3/latex3
On branch  : debug
Link       : https://github.com/latex3/latex3/commit/dc057d5ef15771f3f42aa8fb6f574c12e50bc2d1

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

commit dc057d5ef15771f3f42aa8fb6f574c12e50bc2d1
Author: Joseph Wright <joseph.wright at morningstar2.co.uk>
Date:   Wed Sep 18 19:11:58 2019 +0100

    Cherry-pick end-2018 deprecation changes
    
    So the branch passes


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

dc057d5ef15771f3f42aa8fb6f574c12e50bc2d1
 l3kernel/l3deprecation.dtx                     | 30 +++++++++++
 l3kernel/testfiles/m3deprecation002.luatex.tlg | 70 ++++++++++++++++++++++++--
 l3kernel/testfiles/m3deprecation002.tlg        | 70 ++++++++++++++++++++++++--
 l3kernel/testfiles/m3deprecation003.luatex.tlg | 66 +++++++++++++++++++++++-
 l3kernel/testfiles/m3deprecation003.tlg        | 66 +++++++++++++++++++++++-
 5 files changed, 290 insertions(+), 12 deletions(-)

diff --git a/l3kernel/l3deprecation.dtx b/l3kernel/l3deprecation.dtx
index c5dd76bfd..9840e736a 100644
--- a/l3kernel/l3deprecation.dtx
+++ b/l3kernel/l3deprecation.dtx
@@ -386,14 +386,30 @@
     \__kernel_patch_deprecation:nnNNpn {#3} {#2}
     \cs_gset:Npn #1 { }
   }
+\@@_old:Nnn \box_resize:Nnn
+  { \box_resize_to_wd_and_ht_plus_dp:Nnn } { 2019-01-01 }
+\@@_old:Nnn \box_use_clear:N
+  { \box_use_drop:N } { 2019-01-01 }
 \@@_old:Nnn \c_job_name_tl
   { \c_sys_jobname_str } { 2017-01-01 }
+\@@_old:Nnn \c_minus_one
+  { -1 } { 2019-01-01 }
 \@@_old:Nnn \dim_case:nnn
   { \dim_case:nnF } { 2015-07-14 }
+\@@_old:Nnn \file_add_path:nN
+  { \file_get_full_name:nN } { 2019-01-01 }
 \@@_old_protected:Nnn \file_if_exist_input:nT
   { \file_if_exist:nT and~ \file_input:n } { 2018-03-05 }
 \@@_old_protected:Nnn \file_if_exist_input:nTF
   { \file_if_exist:nT and~ \file_input:n } { 2018-03-05 }
+\@@_old:Nnn \file_list:
+  { \file_log_list: } { 2019-01-01 }
+\@@_old:Nnn \file_path_include:n
+  { \seq_put_right:Nn \l_file_search_path_seq } { 2019-01-01 }
+\@@_old:Nnn \file_path_remove:n
+  { \seq_remove_all:Nn \l_file_search_path_seq } { 2019-01-01 }
+\@@_old:Nnn \g_file_current_name_tl
+  { \g_file_curr_name_str } { 2019-01-01 }
 \@@_old:Nnn \int_case:nnn
   { \int_case:nnF } { 2015-07-14 }
 \@@_old:Nnn \int_from_binary:n
@@ -410,6 +426,14 @@
   { \int_to_oct:n } { 2016-01-05 }
 \@@_old_protected:Nnn \ior_get_str:NN
   { \ior_str_get:NN } { 2018-03-05 }
+\@@_old:Nnn \ior_list_streams:
+  { \ior_show_list: } { 2019-01-01 }
+\@@_old:Nnn \ior_log_streams:
+  { \ior_log_list: } { 2019-01-01 }
+\@@_old:Nnn \iow_list_streams:
+  { \iow_show_list: } { 2019-01-01 }
+\@@_old:Nnn \iow_log_streams:
+  { \iow_log_list: } { 2019-01-01 }
 \@@_old:Nnn \luatex_if_engine_p:
   { \sys_if_engine_luatex_p: } { 2017-01-01 }
 \@@_old:Nnn \luatex_if_engine:F
@@ -436,6 +460,10 @@
   { } { 2015-07-14 }
 \@@_old:Nnn \scan_align_safe_stop:
   { protected~commands } { 2017-01-01 }
+\@@_old:Nnn \sort_ordered:
+  { \sort_return_same: } { 2019-01-01 }
+\@@_old:Nnn \sort_reversed:
+  { \sort_return_swapped: } { 2019-01-01 }
 \@@_old:Nnn \str_case:nnn
   { \str_case:nnF } { 2015-07-14 }
 \@@_old:Nnn \str_case:onn
@@ -450,6 +478,8 @@
   { \tex_lowercase:D } { 2018-03-05 }
 \@@_old_protected:Nnn \tl_to_uppercase:n
   { \tex_uppercase:D } { 2018-03-05 }
+\@@_old:Nnn \token_new:Nn
+  { \cs_new_eq:NN } { 2019-01-01 }
 \@@_old:Nnn \xetex_if_engine_p:
   { \sys_if_engine_xetex_p: } { 2017-01-01 }
 \@@_old:Nnn \xetex_if_engine:F
diff --git a/l3kernel/testfiles/m3deprecation002.luatex.tlg b/l3kernel/testfiles/m3deprecation002.luatex.tlg
index 34668850c..34244cee8 100644
--- a/l3kernel/testfiles/m3deprecation002.luatex.tlg
+++ b/l3kernel/testfiles/m3deprecation002.luatex.tlg
@@ -184,8 +184,68 @@ spurious, as in `$x}$'. But perhaps the } is legitimate and
 you forgot something else, as in `\hbox{$x}'. In such cases
 the way to recover is to insert both the forgotten and the
 deleted material, e.g., by typing `I$}'.
-\c_backslash_str  m3deprecation002
-LaTeX3 Warning: '\token_new:Nn' deprecated on ....-..-... Use '\cs_new_eq:NN
-(LaTeX3)        '.
-Defining \c_testa_token on line ...
-Defining \c_testb_token on line ...
+\c_backslash_str 
+! Undefined control sequence.
+<argument> \LaTeX3 error: 
+                '\g_file_current_name_tl ' deprecated on ....-..-... Use '\g_fi
+l. ...  \tex_message:D { \g_file_current_name_tl
+                                              }
+The control sequence at the end of the top line
+of your error message was never \def'ed. If you have
+misspelled it (e.g., `\hobx'), type `I' and the correct
+spelling (e.g., `I\hbox'). Otherwise just continue,
+and I'll forget about whatever was undefined.
+! LaTeX3 Error: '\token_new:Nn' deprecated on ....-..-... Use '\cs_new_eq:NN
+(LaTeX3)        '. For 6 months after that date one can restore a deprecated
+(LaTeX3)        command by loading the expl3 package with the option
+(LaTeX3)        'undo-recent-deprecations'.
+Type <return> to continue.
+ ...                                              
+l. ...  \token_new:Nn
+                   \c_testa_token { ~ }
+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.
+! Undefined control sequence.
+l. ...  \token_new:Nn \c_testa_token
+                                  { ~ }
+The control sequence at the end of the top line
+of your error message was never \def'ed. If you have
+misspelled it (e.g., `\hobx'), type `I' and the correct
+spelling (e.g., `I\hbox'). Otherwise just continue,
+and I'll forget about whatever was undefined.
+! LaTeX3 Error: '\token_new:Nn' deprecated on ....-..-... Use '\cs_new_eq:NN
+(LaTeX3)        '. For 6 months after that date one can restore a deprecated
+(LaTeX3)        command by loading the expl3 package with the option
+(LaTeX3)        'undo-recent-deprecations'.
+Type <return> to continue.
+ ...                                              
+l. ...  \token_new:Nn
+                   \c_testb_token { ~ }
+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.
+! Undefined control sequence.
+l. ...  \token_new:Nn \c_testb_token
+                                  { ~ }
+The control sequence at the end of the top line
+of your error message was never \def'ed. If you have
+misspelled it (e.g., `\hobx'), type `I' and the correct
+spelling (e.g., `I\hbox'). Otherwise just continue,
+and I'll forget about whatever was undefined.
+! Undefined control sequence.
+<argument> \ERROR 
+l. ......NNF \c_testa_token \c_space_token { \ERROR }
+The control sequence at the end of the top line
+of your error message was never \def'ed. If you have
+misspelled it (e.g., `\hobx'), type `I' and the correct
+spelling (e.g., `I\hbox'). Otherwise just continue,
+and I'll forget about whatever was undefined.
+! Undefined control sequence.
+<argument> \ERROR 
+l. ......NNF \c_testb_token \c_space_token { \ERROR }
+The control sequence at the end of the top line
+of your error message was never \def'ed. If you have
+misspelled it (e.g., `\hobx'), type `I' and the correct
+spelling (e.g., `I\hbox'). Otherwise just continue,
+and I'll forget about whatever was undefined.
diff --git a/l3kernel/testfiles/m3deprecation002.tlg b/l3kernel/testfiles/m3deprecation002.tlg
index 06ef94ca5..755ea7cd5 100644
--- a/l3kernel/testfiles/m3deprecation002.tlg
+++ b/l3kernel/testfiles/m3deprecation002.tlg
@@ -184,8 +184,68 @@ spurious, as in `$x}$'. But perhaps the } is legitimate and
 you forgot something else, as in `\hbox{$x}'. In such cases
 the way to recover is to insert both the forgotten and the
 deleted material, e.g., by typing `I$}'.
-\c_backslash_str  m3deprecation002
-LaTeX3 Warning: '\token_new:Nn' deprecated on ....-..-... Use '\cs_new_eq:NN
-(LaTeX3)        '.
-Defining \c_testa_token on line ...
-Defining \c_testb_token on line ...
+\c_backslash_str 
+! Undefined control sequence.
+<argument> \LaTeX3 error: 
+                           '\g_file_current_name_tl ' deprecated on 2019-01-...
+l. ...  \tex_message:D { \g_file_current_name_tl
+                                                }
+The control sequence at the end of the top line
+of your error message was never \def'ed. If you have
+misspelled it (e.g., `\hobx'), type `I' and the correct
+spelling (e.g., `I\hbox'). Otherwise just continue,
+and I'll forget about whatever was undefined.
+! LaTeX3 Error: '\token_new:Nn' deprecated on ....-..-... Use '\cs_new_eq:NN
+(LaTeX3)        '. For 6 months after that date one can restore a deprecated
+(LaTeX3)        command by loading the expl3 package with the option
+(LaTeX3)        'undo-recent-deprecations'.
+Type <return> to continue.
+ ...                                              
+l. ...  \token_new:Nn
+                     \c_testa_token { ~ }
+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.
+! Undefined control sequence.
+l. ...  \token_new:Nn \c_testa_token
+                                    { ~ }
+The control sequence at the end of the top line
+of your error message was never \def'ed. If you have
+misspelled it (e.g., `\hobx'), type `I' and the correct
+spelling (e.g., `I\hbox'). Otherwise just continue,
+and I'll forget about whatever was undefined.
+! LaTeX3 Error: '\token_new:Nn' deprecated on ....-..-... Use '\cs_new_eq:NN
+(LaTeX3)        '. For 6 months after that date one can restore a deprecated
+(LaTeX3)        command by loading the expl3 package with the option
+(LaTeX3)        'undo-recent-deprecations'.
+Type <return> to continue.
+ ...                                              
+l. ...  \token_new:Nn
+                     \c_testb_token { ~ }
+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.
+! Undefined control sequence.
+l. ...  \token_new:Nn \c_testb_token
+                                    { ~ }
+The control sequence at the end of the top line
+of your error message was never \def'ed. If you have
+misspelled it (e.g., `\hobx'), type `I' and the correct
+spelling (e.g., `I\hbox'). Otherwise just continue,
+and I'll forget about whatever was undefined.
+! Undefined control sequence.
+<argument> \ERROR 
+l. ......F \c_testa_token \c_space_token { \ERROR }
+The control sequence at the end of the top line
+of your error message was never \def'ed. If you have
+misspelled it (e.g., `\hobx'), type `I' and the correct
+spelling (e.g., `I\hbox'). Otherwise just continue,
+and I'll forget about whatever was undefined.
+! Undefined control sequence.
+<argument> \ERROR 
+l. ......F \c_testb_token \c_space_token { \ERROR }
+The control sequence at the end of the top line
+of your error message was never \def'ed. If you have
+misspelled it (e.g., `\hobx'), type `I' and the correct
+spelling (e.g., `I\hbox'). Otherwise just continue,
+and I'll forget about whatever was undefined.
diff --git a/l3kernel/testfiles/m3deprecation003.luatex.tlg b/l3kernel/testfiles/m3deprecation003.luatex.tlg
index 656f5c847..1598db1cd 100644
--- a/l3kernel/testfiles/m3deprecation003.luatex.tlg
+++ b/l3kernel/testfiles/m3deprecation003.luatex.tlg
@@ -30,4 +30,68 @@ 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.
 Aa
-\c_backslash_str  m3deprecation003
+\c_backslash_str 
+! Undefined control sequence.
+<argument> \LaTeX3 error: 
+                '\g_file_current_name_tl ' deprecated on ....-..-... Use '\g_fi
+l. ...  \tex_message:D { \g_file_current_name_tl
+                                              }
+The control sequence at the end of the top line
+of your error message was never \def'ed. If you have
+misspelled it (e.g., `\hobx'), type `I' and the correct
+spelling (e.g., `I\hbox'). Otherwise just continue,
+and I'll forget about whatever was undefined.
+! LaTeX3 Error: '\token_new:Nn' deprecated on ....-..-... Use '\cs_new_eq:NN
+(LaTeX3)        '. For 6 months after that date one can restore a deprecated
+(LaTeX3)        command by loading the expl3 package with the option
+(LaTeX3)        'undo-recent-deprecations'.
+Type <return> to continue.
+ ...                                              
+l. ...  \use:n \token_new:Nn
+                          \c_testa_token { ~ }
+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.
+! Undefined control sequence.
+l. ...  \use:n \token_new:Nn \c_testa_token
+                                         { ~ }
+The control sequence at the end of the top line
+of your error message was never \def'ed. If you have
+misspelled it (e.g., `\hobx'), type `I' and the correct
+spelling (e.g., `I\hbox'). Otherwise just continue,
+and I'll forget about whatever was undefined.
+! LaTeX3 Error: '\token_new:Nn' deprecated on ....-..-... Use '\cs_new_eq:NN
+(LaTeX3)        '. For 6 months after that date one can restore a deprecated
+(LaTeX3)        command by loading the expl3 package with the option
+(LaTeX3)        'undo-recent-deprecations'.
+Type <return> to continue.
+ ...                                              
+l. ...  \token_new:Nn
+                   \c_testb_token { ~ }
+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.
+! Undefined control sequence.
+l. ...  \token_new:Nn \c_testb_token
+                                  { ~ }
+The control sequence at the end of the top line
+of your error message was never \def'ed. If you have
+misspelled it (e.g., `\hobx'), type `I' and the correct
+spelling (e.g., `I\hbox'). Otherwise just continue,
+and I'll forget about whatever was undefined.
+! Undefined control sequence.
+<argument> \ERROR 
+l. ......NNF \c_testa_token \c_space_token { \ERROR }
+The control sequence at the end of the top line
+of your error message was never \def'ed. If you have
+misspelled it (e.g., `\hobx'), type `I' and the correct
+spelling (e.g., `I\hbox'). Otherwise just continue,
+and I'll forget about whatever was undefined.
+! Undefined control sequence.
+<argument> \ERROR 
+l. ......NNF \c_testb_token \c_space_token { \ERROR }
+The control sequence at the end of the top line
+of your error message was never \def'ed. If you have
+misspelled it (e.g., `\hobx'), type `I' and the correct
+spelling (e.g., `I\hbox'). Otherwise just continue,
+and I'll forget about whatever was undefined.
diff --git a/l3kernel/testfiles/m3deprecation003.tlg b/l3kernel/testfiles/m3deprecation003.tlg
index 30d5443c3..3b562748c 100644
--- a/l3kernel/testfiles/m3deprecation003.tlg
+++ b/l3kernel/testfiles/m3deprecation003.tlg
@@ -30,4 +30,68 @@ 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.
 Aa
-\c_backslash_str  m3deprecation003
+\c_backslash_str 
+! Undefined control sequence.
+<argument> \LaTeX3 error: 
+                           '\g_file_current_name_tl ' deprecated on 2019-01-...
+l. ...  \tex_message:D { \g_file_current_name_tl
+                                                }
+The control sequence at the end of the top line
+of your error message was never \def'ed. If you have
+misspelled it (e.g., `\hobx'), type `I' and the correct
+spelling (e.g., `I\hbox'). Otherwise just continue,
+and I'll forget about whatever was undefined.
+! LaTeX3 Error: '\token_new:Nn' deprecated on ....-..-... Use '\cs_new_eq:NN
+(LaTeX3)        '. For 6 months after that date one can restore a deprecated
+(LaTeX3)        command by loading the expl3 package with the option
+(LaTeX3)        'undo-recent-deprecations'.
+Type <return> to continue.
+ ...                                              
+l. ...  \use:n \token_new:Nn
+                            \c_testa_token { ~ }
+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.
+! Undefined control sequence.
+l. ...  \use:n \token_new:Nn \c_testa_token
+                                           { ~ }
+The control sequence at the end of the top line
+of your error message was never \def'ed. If you have
+misspelled it (e.g., `\hobx'), type `I' and the correct
+spelling (e.g., `I\hbox'). Otherwise just continue,
+and I'll forget about whatever was undefined.
+! LaTeX3 Error: '\token_new:Nn' deprecated on ....-..-... Use '\cs_new_eq:NN
+(LaTeX3)        '. For 6 months after that date one can restore a deprecated
+(LaTeX3)        command by loading the expl3 package with the option
+(LaTeX3)        'undo-recent-deprecations'.
+Type <return> to continue.
+ ...                                              
+l. ...  \token_new:Nn
+                     \c_testb_token { ~ }
+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.
+! Undefined control sequence.
+l. ...  \token_new:Nn \c_testb_token
+                                    { ~ }
+The control sequence at the end of the top line
+of your error message was never \def'ed. If you have
+misspelled it (e.g., `\hobx'), type `I' and the correct
+spelling (e.g., `I\hbox'). Otherwise just continue,
+and I'll forget about whatever was undefined.
+! Undefined control sequence.
+<argument> \ERROR 
+l. ......F \c_testa_token \c_space_token { \ERROR }
+The control sequence at the end of the top line
+of your error message was never \def'ed. If you have
+misspelled it (e.g., `\hobx'), type `I' and the correct
+spelling (e.g., `I\hbox'). Otherwise just continue,
+and I'll forget about whatever was undefined.
+! Undefined control sequence.
+<argument> \ERROR 
+l. ......F \c_testb_token \c_space_token { \ERROR }
+The control sequence at the end of the top line
+of your error message was never \def'ed. If you have
+misspelled it (e.g., `\hobx'), type `I' and the correct
+spelling (e.g., `I\hbox'). Otherwise just continue,
+and I'll forget about whatever was undefined.





More information about the latex3-commits mailing list