l3 (26aug14)

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

3 files changed, 63 insertions, 62 deletions

diff --git a/Master/texmf-dist/source/latex/l3packages/l3keys2e/l3keys2e.dtx b/Master/texmf-dist/source/latex/l3packages/l3keys2e/l3keys2e.dtx
index 3976b45c9c0..0bffa0cef39 100644
--- a/Master/texmf-dist/source/latex/l3packages/l3keys2e/l3keys2e.dtx
+++ b/Master/texmf-dist/source/latex/l3packages/l3keys2e/l3keys2e.dtx
@@ -37,8 +37,8 @@
 %<*driver|package>
 % The version of expl3 required is tested as early as possible, as
 % some really old versions do not define \ProvidesExplPackage.
-\RequirePackage{expl3}[2014/07/20]
-%<package>\@ifpackagelater{expl3}{2014/07/20}
+\RequirePackage{expl3}[2014/08/25]
+%<package>\@ifpackagelater{expl3}{2014/08/25}
 %<package>  {}
 %<package>  {%
 %<package>    \PackageError{l3keys2e}{Support package l3kernel too old}
@@ -50,7 +50,7 @@
 %<package>      }%
 %<package>    \endinput
 %<package>  }
-\GetIdInfo$Id: l3keys2e.dtx 5241 2014-07-20 09:44:41Z joseph $
+\GetIdInfo$Id: l3keys2e.dtx 5378 2014-08-25 10:59:48Z joseph $
   {LaTeX2e option processing using LaTeX3 keys}
 %</driver|package>
 %<*driver>
diff --git a/Master/texmf-dist/source/latex/l3packages/xparse/xparse.dtx b/Master/texmf-dist/source/latex/l3packages/xparse/xparse.dtx
index 27bb33f151d..e354b21deaa 100644
--- a/Master/texmf-dist/source/latex/l3packages/xparse/xparse.dtx
+++ b/Master/texmf-dist/source/latex/l3packages/xparse/xparse.dtx
@@ -41,8 +41,8 @@
 %<*driver|package>
 % The version of expl3 required is tested as early as possible, as
 % some really old versions do not define \ProvidesExplPackage.
-\RequirePackage{expl3}[2014/07/20]
-%<package>\@ifpackagelater{expl3}{2014/07/20}
+\RequirePackage{expl3}[2014/08/25]
+%<package>\@ifpackagelater{expl3}{2014/08/25}
 %<package>  {}
 %<package>  {%
 %<package>    \PackageError{xparse}{Support package l3kernel too old}
@@ -54,7 +54,7 @@
 %<package>      }%
 %<package>    \endinput
 %<package>  }
-\GetIdInfo$Id: xparse.dtx 5241 2014-07-20 09:44:41Z joseph $
+\GetIdInfo$Id: xparse.dtx 5378 2014-08-25 10:59:48Z joseph $
   {L3 Experimental document command parser}
 %</driver|package>
 %<*driver>
