l3experimental (18oct16)

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

14 files changed, 290 insertions, 300 deletions

diff --git a/Master/texmf-dist/tex/latex/l3experimental/l3str/l3flag.sty b/Master/texmf-dist/tex/latex/l3experimental/l3str/l3flag.sty
index 560d0edf277..a0ce8b9d326 100644
--- a/Master/texmf-dist/tex/latex/l3experimental/l3str/l3flag.sty
+++ b/Master/texmf-dist/tex/latex/l3experimental/l3str/l3flag.sty
@@ -45,8 +45,8 @@
 %%   prior consultation with the LaTeX3 Project.
 %%
 %% -----------------------------------------------------------------------
-\RequirePackage{expl3}[2016/05/14]
-\@ifpackagelater{expl3}{2016/05/14}
+\RequirePackage{expl3}[2016/10/19]
+\@ifpackagelater{expl3}{2016/10/19}
   {}
   {%
     \PackageError{l3flag}{Support package l3kernel too old}
@@ -58,7 +58,7 @@
       }%
     \endinput
   }
-\GetIdInfo$Id: l3flag.dtx 6492 2016-05-14 20:27:55Z joseph $
+\GetIdInfo$Id: l3flag.dtx 6730 2016-10-19 11:19:38Z joseph $
   {L3 Experimental flags}
 \ProvidesExplPackage
   {\ExplFileName}{\ExplFileDate}{\ExplFileVersion}{\ExplFileDescription}
diff --git a/Master/texmf-dist/tex/latex/l3experimental/l3str/l3regex-trace.sty b/Master/texmf-dist/tex/latex/l3experimental/l3str/l3regex-trace.sty
index ea479829d46..a5605769613 100644
--- a/Master/texmf-dist/tex/latex/l3experimental/l3str/l3regex-trace.sty
+++ b/Master/texmf-dist/tex/latex/l3experimental/l3str/l3regex-trace.sty
@@ -45,8 +45,8 @@
 %%   prior consultation with the LaTeX3 Project.
 %%
 %% -----------------------------------------------------------------------
-\RequirePackage{expl3}[2016/05/14]
-\@ifpackagelater{expl3}{2016/05/14}
+\RequirePackage{expl3}[2016/10/19]
+\@ifpackagelater{expl3}{2016/10/19}
   {}
   {%
     \PackageError{l3regex}{Support package l3kernel too old}
@@ -58,7 +58,7 @@
       }%
     \endinput
   }
-\GetIdInfo$Id: l3regex.dtx 6492 2016-05-14 20:27:55Z joseph $
+\GetIdInfo$Id: l3regex.dtx 6730 2016-10-19 11:19:38Z joseph $
   {L3 Experimental regular expressions}
 \ProvidesExplPackage
   {\ExplFileName}{\ExplFileDate}{\ExplFileVersion}{\ExplFileDescription}
@@ -130,7 +130,7 @@
       \fi:
     \fi:
   }
-\cs_new_protected_nopar:Npn \__regex_compute_case_changed_char:
+\cs_new_protected:Npn \__regex_compute_case_changed_char:
   {
     \int_set_eq:NN \l__regex_case_changed_char_int \l__regex_current_char_int
     \if_int_compare:w \l__regex_current_char_int < \c_ninety_one
@@ -214,14 +214,14 @@
         \group_end:
       }
   }
-\cs_new_protected_nopar:Npn \__regex_prop_d:
+\cs_new_protected:Npn \__regex_prop_d:
   { \__regex_item_caseful_range:nn \c_forty_eight { 57 } } % 0--9
-\cs_new_protected_nopar:Npn \__regex_prop_h:
+\cs_new_protected:Npn \__regex_prop_h:
   {
     \__regex_item_caseful_equal:n \c_thirty_two % space
     \__regex_item_caseful_equal:n \c_nine       % tab
   }
-\cs_new_protected_nopar:Npn \__regex_prop_s:
+\cs_new_protected:Npn \__regex_prop_s:
   {
     \__regex_item_caseful_equal:n \c_thirty_two % space
     \__regex_item_caseful_equal:n \c_nine       % tab
@@ -229,52 +229,52 @@
     \__regex_item_caseful_equal:n \c_twelve     % ff
     \__regex_item_caseful_equal:n \c_thirteen   % cr
   }
-\cs_new_protected_nopar:Npn \__regex_prop_v:
+\cs_new_protected:Npn \__regex_prop_v:
   { \__regex_item_caseful_range:nn \c_ten \c_thirteen } % lf, vtab, ff, cr
-\cs_new_protected_nopar:Npn \__regex_prop_w:
+\cs_new_protected:Npn \__regex_prop_w:
   {
     \__regex_item_caseful_range:nn \c_ninety_seven { 122 } % a--z
     \__regex_item_caseful_range:nn \c_sixty_five   {  90 } % A--Z
     \__regex_item_caseful_range:nn \c_forty_eight  {  57 } % 0--9
     \__regex_item_caseful_equal:n  { 95 } % _
   }
-\cs_new_protected_nopar:Npn \__regex_prop_N:
+\cs_new_protected:Npn \__regex_prop_N:
   { \__regex_item_reverse:n { \__regex_item_caseful_equal:n \c_ten } }
-\cs_new_protected_nopar:Npn \__regex_posix_alnum:
+\cs_new_protected:Npn \__regex_posix_alnum:
   { \__regex_posix_alpha: \__regex_posix_digit: }
-\cs_new_protected_nopar:Npn \__regex_posix_alpha:
+\cs_new_protected:Npn \__regex_posix_alpha:
   { \__regex_posix_lower: \__regex_posix_upper: }
-\cs_new_protected_nopar:Npn \__regex_posix_ascii:
+\cs_new_protected:Npn \__regex_posix_ascii:
   { \__regex_item_caseful_range:nn \c_zero \c_one_hundred_twenty_seven }
 \cs_new_eq:NN \__regex_posix_blank: \__regex_prop_h:
-\cs_new_protected_nopar:Npn \__regex_posix_cntrl:
+\cs_new_protected:Npn \__regex_posix_cntrl:
   {
     \__regex_item_caseful_range:nn \c_zero { 31 }
     \__regex_item_caseful_equal:n \c_one_hundred_twenty_seven
   }
 \cs_new_eq:NN \__regex_posix_digit: \__regex_prop_d:
-\cs_new_protected_nopar:Npn \__regex_posix_graph:
+\cs_new_protected:Npn \__regex_posix_graph:
   { \__regex_item_caseful_range:nn { 33 } { 126 } }
-\cs_new_protected_nopar:Npn \__regex_posix_lower:
+\cs_new_protected:Npn \__regex_posix_lower:
   { \__regex_item_caseful_range:nn \c_ninety_seven { 122 } }
-\cs_new_protected_nopar:Npn \__regex_posix_print:
+\cs_new_protected:Npn \__regex_posix_print:
   { \__regex_item_caseful_range:nn \c_thirty_two { 126 } }
-\cs_new_protected_nopar:Npn \__regex_posix_punct:
+\cs_new_protected:Npn \__regex_posix_punct:
   {
     \__regex_item_caseful_range:nn { 33 } { 47 }
     \__regex_item_caseful_range:nn { 58 } { 64 }
     \__regex_item_caseful_range:nn { 91 } { 96 }
     \__regex_item_caseful_range:nn { 123 } { 126 }
   }
-\cs_new_protected_nopar:Npn \__regex_posix_space:
+\cs_new_protected:Npn \__regex_posix_space:
   {
     \__regex_item_caseful_equal:n \c_thirty_two
     \__regex_item_caseful_range:nn \c_nine \c_thirteen
   }
-\cs_new_protected_nopar:Npn \__regex_posix_upper:
+\cs_new_protected:Npn \__regex_posix_upper:
   { \__regex_item_caseful_range:nn \c_sixty_five { 90 } }
 \cs_new_eq:NN \__regex_posix_word: \__regex_prop_w:
