Extend to cover .meta:nn

latex3 · May 21, 2023 · fcc78a1 · fcc78a1
1 parent c1a7c11
commit fcc78a1
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 5 deletions.
diff --git a/l3kernel/l3keys.dtx b/l3kernel/l3keys.dtx
@@ -2127,7 +2127,7 @@
 \cs_new_protected:Npn \@@_meta_make:nn #1#2
   {
     \exp_args:NV \@@_cmd_set_direct:nn
-      \l_keys_path_str { \keys_set:nn {#1} {#2} }
+      \l_keys_path_str { \@@_set:nn {#1} {#2} }
   }
 %    \end{macrocode}
 % \end{macro}

diff --git a/l3kernel/testfiles/m3keys004.lvt b/l3kernel/testfiles/m3keys004.lvt
@@ -260,14 +260,18 @@
           B1 .groups:n   = main ,
           B2 .code:n     = \TYPE { B2 } ,
           B2 .groups:n   = main ,
-          meta .meta:n   = { B1 , A2 } ,
-          meta .groups:n = { init , main }
+          meta-a .meta:n   = { B1 , A2 } ,
+          meta-a .groups:n = { init , main } ,
+          meta-b .meta:nn  = { } { B1 , A2 } ,
+          meta-b .groups:n = { init , main }
         }
     \TIMO
     \keys_set_groups:nnn { } { init } { B1 , A1 , A2 , B2 }
     \keys_set_groups:nnn { } { main } { B1 , A1 , A2 , B2 }
-    \keys_set_groups:nnn { } { init } { meta , B1 , A1 , A2 , B2 }
-    \keys_set_groups:nnn { } { main } { meta , B1 , A1 , A2 , B2 }
+    \keys_set_groups:nnn { } { init } { meta-a , B1 , A1 , A2 , B2 }
+    \keys_set_groups:nnn { } { main } { meta-a , B1 , A1 , A2 , B2 }
+    \keys_set_groups:nnn { } { init } { meta-b , B1 , A1 , A2 , B2 }
+    \keys_set_groups:nnn { } { main } { meta-b , B1 , A1 , A2 , B2 }
   }
 
 \TEST { Nesting ~ setting }

diff --git a/l3kernel/testfiles/m3keys004.tlg b/l3kernel/testfiles/m3keys004.tlg
@@ -161,6 +161,12 @@ A2
 B1
 B1
 B2
+A2
+A1
+A2
+B1
+B1
+B2
 ============================================================
 ============================================================
 TEST 9: Nesting setting