[latex3-commits] [git/LaTeX3-latex3-latex3] master: Missing variant (fixes #624) (eca145910)

[Joseph Wright]

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

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

commit eca1459100141435fc9cd073a1eb4cef2da07767
Author: Joseph Wright <joseph.wright at morningstar2.co.uk>
Date:   Sun Sep 8 20:41:50 2019 +0100

    Missing variant (fixes #624)


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

eca1459100141435fc9cd073a1eb4cef2da07767
 l3kernel/CHANGELOG.md                   | 4 ++++
 l3kernel/l3file.dtx                     | 7 ++++---
 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 +
 12 files changed, 18 insertions(+), 3 deletions(-)

diff --git a/l3kernel/CHANGELOG.md b/l3kernel/CHANGELOG.md
index f1429e88d..a6e4b7900 100644
--- a/l3kernel/CHANGELOG.md
+++ b/l3kernel/CHANGELOG.md
@@ -7,6 +7,10 @@ this project uses date-based 'snapshot' version identifiers.
 
 ## [Unreleased]
 
+### Fixed
+
+- Missing internal variant (fixes #624)
+
 ## [2019-09-05]
 
 ### Added
diff --git a/l3kernel/l3file.dtx b/l3kernel/l3file.dtx
index c571a0b77..e2618b5d9 100644
--- a/l3kernel/l3file.dtx
+++ b/l3kernel/l3file.dtx
@@ -1369,7 +1369,7 @@
   {
     \tl_set:Nx \l_@@_file_name_tl
       {
-        \exp_args:Ne \__kernel_file_name_quote:n
+        \__kernel_file_name_quote:e
           { \__kernel_file_name_sanitize:n {#2} }
       }
     \iow_close:N #1
@@ -2371,7 +2371,7 @@
 % \end{macro}
 % \end{macro}
 %
-% \begin{macro}[rEXP]{\__kernel_file_name_quote:n}
+% \begin{macro}[rEXP]{\__kernel_file_name_quote:n, \__kernel_file_name_quote:e}
 % \begin{macro}[rEXP]{\__kernel_file_name_quote_auxi:nnnw}
 % \begin{macro}[rEXP]{\__kernel_file_name_quote_auxii:nnn}
 % \begin{macro}[rEXP]{\__kernel_file_name_quote_auxiii:nw}
@@ -2384,6 +2384,7 @@
     \__kernel_file_name_quote_auxi:nnnw {#1} { 0 } { }
       #1 " \q_recursion_tail " \q_recursion_stop
   }
+\cs_generate_variant:Nn \__kernel_file_name_quote:n { e }
 \cs_new:Npn \__kernel_file_name_quote_auxi:nnnw #1#2#3#4 "
   {
     \quark_if_recursion_tail_stop_do:nn {#4}
@@ -2697,7 +2698,7 @@
   {
     \tl_set:Nx \l_@@_full_name_tl
       {
-        \exp_args:Ne \__kernel_file_name_quote:n
+        \__kernel_file_name_quote:e
           { \tl_to_str:n {#1} \l_@@_base_name_tl }
       }  
     \__kernel_ior_open:No \g_@@_internal_ior \l_@@_full_name_tl
diff --git a/l3kernel/testfiles/m3expl001.luatex.tlg b/l3kernel/testfiles/m3expl001.luatex.tlg
index 45d289c32..5386c2747 100644
--- a/l3kernel/testfiles/m3expl001.luatex.tlg
+++ b/l3kernel/testfiles/m3expl001.luatex.tlg
@@ -2908,6 +2908,7 @@ Defining \__kernel_file_name_expand_N_type:Nw on line ...
 Defining \__kernel_file_name_expand_group:nw on line ...
 Defining \__kernel_file_name_expand_space:w on line ...
 Defining \__kernel_file_name_quote:n on line ...
+Defining \__kernel_file_name_quote:e on line ...
 Defining \__kernel_file_name_quote_auxi:nnnw on line ...
 Defining \__kernel_file_name_quote_auxii:nnn on line ...
 Defining \__kernel_file_name_quote_auxiii:nw on line ...
diff --git a/l3kernel/testfiles/m3expl001.ptex.tlg b/l3kernel/testfiles/m3expl001.ptex.tlg
index 6acc2a20a..022f286fd 100644
--- a/l3kernel/testfiles/m3expl001.ptex.tlg
+++ b/l3kernel/testfiles/m3expl001.ptex.tlg
@@ -3162,6 +3162,7 @@ Defining \__kernel_file_name_expand_N_type:Nw on line ...
 Defining \__kernel_file_name_expand_group:nw on line ...
 Defining \__kernel_file_name_expand_space:w on line ...
 Defining \__kernel_file_name_quote:n on line ...
+Defining \__kernel_file_name_quote:e on line ...
 Defining \__kernel_file_name_quote_auxi:nnnw on line ...
 Defining \__kernel_file_name_quote_auxii:nnn on line ...
 Defining \__kernel_file_name_quote_auxiii:nw on line ...
diff --git a/l3kernel/testfiles/m3expl001.tlg b/l3kernel/testfiles/m3expl001.tlg
index 2e19a5f74..c43cf2cc0 100644
--- a/l3kernel/testfiles/m3expl001.tlg
+++ b/l3kernel/testfiles/m3expl001.tlg
@@ -3162,6 +3162,7 @@ Defining \__kernel_file_name_expand_N_type:Nw on line ...
 Defining \__kernel_file_name_expand_group:nw on line ...
 Defining \__kernel_file_name_expand_space:w on line ...
 Defining \__kernel_file_name_quote:n on line ...
+Defining \__kernel_file_name_quote:e on line ...
 Defining \__kernel_file_name_quote_auxi:nnnw on line ...
 Defining \__kernel_file_name_quote_auxii:nnn on line ...
 Defining \__kernel_file_name_quote_auxiii:nw on line ...
diff --git a/l3kernel/testfiles/m3expl001.uptex.tlg b/l3kernel/testfiles/m3expl001.uptex.tlg
index 49e60789d..e2cd53a80 100644
--- a/l3kernel/testfiles/m3expl001.uptex.tlg
+++ b/l3kernel/testfiles/m3expl001.uptex.tlg
@@ -3162,6 +3162,7 @@ Defining \__kernel_file_name_expand_N_type:Nw on line ...
 Defining \__kernel_file_name_expand_group:nw on line ...
 Defining \__kernel_file_name_expand_space:w on line ...
 Defining \__kernel_file_name_quote:n on line ...
+Defining \__kernel_file_name_quote:e on line ...
 Defining \__kernel_file_name_quote_auxi:nnnw on line ...
 Defining \__kernel_file_name_quote_auxii:nnn on line ...
 Defining \__kernel_file_name_quote_auxiii:nw on line ...
diff --git a/l3kernel/testfiles/m3expl001.xetex.tlg b/l3kernel/testfiles/m3expl001.xetex.tlg
index 5f0968cd3..ad7670a65 100644
--- a/l3kernel/testfiles/m3expl001.xetex.tlg
+++ b/l3kernel/testfiles/m3expl001.xetex.tlg
@@ -2906,6 +2906,7 @@ Defining \__kernel_file_name_expand_N_type:Nw on line ...
 Defining \__kernel_file_name_expand_group:nw on line ...
 Defining \__kernel_file_name_expand_space:w on line ...
 Defining \__kernel_file_name_quote:n on line ...
+Defining \__kernel_file_name_quote:e on line ...
 Defining \__kernel_file_name_quote_auxi:nnnw on line ...
 Defining \__kernel_file_name_quote_auxii:nnn on line ...
 Defining \__kernel_file_name_quote_auxiii:nw on line ...
diff --git a/l3kernel/testfiles/m3expl003.luatex.tlg b/l3kernel/testfiles/m3expl003.luatex.tlg
index 45d289c32..5386c2747 100644
--- a/l3kernel/testfiles/m3expl003.luatex.tlg
+++ b/l3kernel/testfiles/m3expl003.luatex.tlg
@@ -2908,6 +2908,7 @@ Defining \__kernel_file_name_expand_N_type:Nw on line ...
 Defining \__kernel_file_name_expand_group:nw on line ...
 Defining \__kernel_file_name_expand_space:w on line ...
 Defining \__kernel_file_name_quote:n on line ...
+Defining \__kernel_file_name_quote:e on line ...
 Defining \__kernel_file_name_quote_auxi:nnnw on line ...
 Defining \__kernel_file_name_quote_auxii:nnn on line ...
 Defining \__kernel_file_name_quote_auxiii:nw on line ...
diff --git a/l3kernel/testfiles/m3expl003.ptex.tlg b/l3kernel/testfiles/m3expl003.ptex.tlg
index 6acc2a20a..022f286fd 100644
--- a/l3kernel/testfiles/m3expl003.ptex.tlg
+++ b/l3kernel/testfiles/m3expl003.ptex.tlg
@@ -3162,6 +3162,7 @@ Defining \__kernel_file_name_expand_N_type:Nw on line ...
 Defining \__kernel_file_name_expand_group:nw on line ...
 Defining \__kernel_file_name_expand_space:w on line ...
 Defining \__kernel_file_name_quote:n on line ...
+Defining \__kernel_file_name_quote:e on line ...
 Defining \__kernel_file_name_quote_auxi:nnnw on line ...
 Defining \__kernel_file_name_quote_auxii:nnn on line ...
 Defining \__kernel_file_name_quote_auxiii:nw on line ...
diff --git a/l3kernel/testfiles/m3expl003.tlg b/l3kernel/testfiles/m3expl003.tlg
index 2e19a5f74..c43cf2cc0 100644
--- a/l3kernel/testfiles/m3expl003.tlg
+++ b/l3kernel/testfiles/m3expl003.tlg
@@ -3162,6 +3162,7 @@ Defining \__kernel_file_name_expand_N_type:Nw on line ...
 Defining \__kernel_file_name_expand_group:nw on line ...
 Defining \__kernel_file_name_expand_space:w on line ...
 Defining \__kernel_file_name_quote:n on line ...
+Defining \__kernel_file_name_quote:e on line ...
 Defining \__kernel_file_name_quote_auxi:nnnw on line ...
 Defining \__kernel_file_name_quote_auxii:nnn on line ...
 Defining \__kernel_file_name_quote_auxiii:nw on line ...
diff --git a/l3kernel/testfiles/m3expl003.uptex.tlg b/l3kernel/testfiles/m3expl003.uptex.tlg
index 49e60789d..e2cd53a80 100644
--- a/l3kernel/testfiles/m3expl003.uptex.tlg
+++ b/l3kernel/testfiles/m3expl003.uptex.tlg
@@ -3162,6 +3162,7 @@ Defining \__kernel_file_name_expand_N_type:Nw on line ...
 Defining \__kernel_file_name_expand_group:nw on line ...
 Defining \__kernel_file_name_expand_space:w on line ...
 Defining \__kernel_file_name_quote:n on line ...
+Defining \__kernel_file_name_quote:e on line ...
 Defining \__kernel_file_name_quote_auxi:nnnw on line ...
 Defining \__kernel_file_name_quote_auxii:nnn on line ...
 Defining \__kernel_file_name_quote_auxiii:nw on line ...
diff --git a/l3kernel/testfiles/m3expl003.xetex.tlg b/l3kernel/testfiles/m3expl003.xetex.tlg
index 5f0968cd3..ad7670a65 100644
--- a/l3kernel/testfiles/m3expl003.xetex.tlg
+++ b/l3kernel/testfiles/m3expl003.xetex.tlg
@@ -2906,6 +2906,7 @@ Defining \__kernel_file_name_expand_N_type:Nw on line ...
 Defining \__kernel_file_name_expand_group:nw on line ...
 Defining \__kernel_file_name_expand_space:w on line ...
 Defining \__kernel_file_name_quote:n on line ...
+Defining \__kernel_file_name_quote:e on line ...
 Defining \__kernel_file_name_quote_auxi:nnnw on line ...
 Defining \__kernel_file_name_quote_auxii:nnn on line ...
 Defining \__kernel_file_name_quote_auxiii:nw on line ...