finish l3 update

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

1 files changed, 11 insertions, 24 deletions

diff --git a/Master/texmf-dist/tex/latex/l3packages/xparse/xparse.sty b/Master/texmf-dist/tex/latex/l3packages/xparse/xparse.sty
index c5eb78daecf..e20d05295c8 100644
--- a/Master/texmf-dist/tex/latex/l3packages/xparse/xparse.sty
+++ b/Master/texmf-dist/tex/latex/l3packages/xparse/xparse.sty
@@ -50,8 +50,8 @@
 %%
 %% -----------------------------------------------------------------------
 %%
-\RequirePackage{expl3}[2012/07/16]
-\@ifpackagelater{expl3}{2012/07/16}
+\RequirePackage{expl3}[2012/08/14]
+\@ifpackagelater{expl3}{2012/08/14}
   {}
   {%
     \PackageError{xparse}{Support package l3kernel too old.}
@@ -62,7 +62,7 @@
       }%
     \endinput
   }
-\GetIdInfo$Id: xparse.dtx 3990 2012-07-16 07:46:03Z joseph $
+\GetIdInfo$Id: xparse.dtx 4091 2012-08-14 08:13:50Z joseph $
   {L3 Experimental document command parser}
 \ProvidesExplPackage
   {\ExplFileName}{\ExplFileDate}{\ExplFileVersion}{\ExplFileDescription}
@@ -213,31 +213,18 @@
   {
     \__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
-                    }
-                }
-            }
+        \cs_set_protected_nopar:Npx \exp_not:c { environment~ #1 ~end~aux }
+          {
+            \exp_not:c { environment~ #1~end~aux~ }
+            \exp_not:n
+              { { \tl_tail:N \l__xparse_args_tl } }
+          }
         \exp_not:n {#3}
       }
     \cs_set_protected_nopar:cpx { environment~ #1 ~end }
-      { \exp_not:c { environment_ #1 _end_aux: } }
+      { \exp_not:c { environment~ #1 ~end~aux } }
     \cs_generate_from_arg_count:cNnn
-      { environment_ #1 _end_aux:w } \cs_set_protected:Npn
+      { environment~ #1 ~end~aux~ } \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 }