Merge remote-tracking branch 'origin/main' into luacolor

latex3 · Jun 8, 2021 · 2ee00e2 · 2ee00e2
2 parents 665ac02 + 95436ed
commit 2ee00e2
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 5 deletions.
diff --git a/l3kernel/testfiles-l3doc/test.tlg b/l3kernel/testfiles-l3doc/test.tlg
@@ -410,6 +410,7 @@ Completed box being shipped out [1]
 ....\penalty 0
 ....\write6{\protect \BOOKMARK [0][-]{index1.0}{\376\377\000I\000n\000d\000e\000x}{}% 1}
 ....\pdfdest name{index1.0} xyz
+....\penalty 10000
 ....\glue 17.22198
 ....\pdfdest name{part*.1} xyz
 ....\penalty 10000

diff --git a/l3packages/CHANGELOG.md b/l3packages/CHANGELOG.md
@@ -7,6 +7,10 @@ this project uses date-based 'snapshot' version identifiers.
 
 ## [Unreleased]
 
+### Fixed
+
+- Correct internal changes to message naming
+
 ## [2021-06-01]
 
 ### Fixed

diff --git a/l3packages/xparse/testfiles/xparse007.tlg b/l3packages/xparse/testfiles/xparse007.tlg
@@ -8,6 +8,7 @@ Defining key ltcmd/log-declarations on line ...
 Defining key ltcmd/log-declarations/unknown on line ...
 Defining key ltcmd/log-declarations/true on line ...
 Defining key ltcmd/log-declarations/false on line ...
+Defining \__cmd_unknown_argument_type_error:n on line ...
 Defining \__cmd_normalize_type_g:w on line ...
 Defining \__cmd_normalize_type_G:w on line ...
 Defining \__cmd_normalize_type_l:w on line ...

diff --git a/l3packages/xparse/xparse.dtx b/l3packages/xparse/xparse.dtx
@@ -1080,14 +1080,19 @@
 \ProcessOptions \relax
 \cs_set_protected:Npn \@@_tmp:w #1
   {
-    \keys_define:nn { ltcmd }
+    \keys_define:nn {#1}
       {
         log-declarations .bool_set:N = \l_@@_log_bool ,
         log-declarations .initial:n  = false
       }
-    \keys_set:nV { ltcmd } \l_@@_options_clist
+    \keys_set:nV {#1} \l_@@_options_clist
     \bool_if:NF \l_@@_log_bool
-      { \msg_redirect_module:nnn { LaTeX / ltcmd } { info } { none } }
+      { \msg_redirect_module:nnn { LaTeX / #1 } { info } { none } }
+    \cs_new_protected:Npn \@@_unknown_argument_type_error:n ##1
+      {
+        \__kernel_msg_error:nnxx {#1} { unknown-argument-type }
+          { \@@_environment_or_command: } { \tl_to_str:n {##1} }
+      }
   }
 \msg_if_exist:nnTF { cmd } { define-command }
   { \@@_tmp:w { cmd } }
@@ -1109,8 +1114,7 @@
     \int_incr:N \l_@@_current_arg_int
     \cs_if_exist_use:cF { @@_normalize_type_ \tl_to_str:n {#1} :w }
       {
-        \__kernel_msg_error:nnxx { ltcmd } { unknown-argument-type }
-          { \@@_environment_or_command: } { \tl_to_str:n {#1} }
+        \@@_unknown_argument_type_error:n {#1}
         \@@_bad_def:wn
       }
   }