l3kernel 2607 (17aug11)

git-svn-id: svn://tug.org/texlive/trunk@23596 c570f23f-e606-0410-a88d-b1316a301751

1 files changed, 31 insertions, 10 deletions

diff --git a/Master/texmf-dist/tex/latex/l3kernel/l3msg.sty b/Master/texmf-dist/tex/latex/l3kernel/l3msg.sty
index 43ccc081d3d..c98aad9f7c2 100644
--- a/Master/texmf-dist/tex/latex/l3kernel/l3msg.sty
+++ b/Master/texmf-dist/tex/latex/l3kernel/l3msg.sty
@@ -46,7 +46,7 @@
 %%
 %% -----------------------------------------------------------------------
 \RequirePackage{l3names}
-\GetIdInfo$Id: l3msg.dtx 2551 2011-08-11 22:40:53Z bruno $
+\GetIdInfo$Id: l3msg.dtx 2601 2011-08-16 23:20:27Z bruno $
   {L3 Experimental messages}
 \ProvidesExplPackage
   {\ExplFileName}{\ExplFileDate}{\ExplFileVersion}{\ExplFileDescription}
@@ -61,7 +61,7 @@
         \msg_kernel_error:nn { msg } { message-already-defined }
           {#1} {#2}
       }
-    \msg_set:nnnn {#1} {#2}
+    \msg_gset:nnnn {#1} {#2}
   }
 \cs_new_protected:Npn \msg_new:nnn #1#2#3
   { \msg_new:nnnn {#1} {#2} {#3} { } }
@@ -74,6 +74,15 @@
   }
 \cs_new_protected:Npn \msg_set:nnn #1#2#3
   { \msg_set:nnnn {#1} {#2} {#3} { } }
+\cs_new_protected:Npn \msg_gset:nnnn #1#2#3#4
+  {
+    \cs_gset:cpn { \c_msg_text_prefix_tl #1 / #2 }
+      ##1##2##3##4 {#3}
+    \cs_gset:cpn { \c_msg_more_text_prefix_tl #1 / #2 }
+      ##1##2##3##4 {#4}
+  }
+\cs_new_protected:Npn \msg_gset:nnn #1#2#3
+  { \msg_gset:nnnn {#1} {#2} {#3} { } }
 \tl_const:Nn \c_msg_coding_error_text_tl
   {
     This~is~a~coding~error.
@@ -160,8 +169,8 @@
     \tex_errhelp:D \exp_after:wN { \l_msg_tmp_tl }
   }
 \group_begin: % {
-  \char_set_lccode:w `\} = `\  \scan_stop:
-  \char_set_lccode:w `\& = `\! \scan_stop:
+  \char_set_lccode:nn {`\}} {`\ }
+  \char_set_lccode:nn {`\&} {`\!}
   \char_set_catcode_active:N \&
 \tl_to_lowercase:n
   {
@@ -564,15 +573,27 @@
     \c_msg_return_text_tl
   }
 \group_begin:
-\cs_new:Npx \msg_expandable_error:n #1
+\char_set_catcode_math_superscript:N \^
+\char_set_lccode:nn {`^} {`\ }
+\char_set_lccode:nn {`L} {`L}
+\char_set_lccode:nn {`T} {`T}
+\char_set_lccode:nn {`X} {`X}
+\tl_to_lowercase:n
   {
-    \exp_not:n
+    \cs_new:Npx \msg_expandable_error:n #1
       {
-        \exp_after:wN \exp_after:wN
-        \exp_after:wN \use_none_delimit_by_q_stop:w
+        \exp_not:n
+          {
+            \tex_romannumeral:D
+            \exp_after:wN \exp_after:wN
+            \exp_after:wN \msg_expandable_error_aux:w
+            \exp_after:wN \exp_after:wN
+            \exp_after:wN \c_zero
+          }
+        \exp_not:N \use:n { \exp_not:c { LaTeX3~error: } ^ #1 }
+        \exp_not:N \q_stop
       }
-    \exp_not:N \use:n { \exp_not:c { LaTeX3 ~ error : } #1 }
-    \exp_not:N \q_stop
+    \cs_new:Npn \msg_expandable_error_aux:w #1 ^ #2 \q_stop { #1 }
   }
 \group_end:
 \cs_new_eq:NN \msg_class_new:nn \msg_class_set:nn