[latex3-commits] [git/LaTeX3-latex3-latex3] master: Deprecate \tl_set_from_file:Nnn, replace with \file_get:nnN (2208dc1)
Joseph Wright
joseph.wright at morningstar2.co.uk
Wed Jan 16 14:15:07 CET 2019
Repository : https://github.com/latex3/latex3
On branch : master
Link : https://github.com/latex3/latex3/commit/2208dc1e843145e7ddb47dfe4c97bd62694ee1f3
>---------------------------------------------------------------
commit 2208dc1e843145e7ddb47dfe4c97bd62694ee1f3
Author: Joseph Wright <joseph.wright at morningstar2.co.uk>
Date: Wed Jan 16 10:07:42 2019 +0000
Deprecate \tl_set_from_file:Nnn, replace with \file_get:nnN
>---------------------------------------------------------------
2208dc1e843145e7ddb47dfe4c97bd62694ee1f3
l3kernel/CHANGELOG.md | 8 ++
l3kernel/l3candidates.dtx | 169 +++++++++----------------------
l3kernel/l3file.dtx | 57 +++++++++++
l3kernel/l3obsolete.txt | 8 ++
l3kernel/testfiles/m3expl001.luatex.tlg | 26 ++---
l3kernel/testfiles/m3expl001.tlg | 26 ++---
l3kernel/testfiles/m3expl001.uptex.tlg | 26 ++---
l3kernel/testfiles/m3expl001.xetex.tlg | 26 ++---
l3kernel/testfiles/m3expl003.luatex.tlg | 26 ++---
l3kernel/testfiles/m3expl003.tlg | 26 ++---
l3kernel/testfiles/m3expl003.uptex.tlg | 26 ++---
l3kernel/testfiles/m3expl003.xetex.tlg | 26 ++---
12 files changed, 224 insertions(+), 226 deletions(-)
diff --git a/l3kernel/CHANGELOG.md b/l3kernel/CHANGELOG.md
index ea0adf7..fe131d2 100644
--- a/l3kernel/CHANGELOG.md
+++ b/l3kernel/CHANGELOG.md
@@ -7,10 +7,18 @@ this project uses date-based 'snapshot' version identifiers.
## [Unreleased]
+### Added
+
+- `\file_get:nnN`
+
### Changed
- `\char_generate:nn` now always takes exactly two expansions
+### Deprecated
+
+- `\tl_(g)set_from_file(_x):Nnn`, replaced by `\file_get:nnN`
+
### Fixed
- In (u)platex: detection of spaces in `\tl_rescan:nn` and related functions
diff --git a/l3kernel/l3candidates.dtx b/l3kernel/l3candidates.dtx
index 295af6e..0a10df5 100644
--- a/l3kernel/l3candidates.dtx
+++ b/l3kernel/l3candidates.dtx
@@ -1220,33 +1220,6 @@
% to add these to the kernel where they are well-documented
% (\emph{e.g.}~in Unicode Consortium or relevant government publications).
%
-% \begin{function}[added = 2014-06-25]
-% {
-% \tl_set_from_file:Nnn, \tl_set_from_file:cnn,
-% \tl_gset_from_file:Nnn, \tl_gset_from_file:cnn
-% }
-% \begin{syntax}
-% \cs{tl_set_from_file:Nnn} \meta{tl} \Arg{setup} \Arg{filename}
-% \end{syntax}
-% Defines \meta{tl} to the contents of \meta{filename}.
-% Category codes may need to be set appropriately via the \meta{setup}
-% argument.
-% \end{function}
-%
-% \begin{function}[added = 2014-06-25]
-% {
-% \tl_set_from_file_x:Nnn, \tl_set_from_file_x:cnn,
-% \tl_gset_from_file_x:Nnn, \tl_gset_from_file_x:cnn
-% }
-% \begin{syntax}
-% \cs{tl_set_from_file_x:Nnn} \meta{tl} \Arg{setup} \Arg{filename}
-% \end{syntax}
-% Defines \meta{tl} to the contents of \meta{filename}, expanding
-% the contents of the file as it is read. Category codes and other
-% definitions may need to be set appropriately via the \meta{setup}
-% argument.
-% \end{function}
-%
% \begin{function}[added = 2018-07-23]
% {
% \tl_set_from_shell:Nnn, \tl_set_from_shell:cnn,
@@ -3135,101 +3108,6 @@
%
% \begin{macro}
% {
-% \tl_set_from_file:Nnn, \tl_set_from_file:cnn,
-% \tl_gset_from_file:Nnn, \tl_gset_from_file:cnn
-% }
-% \begin{macro}{\@@_set_from_file:NNnn}
-% \begin{macro}{\@@_from_file_do:w}
-% \begin{macro}{\@@_set_from:nNNn}
-% The approach here is similar to that for doing a rescan, and so the same
-% internals can be reused. Thus the plan is to insert a pair of tokens of
-% the same charcode but different catcodes after the file has been read.
-% This plus \cs{exp_not:N} allows the primitive to be used to carry out
-% a set operation.
-% \begin{macrocode}
-\cs_new_protected:Npn \tl_set_from_file:Nnn
- { \@@_set_from_file:NNnn \tl_set:Nn }
-\cs_new_protected:Npn \tl_gset_from_file:Nnn
- { \@@_set_from_file:NNnn \tl_gset:Nn }
-\cs_generate_variant:Nn \tl_set_from_file:Nnn { c }
-\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_name_str
- \str_if_empty:NTF \l_@@_file_name_str
- { \__kernel_file_missing:n {#4} }
- {
- \exp_args:NV \@@_set_from:nNNn
- \l_@@_file_name_str
- #1 #2 {#3}
- }
- }
-\exp_args:Nno \use:nn
- { \cs_new_protected:Npn \@@_from_file_do:w #1 }
- { \c_@@_rescan_marker_tl }
- { \tl_set:No \l_@@_internal_a_tl {#1} }
-\cs_new_protected:Npn \@@_set_from:nNNn #1#2#3#4
- {
- \group_begin:
- \exp_args:No \tex_everyeof:D
- { \c_@@_rescan_marker_tl \exp_not:N }
- #4 \scan_stop:
- \exp_after:wN \@@_from_file_do:w
- \exp_after:wN \prg_do_nothing:
- \tex_input:D #1 \scan_stop:
- \exp_args:NNNo \group_end:
- #2 #3 \l_@@_internal_a_tl
- }
-% \end{macrocode}
-% \end{macro}
-% \end{macro}
-% \end{macro}
-% \end{macro}
-%
-% \begin{macro}
-% {
-% \tl_set_from_file_x:Nnn, \tl_set_from_file_x:cnn,
-% \tl_gset_from_file_x:Nnn, \tl_gset_from_file_x:cnn
-% }
-% \begin{macro}{\@@_set_from_file_x:NNnn}
-% 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.
-% Once the business is done using some scratch space, the tokens can be
-% transferred to the real target.
-% \begin{macrocode}
-\cs_new_protected:Npn \tl_set_from_file_x:Nnn
- { \@@_set_from_file_x:NNnn \tl_set:Nn }
-\cs_new_protected:Npn \tl_gset_from_file_x:Nnn
- { \@@_set_from_file_x:NNnn \tl_gset:Nn }
-\cs_generate_variant:Nn \tl_set_from_file_x:Nnn { c }
-\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_name_str
- \str_if_empty:NTF \l_@@_file_name_str
- { \__kernel_file_missing:n {#4} }
- {
- \group_begin:
- \tex_everyeof:D { \exp_not:N }
- #3 \scan_stop:
- \tl_set:Nx \l_@@_internal_a_tl
- { \tex_input:D \l_@@_file_name_str \c_space_token }
- \exp_args:NNNo \group_end:
- #1 #2 \l_@@_internal_a_tl
- }
- }
-% \end{macrocode}
-% \end{macro}
-% \end{macro}
-% \begin{variable}{\l_@@_file_name_str}
-% \begin{macrocode}
-\str_new:N \l_@@_file_name_str
-% \end{macrocode}
-% \end{variable}
-%
-% \begin{macro}
-% {
% \tl_set_from_shell:Nnn, \tl_set_from_shell:cnn,
% \tl_gset_from_shell:Nnn, \tl_gset_from_shell:cnn
% }
@@ -3264,6 +3142,53 @@
% \end{macro}
% \end{macro}
%
+% \subsubsection{Deprecated functions}
+%
+% \begin{macro}[deprecated = 2020-12-31]
+% {
+% \tl_set_from_file:Nnn, \tl_set_from_file:cnn,
+% \tl_gset_from_file:Nnn, \tl_gset_from_file:cnn,
+% \tl_set_from_file_x:Nnn, \tl_set_from_file_x:cnn,
+% \tl_gset_from_file_x:Nnn, \tl_gset_from_file_x:cnn
+% }
+% \begin{macrocode}
+\__kernel_patch_deprecation:nnNNpn { 2020-12-31 } { \file_get:nnN }
+\cs_new_protected:Npn \tl_set_from_file:Nnn #1#2#3
+ { \file_get:nnN {#2} {#3} #1 }
+\cs_generate_variant:Nn \tl_set_from_file:Nnn { c }
+\__kernel_patch_deprecation:nnNNpn { 2020-12-31 } { \file_get:nnN }
+\cs_new_protected:Npn \tl_gset_from_file:Nnn #1#2#3
+ {
+ \group_begin:
+ \file_get:nnN {#3} {#2} \l_@@_internal_a_tl
+ \tl_gset_eq:NN #1 \l_@@_internal_a_tl
+ \group_end:
+ }
+\cs_generate_variant:Nn \tl_gset_from_file:Nnn { c }
+\__kernel_patch_deprecation:nnNNpn { 2020-12-31 } { \file_get:nnN }
+\cs_new_protected:Npn \tl_set_from_file_x:Nnn #1#2#3
+ {
+ \group_begin:
+ \file_get:nnN {#3} {#2} \l_@@_internal_a_tl
+ #2 \scan_stop:
+ \tl_set:Nx \l_@@_internal_a_tl { \l_@@_internal_a_tl }
+ \exp_args:NNNo \group_end:
+ \tl_set:Nn #1 \l_@@_internal_a_tl
+ }
+\cs_generate_variant:Nn \tl_set_from_file_x:Nnn { c }
+\__kernel_patch_deprecation:nnNNpn { 2020-12-31 } { \file_get:nnN }
+\cs_new_protected:Npn \tl_gset_from_file_x:Nnn #1#2#3
+ {
+ \group_begin:
+ \file_get:nnN {#3} {#2} \l_@@_internal_a_tl
+ #2 \scan_stop:
+ \tl_gset:Nx #1 { \l_@@_internal_a_tl }
+ \group_end:
+ }
+\cs_generate_variant:Nn \tl_gset_from_file_x:Nnn { c }
+% \end{macrocode}
+% \end{macro}
+%
% \subsubsection{Unicode case changing}
%
% The mechanisms needed for case changing are somewhat involved, particularly
diff --git a/l3kernel/l3file.dtx b/l3kernel/l3file.dtx
index 72bf2ac..95faf52 100644
--- a/l3kernel/l3file.dtx
+++ b/l3kernel/l3file.dtx
@@ -592,6 +592,15 @@
% \cs{l_file_search_path_seq}.
% \end{function}
%
+% \begin{function}[added = 2019-01-16]{\file_get:nnN}
+% \begin{syntax}
+% \cs{file_get:nnN} \Arg{filename} \Arg{setup} \meta{tl}
+% \end{syntax}
+% Defines \meta{tl} to the contents of \meta{filename}.
+% Category codes may need to be set appropriately via the \meta{setup}
+% argument.
+% \end{function}
+%
% \begin{function}[updated = 2017-06-26]
% {\file_get_full_name:nN, \file_get_full_name:VN}
% \begin{syntax}
@@ -2154,6 +2163,54 @@
% \end{macro}
% \end{macro}
%
+% \begin{variable}{\c_@@_marker_tl}
+% The same idea as the marker for rescanning token lists.
+% \begin{macrocode}
+\tl_const:Nx \c_@@_marker_tl { : \token_to_str:N : }
+% \end{macrocode}
+% \end{variable}
+%
+% \begin{macro}{\file_get:nnN}
+% \begin{macro}{\@@_get_do:w}
+% \begin{macro}{\@@_set_from:nNNn}
+% The approach here is similar to that for doing a rescan, and so the same
+% internals can be reused. Thus the plan is to insert a pair of tokens of
+% the same charcode but different catcodes after the file has been read.
+% This plus \cs{exp_not:N} allows the primitive to be used to carry out
+% a set operation.
+% \begin{macrocode}
+\cs_new_protected:Npn \file_get:nnN #1#2#3
+ {
+ \file_get_full_name:nN {#1} \l_@@_full_name_str
+ \str_if_empty:NTF \l_@@_file_name_str
+ { \__kernel_file_missing:n {#1} }
+ {
+ \exp_args:NV \@@_set_from:nNn
+ \l_@@_full_name_str
+ #3 {#2}
+ }
+ }
+\exp_args:Nno \use:nn
+ { \cs_new_protected:Npn \@@_get_do:w #1 }
+ { \c_@@_marker_tl }
+ { \tl_set:No \l_@@_internal_a_tl {#1} }
+\cs_new_protected:Npn \@@_set_from:nNn #1#2#3
+ {
+ \group_begin:
+ \exp_args:No \tex_everyeof:D
+ { \c_@@_marker_tl \exp_not:N }
+ #3 \scan_stop:
+ \exp_after:wN \@@_get_do:w
+ \exp_after:wN \prg_do_nothing:
+ \tex_input:D #1 \scan_stop:
+ \exp_args:NNNo \group_end:
+ \tl_set:Nn #2 \l_@@_internal_a_tl
+ }
+% \end{macrocode}
+% \end{macro}
+% \end{macro}
+% \end{macro}
+%
% \begin{macro}{\file_get_full_name:nN, \file_get_full_name:VN}
% \begin{macro}{\@@_get_full_name_search:nN}
% The way to test if a file exists is to try to open it: if it does
diff --git a/l3kernel/l3obsolete.txt b/l3kernel/l3obsolete.txt
index ab7f713..91049a8 100644
--- a/l3kernel/l3obsolete.txt
+++ b/l3kernel/l3obsolete.txt
@@ -56,8 +56,16 @@ Function Expires end
\str_if_eq_x:nnT 2019
\str_if_eq_x:nnTF 2019
\str_if_eq_x_p:nn 2019
+\tl_gset_from_file:cnn 2020
+\tl_gset_from_file:Nnn 2020
+\tl_gset_from_file_x:cnn 2020
+\tl_gset_from_file_x:Nnn 2020
\tl_show_analysis:N 2019
\tl_show_analysis:n 2019
+\tl_set_from_file:cnn 2020
+\tl_set_from_file:Nnn 2020
+\tl_set_from_file_x:cnn 2020
+\tl_set_from_file_x:Nnn 2020
\uptex_...:D 2019
\utex_...:D 2019
\xetex_...:D 2019
diff --git a/l3kernel/testfiles/m3expl001.luatex.tlg b/l3kernel/testfiles/m3expl001.luatex.tlg
index 0efb2ed..2e12d83 100644
--- a/l3kernel/testfiles/m3expl001.luatex.tlg
+++ b/l3kernel/testfiles/m3expl001.luatex.tlg
@@ -2900,6 +2900,10 @@ Defining \l__file_tmp_seq on line ...
Defining \__kernel_file_name_sanitize:nN on line ...
Defining \__file_name_quote:nN on line ...
Defining \__file_name_quote_aux:n on line ...
+Defining \c__file_marker_tl on line ...
+Defining \file_get:nnN on line ...
+Defining \__file_get_do:w on line ...
+Defining \__file_set_from:nNn on line ...
Defining \file_get_full_name:nN on line ...
Defining \file_get_full_name:VN on line ...
Defining \__file_get_full_name_search:nN on line ...
@@ -5920,25 +5924,21 @@ Defining \tl_count_tokens:n on line ...
Defining \__tl_act_count_normal:nN on line ...
Defining \__tl_act_count_space:n on line ...
Defining \__tl_act_count_group:nn on line ...
-Defining \tl_set_from_file:Nnn on line ...
-Defining \tl_gset_from_file:Nnn on line ...
-Defining \tl_set_from_file:cnn on line ...
-Defining \tl_gset_from_file:cnn on line ...
-Defining \__tl_set_from_file:NNnn on line ...
-Defining \__tl_from_file_do:w on line ...
-Defining \__tl_set_from:nNNn on line ...
-Defining \tl_set_from_file_x:Nnn on line ...
-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_set_from_shell:Nnn on line ...
Defining \tl_set_from_shell:cnn on line ...
Defining \tl_gset_from_shell:Nnn on line ...
Defining \tl_gset_from_shell:cnn on line ...
Defining \__tl_set_from_shell:NNnn on line ...
Defining message LaTeX/kernel/quote-in-shell on line ...
+Defining \tl_set_from_file:Nnn on line ...
+Defining \tl_set_from_file:cnn on line ...
+Defining \tl_gset_from_file:Nnn on line ...
+Defining \tl_gset_from_file:cnn on line ...
+Defining \tl_set_from_file_x:Nnn on line ...
+Defining \tl_set_from_file_x:cnn on line ...
+Defining \tl_gset_from_file_x:Nnn on line ...
+Defining \tl_gset_from_file_x:cnn on line ...
+Defining \__tl_set_from_file:NNnn on line ...
Defining \char_lower_case:N on line ...
Defining \char_upper_case:N on line ...
Defining \char_mixed_case:N on line ...
diff --git a/l3kernel/testfiles/m3expl001.tlg b/l3kernel/testfiles/m3expl001.tlg
index fc8fec1..912b96e 100644
--- a/l3kernel/testfiles/m3expl001.tlg
+++ b/l3kernel/testfiles/m3expl001.tlg
@@ -3193,6 +3193,10 @@ Defining \l__file_tmp_seq on line ...
Defining \__kernel_file_name_sanitize:nN on line ...
Defining \__file_name_quote:nN on line ...
Defining \__file_name_quote_aux:n on line ...
+Defining \c__file_marker_tl on line ...
+Defining \file_get:nnN on line ...
+Defining \__file_get_do:w on line ...
+Defining \__file_set_from:nNn on line ...
Defining \file_get_full_name:nN on line ...
Defining \file_get_full_name:VN on line ...
Defining \__file_get_full_name_search:nN on line ...
@@ -5954,25 +5958,21 @@ Defining \tl_count_tokens:n on line ...
Defining \__tl_act_count_normal:nN on line ...
Defining \__tl_act_count_space:n on line ...
Defining \__tl_act_count_group:nn on line ...
-Defining \tl_set_from_file:Nnn on line ...
-Defining \tl_gset_from_file:Nnn on line ...
-Defining \tl_set_from_file:cnn on line ...
-Defining \tl_gset_from_file:cnn on line ...
-Defining \__tl_set_from_file:NNnn on line ...
-Defining \__tl_from_file_do:w on line ...
-Defining \__tl_set_from:nNNn on line ...
-Defining \tl_set_from_file_x:Nnn on line ...
-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_set_from_shell:Nnn on line ...
Defining \tl_set_from_shell:cnn on line ...
Defining \tl_gset_from_shell:Nnn on line ...
Defining \tl_gset_from_shell:cnn on line ...
Defining \__tl_set_from_shell:NNnn on line ...
Defining message LaTeX/kernel/quote-in-shell on line ...
+Defining \tl_set_from_file:Nnn on line ...
+Defining \tl_set_from_file:cnn on line ...
+Defining \tl_gset_from_file:Nnn on line ...
+Defining \tl_gset_from_file:cnn on line ...
+Defining \tl_set_from_file_x:Nnn on line ...
+Defining \tl_set_from_file_x:cnn on line ...
+Defining \tl_gset_from_file_x:Nnn on line ...
+Defining \tl_gset_from_file_x:cnn on line ...
+Defining \__tl_set_from_file:NNnn on line ...
Defining \char_lower_case:N on line ...
Defining \char_upper_case:N on line ...
Defining \char_mixed_case:N on line ...
diff --git a/l3kernel/testfiles/m3expl001.uptex.tlg b/l3kernel/testfiles/m3expl001.uptex.tlg
index 693404b..894c074 100644
--- a/l3kernel/testfiles/m3expl001.uptex.tlg
+++ b/l3kernel/testfiles/m3expl001.uptex.tlg
@@ -3193,6 +3193,10 @@ Defining \l__file_tmp_seq on line ...
Defining \__kernel_file_name_sanitize:nN on line ...
Defining \__file_name_quote:nN on line ...
Defining \__file_name_quote_aux:n on line ...
+Defining \c__file_marker_tl on line ...
+Defining \file_get:nnN on line ...
+Defining \__file_get_do:w on line ...
+Defining \__file_set_from:nNn on line ...
Defining \file_get_full_name:nN on line ...
Defining \file_get_full_name:VN on line ...
Defining \__file_get_full_name_search:nN on line ...
@@ -5951,25 +5955,21 @@ Defining \tl_count_tokens:n on line ...
Defining \__tl_act_count_normal:nN on line ...
Defining \__tl_act_count_space:n on line ...
Defining \__tl_act_count_group:nn on line ...
-Defining \tl_set_from_file:Nnn on line ...
-Defining \tl_gset_from_file:Nnn on line ...
-Defining \tl_set_from_file:cnn on line ...
-Defining \tl_gset_from_file:cnn on line ...
-Defining \__tl_set_from_file:NNnn on line ...
-Defining \__tl_from_file_do:w on line ...
-Defining \__tl_set_from:nNNn on line ...
-Defining \tl_set_from_file_x:Nnn on line ...
-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_set_from_shell:Nnn on line ...
Defining \tl_set_from_shell:cnn on line ...
Defining \tl_gset_from_shell:Nnn on line ...
Defining \tl_gset_from_shell:cnn on line ...
Defining \__tl_set_from_shell:NNnn on line ...
Defining message LaTeX/kernel/quote-in-shell on line ...
+Defining \tl_set_from_file:Nnn on line ...
+Defining \tl_set_from_file:cnn on line ...
+Defining \tl_gset_from_file:Nnn on line ...
+Defining \tl_gset_from_file:cnn on line ...
+Defining \tl_set_from_file_x:Nnn on line ...
+Defining \tl_set_from_file_x:cnn on line ...
+Defining \tl_gset_from_file_x:Nnn on line ...
+Defining \tl_gset_from_file_x:cnn on line ...
+Defining \__tl_set_from_file:NNnn on line ...
Defining \char_lower_case:N on line ...
Defining \char_upper_case:N on line ...
Defining \char_mixed_case:N on line ...
diff --git a/l3kernel/testfiles/m3expl001.xetex.tlg b/l3kernel/testfiles/m3expl001.xetex.tlg
index 1a4b6c6..4f86ad5 100644
--- a/l3kernel/testfiles/m3expl001.xetex.tlg
+++ b/l3kernel/testfiles/m3expl001.xetex.tlg
@@ -2938,6 +2938,10 @@ Defining \l__file_tmp_seq on line ...
Defining \__kernel_file_name_sanitize:nN on line ...
Defining \__file_name_quote:nN on line ...
Defining \__file_name_quote_aux:n on line ...
+Defining \c__file_marker_tl on line ...
+Defining \file_get:nnN on line ...
+Defining \__file_get_do:w on line ...
+Defining \__file_set_from:nNn on line ...
Defining \file_get_full_name:nN on line ...
Defining \file_get_full_name:VN on line ...
Defining \__file_get_full_name_search:nN on line ...
@@ -5924,25 +5928,21 @@ Defining \tl_count_tokens:n on line ...
Defining \__tl_act_count_normal:nN on line ...
Defining \__tl_act_count_space:n on line ...
Defining \__tl_act_count_group:nn on line ...
-Defining \tl_set_from_file:Nnn on line ...
-Defining \tl_gset_from_file:Nnn on line ...
-Defining \tl_set_from_file:cnn on line ...
-Defining \tl_gset_from_file:cnn on line ...
-Defining \__tl_set_from_file:NNnn on line ...
-Defining \__tl_from_file_do:w on line ...
-Defining \__tl_set_from:nNNn on line ...
-Defining \tl_set_from_file_x:Nnn on line ...
-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_set_from_shell:Nnn on line ...
Defining \tl_set_from_shell:cnn on line ...
Defining \tl_gset_from_shell:Nnn on line ...
Defining \tl_gset_from_shell:cnn on line ...
Defining \__tl_set_from_shell:NNnn on line ...
Defining message LaTeX/kernel/quote-in-shell on line ...
+Defining \tl_set_from_file:Nnn on line ...
+Defining \tl_set_from_file:cnn on line ...
+Defining \tl_gset_from_file:Nnn on line ...
+Defining \tl_gset_from_file:cnn on line ...
+Defining \tl_set_from_file_x:Nnn on line ...
+Defining \tl_set_from_file_x:cnn on line ...
+Defining \tl_gset_from_file_x:Nnn on line ...
+Defining \tl_gset_from_file_x:cnn on line ...
+Defining \__tl_set_from_file:NNnn on line ...
Defining \char_lower_case:N on line ...
Defining \char_upper_case:N on line ...
Defining \char_mixed_case:N on line ...
diff --git a/l3kernel/testfiles/m3expl003.luatex.tlg b/l3kernel/testfiles/m3expl003.luatex.tlg
index 0efb2ed..2e12d83 100644
--- a/l3kernel/testfiles/m3expl003.luatex.tlg
+++ b/l3kernel/testfiles/m3expl003.luatex.tlg
@@ -2900,6 +2900,10 @@ Defining \l__file_tmp_seq on line ...
Defining \__kernel_file_name_sanitize:nN on line ...
Defining \__file_name_quote:nN on line ...
Defining \__file_name_quote_aux:n on line ...
+Defining \c__file_marker_tl on line ...
+Defining \file_get:nnN on line ...
+Defining \__file_get_do:w on line ...
+Defining \__file_set_from:nNn on line ...
Defining \file_get_full_name:nN on line ...
Defining \file_get_full_name:VN on line ...
Defining \__file_get_full_name_search:nN on line ...
@@ -5920,25 +5924,21 @@ Defining \tl_count_tokens:n on line ...
Defining \__tl_act_count_normal:nN on line ...
Defining \__tl_act_count_space:n on line ...
Defining \__tl_act_count_group:nn on line ...
-Defining \tl_set_from_file:Nnn on line ...
-Defining \tl_gset_from_file:Nnn on line ...
-Defining \tl_set_from_file:cnn on line ...
-Defining \tl_gset_from_file:cnn on line ...
-Defining \__tl_set_from_file:NNnn on line ...
-Defining \__tl_from_file_do:w on line ...
-Defining \__tl_set_from:nNNn on line ...
-Defining \tl_set_from_file_x:Nnn on line ...
-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_set_from_shell:Nnn on line ...
Defining \tl_set_from_shell:cnn on line ...
Defining \tl_gset_from_shell:Nnn on line ...
Defining \tl_gset_from_shell:cnn on line ...
Defining \__tl_set_from_shell:NNnn on line ...
Defining message LaTeX/kernel/quote-in-shell on line ...
+Defining \tl_set_from_file:Nnn on line ...
+Defining \tl_set_from_file:cnn on line ...
+Defining \tl_gset_from_file:Nnn on line ...
+Defining \tl_gset_from_file:cnn on line ...
+Defining \tl_set_from_file_x:Nnn on line ...
+Defining \tl_set_from_file_x:cnn on line ...
+Defining \tl_gset_from_file_x:Nnn on line ...
+Defining \tl_gset_from_file_x:cnn on line ...
+Defining \__tl_set_from_file:NNnn on line ...
Defining \char_lower_case:N on line ...
Defining \char_upper_case:N on line ...
Defining \char_mixed_case:N on line ...
diff --git a/l3kernel/testfiles/m3expl003.tlg b/l3kernel/testfiles/m3expl003.tlg
index fc8fec1..912b96e 100644
--- a/l3kernel/testfiles/m3expl003.tlg
+++ b/l3kernel/testfiles/m3expl003.tlg
@@ -3193,6 +3193,10 @@ Defining \l__file_tmp_seq on line ...
Defining \__kernel_file_name_sanitize:nN on line ...
Defining \__file_name_quote:nN on line ...
Defining \__file_name_quote_aux:n on line ...
+Defining \c__file_marker_tl on line ...
+Defining \file_get:nnN on line ...
+Defining \__file_get_do:w on line ...
+Defining \__file_set_from:nNn on line ...
Defining \file_get_full_name:nN on line ...
Defining \file_get_full_name:VN on line ...
Defining \__file_get_full_name_search:nN on line ...
@@ -5954,25 +5958,21 @@ Defining \tl_count_tokens:n on line ...
Defining \__tl_act_count_normal:nN on line ...
Defining \__tl_act_count_space:n on line ...
Defining \__tl_act_count_group:nn on line ...
-Defining \tl_set_from_file:Nnn on line ...
-Defining \tl_gset_from_file:Nnn on line ...
-Defining \tl_set_from_file:cnn on line ...
-Defining \tl_gset_from_file:cnn on line ...
-Defining \__tl_set_from_file:NNnn on line ...
-Defining \__tl_from_file_do:w on line ...
-Defining \__tl_set_from:nNNn on line ...
-Defining \tl_set_from_file_x:Nnn on line ...
-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_set_from_shell:Nnn on line ...
Defining \tl_set_from_shell:cnn on line ...
Defining \tl_gset_from_shell:Nnn on line ...
Defining \tl_gset_from_shell:cnn on line ...
Defining \__tl_set_from_shell:NNnn on line ...
Defining message LaTeX/kernel/quote-in-shell on line ...
+Defining \tl_set_from_file:Nnn on line ...
+Defining \tl_set_from_file:cnn on line ...
+Defining \tl_gset_from_file:Nnn on line ...
+Defining \tl_gset_from_file:cnn on line ...
+Defining \tl_set_from_file_x:Nnn on line ...
+Defining \tl_set_from_file_x:cnn on line ...
+Defining \tl_gset_from_file_x:Nnn on line ...
+Defining \tl_gset_from_file_x:cnn on line ...
+Defining \__tl_set_from_file:NNnn on line ...
Defining \char_lower_case:N on line ...
Defining \char_upper_case:N on line ...
Defining \char_mixed_case:N on line ...
diff --git a/l3kernel/testfiles/m3expl003.uptex.tlg b/l3kernel/testfiles/m3expl003.uptex.tlg
index 693404b..894c074 100644
--- a/l3kernel/testfiles/m3expl003.uptex.tlg
+++ b/l3kernel/testfiles/m3expl003.uptex.tlg
@@ -3193,6 +3193,10 @@ Defining \l__file_tmp_seq on line ...
Defining \__kernel_file_name_sanitize:nN on line ...
Defining \__file_name_quote:nN on line ...
Defining \__file_name_quote_aux:n on line ...
+Defining \c__file_marker_tl on line ...
+Defining \file_get:nnN on line ...
+Defining \__file_get_do:w on line ...
+Defining \__file_set_from:nNn on line ...
Defining \file_get_full_name:nN on line ...
Defining \file_get_full_name:VN on line ...
Defining \__file_get_full_name_search:nN on line ...
@@ -5951,25 +5955,21 @@ Defining \tl_count_tokens:n on line ...
Defining \__tl_act_count_normal:nN on line ...
Defining \__tl_act_count_space:n on line ...
Defining \__tl_act_count_group:nn on line ...
-Defining \tl_set_from_file:Nnn on line ...
-Defining \tl_gset_from_file:Nnn on line ...
-Defining \tl_set_from_file:cnn on line ...
-Defining \tl_gset_from_file:cnn on line ...
-Defining \__tl_set_from_file:NNnn on line ...
-Defining \__tl_from_file_do:w on line ...
-Defining \__tl_set_from:nNNn on line ...
-Defining \tl_set_from_file_x:Nnn on line ...
-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_set_from_shell:Nnn on line ...
Defining \tl_set_from_shell:cnn on line ...
Defining \tl_gset_from_shell:Nnn on line ...
Defining \tl_gset_from_shell:cnn on line ...
Defining \__tl_set_from_shell:NNnn on line ...
Defining message LaTeX/kernel/quote-in-shell on line ...
+Defining \tl_set_from_file:Nnn on line ...
+Defining \tl_set_from_file:cnn on line ...
+Defining \tl_gset_from_file:Nnn on line ...
+Defining \tl_gset_from_file:cnn on line ...
+Defining \tl_set_from_file_x:Nnn on line ...
+Defining \tl_set_from_file_x:cnn on line ...
+Defining \tl_gset_from_file_x:Nnn on line ...
+Defining \tl_gset_from_file_x:cnn on line ...
+Defining \__tl_set_from_file:NNnn on line ...
Defining \char_lower_case:N on line ...
Defining \char_upper_case:N on line ...
Defining \char_mixed_case:N on line ...
diff --git a/l3kernel/testfiles/m3expl003.xetex.tlg b/l3kernel/testfiles/m3expl003.xetex.tlg
index 1a4b6c6..4f86ad5 100644
--- a/l3kernel/testfiles/m3expl003.xetex.tlg
+++ b/l3kernel/testfiles/m3expl003.xetex.tlg
@@ -2938,6 +2938,10 @@ Defining \l__file_tmp_seq on line ...
Defining \__kernel_file_name_sanitize:nN on line ...
Defining \__file_name_quote:nN on line ...
Defining \__file_name_quote_aux:n on line ...
+Defining \c__file_marker_tl on line ...
+Defining \file_get:nnN on line ...
+Defining \__file_get_do:w on line ...
+Defining \__file_set_from:nNn on line ...
Defining \file_get_full_name:nN on line ...
Defining \file_get_full_name:VN on line ...
Defining \__file_get_full_name_search:nN on line ...
@@ -5924,25 +5928,21 @@ Defining \tl_count_tokens:n on line ...
Defining \__tl_act_count_normal:nN on line ...
Defining \__tl_act_count_space:n on line ...
Defining \__tl_act_count_group:nn on line ...
-Defining \tl_set_from_file:Nnn on line ...
-Defining \tl_gset_from_file:Nnn on line ...
-Defining \tl_set_from_file:cnn on line ...
-Defining \tl_gset_from_file:cnn on line ...
-Defining \__tl_set_from_file:NNnn on line ...
-Defining \__tl_from_file_do:w on line ...
-Defining \__tl_set_from:nNNn on line ...
-Defining \tl_set_from_file_x:Nnn on line ...
-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_set_from_shell:Nnn on line ...
Defining \tl_set_from_shell:cnn on line ...
Defining \tl_gset_from_shell:Nnn on line ...
Defining \tl_gset_from_shell:cnn on line ...
Defining \__tl_set_from_shell:NNnn on line ...
Defining message LaTeX/kernel/quote-in-shell on line ...
+Defining \tl_set_from_file:Nnn on line ...
+Defining \tl_set_from_file:cnn on line ...
+Defining \tl_gset_from_file:Nnn on line ...
+Defining \tl_gset_from_file:cnn on line ...
+Defining \tl_set_from_file_x:Nnn on line ...
+Defining \tl_set_from_file_x:cnn on line ...
+Defining \tl_gset_from_file_x:Nnn on line ...
+Defining \tl_gset_from_file_x:cnn on line ...
+Defining \__tl_set_from_file:NNnn on line ...
Defining \char_lower_case:N on line ...
Defining \char_upper_case:N on line ...
Defining \char_mixed_case:N on line ...
More information about the latex3-commits
mailing list