[latex3-commits] [l3svn] branch master updated: Use curr not current for file name parts
noreply at latex-project.org
noreply at latex-project.org
Sat Jun 24 20:50:58 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 54af5f6 Use curr not current for file name parts
54af5f6 is described below
commit 54af5f69b2c13ae7e0c1890325447d9fc0905edd
Author: Joseph Wright <joseph.wright at morningstar2.co.uk>
Date: Sat Jun 24 19:50:07 2017 +0100
Use curr not current for file name parts
This might have a knock on in some other places, e.g.
\l__color_current_tl ...
---
l3kernel/expl3.dtx | 2 +-
l3kernel/l3doc.dtx | 2 +-
l3kernel/l3file.dtx | 44 +++++++++++++++----------------
l3kernel/l3msg.dtx | 2 +-
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 ++---
14 files changed, 55 insertions(+), 55 deletions(-)
diff --git a/l3kernel/expl3.dtx b/l3kernel/expl3.dtx
index 2b6db97..d85bd54 100644
--- a/l3kernel/expl3.dtx
+++ b/l3kernel/expl3.dtx
@@ -1529,7 +1529,7 @@
% \begin{macrocode}
\cs_set_protected:Npn \@pushfilenameaux #1#2#3
{
- \str_gset:Nn \g_file_current_name_str {#3}
+ \str_gset:Nn \g_file_curr_name_str {#3}
#1 #2 {#3}
}
\tl_put_right:Nn \@popfilename
diff --git a/l3kernel/l3doc.dtx b/l3kernel/l3doc.dtx
index d748bf4..e763060 100644
--- a/l3kernel/l3doc.dtx
+++ b/l3kernel/l3doc.dtx
@@ -2929,7 +2929,7 @@ and all files in that bundle must be distributed together.
\@@_test_missing_aux:Nxn
\g_@@_missing_tests_prop
{ \seq_use:Nn \l_@@_names_seq { , } }
- { { \g_file_current_name_str \iow_char:N \ (#1) } }
+ { { \g_file_curr_name_str \iow_char:N \ (#1) } }
}
\cs_new_protected:Npn \@@_test_missing_aux:Nnn #1#2#3
{
diff --git a/l3kernel/l3file.dtx b/l3kernel/l3file.dtx
index 2bf951b..227e6a1 100644
--- a/l3kernel/l3file.dtx
+++ b/l3kernel/l3file.dtx
@@ -71,9 +71,9 @@
%
% \begin{variable}[added = 2017-06-21]
% {
-% \g_file_current_dir_str,
-% \g_file_current_name_str,
-% \g_file_current_ext_str
+% \g_file_curr_dir_str,
+% \g_file_curr_name_str,
+% \g_file_curr_ext_str
% }
% Contain the directory, name and extension of the current file. The
% directory will be empty if the file was loaded without an explicit
@@ -687,28 +687,28 @@
%
% \begin{variable}
% {
-% \g_file_current_dir_str ,
-% \g_file_current_ext_str ,
-% \g_file_current_name_str
+% \g_file_curr_dir_str ,
+% \g_file_curr_ext_str ,
+% \g_file_curr_name_str
% }
% The name of the current file should be available at all times.
% For the format the file name needs to be picked up at the start of the
% file. In \LaTeXe{} package mode the current file name is collected from
% \tn{@currname}.
% \begin{macrocode}
-\str_new:N \g_file_current_dir_str
-\str_new:N \g_file_current_ext_str
-\str_new:N \g_file_current_name_str
+\str_new:N \g_file_curr_dir_str
+\str_new:N \g_file_curr_ext_str
+\str_new:N \g_file_curr_name_str
%<*initex>
\tex_everyjob:D \exp_after:wN
{
\tex_the:D \tex_everyjob:D
- \str_gset:Nx \g_file_current_name_str { \tex_jobname:D }
+ \str_gset:Nx \g_file_curr_name_str { \tex_jobname:D }
}
%</initex>
%<*package>
\cs_if_exist:NT \@currname
- { \str_gset_eq:NN \g_file_current_name_str \@currname }
+ { \str_gset_eq:NN \g_file_curr_name_str \@currname }
%</package>
% \end{macrocode}
% \end{variable}
@@ -761,7 +761,7 @@
\tex_everyjob:D \exp_after:wN
{
\tex_the:D \tex_everyjob:D
- \seq_gput_right:NV \g_@@_record_seq \g_file_current_name_str
+ \seq_gput_right:NV \g_@@_record_seq \g_file_curr_name_str
}
%</initex>
% \end{macrocode}
@@ -999,15 +999,15 @@
{
\seq_gpush:Nx \g_@@_stack_seq
{
- { \g_file_current_dir_str }
- { \g_file_current_name_str }
- { \g_file_current_ext_str }
+ { \g_file_curr_dir_str }
+ { \g_file_curr_name_str }
+ { \g_file_curr_ext_str }
}
\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
- \str_gset_eq:NN \g_file_current_ext_str \l_@@_ext_str
+ \str_gset_eq:NN \g_file_curr_dir_str \l_@@_dir_str
+ \str_gset_eq:NN \g_file_curr_name_str \l_@@_name_str
+ \str_gset_eq:NN \g_file_curr_ext_str \l_@@_ext_str
}
\cs_new_protected:Npn \@@_input_pop:
{
@@ -1016,9 +1016,9 @@
}
\cs_new_protected:Npn \@@_input_pop:nnn #1#2#3
{
- \str_gset:Nn \g_file_current_dir_str {#1}
- \str_gset:Nn \g_file_current_name_str {#2}
- \str_gset:Nn \g_file_current_ext_str {#3}
+ \str_gset:Nn \g_file_curr_dir_str {#1}
+ \str_gset:Nn \g_file_curr_name_str {#2}
+ \str_gset:Nn \g_file_curr_ext_str {#3}
}
% \end{macrocode}
% \end{macro}
@@ -2367,7 +2367,7 @@
% For removal after 2018-12-31.
% \begin{macrocode}
\tl_new:N \g_file_current_name_tl
-\tl_gset:Nn \g_file_current_name_tl { \g_file_current_name_str }
+\tl_gset:Nn \g_file_current_name_tl { \g_file_curr_name_str }
% \end{macrocode}
% \end{variable}
%
diff --git a/l3kernel/l3msg.dtx b/l3kernel/l3msg.dtx
index 35664d6..00c65aa 100644
--- a/l3kernel/l3msg.dtx
+++ b/l3kernel/l3msg.dtx
@@ -922,7 +922,7 @@
\tl_const:Nn \c_@@_continue_text_tl
{ Type~<return>~to~continue }
\tl_const:Nn \c_@@_critical_text_tl
- { Reading~the~current~file~'\g_file_current_name_str'~will~stop. }
+ { Reading~the~current~file~'\g_file_curr_name_str'~will~stop. }
\tl_const:Nn \c_@@_fatal_text_tl
{ This~is~a~fatal~error:~LaTeX~will~abort. }
\tl_const:Nn \c_@@_help_text_tl
diff --git a/l3kernel/testfiles/m3expl001.luatex.tlg b/l3kernel/testfiles/m3expl001.luatex.tlg
index 5867e58..3715c6d 100644
--- a/l3kernel/testfiles/m3expl001.luatex.tlg
+++ b/l3kernel/testfiles/m3expl001.luatex.tlg
@@ -2836,9 +2836,9 @@ Defining \__msg_show_wrap_aux:w on line ...
Defining \__msg_show_item:n on line ...
Defining \__msg_show_item:nn on line ...
Defining \__msg_show_item_unbraced:nn on line ...
-Defining \g_file_current_dir_str on line ...
-Defining \g_file_current_ext_str on line ...
-Defining \g_file_current_name_str on line ...
+Defining \g_file_curr_dir_str on line ...
+Defining \g_file_curr_ext_str on line ...
+Defining \g_file_curr_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 ...
diff --git a/l3kernel/testfiles/m3expl001.ptex.tlg b/l3kernel/testfiles/m3expl001.ptex.tlg
index 4676a5c..1084e04 100644
--- a/l3kernel/testfiles/m3expl001.ptex.tlg
+++ b/l3kernel/testfiles/m3expl001.ptex.tlg
@@ -2824,9 +2824,9 @@ Defining \__msg_show_wrap_aux:w on line ...
Defining \__msg_show_item:n on line ...
Defining \__msg_show_item:nn on line ...
Defining \__msg_show_item_unbraced:nn on line ...
-Defining \g_file_current_dir_str on line ...
-Defining \g_file_current_ext_str on line ...
-Defining \g_file_current_name_str on line ...
+Defining \g_file_curr_dir_str on line ...
+Defining \g_file_curr_ext_str on line ...
+Defining \g_file_curr_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 ...
diff --git a/l3kernel/testfiles/m3expl001.tlg b/l3kernel/testfiles/m3expl001.tlg
index 9f2d5cf..c5df085 100644
--- a/l3kernel/testfiles/m3expl001.tlg
+++ b/l3kernel/testfiles/m3expl001.tlg
@@ -2824,9 +2824,9 @@ Defining \__msg_show_wrap_aux:w on line ...
Defining \__msg_show_item:n on line ...
Defining \__msg_show_item:nn on line ...
Defining \__msg_show_item_unbraced:nn on line ...
-Defining \g_file_current_dir_str on line ...
-Defining \g_file_current_ext_str on line ...
-Defining \g_file_current_name_str on line ...
+Defining \g_file_curr_dir_str on line ...
+Defining \g_file_curr_ext_str on line ...
+Defining \g_file_curr_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 ...
diff --git a/l3kernel/testfiles/m3expl001.uptex.tlg b/l3kernel/testfiles/m3expl001.uptex.tlg
index 9726955..9777478 100644
--- a/l3kernel/testfiles/m3expl001.uptex.tlg
+++ b/l3kernel/testfiles/m3expl001.uptex.tlg
@@ -2824,9 +2824,9 @@ Defining \__msg_show_wrap_aux:w on line ...
Defining \__msg_show_item:n on line ...
Defining \__msg_show_item:nn on line ...
Defining \__msg_show_item_unbraced:nn on line ...
-Defining \g_file_current_dir_str on line ...
-Defining \g_file_current_ext_str on line ...
-Defining \g_file_current_name_str on line ...
+Defining \g_file_curr_dir_str on line ...
+Defining \g_file_curr_ext_str on line ...
+Defining \g_file_curr_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 ...
diff --git a/l3kernel/testfiles/m3expl001.xetex.tlg b/l3kernel/testfiles/m3expl001.xetex.tlg
index 7b7b26e..2d1234b 100644
--- a/l3kernel/testfiles/m3expl001.xetex.tlg
+++ b/l3kernel/testfiles/m3expl001.xetex.tlg
@@ -2834,9 +2834,9 @@ Defining \__msg_show_wrap_aux:w on line ...
Defining \__msg_show_item:n on line ...
Defining \__msg_show_item:nn on line ...
Defining \__msg_show_item_unbraced:nn on line ...
-Defining \g_file_current_dir_str on line ...
-Defining \g_file_current_ext_str on line ...
-Defining \g_file_current_name_str on line ...
+Defining \g_file_curr_dir_str on line ...
+Defining \g_file_curr_ext_str on line ...
+Defining \g_file_curr_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 ...
diff --git a/l3kernel/testfiles/m3expl003.luatex.tlg b/l3kernel/testfiles/m3expl003.luatex.tlg
index ccd277d..f7d216e 100644
--- a/l3kernel/testfiles/m3expl003.luatex.tlg
+++ b/l3kernel/testfiles/m3expl003.luatex.tlg
@@ -2837,9 +2837,9 @@ Defining \__msg_show_wrap_aux:w on line ...
Defining \__msg_show_item:n on line ...
Defining \__msg_show_item:nn on line ...
Defining \__msg_show_item_unbraced:nn on line ...
-Defining \g_file_current_dir_str on line ...
-Defining \g_file_current_ext_str on line ...
-Defining \g_file_current_name_str on line ...
+Defining \g_file_curr_dir_str on line ...
+Defining \g_file_curr_ext_str on line ...
+Defining \g_file_curr_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 ...
diff --git a/l3kernel/testfiles/m3expl003.ptex.tlg b/l3kernel/testfiles/m3expl003.ptex.tlg
index 5c45b40..902376a 100644
--- a/l3kernel/testfiles/m3expl003.ptex.tlg
+++ b/l3kernel/testfiles/m3expl003.ptex.tlg
@@ -2825,9 +2825,9 @@ Defining \__msg_show_wrap_aux:w on line ...
Defining \__msg_show_item:n on line ...
Defining \__msg_show_item:nn on line ...
Defining \__msg_show_item_unbraced:nn on line ...
-Defining \g_file_current_dir_str on line ...
-Defining \g_file_current_ext_str on line ...
-Defining \g_file_current_name_str on line ...
+Defining \g_file_curr_dir_str on line ...
+Defining \g_file_curr_ext_str on line ...
+Defining \g_file_curr_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 ...
diff --git a/l3kernel/testfiles/m3expl003.tlg b/l3kernel/testfiles/m3expl003.tlg
index 8371dba..82fa505 100644
--- a/l3kernel/testfiles/m3expl003.tlg
+++ b/l3kernel/testfiles/m3expl003.tlg
@@ -2825,9 +2825,9 @@ Defining \__msg_show_wrap_aux:w on line ...
Defining \__msg_show_item:n on line ...
Defining \__msg_show_item:nn on line ...
Defining \__msg_show_item_unbraced:nn on line ...
-Defining \g_file_current_dir_str on line ...
-Defining \g_file_current_ext_str on line ...
-Defining \g_file_current_name_str on line ...
+Defining \g_file_curr_dir_str on line ...
+Defining \g_file_curr_ext_str on line ...
+Defining \g_file_curr_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 ...
diff --git a/l3kernel/testfiles/m3expl003.uptex.tlg b/l3kernel/testfiles/m3expl003.uptex.tlg
index 2796987..6a814f3 100644
--- a/l3kernel/testfiles/m3expl003.uptex.tlg
+++ b/l3kernel/testfiles/m3expl003.uptex.tlg
@@ -2825,9 +2825,9 @@ Defining \__msg_show_wrap_aux:w on line ...
Defining \__msg_show_item:n on line ...
Defining \__msg_show_item:nn on line ...
Defining \__msg_show_item_unbraced:nn on line ...
-Defining \g_file_current_dir_str on line ...
-Defining \g_file_current_ext_str on line ...
-Defining \g_file_current_name_str on line ...
+Defining \g_file_curr_dir_str on line ...
+Defining \g_file_curr_ext_str on line ...
+Defining \g_file_curr_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 ...
diff --git a/l3kernel/testfiles/m3expl003.xetex.tlg b/l3kernel/testfiles/m3expl003.xetex.tlg
index 0aab562..60893a5 100644
--- a/l3kernel/testfiles/m3expl003.xetex.tlg
+++ b/l3kernel/testfiles/m3expl003.xetex.tlg
@@ -2835,9 +2835,9 @@ Defining \__msg_show_wrap_aux:w on line ...
Defining \__msg_show_item:n on line ...
Defining \__msg_show_item:nn on line ...
Defining \__msg_show_item_unbraced:nn on line ...
-Defining \g_file_current_dir_str on line ...
-Defining \g_file_current_ext_str on line ...
-Defining \g_file_current_name_str on line ...
+Defining \g_file_curr_dir_str on line ...
+Defining \g_file_curr_ext_str on line ...
+Defining \g_file_curr_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 ...
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the latex3-commits
mailing list