xpackages 2076

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

2 files changed, 11 insertions, 11 deletions

diff --git a/Master/texmf-dist/tex/latex/xpackages/xbase/xparse.sty b/Master/texmf-dist/tex/latex/xpackages/xbase/xparse.sty
index 6af9c3f4570..7d4cbcba4ec 100644
--- a/Master/texmf-dist/tex/latex/xpackages/xbase/xparse.sty
+++ b/Master/texmf-dist/tex/latex/xpackages/xbase/xparse.sty
@@ -57,7 +57,7 @@
 %% -----------------------------------------------------------------------
 %%
 \RequirePackage{l3names}
-\GetIdInfo$Id: xparse.dtx 2063 2010-10-03 08:26:49Z mittelba $
+\GetIdInfo$Id: xparse.dtx 2073 2010-10-13 07:48:20Z joseph $
   {Generic document command parser}
 \ProvidesExplPackage
   {\filename}{\filedate}{\fileversion}{\filedescription}
@@ -68,7 +68,6 @@
 \prop_put:Nnn \c_xparse_shorthands_prop { s } { t* }
 \tl_new:N \l_xparse_arg_tl
 \tl_new:N \l_xparse_args_tl
-\tl_new:N \l_xparse_environment_args_tl
 \bool_new:N \l_xparse_environment_bool
 \bool_new:N \l_xparse_error_bool
 \tl_new:N \l_xparse_function_tl
@@ -311,16 +310,17 @@
     }
   \xparse_declare_cmd_aux:cnn { environment_begin_ #1 :w } {#2} {
     \group_begin:
-      \tl_set_eq:NN \l_xparse_environment_args_tl \l_xparse_args_tl
+      \cs_set_protected_nopar:cpx { environment_end_ #1 :w }
+        {
+            \exp_not:c { environment_end_ #1 _aux:N }
+            \exp_not:V \l_xparse_args_tl
+          \group_end:
+        }
       #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 :w } {
-      \exp_not:N \exp_last_unbraced:NV
-      \exp_not:c { environment_end_ #1 _aux:N }
-      \exp_not:N \l_xparse_environment_args_tl
-    \exp_not:N \group_end:
-  }
   \cs_set_nopar:cpx { environment_end_ #1 _aux:N } ##1 {
     \exp_not:c { environment_end_ #1 _aux :w }
   }
@@ -328,7 +328,7 @@
     { 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 :w }
+  \cs_set_eq:cc { end #1 } { environment_end_ #1 : }
 }
 \cs_new_nopar:Npn \xparse_flush_m_args: {
   \cs_if_exist:cT {
diff --git a/Master/texmf-dist/tex/latex/xpackages/xtras/l3keys2e.sty b/Master/texmf-dist/tex/latex/xpackages/xtras/l3keys2e.sty
index d5009a13cba..67d8c0757ae 100644
--- a/Master/texmf-dist/tex/latex/xpackages/xtras/l3keys2e.sty
+++ b/Master/texmf-dist/tex/latex/xpackages/xtras/l3keys2e.sty
@@ -45,7 +45,7 @@
 %% -----------------------------------------------------------------------
 %%
 \RequirePackage{l3names}
-\GetIdInfo$Id: l3keys2e.dtx 1494 2009-08-24 11:05:44Z joseph $
+\GetIdInfo$Id: l3keys2e.dtx 2076 2010-10-13 19:09:59Z joseph $
   {Parsing LaTeX3 keyvals as LaTeX2e package options}
 \ProvidesExplPackage
   {\filename}{\filedate}{\fileversion}{\filedescription}