summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/source/latex/l3kernel/l3deprecation.dtx
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2019-09-29 21:16:44 +0000
committerKarl Berry <karl@freefriends.org>2019-09-29 21:16:44 +0000
commitcde95caf86c78ec9b7641198abfd0a7768f5100e (patch)
treedd771c114615e169fe3bde469f39dcac3a7ce074 /Master/texmf-dist/source/latex/l3kernel/l3deprecation.dtx
parent35c007d48195f11757c61c71a9a0eb88420dc9d0 (diff)
l3 (29sep19)
git-svn-id: svn://tug.org/texlive/trunk@52214 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/source/latex/l3kernel/l3deprecation.dtx')
-rw-r--r--Master/texmf-dist/source/latex/l3kernel/l3deprecation.dtx147
1 files changed, 100 insertions, 47 deletions
diff --git a/Master/texmf-dist/source/latex/l3kernel/l3deprecation.dtx b/Master/texmf-dist/source/latex/l3kernel/l3deprecation.dtx
index 41a8bed1a26..82a770ad80a 100644
--- a/Master/texmf-dist/source/latex/l3kernel/l3deprecation.dtx
+++ b/Master/texmf-dist/source/latex/l3kernel/l3deprecation.dtx
@@ -43,7 +43,7 @@
% }^^A
% }
%
-% \date{Released 2019-09-19}
+% \date{Released 2019-09-28}
%
% \maketitle
%
@@ -90,6 +90,10 @@
% \end{macrocode}
%
% \begin{macrocode}
+%<*kernel>
+% \end{macrocode}
+%
+% \begin{macrocode}
%<@@=deprecation>
% \end{macrocode}
%
@@ -126,6 +130,12 @@
% \end{macrocode}
% \end{macro}
%
+% \begin{variable}{\g__kernel_deprecation_undo_recent_bool}
+% \begin{macrocode}
+\bool_new:N \g__kernel_deprecation_undo_recent_bool
+% \end{macrocode}
+% \end{variable}
+%
% \begin{macro}{\@@_not_yet_deprecated:nTF, \@@_minus_six_months:w}
% Receives a deprecation \meta{date} and runs the \texttt{true}
% (\texttt{false}) branch if the \pkg{expl3} date is earlier (later)
@@ -149,7 +159,7 @@
} < {#1}
{
\bool_set_true:N \l_@@_grace_period_bool
- \bool_if:NTF \l@expl@undo@recent@deprecations@bool
+ \bool_if:NTF \g__kernel_deprecation_undo_recent_bool
}
{ \use_ii:nn }
}
@@ -242,9 +252,9 @@
{
\bool_if:nTF
{
- \cs_if_eq_p:NN #3 \cs_new_protected:Npn &&
+ \cs_if_eq_p:NN #3 \cs_gset_protected:Npn &&
\__kernel_if_debug:TF
- { \c_true_bool } { \l@expl@undo@recent@deprecations@bool }
+ { \c_true_bool } { \g__kernel_deprecation_undo_recent_bool }
}
{ \@@_warn_once:nnNnn {#1} {#2} #4 {#5} {#6} }
{ \@@_patch_aux:Nn #3 { #4 #5 {#6} } }
@@ -263,7 +273,7 @@
% \begin{macrocode}
\cs_new_protected:Npn \@@_warn_once:nnNnn #1#2#3#4#5
{
- \cs_new_protected:Npx #3
+ \cs_gset_protected:Npx #3
{
\__kernel_if_debug:TF
{
@@ -292,7 +302,7 @@
\cs_new_protected:Npn \@@_patch_aux:Nn #1#2
{
#1 #2
- \cs_if_eq:NNTF #1 \cs_new_protected:Npn
+ \cs_if_eq:NNTF #1 \cs_gset_protected:Npn
{ \__kernel_deprecation_code:nn { } { \cs_set_protected:Npn #2 } }
{ \__kernel_deprecation_code:nn { } { \cs_set:Npn #2 } }
}
@@ -311,7 +321,7 @@
{
\exp_not:N #4
{
- \cs_if_eq:NNTF #3 \cs_new_protected:Npn
+ \cs_if_eq:NNTF #3 \cs_gset_protected:Npn
{ \exp_not:N \__kernel_msg_error:nnnnnn }
{ \exp_not:N \__kernel_msg_expandable_error:nnnnnn }
{ kernel } { deprecated-command }
@@ -369,12 +379,12 @@
\cs_new_protected:Npn \@@_old_protected:Nnn #1#2#3
{
\__kernel_patch_deprecation:nnNNpn {#3} {#2}
- \cs_new_protected:Npn #1 { }
+ \cs_gset_protected:Npn #1 { }
}
\cs_new_protected:Npn \@@_old:Nnn #1#2#3
{
\__kernel_patch_deprecation:nnNNpn {#3} {#2}
- \cs_new:Npn #1 { }
+ \cs_gset:Npn #1 { }
}
\@@_old:Nnn \box_resize:Nnn
{ \box_resize_to_wd_and_ht_plus_dp:Nnn } { 2019-01-01 }
@@ -545,6 +555,40 @@
% \end{macro}
% \end{macro}
%
+% \subsection{Loading the patches}
+%
+% When loaded first, the patches are simply read here.
+%
+% \begin{macrocode}
+\group_begin:
+\cs_set_protected:Npn \ProvidesExplFile
+ {
+ \char_set_catcode_space:n { `\ }
+ \ProvidesExplFileAux
+ }
+\cs_set_protected:Npx \ProvidesExplFileAux #1#2#3#4
+ {
+ \group_end:
+ \cs_if_exist:NTF \ProvidesFile
+ { \exp_not:N \ProvidesFile {#1} [ #2~v#3~#4 ] }
+ { \iow_log:x { File:~#1~#2~v#3~#4 } }
+ }
+\file_input:n { l3deprecation.def }
+% \end{macrocode}
+%
+% \begin{macrocode}
+%</kernel>
+% \end{macrocode}
+%
+% \begin{macrocode}
+%<*patches>
+% \end{macrocode}
+%
+% Standard file identification.
+% \begin{macrocode}
+\ProvidesExplFile{l3deprecation.def}{2019-04-06}{}{L3 Deprecated functions}
+% \end{macrocode}
+%
% \subsection{Deprecated \pkg{l3box} functions}
%
% \begin{macro}[deprecated = 2021-07-01]
@@ -559,10 +603,10 @@
% }
% \begin{macrocode}
\__kernel_patch_deprecation:nnNNpn { 2021-01-01 } { \box_set_eq_drop:N }
-\cs_new_protected:Npn \box_set_eq_clear:NN #1#2
+\cs_gset_protected:Npn \box_set_eq_clear:NN #1#2
{ \tex_setbox:D #1 \tex_box:D #2 }
\__kernel_patch_deprecation:nnNNpn { 2021-01-01 } { \box_gset_eq_drop:N }
-\cs_new_protected:Npn \box_gset_eq_clear:NN #1#2
+\cs_gset_protected:Npn \box_gset_eq_clear:NN #1#2
{ \tex_global:D \tex_setbox:D #1 \tex_box:D #2 }
\cs_generate_variant:Nn \box_set_eq_clear:NN { c , Nc , cc }
\cs_generate_variant:Nn \box_gset_eq_clear:NN { c , Nc , cc }
@@ -573,7 +617,7 @@
% \begin{macro}[deprecated = 2021-07-01]{\hbox_unpack_clear:N, \hbox_unpack_clear:c}
% \begin{macrocode}
\__kernel_patch_deprecation:nnNNpn { 2021-01-01 } { \hbox_unpack_drop:N }
-\cs_new_protected:Npn \hbox_unpack_clear:N
+\cs_gset_protected:Npn \hbox_unpack_clear:N
{ \hbox_unpack_drop:N }
\cs_generate_variant:Nn \hbox_unpack_clear:N { c }
% \end{macrocode}
@@ -582,7 +626,7 @@
% \begin{macro}[deprecated = 2021-07-01]{\vbox_unpack_clear:N, \vbox_unpack_clear:c}
% \begin{macrocode}
\__kernel_patch_deprecation:nnNNpn { 2021-01-01 } { \vbox_unpack_drop:N }
-\cs_new_protected:Npn \vbox_unpack_clear:N
+\cs_gset_protected:Npn \vbox_unpack_clear:N
{ \vbox_unpack_drop:N }
\cs_generate_variant:Nn \vbox_unpack_clear:N { c }
% \end{macrocode}
@@ -610,7 +654,7 @@
% \cs{@@_constdef:Nw}, with an \cs{exp_not:N} construction because the
% constants themselves are outer at that point.
% \begin{macrocode}
-\cs_new_protected:Npn \@@_deprecated_constants:nn #1#2
+\cs_gset_protected:Npn \@@_deprecated_constants:nn #1#2
{
#1 \c_zero { 0 } #2
#1 \c_one { 1 } #2
@@ -636,7 +680,12 @@
#1 \c_one_thousand { 1000 } #2
#1 \c_ten_thousand { 10000 } #2
}
-\@@_deprecated_constants:nn { \int_const:Nn } { }
+\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
@@ -658,7 +707,7 @@
% \begin{macro}[deprecated = 2020-07-01]{\@@_value:w}
% Made public.
% \begin{macrocode}
-\cs_new_eq:NN \@@_value:w \int_value:w
+\cs_gset_eq:NN \@@_value:w \int_value:w
% \end{macrocode}
% \end{macro}
%
@@ -672,11 +721,11 @@
% \begin{macro}[deprecated = 2020-07-01]{\lua_shipout_x:n}
% \begin{macrocode}
\__kernel_patch_deprecation:nnNNpn { 2020-01-01 } { \lua_now:e }
-\cs_new:Npn \lua_now_x:n #1 { \@@_now:n {#1} }
+\cs_gset:Npn \lua_now_x:n #1 { \@@_now:n {#1} }
\__kernel_patch_deprecation:nnNNpn { 2020-01-01 } { \lua_escape:e }
-\cs_new:Npn \lua_escape_x:n #1 { \@@_escape:n {#1} }
+\cs_gset:Npn \lua_escape_x:n #1 { \@@_escape:n {#1} }
\__kernel_patch_deprecation:nnNNpn { 2020-01-01 } { \lua_shipout_e:n }
-\cs_new_protected:Npn \lua_shipout_x:n #1 { \@@_shipout:n {#1} }
+\cs_gset_protected:Npn \lua_shipout_x:n #1 { \@@_shipout:n {#1} }
% \end{macrocode}
% \end{macro}
% \end{macro}
@@ -690,14 +739,14 @@
% \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_new_protected:Npn \msg_log:n #1
+\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_new_protected:Npn \msg_term:n #1
+\cs_gset_protected:Npn \msg_term:n #1
{
\iow_term:n { ************************************************* }
\iow_wrap:nnnN { * ~ #1} { * ~ } { } \iow_term:n
@@ -709,7 +758,7 @@
% \begin{macro}[deprecated = 2020-07-01]{\msg_interrupt:nnn}
% \begin{macrocode}
\__kernel_patch_deprecation:nnNNpn { 2020-01-01 } { [Defined~error~message] }
-\cs_new_protected:Npn \msg_interrupt:nnn #1#2#3
+\cs_gset_protected:Npn \msg_interrupt:nnn #1#2#3
{
\tl_if_empty:nTF {#3}
{
@@ -721,12 +770,12 @@
{#1 \\\\ #2 \\\\ \c_@@_help_text_tl }
}
}
-\cs_new_protected:Npn \@@_old_interrupt_wrap:nn #1#2
+\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_new_protected:Npn \@@_old_interrupt_more_text:n #1
+\cs_gset_protected:Npn \@@_old_interrupt_more_text:n #1
{
\exp_args:Nx \tex_errhelp:D
{
@@ -743,7 +792,7 @@
\tex_lowercase:D
{
\group_end:
- \cs_new_protected:Npn \@@_old_interrupt_text:n #1
+ \cs_gset_protected:Npn \@@_old_interrupt_text:n #1
{
\iow_term:x
{
@@ -807,16 +856,16 @@
% definition has not yet been restored.
% \begin{macrocode}
\__kernel_patch_deprecation:nnNNpn { 2020-01-01 } { \prg_break_point:Nn }
-\cs_new:Npn \@@_break_point:Nn { \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_new:Npn \@@_break_point: { \prg_break_point: }
+\cs_gset:Npn \@@_break_point: { \prg_break_point: }
\__kernel_patch_deprecation:nnNNpn { 2020-01-01 } { \prg_map_break:Nn }
-\cs_new:Npn \@@_map_break:Nn #1 \@@_break_point: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_new:Npn \@@_break: #1 \@@_break_point: { }
+\cs_gset:Npn \@@_break: #1 \@@_break_point: { }
\__kernel_patch_deprecation:nnNNpn { 2020-01-01 } { \prg_break:n }
-\cs_new:Npn \@@_break:n #1#2 \@@_break_point: {#1}
+\cs_gset:Npn \@@_break:n #1#2 \@@_break_point: {#1}
% \end{macrocode}
% \end{macro}
%
@@ -826,21 +875,21 @@
% \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_new:Npn \str_case_x:nn { \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_new:Npn \str_case_x:nnT { \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_new:Npn \str_case_x:nnF { \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_new:Npn \str_case_x:nnTF { \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_new:Npn \str_if_eq_x_p:nn { \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_new:Npn \str_if_eq_x:nnT { \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_new:Npn \str_if_eq_x:nnF { \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_new:Npn \str_if_eq_x:nnTF { \str_if_eq:eeTF }
+\cs_gset:Npn \str_if_eq_x:nnTF { \str_if_eq:eeTF }
% \end{macrocode}
% \end{macro}
% \end{macro}
@@ -860,11 +909,11 @@
% }
% \begin{macrocode}
\__kernel_patch_deprecation:nnNNpn { 2021-01-01 } { \file_get:nnN }
-\cs_new_protected:Npn \tl_set_from_file:Nnn #1#2#3
+\cs_gset_protected:Npn \tl_set_from_file:Nnn #1#2#3
{ \file_get:nnN {#3} {#2} #1 }
\cs_generate_variant:Nn \tl_set_from_file:Nnn { c }
\__kernel_patch_deprecation:nnNNpn { 2021-01-01 } { \file_get:nnN }
-\cs_new_protected:Npn \tl_gset_from_file:Nnn #1#2#3
+\cs_gset_protected:Npn \tl_gset_from_file:Nnn #1#2#3
{
\group_begin:
\file_get:nnN {#3} {#2} \l_@@_internal_a_tl
@@ -873,7 +922,7 @@
}
\cs_generate_variant:Nn \tl_gset_from_file:Nnn { c }
\__kernel_patch_deprecation:nnNNpn { 2021-01-01 } { \file_get:nnN }
-\cs_new_protected:Npn \tl_set_from_file_x:Nnn #1#2#3
+\cs_gset_protected:Npn \tl_set_from_file_x:Nnn #1#2#3
{
\group_begin:
\file_get:nnN {#3} {#2} \l_@@_internal_a_tl
@@ -884,7 +933,7 @@
}
\cs_generate_variant:Nn \tl_set_from_file_x:Nnn { c }
\__kernel_patch_deprecation:nnNNpn { 2021-01-01 } { \file_get:nnN }
-\cs_new_protected:Npn \tl_gset_from_file_x:Nnn #1#2#3
+\cs_gset_protected:Npn \tl_gset_from_file_x:Nnn #1#2#3
{
\group_begin:
\file_get:nnN {#3} {#2} \l_@@_internal_a_tl
@@ -903,9 +952,9 @@
% Simple renames.
% \begin{macrocode}
\__kernel_patch_deprecation:nnNNpn { 2020-01-01 } { \tl_analysis_show:N }
-\cs_new_protected:Npn \tl_show_analysis:N { \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_new_protected:Npn \tl_show_analysis:n { \tl_analysis_show:n }
+\cs_gset_protected:Npn \tl_show_analysis:n { \tl_analysis_show:n }
% \end{macrocode}
% \end{macro}
%
@@ -919,11 +968,11 @@
% }
% \begin{macrocode}
\__kernel_patch_deprecation:nnNNpn { 2021-01-01 } { \cs_prefix_spec:N }
-\cs_new:Npn \token_get_prefix_spec:N { \cs_prefix_spec:N }
+\cs_gset:Npn \token_get_prefix_spec:N { \cs_prefix_spec:N }
\__kernel_patch_deprecation:nnNNpn { 2021-01-01 } { \cs_argument_spec:N }
-\cs_new:Npn \token_get_arg_spec:N { \cs_argument_spec:N }
+\cs_gset:Npn \token_get_arg_spec:N { \cs_argument_spec:N }
\__kernel_patch_deprecation:nnNNpn { 2021-01-01 } { \cs_replacement_spec:N }
-\cs_new:Npn \token_get_replacement_spec:N { \cs_replacement_spec:N }
+\cs_gset:Npn \token_get_replacement_spec:N { \cs_replacement_spec:N }
% \end{macrocode}
% \end{macro}
%
@@ -937,6 +986,10 @@
% \end{macro}
%
% \begin{macrocode}
+%</patches>
+% \end{macrocode}
+%
+% \begin{macrocode}
%</initex|package>
% \end{macrocode}
%