l3

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

3 files changed, 15 insertions, 13 deletions

diff --git a/Master/texmf-dist/tex/latex/l3packages/l3keys2e/l3keys2e.sty b/Master/texmf-dist/tex/latex/l3packages/l3keys2e/l3keys2e.sty
index bf54335e6fe..7efae37b0e6 100644
--- a/Master/texmf-dist/tex/latex/l3packages/l3keys2e/l3keys2e.sty
+++ b/Master/texmf-dist/tex/latex/l3packages/l3keys2e/l3keys2e.sty
@@ -46,8 +46,8 @@
 %%
 %% -----------------------------------------------------------------------
 %%
-\RequirePackage{expl3}[2015/06/15]
-\@ifpackagelater{expl3}{2015/06/15}
+\RequirePackage{expl3}[2015/07/14]
+\@ifpackagelater{expl3}{2015/07/14}
   {}
   {%
     \PackageError{l3keys2e}{Support package l3kernel too old}
@@ -59,11 +59,13 @@
       }%
     \endinput
   }
-\GetIdInfo$Id: l3keys2e.dtx 5630 2015-06-15 08:49:02Z joseph $
+\GetIdInfo$Id: l3keys2e.dtx 5662 2015-07-14 21:32:38Z joseph $
   {LaTeX2e option processing using LaTeX3 keys}
 \ProvidesExplPackage
   {\ExplFileName}{\ExplFileDate}{\ExplFileVersion}{\ExplFileDescription}
 \cs_generate_variant:Nn \clist_put_right:Nn { Nv }
+\cs_generate_variant:Nn \keys_if_exist:nnT  { nx }
+\cs_generate_variant:Nn \keys_if_exist:nnTF { nx }
 \clist_new:N \l__keys_latexe_options_clist
 \bool_new:N \l__keys_process_class_bool
 \cs_new_protected:Npn \__keys_latexe_options:n #1
@@ -113,7 +115,7 @@
           {
             \clist_map_inline:cn { opt@ \@currname . \@currext }
               {
-                \keys_if_exist:nnTF {#1} { \__keys_latexe_remove_equals:n {##1} }
+                \keys_if_exist:nxTF {#1} { \__keys_latexe_remove_equals:n {##1} }
                   { \clist_put_right:Nn \l__keys_latexe_options_clist {##1} }
                   { \clist_put_right:Nn \@unusedoptionlist {##1} }
               }
@@ -124,7 +126,7 @@
   {
     \clist_map_inline:Nn \@classoptionslist
       {
-        \keys_if_exist:nnT {#1} { \__keys_latexe_remove_equals:n {##1} }
+        \keys_if_exist:nxT {#1} { \__keys_latexe_remove_equals:n {##1} }
           {
             \clist_put_right:Nn \l__keys_latexe_options_clist {##1}
             \clist_remove_all:Nn \@unusedoptionlist {##1}
@@ -144,7 +146,7 @@
   }
 \cs_new:Npn \__keys_latexe_remove_equals:n #1
   { \__keys_latexe_remove_equals:w #1 = \q_stop }
-\cs_new:Npn \__keys_latexe_remove_equals:w #1 = #2 \q_stop {#1}
+\cs_new:Npn \__keys_latexe_remove_equals:w #1 = #2 \q_stop { \exp_not:n {#1} }
 \cs_new_protected_nopar:Npn \ProcessKeysOptions #1
   {
     \bool_set_true:N \l__keys_process_class_bool
diff --git a/Master/texmf-dist/tex/latex/l3packages/xparse/xparse.sty b/Master/texmf-dist/tex/latex/l3packages/xparse/xparse.sty
index 14a6ae0329c..befd3da667a 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}[2015/06/15]
-\@ifpackagelater{expl3}{2015/06/15}
+\RequirePackage{expl3}[2015/07/14]
+\@ifpackagelater{expl3}{2015/07/14}
   {}
   {%
     \PackageError{xparse}{Support package l3kernel too old}
@@ -63,7 +63,7 @@
       }%
     \endinput
   }
-\GetIdInfo$Id: xparse.dtx 5630 2015-06-15 08:49:02Z joseph $
+\GetIdInfo$Id: xparse.dtx 5662 2015-07-14 21:32:38Z joseph $
   {L3 Experimental document command parser}
 \ProvidesExplPackage
   {\ExplFileName}{\ExplFileDate}{\ExplFileVersion}{\ExplFileDescription}
diff --git a/Master/texmf-dist/tex/latex/l3packages/xtemplate/xtemplate.sty b/Master/texmf-dist/tex/latex/l3packages/xtemplate/xtemplate.sty
index 880ef38681d..64fa70a81f5 100644
--- a/Master/texmf-dist/tex/latex/l3packages/xtemplate/xtemplate.sty
+++ b/Master/texmf-dist/tex/latex/l3packages/xtemplate/xtemplate.sty
@@ -50,8 +50,8 @@
 %%
 %% -----------------------------------------------------------------------
 %%
-\RequirePackage{expl3}[2015/06/15]
-\@ifpackagelater{expl3}{2015/06/15}
+\RequirePackage{expl3}[2015/07/14]
+\@ifpackagelater{expl3}{2015/07/14}
   {}
   {%
     \PackageError{xtemplate}{Support package l3kernel too old}
@@ -63,7 +63,7 @@
       }%
     \endinput
   }
-\GetIdInfo$Id: xtemplate.dtx 5630 2015-06-15 08:49:02Z joseph $
+\GetIdInfo$Id: xtemplate.dtx 5662 2015-07-14 21:32:38Z joseph $
   {L3 Experimental prototype document functions}
 \ProvidesExplPackage
   {\ExplFileName}{\ExplFileDate}{\ExplFileVersion}{\ExplFileDescription}
@@ -568,7 +568,7 @@
   }
 \cs_new_protected_nopar:Npn \__xtemplate_create_variable:N #1
   {
-    \str_case:onn \l__xtemplate_keytype_tl
+    \str_case:onF \l__xtemplate_keytype_tl
       {
         { boolean }   { \bool_new:N #1 }
         { commalist } { \clist_new:N #1 }