summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/source
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2010-10-14 23:29:48 +0000
committerKarl Berry <karl@freefriends.org>2010-10-14 23:29:48 +0000
commit1d2d990e9b8c8c63f7fb9f08ee41c4e66ad77ff2 (patch)
treeeaf6365405e13d6a923ab21d1c31bd387f7a4124 /Master/texmf-dist/source
parent10cf54d888d3329dbb08d5fc0b0e1766befd1192 (diff)
xpackages 2076
git-svn-id: svn://tug.org/texlive/trunk@20099 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/source')
-rw-r--r--Master/texmf-dist/source/latex/xpackages/xbase/xparse.dtx26
-rw-r--r--Master/texmf-dist/source/latex/xpackages/xtras/l3keys2e.dtx5
2 files changed, 12 insertions, 19 deletions
diff --git a/Master/texmf-dist/source/latex/xpackages/xbase/xparse.dtx b/Master/texmf-dist/source/latex/xpackages/xbase/xparse.dtx
index d9cb5bbeb32..dbcbbf28a84 100644
--- a/Master/texmf-dist/source/latex/xpackages/xbase/xparse.dtx
+++ b/Master/texmf-dist/source/latex/xpackages/xbase/xparse.dtx
@@ -41,7 +41,7 @@
\RequirePackage{l3names}
%</driver|package>
%\fi
-\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}
%\iffalse
%<*driver>
@@ -963,13 +963,6 @@
% \end{macrocode}
%\end{macro}
%
-%\begin{macro}{\l_xparse_environment_args_tl}
-% Used to pass arguments to the end of an environment.
-% \begin{macrocode}
-\tl_new:N \l_xparse_environment_args_tl
-% \end{macrocode}
-%\end{macro}
-%
%\begin{macro}{\l_xparse_environment_bool}
% Generating environments uses the same mechanism as generating
% functions. However, full processing of arguments is always needed
@@ -1512,16 +1505,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 }
}
@@ -1531,7 +1525,7 @@
%</initex|package>
%<*package>
\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 : }
%</package>
%<*initex|package>
}
diff --git a/Master/texmf-dist/source/latex/xpackages/xtras/l3keys2e.dtx b/Master/texmf-dist/source/latex/xpackages/xtras/l3keys2e.dtx
index 576a0161c94..6ee1ced0ce5 100644
--- a/Master/texmf-dist/source/latex/xpackages/xtras/l3keys2e.dtx
+++ b/Master/texmf-dist/source/latex/xpackages/xtras/l3keys2e.dtx
@@ -37,7 +37,7 @@
\RequirePackage{l3names}
%</driver|package>
%\fi
-\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}
%\iffalse
%<*driver>
@@ -53,8 +53,7 @@
% \fi
%
% \title{The \textsf{l3keys2e} package\thanks{This file
-% has version number \fileversion, last
-% revised \filedate.}\\
+% has version number \fileversion, last revised \filedate.}\\
% Parsing \LaTeX3 keyvals as \LaTeXe\ package options}
% \author{\Team}
% \date{\filedate}