[latex3-commits] [git/LaTeX3-latex3-latex3] master: Add nnff... variants to \__kernel_msg_expandable_error (b39be48)

Bruno Le Floch bruno at le-floch.fr
Sun Apr 1 22:08:32 CEST 2018 

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

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

commit b39be487f67e82cd2c1fb9525f4c6b2f7282a43f
Author: Bruno Le Floch <bruno at le-floch.fr>
Date:   Sun Apr 1 16:08:32 2018 -0400

    Add nnff... variants to \__kernel_msg_expandable_error


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

b39be487f67e82cd2c1fb9525f4c6b2f7282a43f
 l3kernel/l3intarray.dtx                 |    2 +-
 l3kernel/l3msg.dtx                      |   16 ++++++++++++++--
 l3kernel/l3prop.dtx                     |    5 +++--
 l3kernel/testfiles/m3expl001.luatex.tlg |   10 +++++++---
 l3kernel/testfiles/m3expl001.ptex.tlg   |   10 +++++++---
 l3kernel/testfiles/m3expl001.tlg        |   10 +++++++---
 l3kernel/testfiles/m3expl001.uptex.tlg  |   10 +++++++---
 l3kernel/testfiles/m3expl001.xetex.tlg  |   10 +++++++---
 l3kernel/testfiles/m3expl003.luatex.tlg |   10 +++++++---
 l3kernel/testfiles/m3expl003.ptex.tlg   |   10 +++++++---
 l3kernel/testfiles/m3expl003.tlg        |   10 +++++++---
 l3kernel/testfiles/m3expl003.uptex.tlg  |   10 +++++++---
 l3kernel/testfiles/m3expl003.xetex.tlg  |   10 +++++++---
 13 files changed, 88 insertions(+), 35 deletions(-)

diff --git a/l3kernel/l3intarray.dtx b/l3kernel/l3intarray.dtx
index 645d7f6..d5aa932 100644
--- a/l3kernel/l3intarray.dtx
+++ b/l3kernel/l3intarray.dtx
@@ -267,7 +267,7 @@
   }
 \cs_new:Npn \@@_item:Nw #1#2 ;
   {
-    \@@_bounds:NNnTF \__kernel_msg_expandable_error:nnnnn #1 {#2}
+    \@@_bounds:NNnTF \__kernel_msg_expandable_error:nnfff #1 {#2}
       { \__kernel_intarray_item:Nn #1 {#2} }
       { 0 }
   }
diff --git a/l3kernel/l3msg.dtx b/l3kernel/l3msg.dtx
index b8979e2..7fbdaa4 100644
--- a/l3kernel/l3msg.dtx
+++ b/l3kernel/l3msg.dtx
@@ -656,7 +656,11 @@
 %     \__kernel_msg_expandable_error:nnnnn,
 %     \__kernel_msg_expandable_error:nnnn,
 %     \__kernel_msg_expandable_error:nnn,
-%     \__kernel_msg_expandable_error:nn
+%     \__kernel_msg_expandable_error:nn,
+%     \__kernel_msg_expandable_error:nnffff,
+%     \__kernel_msg_expandable_error:nnfff,
+%     \__kernel_msg_expandable_error:nnff,
+%     \__kernel_msg_expandable_error:nnf,
 %   }
 %   \begin{syntax}
 %     \cs{__kernel_msg_expandable_error:nnnnnn} \Arg{module} \Arg{message} \Arg{arg one} \Arg{arg two} \Arg{arg three} \Arg{arg four}
@@ -2108,7 +2112,11 @@
 %     \__kernel_msg_expandable_error:nnnnn,
 %     \__kernel_msg_expandable_error:nnnn,
 %     \__kernel_msg_expandable_error:nnn,
