summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/latex/l3kernel/l3msg.sty
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2012-01-19 22:49:13 +0000
committerKarl Berry <karl@freefriends.org>2012-01-19 22:49:13 +0000
commit17d590a6bcf898806aeec2d7aa57d641a440ca10 (patch)
treedd82ac37aed8f78a0eca38ab7b5c1250b6585fef /Master/texmf-dist/tex/latex/l3kernel/l3msg.sty
parent2648c52105e48119c27762f885fefa29d172b38b (diff)
l3kernel 3209 (19jan12)
git-svn-id: svn://tug.org/texlive/trunk@25157 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/latex/l3kernel/l3msg.sty')
-rw-r--r--Master/texmf-dist/tex/latex/l3kernel/l3msg.sty30
1 files changed, 15 insertions, 15 deletions
diff --git a/Master/texmf-dist/tex/latex/l3kernel/l3msg.sty b/Master/texmf-dist/tex/latex/l3kernel/l3msg.sty
index 7090d10d2a5..90d70060297 100644
--- a/Master/texmf-dist/tex/latex/l3kernel/l3msg.sty
+++ b/Master/texmf-dist/tex/latex/l3kernel/l3msg.sty
@@ -13,7 +13,7 @@
%%
%% Do not distribute a modified version of this file.
%%
-%% 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
@@ -46,12 +46,12 @@
%%
%% -----------------------------------------------------------------------
\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}
\ProvidesExplPackage
{\ExplFileName}{\ExplFileDate}{\ExplFileVersion}{\ExplFileDescription}
\package_check_loaded_expl:
-\tl_new:N \l_msg_tmp_tl
+\tl_new:N \l_msg_internal_tl
\tl_const:Nn \c_msg_text_prefix_tl { msg~text~>~ }
\tl_const:Nn \c_msg_more_text_prefix_tl { msg~extra~text~>~ }
\cs_new_protected:Npn \msg_new:nnnn #1#2
@@ -160,14 +160,14 @@
{ \tl_set:Nn \l_msg_text_tl {#1} }
\cs_new_protected:Npn \msg_interrupt_more_text:n #1
{
- \protected@edef \l_msg_tmp_tl
+ \protected@edef \l_msg_internal_tl
{
|'''''''''''''''''''''''''''''''''''''''''''''''
#1
\msg_newline:
|...............................................
}
- \tex_errhelp:D \exp_after:wN { \l_msg_tmp_tl }
+ \tex_errhelp:D \exp_after:wN { \l_msg_internal_tl }
}
\group_begin: % {
\char_set_lccode:nn {`\}} {`\ }
@@ -572,22 +572,22 @@
{ Negative~argument~for~\prg_replicate:nn. }
\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): }
@@ -652,16 +652,16 @@
\msg_expandable_kernel_error:nnnnnn
{#1} {#2} { } { } { } { }
}
-\tl_new:N \l_msg_show_tl
\cs_new_protected:Npn \msg_aux_use:nn #1#2
{ \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
}
\cs_new_protected:Npn \msg_aux_show:Nnx #1#2#3
{
@@ -677,14 +677,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: