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/l3expan.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/l3expan.dtx')
-rw-r--r-- | Master/texmf-dist/source/latex/l3kernel/l3expan.dtx | 29 |
1 files changed, 15 insertions, 14 deletions
diff --git a/Master/texmf-dist/source/latex/l3kernel/l3expan.dtx b/Master/texmf-dist/source/latex/l3kernel/l3expan.dtx index d932e646c2f..bd8f69d6f16 100644 --- a/Master/texmf-dist/source/latex/l3kernel/l3expan.dtx +++ b/Master/texmf-dist/source/latex/l3kernel/l3expan.dtx @@ -1,6 +1,6 @@ % \iffalse meta-comment % -%% File: l3expan.dtx Copyright (C) 1990-2017 The LaTeX3 project +%% File: l3expan.dtx Copyright (C) 1990-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 @@ { \fi: \fi: - \__msg_kernel_expandable_error:nnn { kernel } { bad-variable } {#2} + \__kernel_msg_expandable_error:nnn { kernel } { bad-variable } {#2} \exp_end: } % \end{macrocode} @@ -1527,7 +1527,7 @@ % error. % \begin{macrocode} \cs_new:Npn ^^@ - { \__msg_kernel_expandable_error:nn { kernel } { bad-exp-end-f } } + { \__kernel_msg_expandable_error:nn { kernel } { bad-exp-end-f } } % \end{macrocode} % The same but grabbing an argument to remove spaces and braces. % \begin{macrocode} @@ -1561,7 +1561,7 @@ % iterate through the comma list of variant argument specifiers, which % we first convert to a string: the reason is explained later. % \begin{macrocode} -\__debug_patch:nnNNpn { \__debug_chk_cs_exist:N #1 } { } +\__kernel_patch:nnNNpn { \__kernel_chk_cs_exist:N #1 } { } \cs_new_protected:Npn \cs_generate_variant:Nn #1#2 { \@@_generate_variant:N #1 @@ -1642,7 +1642,7 @@ \cs_new_protected:Npn \@@_generate_variant:nnNN #1#2#3#4 { \if_meaning:w \c_false_bool #3 - \__msg_kernel_error:nnx { kernel } { missing-colon } + \__kernel_msg_error:nnx { kernel } { missing-colon } { \token_to_str:c {#1} } \exp_after:wN \use_none_delimit_by_q_recursion_stop:w \fi: @@ -1849,7 +1849,7 @@ \exp_not:n { \q_mark - \__msg_kernel_error:nnxx { kernel } { variant-too-long } + \__kernel_msg_error:nnxx { kernel } { variant-too-long } {#5} { \token_to_str:N #3 } \use_none:nnn \q_stop @@ -1864,7 +1864,7 @@ \exp_not:n { \q_mark - \__msg_kernel_error:nnxxxx { kernel } { invalid-variant } + \__kernel_msg_error:nnxxxx { kernel } { invalid-variant } {#7} { \token_to_str:N #5 } {#1} {#2} \use_none:nnn \q_stop @@ -1877,12 +1877,13 @@ #3 \q_stop #4 #5 {#6} {#7} \exp_not:n { - \@@_generate_variant_loop_warning:nnxxxx { kernel } { invalid-variant } + \@@_generate_variant_loop_warning:nnxxxx + { kernel } { deprecated-variant } {#7} { \token_to_str:N #5 } {#1} {#2} } } \cs_new_protected:Npn \@@_generate_variant_loop_warning:nnxxxx - { \__msg_kernel_warning:nnxxxx } + { \__kernel_msg_warning:nnxxxx } % \end{macrocode} % \end{macro} % @@ -1915,11 +1916,11 @@ % \cs{cs_new_protected:Npx}. Then define the variant by % combining the |\exp_args:N #3| variant and the base function. % \begin{macrocode} -\__debug_patch:nnNNpn +\__kernel_patch:nnNNpn { \cs_if_free:NF #4 { - \__debug_log:x + \__kernel_debug_log:x { Variant~\token_to_str:N #4~% already~defined;~ not~ changing~ it~ \msg_line_context: @@ -2012,7 +2013,7 @@ \cs_new_protected:Npn \@@_generate_variant:nnNnn #1#2#3#4#5 { \if_meaning:w \c_false_bool #3 - \__msg_kernel_error:nnx { kernel } { missing-colon } + \__kernel_msg_error:nnx { kernel } { missing-colon } { \token_to_str:c {#1} } \use_i_delimit_by_q_stop:nw \fi: @@ -2032,7 +2033,7 @@ \cs_if_exist_use:cTF { @@_generate_variant_#1_form:nnn } { {#3} {#4} {#5} } { - \__msg_kernel_error:nnxx + \__kernel_msg_error:nnxx { kernel } { conditional-form-unknown } {#1} { \token_to_str:c { #3 : #4 } } } |