l3 (21dec12)

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

3 files changed, 60 insertions, 46 deletions

diff --git a/Master/texmf-dist/tex/latex/l3packages/l3keys2e/l3keys2e.sty b/Master/texmf-dist/tex/latex/l3packages/l3keys2e/l3keys2e.sty
index 365837076f4..7411941082b 100644
--- a/Master/texmf-dist/tex/latex/l3packages/l3keys2e/l3keys2e.sty
+++ b/Master/texmf-dist/tex/latex/l3packages/l3keys2e/l3keys2e.sty
@@ -46,19 +46,20 @@
 %%
 %% -----------------------------------------------------------------------
 %%
-\RequirePackage{expl3}[2012/11/21]
-\@ifpackagelater{expl3}{2012/11/21}
+\RequirePackage{expl3}[2012/12/21]
+\@ifpackagelater{expl3}{2012/12/21}
   {}
   {%
-    \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.\\ \\
+        Please install an up to date version of l3kernel\MessageBreak
+        using your TeX package manager or from CTAN.\MessageBreak
+        \MessageBreak
         Loading l3keys2e will abort!%
       }%
     \endinput
   }
-\GetIdInfo$Id: l3keys2e.dtx 4332 2012-11-21 21:40:31Z joseph $
+\GetIdInfo$Id: l3keys2e.dtx 4390 2012-12-21 06:59:20Z joseph $
   {LaTeX2e option processing using LaTeX3 keys}
 \ProvidesExplPackage
   {\ExplFileName}{\ExplFileDate}{\ExplFileVersion}{\ExplFileDescription}
diff --git a/Master/texmf-dist/tex/latex/l3packages/xparse/xparse.sty b/Master/texmf-dist/tex/latex/l3packages/xparse/xparse.sty
index f1a144b2e16..16f16a26a13 100644
--- a/Master/texmf-dist/tex/latex/l3packages/xparse/xparse.sty
+++ b/Master/texmf-dist/tex/latex/l3packages/xparse/xparse.sty
@@ -50,19 +50,20 @@
 %%
 %% -----------------------------------------------------------------------
 %%
-\RequirePackage{expl3}[2012/11/21]
-\@ifpackagelater{expl3}{2012/11/21}
+\RequirePackage{expl3}[2012/12/21]
+\@ifpackagelater{expl3}{2012/12/21}
   {}
   {%
-    \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.\\ \\
+        Please install an up to date version of l3kernel\MessageBreak
+        using your TeX package manager or from CTAN.\MessageBreak
+        \MessageBreak
         Loading xparse will abort!%
       }%
     \endinput
   }
-\GetIdInfo$Id: xparse.dtx 4332 2012-11-21 21:40:31Z joseph $
+\GetIdInfo$Id: xparse.dtx 4390 2012-12-21 06:59:20Z joseph $
   {L3 Experimental document command parser}
 \ProvidesExplPackage
   {\ExplFileName}{\ExplFileDate}{\ExplFileVersion}{\ExplFileDescription}
