[latex3-commits] [git/LaTeX3-latex3-latex3] master: Update file/IO internals (7e58d3d)
Joseph Wright
joseph.wright at morningstar2.co.uk
Mon Apr 2 13:47:00 CEST 2018
Repository : https://github.com/latex3/latex3
On branch : master
Link : https://github.com/latex3/latex3/commit/7e58d3d7ff2b15f69b2d279cad9a8f66ede1d294
>---------------------------------------------------------------
commit 7e58d3d7ff2b15f69b2d279cad9a8f66ede1d294
Author: Joseph Wright <joseph.wright at morningstar2.co.uk>
Date: Mon Apr 2 12:36:15 2018 +0100
Update file/IO internals
>---------------------------------------------------------------
7e58d3d7ff2b15f69b2d279cad9a8f66ede1d294
l3experimental/l3str/l3str-format.dtx | 6 +--
l3kernel/l3file.dtx | 52 ++++++++++++++++++-------
l3kernel/l3regex.dtx | 4 +-
l3kernel/l3str.dtx | 39 +++++++++----------
l3kernel/testfiles/m3expl001.luatex.tlg | 8 ++--
l3kernel/testfiles/m3expl001.ptex.tlg | 8 ++--
l3kernel/testfiles/m3expl001.tlg | 8 ++--
l3kernel/testfiles/m3expl001.uptex.tlg | 8 ++--
l3kernel/testfiles/m3expl001.xetex.tlg | 8 ++--
l3kernel/testfiles/m3expl003.luatex.tlg | 8 ++--
l3kernel/testfiles/m3expl003.ptex.tlg | 8 ++--
l3kernel/testfiles/m3expl003.tlg | 8 ++--
l3kernel/testfiles/m3expl003.uptex.tlg | 8 ++--
l3kernel/testfiles/m3expl003.xetex.tlg | 8 ++--
l3kernel/testfiles/m3str003.lvt | 2 +-
l3trial/l3fp-extras/l3fp-interchange.dtx | 4 +-
l3trial/l3kernel-extras/l3kernel-extras.dtx | 2 +-
l3trial/l3str-format-new/l3str-format-new.dtx | 6 +--
18 files changed, 118 insertions(+), 77 deletions(-)
diff --git a/l3experimental/l3str/l3str-format.dtx b/l3experimental/l3str/l3str-format.dtx
index df16a5f..7d056b5 100644
--- a/l3experimental/l3str/l3str-format.dtx
+++ b/l3experimental/l3str/l3str-format.dtx
@@ -252,7 +252,7 @@
\cs_new:Npn \@@_parse:n #1
{
\exp_last_unbraced:Nf \@@_parse_auxi:NN
- \__str_to_other:n {#1} \s_stop \s_stop {#1}
+ \__kernel_str_to_other:n {#1} \s_stop \s_stop {#1}
}
\cs_new:Npx \@@_parse_auxi:NN #1#2
{
@@ -506,13 +506,13 @@
% that |f|-expanding \meta{function} \Arg{other string}
% \meta{arguments} yields the piece of the \meta{other string} that we
% want to output. The \meta{other string} is built from the
-% \meta{token list} by |f|-expanding \cs{__str_to_other:n}.
+% \meta{token list} by |f|-expanding \cs{__kernel_str_to_other:n}.
% \begin{macrocode}
\cs_new:Npn \@@_tl_s:NNnnNNn #1#2#3#4#5#6#7
{
\exp_args:Nc \exp_args:Nf
{ @@_align_#6:nnnN }
- { \exp_args:Nf #2 { \__str_to_other:n {#7} } #3 }
+ { \exp_args:Nf #2 { \__kernel_str_to_other:n {#7} } #3 }
{ }
{#4} #5
}
diff --git a/l3kernel/l3file.dtx b/l3kernel/l3file.dtx
index b332ced..5af4d14 100644
--- a/l3kernel/l3file.dtx
+++ b/l3kernel/l3file.dtx
@@ -653,10 +653,18 @@
% \begin{syntax}
% \cs{__kernel_file_missing:n} \Arg{name}
% \end{syntax}
-% Expands the \meta{name} as per \cs{@@_name_sanitize:nN} then
+% Expands the \meta{name} as per \cs{__kernel_file_name_sanitize:nN} then
% produces an error message indicating that that file was not found.
% \end{function}
%
+% \begin{function}{\__kernel_file_name_sanitize:nN}
+% \begin{syntax}
+% \cs{__kernel_file_name_sanitize:nN} \Arg{name} \meta{str var}
+% \end{syntax}
+% For converting a \meta{name} to a string where active characters are treated
+% as strings.
+% \end{function}
+%
% \begin{function}{\__kernel_file_input_push:n, \__kernel_file_input_pop:}
% \begin{syntax}
% \cs{__kernel_file_input_push:n} \Arg{name}
@@ -833,7 +841,7 @@
% \end{macrocode}
% \end{variable}
%
-% \begin{macro}{\@@_name_sanitize:nN}
+% \begin{macro}{\__kernel_file_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
@@ -842,7 +850,7 @@
% assuming they balance strip all of them out before quoting the entire name
% if it contains spaces.
% \begin{macrocode}
-\cs_new_protected:Npn \@@_name_sanitize:nN #1#2
+\cs_new_protected:Npn \__kernel_file_name_sanitize:nN #1#2
{
\group_begin:
\seq_map_inline:Nn \l_char_active_seq
@@ -890,7 +898,7 @@
% \begin{macrocode}
\cs_new_protected:Npn \file_get_full_name:nN #1#2
{
- \@@_name_sanitize:nN {#1} \l_@@_base_name_str
+ \__kernel_file_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 }
@@ -952,7 +960,7 @@
% \begin{macrocode}
\cs_new_protected:Npn \__kernel_file_missing:n #1
{
- \@@_name_sanitize:nN {#1} \l_@@_base_name_str
+ \__kernel_file_name_sanitize:nN {#1} \l_@@_base_name_str
\__kernel_msg_error:nnx { kernel } { file-not-found }
{ \l_@@_base_name_str }
}
@@ -1231,6 +1239,13 @@
% \end{macrocode}
% \end{macro}
%
+% \begin{variable}{\l_@@_file_name_str}
+% Data storage.
+% \begin{macrocode}
+\str_new:N \l_@@_file_name_str
+% \end{macrocode}
+% \end{variable}
+%
% \begin{macro}[TF]{\ior_open:Nn, \ior_open:cn}
% An auxiliary searches for the file in the \TeX{}, \LaTeXe{} and
% \LaTeX3 paths. Then pass the file found to the lower-level function
@@ -1239,11 +1254,11 @@
% \begin{macrocode}
\prg_new_protected_conditional:Npnn \ior_open:Nn #1#2 { T , F , TF }
{
- \file_get_full_name:nN {#2} \l_@@_full_name_str
- \str_if_empty:NTF \l_@@_full_name_str
+ \file_get_full_name:nN {#2} \l_@@_file_name_str
+ \str_if_empty:NTF \l_@@_file_name_str
{ \prg_return_false: }
{
- \__kernel_ior_open:No #1 \l_@@_full_name_str
+ \__kernel_ior_open:No #1 \l_@@_file_name_str
\prg_return_true:
}
}
@@ -1583,6 +1598,13 @@
% \end{macrocode}
% \end{macro}
%
+% \begin{variable}{\l_@@_file_name_str}
+% Data storage.
+% \begin{macrocode}
+\str_new:N \l_@@_file_name_str
+% \end{macrocode}
+% \end{variable}
+%
% \begin{macro}{\iow_open:Nn, \iow_open:cn}
% \begin{macro}{\@@_open_stream:Nn, \@@_open_stream:NV}
% The same idea as for reading, but without the path and without the need
@@ -1590,10 +1612,10 @@
% \begin{macrocode}
\cs_new_protected:Npn \iow_open:Nn #1#2
{
- \@@_name_sanitize:nN {#2} \l_@@_base_name_str
+ \__kernel_file_name_sanitize:nN {#2} \l_@@_file_name_str
\iow_close:N #1
\seq_gpop:NNTF \g_@@_streams_seq \l_@@_stream_tl
- { \@@_open_stream:NV #1 \l_@@_base_name_str }
+ { \@@_open_stream:NV #1 \l_@@_file_name_str }
%<*initex>
{ \__kernel_msg_fatal:nn { kernel } { output-streams-exhausted } }
%</initex>
@@ -1601,7 +1623,7 @@
{
\@@_new:N #1
\tl_set:Nx \l_@@_stream_tl { \int_eval:n {#1} }
- \@@_open_stream:NV #1 \l_@@_base_name_str
+ \@@_open_stream:NV #1 \l_@@_file_name_str
}
%</package>
}
@@ -1803,7 +1825,7 @@
\cs_new_protected:Npn \@@_set_indent:n #1
{
\tl_set:Nx \l_@@_one_indent_tl
- { \exp_args:No \__str_to_other_fast:n { \tl_to_str:n {#1} } }
+ { \exp_args:No \__kernel_str_to_other_fast:n { \tl_to_str:n {#1} } }
\int_set:Nn \l_@@_one_indent_int { \str_count:N \l_@@_one_indent_tl }
\exp_last_unbraced:NNo
\cs_set:Npn \@@_unindent:w \l_@@_one_indent_tl { }
@@ -1988,7 +2010,7 @@
{
\tl_set:Nx \l_@@_wrap_tl
{
- \exp_args:No \__str_to_other_fast:n \l_@@_wrap_tl
+ \exp_args:No \__kernel_str_to_other_fast:n \l_@@_wrap_tl
\c_@@_wrap_end_marker_tl
}
\tl_set:Nx \l_@@_wrap_tl
@@ -2398,7 +2420,7 @@
{ \seq_put_right:Nn \l_file_search_path_seq }
\cs_new_protected:Npn \file_path_include:n #1
{
- \@@_name_sanitize:nN {#1} \l_@@_full_name_str
+ \__kernel_file_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 }
}
@@ -2406,7 +2428,7 @@
{ \seq_remove_all:Nn \l_file_search_path_seq }
\cs_new_protected:Npn \file_path_remove:n #1
{
- \@@_name_sanitize:nN {#1} \l_@@_full_name_str
+ \__kernel_file_name_sanitize:nN {#1} \l_@@_full_name_str
\seq_remove_all:NV \l_file_search_path_seq \l_@@_full_name_str
}
% \end{macrocode}
diff --git a/l3kernel/l3regex.dtx b/l3kernel/l3regex.dtx
index 9cc4f1e..c35868e 100644
--- a/l3kernel/l3regex.dtx
+++ b/l3kernel/l3regex.dtx
@@ -1486,7 +1486,7 @@
\cs_set:Npn \@@_escape_escaped:N ##1 { #2 }
\cs_set:Npn \@@_escape_raw:N ##1 { #3 }
\@@_standard_escapechar:
- \tl_gset:Nx \g_@@_internal_tl { \__str_to_other_fast:n {#4} }
+ \tl_gset:Nx \g_@@_internal_tl { \__kernel_str_to_other_fast:n {#4} }
\tl_put_right:Nx \l_@@_internal_a_tl
{
\exp_after:wN \@@_escape_loop:N \g_@@_internal_tl
@@ -3330,7 +3330,7 @@
\cs_new_protected:Npn \@@_compile_u_in_cs:
{
\tl_gset:Nx \g_@@_internal_tl
- { \exp_args:No \__str_to_other_fast:n { \l_@@_internal_a_tl } }
+ { \exp_args:No \__kernel_str_to_other_fast:n { \l_@@_internal_a_tl } }
\tl_build_put_right:Nx \l_@@_build_tl
{
\tl_map_function:NN \g_@@_internal_tl
diff --git a/l3kernel/l3str.dtx b/l3kernel/l3str.dtx
index 4c75548..815f829 100644
--- a/l3kernel/l3str.dtx
+++ b/l3kernel/l3str.dtx
@@ -801,9 +801,9 @@
%
% \section{Internal string functions}
%
-% \begin{function}[EXP]{\__str_to_other:n}
+% \begin{function}[EXP]{\__kernel_str_to_other:n}
% \begin{syntax}
-% \cs{__str_to_other:n} \Arg{token list}
+% \cs{__kernel_str_to_other:n} \Arg{token list}
% \end{syntax}
% Converts the \meta{token list} to a \meta{other string}, where
% spaces have category code \enquote{other}. This function can be
@@ -812,13 +812,12 @@
% time quadratic in the character count of the string.
% \end{function}
%
-% \begin{function}[rEXP]{\__str_to_other_fast:n}
+% \begin{function}[rEXP]{\__kernel_str_to_other_fast:n}
% \begin{syntax}
-% \cs{__str_to_other_fast:n} \Arg{token list}
+% \cs{__kernel_str_to_other_fast:n} \Arg{token list}
% \end{syntax}
-% Same behaviour \cs{__str_to_other:n} but only restricted-expandable.
+% Same behaviour \cs{__kernel_str_to_other:n} but only restricted-expandable.
% It takes a time linear in the character count of the string.
-% It is used for \cs{iow_wrap:nnnN}.
% \end{function}
%
% \begin{function}[EXP]{\__str_count:n}
@@ -827,7 +826,7 @@
% \end{syntax}
% This function expects an argument that is entirely made of
% characters with category \enquote{other}, as produced by
-% \cs{__str_to_other:n}. It leaves in the input stream the number of
+% \cs{__kernel_str_to_other:n}. It leaves in the input stream the number of
% character tokens in the \meta{other string}, faster than the
% analogous \cs{str_count:n} function.
% \end{function}
@@ -838,7 +837,7 @@
% \end{syntax}
% Identical to \cs{str_range:nnn} except that the first argument is
% expected to be entirely made of characters with category
-% \enquote{other}, as produced by \cs{__str_to_other:n}, and the
+% \enquote{other}, as produced by \cs{__kernel_str_to_other:n}, and the
% result is also an \meta{other string}.
% \end{function}
%
@@ -1260,7 +1259,7 @@
% The inline and variable mappings are similar to the usual token list
% mappings but start out by turning the argument to an ``other
% string''. Doing the same for the expandable function mapping would
-% require \cs{@@_to_other:n}, quadratic in the string length. To deal
+% require \cs{__kernel_str_to_other:n}, quadratic in the string length. To deal
% with spaces in that case, \cs{@@_map_function:w} replaces the
% following space by a braced space and a further call to itself.
% These are received by \cs{@@_map_function:Nn}, which passes
@@ -1303,7 +1302,7 @@
{
\exp_not:N \@@_map_inline:NN
\exp_not:c { @@_map_ \int_use:N \g__kernel_prg_map_int :w }
- \@@_to_other_fast:n {#1}
+ \__kernel_str_to_other_fast:n {#1}
}
\q_recursion_tail
\prg_break_point:Nn \str_map_break: { \int_gdecr:N \g__kernel_prg_map_int }
@@ -1322,7 +1321,7 @@
\use:x
{
\exp_not:n { \@@_map_variable:NnN #2 {#3} }
- \@@_to_other_fast:n {#1}
+ \__kernel_str_to_other_fast:n {#1}
}
\q_recursion_tail
\prg_break_point:Nn \str_map_break: { }
@@ -1355,7 +1354,7 @@
%
% \subsection{Accessing specific characters in a string}
%
-% \begin{macro}[EXP]{\@@_to_other:n}
+% \begin{macro}[EXP]{\__kernel_str_to_other:n}
% \begin{macro}[EXP]{\@@_to_other_loop:w, \@@_to_other_end:w}
% First apply \cs{tl_to_str:n}, then replace all spaces by
% \enquote{other} spaces, $8$ at a time, storing the converted part of
@@ -1366,7 +1365,7 @@
% the result between \cs{q_mark} and the first |A| (well, there is
% also the need to remove a space).
% \begin{macrocode}
-\cs_new:Npn \@@_to_other:n #1
+\cs_new:Npn \__kernel_str_to_other:n #1
{
\exp_after:wN \@@_to_other_loop:w
\tl_to_str:n {#1} ~ A ~ A ~ A ~ A ~ A ~ A ~ A ~ A ~ \q_mark \q_stop
@@ -1393,13 +1392,13 @@
% \end{macro}
% \end{macro}
%
-% \begin{macro}[rEXP]{\@@_to_other_fast:n}
-% \begin{macro}[rEXP]{\@@_to_other_fast_loop:w, \@@_to_other_fast_end:w}
-% The difference with \cs{@@_to_other:n} is that the converted part is
+% \begin{macro}[rEXP]{\__kernel_str_to_other_fast:n}
+% \begin{macro}[rEXP]{\__kernel_str_to_other_fast_loop:w, \@@_to_other_fast_end:w}
+% The difference with \cs{__kernel_str_to_other:n} is that the converted part is
% left in the input stream, making these commands only
% restricted-expandable.
% \begin{macrocode}
-\cs_new:Npn \@@_to_other_fast:n #1
+\cs_new:Npn \__kernel_str_to_other_fast:n #1
{
\exp_after:wN \@@_to_other_fast_loop:w \tl_to_str:n {#1} ~
A ~ A ~ A ~ A ~ A ~ A ~ A ~ A ~ A ~ \q_stop
@@ -1452,7 +1451,7 @@
\exp_args:Nf \tl_to_str:n
{
\exp_args:Nf \@@_item:nn
- { \@@_to_other:n {#1} } {#2}
+ { \__kernel_str_to_other:n {#1} } {#2}
}
}
\cs_new:Npn \str_item_ignore_spaces:nn #1
@@ -1548,7 +1547,7 @@
\exp_args:Nf \tl_to_str:n
{
\exp_args:Nf \@@_range:nnn
- { \@@_to_other:n {#1} } {#2} {#3}
+ { \__kernel_str_to_other:n {#1} } {#2} {#3}
}
}
\cs_new:Npn \str_range_ignore_spaces:nnn #1
@@ -1691,7 +1690,7 @@
% \begin{macro}[EXP]{\@@_count:n}
% \begin{macro}[EXP]{\@@_count_aux:n, \@@_count_loop:NNNNNNNNN}
% To count characters in a string we could first escape all spaces
-% using \cs{@@_to_other:n}, then pass the result to \cs{tl_count:n}.
+% using \cs{_-kernel_str_to_other:n}, then pass the result to \cs{tl_count:n}.
% However, the escaping step would be quadratic in the number of
% characters in the string, and we can do better. Namely, sum the
% number of spaces (\cs{str_count_spaces:n}) and the result of
diff --git a/l3kernel/testfiles/m3expl001.luatex.tlg b/l3kernel/testfiles/m3expl001.luatex.tlg
index 6e2aefc..3382b05 100644
--- a/l3kernel/testfiles/m3expl001.luatex.tlg
+++ b/l3kernel/testfiles/m3expl001.luatex.tlg
@@ -806,10 +806,10 @@ Defining \__str_map_variable:NnN on line ...
Defining \str_map_variable:cNn on line ...
Defining \str_map_break: on line ...
Defining \str_map_break:n on line ...
-Defining \__str_to_other:n on line ...
+Defining \__kernel_str_to_other:n on line ...
Defining \__str_to_other_loop:w on line ...
Defining \__str_to_other_end:w on line ...
-Defining \__str_to_other_fast:n on line ...
+Defining \__kernel_str_to_other_fast:n on line ...
Defining \__str_to_other_fast_loop:w on line ...
Defining \__str_to_other_fast_end:w on line ...
Defining \str_item:Nn on line ...
@@ -3061,7 +3061,7 @@ Defining \l__file_ext_str on line ...
Defining \l__file_name_str on line ...
Defining \l_file_search_path_seq on line ...
Defining \l__file_tmp_seq on line ...
-Defining \__file_name_sanitize:nN 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 \file_get_full_name:nN on line ...
@@ -3096,6 +3096,7 @@ Defining \g_tmpa_ior on line ...
Defining \g_tmpb_ior on line ...
Defining \ior_open:Nn on line ...
Defining \ior_open:cn on line ...
+Defining \l__ior_file_name_str on line ...
Defining \ior_open:NnT on line ...
Defining \ior_open:NnF on line ...
Defining \ior_open:NnTF on line ...
@@ -3138,6 +3139,7 @@ Defining \iow_new:c on line ...
Defining \g_tmpa_iow on line ...
Defining \g_tmpb_iow on line ...
Defining \__iow_new:N on line ...
+Defining \l__iow_file_name_str on line ...
Defining \iow_open:Nn on line ...
Defining \iow_open:cn on line ...
Defining \__iow_open_stream:Nn on line ...
diff --git a/l3kernel/testfiles/m3expl001.ptex.tlg b/l3kernel/testfiles/m3expl001.ptex.tlg
index 3ba0a18..8227281 100644
--- a/l3kernel/testfiles/m3expl001.ptex.tlg
+++ b/l3kernel/testfiles/m3expl001.ptex.tlg
@@ -804,10 +804,10 @@ Defining \__str_map_variable:NnN on line ...
Defining \str_map_variable:cNn on line ...
Defining \str_map_break: on line ...
Defining \str_map_break:n on line ...
-Defining \__str_to_other:n on line ...
+Defining \__kernel_str_to_other:n on line ...
Defining \__str_to_other_loop:w on line ...
Defining \__str_to_other_end:w on line ...
-Defining \__str_to_other_fast:n on line ...
+Defining \__kernel_str_to_other_fast:n on line ...
Defining \__str_to_other_fast_loop:w on line ...
Defining \__str_to_other_fast_end:w on line ...
Defining \str_item:Nn on line ...
@@ -2998,7 +2998,7 @@ Defining \l__file_ext_str on line ...
Defining \l__file_name_str on line ...
Defining \l_file_search_path_seq on line ...
Defining \l__file_tmp_seq on line ...
-Defining \__file_name_sanitize:nN 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 \file_get_full_name:nN on line ...
@@ -3033,6 +3033,7 @@ Defining \g_tmpa_ior on line ...
Defining \g_tmpb_ior on line ...
Defining \ior_open:Nn on line ...
Defining \ior_open:cn on line ...
+Defining \l__ior_file_name_str on line ...
Defining \ior_open:NnT on line ...
Defining \ior_open:NnF on line ...
Defining \ior_open:NnTF on line ...
@@ -3075,6 +3076,7 @@ Defining \iow_new:c on line ...
Defining \g_tmpa_iow on line ...
Defining \g_tmpb_iow on line ...
Defining \__iow_new:N on line ...
+Defining \l__iow_file_name_str on line ...
Defining \iow_open:Nn on line ...
Defining \iow_open:cn on line ...
Defining \__iow_open_stream:Nn on line ...
diff --git a/l3kernel/testfiles/m3expl001.tlg b/l3kernel/testfiles/m3expl001.tlg
index 7f85745..b9173a6 100644
--- a/l3kernel/testfiles/m3expl001.tlg
+++ b/l3kernel/testfiles/m3expl001.tlg
@@ -804,10 +804,10 @@ Defining \__str_map_variable:NnN on line ...
Defining \str_map_variable:cNn on line ...
Defining \str_map_break: on line ...
Defining \str_map_break:n on line ...
-Defining \__str_to_other:n on line ...
+Defining \__kernel_str_to_other:n on line ...
Defining \__str_to_other_loop:w on line ...
Defining \__str_to_other_end:w on line ...
-Defining \__str_to_other_fast:n on line ...
+Defining \__kernel_str_to_other_fast:n on line ...
Defining \__str_to_other_fast_loop:w on line ...
Defining \__str_to_other_fast_end:w on line ...
Defining \str_item:Nn on line ...
@@ -2998,7 +2998,7 @@ Defining \l__file_ext_str on line ...
Defining \l__file_name_str on line ...
Defining \l_file_search_path_seq on line ...
Defining \l__file_tmp_seq on line ...
-Defining \__file_name_sanitize:nN 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 \file_get_full_name:nN on line ...
@@ -3033,6 +3033,7 @@ Defining \g_tmpa_ior on line ...
Defining \g_tmpb_ior on line ...
Defining \ior_open:Nn on line ...
Defining \ior_open:cn on line ...
+Defining \l__ior_file_name_str on line ...
Defining \ior_open:NnT on line ...
Defining \ior_open:NnF on line ...
Defining \ior_open:NnTF on line ...
@@ -3075,6 +3076,7 @@ Defining \iow_new:c on line ...
Defining \g_tmpa_iow on line ...
Defining \g_tmpb_iow on line ...
Defining \__iow_new:N on line ...
+Defining \l__iow_file_name_str on line ...
Defining \iow_open:Nn on line ...
Defining \iow_open:cn on line ...
Defining \__iow_open_stream:Nn on line ...
diff --git a/l3kernel/testfiles/m3expl001.uptex.tlg b/l3kernel/testfiles/m3expl001.uptex.tlg
index c95405a..f5c8528 100644
--- a/l3kernel/testfiles/m3expl001.uptex.tlg
+++ b/l3kernel/testfiles/m3expl001.uptex.tlg
@@ -804,10 +804,10 @@ Defining \__str_map_variable:NnN on line ...
Defining \str_map_variable:cNn on line ...
Defining \str_map_break: on line ...
Defining \str_map_break:n on line ...
-Defining \__str_to_other:n on line ...
+Defining \__kernel_str_to_other:n on line ...
Defining \__str_to_other_loop:w on line ...
Defining \__str_to_other_end:w on line ...
-Defining \__str_to_other_fast:n on line ...
+Defining \__kernel_str_to_other_fast:n on line ...
Defining \__str_to_other_fast_loop:w on line ...
Defining \__str_to_other_fast_end:w on line ...
Defining \str_item:Nn on line ...
@@ -2998,7 +2998,7 @@ Defining \l__file_ext_str on line ...
Defining \l__file_name_str on line ...
Defining \l_file_search_path_seq on line ...
Defining \l__file_tmp_seq on line ...
-Defining \__file_name_sanitize:nN 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 \file_get_full_name:nN on line ...
@@ -3033,6 +3033,7 @@ Defining \g_tmpa_ior on line ...
Defining \g_tmpb_ior on line ...
Defining \ior_open:Nn on line ...
Defining \ior_open:cn on line ...
+Defining \l__ior_file_name_str on line ...
Defining \ior_open:NnT on line ...
Defining \ior_open:NnF on line ...
Defining \ior_open:NnTF on line ...
@@ -3075,6 +3076,7 @@ Defining \iow_new:c on line ...
Defining \g_tmpa_iow on line ...
Defining \g_tmpb_iow on line ...
Defining \__iow_new:N on line ...
+Defining \l__iow_file_name_str on line ...
Defining \iow_open:Nn on line ...
Defining \iow_open:cn on line ...
Defining \__iow_open_stream:Nn on line ...
diff --git a/l3kernel/testfiles/m3expl001.xetex.tlg b/l3kernel/testfiles/m3expl001.xetex.tlg
index 083eb39..5470220 100644
--- a/l3kernel/testfiles/m3expl001.xetex.tlg
+++ b/l3kernel/testfiles/m3expl001.xetex.tlg
@@ -804,10 +804,10 @@ Defining \__str_map_variable:NnN on line ...
Defining \str_map_variable:cNn on line ...
Defining \str_map_break: on line ...
Defining \str_map_break:n on line ...
-Defining \__str_to_other:n on line ...
+Defining \__kernel_str_to_other:n on line ...
Defining \__str_to_other_loop:w on line ...
Defining \__str_to_other_end:w on line ...
-Defining \__str_to_other_fast:n on line ...
+Defining \__kernel_str_to_other_fast:n on line ...
Defining \__str_to_other_fast_loop:w on line ...
Defining \__str_to_other_fast_end:w on line ...
Defining \str_item:Nn on line ...
@@ -3059,7 +3059,7 @@ Defining \l__file_ext_str on line ...
Defining \l__file_name_str on line ...
Defining \l_file_search_path_seq on line ...
Defining \l__file_tmp_seq on line ...
-Defining \__file_name_sanitize:nN 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 \file_get_full_name:nN on line ...
@@ -3094,6 +3094,7 @@ Defining \g_tmpa_ior on line ...
Defining \g_tmpb_ior on line ...
Defining \ior_open:Nn on line ...
Defining \ior_open:cn on line ...
+Defining \l__ior_file_name_str on line ...
Defining \ior_open:NnT on line ...
Defining \ior_open:NnF on line ...
Defining \ior_open:NnTF on line ...
@@ -3136,6 +3137,7 @@ Defining \iow_new:c on line ...
Defining \g_tmpa_iow on line ...
Defining \g_tmpb_iow on line ...
Defining \__iow_new:N on line ...
+Defining \l__iow_file_name_str on line ...
Defining \iow_open:Nn on line ...
Defining \iow_open:cn on line ...
Defining \__iow_open_stream:Nn on line ...
diff --git a/l3kernel/testfiles/m3expl003.luatex.tlg b/l3kernel/testfiles/m3expl003.luatex.tlg
index 6e2aefc..3382b05 100644
--- a/l3kernel/testfiles/m3expl003.luatex.tlg
+++ b/l3kernel/testfiles/m3expl003.luatex.tlg
@@ -806,10 +806,10 @@ Defining \__str_map_variable:NnN on line ...
Defining \str_map_variable:cNn on line ...
Defining \str_map_break: on line ...
Defining \str_map_break:n on line ...
-Defining \__str_to_other:n on line ...
+Defining \__kernel_str_to_other:n on line ...
Defining \__str_to_other_loop:w on line ...
Defining \__str_to_other_end:w on line ...
-Defining \__str_to_other_fast:n on line ...
+Defining \__kernel_str_to_other_fast:n on line ...
Defining \__str_to_other_fast_loop:w on line ...
Defining \__str_to_other_fast_end:w on line ...
Defining \str_item:Nn on line ...
@@ -3061,7 +3061,7 @@ Defining \l__file_ext_str on line ...
Defining \l__file_name_str on line ...
Defining \l_file_search_path_seq on line ...
Defining \l__file_tmp_seq on line ...
-Defining \__file_name_sanitize:nN 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 \file_get_full_name:nN on line ...
@@ -3096,6 +3096,7 @@ Defining \g_tmpa_ior on line ...
Defining \g_tmpb_ior on line ...
Defining \ior_open:Nn on line ...
Defining \ior_open:cn on line ...
+Defining \l__ior_file_name_str on line ...
Defining \ior_open:NnT on line ...
Defining \ior_open:NnF on line ...
Defining \ior_open:NnTF on line ...
@@ -3138,6 +3139,7 @@ Defining \iow_new:c on line ...
Defining \g_tmpa_iow on line ...
Defining \g_tmpb_iow on line ...
Defining \__iow_new:N on line ...
+Defining \l__iow_file_name_str on line ...
Defining \iow_open:Nn on line ...
Defining \iow_open:cn on line ...
Defining \__iow_open_stream:Nn on line ...
diff --git a/l3kernel/testfiles/m3expl003.ptex.tlg b/l3kernel/testfiles/m3expl003.ptex.tlg
index 3ba0a18..8227281 100644
--- a/l3kernel/testfiles/m3expl003.ptex.tlg
+++ b/l3kernel/testfiles/m3expl003.ptex.tlg
@@ -804,10 +804,10 @@ Defining \__str_map_variable:NnN on line ...
Defining \str_map_variable:cNn on line ...
Defining \str_map_break: on line ...
Defining \str_map_break:n on line ...
-Defining \__str_to_other:n on line ...
+Defining \__kernel_str_to_other:n on line ...
Defining \__str_to_other_loop:w on line ...
Defining \__str_to_other_end:w on line ...
-Defining \__str_to_other_fast:n on line ...
+Defining \__kernel_str_to_other_fast:n on line ...
Defining \__str_to_other_fast_loop:w on line ...
Defining \__str_to_other_fast_end:w on line ...
Defining \str_item:Nn on line ...
@@ -2998,7 +2998,7 @@ Defining \l__file_ext_str on line ...
Defining \l__file_name_str on line ...
Defining \l_file_search_path_seq on line ...
Defining \l__file_tmp_seq on line ...
-Defining \__file_name_sanitize:nN 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 \file_get_full_name:nN on line ...
@@ -3033,6 +3033,7 @@ Defining \g_tmpa_ior on line ...
Defining \g_tmpb_ior on line ...
Defining \ior_open:Nn on line ...
Defining \ior_open:cn on line ...
+Defining \l__ior_file_name_str on line ...
Defining \ior_open:NnT on line ...
Defining \ior_open:NnF on line ...
Defining \ior_open:NnTF on line ...
@@ -3075,6 +3076,7 @@ Defining \iow_new:c on line ...
Defining \g_tmpa_iow on line ...
Defining \g_tmpb_iow on line ...
Defining \__iow_new:N on line ...
+Defining \l__iow_file_name_str on line ...
Defining \iow_open:Nn on line ...
Defining \iow_open:cn on line ...
Defining \__iow_open_stream:Nn on line ...
diff --git a/l3kernel/testfiles/m3expl003.tlg b/l3kernel/testfiles/m3expl003.tlg
index 7f85745..b9173a6 100644
--- a/l3kernel/testfiles/m3expl003.tlg
+++ b/l3kernel/testfiles/m3expl003.tlg
@@ -804,10 +804,10 @@ Defining \__str_map_variable:NnN on line ...
Defining \str_map_variable:cNn on line ...
Defining \str_map_break: on line ...
Defining \str_map_break:n on line ...
-Defining \__str_to_other:n on line ...
+Defining \__kernel_str_to_other:n on line ...
Defining \__str_to_other_loop:w on line ...
Defining \__str_to_other_end:w on line ...
-Defining \__str_to_other_fast:n on line ...
+Defining \__kernel_str_to_other_fast:n on line ...
Defining \__str_to_other_fast_loop:w on line ...
Defining \__str_to_other_fast_end:w on line ...
Defining \str_item:Nn on line ...
@@ -2998,7 +2998,7 @@ Defining \l__file_ext_str on line ...
Defining \l__file_name_str on line ...
Defining \l_file_search_path_seq on line ...
Defining \l__file_tmp_seq on line ...
-Defining \__file_name_sanitize:nN 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 \file_get_full_name:nN on line ...
@@ -3033,6 +3033,7 @@ Defining \g_tmpa_ior on line ...
Defining \g_tmpb_ior on line ...
Defining \ior_open:Nn on line ...
Defining \ior_open:cn on line ...
+Defining \l__ior_file_name_str on line ...
Defining \ior_open:NnT on line ...
Defining \ior_open:NnF on line ...
Defining \ior_open:NnTF on line ...
@@ -3075,6 +3076,7 @@ Defining \iow_new:c on line ...
Defining \g_tmpa_iow on line ...
Defining \g_tmpb_iow on line ...
Defining \__iow_new:N on line ...
+Defining \l__iow_file_name_str on line ...
Defining \iow_open:Nn on line ...
Defining \iow_open:cn on line ...
Defining \__iow_open_stream:Nn on line ...
diff --git a/l3kernel/testfiles/m3expl003.uptex.tlg b/l3kernel/testfiles/m3expl003.uptex.tlg
index c95405a..f5c8528 100644
--- a/l3kernel/testfiles/m3expl003.uptex.tlg
+++ b/l3kernel/testfiles/m3expl003.uptex.tlg
@@ -804,10 +804,10 @@ Defining \__str_map_variable:NnN on line ...
Defining \str_map_variable:cNn on line ...
Defining \str_map_break: on line ...
Defining \str_map_break:n on line ...
-Defining \__str_to_other:n on line ...
+Defining \__kernel_str_to_other:n on line ...
Defining \__str_to_other_loop:w on line ...
Defining \__str_to_other_end:w on line ...
-Defining \__str_to_other_fast:n on line ...
+Defining \__kernel_str_to_other_fast:n on line ...
Defining \__str_to_other_fast_loop:w on line ...
Defining \__str_to_other_fast_end:w on line ...
Defining \str_item:Nn on line ...
@@ -2998,7 +2998,7 @@ Defining \l__file_ext_str on line ...
Defining \l__file_name_str on line ...
Defining \l_file_search_path_seq on line ...
Defining \l__file_tmp_seq on line ...
-Defining \__file_name_sanitize:nN 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 \file_get_full_name:nN on line ...
@@ -3033,6 +3033,7 @@ Defining \g_tmpa_ior on line ...
Defining \g_tmpb_ior on line ...
Defining \ior_open:Nn on line ...
Defining \ior_open:cn on line ...
+Defining \l__ior_file_name_str on line ...
Defining \ior_open:NnT on line ...
Defining \ior_open:NnF on line ...
Defining \ior_open:NnTF on line ...
@@ -3075,6 +3076,7 @@ Defining \iow_new:c on line ...
Defining \g_tmpa_iow on line ...
Defining \g_tmpb_iow on line ...
Defining \__iow_new:N on line ...
+Defining \l__iow_file_name_str on line ...
Defining \iow_open:Nn on line ...
Defining \iow_open:cn on line ...
Defining \__iow_open_stream:Nn on line ...
diff --git a/l3kernel/testfiles/m3expl003.xetex.tlg b/l3kernel/testfiles/m3expl003.xetex.tlg
index 083eb39..5470220 100644
--- a/l3kernel/testfiles/m3expl003.xetex.tlg
+++ b/l3kernel/testfiles/m3expl003.xetex.tlg
@@ -804,10 +804,10 @@ Defining \__str_map_variable:NnN on line ...
Defining \str_map_variable:cNn on line ...
Defining \str_map_break: on line ...
Defining \str_map_break:n on line ...
-Defining \__str_to_other:n on line ...
+Defining \__kernel_str_to_other:n on line ...
Defining \__str_to_other_loop:w on line ...
Defining \__str_to_other_end:w on line ...
-Defining \__str_to_other_fast:n on line ...
+Defining \__kernel_str_to_other_fast:n on line ...
Defining \__str_to_other_fast_loop:w on line ...
Defining \__str_to_other_fast_end:w on line ...
Defining \str_item:Nn on line ...
@@ -3059,7 +3059,7 @@ Defining \l__file_ext_str on line ...
Defining \l__file_name_str on line ...
Defining \l_file_search_path_seq on line ...
Defining \l__file_tmp_seq on line ...
-Defining \__file_name_sanitize:nN 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 \file_get_full_name:nN on line ...
@@ -3094,6 +3094,7 @@ Defining \g_tmpa_ior on line ...
Defining \g_tmpb_ior on line ...
Defining \ior_open:Nn on line ...
Defining \ior_open:cn on line ...
+Defining \l__ior_file_name_str on line ...
Defining \ior_open:NnT on line ...
Defining \ior_open:NnF on line ...
Defining \ior_open:NnTF on line ...
@@ -3136,6 +3137,7 @@ Defining \iow_new:c on line ...
Defining \g_tmpa_iow on line ...
Defining \g_tmpb_iow on line ...
Defining \__iow_new:N on line ...
+Defining \l__iow_file_name_str on line ...
Defining \iow_open:Nn on line ...
Defining \iow_open:cn on line ...
Defining \__iow_open_stream:Nn on line ...
diff --git a/l3kernel/testfiles/m3str003.lvt b/l3kernel/testfiles/m3str003.lvt
index 81cb2a8..eb33c21 100644
--- a/l3kernel/testfiles/m3str003.lvt
+++ b/l3kernel/testfiles/m3str003.lvt
@@ -75,7 +75,7 @@
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\TEST { tl~to~other~str }
{
- \tl_set:Nx \l_tmpa_tl { \__str_to_other:n { a~#\par } }
+ \tl_set:Nx \l_tmpa_tl { \__kernel_str_to_other:n { a~#\par } }
\tl_if_eq:NNTF \l_tmpa_tl \c_apar_other_tl { \TRUE } { \ERROR }
}
diff --git a/l3trial/l3fp-extras/l3fp-interchange.dtx b/l3trial/l3fp-extras/l3fp-interchange.dtx
index 46a4fec..99598ac 100644
--- a/l3trial/l3fp-extras/l3fp-interchange.dtx
+++ b/l3trial/l3fp-extras/l3fp-interchange.dtx
@@ -1,6 +1,6 @@
% \iffalse
%
-%% File l3fp-interchange.dtx (C) Copyright 2017 The LaTeX3 Project
+%% File l3fp-interchange.dtx (C) Copyright 2017-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
@@ -130,7 +130,7 @@
% converts it to \pkg{l3fp} floating-points. First test things a bit
% \begin{macrocode}
\cs_new:Npn \fp_from_bytes:n #1
- { \exp_args:Nf \@@_from_bytes:n { \__str_to_other:n {#1} } }
+ { \exp_args:Nf \@@_from_bytes:n { \__kernel_str_to_other:n {#1} } }
\cs_new:Npn \@@_from_bytes:n #1
{
\int_compare:nNnTF { \str_count:n {#1} } = { 8 }
diff --git a/l3trial/l3kernel-extras/l3kernel-extras.dtx b/l3trial/l3kernel-extras/l3kernel-extras.dtx
index 0f08925..47738f5 100644
--- a/l3trial/l3kernel-extras/l3kernel-extras.dtx
+++ b/l3trial/l3kernel-extras/l3kernel-extras.dtx
@@ -579,7 +579,7 @@
% since \TeX{} doesn't let us produce arbitrary characters). Method:
% \begin{itemize}
% \item Turn the token list to a string with category other spaces
-% (with \cs{__str_to_other:n} from the \pkg{l3str} bundle).
+% (with \cs{__kernel_str_to_other:n} from the \pkg{l3str} bundle).
% \item Convert each character to its value to get a clist of
% integers.
% \item In the same pass, detect characters with character code
diff --git a/l3trial/l3str-format-new/l3str-format-new.dtx b/l3trial/l3str-format-new/l3str-format-new.dtx
index c6b558d..24880ef 100644
--- a/l3trial/l3str-format-new/l3str-format-new.dtx
+++ b/l3trial/l3str-format-new/l3str-format-new.dtx
@@ -1083,7 +1083,7 @@
\cs_new:Npn \@@_python:n #1
{
\exp_last_unbraced:Nf \@@_python_auxi:NN
- \__str_to_other:n {#1} \s_stop \s_stop {#1}
+ \__kernel_str_to_other:n {#1} \s_stop \s_stop {#1}
}
\cs_new:Npx \@@_python_auxi:NN #1#2
{
@@ -1224,13 +1224,13 @@
% that |f|-expanding \meta{function} \Arg{other string}
% \meta{arguments} yields the piece of the \meta{other string} that we
% want to output. The \meta{other string} is built from the
-% \meta{token list} by |f|-expanding \cs{__str_to_other:n}.
+% \meta{token list} by |f|-expanding \cs{__kernel_str_to_other:n}.
% \begin{macrocode}
\cs_new:Npn \@@_tl_s:NNnnNNn #1#2#3#4#5#6#7
{
\exp_args:Nc \exp_args:Nf
{ @@_align_#6:nnnN }
- { \exp_args:Nf #2 { \__str_to_other:n {#7} } #3 }
+ { \exp_args:Nf #2 { \__kernel_str_to_other:n {#7} } #3 }
{ }
{#4} #5
}
More information about the latex3-commits
mailing list