finish l3 update

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

1 files changed, 46 insertions, 40 deletions

diff --git a/Master/texmf-dist/source/latex/l3kernel/l3msg.dtx b/Master/texmf-dist/source/latex/l3kernel/l3msg.dtx
index a545ab5e126..5d690ced2cf 100644
--- a/Master/texmf-dist/source/latex/l3kernel/l3msg.dtx
+++ b/Master/texmf-dist/source/latex/l3kernel/l3msg.dtx
@@ -34,8 +34,8 @@
 %% -----------------------------------------------------------------------
 %
 %<*driver|package>
-\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}
 %</driver|package>
 %<*driver>
@@ -257,7 +257,7 @@
 % be converted to strings before being added to the message text: the
 % \texttt{x}-type variants should be used to expand material.
 %
-% \begin{function}[updated = 2012-06-29]
+% \begin{function}[updated = 2012-08-11]
 %   {
 %     \msg_fatal:nnnnnn ,
 %     \msg_fatal:nnnnn  ,
@@ -277,7 +277,7 @@
 %   fatal error the \TeX{} run will halt.
 % \end{function}
 %
-% \begin{function}[updated = 2012-06-29]
+% \begin{function}[updated = 2012-08-11]
 %   {
 %     \msg_critical:nnnnnn ,
 %     \msg_critical:nnnnn  ,
@@ -304,7 +304,7 @@
 %   \end{texnote}
 % \end{function}
 %
-% \begin{function}[updated = 2012-06-29]
+% \begin{function}[updated = 2012-08-11]
 %   {
 %     \msg_error:nnnnnn ,
 %     \msg_error:nnnnn  ,
@@ -325,7 +325,7 @@
 %   input, the run will continue.
 % \end{function}
 %
-% \begin{function}[updated = 2012-06-29]
+% \begin{function}[updated = 2012-08-11]
 %   {
 %     \msg_warning:nnnnnn ,
 %     \msg_warning:nnnnn  ,
@@ -346,7 +346,7 @@
 %   will not be interrupted.
 % \end{function}
 %
-% \begin{function}[updated = 2012-06-29]
+% \begin{function}[updated = 2012-08-11]
 %   {
 %     \msg_info:nnnnnn ,
 %     \msg_info:nnnnn  ,
@@ -366,7 +366,7 @@
 %   The information text will be added to the log file.
 % \end{function}
 %
-% \begin{function}[updated = 2012-07-14]
+% \begin{function}[updated = 2012-08-11]
 %   {
 %     \msg_log:nnnnnn ,
 %     \msg_log:nnnnn  ,
@@ -387,7 +387,7 @@
 %   is briefer than \cs{msg_info:nnnnnn}.
 % \end{function}
 %
-% \begin{function}[updated = 2012-06-29]
+% \begin{function}[updated = 2012-08-11]
 %   {
 %     \msg_none:nnnnnn ,
 %     \msg_none:nnnnn  ,
@@ -577,7 +577,7 @@
 %   these will be supplied and expanded at the time the message is used.
 % \end{function}
 %
-% \begin{function}[updated = 2012-06-29]
+% \begin{function}[updated = 2012-08-11]
 %   {
 %     \__msg_kernel_fatal:nnnnnn ,
 %     \__msg_kernel_fatal:nnnnn  ,
@@ -597,7 +597,7 @@
 %   fatal error the \TeX{} run will halt. Cannot be redirected.
 % \end{function}
 %
-% \begin{function}[updated = 2012-06-29]
+% \begin{function}[updated = 2012-08-11]
 %   {
 %     \__msg_kernel_error:nnnnnn ,
 %     \__msg_kernel_error:nnnnn  ,
@@ -619,7 +619,7 @@
 %   the run will continue. Cannot be redirected.
 % \end{function}
 %
-% \begin{function}[updated = 2012-06-29]
+% \begin{function}[updated = 2012-08-11]
 %   {
 %     \__msg_kernel_warning:nnnnnn ,
 %     \__msg_kernel_warning:nnnnn  ,
@@ -641,7 +641,7 @@
 %   interrupted.
 % \end{function}
 %
-% \begin{function}[updated = 2012-06-29]
+% \begin{function}[updated = 2012-08-11]
 %   {
 %     \__msg_kernel_info:nnnnnn ,
 %     \__msg_kernel_info:nnnnn  ,
@@ -888,7 +888,7 @@
 %     \c_msg_fatal_text_tl        ,
 %     \c_msg_help_text_tl         ,
 %     \c_msg_no_info_text_tl      ,
-%     \c_msg_on_line_tl           ,
+%     \c_msg_on_line_text_tl      ,
 %     \c_msg_return_text_tl       ,
 %     \c_msg_trouble_text_tl
 %   }
@@ -1109,7 +1109,7 @@
   }
 %    \end{macrocode}
 % \end{macro}
-% 
+%
 % \begin{macro}{\@@_class_new:nn}
 %    \begin{macrocode}
 \group_begin:
@@ -1119,9 +1119,12 @@
       \cs_new_protected:cpn { @@_ #1 _code:nnnnnn } ##1##2##3##4##5##6 {#2}
       \cs_new_protected:cpn { msg_ #1 :nnnnnn } ##1##2##3##4##5##6
         {
-          \@@_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 { \@@_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} { } }
@@ -1131,12 +1134,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
             {
-              \@@_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}
             }
         }
@@ -1608,20 +1611,28 @@
 % \end{macro}
 % \end{macro}
 %
-% \begin{macro}[aux]{\@@_kernel_class_new:nn}
-% \begin{macro}[aux]{\@@_kernel_class_new_aux:nn}
+% \begin{macro}[aux]{\@@_kernel_class_new:nN}
+% \begin{macro}[aux]{\@@_kernel_class_new_aux:nN}
 %   All the functions for kernel messages come in variants ranging
 %   from~$0$ to~$4$ arguments.  Those with less than~$4$ arguments are
 %   defined in terms of the $4$-argument variant, in a way very similar
-%   to \cs{msg_class_set:nn}.  This auxiliary is destroyed at the end of
+%   to \cs{@@_class_new:nn}.  This auxiliary is destroyed at the end of
 %   the group.
 %    \begin{macrocode}
 \group_begin:
-  \cs_set_protected:Npn \@@_kernel_class_new:nn #1
-    { \@@_kernel_class_new_aux:nn { kernel_ #1 } }
-  \cs_set_protected:Npn \@@_kernel_class_new_aux:nn #1#2
+  \cs_set_protected:Npn \@@_kernel_class_new:nN #1
+    { \@@_kernel_class_new_aux:nN { kernel_ #1 } }
+  \cs_set_protected:Npn \@@_kernel_class_new_aux:nN #1#2
     {
-      \cs_new_protected:cpn { @@_ #1 :nnnnnn } ##1##2 {#2}
+      \cs_new_protected:cpn { @@_ #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 { @@_ #1 :nnnnn } ##1##2##3##4##5
         { \exp_not:c { @@_ #1 :nnnnnn } {##1} {##2} {##3} {##4} {##5} { } }
       \cs_new_protected:cpx { @@_ #1 :nnnn } ##1##2##3##4
@@ -1634,9 +1645,8 @@
         {
           \use:x
             {
-              \exp_not:c { @@_ #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 { @@_ #1 :nnnnnn } {##1} {##2} }
                 {##3} {##4} {##5} {##6}
             }
         }
@@ -1678,13 +1688,11 @@
 %   already defined by \pkg{l3basics}; we need to undefine them to avoid
 %   errors.
 %    \begin{macrocode}
-  \@@_kernel_class_new:nn { fatal }
-    { \@@_fatal_code:nnnnnn { LaTeX } { #1 / #2 } }
+  \@@_kernel_class_new:nN { fatal } \@@_fatal_code:nnnnnn
   \cs_undefine:N \@@_kernel_error:nnxx
   \cs_undefine:N \@@_kernel_error:nnx
   \cs_undefine:N \@@_kernel_error:nn
-  \@@_kernel_class_new:nn { error }
-    { \@@_error_code:nnnnnn { LaTeX } { #1 / #2 } }
+  \@@_kernel_class_new:nN { error } \@@_error_code:nnnnnn
 %    \end{macrocode}
 % \end{macro}
 %
@@ -1712,14 +1720,12 @@
 %   Kernel messages which can be redirected simply use the machinery for
 %   normal messages, with the module name \enquote{\LaTeX{}}.
 %    \begin{macrocode}
-  \@@_kernel_class_new:nn { warning }
-    { \msg_warning:nnxxxx { LaTeX } { #1 / #2 } }
-  \@@_kernel_class_new:nn { info }
-    { \msg_info:nnxxxx { LaTeX } { #1 / #2 } }
+  \@@_kernel_class_new:nN { warning } \msg_warning:nnxxxx
+  \@@_kernel_class_new:nN { info } \msg_info:nnxxxx
 %    \end{macrocode}
 % \end{macro}
 %
-% End the group to eliminate \cs{@@_kernel_class_new:nn}.
+% End the group to eliminate \cs{@@_kernel_class_new:nN}.
 %    \begin{macrocode}
 \group_end:
 %    \end{macrocode}