[latex3-commits] [git/LaTeX3-latex3-latex3] master: Make deprecation code kernel-reserved (818da61)
Joseph Wright
joseph.wright at morningstar2.co.uk
Sun Apr 1 22:49:29 CEST 2018
Repository : https://github.com/latex3/latex3
On branch : master
Link : https://github.com/latex3/latex3/commit/818da611e98baf59cf8e79c4c81a41c4193b7c6e
>---------------------------------------------------------------
commit 818da611e98baf59cf8e79c4c81a41c4193b7c6e
Author: Joseph Wright <joseph.wright at morningstar2.co.uk>
Date: Sun Apr 1 21:49:29 2018 +0100
Make deprecation code kernel-reserved
>---------------------------------------------------------------
818da611e98baf59cf8e79c4c81a41c4193b7c6e
l3kernel/l3basics.dtx | 4 +-
l3kernel/l3deprecation.dtx | 76 +++++++++++++++----------------
l3kernel/l3file.dtx | 2 +-
l3kernel/l3int.dtx | 10 ++--
l3kernel/testfiles/m3expl001.luatex.tlg | 2 +-
l3kernel/testfiles/m3expl001.ptex.tlg | 2 +-
l3kernel/testfiles/m3expl001.tlg | 2 +-
l3kernel/testfiles/m3expl001.uptex.tlg | 2 +-
l3kernel/testfiles/m3expl001.xetex.tlg | 2 +-
l3kernel/testfiles/m3expl003.luatex.tlg | 2 +-
l3kernel/testfiles/m3expl003.ptex.tlg | 2 +-
l3kernel/testfiles/m3expl003.tlg | 2 +-
l3kernel/testfiles/m3expl003.uptex.tlg | 2 +-
l3kernel/testfiles/m3expl003.xetex.tlg | 2 +-
14 files changed, 56 insertions(+), 56 deletions(-)
diff --git a/l3kernel/l3basics.dtx b/l3kernel/l3basics.dtx
index 8085495..9aa4444 100644
--- a/l3kernel/l3basics.dtx
+++ b/l3kernel/l3basics.dtx
@@ -2153,7 +2153,7 @@
\tl_gput_right:Nn \g_@@_deprecation_on_tl
{
\tex_let:D #3 \scan_stop:
- \__deprecation_error:Nnn #3 {#2} {#1}
+ \__kernel_deprecation_error:Nnn #3 {#2} {#1}
}
\tl_gput_right:Nn \g_@@_deprecation_off_tl
{
@@ -2174,7 +2174,7 @@
\tl_gput_right:Nn \g_@@_deprecation_on_tl
{
\tex_let:D #3 \scan_stop:
- \__deprecation_error:Nnn #3 {#2} {#1}
+ \__kernel_deprecation_error:Nnn #3 {#2} {#1}
}
\tl_gput_right:Nn \g_@@_deprecation_off_tl
{
diff --git a/l3kernel/l3deprecation.dtx b/l3kernel/l3deprecation.dtx
index 95664eb..d83a665 100644
--- a/l3kernel/l3deprecation.dtx
+++ b/l3kernel/l3deprecation.dtx
@@ -66,12 +66,12 @@
%<@@=deprecation>
% \end{macrocode}
%
-% \begin{macro}{\@@_error:Nnn}
+% \begin{macro}{\__kernel_deprecation_error:Nnn}
% The \tn{outer} definition here ensures the command cannot appear
% in an argument. Use this auxiliary on all commands that have been
% removed since 2015.
% \begin{macrocode}
-\cs_new_protected:Npn \@@_error:Nnn #1#2#3
+\cs_new_protected:Npn \__kernel_deprecation_error:Nnn #1#2#3
{
\etex_protected:D \tex_outer:D \tex_edef:D #1
{
@@ -83,42 +83,42 @@
{ \tl_to_str:n {#3} } { \token_to_str:N #1 } { \tl_to_str:n {#2} }
}
}
-\@@_error:Nnn \file_if_exist_input:nT { \file_if_exist:nT and~ \file_input:n } { 2018-03-05 }
-\@@_error:Nnn \file_if_exist_input:nTF { \file_if_exist:nT and~ \file_input:n } { 2018-03-05 }
-\@@_error:Nnn \c_job_name_tl { \c_sys_jobname_str } { 2017-01-01 }
-\@@_error:Nnn \dim_case:nnn { \dim_case:nnF } { 2015-07-14 }
-\@@_error:Nnn \int_case:nnn { \int_case:nnF } { 2015-07-14 }
-\@@_error:Nnn \int_from_binary:n { \int_from_bin:n } { 2016-01-05 }
-\@@_error:Nnn \int_from_hexadecimal:n { \int_from_hex:n } { 2016-01-05 }
-\@@_error:Nnn \int_from_octal:n { \int_from_oct:n } { 2016-01-05 }
-\@@_error:Nnn \int_to_binary:n { \int_to_bin:n } { 2016-01-05 }
-\@@_error:Nnn \int_to_hexadecimal:n { \int_to_hex:n } { 2016-01-05 }
-\@@_error:Nnn \int_to_octal:n { \int_to_oct:n } { 2016-01-05 }
-\@@_error:Nnn \ior_get_str:NN { \ior_str_get:NN } { 2018-03-05 }
-\@@_error:Nnn \luatex_if_engine_p: { \sys_if_engine_luatex_p: } { 2017-01-01 }
-\@@_error:Nnn \luatex_if_engine:F { \sys_if_engine_luatex:F } { 2017-01-01 }
-\@@_error:Nnn \luatex_if_engine:T { \sys_if_engine_luatex:T } { 2017-01-01 }
-\@@_error:Nnn \luatex_if_engine:TF { \sys_if_engine_luatex:TF } { 2017-01-01 }
-\@@_error:Nnn \pdftex_if_engine_p: { \sys_if_engine_pdftex_p: } { 2017-01-01 }
-\@@_error:Nnn \pdftex_if_engine:F { \sys_if_engine_pdftex:F } { 2017-01-01 }
-\@@_error:Nnn \pdftex_if_engine:T { \sys_if_engine_pdftex:T } { 2017-01-01 }
-\@@_error:Nnn \pdftex_if_engine:TF { \sys_if_engine_pdftex:TF } { 2017-01-01 }
-\@@_error:Nnn \prop_get:cn { \prop_item:cn } { 2016-01-05 }
-\@@_error:Nnn \prop_get:Nn { \prop_item:Nn } { 2016-01-05 }
-\@@_error:Nnn \quark_if_recursion_tail_break:N { } { 2015-07-14 }
-\@@_error:Nnn \quark_if_recursion_tail_break:n { }{ 2015-07-14 }
-\@@_error:Nnn \scan_align_safe_stop: { protected~commands } { 2017-01-01 }
-\@@_error:Nnn \str_case:nnn { \str_case:nnF } { 2015-07-14 }
-\@@_error:Nnn \str_case:onn { \str_case:onF } { 2015-07-14 }
-\@@_error:Nnn \str_case_x:nnn { \str_case_x:nnF } { 2015-07-14 }
-\@@_error:Nnn \tl_case:cnn { \tl_case:cnF } { 2015-07-14 }
-\@@_error:Nnn \tl_case:Nnn { \tl_case:NnF } { 2015-07-14 }
-\@@_error:Nnn \tl_to_lowercase:n { \tex_lowercase:D } { 2018-03-05 }
-\@@_error:Nnn \tl_to_uppercase:n { \tex_uppercase:D } { 2018-03-05 }
-\@@_error:Nnn \xetex_if_engine_p: { \sys_if_engine_xetex_p: } { 2017-01-01 }
-\@@_error:Nnn \xetex_if_engine:F { \sys_if_engine_xetex:F } { 2017-01-01 }
-\@@_error:Nnn \xetex_if_engine:T { \sys_if_engine_xetex:T } { 2017-01-01 }
-\@@_error:Nnn \xetex_if_engine:TF { \sys_if_engine_xetex:TF } { 2017-01-01 }
+\__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 \c_job_name_tl { \c_sys_jobname_str } { 2017-01-01 }
+\__kernel_deprecation_error:Nnn \dim_case:nnn { \dim_case:nnF } { 2015-07-14 }
+\__kernel_deprecation_error:Nnn \int_case:nnn { \int_case:nnF } { 2015-07-14 }
+\__kernel_deprecation_error:Nnn \int_from_binary:n { \int_from_bin:n } { 2016-01-05 }
+\__kernel_deprecation_error:Nnn \int_from_hexadecimal:n { \int_from_hex:n } { 2016-01-05 }
+\__kernel_deprecation_error:Nnn \int_from_octal:n { \int_from_oct:n } { 2016-01-05 }
+\__kernel_deprecation_error:Nnn \int_to_binary:n { \int_to_bin:n } { 2016-01-05 }
+\__kernel_deprecation_error:Nnn \int_to_hexadecimal:n { \int_to_hex:n } { 2016-01-05 }
+\__kernel_deprecation_error:Nnn \int_to_octal:n { \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 \luatex_if_engine_p: { \sys_if_engine_luatex_p: } { 2017-01-01 }
+\__kernel_deprecation_error:Nnn \luatex_if_engine:F { \sys_if_engine_luatex:F } { 2017-01-01 }
+\__kernel_deprecation_error:Nnn \luatex_if_engine:T { \sys_if_engine_luatex:T } { 2017-01-01 }
+\__kernel_deprecation_error:Nnn \luatex_if_engine:TF { \sys_if_engine_luatex:TF } { 2017-01-01 }
+\__kernel_deprecation_error:Nnn \pdftex_if_engine_p: { \sys_if_engine_pdftex_p: } { 2017-01-01 }
+\__kernel_deprecation_error:Nnn \pdftex_if_engine:F { \sys_if_engine_pdftex:F } { 2017-01-01 }
+\__kernel_deprecation_error:Nnn \pdftex_if_engine:T { \sys_if_engine_pdftex:T } { 2017-01-01 }
+\__kernel_deprecation_error:Nnn \pdftex_if_engine:TF { \sys_if_engine_pdftex:TF } { 2017-01-01 }
+\__kernel_deprecation_error:Nnn \prop_get:cn { \prop_item:cn } { 2016-01-05 }
+\__kernel_deprecation_error:Nnn \prop_get:Nn { \prop_item:Nn } { 2016-01-05 }
+\__kernel_deprecation_error:Nnn \quark_if_recursion_tail_break:N { } { 2015-07-14 }
+\__kernel_deprecation_error:Nnn \quark_if_recursion_tail_break:n { }{ 2015-07-14 }
+\__kernel_deprecation_error:Nnn \scan_align_safe_stop: { protected~commands } { 2017-01-01 }
+\__kernel_deprecation_error:Nnn \str_case:nnn { \str_case:nnF } { 2015-07-14 }
+\__kernel_deprecation_error:Nnn \str_case:onn { \str_case:onF } { 2015-07-14 }
+\__kernel_deprecation_error:Nnn \str_case_x:nnn { \str_case_x:nnF } { 2015-07-14 }
+\__kernel_deprecation_error:Nnn \tl_case:cnn { \tl_case:cnF } { 2015-07-14 }
+\__kernel_deprecation_error:Nnn \tl_case:Nnn { \tl_case:NnF } { 2015-07-14 }
+\__kernel_deprecation_error:Nnn \tl_to_lowercase:n { \tex_lowercase:D } { 2018-03-05 }
+\__kernel_deprecation_error:Nnn \tl_to_uppercase:n { \tex_uppercase:D } { 2018-03-05 }
+\__kernel_deprecation_error:Nnn \xetex_if_engine_p: { \sys_if_engine_xetex_p: } { 2017-01-01 }
+\__kernel_deprecation_error:Nnn \xetex_if_engine:F { \sys_if_engine_xetex:F } { 2017-01-01 }
+\__kernel_deprecation_error:Nnn \xetex_if_engine:T { \sys_if_engine_xetex:T } { 2017-01-01 }
+\__kernel_deprecation_error:Nnn \xetex_if_engine:TF { \sys_if_engine_xetex:TF } { 2017-01-01 }
% \end{macrocode}
% \end{macro}
%
diff --git a/l3kernel/l3file.dtx b/l3kernel/l3file.dtx
index af55abf..465f770 100644
--- a/l3kernel/l3file.dtx
+++ b/l3kernel/l3file.dtx
@@ -2399,7 +2399,7 @@
\tl_gset:Nn \g_file_current_name_tl { \g_file_curr_name_str }
\__kernel_deprecation_code:nn
{
- \__deprecation_error:Nnn \g_file_current_name_tl
+ \__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 } }
diff --git a/l3kernel/l3int.dtx b/l3kernel/l3int.dtx
index 5ff61fd..a42074e 100644
--- a/l3kernel/l3int.dtx
+++ b/l3kernel/l3int.dtx
@@ -2548,12 +2548,12 @@
% \cs{c_minus_one} (as all deprecated commands) is made outer by
% \cs{debug_deprecation_on:}.
% \begin{macrocode}
-%<package>\cs_gset_eq:NN \c__deprecation_minus_one \m at ne
-%<initex>\int_const:Nn \c__deprecation_minus_one { -1 }
-\cs_new_eq:NN \c_minus_one \c__deprecation_minus_one
+%<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
- { \__deprecation_error:Nnn \c_minus_one { -1 } { 2018-12-31 } }
- { \tex_let:D \c_minus_one \c__deprecation_minus_one }
+ { \__kernel_deprecation_error:Nnn \c_minus_one { -1 } { 2018-12-31 } }
+ { \tex_let:D \c_minus_one \c_@@_minus_one }
% \end{macrocode}
% \end{variable}
%
diff --git a/l3kernel/testfiles/m3expl001.luatex.tlg b/l3kernel/testfiles/m3expl001.luatex.tlg
index 0ece0ad..e02bde2 100644
--- a/l3kernel/testfiles/m3expl001.luatex.tlg
+++ b/l3kernel/testfiles/m3expl001.luatex.tlg
@@ -5671,7 +5671,7 @@ Defining \sys_if_output_pdf:F on line ...
Defining \sys_if_output_pdf:TF on line ...
Defining \sys_if_output_pdf_p: on line ...
Defining \c_sys_output_str on line ...
-Defining \__deprecation_error:Nnn on line ...
+Defining \__kernel_deprecation_error:Nnn on line ...
Defining \mode_leave_vertical: on line ...
Defining \box_clip:N on line ...
Defining \box_clip:c on line ...
diff --git a/l3kernel/testfiles/m3expl001.ptex.tlg b/l3kernel/testfiles/m3expl001.ptex.tlg
index 9945da8..358f3c4 100644
--- a/l3kernel/testfiles/m3expl001.ptex.tlg
+++ b/l3kernel/testfiles/m3expl001.ptex.tlg
@@ -5610,7 +5610,7 @@ Defining \sys_if_output_pdf:F on line ...
Defining \sys_if_output_pdf:TF on line ...
Defining \sys_if_output_pdf_p: on line ...
Defining \c_sys_output_str on line ...
-Defining \__deprecation_error:Nnn on line ...
+Defining \__kernel_deprecation_error:Nnn on line ...
Defining \mode_leave_vertical: on line ...
Defining \box_clip:N on line ...
Defining \box_clip:c on line ...
diff --git a/l3kernel/testfiles/m3expl001.tlg b/l3kernel/testfiles/m3expl001.tlg
index 202c511..6f8dfe4 100644
--- a/l3kernel/testfiles/m3expl001.tlg
+++ b/l3kernel/testfiles/m3expl001.tlg
@@ -5610,7 +5610,7 @@ Defining \sys_if_output_pdf:F on line ...
Defining \sys_if_output_pdf:TF on line ...
Defining \sys_if_output_pdf_p: on line ...
Defining \c_sys_output_str on line ...
-Defining \__deprecation_error:Nnn on line ...
+Defining \__kernel_deprecation_error:Nnn on line ...
Defining \mode_leave_vertical: on line ...
Defining \box_clip:N on line ...
Defining \box_clip:c on line ...
diff --git a/l3kernel/testfiles/m3expl001.uptex.tlg b/l3kernel/testfiles/m3expl001.uptex.tlg
index 394f108..64c4ffe 100644
--- a/l3kernel/testfiles/m3expl001.uptex.tlg
+++ b/l3kernel/testfiles/m3expl001.uptex.tlg
@@ -5608,7 +5608,7 @@ Defining \sys_if_output_pdf:F on line ...
Defining \sys_if_output_pdf:TF on line ...
Defining \sys_if_output_pdf_p: on line ...
Defining \c_sys_output_str on line ...
-Defining \__deprecation_error:Nnn on line ...
+Defining \__kernel_deprecation_error:Nnn on line ...
Defining \mode_leave_vertical: on line ...
Defining \box_clip:N on line ...
Defining \box_clip:c on line ...
diff --git a/l3kernel/testfiles/m3expl001.xetex.tlg b/l3kernel/testfiles/m3expl001.xetex.tlg
index 69bae58..ffaaff5 100644
--- a/l3kernel/testfiles/m3expl001.xetex.tlg
+++ b/l3kernel/testfiles/m3expl001.xetex.tlg
@@ -5648,7 +5648,7 @@ Defining \sys_if_output_pdf:F on line ...
Defining \sys_if_output_pdf:TF on line ...
Defining \sys_if_output_pdf_p: on line ...
Defining \c_sys_output_str on line ...
-Defining \__deprecation_error:Nnn on line ...
+Defining \__kernel_deprecation_error:Nnn on line ...
Defining \mode_leave_vertical: on line ...
Defining \box_clip:N on line ...
Defining \box_clip:c on line ...
diff --git a/l3kernel/testfiles/m3expl003.luatex.tlg b/l3kernel/testfiles/m3expl003.luatex.tlg
index 0ece0ad..e02bde2 100644
--- a/l3kernel/testfiles/m3expl003.luatex.tlg
+++ b/l3kernel/testfiles/m3expl003.luatex.tlg
@@ -5671,7 +5671,7 @@ Defining \sys_if_output_pdf:F on line ...
Defining \sys_if_output_pdf:TF on line ...
Defining \sys_if_output_pdf_p: on line ...
Defining \c_sys_output_str on line ...
-Defining \__deprecation_error:Nnn on line ...
+Defining \__kernel_deprecation_error:Nnn on line ...
Defining \mode_leave_vertical: on line ...
Defining \box_clip:N on line ...
Defining \box_clip:c on line ...
diff --git a/l3kernel/testfiles/m3expl003.ptex.tlg b/l3kernel/testfiles/m3expl003.ptex.tlg
index 9945da8..358f3c4 100644
--- a/l3kernel/testfiles/m3expl003.ptex.tlg
+++ b/l3kernel/testfiles/m3expl003.ptex.tlg
@@ -5610,7 +5610,7 @@ Defining \sys_if_output_pdf:F on line ...
Defining \sys_if_output_pdf:TF on line ...
Defining \sys_if_output_pdf_p: on line ...
Defining \c_sys_output_str on line ...
-Defining \__deprecation_error:Nnn on line ...
+Defining \__kernel_deprecation_error:Nnn on line ...
Defining \mode_leave_vertical: on line ...
Defining \box_clip:N on line ...
Defining \box_clip:c on line ...
diff --git a/l3kernel/testfiles/m3expl003.tlg b/l3kernel/testfiles/m3expl003.tlg
index 202c511..6f8dfe4 100644
--- a/l3kernel/testfiles/m3expl003.tlg
+++ b/l3kernel/testfiles/m3expl003.tlg
@@ -5610,7 +5610,7 @@ Defining \sys_if_output_pdf:F on line ...
Defining \sys_if_output_pdf:TF on line ...
Defining \sys_if_output_pdf_p: on line ...
Defining \c_sys_output_str on line ...
-Defining \__deprecation_error:Nnn on line ...
+Defining \__kernel_deprecation_error:Nnn on line ...
Defining \mode_leave_vertical: on line ...
Defining \box_clip:N on line ...
Defining \box_clip:c on line ...
diff --git a/l3kernel/testfiles/m3expl003.uptex.tlg b/l3kernel/testfiles/m3expl003.uptex.tlg
index 394f108..64c4ffe 100644
--- a/l3kernel/testfiles/m3expl003.uptex.tlg
+++ b/l3kernel/testfiles/m3expl003.uptex.tlg
@@ -5608,7 +5608,7 @@ Defining \sys_if_output_pdf:F on line ...
Defining \sys_if_output_pdf:TF on line ...
Defining \sys_if_output_pdf_p: on line ...
Defining \c_sys_output_str on line ...
-Defining \__deprecation_error:Nnn on line ...
+Defining \__kernel_deprecation_error:Nnn on line ...
Defining \mode_leave_vertical: on line ...
Defining \box_clip:N on line ...
Defining \box_clip:c on line ...
diff --git a/l3kernel/testfiles/m3expl003.xetex.tlg b/l3kernel/testfiles/m3expl003.xetex.tlg
index 69bae58..ffaaff5 100644
--- a/l3kernel/testfiles/m3expl003.xetex.tlg
+++ b/l3kernel/testfiles/m3expl003.xetex.tlg
@@ -5648,7 +5648,7 @@ Defining \sys_if_output_pdf:F on line ...
Defining \sys_if_output_pdf:TF on line ...
Defining \sys_if_output_pdf_p: on line ...
Defining \c_sys_output_str on line ...
-Defining \__deprecation_error:Nnn on line ...
+Defining \__kernel_deprecation_error:Nnn on line ...
Defining \mode_leave_vertical: on line ...
Defining \box_clip:N on line ...
Defining \box_clip:c on line ...
More information about the latex3-commits
mailing list