[latex3-commits] [git/LaTeX3-latex3-latex3] master: Drop an excesss auxiliary (b14afb1)
Unknown
joseph.wright at morningstar2.co.uk
Wed Jul 25 23:03:10 CEST 2018
Repository : https://github.com/latex3/latex3
On branch : master
Link : https://github.com/latex3/latex3/commit/b14afb19bec5d72945c2156c4e0832f84fd0f30c
>---------------------------------------------------------------
commit b14afb19bec5d72945c2156c4e0832f84fd0f30c
Author: Unknown <joseph.wright at morningstar2.co.uk>
Date: Wed Jul 25 22:03:10 2018 +0100
Drop an excesss auxiliary
Not currently setting x-type from pipe.
>---------------------------------------------------------------
b14afb19bec5d72945c2156c4e0832f84fd0f30c
l3kernel/l3candidates.dtx | 22 +++++++---------------
l3kernel/testfiles/m3expl001.luatex.tlg | 1 -
l3kernel/testfiles/m3expl001.ptex.tlg | 1 -
l3kernel/testfiles/m3expl001.tlg | 1 -
l3kernel/testfiles/m3expl001.uptex.tlg | 1 -
l3kernel/testfiles/m3expl001.xetex.tlg | 1 -
l3kernel/testfiles/m3expl003.luatex.tlg | 1 -
l3kernel/testfiles/m3expl003.ptex.tlg | 1 -
l3kernel/testfiles/m3expl003.tlg | 1 -
l3kernel/testfiles/m3expl003.uptex.tlg | 1 -
l3kernel/testfiles/m3expl003.xetex.tlg | 1 -
11 files changed, 7 insertions(+), 25 deletions(-)
diff --git a/l3kernel/l3candidates.dtx b/l3kernel/l3candidates.dtx
index 1a0e3f4..716f28d 100644
--- a/l3kernel/l3candidates.dtx
+++ b/l3kernel/l3candidates.dtx
@@ -3102,7 +3102,6 @@
% \tl_gset_from_file_x:Nnn, \tl_gset_from_file_x:cnn
% }
% \begin{macro}{\@@_set_from_file_x:NNnn}
-% \begin{macro}{\@@_set_from_x:nNNn}
% When reading a file and allowing expansion of the content, the set up
% only needs to prevent \TeX{} complaining about the end of the file. That
% is done simply, with a group then used to trap the definition needed.
@@ -3121,25 +3120,18 @@
\str_if_empty:NTF \l_@@_file_name_str
{ \__kernel_file_missing:n {#4} }
{
- \exp_args:NV \@@_set_from_x:nNNn
- \l_@@_file_name_str
- #1 #2 {#3}
+ \group_begin:
+ \tex_everyeof:D { \exp_not:N }
+ #3 \scan_stop:
+ \tl_set:Nx \l_@@_internal_a_tl
+ { \tex_input:D \l_@@_file_name_str \c_space_token }
+ \exp_args:NNNo \group_end:
+ #1 #2 \l_@@_internal_a_tl
}
}
-\cs_new_protected:Npn \@@_set_from_x:nNNn #1#2#3#4
- {
- \group_begin:
- \tex_everyeof:D { \exp_not:N }
- #4 \scan_stop:
- \tl_set:Nx \l_@@_internal_a_tl
- { \tex_input:D #1 \c_space_token }
- \exp_args:NNNo \group_end:
- #2 #3 \l_@@_internal_a_tl
- }
% \end{macrocode}
% \end{macro}
% \end{macro}
-% \end{macro}
% \begin{variable}{\l_@@_file_name_str}
% \begin{macrocode}
\str_new:N \l_@@_file_name_str
diff --git a/l3kernel/testfiles/m3expl001.luatex.tlg b/l3kernel/testfiles/m3expl001.luatex.tlg
index 80a8705..a9d95a6 100644
--- a/l3kernel/testfiles/m3expl001.luatex.tlg
+++ b/l3kernel/testfiles/m3expl001.luatex.tlg
@@ -5864,7 +5864,6 @@ Defining \tl_gset_from_file_x:Nnn on line ...
Defining \tl_set_from_file_x:cnn on line ...
Defining \tl_gset_from_file_x:cnn on line ...
Defining \__tl_set_from_file_x:NNnn on line ...
-Defining \__tl_set_from_x:nNNn on line ...
Defining \l__tl_file_name_str on line ...
Defining \tl_set_from_shell:Nnn on line ...
Defining \tl_set_from_shell:cnn on line ...
diff --git a/l3kernel/testfiles/m3expl001.ptex.tlg b/l3kernel/testfiles/m3expl001.ptex.tlg
index 834f494..3aa6bb2 100644
--- a/l3kernel/testfiles/m3expl001.ptex.tlg
+++ b/l3kernel/testfiles/m3expl001.ptex.tlg
@@ -5898,7 +5898,6 @@ Defining \tl_gset_from_file_x:Nnn on line ...
Defining \tl_set_from_file_x:cnn on line ...
Defining \tl_gset_from_file_x:cnn on line ...
Defining \__tl_set_from_file_x:NNnn on line ...
-Defining \__tl_set_from_x:nNNn on line ...
Defining \l__tl_file_name_str on line ...
Defining \tl_set_from_shell:Nnn on line ...
Defining \tl_set_from_shell:cnn on line ...
diff --git a/l3kernel/testfiles/m3expl001.tlg b/l3kernel/testfiles/m3expl001.tlg
index 2a59028..c74803d 100644
--- a/l3kernel/testfiles/m3expl001.tlg
+++ b/l3kernel/testfiles/m3expl001.tlg
@@ -5898,7 +5898,6 @@ Defining \tl_gset_from_file_x:Nnn on line ...
Defining \tl_set_from_file_x:cnn on line ...
Defining \tl_gset_from_file_x:cnn on line ...
Defining \__tl_set_from_file_x:NNnn on line ...
-Defining \__tl_set_from_x:nNNn on line ...
Defining \l__tl_file_name_str on line ...
Defining \tl_set_from_shell:Nnn on line ...
Defining \tl_set_from_shell:cnn on line ...
diff --git a/l3kernel/testfiles/m3expl001.uptex.tlg b/l3kernel/testfiles/m3expl001.uptex.tlg
index c9d4b01..4a1e93a 100644
--- a/l3kernel/testfiles/m3expl001.uptex.tlg
+++ b/l3kernel/testfiles/m3expl001.uptex.tlg
@@ -5895,7 +5895,6 @@ Defining \tl_gset_from_file_x:Nnn on line ...
Defining \tl_set_from_file_x:cnn on line ...
Defining \tl_gset_from_file_x:cnn on line ...
Defining \__tl_set_from_file_x:NNnn on line ...
-Defining \__tl_set_from_x:nNNn on line ...
Defining \l__tl_file_name_str on line ...
Defining \tl_set_from_shell:Nnn on line ...
Defining \tl_set_from_shell:cnn on line ...
diff --git a/l3kernel/testfiles/m3expl001.xetex.tlg b/l3kernel/testfiles/m3expl001.xetex.tlg
index d996e67..479d9c9 100644
--- a/l3kernel/testfiles/m3expl001.xetex.tlg
+++ b/l3kernel/testfiles/m3expl001.xetex.tlg
@@ -5868,7 +5868,6 @@ Defining \tl_gset_from_file_x:Nnn on line ...
Defining \tl_set_from_file_x:cnn on line ...
Defining \tl_gset_from_file_x:cnn on line ...
Defining \__tl_set_from_file_x:NNnn on line ...
-Defining \__tl_set_from_x:nNNn on line ...
Defining \l__tl_file_name_str on line ...
Defining \tl_set_from_shell:Nnn on line ...
Defining \tl_set_from_shell:cnn on line ...
diff --git a/l3kernel/testfiles/m3expl003.luatex.tlg b/l3kernel/testfiles/m3expl003.luatex.tlg
index 80a8705..a9d95a6 100644
--- a/l3kernel/testfiles/m3expl003.luatex.tlg
+++ b/l3kernel/testfiles/m3expl003.luatex.tlg
@@ -5864,7 +5864,6 @@ Defining \tl_gset_from_file_x:Nnn on line ...
Defining \tl_set_from_file_x:cnn on line ...
Defining \tl_gset_from_file_x:cnn on line ...
Defining \__tl_set_from_file_x:NNnn on line ...
-Defining \__tl_set_from_x:nNNn on line ...
Defining \l__tl_file_name_str on line ...
Defining \tl_set_from_shell:Nnn on line ...
Defining \tl_set_from_shell:cnn on line ...
diff --git a/l3kernel/testfiles/m3expl003.ptex.tlg b/l3kernel/testfiles/m3expl003.ptex.tlg
index 834f494..3aa6bb2 100644
--- a/l3kernel/testfiles/m3expl003.ptex.tlg
+++ b/l3kernel/testfiles/m3expl003.ptex.tlg
@@ -5898,7 +5898,6 @@ Defining \tl_gset_from_file_x:Nnn on line ...
Defining \tl_set_from_file_x:cnn on line ...
Defining \tl_gset_from_file_x:cnn on line ...
Defining \__tl_set_from_file_x:NNnn on line ...
-Defining \__tl_set_from_x:nNNn on line ...
Defining \l__tl_file_name_str on line ...
Defining \tl_set_from_shell:Nnn on line ...
Defining \tl_set_from_shell:cnn on line ...
diff --git a/l3kernel/testfiles/m3expl003.tlg b/l3kernel/testfiles/m3expl003.tlg
index 2a59028..c74803d 100644
--- a/l3kernel/testfiles/m3expl003.tlg
+++ b/l3kernel/testfiles/m3expl003.tlg
@@ -5898,7 +5898,6 @@ Defining \tl_gset_from_file_x:Nnn on line ...
Defining \tl_set_from_file_x:cnn on line ...
Defining \tl_gset_from_file_x:cnn on line ...
Defining \__tl_set_from_file_x:NNnn on line ...
-Defining \__tl_set_from_x:nNNn on line ...
Defining \l__tl_file_name_str on line ...
Defining \tl_set_from_shell:Nnn on line ...
Defining \tl_set_from_shell:cnn on line ...
diff --git a/l3kernel/testfiles/m3expl003.uptex.tlg b/l3kernel/testfiles/m3expl003.uptex.tlg
index c9d4b01..4a1e93a 100644
--- a/l3kernel/testfiles/m3expl003.uptex.tlg
+++ b/l3kernel/testfiles/m3expl003.uptex.tlg
@@ -5895,7 +5895,6 @@ Defining \tl_gset_from_file_x:Nnn on line ...
Defining \tl_set_from_file_x:cnn on line ...
Defining \tl_gset_from_file_x:cnn on line ...
Defining \__tl_set_from_file_x:NNnn on line ...
-Defining \__tl_set_from_x:nNNn on line ...
Defining \l__tl_file_name_str on line ...
Defining \tl_set_from_shell:Nnn on line ...
Defining \tl_set_from_shell:cnn on line ...
diff --git a/l3kernel/testfiles/m3expl003.xetex.tlg b/l3kernel/testfiles/m3expl003.xetex.tlg
index d996e67..479d9c9 100644
--- a/l3kernel/testfiles/m3expl003.xetex.tlg
+++ b/l3kernel/testfiles/m3expl003.xetex.tlg
@@ -5868,7 +5868,6 @@ Defining \tl_gset_from_file_x:Nnn on line ...
Defining \tl_set_from_file_x:cnn on line ...
Defining \tl_gset_from_file_x:cnn on line ...
Defining \__tl_set_from_file_x:NNnn on line ...
-Defining \__tl_set_from_x:nNNn on line ...
Defining \l__tl_file_name_str on line ...
Defining \tl_set_from_shell:Nnn on line ...
Defining \tl_set_from_shell:cnn on line ...
More information about the latex3-commits
mailing list