l3 (19oct16)

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

4 files changed, 129 insertions, 129 deletions

diff --git a/Master/texmf-dist/source/latex/l3packages/l3keys2e/l3keys2e.dtx b/Master/texmf-dist/source/latex/l3packages/l3keys2e/l3keys2e.dtx
index 05c4a29b55b..017e64c4408 100644
--- a/Master/texmf-dist/source/latex/l3packages/l3keys2e/l3keys2e.dtx
+++ b/Master/texmf-dist/source/latex/l3packages/l3keys2e/l3keys2e.dtx
@@ -37,8 +37,8 @@
 %<*driver|package>
 % The version of expl3 required is tested as early as possible, as
 % some really old versions do not define \ProvidesExplPackage.
-\RequirePackage{expl3}[2016/05/18]
-%<package>\@ifpackagelater{expl3}{2016/05/18}
+\RequirePackage{expl3}[2016/10/19]
+%<package>\@ifpackagelater{expl3}{2016/10/19}
 %<package>  {}
 %<package>  {%
 %<package>    \PackageError{l3keys2e}{Support package l3kernel too old}
@@ -52,8 +52,8 @@
 %<package>  }
 \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}
 %</driver|package>
 %<*driver>
 \documentclass[full]{l3doc}
@@ -288,7 +288,7 @@
 %   \LaTeXe{} stores options for each file in a macro which may or may not
 %   exist, hence the need to use \cs{cs_if_exist:c}.
 %    \begin{macrocode}