@@ -206,6 +207,7 @@
           {#1} { \tl_to_str:n {#2} }
       }
     \prop_put:Nnn \l__xparse_environment_arg_specs_prop {#1} {#2}
+    \bool_set_false:N \l__xparse_expandable_bool
     \bool_set_true:N \l__xparse_environment_bool
     \__xparse_declare_env_internal:nnnn {#1} {#2}
   }
@@ -629,8 +631,8 @@
       { \__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 { }
+\cs_new_protected:Npn \__xparse_grab_arg_auxi:w { }
+\cs_new_protected:Npn \__xparse_grab_arg_auxii:w { }
 \cs_new_protected:Npn \__xparse_grab_D:w #1#2#3#4 \l__xparse_args_tl
   {
     \__xparse_grab_D_aux:NNnnNn #1 #2 {#3} {#4} \cs_set_protected_nopar:Npn
@@ -972,10 +974,10 @@
 \cs_new_protected:Npn \__xparse_grab_v_aux_loop:N #1
   {
     \peek_N_type:TF
-      { \__xparse_grab_v_aux_loop_ii:NN #1 }
+      { \__xparse_grab_v_aux_loop:NN #1 }
       { \__xparse_grab_v_aux_abort: }
   }
-\cs_new_protected:Npn \__xparse_grab_v_aux_loop_ii:NN #1 #2
+\cs_new_protected:Npn \__xparse_grab_v_aux_loop:NN #1 #2
   {
     \__xparse_grab_v_token_if_char:NTF #2
       {
@@ -1005,10 +1007,10 @@
 \cs_new_protected:Npn \__xparse_grab_v_bgroup_loop:
   {
     \peek_N_type:TF
-      { \__xparse_grab_v_bgroup_loop_ii:N }
+      { \__xparse_grab_v_bgroup_loop:N }
       { \__xparse_grab_v_aux_abort: }
   }
-\cs_new_protected:Npn \__xparse_grab_v_bgroup_loop_ii:N #1
+\cs_new_protected:Npn \__xparse_grab_v_bgroup_loop:N #1
   {
     \__xparse_grab_v_token_if_char:NTF #1
       {
@@ -1044,9 +1046,9 @@
   {
     \__xparse_grab_v_group_end:
     \__xparse_add_arg:o \c__xparse_no_value_tl
-    \exp_after:wN \__xparse_grab_v_aux_abort_ii:w \l__xparse_args_tl \q_stop
+    \exp_after:wN \__xparse_grab_v_aux_abort:w \l__xparse_args_tl \q_stop
   }
-\cs_new_protected:Npn \__xparse_grab_v_aux_abort_ii:w #1 #2 \q_stop
+\cs_new_protected:Npn \__xparse_grab_v_aux_abort:w #1 #2 \q_stop
   {
     \group_begin:
     \char_set_lccode:nn { `\# } { \tex_endlinechar:D }
@@ -1103,28 +1105,28 @@
 }
 \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
+  { #2 { \__xparse_expandable_grab_D:NNNnwNn #1 \q__xparse #2 } }
+\cs_new:Npn \__xparse_expandable_grab_D: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 }
+          { \__xparse_expandable_grab_D: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
+\cs_new:Npn \__xparse_expandable_grab_D:NNNwNnnn #1#2#3#4 \q__xparse #5#6#7#8
   {
-    \exp_args:Nof \__xparse_expandable_grab_D_iv:nnNNNwN
+    \exp_args:Nof \__xparse_expandable_grab_D:nnNNNwN
       { \use_ii:nn #6 #2 }
-      { \__xparse_expandable_grab_D_iii:Nw #3 \exp_stop_f: #7 #8 }
+      { \__xparse_expandable_grab_D: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
+\cs_new:Npn \__xparse_expandable_grab_D:Nw #1#2 \ERROR \ERROR { #2 #1 }
+\cs_new:Npn \__xparse_expandable_grab_D: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 }
@@ -1134,25 +1136,25 @@
       }
       {
         #3
-          { \__xparse_expandable_grab_D_ii:NNNwNnnn #3#4#5#6 \q__xparse #7 }
+          { \__xparse_expandable_grab_D: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
+  { #2 { \__xparse_expandable_grab_D_alt:NNnwNn #1 \q__xparse #2 } }
+\cs_new:Npn \__xparse_expandable_grab_D_alt: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 }
+          { \__xparse_expandable_grab_D_alt: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
+\cs_new:Npn \__xparse_expandable_grab_D_alt: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 } }
@@ -1167,7 +1169,7 @@
       { { } { #2 } { } }
       {
         #1
-          { \__xparse_expandable_grab_D_ii:NNNwNnnn #1#2#3#5 \q__xparse #6 }
+          { \__xparse_expandable_grab_D:NNNwNnnn #1#2#3#5 \q__xparse #6 }
           \q_nil { } #2 \ERROR \q__xparse \ERROR
       }
       {
@@ -1185,7 +1187,7 @@
       { { } #2 }
       {
         #1
-          { \__xparse_expandable_grab_D_alt_ii:Nwn #5 #4 \q__xparse }
+          { \__xparse_expandable_grab_D_alt:Nwn #5 #4 \q__xparse }
           #6 \ERROR
       }
       {
diff --git a/Master/texmf-dist/tex/latex/l3packages/xtemplate/xtemplate.sty b/Master/texmf-dist/tex/latex/l3packages/xtemplate/xtemplate.sty
index c2fa5195eba..7c33f8c0803 100644
--- a/Master/texmf-dist/tex/latex/l3packages/xtemplate/xtemplate.sty
+++ b/Master/texmf-dist/tex/latex/l3packages/xtemplate/xtemplate.sty
@@ -50,19 +50,20 @@
 %%
 %% -----------------------------------------------------------------------
 %%
-\RequirePackage{expl3}[2012/11/21]
-\@ifpackagelater{expl3}{2012/11/21}
+\RequirePackage{expl3}[2012/12/21]
+\@ifpackagelater{expl3}{2012/12/21}
   {}
   {%
-    \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.\\ \\
+        Please install an up to date version of l3kernel\MessageBreak
+        using your TeX package manager or from CTAN.\MessageBreak
+        \MessageBreak
         Loading xtemplate will abort!%
       }%
     \endinput
   }
-\GetIdInfo$Id: xtemplate.dtx 4332 2012-11-21 21:40:31Z joseph $
+\GetIdInfo$Id: xtemplate.dtx 4390 2012-12-21 06:59:20Z joseph $
   {L3 Experimental prototype document functions}
 \ProvidesExplPackage
   {\ExplFileName}{\ExplFileDate}{\ExplFileVersion}{\ExplFileDescription}
@@ -843,12 +844,22 @@
   }
 \cs_new_protected_nopar:Npn \__xtemplate_assign_boolean_aux:n #1
   {
-    \__xtemplate_if_key_value:oT \l__xtemplate_value_tl
-      { \__xtemplate_key_to_value: }
-    \tl_put_right:Nx \l__xtemplate_assignments_tl
+    \__xtemplate_if_key_value:oTF \l__xtemplate_value_tl
       {
-        \exp_not:c { #1 _ \l__xtemplate_value_tl :N }
-        \exp_not:o \l__xtemplate_var_tl
+        \__xtemplate_key_to_value:
+        \tl_put_right:Nx \l__xtemplate_assignments_tl
+          {
+            \exp_not:c { #1 _eq:NN }
+            \exp_not:o \l__xtemplate_var_tl
+            \exp_not:o \l__xtemplate_value_tl
+          }
+      }
+      {
+        \tl_put_right:Nx \l__xtemplate_assignments_tl
+          {
+            \exp_not:c { #1 _ \l__xtemplate_value_tl :N }
+            \exp_not:o \l__xtemplate_var_tl
+          }
       }
   }
 \cs_new_protected_nopar:Npn \__xtemplate_assign_choice: