diff options
author | Karl Berry <karl@freefriends.org> | 2012-08-31 17:58:55 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2012-08-31 17:58:55 +0000 |
commit | 3301423440393adfdbbcfa0d8471e4b4c63df1e6 (patch) | |
tree | 6aa86f66a252f654a2bd2f28ee7b680fdac1b0a3 /Master/texmf-dist/source/latex/l3kernel/l3msg.dtx | |
parent | a511edd7e6a05e250f2b2d8062a470734e3af33d (diff) |
l3kernel 3160 (31aug12)
git-svn-id: svn://tug.org/texlive/trunk@27559 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/source/latex/l3kernel/l3msg.dtx')
-rw-r--r-- | Master/texmf-dist/source/latex/l3kernel/l3msg.dtx | 31 |
1 files changed, 21 insertions, 10 deletions
diff --git a/Master/texmf-dist/source/latex/l3kernel/l3msg.dtx b/Master/texmf-dist/source/latex/l3kernel/l3msg.dtx index 5d690ced2cf..a1e30326917 100644 --- a/Master/texmf-dist/source/latex/l3kernel/l3msg.dtx +++ b/Master/texmf-dist/source/latex/l3kernel/l3msg.dtx @@ -35,7 +35,7 @@ % %<*driver|package> \RequirePackage{l3bootstrap} -\GetIdInfo$Id: l3msg.dtx 4077 2012-08-10 23:30:52Z bruno $ +\GetIdInfo$Id: l3msg.dtx 4147 2012-08-28 10:27:33Z bruno $ {L3 Messages} %</driver|package> %<*driver> @@ -722,8 +722,9 @@ % formatting. Used in messages which print complex variable contents % completely. % \end{function} -% -% \begin{function}{\__msg_show_variable:Nnn, \__msg_show_variable:Nnx} +% +% \begin{function}[updated = 2012-08-14] +% {\__msg_show_variable:Nnn, \__msg_show_variable:Nnx} % \begin{syntax} % \cs{__msg_show_variable:Nnn} \meta{variable} \Arg{type} \Arg{formatted content} % \end{syntax} @@ -731,8 +732,10 @@ % in the terminal. The \meta{formatted content} will typically be generated % by \texttt{x}-type expansion using the \cs{__msg_show_variable:Nnx} variant: % the nature of the formatting is dependent on the calling module. +% The \meta{formatted content} must be a string, either empty or +% containing |>|; everything until the first |>| will be removed. % \end{function} -% +% % \begin{function}{\__msg_show_variable:n, \__msg_show_variable:x} % \begin{syntax} % \cs{__msg_show_variable:n} \Arg{formatted string} @@ -742,7 +745,7 @@ % and the part of \meta{formatted string} before the first |>| is % removed. Failure to do so causes low-level \TeX{} errors. % \end{function} -% +% % \begin{function} % {\__msg_show_item:n, \__msg_show_item:nn, \__msg_show_item_unbraced:nn} % \begin{syntax} @@ -752,7 +755,7 @@ % Auxiliary functions used within the argument of % \cs{__msg_show_variable:Nnx} to format variable items correctly for % display. The \cs{__msg_show_item:n} version is used for simple lists, -% the \cs{__msg_show_item:nn} and \cs{__msg_show_item_ubraced:nn} versions +% the \cs{__msg_show_item:nn} and \cs{__msg_show_item_unbraced:nn} versions % for key--value like data structures. % \end{function} % @@ -1815,7 +1818,7 @@ \c_msg_coding_error_text_tl Code-level~functions~must~contain~':'~to~separate~the~ argument~specification~from~the~function~name.~This~is~ - needed~when~defining~conditionals~or~when~building~a~ + needed~when~defining~conditionals~or~variants,~or~when~building~a~ parameter~text~from~the~number~of~arguments~of~the~function. } \@@_kernel_new:nnnn { kernel } { protected-predicate } @@ -1854,6 +1857,14 @@ with~a~signature~starting~with~'#1',~but~that~is~longer~than~ the~signature~(part~after~the~colon)~of~'#2'. } +\@@_kernel_new:nnnn { kernel } { invalid-variant } + { Variant~form~'#1'~invalid~for~base~form~'#2'. } + { + \c_msg_coding_error_text_tl + LaTeX~has~been~asked~to~create~a~variant~of~the~function~'#2'~ + with~a~signature~starting~with~'#1',~but~cannot~change~an~argument~ + from~type~'#3'~to~type~'#4'. + } % \end{macrocode} % % Some errors only appear in expandable settings, @@ -2027,10 +2038,10 @@ % \end{macro} % \end{macro} % -% \begin{macro}[int]{\@@_show_variable:Nnn, \@@_show_variable:Nnn} +% \begin{macro}[int]{\@@_show_variable:Nnn, \@@_show_variable:Nnx} % \begin{macro}[int]{\@@_show_variable:n, \@@_show_variable:x} % \begin{macro}[aux,EXP]{\@@_show_variable:w} -% The arguments of \cs{@@_show_variable:Nnn} are +% The arguments of \cs{@@_show_variable:Nnx} are % \begin{itemize} % \item The \meta{variable} to be shown. % \item The \texttt{TF} emptiness conditional for that type of variables. @@ -2050,7 +2061,7 @@ \cs_if_exist:NTF #1 { \@@_term:nnn { LaTeX / kernel } { show- #2 } {#1} - \@@_show_variable:x {#3} + \@@_show_variable:x { \tl_to_str:n {#3} } } { \@@_kernel_error:nnx { kernel } { variable-not-defined } |