[latex3-commits] [git/LaTeX3-latex3-latex3] master: Sort internal file/IO functions (5f6695b)
Joseph Wright
joseph.wright at morningstar2.co.uk
Mon Apr 2 11:19:37 CEST 2018
Repository : https://github.com/latex3/latex3
On branch : master
Link : https://github.com/latex3/latex3/commit/5f6695b935892610562688618c2d6bbb98957c0d
>---------------------------------------------------------------
commit 5f6695b935892610562688618c2d6bbb98957c0d
Author: Joseph Wright <joseph.wright at morningstar2.co.uk>
Date: Mon Apr 2 10:19:02 2018 +0100
Sort internal file/IO functions
A couple have to be made __kernel (I think).
>---------------------------------------------------------------
5f6695b935892610562688618c2d6bbb98957c0d
l3kernel/expl3.dtx | 4 +-
l3kernel/l3candidates.dtx | 19 ++--
l3kernel/l3file.dtx | 158 ++++++++++++++-----------------
l3kernel/l3msg.dtx | 10 +-
l3kernel/l3tl.dtx | 6 +-
l3kernel/testfiles/m3expl001.luatex.tlg | 13 ++-
l3kernel/testfiles/m3expl001.ptex.tlg | 13 ++-
l3kernel/testfiles/m3expl001.tlg | 13 ++-
l3kernel/testfiles/m3expl001.uptex.tlg | 13 ++-
l3kernel/testfiles/m3expl001.xetex.tlg | 13 ++-
l3kernel/testfiles/m3expl003.luatex.tlg | 13 ++-
l3kernel/testfiles/m3expl003.ptex.tlg | 13 ++-
l3kernel/testfiles/m3expl003.tlg | 13 ++-
l3kernel/testfiles/m3expl003.uptex.tlg | 13 ++-
l3kernel/testfiles/m3expl003.xetex.tlg | 13 ++-
15 files changed, 172 insertions(+), 155 deletions(-)
diff --git a/l3kernel/expl3.dtx b/l3kernel/expl3.dtx
index 1a8c0ad..1e0b8a7 100644
--- a/l3kernel/expl3.dtx
+++ b/l3kernel/expl3.dtx
@@ -1535,7 +1535,7 @@
% \begin{macrocode}
\tl_put_left:Nn \@pushfilename
{
- \exp_args:Nx \__file_input_push:n
+ \exp_args:Nx \__kernel_file_input_push:n
{
\tl_to_str:N \@currname
\tl_to_str:N \@currext
@@ -1560,7 +1560,7 @@
}
\tl_put_right:Nn \@popfilename
{
- \__file_input_pop:
+ \__kernel_file_input_pop:
\tl_if_empty:NTF \l__expl_status_stack_tl
{ \ExplSyntaxOff }
{ \exp_after:wN \__expl_status_pop:w \l__expl_status_stack_tl \q_stop }
diff --git a/l3kernel/l3candidates.dtx b/l3kernel/l3candidates.dtx
index c96a892..3832f98 100644
--- a/l3kernel/l3candidates.dtx
+++ b/l3kernel/l3candidates.dtx
@@ -2703,9 +2703,9 @@
\cs_generate_variant:Nn \tl_gset_from_file:Nnn { c }
\cs_new_protected:Npn \@@_set_from_file:NNnn #1#2#3#4
{
- \file_get_full_name:nN {#4} \l__file_full_name_str
- \str_if_empty:NTF \l__file_full_name_str
- { \__file_missing:n {#4} }
+ \file_get_full_name:nN {#4} \l_@@_file_name_str
+ \str_if_empty:NTF \l_@@_file_name_str
+ { \__kernel_file_missing:n {#4} }
{
\group_begin:
\exp_args:No \etex_everyeof:D
@@ -2713,7 +2713,7 @@
#3 \scan_stop:
\exp_after:wN \@@_from_file_do:w
\exp_after:wN \prg_do_nothing:
- \tex_input:D \l__file_full_name_str \scan_stop:
+ \tex_input:D \l_@@_file_name_str \scan_stop:
\exp_args:NNNo \group_end:
#1 #2 \l_@@_internal_a_tl
}
@@ -2733,6 +2733,7 @@
% \tl_gset_from_file_x:Nnn, \tl_gset_from_file_x:cnn
% }
% \begin{macro}{\@@_set_from_file_x:NNnn}
+% \begin{variable}{\l_@@_file_name_str}
% When reading a file and allowing expansion of the content, the set up
% only needs to prevent \TeX{} complaining about the end of the file. That
% is done simply, with a group then used to trap the definition needed.
@@ -2747,20 +2748,22 @@
\cs_generate_variant:Nn \tl_gset_from_file_x:Nnn { c }
\cs_new_protected:Npn \@@_set_from_file_x:NNnn #1#2#3#4
{
- \file_get_full_name:nN {#4} \l__file_full_name_str
- \str_if_empty:NTF \l__file_full_name_str
- { \__file_missing:n {#4} }
+ \file_get_full_name:nN {#4} \l_@@_file_name_str
+ \str_if_empty:NTF \l_@@_file_name_str
+ { \__kernel_file_missing:n {#4} }
{
\group_begin:
\etex_everyeof:D { \exp_not:N }
#3 \scan_stop:
\tl_set:Nx \l_@@_internal_a_tl
- { \tex_input:D \l__file_full_name_str \c_space_token }
+ { \tex_input:D \l_@@_file_name_str \c_space_token }
\exp_args:NNNo \group_end:
#1 #2 \l_@@_internal_a_tl
}
}
+\str_new:N \l_@@_file_name_str
% \end{macrocode}
+% \end{variable}
% \end{macro}
% \end{macro}
%
diff --git a/l3kernel/l3file.dtx b/l3kernel/l3file.dtx
index 465f770..b332ced 100644
--- a/l3kernel/l3file.dtx
+++ b/l3kernel/l3file.dtx
@@ -649,50 +649,28 @@
%
% \subsection{Internal file functions and variables}
%
-% \begin{variable}{\g__file_internal_ior}
-% Used to test for the existence of files when opening.
-% \end{variable}
-%
-% \begin{variable}{\l__file_base_name_str, \l__file_full_name_str}
-% Used to store and transfer the file name (including extension)
-% and (partial) file path whilst reading files. (The file base is the
-% base name plus any preceding directory name.)
-% \end{variable}
-%
-% \begin{function}[added = 2017-06-25]{\__file_missing:n}
+% \begin{function}{\__kernel_file_missing:n}
% \begin{syntax}
-% \cs{__file_missing:n} \Arg{name}
+% \cs{__kernel_file_missing:n} \Arg{name}
% \end{syntax}
-% Expands the \meta{name} as per \cs{__file_name_sanitize:nN} then
+% Expands the \meta{name} as per \cs{@@_name_sanitize:nN} then
% produces an error message indicating that that file was not found.
% \end{function}
%
-% \begin{function}[added = 2017-06-19]{\__file_name_sanitize:nN}
+% \begin{function}{\__kernel_file_input_push:n, \__kernel_file_input_pop:}
% \begin{syntax}
-% \cs{__file_name_sanitize:nN} \Arg{name} \meta{str var}
+% \cs{__kernel_file_input_push:n} \Arg{name}
+% \cs{__kernel_file_input_pop:}
% \end{syntax}
-% Exhaustively-expands the \meta{name} with the exception of any
-% category \meta{active} (catcode~$13$) tokens, which are not expanded.
-% The list of \meta{active} tokens is taken from \cs{l_char_active_seq}.
-% The \meta{str var} is then set to the \meta{sanitized name}.
-% \end{function}
-%
-% \begin{function}[added = 2017-06-19, updated = 2017-06-25]
-% {\__file_name_quote:nN}
-% \begin{syntax}
-% \cs{__file_name_quote:nN} \Arg{name} \meta{str var}
-% \end{syntax}
-% Expands the \meta{name} (without special-casing active tokens), then
-% sets the \meta{str var} to the \meta{name} quoted using |"| at each
-% end if required by the presence of spaces in the \meta{name}. Any existing
-% |"| tokens is removed and if their number is odd an error is raised.
+% Used to push and pop data from the internal file stack: needed only
+% in package mode, where interfacing with the \LaTeXe{} kernel is necessary.
% \end{function}
%
% \subsection{Internal input--output functions}
%
-% \begin{function}[added = 2012-01-23]{\__ior_open:Nn, \__ior_open:No}
+% \begin{function}{\__kernel_ior_open:Nn, \__kernel_ior_open:No}
% \begin{syntax}
-% \cs{__ior_open:Nn} \meta{stream} \Arg{file name}
+% \cs{__kernel_ior_open:Nn} \meta{stream} \Arg{file name}
% \end{syntax}
% This function has identical syntax to the public version. However,
% is does not take precautions against active characters in the
@@ -704,9 +682,9 @@
% implementation of \cs{file_get_full_name:nN},
% \end{function}
%
-% \begin{function}[added = 2014-08-23]{\__iow_with:Nnn}
+% \begin{function}[added = 2014-08-23]{\__kernel_iow_with:Nnn}
% \begin{syntax}
-% \cs{__iow_with:Nnn} \meta{integer} \Arg{value} \Arg{code}
+% \cs{__kernel_iow_with:Nnn} \meta{integer} \Arg{value} \Arg{code}
% \end{syntax}
% If the \meta{integer} is equal to the \meta{value} then this
% function simply runs the \meta{code}. Otherwise it saves the
@@ -821,11 +799,11 @@
% \end{macrocode}
% \end{variable}
%
-% \begin{variable}{\l__file_base_name_str, \l__file_full_name_str}
+% \begin{variable}{\l_@@_base_name_str, \l_@@_full_name_str}
% For storing the basename and full path whilst passing data internally.
% \begin{macrocode}
-\str_new:N \l__file_base_name_str
-\str_new:N \l__file_full_name_str
+\str_new:N \l_@@_base_name_str
+\str_new:N \l_@@_full_name_str
% \end{macrocode}
% \end{variable}
%
@@ -855,8 +833,8 @@
% \end{macrocode}
% \end{variable}
%
-% \begin{macro}{\__file_name_sanitize:nN}
-% \begin{macro}{\__file_name_quote:nN}
+% \begin{macro}{\@@_name_sanitize:nN}
+% \begin{macro}{\@@_name_quote:nN}
% \begin{macro}{\@@_name_sanitize_aux:n}
% For converting a token list to a string where active characters are treated
% as strings from the start. The logic to the quoting normalisation is the
@@ -864,7 +842,7 @@
% assuming they balance strip all of them out before quoting the entire name
% if it contains spaces.
% \begin{macrocode}
-\cs_new_protected:Npn \__file_name_sanitize:nN #1#2
+\cs_new_protected:Npn \@@_name_sanitize:nN #1#2
{
\group_begin:
\seq_map_inline:Nn \l_char_active_seq
@@ -878,7 +856,7 @@
\exp_args:NNNV \group_end:
\str_set:Nn #2 \l_@@_tmp_tl
}
-\cs_new_protected:Npn \__file_name_quote:nN #1#2
+\cs_new_protected:Npn \@@_name_quote:nN #1#2
{
\str_set:Nx #2 {#1}
\int_if_even:nF
@@ -912,7 +890,7 @@
% \begin{macrocode}
\cs_new_protected:Npn \file_get_full_name:nN #1#2
{
- \__file_name_sanitize:nN {#1} \l__file_base_name_str
+ \@@_name_sanitize:nN {#1} \l_@@_base_name_str
\@@_get_full_name_search:nN { } \use:n
\seq_map_inline:Nn \l_file_search_path_seq
{ \@@_get_full_name_search:nN { ##1 / } \seq_map_break:n }
@@ -923,30 +901,30 @@
{ \@@_get_full_name_search:nN { ##1 } \tl_map_break:n }
}
%</package>
- \str_clear:N \l__file_full_name_str
+ \str_clear:N \l_@@_full_name_str
\prg_break_point:
- \str_if_empty:NF \l__file_full_name_str
+ \str_if_empty:NF \l_@@_full_name_str
{
- \exp_args:NV \file_parse_full_name:nNNN \l__file_full_name_str
+ \exp_args:NV \file_parse_full_name:nNNN \l_@@_full_name_str
\l_@@_dir_str \l_@@_name_str \l_@@_ext_str
\str_if_empty:NT \l_@@_ext_str
{
- \__ior_open:No \g_@@_internal_ior
- { \l__file_full_name_str .tex }
+ \__kernel_ior_open:No \g_@@_internal_ior
+ { \l_@@_full_name_str .tex }
\ior_if_eof:NF \g_@@_internal_ior
- { \str_put_right:Nn \l__file_full_name_str { .tex } }
+ { \str_put_right:Nn \l_@@_full_name_str { .tex } }
}
}
- \str_set_eq:NN #2 \l__file_full_name_str
+ \str_set_eq:NN #2 \l_@@_full_name_str
\ior_close:N \g_@@_internal_ior
}
\cs_generate_variant:Nn \file_get_full_name:nN { V }
\cs_new_protected:Npn \@@_get_full_name_search:nN #1#2
{
- \__file_name_quote:nN
- { \tl_to_str:n {#1} \l__file_base_name_str }
- \l__file_full_name_str
- \__ior_open:No \g_@@_internal_ior \l__file_full_name_str
+ \@@_name_quote:nN
+ { \tl_to_str:n {#1} \l_@@_base_name_str }
+ \l_@@_full_name_str
+ \__kernel_ior_open:No \g_@@_internal_ior \l_@@_full_name_str
\ior_if_eof:NF \g_@@_internal_ior { #2 { \prg_break: } }
}
% \end{macrocode}
@@ -961,30 +939,30 @@
% \begin{macrocode}
\prg_new_protected_conditional:Npnn \file_if_exist:n #1 { T , F , TF }
{
- \file_get_full_name:nN {#1} \l__file_full_name_str
- \str_if_empty:NTF \l__file_full_name_str
+ \file_get_full_name:nN {#1} \l_@@_full_name_str
+ \str_if_empty:NTF \l_@@_full_name_str
{ \prg_return_false: }
{ \prg_return_true: }
}
% \end{macrocode}
% \end{macro}
%
-% \begin{macro}{\__file_missing:n}
+% \begin{macro}{\__kernel_file_missing:n}
% An error message for a missing file, also used in \cs{ior_open:Nn}.
% \begin{macrocode}
-\cs_new_protected:Npn \__file_missing:n #1
+\cs_new_protected:Npn \__kernel_file_missing:n #1
{
- \__file_name_sanitize:nN {#1} \l__file_base_name_str
+ \@@_name_sanitize:nN {#1} \l_@@_base_name_str
\__kernel_msg_error:nnx { kernel } { file-not-found }
- { \l__file_base_name_str }
+ { \l_@@_base_name_str }
}
% \end{macrocode}
% \end{macro}
%
% \begin{macro}{\file_input:n}
% \begin{macro}{\@@_input:n, \@@_input:V}
-% \begin{macro}{\@@_input_push:n}
-% \begin{macro}{\@@_input_pop:}
+% \begin{macro}{\@@_input_push:n, \__kernel_file_input_push:n}
+% \begin{macro}{\@@_input_pop:, \__kernel_file_input_pop:}
% \begin{macro}{\@@_input_pop:nnn}
% Loading a file is done in a safe way, checking first that the file
% exists and loading only if it does. Push the file name on the
@@ -993,10 +971,10 @@
% \begin{macrocode}
\cs_new_protected:Npn \file_input:n #1
{
- \file_get_full_name:nN {#1} \l__file_full_name_str
- \str_if_empty:NTF \l__file_full_name_str
- { \__file_missing:n {#1} }
- { \@@_input:V \l__file_full_name_str }
+ \file_get_full_name:nN {#1} \l_@@_full_name_str
+ \str_if_empty:NTF \l_@@_full_name_str
+ { \__kernel_file_missing:n {#1} }
+ { \@@_input:V \l_@@_full_name_str }
}
\cs_new_protected:Npn \@@_input:n #1
{
@@ -1031,11 +1009,17 @@
\str_gset_eq:NN \g_file_curr_name_str \l_@@_name_str
\str_gset_eq:NN \g_file_curr_ext_str \l_@@_ext_str
}
+%<*package>
+\cs_new_eq:NN \__kernel_file_input_push:n \__file_input_push:n
+%</package>
\cs_new_protected:Npn \@@_input_pop:
{
\seq_gpop:NN \g_@@_stack_seq \l_@@_tmp_tl
\exp_after:wN \@@_input_pop:nnn \l_@@_tmp_tl
}
+%<*package>
+\cs_new_eq:NN \__kernel_file_input_pop: \__file_input_pop:
+%</package>
\cs_new_protected:Npn \@@_input_pop:nnn #1#2#3
{
\str_gset:Nn \g_file_curr_dir_str {#1}
@@ -1242,7 +1226,7 @@
% Use the conditional version, with an error if the file is not found.
% \begin{macrocode}
\cs_new_protected:Npn \ior_open:Nn #1#2
- { \ior_open:NnF #1 {#2} { \__file_missing:n {#2} } }
+ { \ior_open:NnF #1 {#2} { \__kernel_file_missing:n {#2} } }
\cs_generate_variant:Nn \ior_open:Nn { c }
% \end{macrocode}
% \end{macro}
@@ -1255,11 +1239,11 @@
% \begin{macrocode}
\prg_new_protected_conditional:Npnn \ior_open:Nn #1#2 { T , F , TF }
{
- \file_get_full_name:nN {#2} \l__file_full_name_str
- \str_if_empty:NTF \l__file_full_name_str
+ \file_get_full_name:nN {#2} \l_@@_full_name_str
+ \str_if_empty:NTF \l_@@_full_name_str
{ \prg_return_false: }
{
- \@@_open:No #1 \l__file_full_name_str
+ \__kernel_ior_open:No #1 \l_@@_full_name_str
\prg_return_true:
}
}
@@ -1283,7 +1267,7 @@
% \end{macrocode}
% \end{macro}
%
-% \begin{macro}{\@@_open:Nn, \@@_open:No}
+% \begin{macro}{\__kernel_ior_open:Nn, \__kernel_ior_open:No}
% \begin{macro}{\@@_open_stream:Nn}
% The stream allocation itself uses the fact that there is a list of all of
% those available, so allocation is simply a question of using the number at
@@ -1293,7 +1277,7 @@
% are tracked, so we first try those. If that fails, ask plain \TeX{} or \LaTeXe{}
% for a new stream and use that number (after a bit of conversion).
% \begin{macrocode}
-\cs_new_protected:Npn \@@_open:Nn #1#2
+\cs_new_protected:Npn \__kernel_ior_open:Nn #1#2
{
\ior_close:N #1
\seq_gpop:NNTF \g_@@_streams_seq \l_@@_stream_tl
@@ -1309,7 +1293,7 @@
}
%</package>
}
-\cs_generate_variant:Nn \@@_open:Nn { No }
+\cs_generate_variant:Nn \__kernel_ior_open:Nn { No }
\cs_new_protected:Npn \@@_open_stream:Nn #1#2
{
\tex_global:D \tex_chardef:D #1 = \l_@@_stream_tl \scan_stop:
@@ -1606,10 +1590,10 @@
% \begin{macrocode}
\cs_new_protected:Npn \iow_open:Nn #1#2
{
- \__file_name_sanitize:nN {#2} \l__file_base_name_str
+ \@@_name_sanitize:nN {#2} \l_@@_base_name_str
\iow_close:N #1
\seq_gpop:NNTF \g_@@_streams_seq \l_@@_stream_tl
- { \@@_open_stream:NV #1 \l__file_base_name_str }
+ { \@@_open_stream:NV #1 \l_@@_base_name_str }
%<*initex>
{ \__kernel_msg_fatal:nn { kernel } { output-streams-exhausted } }
%</initex>
@@ -1617,7 +1601,7 @@
{
\@@_new:N #1
\tl_set:Nx \l_@@_stream_tl { \int_eval:n {#1} }
- \@@_open_stream:NV #1 \l__file_base_name_str
+ \@@_open_stream:NV #1 \l_@@_base_name_str
}
%</package>
}
@@ -1697,20 +1681,20 @@
%
% \subsubsection{Immediate writing}
%
-% \begin{macro}{\@@_with:Nnn}
-% \begin{macro}{\@@_with_aux:nNnn}
+% \begin{macro}{\__kernel_iow_with:Nnn}
+% \begin{macro}{\@@_with:nNnn}
% If the integer~|#1| is equal to~|#2|, just leave~|#3| in the input
% stream. Otherwise, pass the old value to an auxiliary, which sets
% the integer to the new value, runs the code, and restores the
% integer.
% \begin{macrocode}
-\cs_new_protected:Npn \@@_with:Nnn #1#2
+\cs_new_protected:Npn \__kernel_iow_with:Nnn #1#2
{
\int_compare:nNnTF {#1} = {#2}
{ \use:n }
- { \exp_args:No \@@_with_aux:nNnn { \int_use:N #1 } #1 {#2} }
+ { \exp_args:No \@@_with:nNnn { \int_use:N #1 } #1 {#2} }
}
-\cs_new_protected:Npn \@@_with_aux:nNnn #1#2#3#4
+\cs_new_protected:Npn \@@_with:nNnn #1#2#3#4
{
\int_set:Nn #2 {#3}
#4
@@ -1728,14 +1712,14 @@
% get the |Nx| variant, because it differs in subtle ways from
% \texttt{x}-expansion, namely, macro parameter characters would not
% need to be doubled. We set the \tn{newlinechar} to~$10$ using
-% \cs{@@_with:Nnn} to support formats such as plain \TeX{}: otherwise,
+% \cs{__kernel_iow_with:Nnn} to support formats such as plain \TeX{}: otherwise,
% \cs{iow_newline:} would not work. We do not do this for
% \cs{iow_shipout:Nn} or \cs{iow_shipout_x:Nn}, as \TeX{} looks at the
% value of the \tn{newlinechar} at shipout time in those cases.
% \begin{macrocode}
\cs_new_protected:Npn \iow_now:Nn #1#2
{
- \@@_with:Nnn \tex_newlinechar:D { `\^^J }
+ \__kernel_iow_with:Nnn \tex_newlinechar:D { `\^^J }
{ \tex_immediate:D \tex_write:D #1 { \exp_not:n {#2} } }
}
\cs_generate_variant:Nn \iow_now:Nn { c, Nx, cx }
@@ -2414,16 +2398,16 @@
{ \seq_put_right:Nn \l_file_search_path_seq }
\cs_new_protected:Npn \file_path_include:n #1
{
- \__file_name_sanitize:nN {#1} \l__file_full_name_str
- \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 }
+ \@@_name_sanitize:nN {#1} \l_@@_full_name_str
+ \seq_if_in:NVF \l_file_search_path_seq \l_@@_full_name_str
+ { \seq_put_right:NV \l_file_search_path_seq \l_@@_full_name_str }
}
\__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
{
- \__file_name_sanitize:nN {#1} \l__file_full_name_str
- \seq_remove_all:NV \l_file_search_path_seq \l__file_full_name_str
+ \@@_name_sanitize:nN {#1} \l_@@_full_name_str
+ \seq_remove_all:NV \l_file_search_path_seq \l_@@_full_name_str
}
% \end{macrocode}
% \end{macro}
diff --git a/l3kernel/l3msg.dtx b/l3kernel/l3msg.dtx
index 4a3a3a3..63912e8 100644
--- a/l3kernel/l3msg.dtx
+++ b/l3kernel/l3msg.dtx
@@ -910,7 +910,7 @@
% inserted by typing |I| in the command-line are inserted after
% the message is entirely cleaned up.
%
-% The \cs{__iow_with:Nnn} auxiliary, defined in \pkg{l3file}, expects
+% The \cs{__kernel_iow_with:Nnn} auxiliary, defined in \pkg{l3file}, expects
% an \meta{integer variable}, an integer \meta{value}, and some
% \meta{code}. It runs the \meta{code} after ensuring that the
% \meta{integer variable} takes the given \meta{value}, then restores
@@ -939,9 +939,9 @@
\iow_newline:
!
}
- \__iow_with:Nnn \tex_newlinechar:D { `\^^J }
+ \__kernel_iow_with:Nnn \tex_newlinechar:D { `\^^J }
{
- \__iow_with:Nnn \tex_errorcontextlines:D { -1 }
+ \__kernel_iow_with:Nnn \tex_errorcontextlines:D { -1 }
{
\group_begin:
\cs_set_protected:Npn &
@@ -1331,9 +1331,9 @@
\tl_if_empty:nF {#1}
{ \exp_args:No \iow_term:n { \use_none:n #1 } }
\tl_set:Nn \l_@@_internal_tl {#2}
- \__iow_with:Nnn \tex_newlinechar:D { 10 }
+ \__kernel_iow_with:Nnn \tex_newlinechar:D { 10 }
{
- \__iow_with:Nnn \tex_errorcontextlines:D { -1 }
+ \__kernel_iow_with:Nnn \tex_errorcontextlines:D { -1 }
{
\etex_showtokens:D \exp_after:wN \exp_after:wN \exp_after:wN
{ \exp_after:wN \l_@@_internal_tl }
diff --git a/l3kernel/l3tl.dtx b/l3kernel/l3tl.dtx
index 1d22528..5090216 100644
--- a/l3kernel/l3tl.dtx
+++ b/l3kernel/l3tl.dtx
@@ -2980,7 +2980,7 @@
% of all these manipulations is displayed to the terminal using
% \cs{etex_showtokens:D} and an odd \cs{exp_after:wN} which expand the
% closing brace to improve the output slightly. The calls to
-% \cs{__iow_with:Nnn} ensure that the \tn{newlinechar} is set to~$10$
+% \cs{__kernel_iow_with:Nnn} ensure that the \tn{newlinechar} is set to~$10$
% so that the \cs{iow_newline:} inserted by the line-wrapping code
% are correctly recognized by \TeX{}, and that \tn{errorcontextlines}
% is $-1$ to avoid printing irrelevant context.
@@ -2990,9 +2990,9 @@
\cs_new_protected:Npn \@@_show:n #1
{
\tl_set:Nf \l_@@_internal_a_tl { \@@_show:w #1 \q_stop }
- \__iow_with:Nnn \tex_newlinechar:D { 10 }
+ \__kernel_iow_with:Nnn \tex_newlinechar:D { 10 }
{
- \__iow_with:Nnn \tex_errorcontextlines:D { -1 }
+ \__kernel_iow_with:Nnn \tex_errorcontextlines:D { -1 }
{
\etex_showtokens:D \exp_after:wN \exp_after:wN \exp_after:wN
{ \exp_after:wN \l_@@_internal_a_tl }
diff --git a/l3kernel/testfiles/m3expl001.luatex.tlg b/l3kernel/testfiles/m3expl001.luatex.tlg
index 4009e63..6e2aefc 100644
--- a/l3kernel/testfiles/m3expl001.luatex.tlg
+++ b/l3kernel/testfiles/m3expl001.luatex.tlg
@@ -3070,12 +3070,14 @@ Defining \__file_get_full_name_search:nN on line ...
Defining \file_if_exist:nT on line ...
Defining \file_if_exist:nF on line ...
Defining \file_if_exist:nTF on line ...
-Defining \__file_missing:n on line ...
+Defining \__kernel_file_missing:n on line ...
Defining \file_input:n on line ...
Defining \__file_input:n on line ...
Defining \__file_input:V on line ...
Defining \__file_input_push:n on line ...
+Defining \__kernel_file_input_push:n on line ...
Defining \__file_input_pop: on line ...
+Defining \__kernel_file_input_pop: on line ...
Defining \__file_input_pop:nnn on line ...
Defining \file_parse_full_name:nNNN on line ...
Defining \__file_parse_full_name_auxi:w on line ...
@@ -3101,8 +3103,8 @@ Defining \ior_open:cnT on line ...
Defining \ior_open:cnF on line ...
Defining \ior_open:cnTF on line ...
Defining \__ior_new:N on line ...
-Defining \__ior_open:Nn on line ...
-Defining \__ior_open:No on line ...
+Defining \__kernel_ior_open:Nn on line ...
+Defining \__kernel_ior_open:No on line ...
Defining \__ior_open_stream:Nn on line ...
Defining \ior_close:N on line ...
Defining \ior_close:c on line ...
@@ -3153,8 +3155,8 @@ Defining \iow_shipout:Nn on line ...
Defining \iow_shipout:cn on line ...
Defining \iow_shipout:Nx on line ...
Defining \iow_shipout:cx on line ...
-Defining \__iow_with:Nnn on line ...
-Defining \__iow_with_aux:nNnn on line ...
+Defining \__kernel_iow_with:Nnn on line ...
+Defining \__iow_with:nNnn on line ...
Defining \iow_now:Nn on line ...
Defining \iow_now:cn on line ...
Defining \iow_now:Nx on line ...
@@ -5830,6 +5832,7 @@ Defining \tl_gset_from_file_x:Nnn on line ...
Defining \tl_set_from_file_x:cnn on line ...
Defining \tl_gset_from_file_x:cnn on line ...
Defining \__tl_set_from_file_x:NNnn on line ...
+Defining \l__tl_file_name_str on line ...
Defining \tl_if_head_eq_catcode:oNTF on line ...
Defining \tl_lower_case:n on line ...
Defining \tl_upper_case:n on line ...
diff --git a/l3kernel/testfiles/m3expl001.ptex.tlg b/l3kernel/testfiles/m3expl001.ptex.tlg
index 8c09301..3ba0a18 100644
--- a/l3kernel/testfiles/m3expl001.ptex.tlg
+++ b/l3kernel/testfiles/m3expl001.ptex.tlg
@@ -3007,12 +3007,14 @@ Defining \__file_get_full_name_search:nN on line ...
Defining \file_if_exist:nT on line ...
Defining \file_if_exist:nF on line ...
Defining \file_if_exist:nTF on line ...
-Defining \__file_missing:n on line ...
+Defining \__kernel_file_missing:n on line ...
Defining \file_input:n on line ...
Defining \__file_input:n on line ...
Defining \__file_input:V on line ...
Defining \__file_input_push:n on line ...
+Defining \__kernel_file_input_push:n on line ...
Defining \__file_input_pop: on line ...
+Defining \__kernel_file_input_pop: on line ...
Defining \__file_input_pop:nnn on line ...
Defining \file_parse_full_name:nNNN on line ...
Defining \__file_parse_full_name_auxi:w on line ...
@@ -3038,8 +3040,8 @@ Defining \ior_open:cnT on line ...
Defining \ior_open:cnF on line ...
Defining \ior_open:cnTF on line ...
Defining \__ior_new:N on line ...
-Defining \__ior_open:Nn on line ...
-Defining \__ior_open:No on line ...
+Defining \__kernel_ior_open:Nn on line ...
+Defining \__kernel_ior_open:No on line ...
Defining \__ior_open_stream:Nn on line ...
Defining \ior_close:N on line ...
Defining \ior_close:c on line ...
@@ -3090,8 +3092,8 @@ Defining \iow_shipout:Nn on line ...
Defining \iow_shipout:cn on line ...
Defining \iow_shipout:Nx on line ...
Defining \iow_shipout:cx on line ...
-Defining \__iow_with:Nnn on line ...
-Defining \__iow_with_aux:nNnn on line ...
+Defining \__kernel_iow_with:Nnn on line ...
+Defining \__iow_with:nNnn on line ...
Defining \iow_now:Nn on line ...
Defining \iow_now:cn on line ...
Defining \iow_now:Nx on line ...
@@ -5770,6 +5772,7 @@ Defining \tl_gset_from_file_x:Nnn on line ...
Defining \tl_set_from_file_x:cnn on line ...
Defining \tl_gset_from_file_x:cnn on line ...
Defining \__tl_set_from_file_x:NNnn on line ...
+Defining \l__tl_file_name_str on line ...
Defining \tl_if_head_eq_catcode:oNTF on line ...
Defining \tl_lower_case:n on line ...
Defining \tl_upper_case:n on line ...
diff --git a/l3kernel/testfiles/m3expl001.tlg b/l3kernel/testfiles/m3expl001.tlg
index a0e6ec6..7f85745 100644
--- a/l3kernel/testfiles/m3expl001.tlg
+++ b/l3kernel/testfiles/m3expl001.tlg
@@ -3007,12 +3007,14 @@ Defining \__file_get_full_name_search:nN on line ...
Defining \file_if_exist:nT on line ...
Defining \file_if_exist:nF on line ...
Defining \file_if_exist:nTF on line ...
-Defining \__file_missing:n on line ...
+Defining \__kernel_file_missing:n on line ...
Defining \file_input:n on line ...
Defining \__file_input:n on line ...
Defining \__file_input:V on line ...
Defining \__file_input_push:n on line ...
+Defining \__kernel_file_input_push:n on line ...
Defining \__file_input_pop: on line ...
+Defining \__kernel_file_input_pop: on line ...
Defining \__file_input_pop:nnn on line ...
Defining \file_parse_full_name:nNNN on line ...
Defining \__file_parse_full_name_auxi:w on line ...
@@ -3038,8 +3040,8 @@ Defining \ior_open:cnT on line ...
Defining \ior_open:cnF on line ...
Defining \ior_open:cnTF on line ...
Defining \__ior_new:N on line ...
-Defining \__ior_open:Nn on line ...
-Defining \__ior_open:No on line ...
+Defining \__kernel_ior_open:Nn on line ...
+Defining \__kernel_ior_open:No on line ...
Defining \__ior_open_stream:Nn on line ...
Defining \ior_close:N on line ...
Defining \ior_close:c on line ...
@@ -3090,8 +3092,8 @@ Defining \iow_shipout:Nn on line ...
Defining \iow_shipout:cn on line ...
Defining \iow_shipout:Nx on line ...
Defining \iow_shipout:cx on line ...
-Defining \__iow_with:Nnn on line ...
-Defining \__iow_with_aux:nNnn on line ...
+Defining \__kernel_iow_with:Nnn on line ...
+Defining \__iow_with:nNnn on line ...
Defining \iow_now:Nn on line ...
Defining \iow_now:cn on line ...
Defining \iow_now:Nx on line ...
@@ -5770,6 +5772,7 @@ Defining \tl_gset_from_file_x:Nnn on line ...
Defining \tl_set_from_file_x:cnn on line ...
Defining \tl_gset_from_file_x:cnn on line ...
Defining \__tl_set_from_file_x:NNnn on line ...
+Defining \l__tl_file_name_str on line ...
Defining \tl_if_head_eq_catcode:oNTF on line ...
Defining \tl_lower_case:n on line ...
Defining \tl_upper_case:n on line ...
diff --git a/l3kernel/testfiles/m3expl001.uptex.tlg b/l3kernel/testfiles/m3expl001.uptex.tlg
index 0bbf153..c95405a 100644
--- a/l3kernel/testfiles/m3expl001.uptex.tlg
+++ b/l3kernel/testfiles/m3expl001.uptex.tlg
@@ -3007,12 +3007,14 @@ Defining \__file_get_full_name_search:nN on line ...
Defining \file_if_exist:nT on line ...
Defining \file_if_exist:nF on line ...
Defining \file_if_exist:nTF on line ...
-Defining \__file_missing:n on line ...
+Defining \__kernel_file_missing:n on line ...
Defining \file_input:n on line ...
Defining \__file_input:n on line ...
Defining \__file_input:V on line ...
Defining \__file_input_push:n on line ...
+Defining \__kernel_file_input_push:n on line ...
Defining \__file_input_pop: on line ...
+Defining \__kernel_file_input_pop: on line ...
Defining \__file_input_pop:nnn on line ...
Defining \file_parse_full_name:nNNN on line ...
Defining \__file_parse_full_name_auxi:w on line ...
@@ -3038,8 +3040,8 @@ Defining \ior_open:cnT on line ...
Defining \ior_open:cnF on line ...
Defining \ior_open:cnTF on line ...
Defining \__ior_new:N on line ...
-Defining \__ior_open:Nn on line ...
-Defining \__ior_open:No on line ...
+Defining \__kernel_ior_open:Nn on line ...
+Defining \__kernel_ior_open:No on line ...
Defining \__ior_open_stream:Nn on line ...
Defining \ior_close:N on line ...
Defining \ior_close:c on line ...
@@ -3090,8 +3092,8 @@ Defining \iow_shipout:Nn on line ...
Defining \iow_shipout:cn on line ...
Defining \iow_shipout:Nx on line ...
Defining \iow_shipout:cx on line ...
-Defining \__iow_with:Nnn on line ...
-Defining \__iow_with_aux:nNnn on line ...
+Defining \__kernel_iow_with:Nnn on line ...
+Defining \__iow_with:nNnn on line ...
Defining \iow_now:Nn on line ...
Defining \iow_now:cn on line ...
Defining \iow_now:Nx on line ...
@@ -5768,6 +5770,7 @@ Defining \tl_gset_from_file_x:Nnn on line ...
Defining \tl_set_from_file_x:cnn on line ...
Defining \tl_gset_from_file_x:cnn on line ...
Defining \__tl_set_from_file_x:NNnn on line ...
+Defining \l__tl_file_name_str on line ...
Defining \tl_if_head_eq_catcode:oNTF on line ...
Defining \tl_lower_case:n on line ...
Defining \tl_upper_case:n on line ...
diff --git a/l3kernel/testfiles/m3expl001.xetex.tlg b/l3kernel/testfiles/m3expl001.xetex.tlg
index 9e65c6d..083eb39 100644
--- a/l3kernel/testfiles/m3expl001.xetex.tlg
+++ b/l3kernel/testfiles/m3expl001.xetex.tlg
@@ -3068,12 +3068,14 @@ Defining \__file_get_full_name_search:nN on line ...
Defining \file_if_exist:nT on line ...
Defining \file_if_exist:nF on line ...
Defining \file_if_exist:nTF on line ...
-Defining \__file_missing:n on line ...
+Defining \__kernel_file_missing:n on line ...
Defining \file_input:n on line ...
Defining \__file_input:n on line ...
Defining \__file_input:V on line ...
Defining \__file_input_push:n on line ...
+Defining \__kernel_file_input_push:n on line ...
Defining \__file_input_pop: on line ...
+Defining \__kernel_file_input_pop: on line ...
Defining \__file_input_pop:nnn on line ...
Defining \file_parse_full_name:nNNN on line ...
Defining \__file_parse_full_name_auxi:w on line ...
@@ -3099,8 +3101,8 @@ Defining \ior_open:cnT on line ...
Defining \ior_open:cnF on line ...
Defining \ior_open:cnTF on line ...
Defining \__ior_new:N on line ...
-Defining \__ior_open:Nn on line ...
-Defining \__ior_open:No on line ...
+Defining \__kernel_ior_open:Nn on line ...
+Defining \__kernel_ior_open:No on line ...
Defining \__ior_open_stream:Nn on line ...
Defining \ior_close:N on line ...
Defining \ior_close:c on line ...
@@ -3151,8 +3153,8 @@ Defining \iow_shipout:Nn on line ...
Defining \iow_shipout:cn on line ...
Defining \iow_shipout:Nx on line ...
Defining \iow_shipout:cx on line ...
-Defining \__iow_with:Nnn on line ...
-Defining \__iow_with_aux:nNnn on line ...
+Defining \__kernel_iow_with:Nnn on line ...
+Defining \__iow_with:nNnn on line ...
Defining \iow_now:Nn on line ...
Defining \iow_now:cn on line ...
Defining \iow_now:Nx on line ...
@@ -5803,6 +5805,7 @@ Defining \tl_gset_from_file_x:Nnn on line ...
Defining \tl_set_from_file_x:cnn on line ...
Defining \tl_gset_from_file_x:cnn on line ...
Defining \__tl_set_from_file_x:NNnn on line ...
+Defining \l__tl_file_name_str on line ...
Defining \tl_if_head_eq_catcode:oNTF on line ...
Defining \tl_lower_case:n on line ...
Defining \tl_upper_case:n on line ...
diff --git a/l3kernel/testfiles/m3expl003.luatex.tlg b/l3kernel/testfiles/m3expl003.luatex.tlg
index 4009e63..6e2aefc 100644
--- a/l3kernel/testfiles/m3expl003.luatex.tlg
+++ b/l3kernel/testfiles/m3expl003.luatex.tlg
@@ -3070,12 +3070,14 @@ Defining \__file_get_full_name_search:nN on line ...
Defining \file_if_exist:nT on line ...
Defining \file_if_exist:nF on line ...
Defining \file_if_exist:nTF on line ...
-Defining \__file_missing:n on line ...
+Defining \__kernel_file_missing:n on line ...
Defining \file_input:n on line ...
Defining \__file_input:n on line ...
Defining \__file_input:V on line ...
Defining \__file_input_push:n on line ...
+Defining \__kernel_file_input_push:n on line ...
Defining \__file_input_pop: on line ...
+Defining \__kernel_file_input_pop: on line ...
Defining \__file_input_pop:nnn on line ...
Defining \file_parse_full_name:nNNN on line ...
Defining \__file_parse_full_name_auxi:w on line ...
@@ -3101,8 +3103,8 @@ Defining \ior_open:cnT on line ...
Defining \ior_open:cnF on line ...
Defining \ior_open:cnTF on line ...
Defining \__ior_new:N on line ...
-Defining \__ior_open:Nn on line ...
-Defining \__ior_open:No on line ...
+Defining \__kernel_ior_open:Nn on line ...
+Defining \__kernel_ior_open:No on line ...
Defining \__ior_open_stream:Nn on line ...
Defining \ior_close:N on line ...
Defining \ior_close:c on line ...
@@ -3153,8 +3155,8 @@ Defining \iow_shipout:Nn on line ...
Defining \iow_shipout:cn on line ...
Defining \iow_shipout:Nx on line ...
Defining \iow_shipout:cx on line ...
-Defining \__iow_with:Nnn on line ...
-Defining \__iow_with_aux:nNnn on line ...
+Defining \__kernel_iow_with:Nnn on line ...
+Defining \__iow_with:nNnn on line ...
Defining \iow_now:Nn on line ...
Defining \iow_now:cn on line ...
Defining \iow_now:Nx on line ...
@@ -5830,6 +5832,7 @@ Defining \tl_gset_from_file_x:Nnn on line ...
Defining \tl_set_from_file_x:cnn on line ...
Defining \tl_gset_from_file_x:cnn on line ...
Defining \__tl_set_from_file_x:NNnn on line ...
+Defining \l__tl_file_name_str on line ...
Defining \tl_if_head_eq_catcode:oNTF on line ...
Defining \tl_lower_case:n on line ...
Defining \tl_upper_case:n on line ...
diff --git a/l3kernel/testfiles/m3expl003.ptex.tlg b/l3kernel/testfiles/m3expl003.ptex.tlg
index 8c09301..3ba0a18 100644
--- a/l3kernel/testfiles/m3expl003.ptex.tlg
+++ b/l3kernel/testfiles/m3expl003.ptex.tlg
@@ -3007,12 +3007,14 @@ Defining \__file_get_full_name_search:nN on line ...
Defining \file_if_exist:nT on line ...
Defining \file_if_exist:nF on line ...
Defining \file_if_exist:nTF on line ...
-Defining \__file_missing:n on line ...
+Defining \__kernel_file_missing:n on line ...
Defining \file_input:n on line ...
Defining \__file_input:n on line ...
Defining \__file_input:V on line ...
Defining \__file_input_push:n on line ...
+Defining \__kernel_file_input_push:n on line ...
Defining \__file_input_pop: on line ...
+Defining \__kernel_file_input_pop: on line ...
Defining \__file_input_pop:nnn on line ...
Defining \file_parse_full_name:nNNN on line ...
Defining \__file_parse_full_name_auxi:w on line ...
@@ -3038,8 +3040,8 @@ Defining \ior_open:cnT on line ...
Defining \ior_open:cnF on line ...
Defining \ior_open:cnTF on line ...
Defining \__ior_new:N on line ...
-Defining \__ior_open:Nn on line ...
-Defining \__ior_open:No on line ...
+Defining \__kernel_ior_open:Nn on line ...
+Defining \__kernel_ior_open:No on line ...
Defining \__ior_open_stream:Nn on line ...
Defining \ior_close:N on line ...
Defining \ior_close:c on line ...
@@ -3090,8 +3092,8 @@ Defining \iow_shipout:Nn on line ...
Defining \iow_shipout:cn on line ...
Defining \iow_shipout:Nx on line ...
Defining \iow_shipout:cx on line ...
-Defining \__iow_with:Nnn on line ...
-Defining \__iow_with_aux:nNnn on line ...
+Defining \__kernel_iow_with:Nnn on line ...
+Defining \__iow_with:nNnn on line ...
Defining \iow_now:Nn on line ...
Defining \iow_now:cn on line ...
Defining \iow_now:Nx on line ...
@@ -5770,6 +5772,7 @@ Defining \tl_gset_from_file_x:Nnn on line ...
Defining \tl_set_from_file_x:cnn on line ...
Defining \tl_gset_from_file_x:cnn on line ...
Defining \__tl_set_from_file_x:NNnn on line ...
+Defining \l__tl_file_name_str on line ...
Defining \tl_if_head_eq_catcode:oNTF on line ...
Defining \tl_lower_case:n on line ...
Defining \tl_upper_case:n on line ...
diff --git a/l3kernel/testfiles/m3expl003.tlg b/l3kernel/testfiles/m3expl003.tlg
index a0e6ec6..7f85745 100644
--- a/l3kernel/testfiles/m3expl003.tlg
+++ b/l3kernel/testfiles/m3expl003.tlg
@@ -3007,12 +3007,14 @@ Defining \__file_get_full_name_search:nN on line ...
Defining \file_if_exist:nT on line ...
Defining \file_if_exist:nF on line ...
Defining \file_if_exist:nTF on line ...
-Defining \__file_missing:n on line ...
+Defining \__kernel_file_missing:n on line ...
Defining \file_input:n on line ...
Defining \__file_input:n on line ...
Defining \__file_input:V on line ...
Defining \__file_input_push:n on line ...
+Defining \__kernel_file_input_push:n on line ...
Defining \__file_input_pop: on line ...
+Defining \__kernel_file_input_pop: on line ...
Defining \__file_input_pop:nnn on line ...
Defining \file_parse_full_name:nNNN on line ...
Defining \__file_parse_full_name_auxi:w on line ...
@@ -3038,8 +3040,8 @@ Defining \ior_open:cnT on line ...
Defining \ior_open:cnF on line ...
Defining \ior_open:cnTF on line ...
Defining \__ior_new:N on line ...
-Defining \__ior_open:Nn on line ...
-Defining \__ior_open:No on line ...
+Defining \__kernel_ior_open:Nn on line ...
+Defining \__kernel_ior_open:No on line ...
Defining \__ior_open_stream:Nn on line ...
Defining \ior_close:N on line ...
Defining \ior_close:c on line ...
@@ -3090,8 +3092,8 @@ Defining \iow_shipout:Nn on line ...
Defining \iow_shipout:cn on line ...
Defining \iow_shipout:Nx on line ...
Defining \iow_shipout:cx on line ...
-Defining \__iow_with:Nnn on line ...
-Defining \__iow_with_aux:nNnn on line ...
+Defining \__kernel_iow_with:Nnn on line ...
+Defining \__iow_with:nNnn on line ...
Defining \iow_now:Nn on line ...
Defining \iow_now:cn on line ...
Defining \iow_now:Nx on line ...
@@ -5770,6 +5772,7 @@ Defining \tl_gset_from_file_x:Nnn on line ...
Defining \tl_set_from_file_x:cnn on line ...
Defining \tl_gset_from_file_x:cnn on line ...
Defining \__tl_set_from_file_x:NNnn on line ...
+Defining \l__tl_file_name_str on line ...
Defining \tl_if_head_eq_catcode:oNTF on line ...
Defining \tl_lower_case:n on line ...
Defining \tl_upper_case:n on line ...
diff --git a/l3kernel/testfiles/m3expl003.uptex.tlg b/l3kernel/testfiles/m3expl003.uptex.tlg
index 0bbf153..c95405a 100644
--- a/l3kernel/testfiles/m3expl003.uptex.tlg
+++ b/l3kernel/testfiles/m3expl003.uptex.tlg
@@ -3007,12 +3007,14 @@ Defining \__file_get_full_name_search:nN on line ...
Defining \file_if_exist:nT on line ...
Defining \file_if_exist:nF on line ...
Defining \file_if_exist:nTF on line ...
-Defining \__file_missing:n on line ...
+Defining \__kernel_file_missing:n on line ...
Defining \file_input:n on line ...
Defining \__file_input:n on line ...
Defining \__file_input:V on line ...
Defining \__file_input_push:n on line ...
+Defining \__kernel_file_input_push:n on line ...
Defining \__file_input_pop: on line ...
+Defining \__kernel_file_input_pop: on line ...
Defining \__file_input_pop:nnn on line ...
Defining \file_parse_full_name:nNNN on line ...
Defining \__file_parse_full_name_auxi:w on line ...
@@ -3038,8 +3040,8 @@ Defining \ior_open:cnT on line ...
Defining \ior_open:cnF on line ...
Defining \ior_open:cnTF on line ...
Defining \__ior_new:N on line ...
-Defining \__ior_open:Nn on line ...
-Defining \__ior_open:No on line ...
+Defining \__kernel_ior_open:Nn on line ...
+Defining \__kernel_ior_open:No on line ...
Defining \__ior_open_stream:Nn on line ...
Defining \ior_close:N on line ...
Defining \ior_close:c on line ...
@@ -3090,8 +3092,8 @@ Defining \iow_shipout:Nn on line ...
Defining \iow_shipout:cn on line ...
Defining \iow_shipout:Nx on line ...
Defining \iow_shipout:cx on line ...
-Defining \__iow_with:Nnn on line ...
-Defining \__iow_with_aux:nNnn on line ...
+Defining \__kernel_iow_with:Nnn on line ...
+Defining \__iow_with:nNnn on line ...
Defining \iow_now:Nn on line ...
Defining \iow_now:cn on line ...
Defining \iow_now:Nx on line ...
@@ -5768,6 +5770,7 @@ Defining \tl_gset_from_file_x:Nnn on line ...
Defining \tl_set_from_file_x:cnn on line ...
Defining \tl_gset_from_file_x:cnn on line ...
Defining \__tl_set_from_file_x:NNnn on line ...
+Defining \l__tl_file_name_str on line ...
Defining \tl_if_head_eq_catcode:oNTF on line ...
Defining \tl_lower_case:n on line ...
Defining \tl_upper_case:n on line ...
diff --git a/l3kernel/testfiles/m3expl003.xetex.tlg b/l3kernel/testfiles/m3expl003.xetex.tlg
index 9e65c6d..083eb39 100644
--- a/l3kernel/testfiles/m3expl003.xetex.tlg
+++ b/l3kernel/testfiles/m3expl003.xetex.tlg
@@ -3068,12 +3068,14 @@ Defining \__file_get_full_name_search:nN on line ...
Defining \file_if_exist:nT on line ...
Defining \file_if_exist:nF on line ...
Defining \file_if_exist:nTF on line ...
-Defining \__file_missing:n on line ...
+Defining \__kernel_file_missing:n on line ...
Defining \file_input:n on line ...
Defining \__file_input:n on line ...
Defining \__file_input:V on line ...
Defining \__file_input_push:n on line ...
+Defining \__kernel_file_input_push:n on line ...
Defining \__file_input_pop: on line ...
+Defining \__kernel_file_input_pop: on line ...
Defining \__file_input_pop:nnn on line ...
Defining \file_parse_full_name:nNNN on line ...
Defining \__file_parse_full_name_auxi:w on line ...
@@ -3099,8 +3101,8 @@ Defining \ior_open:cnT on line ...
Defining \ior_open:cnF on line ...
Defining \ior_open:cnTF on line ...
Defining \__ior_new:N on line ...
-Defining \__ior_open:Nn on line ...
-Defining \__ior_open:No on line ...
+Defining \__kernel_ior_open:Nn on line ...
+Defining \__kernel_ior_open:No on line ...
Defining \__ior_open_stream:Nn on line ...
Defining \ior_close:N on line ...
Defining \ior_close:c on line ...
@@ -3151,8 +3153,8 @@ Defining \iow_shipout:Nn on line ...
Defining \iow_shipout:cn on line ...
Defining \iow_shipout:Nx on line ...
Defining \iow_shipout:cx on line ...
-Defining \__iow_with:Nnn on line ...
-Defining \__iow_with_aux:nNnn on line ...
+Defining \__kernel_iow_with:Nnn on line ...
+Defining \__iow_with:nNnn on line ...
Defining \iow_now:Nn on line ...
Defining \iow_now:cn on line ...
Defining \iow_now:Nx on line ...
@@ -5803,6 +5805,7 @@ Defining \tl_gset_from_file_x:Nnn on line ...
Defining \tl_set_from_file_x:cnn on line ...
Defining \tl_gset_from_file_x:cnn on line ...
Defining \__tl_set_from_file_x:NNnn on line ...
+Defining \l__tl_file_name_str on line ...
Defining \tl_if_head_eq_catcode:oNTF on line ...
Defining \tl_lower_case:n on line ...
Defining \tl_upper_case:n on line ...
More information about the latex3-commits
mailing list