l3 (19oct16)

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

4 files changed, 121 insertions, 121 deletions

diff --git a/Master/texmf-dist/tex/latex/l3packages/l3keys2e/l3keys2e.sty b/Master/texmf-dist/tex/latex/l3packages/l3keys2e/l3keys2e.sty
index 782004ad183..f16aa19f843 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}[2016/05/18]
-\@ifpackagelater{expl3}{2016/05/18}
+\RequirePackage{expl3}[2016/10/19]
+\@ifpackagelater{expl3}{2016/10/19}
   {}
   {%
     \PackageError{l3keys2e}{Support package l3kernel too old}
@@ -61,8 +61,8 @@
   }
 \def\ExplFileName{l3keys2e}
 \def\ExplFileDescription{LaTeX2e option processing using LaTeX3 keys}
-\def\ExplFileDate{2016/05/18}
-\def\ExplFileVersion{6512}
+\def\ExplFileDate{2016/10/19}
+\def\ExplFileVersion{6730}
 \ProvidesExplPackage
   {\ExplFileName}{\ExplFileDate}{\ExplFileVersion}{\ExplFileDescription}
 \cs_generate_variant:Nn \clist_put_right:Nn { Nv }
@@ -135,7 +135,7 @@
           }
       }
   }
-\cs_new_protected_nopar:Npn \__keys_latexe_options_local:
+\cs_new_protected:Npn \__keys_latexe_options_local:
   {
     \cs_if_eq:NNF \@currext \@clsextension
       {
@@ -149,12 +149,12 @@
 \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 { \exp_not:n {#1} }
-\cs_new_protected_nopar:Npn \ProcessKeysOptions #1
+\cs_new_protected:Npn \ProcessKeysOptions #1
   {
     \bool_set_true:N \l__keys_process_class_bool
     \__keys_latexe_options:n {#1}
   }
-\cs_new_protected_nopar:Npn \ProcessKeysPackageOptions #1
+\cs_new_protected:Npn \ProcessKeysPackageOptions #1
   {
     \bool_set_false:N \l__keys_process_class_bool
     \__keys_latexe_options:n {#1}
diff --git a/Master/texmf-dist/tex/latex/l3packages/xfrac/xfrac.sty b/Master/texmf-dist/tex/latex/l3packages/xfrac/xfrac.sty
index 9f41789cb3c..a16df31eead 100644
--- a/Master/texmf-dist/tex/latex/l3packages/xfrac/xfrac.sty
+++ b/Master/texmf-dist/tex/latex/l3packages/xfrac/xfrac.sty
@@ -47,8 +47,8 @@
 %%
 %% -----------------------------------------------------------------------
 %%
-\RequirePackage{expl3}[2016/05/18]
-\@ifpackagelater{expl3}{2016/05/18}
+\RequirePackage{expl3}[2016/10/19]
+\@ifpackagelater{expl3}{2016/10/19}
   {}
   {%
     \PackageError{xfrac}{Support package l3kernel too old}
@@ -63,8 +63,8 @@
 \RequirePackage{amstext,graphicx,l3keys2e,textcomp,xparse,xtemplate}
 \def\ExplFileName{xfrac}
 \def\ExplFileDescription{L3 Experimental split-level fractions}
-\def\ExplFileDate{2016/05/18}
-\def\ExplFileVersion{6512}
+\def\ExplFileDate{2016/10/19}
+\def\ExplFileVersion{6730}
 \ProvidesExplPackage
   {\ExplFileName}{\ExplFileDate}{\ExplFileVersion}{\ExplFileDescription}
 \keys_define:nn { xfrac }
@@ -98,14 +98,14 @@
 \tl_new:N \l__xfrac_phantom_tl
 \tl_new:N \l__xfrac_slash_symbol_tl
 \tl_new:N \l__xfrac_slash_symbol_font_tl
-\cs_new_nopar:Npn \__xfrac_fontscale: { }
+\cs_new:Npn \__xfrac_fontscale: { }
 \cs_new:Npn \__xfrac_math:n #1 { }
-\cs_new_nopar:Npn \__xfrac_denominator_font_change: { }
+\cs_new:Npn \__xfrac_denominator_font_change: { }
 \cs_new:Npn \__xfrac_denominator_format:n #1 { }
-\cs_new_nopar:Npn \__xfrac_numerator_font_change: { }
+\cs_new:Npn \__xfrac_numerator_font_change: { }
 \cs_new:Npn \__xfrac_numerator_format:n #1 { }
-\cs_new_nopar:Npn \__xfrac_relscale: { }
-\cs_new_nopar:Npn \__xfrac_slash_symbol_font_change: { }
+\cs_new:Npn \__xfrac_relscale: { }
+\cs_new:Npn \__xfrac_slash_symbol_font_change: { }
 \cs_new:Npn \__xfrac_slash_symbol_format:n #1 { }
 \cs_new:Npn \__xfrac_text_or_math:n #1 { }
 \DeclareObjectType { xfrac } { 3 }
@@ -156,21 +156,21 @@
     scale-relative      =
       {
         false =
-          \cs_set_nopar:Npn \__xfrac_relscale:
+          \cs_set:Npn \__xfrac_relscale:
             {
               \__dim_eval:w
                 \box_ht:N \l__xfrac_tmp_box + \box_dp:N \l__xfrac_tmp_box
               \__dim_eval_end:
             },
         true  =
-          \cs_set_nopar:Npn \__xfrac_relscale:
+          \cs_set:Npn \__xfrac_relscale:
             { \box_ht:N \l__xfrac_slash_box }
       },
     scaling             =
       {
         false = \cs_set_eq:NN \__xfrac_fontscale: \prg_do_nothing:,
         true  =
-          \cs_set_nopar:Npn \__xfrac_fontscale:
+          \cs_set:Npn \__xfrac_fontscale:
             {
               \fontsize
                 { \fp_use:N \l__xfrac_scale_factor_fp \__xfrac_relscale: }
@@ -192,26 +192,26 @@
     \mode_if_math:TF
       {
         \cs_set_eq:NN \__xfrac_text_or_math:n \text
-        \cs_set_nopar:Npx \__xfrac_denominator_font_change:
+        \cs_set:Npx \__xfrac_denominator_font_change:
           { \tex_fam:D \l__xfrac_denominator_font_tl }
-        \cs_set_nopar:Npx \__xfrac_numerator_font_change:
+        \cs_set:Npx \__xfrac_numerator_font_change:
           { \tex_fam:D \l__xfrac_numerator_font_tl }
-        \cs_set_nopar:Npx \__xfrac_slash_symbol_font_change:
+        \cs_set:Npx \__xfrac_slash_symbol_font_change:
           { \tex_fam:D \l__xfrac_slash_symbol_font_tl }
       }
       {
         \cs_set_eq:NN \__xfrac_text_or_math:n \mbox
-        \cs_set_nopar:Npn \__xfrac_denominator_font_change:
+        \cs_set:Npn \__xfrac_denominator_font_change:
           {
             \fontfamily { \l__xfrac_denominator_font_tl }
             \selectfont
           }
-        \cs_set_nopar:Npn \__xfrac_numerator_font_change:
+        \cs_set:Npn \__xfrac_numerator_font_change:
           {
             \fontfamily { \l__xfrac_numerator_font_tl }
             \selectfont
           }
-        \cs_set_nopar:Npn \__xfrac_slash_symbol_font_change:
+        \cs_set:Npn \__xfrac_slash_symbol_font_change:
           {
             \fontfamily { \l__xfrac_slash_symbol_font_tl }
             \selectfont
@@ -237,7 +237,7 @@
                   }
               }
           }
-        \cs_set_nopar:Npn \__xfrac_tmp:w
+        \cs_set:Npn \__xfrac_tmp:w
           {
             \raisebox
               {
@@ -254,7 +254,7 @@
             \dim_compare:nNnF
               { \l__xfrac_numerator_bot_sep_dim } = { \c_max_dim }
               {
-                \cs_set_nopar:Npn \__xfrac_tmp:w
+                \cs_set:Npn \__xfrac_tmp:w
                   {
                     \raisebox
                       { \dim_use:N \l__xfrac_numerator_bot_sep_dim }
@@ -265,7 +265,7 @@
             \dim_compare:nNnTF
               { \l__xfrac_numerator_bot_sep_dim } = { \c_max_dim }
                 {
-                  \cs_set_nopar:Npn \__xfrac_tmp:w
+                  \cs_set:Npn \__xfrac_tmp:w
                     {
                       \raisebox
                         {
@@ -319,11 +319,11 @@
         \dim_compare:nNnTF
           { \l__xfrac_denominator_bot_sep_dim } = { \c_max_dim }
           {
-            \cs_set_nopar:Npn \__xfrac_tmp:w
+            \cs_set:Npn \__xfrac_tmp:w
               { \raisebox { - \box_dp:N \l__xfrac_slash_box } }
           }
           {
-            \cs_set_nopar:Npn \__xfrac_tmp:w
+            \cs_set:Npn \__xfrac_tmp:w
               {
                 \raisebox
                   { \dim_use:N \l__xfrac_denominator_bot_sep_dim }
diff --git a/Master/texmf-dist/tex/latex/l3packages/xparse/xparse.sty b/Master/texmf-dist/tex/latex/l3packages/xparse/xparse.sty
index 8a4664f615a..4777b58c255 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}[2016/05/18]
-\@ifpackagelater{expl3}{2016/05/18}
+\RequirePackage{expl3}[2016/10/19]
+\@ifpackagelater{expl3}{2016/10/19}
   {}
   {%
     \PackageError{xparse}{Support package l3kernel too old}
@@ -65,8 +65,8 @@
   }
 \def\ExplFileName{xparse}
 \def\ExplFileDescription{L3 Experimental document command parser}
-\def\ExplFileDate{2016/05/18}
-\def\ExplFileVersion{6512}
+\def\ExplFileDate{2016/10/19}
+\def\ExplFileVersion{6730}
 \ProvidesExplPackage
   {\ExplFileName}{\ExplFileDate}{\ExplFileVersion}{\ExplFileDescription}
 \tl_const:Nx \c__xparse_no_value_tl
@@ -97,12 +97,12 @@
 \int_new:N \l__xparse_processor_int
 \tl_new:N \l__xparse_signature_tl
 \tl_new:N \l__xparse_tmp_tl
-\cs_new_protected_nopar:Npn \__xparse_declare_cmd:Nnn
+\cs_new_protected:Npn \__xparse_declare_cmd:Nnn
   {
     \bool_set_false:N \l__xparse_expandable_bool
     \__xparse_declare_cmd_aux:Nnn
   }
-\cs_new_protected_nopar:Npn \__xparse_declare_expandable_cmd:Nnn
+\cs_new_protected:Npn \__xparse_declare_expandable_cmd:Nnn
   {
     \bool_set_true:N \l__xparse_expandable_bool
     \__xparse_declare_cmd_aux:Nnn
@@ -267,7 +267,7 @@
     \quark_if_recursion_tail_stop_do:nn {#3} { \__xparse_bad_arg_spec:wn }
     \__xparse_count_mandatory:N
   }
-\cs_new_protected_nopar:Npn \__xparse_count_type_g:w
+\cs_new_protected:Npn \__xparse_count_type_g:w
   { \__xparse_count_mandatory:N }
 \cs_new_protected:Npn \__xparse_count_type_G:w #1
   {
@@ -286,7 +286,7 @@
     \quark_if_recursion_tail_stop_do:nn {#2} { \__xparse_bad_arg_spec:wn }
     \__xparse_count_mandatory:N
   }
-\cs_new_protected_nopar:Npn \__xparse_count_type_m:w
+\cs_new_protected:Npn \__xparse_count_type_m:w
   {
     \int_incr:N \l__xparse_mandatory_args_int
     \__xparse_count_mandatory:N
@@ -342,7 +342,7 @@
     \tl_clear:N \l__xparse_signature_tl
     \__xparse_prepare_signature:N #1 \q_recursion_tail \q_recursion_stop
   }
-\cs_new_protected_nopar:Npn \__xparse_prepare_signature:N
+\cs_new_protected:Npn \__xparse_prepare_signature:N
   {
     \bool_set_false:N \l__xparse_processor_bool
     \__xparse_prepare_signature_bypass:N
@@ -373,7 +373,7 @@
           { \__xparse_add_type_m:w }
       }
   }
-\cs_new_protected_nopar:cpn { __xparse_add_type_+:w }
+\cs_new_protected:cpn { __xparse_add_type_+:w }
   {
     \__xparse_flush_m_args:
     \bool_set_true:N \l__xparse_long_bool
@@ -397,7 +397,7 @@
     \tl_put_right:Nn \l__xparse_signature_tl { #1 #2 {#3} }
     \__xparse_prepare_signature:N
   }
-\cs_new_protected_nopar:Npn \__xparse_add_type_g:w
+\cs_new_protected:Npn \__xparse_add_type_g:w
   { \exp_args:No \__xparse_add_type_G:w \c__xparse_no_value_tl }
 \cs_new_protected:Npn \__xparse_add_type_G:w #1
   {
@@ -415,13 +415,13 @@
     \tl_put_right:Nn \l__xparse_signature_tl { #1 {#2} }
     \__xparse_prepare_signature:N
   }
-\cs_new_protected_nopar:Npn \__xparse_add_type_l:w
+\cs_new_protected:Npn \__xparse_add_type_l:w
   {
     \__xparse_flush_m_args:
     \__xparse_add_grabber_mandatory:N l
     \__xparse_prepare_signature:N
   }
-\cs_new_protected_nopar:Npn \__xparse_add_type_m:w
+\cs_new_protected:Npn \__xparse_add_type_m:w
   {
     \bool_if:nTF { \l__xparse_long_bool || \l__xparse_processor_bool }
       {
@@ -454,13 +454,13 @@
     \tl_put_right:Nn \l__xparse_signature_tl { {#1} }
     \__xparse_prepare_signature:N
   }
-\cs_new_protected_nopar:Npn \__xparse_add_type_v:w
+\cs_new_protected:Npn \__xparse_add_type_v:w
   {
     \__xparse_flush_m_args:
     \__xparse_add_grabber_mandatory:N v
     \__xparse_prepare_signature:N
   }
-\cs_new_protected_nopar:Npn \__xparse_flush_m_args:
+\cs_new_protected:Npn \__xparse_flush_m_args:
   {
     \int_compare:nNnT \l__xparse_m_args_int > \c_zero
       {
@@ -470,7 +470,7 @@
       }
     \int_zero:N \l__xparse_m_args_int
   }
-\cs_new_protected_nopar:Npn \__xparse_add_grabber_mandatory:N #1
+\cs_new_protected:Npn \__xparse_add_grabber_mandatory:N #1
   {
     \tl_put_right:Nx \l__xparse_signature_tl
       {
@@ -480,7 +480,7 @@
     \bool_set_false:N \l__xparse_long_bool
     \int_decr:N \l__xparse_mandatory_args_int
   }
-\cs_new_protected_nopar:Npn \__xparse_add_grabber_optional:N #1
+\cs_new_protected:Npn \__xparse_add_grabber_optional:N #1
   {
     \tl_put_right:Nx \l__xparse_signature_tl
       {
@@ -495,7 +495,7 @@
       }
     \bool_set_false:N \l__xparse_long_bool
   }
-\cs_new_protected_nopar:cpn { __xparse_add_expandable_type_+:w }
+\cs_new_protected:cpn { __xparse_add_expandable_type_+:w }
   {
     \bool_set_true:N \l__xparse_long_bool
     \int_compare:nNnTF \l__xparse_current_arg_int = \c_one
@@ -561,24 +561,24 @@
     \bool_set_false:N \l__xparse_long_bool
     \__xparse_prepare_signature:N
   }
-\cs_new_protected_nopar:Npn \__xparse_add_expandable_type_g:w
+\cs_new_protected:Npn \__xparse_add_expandable_type_g:w
   {
     \__msg_kernel_error:nnx { xparse } { invalid-expandable-argument-type }
       { g }
     \__xparse_add_expandable_type_m:w
   }
-\cs_new_protected_nopar:Npn \__xparse_add_expandable_type_G:w #1
+\cs_new_protected:Npn \__xparse_add_expandable_type_G:w #1
   {
     \__msg_kernel_error:nnx { xparse } { invalid-expandable-argument-type }
       { G }
     \__xparse_add_expandable_type_m:w
   }
-\cs_new_protected_nopar:Npn \__xparse_add_expandable_type_k:w #1
+\cs_new_protected:Npn \__xparse_add_expandable_type_k:w #1
   {
     \exp_args:NNo
       \__xparse_add_expandable_type_K:w #1 \c__xparse_no_value_tl
   }
-\cs_new_protected_nopar:Npn \__xparse_add_expandable_type_K:w #1#2
+\cs_new_protected:Npn \__xparse_add_expandable_type_K:w #1#2
   {
     \__xparse_add_expandable_grabber_optional:n { K }
     \bool_if:NTF \l__xparse_all_long_bool
@@ -594,13 +594,13 @@
     \bool_set_false:N \l__xparse_long_bool
     \__xparse_prepare_signature:N
   }
-\cs_new_protected_nopar:Npn \__xparse_add_expandable_type_l:w
+\cs_new_protected:Npn \__xparse_add_expandable_type_l:w
   {
     \__msg_kernel_error:nnx { xparse } { invalid-expandable-argument-type }
       { l }
     \__xparse_add_expandable_type_m:w
   }
-\cs_new_protected_nopar:Npn \__xparse_add_expandable_type_m:w
+\cs_new_protected:Npn \__xparse_add_expandable_type_m:w
   {
     \int_incr:N \l__xparse_m_args_int
     \__xparse_add_expandable_grabber_mandatory:n { m }
@@ -624,7 +624,7 @@
         \__xparse_add_expandable_type_D_aux:NNn #1#2
       }
   }
-\cs_new_protected_nopar:Npn \__xparse_add_expandable_type_t:w #1
+\cs_new_protected:Npn \__xparse_add_expandable_type_t:w #1
   {
     \__xparse_add_expandable_grabber_optional:n { t }
     \bool_if:NTF \l__xparse_all_long_bool
@@ -639,19 +639,19 @@
     \bool_set_false:N \l__xparse_long_bool
     \__xparse_prepare_signature:N
   }
-\cs_new_protected_nopar:Npn \__xparse_add_expandable_type_u:w #1
+\cs_new_protected:Npn \__xparse_add_expandable_type_u:w #1
   {
     \__msg_kernel_error:nnx { xparse } { invalid-expandable-argument-type }
       { u }
     \__xparse_add_expandable_type_m:w
   }
-\cs_new_protected_nopar:Npn \__xparse_add_expandable_type_v:w
+\cs_new_protected:Npn \__xparse_add_expandable_type_v:w
   {
     \__msg_kernel_error:nnx { xparse } { invalid-expandable-argument-type }
       { v }
     \__xparse_add_expandable_type_m:w
   }
-\cs_new_protected_nopar:Npn \__xparse_add_expandable_grabber_mandatory:n #1
+\cs_new_protected:Npn \__xparse_add_expandable_grabber_mandatory:n #1
   {
     \__xparse_add_expandable_long_check:
     \tl_put_right:Nx \l__xparse_signature_tl
@@ -659,7 +659,7 @@
     \bool_set_false:N \l__xparse_long_bool
     \int_decr:N \l__xparse_mandatory_args_int
   }
-\cs_new_protected_nopar:Npn \__xparse_add_expandable_grabber_optional:n #1
+\cs_new_protected:Npn \__xparse_add_expandable_grabber_optional:n #1
   {
     \__xparse_add_expandable_long_check:
     \int_compare:nNnF \l__xparse_mandatory_args_int > \c_zero
@@ -668,7 +668,7 @@
       { \exp_not:c { __xparse_expandable_grab_ #1 :w } }
     \bool_set_false:N \l__xparse_long_bool
   }
-\cs_new_protected_nopar:Npn \__xparse_add_expandable_long_check:
+\cs_new_protected:Npn \__xparse_add_expandable_long_check:
   {
     \bool_if:nT { \l__xparse_all_long_bool && ! \l__xparse_long_bool }
       { \__msg_kernel_error:nn { xparse } { inconsistent-long } }
@@ -1010,12 +1010,12 @@
   }
 \tl_new:N \l__xparse_v_rest_of_signature_tl
 \tl_new:N \l__xparse_v_arg_tl
-\cs_new_protected_nopar:Npn \__xparse_grab_v:w
+\cs_new_protected:Npn \__xparse_grab_v:w
   {
     \bool_set_false:N \l__xparse_long_bool
     \__xparse_grab_v_aux:w
   }
-\cs_new_protected_nopar:Npn \__xparse_grab_v_long:w
+\cs_new_protected:Npn \__xparse_grab_v_long:w
   {
     \bool_set_true:N \l__xparse_long_bool
     \__xparse_grab_v_aux:w
@@ -1038,7 +1038,7 @@
               { \__xparse_grab_v_aux_abort:n { } }
           }
   }
-\cs_new_protected_nopar:Npn \__xparse_grab_v_group_end:
+\cs_new_protected:Npn \__xparse_grab_v_group_end:
   {
         \group_align_safe_end:
         \exp_args:NNNo
@@ -1074,14 +1074,14 @@
       }
       { \__xparse_grab_v_aux_abort:n {#2} #2 }
   }
-\cs_new_protected_nopar:Npn \__xparse_grab_v_aux_loop_end:
+\cs_new_protected:Npn \__xparse_grab_v_aux_loop_end:
   {
     \__xparse_grab_v_group_end:
     \exp_args:Nx \__xparse_add_arg:n { \tl_tail:N \l__xparse_v_arg_tl }
     \l__xparse_v_rest_of_signature_tl \l__xparse_args_tl
   }
 \int_new:N \l__xparse_v_nesting_int
-\cs_new_protected_nopar:Npx \__xparse_grab_v_bgroup:
+\cs_new_protected:Npx \__xparse_grab_v_bgroup:
   {
     \exp_not:N \__xparse_grab_v_aux_catcodes:
     \exp_not:n { \int_set_eq:NN \l__xparse_v_nesting_int \c_one }
@@ -1117,7 +1117,7 @@
       }
       { \__xparse_grab_v_aux_abort:n {#1} #1 }
   }
-\cs_new_protected_nopar:Npn \__xparse_grab_v_aux_catcodes:
+\cs_new_protected:Npn \__xparse_grab_v_aux_catcodes:
   {
     \cs_set_eq:NN \do \char_set_catcode_other:N
     \dospecials
@@ -1759,8 +1759,8 @@
 \cs_new_eq:NN \IfNoValueF  \__xparse_if_no_value:nF
 \cs_new_eq:NN \IfNoValueT  \__xparse_if_no_value:nT
 \cs_new_eq:NN \IfNoValueTF \__xparse_if_no_value:nTF
-\cs_new_nopar:Npn \IfValueF { \__xparse_if_no_value:nT }
-\cs_new_nopar:Npn \IfValueT { \__xparse_if_no_value:nF }
+\cs_new:Npn \IfValueF { \__xparse_if_no_value:nT }
+\cs_new:Npn \IfValueT { \__xparse_if_no_value:nF }
 \cs_new:Npn \IfValueTF #1#2#3 { \__xparse_if_no_value:nTF {#1} {#3} {#2} }
 \tl_new:N \ProcessedArgument
 \cs_new_eq:NN \ReverseBoolean \__xparse_bool_reverse:N
diff --git a/Master/texmf-dist/tex/latex/l3packages/xtemplate/xtemplate.sty b/Master/texmf-dist/tex/latex/l3packages/xtemplate/xtemplate.sty
index 04efdce2561..8f389e34ab5 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}[2016/05/18]
-\@ifpackagelater{expl3}{2016/05/18}
+\RequirePackage{expl3}[2016/10/19]
+\@ifpackagelater{expl3}{2016/10/19}
   {}
   {%
     \PackageError{xtemplate}{Support package l3kernel too old}
@@ -65,8 +65,8 @@
   }
 \def\ExplFileName{xtemplate}
 \def\ExplFileDescription{L3 Experimental prototype document functions}
-\def\ExplFileDate{2016/05/18}
-\def\ExplFileVersion{6512}
+\def\ExplFileDate{2016/10/19}
+\def\ExplFileVersion{6730}
 \ProvidesExplPackage
   {\ExplFileName}{\ExplFileDate}{\ExplFileVersion}{\ExplFileDescription}
 \tl_const:Nn \c__xtemplate_code_root_tl      { template~code~>~ }
@@ -295,7 +295,7 @@
           }
       }
   }
-\cs_new_protected_nopar:Npn \__xtemplate_parse_keys_elt_aux:n #1
+\cs_new_protected:Npn \__xtemplate_parse_keys_elt_aux:n #1
   {
     \str_if_eq:onT \l__xtemplate_keytype_tl {#1}
       {
@@ -308,7 +308,7 @@
           }
       }
   }
-\cs_new_nopar:Npn \__xtemplate_parse_keys_elt_aux:
+\cs_new:Npn \__xtemplate_parse_keys_elt_aux:
   {
     \tl_set:Nx \l__xtemplate_tmp_tl
       {
@@ -377,7 +377,7 @@
   {
     \tl_set:Nn \l__xtemplate_keytype_tl {#1}
     \tl_clear:N \l__xtemplate_keytype_arg_tl
-    \cs_set_protected_nopar:Npn \__xtemplate_split_keytype_arg_aux:n ##1
+    \cs_set_protected:Npn \__xtemplate_split_keytype_arg_aux:n ##1
       {
         \tl_if_in:nnT {#1} {##1}
           {
@@ -398,8 +398,8 @@
       \__xtemplate_split_keytype_arg_aux:n
   }
 \cs_generate_variant:Nn \__xtemplate_split_keytype_arg:n { o }
-\cs_new_nopar:Npn \__xtemplate_split_keytype_arg_aux:n #1 { }
-\cs_new_nopar:Npn \__xtemplate_split_keytype_arg_aux:w #1 \q_stop { }
+\cs_new:Npn \__xtemplate_split_keytype_arg_aux:n #1 { }
+\cs_new:Npn \__xtemplate_split_keytype_arg_aux:w #1 \q_stop { }
 \cs_new_protected:Npn \__xtemplate_store_value_boolean:n #1
   {
     \__xtemplate_if_eval_now:nTF {#1}
@@ -573,7 +573,7 @@
             { \tl_to_str:n { #1 global #2 } }
       }
   }
-\cs_new_protected_nopar:Npn \__xtemplate_create_variable:N #1
+\cs_new_protected:Npn \__xtemplate_create_variable:N #1
   {
     \str_case:onF \l__xtemplate_keytype_tl
       {
@@ -607,7 +607,7 @@
           }
       }
   }
-\cs_new_protected_nopar:Npn \__xtemplate_implement_choices_default:
+\cs_new_protected:Npn \__xtemplate_implement_choices_default:
   {
     \tl_set:Nx \l__xtemplate_tmp_tl
       { \l__xtemplate_key_name_tl \c_space_tl \l__xtemplate_tmp_tl }
@@ -789,7 +789,7 @@
     \__xtemplate_declare_instance_aux:nnnnn {#1} {#2}
   }
 \cs_generate_variant:Nn \__xtemplate_edit_instance_aux:nnnnn { no }
-\cs_new_protected_nopar:Npn \__xtemplate_convert_to_assignments:
+\cs_new_protected:Npn \__xtemplate_convert_to_assignments:
   {
     \tl_clear:N \l__xtemplate_assignments_tl
     \seq_map_function:NN \l__xtemplate_key_order_seq
@@ -819,7 +819,7 @@
       }
   }
 \cs_generate_variant:Nn \__xtemplate_convert_to_assignments_aux:nn { no }
-\cs_new_protected_nopar:Npn \__xtemplate_find_global:
+\cs_new_protected:Npn \__xtemplate_find_global:
   {
     \bool_set_false:N \l__xtemplate_global_bool
     \tl_if_in:onT \l__xtemplate_var_tl { global }
@@ -843,13 +843,13 @@
         \use:c { \c__xtemplate_code_root_tl #1 / #2  }
       }
   }
-\cs_new_protected_nopar:Npn \__xtemplate_assign_boolean:
+\cs_new_protected:Npn \__xtemplate_assign_boolean:
   {
     \bool_if:NTF \l__xtemplate_global_bool
       { \__xtemplate_assign_boolean_aux:n { bool_gset } }
       { \__xtemplate_assign_boolean_aux:n { bool_set } }
   }
-\cs_new_protected_nopar:Npn \__xtemplate_assign_boolean_aux:n #1
+\cs_new_protected:Npn \__xtemplate_assign_boolean_aux:n #1
   {
     \__xtemplate_if_key_value:oTF \l__xtemplate_value_tl
       {
@@ -869,7 +869,7 @@
           }
       }
   }
-\cs_new_protected_nopar:Npn \__xtemplate_assign_choice:
+\cs_new_protected:Npn \__xtemplate_assign_choice:
   {
     \__xtemplate_assign_choice_aux:xF
       { \l__xtemplate_key_name_tl \c_space_tl \l__xtemplate_value_tl }
@@ -886,7 +886,7 @@
           }
       }
   }
-\cs_new_protected_nopar:Npn \__xtemplate_assign_choice_aux:nF #1
+\cs_new_protected:Npn \__xtemplate_assign_choice_aux:nF #1
   {
     \prop_get:NnNTF
       \l__xtemplate_vars_prop
@@ -895,7 +895,7 @@
       { \tl_put_right:No \l__xtemplate_assignments_tl \l__xtemplate_tmp_tl }
   }
 \cs_generate_variant:Nn \__xtemplate_assign_choice_aux:nF { x }
-\cs_new_protected_nopar:Npn \__xtemplate_assign_code:
+\cs_new_protected:Npn \__xtemplate_assign_code:
   {
     \tl_put_right:Nx \l__xtemplate_assignments_tl
       {
@@ -905,13 +905,13 @@
       }
   }
 \cs_new_protected:Npn \__xtemplate_assign_code:n #1 { }
-\cs_new_protected_nopar:Npn \__xtemplate_assign_function:
+\cs_new_protected:Npn \__xtemplate_assign_function:
   {
     \bool_if:NTF \l__xtemplate_global_bool
       { \__xtemplate_assign_function_aux:N \cs_gset:Npn }
       { \__xtemplate_assign_function_aux:N \cs_set:Npn  }
   }
-\cs_new_protected_nopar:Npn \__xtemplate_assign_function_aux:N #1
+\cs_new_protected:Npn \__xtemplate_assign_function_aux:N #1
   {
     \tl_put_right:Nx \l__xtemplate_assignments_tl
       {
@@ -922,13 +922,13 @@
           { \exp_not:o \l__xtemplate_value_tl }
       }
   }
-\cs_new_protected_nopar:Npn \__xtemplate_assign_instance:
+\cs_new_protected:Npn \__xtemplate_assign_instance:
   {
     \bool_if:NTF \l__xtemplate_global_bool
       { \__xtemplate_assign_instance_aux:N \cs_gset_protected:Npn }
       { \__xtemplate_assign_instance_aux:N \cs_set_protected:Npn  }
   }
-\cs_new_protected_nopar:Npn \__xtemplate_assign_instance_aux:N #1
+\cs_new_protected:Npn \__xtemplate_assign_instance_aux:N #1
   {
     \tl_put_right:Nx \l__xtemplate_assignments_tl
       {
@@ -940,43 +940,43 @@
           }
       }
   }
-\cs_new_protected_nopar:Npn \__xtemplate_assign_integer:
+\cs_new_protected:Npn \__xtemplate_assign_integer:
   {
     \bool_if:NTF \l__xtemplate_global_bool
       { \__xtemplate_assign_variable:N \int_gset:Nn }
       { \__xtemplate_assign_variable:N \int_set:Nn  }
   }
-\cs_new_protected_nopar:Npn \__xtemplate_assign_length:
+\cs_new_protected:Npn \__xtemplate_assign_length:
   {
     \bool_if:NTF \l__xtemplate_global_bool
       { \__xtemplate_assign_variable:N \dim_gset:Nn }
       { \__xtemplate_assign_variable:N \dim_set:Nn  }
 }
-\cs_new_protected_nopar:Npn \__xtemplate_assign_muskip:
+\cs_new_protected:Npn \__xtemplate_assign_muskip:
   {
     \bool_if:NTF \l__xtemplate_global_bool
       { \__xtemplate_assign_variable:N \muskip_gset:Nn }
       { \__xtemplate_assign_variable:N \muskip_set:Nn  }
   }
-\cs_new_protected_nopar:Npn \__xtemplate_assign_real:
+\cs_new_protected:Npn \__xtemplate_assign_real:
   {
     \bool_if:NTF \l__xtemplate_global_bool
       { \__xtemplate_assign_variable:N \fp_gset:Nn }
       { \__xtemplate_assign_variable:N \fp_set:Nn  }
   }
-\cs_new_protected_nopar:Npn \__xtemplate_assign_skip:
+\cs_new_protected:Npn \__xtemplate_assign_skip:
   {
     \bool_if:NTF \l__xtemplate_global_bool
       { \__xtemplate_assign_variable:N \skip_gset:Nn }
       { \__xtemplate_assign_variable:N \skip_set:Nn  }
   }
-\cs_new_protected_nopar:Npn \__xtemplate_assign_tokenlist:
+\cs_new_protected:Npn \__xtemplate_assign_tokenlist:
   {
     \bool_if:NTF \l__xtemplate_global_bool
       { \__xtemplate_assign_tokenlist_aux:NN \tl_gset:NV \tl_gset:Nn }
       { \__xtemplate_assign_tokenlist_aux:NN \tl_set:NV  \tl_set:Nn }
   }
-\cs_new_protected_nopar:Npn \__xtemplate_assign_tokenlist_aux:NN #1#2
+\cs_new_protected:Npn \__xtemplate_assign_tokenlist_aux:NN #1#2
   {
     \__xtemplate_if_key_value:oTF \l__xtemplate_value_tl
       {
@@ -995,13 +995,13 @@
           }
       }
   }
-\cs_new_protected_nopar:Npn \__xtemplate_assign_commalist:
+\cs_new_protected:Npn \__xtemplate_assign_commalist:
   {
     \bool_if:NTF \l__xtemplate_global_bool
       { \__xtemplate_assign_tokenlist_aux:NN \clist_gset:NV \clist_gset:Nn }
       { \__xtemplate_assign_tokenlist_aux:NN \clist_set:NV  \clist_set:Nn }
   }
-\cs_new_protected_nopar:Npn \__xtemplate_assign_variable:N #1
+\cs_new_protected:Npn \__xtemplate_assign_variable:N #1
   {
     \__xtemplate_if_key_value:oT \l__xtemplate_value_tl
       { \__xtemplate_key_to_value: }
@@ -1011,7 +1011,7 @@
          { \exp_not:o \l__xtemplate_value_tl }
       }
   }
-\cs_new_protected_nopar:Npn \__xtemplate_key_to_value:
+\cs_new_protected:Npn \__xtemplate_key_to_value:
   { \exp_after:wN \__xtemplate_key_to_value_auxi:w \l__xtemplate_value_tl }
 \cs_new_protected:Npn \__xtemplate_key_to_value_auxi:w \KeyValue #1
   {
@@ -1076,12 +1076,12 @@
       \l__xtemplate_collection_tl
       { \tl_clear:N \l__xtemplate_collection_tl }
   }
-\cs_new_nopar:Npn \__xtemplate_assignments_pop: { \l__xtemplate_assignments_tl }
+\cs_new:Npn \__xtemplate_assignments_pop: { \l__xtemplate_assignments_tl }
 \cs_new_protected:Npn \__xtemplate_assignments_push:n #1
   { \tl_set:Nn \l__xtemplate_assignments_tl {#1} }
-\cs_new_protected_nopar:Npn \__xtemplate_show_code:nn #1#2
+\cs_new_protected:Npn \__xtemplate_show_code:nn #1#2
   { \cs_show:c { \c__xtemplate_code_root_tl #1 / #2 } }
-\cs_new_protected_nopar:Npn \__xtemplate_show_defaults:nn #1#2
+\cs_new_protected:Npn \__xtemplate_show_defaults:nn #1#2
   {
     \__xtemplate_if_keys_exist:nnT {#1} {#2}
       {
@@ -1090,7 +1090,7 @@
           {#1} {#2} { default~values }
       }
   }
-\cs_new_protected_nopar:Npn \__xtemplate_show_keytypes:nn #1#2
+\cs_new_protected:Npn \__xtemplate_show_keytypes:nn #1#2
   {
     \__xtemplate_if_keys_exist:nnT {#1} {#2}
       {
@@ -1099,7 +1099,7 @@
           {#1} {#2} { interface }
       }
   }
-\cs_new_protected_nopar:Npn \__xtemplate_show_vars:nn #1#2
+\cs_new_protected:Npn \__xtemplate_show_vars:nn #1#2
   {
      \__xtemplate_execute_if_code_exist:nnT {#1} {#2}
       {
@@ -1108,7 +1108,7 @@
           {#1} {#2} { variable~mapping }
       }
   }
-\cs_new_protected_nopar:Npn \__xtemplate_show:Nnnn #1#2#3#4
+\cs_new_protected:Npn \__xtemplate_show:Nnnn #1#2#3#4
   {
     \__msg_show_pre:nnnnnn { xtemplate }
       { \prop_if_empty:NTF #1 { show-no-attribute } { show-attribute } }
@@ -1116,7 +1116,7 @@
     \__msg_show_wrap:n
       { \prop_map_function:NN #1 \__msg_show_item_unbraced:nn }
   }
-\cs_new_protected_nopar:Npn \__xtemplate_show_values:nnn #1#2#3
+\cs_new_protected:Npn \__xtemplate_show_values:nnn #1#2#3
   {
     \__xtemplate_if_instance_exist:nnnT {#1} {#2} {#3}
       {
@@ -1341,7 +1341,7 @@
     \tl_if_empty:nF {#4} { (from~template~'#4')~ }
     has~values:
   }
-\cs_new_protected_nopar:Npn \DeclareObjectType #1#2
+\cs_new_protected:Npn \DeclareObjectType #1#2
   { \__xtemplate_declare_object_type:nn {#1} {#2} }
 \cs_new_protected:Npn \DeclareTemplateInterface #1#2#3#4
   { \__xtemplate_declare_template_keys:nnnn {#1} {#2} {#3} {#4} }
@@ -1359,33 +1359,33 @@
   { \__xtemplate_edit_instance:nnnn {#1} { } {#2} {#3} }
 \cs_new_protected:Npn \EditCollectionInstance #1#2#3#4
   { \__xtemplate_edit_instance:nnnn {#2} {#1} {#3} {#4} }
-\cs_new_protected_nopar:Npn \UseTemplate #1#2#3
+\cs_new_protected:Npn \UseTemplate #1#2#3
   { \__xtemplate_use_template:nnn {#1} {#2} {#3} }
-\cs_new_protected_nopar:Npn \UseInstance #1#2
+\cs_new_protected:Npn \UseInstance #1#2
   { \__xtemplate_use_instance:nn {#1} {#2} }
-\cs_new_protected_nopar:Npn \UseCollection #1#2
+\cs_new_protected:Npn \UseCollection #1#2
   { \__xtemplate_use_collection:nn {#1} {#2} }
-\cs_new_protected_nopar:Npn \ShowTemplateCode #1#2
+\cs_new_protected:Npn \ShowTemplateCode #1#2
   { \__xtemplate_show_code:nn {#1} {#2} }
-\cs_new_protected_nopar:Npn \ShowTemplateDefaults #1#2
+\cs_new_protected:Npn \ShowTemplateDefaults #1#2
   { \__xtemplate_show_defaults:nn {#1} {#2} }
-\cs_new_protected_nopar:Npn \ShowTemplateInterface #1#2
+\cs_new_protected:Npn \ShowTemplateInterface #1#2
   { \__xtemplate_show_keytypes:nn {#1} {#2} }
-\cs_new_protected_nopar:Npn \ShowTemplateVariables #1#2
+\cs_new_protected:Npn \ShowTemplateVariables #1#2
   { \__xtemplate_show_vars:nn {#1} {#2} }
-\cs_new_protected_nopar:Npn \ShowInstanceValues #1#2
+\cs_new_protected:Npn \ShowInstanceValues #1#2
   { \__xtemplate_show_values:nnn {#1} { } {#2} }
-\cs_new_protected_nopar:Npn \ShowCollectionInstanceValues #1#2#3
+\cs_new_protected:Npn \ShowCollectionInstanceValues #1#2#3
   { \__xtemplate_show_values:nnn {#1} {#2} {#3} }
-\cs_new_nopar:Npn \IfInstanceExistTF #1#2
+\cs_new:Npn \IfInstanceExistTF #1#2
   { \__xtemplate_if_instance_exist:nnnTF {#1} { } {#2} }
-\cs_new_nopar:Npn \IfInstanceExistT #1#2
+\cs_new:Npn \IfInstanceExistT #1#2
   { \__xtemplate_if_instance_exist:nnnT {#1} { } {#2} }
-\cs_new_nopar:Npn \IfInstanceExistF #1#2
+\cs_new:Npn \IfInstanceExistF #1#2
   { \__xtemplate_if_instance_exist:nnnF {#1} { } {#2} }
 \cs_new_protected:Npn \EvaluateNow #1 {#1}
 \cs_new_protected:Npn \KeyValue #1 {#1}
-\cs_new_protected_nopar:Npn \AssignTemplateKeys
+\cs_new_protected:Npn \AssignTemplateKeys
   { \__xtemplate_assignments_pop: }
 \cs_new_eq:NN \ShowTemplateKeytypes \ShowTemplateInterface
 %%