diff options
author | Karl Berry <karl@freefriends.org> | 2012-01-19 22:49:13 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2012-01-19 22:49:13 +0000 |
commit | 17d590a6bcf898806aeec2d7aa57d641a440ca10 (patch) | |
tree | dd82ac37aed8f78a0eca38ab7b5c1250b6585fef /Master/texmf-dist/source/latex/l3kernel/l3msg.dtx | |
parent | 2648c52105e48119c27762f885fefa29d172b38b (diff) |
l3kernel 3209 (19jan12)
git-svn-id: svn://tug.org/texlive/trunk@25157 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 | 41 |
1 files changed, 17 insertions, 24 deletions
diff --git a/Master/texmf-dist/source/latex/l3kernel/l3msg.dtx b/Master/texmf-dist/source/latex/l3kernel/l3msg.dtx index 89b6953da83..510747c1068 100644 --- a/Master/texmf-dist/source/latex/l3kernel/l3msg.dtx +++ b/Master/texmf-dist/source/latex/l3kernel/l3msg.dtx @@ -1,6 +1,6 @@ % \iffalse meta-comment % -%% File: l3msg.dtx Copyright (C) 2009-2011 The LaTeX3 Project +%% File: l3msg.dtx Copyright (C) 2009-2012 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 @@ -35,7 +35,7 @@ % %<*driver|package> \RequirePackage{l3names} -\GetIdInfo$Id: l3msg.dtx 3086 2011-12-22 17:55:46Z bruno $ +\GetIdInfo$Id: l3msg.dtx 3153 2012-01-08 22:05:30Z bruno $ {L3 Experimental messages} %</driver|package> %<*driver> @@ -719,10 +719,10 @@ %</package> % \end{macrocode} % -% \begin{variable}{\l_msg_tmp_tl} +% \begin{variable}{\l_msg_internal_tl} % A general scratch for the module. % \begin{macrocode} -\tl_new:N \l_msg_tmp_tl +\tl_new:N \l_msg_internal_tl % \end{macrocode} % \end{variable} % @@ -932,10 +932,10 @@ \cs_new_protected:Npn \msg_interrupt_more_text:n #1 { %<*initex> - \tl_set:Nx \l_msg_tmp_tl + \tl_set:Nx \l_msg_internal_tl %</initex> %<*package> - \protected@edef \l_msg_tmp_tl + \protected@edef \l_msg_internal_tl %</package> { |''''''''''''''''''''''''''''''''''''''''''''''' @@ -943,7 +943,7 @@ \msg_newline: |............................................... } - \tex_errhelp:D \exp_after:wN { \l_msg_tmp_tl } + \tex_errhelp:D \exp_after:wN { \l_msg_internal_tl } } % \end{macrocode} % The business end of the process starts by producing some visual @@ -1661,22 +1661,22 @@ % \begin{macrocode} \msg_kernel_new:nnn { seq } { show } { - Sequence~\token_to_str:N #1~ + The~sequence~\token_to_str:N #1~ \seq_if_empty:NTF #1 { is~empty } { contains~the~items~(without~outer~braces): } } \msg_kernel_new:nnn { prop } { show } { - Property~list~\token_to_str:N #1~ + The~property~list~\token_to_str:N #1~ \prop_if_empty:NTF #1 { is~empty } { contains~the~pairs~(without~outer~braces): } } \msg_kernel_new:nnn { clist } { show } { - Comma~list~ - \str_if_eq:nnF {#1} { \l_clist_tmpa_clist } { \token_to_str:N #1~} + The~comma~list~ + \str_if_eq:nnF {#1} { \l_clist_internal_clist } { \token_to_str:N #1~} \clist_if_empty:NTF #1 { is~empty } { contains~the~items~(without~outer~braces): } @@ -1788,14 +1788,6 @@ % Functions defined in this section are used for diagnostic functions % in \pkg{l3clist}, \pkg{l3io}, \pkg{l3prop}, \pkg{l3seq}, \pkg{xtemplate} % -% \begin{variable}{\l_msg_show_tl} -% Used to store the material for the diagnostic functions -% of various modules. -% \begin{macrocode} -\tl_new:N \l_msg_show_tl -% \end{macrocode} -% \end{variable} -% % \begin{macro}[aux]{\msg_aux_use:nn} % \begin{macro}[aux]{\msg_aux_use:nnxxxx} % Print the text of a message to the terminal, without formatting. @@ -1804,11 +1796,12 @@ { \msg_aux_use:nnxxxx {#1} {#2} { } { } { } { } } \cs_new_protected:Npn \msg_aux_use:nnxxxx #1#2#3#4#5#6 { - \iow_term:x + \iow_wrap:xnnnN { \use:c { \c_msg_text_prefix_tl #1 / #2 } {#3} {#4} {#5} {#6} } + { } \c_zero { } \iow_term:x } % \end{macrocode} % \end{macro} @@ -1846,14 +1839,14 @@ } \cs_new_protected:Npn \msg_aux_show:x #1 { - \tl_set:Nx \l_msg_show_tl {#1} - \tl_if_empty:NT \l_msg_show_tl - { \tl_set:Nx \l_msg_show_tl { > } } + \tl_set:Nx \l_msg_internal_tl {#1} + \tl_if_empty:NT \l_msg_internal_tl + { \tl_set:Nx \l_msg_internal_tl { > } } \exp_args:Nf \etex_showtokens:D { \exp_after:wN \exp_after:wN \exp_after:wN \msg_aux_show:w - \exp_after:wN \l_msg_show_tl + \exp_after:wN \l_msg_internal_tl \exp_after:wN } \prg_do_nothing: |