diff options
author | Karl Berry <karl@freefriends.org> | 2018-02-23 21:54:14 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2018-02-23 21:54:14 +0000 |
commit | 87d871a3d83784d48b71fa3712b9f525bfc710d2 (patch) | |
tree | f12f9ffdc697b5af9ee14c06874ec0e2f72c9f94 /Master/texmf-dist/source/latex/l3kernel/l3keys.dtx | |
parent | ccc63194ce7813106830c8a8755c54d89de831b4 (diff) |
l3 (22feb18)
git-svn-id: svn://tug.org/texlive/trunk@46720 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/source/latex/l3kernel/l3keys.dtx')
-rw-r--r-- | Master/texmf-dist/source/latex/l3kernel/l3keys.dtx | 58 |
1 files changed, 29 insertions, 29 deletions
diff --git a/Master/texmf-dist/source/latex/l3kernel/l3keys.dtx b/Master/texmf-dist/source/latex/l3kernel/l3keys.dtx index 1ccd2b357c2..5e5a5399d42 100644 --- a/Master/texmf-dist/source/latex/l3kernel/l3keys.dtx +++ b/Master/texmf-dist/source/latex/l3kernel/l3keys.dtx @@ -1,6 +1,6 @@ % \iffalse meta-comment % -%% File: l3keys.dtx Copyright (C) 2006-2017 The LaTeX3 Project +%% File: l3keys.dtx Copyright (C) 2006-2018 The LaTeX3 Project % % It may be distributed and/or modified under the conditions of the % LaTeX Project Public License (LPPL), either version 1.3c of this @@ -41,7 +41,7 @@ % }^^A % } % -% \date{Released 2017/12/16} +% \date{Released 2018/02/21} % % \maketitle % @@ -1064,7 +1064,7 @@ } \else: \cs_set:Npn \@@_action: - { \__msg_kernel_error:nn { kernel } { misplaced-equals-sign } } + { \__kernel_msg_error:nn { kernel } { misplaced-equals-sign } } \fi: \fi: \@@_action: @@ -1079,7 +1079,7 @@ } \cs_new:Npn \@@_action: { } \cs_new_protected:Npn \@@_empty_key: - { \__msg_kernel_error:nn { kernel } { misplaced-equals-sign } } + { \__kernel_msg_error:nn { kernel } { misplaced-equals-sign } } % \end{macrocode} % \end{macro} % \end{macro} @@ -1105,7 +1105,7 @@ % % One message for the low level parsing system. % \begin{macrocode} -\__msg_kernel_new:nnnn { kernel } { misplaced-equals-sign } +\__kernel_msg_new:nnnn { kernel } { misplaced-equals-sign } { Misplaced~equals~sign~in~key-value~input~\msg_line_number: } { LaTeX~is~attempting~to~parse~some~key-value~input~but~found~ @@ -1295,7 +1295,7 @@ { \tl_if_empty:NF \l_@@_property_tl { - \__msg_kernel_error:nnxx { kernel } { property-unknown } + \__kernel_msg_error:nnxx { kernel } { property-unknown } { \l_@@_property_tl } { \l_keys_path_tl } } } @@ -1321,7 +1321,7 @@ \tl_if_blank:nTF {#3} { \tl_clear:N \l_@@_property_tl - \__msg_kernel_error:nnn { kernel } { key-no-property } {#4} + \__kernel_msg_error:nnn { kernel } { key-no-property } {#4} } { \str_if_eq:nnTF {#3} { . } @@ -1372,7 +1372,7 @@ \l_@@_property_tl \q_stop { \use:c { \c_@@_props_root_tl \l_@@_property_tl } } { - \__msg_kernel_error:nnxx { kernel } + \__kernel_msg_error:nnxx { kernel } { property-requires-value } { \l_@@_property_tl } { \l_keys_path_tl } } @@ -1406,7 +1406,7 @@ { \exp_not:c { bool_ #2 set_false:N } \exp_not:N #1 } \@@_cmd_set:nn { \l_keys_path_tl / unknown } { - \__msg_kernel_error:nnx { kernel } { boolean-values-only } + \__kernel_msg_error:nnx { kernel } { boolean-values-only } { \l_keys_key_tl } } \@@_default_set:n { true } @@ -1428,7 +1428,7 @@ { \exp_not:c { bool_ #2 set_true:N } \exp_not:N #1 } \@@_cmd_set:nn { \l_keys_path_tl / unknown } { - \__msg_kernel_error:nnx { kernel } { boolean-values-only } + \__kernel_msg_error:nnx { kernel } { boolean-values-only } { \l_keys_key_tl } } \@@_default_set:n { true } @@ -1457,7 +1457,7 @@ { \exp_not:v { \c_@@_type_root_tl \@@_parent:o \l_keys_path_tl } } { choice } { - \__msg_kernel_error:nnxx { kernel } { nested-choice-key } + \__kernel_msg_error:nnxx { kernel } { nested-choice-key } { \l_keys_path_tl } { \@@_parent:o \l_keys_path_tl } } { \@@_choice_make_aux:N #1 } @@ -1470,7 +1470,7 @@ \@@_cmd_set:nn { \l_keys_path_tl } { #1 {##1} } \@@_cmd_set:nn { \l_keys_path_tl / unknown } { - \__msg_kernel_error:nnxx { kernel } { key-choice-unknown } + \__kernel_msg_error:nnxx { kernel } { key-choice-unknown } { \l_keys_path_tl } {##1} } } @@ -1513,10 +1513,10 @@ % Setting the code for a key first logs if appropriate that we are % defining a new key, then saves the code. % \begin{macrocode} -\__debug_patch:nnNNpn +\__kernel_patch:nnNNpn { \cs_if_exist:cF { \c_@@_code_root_tl #1 } - { \__debug_log:x { Defining~key~#1~\msg_line_context: } } + { \__kernel_debug_log:x { Defining~key~#1~\msg_line_context: } } } { } \cs_new_protected:Npn \@@_cmd_set:nn #1#2 @@ -1658,7 +1658,7 @@ } } { - \__msg_kernel_error:nnx { kernel } { property-boolean-values-only } + \__kernel_msg_error:nnx { kernel } { property-boolean-values-only } { .value_ #1 :n } } } @@ -1666,7 +1666,7 @@ { \bool_if:NF \l_@@_no_value_bool { - \__msg_kernel_error:nnxx { kernel } { value-forbidden } + \__kernel_msg_error:nnxx { kernel } { value-forbidden } { \l_keys_path_tl } { \l_keys_value_tl } \@@_validate_cleanup:w } @@ -1675,7 +1675,7 @@ { \bool_if:NT \l_@@_no_value_bool { - \__msg_kernel_error:nnx { kernel } { value-required } + \__kernel_msg_error:nnx { kernel } { value-required } { \l_keys_path_tl } \@@_validate_cleanup:w } @@ -2338,7 +2338,7 @@ \exp_after:wN \cs_end: \exp_after:wN { \l_keys_value_tl } } { - \__msg_kernel_error:nnxx { kernel } { key-unknown } + \__kernel_msg_error:nnxx { kernel } { key-unknown } { \l_keys_path_tl } { \l_@@_module_tl } } } @@ -2471,16 +2471,16 @@ % % For when there is a need to complain. % \begin{macrocode} -\__msg_kernel_new:nnnn { kernel } { boolean-values-only } +\__kernel_msg_new:nnnn { kernel } { boolean-values-only } { Key~'#1'~accepts~boolean~values~only. } { The~key~'#1'~only~accepts~the~values~'true'~and~'false'. } -\__msg_kernel_new:nnnn { kernel } { key-choice-unknown } +\__kernel_msg_new:nnnn { kernel } { key-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. } -\__msg_kernel_new:nnnn { kernel } { key-no-property } +\__kernel_msg_new:nnnn { kernel } { key-no-property } { No~property~given~in~definition~of~key~'#1'. } { \c__msg_coding_error_text_tl @@ -2489,51 +2489,51 @@ \iow_indent:n { #1 .<property> } \\ \\ LaTeX~did~not~find~a~'.'~to~indicate~the~start~of~a~property. } -\__msg_kernel_new:nnnn { kernel } { key-unknown } +\__kernel_msg_new:nnnn { kernel } { key-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. } -\__msg_kernel_new:nnnn { kernel } { nested-choice-key } +\__kernel_msg_new:nnnn { kernel } { 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. } -\__msg_kernel_new:nnnn { kernel } { property-boolean-values-only } +\__kernel_msg_new:nnnn { kernel } { property-boolean-values-only } { The~property~'#1'~accepts~boolean~values~only. } { \c__msg_coding_error_text_tl The~property~'#1'~only~accepts~the~values~'true'~and~'false'. } -\__msg_kernel_new:nnnn { kernel } { property-requires-value } +\__kernel_msg_new:nnnn { kernel } { property-requires-value } { The~property~'#1'~requires~a~value. } { \c__msg_coding_error_text_tl LaTeX~was~asked~to~set~property~'#1'~for~key~'#2'.\\ No~value~was~given~for~the~property,~and~one~is~required. } -\__msg_kernel_new:nnnn { kernel } { property-unknown } +\__kernel_msg_new:nnnn { kernel } { property-unknown } { The~key~property~'#1'~is~unknown. } { \c__msg_coding_error_text_tl LaTeX~has~been~asked~to~set~the~property~'#1'~for~key~'#2':~ this~property~is~not~defined. } -\__msg_kernel_new:nnnn { kernel } { value-forbidden } +\__kernel_msg_new:nnnn { kernel } { 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. } -\__msg_kernel_new:nnnn { kernel } { value-required } +\__kernel_msg_new:nnnn { kernel } { value-required } { The~key~'#1'~requires~a~value. } { The~key~'#1'~must~have~a~value.\\ No~value~was~present:~the~key~will~be~ignored. } -\__msg_kernel_new:nnn { kernel } { show-key } +\__kernel_msg_new:nnn { kernel } { show-key } { The~key~#1~ \tl_if_empty:nTF {#2} |