l3 (7may21)

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

1 files changed, 9 insertions, 4 deletions

diff --git a/Master/texmf-dist/tex/latex/l3packages/xtemplate/xtemplate.sty b/Master/texmf-dist/tex/latex/l3packages/xtemplate/xtemplate.sty
index e417770b7d0..ff1f70cffd2 100644
--- a/Master/texmf-dist/tex/latex/l3packages/xtemplate/xtemplate.sty
+++ b/Master/texmf-dist/tex/latex/l3packages/xtemplate/xtemplate.sty
@@ -32,7 +32,7 @@
       }%
     \endinput
   }
-\ProvidesExplPackage{xtemplate}{2021-03-12}{}
+\ProvidesExplPackage{xtemplate}{2021-05-07}{}
   {L3 Experimental prototype document functions}
 \tl_const:Nn \c__xtemplate_code_root_tl      { template~code~>~ }
 \tl_const:Nn \c__xtemplate_defaults_root_tl  { template~defaults~>~ }
@@ -485,12 +485,12 @@
 \cs_new_protected:Npn \__xtemplate_store_key_implementation:nnn #1#2#3
   {
     \__xtemplate_recover_defaults:n { #1 / #2 }
+    \__xtemplate_recover_restrictions:n { #1 / #2 }
     \__xtemplate_recover_keytypes:n { #1 / #2 }
     \prop_clear:N \l__xtemplate_vars_prop
     \keyval_parse:NNn
       \__xtemplate_parse_vars_elt:n \__xtemplate_parse_vars_elt:nn {#3}
     \__xtemplate_store_vars:n { #1 / #2 }
-    \clist_clear:N \l__xtemplate_restrict_clist
     \__xtemplate_store_restrictions:n { #1 / #2 }
     \prop_map_inline:Nn \l__xtemplate_keytypes_prop
       {
@@ -681,8 +681,12 @@
   }
 \cs_new_protected:Npn \__xtemplate_parse_values:nn #1#2
   {
-    \__xtemplate_recover_keytypes:n {#1}
     \clist_clear:N \l__xtemplate_restrict_clist
+    \__xtemplate_parse_values_aux:nn {#1} {#2}
+  }
+\cs_new_protected:Npn \__xtemplate_parse_values_aux:nn #1#2
+  {
+    \__xtemplate_recover_keytypes:n {#1}
     \keyval_parse:NNn
       \__xtemplate_parse_values_elt:n \__xtemplate_parse_values_elt:nn {#2}
   }
@@ -733,6 +737,7 @@
     \__xtemplate_execute_if_code_exist:nnT {#1} {#2}
       {
         \__xtemplate_recover_defaults:n { #1 / #2 }
+        \__xtemplate_recover_restrictions:n { #1 / #2 }
         \__xtemplate_recover_vars:n { #1 / #2 }
         \__xtemplate_declare_instance_aux:nnnnn {#1} {#2} {#3} {#4} {#5}
       }
@@ -740,7 +745,7 @@
 \cs_new_protected:Npn \__xtemplate_declare_instance_aux:nnnnn #1#2#3#4#5
   {
     \bool_set_false:N \l__xtemplate_error_bool
-    \__xtemplate_parse_values:nn { #1 / #2 } {#5}
+    \__xtemplate_parse_values_aux:nn { #1 / #2 } {#5}
     \bool_if:NF \l__xtemplate_error_bool
       {
         \prop_put:Nnn \l__xtemplate_values_prop { from~template } {#2}