-\cs_new_protected_nopar:Npn \@@_latexe_options_local:
+\cs_new_protected:Npn \@@_latexe_options_local:
   {
     \cs_if_eq:NNF \@currext \@clsextension
       {
@@ -321,12 +321,12 @@
 %   contrast to other similar packages, the module name is always required
 %   here.
 %    \begin{macrocode}
-\cs_new_protected_nopar:Npn \ProcessKeysOptions #1
+\cs_new_protected:Npn \ProcessKeysOptions #1
   {
     \bool_set_true:N \l_@@_process_class_bool
     \@@_latexe_options:n {#1}
   }
-\cs_new_protected_nopar:Npn \ProcessKeysPackageOptions #1
+\cs_new_protected:Npn \ProcessKeysPackageOptions #1
   {
     \bool_set_false:N \l_@@_process_class_bool
     \@@_latexe_options:n {#1}
diff --git a/Master/texmf-dist/source/latex/l3packages/xfrac/xfrac.dtx b/Master/texmf-dist/source/latex/l3packages/xfrac/xfrac.dtx
index 6204cdcca48..ff94447c900 100644
--- a/Master/texmf-dist/source/latex/l3packages/xfrac/xfrac.dtx
+++ b/Master/texmf-dist/source/latex/l3packages/xfrac/xfrac.dtx
@@ -38,8 +38,8 @@
 %<*driver|package>
 % The version of expl3 required is tested as early as possible, as
 % some really old versions do not define \ProvidesExplPackage.
-\RequirePackage{expl3}[2016/05/18]
-%<package>\@ifpackagelater{expl3}{2016/05/18}
+\RequirePackage{expl3}[2016/10/19]
+%<package>\@ifpackagelater{expl3}{2016/10/19}
 %<package>  {}
 %<package>  {%
 %<package>    \PackageError{xfrac}{Support package l3kernel too old}
@@ -54,8 +54,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}
 %</driver|package>
 %<*driver>
 \documentclass[full]{l3doc}
@@ -678,14 +678,14 @@
 %   (no argument required) or are functions taking one argument in the
 %   code.
 %    \begin{macrocode}
-\cs_new_nopar:Npn \@@_fontscale: { }
+\cs_new:Npn \@@_fontscale: { }
 \cs_new:Npn \@@_math:n #1 { }
-\cs_new_nopar:Npn \@@_denominator_font_change: { }
+\cs_new:Npn \@@_denominator_font_change: { }
 \cs_new:Npn \@@_denominator_format:n #1 { }
-\cs_new_nopar:Npn \@@_numerator_font_change: { }
+\cs_new:Npn \@@_numerator_font_change: { }
 \cs_new:Npn \@@_numerator_format:n #1 { }
-\cs_new_nopar:Npn \@@_relscale: { }
-\cs_new_nopar:Npn \@@_slash_symbol_font_change: { }
+\cs_new:Npn \@@_relscale: { }
+\cs_new:Npn \@@_slash_symbol_font_change: { }
 \cs_new:Npn \@@_slash_symbol_format:n #1 { }
 \cs_new:Npn \@@_text_or_math:n #1 { }
 %    \end{macrocode}
@@ -763,21 +763,21 @@
     scale-relative      =
       {
         false =
-          \cs_set_nopar:Npn \@@_relscale:
+          \cs_set:Npn \@@_relscale:
             {
               \__dim_eval:w
                 \box_ht:N \l_@@_tmp_box + \box_dp:N \l_@@_tmp_box
               \__dim_eval_end:
             },
         true  =
-          \cs_set_nopar:Npn \@@_relscale:
+          \cs_set:Npn \@@_relscale:
             { \box_ht:N \l_@@_slash_box }
       },
     scaling             =
       {
         false = \cs_set_eq:NN \@@_fontscale: \prg_do_nothing:,
         true  =
-          \cs_set_nopar:Npn \@@_fontscale:
+          \cs_set:Npn \@@_fontscale:
             {
               \fontsize
                 { \fp_use:N \l_@@_scale_factor_fp \@@_relscale: }
@@ -804,26 +804,26 @@
     \mode_if_math:TF
       {
         \cs_set_eq:NN \@@_text_or_math:n \text
-        \cs_set_nopar:Npx \@@_denominator_font_change:
+        \cs_set:Npx \@@_denominator_font_change:
           { \tex_fam:D \l_@@_denominator_font_tl }
-        \cs_set_nopar:Npx \@@_numerator_font_change:
+        \cs_set:Npx \@@_numerator_font_change:
           { \tex_fam:D \l_@@_numerator_font_tl }
-        \cs_set_nopar:Npx \@@_slash_symbol_font_change:
+        \cs_set:Npx \@@_slash_symbol_font_change:
           { \tex_fam:D \l_@@_slash_symbol_font_tl }
       }
       {
         \cs_set_eq:NN \@@_text_or_math:n \mbox
-        \cs_set_nopar:Npn \@@_denominator_font_change:
+        \cs_set:Npn \@@_denominator_font_change:
           {
             \fontfamily { \l_@@_denominator_font_tl }
             \selectfont
           }
-        \cs_set_nopar:Npn \@@_numerator_font_change:
+        \cs_set:Npn \@@_numerator_font_change:
           {
             \fontfamily { \l_@@_numerator_font_tl }
             \selectfont
           }
-        \cs_set_nopar:Npn \@@_slash_symbol_font_change:
+        \cs_set:Npn \@@_slash_symbol_font_change:
           {
             \fontfamily { \l_@@_slash_symbol_font_tl }
             \selectfont
@@ -859,7 +859,7 @@
 % set up a default, which is also used when both values are set
 % erroneously.
 %    \begin{macrocode}
-        \cs_set_nopar:Npn \@@_tmp:w
+        \cs_set:Npn \@@_tmp:w
           {
             \raisebox
               {
@@ -876,7 +876,7 @@
             \dim_compare:nNnF
               { \l_@@_numerator_bot_sep_dim } = { \c_max_dim }
               {
-                \cs_set_nopar:Npn \@@_tmp:w
+                \cs_set:Npn \@@_tmp:w
                   {
                     \raisebox
                       { \dim_use:N \l_@@_numerator_bot_sep_dim }
@@ -887,7 +887,7 @@
             \dim_compare:nNnTF
               { \l_@@_numerator_bot_sep_dim } = { \c_max_dim }
                 {
-                  \cs_set_nopar:Npn \@@_tmp:w
+                  \cs_set:Npn \@@_tmp:w
                     {
                       \raisebox
                         {
@@ -950,11 +950,11 @@
         \dim_compare:nNnTF
           { \l_@@_denominator_bot_sep_dim } = { \c_max_dim }
           {
-            \cs_set_nopar:Npn \@@_tmp:w
+            \cs_set:Npn \@@_tmp:w
               { \raisebox { - \box_dp:N \l_@@_slash_box } }
           }
           {
-            \cs_set_nopar:Npn \@@_tmp:w
+            \cs_set:Npn \@@_tmp:w
               {
                 \raisebox
                   { \dim_use:N \l_@@_denominator_bot_sep_dim }
diff --git a/Master/texmf-dist/source/latex/l3packages/xparse/xparse.dtx b/Master/texmf-dist/source/latex/l3packages/xparse/xparse.dtx
index f19e9301113..3a142e32fa9 100644
--- a/Master/texmf-dist/source/latex/l3packages/xparse/xparse.dtx
+++ b/Master/texmf-dist/source/latex/l3packages/xparse/xparse.dtx
@@ -41,8 +41,8 @@
 %<*driver|package>
 % The version of expl3 required is tested as early as possible, as
 % some really old versions do not define \ProvidesExplPackage.
-\RequirePackage{expl3}[2016/05/18]
-%<package>\@ifpackagelater{expl3}{2016/05/18}
+\RequirePackage{expl3}[2016/10/19]
+%<package>\@ifpackagelater{expl3}{2016/10/19}
 %<package>  {}
 %<package>  {%
 %<package>    \PackageError{xparse}{Support package l3kernel too old}
@@ -56,8 +56,8 @@
 %<package>  }
 \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}
 %</driver|package>
 %<*driver>
 \documentclass[full]{l3doc}
@@ -415,7 +415,7 @@
 % variables to return information about the nature of the argument
 % received.
 %
-% \begin{function}[EXP,TF]{\IfNoValue}
+% \begin{function}[EXP]{\IfNoValueT, \IfNoValueF, \IfNoValueTF}
 %   \begin{syntax}
 %     \cs{IfNoValueTF} \Arg{argument} \Arg{true code} \Arg{false code}
 %     \cs{IfNoValueT} \Arg{argument} \Arg{true code}
@@ -451,7 +451,7 @@
 %   will be logically \texttt{false}.
 % \end{function}
 %
-% \begin{function}[EXP,TF]{\IfValue}
+% \begin{function}[EXP]{\IfValueT, \IfValueF, \IfValueTF}
 %   \begin{syntax}
 %     \cs{IfValueTF} \Arg{argument} \Arg{true code} \Arg{false code}
 %    \end{syntax}
@@ -466,7 +466,7 @@
 %   names which are accessible outside of code blocks.
 % \end{variable}
 %
-% \begin{function}[EXP,TF]{\IfBoolean}
+% \begin{function}[EXP]{\IfBooleanT, \IfBooleanF, \IfBooleanTF}
 %   \begin{syntax}
 %     \cs{IfBooleanTF} \meta{argument} \Arg{true code} \Arg{false code}
 %   \end{syntax}
@@ -915,12 +915,12 @@
 %   The main functions for creating commands set the appropriate flag then
 %   use the same internal code to do the definition.
 %    \begin{macrocode}
-\cs_new_protected_nopar:Npn \@@_declare_cmd:Nnn
+\cs_new_protected:Npn \@@_declare_cmd:Nnn
   {
     \bool_set_false:N \l_@@_expandable_bool
     \@@_declare_cmd_aux:Nnn
   }
-\cs_new_protected_nopar:Npn \@@_declare_expandable_cmd:Nnn
+\cs_new_protected:Npn \@@_declare_expandable_cmd:Nnn
   {
     \bool_set_true:N \l_@@_expandable_bool
     \@@_declare_cmd_aux:Nnn
@@ -1202,7 +1202,7 @@
     \quark_if_recursion_tail_stop_do:nn {#3} { \@@_bad_arg_spec:wn }
     \@@_count_mandatory:N
   }
-\cs_new_protected_nopar:Npn \@@_count_type_g:w
+\cs_new_protected:Npn \@@_count_type_g:w
   { \@@_count_mandatory:N }
 \cs_new_protected:Npn \@@_count_type_G:w #1
   {
@@ -1221,7 +1221,7 @@
     \quark_if_recursion_tail_stop_do:nn {#2} { \@@_bad_arg_spec:wn }
     \@@_count_mandatory:N
   }
-\cs_new_protected_nopar:Npn \@@_count_type_m:w
+\cs_new_protected:Npn \@@_count_type_m:w
   {
     \int_incr:N \l_@@_mandatory_args_int
     \@@_count_mandatory:N
@@ -1312,7 +1312,7 @@
 %  process so that when actually setting up processors the flag-reset can
 %  be bypassed.
 %    \begin{macrocode}
-\cs_new_protected_nopar:Npn \@@_prepare_signature:N
+\cs_new_protected:Npn \@@_prepare_signature:N
   {
     \bool_set_false:N \l_@@_processor_bool
     \@@_prepare_signature_bypass:N
@@ -1369,7 +1369,7 @@
 %   off the total argument count. The \texttt{m} arguments are recorded here as
 %   this has to be done for every case where there is then a long argument.
 %    \begin{macrocode}
-\cs_new_protected_nopar:cpn { @@_add_type_+:w }
+\cs_new_protected:cpn { @@_add_type_+:w }
   {
     \@@_flush_m_args:
     \bool_set_true:N \l_@@_long_bool
@@ -1419,7 +1419,7 @@
 %   The \texttt{g} type is simply an alias for \texttt{G} with the correct
 %   default built-in.
 %    \begin{macrocode}
-\cs_new_protected_nopar:Npn \@@_add_type_g:w
+\cs_new_protected:Npn \@@_add_type_g:w
   { \exp_args:No \@@_add_type_G:w \c_@@_no_value_tl }
 %    \end{macrocode}
 % \end{macro}
@@ -1458,7 +1458,7 @@
 %   Finding \texttt{l} arguments is very simple: there is nothing to do
 %   other than add the grabber.
 %    \begin{macrocode}
-\cs_new_protected_nopar:Npn \@@_add_type_l:w
+\cs_new_protected:Npn \@@_add_type_l:w
   {
     \@@_flush_m_args:
     \@@_add_grabber_mandatory:N l
@@ -1475,7 +1475,7 @@
 %   argument is required it is simply counted at this stage, to be
 %   added later using \cs{@@_flush_m_args:}.
 %    \begin{macrocode}
-\cs_new_protected_nopar:Npn \@@_add_type_m:w
+\cs_new_protected:Npn \@@_add_type_m:w
   {
     \bool_if:nTF { \l_@@_long_bool || \l_@@_processor_bool }
       {
@@ -1535,7 +1535,7 @@
 % \begin{macro}{\@@_add_type_v:w}
 %   At this stage, the \texttt{v} argument is identical to \texttt{l}.
 %    \begin{macrocode}
-\cs_new_protected_nopar:Npn \@@_add_type_v:w
+\cs_new_protected:Npn \@@_add_type_v:w
   {
     \@@_flush_m_args:
     \@@_add_grabber_mandatory:N v
@@ -1552,7 +1552,7 @@
 %   remain to be added to
 %   the signature is also decreased by the appropriate amount.
 %    \begin{macrocode}
-\cs_new_protected_nopar:Npn \@@_flush_m_args:
+\cs_new_protected:Npn \@@_flush_m_args:
   {
     \int_compare:nNnT \l_@@_m_args_int > \c_zero
       {
@@ -1574,7 +1574,7 @@
 %   This is used to determine whether to skip spaces or not where
 %   searching for the argument.
 %    \begin{macrocode}
-\cs_new_protected_nopar:Npn \@@_add_grabber_mandatory:N #1
+\cs_new_protected:Npn \@@_add_grabber_mandatory:N #1
   {
     \tl_put_right:Nx \l_@@_signature_tl
       {
@@ -1584,7 +1584,7 @@
     \bool_set_false:N \l_@@_long_bool
     \int_decr:N \l_@@_mandatory_args_int
   }
-\cs_new_protected_nopar:Npn \@@_add_grabber_optional:N #1
+\cs_new_protected:Npn \@@_add_grabber_optional:N #1
   {
     \tl_put_right:Nx \l_@@_signature_tl
       {
@@ -1613,7 +1613,7 @@
 % \begin{macro}{\@@_add_expandable_type_+:w}
 %   Check that a plus is given only if it occurs for every argument.
 %    \begin{macrocode}
-\cs_new_protected_nopar:cpn { @@_add_expandable_type_+:w }
+\cs_new_protected:cpn { @@_add_expandable_type_+:w }
   {
     \bool_set_true:N \l_@@_long_bool
     \int_compare:nNnTF \l_@@_current_arg_int = \c_one
@@ -1712,13 +1712,13 @@
 % \begin{macro}{\@@_add_expandable_type_G:w}
 %   These are not allowed at all, so there is a complaint and a fall-back.
 %    \begin{macrocode}
-\cs_new_protected_nopar:Npn \@@_add_expandable_type_g:w
+\cs_new_protected:Npn \@@_add_expandable_type_g:w
   {
     \__msg_kernel_error:nnx { xparse } { invalid-expandable-argument-type }
       { g }
     \@@_add_expandable_type_m:w
   }
-\cs_new_protected_nopar:Npn \@@_add_expandable_type_G:w #1
+\cs_new_protected:Npn \@@_add_expandable_type_G:w #1
   {
     \__msg_kernel_error:nnx { xparse } { invalid-expandable-argument-type }
       { G }
@@ -1731,12 +1731,12 @@
 % \begin{macro}{\@@_add_expandable_type_k:w}
 % \begin{macro}{\@@_add_expandable_type_K:w}
 %    \begin{macrocode}
-\cs_new_protected_nopar:Npn \@@_add_expandable_type_k:w #1
+\cs_new_protected:Npn \@@_add_expandable_type_k:w #1
   {
     \exp_args:NNo
       \@@_add_expandable_type_K:w #1 \c_@@_no_value_tl
   }
-\cs_new_protected_nopar:Npn \@@_add_expandable_type_K:w #1#2
+\cs_new_protected:Npn \@@_add_expandable_type_K:w #1#2
   {
     \@@_add_expandable_grabber_optional:n { K }
     \bool_if:NTF \l_@@_all_long_bool
@@ -1760,7 +1760,7 @@
 %   Invalid in expandable contexts (as the next left brace may have been
 %   inserted by \pkg{xparse} due to a failed search for an optional argument).
 %    \begin{macrocode}
-\cs_new_protected_nopar:Npn \@@_add_expandable_type_l:w
+\cs_new_protected:Npn \@@_add_expandable_type_l:w
   {
     \__msg_kernel_error:nnx { xparse } { invalid-expandable-argument-type }
       { l }
@@ -1775,7 +1775,7 @@
 %   arguments. To deal with the latter case, the value of
 %   \cs{l_@@_m_args_int} needs to be increased appropriately.
 %    \begin{macrocode}
-\cs_new_protected_nopar:Npn \@@_add_expandable_type_m:w
+\cs_new_protected:Npn \@@_add_expandable_type_m:w
   {
     \int_incr:N \l_@@_m_args_int
     \@@_add_expandable_grabber_mandatory:n { m }
@@ -1813,7 +1813,7 @@
 %
 % \begin{macro}{\@@_add_expandable_type_t:w}
 %    \begin{macrocode}
-\cs_new_protected_nopar:Npn \@@_add_expandable_type_t:w #1
+\cs_new_protected:Npn \@@_add_expandable_type_t:w #1
   {
     \@@_add_expandable_grabber_optional:n { t }
     \bool_if:NTF \l_@@_all_long_bool
@@ -1835,7 +1835,7 @@
 %   Invalid in an expandable context as any preceding optional argument may
 %   wrap part of the delimiter up in braces.
 %    \begin{macrocode}
-\cs_new_protected_nopar:Npn \@@_add_expandable_type_u:w #1
+\cs_new_protected:Npn \@@_add_expandable_type_u:w #1
   {
     \__msg_kernel_error:nnx { xparse } { invalid-expandable-argument-type }
       { u }
@@ -1847,7 +1847,7 @@
 % \begin{macro}{\@@_add_expandable_type_v:w}
 %   Another forbidden type.
 %    \begin{macrocode}
-\cs_new_protected_nopar:Npn \@@_add_expandable_type_v:w
+\cs_new_protected:Npn \@@_add_expandable_type_v:w
   {
     \__msg_kernel_error:nnx { xparse } { invalid-expandable-argument-type }
       { v }
@@ -1867,7 +1867,7 @@
 %   is also a good place to check on the consistency of the long status of
 %   arguments.
 %    \begin{macrocode}
-\cs_new_protected_nopar:Npn \@@_add_expandable_grabber_mandatory:n #1
+\cs_new_protected:Npn \@@_add_expandable_grabber_mandatory:n #1
   {
     \@@_add_expandable_long_check:
     \tl_put_right:Nx \l_@@_signature_tl
@@ -1875,7 +1875,7 @@
     \bool_set_false:N \l_@@_long_bool
     \int_decr:N \l_@@_mandatory_args_int
   }
-\cs_new_protected_nopar:Npn \@@_add_expandable_grabber_optional:n #1
+\cs_new_protected:Npn \@@_add_expandable_grabber_optional:n #1
   {
     \@@_add_expandable_long_check:
     \int_compare:nNnF \l_@@_mandatory_args_int > \c_zero
@@ -1884,7 +1884,7 @@
       { \exp_not:c { @@_expandable_grab_ #1 :w } }
     \bool_set_false:N \l_@@_long_bool
   }
-\cs_new_protected_nopar:Npn \@@_add_expandable_long_check:
+\cs_new_protected:Npn \@@_add_expandable_long_check:
   {
     \bool_if:nT { \l_@@_all_long_bool && ! \l_@@_long_bool }
       { \__msg_kernel_error:nn { xparse } { inconsistent-long } }
@@ -2453,12 +2453,12 @@
 %    \begin{macrocode}
 \tl_new:N \l_@@_v_rest_of_signature_tl
 \tl_new:N \l_@@_v_arg_tl
-\cs_new_protected_nopar:Npn \@@_grab_v:w
+\cs_new_protected:Npn \@@_grab_v:w
   {
     \bool_set_false:N \l_@@_long_bool
     \@@_grab_v_aux:w
   }
-\cs_new_protected_nopar:Npn \@@_grab_v_long:w
+\cs_new_protected:Npn \@@_grab_v_long:w
   {
     \bool_set_true:N \l_@@_long_bool
     \@@_grab_v_aux:w
@@ -2481,7 +2481,7 @@
               { \@@_grab_v_aux_abort:n { } }
           }
   }
-\cs_new_protected_nopar:Npn \@@_grab_v_group_end:
+\cs_new_protected:Npn \@@_grab_v_group_end:
   {
         \group_align_safe_end:
         \exp_args:NNNo
@@ -2550,7 +2550,7 @@
       }
       { \@@_grab_v_aux_abort:n {#2} #2 }
   }
-\cs_new_protected_nopar:Npn \@@_grab_v_aux_loop_end:
+\cs_new_protected:Npn \@@_grab_v_aux_loop_end:
   {
     \@@_grab_v_group_end:
     \exp_args:Nx \@@_add_arg:n { \tl_tail:N \l_@@_v_arg_tl }
@@ -2577,7 +2577,7 @@
 %   normal undelimited argument.
 %    \begin{macrocode}
 \int_new:N \l_@@_v_nesting_int
-\cs_new_protected_nopar:Npx \@@_grab_v_bgroup:
+\cs_new_protected:Npx \@@_grab_v_bgroup:
   {
     \exp_not:N \@@_grab_v_aux_catcodes:
     \exp_not:n { \int_set_eq:NN \l_@@_v_nesting_int \c_one }
@@ -2629,7 +2629,7 @@
 %   rest of the code. Then the error branch can check what caused the
 %   bail out and give the appropriate error message.
 %    \begin{macrocode}
-\cs_new_protected_nopar:Npn \@@_grab_v_aux_catcodes:
+\cs_new_protected:Npn \@@_grab_v_aux_catcodes:
   {
 %<*initex>
     \seq_map_function:NN
@@ -3627,7 +3627,7 @@
 %    \end{macrocode}
 % \end{macro}
 %
-% \begin{macro}[TF]{\IfBoolean}
+% \begin{macro}{\IfBooleanT, \IfBooleanF, \IfBooleanTF}
 %   The logical \meta{true} and \meta{false} statements are just the
 %   normal \cs{c_true_bool} and \cs{c_false_bool}, so testing for them is
 %   done with the \cs{bool_if:NTF} functions from \textsf{l3prg}.
@@ -3638,7 +3638,7 @@
 %    \end{macrocode}
 % \end{macro}
 %
-% \begin{macro}[TF]{\IfNoValue}
+% \begin{macro}{\IfNoValueT, \IfNoValueF, \IfNoValueTF}
 %   Simple re-naming.
 %    \begin{macrocode}
 \cs_new_eq:NN \IfNoValueF  \@@_if_no_value:nF
@@ -3646,11 +3646,11 @@
 \cs_new_eq:NN \IfNoValueTF \@@_if_no_value:nTF
 %    \end{macrocode}
 % \end{macro}
-% \begin{macro}[TF]{\IfValue}
+% \begin{macro}{\IfValueT, \IfValueF, \IfValueTF}
 %   Inverted logic.
 %    \begin{macrocode}
-\cs_new_nopar:Npn \IfValueF { \@@_if_no_value:nT }
-\cs_new_nopar:Npn \IfValueT { \@@_if_no_value:nF }
+\cs_new:Npn \IfValueF { \@@_if_no_value:nT }
+\cs_new:Npn \IfValueT { \@@_if_no_value:nF }
 \cs_new:Npn \IfValueTF #1#2#3 { \@@_if_no_value:nTF {#1} {#3} {#2} }
 %    \end{macrocode}
 % \end{macro}
diff --git a/Master/texmf-dist/source/latex/l3packages/xtemplate/xtemplate.dtx b/Master/texmf-dist/source/latex/l3packages/xtemplate/xtemplate.dtx
index f3ad7e8f289..394bb8b72ee 100644
--- a/Master/texmf-dist/source/latex/l3packages/xtemplate/xtemplate.dtx
+++ b/Master/texmf-dist/source/latex/l3packages/xtemplate/xtemplate.dtx
@@ -41,8 +41,8 @@
 %<*driver|package>
 % The version of expl3 required is tested as early as possible, as
 % some really old versions do not define \ProvidesExplPackage.
-\RequirePackage{expl3}[2016/05/18]
-%<package>\@ifpackagelater{expl3}{2016/05/18}
+\RequirePackage{expl3}[2016/10/19]
+%<package>\@ifpackagelater{expl3}{2016/10/19}
 %<package>  {}
 %<package>  {%
 %<package>    \PackageError{xtemplate}{Support package l3kernel too old}
@@ -56,8 +56,8 @@
 %<package>  }
 \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}
 %</driver|package>
 %<*driver>
 \documentclass[full]{l3doc}
@@ -501,7 +501,7 @@
 %   the general idea of fixing some settings.
 % \end{function}
 %
-% \begin{function}[TF]{\IfInstanceExist}
+% \begin{function}{\IfInstanceExistT, \IfInstanceExistF, \IfInstanceExistTF}
 %   \begin{syntax}
 %     \cs{IfInstanceExistTF} \Arg{object type} \Arg{instance} \Arg{true code} \Arg{false code}
 %   \end{syntax}
@@ -1227,7 +1227,7 @@
           }
       }
   }
-\cs_new_protected_nopar:Npn \@@_parse_keys_elt_aux:n #1
+\cs_new_protected:Npn \@@_parse_keys_elt_aux:n #1
   {
     \str_if_eq:onT \l_@@_keytype_tl {#1}
       {
@@ -1240,7 +1240,7 @@
           }
       }
   }
-\cs_new_nopar:Npn \@@_parse_keys_elt_aux:
+\cs_new:Npn \@@_parse_keys_elt_aux:
   {
     \tl_set:Nx \l_@@_tmp_tl
       {
@@ -1347,7 +1347,7 @@
   {
     \tl_set:Nn \l_@@_keytype_tl {#1}
     \tl_clear:N \l_@@_keytype_arg_tl
-    \cs_set_protected_nopar:Npn \@@_split_keytype_arg_aux:n ##1
+    \cs_set_protected:Npn \@@_split_keytype_arg_aux:n ##1
       {
         \tl_if_in:nnT {#1} {##1}
           {
@@ -1368,8 +1368,8 @@
       \@@_split_keytype_arg_aux:n
   }
 \cs_generate_variant:Nn \@@_split_keytype_arg:n { o }
-\cs_new_nopar:Npn \@@_split_keytype_arg_aux:n #1 { }
-\cs_new_nopar:Npn \@@_split_keytype_arg_aux:w #1 \q_stop { }
+\cs_new:Npn \@@_split_keytype_arg_aux:n #1 { }
+\cs_new:Npn \@@_split_keytype_arg_aux:w #1 \q_stop { }
 %    \end{macrocode}
 % \end{macro}
 % \end{macro}
@@ -1661,7 +1661,7 @@
 %   A shortcut to create non-declared variables. Some types need a name
 %   mapping, others can be used directly.
 %    \begin{macrocode}
-\cs_new_protected_nopar:Npn \@@_create_variable:N #1
+\cs_new_protected:Npn \@@_create_variable:N #1
   {
     \str_case:onF \l_@@_keytype_tl
       {
@@ -1707,7 +1707,7 @@
 %   A sanity check for the default value, so that an error is raised
 %   now and not when converting to assignments.
 %    \begin{macrocode}
-\cs_new_protected_nopar:Npn \@@_implement_choices_default:
+\cs_new_protected:Npn \@@_implement_choices_default:
   {
     \tl_set:Nx \l_@@_tmp_tl
       { \l_@@_key_name_tl \c_space_tl \l_@@_tmp_tl }
@@ -2000,7 +2000,7 @@
 %   This is done using a sequence as property lists are not
 %   \enquote{ordered}.
 %    \begin{macrocode}
-\cs_new_protected_nopar:Npn \@@_convert_to_assignments:
+\cs_new_protected:Npn \@@_convert_to_assignments:
   {
     \tl_clear:N \l_@@_assignments_tl
     \seq_map_function:NN \l_@@_key_order_seq
@@ -2050,7 +2050,7 @@
 %   Global assignments should have the phrase |global| at the front.
 %   This is pretty easy to find: no other error checking, though.
 %    \begin{macrocode}
-\cs_new_protected_nopar:Npn \@@_find_global:
+\cs_new_protected:Npn \@@_find_global:
   {
     \bool_set_false:N \l_@@_global_bool
     \tl_if_in:onT \l_@@_var_tl { global }
@@ -2100,13 +2100,13 @@
 %   for the fact that the recovered value here will \emph{not} be expandable,
 %   so needs to be converted to something that is.
 %    \begin{macrocode}
-\cs_new_protected_nopar:Npn \@@_assign_boolean:
+\cs_new_protected:Npn \@@_assign_boolean:
   {
     \bool_if:NTF \l_@@_global_bool
       { \@@_assign_boolean_aux:n { bool_gset } }
       { \@@_assign_boolean_aux:n { bool_set } }
   }
-\cs_new_protected_nopar:Npn \@@_assign_boolean_aux:n #1
+\cs_new_protected:Npn \@@_assign_boolean_aux:n #1
   {
     \@@_if_key_value:oTF \l_@@_value_tl
       {
@@ -2136,7 +2136,7 @@
 %   The idea here is to find either the choice as-given or else the
 %   special |unknown| choice, and to copy the appropriate code across.
 %    \begin{macrocode}
-\cs_new_protected_nopar:Npn \@@_assign_choice:
+\cs_new_protected:Npn \@@_assign_choice:
   {
     \@@_assign_choice_aux:xF
       { \l_@@_key_name_tl \c_space_tl \l_@@_value_tl }
@@ -2153,7 +2153,7 @@
           }
       }
   }
-\cs_new_protected_nopar:Npn \@@_assign_choice_aux:nF #1
+\cs_new_protected:Npn \@@_assign_choice_aux:nF #1
   {
     \prop_get:NnNTF
       \l_@@_vars_prop
@@ -2172,7 +2172,7 @@
 %   and run when \cs{AssignTemplateKeys} is called. So the appropriate
 %   definition then use is created in the token list variable.
 %    \begin{macrocode}
-\cs_new_protected_nopar:Npn \@@_assign_code:
+\cs_new_protected:Npn \@@_assign_code:
   {
     \tl_put_right:Nx \l_@@_assignments_tl
       {
@@ -2190,13 +2190,13 @@
 % \begin{macro}[aux]{\@@_assign_function_aux:N}
 %   This looks a bit messy but is only actually one function.
 %    \begin{macrocode}
-\cs_new_protected_nopar:Npn \@@_assign_function:
+\cs_new_protected:Npn \@@_assign_function:
   {
     \bool_if:NTF \l_@@_global_bool
       { \@@_assign_function_aux:N \cs_gset:Npn }
       { \@@_assign_function_aux:N \cs_set:Npn  }
   }
-\cs_new_protected_nopar:Npn \@@_assign_function_aux:N #1
+\cs_new_protected:Npn \@@_assign_function_aux:N #1
   {
     \tl_put_right:Nx \l_@@_assignments_tl
       {
@@ -2217,13 +2217,13 @@
 %   the tl. No checks are made at this stage, so if the instance is
 %   not valid then errors will arise later.
 %    \begin{macrocode}
-\cs_new_protected_nopar:Npn \@@_assign_instance:
+\cs_new_protected:Npn \@@_assign_instance:
   {
     \bool_if:NTF \l_@@_global_bool
       { \@@_assign_instance_aux:N \cs_gset_protected:Npn }
       { \@@_assign_instance_aux:N \cs_set_protected:Npn  }
   }
-\cs_new_protected_nopar:Npn \@@_assign_instance_aux:N #1
+\cs_new_protected:Npn \@@_assign_instance_aux:N #1
   {
     \tl_put_right:Nx \l_@@_assignments_tl
       {
@@ -2247,31 +2247,31 @@
 %   All of the calculated assignments use the same underlying code, with
 %   only the low-level assignment function changing.
 %    \begin{macrocode}
-\cs_new_protected_nopar:Npn \@@_assign_integer:
+\cs_new_protected:Npn \@@_assign_integer:
   {
     \bool_if:NTF \l_@@_global_bool
       { \@@_assign_variable:N \int_gset:Nn }
       { \@@_assign_variable:N \int_set:Nn  }
   }
-\cs_new_protected_nopar:Npn \@@_assign_length:
+\cs_new_protected:Npn \@@_assign_length:
   {
     \bool_if:NTF \l_@@_global_bool
       { \@@_assign_variable:N \dim_gset:Nn }
       { \@@_assign_variable:N \dim_set:Nn  }
 }
-\cs_new_protected_nopar:Npn \@@_assign_muskip:
+\cs_new_protected:Npn \@@_assign_muskip:
   {
     \bool_if:NTF \l_@@_global_bool
       { \@@_assign_variable:N \muskip_gset:Nn }
       { \@@_assign_variable:N \muskip_set:Nn  }
   }
-\cs_new_protected_nopar:Npn \@@_assign_real:
+\cs_new_protected:Npn \@@_assign_real:
   {
     \bool_if:NTF \l_@@_global_bool
       { \@@_assign_variable:N \fp_gset:Nn }
       { \@@_assign_variable:N \fp_set:Nn  }
   }
-\cs_new_protected_nopar:Npn \@@_assign_skip:
+\cs_new_protected:Npn \@@_assign_skip:
   {
     \bool_if:NTF \l_@@_global_bool
       { \@@_assign_variable:N \skip_gset:Nn }
@@ -2290,13 +2290,13 @@
 %   correctly with that, we need to allow for the recovery a a stored value
 %   at point of use.
 %    \begin{macrocode}
-\cs_new_protected_nopar:Npn \@@_assign_tokenlist:
+\cs_new_protected:Npn \@@_assign_tokenlist:
   {
     \bool_if:NTF \l_@@_global_bool
       { \@@_assign_tokenlist_aux:NN \tl_gset:NV \tl_gset:Nn }
       { \@@_assign_tokenlist_aux:NN \tl_set:NV  \tl_set:Nn }
   }
-\cs_new_protected_nopar:Npn \@@_assign_tokenlist_aux:NN #1#2
+\cs_new_protected:Npn \@@_assign_tokenlist_aux:NN #1#2
   {
     \@@_if_key_value:oTF \l_@@_value_tl
       {
@@ -2322,7 +2322,7 @@
 % \begin{macro}{\@@_assign_commalist:}
 %   Very similar for commas lists, so some code is shared.
 %    \begin{macrocode}
-\cs_new_protected_nopar:Npn \@@_assign_commalist:
+\cs_new_protected:Npn \@@_assign_commalist:
   {
     \bool_if:NTF \l_@@_global_bool
       { \@@_assign_tokenlist_aux:NN \clist_gset:NV \clist_gset:Nn }
@@ -2336,7 +2336,7 @@
 %   As long as the value is not coming from another variable, the stored
 %   value is simply transferred for output.
 %    \begin{macrocode}
-\cs_new_protected_nopar:Npn \@@_assign_variable:N #1
+\cs_new_protected:Npn \@@_assign_variable:N #1
   {
     \@@_if_key_value:oT \l_@@_value_tl
       { \@@_key_to_value: }
@@ -2360,7 +2360,7 @@
 %   There is also a need to check in case the copied value happens to be
 %   \texttt{global}.
 %    \begin{macrocode}
-\cs_new_protected_nopar:Npn \@@_key_to_value:
+\cs_new_protected:Npn \@@_key_to_value:
   { \exp_after:wN \@@_key_to_value_auxi:w \l_@@_value_tl }
 \cs_new_protected:Npn \@@_key_to_value_auxi:w \KeyValue #1
   {
@@ -2470,7 +2470,7 @@
 % \begin{macro}{\@@_assignments_pop:}
 % To actually use the assignments.
 %    \begin{macrocode}
-\cs_new_nopar:Npn \@@_assignments_pop: { \l_@@_assignments_tl }
+\cs_new:Npn \@@_assignments_pop: { \l_@@_assignments_tl }
 %    \end{macrocode}
 % \end{macro}
 %
@@ -2488,7 +2488,7 @@
 %   Showing the code for a template is just a translation of
 %   \cs{cs_show:c}.
 %    \begin{macrocode}
-\cs_new_protected_nopar:Npn \@@_show_code:nn #1#2
+\cs_new_protected:Npn \@@_show_code:nn #1#2
   { \cs_show:c { \c_@@_code_root_tl #1 / #2 } }
 %    \end{macrocode}
 % \end{macro}
@@ -2503,7 +2503,7 @@
 %   the output refers to templates and instances rather than to the
 %   underlying structures.
 %    \begin{macrocode}
-\cs_new_protected_nopar:Npn \@@_show_defaults:nn #1#2
+\cs_new_protected:Npn \@@_show_defaults:nn #1#2
   {
     \@@_if_keys_exist:nnT {#1} {#2}
       {
@@ -2512,7 +2512,7 @@
           {#1} {#2} { default~values }
       }
   }
-\cs_new_protected_nopar:Npn \@@_show_keytypes:nn #1#2
+\cs_new_protected:Npn \@@_show_keytypes:nn #1#2
   {
     \@@_if_keys_exist:nnT {#1} {#2}
       {
@@ -2521,7 +2521,7 @@
           {#1} {#2} { interface }
       }
   }
-\cs_new_protected_nopar:Npn \@@_show_vars:nn #1#2
+\cs_new_protected:Npn \@@_show_vars:nn #1#2
   {
      \@@_execute_if_code_exist:nnT {#1} {#2}
       {
@@ -2530,7 +2530,7 @@
           {#1} {#2} { variable~mapping }
       }
   }
-\cs_new_protected_nopar:Npn \@@_show:Nnnn #1#2#3#4
+\cs_new_protected:Npn \@@_show:Nnnn #1#2#3#4
   {
     \__msg_show_pre:nnnnnn { xtemplate }
       { \prop_if_empty:NTF #1 { show-no-attribute } { show-attribute } }
@@ -2546,7 +2546,7 @@
 %   Instance values are a little more complex, as there are the collection
 %   and template to consider.
 %    \begin{macrocode}
-\cs_new_protected_nopar:Npn \@@_show_values:nnn #1#2#3
+\cs_new_protected:Npn \@@_show_values:nnn #1#2#3
   {
     \@@_if_instance_exist:nnnT {#1} {#2} {#3}
       {
@@ -2805,7 +2805,7 @@
 %   All simple translations, with the appropriate long/short argument
 %   filtering.
 %    \begin{macrocode}
-\cs_new_protected_nopar:Npn \DeclareObjectType #1#2
+\cs_new_protected:Npn \DeclareObjectType #1#2
   { \@@_declare_object_type:nn {#1} {#2} }
 \cs_new_protected:Npn \DeclareTemplateInterface #1#2#3#4
   { \@@_declare_template_keys:nnnn {#1} {#2} {#3} {#4} }
@@ -2823,11 +2823,11 @@
   { \@@_edit_instance:nnnn {#1} { } {#2} {#3} }
 \cs_new_protected:Npn \EditCollectionInstance #1#2#3#4
   { \@@_edit_instance:nnnn {#2} {#1} {#3} {#4} }
-\cs_new_protected_nopar:Npn \UseTemplate #1#2#3
+\cs_new_protected:Npn \UseTemplate #1#2#3
   { \@@_use_template:nnn {#1} {#2} {#3} }
-\cs_new_protected_nopar:Npn \UseInstance #1#2
+\cs_new_protected:Npn \UseInstance #1#2
   { \@@_use_instance:nn {#1} {#2} }
-\cs_new_protected_nopar:Npn \UseCollection #1#2
+\cs_new_protected:Npn \UseCollection #1#2
   { \@@_use_collection:nn {#1} {#2} }
 %    \end{macrocode}
 % \end{macro}
@@ -2851,17 +2851,17 @@
 % \begin{macro}{\ShowCollectionInstanceValues}
 %   The show functions are again just translation.
 %    \begin{macrocode}
-\cs_new_protected_nopar:Npn \ShowTemplateCode #1#2
+\cs_new_protected:Npn \ShowTemplateCode #1#2
   { \@@_show_code:nn {#1} {#2} }
-\cs_new_protected_nopar:Npn \ShowTemplateDefaults #1#2
+\cs_new_protected:Npn \ShowTemplateDefaults #1#2
   { \@@_show_defaults:nn {#1} {#2} }
-\cs_new_protected_nopar:Npn \ShowTemplateInterface #1#2
+\cs_new_protected:Npn \ShowTemplateInterface #1#2
   { \@@_show_keytypes:nn {#1} {#2} }
-\cs_new_protected_nopar:Npn \ShowTemplateVariables #1#2
+\cs_new_protected:Npn \ShowTemplateVariables #1#2
   { \@@_show_vars:nn {#1} {#2} }
-\cs_new_protected_nopar:Npn \ShowInstanceValues #1#2
+\cs_new_protected:Npn \ShowInstanceValues #1#2
   { \@@_show_values:nnn {#1} { } {#2} }
-\cs_new_protected_nopar:Npn \ShowCollectionInstanceValues #1#2#3
+\cs_new_protected:Npn \ShowCollectionInstanceValues #1#2#3
   { \@@_show_values:nnn {#1} {#2} {#3} }
 %    \end{macrocode}
 % \end{macro}
@@ -2871,14 +2871,14 @@
 % \end{macro}
 % \end{macro}
 %
-% \begin{macro}[TF]{\IfInstanceExist}
+% \begin{macro}{\IfInstanceExistT, \IfInstanceExistF, \IfInstanceExistTF}
 %   More direct translation: only the base instance is checked for.
 %    \begin{macrocode}
-\cs_new_nopar:Npn \IfInstanceExistTF #1#2
+\cs_new:Npn \IfInstanceExistTF #1#2
   { \@@_if_instance_exist:nnnTF {#1} { } {#2} }
-\cs_new_nopar:Npn \IfInstanceExistT #1#2
+\cs_new:Npn \IfInstanceExistT #1#2
   { \@@_if_instance_exist:nnnT {#1} { } {#2} }
-\cs_new_nopar:Npn \IfInstanceExistF #1#2
+\cs_new:Npn \IfInstanceExistF #1#2
   { \@@_if_instance_exist:nnnF {#1} { } {#2} }
 %    \end{macrocode}
 % \end{macro}
@@ -2897,7 +2897,7 @@
 % \begin{macro}{\AssignTemplateKeys}
 %   A short call to use a token register by proxy.
 %    \begin{macrocode}
-\cs_new_protected_nopar:Npn \AssignTemplateKeys
+\cs_new_protected:Npn \AssignTemplateKeys
   { \@@_assignments_pop: }
 %    \end{macrocode}
 % \end{macro}