summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/latex/l3kernel/l3msg.sty
diff options
context:
space:
mode:
Diffstat (limited to 'Master/texmf-dist/tex/latex/l3kernel/l3msg.sty')
-rw-r--r--Master/texmf-dist/tex/latex/l3kernel/l3msg.sty36
1 files changed, 15 insertions, 21 deletions
diff --git a/Master/texmf-dist/tex/latex/l3kernel/l3msg.sty b/Master/texmf-dist/tex/latex/l3kernel/l3msg.sty
index 0d717006172..584b54ac427 100644
--- a/Master/texmf-dist/tex/latex/l3kernel/l3msg.sty
+++ b/Master/texmf-dist/tex/latex/l3kernel/l3msg.sty
@@ -46,7 +46,7 @@
%%
%% -----------------------------------------------------------------------
\RequirePackage{l3bootstrap}
-\GetIdInfo$Id: l3msg.dtx 4147 2012-08-28 10:27:33Z bruno $
+\GetIdInfo$Id: l3msg.dtx 4212 2012-09-09 12:24:04Z bruno $
{L3 Messages}
\ProvidesExplPackage
{\ExplFileName}{\ExplFileDate}{\ExplFileVersion}{\ExplFileDescription}
@@ -744,43 +744,37 @@
\cs_if_exist:NTF #1
{
\__msg_term:nnn { LaTeX / kernel } { show- #2 } {#1}
- \__msg_show_variable:x { \tl_to_str:n {#3} }
+ \__msg_show_variable:n {#3}
}
{
\__msg_kernel_error:nnx { kernel } { variable-not-defined }
{ \token_to_str:N #1 }
}
}
-\cs_generate_variant:Nn \__msg_show_variable:Nnn { Nnx }
\cs_new_protected:Npn \__msg_show_variable:n #1
+ { \iow_wrap:nnnN {#1} { } { } \__msg_show_variable_aux:n }
+\cs_new_protected:Npn \__msg_show_variable_aux:n #1
{
- \tl_set:Nn \l__msg_internal_tl {#1}
- \tl_if_empty:NTF \l__msg_internal_tl
- { \etex_showtokens:D \exp_after:wN { } }
- {
- \exp_args:Nf \etex_showtokens:D
- {
- \exp_after:wN \exp_after:wN
- \exp_after:wN \__msg_show_variable:w
- \exp_after:wN \l__msg_internal_tl
- }
- }
+ \tl_if_empty:nTF {#1}
+ { \tl_clear:N \l__msg_internal_tl }
+ { \tl_set:Nf \l__msg_internal_tl { \__msg_show_variable_aux:w #1 } }
+ \etex_showtokens:D \exp_after:wN \exp_after:wN \exp_after:wN
+ { \exp_after:wN \l__msg_internal_tl }
}
-\cs_generate_variant:Nn \__msg_show_variable:n { x }
-\cs_new:Npn \__msg_show_variable:w #1 > { }
+\cs_new:Npn \__msg_show_variable_aux:w #1 > { }
\cs_new:Npn \__msg_show_item:n #1
{
- \iow_newline: > \c_space_tl \c_space_tl { \exp_not:n {#1} }
+ \\ > \ \ \{ \tl_to_str:n {#1} \}
}
\cs_new:Npn \__msg_show_item:nn #1#2
{
- \iow_newline: > \c_space_tl \c_space_tl { \exp_not:n {#1} }
- \c_space_tl \c_space_tl => \c_space_tl \c_space_tl { \exp_not:n {#2} }
+ \\ > \ \ \{ \tl_to_str:n {#1} \}
+ \ \ => \ \ \{ \tl_to_str:n {#2} \}
}
\cs_new:Npn \__msg_show_item_unbraced:nn #1#2
{
- \iow_newline: > \c_space_tl \c_space_tl \exp_not:n {#1}
- \c_space_tl \c_space_tl => \c_space_tl \c_space_tl \exp_not:n {#2}
+ \\ > \ \ \tl_to_str:n {#1}
+ \ \ => \ \ \tl_to_str:n {#2}
}
\cs_new_nopar:Npn \msg_newline: { ^^J }
\cs_new_nopar:Npn \msg_two_newlines: { ^^J ^^J }