[latex3-commits] [git/LaTeX3-latex3-latex3] main: Correct align_safe groups in keyval_parse (see #912, see #896) (ec1e3f96c)

[Bruno Le Floch]

Repository : https://github.com/latex3/latex3
On branch  : main
Link       : https://github.com/latex3/latex3/commit/ec1e3f96cc2a2316aa7d6b14fbdc55cbd5d203ce

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

commit ec1e3f96cc2a2316aa7d6b14fbdc55cbd5d203ce
Author: Bruno Le Floch <blflatex at gmail.com>
Date:   Wed May 12 12:14:09 2021 +0200

    Correct align_safe groups in keyval_parse (see #912, see #896)


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

ec1e3f96cc2a2316aa7d6b14fbdc55cbd5d203ce
 l3kernel/l3keys.dtx | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/l3kernel/l3keys.dtx b/l3kernel/l3keys.dtx
index 8f5f984c7..f59370707 100644
--- a/l3kernel/l3keys.dtx
+++ b/l3kernel/l3keys.dtx
@@ -1020,6 +1020,7 @@
         {
           \group_align_safe_begin:
           \@@_loop_active:nnw {##1} {##2} \s_@@_mark ##3 #1 \s_@@_tail #1
+          \group_align_safe_end:
         }
       \cs_new_eq:NN \keyval_parse:NNn \keyval_parse:nnn
 %    \end{macrocode}
@@ -1258,7 +1259,7 @@
       \cs_new:Npn \@@_end_loop_active:w
           \s_@@_tail
           \@@_loop_other:nnw ##1 \s_@@_mark \s_@@_tail , \s_@@_tail ,
-        { \group_align_safe_end: }
+        { }
 %    \end{macrocode}
 % \end{macro}
 %
@@ -1319,7 +1320,7 @@
 \cs_new:Npn \@@_blank_true:w \s_@@_mark \s_@@_stop \@@_trim:nN #1 \@@_key:nn
   { \@@_loop_other:nnw }
 \cs_new:Npn \@@_blank_key_error:w
-  \s_@@_mark \s_@@_stop \group_align_safe_end: \exp_not:n #1
+  \s_@@_mark \s_@@_stop \group_align_safe_end: \exp_not:n #1 \group_align_safe_begin:
   {
     \__kernel_msg_expandable_error:nn
       { keyval } { blank-key-name }