summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/latex/l3kernel/l3msg.sty
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2012-08-16 22:41:08 +0000
committerKarl Berry <karl@freefriends.org>2012-08-16 22:41:08 +0000
commitca1c73f9a8de69e467230c4a57ccf8b07cd275a9 (patch)
tree6272657307f73c14327d6b8bce5d6b7ff97c3f66 /Master/texmf-dist/tex/latex/l3kernel/l3msg.sty
parent22c251adda514ed7b453066de05b2f89707d0fe6 (diff)
finish l3 update
git-svn-id: svn://tug.org/texlive/trunk@27427 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.sty52
1 files changed, 29 insertions, 23 deletions
diff --git a/Master/texmf-dist/tex/latex/l3kernel/l3msg.sty b/Master/texmf-dist/tex/latex/l3kernel/l3msg.sty
index bfce368f0d0..3845880de85 100644
--- a/Master/texmf-dist/tex/latex/l3kernel/l3msg.sty
+++ b/Master/texmf-dist/tex/latex/l3kernel/l3msg.sty
@@ -45,8 +45,8 @@
%% prior consultation with the LaTeX3 Project.
%%
%% -----------------------------------------------------------------------
-\RequirePackage{l3names}
-\GetIdInfo$Id: l3msg.dtx 3986 2012-07-15 19:23:51Z joseph $
+\RequirePackage{l3bootstrap}
+\GetIdInfo$Id: l3msg.dtx 4077 2012-08-10 23:30:52Z bruno $
{L3 Messages}
\ProvidesExplPackage
{\ExplFileName}{\ExplFileDate}{\ExplFileVersion}{\ExplFileDescription}
@@ -230,9 +230,12 @@
\cs_new_protected:cpn { __msg_ #1 _code:nnnnnn } ##1##2##3##4##5##6 {#2}
\cs_new_protected:cpn { msg_ #1 :nnnnnn } ##1##2##3##4##5##6
{
- \__msg_use:nnnnnnn {#1} {##1} {##2}
- { \tl_to_str:n {##3} } { \tl_to_str:n {##4} }
- { \tl_to_str:n {##5} } { \tl_to_str:n {##6} }
+ \use:x
+ {
+ \exp_not:n { \__msg_use:nnnnnnn {#1} {##1} {##2} }
+ { \tl_to_str:n {##3} } { \tl_to_str:n {##4} }
+ { \tl_to_str:n {##5} } { \tl_to_str:n {##6} }
+ }
}
\cs_new_protected:cpx { msg_ #1 :nnnnn } ##1##2##3##4##5
{ \exp_not:c { msg_ #1 :nnnnnn } {##1} {##2} {##3} {##4} {##5} { } }
@@ -242,12 +245,12 @@
{ \exp_not:c { msg_ #1 :nnnnnn } {##1} {##2} {##3} { } { } { } }
\cs_new_protected:cpx { msg_ #1 :nn } ##1##2
{ \exp_not:c { msg_ #1 :nnnnnn } {##1} {##2} { } { } { } { } }
- \cs_new_protected:cpn { msg_ #1 :nnxxxx } ##1##2##3##4##5##6
+ \cs_new_protected:cpx { msg_ #1 :nnxxxx } ##1##2##3##4##5##6
{
\use:x
{
- \__msg_use:nnnnnnn
- { \exp_not:n {#1} } { \exp_not:n {##1} } { \exp_not:n {##2} }
+ \exp_not:N \exp_not:n
+ { \exp_not:c { msg_ #1 :nnnnnn } {##1} {##2} }
{##3} {##4} {##5} {##6}
}
}
@@ -465,11 +468,19 @@
\cs_new_protected:Npn \__msg_kernel_set:nnn #1#2
{ \msg_set:nnn { LaTeX } { #1 / #2 } }
\group_begin:
- \cs_set_protected:Npn \__msg_kernel_class_new:nn #1
- { \__msg_kernel_class_new_aux:nn { kernel_ #1 } }
- \cs_set_protected:Npn \__msg_kernel_class_new_aux:nn #1#2
+ \cs_set_protected:Npn \__msg_kernel_class_new:nN #1
+ { \__msg_kernel_class_new_aux:nN { kernel_ #1 } }
+ \cs_set_protected:Npn \__msg_kernel_class_new_aux:nN #1#2
{
- \cs_new_protected:cpn { __msg_ #1 :nnnnnn } ##1##2 {#2}
+ \cs_new_protected:cpn { __msg_ #1 :nnnnnn } ##1##2##3##4##5##6
+ {
+ \use:x
+ {
+ \exp_not:n { #2 { LaTeX } { ##1 / ##2 } }
+ { \tl_to_str:n {##3} } { \tl_to_str:n {##4} }
+ { \tl_to_str:n {##5} } { \tl_to_str:n {##6} }
+ }
+ }
\cs_new_protected:cpx { __msg_ #1 :nnnnn } ##1##2##3##4##5
{ \exp_not:c { __msg_ #1 :nnnnnn } {##1} {##2} {##3} {##4} {##5} { } }
\cs_new_protected:cpx { __msg_ #1 :nnnn } ##1##2##3##4
@@ -482,9 +493,8 @@
{
\use:x
{
- \exp_not:c { __msg_ #1 :nnnnnn }
- { \exp_not:N \exp_not:n {##1} }
- { \exp_not:N \exp_not:n {##2} }
+ \exp_not:N \exp_not:n
+ { \exp_not:c { __msg_ #1 :nnnnnn } {##1} {##2} }
{##3} {##4} {##5} {##6}
}
}
@@ -495,17 +505,13 @@
\cs_new_protected:cpx { __msg_ #1 :nnx } ##1##2##3
{ \exp_not:c { __msg_ #1 :nnxxxx } {##1} {##2} {##3} { } { } { } }
}
- \__msg_kernel_class_new:nn { fatal }
- { \__msg_fatal_code:nnnnnn { LaTeX } { #1 / #2 } }
+ \__msg_kernel_class_new:nN { fatal } \__msg_fatal_code:nnnnnn
\cs_undefine:N \__msg_kernel_error:nnxx
\cs_undefine:N \__msg_kernel_error:nnx
\cs_undefine:N \__msg_kernel_error:nn
- \__msg_kernel_class_new:nn { error }
- { \__msg_error_code:nnnnnn { LaTeX } { #1 / #2 } }
- \__msg_kernel_class_new:nn { warning }
- { \msg_warning:nnxxxx { LaTeX } { #1 / #2 } }
- \__msg_kernel_class_new:nn { info }
- { \msg_info:nnxxxx { LaTeX } { #1 / #2 } }
+ \__msg_kernel_class_new:nN { error } \__msg_error_code:nnnnnn
+ \__msg_kernel_class_new:nN { warning } \msg_warning:nnxxxx
+ \__msg_kernel_class_new:nN { info } \msg_info:nnxxxx
\group_end:
\__msg_kernel_new:nnnn { kernel } { message-already-defined }
{ Message~'#2'~for~module~'#1'~already~defined. }