summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/latex/xpackages/xbase/xparse.sty
diff options
context:
space:
mode:
Diffstat (limited to 'Master/texmf-dist/tex/latex/xpackages/xbase/xparse.sty')
-rw-r--r--Master/texmf-dist/tex/latex/xpackages/xbase/xparse.sty8
1 files changed, 4 insertions, 4 deletions
diff --git a/Master/texmf-dist/tex/latex/xpackages/xbase/xparse.sty b/Master/texmf-dist/tex/latex/xpackages/xbase/xparse.sty
index f2c04ee2d9c..a6c0132ec16 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 2125 2011-01-09 15:24:39Z joseph $
+\GetIdInfo$Id: xparse.dtx 2136 2011-01-23 12:15:49Z joseph $
{Generic document command parser}
\ProvidesExplPackage
{\filename}{\filedate}{\fileversion}{\filedescription}
@@ -452,7 +452,7 @@
}
#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_grab_D_nested:NNnnN #1 #2 {##1} {#4} #5
}{
\xparse_add_arg:n {##1}
#4 \l_xparse_args_tl
@@ -468,7 +468,7 @@
\tl_new:N \_l_xparse_nesting_a_tl
\tl_new:N \_l_xparse_nesting_b_tl
\quark_new:N \q_xparse
-\cs_new_protected:Npn \xparse_grab_D_nested:NNNnn #1#2#3#4#5 {
+\cs_new_protected:Npn \xparse_grab_D_nested:NNnnN #1#2#3#4#5 {
\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
@@ -478,6 +478,7 @@
\tl_if_in:nnTF {##2} {#1}
{ \xparse_grab_arg:w ##2 \q_xparse }
{
+ \tl_put_right:Nn \_l_xparse_nesting_a_tl {##2}
\tl_if_in:NnTF \_l_xparse_nesting_b_tl {#1}
{
\tl_set_eq:NN \l_xparse_tmp_tl \_l_xparse_nesting_b_tl
@@ -486,7 +487,6 @@
\l_xparse_tmp_tl \q_xparse
}
{
- \tl_put_right:Nn \_l_xparse_nesting_a_tl {##2}
\tl_put_right:NV \_l_xparse_nesting_a_tl
\_l_xparse_nesting_b_tl
\xparse_add_arg:V \_l_xparse_nesting_a_tl