Remove end-of-2017 deprecated commands

This got missed before as l3build was forcing the epoch on typesetting: we now get an l3doc error.
latex3 · Mar 5, 2018 · c95d54f · c95d54f
1 parent 0c20b83
commit c95d54f
Show file tree

Hide file tree

Showing 16 changed files with 16 additions and 172 deletions.
diff --git a/l3kernel/l3candidates.dtx b/l3kernel/l3candidates.dtx
@@ -1862,28 +1862,6 @@
 %    \end{macrocode}
 % \end{macro}
 %
-% \begin{macro}[deprecated = 2017-12-31]{\file_if_exist_input:nT, \file_if_exist_input:nTF}
-%   For removal after 2017-12-31.
-%    \begin{macrocode}
-\__kernel_patch_deprecation:nnNNpn { 2017-12-31 }
-  { \file_if_exist:nTF and~ \file_input:n }
-\cs_new_protected:Npn \file_if_exist_input:nTF #1#2#3
-  {
-    \file_get_full_name:nN {#1} \l_@@_full_name_str
-    \str_if_empty:NTF \l_@@_full_name_str
-      {#3} { #2 \@@_input:V \l_@@_full_name_str }
-  }
-\__kernel_patch_deprecation:nnNNpn { 2017-12-31 }
-  { \file_if_exist:nT and~ \file_input:n }
-\cs_new_protected:Npn \file_if_exist_input:nT #1#2
-  {
-    \file_get_full_name:nN {#1} \l_@@_full_name_str
-    \str_if_empty:NF \l_@@_full_name_str
-      { #2 \@@_input:V \l_@@_full_name_str }
-  }
-%    \end{macrocode}
-% \end{macro}
-%
 % \begin{macro}{\file_input_stop:}
 %   A simple rename.
 %    \begin{macrocode}

diff --git a/l3kernel/l3deprecation.dtx b/l3kernel/l3deprecation.dtx
@@ -83,6 +83,8 @@
           { \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 }
@@ -92,6 +94,7 @@
 \@@_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 }
@@ -110,6 +113,8 @@
 \@@_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 }

diff --git a/l3kernel/l3file.dtx b/l3kernel/l3file.dtx
@@ -2442,14 +2442,6 @@
 %    \end{macrocode}
 % \end{macro}
 %
-% \begin{macro}[added = 2012-06-24, updated = 2012-07-31, deprecated=2017-12-31]{\ior_get_str:NN}
-%   For removal after 2017-12-31.
-%    \begin{macrocode}
-\__kernel_patch_deprecation:nnNNpn { 2017-12-31 } { \ior_str_get:NN }
-\cs_new_protected:Npn \ior_get_str:NN      { \ior_str_get:NN }
-%    \end{macrocode}
-% \end{macro}
-%
 % \begin{macro}[deprecated = 2018-12-31]{\file_list:}
 %   Renamed to \cs{file_log_list:}.  For removal after 2018-12-31.
 %    \begin{macrocode}

diff --git a/l3kernel/l3fp-round.dtx b/l3kernel/l3fp-round.dtx
@@ -86,68 +86,19 @@
 % \begin{macro}[EXP]
 %   {
 %     \@@_parse_word_round:N, \@@_parse_round:Nw,
-%     \@@_parse_round_no_error:Nw,
-%     \@@_parse_round_deprecation_error:Nw
 %   }
-% \begin{macro}[deprecated = 2017-12-31]{round+, round0, round-}
-%   This looks for |+|, |-|, |0| after |round|.  That syntax was
-%   deprecated in 2013 but the system to tell users about deprecated
-%   syntax was not really available then, so we did not have anything
-%   set up.  When \pkg{l3doc} complains, remove the syntax by
-%   removing everything until the last \cs{fi:} in
-%   \cs{@@_parse_word_round:N} (and getting rid of the unused
-%   definitions of \cs{@@_parse_round:Nw} and so on, as well as the
-%   |fp-deprecated| error in \pkg{l3fp-parse}).
 %    \begin{macrocode}
 \cs_new:Npn \@@_parse_word_round:N #1#2
   {
-    \if_meaning:w + #2
-      \@@_parse_round:Nw \@@_round_to_pinf:NNN
-    \else:
-      \if_meaning:w 0 #2
-        \@@_parse_round:Nw \@@_round_to_zero:NNN
-      \else:
-        \if_meaning:w - #2
-          \@@_parse_round:Nw \@@_round_to_ninf:NNN
-        \fi:
-      \fi:
-    \fi:
     \@@_parse_function:NNN
       \@@_round_o:Nw \@@_round_to_nearest:NNN #1
     #2
   }
-\__kernel_debug:TF
-  {
-    \__kernel_deprecation_code:nn
-      {
-        \cs_set_eq:NN \@@_parse_round:Nw
-          \@@_parse_round_deprecation_error:Nw
-      }
-      {
-        \cs_set_eq:NN \@@_parse_round:Nw
-          \@@_parse_round_no_error:Nw
-      }
-    \cs_new:Npn \@@_parse_round_deprecation_error:Nw
-        #1 #2 \@@_round_to_nearest:NNN #3#4
-      {
-        \@@_error:nnfn { fp-deprecated } { round#4() }
-          {
-            \str_case:nn {#2}
-              { { + } { ceil } { 0 } { trunc } { - } { floor } }
-          } { }
-        #2 #1 #3
-      }
-    \cs_new:Npn \@@_parse_round_no_error:Nw
-        #1 #2 \@@_round_to_nearest:NNN #3#4 { #2 #1 #3 }
-    \cs_new_eq:NN \@@_parse_round:Nw \@@_parse_round_no_error:Nw
-  }
-  {
-    \cs_new:Npn \@@_parse_round:Nw
-        #1 #2 \@@_round_to_nearest:NNN #3#4 { #2 #1 #3 }
-  }
+\cs_new:Npn \@@_parse_round:Nw #1 #2 \@@_round_to_nearest:NNN #3#4
+  { #2 #1 #3 }
+
 %    \end{macrocode}
 % \end{macro}
-% \end{macro}
 %
 % \subsection{Rounding tools}
 %

diff --git a/l3kernel/l3obsolete.txt b/l3kernel/l3obsolete.txt
@@ -21,25 +21,17 @@ Function                   Expires end
 \box_use_clear:c                  2018
 \box_use_clear:N                  2018
 \file_add_path:nN                 2018
-\file_if_exist_input:nT           2017
-\file_if_exist_input:nTF          2017
 \file_list:                       2018
 \file_path_include:n              2018
 \file_path_remove:n               2018
 \g_file_current_name_tl           2018
-\ior_get_str:NN                   2017
 \ior_list_streams:                2018
 \ior_log_streams:                 2018
 \iow_list_streams:                2018
 \iow_log_streams:                 2018
 \sort_ordered:                    2018
 \sort_reversed:                   2018
-\tl_to_lowercase:n                2017
-\tl_to_uppercase:n                2017
 \token_new:Nn                     2018
-[fp function] round+              2017
-[fp function] round-              2017
-[fp function] round0              2017
 ---------------------------------------
 
 Removed functions and variables
@@ -173,6 +165,8 @@ Function                                      Date removed
 \dim_set_min:Nn                                 2013-01-08
 \ExplSyntaxNamesOff                             2013-01-08
 \ExplSyntaxNamesOn                              2013-01-08
+\file_if_exist_input:nT                         2018-03-05
+\file_if_exist_input:nTF                        2018-03-05
 \fp_abs:c                                       2014-05-28
 \fp_abs:N                                       2014-05-28
 \fp_compare:NNNF                                2014-05-28
@@ -257,6 +251,7 @@ Function                                      Date removed
 \int_to_octal:n                                 2016-01-05
 \int_to_symbol:n                                2011-11-22
 \int_value:w                                    2013-01-08
+\ior_get_str:NN                                 2018-03-05
 \ior_gto:NN                                     2013-07-28
 \ior_open_streams:                              2011-09-08
 \ior_str_gto:NN                                 2013-07-28
@@ -432,6 +427,8 @@ Function                                      Date removed
 \tl_replace_in:Nnn                              2011-09-08
 \tl_set:Nc                                      2011-09-08
 \tl_tail:w                                      2013-01-08
+\tl_to_lowercase:n                              2018-03-05
+\tl_to_uppercase:n                              2018-03-05
 \token_if_active_char_p:N                       2011-09-08
 \token_if_active_char:NF                        2011-09-08
 \token_if_active_char:NT                        2011-09-08
@@ -557,6 +554,9 @@ Function                                      Date removed
 \xetex_if_engine:F                              2017-01-01
 \xetex_if_engine:T                              2017-01-01
 \xetex_if_engine:TF                             2017-01-01
+[fp function] round+                            2018-03-05
+[fp function] round-                            2018-03-05
+[fp function] round0                            2018-03-05
 [key property] .choice_code:n                   2015-07-14
 [key property] .choice_code:x                   2015-07-14
 [key property] .code:x                          2013-07-10

diff --git a/l3kernel/l3tl.dtx b/l3kernel/l3tl.dtx
@@ -3036,18 +3036,6 @@
 %    \end{macrocode}
 % \end{variable}
 %
-% \subsection{Deprecated functions}
-%
-% \begin{macro}[deprecated=2017-12-31]{\tl_to_lowercase:n, \tl_to_uppercase:n}
-%   For removal after 2017-12-31.
-%    \begin{macrocode}
-\__kernel_patch_deprecation:nnNNpn { 2017-12-31 } { \tex_lowercase:D }
-\cs_new_protected:Npn \tl_to_lowercase:n #1 { \tex_lowercase:D {#1} }
-\__kernel_patch_deprecation:nnNNpn { 2017-12-31 } { \tex_uppercase:D }
-\cs_new_protected:Npn \tl_to_uppercase:n #1 { \tex_uppercase:D {#1} }
-%    \end{macrocode}
-% \end{macro}
-%
 %    \begin{macrocode}
 %</initex|package>
 %    \end{macrocode}

diff --git a/l3kernel/testfiles/m3expl001.luatex.tlg b/l3kernel/testfiles/m3expl001.luatex.tlg
@@ -621,8 +621,6 @@ Defining \g_tmpa_tl on line ...
 Defining \g_tmpb_tl on line ...
 Defining \l_tmpa_tl on line ...
 Defining \l_tmpb_tl on line ...
-Defining \tl_to_lowercase:n on line ...
-Defining \tl_to_uppercase:n on line ...
 Defining \str_new:N on line ...
 Defining \str_new:c on line ...
 Defining \str_use:N on line ...
@@ -3110,7 +3108,6 @@ Defining \g_file_current_name_tl on line ...
 Defining \file_path_include:n on line ...
 Defining \file_path_remove:n on line ...
 Defining \file_add_path:nN on line ...
-Defining \ior_get_str:NN on line ...
 Defining \file_list: on line ...
 Defining \ior_list_streams: on line ...
 Defining \ior_log_streams: on line ...
@@ -3775,8 +3772,6 @@ Defining \__fp_parse_word_trunc:N on line ...
 Defining \__fp_parse_word_floor:N on line ...
 Defining \__fp_parse_word_ceil:N on line ...
 Defining \__fp_parse_word_round:N on line ...
-Defining \__fp_parse_round_deprecation_error:Nw on line ...
-Defining \__fp_parse_round_no_error:Nw on line ...
 Defining \__fp_parse_round:Nw on line ...
 Defining \c__fp_five_int on line ...
 Defining \__fp_round_return_one: on line ...
@@ -5619,8 +5614,6 @@ Defining \__file_get_details:nnN on line ...
 Defining message LaTeX/kernel/xetex-primitive-not-available on line ...
 Defining \file_if_exist_input:n on line ...
 Defining \file_if_exist_input:nF on line ...
-Defining \file_if_exist_input:nTF on line ...
-Defining \file_if_exist_input:nT on line ...
 Defining \file_input_stop: on line ...
 Defining \int_rand:nn on line ...
 Defining \__int_rand:ww on line ...

diff --git a/l3kernel/testfiles/m3expl001.ptex.tlg b/l3kernel/testfiles/m3expl001.ptex.tlg
@@ -620,8 +620,6 @@ Defining \g_tmpa_tl on line ...
 Defining \g_tmpb_tl on line ...
 Defining \l_tmpa_tl on line ...
 Defining \l_tmpb_tl on line ...
-Defining \tl_to_lowercase:n on line ...
-Defining \tl_to_uppercase:n on line ...
 Defining \str_new:N on line ...
 Defining \str_new:c on line ...
 Defining \str_use:N on line ...
@@ -3098,7 +3096,6 @@ Defining \g_file_current_name_tl on line ...
 Defining \file_path_include:n on line ...
 Defining \file_path_remove:n on line ...
 Defining \file_add_path:nN on line ...
-Defining \ior_get_str:NN on line ...
 Defining \file_list: on line ...
 Defining \ior_list_streams: on line ...
 Defining \ior_log_streams: on line ...
@@ -3763,8 +3760,6 @@ Defining \__fp_parse_word_trunc:N on line ...
 Defining \__fp_parse_word_floor:N on line ...
 Defining \__fp_parse_word_ceil:N on line ...
 Defining \__fp_parse_word_round:N on line ...
-Defining \__fp_parse_round_deprecation_error:Nw on line ...
-Defining \__fp_parse_round_no_error:Nw on line ...
 Defining \__fp_parse_round:Nw on line ...
 Defining \c__fp_five_int on line ...
 Defining \__fp_round_return_one: on line ...
@@ -5609,8 +5604,6 @@ Defining \__file_get_details:nnN on line ...
 Defining message LaTeX/kernel/xetex-primitive-not-available on line ...
 Defining \file_if_exist_input:n on line ...
 Defining \file_if_exist_input:nF on line ...
-Defining \file_if_exist_input:nTF on line ...
-Defining \file_if_exist_input:nT on line ...
 Defining \file_input_stop: on line ...
 Defining \int_rand:nn on line ...
 Defining \__int_rand:ww on line ...

diff --git a/l3kernel/testfiles/m3expl001.tlg b/l3kernel/testfiles/m3expl001.tlg
@@ -620,8 +620,6 @@ Defining \g_tmpa_tl on line ...
 Defining \g_tmpb_tl on line ...
 Defining \l_tmpa_tl on line ...
 Defining \l_tmpb_tl on line ...
-Defining \tl_to_lowercase:n on line ...
-Defining \tl_to_uppercase:n on line ...
 Defining \str_new:N on line ...
 Defining \str_new:c on line ...
 Defining \str_use:N on line ...
@@ -3098,7 +3096,6 @@ Defining \g_file_current_name_tl on line ...
 Defining \file_path_include:n on line ...
 Defining \file_path_remove:n on line ...
 Defining \file_add_path:nN on line ...
-Defining \ior_get_str:NN on line ...
 Defining \file_list: on line ...
 Defining \ior_list_streams: on line ...
 Defining \ior_log_streams: on line ...
@@ -3763,8 +3760,6 @@ Defining \__fp_parse_word_trunc:N on line ...
 Defining \__fp_parse_word_floor:N on line ...
 Defining \__fp_parse_word_ceil:N on line ...
 Defining \__fp_parse_word_round:N on line ...
-Defining \__fp_parse_round_deprecation_error:Nw on line ...
-Defining \__fp_parse_round_no_error:Nw on line ...
 Defining \__fp_parse_round:Nw on line ...
 Defining \c__fp_five_int on line ...
 Defining \__fp_round_return_one: on line ...
@@ -5609,8 +5604,6 @@ Defining \__file_get_details:nnN on line ...
 Defining message LaTeX/kernel/xetex-primitive-not-available on line ...
 Defining \file_if_exist_input:n on line ...
 Defining \file_if_exist_input:nF on line ...
-Defining \file_if_exist_input:nTF on line ...
-Defining \file_if_exist_input:nT on line ...
 Defining \file_input_stop: on line ...
 Defining \int_rand:nn on line ...
 Defining \__int_rand:ww on line ...

diff --git a/l3kernel/testfiles/m3expl001.uptex.tlg b/l3kernel/testfiles/m3expl001.uptex.tlg
@@ -620,8 +620,6 @@ Defining \g_tmpa_tl on line ...
 Defining \g_tmpb_tl on line ...
 Defining \l_tmpa_tl on line ...
 Defining \l_tmpb_tl on line ...
-Defining \tl_to_lowercase:n on line ...
-Defining \tl_to_uppercase:n on line ...
 Defining \str_new:N on line ...
 Defining \str_new:c on line ...
 Defining \str_use:N on line ...
@@ -3098,7 +3096,6 @@ Defining \g_file_current_name_tl on line ...
 Defining \file_path_include:n on line ...
 Defining \file_path_remove:n on line ...
 Defining \file_add_path:nN on line ...
-Defining \ior_get_str:NN on line ...
 Defining \file_list: on line ...
 Defining \ior_list_streams: on line ...
 Defining \ior_log_streams: on line ...
@@ -3763,8 +3760,6 @@ Defining \__fp_parse_word_trunc:N on line ...
 Defining \__fp_parse_word_floor:N on line ...
 Defining \__fp_parse_word_ceil:N on line ...
 Defining \__fp_parse_word_round:N on line ...
-Defining \__fp_parse_round_deprecation_error:Nw on line ...
-Defining \__fp_parse_round_no_error:Nw on line ...
 Defining \__fp_parse_round:Nw on line ...
 Defining \c__fp_five_int on line ...
 Defining \__fp_round_return_one: on line ...
@@ -5607,8 +5602,6 @@ Defining \__file_get_details:nnN on line ...
 Defining message LaTeX/kernel/xetex-primitive-not-available on line ...
 Defining \file_if_exist_input:n on line ...
 Defining \file_if_exist_input:nF on line ...
-Defining \file_if_exist_input:nTF on line ...
-Defining \file_if_exist_input:nT on line ...
 Defining \file_input_stop: on line ...
 Defining \int_rand:nn on line ...
 Defining \__int_rand:ww on line ...

diff --git a/l3kernel/testfiles/m3expl001.xetex.tlg b/l3kernel/testfiles/m3expl001.xetex.tlg
@@ -620,8 +620,6 @@ Defining \g_tmpa_tl on line ...
 Defining \g_tmpb_tl on line ...
 Defining \l_tmpa_tl on line ...
 Defining \l_tmpb_tl on line ...
-Defining \tl_to_lowercase:n on line ...
-Defining \tl_to_uppercase:n on line ...
 Defining \str_new:N on line ...
 Defining \str_new:c on line ...
 Defining \str_use:N on line ...
@@ -3108,7 +3106,6 @@ Defining \g_file_current_name_tl on line ...
 Defining \file_path_include:n on line ...
 Defining \file_path_remove:n on line ...
 Defining \file_add_path:nN on line ...
-Defining \ior_get_str:NN on line ...
 Defining \file_list: on line ...
 Defining \ior_list_streams: on line ...
 Defining \ior_log_streams: on line ...
@@ -3773,8 +3770,6 @@ Defining \__fp_parse_word_trunc:N on line ...
 Defining \__fp_parse_word_floor:N on line ...
 Defining \__fp_parse_word_ceil:N on line ...
 Defining \__fp_parse_word_round:N on line ...
-Defining \__fp_parse_round_deprecation_error:Nw on line ...
-Defining \__fp_parse_round_no_error:Nw on line ...
 Defining \__fp_parse_round:Nw on line ...
 Defining \c__fp_five_int on line ...
 Defining \__fp_round_return_one: on line ...
@@ -5596,8 +5591,6 @@ Defining \__file_get_details:nnN on line ...
 Defining message LaTeX/kernel/xetex-primitive-not-available on line ...
 Defining \file_if_exist_input:n on line ...
 Defining \file_if_exist_input:nF on line ...
-Defining \file_if_exist_input:nTF on line ...
-Defining \file_if_exist_input:nT on line ...
 Defining \file_input_stop: on line ...
 Defining \int_rand:nn on line ...
 Defining \msg_expandable_error:nnnnnn on line ...