@@ -927,7 +927,7 @@
   {
     \cs_if_exist:NTF #1
       {
-        \__msg_kernel_warning:nnxx { xparse } { redefine-command }
+        \__msg_kernel_info:nnxx { xparse } { redefine-command }
           { \token_to_str:N #1 } { \tl_to_str:n {#2} }
       }
       {
@@ -1057,7 +1057,7 @@
     \cs_if_exist:cTF {#1}
 %</package>
       {
-        \__msg_kernel_warning:nnxx { xparse } { redefine-environment }
+        \__msg_kernel_info:nnxx { xparse } { redefine-environment }
           {#1} { \tl_to_str:n {#2} }
       }
       {
@@ -2320,18 +2320,19 @@
 % \begin{macro}{\@@_grab_v_group_end:}
 % \begin{variable}{\l_@@_v_rest_of_signature_tl}
 % \begin{variable}{\l_@@_v_arg_tl}
-%   The opening delimiter is never read verbatim, for consistency: if the
-%   preceding argument was optional and absent, then \TeX{} has already read
-%   that token when looking for the optional argument. The first thing
-%   to check is that this delimiter is a character, and distinguish the
-%   case of a left brace (in that case, \cs{group_align_safe_end:}
-%   is needed to compensate for the begin-group character that was
-%   just seen).
-%   Then set verbatim catcodes with \cs{@@_grab_v_aux_catcodes:}.
+%   The opening delimiter is the first non-space token, and is never
+%   read verbatim.  This is required by consistency with the case where
+%   the preceding argument was optional and absent: then \TeX{} has
+%   already read and tokenized that token when looking for the optional
+%   argument.  The first thing is thus to check is that this delimiter
+%   is a character, and to distinguish the case of a left brace (in that
+%   case, \cs{group_align_safe_end:} is needed to compensate for the
+%   begin-group character that was just seen).  Then set verbatim
+%   catcodes with \cs{@@_grab_v_aux_catcodes:}.
 %
 %   The group keep catcode changes local, and
 %   \cs{group_align_safe_begin/end:} allow to use a character
-%   with category code $4$ (normally |&|) as the delimiter.
+%   with category code~$4$ (normally |&|) as the delimiter.
 %   It is ended by \cs{@@_grab_v_group_end:}, which smuggles
 %   the collected argument out of the group.
 %    \begin{macrocode}
@@ -2354,15 +2355,15 @@
       \group_align_safe_begin:
         \tex_escapechar:D = 92 \scan_stop:
         \tl_clear:N \l_@@_v_arg_tl
-        \peek_N_type:TF
-          { \@@_grab_v_aux_test:N }
+        \peek_meaning_remove_ignore_spaces:NTF \c_group_begin_token
           {
-            \peek_meaning_remove:NTF \c_group_begin_token
-              {
-                \group_align_safe_end:
-                \@@_grab_v_bgroup:
-              }
-              { \@@_grab_v_aux_abort: }
+            \group_align_safe_end:
+            \@@_grab_v_bgroup:
+          }
+          {
+            \peek_N_type:TF
+              { \@@_grab_v_aux_test:N }
+              { \@@_grab_v_aux_abort:n { } }
           }
   }
 \cs_new_protected_nopar:Npn \@@_grab_v_group_end:
@@ -2402,24 +2403,24 @@
 %   If we ever meet a token which we cannot grab (non-N-type),
 %   or which is not a character according to
 %   \cs{@@_grab_v_token_if_char:NTF}, then we bail out with
-%   \cs{@@_grab_v_aux_abort:}. Otherwise, we stop at the first
+%   \cs{@@_grab_v_aux_abort:n}. Otherwise, we stop at the first
 %   character matching the delimiter.
 %    \begin{macrocode}
 \cs_new_protected:Npn \@@_grab_v_aux_test:N #1
   {
-    \@@_grab_v_aux_put:N #1
     \@@_grab_v_token_if_char:NTF #1
       {
+        \@@_grab_v_aux_put:N #1
         \@@_grab_v_aux_catcodes:
         \@@_grab_v_aux_loop:N #1
       }
-      { \@@_grab_v_aux_abort: }
+      { \@@_grab_v_aux_abort:n {#1} #1 }
   }
 \cs_new_protected:Npn \@@_grab_v_aux_loop:N #1
   {
     \peek_N_type:TF
       { \@@_grab_v_aux_loop:NN #1 }
-      { \@@_grab_v_aux_abort: }
+      { \@@_grab_v_aux_abort:n { } }
   }
 \cs_new_protected:Npn \@@_grab_v_aux_loop:NN #1 #2
   {
@@ -2432,7 +2433,7 @@
             \@@_grab_v_aux_loop:N #1
           }
       }
-      { \@@_grab_v_aux_abort: #2 }
+      { \@@_grab_v_aux_abort:n {#2} #2 }
   }
 \cs_new_protected_nopar:Npn \@@_grab_v_aux_loop_end:
   {
@@ -2472,7 +2473,7 @@
   {
     \peek_N_type:TF
       { \@@_grab_v_bgroup_loop:N }
-      { \@@_grab_v_aux_abort: }
+      { \@@_grab_v_aux_abort:n { } }
   }
 \cs_new_protected:Npn \@@_grab_v_bgroup_loop:N #1
   {
@@ -2495,7 +2496,7 @@
             \@@_grab_v_bgroup_loop:
           }
       }
-      { \@@_grab_v_aux_abort: #1 }
+      { \@@_grab_v_aux_abort:n {#1} #1 }
   }
 %    \end{macrocode}
 % \end{variable}
@@ -2504,8 +2505,7 @@
 % \end{macro}
 %
 % \begin{macro}{\@@_grab_v_aux_catcodes:}
-% \begin{macro}{\@@_grab_v_aux_abort:}
-% \begin{macro}{\@@_grab_v_aux_abort:w}
+% \begin{macro}{\@@_grab_v_aux_abort:n}
 %   In a standalone format, the list of special characters is kept
 %   as a sequence, \cs{c_@@_special_chars_seq}, and we use
 %   \tn{dospecials} in package mode.
@@ -2530,35 +2530,32 @@
       { \char_set_catcode_other:n { \tex_endlinechar:D } }
       { \char_set_catcode_parameter:n { \tex_endlinechar:D } }
   }
-\cs_new_protected_nopar:Npn \@@_grab_v_aux_abort:
+\cs_new_protected:Npn \@@_grab_v_aux_abort:n #1
   {
     \@@_grab_v_group_end:
     \@@_add_arg:o \c_@@_no_value_tl
-    \exp_after:wN \@@_grab_v_aux_abort:w \l_@@_args_tl \q_stop
-  }
-\cs_new_protected:Npn \@@_grab_v_aux_abort:w #1 #2 \q_stop
-  {
     \group_begin:
     \char_set_lccode:nn { `\# } { \tex_endlinechar:D }
     \tl_to_lowercase:n
       { \group_end: \peek_meaning_remove:NTF ## }
       {
-        \__msg_kernel_error:nnxx { xparse } { verbatim-newline }
-          { \token_to_str:N #1 }
+        \__msg_kernel_error:nnxxx { xparse } { verbatim-newline }
+          { \exp_after:wN \token_to_str:N \l_@@_fn_tl }
           { \tl_to_str:N \l_@@_v_arg_tl }
+          { \tl_to_str:n {#1} }
         \l_@@_v_rest_of_signature_tl \l_@@_args_tl
       }
       {
-        \__msg_kernel_error:nnxx { xparse } { verbatim-already-tokenized }
-          { \token_to_str:N #1 }
+        \__msg_kernel_error:nnxxx { xparse } { verbatim-tokenized }
+          { \exp_after:wN \token_to_str:N \l_@@_fn_tl }
           { \tl_to_str:N \l_@@_v_arg_tl }
+          { \tl_to_str:n {#1} }
         \l_@@_v_rest_of_signature_tl \l_@@_args_tl
       }
   }
 %    \end{macrocode}
 % \end{macro}
 % \end{macro}
-% \end{macro}
 %
 % \begin{macro}{\@@_grab_v_aux_put:N}
 %   Storing one token in the collected argument. Most tokens are
@@ -3267,19 +3264,23 @@
     but~this~is~not~a~document~environment.
   }
 \__msg_kernel_new:nnnn { xparse } { verbatim-newline }
-  { Verbatim~argument~of~#1~ended~by~end~of~line. }
+  { Verbatim~argument~of~'#1'~ended~by~end~of~line. }
   {
-    The~verbatim~argument~of~#1~cannot~contain~more~than~one~line,~but~the~end~
+    The~verbatim~argument~of~'#1'~cannot~contain~more~than~one~line,~
+    but~the~end~
     of~the~current~line~has~been~reached.~You~have~probably~forgotten~the~
     closing~delimiter.
     \\ \\
-    LaTeX~will~ignored~'#2'.
+    LaTeX~will~ignore~'#2'.
+  }
+\__msg_kernel_new:nnnn { xparse } { verbatim-tokenized }
+  {
+    The~verbatim~command~'#1'~cannot~be~used~inside~an~argument.~
   }
-\__msg_kernel_new:nnnn { xparse } { verbatim-already-tokenized }
-  { Verbatim~command~#1~illegal~in~command~argument. }
   {
-    The~command~#1~takes~a~verbatim~argument.~It~may~not~appear~within~
-    the~argument~of~another~function.
+    The~command~'#1'~takes~a~verbatim~argument.~
+    It~may~not~appear~within~the~argument~of~another~function.~
+    It~received~an~illegal~token \tl_if_empty:nF {#3} { ~'#3' } .
     \\ \\
     LaTeX~will~ignore~'#2'.
   }
@@ -3289,23 +3290,23 @@
 %    \begin{macrocode}
 \__msg_kernel_new:nnn { xparse } { define-command }
   {
-    Defining~document~command~#1~
-    with~arg.~spec.~'#2'~\msg_line_context:.
+    Defining~command~#1~
+    with~sig.~'#2'~\msg_line_context:.
   }
 \__msg_kernel_new:nnn { xparse } { define-environment }
   {
-    Defining~document~environment~'#1'~
-    with~arg.~spec.~'#2'~\msg_line_context:.
+    Defining~environment~'#1'~
+    with~sig.~'#2'~\msg_line_context:.
   }
 \__msg_kernel_new:nnn { xparse } { redefine-command }
   {
-    Redefining~document~command~#1~
-    with~arg.~spec.~'#2'~\msg_line_context:.
+    Redefining~command~#1~
+    with~sig.~'#2'~\msg_line_context:.
   }
 \__msg_kernel_new:nnn { xparse } { redefine-environment }
   {
-    Redefining~document~environment~'#1'~
-    with~arg.~spec.~'#2'~\msg_line_context:.
+    Redefining~environment~'#1'~
+    with~sig.~'#2'~\msg_line_context:.
   }
 %    \end{macrocode}
 %
diff --git a/Master/texmf-dist/source/latex/l3packages/xtemplate/xtemplate.dtx b/Master/texmf-dist/source/latex/l3packages/xtemplate/xtemplate.dtx
index f2c65ec055e..54ed4a7c0a7 100644
--- a/Master/texmf-dist/source/latex/l3packages/xtemplate/xtemplate.dtx
+++ b/Master/texmf-dist/source/latex/l3packages/xtemplate/xtemplate.dtx
@@ -41,8 +41,8 @@
 %<*driver|package>
 % The version of expl3 required is tested as early as possible, as
 % some really old versions do not define \ProvidesExplPackage.
-\RequirePackage{expl3}[2014/07/20]
-%<package>\@ifpackagelater{expl3}{2014/07/20}
+\RequirePackage{expl3}[2014/08/25]
+%<package>\@ifpackagelater{expl3}{2014/08/25}
 %<package>  {}
 %<package>  {%
 %<package>    \PackageError{xtemplate}{Support package l3kernel too old}
@@ -54,7 +54,7 @@
 %<package>      }%
 %<package>    \endinput
 %<package>  }
-\GetIdInfo$Id: xtemplate.dtx 5241 2014-07-20 09:44:41Z joseph $
+\GetIdInfo$Id: xtemplate.dtx 5378 2014-08-25 10:59:48Z joseph $
   {L3 Experimental prototype document functions}
 %</driver|package>
 %<*driver>