From 52b787d36c60fda90673669dd2809c95c1fdfca5 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Wed, 19 Oct 2016 20:38:20 +0000 Subject: l3 (19oct16) git-svn-id: svn://tug.org/texlive/trunk@42306 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/source/latex/l3kernel/l3file.dtx | 64 +++++++++++----------- 1 file changed, 32 insertions(+), 32 deletions(-) (limited to 'Master/texmf-dist/source/latex/l3kernel/l3file.dtx') diff --git a/Master/texmf-dist/source/latex/l3kernel/l3file.dtx b/Master/texmf-dist/source/latex/l3kernel/l3file.dtx index a60bb8819b0..aca87c16595 100644 --- a/Master/texmf-dist/source/latex/l3kernel/l3file.dtx +++ b/Master/texmf-dist/source/latex/l3kernel/l3file.dtx @@ -37,7 +37,7 @@ \documentclass[full]{l3doc} % %<*driver|package> -\GetIdInfo$Id: l3file.dtx 6458 2016-03-25 21:19:04Z joseph $ +\GetIdInfo$Id: l3file.dtx 6685 2016-08-19 16:26:52Z bruno $ {L3 File and I/O operations} % %<*driver> @@ -69,9 +69,9 @@ % \begin{documentation} % % This module provides functions for working with external files. Some of these -% functions apply to an entire file, and have prefix \cs{file_\ldots}, while +% functions apply to an entire file, and have prefix \cs[no-index]{file_\ldots}, while % others are used to work with files on a line by line basis and have prefix -% \cs{ior_\ldots} (reading) or \cs{iow_\ldots} (writing). +% \cs[no-index]{ior_\ldots} (reading) or \cs[no-index]{iow_\ldots} (writing). % % It is important to remember that when reading external files \TeX{} will % attempt to locate them both the operating system path and entries in the @@ -178,9 +178,9 @@ % \end{syntax} % Globally reserves the name of the \meta{stream}, either for reading % or for writing as appropriate. The \meta{stream} is not opened until -% the appropriate \cs{\ldots_open:Nn} function is used. Attempting to +% the appropriate \cs[no-index]{\ldots_open:Nn} function is used. Attempting to % use a \meta{stream} which has not been opened is an error, and the -% \meta{stream} will behave as the corresponding \cs{c_term_\ldots}. +% \meta{stream} will behave as the corresponding \cs[no-index]{c_term_\ldots}. % \end{function} % % \begin{function}[updated = 2012-02-10]{\ior_open:Nn, \ior_open:cn} @@ -528,7 +528,7 @@ % % \begin{variable}{\l__file_internal_name_tl} % Used to return the full name of a file for internal use. This is -% set by \cs{file_if_exist:n(TF)} and \cs{__file_if_exist:nT}, and +% set by \cs{file_if_exist:nTF} and \cs{__file_if_exist:nT}, and % the value may then be used to load a file directly provided no % further operations intervene. % \end{variable} @@ -887,7 +887,7 @@ % (we capture it \cs{AtBeginDocument} into % \cs{g_@@_record_seq}), turning each file name into a string. % \begin{macrocode} -\cs_new_protected_nopar:Npn \file_list: +\cs_new_protected:Npn \file_list: { \seq_set_eq:NN \l_@@_internal_seq \g_@@_record_seq %<*package> @@ -1058,7 +1058,7 @@ % being \tn{outer}. % \begin{macrocode} %<*package> -\exp_args:NNf \cs_new_protected_nopar:Npn \@@_new:N +\exp_args:NNf \cs_new_protected:Npn \@@_new:N { \exp_args:NNc \exp_after:wN \exp_stop_f: { newread } } % % \end{macrocode} @@ -1133,7 +1133,7 @@ % translating |ior|/|iow| to English. The list of streams is % formatted using \cs{__msg_show_item_unbraced:nn}. % \begin{macrocode} -\cs_new_protected_nopar:Npn \ior_list_streams: +\cs_new_protected:Npn \ior_list_streams: { \@@_list_streams:Nn \g_@@_streams_prop { ior } } \cs_new_protected:Npn \@@_list_streams:Nn #1#2 { @@ -1298,7 +1298,7 @@ % that it is not \tn{outer}. % \begin{macrocode} %<*package> -\exp_args:NNf \cs_new_protected_nopar:Npn \@@_new:N +\exp_args:NNf \cs_new_protected:Npn \@@_new:N { \exp_args:NNc \exp_after:wN \exp_stop_f: { newwrite } } % % \end{macrocode} @@ -1366,7 +1366,7 @@ % \begin{macro}{\@@_list_streams:Nn} % Done as for input, but with a copy of the auxiliary so the name is correct. % \begin{macrocode} -\cs_new_protected_nopar:Npn \iow_list_streams: +\cs_new_protected:Npn \iow_list_streams: { \@@_list_streams:Nn \g_@@_streams_prop { iow } } \cs_new_eq:NN \@@_list_streams:Nn \__ior_list_streams:Nn % \end{macrocode} @@ -1443,10 +1443,10 @@ % \begin{macro}{\iow_term:n, \iow_term:x} % Writing to the log and the terminal directly are relatively easy. % \begin{macrocode} -\cs_set_protected_nopar:Npn \iow_log:x { \iow_now:Nx \c_log_iow } -\cs_new_protected_nopar:Npn \iow_log:n { \iow_now:Nn \c_log_iow } -\cs_set_protected_nopar:Npn \iow_term:x { \iow_now:Nx \c_term_iow } -\cs_new_protected_nopar:Npn \iow_term:n { \iow_now:Nn \c_term_iow } +\cs_set_protected:Npn \iow_log:x { \iow_now:Nx \c_log_iow } +\cs_new_protected:Npn \iow_log:n { \iow_now:Nn \c_log_iow } +\cs_set_protected:Npn \iow_term:x { \iow_now:Nx \c_term_iow } +\cs_new_protected:Npn \iow_term:n { \iow_now:Nn \c_term_iow } % \end{macrocode} %\end{macro} %\end{macro} @@ -1457,7 +1457,7 @@ % Global variable holding the character that forces a new line when % something is written to an output stream. % \begin{macrocode} -\cs_new_nopar:Npn \iow_newline: { ^^J } +\cs_new:Npn \iow_newline: { ^^J } % \end{macrocode} % \end{macro} % @@ -1612,7 +1612,7 @@ \__msg_kernel_expandable_error:nn { kernel } { indent-outside-wrapping-code } #1 } -\cs_new_protected_nopar:Npn \iow_indent:n { \@@_indent_error:n } +\cs_new_protected:Npn \iow_indent:n { \@@_indent_error:n } % \end{macrocode} % \end{macro} % \end{macro} @@ -1639,11 +1639,11 @@ { \group_begin: \int_set_eq:NN \tex_escapechar:D \c_minus_one - \cs_set_nopar:Npx \{ { \token_to_str:N \{ } - \cs_set_nopar:Npx \# { \token_to_str:N \# } - \cs_set_nopar:Npx \} { \token_to_str:N \} } - \cs_set_nopar:Npx \% { \token_to_str:N \% } - \cs_set_nopar:Npx \~ { \token_to_str:N \~ } + \cs_set:Npx \{ { \token_to_str:N \{ } + \cs_set:Npx \# { \token_to_str:N \# } + \cs_set:Npx \} { \token_to_str:N \} } + \cs_set:Npx \% { \token_to_str:N \% } + \cs_set:Npx \~ { \token_to_str:N \~ } \int_set:Nn \tex_escapechar:D { 92 } \cs_set_eq:NN \\ \c_@@_wrap_newline_marker_tl \cs_set_eq:NN \ \c_catcode_other_space_tl @@ -1719,11 +1719,11 @@ % be replaced once the string module is finalised with something a little % cleaner. % \begin{macrocode} -\cs_new_protected_nopar:Npn \@@_wrap_set_target: +\cs_new_protected:Npn \@@_wrap_set_target: { - \cs_set_protected_nopar:Npn \@@_wrap_set_target: + \cs_set_protected:Npn \@@_wrap_set_target: { - \cs_set_protected_nopar:Npn \@@_wrap_set_target: { } + \cs_set_protected:Npn \@@_wrap_set_target: { } \tl_replace_all:Nnn \l_@@_newline_tl { ~ } { \c_space_tl } \int_set:Nn \l_@@_target_count_int { \l_iow_line_count_int - \tl_count:N \l_@@_newline_tl + \c_one } @@ -1756,7 +1756,7 @@ % Otherwise, the current line is added to the result, with the run-on text. % The current word (and its character count) are then put in the new line. % \begin{macrocode} -\cs_new_protected_nopar:Npn \@@_wrap_word: +\cs_new_protected:Npn \@@_wrap_word: { \int_set:Nn \l_@@_current_word_int { \exp_args:No \str_count_ignore_spaces:n \l_@@_current_word_tl } @@ -1766,7 +1766,7 @@ { \@@_wrap_word_newline: } \@@_wrap_loop:w } -\cs_new_protected_nopar:Npn \@@_wrap_word_fits: +\cs_new_protected:Npn \@@_wrap_word_fits: { \bool_if:NTF \l_@@_line_start_bool { @@ -1782,7 +1782,7 @@ \int_incr:N \l_@@_current_line_int } } -\cs_new_protected_nopar:Npn \@@_wrap_word_newline: +\cs_new_protected:Npn \@@_wrap_word_newline: { \@@_wrap_set_target: \tl_put_right:Nx \l_@@_wrap_tl @@ -1826,7 +1826,7 @@ { \@@_wrap_special:w } { \@@_wrap_loop:w #2 ~ #3 ~ } } -\cs_new_protected_nopar:Npn \@@_wrap_newline: +\cs_new_protected:Npn \@@_wrap_newline: { \@@_wrap_set_target: \tl_put_right:Nx \l_@@_wrap_tl @@ -1835,19 +1835,19 @@ \tl_clear:N \l_@@_current_line_tl \bool_set_true:N \l_@@_line_start_bool } -\cs_new_protected_nopar:Npx \@@_wrap_indent: +\cs_new_protected:Npx \@@_wrap_indent: { \int_add:Nn \l_@@_current_indentation_int \c_four \tl_put_right:Nx \exp_not:N \l_@@_current_indentation_tl { \c_space_tl \c_space_tl \c_space_tl \c_space_tl } } -\cs_new_protected_nopar:Npn \@@_wrap_unindent: +\cs_new_protected:Npn \@@_wrap_unindent: { \int_sub:Nn \l_@@_current_indentation_int \c_four \tl_set:Nx \l_@@_current_indentation_tl { \prg_replicate:nn \l_@@_current_indentation_int { ~ } } } -\cs_new_protected_nopar:Npn \@@_wrap_end: +\cs_new_protected:Npn \@@_wrap_end: { \tl_put_right:Nx \l_@@_wrap_tl { \l_@@_current_line_tl } -- cgit v1.2.3