diff options
Diffstat (limited to 'macros/latex/contrib/l3kernel/l3deprecation.dtx')
-rw-r--r-- | macros/latex/contrib/l3kernel/l3deprecation.dtx | 417 |
1 files changed, 79 insertions, 338 deletions
diff --git a/macros/latex/contrib/l3kernel/l3deprecation.dtx b/macros/latex/contrib/l3kernel/l3deprecation.dtx index 012e0d3208..8faf863504 100644 --- a/macros/latex/contrib/l3kernel/l3deprecation.dtx +++ b/macros/latex/contrib/l3kernel/l3deprecation.dtx @@ -43,7 +43,7 @@ % }^^A % } % -% \date{Released 2020-06-18} +% \date{Released 2020-07-17} % % \maketitle % @@ -402,6 +402,52 @@ { \c_sys_jobname_str } { 2017-01-01 } \@@_old:Nnn \c_minus_one { -1 } { 2019-01-01 } +\@@_old:Nnn \c_zero + { 0 } { 2020-01-01 } +\@@_old:Nnn \c_one + { 1 } { 2020-01-01 } +\@@_old:Nnn \c_two + { 2 } { 2020-01-01 } +\@@_old:Nnn \c_three + { 3 } { 2020-01-01 } +\@@_old:Nnn \c_four + { 4 } { 2020-01-01 } +\@@_old:Nnn \c_five + { 5 } { 2020-01-01 } +\@@_old:Nnn \c_six + { 6 } { 2020-01-01 } +\@@_old:Nnn \c_seven + { 7 } { 2020-01-01 } +\@@_old:Nnn \c_eight + { 8 } { 2020-01-01 } +\@@_old:Nnn \c_nine + { 9 } { 2020-01-01 } +\@@_old:Nnn \c_ten + { 10 } { 2020-01-01 } +\@@_old:Nnn \c_eleven + { 11 } { 2020-01-01 } +\@@_old:Nnn \c_twelve + { 12 } { 2020-01-01 } +\@@_old:Nnn \c_thirteen + { 13 } { 2020-01-01 } +\@@_old:Nnn \c_fourteen + { 14 } { 2020-01-01 } +\@@_old:Nnn \c_fifteen + { 15 } { 2020-01-01 } +\@@_old:Nnn \c_sixteen + { 16 } { 2020-01-01 } +\@@_old:Nnn \c_thirty_two + { 32 } { 2020-01-01 } +\@@_old:Nnn \c_one_hundred + { 100 } { 2020-01-01 } +\@@_old:Nnn \c_two_hundred_fifty_five + { 255 } { 2020-01-01 } +\@@_old:Nnn \c_two_hundred_fifty_six + { 256 } { 2020-01-01 } +\@@_old:Nnn \c_one_thousand + { 1000 } { 2020-01-01 } +\@@_old:Nnn \c_ten_thousand + { 10000 } { 2020-01-01 } \@@_old:Nnn \dim_case:nnn { \dim_case:nnF } { 2015-07-14 } \@@_old:Nnn \file_add_path:nN @@ -442,6 +488,12 @@ { \iow_show_list: } { 2019-01-01 } \@@_old:Nnn \iow_log_streams: { \iow_log_list: } { 2019-01-01 } +\@@_old:Nnn \lua_escape_x:n + { \lua_escape:e } { 2020-01-01 } +\@@_old:Nnn \lua_now_x:n + { \lua_now:e } { 2020-01-01 } +\@@_old_protected:Nnn \lua_shipout_x:n + { \lua_shipout_e:n } { 2020-01-01 } \@@_old:Nnn \luatex_if_engine_p: { \sys_if_engine_luatex_p: } { 2017-01-01 } \@@_old:Nnn \luatex_if_engine:F @@ -450,6 +502,12 @@ { \sys_if_engine_luatex:T } { 2017-01-01 } \@@_old:Nnn \luatex_if_engine:TF { \sys_if_engine_luatex:TF } { 2017-01-01 } +\@@_old_protected:Nnn \msg_interrupt:nnn + { [Defined~error~message] } { 2020-01-01 } +\@@_old_protected:Nnn \msg_log:n + { \iow_log:n } { 2020-01-01 } +\@@_old_protected:Nnn \msg_term:n + { \iow_term:n } { 2020-01-01 } \@@_old:Nnn \pdftex_if_engine_p: { \sys_if_engine_pdftex_p: } { 2017-01-01 } \@@_old:Nnn \pdftex_if_engine:F @@ -476,8 +534,28 @@ { \str_case:nnF } { 2015-07-14 } \@@_old:Nnn \str_case:onn { \str_case:onF } { 2015-07-14 } +\@@_old:Nnn \str_case_x:nn + { \str_case_e:nn } { 2020-01-01 } \@@_old:Nnn \str_case_x:nnn { \str_case_e:nnF } { 2015-07-14 } +\@@_old:Nnn \str_case_x:nnT + { \str_case_e:nnT } { 2020-01-01 } +\@@_old:Nnn \str_case_x:nnTF + { \str_case_e:nnTF } { 2020-01-01 } +\@@_old:Nnn \str_case_x:nnF + { \str_case_e:nnF } { 2020-01-01 } +\@@_old:Nnn \str_if_eq_x_p:nn + { \str_if_eq_p:ee } { 2020-01-01 } +\@@_old:Nnn \str_if_eq_x:nnT + { \str_if_eq:eeT } { 2020-01-01 } +\@@_old:Nnn \str_if_eq_x:nnF + { \str_if_eq:eeF } { 2020-01-01 } +\@@_old:Nnn \str_if_eq_x:nnTF + { \str_if_eq:eeTF } { 2020-01-01 } +\@@_old_protected:Nnn \tl_show_analysis:N + { \tl_analysis_show:N } { 2020-01-01 } +\@@_old_protected:Nnn \tl_show_analysis:n + { \tl_analysis_show:n } { 2020-01-01 } \@@_old:Nnn \tl_case:cnn { \tl_case:cnF } { 2015-07-14 } \@@_old:Nnn \tl_case:Nnn @@ -499,70 +577,6 @@ % \end{macrocode} % \end{macro} % -% \subsection{Deprecated primitives} -% -% \begin{macro}[deprecated = 2020-07-01]{\etex_beginL:D} -% \begin{macro}{\@@_primitive:NN, \@@_primitive:w} -% We renamed all primitives to \cs[no-index]{tex_\ldots{}:D} so all -% others are deprecated. In \pkg{l3names}, \cs{__kernel_primitives:} -% is defined to contain \cs{__kernel_primitive:NN} \cs{beginL} -% \cs{etex_beginL:D} and so on, one for each deprecated primitive. We -% apply \cs{exp_not:N} to the second argument of -% \cs{__kernel_primitive:NN} because it may be outer (both when doing -% and undoing deprecation actually), then \cs{@@_primitive:NN} uses -% \cs{tex_let:D} to change the meaning of this potentially outer -% token. Then, either turn it into an error or make it equal to the -% primitive~|#1|. To be more precise, |#1| may not be defined, so try -% a \cs[no-index]{tex_\ldots{}:D} command as well. -% \begin{macrocode} -\cs_new_protected:Npn \@@_primitive:NN #1#2 { } -\exp_last_unbraced:NNNNo - \cs_new:Npn \@@_primitive:w #1 { \token_to_str:N _ } { } -\__kernel_deprecation_code:nn - { - \cs_set_protected:Npn \__kernel_primitive:NN #1 - { - \exp_after:wN \@@_primitive:NN - \exp_after:wN #1 - \exp_not:N - } - \cs_set_protected:Npn \@@_primitive:NN #1#2 - { - \tex_let:D #2 \scan_stop: - \exp_args:NNx \__kernel_deprecation_error:Nnn #2 - { - \iow_char:N \\ - \cs_if_exist:NTF #1 - { \cs_to_str:N #1 } - { - tex_ - \exp_last_unbraced:Nf - \@@_primitive:w { \cs_to_str:N #2 } - } - } - { 2020-01-01 } - } - \__kernel_primitives: - } - { - \cs_set_protected:Npn \__kernel_primitive:NN #1 - { - \exp_after:wN \@@_primitive:NN - \exp_after:wN #1 - \exp_not:N - } - \cs_set_protected:Npn \@@_primitive:NN #1#2 - { - \tex_let:D #2 #1 - \cs_if_exist:cT { tex_ \cs_to_str:N #1 :D } - { \cs_set_eq:Nc #2 { tex_ \cs_to_str:N #1 :D } } - } - \__kernel_primitives: - } -% \end{macrocode} -% \end{macro} -% \end{macro} -% % \subsection{Loading the patches} % % When loaded first, the patches are simply read here. @@ -646,243 +660,6 @@ % \end{macrocode} % \end{macro} % -% \subsection{Deprecated \pkg{l3int} functions} -% -% \begin{macrocode} -%<@@=int> -% \end{macrocode} -% -% \begin{variable}[deprecated = 2020-07-01] -% { -% \c_zero, \c_one, \c_two, \c_three, \c_four, \c_five, \c_six, -% \c_seven, \c_eight, \c_nine, \c_ten, \c_eleven, \c_twelve, -% \c_thirteen, \c_fourteen, \c_fifteen, \c_sixteen, \c_thirty_two, -% \c_one_hundred, \c_two_hundred_fifty_five, -% \c_two_hundred_fifty_six, \c_one_thousand, \c_ten_thousand, -% } -% \begin{macro}{\@@_deprecated_constants:nn} -% Constants that are now deprecated. By default define them with -% \cs{int_const:Nn}. To deprecate them call for instance -% \cs{__kernel_deprecation_error:Nnn} \cs{c_zero} |{0}| -% |{2020-01-01}|. To redefine them (locally), use -% \cs{@@_constdef:Nw}, with an \cs{exp_not:N} construction because the -% constants themselves are outer at that point. -% \begin{macrocode} -\cs_gset_protected:Npn \@@_deprecated_constants:nn #1#2 - { - #1 \c_zero { 0 } #2 - #1 \c_one { 1 } #2 - #1 \c_two { 2 } #2 - #1 \c_three { 3 } #2 - #1 \c_four { 4 } #2 - #1 \c_five { 5 } #2 - #1 \c_six { 6 } #2 - #1 \c_seven { 7 } #2 - #1 \c_eight { 8 } #2 - #1 \c_nine { 9 } #2 - #1 \c_ten { 10 } #2 - #1 \c_eleven { 11 } #2 - #1 \c_twelve { 12 } #2 - #1 \c_thirteen { 13 } #2 - #1 \c_fourteen { 14 } #2 - #1 \c_fifteen { 15 } #2 - #1 \c_sixteen { 16 } #2 - #1 \c_thirty_two { 32 } #2 - #1 \c_one_hundred { 100 } #2 - #1 \c_two_hundred_fifty_five { 255 } #2 - #1 \c_two_hundred_fifty_six { 256 } #2 - #1 \c_one_thousand { 1000 } #2 - #1 \c_ten_thousand { 10000 } #2 - } -\cs_set_protected:Npn \@@_deprecated_constants:Nn #1#2 - { - \cs_if_free:NT #1 - { \int_const:Nn #1 {#2} } - } -\@@_deprecated_constants:nn { \@@_deprecated_constants:Nn } { } -\__kernel_deprecation_code:nn - { - \@@_deprecated_constants:nn - { \exp_after:wN \__kernel_deprecation_error:Nnn \exp_not:N } - { { 2020-01-01 } } - } - { - \@@_deprecated_constants:nn - { - \exp_after:wN \use:nnn - \exp_after:wN \@@_constdef:Nw \exp_not:N - } - { \exp_stop_f: } - } -% \end{macrocode} -% \end{macro} -% \end{variable} -% -% \begin{macro}[deprecated = 2020-07-01]{\@@_value:w} -% Made public. -% \begin{macrocode} -\cs_gset_eq:NN \@@_value:w \int_value:w -% \end{macrocode} -% \end{macro} -% -% \subsection{Deprecated \pkg{l3luatex} functions} -% -% \begin{macrocode} -%<@@=lua> -% \end{macrocode} -% -% \begin{macro}[EXP, deprecated = 2020-07-01]{\lua_now_x:n, \lua_escape_x:n} -% \begin{macro}[deprecated = 2020-07-01]{\lua_shipout_x:n} -% \begin{macrocode} -\__kernel_patch_deprecation:nnNNpn { 2020-01-01 } { \lua_now:e } -\cs_gset:Npn \lua_now_x:n #1 { \@@_now:n {#1} } -\__kernel_patch_deprecation:nnNNpn { 2020-01-01 } { \lua_escape:e } -\cs_gset:Npn \lua_escape_x:n #1 { \@@_escape:n {#1} } -\__kernel_patch_deprecation:nnNNpn { 2020-01-01 } { \lua_shipout_e:n } -\cs_gset_protected:Npn \lua_shipout_x:n #1 { \@@_shipout:n {#1} } -% \end{macrocode} -% \end{macro} -% \end{macro} -% -% \subsection{Deprecated \pkg{l3msg} functions} -% -% \begin{macrocode} -%<@@=msg> -% \end{macrocode} -% -% \begin{macro}[deprecated = 2020-07-01]{\msg_log:n, \msg_term:n} -% \begin{macrocode} -\__kernel_patch_deprecation:nnNNpn { 2020-01-01 } { \iow_log:n } -\cs_gset_protected:Npn \msg_log:n #1 - { - \iow_log:n { ................................................. } - \iow_wrap:nnnN { . ~ #1} { . ~ } { } \iow_log:n - \iow_log:n { ................................................. } - } -\__kernel_patch_deprecation:nnNNpn { 2020-01-01 } { \iow_term:n } -\cs_gset_protected:Npn \msg_term:n #1 - { - \iow_term:n { ************************************************* } - \iow_wrap:nnnN { * ~ #1} { * ~ } { } \iow_term:n - \iow_term:n { ************************************************* } - } -% \end{macrocode} -% \end{macro} -% -% \begin{macro}[deprecated = 2020-07-01]{\msg_interrupt:nnn} -% \begin{macrocode} -\__kernel_patch_deprecation:nnNNpn { 2020-01-01 } { [Defined~error~message] } -\cs_gset_protected:Npn \msg_interrupt:nnn #1#2#3 - { - \tl_if_empty:nTF {#3} - { - \@@_old_interrupt_wrap:nn { \\ \c_@@_no_info_text_tl } - {#1 \\\\ #2 \\\\ \c_@@_continue_text_tl } - } - { - \@@_old_interrupt_wrap:nn { \\ #3 } - {#1 \\\\ #2 \\\\ \c_@@_help_text_tl } - } - } -\cs_gset_protected:Npn \@@_old_interrupt_wrap:nn #1#2 - { - \iow_wrap:nnnN {#1} { | ~ } { } \@@_old_interrupt_more_text:n - \iow_wrap:nnnN {#2} { ! ~ } { } \@@_old_interrupt_text:n - } -\cs_gset_protected:Npn \@@_old_interrupt_more_text:n #1 - { - \exp_args:Nx \tex_errhelp:D - { - |''''''''''''''''''''''''''''''''''''''''''''''' - #1 \iow_newline: - |............................................... - } - } -\group_begin: - \char_set_lccode:nn {`\{} {`\ } - \char_set_lccode:nn {`\}} {`\ } - \char_set_lccode:nn {`\&} {`\!} - \char_set_catcode_active:N \& -\tex_lowercase:D - { - \group_end: - \cs_gset_protected:Npn \@@_old_interrupt_text:n #1 - { - \iow_term:x - { - \iow_newline: - !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! - \iow_newline: - ! - } - \__kernel_iow_with:Nnn \tex_newlinechar:D { `\^^J } - { - \__kernel_iow_with:Nnn \tex_errorcontextlines:D { -1 } - { - \group_begin: - \cs_set_protected:Npn & - { - \tex_errmessage:D - { - #1 - \use_none:n - { ............................................ } - } - } - \exp_after:wN - \group_end: - & - } - } - } - } -% \end{macrocode} -% \end{macro} -% -% \subsection{Deprecated \pkg{l3prg} functions} -% -% \begin{macrocode} -%<@@=prg> -% \end{macrocode} -% -% \begin{macro}[deprecated = 2020-07-01] -% { -% \@@_break_point:Nn, -% \@@_break_point:, -% \@@_map_break:Nn, -% \@@_break:, -% \@@_break:n -% } -% Made public, but used by a few third-parties. It's not possible to -% perfectly support a mixture of \cs{@@_map_break:Nn} and -% \cs{prg_map_break:Nn} because they use different delimiters. The -% following code only breaks if someone tries to break from two -% \enquote{old-style} \cs{@@_map_break:Nn} \ldots{} -% \cs{@@_break_point:Nn} mappings in one go. Basically, the -% \cs{@@_map_break:Nn} converts a single \cs{@@_break_point:Nn} to -% \cs{prg_break_point:Nn}, and that delimiter had better be the right -% one. Then we call \cs{prg_map_break:Nn} which may end up breaking -% intermediate looks in the (unbraced) argument |#1|. It is essential -% to define the |break_point| functions before the corresponding -% |break| functions: otherwise \cs{debug_on:n} |{deprecation}| -% \cs{debug_off:n} |{deprecation}| would break when trying to restore -% the definitions because they would involve deprecated commands whose -% definition has not yet been restored. -% \begin{macrocode} -\__kernel_patch_deprecation:nnNNpn { 2020-01-01 } { \prg_break_point:Nn } -\cs_gset:Npn \@@_break_point:Nn { \prg_break_point:Nn } -\__kernel_patch_deprecation:nnNNpn { 2020-01-01 } { \prg_break_point: } -\cs_gset:Npn \@@_break_point: { \prg_break_point: } -\__kernel_patch_deprecation:nnNNpn { 2020-01-01 } { \prg_map_break:Nn } -\cs_gset:Npn \@@_map_break:Nn #1 \@@_break_point:Nn - { \prg_map_break:Nn #1 \prg_break_point:Nn } -\__kernel_patch_deprecation:nnNNpn { 2020-01-01 } { \prg_break: } -\cs_gset:Npn \@@_break: #1 \@@_break_point: { } -\__kernel_patch_deprecation:nnNNpn { 2020-01-01 } { \prg_break:n } -\cs_gset:Npn \@@_break:n #1#2 \@@_break_point: {#1} -% \end{macrocode} -% \end{macro} -% % \subsection{Deprecated \pkg{l3str} functions} % % \begin{macro}[EXP, deprecated = 2022-07-01] @@ -907,29 +684,6 @@ % \end{macrocode} % \end{macro} % -% \begin{macro}[EXP, deprecated = 2020-07-01, noTF]{\str_case_x:nn} -% \begin{macro}[EXP, deprecated = 2020-07-01, pTF]{\str_if_eq_x:nn} -% \begin{macrocode} -\__kernel_patch_deprecation:nnNNpn { 2020-01-01 } { \str_case_e:nn } -\cs_gset:Npn \str_case_x:nn { \str_case_e:nn } -\__kernel_patch_deprecation:nnNNpn { 2020-01-01 } { \str_case_e:nnT } -\cs_gset:Npn \str_case_x:nnT { \str_case_e:nnT } -\__kernel_patch_deprecation:nnNNpn { 2020-01-01 } { \str_case_e:nnF } -\cs_gset:Npn \str_case_x:nnF { \str_case_e:nnF } -\__kernel_patch_deprecation:nnNNpn { 2020-01-01 } { \str_case_e:nnTF } -\cs_gset:Npn \str_case_x:nnTF { \str_case_e:nnTF } -\__kernel_patch_deprecation:nnNNpn { 2020-01-01 } { \str_if_eq_p:ee } -\cs_gset:Npn \str_if_eq_x_p:nn { \str_if_eq_p:ee } -\__kernel_patch_deprecation:nnNNpn { 2020-01-01 } { \str_if_eq:eeT } -\cs_gset:Npn \str_if_eq_x:nnT { \str_if_eq:eeT } -\__kernel_patch_deprecation:nnNNpn { 2020-01-01 } { \str_if_eq:eeF } -\cs_gset:Npn \str_if_eq_x:nnF { \str_if_eq:eeF } -\__kernel_patch_deprecation:nnNNpn { 2020-01-01 } { \str_if_eq:eeTF } -\cs_gset:Npn \str_if_eq_x:nnTF { \str_if_eq:eeTF } -% \end{macrocode} -% \end{macro} -% \end{macro} -% % \subsection{Deprecated \pkg{l3seq} functions} % % \begin{macro}[EXP, deprecated = 2023-01-01] @@ -1023,19 +777,6 @@ % \end{macrocode} % \end{macro} % -% \subsection{Deprecated \pkg{l3tl-analysis} functions} -% -% \begin{macro}[deprecated = 2020-07-01] -% {\tl_show_analysis:N, \tl_show_analysis:n} -% Simple renames. -% \begin{macrocode} -\__kernel_patch_deprecation:nnNNpn { 2020-01-01 } { \tl_analysis_show:N } -\cs_gset_protected:Npn \tl_show_analysis:N { \tl_analysis_show:N } -\__kernel_patch_deprecation:nnNNpn { 2020-01-01 } { \tl_analysis_show:n } -\cs_gset_protected:Npn \tl_show_analysis:n { \tl_analysis_show:n } -% \end{macrocode} -% \end{macro} -% % \subsection{Deprecated \pkg{l3token} functions} % % \begin{macro}[EXP, deprecated = 2021-07-01] |