-%     \__kernel_msg_expandable_error:nn
+%     \__kernel_msg_expandable_error:nn,
+%     \__kernel_msg_expandable_error:nnffff,
+%     \__kernel_msg_expandable_error:nnfff,
+%     \__kernel_msg_expandable_error:nnff,
+%     \__kernel_msg_expandable_error:nnf,
 %   }
 %   The command built from the csname
 %   \cs{c_@@_text_prefix_tl} |LaTeX / #1 / #2|
@@ -2144,6 +2152,10 @@
     \__kernel_msg_expandable_error:nnnnnn
       {#1} {#2} { } { } { } { }
   }
+\cs_generate_variant:Nn \__kernel_msg_expandable_error:nnnnnn { nnffff }
+\cs_generate_variant:Nn \__kernel_msg_expandable_error:nnnnn { nnfff }
+\cs_generate_variant:Nn \__kernel_msg_expandable_error:nnnn { nnff }
+\cs_generate_variant:Nn \__kernel_msg_expandable_error:nnn { nnf }
 %    \end{macrocode}
 % \end{macro}
 %
diff --git a/l3kernel/l3prop.dtx b/l3kernel/l3prop.dtx
index 5a2f306..00b9872 100644
--- a/l3kernel/l3prop.dtx
+++ b/l3kernel/l3prop.dtx
@@ -699,8 +699,9 @@
             \s_@@ { \exp_not:n {#1} }
           }
           {
-            \exp_args:Nnno \__kernel_msg_expandable_error:nnn
-              { kernel } { prop-keyval } {#4}
+            \__kernel_msg_expandable_error:nnf
+              { kernel } { prop-keyval }
+              { \exp_after:wN \exp_stop_f: #4 }
           }
       }
   }
diff --git a/l3kernel/testfiles/m3expl001.luatex.tlg b/l3kernel/testfiles/m3expl001.luatex.tlg
index 7ec8606..aeb538e 100644
--- a/l3kernel/testfiles/m3expl001.luatex.tlg
+++ b/l3kernel/testfiles/m3expl001.luatex.tlg
@@ -3041,6 +3041,13 @@ Defining \__kernel_msg_expandable_error:nnnnn on line ...
 Defining \__kernel_msg_expandable_error:nnnn on line ...
 Defining \__kernel_msg_expandable_error:nnn on line ...
 Defining \__kernel_msg_expandable_error:nn on line ...
+Defining \exp_args:Nnnffff on line ...
+Defining \__kernel_msg_expandable_error:nnffff on line ...
+Defining \exp_args:Nnnfff on line ...
+Defining \__kernel_msg_expandable_error:nnfff on line ...
+Defining \exp_args:Nnnff on line ...
+Defining \__kernel_msg_expandable_error:nnff on line ...
+Defining \__kernel_msg_expandable_error:nnf 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 ...
@@ -5739,11 +5746,8 @@ Defining \msg_expandable_error:nnnnn on line ...
 Defining \msg_expandable_error:nnnn on line ...
 Defining \msg_expandable_error:nnn on line ...
 Defining \msg_expandable_error:nn on line ...
-Defining \exp_args:Nnnffff on line ...
 Defining \msg_expandable_error:nnffff on line ...
-Defining \exp_args:Nnnfff on line ...
 Defining \msg_expandable_error:nnfff on line ...
-Defining \exp_args:Nnnff on line ...
 Defining \msg_expandable_error:nnff on line ...
 Defining \msg_expandable_error:nnf on line ...
 Defining \__msg_expandable_error_module:nn on line ...
diff --git a/l3kernel/testfiles/m3expl001.ptex.tlg b/l3kernel/testfiles/m3expl001.ptex.tlg
index ecc4cb7..4157fc4 100644
--- a/l3kernel/testfiles/m3expl001.ptex.tlg
+++ b/l3kernel/testfiles/m3expl001.ptex.tlg
@@ -2978,6 +2978,13 @@ Defining \__kernel_msg_expandable_error:nnnnn on line ...
 Defining \__kernel_msg_expandable_error:nnnn on line ...
 Defining \__kernel_msg_expandable_error:nnn on line ...
 Defining \__kernel_msg_expandable_error:nn on line ...
+Defining \exp_args:Nnnffff on line ...
+Defining \__kernel_msg_expandable_error:nnffff on line ...
+Defining \exp_args:Nnnfff on line ...
+Defining \__kernel_msg_expandable_error:nnfff on line ...
+Defining \exp_args:Nnnff on line ...
+Defining \__kernel_msg_expandable_error:nnff on line ...
+Defining \__kernel_msg_expandable_error:nnf 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 ...
@@ -5678,11 +5685,8 @@ Defining \msg_expandable_error:nnnnn on line ...
 Defining \msg_expandable_error:nnnn on line ...
 Defining \msg_expandable_error:nnn on line ...
 Defining \msg_expandable_error:nn on line ...
-Defining \exp_args:Nnnffff on line ...
 Defining \msg_expandable_error:nnffff on line ...
-Defining \exp_args:Nnnfff on line ...
 Defining \msg_expandable_error:nnfff on line ...
-Defining \exp_args:Nnnff on line ...
 Defining \msg_expandable_error:nnff on line ...
 Defining \msg_expandable_error:nnf on line ...
 Defining \__msg_expandable_error_module:nn on line ...
diff --git a/l3kernel/testfiles/m3expl001.tlg b/l3kernel/testfiles/m3expl001.tlg
index 3c975c1..7c98d56 100644
--- a/l3kernel/testfiles/m3expl001.tlg
+++ b/l3kernel/testfiles/m3expl001.tlg
@@ -2978,6 +2978,13 @@ Defining \__kernel_msg_expandable_error:nnnnn on line ...
 Defining \__kernel_msg_expandable_error:nnnn on line ...
 Defining \__kernel_msg_expandable_error:nnn on line ...
 Defining \__kernel_msg_expandable_error:nn on line ...
+Defining \exp_args:Nnnffff on line ...
+Defining \__kernel_msg_expandable_error:nnffff on line ...
+Defining \exp_args:Nnnfff on line ...
+Defining \__kernel_msg_expandable_error:nnfff on line ...
+Defining \exp_args:Nnnff on line ...
+Defining \__kernel_msg_expandable_error:nnff on line ...
+Defining \__kernel_msg_expandable_error:nnf 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 ...
@@ -5678,11 +5685,8 @@ Defining \msg_expandable_error:nnnnn on line ...
 Defining \msg_expandable_error:nnnn on line ...
 Defining \msg_expandable_error:nnn on line ...
 Defining \msg_expandable_error:nn on line ...
-Defining \exp_args:Nnnffff on line ...
 Defining \msg_expandable_error:nnffff on line ...
-Defining \exp_args:Nnnfff on line ...
 Defining \msg_expandable_error:nnfff on line ...
-Defining \exp_args:Nnnff on line ...
 Defining \msg_expandable_error:nnff on line ...
 Defining \msg_expandable_error:nnf on line ...
 Defining \__msg_expandable_error_module:nn on line ...
diff --git a/l3kernel/testfiles/m3expl001.uptex.tlg b/l3kernel/testfiles/m3expl001.uptex.tlg
index 132f503..0ee6255 100644
--- a/l3kernel/testfiles/m3expl001.uptex.tlg
+++ b/l3kernel/testfiles/m3expl001.uptex.tlg
@@ -2978,6 +2978,13 @@ Defining \__kernel_msg_expandable_error:nnnnn on line ...
 Defining \__kernel_msg_expandable_error:nnnn on line ...
 Defining \__kernel_msg_expandable_error:nnn on line ...
 Defining \__kernel_msg_expandable_error:nn on line ...
+Defining \exp_args:Nnnffff on line ...
+Defining \__kernel_msg_expandable_error:nnffff on line ...
+Defining \exp_args:Nnnfff on line ...
+Defining \__kernel_msg_expandable_error:nnfff on line ...
+Defining \exp_args:Nnnff on line ...
+Defining \__kernel_msg_expandable_error:nnff on line ...
+Defining \__kernel_msg_expandable_error:nnf 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 ...
@@ -5676,11 +5683,8 @@ Defining \msg_expandable_error:nnnnn on line ...
 Defining \msg_expandable_error:nnnn on line ...
 Defining \msg_expandable_error:nnn on line ...
 Defining \msg_expandable_error:nn on line ...
-Defining \exp_args:Nnnffff on line ...
 Defining \msg_expandable_error:nnffff on line ...
-Defining \exp_args:Nnnfff on line ...
 Defining \msg_expandable_error:nnfff on line ...
-Defining \exp_args:Nnnff on line ...
 Defining \msg_expandable_error:nnff on line ...
 Defining \msg_expandable_error:nnf on line ...
 Defining \__msg_expandable_error_module:nn on line ...
diff --git a/l3kernel/testfiles/m3expl001.xetex.tlg b/l3kernel/testfiles/m3expl001.xetex.tlg
index f710587..5ad0fa1 100644
--- a/l3kernel/testfiles/m3expl001.xetex.tlg
+++ b/l3kernel/testfiles/m3expl001.xetex.tlg
@@ -3039,6 +3039,13 @@ Defining \__kernel_msg_expandable_error:nnnnn on line ...
 Defining \__kernel_msg_expandable_error:nnnn on line ...
 Defining \__kernel_msg_expandable_error:nnn on line ...
 Defining \__kernel_msg_expandable_error:nn on line ...
+Defining \exp_args:Nnnffff on line ...
+Defining \__kernel_msg_expandable_error:nnffff on line ...
+Defining \exp_args:Nnnfff on line ...
+Defining \__kernel_msg_expandable_error:nnfff on line ...
+Defining \exp_args:Nnnff on line ...
+Defining \__kernel_msg_expandable_error:nnff on line ...
+Defining \__kernel_msg_expandable_error:nnf 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 ...
@@ -5711,11 +5718,8 @@ Defining \msg_expandable_error:nnnnn on line ...
 Defining \msg_expandable_error:nnnn on line ...
 Defining \msg_expandable_error:nnn on line ...
 Defining \msg_expandable_error:nn on line ...
-Defining \exp_args:Nnnffff on line ...
 Defining \msg_expandable_error:nnffff on line ...
-Defining \exp_args:Nnnfff on line ...
 Defining \msg_expandable_error:nnfff on line ...
-Defining \exp_args:Nnnff on line ...
 Defining \msg_expandable_error:nnff on line ...
 Defining \msg_expandable_error:nnf on line ...
 Defining \__msg_expandable_error_module:nn on line ...
diff --git a/l3kernel/testfiles/m3expl003.luatex.tlg b/l3kernel/testfiles/m3expl003.luatex.tlg
index 7ec8606..aeb538e 100644
--- a/l3kernel/testfiles/m3expl003.luatex.tlg
+++ b/l3kernel/testfiles/m3expl003.luatex.tlg
@@ -3041,6 +3041,13 @@ Defining \__kernel_msg_expandable_error:nnnnn on line ...
 Defining \__kernel_msg_expandable_error:nnnn on line ...
 Defining \__kernel_msg_expandable_error:nnn on line ...
 Defining \__kernel_msg_expandable_error:nn on line ...
+Defining \exp_args:Nnnffff on line ...
+Defining \__kernel_msg_expandable_error:nnffff on line ...
+Defining \exp_args:Nnnfff on line ...
+Defining \__kernel_msg_expandable_error:nnfff on line ...
+Defining \exp_args:Nnnff on line ...
+Defining \__kernel_msg_expandable_error:nnff on line ...
+Defining \__kernel_msg_expandable_error:nnf 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 ...
@@ -5739,11 +5746,8 @@ Defining \msg_expandable_error:nnnnn on line ...
 Defining \msg_expandable_error:nnnn on line ...
 Defining \msg_expandable_error:nnn on line ...
 Defining \msg_expandable_error:nn on line ...
-Defining \exp_args:Nnnffff on line ...
 Defining \msg_expandable_error:nnffff on line ...
-Defining \exp_args:Nnnfff on line ...
 Defining \msg_expandable_error:nnfff on line ...
-Defining \exp_args:Nnnff on line ...
 Defining \msg_expandable_error:nnff on line ...
 Defining \msg_expandable_error:nnf on line ...
 Defining \__msg_expandable_error_module:nn on line ...
diff --git a/l3kernel/testfiles/m3expl003.ptex.tlg b/l3kernel/testfiles/m3expl003.ptex.tlg
index ecc4cb7..4157fc4 100644
--- a/l3kernel/testfiles/m3expl003.ptex.tlg
+++ b/l3kernel/testfiles/m3expl003.ptex.tlg
@@ -2978,6 +2978,13 @@ Defining \__kernel_msg_expandable_error:nnnnn on line ...
 Defining \__kernel_msg_expandable_error:nnnn on line ...
 Defining \__kernel_msg_expandable_error:nnn on line ...
 Defining \__kernel_msg_expandable_error:nn on line ...
+Defining \exp_args:Nnnffff on line ...
+Defining \__kernel_msg_expandable_error:nnffff on line ...
+Defining \exp_args:Nnnfff on line ...
+Defining \__kernel_msg_expandable_error:nnfff on line ...
+Defining \exp_args:Nnnff on line ...
+Defining \__kernel_msg_expandable_error:nnff on line ...
+Defining \__kernel_msg_expandable_error:nnf 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 ...
@@ -5678,11 +5685,8 @@ Defining \msg_expandable_error:nnnnn on line ...
 Defining \msg_expandable_error:nnnn on line ...
 Defining \msg_expandable_error:nnn on line ...
 Defining \msg_expandable_error:nn on line ...
-Defining \exp_args:Nnnffff on line ...
 Defining \msg_expandable_error:nnffff on line ...
-Defining \exp_args:Nnnfff on line ...
 Defining \msg_expandable_error:nnfff on line ...
-Defining \exp_args:Nnnff on line ...
 Defining \msg_expandable_error:nnff on line ...
 Defining \msg_expandable_error:nnf on line ...
 Defining \__msg_expandable_error_module:nn on line ...
diff --git a/l3kernel/testfiles/m3expl003.tlg b/l3kernel/testfiles/m3expl003.tlg
index 3c975c1..7c98d56 100644
--- a/l3kernel/testfiles/m3expl003.tlg
+++ b/l3kernel/testfiles/m3expl003.tlg
@@ -2978,6 +2978,13 @@ Defining \__kernel_msg_expandable_error:nnnnn on line ...
 Defining \__kernel_msg_expandable_error:nnnn on line ...
 Defining \__kernel_msg_expandable_error:nnn on line ...
 Defining \__kernel_msg_expandable_error:nn on line ...
+Defining \exp_args:Nnnffff on line ...
+Defining \__kernel_msg_expandable_error:nnffff on line ...
+Defining \exp_args:Nnnfff on line ...
+Defining \__kernel_msg_expandable_error:nnfff on line ...
+Defining \exp_args:Nnnff on line ...
+Defining \__kernel_msg_expandable_error:nnff on line ...
+Defining \__kernel_msg_expandable_error:nnf 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 ...
@@ -5678,11 +5685,8 @@ Defining \msg_expandable_error:nnnnn on line ...
 Defining \msg_expandable_error:nnnn on line ...
 Defining \msg_expandable_error:nnn on line ...
 Defining \msg_expandable_error:nn on line ...
-Defining \exp_args:Nnnffff on line ...
 Defining \msg_expandable_error:nnffff on line ...
-Defining \exp_args:Nnnfff on line ...
 Defining \msg_expandable_error:nnfff on line ...
-Defining \exp_args:Nnnff on line ...
 Defining \msg_expandable_error:nnff on line ...
 Defining \msg_expandable_error:nnf on line ...
 Defining \__msg_expandable_error_module:nn on line ...
diff --git a/l3kernel/testfiles/m3expl003.uptex.tlg b/l3kernel/testfiles/m3expl003.uptex.tlg
index 132f503..0ee6255 100644
--- a/l3kernel/testfiles/m3expl003.uptex.tlg
+++ b/l3kernel/testfiles/m3expl003.uptex.tlg
@@ -2978,6 +2978,13 @@ Defining \__kernel_msg_expandable_error:nnnnn on line ...
 Defining \__kernel_msg_expandable_error:nnnn on line ...
 Defining \__kernel_msg_expandable_error:nnn on line ...
 Defining \__kernel_msg_expandable_error:nn on line ...
+Defining \exp_args:Nnnffff on line ...
+Defining \__kernel_msg_expandable_error:nnffff on line ...
+Defining \exp_args:Nnnfff on line ...
+Defining \__kernel_msg_expandable_error:nnfff on line ...
+Defining \exp_args:Nnnff on line ...
+Defining \__kernel_msg_expandable_error:nnff on line ...
+Defining \__kernel_msg_expandable_error:nnf 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 ...
@@ -5676,11 +5683,8 @@ Defining \msg_expandable_error:nnnnn on line ...
 Defining \msg_expandable_error:nnnn on line ...
 Defining \msg_expandable_error:nnn on line ...
 Defining \msg_expandable_error:nn on line ...
-Defining \exp_args:Nnnffff on line ...
 Defining \msg_expandable_error:nnffff on line ...
-Defining \exp_args:Nnnfff on line ...
 Defining \msg_expandable_error:nnfff on line ...
-Defining \exp_args:Nnnff on line ...
 Defining \msg_expandable_error:nnff on line ...
 Defining \msg_expandable_error:nnf on line ...
 Defining \__msg_expandable_error_module:nn on line ...
diff --git a/l3kernel/testfiles/m3expl003.xetex.tlg b/l3kernel/testfiles/m3expl003.xetex.tlg
index f710587..5ad0fa1 100644
--- a/l3kernel/testfiles/m3expl003.xetex.tlg
+++ b/l3kernel/testfiles/m3expl003.xetex.tlg
@@ -3039,6 +3039,13 @@ Defining \__kernel_msg_expandable_error:nnnnn on line ...
 Defining \__kernel_msg_expandable_error:nnnn on line ...
 Defining \__kernel_msg_expandable_error:nnn on line ...
 Defining \__kernel_msg_expandable_error:nn on line ...
+Defining \exp_args:Nnnffff on line ...
+Defining \__kernel_msg_expandable_error:nnffff on line ...
+Defining \exp_args:Nnnfff on line ...
+Defining \__kernel_msg_expandable_error:nnfff on line ...
+Defining \exp_args:Nnnff on line ...
+Defining \__kernel_msg_expandable_error:nnff on line ...
+Defining \__kernel_msg_expandable_error:nnf 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 ...
@@ -5711,11 +5718,8 @@ Defining \msg_expandable_error:nnnnn on line ...
 Defining \msg_expandable_error:nnnn on line ...
 Defining \msg_expandable_error:nnn on line ...
 Defining \msg_expandable_error:nn on line ...
-Defining \exp_args:Nnnffff on line ...
 Defining \msg_expandable_error:nnffff on line ...
-Defining \exp_args:Nnnfff on line ...
 Defining \msg_expandable_error:nnfff on line ...
-Defining \exp_args:Nnnff on line ...
 Defining \msg_expandable_error:nnff on line ...
 Defining \msg_expandable_error:nnf on line ...
 Defining \__msg_expandable_error_module:nn on line ...

More information about the latex3-commits mailing list