[latex3-commits] [git/LaTeX3-latex3-latex3] master: \tl_set_from_shell:Nnn needs some removed parts (d0165d2)

[Joseph Wright]

Repository : https://github.com/latex3/latex3
On branch  : master
Link       : https://github.com/latex3/latex3/commit/d0165d27db3c7fdf83eddf00cbd0e322551d0605

>---------------------------------------------------------------

commit d0165d27db3c7fdf83eddf00cbd0e322551d0605
Author: Joseph Wright <joseph.wright at morningstar2.co.uk>
Date:   Wed Jan 16 14:05:19 2019 +0000

    \tl_set_from_shell:Nnn needs some removed parts
    
    To be addressed properly later.


>---------------------------------------------------------------

d0165d27db3c7fdf83eddf00cbd0e322551d0605
 l3kernel/l3candidates.dtx               |   20 ++++++++++++++++++++
 l3kernel/testfiles/m3expl001.luatex.tlg |    2 ++
 l3kernel/testfiles/m3expl001.ptex.tlg   |    2 ++
 l3kernel/testfiles/m3expl001.tlg        |    2 ++
 l3kernel/testfiles/m3expl001.uptex.tlg  |    2 ++
 l3kernel/testfiles/m3expl001.xetex.tlg  |    2 ++
 l3kernel/testfiles/m3expl003.luatex.tlg |    2 ++
 l3kernel/testfiles/m3expl003.ptex.tlg   |    2 ++
 l3kernel/testfiles/m3expl003.tlg        |    2 ++
 l3kernel/testfiles/m3expl003.uptex.tlg  |    2 ++
 l3kernel/testfiles/m3expl003.xetex.tlg  |    2 ++
 11 files changed, 40 insertions(+)

diff --git a/l3kernel/l3candidates.dtx b/l3kernel/l3candidates.dtx
index 0a10df5..14d43c4 100644
--- a/l3kernel/l3candidates.dtx
+++ b/l3kernel/l3candidates.dtx
@@ -3112,6 +3112,8 @@
 %     \tl_gset_from_shell:Nnn, \tl_gset_from_shell:cnn
 %   }
 % \begin{macro}{\@@_set_from_shell:NNnn}
+% \begin{macro}{\@@_set_from:nNNn}
+% \begin{macro}{\@@_set_from_do:w}
 %   Setting using a shell is at this level just a slightly specialised file
 %   operation.
 %    \begin{macrocode}
@@ -3135,12 +3137,30 @@
       }
       { #1 #2 { } }
   }
