diff options
Diffstat (limited to 'Master/texmf-dist/source/latex/l3kernel/l3file.dtx')
-rw-r--r-- | Master/texmf-dist/source/latex/l3kernel/l3file.dtx | 59 |
1 files changed, 27 insertions, 32 deletions
diff --git a/Master/texmf-dist/source/latex/l3kernel/l3file.dtx b/Master/texmf-dist/source/latex/l3kernel/l3file.dtx index 211c204a7d8..4b89d01c5d1 100644 --- a/Master/texmf-dist/source/latex/l3kernel/l3file.dtx +++ b/Master/texmf-dist/source/latex/l3kernel/l3file.dtx @@ -1,6 +1,6 @@ % \iffalse meta-comment % -%% File: l3file.dtx Copyright (C) 1990-2017 The LaTeX3 Project +%% File: l3file.dtx Copyright (C) 1990-2018 The LaTeX3 Project % % It may be distributed and/or modified under the conditions of the % LaTeX Project Public License (LPPL), either version 1.3c of this @@ -42,7 +42,7 @@ % }^^A % } % -% \date{Released 2017/12/16} +% \date{Released 2018/02/21} % % \maketitle % @@ -884,7 +884,7 @@ \int_if_even:nF { 0 \tl_map_function:NN #2 \@@_name_quote_aux:n } { - \__msg_kernel_error:nnx + \__kernel_msg_error:nnx { kernel } { unbalanced-quote-in-filename } {#2} } \tl_remove_all:Nn #2 { " } @@ -975,7 +975,7 @@ \cs_new_protected:Npn \__file_missing:n #1 { \__file_name_sanitize:nN {#1} \l__file_base_name_str - \__msg_kernel_error:nnx { kernel } { file-not-found } + \__kernel_msg_error:nnx { kernel } { file-not-found } { \l__file_base_name_str } } % \end{macrocode} @@ -1299,7 +1299,7 @@ \seq_gpop:NNTF \g_@@_streams_seq \l_@@_stream_tl { \@@_open_stream:Nn #1 {#2} } %<*initex> - { \__msg_kernel_fatal:nn { kernel } { input-streams-exhausted } } + { \__kernel_msg_fatal:nn { kernel } { input-streams-exhausted } } %</initex> %<*package> { @@ -1611,7 +1611,7 @@ \seq_gpop:NNTF \g_@@_streams_seq \l_@@_stream_tl { \@@_open_stream:NV #1 \l__file_base_name_str } %<*initex> - { \__msg_kernel_fatal:nn { kernel } { output-streams-exhausted } } + { \__kernel_msg_fatal:nn { kernel } { output-streams-exhausted } } %</initex> %<*package> { @@ -1912,7 +1912,7 @@ % \begin{macrocode} \cs_new_protected:Npn \iow_indent:n #1 { - \__msg_kernel_error:nnnnn { kernel } { iow-indent } + \__kernel_msg_error:nnnnn { kernel } { iow-indent } { \iow_wrap:nnnN } { \iow_indent:n } {#1} #1 } @@ -1924,7 +1924,7 @@ } \cs_new:Npn \@@_indent_error:n #1 { - \__msg_kernel_expandable_error:nnnnn { kernel } { iow-indent } + \__kernel_msg_expandable_error:nnnnn { kernel } { iow-indent } { \iow_wrap:nnnN } { \iow_indent:n } {#1} #1 } @@ -2346,38 +2346,38 @@ % \subsection{Messages} % % \begin{macrocode} -\__msg_kernel_new:nnnn { kernel } { file-not-found } +\__kernel_msg_new:nnnn { kernel } { file-not-found } { File~'#1'~not~found. } { The~requested~file~could~not~be~found~in~the~current~directory,~ in~the~TeX~search~path~or~in~the~LaTeX~search~path. } -\__msg_kernel_new:nnn { kernel } { file-list } +\__kernel_msg_new:nnn { kernel } { file-list } { >~File~List~< #1 \\ ............. } -\__msg_kernel_new:nnnn { kernel } { input-streams-exhausted } +\__kernel_msg_new:nnnn { kernel } { input-streams-exhausted } { Input~streams~exhausted } { TeX~can~only~open~up~to~16~input~streams~at~one~time.\\ All~16~are~currently~in~use,~and~something~wanted~to~open~ another~one. } -\__msg_kernel_new:nnnn { kernel } { output-streams-exhausted } +\__kernel_msg_new:nnnn { kernel } { output-streams-exhausted } { Output~streams~exhausted } { TeX~can~only~open~up~to~16~output~streams~at~one~time.\\ All~16~are~currently~in~use,~and~something~wanted~to~open~ another~one. } -\__msg_kernel_new:nnnn { kernel } { unbalanced-quote-in-filename } +\__kernel_msg_new:nnnn { kernel } { unbalanced-quote-in-filename } { Unbalanced~quotes~in~file~name~'#1'. } { File~names~must~contain~balanced~numbers~of~quotes~("). } -\__msg_kernel_new:nnnn { kernel } { iow-indent } +\__kernel_msg_new:nnnn { kernel } { iow-indent } { Only~#1 (arg~1)~allows~#2 } { The~command~#2 can~only~be~used~in~messages~ @@ -2397,17 +2397,12 @@ % \begin{macrocode} \tl_new:N \g_file_current_name_tl \tl_gset:Nn \g_file_current_name_tl { \g_file_curr_name_str } -\__debug:TF +\__kernel_deprecation_code:nn { - \tl_gput_right:Nn \g__debug_deprecation_on_tl - { - \__deprecation_error:Nnn \g_file_current_name_tl - { \g_file_curr_name_str } { 2018-12-31 } - } - \tl_gput_right:Nn \g__debug_deprecation_off_tl - { \tex_def:D \g_file_current_name_tl { \g_file_curr_name_str } } + \__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 } } % \end{macrocode} % \end{variable} % @@ -2415,7 +2410,7 @@ % \begin{macro}[deprecated = 2018-12-31]{\file_path_remove:n} % Wrapper functions to manage the search path. % \begin{macrocode} -\__debug_deprecation:nnNNpn { 2018-12-31 } +\__kernel_patch_deprecation:nnNNpn { 2018-12-31 } { \seq_put_right:Nn \l_file_search_path_seq } \cs_new_protected:Npn \file_path_include:n #1 { @@ -2423,7 +2418,7 @@ \seq_if_in:NVF \l_file_search_path_seq \l__file_full_name_str { \seq_put_right:NV \l_file_search_path_seq \l__file_full_name_str } } -\__debug_deprecation:nnNNpn { 2018-12-31 } +\__kernel_patch_deprecation:nnNNpn { 2018-12-31 } { \seq_remove_all:Nn \l_file_search_path_seq } \cs_new_protected:Npn \file_path_remove:n #1 { @@ -2437,7 +2432,7 @@ % \begin{macro}[deprecated = 2018-12-31]{\file_add_path:nN} % For removal after 2018-12-31. % \begin{macrocode} -\__debug_deprecation:nnNNpn { 2018-12-31 } { \file_get_full_name:nN } +\__kernel_patch_deprecation:nnNNpn { 2018-12-31 } { \file_get_full_name:nN } \cs_new_protected:Npn \file_add_path:nN #1#2 { \file_get_full_name:nN {#1} #2 @@ -2450,7 +2445,7 @@ % \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} -\__debug_deprecation:nnNNpn { 2017-12-31 } { \ior_str_get:NN } +\__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} @@ -2458,7 +2453,7 @@ % \begin{macro}[deprecated = 2018-12-31]{\file_list:} % Renamed to \cs{file_log_list:}. For removal after 2018-12-31. % \begin{macrocode} -\__debug_deprecation:nnNNpn { 2018-12-31 } { \file_log_list: } +\__kernel_patch_deprecation:nnNNpn { 2018-12-31 } { \file_log_list: } \cs_new_protected:Npn \file_list: { \file_log_list: } % \end{macrocode} % \end{macro} @@ -2467,13 +2462,13 @@ % {\ior_list_streams:, \ior_log_streams:, \iow_list_streams:, \iow_log_streams:} % These got a more consistent naming. % \begin{macrocode} -\__debug_deprecation:nnNNpn { 2018-12-31 } { \ior_show_list: } +\__kernel_patch_deprecation:nnNNpn { 2018-12-31 } { \ior_show_list: } \cs_new_protected:Npn \ior_list_streams: { \ior_show_list: } -\__debug_deprecation:nnNNpn { 2018-12-31 } { \ior_log_list: } +\__kernel_patch_deprecation:nnNNpn { 2018-12-31 } { \ior_log_list: } \cs_new_protected:Npn \ior_log_streams: { \ior_log_list: } -\__debug_deprecation:nnNNpn { 2018-12-31 } { \iow_show_list: } +\__kernel_patch_deprecation:nnNNpn { 2018-12-31 } { \iow_show_list: } \cs_new_protected:Npn \iow_list_streams: { \iow_show_list: } -\__debug_deprecation:nnNNpn { 2018-12-31 } { \iow_log_list: } +\__kernel_patch_deprecation:nnNNpn { 2018-12-31 } { \iow_log_list: } \cs_new_protected:Npn \iow_log_streams: { \iow_log_list: } % \end{macrocode} % \end{macro} |