l3packages 3209 (19jan12)

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

3 files changed, 795 insertions, 692 deletions

diff --git a/Master/texmf-dist/tex/latex/l3packages/l3keys2e/l3keys2e.sty b/Master/texmf-dist/tex/latex/l3packages/l3keys2e/l3keys2e.sty
index 85dcd6deb39..89ae6dcdd14 100644
--- a/Master/texmf-dist/tex/latex/l3packages/l3keys2e/l3keys2e.sty
+++ b/Master/texmf-dist/tex/latex/l3packages/l3keys2e/l3keys2e.sty
@@ -13,7 +13,7 @@
 %% 
 %% Do not distribute a modified version of this file.
 %% 
-%% File: l3keys2e.dtx (C) Copyright 2009,2011 The LaTeX3 Project
+%% File: l3keys2e.dtx (C) Copyright 2009,2011,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,22 +46,23 @@
 %%
 %% -----------------------------------------------------------------------
 %%
-\RequirePackage{xparse}
-\GetIdInfo$Id: l3keys2e.dtx 3109 2011-12-29 10:42:27Z joseph $
-  {LaTeX2e option processing using LaTeX3 keys}
-\ProvidesExplPackage
-  {\ExplFileName}{\ExplFileDate}{\ExplFileVersion}{\ExplFileDescription}
-\@ifpackagelater { expl3 } { 2011/12/29 }
-  { }
+\RequirePackage{expl3}[2012/01/19]
+\@ifpackagelater{expl3}{2012/01/19}
+  {}
   {
-    \PackageError { l3keys2e } { Support~package~l3kernel~too~old. }
+    \PackageError{l3keys2e}{Support package l3kernel too old.}
       {
-        Please~install~an~up~to~date~version~of~l3kernel~
-        using~your~TeX~package~manager~or~from~CTAN.\\ \\
-        Loading~l3keys2e~will~abort!
+        Please install an up to date~version of l3kernel
+        using your TeX package manager or from CTAN.\\ \\
+        Loading l3keys2e will abort!
       }
-    \tex_endinput:D
+    \endinput
   }
+\RequirePackage{xparse}
+\GetIdInfo$Id: l3keys2e.dtx 3207 2012-01-19 08:50:24Z joseph $
+  {LaTeX2e option processing using LaTeX3 keys}
+\ProvidesExplPackage
+  {\ExplFileName}{\ExplFileDate}{\ExplFileVersion}{\ExplFileDescription}
 \clist_new:N \keys_latexe_options_clist
 \bool_new:N \_l_keys_process_class_bool
 \cs_new_protected:Npn \keys_latexe_options:n #1
diff --git a/Master/texmf-dist/tex/latex/l3packages/xparse/xparse.sty b/Master/texmf-dist/tex/latex/l3packages/xparse/xparse.sty
index a73d9f7cd52..4c6955b7daf 100644
--- a/Master/texmf-dist/tex/latex/l3packages/xparse/xparse.sty
+++ b/Master/texmf-dist/tex/latex/l3packages/xparse/xparse.sty
@@ -17,7 +17,7 @@
 %%                      David Carlisle
 %%                  (C) Copyright 2004-2008 Frank Mittelbach,
 %%                      The LaTeX3 Project
-%%                  (C) Copyright 2009-2011 The LaTeX3 Project
+%%                  (C) Copyright 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
@@ -50,81 +50,337 @@
 %%
 %% -----------------------------------------------------------------------
 %%
-\RequirePackage{expl3}
-\GetIdInfo$Id: xparse.dtx 3109 2011-12-29 10:42:27Z joseph $
-  {L3 Experimental document command parser}
-\ProvidesExplPackage
-  {\ExplFileName}{\ExplFileDate}{\ExplFileVersion}{\ExplFileDescription}
-\RequirePackage{expl3}
-\@ifpackagelater { expl3 } { 2011/12/29 }
-  { }
+\RequirePackage{expl3}[2012/01/19]
+\@ifpackagelater{expl3}{2012/01/19}
+  {}
   {
-    \PackageError { xparse } { Support~package~l3kernel~too~old. }
+    \PackageError{xparse}{Support package l3kernel too old.}
       {
-        Please~install~an~up~to~date~version~of~l3kernel~
-        using~your~TeX~package~manager~or~from~CTAN.\\ \\
-        Loading~xparse~will~abort!
+        Please install an up to date~version of l3kernel
+        using your TeX package manager or from CTAN.\\ \\
+        Loading xparse will abort!
       }
-    \tex_endinput:D
+    \endinput
   }
+\GetIdInfo$Id: xparse.dtx 3209 2012-01-19 09:21:50Z joseph $
+  {L3 Experimental document command parser}
+\ProvidesExplPackage
+  {\ExplFileName}{\ExplFileDate}{\ExplFileVersion}{\ExplFileDescription}
 \prop_new:N \c_xparse_shorthands_prop
 \prop_put:Nnn \c_xparse_shorthands_prop { o } { d[] }
 \prop_put:Nnn \c_xparse_shorthands_prop { O } { D[] }
 \prop_put:Nnn \c_xparse_shorthands_prop { s } { t* }
-\tl_new:N \l_xparse_arg_tl
+\bool_new:N \l_xparse_all_long_bool
 \tl_new:N \l_xparse_args_tl
+\prop_new:N \l_xparse_command_arg_specs_prop
+\int_new:N \l_xparse_current_arg_int
 \bool_new:N \l_xparse_environment_bool
+\prop_new:N \l_xparse_environment_arg_specs_prop
+\bool_new:N \l_xparse_expandable_bool
+\tl_new:N \l_xparse_expandable_aux_name_tl
+\tl_set:Nn \l_xparse_expandable_aux_name_tl
+  {
+    \l_xparse_function_tl \c_space_tl
+    ( arg~ \int_use:N \l_xparse_current_arg_int )
+  }
+\tl_new:N \l_xparse_fn_tl
 \tl_new:N \l_xparse_function_tl
-\tl_new:N \l_xparse_last_arg_tl
 \bool_new:N \l_xparse_long_bool
 \int_new:N \l_xparse_m_args_int
-\bool_new:N \l_xparse_m_only_bool
 \int_new:N \l_xparse_mandatory_args_int
 \bool_new:N \l_xparse_processor_bool
 \int_new:N \l_xparse_processor_int
 \tl_new:N \l_xparse_signature_tl
 \tl_new:N \l_xparse_tmp_tl
