summaryrefslogtreecommitdiff
path: root/macros/latex/contrib/l3kernel/l3keys.dtx
diff options
context:
space:
mode:
Diffstat (limited to 'macros/latex/contrib/l3kernel/l3keys.dtx')
-rw-r--r--macros/latex/contrib/l3kernel/l3keys.dtx62
1 files changed, 33 insertions, 29 deletions
diff --git a/macros/latex/contrib/l3kernel/l3keys.dtx b/macros/latex/contrib/l3kernel/l3keys.dtx
index af7ed2f1e5..cf7257daf5 100644
--- a/macros/latex/contrib/l3kernel/l3keys.dtx
+++ b/macros/latex/contrib/l3kernel/l3keys.dtx
@@ -43,7 +43,7 @@
% }^^A
% }
%
-% \date{Released 2021-07-12}
+% \date{Released 2021-08-27}
%
% \maketitle
%
@@ -1242,7 +1242,7 @@
\s_@@_mark ##3 \s_@@_nil
#2 \s_@@_mark \@@_clean_up_active:w
{
- \__kernel_msg_expandable_error:nn
+ \msg_expandable_error:nn
{ keyval } { misplaced-equals-sign }
\@@_loop_other:nnw
}
@@ -1250,7 +1250,7 @@
\s_@@_mark ##1 \s_@@_stop \s_@@_mark ##2 \s_@@_nil
##3 \s_@@_mark ##4 ##5
{
- \__kernel_msg_expandable_error:nn
+ \msg_expandable_error:nn
{ keyval } { misplaced-equals-sign }
\@@_loop_other:nnw
}
@@ -1345,7 +1345,7 @@
{ \@@_loop_other:nnw }
\cs_new:Npn \@@_blank_key_error:w #1 \@@_loop_other:nnw
{
- \__kernel_msg_expandable_error:nn { keyval } { blank-key-name }
+ \msg_expandable_error:nn { keyval } { blank-key-name }
\@@_loop_other:nnw
}
% \end{macrocode}
@@ -1353,10 +1353,12 @@
%
% Two messages for the low level parsing system.
% \begin{macrocode}
-\__kernel_msg_new:nnn { keyval } { misplaced-equals-sign }
- { Misplaced~equals~sign~in~key-value~input~\msg_line_context: }
-\__kernel_msg_new:nnn { keyval } { blank-key-name }
+\msg_new:nnn { keyval } { misplaced-equals-sign }
+ { Misplaced~'='~in~key-value~input~\msg_line_context: }
+\msg_new:nnn { keyval } { blank-key-name }
{ Blank~key~name~in~key-value~input~\msg_line_context: }
+\prop_gput:Nnn \g_msg_module_name_prop { keyval } { LaTeX3 }
+\prop_gput:Nnn \g_msg_module_type_prop { keyval } { }
% \end{macrocode}
%
% \begin{macro}[EXP]{\@@_trim:nN}
@@ -1645,7 +1647,7 @@
{
\str_if_empty:NF \l_@@_property_str
{
- \__kernel_msg_error:nnxx { keys } { property-unknown }
+ \msg_error:nnxx { keys } { property-unknown }
\l_@@_property_str \l_keys_path_str
}
}
@@ -1708,7 +1710,7 @@
#1 \s_@@_nil #2 \@@_property_find_err:w
{
\str_clear:N \l_@@_property_str
- \__kernel_msg_error:nnn { keys } { no-property } {#1}
+ \msg_error:nnn { keys } { no-property } {#1}
}
% \end{macrocode}
% \end{macro}
@@ -1730,7 +1732,7 @@
\l_@@_property_str \s_@@_stop
{ \use:c { \c_@@_props_root_str \l_@@_property_str } }
{
- \__kernel_msg_error:nnxx { keys } { property-requires-value }
+ \msg_error:nnxx { keys } { property-requires-value }
\l_@@_property_str \l_keys_path_str
}
}
@@ -1760,7 +1762,7 @@
{ \exp_not:c { bool_ #2 set_false:N } \exp_not:N #1 }
\@@_cmd_set:nn { \l_keys_path_str / unknown }
{
- \__kernel_msg_error:nnx { keys } { boolean-values-only }
+ \msg_error:nnx { keys } { boolean-values-only }
\l_keys_key_str
}
\@@_default_set:n { true }
@@ -1782,7 +1784,7 @@
{ \exp_not:c { bool_ #2 set_true:N } \exp_not:N #1 }
\@@_cmd_set:nn { \l_keys_path_str / unknown }
{
- \__kernel_msg_error:nnx { keys } { boolean-values-only }
+ \msg_error:nnx { keys } { boolean-values-only }
\l_keys_key_str
}
\@@_default_set:n { true }
@@ -1811,7 +1813,7 @@
{ \c_@@_type_root_str \@@_parent:o \l_keys_path_str }
{ choice }
{
- \__kernel_msg_error:nnxx { keys } { nested-choice-key }
+ \msg_error:nnxx { keys } { nested-choice-key }
\l_keys_path_tl { \@@_parent:o \l_keys_path_str }
}
{ \@@_choice_make_aux:N #1 }
@@ -1825,7 +1827,7 @@
\@@_cmd_set:nn \l_keys_path_str { #1 {##1} }
\@@_cmd_set:nn { \l_keys_path_str / unknown }
{
- \__kernel_msg_error:nnxx { keys } { choice-unknown }
+ \msg_error:nnxx { keys } { choice-unknown }
\l_keys_path_str {##1}
}
}
@@ -2049,7 +2051,7 @@
}
}
{
- \__kernel_msg_error:nnx { keys }
+ \msg_error:nnx { keys }
{ property-boolean-values-only }
{ .value_ #1 :n }
}
@@ -2058,7 +2060,7 @@
{
\bool_if:NF \l_@@_no_value_bool
{
- \__kernel_msg_error:nnxx { keys } { value-forbidden }
+ \msg_error:nnxx { keys } { value-forbidden }
\l_keys_path_str \l_keys_value_tl
\use_none:nnn
}
@@ -2067,7 +2069,7 @@
{
\bool_if:NT \l_@@_no_value_bool
{
- \__kernel_msg_error:nnx { keys } { value-required }
+ \msg_error:nnx { keys } { value-required }
\l_keys_path_str
\use_none:nnn
}
@@ -2911,7 +2913,7 @@
{ \c_@@_code_root_str \l_@@_module_str / unknown }
{ \@@_execute:no { \l_@@_module_str / unknown } \l_keys_value_tl }
{
- \__kernel_msg_error:nnxx { keys } { unknown }
+ \msg_error:nnxx { keys } { unknown }
\l_keys_path_str \l_@@_module_str
}
}
@@ -2984,7 +2986,7 @@
{
\tl_if_blank:nF {##1}
{
- \__kernel_msg_error:nnxx { keys } { bad-relative-key-path }
+ \msg_error:nnxx { keys } { bad-relative-key-path }
\l_keys_path_str
\l_@@_relative_tl
}
@@ -3155,9 +3157,9 @@
% To show a key, show its code using a message.
% \begin{macrocode}
\cs_new_protected:Npn \keys_show:nn
- { \@@_show:Nnn \__kernel_msg_show:nnxxxx }
+ { \@@_show:Nnn \msg_show:nnxxxx }
\cs_new_protected:Npn \keys_log:nn
- { \@@_show:Nnn \__kernel_msg_log:nnxxxx }
+ { \@@_show:Nnn \msg_log:nnxxxx }
\cs_new_protected:Npn \@@_show:Nnn #1#2#3
{
#1 { keys } { show-key }
@@ -3184,49 +3186,51 @@
%
% For when there is a need to complain.
% \begin{macrocode}
-\__kernel_msg_new:nnnn { keys } { bad-relative-key-path }
+\msg_new:nnnn { keys } { bad-relative-key-path }
{ The~key~'#1'~is~not~inside~the~'#2'~path. }
{ The~key~'#1'~cannot~be~expressed~relative~to~path~'#2'. }
-\__kernel_msg_new:nnnn { keys } { boolean-values-only }
+\msg_new:nnnn { keys } { boolean-values-only }
{ Key~'#1'~accepts~boolean~values~only. }
{ The~key~'#1'~only~accepts~the~values~'true'~and~'false'. }
-\__kernel_msg_new:nnnn { keys } { choice-unknown }
+\msg_new:nnnn { keys } { choice-unknown }
{ Key~'#1'~accepts~only~a~fixed~set~of~choices. }
{
The~key~'#1'~only~accepts~predefined~values,~
and~'#2'~is~not~one~of~these.
}
-\__kernel_msg_new:nnnn { keys } { unknown }
+\msg_new:nnnn { keys } { unknown }
{ The~key~'#1'~is~unknown~and~is~being~ignored. }
{
The~module~'#2'~does~not~have~a~key~called~'#1'.\\
Check~that~you~have~spelled~the~key~name~correctly.
}
-\__kernel_msg_new:nnnn { keys } { nested-choice-key }
+\msg_new:nnnn { keys } { nested-choice-key }
{ Attempt~to~define~'#1'~as~a~nested~choice~key. }
{
The~key~'#1'~cannot~be~defined~as~a~choice~as~the~parent~key~'#2'~is~
itself~a~choice.
}
-\__kernel_msg_new:nnnn { keys } { value-forbidden }
+\msg_new:nnnn { keys } { value-forbidden }
{ The~key~'#1'~does~not~take~a~value. }
{
The~key~'#1'~should~be~given~without~a~value.\\
The~value~'#2'~was~present:~the~key~will~be~ignored.
}
-\__kernel_msg_new:nnnn { keys } { value-required }
+\msg_new:nnnn { keys } { value-required }
{ The~key~'#1'~requires~a~value. }
{
The~key~'#1'~must~have~a~value.\\
No~value~was~present:~the~key~will~be~ignored.
}
-\__kernel_msg_new:nnn { keys } { show-key }
+\msg_new:nnn { keys } { show-key }
{
The~key~#1~
\tl_if_empty:nTF {#2}
{ is~undefined. }
{ has~the~properties: #2 . }
}
+\prop_gput:Nnn \g_msg_module_name_prop { keys } { LaTeX3 }
+\prop_gput:Nnn \g_msg_module_type_prop { keys } { }
% \end{macrocode}
%
% \begin{macrocode}