[latex3-commits] [l3svn] branch master updated: Revert "Move \file_if_exist_input:N(TF) to stable"
noreply at latex-project.org
noreply at latex-project.org
Sun Jun 25 22:27:37 CEST 2017
This is an automated email from the git hooks/post-receive script.
joseph pushed a commit to branch master
in repository l3svn.
The following commit(s) were added to refs/heads/master by this push:
new a993748 Revert "Move \file_if_exist_input:N(TF) to stable"
a993748 is described below
commit a9937486a505a5845997a633118033e4aec81217
Author: Joseph Wright <joseph.wright at morningstar2.co.uk>
Date: Sun Jun 25 21:27:08 2017 +0100
Revert "Move \file_if_exist_input:N(TF) to stable"
This reverts commit 67354a43b339aab04a4edf9df9716435c08b28f9.
Dicussions are still ongoing.
---
l3kernel/l3candidates.dtx | 55 +++++++++++++++++++++++++++++++
l3kernel/l3file.dtx | 52 -----------------------------
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 ++---
12 files changed, 95 insertions(+), 92 deletions(-)
diff --git a/l3kernel/l3candidates.dtx b/l3kernel/l3candidates.dtx
index 7d5b55a..f4a3cdf 100644
--- a/l3kernel/l3candidates.dtx
+++ b/l3kernel/l3candidates.dtx
@@ -188,6 +188,19 @@
%
% \section{Additions to \pkg{l3file}}
%
+% \begin{function}[TF, added = 2014-07-02]{\file_if_exist_input:n}
+% \begin{syntax}
+% \cs{file_if_exist_input:n} \Arg{file name}
+% \cs{file_if_exist_input:nTF} \Arg{file name} \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{file_path_include:n}). If found, inserts the \meta{true code} then
+% reads in the file as additional \LaTeX{} source as described for
+% \cs{file_input:n}. Note that \cs{file_if_exist_input:n} does not raise
+% an error if the file is not found, in contrast to \cs{file_input:n}.
+% \end{function}
+%
% \begin{function}[added = 2014-08-22]
% {\ior_log_streams:, \iow_log_streams:}
% \begin{syntax}
@@ -1446,6 +1459,48 @@
%
% \subsection{Additions to \pkg{l3file}}
%
+% \begin{macrocode}
+%<@@=file>
+% \end{macrocode}
+%
+% \begin{macro}[TF]{\file_if_exist_input:n}
+% Input of a file with a test for existence cannot be done the usual
+% way as the tokens to insert are in an odd place.
+% \begin{macrocode}
+\cs_new_protected:Npn \file_if_exist_input:n #1
+ {
+ \file_get_full_name:nN {#1} \l__file_full_name_str
+ \str_if_empty:NF \l__file_full_name_str
+ { \@@_input:V \l__file_full_name_str }
+ }
+\cs_new_protected:Npn \file_if_exist_input:nT #1#2
+ {
+ \file_get_full_name:nN {#1} \l__file_full_name_str
+ \str_if_empty:NF \l__file_full_name_str
+ {
+ #2
+ \@@_input:V \l__file_full_name_str
+ }
+ }
+\cs_new_protected:Npn \file_if_exist_input:nF #1#2
+ {
+ \file_get_full_name:nN {#1} \l__file_full_name_str
+ \str_if_empty:NTF \l__file_full_name_str
+ {#2}
+ { \@@_input:V \l__file_full_name_str }
+ }
+\cs_new_protected:Npn \file_if_exist_input:nTF #1#2#3
+ {
+ \file_get_full_name:nN {#1} \l__file_full_name_str
+ \str_if_empty:NTF \l__file_full_name_str
+ {#3}
+ {
+ #2
+ \@@_input:V \l__file_full_name_str
+ }
+ }
+% \end{macrocode}
+% \end{macro}
% \begin{macro}{\ior_log_streams:}
% Redirect output of \cs{ior_list_streams:} to the log.
% \begin{macrocode}
diff --git a/l3kernel/l3file.dtx b/l3kernel/l3file.dtx
index b88e030..227e6a1 100644
--- a/l3kernel/l3file.dtx
+++ b/l3kernel/l3file.dtx
@@ -105,19 +105,6 @@
% \cs{l_file_search_path_seq}.
% \end{function}
%
-% \begin{function}[TF, added = 2014-07-02]{\file_if_exist_input:n}
-% \begin{syntax}
-% \cs{file_if_exist_input:n} \Arg{file name}
-% \cs{file_if_exist_input:nTF} \Arg{file name} \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{file_path_include:n}). If found, inserts the \meta{true code} then
-% reads in the file as additional \LaTeX{} source as described for
-% \cs{file_input:n}. Note that \cs{file_if_exist_input:n} does not raise
-% an error if the file is not found, in contrast to \cs{file_input:n}.
-% \end{function}
-%
% \begin{function}[updated = 2017-06-23]
% {\file_get_full_name:nN, \file_get_full_name:VN}
% \begin{syntax}
@@ -957,45 +944,6 @@
% \end{macrocode}
% \end{macro}
%
-% \begin{macro}[TF]{\file_if_exist_input:n}
-% Input of a file with a test for existence cannot be done the usual
-% way as the tokens to insert are in an odd place.
-% \begin{macrocode}
-\cs_new_protected:Npn \file_if_exist_input:n #1
- {
- \file_get_full_name:nN {#1} \l__file_full_name_str
- \str_if_empty:NF \l__file_full_name_str
- { \@@_input:V \l__file_full_name_str }
- }
-\cs_new_protected:Npn \file_if_exist_input:nT #1#2
- {
- \file_get_full_name:nN {#1} \l__file_full_name_str
- \str_if_empty:NF \l__file_full_name_str
- {
- #2
- \@@_input:V \l__file_full_name_str
- }
- }
-\cs_new_protected:Npn \file_if_exist_input:nF #1#2
- {
- \file_get_full_name:nN {#1} \l__file_full_name_str
- \str_if_empty:NTF \l__file_full_name_str
- {#2}
- { \@@_input:V \l__file_full_name_str }
- }
-\cs_new_protected:Npn \file_if_exist_input:nTF #1#2#3
- {
- \file_get_full_name:nN {#1} \l__file_full_name_str
- \str_if_empty:NTF \l__file_full_name_str
- {#3}
- {
- #2
- \@@_input:V \l__file_full_name_str
- }
- }
-% \end{macrocode}
-% \end{macro}
-%
% \begin{macro}{\file_input:n}
% \begin{macro}[aux]{\@@_missing:n}
% \begin{macro}[aux]{\@@_input:n, \@@_input:V}
diff --git a/l3kernel/testfiles/m3expl001.luatex.tlg b/l3kernel/testfiles/m3expl001.luatex.tlg
index 76937f7..3715c6d 100644
--- a/l3kernel/testfiles/m3expl001.luatex.tlg
+++ b/l3kernel/testfiles/m3expl001.luatex.tlg
@@ -2860,10 +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_input:n on line ...
-Defining \file_if_exist_input:nT on line ...
-Defining \file_if_exist_input:nF on line ...
-Defining \file_if_exist_input:nTF on line ...
Defining \file_input:n on line ...
Defining \__file_missing:n on line ...
Defining \__file_input:n on line ...
@@ -5402,6 +5398,10 @@ Defining \__coffin_scale_corner:Nnnn on line ...
Defining \__coffin_scale_pole:Nnnnnn on line ...
Defining \__coffin_x_shift_corner:Nnnn on line ...
Defining \__coffin_x_shift_pole:Nnnnnn on line ...
+Defining \file_if_exist_input:n on line ...
+Defining \file_if_exist_input:nT on line ...
+Defining \file_if_exist_input:nF on line ...
+Defining \file_if_exist_input:nTF on line ...
Defining \ior_log_streams: on line ...
Defining \iow_log_streams: on line ...
Defining \int_rand:nn on line ...
diff --git a/l3kernel/testfiles/m3expl001.ptex.tlg b/l3kernel/testfiles/m3expl001.ptex.tlg
index 3cbc7b1..1084e04 100644
--- a/l3kernel/testfiles/m3expl001.ptex.tlg
+++ b/l3kernel/testfiles/m3expl001.ptex.tlg
@@ -2848,10 +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_input:n on line ...
-Defining \file_if_exist_input:nT on line ...
-Defining \file_if_exist_input:nF on line ...
-Defining \file_if_exist_input:nTF on line ...
Defining \file_input:n on line ...
Defining \__file_missing:n on line ...
Defining \__file_input:n on line ...
@@ -5392,6 +5388,10 @@ Defining \__coffin_scale_corner:Nnnn on line ...
Defining \__coffin_scale_pole:Nnnnnn on line ...
Defining \__coffin_x_shift_corner:Nnnn on line ...
Defining \__coffin_x_shift_pole:Nnnnnn on line ...
+Defining \file_if_exist_input:n on line ...
+Defining \file_if_exist_input:nT on line ...
+Defining \file_if_exist_input:nF on line ...
+Defining \file_if_exist_input:nTF on line ...
Defining \ior_log_streams: on line ...
Defining \iow_log_streams: on line ...
Defining \int_rand:nn on line ...
diff --git a/l3kernel/testfiles/m3expl001.tlg b/l3kernel/testfiles/m3expl001.tlg
index cfdb12b..c5df085 100644
--- a/l3kernel/testfiles/m3expl001.tlg
+++ b/l3kernel/testfiles/m3expl001.tlg
@@ -2848,10 +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_input:n on line ...
-Defining \file_if_exist_input:nT on line ...
-Defining \file_if_exist_input:nF on line ...
-Defining \file_if_exist_input:nTF on line ...
Defining \file_input:n on line ...
Defining \__file_missing:n on line ...
Defining \__file_input:n on line ...
@@ -5392,6 +5388,10 @@ Defining \__coffin_scale_corner:Nnnn on line ...
Defining \__coffin_scale_pole:Nnnnnn on line ...
Defining \__coffin_x_shift_corner:Nnnn on line ...
Defining \__coffin_x_shift_pole:Nnnnnn on line ...
+Defining \file_if_exist_input:n on line ...
+Defining \file_if_exist_input:nT on line ...
+Defining \file_if_exist_input:nF on line ...
+Defining \file_if_exist_input:nTF on line ...
Defining \ior_log_streams: on line ...
Defining \iow_log_streams: on line ...
Defining \int_rand:nn on line ...
diff --git a/l3kernel/testfiles/m3expl001.uptex.tlg b/l3kernel/testfiles/m3expl001.uptex.tlg
index 6cec849..9777478 100644
--- a/l3kernel/testfiles/m3expl001.uptex.tlg
+++ b/l3kernel/testfiles/m3expl001.uptex.tlg
@@ -2848,10 +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_input:n on line ...
-Defining \file_if_exist_input:nT on line ...
-Defining \file_if_exist_input:nF on line ...
-Defining \file_if_exist_input:nTF on line ...
Defining \file_input:n on line ...
Defining \__file_missing:n on line ...
Defining \__file_input:n on line ...
@@ -5390,6 +5386,10 @@ Defining \__coffin_scale_corner:Nnnn on line ...
Defining \__coffin_scale_pole:Nnnnnn on line ...
Defining \__coffin_x_shift_corner:Nnnn on line ...
Defining \__coffin_x_shift_pole:Nnnnnn on line ...
+Defining \file_if_exist_input:n on line ...
+Defining \file_if_exist_input:nT on line ...
+Defining \file_if_exist_input:nF on line ...
+Defining \file_if_exist_input:nTF on line ...
Defining \ior_log_streams: on line ...
Defining \iow_log_streams: on line ...
Defining \int_rand:nn on line ...
diff --git a/l3kernel/testfiles/m3expl001.xetex.tlg b/l3kernel/testfiles/m3expl001.xetex.tlg
index 5ac1d66..2d1234b 100644
--- a/l3kernel/testfiles/m3expl001.xetex.tlg
+++ b/l3kernel/testfiles/m3expl001.xetex.tlg
@@ -2858,10 +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_input:n on line ...
-Defining \file_if_exist_input:nT on line ...
-Defining \file_if_exist_input:nF on line ...
-Defining \file_if_exist_input:nTF on line ...
Defining \file_input:n on line ...
Defining \__file_missing:n on line ...
Defining \__file_input:n on line ...
@@ -5380,6 +5376,10 @@ Defining \__coffin_scale_corner:Nnnn on line ...
Defining \__coffin_scale_pole:Nnnnnn on line ...
Defining \__coffin_x_shift_corner:Nnnn on line ...
Defining \__coffin_x_shift_pole:Nnnnnn on line ...
+Defining \file_if_exist_input:n on line ...
+Defining \file_if_exist_input:nT on line ...
+Defining \file_if_exist_input:nF on line ...
+Defining \file_if_exist_input:nTF on line ...
Defining \ior_log_streams: on line ...
Defining \iow_log_streams: on line ...
Defining \int_rand:nn on line ...
diff --git a/l3kernel/testfiles/m3expl003.luatex.tlg b/l3kernel/testfiles/m3expl003.luatex.tlg
index 585bb17..f7d216e 100644
--- a/l3kernel/testfiles/m3expl003.luatex.tlg
+++ b/l3kernel/testfiles/m3expl003.luatex.tlg
@@ -2861,10 +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_input:n on line ...
-Defining \file_if_exist_input:nT on line ...
-Defining \file_if_exist_input:nF on line ...
-Defining \file_if_exist_input:nTF on line ...
Defining \file_input:n on line ...
Defining \__file_missing:n on line ...
Defining \__file_input:n on line ...
@@ -5403,6 +5399,10 @@ Defining \__coffin_scale_corner:Nnnn on line ...
Defining \__coffin_scale_pole:Nnnnnn on line ...
Defining \__coffin_x_shift_corner:Nnnn on line ...
Defining \__coffin_x_shift_pole:Nnnnnn on line ...
+Defining \file_if_exist_input:n on line ...
+Defining \file_if_exist_input:nT on line ...
+Defining \file_if_exist_input:nF on line ...
+Defining \file_if_exist_input:nTF on line ...
Defining \ior_log_streams: on line ...
Defining \iow_log_streams: on line ...
Defining \int_rand:nn on line ...
diff --git a/l3kernel/testfiles/m3expl003.ptex.tlg b/l3kernel/testfiles/m3expl003.ptex.tlg
index 8142e8c..902376a 100644
--- a/l3kernel/testfiles/m3expl003.ptex.tlg
+++ b/l3kernel/testfiles/m3expl003.ptex.tlg
@@ -2849,10 +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_input:n on line ...
-Defining \file_if_exist_input:nT on line ...
-Defining \file_if_exist_input:nF on line ...
-Defining \file_if_exist_input:nTF on line ...
Defining \file_input:n on line ...
Defining \__file_missing:n on line ...
Defining \__file_input:n on line ...
@@ -5393,6 +5389,10 @@ Defining \__coffin_scale_corner:Nnnn on line ...
Defining \__coffin_scale_pole:Nnnnnn on line ...
Defining \__coffin_x_shift_corner:Nnnn on line ...
Defining \__coffin_x_shift_pole:Nnnnnn on line ...
+Defining \file_if_exist_input:n on line ...
+Defining \file_if_exist_input:nT on line ...
+Defining \file_if_exist_input:nF on line ...
+Defining \file_if_exist_input:nTF on line ...
Defining \ior_log_streams: on line ...
Defining \iow_log_streams: on line ...
Defining \int_rand:nn on line ...
diff --git a/l3kernel/testfiles/m3expl003.tlg b/l3kernel/testfiles/m3expl003.tlg
index fc17f2a..82fa505 100644
--- a/l3kernel/testfiles/m3expl003.tlg
+++ b/l3kernel/testfiles/m3expl003.tlg
@@ -2849,10 +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_input:n on line ...
-Defining \file_if_exist_input:nT on line ...
-Defining \file_if_exist_input:nF on line ...
-Defining \file_if_exist_input:nTF on line ...
Defining \file_input:n on line ...
Defining \__file_missing:n on line ...
Defining \__file_input:n on line ...
@@ -5393,6 +5389,10 @@ Defining \__coffin_scale_corner:Nnnn on line ...
Defining \__coffin_scale_pole:Nnnnnn on line ...
Defining \__coffin_x_shift_corner:Nnnn on line ...
Defining \__coffin_x_shift_pole:Nnnnnn on line ...
+Defining \file_if_exist_input:n on line ...
+Defining \file_if_exist_input:nT on line ...
+Defining \file_if_exist_input:nF on line ...
+Defining \file_if_exist_input:nTF on line ...
Defining \ior_log_streams: on line ...
Defining \iow_log_streams: on line ...
Defining \int_rand:nn on line ...
diff --git a/l3kernel/testfiles/m3expl003.uptex.tlg b/l3kernel/testfiles/m3expl003.uptex.tlg
index fa7c9e9..6a814f3 100644
--- a/l3kernel/testfiles/m3expl003.uptex.tlg
+++ b/l3kernel/testfiles/m3expl003.uptex.tlg
@@ -2849,10 +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_input:n on line ...
-Defining \file_if_exist_input:nT on line ...
-Defining \file_if_exist_input:nF on line ...
-Defining \file_if_exist_input:nTF on line ...
Defining \file_input:n on line ...
Defining \__file_missing:n on line ...
Defining \__file_input:n on line ...
@@ -5391,6 +5387,10 @@ Defining \__coffin_scale_corner:Nnnn on line ...
Defining \__coffin_scale_pole:Nnnnnn on line ...
Defining \__coffin_x_shift_corner:Nnnn on line ...
Defining \__coffin_x_shift_pole:Nnnnnn on line ...
+Defining \file_if_exist_input:n on line ...
+Defining \file_if_exist_input:nT on line ...
+Defining \file_if_exist_input:nF on line ...
+Defining \file_if_exist_input:nTF on line ...
Defining \ior_log_streams: on line ...
Defining \iow_log_streams: on line ...
Defining \int_rand:nn on line ...
diff --git a/l3kernel/testfiles/m3expl003.xetex.tlg b/l3kernel/testfiles/m3expl003.xetex.tlg
index 94c8e3f..60893a5 100644
--- a/l3kernel/testfiles/m3expl003.xetex.tlg
+++ b/l3kernel/testfiles/m3expl003.xetex.tlg
@@ -2859,10 +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_input:n on line ...
-Defining \file_if_exist_input:nT on line ...
-Defining \file_if_exist_input:nF on line ...
-Defining \file_if_exist_input:nTF on line ...
Defining \file_input:n on line ...
Defining \__file_missing:n on line ...
Defining \__file_input:n on line ...
@@ -5381,6 +5377,10 @@ Defining \__coffin_scale_corner:Nnnn on line ...
Defining \__coffin_scale_pole:Nnnnnn on line ...
Defining \__coffin_x_shift_corner:Nnnn on line ...
Defining \__coffin_x_shift_pole:Nnnnnn on line ...
+Defining \file_if_exist_input:n on line ...
+Defining \file_if_exist_input:nT on line ...
+Defining \file_if_exist_input:nF on line ...
+Defining \file_if_exist_input:nTF on line ...
Defining \ior_log_streams: on line ...
Defining \iow_log_streams: on line ...
Defining \int_rand:nn 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