-\int_new:N \l_xparse_total_args_int
-\cs_new_protected_nopar:Npn \xparse_add_grabber_mandatory:N #1
+\cs_new_protected_nopar:Npn \xparse_declare_cmd:Nnn
   {
-    \tl_put_right:Nx \l_xparse_signature_tl
+    \bool_set_false:N \l_xparse_expandable_bool
+    \xparse_declare_cmd_aux:Nnn
+  }
+\cs_new_protected_nopar:Npn \xparse_declare_expandable_cmd:Nnn
+  {
+    \bool_set_true:N \l_xparse_expandable_bool
+    \xparse_declare_cmd_aux:Nnn
+  }
+\cs_new_protected:Npn \xparse_declare_cmd_aux:Nnn #1#2
+  {
+    \cs_if_exist:NTF #1
       {
-        \exp_not:c
-          { xparse_grab_ #1 \bool_if:NT \l_xparse_long_bool { _long } :w }
+        \msg_kernel_warning:nnxx { xparse } { redefine-command }
+          { \token_to_str:N #1 } { \tl_to_str:n {#2} }
       }
-    \bool_set_false:N \l_xparse_long_bool
-    \int_decr:N \l_xparse_mandatory_args_int
+      {
+        \msg_kernel_info:nnxx { xparse } { define-command }
+          { \token_to_str:N #1 } { \tl_to_str:n {#2} }
+      }
+    \prop_put:Nnn \l_xparse_command_arg_specs_prop {#1} {#2}
+    \bool_set_false:N \l_xparse_environment_bool
+    \xparse_declare_cmd_internal:Nnn #1 {#2}
   }
-\cs_new_protected_nopar:Npn \xparse_add_grabber_optional:N #1
+\cs_new_protected:Npn \xparse_declare_cmd_internal:Nnn #1#2#3
   {
-    \tl_put_right:Nx \l_xparse_signature_tl
+    \tl_set:Nx \l_xparse_function_tl { \cs_to_str:N #1 }
+    \xparse_count_mandatory:n {#2}
+    \xparse_prepare_signature:n {#2}
+    \int_compare:nNnTF \l_xparse_current_arg_int = \l_xparse_m_args_int
       {
-        \exp_not:c
-          {
-            xparse_grab_ #1
-            \bool_if:NT \l_xparse_long_bool { _long }
-            \int_compare:nNnF \l_xparse_mandatory_args_int > \c_zero
-              { _trailing }
-            :w
-          }
+        \bool_if:NTF \l_xparse_environment_bool
+          { \xparse_declare_cmd_mixed:Nn #1 {#3} }
+          { \xparse_declare_cmd_all_m:Nn #1 {#3} }
+      }
+      { \xparse_declare_cmd_mixed:Nn #1 {#3} }
+    \xparse_break_point:n {#2}
+  }
+\cs_generate_variant:Nn \xparse_declare_cmd_internal:Nnn { cnx }
+\cs_new_eq:NN \xparse_break_point:n \use_none:n
+\cs_new_protected:Npn \xparse_declare_cmd_all_m:Nn #1#2
+  {
+    \cs_generate_from_arg_count:Ncnn #1
+      {
+        cs_set
+        \bool_if:NF \l_xparse_expandable_bool { _protected }
+        \bool_if:NF \l_xparse_all_long_bool { _nopar }
+        :Npn
+      }
+      \l_xparse_current_arg_int {#2}
+  }
+\cs_new_protected:Npn \xparse_declare_cmd_mixed:Nn
+  {
+    \bool_if:NTF \l_xparse_expandable_bool
+      { \xparse_declare_cmd_mixed_expandable:Nn }
+      { \xparse_declare_cmd_mixed_aux:Nn }
+   }
+\cs_new_protected:Npn \xparse_declare_cmd_mixed_aux:Nn #1#2
+  {
+    \xparse_flush_m_args:
+    \cs_generate_from_arg_count:cNnn
+      { \l_xparse_function_tl \c_space_tl code }
+      \cs_set_protected:Npn \l_xparse_current_arg_int {#2}
+    \cs_set_protected_nopar:Npx #1
+      {
+        \int_zero:N \l_xparse_processor_int
+        \tl_set:Nn \exp_not:N \l_xparse_args_tl
+          { \exp_not:c { \l_xparse_function_tl \c_space_tl code } }
+        \tl_set:Nn \exp_not:N \l_xparse_fn_tl
+          { \exp_not:c { \l_xparse_function_tl \c_space_tl } }
+        \exp_not:o \l_xparse_signature_tl
+        \exp_not:N \l_xparse_args_tl
+      }
+  }
+\cs_new_protected:Npn \xparse_declare_cmd_mixed_expandable:Nn #1#2
+  {
+    \cs_generate_from_arg_count:cNnn
+      { \l_xparse_function_tl \c_space_tl code }
+      \cs_set:Npn \l_xparse_current_arg_int {#2}
+    \cs_set_nopar:Npx #1
+      {
+        \exp_not:o \l_xparse_signature_tl
+        \exp_not:N \xparse_grab_expandable_end:wN
+        \exp_not:c { \l_xparse_function_tl \c_space_tl code }
+        \exp_not:N \q_xparse
+        \exp_not:c { \l_xparse_function_tl \c_space_tl }
+      }
+    \bool_if:NTF \l_xparse_long_bool
+      { \cs_set:cpx }
+      { \cs_set_nopar:cpx }
+      { \l_xparse_function_tl \c_space_tl } ##1##2 { ##1 {##2} }
+  }
+\cs_new_protected:Npn \xparse_declare_env:nnnn #1#2
+  {
+    \cs_if_exist:cTF {#1}
+      {
+        \msg_kernel_warning:nnxx { xparse } { redefine-environment }
+          {#1} { \tl_to_str:n {#2} }
+      }
+      {
+        \msg_kernel_info:nnxx { xparse } { define-environment }
+          {#1} { \tl_to_str:n {#2} }
+      }
+    \prop_put:Nnn \l_xparse_environment_arg_specs_prop {#1} {#2}
+    \bool_set_true:N \l_xparse_environment_bool
+    \xparse_declare_env_internal:nnnn {#1} {#2}
+  }
+\cs_new_protected:Npn \xparse_declare_env_internal:nnnn #1#2#3#4
+  {
+    \xparse_declare_cmd_internal:cnx { environment~ #1 } {#2}
+      {
+        \group_begin:
+          \cs_set_protected_nopar:Npx \exp_not:c { environment_ #1 _end_aux: }
+            {
+              \exp_not:c { environment_ #1 _end_aux:w }
+              \exp_not:n
+                {
+                  \exp_args:No \exp_not:o
+                    { \exp_after:wN \use_none:n \l_xparse_args_tl }
+                  \exp_not:n
+                    {
+                      \if@endpe
+                        \exp_after:wN \group_end:
+                        \exp_after:wN \@endpetrue
+                      \else
+                        \exp_after:wN \group_end:
+                      \fi
+                    }
+                }
+            }
+        \exp_not:n {#3}
       }
+    \cs_set_protected_nopar:cpx { environment~ #1 ~end }
+      { \exp_not:c { environment_ #1 _end_aux: } }
+    \cs_generate_from_arg_count:cNnn
+      { environment_ #1 _end_aux:w } \cs_set_protected:Npn
+      \l_xparse_current_arg_int {#4}
+    \cs_set_eq:cc {#1}       { environment~ #1 }
+    \cs_set_eq:cc { end #1 } { environment~ #1 ~end }
+  }
+\cs_new_protected:Npn \xparse_count_mandatory:n #1
+  {
+    \int_zero:N \l_xparse_mandatory_args_int
+    \xparse_count_mandatory:N #1
+      \q_recursion_tail \q_recursion_tail \q_recursion_tail \q_recursion_stop
+  }
+\cs_new_protected:Npn \xparse_count_mandatory:N #1
+  {
+    \quark_if_recursion_tail_stop:N #1
+    \prop_get:NnNTF \c_xparse_shorthands_prop {#1} \l_xparse_tmp_tl
+      { \exp_after:wN \xparse_count_mandatory:N \l_xparse_tmp_tl }
+      { \xparse_count_mandatory_aux:N #1 }
+  }
+\cs_new_protected:Npn \xparse_count_mandatory_aux:N #1
+  {
+    \cs_if_free:cTF { xparse_count_type_ \token_to_str:N #1 :w }
+      { \xparse_count_type_m:w }
+      { \use:c { xparse_count_type_ \token_to_str:N #1 :w } }
+  }
+\cs_new_protected:cpn { xparse_count_type_>:w } #1
+  {
+    \quark_if_recursion_tail_stop_do:nn {#1} { \xparse_bad_signature:wn }
+    \xparse_count_mandatory:N
+  }
+\cs_new_protected_nopar:cpn { xparse_count_type_+:w }
+  { \xparse_count_mandatory:N }
+\cs_new_protected:Npn \xparse_count_type_d:w #1#2
+  {
+    \xparse_single_token_check:n {#1}
+    \xparse_single_token_check:n {#2}
+    \quark_if_recursion_tail_stop_do:Nn #2 { \xparse_bad_signature:wn }
+    \xparse_count_mandatory:N
+  }
+\cs_new_protected:Npn \xparse_count_type_D:w #1#2#3
+  {
+    \xparse_single_token_check:n {#1}
+    \xparse_single_token_check:n {#2}
+    \quark_if_recursion_tail_stop_do:nn {#3} { \xparse_bad_signature:wn }
+    \xparse_count_mandatory:N
+  }
+\cs_new_protected_nopar:Npn \xparse_count_type_g:w
+  { \xparse_count_mandatory:N }
+\cs_new_protected:Npn \xparse_count_type_G:w #1
+  {
+    \quark_if_recursion_tail_stop_do:nn {#1} { \xparse_bad_signature:wn }
+    \xparse_count_mandatory:N
+  }
+\cs_new_protected_nopar:Npn \xparse_count_type_m:w
+  {
+    \int_incr:N \l_xparse_mandatory_args_int
+    \xparse_count_mandatory:N
+  }
+\cs_new_protected:Npn \xparse_count_type_r:w #1#2
+  {
+    \xparse_single_token_check:n {#1}
+    \xparse_single_token_check:n {#2}
+    \quark_if_recursion_tail_stop_do:Nn #2 { \xparse_bad_signature:wn }
+    \int_incr:N \l_xparse_mandatory_args_int
+    \xparse_count_mandatory:N
+  }
+\cs_new_protected:Npn \xparse_count_type_R:w #1#2#3
+  {
+    \xparse_single_token_check:n {#1}
+    \xparse_single_token_check:n {#2}
+    \quark_if_recursion_tail_stop_do:nn {#3} { \xparse_bad_signature:wn }
+    \int_incr:N \l_xparse_mandatory_args_int
+    \xparse_count_mandatory:N
+  }
+\cs_new_protected:Npn \xparse_count_type_t:w #1
+  {
+    \xparse_single_token_check:n {#1}
+    \quark_if_recursion_tail_stop_do:Nn #1 { \xparse_bad_signature:wn }
+    \xparse_count_mandatory:N
+  }
+\cs_new_protected:Npn \xparse_count_type_u:w #1
+  {
+    \quark_if_recursion_tail_stop_do:nn {#1} { \xparse_bad_signature:wn }
+    \int_incr:N \l_xparse_mandatory_args_int
+    \xparse_count_mandatory:N
+  }
+\cs_new_protected:Npn \xparse_single_token_check:n #1
+  {
+    \tl_if_single:nF {#1}
+      { \xparse_single_token_check_aux:nwn {#1} }
+  }
+\cs_new_protected:Npn \xparse_single_token_check_aux:nwn
+  #1#2 \xparse_break_point:n #3
+  {
+    \msg_kernel_error:nnx { xparse } { not-single-token }
+      { \tl_to_str:n {#1} } { \tl_to_str:n {#3} }
+  }
+\cs_new_protected:Npn \xparse_bad_signature:wn #1 \xparse_break_point:n #2
+  { \msg_kernel_error:nnx { xparse } { bad-signature } { \tl_to_str:n {#2} } }
+\cs_new_protected:Npn \xparse_prepare_signature:n #1
+  {
+    \bool_set_false:N \l_xparse_all_long_bool
+    \int_zero:N \l_xparse_current_arg_int
     \bool_set_false:N \l_xparse_long_bool
+    \int_zero:N \l_xparse_m_args_int
+    \bool_set_false:N \l_xparse_processor_bool
+    \tl_clear:N \l_xparse_signature_tl
+    \xparse_prepare_signature:N #1 \q_recursion_tail \q_recursion_stop
+  }
+\cs_new_protected_nopar:Npn \xparse_prepare_signature:N
+  {
+    \bool_set_false:N \l_xparse_processor_bool
+    \xparse_prepare_signature_bypass:N
+  }
+\cs_new_protected:Npn \xparse_prepare_signature_bypass:N #1
+  {
+    \quark_if_recursion_tail_stop:N #1
+    \prop_get:NnNTF \c_xparse_shorthands_prop {#1} \l_xparse_tmp_tl
+      { \exp_after:wN \xparse_prepare_signature:N \l_xparse_tmp_tl }
+      {
+        \int_incr:N \l_xparse_current_arg_int
+        \xparse_prepare_signature_add:N #1
+      }
+  }
+\cs_new_protected:Npn \xparse_prepare_signature_add:N #1
+  {
+    \cs_if_exist_use:cF
+      {
+         xparse_add
+         \bool_if:NT \l_xparse_expandable_bool { _expandable }
+         _type_  \token_to_str:N #1 :w
+      }
+      {
+        \msg_kernel_error:nnx { xparse } { unknown-argument-type }
+          { \token_to_str:N #1 }
+        \bool_if:NTF \l_xparse_expandable_bool
+          { \xparse_add_expandable_type_m:w }
+          { \xparse_add_type_m:w }
+      }
   }
 \cs_new_protected_nopar:cpn { xparse_add_type_+:w }
   {
     \xparse_flush_m_args:
     \bool_set_true:N \l_xparse_long_bool
-    \bool_set_false:N \l_xparse_m_only_bool
-    \int_decr:N \l_xparse_total_args_int
+    \int_decr:N \l_xparse_current_arg_int
     \xparse_prepare_signature:N
   }
 \cs_new_protected:cpn { xparse_add_type_>:w } #1
   {
     \bool_set_true:N \l_xparse_processor_bool
     \xparse_flush_m_args:
-    \int_decr:N \l_xparse_total_args_int
+    \int_decr:N \l_xparse_current_arg_int
     \tl_put_right:Nn \l_xparse_signature_tl { \xparse_process_arg:n {#1} }
-    \xparse_prepare_signature_aux:N
+    \xparse_prepare_signature_bypass:N
   }
 \cs_new_protected:Npn \xparse_add_type_d:w #1#2
   { \xparse_add_type_D:w #1 #2 { \NoValue } }
@@ -160,6 +416,15 @@
       { \int_incr:N \l_xparse_m_args_int }
     \xparse_prepare_signature:N
   }
+\cs_new_protected:Npn \xparse_add_type_r:w #1#2
+  { \xparse_add_type_R:w #1 #2 { \NoValue } }
+\cs_new_protected:Npn \xparse_add_type_R:w #1#2#3
+  {
+    \xparse_flush_m_args:
+    \xparse_add_grabber_mandatory:N R
+    \tl_put_right:Nn \l_xparse_signature_tl { #1 #2 {#3} }
+    \xparse_prepare_signature:N
+  }
 \cs_new_protected:Npn \xparse_add_type_t:w #1
   {
     \xparse_flush_m_args:
@@ -180,276 +445,188 @@
     \xparse_add_grabber_mandatory:N v
     \xparse_prepare_signature:N
   }
-\cs_new_protected_nopar:Npn \xparse_check_and_add:N #1
+\cs_new_protected_nopar:Npn \xparse_flush_m_args:
   {
-    \cs_if_free:cTF { xparse_add_type_ #1 :w }
+    \int_compare:nNnT \l_xparse_m_args_int > \c_zero
       {
-        \msg_error:nnx { xparse } { unknown-argument-type }
-          { \tl_to_str:n {#1} }
-        \xparse_add_type_m:w
+        \tl_put_right:Nx \l_xparse_signature_tl
+           { \exp_not:c { xparse_grab_m_ \int_use:N \l_xparse_m_args_int :w } }
+        \int_set:Nn \l_xparse_mandatory_args_int
+          { \l_xparse_mandatory_args_int - \l_xparse_m_args_int }
       }
-      { \use:c { xparse_add_type_ #1 :w } }
-  }
-\cs_new_protected:Npn \xparse_count_mandatory:n #1
-  {
-    \int_zero:N \l_xparse_mandatory_args_int
-    \xparse_count_mandatory:N #1 \q_nil
+    \int_zero:N \l_xparse_m_args_int
   }
-\cs_new_protected:Npn \xparse_count_mandatory:N #1
+\cs_new_protected_nopar:Npn \xparse_add_grabber_mandatory:N #1
   {
-    \quark_if_nil:NF #1
+    \tl_put_right:Nx \l_xparse_signature_tl
       {
-        \prop_get:NnNTF \c_xparse_shorthands_prop {#1} \l_xparse_tmp_tl
-          { \exp_last_unbraced:NV \xparse_count_mandatory:N \l_xparse_tmp_tl }
-          { \xparse_count_mandatory_aux:N #1 }
+        \exp_not:c
+          { xparse_grab_ #1 \bool_if:NT \l_xparse_long_bool { _long } :w }
       }
+    \bool_set_false:N \l_xparse_long_bool
+    \int_decr:N \l_xparse_mandatory_args_int
   }
-\cs_new_protected:Npn \xparse_count_mandatory_aux:N #1
-  {
-    \cs_if_free:cTF { xparse_count_type_ #1 :w }
-      { \xparse_count_type_m:w }
-      { \use:c { xparse_count_type_ #1 :w } }
-  }
-\cs_new_protected:cpn { xparse_count_type_>:w } #1
-  { \xparse_count_mandatory:N }
-\cs_new_protected_nopar:cpn { xparse_count_type_+:w }
-  { \xparse_count_mandatory:N }
-\cs_new_protected:Npn \xparse_count_type_d:w #1#2
-  { \xparse_count_mandatory:N }
-\cs_new_protected:Npn \xparse_count_type_D:w #1#2#3
-  { \xparse_count_mandatory:N }
-\cs_new_protected_nopar:Npn \xparse_count_type_g:w
-  { \xparse_count_mandatory:N }
-\cs_new_protected:Npn \xparse_count_type_G:w #1
-  { \xparse_count_mandatory:N }
-\cs_new_protected_nopar:Npn \xparse_count_type_l:w
-  {
-    \int_incr:N \l_xparse_mandatory_args_int
-    \xparse_count_mandatory:N
-  }
-\cs_new_protected_nopar:Npn \xparse_count_type_m:w
+\cs_new_protected_nopar:Npn \xparse_add_grabber_optional:N #1
   {
-    \int_incr:N \l_xparse_mandatory_args_int
-    \xparse_count_mandatory:N
+    \tl_put_right:Nx \l_xparse_signature_tl
+      {
+        \exp_not:c
+          {
+            xparse_grab_ #1
+            \bool_if:NT \l_xparse_long_bool { _long }
+            \int_compare:nNnF \l_xparse_mandatory_args_int > \c_zero
+              { _trailing }
+            :w
+          }
+      }
+    \bool_set_false:N \l_xparse_long_bool
   }
-\cs_new_protected:Npn \xparse_count_type_t:w #1
-  { \xparse_count_mandatory:N }
-\cs_new_protected:Npn \xparse_count_type_u:w #1
+\cs_new_protected_nopar:cpn { xparse_add_expandable_type_+:w }
   {
-    \int_incr:N \l_xparse_mandatory_args_int
-    \xparse_count_mandatory:N
+    \bool_set_true:N \l_xparse_long_bool
+    \int_compare:nNnTF \l_xparse_current_arg_int = \c_one
+      { \bool_set_true:N \l_xparse_all_long_bool }
+      {
+        \bool_if:NF \l_xparse_all_long_bool
+          { \msg_kernel_error:nn { xparse } { inconsistent-long } }
+      }
+    \int_decr:N \l_xparse_current_arg_int
+    \xparse_prepare_signature:N
   }
-\cs_new_protected_nopar:Npn \xparse_count_type_v:w
+\cs_new_protected:cpn { xparse_add_expandable_type_>:w } #1
   {
-    \int_incr:N \l_xparse_mandatory_args_int
-    \xparse_count_mandatory:N
+    \msg_kernel_error:nnx { xparse } { processor-in-expandable }
+      { \token_to_str:c { \l_xparse_function_tl } }
+    \int_decr:N \l_xparse_current_arg_int
+    \xparse_prepare_signature:N
   }
-\cs_new_protected:Npn \xparse_declare_cmd:Nnn #1#2
+\cs_new_protected:Npn \xparse_add_expandable_type_d:w #1#2
+  { \xparse_add_expandable_type_D:w #1 #2 { \NoValue } }
+\cs_new_protected:Npn \xparse_add_expandable_type_D:w #1#2
   {
-    \cs_if_exist:NTF #1
+    \token_if_eq_meaning:NNTF #1 #2
       {
-        \msg_warning:nnxx { xparse } { redefine-command }
-          { \token_to_str:N #1 } { \tl_to_str:n {#2} }
+        \xparse_add_expandable_grabber_optional:n { D_alt }
+        \xparse_add_expandable_type_D_aux:Nn #1
       }
       {
-        \msg_info:nnxx { xparse } { define-command }
-          { \token_to_str:N #1 } { \tl_to_str:n {#2} }
+        \xparse_add_expandable_grabber_optional:n { D }
+        \xparse_add_expandable_type_D_aux:NNn #1#2
       }
-    \xparse_declare_cmd_aux:Nnn #1 {#2}
   }
-\cs_new_protected:Npn \xparse_declare_cmd_aux:Nnn #1#2#3
-  {
-    \tl_clear_new:c { l_xparse_ \token_to_str:N #1 _arg_spec_tl }
-    \tl_set:cn { l_xparse_ \token_to_str:N #1 _arg_spec_tl } {#2}
-    \xparse_count_mandatory:n {#2}
-    \xparse_prepare_signature:n {#2}
-    \bool_if:NTF \l_xparse_m_only_bool
-      { \xparse_declare_cmd_all_m:Nn #1 {#3} }
-      { \xparse_declare_cmd_mixed:Nn #1 {#3} }
-  }
-\cs_generate_variant:Nn \xparse_declare_cmd_aux:Nnn { cnn }
-\cs_new_protected:Npn \xparse_declare_cmd_all_m:Nn #1#2
+\cs_new_protected:Npn \xparse_add_expandable_type_D_aux:NNn #1#2#3
   {
-    \cs_generate_from_arg_count:NNnn
-      #1 \cs_set_protected_nopar:Npn \l_xparse_total_args_int {#2}
+    \bool_if:NTF \l_xparse_long_bool
+      { \cs_set:cpx }
+      { \cs_set_nopar:cpx }
+      { \l_xparse_expandable_aux_name_tl } ##1 ##2 #1 ##3 \q_xparse ##4 #2
+      { ##1 {##2} {##3} {##4} }
+    \tl_put_right:Nx \l_xparse_signature_tl
+      {
+        \exp_not:c  { \l_xparse_expandable_aux_name_tl }
+        \exp_not:n { #1 #2 {#3} }
+      }
+    \bool_set_false:N \l_xparse_long_bool
+    \xparse_prepare_signature:N
   }
-\cs_new_protected:Npn \xparse_declare_cmd_mixed:Nn #1#2
+\cs_new_protected:Npn \xparse_add_expandable_type_D_aux:Nn #1#2
   {
-    \group_begin:
-      \tex_escapechar:D 92 \scan_stop:
-      \tl_set:Nx \l_xparse_function_tl { \token_to_str:N #1 }
-    \exp_args:NNNo \group_end:
-    \tl_set:Nn \l_xparse_function_tl { \l_xparse_function_tl }
-    \cs_set_protected_nopar:Npx #1
+    \bool_if:NTF \l_xparse_long_bool
+      { \cs_set:cpx }
+      { \cs_set_nopar:cpx }
+      { \l_xparse_expandable_aux_name_tl } ##1 #1 ##2 #1
+      { ##1 {##2} }
+    \tl_put_right:Nx \l_xparse_signature_tl
       {
-        \exp_not:n
-          {
-            \int_zero:N \l_xparse_processor_int
-            \tl_set:Nn \l_xparse_args_tl
-          }
-            { \exp_not:c { \l_xparse_function_tl } }
-        \exp_not:o \l_xparse_signature_tl
-        \exp_not:N \l_xparse_args_tl
+        \exp_not:c  { \l_xparse_expandable_aux_name_tl }
+        \exp_not:n { #1 {#2} }
       }
-    \cs_generate_from_arg_count:cNnn
-      { \token_to_str:N #1 } \cs_set:Npn \l_xparse_total_args_int {#2}
+    \bool_set_false:N \l_xparse_long_bool
+    \xparse_prepare_signature:N
   }
-\cs_new_protected:Npn \xparse_declare_cmd_implementation:nNn #1#2#3
+\cs_new_protected_nopar:Npn \xparse_add_expandable_type_g:w
   {
-    \cs_generate_from_arg_count:cNnn { implementation_ #1 :w }
-      \cs_set:Npn {#2} {#3}
+    \msg_kernel_error:nnx { xparse } { invalid-expandable-argument-type } { g }
+    \xparse_add_expandable_type_m:w
   }
-\cs_new_protected:Npn \xparse_declare_cmd_interface:Nnn #1#2#3
+\cs_new_protected_nopar:Npn \xparse_add_expandable_type_G:w #1
   {
-    \xparse_prepare_signature:n {#3}
-    \bool_if:NTF \l_xparse_m_only_bool
-      { \xparse_declare_cmd_interface_all_m:Nn #1 {#2} }
-      { \xparse_declare_cmd_interface_mixed:Nn #1 {#2} }
-    \cs_generate_from_arg_count:cNnn { implementation_ #2 :w }
-      \cs_set:Npn \l_xparse_total_args_int  { '#2' }
+    \msg_kernel_error:nnx { xparse } { invalid-expandable-argument-type } { G }
+    \xparse_add_expandable_type_m:w
   }
-\cs_new_protected:Npn \xparse_declare_cmd_interface_all_m:Nn #1#2
+\cs_new_protected_nopar:Npn \xparse_add_expandable_type_l:w
   {
-    \cs_generate_from_arg_count:NNnn
-      #1 \cs_set_protected_nopar:Npn \l_xparse_total_args_int
-      { \use:c { implementation_ #2 :w } }
+    \msg_kernel_error:nnx { xparse } { invalid-expandable-argument-type } { l }
+    \xparse_add_expandable_type_m:w
   }
-\cs_new_protected:Npn \xparse_declare_cmd_interface_mixed:Nn #1#2
+\cs_new_protected_nopar:Npn \xparse_add_expandable_type_m:w
   {
-    \cs_set_protected_nopar:Npx #1
-      {
-        \exp_not:n
-          {
-            \int_zero:N \l_xparse_processor_int
-            \tl_set:Nn \l_xparse_args_tl
-          }
-            { \exp_not:c { \token_to_str:N #1 } }
-        \exp_not:o \l_xparse_signature_tl
-        \exp_not:N \l_xparse_args_tl
-      }
-    \cs_generate_from_arg_count:cNnn
-      { \token_to_str:N #1 } \cs_set:Npn \l_xparse_total_args_int
-      { \use:c { implementation_ #2 :w } }
+    \int_incr:N \l_xparse_m_args_int
+    \xparse_add_expandable_grabber_mandatory:n { m }
+    \bool_set_false:N \l_xparse_long_bool
+    \xparse_prepare_signature:N
   }
-\cs_new_protected:Npn \xparse_declare_env:nnnn #1#2#3#4
+\cs_new_protected:Npn \xparse_add_expandable_type_r:w #1#2
+  { \xparse_add_expandable_type_R:w #1 #2 { \NoValue } }
+\cs_new_protected:Npn \xparse_add_expandable_type_R:w #1#2
   {
-    \bool_set_true:N \l_xparse_environment_bool
-    \cs_if_exist:cTF {#1}
+    \token_if_eq_meaning:NNTF #1 #2
       {
-        \msg_warning:nnxx { xparse } { redefine-environment }
-          { \tl_to_str:n {#1} } { \tl_to_str:n {#2} }
+        \xparse_add_expandable_grabber_optional:n { R_alt }
+        \xparse_add_expandable_type_D_aux:Nn #1
       }
       {
-        \msg_info:nnxx { xparse } { define-environment }
-          { \tl_to_str:n {#1} } { \tl_to_str:n {#2} }
+        \xparse_add_expandable_grabber_optional:n { R }
+        \xparse_add_expandable_type_D_aux:NNn #1#2
       }
-    \xparse_declare_cmd_aux:cnn { environment_begin_ #1 :w } {#2}
-      {
-        \group_begin:
-          \cs_set_protected_nopar:cpx { environment_end_ #1 :w }
-            {
-                \exp_not:c { environment_end_ #1 _aux:N }
-                \exp_not:o \l_xparse_args_tl
-                \exp_not:n
-                  {
-                    \if@endpe
-                      \exp_after:wN \group_end:
-                      \cs:w @endpetrue \exp_after:wN \cs_end:
-                    \else
-                      \exp_after:wN \group_end:
-                    \fi
-                  }
-            }
-          #3
-      }
-   \cs_set_protected_nopar:cpx { environment_end_ #1 : }
-     { \exp_not:c { environment_end_ #1 :w } }
-    \bool_set_false:N \l_xparse_environment_bool
-    \cs_set_nopar:cpx { environment_end_ #1 _aux:N } ##1
-      { \exp_not:c { environment_end_ #1 _aux :w } }
-    \cs_generate_from_arg_count:cNnn
-      { environment_end_ #1 _aux :w } \cs_set:Npn
-      \l_xparse_total_args_int {#4}
-    \cs_set_eq:cc {#1} { environment_begin_ #1 :w }
-    \cs_set_eq:cc { end #1 } { environment_end_ #1 : }
   }
-\cs_new_protected_nopar:Npn \xparse_flush_m_args:
+\cs_new_protected_nopar:Npn \xparse_add_expandable_type_t:w #1
   {
-    \cs_if_exist:cT { xparse_grab_m_ \int_use:N \l_xparse_m_args_int :w }
+    \xparse_add_expandable_grabber_optional:n { t }
+    \bool_if:NTF \l_xparse_long_bool
+      { \cs_set:cpn }
+      { \cs_set_nopar:cpn }
+      { \l_xparse_expandable_aux_name_tl } ##1 #1 {##1}
+    \tl_put_right:Nx \l_xparse_signature_tl
       {
-        \tl_put_right:Nx \l_xparse_signature_tl
-           { \exp_not:c { xparse_grab_m_ \int_use:N \l_xparse_m_args_int :w } }
-        \int_set:Nn \l_xparse_mandatory_args_int
-          { \l_xparse_mandatory_args_int - \l_xparse_m_args_int }
+        \exp_not:c  { \l_xparse_expandable_aux_name_tl }
+        \exp_not:N #1
       }
-    \int_zero:N \l_xparse_m_args_int
-    \bool_set_false:N \l_xparse_m_only_bool
-  }
-\prg_new_conditional:Npnn \xparse_if_no_value:n #1 { T ,  F , TF }
-  { \str_if_eq:nnTF {#1} { \NoValue } \prg_return_true: \prg_return_false: }
-\cs_new_protected:Npn \xparse_prepare_signature:n #1
-  {
     \bool_set_false:N \l_xparse_long_bool
-    \int_zero:N \l_xparse_m_args_int
-    \bool_if:NTF \l_xparse_environment_bool
-      { \bool_set_false:N \l_xparse_m_only_bool }
-      { \bool_set_true:N \l_xparse_m_only_bool }
-    \bool_set_false:N \l_xparse_processor_bool
-    \tl_clear:N \l_xparse_signature_tl
-    \int_zero:N \l_xparse_total_args_int
-    \xparse_prepare_signature:N #1 \q_nil
+    \xparse_prepare_signature:N
   }
-\cs_new_protected:Npn \xparse_prepare_signature:N #1
+\cs_new_protected_nopar:Npn \xparse_add_expandable_type_u:w #1
   {
-    \bool_set_false:N \l_xparse_processor_bool
-    \xparse_prepare_signature_aux:N #1
+    \msg_kernel_error:nnx { xparse } { invalid-expandable-argument-type } { u }
+    \xparse_add_expandable_type_m:w
   }
-\cs_new_protected:Npn \xparse_prepare_signature_aux:N #1
+\cs_new_protected_nopar:Npn \xparse_add_expandable_type_v:w
   {
-    \quark_if_nil:NTF #1
-      { \bool_if:NF \l_xparse_m_only_bool { \xparse_flush_m_args: } }
-      {
-        \prop_get:NnNTF \c_xparse_shorthands_prop {#1} \l_xparse_tmp_tl
-          { \exp_after:wN \xparse_prepare_signature:N \l_xparse_tmp_tl }
-          {
-            \int_incr:N \l_xparse_total_args_int
-            \xparse_check_and_add:N #1
-          }
-      }
+    \msg_kernel_error:nnx { xparse } { invalid-expandable-argument-type } { v }
+    \xparse_add_expandable_type_m:w
   }
-\cs_new_protected:Npn \xparse_process_arg:n #1
+\cs_new_protected_nopar:Npn \xparse_add_expandable_grabber_mandatory:n #1
   {
-    \int_incr:N \l_xparse_processor_int
-    \cs_set:cpn { xparse_processor_ \int_use:N \l_xparse_processor_int :n } ##1
-      { #1 {##1} }
+    \xparse_add_expandable_long_check:
+    \tl_put_right:Nx \l_xparse_signature_tl
+      { \exp_not:c { xparse_expandable_grab_ #1 :w } }
+    \bool_set_false:N \l_xparse_long_bool
+    \int_decr:N \l_xparse_mandatory_args_int
   }
-\cs_new_protected:Npn \xparse_add_arg:n #1
+\cs_new_protected_nopar:Npn \xparse_add_expandable_grabber_optional:n #1
   {
-    \int_compare:nNnTF \l_xparse_processor_int = \c_zero
-      { \tl_put_right:Nn \l_xparse_args_tl { {#1} } }
-      {
-        \xparse_if_no_value:nTF {#1}
-          {
-            \int_zero:N \l_xparse_processor_int
-            \tl_put_right:Nn \l_xparse_args_tl { {#1} }
-          }
-          { \xparse_add_arg_aux:n {#1} }
-      }
+    \xparse_add_expandable_long_check:
+    \int_compare:nNnF \l_xparse_mandatory_args_int > \c_zero
+      { \msg_kernel_error:nn { xparse } { expandable-ending-optional } }
+    \tl_put_right:Nx \l_xparse_signature_tl
+      { \exp_not:c { xparse_expandable_grab_ #1 :w } }
+    \bool_set_false:N \l_xparse_long_bool
   }
-\cs_generate_variant:Nn \xparse_add_arg:n { V }
-\cs_new_protected:Npn \xparse_add_arg_aux:n #1
+\cs_new_protected_nopar:Npn \xparse_add_expandable_long_check:
   {
-    \tl_set_eq:NN \ProcessedArgument \l_xparse_arg_tl
-    \use:c { xparse_processor_ \int_use:N \l_xparse_processor_int :n } {#1}
-    \int_decr:N \l_xparse_processor_int
-    \int_compare:nNnTF \l_xparse_processor_int = \c_zero
-      {
-        \tl_put_right:Nx \l_xparse_args_tl
-          { { \exp_not:V \ProcessedArgument } }
-      }
-      { \xparse_add_arg_aux:V \ProcessedArgument }
-}
-\cs_generate_variant:Nn \xparse_add_arg_aux:n { V }
+    \bool_if:nT { \l_xparse_all_long_bool && ! ( \l_xparse_long_bool ) }
+      { \msg_kernel_error:nn { xparse } { inconsistent-long } }
+  }
 \cs_new_protected:Npn \xparse_grab_arg:w { }
 \cs_new_protected:Npn \xparse_grab_arg_aux_i:w { }
 \cs_new_protected:Npn \xparse_grab_arg_aux_ii:w { }
@@ -469,34 +646,47 @@
   { \xparse_grab_D_aux:NNnnNn #1 #2 {#3} {#4} \cs_set_protected:Npn { } }
 \cs_new_protected:Npn \xparse_grab_D_aux:NNnnNn #1#2#3#4#5#6
   {
-    #5 \xparse_grab_arg:w #1
-      {
-        \peek_meaning:NTF \c_group_begin_token
-          { \xparse_grab_arg_aux_i:w }
-          { \xparse_grab_arg_aux_ii:w }
-      }
-    #5 \xparse_grab_arg_aux_i:w ##1
-      {
-        \peek_charcode:NTF #2
-          { \xparse_grab_arg_aux_ii:w { {##1} } }
-          { \xparse_grab_arg_aux_ii:w {##1} }
-      }
-    #5 \xparse_grab_arg_aux_ii:w ##1 #2
-      {
-        \tl_if_in:nnTF {##1} {#1}
-          { \xparse_grab_D_nested:NNnnN #1 #2 {##1} {#4} #5 }
-          {
-            \xparse_add_arg:n {##1}
-            #4 \l_xparse_args_tl
-           }
-      }
-    \use:c { peek_charcode #6 :NTF } #1
+    \xparse_grab_D_aux:NNnN #1#2 {#4} #5
+    \use:c { peek_meaning_remove #6 :NTF } #1
       { \xparse_grab_arg:w }
       {
         \xparse_add_arg:n {#3}
         #4 \l_xparse_args_tl
       }
   }
+\cs_new_protected:Npn \xparse_grab_D_aux:NNnN #1#2#3#4
+  {
+    \cs_set_protected_nopar:Npn \xparse_grab_arg:w
+      {
+        \exp_after:wN #4 \l_xparse_fn_tl ####1 #2
+          {
+            \tl_if_in:nnTF {####1} {#1}
+              { \xparse_grab_D_nested:NNnnN #1 #2 {####1} {#3} #4 }
+              {
+                \xparse_add_arg:o { \use_none:n ####1 }
+                #3 \l_xparse_args_tl
+              }
+          }
+        \group_begin:
+          \token_if_eq_catcode:NNTF #1 ^
+            {
+              \char_set_lccode:nn { `A } { `#1 }
+              \tl_to_lowercase:n
+                {
+                  \group_end:
+                  \l_xparse_fn_tl A
+                }
+            }
+            {
+              \char_set_lccode:nn { `^ } { `#1 }
+              \tl_to_lowercase:n
+                {
+                  \group_end:
+                  \l_xparse_fn_tl ^
+                }
+            }
+      }
+  }
 \tl_new:N \l_xparse_nesting_a_tl
 \tl_new:N \l_xparse_nesting_b_tl
 \quark_new:N \q_xparse
@@ -504,19 +694,24 @@
   {
     \tl_clear:N \l_xparse_nesting_a_tl
     \tl_clear:N \l_xparse_nesting_b_tl
-    #5 \xparse_grab_arg:w ##1 #1 ##2 \q_xparse ##3 #2
+    \exp_after:wN #5 \l_xparse_fn_tl ##1 #1 ##2 \q_xparse ##3 #2
       {
-        \tl_put_right:Nn \l_xparse_nesting_a_tl { ##1 #1 }
-        \tl_put_right:Nn \l_xparse_nesting_b_tl { #2 ##3 }
+        \tl_put_right:No \l_xparse_nesting_a_tl { \use_none:n ##1 #1 }
+        \tl_put_right:No \l_xparse_nesting_b_tl { \use_i:nn #2 ##3 }
         \tl_if_in:nnTF {##2} {#1}
-          { \xparse_grab_arg:w ##2 \q_xparse }
           {
-            \tl_put_right:Nn \l_xparse_nesting_a_tl {##2}
+            \l_xparse_fn_tl
+              \q_nil ##2 \q_xparse \ERROR
+          }
+          {
+            \tl_put_right:Nx \l_xparse_nesting_a_tl
+              { \xparse_grab_D_nested:w \q_nil ##2 \q_stop }
             \tl_if_in:NnTF \l_xparse_nesting_b_tl {#1}
               {
                 \tl_set_eq:NN \l_xparse_tmp_tl \l_xparse_nesting_b_tl
                 \tl_clear:N \l_xparse_nesting_b_tl
-                \exp_after:wN \xparse_grab_arg:w \l_xparse_tmp_tl \q_xparse
+                \exp_after:wN \l_xparse_fn_tl \exp_after:wN
+                  \q_nil \l_xparse_tmp_tl \q_nil \q_xparse \ERROR
               }
               {
                 \tl_put_right:No \l_xparse_nesting_a_tl
@@ -526,8 +721,10 @@
               }
           }
       }
-    \xparse_grab_arg:w #3 \q_xparse
+    \l_xparse_fn_tl #3 \q_nil \q_xparse \ERROR
   }
+\cs_new:Npn \xparse_grab_D_nested:w #1 \q_nil \q_stop
+  { \exp_not:o { \use_none:n #1 } }
 \cs_new_protected:Npn \xparse_grab_G:w #1#2 \l_xparse_args_tl
   {
     \xparse_grab_G_aux:nnNn {#1} {#2} \cs_set_protected_nopar:Npn
@@ -543,13 +740,13 @@
   { \xparse_grab_G_aux:nnNn {#1} {#2} \cs_set_protected:Npn { } }
 \cs_new_protected:Npn \xparse_grab_G_aux:nnNn #1#2#3#4
   {
-    #3 \xparse_grab_arg:w ##1
+    \exp_after:wN #3 \l_xparse_fn_tl ##1
       {
         \xparse_add_arg:n {##1}
         #2 \l_xparse_args_tl
       }
     \use:c { peek_meaning #4 :NTF } \c_group_begin_token
-      { \xparse_grab_arg:w }
+      { \l_xparse_fn_tl }
       {
         \xparse_add_arg:n {#1}
         #2 \l_xparse_args_tl
@@ -561,105 +758,128 @@
   { \xparse_grab_l_aux:nN {#1} \cs_set_protected:Npn }
 \cs_new_protected:Npn \xparse_grab_l_aux:nN #1#2
   {
-    #2 \xparse_grab_arg:w ##1##
+    \exp_after:wN #2 \l_xparse_fn_tl ##1##
       {
         \xparse_add_arg:n {##1}
         #1 \l_xparse_args_tl
       }
-    \xparse_grab_arg:w
+    \l_xparse_fn_tl
   }
 \cs_new_protected:Npn \xparse_grab_m:w #1 \l_xparse_args_tl
   {
-    \cs_set_protected_nopar:Npn \xparse_grab_arg:w ##1
+    \exp_after:wN \cs_set_protected_nopar:Npn \l_xparse_fn_tl ##1
       {
         \xparse_add_arg:n {##1}
         #1 \l_xparse_args_tl
       }
-    \xparse_grab_arg:w
+    \l_xparse_fn_tl
   }
 \cs_new_protected:Npn \xparse_grab_m_long:w #1 \l_xparse_args_tl
   {
-    \cs_set_protected:Npn \xparse_grab_arg:w ##1
+    \exp_after:wN \cs_set_protected:Npn \l_xparse_fn_tl ##1
       {
         \xparse_add_arg:n {##1}
         #1 \l_xparse_args_tl
       }
-    \xparse_grab_arg:w
+    \l_xparse_fn_tl
   }
 \cs_new_protected:cpn { xparse_grab_m_1:w } #1 \l_xparse_args_tl
   {
-    \cs_set_protected_nopar:Npn \xparse_grab_arg:w ##1
+    \exp_after:wN \cs_set_protected_nopar:Npn \l_xparse_fn_tl ##1
       {
         \tl_put_right:Nn \l_xparse_args_tl { {##1} }
         #1 \l_xparse_args_tl
       }
-    \xparse_grab_arg:w
+    \l_xparse_fn_tl
   }
 \cs_new_protected:cpn { xparse_grab_m_2:w } #1 \l_xparse_args_tl
   {
-    \cs_set_protected_nopar:Npn \xparse_grab_arg:w ##1##2
+    \exp_after:wN \cs_set_protected_nopar:Npn \l_xparse_fn_tl
+      ##1##2
       {
         \tl_put_right:Nn \l_xparse_args_tl { {##1} {##2} }
         #1 \l_xparse_args_tl
       }
-    \xparse_grab_arg:w
+    \l_xparse_fn_tl
   }
 \cs_new_protected:cpn { xparse_grab_m_3:w } #1 \l_xparse_args_tl
   {
-    \cs_set_protected_nopar:Npn \xparse_grab_arg:w ##1##2##3
+    \exp_after:wN \cs_set_protected_nopar:Npn \l_xparse_fn_tl
+      ##1##2##3
       {
         \tl_put_right:Nn \l_xparse_args_tl { {##1} {##2} {##3} }
         #1 \l_xparse_args_tl
       }
-    \xparse_grab_arg:w
+    \l_xparse_fn_tl
   }
 \cs_new_protected:cpn { xparse_grab_m_4:w } #1 \l_xparse_args_tl
   {
-    \cs_set_protected_nopar:Npn \xparse_grab_arg:w ##1##2##3##4
+    \exp_after:wN \cs_set_protected_nopar:Npn \l_xparse_fn_tl
+      ##1##2##3##4
       {
         \tl_put_right:Nn \l_xparse_args_tl { {##1} {##2} {##3} {##4} }
         #1 \l_xparse_args_tl
       }
-    \xparse_grab_arg:w
+    \l_xparse_fn_tl
   }
 \cs_new_protected:cpn { xparse_grab_m_5:w } #1 \l_xparse_args_tl
   {
-    \cs_set_protected_nopar:Npn \xparse_grab_arg:w ##1##2##3##4##5
+    \exp_after:wN \cs_set_protected_nopar:Npn \l_xparse_fn_tl
+      ##1##2##3##4##5
       {
         \tl_put_right:Nn \l_xparse_args_tl { {##1} {##2} {##3} {##4} {##5} }
         #1 \l_xparse_args_tl
       }
-    \xparse_grab_arg:w
+    \l_xparse_fn_tl
   }
 \cs_new_protected:cpn { xparse_grab_m_6:w } #1 \l_xparse_args_tl
   {
-    \cs_set_protected_nopar:Npn \xparse_grab_arg:w ##1##2##3##4##5##6
+    \exp_after:wN \cs_set_protected_nopar:Npn \l_xparse_fn_tl
+      ##1##2##3##4##5##6
       {
         \tl_put_right:Nn \l_xparse_args_tl
           { {##1} {##2} {##3} {##4} {##5} {##6} }
         #1 \l_xparse_args_tl
       }
-    \xparse_grab_arg:w
+    \l_xparse_fn_tl
   }
 \cs_new_protected:cpn { xparse_grab_m_7:w } #1 \l_xparse_args_tl
   {
-    \cs_set_protected_nopar:Npn \xparse_grab_arg:w ##1##2##3##4##5##6##7
+    \exp_after:wN \cs_set_protected_nopar:Npn \l_xparse_fn_tl
+      ##1##2##3##4##5##6##7
       {
         \tl_put_right:Nn \l_xparse_args_tl
           { {##1} {##2} {##3} {##4} {##5} {##6} {##7} }
         #1 \l_xparse_args_tl
       }
-    \xparse_grab_arg:w
+    \l_xparse_fn_tl
   }
 \cs_new_protected:cpn { xparse_grab_m_8:w } #1 \l_xparse_args_tl
   {
-    \cs_set_protected_nopar:Npn \xparse_grab_arg:w ##1##2##3##4##5##6##7##8
+    \exp_after:wN \cs_set_protected_nopar:Npn \l_xparse_fn_tl
+      ##1##2##3##4##5##6##7##8
       {
         \tl_put_right:Nn \l_xparse_args_tl
           { {##1} {##2} {##3} {##4} {##5} {##6} {##7} {##8} }
         #1 \l_xparse_args_tl
       }
-    \xparse_grab_arg:w
+    \l_xparse_fn_tl
+  }
+\cs_new_protected:Npn \xparse_grab_R:w #1#2#3#4 \l_xparse_args_tl
+  { \xparse_grab_R_aux:NNnnN #1 #2 {#3} {#4} \cs_set_protected_nopar:Npn }
+\cs_new_protected:Npn \xparse_grab_R_long:w #1#2#3#4 \l_xparse_args_tl
+  { \xparse_grab_R_aux:NNnnN #1 #2 {#3} {#4} \cs_set_protected:Npn }
+\cs_new_protected:Npn \xparse_grab_R_aux:NNnnN #1#2#3#4#5
+  {
+    \xparse_grab_D_aux:NNnN #1 #2 {#4} #5
+    \peek_meaning_remove_ignore_spaces:NTF #1
+      { \xparse_grab_arg:w }
+      {
+        \msg_kernel_error:nnxx { xparse } { missing-required }
+          { \token_to_str:N #1 } { \tl_to_str:n {#3} }
+        \xparse_add_arg:n {#3}
+        #4 \l_xparse_args_tl
+      }
   }
 \cs_new_protected:Npn \xparse_grab_t:w #1#2 \l_xparse_args_tl
   {
@@ -674,9 +894,9 @@
   { \xparse_grab_t_aux:NnNn #1 {#2} \cs_set_protected:Npn { } }
 \cs_new_protected:Npn \xparse_grab_t_aux:NnNn #1#2#3#4
   {
-    #3 \xparse_grab_arg:w
+    \exp_after:wN #3 \l_xparse_fn_tl
       {
-        \use:c { peek_charcode_remove #4 :NTF } #1
+        \use:c { peek_meaning_remove #4 :NTF } #1
           {
             \xparse_add_arg:n { \BooleanTrue }
             #2 \l_xparse_args_tl
@@ -686,7 +906,7 @@
             #2 \l_xparse_args_tl
           }
       }
-    \xparse_grab_arg:w
+    \l_xparse_fn_tl
   }
 \cs_new_protected:Npn \xparse_grab_u:w #1#2 \l_xparse_args_tl
   { \xparse_grab_u_aux:nnN {#1} {#2} \cs_set_protected_nopar:Npn }
@@ -694,12 +914,12 @@
   { \xparse_grab_u_aux:nnN {#1} {#2} \cs_set_protected:Npn }
 \cs_new_protected:Npn \xparse_grab_u_aux:nnN #1#2#3
   {
-    #3 \xparse_grab_arg:w ##1 #1
+    \exp_after:wN #3 \l_xparse_fn_tl ##1 #1
       {
         \xparse_add_arg:n {##1}
         #2 \l_xparse_args_tl
       }
-    \xparse_grab_arg:w
+    \l_xparse_fn_tl
   }
 \tl_new:N \l_xparse_v_rest_of_signature_tl
 \tl_new:N \l_xparse_v_arg_tl
@@ -837,20 +1057,156 @@
     \tl_to_lowercase:n
       { \group_end: \peek_meaning_remove:NTF ## }
       {
-        \msg_error:nnxx { xparse } { verbatim-newline }
-          { \cs_to_str:N #1 }
+        \msg_kernel_error:nnxx { xparse } { verbatim-newline }
+          { \token_to_str:N #1 }
           { \tl_to_str:N \l_xparse_v_arg_tl }
         \l_xparse_v_rest_of_signature_tl \l_xparse_args_tl
       }
       {
-        \msg_error:nnxx { xparse } { verbatim-already-tokenized }
-          { \cs_to_str:N #1 }
+        \msg_kernel_error:nnxx { xparse } { verbatim-already-tokenized }
+          { \token_to_str:N #1 }
           { \tl_to_str:N \l_xparse_v_arg_tl }
         \l_xparse_v_rest_of_signature_tl \l_xparse_args_tl
       }
   }
 \cs_new_protected:Npn \xparse_grab_v_token_if_char:NTF #1
   { \str_if_eq:xxTF { } { \str_tail:n {#1} } }
+\cs_new_protected:Npn \xparse_add_arg:n #1
+  {
+    \int_compare:nNnTF \l_xparse_processor_int = \c_zero
+      { \tl_put_right:Nn \l_xparse_args_tl { {#1} } }
+      {
+        \tl_clear:N \ProcessedArgument
+        \xparse_if_no_value:nTF {#1}
+          {
+            \int_zero:N \l_xparse_processor_int
+            \tl_put_right:Nn \l_xparse_args_tl { {#1} }
+          }
+          { \xparse_add_arg_aux:n {#1} }
+      }
+  }
+\cs_generate_variant:Nn \xparse_add_arg:n { V , o }
+\cs_new_protected:Npn \xparse_add_arg_aux:n #1
+  {
+    \use:c { xparse_processor_ \int_use:N \l_xparse_processor_int :n } {#1}
+    \int_decr:N \l_xparse_processor_int
+    \int_compare:nNnTF \l_xparse_processor_int = \c_zero
+      {
+        \tl_put_right:Nx \l_xparse_args_tl
+          { { \exp_not:V \ProcessedArgument } }
+      }
+      { \xparse_add_arg_aux:V \ProcessedArgument }
+}
+\cs_generate_variant:Nn \xparse_add_arg_aux:n { V }
+\cs_new:Npn \xparse_expandable_grab_D:w #1 \q_xparse #2
+  { #2 { \xparse_expandable_grab_D_i:NNNnwNn #1 \q_xparse #2 } }
+\cs_new:Npn \xparse_expandable_grab_D_i:NNNnwNn #1#2#3#4#5 \q_xparse #6#7
+  {
+    \str_if_eq:onTF
+      { #1 { } { } #7 #2 \q_xparse #3 }
+      { { } { #2 } { } }
+      {
+        #1
+          { \xparse_expandable_grab_D_ii:NNNwNnnn #1#2#3#5 \q_xparse #6 }
+          \q_nil { } #2 \ERROR \q_xparse \ERROR
+      }
+      { #5 {#4} \q_xparse #6 {#7} }
+  }
+\cs_new:Npn \xparse_expandable_grab_D_ii:NNNwNnnn #1#2#3#4 \q_xparse #5#6#7#8
+  {
+    \exp_args:Nof \xparse_expandable_grab_D_iv:nnNNNwN
+      { \use_ii:nn #6 #2 }
+      { \xparse_expandable_grab_D_iii:Nw #3 \exp_stop_f: #7 #8 }
+    #1#2#3 #4 \q_xparse #5
+  }
+\cs_new:Npn \xparse_expandable_grab_D_iii:Nw #1#2 \ERROR \ERROR { #2 #1 }
+\cs_new:Npn \xparse_expandable_grab_D_iv:nnNNNwN #1#2#3#4#5#6 \q_xparse #7
+  {
+    \exp_args:No \tl_if_empty:oTF
+      { #3 { \use_none:nnn } #2 \q_xparse #5 #4 \q_xparse #5 }
+      {
+        \xparse_put_arg_expandable:ow { \use_none:nn #1#2 }
+          #6 \q_xparse #7
+      }
+      {
+        #3
+          { \xparse_expandable_grab_D_ii:NNNwNnnn #3#4#5#6 \q_xparse #7 }
+          \q_nil {#1} #2 \ERROR \q_xparse \ERROR
+      }
+  }
+\cs_new:Npn \xparse_expandable_grab_D_alt:w #1 \q_xparse #2
+  { #2 { \xparse_expandable_grab_D_alt_i:NNnwNn #1 \q_xparse #2 } }
+\cs_new:Npn \xparse_expandable_grab_D_alt_i:NNnwNn #1#2#3#4 \q_xparse #5#6
+  {
+    \str_if_eq:onTF
+      { #1 { } #6 #2 #2 }
+      { { } #2 }
+      {
+        #1
+          { \xparse_expandable_grab_D_alt_ii:Nwn #5 #4 \q_xparse }
+          #6 \ERROR
+      }
+      { #4 {#3} \q_xparse #5 {#6} }
+  }
+\cs_new:Npn \xparse_expandable_grab_D_alt_ii:Nwn #1#2 \q_xparse #3
+  { \xparse_put_arg_expandable:ow { \use_none:n #3 } #2 \q_xparse #1 }
+\cs_new:Npn \xparse_expandable_grab_m:w #1 \q_xparse #2
+  { #2 { \xparse_expandable_grab_m_aux:wNn #1 \q_xparse #2 } }
+\cs_new:Npn \xparse_expandable_grab_m_aux:wNn #1 \q_xparse #2#3
+  { #1 {#3} \q_xparse #2 }
+\cs_new:Npn \xparse_expandable_grab_R:w #1 \q_xparse #2
+  { #2 { \xparse_expandable_grab_R_aux:NNNnwNn #1 \q_xparse #2 } }
+\cs_new:Npn \xparse_expandable_grab_R_aux:NNNnwNn #1#2#3#4#5 \q_xparse #6#7
+  {
+    \str_if_eq:onTF
+      { #1 { } { } #7 #2 \q_xparse #3 }
+      { { } { #2 } { } }
+      {
+        #1
+          { \xparse_expandable_grab_D_ii:NNNwNnnn #1#2#3#5 \q_xparse #6 }
+          \q_nil { } #2 \ERROR \q_xparse \ERROR
+      }
+      {
+        \msg_expandable_kernel_error:nnn
+          { xparse } { missing-required } {#2}
+        #5 {#4} \q_xparse #6 {#7}
+      }
+  }
+\cs_new:Npn \xparse_expandable_grab_R_alt:w #1 \q_xparse #2
+  { #2 { \xparse_expandable_grab_R_alt_aux:NNnwNn #1 \q_xparse #2 } }
+\cs_new:Npn \xparse_expandable_grab_R_alt_aux:NNnwNn #1#2#3#4 \q_xparse #5#6
+  {
+    \str_if_eq:onTF
+      { #1 { } #6 #2 #2 }
+      { { } #2 }
+      {
+        #1
+          { \xparse_expandable_grab_D_alt_ii:Nwn #5 #4 \q_xparse }
+          #6 \ERROR
+      }
+      {
+        \msg_expandable_kernel_error:nnn
+          { xparse } { missing-required } {#2}
+        #4 {#3} \q_xparse #5 {#6}
+      }
+  }
+\cs_new:Npn \xparse_expandable_grab_t:w #1 \q_xparse #2
+  { #2 { \xparse_expandable_grab_t_aux:NNwn #1 \q_xparse #2 } }
+\cs_new:Npn \xparse_expandable_grab_t_aux:NNwn #1#2#3 \q_xparse #4#5
+  {
+    \str_if_eq:onTF { #1 { } #5 #2 } { #2 }
+      { #3 { \BooleanTrue } \q_xparse #4 }
+      { #3 { \BooleanFalse } \q_xparse #4 {#5} }
+  }
+\cs_new:Npn \xparse_put_arg_expandable:nw #1#2 \q_xparse { #2 {#1} \q_xparse }
+\cs_generate_variant:Nn \xparse_put_arg_expandable:nw { o }
+\cs_new:Npn \xparse_grab_expandable_end:wN #1 \q_xparse #2 {#1}
+\cs_new_protected:Npn \xparse_process_arg:n #1
+  {
+    \int_incr:N \l_xparse_processor_int
+    \cs_set:cpn { xparse_processor_ \int_use:N \l_xparse_processor_int :n } ##1
+      { #1 {##1} }
+  }
 \cs_new_protected:Npn \xparse_process_to_str:n #1
   { \tl_set:Nx \ProcessedArgument { \tl_to_str:n {#1} } }
 \cs_new_protected:Npn \xparse_bool_reverse:N #1
@@ -883,7 +1239,7 @@
         {
           \IfNoValueF {##1}
             {
-              \msg_error:nnxxx { xparse } { split-excess-tokens }
+              \msg_kernel_error:nnxxx { xparse } { split-excess-tokens }
                 { \tl_to_str:n {#2} } { \tl_to_str:n {#1} }
                 { \tl_to_str:n {#3} }
             }
@@ -946,366 +1302,98 @@
 \group_end:
 \cs_new_protected:Npn \xparse_trim_spaces:n #1
   { \tl_set:Nx \ProcessedArgument { \tl_trim_spaces:n {#1} } }
-\cs_new_protected:Npn \xparse_exp_add_type_d:w #1#2
-  { \xparse_exp_add_type_D:w #1 #2 { \NoValue } }
-\cs_new_protected:Npn \xparse_exp_add_type_D:w #1#2#3
-  {
-    \exp_args:NVV \xparse_exp_add_type_D_aux:nnNNn
-      \l_xparse_function_tl \l_xparse_total_args_int #1 #2 {#3}
-    \xparse_exp_prepare_function:N
-  }
-\cs_new_protected:Npn \xparse_exp_add_type_D_aux:nnNNn #1#2#3#4#5
-  {
-    \xparse_exp_set:cpx { #1 _arg_ #2 :w } ##1 \q_xparse ##2
-      {
-        \exp_not:N \str_if_eq:nnTF {##2} {#3}
-          { \exp_not:c { #1 _arg_ #2 _aux:w } ##1 \exp_not:N \q_xparse }
-          {
-            \exp_not:c { #1 _arg_ \int_eval:n { #2 + \c_one } :w }
-              ##1 {#5} \exp_not:N \q_xparse {##2}
-          }
-      }
-    \xparse_exp_set:cpx { #1 _arg_ #2 _aux:w } ##1 \q_xparse ##2 #4
-      {
-        \exp_not:N \tl_if_empty:oTF
-          {  \exp_not:c { #1 _arg_ #2 _open_check:w } ##2 { } { } #3 }
-          {
-            \exp_not:c { #1 _arg_ \int_eval:n { #2 + \c_one } :w }
-              ##1 {##2} \exp_not:N \q_xparse
-          }
-          {
-            \exp_not:c { #1 _arg_ #2 _nested:wnnw } ##1 \exp_not:N \q_xparse
-              { } { } ##2 \exp_not:N \q_xparse
-          }
-      }
-    \cs_set:cpn { #1 _arg_ #2 _open_check:w } ##1 #3 { }
-    \xparse_exp_set:cpx { #1 _arg_ #2 _nested:wnnw }
-      ##1 \q_xparse ##2##3 ##4 #3 ##5 \q_xparse ##6 #4
-      {
-        \exp_not:N \tl_if_empty:oTF
-          { \exp_not:c { #1 _arg_ #2 _open_check:w } ##5 { } { } #3 }
-          {
-            \exp_not:N \tl_if_empty:oTF
-              {
-                \exp_not:c { #1 _arg_ #2 _open_check:w } ##3 #4 ##6 { } { } #3
-              }
-              {
-                \exp_not:c { #1 _arg_ \int_eval:n { #2 + \c_one } :w }
-                  ##1 { ##2 ##4 #3 ##5 ##3 #4 ##6 } \exp_not:N \q_xparse
-              }
-              {
-                \exp_not:c { #1 _arg_ #2 _nested:wnnw }
-                  ##1 \exp_not:N \q_xparse { ##2 ##4 #3 ##5 } { }
-                  ##3 #4 ##6  \exp_not:N \q_xparse
-              }
-          }
-          {
-            \exp_not:c { #1 _arg_ #2 _nested:w } ##1 \exp_not:N \q_xparse
-              { ##2 ##4 #3 }
-              { ##3 #4 ##6 }
-              ##5 \exp_not:N \q_xparse
-          }
-      }
-  }
-\cs_new_protected_nopar:Npn \xparse_exp_add_type_m:w
-  {
-    \int_incr:N \l_xparse_m_args_int
-    \xparse_exp_set:cpx
-      {
-        \l_xparse_function_tl
-        _arg_
-        \int_use:N \l_xparse_total_args_int
-        :w
-      }
-      ##1 \q_xparse ##2
-      {
-        \exp_not:c
-          {
-            \l_xparse_function_tl
-            _arg_
-            \int_eval:n { \l_xparse_total_args_int + \c_one }
-            :w
-          }
-          ##1 {##2} \exp_not:N \q_xparse
-      }
-    \xparse_exp_prepare_function:N
-  }
-\cs_new_protected:Npn \xparse_exp_add_type_t:w #1
-  {
-    \xparse_exp_set:cpx
-      {
-        \l_xparse_function_tl
-        _arg_
-        \int_use:N \l_xparse_total_args_int
-        :w
-      }
-      ##1 \q_xparse ##2
-      {
-        \exp_not:N \str_if_eq:nnTF {##2} {#1}
-          {
-            \exp_not:c
-              {
-                \l_xparse_function_tl
-                _arg_
-                \int_eval:n { \l_xparse_total_args_int + \c_one }
-                :w
-              }
-            ##1 \exp_not:n { { \BooleanTrue } \q_xparse }
-          }
-          {
-            \exp_not:c
-              {
-                \l_xparse_function_tl
-                _arg_
-                \int_eval:n { \l_xparse_total_args_int + \c_one }
-                :w
-              }
-            ##1 \exp_not:n { { \BooleanFalse } \q_xparse } {##2}
-          }
-      }
-    \xparse_exp_prepare_function:N
-  }
-\cs_new_protected:Npn \xparse_exp_add_type_u:w #1
-  {
-    \xparse_exp_set:cpx
-      {
-        \l_xparse_function_tl
-        _arg_
-        \int_use:N \l_xparse_total_args_int
-        :w
-      }
-      ##1 \q_xparse ##2 #1
-      {
-        \exp_not:c
-          {
-            \l_xparse_function_tl
-            _arg_
-            \int_eval:n { \l_xparse_total_args_int + \c_one }
-            :w
-          }
-          ##1 {##2} \exp_not:N \q_xparse
-    }
-    \xparse_exp_prepare_function:N
-  }
-\cs_new_protected_nopar:Npn \xparse_exp_check_and_add:N #1
-  {
-    \cs_if_free:cTF { xparse_exp_add_type_ #1 :w }
-      {
-        \msg_error:nnx { xparse }
-          { unknown-expandable-argument-type }
-          { \tl_to_str:n {#1} }
-        \tl_set:Nn \l_xparse_last_arg_tl { m }
-        \xparse_exp_add_type_m:w
-      }
-      {
-        \tl_set:Nn \l_xparse_last_arg_tl {#1}
-        \use:c { xparse_exp_add_type_ #1 :w }
-      }
-  }
-\cs_new_protected:Npn \xparse_exp_declare_cmd:Nnn #1#2#3
-  {
-    \cs_if_exist:NTF #1
-      {
-        \msg_warning:nnxx { xparse } { redefine-command }
-          { \token_to_str:N #1 } { \tl_to_str:n {#2} }
-      }
-      {
-        \msg_info:nnxx { xparse } { define-command }
-          { \token_to_str:N #1 } { \tl_to_str:n {#2} }
-      }
-    \group_begin:
-      \tex_escapechar:D 92 \scan_stop:
-      \tl_set:Nx \l_xparse_function_tl { \token_to_str:N #1 }
-    \exp_args:NNNV \group_end:
-    \tl_set:Nn \l_xparse_function_tl \l_xparse_function_tl
-    \xparse_exp_prepare_function:n {#2}
-    \int_compare:nNnTF \l_xparse_total_args_int = \l_xparse_m_args_int
-      { \xparse_exp_declare_cmd_all_m:Nn #1 {#3} }
-      { \xparse_exp_declare_cmd_mixed:Nn #1 {#3} }
-  }
-\cs_new_protected:Npn \xparse_exp_declare_cmd_all_m:Nn #1#2
-  {
-    \bool_if:NTF \l_xparse_long_bool
-      {
-        \cs_generate_from_arg_count:NNnn
-          #1 \cs_set:Npn \l_xparse_total_args_int {#2}
-      }
-      {
-        \cs_generate_from_arg_count:NNnn
-          #1 \cs_set_nopar:Npn \l_xparse_total_args_int {#2}
-      }
-  }
-\cs_new_protected:Npn \xparse_exp_declare_cmd_mixed:Nn #1#2
-  {
-    \tl_if_in:noTF { l m u } \l_xparse_last_arg_tl
-      { \xparse_exp_declare_cmd_mixed_aux:Nn #1 {#2} }
-      { \msg_error:nn { xparse } { expandable-ending-optional } }
-  }
-\cs_new_protected:Npn \xparse_exp_declare_cmd_mixed_aux:Nn #1#2
-  {
-    \cs_set_nopar:Npx #1
-      {
-        \exp_not:c { \l_xparse_function_tl _arg_ 1 :w } x \exp_not:N \q_xparse
-      }
-    \cs_set_nopar:cpx
-      {
-        \l_xparse_function_tl
-        _arg_
-        \int_eval:n { \l_xparse_total_args_int + \c_one  }
-        :w
-      }
-      x ##1 \q_xparse
-      { \exp_not:c { \l_xparse_function_tl } ##1 }
-    \cs_generate_from_arg_count:cNnn
-      { \l_xparse_function_tl } \cs_set:Npn \l_xparse_total_args_int {#2}
-  }
-\cs_new_protected:Npn \xparse_exp_prepare_function:n #1
-  {
-    \tl_if_in:nnTF {#1} { > }
-      {
-        \msg_error:nnxx { xparse } { processor-in-expandable }
-          { \tl_to_str:n {#1} }
-      }
-      { \xparse_exp_prepare_function_aux:n {#1} }
-  }
-\cs_new_protected:Npn \xparse_exp_prepare_function_aux:n #1
-  {
-    \cs_set_eq:NN \xparse_prepare_next:w \xparse_exp_prepare_function:N
-    \cs_set_eq:NN \xparse_exp_set:cpx \cs_set_nopar:cpx
-    \bool_set_false:N \l_xparse_long_bool
-    \int_zero:N \l_xparse_m_args_int
-    \int_zero:N \l_xparse_total_args_int
-    \tl_if_in:nnT {#1} { + }
-      {
-        \bool_set_true:N \l_xparse_long_bool
-        \cs_set_eq:NN \xparse_exp_set:cpx \cs_set:cpx
-      }
-    \xparse_exp_prepare_function:N #1 \q_nil
-  }
-\cs_new_protected:Npn \xparse_exp_prepare_function:N #1
-  {
-    \bool_if:NTF \l_xparse_long_bool
-      { \xparse_exp_prepare_function_long:N #1 }
-      { \xparse_exp_prepare_function_short:N #1 }
-}
-\cs_new_protected:Npn \xparse_exp_prepare_function_long:N #1
-  {
-    \quark_if_nil:NF #1
-      {
-        \str_if_eq:nnTF {#1} { + }
-          { \xparse_exp_prepare_function_short:N }
-          {
-            \msg_error:nn { xparse } { inconsistent-long }
-            \xparse_exp_prepare_function_short:N #1
-          }
-      }
-  }
-\cs_new_protected:Npn \xparse_exp_prepare_function_short:N #1
-  {
-    \quark_if_nil:NF #1
-      {
-        \prop_get:NnNTF \c_xparse_shorthands_prop {#1} \l_xparse_tmp_tl
-          {
-            \bool_if:NT \l_xparse_long_bool
-              { \tl_put_left:Nn \l_xparse_tmp_tl { + }  }
-            \exp_after:wN \xparse_exp_prepare_function:N \l_xparse_tmp_tl
-          }
-          {
-            \int_incr:N \l_xparse_total_args_int
-            \xparse_exp_check_and_add:N #1
-          }
-      }
-  }
-\cs_new_eq:NN \xparse_exp_set:cpx \cs_set_nopar:cpx
 \cs_new_protected:Npn \xparse_get_arg_spec:N #1
   {
-    \cs_if_exist:cTF { l_xparse_ \token_to_str:N #1 _arg_spec_tl }
+    \prop_get:NnNF \l_xparse_command_arg_specs_prop {#1}
+      \ArgumentSpecification
       {
-        \tl_set_eq:Nc \ArgumentSpecification
-          { l_xparse_ \token_to_str:N #1 _arg_spec_tl }
-      }
-      {
-        \msg_error:nnx { xparse } { unknown-document-command }
+        \msg_kernel_error:nnx { xparse } { unknown-document-command }
           { \token_to_str:N #1 }
       }
   }
 \cs_new_protected:Npn \xparse_get_arg_spec:n #1
   {
-    \cs_if_exist:cTF { l_xparse_ #1 _arg_spec_tl }
-      { \tl_set_eq:Nc \ArgumentSpecification { l_xparse_ #1 _arg_spec_tl } }
+    \prop_get:NnNF \l_xparse_environment_arg_specs_prop {#1}
+      \ArgumentSpecification
       {
-        \msg_error:nnx { xparse } { unknown-document-environment }
+        \msg_kernel_error:nnx { xparse } { unknown-document-environment }
           { \tl_to_str:n {#1} }
       }
   }
 \tl_new:N \ArgumentSpecification
 \cs_new_protected:Npn \xparse_show_arg_spec:N #1
   {
-    \cs_if_exist:cTF { l_xparse_ \token_to_str:N #1 _arg_spec_tl }
-      {
-        \tl_set_eq:Nc \ArgumentSpecification
-          { l_xparse_ \token_to_str:N #1 _arg_spec_tl }
-        \tl_show:N \ArgumentSpecification
-      }
+    \tl_set:Nx \l_xparse_function_tl { \cs_to_str:N #1 }
+    \prop_get:NnNTF \l_xparse_command_arg_specs_prop {#1}
+      \ArgumentSpecification
+      { \tl_show:N \ArgumentSpecification }
       {
-        \msg_error:nnx { xparse } { unknown-document-command }
+        \msg_kernel_error:nnx { xparse } { unknown-document-command }
           { \token_to_str:N #1 }
       }
   }
 \cs_new_protected:Npn \xparse_show_arg_spec:n #1
   {
-    \cs_if_exist:cTF { l_xparse_ #1 _arg_spec_tl }
-      {
-        \tl_set_eq:Nc \ArgumentSpecification { l_xparse_ #1 _arg_spec_tl }
-        \tl_show:N \ArgumentSpecification
-      }
+    \prop_get:NnNTF \l_xparse_environment_arg_specs_prop {#1}
+      \ArgumentSpecification
+      { \tl_show:N \ArgumentSpecification }
       {
-        \msg_error:nnx { xparse } { unknown-document-environment }
+        \msg_kernel_error:nnx { xparse } { unknown-document-environment }
           { \tl_to_str:n {#1} }
       }
   }
-\msg_new:nnnn { xparse } { command-already-defined }
+\prg_new_conditional:Npnn \xparse_if_no_value:n #1 { T ,  F , TF }
+  { \str_if_eq:nnTF {#1} { \NoValue } \prg_return_true: \prg_return_false: }
+\msg_kernel_new:nnnn { xparse } { bad-signature }
+  { Bad~signature~'#1'. }
+  {
+    \c_msg_coding_error_text_tl
+    The~signature~provided~was~not~valid:~one~or~more~mandatory~pieces~
+    of~information~were~missing. \\ \\
+    LaTeX~will~ignore~this~entire~definition.
+  }
+\msg_kernel_new:nnnn { xparse } { command-already-defined }
   { Command~'#1'~already~defined! }
   {
     You~have~used~\NewDocumentCommand
     with~a~command~that~already~has~a~definition. \\
     The~existing~definition~of~'#1'~will~be~overwritten.
   }
-\msg_new:nnnn { xparse } { command-not-yet-defined }
+\msg_kernel_new:nnnn { xparse } { command-not-yet-defined }
   { Command ~'#1'~not~yet~defined! }
   {
     You~have~used~\RenewDocumentCommand
     with~a~command~that~was~never~defined.\\
     A~new~command~'#1'~will~be~created.
   }
-\msg_new:nnnn { xparse } { environment-already-defined }
+\msg_kernel_new:nnnn { xparse } { environment-already-defined }
   { Environment~'#1'~already~defined! }
   {
     You~have~used~\NewDocumentEnvironment
     with~an~environment~that~already~has~a~definition.\\
     The~existing~definition~of~'#1'~will~be~overwritten.
   }
-\msg_new:nnnn { xparse } { environment-mismatch }
+\msg_kernel_new:nnnn { xparse } { environment-mismatch }
   { Mismatch~between~start~and~end~of~environment. }
   {
     The~current~environment~is~called~'#1',~but~you~have~tried~to~
     end~one~called~'#2'.~Environments~have~to~be~properly~nested.
   }
-\msg_new:nnnn { xparse } { environment-not-yet-defined }
+\msg_kernel_new:nnnn { xparse } { environment-not-yet-defined }
   { Environment~'#1'~not~yet~defined! }
   {
     You~have~used~\RenewDocumentEnvironment
     with~an~environment~that~was~never~defined.\\
     A~new~environment~'#1'~will~be~created.
   }
-\msg_new:nnnn { xparse } { environment-unknown }
+\msg_kernel_new:nnnn { xparse } { environment-unknown }
   { Environment~'#1'~undefined. }
   {
     You~have~tried~to~start~an~environment~called~'#1',~
     but~this~has~never~been~defined.\\
     The~command~will~be~ignored.
   }
-\msg_new:nnnn { xparse } { expandable-ending-optional }
+\msg_kernel_new:nnnn { xparse } { expandable-ending-optional }
   { Signature~for~expandable~command~ends~with~optional~argument. }
   {
     \c_msg_coding_error_text_tl
@@ -1313,83 +1401,103 @@
     (or~no~arguments~at~all).~You~cannot~have~a~terminal~optional~
     argument~with~expandable~commands.
   }
-\msg_new:nnnn { xparse } { inconsistent-long }
+\msg_kernel_new:nnnn { xparse } { inconsistent-long }
   { Inconsistent~long~arguments~for~expandable~command. }
   {
     \c_msg_coding_error_text_tl
     The~arguments~for~an~expandable~command~must~either~all~be~
     short~or~all~be~long.~You~have~tried~to~mix~the~two~types.
   }
-\msg_new:nnnn { xparse } { processor-in-expandable }
+\msg_kernel_new:nnnn { xparse } { invalid-expandable-argument-type }
+  { Unknown~argument~type~'#1'~replaced~by~'m'. }
+  {
+    \c_msg_coding_error_text_tl
+    The~letter~'#1'~does~not~specify~an~argument~type~which~can~be~used~
+    in~an~expandable~function.
+    \\ \\
+    LaTeX~will~assume~you~want~a~standard~mandatory~argument~(type~'m').
+  }
+\msg_kernel_new:nnnn { xparse } { missing-required }
+  { Failed~to~find~required~argument~starting~with~'#1'. }
+  {
+    There~is~supposed~to~be~an~argument~to~the~current~function~starting~with~
+    '#1'.~LaTeX~did~not~find~it,~and~will~insert~'#2'~as~the~value~to~be~
+    processed.
+  }
+\msg_kernel_new:nnnn { xparse } { not-single-token }
+  { Argument~delimiter~should~be~a~single~token:~'#1'. }
+  {
+    \c_msg_coding_error_text_tl
+    The~signature~provided~was~not~valid:~in~a~place~where~a~single~token~is~
+    required,~LaTeX~found~'#1'. \\ \\
+    LaTeX~will~ignore~this~entire~definition.
+  }
+\msg_kernel_new:nnnn { xparse } { processor-in-expandable }
   { Argument~processors~cannot~be~used~with~expandable~functions. }
   {
     \c_msg_coding_error_text_tl
-    Argument~specification~'#1'~contains~a~processor~function:~
+    The~argument~specification~for~#1~contains~a~processor~function:~
     this~is~only~supported~for~standard~robust~functions.
   }
-\msg_new:nnnn { xparse } { split-excess-tokens }
+\msg_kernel_new:nnnn { xparse } { split-excess-tokens }
   { Too~many~'#1'~tokens~when~trying~to~split~argument. }
   {
     LaTeX~was~asked~to~split~the~input~'#3'~
     at~each~occurrence~of~the~token~'#1',~up~to~a~maximum~of~#2~parts.~
     There~were~too~many~'#1'~tokens.
   }
-\msg_new:nnnn { xparse } { unknown-argument-type }
+\msg_kernel_new:nnnn { xparse } { unknown-argument-type }
   { Unknown~argument~type~'#1'~replaced~by~'m'. }
   {
     \c_msg_coding_error_text_tl
     The~letter~'#1'~does~not~specify~a~known~argument~type.~
     LaTeX~will~assume~you~want~a~standard~mandatory~argument~(type~'m').
   }
-\msg_new:nnnn { xparse } { unknown-document-command }
+\msg_kernel_new:nnnn { xparse } { unknown-document-command }
   { Unknown~document~command~'#1'. }
   {
     You~have~asked~for~the~argument~specification~for~a~command~'#1',~
     but~this~is~not~a~document~command.
   }
-\msg_new:nnnn { xparse } { unknown-document-environment }
+\msg_kernel_new:nnnn { xparse } { unknown-document-environment }
   { Unknown~document~environment~'#1'. }
   {
     You~have~asked~for~the~argument~specification~for~a~command~'#1',~
     but~this~is~not~a~document~environment.
   }
-\msg_new:nnnn { xparse } { unknown-expandable-argument-type }
-  { Unknown~argument~type~'#1'~replaced~by~'m'. }
-  {
-    \c_msg_coding_error_text_tl
-    The~letter~'#1'~does~not~specify~an~argument~type~which~can~be~used~
-    in~an~expandable~function.
-    LaTeX~will~assume~you~want~a~standard~mandatory~argument~(type~'m').
-  }
-\msg_new:nnnn { xparse } { verbatim-newline }
+\msg_kernel_new:nnnn { xparse } { verbatim-newline }
   { Verbatim~argument~of~#1~ended~by~end~of~line. }
   {
-    Short~verbatim~arguments~cannot~contain~newlines.~
-    I~suspect~you've~forgotten~the~closing~delimiter~of~#1.
-    I~will~ignore~'#2'.
+    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'.
   }
-\msg_new:nnnn { xparse } { verbatim-already-tokenized }
+\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.~I~will~ignore~'#2'.
+    the~argument~of~another~function.
+    \\ \\
+    LaTeX~will~ignore~'#2'.
   }
-\msg_new:nnn { xparse } { define-command }
+\msg_kernel_new:nnn { xparse } { define-command }
   {
     Defining~document~command~#1~
     with~arg.~spec.~'#2'~\msg_line_context:.
   }
-\msg_new:nnn { xparse } { define-environment }
+\msg_kernel_new:nnn { xparse } { define-environment }
   {
     Defining~document~environment~'#1'~
     with~arg.~spec.~'#2'~\msg_line_context:.
   }
-\msg_new:nnn { xparse } { redefine-command }
+\msg_kernel_new:nnn { xparse } { redefine-command }
   {
     Redefining~document~command~#1~
     with~arg.~spec.~'#2'~\msg_line_context:.
   }
-\msg_new:nnn { xparse } { redefine-environment }
+\msg_kernel_new:nnn { xparse } { redefine-environment }
   {
     Redefining~document~environment~'#1'~
     with~arg.~spec.~'#2'~\msg_line_context:.
@@ -1402,7 +1510,7 @@
   {
     \cs_if_exist:NTF #1
       {
-        \msg_error:nnx { xparse } { command-already-defined }
+        \msg_kernel_error:nnx { xparse } { command-already-defined }
           { \token_to_str:N #1 }
       }
       { \xparse_declare_cmd:Nnn #1 {#2} {#3} }
@@ -1410,36 +1518,32 @@
 \cs_new_protected:Npn \RenewDocumentCommand #1#2#3
   {
     \cs_if_exist:NTF #1
-      { \xparse_declare_cmd_aux:Nnn #1 {#2} {#3} }
+      { \xparse_declare_cmd:Nnn #1 {#2} {#3} }
       {
-        \msg_error:nnx { xparse } { command-not-yet-defined }
+        \msg_kernel_error:nnx { xparse } { command-not-yet-defined }
           { \token_to_str:N #1 }
       }
   }
 \cs_new_protected:Npn \ProvideDocumentCommand #1#2#3
   { \cs_if_exist:NF #1 { \xparse_declare_cmd:Nnn #1 {#2} {#3} } }
-\cs_new_protected:Npn \DeclareDocumentCommandImplementation #1#2#3
-  { \xparse_declare_cmd_implementation:nNn {#1} #2 {#3} }
-\cs_new_protected:Npn \DeclareDocumentCommandInterface #1#2#3
-  { \xparse_declare_cmd_interface:Nnn #1 {#2} {#3} }
 \cs_new_protected:Npn \DeclareDocumentEnvironment #1#2#3#4
   { \xparse_declare_env:nnnn {#1} {#2} {#3} {#4} }
 \cs_new_protected:Npn \NewDocumentEnvironment #1#2#3#4
   {
     \cs_if_exist:cTF {#1}
-      { \msg_error:nnx { xparse } { environment-already-defined } {#1} }
+      { \msg_kernel_error:nnx { xparse } { environment-already-defined } {#1} }
       { \xparse_declare_env:nnnn {#1} {#2} {#3} {#4} }
 }
 \cs_new_protected:Npn \RenewDocumentEnvironment #1#2#3#4
   {
     \cs_if_exist:cTF {#1}
       { \xparse_declare_env:nnnn {#1} {#2} {#3} {#4} }
-      { \msg_error:nnx { xparse } { environment-not-yet-defined } {#1} }
+      { \msg_kernel_error:nnx { xparse } { environment-not-yet-defined } {#1} }
   }
 \cs_new_protected:Npn \ProvideDocumentEnvironment #1#2#3#4
   { \cs_if_exist:cF { #1 } { \xparse_declare_env:nnnn {#1} {#2} {#3} {#4} } }
 \cs_new_protected:Npn \DeclareExpandableDocumentCommand #1#2#3
-  { \xparse_exp_declare_cmd:Nnn #1 {#2} {#3} }
+  { \xparse_declare_expandable_cmd:Nnn #1 {#2} {#3} }
 \cs_new_eq:NN \IfBooleanTF \bool_if:NTF
 \cs_new_eq:NN \IfBooleanT  \bool_if:NT
 \cs_new_eq:NN \IfBooleanF  \bool_if:NF
@@ -1452,9 +1556,10 @@
 \cs_new_protected:Npn \NoValue { -NoValue- }
 \tl_new:N \ProcessedArgument
 \cs_new_eq:NN \ReverseBoolean \xparse_bool_reverse:N
-\cs_new_eq:NN \SplitArgument \xparse_split_argument:nnn
-\cs_new_eq:NN \SplitList     \xparse_split_list:nn
-\cs_new_eq:NN \TrimSpaces    \xparse_trim_spaces:n
+\cs_new_eq:NN \SplitArgument  \xparse_split_argument:nnn
+\cs_new_eq:NN \SplitList      \xparse_split_list:nn
+\cs_new_eq:NN \TrimSpaces     \xparse_trim_spaces:n
+\cs_new_eq:NN \ProcessList \tl_map_function:nN
 \cs_new_eq:NN \GetDocumentCommandArgSpec      \xparse_get_arg_spec:N
 \cs_new_eq:NN \GetDocumentEnvironmmentArgSpec \xparse_get_arg_spec:n
 \cs_new_eq:NN \ShowDocumentCommandArgSpec     \xparse_show_arg_spec:N
diff --git a/Master/texmf-dist/tex/latex/l3packages/xtemplate/xtemplate.sty b/Master/texmf-dist/tex/latex/l3packages/xtemplate/xtemplate.sty
index 0e73815b3f6..a7d0663e2b8 100644
--- a/Master/texmf-dist/tex/latex/l3packages/xtemplate/xtemplate.sty
+++ b/Master/texmf-dist/tex/latex/l3packages/xtemplate/xtemplate.sty
@@ -17,7 +17,7 @@
 %%                         David Carlisle
 %%                     (C) Copyright 2004-2010 Frank Mittelbach,
 %%                         The LaTeX3 Project
-%%                     (C) Copyright 2011 The LaTeX3 Project
+%%                     (C) Copyright 2011,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
@@ -50,22 +50,22 @@
 %%
 %% -----------------------------------------------------------------------
 %%
-\RequirePackage{expl3}
-\GetIdInfo$Id: xtemplate.dtx 3109 2011-12-29 10:42:27Z joseph $
-  {L3 Experimental prototype document functions}
-\ProvidesExplPackage
-  {\ExplFileName}{\ExplFileDate}{\ExplFileVersion}{\ExplFileDescription}
-\@ifpackagelater { expl3 } { 2011/12/29 }
-  { }
+\RequirePackage{expl3}[2012/01/19]
+\@ifpackagelater{expl3}{2012/01/19}
+  {}
   {
-    \PackageError { xtemplate } { Support~package~l3kernel~too~old. }
+    \PackageError{xtemplate}{Support package l3kernel too old.}
       {
-        Please~install~an~up~to~date~version~of~l3kernel~
-        using~your~TeX~package~manager~or~from~CTAN.\\ \\
-        Loading~xtemplate~will~abort!
+        Please install an up to date~version of l3kernel
+        using your TeX package manager or from CTAN.\\ \\
+        Loading xtemplate will abort!
       }
-    \tex_endinput:D
+    \endinput
   }
+\GetIdInfo$Id: xtemplate.dtx 3207 2012-01-19 08:50:24Z joseph $
+  {L3 Experimental prototype document functions}
+\ProvidesExplPackage
+  {\ExplFileName}{\ExplFileDate}{\ExplFileVersion}{\ExplFileDescription}
 \tl_const:Nn \c_xtemplate_code_root_tl      { template~code~>~ }
 \tl_const:Nn \c_xtemplate_defaults_root_tl  { template~defaults~>~ }
 \tl_const:Nn \c_xtemplate_instances_root_tl { template~instance~>~  }
@@ -1284,24 +1284,21 @@
     \msg_line_context:.
   }
 \msg_new:nnn { xtemplate } { show-no-attribute }
-  { Template~'#2'~of~object~type~'#1'~has~no~#3 . }
+  { The~template~'#2'~of~object~type~'#1'~has~no~#3 . }
 \msg_new:nnn { xtemplate } { show-attribute }
-  { Template~'#2'~of~object~type~'#1'~has~#3 : }
+  { The~template~'#2'~of~object~type~'#1'~has~#3 : }
 \msg_new:nnn { xtemplate } { show-no-values }
   {
-    \tl_if_empty:nTF {#2}
-      { Instance~'#3'~ }
-      { Collection instance~'#3'~(from~collection~'#2')~ }
+    The~ \tl_if_empty:nF {#2} {collection~} instance~'#3'~
+    \tl_if_empty:nF {#2} { (from~collection~'#2')~ }
     of~object~type~'#1'~has~no~values.
   }
 \msg_new:nnn { xtemplate } { show-values }
   {
-    \tl_if_empty:nTF {#2}
-      { Instance~'#3'~ }
-      { Collection instance~'#3'~(from~collection~'#2')~ }
-    of~object~type~'#1'
-    \quark_if_no_value:NF #4
-      { ~(from~template~'#4')~ }
+    The~ \tl_if_empty:nF {#2} {collection~} instance~'#3'~
+    \tl_if_empty:nF {#2} { (from~collection~'#2')~ }
+    of~object~type~'#1'~
+    \quark_if_no_value:NF #4 { (from~template~'#4')~ }
     has~values:
   }
 \cs_new_protected_nopar:Npn \DeclareObjectType #1#2