+\cs_new_protected:Npn \@@_set_from:nNNn #1#2#3#4
+  {
+    \group_begin:
+      \exp_args:No \tex_everyeof:D
+        { \c_@@_rescan_marker_tl \exp_not:N }
+      #4 \scan_stop:
+      \exp_after:wN \@@_from_file_do:w
+      \exp_after:wN \prg_do_nothing:
+        \tex_input:D #1 \scan_stop:
+    \exp_args:NNNo \group_end:
+    #2 #3 \l_@@_internal_a_tl
+  }
+\exp_args:Nno \use:nn
+  { \cs_new_protected:Npn \@@_from_file_do:w #1 }
+  { \c_@@_rescan_marker_tl }
+  { \tl_set:No \l_@@_internal_a_tl {#1} }
 \__kernel_msg_new:nnnn { kernel } { quote-in-shell }
   { Quotes~in~shell~command~'#1'. }
   { Shell~commands~cannot~contain~quotes~("). }
 %    \end{macrocode}
 % \end{macro}
 % \end{macro}
+% \end{macro}
+% \end{macro}
 %
 % \subsubsection{Deprecated functions}
 %
diff --git a/l3kernel/testfiles/m3expl001.luatex.tlg b/l3kernel/testfiles/m3expl001.luatex.tlg
index e796fa3..11f840d 100644
--- a/l3kernel/testfiles/m3expl001.luatex.tlg
+++ b/l3kernel/testfiles/m3expl001.luatex.tlg
@@ -5929,6 +5929,8 @@ Defining \tl_set_from_shell:cnn on line ...
 Defining \tl_gset_from_shell:Nnn on line ...
 Defining \tl_gset_from_shell:cnn on line ...
 Defining \__tl_set_from_shell:NNnn on line ...
+Defining \__tl_set_from:nNNn on line ...
+Defining \__tl_from_file_do:w on line ...
 Defining message LaTeX/kernel/quote-in-shell on line ...
 Defining \tl_set_from_file:Nnn on line ...
 Defining \tl_set_from_file:cnn on line ...
diff --git a/l3kernel/testfiles/m3expl001.ptex.tlg b/l3kernel/testfiles/m3expl001.ptex.tlg
index 0cce0ee..5bdc4a0 100644
--- a/l3kernel/testfiles/m3expl001.ptex.tlg
+++ b/l3kernel/testfiles/m3expl001.ptex.tlg
@@ -5963,6 +5963,8 @@ Defining \tl_set_from_shell:cnn on line ...
 Defining \tl_gset_from_shell:Nnn on line ...
 Defining \tl_gset_from_shell:cnn on line ...
 Defining \__tl_set_from_shell:NNnn on line ...
+Defining \__tl_set_from:nNNn on line ...
+Defining \__tl_from_file_do:w on line ...
 Defining message LaTeX/kernel/quote-in-shell on line ...
 Defining \tl_set_from_file:Nnn on line ...
 Defining \tl_set_from_file:cnn on line ...
diff --git a/l3kernel/testfiles/m3expl001.tlg b/l3kernel/testfiles/m3expl001.tlg
index 94c83ca..a982ae7 100644
--- a/l3kernel/testfiles/m3expl001.tlg
+++ b/l3kernel/testfiles/m3expl001.tlg
@@ -5963,6 +5963,8 @@ Defining \tl_set_from_shell:cnn on line ...
 Defining \tl_gset_from_shell:Nnn on line ...
 Defining \tl_gset_from_shell:cnn on line ...
 Defining \__tl_set_from_shell:NNnn on line ...
+Defining \__tl_set_from:nNNn on line ...
+Defining \__tl_from_file_do:w on line ...
 Defining message LaTeX/kernel/quote-in-shell on line ...
 Defining \tl_set_from_file:Nnn on line ...
 Defining \tl_set_from_file:cnn on line ...
diff --git a/l3kernel/testfiles/m3expl001.uptex.tlg b/l3kernel/testfiles/m3expl001.uptex.tlg
index f2ac3d4..5bb7fb7 100644
--- a/l3kernel/testfiles/m3expl001.uptex.tlg
+++ b/l3kernel/testfiles/m3expl001.uptex.tlg
@@ -5960,6 +5960,8 @@ Defining \tl_set_from_shell:cnn on line ...
 Defining \tl_gset_from_shell:Nnn on line ...
 Defining \tl_gset_from_shell:cnn on line ...
 Defining \__tl_set_from_shell:NNnn on line ...
+Defining \__tl_set_from:nNNn on line ...
+Defining \__tl_from_file_do:w on line ...
 Defining message LaTeX/kernel/quote-in-shell on line ...
 Defining \tl_set_from_file:Nnn on line ...
 Defining \tl_set_from_file:cnn on line ...
diff --git a/l3kernel/testfiles/m3expl001.xetex.tlg b/l3kernel/testfiles/m3expl001.xetex.tlg
index d2cb3ad..4ba4602 100644
--- a/l3kernel/testfiles/m3expl001.xetex.tlg
+++ b/l3kernel/testfiles/m3expl001.xetex.tlg
@@ -5933,6 +5933,8 @@ Defining \tl_set_from_shell:cnn on line ...
 Defining \tl_gset_from_shell:Nnn on line ...
 Defining \tl_gset_from_shell:cnn on line ...
 Defining \__tl_set_from_shell:NNnn on line ...
+Defining \__tl_set_from:nNNn on line ...
+Defining \__tl_from_file_do:w on line ...
 Defining message LaTeX/kernel/quote-in-shell on line ...
 Defining \tl_set_from_file:Nnn on line ...
 Defining \tl_set_from_file:cnn on line ...
diff --git a/l3kernel/testfiles/m3expl003.luatex.tlg b/l3kernel/testfiles/m3expl003.luatex.tlg
index e796fa3..11f840d 100644
--- a/l3kernel/testfiles/m3expl003.luatex.tlg
+++ b/l3kernel/testfiles/m3expl003.luatex.tlg
@@ -5929,6 +5929,8 @@ Defining \tl_set_from_shell:cnn on line ...
 Defining \tl_gset_from_shell:Nnn on line ...
 Defining \tl_gset_from_shell:cnn on line ...
 Defining \__tl_set_from_shell:NNnn on line ...
+Defining \__tl_set_from:nNNn on line ...
+Defining \__tl_from_file_do:w on line ...
 Defining message LaTeX/kernel/quote-in-shell on line ...
 Defining \tl_set_from_file:Nnn on line ...
 Defining \tl_set_from_file:cnn on line ...
diff --git a/l3kernel/testfiles/m3expl003.ptex.tlg b/l3kernel/testfiles/m3expl003.ptex.tlg
index 0cce0ee..5bdc4a0 100644
--- a/l3kernel/testfiles/m3expl003.ptex.tlg
+++ b/l3kernel/testfiles/m3expl003.ptex.tlg
@@ -5963,6 +5963,8 @@ Defining \tl_set_from_shell:cnn on line ...
 Defining \tl_gset_from_shell:Nnn on line ...
 Defining \tl_gset_from_shell:cnn on line ...
 Defining \__tl_set_from_shell:NNnn on line ...
+Defining \__tl_set_from:nNNn on line ...
+Defining \__tl_from_file_do:w on line ...
 Defining message LaTeX/kernel/quote-in-shell on line ...
 Defining \tl_set_from_file:Nnn on line ...
 Defining \tl_set_from_file:cnn on line ...
diff --git a/l3kernel/testfiles/m3expl003.tlg b/l3kernel/testfiles/m3expl003.tlg
index 94c83ca..a982ae7 100644
--- a/l3kernel/testfiles/m3expl003.tlg
+++ b/l3kernel/testfiles/m3expl003.tlg
@@ -5963,6 +5963,8 @@ Defining \tl_set_from_shell:cnn on line ...
 Defining \tl_gset_from_shell:Nnn on line ...
 Defining \tl_gset_from_shell:cnn on line ...
 Defining \__tl_set_from_shell:NNnn on line ...
+Defining \__tl_set_from:nNNn on line ...
+Defining \__tl_from_file_do:w on line ...
 Defining message LaTeX/kernel/quote-in-shell on line ...
 Defining \tl_set_from_file:Nnn on line ...
 Defining \tl_set_from_file:cnn on line ...
diff --git a/l3kernel/testfiles/m3expl003.uptex.tlg b/l3kernel/testfiles/m3expl003.uptex.tlg
index f2ac3d4..5bb7fb7 100644
--- a/l3kernel/testfiles/m3expl003.uptex.tlg
+++ b/l3kernel/testfiles/m3expl003.uptex.tlg
@@ -5960,6 +5960,8 @@ Defining \tl_set_from_shell:cnn on line ...
 Defining \tl_gset_from_shell:Nnn on line ...
 Defining \tl_gset_from_shell:cnn on line ...
 Defining \__tl_set_from_shell:NNnn on line ...
+Defining \__tl_set_from:nNNn on line ...
+Defining \__tl_from_file_do:w on line ...
 Defining message LaTeX/kernel/quote-in-shell on line ...
 Defining \tl_set_from_file:Nnn on line ...
 Defining \tl_set_from_file:cnn on line ...
diff --git a/l3kernel/testfiles/m3expl003.xetex.tlg b/l3kernel/testfiles/m3expl003.xetex.tlg
index d2cb3ad..4ba4602 100644
--- a/l3kernel/testfiles/m3expl003.xetex.tlg
+++ b/l3kernel/testfiles/m3expl003.xetex.tlg
@@ -5933,6 +5933,8 @@ Defining \tl_set_from_shell:cnn on line ...
 Defining \tl_gset_from_shell:Nnn on line ...
 Defining \tl_gset_from_shell:cnn on line ...
 Defining \__tl_set_from_shell:NNnn on line ...
+Defining \__tl_set_from:nNNn on line ...
+Defining \__tl_from_file_do:w on line ...
 Defining message LaTeX/kernel/quote-in-shell on line ...
 Defining \tl_set_from_file:Nnn on line ...
 Defining \tl_set_from_file:cnn on line ...