[latex3-commits] [l3svn] 05/06: Rename some internal file variables
noreply at latex-project.org
noreply at latex-project.org
Fri Jun 23 23:14:55 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 0c9476b6ed0ee063cffa729e73b90c1f0bedba93
Author: Joseph Wright <joseph.wright at morningstar2.co.uk>
Date: Fri Jun 23 21:34:43 2017 +0100
Rename some internal file variables
This now matches the agreed position on naming.
---
l3kernel/l3candidates.dtx | 36 ++++++++--------
l3kernel/l3file.dtx | 72 +++++++++++++++----------------
l3kernel/testfiles/m3expl001.luatex.tlg | 4 +-
l3kernel/testfiles/m3expl001.ptex.tlg | 4 +-
l3kernel/testfiles/m3expl001.tlg | 4 +-
l3kernel/testfiles/m3expl001.uptex.tlg | 4 +-
l3kernel/testfiles/m3expl001.xetex.tlg | 4 +-
l3kernel/testfiles/m3expl003.luatex.tlg | 4 +-
l3kernel/testfiles/m3expl003.ptex.tlg | 4 +-
l3kernel/testfiles/m3expl003.tlg | 4 +-
l3kernel/testfiles/m3expl003.uptex.tlg | 4 +-
l3kernel/testfiles/m3expl003.xetex.tlg | 4 +-
12 files changed, 74 insertions(+), 74 deletions(-)
diff --git a/l3kernel/l3candidates.dtx b/l3kernel/l3candidates.dtx
index c70c6db..f4a3cdf 100644
--- a/l3kernel/l3candidates.dtx
+++ b/l3kernel/l3candidates.dtx
@@ -1469,34 +1469,34 @@
% \begin{macrocode}
\cs_new_protected:Npn \file_if_exist_input:n #1
{
- \file_get_full_name:nN {#1} \l__file_path_str
- \str_if_empty:NF \l__file_path_str
- { \@@_input:V \l__file_path_str }
+ \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_path_str
- \str_if_empty:NF \l__file_path_str
+ \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_path_str
+ \@@_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_path_str
- \str_if_empty:NTF \l__file_path_str
+ \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_path_str }
+ { \@@_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_path_str
- \str_if_empty:NTF \l__file_path_str
+ \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_path_str
+ \@@_input:V \l__file_full_name_str
}
}
% \end{macrocode}
@@ -2168,8 +2168,8 @@
\cs_generate_variant:Nn \tl_gset_from_file:Nnn { c }
\cs_new_protected:Npn \@@_set_from_file:NNnn #1#2#3#4
{
- \file_get_full_name:nN {#4} \l__file_path_str
- \str_if_empty:NTF \l__file_path_str
+ \file_get_full_name:nN {#4} \l__file_full_name_str
+ \str_if_empty:NTF \l__file_full_name_str
{ \__file_missing:n {#4} }
{
\group_begin:
@@ -2178,7 +2178,7 @@
#3 \scan_stop:
\exp_after:wN \@@_from_file_do:w
\exp_after:wN \prg_do_nothing:
- \tex_input:D \l__file_path_str \scan_stop:
+ \tex_input:D \l__file_full_name_str \scan_stop:
\exp_args:NNNo \group_end:
#1 #2 \l_@@_internal_a_tl
}
@@ -2212,15 +2212,15 @@
\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_get_full_name:nN {#4} \l__file_path_str
- \str_if_empty:NTF \l__file_path_str
+ \file_get_full_name:nN {#4} \l__file_full_name_str
+ \str_if_empty:NTF \l__file_full_name_str
{ \__file_missing:n {#4} }
{
\group_begin:
\etex_everyeof:D { \exp_not:N }
#3 \scan_stop:
\tl_set:Nx \l_@@_internal_a_tl
- { \tex_input:D \l__file_path_str \c_space_token }
+ { \tex_input:D \l__file_full_name_str \c_space_token }
\exp_args:NNNo \group_end:
#1 #2 \l_@@_internal_a_tl
}
diff --git a/l3kernel/l3file.dtx b/l3kernel/l3file.dtx
index a5dac5d..2bf951b 100644
--- a/l3kernel/l3file.dtx
+++ b/l3kernel/l3file.dtx
@@ -612,7 +612,7 @@
% Used to test for the existence of files when opening.
% \end{variable}
%
-% \begin{variable}{\l__file_basename_str, \l__file_path_str}
+% \begin{variable}{\l__file_base_name_str, \l__file_full_name_str}
% Used to store and transfer the file name (including extension)
% and (partial) file path whilst reading files. (The file base is the
% basename plus any preceding directory name.)
@@ -774,11 +774,11 @@
% \end{macrocode}
% \end{variable}
%
-% \begin{variable}{\l__file_basename_str, \l__file_path_str}
+% \begin{variable}{\l__file_base_name_str, \l__file_full_name_str}
% For storing the basename and full path whilst passing data internally.
% \begin{macrocode}
-\str_new:N \l__file_basename_str
-\str_new:N \l__file_path_str
+\str_new:N \l__file_base_name_str
+\str_new:N \l__file_full_name_str
% \end{macrocode}
% \end{variable}
%
@@ -882,12 +882,12 @@
% \begin{macrocode}
\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
+ \__file_name_sanitize:nN {#1} \l__file_base_name_str
+ \__file_name_quote:VN \l__file_base_name_str \l__file_full_name_str
+ \__ior_open:No \g_@@_internal_ior \l__file_full_name_str
\ior_if_eof:NTF \g_@@_internal_ior
{ \@@_get_full_name_search:N #2 }
- { \str_set_eq:NN #2 \l__file_path_str }
+ { \str_set_eq:NN #2 \l__file_full_name_str }
\ior_close:N \g_@@_internal_ior
}
\cs_generate_variant:Nn \file_get_full_name:nN { V }
@@ -906,13 +906,13 @@
%</package>
\seq_map_inline:Nn \l_file_search_path_seq
{
- \str_set:Nx \l__file_path_str
- { \tl_to_str:n {##1} / \l__file_basename_str }
- \__file_name_quote:VN \l__file_path_str \l__file_path_str
- \__ior_open:NV \g_@@_internal_ior \l__file_path_str
+ \str_set:Nx \l__file_full_name_str
+ { \tl_to_str:n {##1} / \l__file_base_name_str }
+ \__file_name_quote:VN \l__file_full_name_str \l__file_full_name_str
+ \__ior_open:NV \g_@@_internal_ior \l__file_full_name_str
\ior_if_eof:NF \g_@@_internal_ior
{
- \str_set_eq:NN #1 \l__file_path_str
+ \str_set_eq:NN #1 \l__file_full_name_str
\seq_map_break:
}
}
@@ -936,8 +936,8 @@
% \begin{macrocode}
\prg_new_protected_conditional:Npnn \file_if_exist:n #1 { T , F , TF }
{
- \file_get_full_name:nN {#1} \l__file_path_str
- \str_if_empty:NTF \l__file_path_str
+ \file_get_full_name:nN {#1} \l__file_full_name_str
+ \str_if_empty:NTF \l__file_full_name_str
{ \prg_return_false: }
{ \prg_return_true: }
}
@@ -958,16 +958,16 @@
% \begin{macrocode}
\cs_new_protected:Npn \file_input:n #1
{
- \file_get_full_name:nN {#1} \l__file_path_str
- \str_if_empty:NTF \l__file_path_str
+ \file_get_full_name:nN {#1} \l__file_full_name_str
+ \str_if_empty:NTF \l__file_full_name_str
{ \@@_missing:n {#1} }
- { \@@_input:V \l__file_path_str }
+ { \@@_input:V \l__file_full_name_str }
}
\cs_new_protected:Npn \@@_missing:n #1
{
- \__file_name_sanitize:nN {#1} \l__file_basename_str
+ \__file_name_sanitize:nN {#1} \l__file_base_name_str
\__msg_kernel_error:nnx { kernel } { file-not-found }
- { \l__file_basename_str }
+ { \l__file_base_name_str }
}
\cs_new_protected:Npn \@@_input:n #1
{
@@ -1232,13 +1232,13 @@
% \begin{macrocode}
\cs_new_protected:Npn \ior_open:Nn #1#2
{
- \file_get_full_name:nN {#2} \l__file_path_str
- \str_if_empty:NTF \l__file_path_str
+ \file_get_full_name:nN {#2} \l__file_full_name_str
+ \str_if_empty:NTF \l__file_full_name_str
{
- \__file_name_sanitize:nN {#2} \l__file_basename_str
- \__msg_kernel_error:nnx { kernel } { file-not-found } \l__file_basename_str
+ \__file_name_sanitize:nN {#2} \l__file_base_name_str
+ \__msg_kernel_error:nnx { kernel } { file-not-found } \l__file_base_name_str
}
- { \@@_open:No #1 \l__file_path_str }
+ { \@@_open:No #1 \l__file_full_name_str }
}
\cs_generate_variant:Nn \ior_open:Nn { c }
% \end{macrocode}
@@ -1250,11 +1250,11 @@
% \begin{macrocode}
\prg_new_protected_conditional:Npnn \ior_open:Nn #1#2 { T , F , TF }
{
- \file_get_full_name:VN \l__file_basename_str \l__file_path_str
- \str_if_empty:NTF \l__file_path_str
+ \file_get_full_name:VN \l__file_base_name_str \l__file_full_name_str
+ \str_if_empty:NTF \l__file_full_name_str
{ \prg_return_false: }
{
- \@@_open:No #1 \l__file_path_str
+ \@@_open:No #1 \l__file_full_name_str
\prg_return_true:
}
}
@@ -1592,10 +1592,10 @@
% \begin{macrocode}
\cs_new_protected:Npn \iow_open:Nn #1#2
{
- \__file_name_sanitize:nN {#2} \l__file_basename_str
+ \__file_name_sanitize:nN {#2} \l__file_base_name_str
\iow_close:N #1
\seq_gpop:NNTF \g_@@_streams_seq \l_@@_stream_tl
- { \@@_open_stream:NV #1 \l__file_basename_str }
+ { \@@_open_stream:NV #1 \l__file_base_name_str }
%<*initex>
{ \__msg_kernel_fatal:nn { kernel } { output-streams-exhausted } }
%</initex>
@@ -1603,7 +1603,7 @@
{
\@@_new:N #1
\tl_set:Nx \l_@@_stream_tl { \int_eval:n {#1} }
- \@@_open_stream:NV #1 \l__file_basename_str
+ \@@_open_stream:NV #1 \l__file_base_name_str
}
%</package>
}
@@ -2378,14 +2378,14 @@
% \begin{macrocode}
\cs_new_protected:Npn \file_path_include:n #1
{
- \__file_name_sanitize:nN {#1} \l__file_path_str
- \seq_if_in:NVF \l_file_search_path_seq \l__file_path_str
- { \seq_put_right:NV \l_file_search_path_seq \l__file_path_str }
+ \__file_name_sanitize:nN {#1} \l__file_full_name_str
+ \seq_if_in:NVF \l_file_search_path_seq \l__file_full_name_str
+ { \seq_put_right:NV \l_file_search_path_seq \l__file_full_name_str }
}
\cs_new_protected:Npn \file_path_remove:n #1
{
- \__file_name_sanitize:nN {#1} \l__file_path_str
- \seq_remove_all:NV \l_file_search_path_seq \l__file_path_str
+ \__file_name_sanitize:nN {#1} \l__file_full_name_str
+ \seq_remove_all:NV \l_file_search_path_seq \l__file_full_name_str
}
% \end{macrocode}
% \end{macro}
diff --git a/l3kernel/testfiles/m3expl001.luatex.tlg b/l3kernel/testfiles/m3expl001.luatex.tlg
index 9dfaad3..5867e58 100644
--- a/l3kernel/testfiles/m3expl001.luatex.tlg
+++ b/l3kernel/testfiles/m3expl001.luatex.tlg
@@ -2842,8 +2842,8 @@ Defining \g_file_current_name_str on line ...
Defining \g__file_stack_seq on line ...
Defining \g__file_record_seq on line ...
Defining \l__file_tmp_tl on line ...
-Defining \l__file_basename_str on line ...
-Defining \l__file_path_str on line ...
+Defining \l__file_base_name_str on line ...
+Defining \l__file_full_name_str on line ...
Defining \l__file_dir_str on line ...
Defining \l__file_ext_str on line ...
Defining \l__file_name_str on line ...
diff --git a/l3kernel/testfiles/m3expl001.ptex.tlg b/l3kernel/testfiles/m3expl001.ptex.tlg
index 7bb3ecb..4676a5c 100644
--- a/l3kernel/testfiles/m3expl001.ptex.tlg
+++ b/l3kernel/testfiles/m3expl001.ptex.tlg
@@ -2830,8 +2830,8 @@ Defining \g_file_current_name_str on line ...
Defining \g__file_stack_seq on line ...
Defining \g__file_record_seq on line ...
Defining \l__file_tmp_tl on line ...
-Defining \l__file_basename_str on line ...
-Defining \l__file_path_str on line ...
+Defining \l__file_base_name_str on line ...
+Defining \l__file_full_name_str on line ...
Defining \l__file_dir_str on line ...
Defining \l__file_ext_str on line ...
Defining \l__file_name_str on line ...
diff --git a/l3kernel/testfiles/m3expl001.tlg b/l3kernel/testfiles/m3expl001.tlg
index 7d5e95f..9f2d5cf 100644
--- a/l3kernel/testfiles/m3expl001.tlg
+++ b/l3kernel/testfiles/m3expl001.tlg
@@ -2830,8 +2830,8 @@ Defining \g_file_current_name_str on line ...
Defining \g__file_stack_seq on line ...
Defining \g__file_record_seq on line ...
Defining \l__file_tmp_tl on line ...
-Defining \l__file_basename_str on line ...
-Defining \l__file_path_str on line ...
+Defining \l__file_base_name_str on line ...
+Defining \l__file_full_name_str on line ...
Defining \l__file_dir_str on line ...
Defining \l__file_ext_str on line ...
Defining \l__file_name_str on line ...
diff --git a/l3kernel/testfiles/m3expl001.uptex.tlg b/l3kernel/testfiles/m3expl001.uptex.tlg
index 3ca1416..9726955 100644
--- a/l3kernel/testfiles/m3expl001.uptex.tlg
+++ b/l3kernel/testfiles/m3expl001.uptex.tlg
@@ -2830,8 +2830,8 @@ Defining \g_file_current_name_str on line ...
Defining \g__file_stack_seq on line ...
Defining \g__file_record_seq on line ...
Defining \l__file_tmp_tl on line ...
-Defining \l__file_basename_str on line ...
-Defining \l__file_path_str on line ...
+Defining \l__file_base_name_str on line ...
+Defining \l__file_full_name_str on line ...
Defining \l__file_dir_str on line ...
Defining \l__file_ext_str on line ...
Defining \l__file_name_str on line ...
diff --git a/l3kernel/testfiles/m3expl001.xetex.tlg b/l3kernel/testfiles/m3expl001.xetex.tlg
index 05fafb6..7b7b26e 100644
--- a/l3kernel/testfiles/m3expl001.xetex.tlg
+++ b/l3kernel/testfiles/m3expl001.xetex.tlg
@@ -2840,8 +2840,8 @@ Defining \g_file_current_name_str on line ...
Defining \g__file_stack_seq on line ...
Defining \g__file_record_seq on line ...
Defining \l__file_tmp_tl on line ...
-Defining \l__file_basename_str on line ...
-Defining \l__file_path_str on line ...
+Defining \l__file_base_name_str on line ...
+Defining \l__file_full_name_str on line ...
Defining \l__file_dir_str on line ...
Defining \l__file_ext_str on line ...
Defining \l__file_name_str on line ...
diff --git a/l3kernel/testfiles/m3expl003.luatex.tlg b/l3kernel/testfiles/m3expl003.luatex.tlg
index b4ff43d..ccd277d 100644
--- a/l3kernel/testfiles/m3expl003.luatex.tlg
+++ b/l3kernel/testfiles/m3expl003.luatex.tlg
@@ -2843,8 +2843,8 @@ Defining \g_file_current_name_str on line ...
Defining \g__file_stack_seq on line ...
Defining \g__file_record_seq on line ...
Defining \l__file_tmp_tl on line ...
-Defining \l__file_basename_str on line ...
-Defining \l__file_path_str on line ...
+Defining \l__file_base_name_str on line ...
+Defining \l__file_full_name_str on line ...
Defining \l__file_dir_str on line ...
Defining \l__file_ext_str on line ...
Defining \l__file_name_str on line ...
diff --git a/l3kernel/testfiles/m3expl003.ptex.tlg b/l3kernel/testfiles/m3expl003.ptex.tlg
index db1bc1f..5c45b40 100644
--- a/l3kernel/testfiles/m3expl003.ptex.tlg
+++ b/l3kernel/testfiles/m3expl003.ptex.tlg
@@ -2831,8 +2831,8 @@ Defining \g_file_current_name_str on line ...
Defining \g__file_stack_seq on line ...
Defining \g__file_record_seq on line ...
Defining \l__file_tmp_tl on line ...
-Defining \l__file_basename_str on line ...
-Defining \l__file_path_str on line ...
+Defining \l__file_base_name_str on line ...
+Defining \l__file_full_name_str on line ...
Defining \l__file_dir_str on line ...
Defining \l__file_ext_str on line ...
Defining \l__file_name_str on line ...
diff --git a/l3kernel/testfiles/m3expl003.tlg b/l3kernel/testfiles/m3expl003.tlg
index 0be06d1..8371dba 100644
--- a/l3kernel/testfiles/m3expl003.tlg
+++ b/l3kernel/testfiles/m3expl003.tlg
@@ -2831,8 +2831,8 @@ Defining \g_file_current_name_str on line ...
Defining \g__file_stack_seq on line ...
Defining \g__file_record_seq on line ...
Defining \l__file_tmp_tl on line ...
-Defining \l__file_basename_str on line ...
-Defining \l__file_path_str on line ...
+Defining \l__file_base_name_str on line ...
+Defining \l__file_full_name_str on line ...
Defining \l__file_dir_str on line ...
Defining \l__file_ext_str on line ...
Defining \l__file_name_str on line ...
diff --git a/l3kernel/testfiles/m3expl003.uptex.tlg b/l3kernel/testfiles/m3expl003.uptex.tlg
index e81d9b2..2796987 100644
--- a/l3kernel/testfiles/m3expl003.uptex.tlg
+++ b/l3kernel/testfiles/m3expl003.uptex.tlg
@@ -2831,8 +2831,8 @@ Defining \g_file_current_name_str on line ...
Defining \g__file_stack_seq on line ...
Defining \g__file_record_seq on line ...
Defining \l__file_tmp_tl on line ...
-Defining \l__file_basename_str on line ...
-Defining \l__file_path_str on line ...
+Defining \l__file_base_name_str on line ...
+Defining \l__file_full_name_str on line ...
Defining \l__file_dir_str on line ...
Defining \l__file_ext_str on line ...
Defining \l__file_name_str on line ...
diff --git a/l3kernel/testfiles/m3expl003.xetex.tlg b/l3kernel/testfiles/m3expl003.xetex.tlg
index 798966d..0aab562 100644
--- a/l3kernel/testfiles/m3expl003.xetex.tlg
+++ b/l3kernel/testfiles/m3expl003.xetex.tlg
@@ -2841,8 +2841,8 @@ Defining \g_file_current_name_str on line ...
Defining \g__file_stack_seq on line ...
Defining \g__file_record_seq on line ...
Defining \l__file_tmp_tl on line ...
-Defining \l__file_basename_str on line ...
-Defining \l__file_path_str on line ...
+Defining \l__file_base_name_str on line ...
+Defining \l__file_full_name_str on line ...
Defining \l__file_dir_str on line ...
Defining \l__file_ext_str on line ...
Defining \l__file_name_str 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