[latex3-commits] [l3svn] 02/06: \file_parse_path:nNNN => \file_parse_full_name:nNNN
noreply at latex-project.org
noreply at latex-project.org
Fri Jun 23 23:14:52 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 68f888f325637b9422407d99cfc5cd111df2e6c5
Author: Joseph Wright <joseph.wright at morningstar2.co.uk>
Date: Fri Jun 23 21:04:28 2017 +0100
\file_parse_path:nNNN => \file_parse_full_name:nNNN
---
l3kernel/l3file.dtx | 28 ++++++++++++++--------------
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/m3file001.lvt | 2 +-
12 files changed, 55 insertions(+), 55 deletions(-)
diff --git a/l3kernel/l3file.dtx b/l3kernel/l3file.dtx
index 6594a40..472c955 100644
--- a/l3kernel/l3file.dtx
+++ b/l3kernel/l3file.dtx
@@ -126,9 +126,9 @@
% If the file is not found then the \meta{str var} will be empty.
% \end{function}
%
-% \begin{function}[added = 2017-06-20]{\file_parse_path:nNNN}
+% \begin{function}[added = 2017-06-23]{\file_parse_full_name:nNNN}
% \begin{syntax}
-% \cs{file_parse_path:nNNN} \Arg{file path} \meta{dir} \meta{name} \meta{ext}
+% \cs{file_parse_full_name:nNNN} \Arg{full name} \meta{dir} \meta{name} \meta{ext}
% \end{syntax}
% Parsers the \meta{file path} and splits it into three parts, each of
% which is returned by settings the appropriate local string variable:
@@ -1021,7 +1021,7 @@
{ \g_file_current_name_str }
{ \g_file_current_ext_str }
}
- \file_parse_path:nNNN {#1}
+ \file_parse_full_name:nNNN {#1}
\l_@@_dir_str \l_@@_name_str \l_@@_ext_str
\str_gset_eq:NN \g_file_current_dir_str \l_@@_dir_str
\str_gset_eq:NN \g_file_current_name_str \l_@@_name_str
@@ -1047,9 +1047,9 @@
% \end{macro}
% \end{macro}
%
-% \begin{macro}{\file_parse_path:nNNN}
+% \begin{macro}{\file_parse_full_name:nNNN}
% \begin{macro}[aux]
-% {\@@_parse_path_auxi:w, \@@_parse_path_auxii:w, \@@_parse_path_auxiii:w}
+% {\@@_parse_full_name_auxi:w, \@@_parse_full_name_auxii:w, \@@_parse_full_name_auxiii:w}
% Parsing starts by stripping off any surrounding quotes. Assuming there is
% then something to read, the next step is to split off the directory.
% We don't want to add |/| until at least one parent directory is found,
@@ -1057,26 +1057,26 @@
% there is a second test for that construct at the end of directory
% discovery.
% \begin{macrocode}
-\cs_new_protected:Npn \file_parse_path:nNNN #1#2#3#4
+\cs_new_protected:Npn \file_parse_full_name:nNNN #1#2#3#4
{
- \@@_parse_path_auxi:w #1 " #1 " \q_stop #2#3#4
+ \@@_parse_full_name_auxi:w #1 " #1 " \q_stop #2#3#4
}
-\cs_new_protected:Npn \@@_parse_path_auxi:w #1 " #2 " #3 \q_stop #4#5#6
+\cs_new_protected:Npn \@@_parse_full_name_auxi:w #1 " #2 " #3 \q_stop #4#5#6
{
\str_clear:N #4
\str_clear:N #5
\str_clear:N #6
\tl_if_blank:nF {#2}
- { \@@_parse_path_auxii:w #2 / \q_mark #2 \q_stop #4#5#6 }
+ { \@@_parse_full_name_auxii:w #2 / \q_mark #2 \q_stop #4#5#6 }
}
-\cs_new_protected:Npn \@@_parse_path_auxii:w #1 / #2 \q_mark #3 \q_stop #4#5#6
+\cs_new_protected:Npn \@@_parse_full_name_auxii:w #1 / #2 \q_mark #3 \q_stop #4#5#6
{
\tl_if_blank:nTF {#2}
{
\tl_if_head_eq_charcode:nNT {#3} { / }
{ \str_set:Nx #4 { / #4 } }
\tl_if_blank:nF {#1}
- { \@@_parse_path_auxiii:w #1 . \q_stop #5#6 }
+ { \@@_parse_full_name_auxiii:w #1 . \q_stop #5#6 }
}
{
\str_set:Nx #4
@@ -1085,7 +1085,7 @@
\str_if_empty:NF #4 { / }
#1
}
- \@@_parse_path_auxii:w #2 \q_mark #3 \q_stop #4#5#6
+ \@@_parse_full_name_auxii:w #2 \q_mark #3 \q_stop #4#5#6
}
}
% \end{macrocode}
@@ -1094,7 +1094,7 @@
% these are |.tex| files. We also use a loop here to deal with multi-dot
% names, \emph{cf.}~how \tn{filename at parse} would deal with this.
% \begin{macrocode}
-\cs_new_protected:Npn \@@_parse_path_auxiii:w #1 . #2 \q_stop #3#4
+\cs_new_protected:Npn \@@_parse_full_name_auxiii:w #1 . #2 \q_stop #3#4
{
\tl_if_blank:nTF {#2}
{
@@ -1112,7 +1112,7 @@
\str_if_empty:NF #3 { . }
#1
}
- \@@_parse_path_auxiii:w #2 \q_stop #3#4
+ \@@_parse_full_name_auxiii:w #2 \q_stop #3#4
}
}
% \end{macrocode}
diff --git a/l3kernel/testfiles/m3expl001.luatex.tlg b/l3kernel/testfiles/m3expl001.luatex.tlg
index e1dd107..9574212 100644
--- a/l3kernel/testfiles/m3expl001.luatex.tlg
+++ b/l3kernel/testfiles/m3expl001.luatex.tlg
@@ -2872,10 +2872,10 @@ Defining \__file_input_aux:o on line ...
Defining \__file_input_push:n on line ...
Defining \__file_input_pop: on line ...
Defining \__file_input_pop:nnn on line ...
-Defining \file_parse_path:nNNN on line ...
-Defining \__file_parse_path_auxi:w on line ...
-Defining \__file_parse_path_auxii:w on line ...
-Defining \__file_parse_path_auxiii:w on line ...
+Defining \file_parse_full_name:nNNN on line ...
+Defining \__file_parse_full_name_auxi:w on line ...
+Defining \__file_parse_full_name_auxii:w on line ...
+Defining \__file_parse_full_name_auxiii:w on line ...
Defining \file_list: on line ...
Defining \c_term_ior on line ...
Defining \g__ior_streams_seq on line ...
diff --git a/l3kernel/testfiles/m3expl001.ptex.tlg b/l3kernel/testfiles/m3expl001.ptex.tlg
index f163372..f6ca135 100644
--- a/l3kernel/testfiles/m3expl001.ptex.tlg
+++ b/l3kernel/testfiles/m3expl001.ptex.tlg
@@ -2860,10 +2860,10 @@ Defining \__file_input_aux:o on line ...
Defining \__file_input_push:n on line ...
Defining \__file_input_pop: on line ...
Defining \__file_input_pop:nnn on line ...
-Defining \file_parse_path:nNNN on line ...
-Defining \__file_parse_path_auxi:w on line ...
-Defining \__file_parse_path_auxii:w on line ...
-Defining \__file_parse_path_auxiii:w on line ...
+Defining \file_parse_full_name:nNNN on line ...
+Defining \__file_parse_full_name_auxi:w on line ...
+Defining \__file_parse_full_name_auxii:w on line ...
+Defining \__file_parse_full_name_auxiii:w on line ...
Defining \file_list: on line ...
Defining \c_term_ior on line ...
Defining \g__ior_streams_seq on line ...
diff --git a/l3kernel/testfiles/m3expl001.tlg b/l3kernel/testfiles/m3expl001.tlg
index 24efb36..1594022 100644
--- a/l3kernel/testfiles/m3expl001.tlg
+++ b/l3kernel/testfiles/m3expl001.tlg
@@ -2860,10 +2860,10 @@ Defining \__file_input_aux:o on line ...
Defining \__file_input_push:n on line ...
Defining \__file_input_pop: on line ...
Defining \__file_input_pop:nnn on line ...
-Defining \file_parse_path:nNNN on line ...
-Defining \__file_parse_path_auxi:w on line ...
-Defining \__file_parse_path_auxii:w on line ...
-Defining \__file_parse_path_auxiii:w on line ...
+Defining \file_parse_full_name:nNNN on line ...
+Defining \__file_parse_full_name_auxi:w on line ...
+Defining \__file_parse_full_name_auxii:w on line ...
+Defining \__file_parse_full_name_auxiii:w on line ...
Defining \file_list: on line ...
Defining \c_term_ior on line ...
Defining \g__ior_streams_seq on line ...
diff --git a/l3kernel/testfiles/m3expl001.uptex.tlg b/l3kernel/testfiles/m3expl001.uptex.tlg
index 9df3165..98881d6 100644
--- a/l3kernel/testfiles/m3expl001.uptex.tlg
+++ b/l3kernel/testfiles/m3expl001.uptex.tlg
@@ -2860,10 +2860,10 @@ Defining \__file_input_aux:o on line ...
Defining \__file_input_push:n on line ...
Defining \__file_input_pop: on line ...
Defining \__file_input_pop:nnn on line ...
-Defining \file_parse_path:nNNN on line ...
-Defining \__file_parse_path_auxi:w on line ...
-Defining \__file_parse_path_auxii:w on line ...
-Defining \__file_parse_path_auxiii:w on line ...
+Defining \file_parse_full_name:nNNN on line ...
+Defining \__file_parse_full_name_auxi:w on line ...
+Defining \__file_parse_full_name_auxii:w on line ...
+Defining \__file_parse_full_name_auxiii:w on line ...
Defining \file_list: on line ...
Defining \c_term_ior on line ...
Defining \g__ior_streams_seq on line ...
diff --git a/l3kernel/testfiles/m3expl001.xetex.tlg b/l3kernel/testfiles/m3expl001.xetex.tlg
index 88c31f0..172b199 100644
--- a/l3kernel/testfiles/m3expl001.xetex.tlg
+++ b/l3kernel/testfiles/m3expl001.xetex.tlg
@@ -2870,10 +2870,10 @@ Defining \__file_input_aux:o on line ...
Defining \__file_input_push:n on line ...
Defining \__file_input_pop: on line ...
Defining \__file_input_pop:nnn on line ...
-Defining \file_parse_path:nNNN on line ...
-Defining \__file_parse_path_auxi:w on line ...
-Defining \__file_parse_path_auxii:w on line ...
-Defining \__file_parse_path_auxiii:w on line ...
+Defining \file_parse_full_name:nNNN on line ...
+Defining \__file_parse_full_name_auxi:w on line ...
+Defining \__file_parse_full_name_auxii:w on line ...
+Defining \__file_parse_full_name_auxiii:w on line ...
Defining \file_list: on line ...
Defining \c_term_ior on line ...
Defining \g__ior_streams_seq on line ...
diff --git a/l3kernel/testfiles/m3expl003.luatex.tlg b/l3kernel/testfiles/m3expl003.luatex.tlg
index 800c158..73f0899 100644
--- a/l3kernel/testfiles/m3expl003.luatex.tlg
+++ b/l3kernel/testfiles/m3expl003.luatex.tlg
@@ -2873,10 +2873,10 @@ Defining \__file_input_aux:o on line ...
Defining \__file_input_push:n on line ...
Defining \__file_input_pop: on line ...
Defining \__file_input_pop:nnn on line ...
-Defining \file_parse_path:nNNN on line ...
-Defining \__file_parse_path_auxi:w on line ...
-Defining \__file_parse_path_auxii:w on line ...
-Defining \__file_parse_path_auxiii:w on line ...
+Defining \file_parse_full_name:nNNN on line ...
+Defining \__file_parse_full_name_auxi:w on line ...
+Defining \__file_parse_full_name_auxii:w on line ...
+Defining \__file_parse_full_name_auxiii:w on line ...
Defining \file_list: on line ...
Defining \c_term_ior on line ...
Defining \g__ior_streams_seq on line ...
diff --git a/l3kernel/testfiles/m3expl003.ptex.tlg b/l3kernel/testfiles/m3expl003.ptex.tlg
index 9e79e76..0d22174 100644
--- a/l3kernel/testfiles/m3expl003.ptex.tlg
+++ b/l3kernel/testfiles/m3expl003.ptex.tlg
@@ -2861,10 +2861,10 @@ Defining \__file_input_aux:o on line ...
Defining \__file_input_push:n on line ...
Defining \__file_input_pop: on line ...
Defining \__file_input_pop:nnn on line ...
-Defining \file_parse_path:nNNN on line ...
-Defining \__file_parse_path_auxi:w on line ...
-Defining \__file_parse_path_auxii:w on line ...
-Defining \__file_parse_path_auxiii:w on line ...
+Defining \file_parse_full_name:nNNN on line ...
+Defining \__file_parse_full_name_auxi:w on line ...
+Defining \__file_parse_full_name_auxii:w on line ...
+Defining \__file_parse_full_name_auxiii:w on line ...
Defining \file_list: on line ...
Defining \c_term_ior on line ...
Defining \g__ior_streams_seq on line ...
diff --git a/l3kernel/testfiles/m3expl003.tlg b/l3kernel/testfiles/m3expl003.tlg
index 0f98a36..65e87e3 100644
--- a/l3kernel/testfiles/m3expl003.tlg
+++ b/l3kernel/testfiles/m3expl003.tlg
@@ -2861,10 +2861,10 @@ Defining \__file_input_aux:o on line ...
Defining \__file_input_push:n on line ...
Defining \__file_input_pop: on line ...
Defining \__file_input_pop:nnn on line ...
-Defining \file_parse_path:nNNN on line ...
-Defining \__file_parse_path_auxi:w on line ...
-Defining \__file_parse_path_auxii:w on line ...
-Defining \__file_parse_path_auxiii:w on line ...
+Defining \file_parse_full_name:nNNN on line ...
+Defining \__file_parse_full_name_auxi:w on line ...
+Defining \__file_parse_full_name_auxii:w on line ...
+Defining \__file_parse_full_name_auxiii:w on line ...
Defining \file_list: on line ...
Defining \c_term_ior on line ...
Defining \g__ior_streams_seq on line ...
diff --git a/l3kernel/testfiles/m3expl003.uptex.tlg b/l3kernel/testfiles/m3expl003.uptex.tlg
index ee4ca3d..415a44a 100644
--- a/l3kernel/testfiles/m3expl003.uptex.tlg
+++ b/l3kernel/testfiles/m3expl003.uptex.tlg
@@ -2861,10 +2861,10 @@ Defining \__file_input_aux:o on line ...
Defining \__file_input_push:n on line ...
Defining \__file_input_pop: on line ...
Defining \__file_input_pop:nnn on line ...
-Defining \file_parse_path:nNNN on line ...
-Defining \__file_parse_path_auxi:w on line ...
-Defining \__file_parse_path_auxii:w on line ...
-Defining \__file_parse_path_auxiii:w on line ...
+Defining \file_parse_full_name:nNNN on line ...
+Defining \__file_parse_full_name_auxi:w on line ...
+Defining \__file_parse_full_name_auxii:w on line ...
+Defining \__file_parse_full_name_auxiii:w on line ...
Defining \file_list: on line ...
Defining \c_term_ior on line ...
Defining \g__ior_streams_seq on line ...
diff --git a/l3kernel/testfiles/m3expl003.xetex.tlg b/l3kernel/testfiles/m3expl003.xetex.tlg
index e37f596..948859d 100644
--- a/l3kernel/testfiles/m3expl003.xetex.tlg
+++ b/l3kernel/testfiles/m3expl003.xetex.tlg
@@ -2871,10 +2871,10 @@ Defining \__file_input_aux:o on line ...
Defining \__file_input_push:n on line ...
Defining \__file_input_pop: on line ...
Defining \__file_input_pop:nnn on line ...
-Defining \file_parse_path:nNNN on line ...
-Defining \__file_parse_path_auxi:w on line ...
-Defining \__file_parse_path_auxii:w on line ...
-Defining \__file_parse_path_auxiii:w on line ...
+Defining \file_parse_full_name:nNNN on line ...
+Defining \__file_parse_full_name_auxi:w on line ...
+Defining \__file_parse_full_name_auxii:w on line ...
+Defining \__file_parse_full_name_auxiii:w on line ...
Defining \file_list: on line ...
Defining \c_term_ior on line ...
Defining \g__ior_streams_seq on line ...
diff --git a/l3kernel/testfiles/m3file001.lvt b/l3kernel/testfiles/m3file001.lvt
index a18eb7a..eea0f09 100644
--- a/l3kernel/testfiles/m3file001.lvt
+++ b/l3kernel/testfiles/m3file001.lvt
@@ -80,7 +80,7 @@
\str_new:N \l_tmpc_str
\cs_set_protected:Npn \test:n #1
{
- \file_parse_path:nNNN {#1} \l_tmpa_str \l_tmpb_str \l_tmpc_str
+ \file_parse_full_name:nNNN {#1} \l_tmpa_str \l_tmpb_str \l_tmpc_str
\TYPE
{
Path:~" \l_tmpa_str ",~
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the latex3-commits
mailing list