[latex3-commits] [l3svn] 03/06: Drop \file_if_exist:nN(TF)
noreply at latex-project.org
noreply at latex-project.org
Fri Jun 23 23:14:53 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 196dd2aabc4f90a1ceeadea1f78d92291973ea89
Author: Joseph Wright <joseph.wright at morningstar2.co.uk>
Date: Fri Jun 23 21:10:36 2017 +0100
Drop \file_if_exist:nN(TF)
As discussed on the team list, this is better handled using
\file_get_full_name:nN and a \str_if_empty:N(TF) test.
---
l3kernel/l3candidates.dtx | 28 ++++++++++++++++++----------
l3kernel/l3file.dtx | 24 +++---------------------
l3kernel/testfiles/m3expl001.luatex.tlg | 3 ---
l3kernel/testfiles/m3expl001.ptex.tlg | 3 ---
l3kernel/testfiles/m3expl001.tlg | 3 ---
l3kernel/testfiles/m3expl001.uptex.tlg | 3 ---
l3kernel/testfiles/m3expl001.xetex.tlg | 3 ---
l3kernel/testfiles/m3expl003.luatex.tlg | 3 ---
l3kernel/testfiles/m3expl003.ptex.tlg | 3 ---
l3kernel/testfiles/m3expl003.tlg | 3 ---
l3kernel/testfiles/m3expl003.uptex.tlg | 3 ---
l3kernel/testfiles/m3expl003.xetex.tlg | 3 ---
12 files changed, 21 insertions(+), 61 deletions(-)
diff --git a/l3kernel/l3candidates.dtx b/l3kernel/l3candidates.dtx
index faf809a..c70c6db 100644
--- a/l3kernel/l3candidates.dtx
+++ b/l3kernel/l3candidates.dtx
@@ -1469,25 +1469,31 @@
% \begin{macrocode}
\cs_new_protected:Npn \file_if_exist_input:n #1
{
- \file_if_exist:nNT {#1} \l__file_path_str
+ \file_get_full_name:nN {#1} \l__file_path_str
+ \str_if_empty:NF \l__file_path_str
{ \@@_input:V \l__file_path_str }
}
\cs_new_protected:Npn \file_if_exist_input:nT #1#2
{
- \file_if_exist:nNT {#1} \l__file_path_str
+ \file_get_full_name:nN {#1} \l__file_path_str
+ \str_if_empty:NF \l__file_path_str
{
#2
\@@_input:V \l__file_path_str
}
}
-\cs_new_protected:Npn \file_if_exist_input:nF #1
+\cs_new_protected:Npn \file_if_exist_input:nF #1#2
{
- \file_if_exist:nNTF {#1} \l__file_path_str
+ \file_get_full_name:nN {#1} \l__file_path_str
+ \str_if_empty:NTF \l__file_path_str
+ {#2}
{ \@@_input:V \l__file_path_str }
}
-\cs_new_protected:Npn \file_if_exist_input:nTF #1#2
+\cs_new_protected:Npn \file_if_exist_input:nTF #1#2#3
{
- \file_if_exist:nNTF {#1} \l__file_path_str
+ \file_get_full_name:nN {#1} \l__file_path_str
+ \str_if_empty:NTF \l__file_path_str
+ {#3}
{
#2
\@@_input:V \l__file_path_str
@@ -2162,7 +2168,9 @@
\cs_generate_variant:Nn \tl_gset_from_file:Nnn { c }
\cs_new_protected:Npn \@@_set_from_file:NNnn #1#2#3#4
{
- \file_if_exist:nNTF {#4} \l__file_path_str
+ \file_get_full_name:nN {#4} \l__file_path_str
+ \str_if_empty:NTF \l__file_path_str
+ { \__file_missing:n {#4} }
{
\group_begin:
\exp_args:No \etex_everyeof:D
@@ -2174,7 +2182,6 @@
\exp_args:NNNo \group_end:
#1 #2 \l_@@_internal_a_tl
}
- { \__file_missing:n {#4} }
}
\exp_args:Nno \use:nn
{ \cs_new_protected:Npn \@@_from_file_do:w #1 }
@@ -2205,7 +2212,9 @@
\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_if_exist:nNTF {#4} \l__file_path_str
+ \file_get_full_name:nN {#4} \l__file_path_str
+ \str_if_empty:NTF \l__file_path_str
+ { \__file_missing:n {#4} }
{
\group_begin:
\etex_everyeof:D { \exp_not:N }
@@ -2215,7 +2224,6 @@
\exp_args:NNNo \group_end:
#1 #2 \l_@@_internal_a_tl
}
- { \__file_missing:n {#4} }
}
% \end{macrocode}
% \end{macro}
diff --git a/l3kernel/l3file.dtx b/l3kernel/l3file.dtx
index 472c955..8829110 100644
--- a/l3kernel/l3file.dtx
+++ b/l3kernel/l3file.dtx
@@ -105,16 +105,6 @@
% \cs{l_file_search_path_seq}.
% \end{function}
%
-% \begin{function}[TF, added = 2017-06-19]{\file_if_exist:nN}
-% \begin{syntax}
-% \cs{file_if_exist:nTF} \Arg{file name} \meta{str var} \Arg{true code} \Arg{false code}
-% \end{syntax}
-% Searches for \meta{file name} using the current \TeX{} search
-% path and the additional paths controlled by
-% \cs{l_file_search_path_seq}). The resulting full path is returned as
-% \meta{str var}, which will be empty if the file is not found.
-% \end{function}
-%
% \begin{function}[updated = 2017-06-23]
% {\file_get_full_name:nN, \file_get_full_name:VN}
% \begin{syntax}
@@ -939,7 +929,6 @@
% \end{macro}
%
% \begin{macro}[TF]{\file_if_exist:n}
-% \begin{macro}[TF]{\file_if_exist:nN}
% The test for the existence of a file is a wrapper around the function to
% add a path to a file. If the file was found, the path will contain
% something, whereas if the file was not located then the return value
@@ -952,16 +941,8 @@
{ \prg_return_false: }
{ \prg_return_true: }
}
-\prg_new_protected_conditional:Npnn \file_if_exist:nN #1#2 { T , F , TF }
- {
- \file_get_full_name:nN {#1} #2
- \str_if_empty:NTF #2
- { \prg_return_false: }
- { \prg_return_true: }
- }
% \end{macrocode}
% \end{macro}
-% \end{macro}
%
% \begin{macro}{\file_input:n}
% \begin{macro}[aux]{\@@_missing:n}
@@ -977,9 +958,10 @@
% \begin{macrocode}
\cs_new_protected:Npn \file_input:n #1
{
- \file_if_exist:nNTF {#1} \l__file_path_str
- { \@@_input:V \l__file_path_str }
+ \file_get_full_name:nN {#1} \l__file_path_str
+ \str_if_empty:NTF \l__file_path_str
{ \@@_missing:n {#1} }
+ { \@@_input:V \l__file_path_str }
}
\cs_new_protected:Npn \@@_missing:n #1
{
diff --git a/l3kernel/testfiles/m3expl001.luatex.tlg b/l3kernel/testfiles/m3expl001.luatex.tlg
index 9574212..9dfaad3 100644
--- a/l3kernel/testfiles/m3expl001.luatex.tlg
+++ b/l3kernel/testfiles/m3expl001.luatex.tlg
@@ -2860,9 +2860,6 @@ 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 ...
-Defining \file_if_exist:nNT on line ...
-Defining \file_if_exist:nNF on line ...
-Defining \file_if_exist:nNTF on line ...
Defining \file_input:n on line ...
Defining \__file_missing:n on line ...
Defining \__file_input:n on line ...
diff --git a/l3kernel/testfiles/m3expl001.ptex.tlg b/l3kernel/testfiles/m3expl001.ptex.tlg
index f6ca135..7bb3ecb 100644
--- a/l3kernel/testfiles/m3expl001.ptex.tlg
+++ b/l3kernel/testfiles/m3expl001.ptex.tlg
@@ -2848,9 +2848,6 @@ 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 ...
-Defining \file_if_exist:nNT on line ...
-Defining \file_if_exist:nNF on line ...
-Defining \file_if_exist:nNTF on line ...
Defining \file_input:n on line ...
Defining \__file_missing:n on line ...
Defining \__file_input:n on line ...
diff --git a/l3kernel/testfiles/m3expl001.tlg b/l3kernel/testfiles/m3expl001.tlg
index 1594022..7d5e95f 100644
--- a/l3kernel/testfiles/m3expl001.tlg
+++ b/l3kernel/testfiles/m3expl001.tlg
@@ -2848,9 +2848,6 @@ 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 ...
-Defining \file_if_exist:nNT on line ...
-Defining \file_if_exist:nNF on line ...
-Defining \file_if_exist:nNTF on line ...
Defining \file_input:n on line ...
Defining \__file_missing:n on line ...
Defining \__file_input:n on line ...
diff --git a/l3kernel/testfiles/m3expl001.uptex.tlg b/l3kernel/testfiles/m3expl001.uptex.tlg
index 98881d6..3ca1416 100644
--- a/l3kernel/testfiles/m3expl001.uptex.tlg
+++ b/l3kernel/testfiles/m3expl001.uptex.tlg
@@ -2848,9 +2848,6 @@ 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 ...
-Defining \file_if_exist:nNT on line ...
-Defining \file_if_exist:nNF on line ...
-Defining \file_if_exist:nNTF on line ...
Defining \file_input:n on line ...
Defining \__file_missing:n on line ...
Defining \__file_input:n on line ...
diff --git a/l3kernel/testfiles/m3expl001.xetex.tlg b/l3kernel/testfiles/m3expl001.xetex.tlg
index 172b199..05fafb6 100644
--- a/l3kernel/testfiles/m3expl001.xetex.tlg
+++ b/l3kernel/testfiles/m3expl001.xetex.tlg
@@ -2858,9 +2858,6 @@ 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 ...
-Defining \file_if_exist:nNT on line ...
-Defining \file_if_exist:nNF on line ...
-Defining \file_if_exist:nNTF on line ...
Defining \file_input:n on line ...
Defining \__file_missing:n on line ...
Defining \__file_input:n on line ...
diff --git a/l3kernel/testfiles/m3expl003.luatex.tlg b/l3kernel/testfiles/m3expl003.luatex.tlg
index 73f0899..b4ff43d 100644
--- a/l3kernel/testfiles/m3expl003.luatex.tlg
+++ b/l3kernel/testfiles/m3expl003.luatex.tlg
@@ -2861,9 +2861,6 @@ 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 ...
-Defining \file_if_exist:nNT on line ...
-Defining \file_if_exist:nNF on line ...
-Defining \file_if_exist:nNTF on line ...
Defining \file_input:n on line ...
Defining \__file_missing:n on line ...
Defining \__file_input:n on line ...
diff --git a/l3kernel/testfiles/m3expl003.ptex.tlg b/l3kernel/testfiles/m3expl003.ptex.tlg
index 0d22174..db1bc1f 100644
--- a/l3kernel/testfiles/m3expl003.ptex.tlg
+++ b/l3kernel/testfiles/m3expl003.ptex.tlg
@@ -2849,9 +2849,6 @@ 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 ...
-Defining \file_if_exist:nNT on line ...
-Defining \file_if_exist:nNF on line ...
-Defining \file_if_exist:nNTF on line ...
Defining \file_input:n on line ...
Defining \__file_missing:n on line ...
Defining \__file_input:n on line ...
diff --git a/l3kernel/testfiles/m3expl003.tlg b/l3kernel/testfiles/m3expl003.tlg
index 65e87e3..0be06d1 100644
--- a/l3kernel/testfiles/m3expl003.tlg
+++ b/l3kernel/testfiles/m3expl003.tlg
@@ -2849,9 +2849,6 @@ 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 ...
-Defining \file_if_exist:nNT on line ...
-Defining \file_if_exist:nNF on line ...
-Defining \file_if_exist:nNTF on line ...
Defining \file_input:n on line ...
Defining \__file_missing:n on line ...
Defining \__file_input:n on line ...
diff --git a/l3kernel/testfiles/m3expl003.uptex.tlg b/l3kernel/testfiles/m3expl003.uptex.tlg
index 415a44a..e81d9b2 100644
--- a/l3kernel/testfiles/m3expl003.uptex.tlg
+++ b/l3kernel/testfiles/m3expl003.uptex.tlg
@@ -2849,9 +2849,6 @@ 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 ...
-Defining \file_if_exist:nNT on line ...
-Defining \file_if_exist:nNF on line ...
-Defining \file_if_exist:nNTF on line ...
Defining \file_input:n on line ...
Defining \__file_missing:n on line ...
Defining \__file_input:n on line ...
diff --git a/l3kernel/testfiles/m3expl003.xetex.tlg b/l3kernel/testfiles/m3expl003.xetex.tlg
index 948859d..798966d 100644
--- a/l3kernel/testfiles/m3expl003.xetex.tlg
+++ b/l3kernel/testfiles/m3expl003.xetex.tlg
@@ -2859,9 +2859,6 @@ 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 ...
-Defining \file_if_exist:nNT on line ...
-Defining \file_if_exist:nNF on line ...
-Defining \file_if_exist:nNTF on line ...
Defining \file_input:n on line ...
Defining \__file_missing:n on line ...
Defining \__file_input:n on line ...
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the latex3-commits
mailing list