-\cs_new_protected_nopar:Npn \__regex_posix_xdigit:
+\cs_new_protected:Npn \__regex_posix_xdigit:
   {
     \__regex_posix_digit:
     \__regex_item_caseful_range:nn \c_sixty_five { 70 }
@@ -284,9 +284,9 @@
   {
     \trace_push:nnn { regex } { 1 } { __regex_escape_use:nnnn }
     \__tl_build:Nw \l__regex_internal_a_tl
-      \cs_set_nopar:Npn \__regex_escape_unescaped:N ##1 { #1 }
-      \cs_set_nopar:Npn \__regex_escape_escaped:N ##1 { #2 }
-      \cs_set_nopar:Npn \__regex_escape_raw:N ##1 { #3 }
+      \cs_set:Npn \__regex_escape_unescaped:N ##1 { #1 }
+      \cs_set:Npn \__regex_escape_escaped:N ##1 { #2 }
+      \cs_set:Npn \__regex_escape_raw:N ##1 { #3 }
       \int_set:Nn \tex_escapechar:D { 92 }
       \__str_gset_other:Nn \g__regex_internal_tl { #4 }
       \tl_set:Nx \l__regex_internal_b_tl
@@ -305,7 +305,7 @@
       { \__regex_escape_unescaped:N #1 }
     \__regex_escape_loop:N
   }
-\cs_new_nopar:cpn { __regex_escape_ \c_backslash_str :w }
+\cs_new:cpn { __regex_escape_ \c_backslash_str :w }
     \__regex_escape_loop:N #1
   {
     \cs_if_exist_use:cF { __regex_escape_/\token_to_str:N #1:w }
@@ -316,24 +316,24 @@
 \cs_new_eq:NN \__regex_escape_escaped:N   ?
 \cs_new_eq:NN \__regex_escape_raw:N       ?
 \cs_new_eq:NN \__regex_escape_break:w \__prg_break:
-\cs_new_nopar:cpn { __regex_escape_/break:w }
+\cs_new:cpn { __regex_escape_/break:w }
   {
     \if_false: { \fi: }
     \__msg_kernel_error:nn { regex } { trailing-backslash }
     \exp_after:wN \use_none:n \exp_after:wN { \if_false: } \fi:
   }
-\cs_new_nopar:cpn { __regex_escape_~:w } { }
-\cs_new_nopar:cpx { __regex_escape_/a:w }
+\cs_new:cpn { __regex_escape_~:w } { }
+\cs_new:cpx { __regex_escape_/a:w }
   { \exp_not:N \__regex_escape_raw:N \iow_char:N \^^G }
-\cs_new_nopar:cpx { __regex_escape_/t:w }
+\cs_new:cpx { __regex_escape_/t:w }
   { \exp_not:N \__regex_escape_raw:N \iow_char:N \^^I }
-\cs_new_nopar:cpx { __regex_escape_/n:w }
+\cs_new:cpx { __regex_escape_/n:w }
   { \exp_not:N \__regex_escape_raw:N \iow_char:N \^^J }
-\cs_new_nopar:cpx { __regex_escape_/f:w }
+\cs_new:cpx { __regex_escape_/f:w }
   { \exp_not:N \__regex_escape_raw:N \iow_char:N \^^L }
-\cs_new_nopar:cpx { __regex_escape_/r:w }
+\cs_new:cpx { __regex_escape_/r:w }
   { \exp_not:N \__regex_escape_raw:N \iow_char:N \^^M }
-\cs_new_nopar:cpx { __regex_escape_/e:w }
+\cs_new:cpx { __regex_escape_/e:w }
   { \exp_not:N \__regex_escape_raw:N \iow_char:N \^^[ }
 \cs_new:cpn { __regex_escape_/x:w } \__regex_escape_loop:N
   {
@@ -517,7 +517,7 @@
       \prg_return_false:
     \fi:
   }
-\cs_new_nopar:Npn \__regex_if_in_class:TF
+\cs_new:Npn \__regex_if_in_class:TF
   {
     \if_int_odd:w \l__regex_mode_int
       \exp_after:wN \use_i:nn
@@ -525,7 +525,7 @@
       \exp_after:wN \use_ii:nn
     \fi:
   }
-\cs_new_nopar:Npn \__regex_if_in_cs:TF
+\cs_new:Npn \__regex_if_in_cs:TF
   {
     \if_int_odd:w \l__regex_mode_int
       \exp_after:wN \use_ii:nn
@@ -537,7 +537,7 @@
       \fi:
     \fi:
   }
-\cs_new_nopar:Npn \__regex_if_in_class_or_catcode:TF
+\cs_new:Npn \__regex_if_in_class_or_catcode:TF
   {
     \if_int_odd:w \l__regex_mode_int
       \exp_after:wN \use_i:nn
@@ -549,7 +549,7 @@
       \fi:
     \fi:
   }
-\cs_new_nopar:Npn \__regex_if_within_catcode:TF
+\cs_new:Npn \__regex_if_within_catcode:TF
   {
     \if_int_compare:w \l__regex_mode_int > \c_zero
       \exp_after:wN \use_i:nn
@@ -580,17 +580,17 @@
       \fi:
     \fi:
   }
-\cs_new_protected_nopar:Npn \__regex_compile:w
+\cs_new_protected:Npn \__regex_compile:w
   {
     \__tl_build_x:Nw \l__regex_internal_regex
       \int_zero:N \l__regex_group_level_int
       \int_set_eq:NN \l__regex_default_catcodes_int \c__regex_all_catcodes_int
       \int_set_eq:NN \l__regex_catcodes_int \l__regex_default_catcodes_int
-      \cs_set_nopar:Npn \__regex_item_equal:n  { \__regex_item_caseful_equal:n }
-      \cs_set_nopar:Npn \__regex_item_range:nn { \__regex_item_caseful_range:nn }
+      \cs_set:Npn \__regex_item_equal:n  { \__regex_item_caseful_equal:n }
+      \cs_set:Npn \__regex_item_range:nn { \__regex_item_caseful_range:nn }
       \__tl_build_one:n { \__regex_branch:n { \if_false: } \fi: }
   }
-\cs_new_protected_nopar:Npn \__regex_compile_end:
+\cs_new_protected:Npn \__regex_compile_end:
   {
       \__regex_if_in_class:TF
         {
@@ -714,11 +714,11 @@
         #3 #4
       }
   }
-\cs_new_protected_nopar:cpn { __regex_compile_quantifier_?:w }
+\cs_new_protected:cpn { __regex_compile_quantifier_?:w }
   { \__regex_compile_quantifier_lazyness:nnNN { 0 } { 1 } }
-\cs_new_protected_nopar:cpn { __regex_compile_quantifier_*:w }
+\cs_new_protected:cpn { __regex_compile_quantifier_*:w }
   { \__regex_compile_quantifier_lazyness:nnNN { 0 } { -1 } }
-\cs_new_protected_nopar:cpn { __regex_compile_quantifier_+:w }
+\cs_new_protected:cpn { __regex_compile_quantifier_+:w }
   { \__regex_compile_quantifier_lazyness:nnNN { 1 } { -1 } }
 \cs_new_protected:cpn { __regex_compile_quantifier_ \c_left_brace_str :w }
   {
@@ -857,13 +857,13 @@
         #2#3
       }
   }
-\cs_new_protected_nopar:cpx { __regex_compile_.: }
+\cs_new_protected:cpx { __regex_compile_.: }
   {
     \exp_not:N \__regex_if_in_class:TF
       { \__regex_compile_raw:N . }
       { \__regex_compile_one:x \exp_not:c { __regex_prop_.: } }
   }
-\cs_new_protected_nopar:cpn { __regex_prop_.: }
+\cs_new_protected:cpn { __regex_prop_.: }
   {
     \if_int_compare:w \l__regex_current_char_int > - \c_two
       \exp_after:wN \__regex_break_true:w
@@ -871,9 +871,9 @@
   }
 \cs_set_protected:Npn \__regex_tmp:w #1#2
   {
-    \cs_new_protected_nopar:cpx { __regex_compile_/#1: }
+    \cs_new_protected:cpx { __regex_compile_/#1: }
       { \__regex_compile_one:x \exp_not:c { __regex_prop_#1: } }
-    \cs_new_protected_nopar:cpx { __regex_compile_/#2: }
+    \cs_new_protected:cpx { __regex_compile_/#2: }
       {
         \__regex_compile_one:x
           { \__regex_item_reverse:n \exp_not:c { __regex_prop_#1: } }
@@ -884,7 +884,7 @@
 \__regex_tmp:w s S
 \__regex_tmp:w v V
 \__regex_tmp:w w W
-\cs_new_protected_nopar:cpn { __regex_compile_/N: }
+\cs_new_protected:cpn { __regex_compile_/N: }
   { \__regex_compile_one:x \__regex_prop_N: }
 \cs_new_protected:Npn \__regex_compile_anchor:NF #1#2
   {
@@ -896,7 +896,7 @@
   }
 \cs_set_protected:Npn \__regex_tmp:w #1#2
   {
-    \cs_new_protected_nopar:cpn { __regex_compile_/#1: }
+    \cs_new_protected:cpn { __regex_compile_/#1: }
       { \__regex_compile_anchor:NF #2 { \__regex_compile_raw_error:N #1 } }
   }
 \__regex_tmp:w A \l__regex_min_pos_int
@@ -905,12 +905,12 @@
 \__regex_tmp:w z \l__regex_max_pos_int
 \cs_set_protected:Npn \__regex_tmp:w #1#2
   {
-    \cs_new_protected_nopar:cpn { __regex_compile_#1: }
+    \cs_new_protected:cpn { __regex_compile_#1: }
       { \__regex_compile_anchor:NF #2 { \__regex_compile_raw:N #1 } }
   }
 \exp_args:Nx \__regex_tmp:w { \iow_char:N \^ } \l__regex_min_pos_int
 \exp_args:Nx \__regex_tmp:w { \iow_char:N \$ } \l__regex_max_pos_int
-\cs_new_protected_nopar:cpn { __regex_compile_/b: }
+\cs_new_protected:cpn { __regex_compile_/b: }
   {
     \__regex_if_in_class_or_catcode:TF
       { \__regex_compile_raw_error:N b }
@@ -919,7 +919,7 @@
           { \__regex_assertion:Nn \c_true_bool { \__regex_b_test: } }
       }
   }
-\cs_new_protected_nopar:cpn { __regex_compile_/B: }
+\cs_new_protected:cpn { __regex_compile_/B: }
   {
     \__regex_if_in_class_or_catcode:TF
       { \__regex_compile_raw_error:N B }
@@ -943,7 +943,7 @@
       }
       { \__regex_compile_raw:N ] }
   }
-\cs_new_protected_nopar:cpn { __regex_compile_[: }
+\cs_new_protected:cpn { __regex_compile_[: }
   {
     \__regex_if_in_class:TF
       { \__regex_compile_class_posix_test:w }
@@ -956,7 +956,7 @@
           { \__regex_compile_class_normal:w }
       }
   }
-\cs_new_protected_nopar:Npn \__regex_compile_class_normal:w
+\cs_new_protected:Npn \__regex_compile_class_normal:w
   {
     \__regex_compile_class:TFNN
       { \__regex_class:NnnnN \c_true_bool }
@@ -1077,7 +1077,7 @@
       \exp_after:wN \__regex_compile_raw:N \exp_after:wN )
     \fi:
   }
-\cs_new_protected_nopar:cpn { __regex_compile_(: }
+\cs_new_protected:cpn { __regex_compile_(: }
   {
     \__regex_if_in_class:TF { \__regex_compile_raw:N ( }
       { \__regex_compile_lparen:w }
@@ -1100,7 +1100,7 @@
           #1 #2 #3 #4
       }
   }
-\cs_new_protected_nopar:cpn { __regex_compile_|: }
+\cs_new_protected:cpn { __regex_compile_|: }
   {
     \__regex_if_in_class:TF { \__regex_compile_raw:N | }
       {
@@ -1108,21 +1108,21 @@
           { \if_false: { \fi: } \__regex_branch:n { \if_false: } \fi: }
       }
   }
-\cs_new_protected_nopar:cpn { __regex_compile_): }
+\cs_new_protected:cpn { __regex_compile_): }
   {
     \__regex_if_in_class:TF { \__regex_compile_raw:N ) }
       { \__regex_compile_group_end: }
   }
-\cs_new_protected_nopar:cpn { __regex_compile_special_group_::w }
+\cs_new_protected:cpn { __regex_compile_special_group_::w }
   { \__regex_compile_group_begin:N \__regex_group_no_capture:nnnN }
-\cs_new_protected_nopar:cpn { __regex_compile_special_group_|:w }
+\cs_new_protected:cpn { __regex_compile_special_group_|:w }
   { \__regex_compile_group_begin:N \__regex_group_resetting:nnnN }
 \cs_new_protected:Npn \__regex_compile_special_group_i:w #1#2
   {
     \str_if_eq:nnTF { #1 #2 } { \__regex_compile_special:N ) }
       {
-        \cs_set_nopar:Npn \__regex_item_equal:n  { \__regex_item_caseless_equal:n }
-        \cs_set_nopar:Npn \__regex_item_range:nn { \__regex_item_caseless_range:nn }
+        \cs_set:Npn \__regex_item_equal:n  { \__regex_item_caseless_equal:n }
+        \cs_set:Npn \__regex_item_range:nn { \__regex_item_caseless_range:nn }
       }
       {
         \__msg_kernel_warning:nnx { regex } { unknown-option } { (?i #2 }
@@ -1132,13 +1132,13 @@
         #1 #2
       }
   }
-\cs_new_protected_nopar:cpn { __regex_compile_special_group_-:w } #1#2#3#4
+\cs_new_protected:cpn { __regex_compile_special_group_-:w } #1#2#3#4
   {
     \str_if_eq:nnTF { #1 #2 #3 #4 }
       { \__regex_compile_raw:N i \__regex_compile_special:N ) }
       {
-        \cs_set_nopar:Npn \__regex_item_equal:n  { \__regex_item_caseful_equal:n }
-        \cs_set_nopar:Npn \__regex_item_range:nn { \__regex_item_caseful_range:nn }
+        \cs_set:Npn \__regex_item_equal:n  { \__regex_item_caseful_equal:n }
+        \cs_set:Npn \__regex_item_range:nn { \__regex_item_caseful_range:nn }
       }
       {
         \__msg_kernel_warning:nnx { regex } { unknown-option } { (?-#2#4 }
@@ -1211,14 +1211,14 @@
       \tex_advance:D \l__regex_catcodes_int #1
     \fi:
   }
-\cs_new_protected_nopar:Npn \__regex_compile_c_lbrack_end:
+\cs_new_protected:Npn \__regex_compile_c_lbrack_end:
   {
     \if_meaning:w \c_false_bool \l__regex_catcodes_bool
       \int_set:Nn \l__regex_catcodes_int
         { \c__regex_all_catcodes_int - \l__regex_catcodes_int }
     \fi:
   }
-\cs_new_protected_nopar:cpn { __regex_compile_c_ \c_left_brace_str :w }
+\cs_new_protected:cpn { __regex_compile_c_ \c_left_brace_str :w }
   {
     \__regex_compile:w
       \__regex_disable_submatches:
@@ -1313,7 +1313,7 @@
           }
       }
   }
-\cs_new_protected_nopar:cpn { __regex_compile_/K: }
+\cs_new_protected:cpn { __regex_compile_/K: }
   {
     \int_compare:nNnTF \l__regex_mode_int = \c_zero
       { \__tl_build_one:n { \__regex_command_K: } }
@@ -1322,25 +1322,25 @@
 \cs_new_protected:Npn \__regex_show:Nx #1#2
   {
     \__tl_build:Nw \l__regex_internal_a_tl
-      \cs_set_protected_nopar:Npn \__regex_branch:n
+      \cs_set_protected:Npn \__regex_branch:n
         {
           \seq_pop_right:NN \l__regex_show_prefix_seq \l__regex_internal_a_tl
           \__regex_show_one:n { +-branch }
           \seq_put_right:No \l__regex_show_prefix_seq \l__regex_internal_a_tl
           \use:n
         }
-      \cs_set_protected_nopar:Npn \__regex_group:nnnN
+      \cs_set_protected:Npn \__regex_group:nnnN
         { \__regex_show_group_aux:nnnnN { } }
-      \cs_set_protected_nopar:Npn \__regex_group_no_capture:nnnN
+      \cs_set_protected:Npn \__regex_group_no_capture:nnnN
         { \__regex_show_group_aux:nnnnN { ~(no~capture) } }
-      \cs_set_protected_nopar:Npn \__regex_group_resetting:nnnN
+      \cs_set_protected:Npn \__regex_group_resetting:nnnN
         { \__regex_show_group_aux:nnnnN { ~(resetting) } }
       \cs_set_eq:NN \__regex_class:NnnnN \__regex_show_class:NnnnN
-      \cs_set_protected_nopar:Npn \__regex_command_K:
+      \cs_set_protected:Npn \__regex_command_K:
         { \__regex_show_one:n { reset~match~start~(\iow_char:N\\K) } }
       \cs_set_protected:Npn \__regex_assertion:Nn ##1##2
         { \__regex_show_one:n { \bool_if:NF ##1 { negative~ } assertion:~##2 } }
-      \cs_set_nopar:Npn \__regex_b_test: { word~boundary }
+      \cs_set:Npn \__regex_b_test: { word~boundary }
       \cs_set_eq:NN \__regex_anchor:N \__regex_show_anchor_to_str:N
       \cs_set_protected:Npn \__regex_item_caseful_equal:n ##1
         { \__regex_show_one:n { char~code~\int_eval:n{##1} } }
@@ -1511,14 +1511,14 @@
     \__regex_trace_states:n { 2 }
     \trace_pop:nnn { regex } { 1 } { __regex_build_for_cs }
   }
-\cs_new_protected_nopar:Npn \__regex_push_lr_states:
+\cs_new_protected:Npn \__regex_push_lr_states:
   {
     \seq_push:No \l__regex_left_state_seq
       { \int_use:N \l__regex_left_state_int }
     \seq_push:No \l__regex_right_state_seq
       { \int_use:N \l__regex_right_state_int }
   }
-\cs_new_protected_nopar:Npn \__regex_pop_lr_states:
+\cs_new_protected:Npn \__regex_pop_lr_states:
   {
     \seq_pop:NN \l__regex_left_state_seq  \l__regex_internal_a_tl
     \int_set:Nn \l__regex_left_state_int  \l__regex_internal_a_tl
@@ -1527,13 +1527,13 @@
   }
 \cs_new_protected:Npn \__regex_toks_put_left:Nx #1#2
   {
-    \cs_set_nopar:Npx \__regex_tmp:w { #2 }
+    \cs_set:Npx \__regex_tmp:w { #2 }
     \tex_toks:D #1 \exp_after:wN \exp_after:wN \exp_after:wN
       { \exp_after:wN \__regex_tmp:w \tex_the:D \tex_toks:D #1 }
   }
 \cs_new_protected:Npn \__regex_toks_put_right:Nx #1#2
   {
-    \cs_set_nopar:Npx \__regex_tmp:w {#2}
+    \cs_set:Npx \__regex_tmp:w {#2}
     \tex_toks:D #1 \exp_after:wN
       { \tex_the:D \tex_toks:D \exp_after:wN #1 \__regex_tmp:w }
   }
@@ -1543,7 +1543,7 @@
   { \__regex_toks_put_left:Nx  #2 { #1 { \int_eval:n { #3 - #2 } } } }
 \cs_new_protected:Npn \__regex_build_transition_right:nNn #1#2#3
   { \__regex_toks_put_right:Nx #2 { #1 { \int_eval:n { #3 - #2 } } } }
-\cs_new_protected_nopar:Npn \__regex_build_new_state:
+\cs_new_protected:Npn \__regex_build_new_state:
   {
     \trace:nnx { regex } { 2 }
       {
@@ -1574,7 +1574,7 @@
   }
 \cs_new_protected:Npn \__regex_class:NnnnN #1#2#3#4#5
   {
-    \cs_set_nopar:Npx \__regex_tests_action_cost:n ##1
+    \cs_set:Npx \__regex_tests_action_cost:n ##1
       {
         \exp_not:n { \exp_not:n {#2} }
         \bool_if:NTF #1
@@ -1651,7 +1651,7 @@
         #1
       }
   }
-\cs_new_protected_nopar:Npn \__regex_group_no_capture:nnnN
+\cs_new_protected:Npn \__regex_group_no_capture:nnnN
   { \__regex_group_aux:nnnnN { -1 } }
 \cs_new_protected:Npn \__regex_group_resetting:nnnN #1
   {
@@ -1820,7 +1820,7 @@
       \exp_after:wN \__regex_break_true:w
     \fi:
   }
-\cs_new_protected_nopar:Npn \__regex_b_test:
+\cs_new_protected:Npn \__regex_b_test:
   {
     \group_begin:
       \int_set_eq:NN \l__regex_current_char_int \l__regex_last_char_int
@@ -1829,7 +1829,7 @@
         { \group_end: \__regex_item_reverse:n \__regex_prop_w: }
         { \group_end: \__regex_prop_w: }
   }
-\cs_new_protected_nopar:Npn \__regex_command_K:
+\cs_new_protected:Npn \__regex_command_K:
   {
     \__regex_build_new_state:
     \__regex_toks_put_right:Nx \l__regex_left_state_int
@@ -1889,10 +1889,10 @@
     \__regex_match_once:
     \trace_pop:nnx { regex } { 1 } { __regex_match }
   }
-\cs_new_protected_nopar:Npn \__regex_match_once:
+\cs_new_protected:Npn \__regex_match_once:
   {
     \if_meaning:w \c_true_bool \l__regex_empty_success_bool
-      \cs_set_nopar:Npn \__regex_if_two_empty_matches:F
+      \cs_set:Npn \__regex_if_two_empty_matches:F
         { \int_compare:nNnF \l__regex_start_pos_int = \l__regex_current_pos_int }
     \else:
       \cs_set_eq:NN \__regex_if_two_empty_matches:F \use:n
@@ -1908,7 +1908,7 @@
     \__regex_match_loop:
     \l__regex_every_match_tl
   }
-\cs_new_protected_nopar:Npn \__regex_single_match:
+\cs_new_protected:Npn \__regex_single_match:
   {
     \tl_set:Nn \l__regex_every_match_tl
       { \bool_gset_eq:NN \g__regex_success_bool \l__regex_match_success_bool }
@@ -1924,7 +1924,7 @@
         \fi:
       }
   }
-\cs_new_protected_nopar:Npn \__regex_match_loop:
+\cs_new_protected:Npn \__regex_match_loop:
   {
     \tex_advance:D \l__regex_step_int \c_two
     \int_incr:N \l__regex_current_pos_int
@@ -1970,14 +1970,14 @@
     \or: \int_decr:N \l__regex_balance_int
     \fi:
   }
-\cs_new_protected_nopar:Npn \__regex_query_get:
+\cs_new_protected:Npn \__regex_query_get:
   {
     \l__regex_current_char_int
       = \etex_mutoglue:D \tex_muskip:D \l__regex_current_pos_int
     \l__regex_current_catcode_int = \etex_gluestretch:D
       \etex_mutoglue:D \tex_muskip:D \l__regex_current_pos_int
   }
-\cs_new_protected_nopar:Npn \__regex_use_state:
+\cs_new_protected:Npn \__regex_use_state:
   {
     \trace:nnx { regex } { 2 } { state~\int_use:N \l__regex_current_state_int }
     \tex_dimen:D \l__regex_current_state_int
@@ -1996,16 +1996,16 @@
     \fi:
     \scan_stop:
   }
-\cs_new_protected_nopar:Npn \__regex_action_start_wildcard:
+\cs_new_protected:Npn \__regex_action_start_wildcard:
   {
     \bool_set_true:N \l__regex_fresh_thread_bool
     \__regex_action_free:n {1}
     \bool_set_false:N \l__regex_fresh_thread_bool
     \__regex_action_cost:n {0}
   }
-\cs_new_protected_nopar:Npn \__regex_action_free:n
+\cs_new_protected:Npn \__regex_action_free:n
   { \__regex_action_free_aux:nn { > \l__regex_step_int \else: } }
-\cs_new_protected_nopar:Npn \__regex_action_free_group:n
+\cs_new_protected:Npn \__regex_action_free_group:n
   { \__regex_action_free_aux:nn { < \l__regex_step_int } }
 \cs_new_protected:Npn \__regex_action_free_aux:nn #1#2
   {
@@ -2035,14 +2035,14 @@
     \tex_skip:D \l__regex_max_active_int = #1 sp \scan_stop:
     \int_incr:N \l__regex_max_active_int
   }
-\cs_new_protected_nopar:Npn \__regex_store_submatches:
+\cs_new_protected:Npn \__regex_store_submatches:
   {
     \tex_toks:D \l__regex_max_active_int \exp_after:wN
       { \l__regex_current_submatches_prop }
   }
-\cs_new_protected_nopar:Npn \__regex_disable_submatches:
+\cs_new_protected:Npn \__regex_disable_submatches:
   {
-    \cs_set_protected_nopar:Npn \__regex_store_submatches: { }
+    \cs_set_protected:Npn \__regex_store_submatches: { }
     \cs_set_protected:Npn \__regex_action_submatch:n ##1 { }
   }
 \cs_new_protected:Npn \__regex_action_submatch:n #1
@@ -2050,7 +2050,7 @@
     \prop_put:Nno \l__regex_current_submatches_prop {#1}
       { \int_use:N \l__regex_current_pos_int }
   }
-\cs_new_protected_nopar:Npn \__regex_action_success:
+\cs_new_protected:Npn \__regex_action_success:
   {
     \__regex_if_two_empty_matches:F
       {
@@ -2210,7 +2210,7 @@
       }
       { \__regex_replacement_error:NNN c #1#2 }
   }
-\cs_new_protected_nopar:cpn { __regex_replacement_c_ \c_left_brace_str :w }
+\cs_new_protected:cpn { __regex_replacement_c_ \c_left_brace_str :w }
   {
     \if_case:w \l__regex_replacement_csnames_int
       \__tl_build_one:n
@@ -2253,10 +2253,10 @@
       \fi:
     }
   \char_set_catcode_active:N \^^@
-  \cs_new_protected_nopar:Npn \__regex_replacement_c_A:w
+  \cs_new_protected:Npn \__regex_replacement_c_A:w
     { \__regex_replacement_char:nNN { \exp_not:n { \exp_not:N ^^@ } } }
   \char_set_catcode_group_begin:N \^^@
-  \cs_new_protected_nopar:Npn \__regex_replacement_c_B:w
+  \cs_new_protected:Npn \__regex_replacement_c_B:w
     {
       \if_int_compare:w \l__regex_replacement_csnames_int = \c_zero
         \int_incr:N \l__regex_balance_int
@@ -2267,10 +2267,10 @@
   \cs_new_protected:Npn \__regex_replacement_c_C:w #1#2
     { \__tl_build_one:n { \exp_not:N \exp_not:N \exp_not:c {#2} } }
   \char_set_catcode_math_subscript:N \^^@
-  \cs_new_protected_nopar:Npn \__regex_replacement_c_D:w
+  \cs_new_protected:Npn \__regex_replacement_c_D:w
     { \__regex_replacement_char:nNN { ^^@ } }
   \char_set_catcode_group_end:N \^^@
-  \cs_new_protected_nopar:Npn \__regex_replacement_c_E:w
+  \cs_new_protected:Npn \__regex_replacement_c_E:w
     {
       \if_int_compare:w \l__regex_replacement_csnames_int = \c_zero
         \int_decr:N \l__regex_balance_int
@@ -2279,16 +2279,16 @@
         { \exp_not:n { \if_false: { \fi:  ^^@ } }
     }
   \char_set_catcode_letter:N \^^@
-  \cs_new_protected_nopar:Npn \__regex_replacement_c_L:w
+  \cs_new_protected:Npn \__regex_replacement_c_L:w
     { \__regex_replacement_char:nNN { ^^@ } }
   \char_set_catcode_math_toggle:N \^^@
-  \cs_new_protected_nopar:Npn \__regex_replacement_c_M:w
+  \cs_new_protected:Npn \__regex_replacement_c_M:w
     { \__regex_replacement_char:nNN { ^^@ } }
   \char_set_catcode_other:N \^^@
-  \cs_new_protected_nopar:Npn \__regex_replacement_c_O:w
+  \cs_new_protected:Npn \__regex_replacement_c_O:w
     { \__regex_replacement_char:nNN { ^^@ } }
   \char_set_catcode_parameter:N \^^@
-  \cs_new_protected_nopar:Npn \__regex_replacement_c_P:w
+  \cs_new_protected:Npn \__regex_replacement_c_P:w
     {
       \__regex_replacement_char:nNN
         { \exp_not:n { \exp_not:n { ^^@^^@^^@^^@ } } }
@@ -2306,10 +2306,10 @@
       \fi:
     }
   \char_set_catcode_alignment:N \^^@
-  \cs_new_protected_nopar:Npn \__regex_replacement_c_T:w
+  \cs_new_protected:Npn \__regex_replacement_c_T:w
     { \__regex_replacement_char:nNN { ^^@ } }
   \char_set_catcode_math_superscript:N \^^@
-  \cs_new_protected_nopar:Npn \__regex_replacement_c_U:w
+  \cs_new_protected:Npn \__regex_replacement_c_U:w
     { \__regex_replacement_char:nNN { ^^@ } }
 \group_end:
 \cs_new_protected:Npn \__regex_replacement_error:NNN #1#2#3
@@ -2319,17 +2319,17 @@
   }
 \cs_new_protected:Npn \regex_new:N #1
   { \cs_new_eq:NN #1 \c__regex_no_match_regex }
-\cs_new_protected_nopar:Npn \regex_set:Nn #1#2
+\cs_new_protected:Npn \regex_set:Nn #1#2
   {
     \__regex_compile:n {#2}
     \tl_set_eq:NN #1 \l__regex_internal_regex
   }
-\cs_new_protected_nopar:Npn \regex_gset:Nn #1#2
+\cs_new_protected:Npn \regex_gset:Nn #1#2
   {
     \__regex_compile:n {#2}
     \tl_gset_eq:NN #1 \l__regex_internal_regex
   }
-\cs_new_protected_nopar:Npn \regex_const:Nn #1#2
+\cs_new_protected:Npn \regex_const:Nn #1#2
   {
     \__regex_compile:n {#2}
     \tl_const:Nx #1 { \exp_not:o \l__regex_internal_regex }
@@ -2379,7 +2379,7 @@
 \flag_new:n { __regex_end }
 \int_new:N \l__regex_submatch_int
 \int_new:N \l__regex_zeroth_submatch_int
-\cs_new_protected_nopar:Npn \__regex_return:
+\cs_new_protected:Npn \__regex_return:
   {
     \if_meaning:w \c_true_bool \g__regex_success_bool
       \prg_return_true:
@@ -2498,7 +2498,7 @@
       \prg_replicate:nn {#1} { \exp_not:n { \if_false: { \fi: } } }
     \fi:
   }
-\cs_new_protected_nopar:Npn \__regex_extract:
+\cs_new_protected:Npn \__regex_extract:
   {
     \if_meaning:w \c_true_bool \g__regex_success_bool
       \int_set_eq:NN \l__regex_zeroth_submatch_int \l__regex_submatch_int
@@ -2585,7 +2585,7 @@
         }
     \__regex_group_end_replace:N #3
   }
-\cs_new_protected_nopar:Npn \__regex_group_end_replace:N #1
+\cs_new_protected:Npn \__regex_group_end_replace:N #1
   {
     \if_int_compare:w \l__regex_balance_int = \c_zero
     \else:
diff --git a/Master/texmf-dist/tex/latex/l3experimental/l3str/l3regex.sty b/Master/texmf-dist/tex/latex/l3experimental/l3str/l3regex.sty
index e1e95236068..4f92950cb33 100644
--- a/Master/texmf-dist/tex/latex/l3experimental/l3str/l3regex.sty
+++ b/Master/texmf-dist/tex/latex/l3experimental/l3str/l3regex.sty
@@ -45,8 +45,8 @@
 %%   prior consultation with the LaTeX3 Project.
 %%
 %% -----------------------------------------------------------------------
-\RequirePackage{expl3}[2016/05/14]
-\@ifpackagelater{expl3}{2016/05/14}
+\RequirePackage{expl3}[2016/10/19]
+\@ifpackagelater{expl3}{2016/10/19}
   {}
   {%
     \PackageError{l3regex}{Support package l3kernel too old}
@@ -58,7 +58,7 @@
       }%
     \endinput
   }
-\GetIdInfo$Id: l3regex.dtx 6492 2016-05-14 20:27:55Z joseph $
+\GetIdInfo$Id: l3regex.dtx 6730 2016-10-19 11:19:38Z joseph $
   {L3 Experimental regular expressions}
 \ProvidesExplPackage
   {\ExplFileName}{\ExplFileDate}{\ExplFileVersion}{\ExplFileDescription}
@@ -130,7 +130,7 @@
       \fi:
     \fi:
   }
-\cs_new_protected_nopar:Npn \__regex_compute_case_changed_char:
+\cs_new_protected:Npn \__regex_compute_case_changed_char:
   {
     \int_set_eq:NN \l__regex_case_changed_char_int \l__regex_current_char_int
     \if_int_compare:w \l__regex_current_char_int < \c_ninety_one
@@ -214,14 +214,14 @@
         \group_end:
       }
   }
-\cs_new_protected_nopar:Npn \__regex_prop_d:
+\cs_new_protected:Npn \__regex_prop_d:
   { \__regex_item_caseful_range:nn \c_forty_eight { 57 } } % 0--9
-\cs_new_protected_nopar:Npn \__regex_prop_h:
+\cs_new_protected:Npn \__regex_prop_h:
   {
     \__regex_item_caseful_equal:n \c_thirty_two % space
     \__regex_item_caseful_equal:n \c_nine       % tab
   }
-\cs_new_protected_nopar:Npn \__regex_prop_s:
+\cs_new_protected:Npn \__regex_prop_s:
   {
     \__regex_item_caseful_equal:n \c_thirty_two % space
     \__regex_item_caseful_equal:n \c_nine       % tab
@@ -229,52 +229,52 @@
     \__regex_item_caseful_equal:n \c_twelve     % ff
     \__regex_item_caseful_equal:n \c_thirteen   % cr
   }
-\cs_new_protected_nopar:Npn \__regex_prop_v:
+\cs_new_protected:Npn \__regex_prop_v:
   { \__regex_item_caseful_range:nn \c_ten \c_thirteen } % lf, vtab, ff, cr
-\cs_new_protected_nopar:Npn \__regex_prop_w:
+\cs_new_protected:Npn \__regex_prop_w:
   {
     \__regex_item_caseful_range:nn \c_ninety_seven { 122 } % a--z
     \__regex_item_caseful_range:nn \c_sixty_five   {  90 } % A--Z
     \__regex_item_caseful_range:nn \c_forty_eight  {  57 } % 0--9
     \__regex_item_caseful_equal:n  { 95 } % _
   }
-\cs_new_protected_nopar:Npn \__regex_prop_N:
+\cs_new_protected:Npn \__regex_prop_N:
   { \__regex_item_reverse:n { \__regex_item_caseful_equal:n \c_ten } }
-\cs_new_protected_nopar:Npn \__regex_posix_alnum:
+\cs_new_protected:Npn \__regex_posix_alnum:
   { \__regex_posix_alpha: \__regex_posix_digit: }
-\cs_new_protected_nopar:Npn \__regex_posix_alpha:
+\cs_new_protected:Npn \__regex_posix_alpha:
   { \__regex_posix_lower: \__regex_posix_upper: }
-\cs_new_protected_nopar:Npn \__regex_posix_ascii:
+\cs_new_protected:Npn \__regex_posix_ascii:
   { \__regex_item_caseful_range:nn \c_zero \c_one_hundred_twenty_seven }
 \cs_new_eq:NN \__regex_posix_blank: \__regex_prop_h:
-\cs_new_protected_nopar:Npn \__regex_posix_cntrl:
+\cs_new_protected:Npn \__regex_posix_cntrl:
   {
     \__regex_item_caseful_range:nn \c_zero { 31 }
     \__regex_item_caseful_equal:n \c_one_hundred_twenty_seven
   }
 \cs_new_eq:NN \__regex_posix_digit: \__regex_prop_d:
-\cs_new_protected_nopar:Npn \__regex_posix_graph:
+\cs_new_protected:Npn \__regex_posix_graph:
   { \__regex_item_caseful_range:nn { 33 } { 126 } }
-\cs_new_protected_nopar:Npn \__regex_posix_lower:
+\cs_new_protected:Npn \__regex_posix_lower:
   { \__regex_item_caseful_range:nn \c_ninety_seven { 122 } }
-\cs_new_protected_nopar:Npn \__regex_posix_print:
+\cs_new_protected:Npn \__regex_posix_print:
   { \__regex_item_caseful_range:nn \c_thirty_two { 126 } }
-\cs_new_protected_nopar:Npn \__regex_posix_punct:
+\cs_new_protected:Npn \__regex_posix_punct:
   {
     \__regex_item_caseful_range:nn { 33 } { 47 }
     \__regex_item_caseful_range:nn { 58 } { 64 }
     \__regex_item_caseful_range:nn { 91 } { 96 }
     \__regex_item_caseful_range:nn { 123 } { 126 }
   }
-\cs_new_protected_nopar:Npn \__regex_posix_space:
+\cs_new_protected:Npn \__regex_posix_space:
   {
     \__regex_item_caseful_equal:n \c_thirty_two
     \__regex_item_caseful_range:nn \c_nine \c_thirteen
   }
-\cs_new_protected_nopar:Npn \__regex_posix_upper:
+\cs_new_protected:Npn \__regex_posix_upper:
   { \__regex_item_caseful_range:nn \c_sixty_five { 90 } }
 \cs_new_eq:NN \__regex_posix_word: \__regex_prop_w:
-\cs_new_protected_nopar:Npn \__regex_posix_xdigit:
+\cs_new_protected:Npn \__regex_posix_xdigit:
   {
     \__regex_posix_digit:
     \__regex_item_caseful_range:nn \c_sixty_five { 70 }
@@ -283,9 +283,9 @@
 \cs_new_protected:Npn \__regex_escape_use:nnnn #1#2#3#4
   {
     \__tl_build:Nw \l__regex_internal_a_tl
-      \cs_set_nopar:Npn \__regex_escape_unescaped:N ##1 { #1 }
-      \cs_set_nopar:Npn \__regex_escape_escaped:N ##1 { #2 }
-      \cs_set_nopar:Npn \__regex_escape_raw:N ##1 { #3 }
+      \cs_set:Npn \__regex_escape_unescaped:N ##1 { #1 }
+      \cs_set:Npn \__regex_escape_escaped:N ##1 { #2 }
+      \cs_set:Npn \__regex_escape_raw:N ##1 { #3 }
       \int_set:Nn \tex_escapechar:D { 92 }
       \__str_gset_other:Nn \g__regex_internal_tl { #4 }
       \tl_set:Nx \l__regex_internal_b_tl
@@ -303,7 +303,7 @@
       { \__regex_escape_unescaped:N #1 }
     \__regex_escape_loop:N
   }
-\cs_new_nopar:cpn { __regex_escape_ \c_backslash_str :w }
+\cs_new:cpn { __regex_escape_ \c_backslash_str :w }
     \__regex_escape_loop:N #1
   {
     \cs_if_exist_use:cF { __regex_escape_/\token_to_str:N #1:w }
@@ -314,24 +314,24 @@
 \cs_new_eq:NN \__regex_escape_escaped:N   ?
 \cs_new_eq:NN \__regex_escape_raw:N       ?
 \cs_new_eq:NN \__regex_escape_break:w \__prg_break:
-\cs_new_nopar:cpn { __regex_escape_/break:w }
+\cs_new:cpn { __regex_escape_/break:w }
   {
     \if_false: { \fi: }
     \__msg_kernel_error:nn { regex } { trailing-backslash }
     \exp_after:wN \use_none:n \exp_after:wN { \if_false: } \fi:
   }
-\cs_new_nopar:cpn { __regex_escape_~:w } { }
-\cs_new_nopar:cpx { __regex_escape_/a:w }
+\cs_new:cpn { __regex_escape_~:w } { }
+\cs_new:cpx { __regex_escape_/a:w }
   { \exp_not:N \__regex_escape_raw:N \iow_char:N \^^G }
-\cs_new_nopar:cpx { __regex_escape_/t:w }
+\cs_new:cpx { __regex_escape_/t:w }
   { \exp_not:N \__regex_escape_raw:N \iow_char:N \^^I }
-\cs_new_nopar:cpx { __regex_escape_/n:w }
+\cs_new:cpx { __regex_escape_/n:w }
   { \exp_not:N \__regex_escape_raw:N \iow_char:N \^^J }
-\cs_new_nopar:cpx { __regex_escape_/f:w }
+\cs_new:cpx { __regex_escape_/f:w }
   { \exp_not:N \__regex_escape_raw:N \iow_char:N \^^L }
-\cs_new_nopar:cpx { __regex_escape_/r:w }
+\cs_new:cpx { __regex_escape_/r:w }
   { \exp_not:N \__regex_escape_raw:N \iow_char:N \^^M }
-\cs_new_nopar:cpx { __regex_escape_/e:w }
+\cs_new:cpx { __regex_escape_/e:w }
   { \exp_not:N \__regex_escape_raw:N \iow_char:N \^^[ }
 \cs_new:cpn { __regex_escape_/x:w } \__regex_escape_loop:N
   {
@@ -515,7 +515,7 @@
       \prg_return_false:
     \fi:
   }
-\cs_new_nopar:Npn \__regex_if_in_class:TF
+\cs_new:Npn \__regex_if_in_class:TF
   {
     \if_int_odd:w \l__regex_mode_int
       \exp_after:wN \use_i:nn
@@ -523,7 +523,7 @@
       \exp_after:wN \use_ii:nn
     \fi:
   }
-\cs_new_nopar:Npn \__regex_if_in_cs:TF
+\cs_new:Npn \__regex_if_in_cs:TF
   {
     \if_int_odd:w \l__regex_mode_int
       \exp_after:wN \use_ii:nn
@@ -535,7 +535,7 @@
       \fi:
     \fi:
   }
-\cs_new_nopar:Npn \__regex_if_in_class_or_catcode:TF
+\cs_new:Npn \__regex_if_in_class_or_catcode:TF
   {
     \if_int_odd:w \l__regex_mode_int
       \exp_after:wN \use_i:nn
@@ -547,7 +547,7 @@
       \fi:
     \fi:
   }
-\cs_new_nopar:Npn \__regex_if_within_catcode:TF
+\cs_new:Npn \__regex_if_within_catcode:TF
   {
     \if_int_compare:w \l__regex_mode_int > \c_zero
       \exp_after:wN \use_i:nn
@@ -578,17 +578,17 @@
       \fi:
     \fi:
   }
-\cs_new_protected_nopar:Npn \__regex_compile:w
+\cs_new_protected:Npn \__regex_compile:w
   {
     \__tl_build_x:Nw \l__regex_internal_regex
       \int_zero:N \l__regex_group_level_int
       \int_set_eq:NN \l__regex_default_catcodes_int \c__regex_all_catcodes_int
       \int_set_eq:NN \l__regex_catcodes_int \l__regex_default_catcodes_int
-      \cs_set_nopar:Npn \__regex_item_equal:n  { \__regex_item_caseful_equal:n }
-      \cs_set_nopar:Npn \__regex_item_range:nn { \__regex_item_caseful_range:nn }
+      \cs_set:Npn \__regex_item_equal:n  { \__regex_item_caseful_equal:n }
+      \cs_set:Npn \__regex_item_range:nn { \__regex_item_caseful_range:nn }
       \__tl_build_one:n { \__regex_branch:n { \if_false: } \fi: }
   }
-\cs_new_protected_nopar:Npn \__regex_compile_end:
+\cs_new_protected:Npn \__regex_compile_end:
   {
       \__regex_if_in_class:TF
         {
@@ -712,11 +712,11 @@
         #3 #4
       }
   }
-\cs_new_protected_nopar:cpn { __regex_compile_quantifier_?:w }
+\cs_new_protected:cpn { __regex_compile_quantifier_?:w }
   { \__regex_compile_quantifier_lazyness:nnNN { 0 } { 1 } }
-\cs_new_protected_nopar:cpn { __regex_compile_quantifier_*:w }
+\cs_new_protected:cpn { __regex_compile_quantifier_*:w }
   { \__regex_compile_quantifier_lazyness:nnNN { 0 } { -1 } }
-\cs_new_protected_nopar:cpn { __regex_compile_quantifier_+:w }
+\cs_new_protected:cpn { __regex_compile_quantifier_+:w }
   { \__regex_compile_quantifier_lazyness:nnNN { 1 } { -1 } }
 \cs_new_protected:cpn { __regex_compile_quantifier_ \c_left_brace_str :w }
   {
@@ -855,13 +855,13 @@
         #2#3
       }
   }
-\cs_new_protected_nopar:cpx { __regex_compile_.: }
+\cs_new_protected:cpx { __regex_compile_.: }
   {
     \exp_not:N \__regex_if_in_class:TF
       { \__regex_compile_raw:N . }
       { \__regex_compile_one:x \exp_not:c { __regex_prop_.: } }
   }
-\cs_new_protected_nopar:cpn { __regex_prop_.: }
+\cs_new_protected:cpn { __regex_prop_.: }
   {
     \if_int_compare:w \l__regex_current_char_int > - \c_two
       \exp_after:wN \__regex_break_true:w
@@ -869,9 +869,9 @@
   }
 \cs_set_protected:Npn \__regex_tmp:w #1#2
   {
-    \cs_new_protected_nopar:cpx { __regex_compile_/#1: }
+    \cs_new_protected:cpx { __regex_compile_/#1: }
       { \__regex_compile_one:x \exp_not:c { __regex_prop_#1: } }
-    \cs_new_protected_nopar:cpx { __regex_compile_/#2: }
+    \cs_new_protected:cpx { __regex_compile_/#2: }
       {
         \__regex_compile_one:x
           { \__regex_item_reverse:n \exp_not:c { __regex_prop_#1: } }
@@ -882,7 +882,7 @@
 \__regex_tmp:w s S
 \__regex_tmp:w v V
 \__regex_tmp:w w W
-\cs_new_protected_nopar:cpn { __regex_compile_/N: }
+\cs_new_protected:cpn { __regex_compile_/N: }
   { \__regex_compile_one:x \__regex_prop_N: }
 \cs_new_protected:Npn \__regex_compile_anchor:NF #1#2
   {
@@ -894,7 +894,7 @@
   }
 \cs_set_protected:Npn \__regex_tmp:w #1#2
   {
-    \cs_new_protected_nopar:cpn { __regex_compile_/#1: }
+    \cs_new_protected:cpn { __regex_compile_/#1: }
       { \__regex_compile_anchor:NF #2 { \__regex_compile_raw_error:N #1 } }
   }
 \__regex_tmp:w A \l__regex_min_pos_int
@@ -903,12 +903,12 @@
 \__regex_tmp:w z \l__regex_max_pos_int
 \cs_set_protected:Npn \__regex_tmp:w #1#2
   {
-    \cs_new_protected_nopar:cpn { __regex_compile_#1: }
+    \cs_new_protected:cpn { __regex_compile_#1: }
       { \__regex_compile_anchor:NF #2 { \__regex_compile_raw:N #1 } }
   }
 \exp_args:Nx \__regex_tmp:w { \iow_char:N \^ } \l__regex_min_pos_int
 \exp_args:Nx \__regex_tmp:w { \iow_char:N \$ } \l__regex_max_pos_int
-\cs_new_protected_nopar:cpn { __regex_compile_/b: }
+\cs_new_protected:cpn { __regex_compile_/b: }
   {
     \__regex_if_in_class_or_catcode:TF
       { \__regex_compile_raw_error:N b }
@@ -917,7 +917,7 @@
           { \__regex_assertion:Nn \c_true_bool { \__regex_b_test: } }
       }
   }
-\cs_new_protected_nopar:cpn { __regex_compile_/B: }
+\cs_new_protected:cpn { __regex_compile_/B: }
   {
     \__regex_if_in_class_or_catcode:TF
       { \__regex_compile_raw_error:N B }
@@ -941,7 +941,7 @@
       }
       { \__regex_compile_raw:N ] }
   }
-\cs_new_protected_nopar:cpn { __regex_compile_[: }
+\cs_new_protected:cpn { __regex_compile_[: }
   {
     \__regex_if_in_class:TF
       { \__regex_compile_class_posix_test:w }
@@ -954,7 +954,7 @@
           { \__regex_compile_class_normal:w }
       }
   }
-\cs_new_protected_nopar:Npn \__regex_compile_class_normal:w
+\cs_new_protected:Npn \__regex_compile_class_normal:w
   {
     \__regex_compile_class:TFNN
       { \__regex_class:NnnnN \c_true_bool }
@@ -1075,7 +1075,7 @@
       \exp_after:wN \__regex_compile_raw:N \exp_after:wN )
     \fi:
   }
-\cs_new_protected_nopar:cpn { __regex_compile_(: }
+\cs_new_protected:cpn { __regex_compile_(: }
   {
     \__regex_if_in_class:TF { \__regex_compile_raw:N ( }
       { \__regex_compile_lparen:w }
@@ -1098,7 +1098,7 @@
           #1 #2 #3 #4
       }
   }
-\cs_new_protected_nopar:cpn { __regex_compile_|: }
+\cs_new_protected:cpn { __regex_compile_|: }
   {
     \__regex_if_in_class:TF { \__regex_compile_raw:N | }
       {
@@ -1106,21 +1106,21 @@
           { \if_false: { \fi: } \__regex_branch:n { \if_false: } \fi: }
       }
   }
-\cs_new_protected_nopar:cpn { __regex_compile_): }
+\cs_new_protected:cpn { __regex_compile_): }
   {
     \__regex_if_in_class:TF { \__regex_compile_raw:N ) }
       { \__regex_compile_group_end: }
   }
-\cs_new_protected_nopar:cpn { __regex_compile_special_group_::w }
+\cs_new_protected:cpn { __regex_compile_special_group_::w }
   { \__regex_compile_group_begin:N \__regex_group_no_capture:nnnN }
-\cs_new_protected_nopar:cpn { __regex_compile_special_group_|:w }
+\cs_new_protected:cpn { __regex_compile_special_group_|:w }
   { \__regex_compile_group_begin:N \__regex_group_resetting:nnnN }
 \cs_new_protected:Npn \__regex_compile_special_group_i:w #1#2
   {
     \str_if_eq:nnTF { #1 #2 } { \__regex_compile_special:N ) }
       {
-        \cs_set_nopar:Npn \__regex_item_equal:n  { \__regex_item_caseless_equal:n }
-        \cs_set_nopar:Npn \__regex_item_range:nn { \__regex_item_caseless_range:nn }
+        \cs_set:Npn \__regex_item_equal:n  { \__regex_item_caseless_equal:n }
+        \cs_set:Npn \__regex_item_range:nn { \__regex_item_caseless_range:nn }
       }
       {
         \__msg_kernel_warning:nnx { regex } { unknown-option } { (?i #2 }
@@ -1130,13 +1130,13 @@
         #1 #2
       }
   }
-\cs_new_protected_nopar:cpn { __regex_compile_special_group_-:w } #1#2#3#4
+\cs_new_protected:cpn { __regex_compile_special_group_-:w } #1#2#3#4
   {
     \str_if_eq:nnTF { #1 #2 #3 #4 }
       { \__regex_compile_raw:N i \__regex_compile_special:N ) }
       {
-        \cs_set_nopar:Npn \__regex_item_equal:n  { \__regex_item_caseful_equal:n }
-        \cs_set_nopar:Npn \__regex_item_range:nn { \__regex_item_caseful_range:nn }
+        \cs_set:Npn \__regex_item_equal:n  { \__regex_item_caseful_equal:n }
+        \cs_set:Npn \__regex_item_range:nn { \__regex_item_caseful_range:nn }
       }
       {
         \__msg_kernel_warning:nnx { regex } { unknown-option } { (?-#2#4 }
@@ -1209,14 +1209,14 @@
       \tex_advance:D \l__regex_catcodes_int #1
     \fi:
   }
-\cs_new_protected_nopar:Npn \__regex_compile_c_lbrack_end:
+\cs_new_protected:Npn \__regex_compile_c_lbrack_end:
   {
     \if_meaning:w \c_false_bool \l__regex_catcodes_bool
       \int_set:Nn \l__regex_catcodes_int
         { \c__regex_all_catcodes_int - \l__regex_catcodes_int }
     \fi:
   }
-\cs_new_protected_nopar:cpn { __regex_compile_c_ \c_left_brace_str :w }
+\cs_new_protected:cpn { __regex_compile_c_ \c_left_brace_str :w }
   {
     \__regex_compile:w
       \__regex_disable_submatches:
@@ -1311,7 +1311,7 @@
           }
       }
   }
-\cs_new_protected_nopar:cpn { __regex_compile_/K: }
+\cs_new_protected:cpn { __regex_compile_/K: }
   {
     \int_compare:nNnTF \l__regex_mode_int = \c_zero
       { \__tl_build_one:n { \__regex_command_K: } }
@@ -1320,25 +1320,25 @@
 \cs_new_protected:Npn \__regex_show:Nx #1#2
   {
     \__tl_build:Nw \l__regex_internal_a_tl
-      \cs_set_protected_nopar:Npn \__regex_branch:n
+      \cs_set_protected:Npn \__regex_branch:n
         {
           \seq_pop_right:NN \l__regex_show_prefix_seq \l__regex_internal_a_tl
           \__regex_show_one:n { +-branch }
           \seq_put_right:No \l__regex_show_prefix_seq \l__regex_internal_a_tl
           \use:n
         }
-      \cs_set_protected_nopar:Npn \__regex_group:nnnN
+      \cs_set_protected:Npn \__regex_group:nnnN
         { \__regex_show_group_aux:nnnnN { } }
-      \cs_set_protected_nopar:Npn \__regex_group_no_capture:nnnN
+      \cs_set_protected:Npn \__regex_group_no_capture:nnnN
         { \__regex_show_group_aux:nnnnN { ~(no~capture) } }
-      \cs_set_protected_nopar:Npn \__regex_group_resetting:nnnN
+      \cs_set_protected:Npn \__regex_group_resetting:nnnN
         { \__regex_show_group_aux:nnnnN { ~(resetting) } }
       \cs_set_eq:NN \__regex_class:NnnnN \__regex_show_class:NnnnN
-      \cs_set_protected_nopar:Npn \__regex_command_K:
+      \cs_set_protected:Npn \__regex_command_K:
         { \__regex_show_one:n { reset~match~start~(\iow_char:N\\K) } }
       \cs_set_protected:Npn \__regex_assertion:Nn ##1##2
         { \__regex_show_one:n { \bool_if:NF ##1 { negative~ } assertion:~##2 } }
-      \cs_set_nopar:Npn \__regex_b_test: { word~boundary }
+      \cs_set:Npn \__regex_b_test: { word~boundary }
       \cs_set_eq:NN \__regex_anchor:N \__regex_show_anchor_to_str:N
       \cs_set_protected:Npn \__regex_item_caseful_equal:n ##1
         { \__regex_show_one:n { char~code~\int_eval:n{##1} } }
@@ -1503,14 +1503,14 @@
         \fi:
       }
   }
-\cs_new_protected_nopar:Npn \__regex_push_lr_states:
+\cs_new_protected:Npn \__regex_push_lr_states:
   {
     \seq_push:No \l__regex_left_state_seq
       { \int_use:N \l__regex_left_state_int }
     \seq_push:No \l__regex_right_state_seq
       { \int_use:N \l__regex_right_state_int }
   }
-\cs_new_protected_nopar:Npn \__regex_pop_lr_states:
+\cs_new_protected:Npn \__regex_pop_lr_states:
   {
     \seq_pop:NN \l__regex_left_state_seq  \l__regex_internal_a_tl
     \int_set:Nn \l__regex_left_state_int  \l__regex_internal_a_tl
@@ -1519,13 +1519,13 @@
   }
 \cs_new_protected:Npn \__regex_toks_put_left:Nx #1#2
   {
-    \cs_set_nopar:Npx \__regex_tmp:w { #2 }
+    \cs_set:Npx \__regex_tmp:w { #2 }
     \tex_toks:D #1 \exp_after:wN \exp_after:wN \exp_after:wN
       { \exp_after:wN \__regex_tmp:w \tex_the:D \tex_toks:D #1 }
   }
 \cs_new_protected:Npn \__regex_toks_put_right:Nx #1#2
   {
-    \cs_set_nopar:Npx \__regex_tmp:w {#2}
+    \cs_set:Npx \__regex_tmp:w {#2}
     \tex_toks:D #1 \exp_after:wN
       { \tex_the:D \tex_toks:D \exp_after:wN #1 \__regex_tmp:w }
   }
@@ -1535,7 +1535,7 @@
   { \__regex_toks_put_left:Nx  #2 { #1 { \int_eval:n { #3 - #2 } } } }
 \cs_new_protected:Npn \__regex_build_transition_right:nNn #1#2#3
   { \__regex_toks_put_right:Nx #2 { #1 { \int_eval:n { #3 - #2 } } } }
-\cs_new_protected_nopar:Npn \__regex_build_new_state:
+\cs_new_protected:Npn \__regex_build_new_state:
   {
     \tex_toks:D \l__regex_max_state_int { }
     \int_set_eq:NN \l__regex_left_state_int \l__regex_right_state_int
@@ -1558,7 +1558,7 @@
   }
 \cs_new_protected:Npn \__regex_class:NnnnN #1#2#3#4#5
   {
-    \cs_set_nopar:Npx \__regex_tests_action_cost:n ##1
+    \cs_set:Npx \__regex_tests_action_cost:n ##1
       {
         \exp_not:n { \exp_not:n {#2} }
         \bool_if:NTF #1
@@ -1633,7 +1633,7 @@
         #1
       }
   }
-\cs_new_protected_nopar:Npn \__regex_group_no_capture:nnnN
+\cs_new_protected:Npn \__regex_group_no_capture:nnnN
   { \__regex_group_aux:nnnnN { -1 } }
 \cs_new_protected:Npn \__regex_group_resetting:nnnN #1
   {
@@ -1800,7 +1800,7 @@
       \exp_after:wN \__regex_break_true:w
     \fi:
   }
-\cs_new_protected_nopar:Npn \__regex_b_test:
+\cs_new_protected:Npn \__regex_b_test:
   {
     \group_begin:
       \int_set_eq:NN \l__regex_current_char_int \l__regex_last_char_int
@@ -1809,7 +1809,7 @@
         { \group_end: \__regex_item_reverse:n \__regex_prop_w: }
         { \group_end: \__regex_prop_w: }
   }
-\cs_new_protected_nopar:Npn \__regex_command_K:
+\cs_new_protected:Npn \__regex_command_K:
   {
     \__regex_build_new_state:
     \__regex_toks_put_right:Nx \l__regex_left_state_int
@@ -1865,10 +1865,10 @@
     \bool_set_false:N \l__regex_empty_success_bool
     \__regex_match_once:
   }
-\cs_new_protected_nopar:Npn \__regex_match_once:
+\cs_new_protected:Npn \__regex_match_once:
   {
     \if_meaning:w \c_true_bool \l__regex_empty_success_bool
-      \cs_set_nopar:Npn \__regex_if_two_empty_matches:F
+      \cs_set:Npn \__regex_if_two_empty_matches:F
         { \int_compare:nNnF \l__regex_start_pos_int = \l__regex_current_pos_int }
     \else:
       \cs_set_eq:NN \__regex_if_two_empty_matches:F \use:n
@@ -1884,7 +1884,7 @@
     \__regex_match_loop:
     \l__regex_every_match_tl
   }
-\cs_new_protected_nopar:Npn \__regex_single_match:
+\cs_new_protected:Npn \__regex_single_match:
   {
     \tl_set:Nn \l__regex_every_match_tl
       { \bool_gset_eq:NN \g__regex_success_bool \l__regex_match_success_bool }
@@ -1900,7 +1900,7 @@
         \fi:
       }
   }
-\cs_new_protected_nopar:Npn \__regex_match_loop:
+\cs_new_protected:Npn \__regex_match_loop:
   {
     \tex_advance:D \l__regex_step_int \c_two
     \int_incr:N \l__regex_current_pos_int
@@ -1946,14 +1946,14 @@
     \or: \int_decr:N \l__regex_balance_int
     \fi:
   }
-\cs_new_protected_nopar:Npn \__regex_query_get:
+\cs_new_protected:Npn \__regex_query_get:
   {
     \l__regex_current_char_int
       = \etex_mutoglue:D \tex_muskip:D \l__regex_current_pos_int
     \l__regex_current_catcode_int = \etex_gluestretch:D
       \etex_mutoglue:D \tex_muskip:D \l__regex_current_pos_int
   }
-\cs_new_protected_nopar:Npn \__regex_use_state:
+\cs_new_protected:Npn \__regex_use_state:
   {
     \tex_dimen:D \l__regex_current_state_int
       = \l__regex_step_int sp \scan_stop:
@@ -1971,16 +1971,16 @@
     \fi:
     \scan_stop:
   }
-\cs_new_protected_nopar:Npn \__regex_action_start_wildcard:
+\cs_new_protected:Npn \__regex_action_start_wildcard:
   {
     \bool_set_true:N \l__regex_fresh_thread_bool
     \__regex_action_free:n {1}
     \bool_set_false:N \l__regex_fresh_thread_bool
     \__regex_action_cost:n {0}
   }
-\cs_new_protected_nopar:Npn \__regex_action_free:n
+\cs_new_protected:Npn \__regex_action_free:n
   { \__regex_action_free_aux:nn { > \l__regex_step_int \else: } }
-\cs_new_protected_nopar:Npn \__regex_action_free_group:n
+\cs_new_protected:Npn \__regex_action_free_group:n
   { \__regex_action_free_aux:nn { < \l__regex_step_int } }
 \cs_new_protected:Npn \__regex_action_free_aux:nn #1#2
   {
@@ -2010,14 +2010,14 @@
     \tex_skip:D \l__regex_max_active_int = #1 sp \scan_stop:
     \int_incr:N \l__regex_max_active_int
   }
-\cs_new_protected_nopar:Npn \__regex_store_submatches:
+\cs_new_protected:Npn \__regex_store_submatches:
   {
     \tex_toks:D \l__regex_max_active_int \exp_after:wN
       { \l__regex_current_submatches_prop }
   }
-\cs_new_protected_nopar:Npn \__regex_disable_submatches:
+\cs_new_protected:Npn \__regex_disable_submatches:
   {
-    \cs_set_protected_nopar:Npn \__regex_store_submatches: { }
+    \cs_set_protected:Npn \__regex_store_submatches: { }
     \cs_set_protected:Npn \__regex_action_submatch:n ##1 { }
   }
 \cs_new_protected:Npn \__regex_action_submatch:n #1
@@ -2025,7 +2025,7 @@
     \prop_put:Nno \l__regex_current_submatches_prop {#1}
       { \int_use:N \l__regex_current_pos_int }
   }
-\cs_new_protected_nopar:Npn \__regex_action_success:
+\cs_new_protected:Npn \__regex_action_success:
   {
     \__regex_if_two_empty_matches:F
       {
@@ -2183,7 +2183,7 @@
       }
       { \__regex_replacement_error:NNN c #1#2 }
   }
-\cs_new_protected_nopar:cpn { __regex_replacement_c_ \c_left_brace_str :w }
+\cs_new_protected:cpn { __regex_replacement_c_ \c_left_brace_str :w }
   {
     \if_case:w \l__regex_replacement_csnames_int
       \__tl_build_one:n
@@ -2226,10 +2226,10 @@
       \fi:
     }
   \char_set_catcode_active:N \^^@
-  \cs_new_protected_nopar:Npn \__regex_replacement_c_A:w
+  \cs_new_protected:Npn \__regex_replacement_c_A:w
     { \__regex_replacement_char:nNN { \exp_not:n { \exp_not:N ^^@ } } }
   \char_set_catcode_group_begin:N \^^@
-  \cs_new_protected_nopar:Npn \__regex_replacement_c_B:w
+  \cs_new_protected:Npn \__regex_replacement_c_B:w
     {
       \if_int_compare:w \l__regex_replacement_csnames_int = \c_zero
         \int_incr:N \l__regex_balance_int
@@ -2240,10 +2240,10 @@
   \cs_new_protected:Npn \__regex_replacement_c_C:w #1#2
     { \__tl_build_one:n { \exp_not:N \exp_not:N \exp_not:c {#2} } }
   \char_set_catcode_math_subscript:N \^^@
-  \cs_new_protected_nopar:Npn \__regex_replacement_c_D:w
+  \cs_new_protected:Npn \__regex_replacement_c_D:w
     { \__regex_replacement_char:nNN { ^^@ } }
   \char_set_catcode_group_end:N \^^@
-  \cs_new_protected_nopar:Npn \__regex_replacement_c_E:w
+  \cs_new_protected:Npn \__regex_replacement_c_E:w
     {
       \if_int_compare:w \l__regex_replacement_csnames_int = \c_zero
         \int_decr:N \l__regex_balance_int
@@ -2252,16 +2252,16 @@
         { \exp_not:n { \if_false: { \fi:  ^^@ } }
     }
   \char_set_catcode_letter:N \^^@
-  \cs_new_protected_nopar:Npn \__regex_replacement_c_L:w
+  \cs_new_protected:Npn \__regex_replacement_c_L:w
     { \__regex_replacement_char:nNN { ^^@ } }
   \char_set_catcode_math_toggle:N \^^@
-  \cs_new_protected_nopar:Npn \__regex_replacement_c_M:w
+  \cs_new_protected:Npn \__regex_replacement_c_M:w
     { \__regex_replacement_char:nNN { ^^@ } }
   \char_set_catcode_other:N \^^@
-  \cs_new_protected_nopar:Npn \__regex_replacement_c_O:w
+  \cs_new_protected:Npn \__regex_replacement_c_O:w
     { \__regex_replacement_char:nNN { ^^@ } }
   \char_set_catcode_parameter:N \^^@
-  \cs_new_protected_nopar:Npn \__regex_replacement_c_P:w
+  \cs_new_protected:Npn \__regex_replacement_c_P:w
     {
       \__regex_replacement_char:nNN
         { \exp_not:n { \exp_not:n { ^^@^^@^^@^^@ } } }
@@ -2279,10 +2279,10 @@
       \fi:
     }
   \char_set_catcode_alignment:N \^^@
-  \cs_new_protected_nopar:Npn \__regex_replacement_c_T:w
+  \cs_new_protected:Npn \__regex_replacement_c_T:w
     { \__regex_replacement_char:nNN { ^^@ } }
   \char_set_catcode_math_superscript:N \^^@
-  \cs_new_protected_nopar:Npn \__regex_replacement_c_U:w
+  \cs_new_protected:Npn \__regex_replacement_c_U:w
     { \__regex_replacement_char:nNN { ^^@ } }
 \group_end:
 \cs_new_protected:Npn \__regex_replacement_error:NNN #1#2#3
@@ -2292,17 +2292,17 @@
   }
 \cs_new_protected:Npn \regex_new:N #1
   { \cs_new_eq:NN #1 \c__regex_no_match_regex }
-\cs_new_protected_nopar:Npn \regex_set:Nn #1#2
+\cs_new_protected:Npn \regex_set:Nn #1#2
   {
     \__regex_compile:n {#2}
     \tl_set_eq:NN #1 \l__regex_internal_regex
   }
-\cs_new_protected_nopar:Npn \regex_gset:Nn #1#2
+\cs_new_protected:Npn \regex_gset:Nn #1#2
   {
     \__regex_compile:n {#2}
     \tl_gset_eq:NN #1 \l__regex_internal_regex
   }
-\cs_new_protected_nopar:Npn \regex_const:Nn #1#2
+\cs_new_protected:Npn \regex_const:Nn #1#2
   {
     \__regex_compile:n {#2}
     \tl_const:Nx #1 { \exp_not:o \l__regex_internal_regex }
@@ -2352,7 +2352,7 @@
 \flag_new:n { __regex_end }
 \int_new:N \l__regex_submatch_int
 \int_new:N \l__regex_zeroth_submatch_int
-\cs_new_protected_nopar:Npn \__regex_return:
+\cs_new_protected:Npn \__regex_return:
   {
     \if_meaning:w \c_true_bool \g__regex_success_bool
       \prg_return_true:
@@ -2471,7 +2471,7 @@
       \prg_replicate:nn {#1} { \exp_not:n { \if_false: { \fi: } } }
     \fi:
   }
-\cs_new_protected_nopar:Npn \__regex_extract:
+\cs_new_protected:Npn \__regex_extract:
   {
     \if_meaning:w \c_true_bool \g__regex_success_bool
       \int_set_eq:NN \l__regex_zeroth_submatch_int \l__regex_submatch_int
@@ -2558,7 +2558,7 @@
         }
     \__regex_group_end_replace:N #3
   }
-\cs_new_protected_nopar:Npn \__regex_group_end_replace:N #1
+\cs_new_protected:Npn \__regex_group_end_replace:N #1
   {
     \if_int_compare:w \l__regex_balance_int = \c_zero
     \else:
diff --git a/Master/texmf-dist/tex/latex/l3experimental/l3str/l3str-convert.sty b/Master/texmf-dist/tex/latex/l3experimental/l3str/l3str-convert.sty
index bedffef50f0..d7554d39c69 100644
--- a/Master/texmf-dist/tex/latex/l3experimental/l3str/l3str-convert.sty
+++ b/Master/texmf-dist/tex/latex/l3experimental/l3str/l3str-convert.sty
@@ -46,24 +46,14 @@
 %%
 %% -----------------------------------------------------------------------
 \RequirePackage{expl3}
-\GetIdInfo$Id: l3str-convert.dtx 6443 2016-03-24 10:59:09Z joseph $
+\GetIdInfo$Id: l3str-convert.dtx 6699 2016-09-07 16:03:15Z bruno $
   {L3 Experimental string encoding conversions}
 \ProvidesExplPackage
   {\ExplFileName}{\ExplFileDate}{\ExplFileVersion}{\ExplFileDescription}
 \RequirePackage{l3tl-analysis,l3tl-build,l3flag}
 \cs_if_exist:NF \use_ii_i:nn
   { \cs_new:Npn \use_ii_i:nn #1#2 { #2 #1 } }
-\int_const:Nn \c_max_char_int
-  {
-    \bool_if:nTF
-      {
-        \sys_if_engine_luatex_p: ||
-        \sys_if_engine_xetex_p:
-      }
-      { "10FFFF }
-      { "FF }
-  }
-\cs_new_protected_nopar:Npn \__str_tmp:w { }
+\cs_new_protected:Npn \__str_tmp:w { }
 \tl_new:N \l__str_internal_tl
 \int_new:N \l__str_internal_int
 \tl_new:N \g__str_result_tl
@@ -140,7 +130,7 @@
     \fi:
     \__str_if_contains_char_aux:NN #1
   }
-\cs_new_nopar:Npn \__str_if_contains_char_true:
+\cs_new:Npn \__str_if_contains_char_true:
   { \__prg_break:n { \prg_return_true: \use_none:n } }
 \prg_new_conditional:Npnn \__str_octal_use:N #1 { TF }
   {
@@ -185,7 +175,7 @@
 \tl_const:cn { c__str_byte_-1_tl } { { } \use_none:n { } }
 \cs_new:Npn \__str_output_byte:n #1
   { \__str_output_byte:w #1 \__str_output_end: }
-\cs_new_nopar:Npn \__str_output_byte:w
+\cs_new:Npn \__str_output_byte:w
   {
     \exp_after:wN \exp_after:wN
     \exp_after:wN \use_i:nnn
@@ -193,13 +183,13 @@
   }
 \cs_new:Npn \__str_output_hexadecimal:n #1
   { \__str_output_hexadecimal:w #1 \__str_output_end: }
-\cs_new_nopar:Npn \__str_output_hexadecimal:w
+\cs_new:Npn \__str_output_hexadecimal:w
   {
     \exp_after:wN \exp_after:wN
     \exp_after:wN \use_none:n
     \cs:w c__str_byte_ \__int_value:w \__int_eval:w
   }
-\cs_new_nopar:Npn \__str_output_end:
+\cs_new:Npn \__str_output_end:
   { \__int_eval_end: _tl \cs_end: }
 \cs_new:Npn \__str_output_byte_pair_be:n #1
   {
@@ -259,9 +249,9 @@
   { \flag_if_raised:nT {#1} { \bool_gset_true:N \g__str_error_bool } }
 \cs_new:Npn \__str_if_flag_times:nT #1#2
   { \flag_if_raised:nT {#1} { #2~(x \flag_height:n {#1} ) } }
-\cs_new_protected_nopar:Npn \str_set_convert:Nnnn
+\cs_new_protected:Npn \str_set_convert:Nnnn
   { \__str_convert:nNNnnn { } \tl_set_eq:NN }
-\cs_new_protected_nopar:Npn \str_gset_convert:Nnnn
+\cs_new_protected:Npn \str_gset_convert:Nnnn
   { \__str_convert:nNNnnn { } \tl_gset_eq:NN }
 \prg_new_protected_conditional:Npnn
     \str_set_convert:Nnnn #1#2#3#4 { T , F , TF }
@@ -429,7 +419,7 @@
     \sys_if_engine_xetex_p:
   }
   {
-    \cs_new_protected_nopar:Npn \__str_convert_unescape_:
+    \cs_new_protected:Npn \__str_convert_unescape_:
       {
         \flag_clear:n { str_byte }
         \tl_gset:Nx \g__str_result_tl
@@ -437,11 +427,11 @@
         \__str_if_flag_error:nnx { str_byte } { non-byte } { bytes }
       }
   }
-  { \cs_new_protected_nopar:Npn \__str_convert_unescape_: { } }
+  { \cs_new_protected:Npn \__str_convert_unescape_: { } }
 \cs_new_eq:NN \__str_convert_unescape_bytes: \__str_convert_unescape_:
-\cs_new_protected_nopar:Npn \__str_convert_escape_: { }
+\cs_new_protected:Npn \__str_convert_escape_: { }
 \cs_new_eq:NN \__str_convert_escape_bytes: \__str_convert_escape_:
-\cs_new_protected_nopar:Npn \__str_convert_decode_:
+\cs_new_protected:Npn \__str_convert_decode_:
   { \__str_convert_gmap:N \__str_decode_native_char:N }
 \cs_new:Npn \__str_decode_native_char:N #1
   { #1 \s__tl \__int_value:w `#1 \s__tl }
@@ -453,7 +443,7 @@
       \sys_if_engine_xetex_p:
     }
     {
-      \cs_new_protected_nopar:Npn \__str_convert_encode_:
+      \cs_new_protected:Npn \__str_convert_encode_:
         {
           \__tl_gbuild_x:Nw \g__str_result_tl
             \exp_after:wN \__str_encode_native_loop:w
@@ -470,7 +460,7 @@
         }
     }
     {
-      \cs_new_protected_nopar:Npn \__str_convert_encode_:
+      \cs_new_protected:Npn \__str_convert_encode_:
         {
           \flag_clear:n { str_error }
           \__str_convert_gmap_internal:N \__str_encode_native_char:n
@@ -495,7 +485,7 @@
         }
     }
 \group_end:
-\cs_new_protected_nopar:Npn \__str_convert_decode_clist:
+\cs_new_protected:Npn \__str_convert_decode_clist:
   {
     \clist_set:No \g__str_result_tl \g__str_result_tl
     \tl_gset:Nx \g__str_result_tl
@@ -506,7 +496,7 @@
   }
 \cs_new:Npn \__str_decode_clist_char:n #1
   { #1 \s__tl \int_eval:n {#1} \s__tl }
-\cs_new_protected_nopar:Npn \__str_convert_encode_clist:
+\cs_new_protected:Npn \__str_convert_encode_clist:
   {
     \__str_convert_gmap_internal:N \__str_encode_clist_char:n
     \tl_gset:Nx \g__str_result_tl { \tl_tail:N \g__str_result_tl }
@@ -515,9 +505,9 @@
 \cs_new_protected:Npn \__str_declare_eight_bit_encoding:nnn #1#2#3
   {
     \tl_set:Nn \l__str_internal_tl {#1}
-    \cs_new_protected_nopar:cpn { __str_convert_decode_#1: }
+    \cs_new_protected:cpn { __str_convert_decode_#1: }
       { \__str_convert_decode_eight_bit:n {#1} }
-    \cs_new_protected_nopar:cpn { __str_convert_encode_#1: }
+    \cs_new_protected:cpn { __str_convert_encode_#1: }
       { \__str_convert_encode_eight_bit:n {#1} }
     \tl_const:cn { c__str_encoding_#1_tl } {#2}
     \tl_const:cn { c__str_encoding_#1_missing_tl } {#3}
diff --git a/Master/texmf-dist/tex/latex/l3experimental/l3str/l3str-enc-utf16.def b/Master/texmf-dist/tex/latex/l3experimental/l3str/l3str-enc-utf16.def
index e2b8568d358..4bfb9bc9444 100644
--- a/Master/texmf-dist/tex/latex/l3experimental/l3str/l3str-enc-utf16.def
+++ b/Master/texmf-dist/tex/latex/l3experimental/l3str/l3str-enc-utf16.def
@@ -48,14 +48,14 @@
 \group_begin:
   \char_set_catcode_other:N \^^fe
   \char_set_catcode_other:N \^^ff
-  \cs_new_protected_nopar:cpn { __str_convert_encode_utf16: }
+  \cs_new_protected:cpn { __str_convert_encode_utf16: }
     {
       \__str_encode_utf_xvi_aux:N \__str_output_byte_pair_be:n
       \tl_gput_left:Nx \g__str_result_tl { ^^fe ^^ff }
     }
-  \cs_new_protected_nopar:cpn { __str_convert_encode_utf16be: }
+  \cs_new_protected:cpn { __str_convert_encode_utf16be: }
     { \__str_encode_utf_xvi_aux:N \__str_output_byte_pair_be:n }
-  \cs_new_protected_nopar:cpn { __str_convert_encode_utf16le: }
+  \cs_new_protected:cpn { __str_convert_encode_utf16le: }
     { \__str_encode_utf_xvi_aux:N \__str_output_byte_pair_le:n }
   \cs_new_protected:Npn \__str_encode_utf_xvi_aux:N #1
     {
@@ -130,11 +130,11 @@
           the~basic~code~unit~for~UTF-16~is~16~bits~(2~bytes).
         }
     }
-  \cs_new_protected_nopar:cpn { __str_convert_decode_utf16be: }
+  \cs_new_protected:cpn { __str_convert_decode_utf16be: }
     { \__str_decode_utf_xvi:Nw 1 \g__str_result_tl \s__stop }
-  \cs_new_protected_nopar:cpn { __str_convert_decode_utf16le: }
+  \cs_new_protected:cpn { __str_convert_decode_utf16le: }
     { \__str_decode_utf_xvi:Nw 2 \g__str_result_tl \s__stop }
-  \cs_new_protected_nopar:cpn { __str_convert_decode_utf16: }
+  \cs_new_protected:cpn { __str_convert_decode_utf16: }
     {
       \exp_after:wN \__str_decode_utf_xvi_bom:NN
         \g__str_result_tl \s__stop \s__stop \s__stop
diff --git a/Master/texmf-dist/tex/latex/l3experimental/l3str/l3str-enc-utf32.def b/Master/texmf-dist/tex/latex/l3experimental/l3str/l3str-enc-utf32.def
index df8659954e7..02060931fdb 100644
--- a/Master/texmf-dist/tex/latex/l3experimental/l3str/l3str-enc-utf32.def
+++ b/Master/texmf-dist/tex/latex/l3experimental/l3str/l3str-enc-utf32.def
@@ -49,14 +49,14 @@
   \char_set_catcode_other:N \^^00
   \char_set_catcode_other:N \^^fe
   \char_set_catcode_other:N \^^ff
-  \cs_new_protected_nopar:cpn { __str_convert_encode_utf32: }
+  \cs_new_protected:cpn { __str_convert_encode_utf32: }
     {
       \__str_convert_gmap_internal:N \__str_encode_utf_xxxii_be:n
       \tl_gput_left:Nx \g__str_result_tl { ^^00 ^^00 ^^fe ^^ff }
     }
-  \cs_new_protected_nopar:cpn { __str_convert_encode_utf32be: }
+  \cs_new_protected:cpn { __str_convert_encode_utf32be: }
     { \__str_convert_gmap_internal:N \__str_encode_utf_xxxii_be:n }
-  \cs_new_protected_nopar:cpn { __str_convert_encode_utf32le: }
+  \cs_new_protected:cpn { __str_convert_encode_utf32le: }
     { \__str_convert_gmap_internal:N \__str_encode_utf_xxxii_le:n }
   \cs_new:Npn \__str_encode_utf_xxxii_be:n #1
     {
@@ -106,11 +106,11 @@
           Perhaps~the~string~was~truncated?
         }
     }
-  \cs_new_protected_nopar:cpn { __str_convert_decode_utf32be: }
+  \cs_new_protected:cpn { __str_convert_decode_utf32be: }
     { \__str_decode_utf_xxxii:Nw 1 \g__str_result_tl \s__stop }
-  \cs_new_protected_nopar:cpn { __str_convert_decode_utf32le: }
+  \cs_new_protected:cpn { __str_convert_decode_utf32le: }
     { \__str_decode_utf_xxxii:Nw 2 \g__str_result_tl \s__stop }
-  \cs_new_protected_nopar:cpn { __str_convert_decode_utf32: }
+  \cs_new_protected:cpn { __str_convert_decode_utf32: }
     {
       \exp_after:wN \__str_decode_utf_xxxii_bom:NNNN \g__str_result_tl
         \s__stop \s__stop \s__stop \s__stop \s__stop
diff --git a/Master/texmf-dist/tex/latex/l3experimental/l3str/l3str-enc-utf8.def b/Master/texmf-dist/tex/latex/l3experimental/l3str/l3str-enc-utf8.def
index b1b0d554590..b91e8997d27 100644
--- a/Master/texmf-dist/tex/latex/l3experimental/l3str/l3str-enc-utf8.def
+++ b/Master/texmf-dist/tex/latex/l3experimental/l3str/l3str-enc-utf8.def
@@ -45,7 +45,7 @@
 %%   prior consultation with the LaTeX3 Project.
 %%
 %% -----------------------------------------------------------------------
-\cs_new_protected_nopar:cpn { __str_convert_encode_utf8: }
+\cs_new_protected:cpn { __str_convert_encode_utf8: }
   { \__str_convert_gmap_internal:N \__str_encode_utf_viii_char:n }
 \cs_new:Npn \__str_encode_utf_viii_char:n #1
   {
@@ -115,7 +115,7 @@
         Unicode~limits~code~points~to~the~range~[0,1114111].
       }
   }
-\cs_new_protected_nopar:cpn { __str_convert_decode_utf8: }
+\cs_new_protected:cpn { __str_convert_decode_utf8: }
   {
     \flag_clear:n { str_error }
     \flag_clear:n { str_missing }
@@ -202,7 +202,7 @@
     \flag_raise:n { str_error }
     \int_use:N \c__str_replacement_char_int
   }
-\cs_new_nopar:Npn \__str_decode_utf_viii_end:
+\cs_new:Npn \__str_decode_utf_viii_end:
   {
     \s__tl
     \flag_raise:n { str_missing }
diff --git a/Master/texmf-dist/tex/latex/l3experimental/l3str/l3str-esc-hex.def b/Master/texmf-dist/tex/latex/l3experimental/l3str/l3str-esc-hex.def
index 2999bf6abd6..0669ea16a9c 100644
--- a/Master/texmf-dist/tex/latex/l3experimental/l3str/l3str-esc-hex.def
+++ b/Master/texmf-dist/tex/latex/l3experimental/l3str/l3str-esc-hex.def
@@ -45,7 +45,7 @@
 %%   prior consultation with the LaTeX3 Project.
 %%
 %% -----------------------------------------------------------------------
-\cs_new_protected_nopar:Npn \__str_convert_unescape_hex:
+\cs_new_protected:Npn \__str_convert_unescape_hex:
   {
     \group_begin:
       \flag_clear:n { str_error }
@@ -91,7 +91,7 @@
     Some~characters~in~the~string~you~asked~to~convert~are~not~
     hexadecimal~digits~(0-9,~A-F,~a-f)~nor~spaces.
   }
-\cs_new_protected_nopar:Npn \__str_convert_escape_hex:
+\cs_new_protected:Npn \__str_convert_escape_hex:
   { \__str_convert_gmap:N \__str_escape_hex_char:N }
 \cs_new:Npn \__str_escape_hex_char:N #1
   { \__str_output_hexadecimal:n { `#1 } }
diff --git a/Master/texmf-dist/tex/latex/l3experimental/l3str/l3str-esc-name.def b/Master/texmf-dist/tex/latex/l3experimental/l3str/l3str-esc-name.def
index 35550296787..d1650a5dff8 100644
--- a/Master/texmf-dist/tex/latex/l3experimental/l3str/l3str-esc-name.def
+++ b/Master/texmf-dist/tex/latex/l3experimental/l3str/l3str-esc-name.def
@@ -95,7 +95,7 @@
   \__str_unescape_name_loop:wNN
 \str_const:Nn \c__str_escape_name_not_str { ! " $ & ' } %$
 \str_const:Nn \c__str_escape_name_str { {}/<>[] }
-\cs_new_protected_nopar:Npn \__str_convert_escape_name:
+\cs_new_protected:Npn \__str_convert_escape_name:
   { \__str_convert_gmap:N \__str_escape_name_char:N }
 \cs_new:Npn \__str_escape_name_char:N #1
   {
diff --git a/Master/texmf-dist/tex/latex/l3experimental/l3str/l3str-esc-string.def b/Master/texmf-dist/tex/latex/l3experimental/l3str/l3str-esc-string.def
index 28babc286f9..3d36f4ef1e2 100644
--- a/Master/texmf-dist/tex/latex/l3experimental/l3str/l3str-esc-string.def
+++ b/Master/texmf-dist/tex/latex/l3experimental/l3str/l3str-esc-string.def
@@ -51,7 +51,7 @@
   \char_set_catcode_other:N \^^M
   \tex_lowercase:D
     {
-      \cs_new_protected_nopar:Npn \__str_convert_unescape_string:
+      \cs_new_protected:Npn \__str_convert_unescape_string:
         {
           \group_begin:
             \flag_clear:n { str_byte }
@@ -134,7 +134,7 @@
 \group_end:
 \str_const:Nx \c__str_escape_string_str
   { \c_backslash_str ( ) }
-\cs_new_protected_nopar:Npn \__str_convert_escape_string:
+\cs_new_protected:Npn \__str_convert_escape_string:
   { \__str_convert_gmap:N \__str_escape_string_char:N }
 \cs_new:Npn \__str_escape_string_char:N #1
   {
diff --git a/Master/texmf-dist/tex/latex/l3experimental/l3str/l3str-esc-url.def b/Master/texmf-dist/tex/latex/l3experimental/l3str/l3str-esc-url.def
index 5fcd1eeb79c..d3801b67f88 100644
--- a/Master/texmf-dist/tex/latex/l3experimental/l3str/l3str-esc-url.def
+++ b/Master/texmf-dist/tex/latex/l3experimental/l3str/l3str-esc-url.def
@@ -93,7 +93,7 @@
   }
 \exp_after:wN \__str_tmp:w \c_percent_str { url }
   \__str_unescape_url_loop:wNN
-\cs_new_protected_nopar:Npn \__str_convert_escape_url:
+\cs_new_protected:Npn \__str_convert_escape_url:
   { \__str_convert_gmap:N \__str_escape_url_char:N }
 \cs_new:Npn \__str_escape_url_char:N #1
   {
diff --git a/Master/texmf-dist/tex/latex/l3experimental/l3str/l3str-format.sty b/Master/texmf-dist/tex/latex/l3experimental/l3str/l3str-format.sty
index 961ff91b149..41093e4b732 100644
--- a/Master/texmf-dist/tex/latex/l3experimental/l3str/l3str-format.sty
+++ b/Master/texmf-dist/tex/latex/l3experimental/l3str/l3str-format.sty
@@ -46,7 +46,7 @@
 %%
 %% -----------------------------------------------------------------------
 \RequirePackage{expl3}
-\GetIdInfo$Id: l3str-format.dtx 6439 2016-03-23 12:03:41Z joseph $
+\GetIdInfo$Id: l3str-format.dtx 6589 2016-06-13 11:11:55Z joseph $
   {L3 Experimental string formatting}
 \ProvidesExplPackage
   {\ExplFileName}{\ExplFileDate}{\ExplFileVersion}{\ExplFileDescription}
@@ -182,7 +182,7 @@
       }
     #1
   }
-\cs_new_nopar:Npn \tl_format:Nn { \exp_args:No \tl_format:nn }
+\cs_new:Npn \tl_format:Nn { \exp_args:No \tl_format:nn }
 \cs_generate_variant:Nn \tl_format:Nn { c }
 \cs_new:Npn \tl_format:nn #1#2
   {
diff --git a/Master/texmf-dist/tex/latex/l3experimental/l3str/l3tl-analysis.sty b/Master/texmf-dist/tex/latex/l3experimental/l3str/l3tl-analysis.sty
index 3d5ca864417..aee29ed5cab 100644
--- a/Master/texmf-dist/tex/latex/l3experimental/l3str/l3tl-analysis.sty
+++ b/Master/texmf-dist/tex/latex/l3experimental/l3str/l3tl-analysis.sty
@@ -46,7 +46,7 @@
 %%
 %% -----------------------------------------------------------------------
 \RequirePackage{expl3}
-\GetIdInfo$Id: l3tl-analysis.dtx 6443 2016-03-24 10:59:09Z joseph $
+\GetIdInfo$Id: l3tl-analysis.dtx 6589 2016-06-13 11:11:55Z joseph $
   {L3 Experimental token lists analysis}
 \ProvidesExplPackage
   {\ExplFileName}{\ExplFileDate}{\ExplFileVersion}{\ExplFileDescription}
@@ -59,7 +59,7 @@
 \int_new:N \l__tl_analysis_nesting_int
 \int_new:N \l__tl_analysis_type_int
 \tl_new:N \g__tl_analysis_result_tl
-\cs_new_nopar:Npn \__tl_analysis_extract_charcode:
+\cs_new:Npn \__tl_analysis_extract_charcode:
   {
     \exp_after:wN \__tl_analysis_extract_charcode_aux:w
       \token_to_meaning:N \l__tl_analysis_token
@@ -116,9 +116,9 @@
     \if_false: { \fi: \__tl_analysis_a_loop:w #1 }
     \int_decr:N \l__tl_analysis_index_int
   }
-\cs_new_protected_nopar:Npn \__tl_analysis_a_loop:w
+\cs_new_protected:Npn \__tl_analysis_a_loop:w
   { \tex_futurelet:D \l__tl_analysis_token \__tl_analysis_a_type:w }
-\cs_new_protected_nopar:Npn \__tl_analysis_a_type:w
+\cs_new_protected:Npn \__tl_analysis_a_type:w
   {
     \l__tl_analysis_type_int =
       \if_meaning:w \l__tl_analysis_token \c_space_token
@@ -141,14 +141,14 @@
     \else: \exp_after:wN \__tl_analysis_a_egroup:w
     \fi:
   }
-\cs_new_protected_nopar:Npn \__tl_analysis_a_space:w
+\cs_new_protected:Npn \__tl_analysis_a_space:w
   {
     \tex_afterassignment:D \__tl_analysis_a_space_test:w
     \exp_after:wN \cs_set_eq:NN
     \exp_after:wN \l__tl_analysis_char_token
     \token_to_str:N
   }
-\cs_new_protected_nopar:Npn \__tl_analysis_a_space_test:w
+\cs_new_protected:Npn \__tl_analysis_a_space_test:w
   {
     \if_meaning:w \l__tl_analysis_char_token \c_space_token
       \tex_toks:D \l__tl_analysis_index_int { \exp_not:n { ~ } }
@@ -161,11 +161,11 @@
 \group_begin:
   \char_set_catcode_group_begin:N \^^@
   \char_set_catcode_group_end:N \^^E
-  \cs_new_protected_nopar:Npn \__tl_analysis_a_bgroup:w
+  \cs_new_protected:Npn \__tl_analysis_a_bgroup:w
     { \__tl_analysis_a_group:nw { \exp_after:wN ^^@ \if_false: ^^E \fi: } }
   \char_set_catcode_group_begin:N \^^B
   \char_set_catcode_group_end:N \^^@
-  \cs_new_protected_nopar:Npn \__tl_analysis_a_egroup:w
+  \cs_new_protected:Npn \__tl_analysis_a_egroup:w
     { \__tl_analysis_a_group:nw { \if_false: ^^B \fi: ^^@ } }
 \group_end:
 \cs_new_protected:Npn \__tl_analysis_a_group:nw #1
@@ -180,7 +180,7 @@
     \exp_after:wN \l__tl_analysis_char_token
     \token_to_str:N
   }
-\cs_new_protected_nopar:Npn \__tl_analysis_a_group_test:w
+\cs_new_protected:Npn \__tl_analysis_a_group_test:w
   {
     \if_charcode:w \l__tl_analysis_token \l__tl_analysis_char_token
       \__tl_analysis_a_store:
@@ -189,7 +189,7 @@
     \fi:
     \__tl_analysis_a_loop:w
   }
-\cs_new_protected_nopar:Npn \__tl_analysis_a_store:
+\cs_new_protected:Npn \__tl_analysis_a_store:
   {
     \tex_advance:D \l__tl_analysis_nesting_int \l__tl_analysis_type_int
     \if_int_compare:w \tex_lccode:D \c_zero = \c_thirty_two
diff --git a/Master/texmf-dist/tex/latex/l3experimental/l3str/l3tl-build.sty b/Master/texmf-dist/tex/latex/l3experimental/l3str/l3tl-build.sty
index c98c6edee9e..a570d9a325b 100644
--- a/Master/texmf-dist/tex/latex/l3experimental/l3str/l3tl-build.sty
+++ b/Master/texmf-dist/tex/latex/l3experimental/l3str/l3tl-build.sty
@@ -45,8 +45,8 @@
 %%   prior consultation with the LaTeX3 Project.
 %%
 %% -----------------------------------------------------------------------
-\RequirePackage{expl3}[2016/05/14]
-\@ifpackagelater{expl3}{2016/05/14}
+\RequirePackage{expl3}[2016/10/19]
+\@ifpackagelater{expl3}{2016/10/19}
   {}
   {%
     \PackageError{l3tl-build}{Support package l3kernel too old}
@@ -58,14 +58,14 @@
       }%
     \endinput
   }
-\GetIdInfo$Id: l3tl-build.dtx 6492 2016-05-14 20:27:55Z joseph $
+\GetIdInfo$Id: l3tl-build.dtx 6730 2016-10-19 11:19:38Z joseph $
   {L3 Experimental token list construction}
 \ProvidesExplPackage
   {\ExplFileName}{\ExplFileDate}{\ExplFileVersion}{\ExplFileDescription}
 \int_new:N \l__tl_build_start_index_int
 \int_new:N \l__tl_build_index_int
 \tl_new:N \l__tl_build_result_tl
-\cs_new_protected_nopar:Npn \__tl_build_unpack:
+\cs_new_protected:Npn \__tl_build_unpack:
   {
     \tl_put_right:Nx \l__tl_build_result_tl
       {
@@ -83,24 +83,24 @@
     \exp_after:wN \__tl_build_unpack_loop:w
       \int_use:N \__int_eval:w #1 + \c_one ;
   }
-\cs_new_protected_nopar:Npn \__tl_build:Nw
+\cs_new_protected:Npn \__tl_build:Nw
   { \__tl_build_aux:NNw \tl_set:Nn }
-\cs_new_protected_nopar:Npn \__tl_build_x:Nw
+\cs_new_protected:Npn \__tl_build_x:Nw
   { \__tl_build_aux:NNw \tl_set:Nx }
-\cs_new_protected_nopar:Npn \__tl_gbuild:Nw
+\cs_new_protected:Npn \__tl_gbuild:Nw
   { \__tl_build_aux:NNw \tl_gset:Nn }
-\cs_new_protected_nopar:Npn \__tl_gbuild_x:Nw
+\cs_new_protected:Npn \__tl_gbuild_x:Nw
   { \__tl_build_aux:NNw \tl_gset:Nx }
 \cs_new_protected:Npn \__tl_build_aux:NNw #1#2
   {
     \group_begin:
-      \cs_set_nopar:Npn \__tl_build_end_assignment:n
+      \cs_set:Npn \__tl_build_end_assignment:n
         { \group_end: #1 #2 }
       \int_zero:N \l__tl_build_start_index_int
       \int_zero:N \l__tl_build_index_int
       \tl_clear:N \l__tl_build_result_tl
   }
-\cs_new_protected_nopar:Npn \__tl_build_end:
+\cs_new_protected:Npn \__tl_build_end:
   {
       \__tl_build_unpack:
       \exp_args:No