[latex3-commits] [l3svn] 01/06: \file_find:nN => \file_get_full_name:nN
noreply at latex-project.org
noreply at latex-project.org
Fri Jun 23 23:14:51 CEST 2017
This is an automated email from the git hooks/post-receive script.
joseph pushed a commit to branch master
in repository l3svn.
commit 89b31ed447ee1feb53b4ddb47a7b67ea531ff91f
Author: Joseph Wright <joseph.wright at morningstar2.co.uk>
Date: Fri Jun 23 19:57:33 2017 +0100
\file_find:nN => \file_get_full_name:nN
---
l3kernel/l3file.dtx | 29 +++++++++++++++--------------
l3kernel/testfiles/m3expl001.luatex.tlg | 6 +++---
l3kernel/testfiles/m3expl001.ptex.tlg | 6 +++---
l3kernel/testfiles/m3expl001.tlg | 6 +++---
l3kernel/testfiles/m3expl001.uptex.tlg | 6 +++---
l3kernel/testfiles/m3expl001.xetex.tlg | 6 +++---
l3kernel/testfiles/m3expl003.luatex.tlg | 6 +++---
l3kernel/testfiles/m3expl003.ptex.tlg | 6 +++---
l3kernel/testfiles/m3expl003.tlg | 6 +++---
l3kernel/testfiles/m3expl003.uptex.tlg | 6 +++---
l3kernel/testfiles/m3expl003.xetex.tlg | 6 +++---
l3kernel/testfiles/m3file001.lvt | 8 ++++----
l3kernel/testfiles/m3file001.ptex.tlg | 2 +-
l3kernel/testfiles/m3file001.tlg | 2 +-
l3kernel/testfiles/m3file001.uptex.tlg | 2 +-
l3kernel/testfiles/m3file001.xetex.tlg | 2 +-
16 files changed, 53 insertions(+), 52 deletions(-)
diff --git a/l3kernel/l3file.dtx b/l3kernel/l3file.dtx
index f586948..6594a40 100644
--- a/l3kernel/l3file.dtx
+++ b/l3kernel/l3file.dtx
@@ -115,9 +115,10 @@
% \meta{str var}, which will be empty if the file is not found.
% \end{function}
%
-% \begin{function}[updated = 2017-06-19]{\file_find:nN, \file_find:VN}
+% \begin{function}[updated = 2017-06-23]
+% {\file_get_full_name:nN, \file_get_full_name:VN}
% \begin{syntax}
-% \cs{file_find:nN} \Arg{file name} \meta{str var}
+% \cs{file_get_full_name:nN} \Arg{file name} \meta{str var}
% \end{syntax}
% Searches for \meta{file name} in the path as detailed for
% \cs{file_if_exist:nTF}, and if found sets the \meta{str var} the
@@ -660,7 +661,7 @@
% higher-level
% functions which have already fully expanded the \meta{file name} and which
% need to perform multiple open or close operations. See for example the
-% implementation of \cs{file_find:nN},
+% implementation of \cs{file_get_full_name:nN},
% \end{function}
%
% \begin{function}[added = 2014-08-23]{\__iow_with:Nnn}
@@ -880,8 +881,8 @@
% \end{macro}
% \end{macro}
%
-% \begin{macro}{\file_find:nN, \file_find:VN}
-% \begin{macro}[aux]{\@@_find_search:N}
+% \begin{macro}{\file_get_full_name:nN, \file_get_full_name:VN}
+% \begin{macro}[aux]{\@@_get_full_name_search:N}
% The way to test if a file exists is to try to open it: if it does not
% exist then \TeX{} will report end-of-file. For files which are in the
% current directory, this is straight-forward. For other locations, a
@@ -889,18 +890,18 @@
% location is of course treated as the correct one. If nothing is found,
% |#2| is returned empty.
% \begin{macrocode}
-\cs_new_protected:Npn \file_find:nN #1#2
+\cs_new_protected:Npn \file_get_full_name:nN #1#2
{
\__file_name_sanitize:nN {#1} \l__file_basename_str
\__file_name_quote:VN \l__file_basename_str \l__file_path_str
\__ior_open:No \g_@@_internal_ior \l__file_path_str
\ior_if_eof:NTF \g_@@_internal_ior
- { \@@_find_search:N #2 }
+ { \@@_get_full_name_search:N #2 }
{ \str_set_eq:NN #2 \l__file_path_str }
\ior_close:N \g_@@_internal_ior
}
-\cs_generate_variant:Nn \file_find:nN { V }
-\cs_new_protected:Npn \@@_find_search:N #1
+\cs_generate_variant:Nn \file_get_full_name:nN { V }
+\cs_new_protected:Npn \@@_get_full_name_search:N #1
{
\str_clear:N #1
%<*package>
@@ -946,14 +947,14 @@
% \begin{macrocode}
\prg_new_protected_conditional:Npnn \file_if_exist:n #1 { T , F , TF }
{
- \file_find:nN {#1} \l__file_path_str
+ \file_get_full_name:nN {#1} \l__file_path_str
\str_if_empty:NTF \l__file_path_str
{ \prg_return_false: }
{ \prg_return_true: }
}
\prg_new_protected_conditional:Npnn \file_if_exist:nN #1#2 { T , F , TF }
{
- \file_find:nN {#1} #2
+ \file_get_full_name:nN {#1} #2
\str_if_empty:NTF #2
{ \prg_return_false: }
{ \prg_return_true: }
@@ -1249,7 +1250,7 @@
% \begin{macrocode}
\cs_new_protected:Npn \ior_open:Nn #1#2
{
- \file_find:nN {#2} \l__file_path_str
+ \file_get_full_name:nN {#2} \l__file_path_str
\str_if_empty:NTF \l__file_path_str
{
\__file_name_sanitize:nN {#2} \l__file_basename_str
@@ -1267,7 +1268,7 @@
% \begin{macrocode}
\prg_new_protected_conditional:Npnn \ior_open:Nn #1#2 { T , F , TF }
{
- \file_find:VN \l__file_basename_str \l__file_path_str
+ \file_get_full_name:VN \l__file_basename_str \l__file_path_str
\str_if_empty:NTF \l__file_path_str
{ \prg_return_false: }
{
@@ -2414,7 +2415,7 @@
% \begin{macrocode}
\cs_new_protected:Npn \file_add_path:nN #1#2
{
- \file_find:nN {#1} #2
+ \file_get_full_name:nN {#1} #2
\str_if_empty:NT #2
{ \tl_set:Nn #2 { \q_no_value } }
}
diff --git a/l3kernel/testfiles/m3expl001.luatex.tlg b/l3kernel/testfiles/m3expl001.luatex.tlg
index 8f2fd53..e1dd107 100644
--- a/l3kernel/testfiles/m3expl001.luatex.tlg
+++ b/l3kernel/testfiles/m3expl001.luatex.tlg
@@ -2854,9 +2854,9 @@ Defining \__file_name_sanitize:nN on line ...
Defining \__file_name_quote:nN on line ...
Defining \__file_name_quote:VN on line ...
Defining \__file_name_quote_aux:n on line ...
-Defining \file_find:nN on line ...
-Defining \file_find:VN on line ...
-Defining \__file_find_search:N on line ...
+Defining \file_get_full_name:nN on line ...
+Defining \file_get_full_name:VN on line ...
+Defining \__file_get_full_name_search:N on line ...
Defining \file_if_exist:nT on line ...
Defining \file_if_exist:nF on line ...
Defining \file_if_exist:nTF on line ...
diff --git a/l3kernel/testfiles/m3expl001.ptex.tlg b/l3kernel/testfiles/m3expl001.ptex.tlg
index a469b30..f163372 100644
--- a/l3kernel/testfiles/m3expl001.ptex.tlg
+++ b/l3kernel/testfiles/m3expl001.ptex.tlg
@@ -2842,9 +2842,9 @@ Defining \__file_name_sanitize:nN on line ...
Defining \__file_name_quote:nN on line ...
Defining \__file_name_quote:VN on line ...
Defining \__file_name_quote_aux:n on line ...
-Defining \file_find:nN on line ...
-Defining \file_find:VN on line ...
-Defining \__file_find_search:N on line ...
+Defining \file_get_full_name:nN on line ...
+Defining \file_get_full_name:VN on line ...
+Defining \__file_get_full_name_search:N on line ...
Defining \file_if_exist:nT on line ...
Defining \file_if_exist:nF on line ...
Defining \file_if_exist:nTF on line ...
diff --git a/l3kernel/testfiles/m3expl001.tlg b/l3kernel/testfiles/m3expl001.tlg
index 7bd601e..24efb36 100644
--- a/l3kernel/testfiles/m3expl001.tlg
+++ b/l3kernel/testfiles/m3expl001.tlg
@@ -2842,9 +2842,9 @@ Defining \__file_name_sanitize:nN on line ...
Defining \__file_name_quote:nN on line ...
Defining \__file_name_quote:VN on line ...
Defining \__file_name_quote_aux:n on line ...
-Defining \file_find:nN on line ...
-Defining \file_find:VN on line ...
-Defining \__file_find_search:N on line ...
+Defining \file_get_full_name:nN on line ...
+Defining \file_get_full_name:VN on line ...
+Defining \__file_get_full_name_search:N on line ...
Defining \file_if_exist:nT on line ...
Defining \file_if_exist:nF on line ...
Defining \file_if_exist:nTF on line ...
diff --git a/l3kernel/testfiles/m3expl001.uptex.tlg b/l3kernel/testfiles/m3expl001.uptex.tlg
index a86c59c..9df3165 100644
--- a/l3kernel/testfiles/m3expl001.uptex.tlg
+++ b/l3kernel/testfiles/m3expl001.uptex.tlg
@@ -2842,9 +2842,9 @@ Defining \__file_name_sanitize:nN on line ...
Defining \__file_name_quote:nN on line ...
Defining \__file_name_quote:VN on line ...
Defining \__file_name_quote_aux:n on line ...
-Defining \file_find:nN on line ...
-Defining \file_find:VN on line ...
-Defining \__file_find_search:N on line ...
+Defining \file_get_full_name:nN on line ...
+Defining \file_get_full_name:VN on line ...
+Defining \__file_get_full_name_search:N on line ...
Defining \file_if_exist:nT on line ...
Defining \file_if_exist:nF on line ...
Defining \file_if_exist:nTF on line ...
diff --git a/l3kernel/testfiles/m3expl001.xetex.tlg b/l3kernel/testfiles/m3expl001.xetex.tlg
index f614153..88c31f0 100644
--- a/l3kernel/testfiles/m3expl001.xetex.tlg
+++ b/l3kernel/testfiles/m3expl001.xetex.tlg
@@ -2852,9 +2852,9 @@ Defining \__file_name_sanitize:nN on line ...
Defining \__file_name_quote:nN on line ...
Defining \__file_name_quote:VN on line ...
Defining \__file_name_quote_aux:n on line ...
-Defining \file_find:nN on line ...
-Defining \file_find:VN on line ...
-Defining \__file_find_search:N on line ...
+Defining \file_get_full_name:nN on line ...
+Defining \file_get_full_name:VN on line ...
+Defining \__file_get_full_name_search:N on line ...
Defining \file_if_exist:nT on line ...
Defining \file_if_exist:nF on line ...
Defining \file_if_exist:nTF on line ...
diff --git a/l3kernel/testfiles/m3expl003.luatex.tlg b/l3kernel/testfiles/m3expl003.luatex.tlg
index 8caa60f..800c158 100644
--- a/l3kernel/testfiles/m3expl003.luatex.tlg
+++ b/l3kernel/testfiles/m3expl003.luatex.tlg
@@ -2855,9 +2855,9 @@ Defining \__file_name_sanitize:nN on line ...
Defining \__file_name_quote:nN on line ...
Defining \__file_name_quote:VN on line ...
Defining \__file_name_quote_aux:n on line ...
-Defining \file_find:nN on line ...
-Defining \file_find:VN on line ...
-Defining \__file_find_search:N on line ...
+Defining \file_get_full_name:nN on line ...
+Defining \file_get_full_name:VN on line ...
+Defining \__file_get_full_name_search:N on line ...
Defining \file_if_exist:nT on line ...
Defining \file_if_exist:nF on line ...
Defining \file_if_exist:nTF on line ...
diff --git a/l3kernel/testfiles/m3expl003.ptex.tlg b/l3kernel/testfiles/m3expl003.ptex.tlg
index 411107c..9e79e76 100644
--- a/l3kernel/testfiles/m3expl003.ptex.tlg
+++ b/l3kernel/testfiles/m3expl003.ptex.tlg
@@ -2843,9 +2843,9 @@ Defining \__file_name_sanitize:nN on line ...
Defining \__file_name_quote:nN on line ...
Defining \__file_name_quote:VN on line ...
Defining \__file_name_quote_aux:n on line ...
-Defining \file_find:nN on line ...
-Defining \file_find:VN on line ...
-Defining \__file_find_search:N on line ...
+Defining \file_get_full_name:nN on line ...
+Defining \file_get_full_name:VN on line ...
+Defining \__file_get_full_name_search:N on line ...
Defining \file_if_exist:nT on line ...
Defining \file_if_exist:nF on line ...
Defining \file_if_exist:nTF on line ...
diff --git a/l3kernel/testfiles/m3expl003.tlg b/l3kernel/testfiles/m3expl003.tlg
index 301537c..0f98a36 100644
--- a/l3kernel/testfiles/m3expl003.tlg
+++ b/l3kernel/testfiles/m3expl003.tlg
@@ -2843,9 +2843,9 @@ Defining \__file_name_sanitize:nN on line ...
Defining \__file_name_quote:nN on line ...
Defining \__file_name_quote:VN on line ...
Defining \__file_name_quote_aux:n on line ...
-Defining \file_find:nN on line ...
-Defining \file_find:VN on line ...
-Defining \__file_find_search:N on line ...
+Defining \file_get_full_name:nN on line ...
+Defining \file_get_full_name:VN on line ...
+Defining \__file_get_full_name_search:N on line ...
Defining \file_if_exist:nT on line ...
Defining \file_if_exist:nF on line ...
Defining \file_if_exist:nTF on line ...
diff --git a/l3kernel/testfiles/m3expl003.uptex.tlg b/l3kernel/testfiles/m3expl003.uptex.tlg
index 18a0553..ee4ca3d 100644
--- a/l3kernel/testfiles/m3expl003.uptex.tlg
+++ b/l3kernel/testfiles/m3expl003.uptex.tlg
@@ -2843,9 +2843,9 @@ Defining \__file_name_sanitize:nN on line ...
Defining \__file_name_quote:nN on line ...
Defining \__file_name_quote:VN on line ...
Defining \__file_name_quote_aux:n on line ...
-Defining \file_find:nN on line ...
-Defining \file_find:VN on line ...
-Defining \__file_find_search:N on line ...
+Defining \file_get_full_name:nN on line ...
+Defining \file_get_full_name:VN on line ...
+Defining \__file_get_full_name_search:N on line ...
Defining \file_if_exist:nT on line ...
Defining \file_if_exist:nF on line ...
Defining \file_if_exist:nTF on line ...
diff --git a/l3kernel/testfiles/m3expl003.xetex.tlg b/l3kernel/testfiles/m3expl003.xetex.tlg
index b3cda2f..e37f596 100644
--- a/l3kernel/testfiles/m3expl003.xetex.tlg
+++ b/l3kernel/testfiles/m3expl003.xetex.tlg
@@ -2853,9 +2853,9 @@ Defining \__file_name_sanitize:nN on line ...
Defining \__file_name_quote:nN on line ...
Defining \__file_name_quote:VN on line ...
Defining \__file_name_quote_aux:n on line ...
-Defining \file_find:nN on line ...
-Defining \file_find:VN on line ...
-Defining \__file_find_search:N on line ...
+Defining \file_get_full_name:nN on line ...
+Defining \file_get_full_name:VN on line ...
+Defining \__file_get_full_name_search:N on line ...
Defining \file_if_exist:nT on line ...
Defining \file_if_exist:nF on line ...
Defining \file_if_exist:nTF on line ...
diff --git a/l3kernel/testfiles/m3file001.lvt b/l3kernel/testfiles/m3file001.lvt
index e974506..a18eb7a 100644
--- a/l3kernel/testfiles/m3file001.lvt
+++ b/l3kernel/testfiles/m3file001.lvt
@@ -43,13 +43,13 @@
}
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-\TEST { Finding~files }
+\TEST { Getting~the~full~name~of~files }
{
- \file_find:nN { filetest.txt } \l_A_tl
+ \file_get_full_name:nN { filetest.txt } \l_A_tl
\tl_log:N \l_A_tl
- \file_find:nN { \filea } \l_A_tl
+ \file_get_full_name:nN { \filea } \l_A_tl
\tl_log:N \l_A_tl
- \file_find:nN { NotAFile.xxx.yyy.zzz } \l_A_tl
+ \file_get_full_name:nN { NotAFile.xxx.yyy.zzz } \l_A_tl
\tl_log:N \l_A_tl
}
diff --git a/l3kernel/testfiles/m3file001.ptex.tlg b/l3kernel/testfiles/m3file001.ptex.tlg
index 87b6700..f0e44b1 100644
--- a/l3kernel/testfiles/m3file001.ptex.tlg
+++ b/l3kernel/testfiles/m3file001.ptex.tlg
@@ -15,7 +15,7 @@ FALSE
FALSE
============================================================
============================================================
-TEST 2: Finding files
+TEST 2: Getting the full name of files
============================================================
> \l_A_tl=filetest.txt.
> \l_A_tl=filetest.txt.
diff --git a/l3kernel/testfiles/m3file001.tlg b/l3kernel/testfiles/m3file001.tlg
index 59d37f3..e7dc293 100644
--- a/l3kernel/testfiles/m3file001.tlg
+++ b/l3kernel/testfiles/m3file001.tlg
@@ -15,7 +15,7 @@ FALSE
FALSE
============================================================
============================================================
-TEST 2: Finding files
+TEST 2: Getting the full name of files
============================================================
> \l_A_tl=filetest.txt.
> \l_A_tl=filetest.txt.
diff --git a/l3kernel/testfiles/m3file001.uptex.tlg b/l3kernel/testfiles/m3file001.uptex.tlg
index 70087d1..b974084 100644
--- a/l3kernel/testfiles/m3file001.uptex.tlg
+++ b/l3kernel/testfiles/m3file001.uptex.tlg
@@ -15,7 +15,7 @@ FALSE
FALSE
============================================================
============================================================
-TEST 2: Finding files
+TEST 2: Getting the full name of files
============================================================
> \l_A_tl=filetest.txt.
> \l_A_tl=filetest.txt.
diff --git a/l3kernel/testfiles/m3file001.xetex.tlg b/l3kernel/testfiles/m3file001.xetex.tlg
index e75f64d..9ccc35a 100644
--- a/l3kernel/testfiles/m3file001.xetex.tlg
+++ b/l3kernel/testfiles/m3file001.xetex.tlg
@@ -15,7 +15,7 @@ FALSE
FALSE
============================================================
============================================================
-TEST 2: Finding files
+TEST 2: Getting the full name of files
============================================================
> \l_A_tl=filetest.txt.
> \l_A_tl=filetest.txt.
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the latex3-commits
mailing list