[latex3-commits] [l3svn] r7308 - Move regex and sort messages to LaTeX/kernel namespace

[noreply at latex-project.org]

Author: bruno
Date: 2017-06-25 23:25:21 +0200 (Sun, 25 Jun 2017)
New Revision: 7308

Modified:
   trunk/l3kernel/l3regex.dtx
   trunk/l3kernel/l3sort.dtx
   trunk/l3kernel/testfiles/m3expl001.luatex.tlg
   trunk/l3kernel/testfiles/m3expl001.ptex.tlg
   trunk/l3kernel/testfiles/m3expl001.tlg
   trunk/l3kernel/testfiles/m3expl001.uptex.tlg
   trunk/l3kernel/testfiles/m3expl001.xetex.tlg
   trunk/l3kernel/testfiles/m3expl003.luatex.tlg
   trunk/l3kernel/testfiles/m3expl003.ptex.tlg
   trunk/l3kernel/testfiles/m3expl003.tlg
   trunk/l3kernel/testfiles/m3expl003.uptex.tlg
   trunk/l3kernel/testfiles/m3expl003.xetex.tlg
   trunk/l3kernel/testfiles/m3regex001.tlg
   trunk/l3kernel/testfiles/m3regex005.tlg
   trunk/l3kernel/testfiles/m3regex006.luatex.tlg
   trunk/l3kernel/testfiles/m3regex006.tlg
   trunk/l3kernel/testfiles/m3regex007.tlg
   trunk/l3kernel/testfiles/m3regex009.tlg
   trunk/l3kernel/testfiles/m3sort001.luatex.tlg
   trunk/l3kernel/testfiles/m3sort001.tlg
Log:
Move regex and sort messages to LaTeX/kernel namespace

This matches how we do things for modules like l3tl or l3fp.


Modified: trunk/l3kernel/l3regex.dtx
===================================================================
--- trunk/l3kernel/l3regex.dtx	2017-06-25 20:27:28 UTC (rev 7307)
+++ trunk/l3kernel/l3regex.dtx	2017-06-25 21:25:21 UTC (rev 7308)
@@ -1442,7 +1442,7 @@
 \cs_new:cpn { @@_escape_/break:w }
   {
     \if_false: { \fi: }
-    \__msg_kernel_error:nn { regex } { trailing-backslash }
+    \__msg_kernel_error:nn { kernel } { trailing-backslash }
     \exp_after:wN \use_none:n \exp_after:wN { \if_false: } \fi:
   }
 \cs_new:cpn { @@_escape_~:w } { }
@@ -1481,7 +1481,7 @@
       {
         \if_false: { \fi: }
         \__tl_build_one:o \l_@@_internal_b_tl
-        \__msg_kernel_error:nnx { regex } { x-overflow } {#1}
+        \__msg_kernel_error:nnx { kernel } { x-overflow } {#1}
         \tl_set:Nx \l_@@_internal_b_tl
           { \if_false: } \fi:
       }
@@ -1570,7 +1570,7 @@
   {
     \if_false: { \fi: }
     \__tl_build_one:o \l_@@_internal_b_tl
-    \__msg_kernel_error:nnx { regex } { x-missing-rbrace } {#1}
+    \__msg_kernel_error:nnx { kernel } { x-missing-rbrace } {#1}
     \tl_set:Nx \l_@@_internal_b_tl
       { \if_false: } \fi: \@@_escape_loop:N #1
   }
@@ -1987,7 +1987,7 @@
       \if_int_compare:w \l_@@_mode_int = \c_@@_class_mode_int
         \exp_after:wN \exp_after:wN \exp_after:wN \use:n
       \else:
-        \__msg_kernel_error:nn { regex } { c-bad-mode }
+        \__msg_kernel_error:nn { kernel } { c-bad-mode }
         \exp_after:wN \exp_after:wN \exp_after:wN \use_none:n
       \fi:
     \fi:
@@ -2036,13 +2036,13 @@
   {
       \@@_if_in_class:TF
         {
-          \__msg_kernel_error:nn { regex } { missing-rbrack }
+          \__msg_kernel_error:nn { kernel } { missing-rbrack }
           \use:c { @@_compile_]: }
           \prg_do_nothing: \prg_do_nothing:
         }
         { }
       \if_int_compare:w \l_@@_group_level_int > 0 \exp_stop_f:
-        \__msg_kernel_error:nnx { regex } { missing-rparen }
+        \__msg_kernel_error:nnx { kernel } { missing-rparen }
           { \int_use:N \l_@@_group_level_int }
         \prg_replicate:nn
           { \l_@@_group_level_int }
@@ -2093,10 +2093,10 @@
       \prg_do_nothing: \prg_do_nothing:
       \prg_do_nothing: \prg_do_nothing:
       \int_compare:nNnT \l_@@_mode_int = \c_@@_catcode_mode_int
-        { \__msg_kernel_error:nn { regex } { c-trailing } }
+        { \__msg_kernel_error:nn { kernel } { c-trailing } }
       \int_compare:nNnT \l_@@_mode_int < \c_@@_outer_mode_int
         {
-          \__msg_kernel_error:nn { regex } { c-missing-rbrace }
+          \__msg_kernel_error:nn { kernel } { c-missing-rbrace }
           \@@_compile_end_cs:
           \prg_do_nothing: \prg_do_nothing:
           \prg_do_nothing: \prg_do_nothing:
@@ -2203,7 +2203,7 @@
 \cs_new_protected:Npn \@@_compile_quantifier_abort:xNN #1#2#3
   {
     \@@_compile_quantifier_none:
-    \__msg_kernel_warning:nnxx { regex } { invalid-quantifier } {#1} {#3}
+    \__msg_kernel_warning:nnxx { kernel } { invalid-quantifier } {#1} {#3}
     \@@_compile_abort_tokens:x {#1}
     #2 #3
   }
@@ -2316,7 +2316,7 @@
       { #1 #2 } { \@@_compile_special:N \c_right_brace_str }
       {
         \if_int_compare:w \l_@@_internal_a_int > \l_@@_internal_b_int
-          \__msg_kernel_error:nnxx { regex } { backwards-quantifier }
+          \__msg_kernel_error:nnxx { kernel } { backwards-quantifier }
             { \int_use:N \l_@@_internal_a_int }
             { \int_use:N \l_@@_internal_b_int }
           \int_zero:N \l_@@_internal_b_int
@@ -2350,7 +2350,7 @@
 %    \begin{macrocode}
 \cs_new_protected:Npn \@@_compile_raw_error:N #1
   {
-    \__msg_kernel_error:nnx { regex } { bad-escape } {#1}
+    \__msg_kernel_error:nnx { kernel } { bad-escape } {#1}
     \@@_compile_raw:N #1
   }
 %    \end{macrocode}
@@ -2409,7 +2409,7 @@
     \@@_if_end_range:NNTF #2 #3
       {
         \if_int_compare:w `#1 > `#3 \exp_stop_f:
-          \__msg_kernel_error:nnxx { regex } { range-backwards } {#1} {#3}
+          \__msg_kernel_error:nnxx { kernel } { range-backwards } {#1} {#3}
         \else:
           \__tl_build_one:x
             {
@@ -2423,7 +2423,7 @@
         \fi:
       }
       {
-        \__msg_kernel_warning:nnxx { regex } { range-missing-end }
+        \__msg_kernel_warning:nnxx { kernel } { range-missing-end }
           {#1} { \c_backslash_str #3 }
         \__tl_build_one:x
           {
@@ -2701,8 +2701,8 @@
         \str_case:nn { #2 }
           {
             : { \@@_compile_class_posix:NNNNw }
-            = { \__msg_kernel_warning:nnx { regex } { posix-unsupported } { = } }
-            . { \__msg_kernel_warning:nnx { regex } { posix-unsupported } { . } }
+            = { \__msg_kernel_warning:nnx { kernel } { posix-unsupported } { = } }
+            . { \__msg_kernel_warning:nnx { kernel } { posix-unsupported } { . } }
           }
       }
     \@@_compile_raw:N [ #1 #2
@@ -2741,7 +2741,7 @@
               }
           }
           {
-            \__msg_kernel_warning:nnx { regex } { posix-unknown }
+            \__msg_kernel_warning:nnx { kernel } { posix-unknown }
               { \l_@@_internal_a_tl }
             \@@_compile_abort_tokens:x
               {
@@ -2751,7 +2751,7 @@
           }
       }
       {
-        \__msg_kernel_error:nnxx { regex } { posix-missing-close }
+        \__msg_kernel_error:nnxx { kernel } { posix-missing-close }
           { [: \l_@@_internal_a_tl } { #2 #4 }
         \@@_compile_abort_tokens:x { [: \l_@@_internal_a_tl }
         #1 #2 #3 #4
@@ -2793,7 +2793,7 @@
       \__tl_build_one:o \l_@@_internal_regex
       \exp_after:wN \@@_compile_quantifier:w
     \else:
-      \__msg_kernel_warning:nn { regex } { extra-rparen }
+      \__msg_kernel_warning:nn { kernel } { extra-rparen }
       \exp_after:wN \@@_compile_raw:N \exp_after:wN )
     \fi:
   }
@@ -2817,7 +2817,7 @@
         \cs_if_exist_use:cF
           { @@_compile_special_group_\token_to_str:N #4 :w }
           {
-            \__msg_kernel_warning:nnx { regex } { special-group-unknown }
+            \__msg_kernel_warning:nnx { kernel } { special-group-unknown }
               { (? #4 }
             \@@_compile_group_begin:N \@@_group:nnnN
               \@@_compile_raw:N ? #3 #4
@@ -2885,7 +2885,7 @@
         \cs_set:Npn \@@_item_range:nn { \@@_item_caseless_range:nn }
       }
       {
-        \__msg_kernel_warning:nnx { regex } { unknown-option } { (?i #2 }
+        \__msg_kernel_warning:nnx { kernel } { unknown-option } { (?i #2 }
         \@@_compile_raw:N (
         \@@_compile_raw:N ?
         \@@_compile_raw:N i
@@ -2901,7 +2901,7 @@
         \cs_set:Npn \@@_item_range:nn { \@@_item_caseful_range:nn }
       }
       {
-        \__msg_kernel_warning:nnx { regex } { unknown-option } { (?-#2#4 }
+        \__msg_kernel_warning:nnx { kernel } { unknown-option } { (?-#2#4 }
         \@@_compile_raw:N (
         \@@_compile_raw:N ?
         \@@_compile_raw:N -
@@ -2938,7 +2938,7 @@
       }
       { \cs_if_exist_use:cF { @@_compile_c_#2:w } }
           {
-            \__msg_kernel_error:nnx { regex } { c-missing-category } {#2}
+            \__msg_kernel_error:nnx { kernel } { c-missing-category } {#2}
             #1 #2
           }
   }
@@ -2992,7 +2992,7 @@
           { \@@_compile_c_lbrack_end: }
       }
           {
-            \__msg_kernel_error:nnx { regex } { c-missing-rbrack } {#2}
+            \__msg_kernel_error:nnx { kernel } { c-missing-rbrack } {#2}
             \@@_compile_c_lbrack_end:
             #1 #2
           }
@@ -3138,7 +3138,7 @@
             \@@_compile_u_loop:NN
           }
           {
-            \__msg_kernel_error:nn { regex } { u-missing-lbrace }
+            \__msg_kernel_error:nn { kernel } { u-missing-lbrace }
             \@@_compile_raw:N u #1 #2
           }
       }
@@ -3156,7 +3156,7 @@
           }
           {
             \if_false: { \fi: }
-            \__msg_kernel_error:nnx { regex } { u-missing-rbrace } {#2}
+            \__msg_kernel_error:nnx { kernel } { u-missing-rbrace } {#2}
             \@@_compile_u_end:
             #1 #2
           }
@@ -4984,14 +4984,14 @@
         {#1}
       \prg_do_nothing: \prg_do_nothing:
       \if_int_compare:w \l_@@_replacement_csnames_int > 0 \exp_stop_f:
-        \__msg_kernel_error:nnx { regex } { replacement-missing-rbrace }
+        \__msg_kernel_error:nnx { kernel } { replacement-missing-rbrace }
           { \int_use:N \l_@@_replacement_csnames_int }
         \__tl_build_one:x
           { \prg_replicate:nn \l_@@_replacement_csnames_int \cs_end: }
       \fi:
       \seq_if_empty:NF \l_@@_replacement_category_seq
         {
-          \__msg_kernel_error:nnx { regex } { replacement-missing-rparen }
+          \__msg_kernel_error:nnx { kernel } { replacement-missing-rparen }
             { \seq_count:N \l_@@_replacement_category_seq }
           \seq_clear:N \l_@@_replacement_category_seq
         }
@@ -5226,12 +5226,12 @@
 \cs_new_protected:Npn \@@_replacement_cat:NNN #1#2#3
   {
     \token_if_eq_meaning:NNTF \prg_do_nothing: #3
-      { \__msg_kernel_error:nn { regex } { replacement-catcode-end } }
+      { \__msg_kernel_error:nn { kernel } { replacement-catcode-end } }
       {
         \int_compare:nNnTF { \l_@@_replacement_csnames_int } > 0
           {
             \__msg_kernel_error:nnnn
-              { regex } { replacement-catcode-in-cs } {#1} {#3}
+              { kernel } { replacement-catcode-in-cs } {#1} {#3}
             #2 #3
           }
           {
@@ -5396,7 +5396,7 @@
   \cs_new_protected:Npn \@@_replacement_c_S:w #1#2
     {
       \if_int_compare:w `#2 = 0 \exp_stop_f:
-        \__msg_kernel_error:nn { regex } { replacement-null-space }
+        \__msg_kernel_error:nn { kernel } { replacement-null-space }
       \fi:
       \tex_lccode:D `\ = `#2 \scan_stop:
       \tex_lowercase:D { \__tl_build_one:n {~} }
@@ -5439,7 +5439,7 @@
 %    \begin{macrocode}
 \cs_new_protected:Npn \@@_replacement_error:NNN #1#2#3
   {
-    \__msg_kernel_error:nnx { regex } { replacement-#1 } {#3}
+    \__msg_kernel_error:nnx { kernel } { replacement-#1 } {#3}
     #2 #3
   }
 %    \end{macrocode}
@@ -5781,7 +5781,7 @@
         { \flag_height:n { @@_begin } + \flag_height:n { @@_end } }
         = 0
         {
-          \__msg_kernel_error:nnxxx { regex } { result-unbalanced }
+          \__msg_kernel_error:nnxxx { kernel } { result-unbalanced }
             { splitting~or~extracting~submatches }
             { \flag_height:n { @@_end } }
             { \flag_height:n { @@_begin } }
@@ -5972,7 +5972,7 @@
   {
     \if_int_compare:w \l_@@_balance_int = 0 \exp_stop_f:
     \else:
-      \__msg_kernel_error:nnxxx { regex } { result-unbalanced }
+      \__msg_kernel_error:nnxxx { kernel } { result-unbalanced }
         { replacing }
         { \int_max:nn { - \l_@@_balance_int } { 0 } }
         { \int_max:nn { \l_@@_balance_int } { 0 } }
@@ -6003,20 +6003,20 @@
 %
 % Messages for the preparsing phase.
 %    \begin{macrocode}
-\__msg_kernel_new:nnnn { regex } { trailing-backslash }
+\__msg_kernel_new:nnnn { kernel } { trailing-backslash }
   { Trailing~escape~character~'\iow_char:N\\'. }
   {
     A~regular~expression~or~its~replacement~text~ends~with~
     the~escape~character~'\iow_char:N\\'.~It~will~be~ignored.
   }
-\__msg_kernel_new:nnnn { regex } { x-missing-rbrace }
+\__msg_kernel_new:nnnn { kernel } { x-missing-rbrace }
   { Missing~closing~brace~in~'\iow_char:N\\x'~hexadecimal~sequence. }
   {
     You~wrote~something~like~
     '\iow_char:N\\x\{...#1'.~
     The~closing~brace~is~missing.
   }
-\__msg_kernel_new:nnnn { regex } { x-overflow }
+\__msg_kernel_new:nnnn { kernel } { x-overflow }
   { Character~code~'#1'~too~large~in~'\iow_char:N\\x'~hexadecimal~sequence. }
   {
     You~wrote~something~like~
@@ -6028,7 +6028,7 @@
 %
 % Invalid quantifier.
 %    \begin{macrocode}
-\__msg_kernel_new:nnnn { regex } { invalid-quantifier }
+\__msg_kernel_new:nnnn { kernel } { invalid-quantifier }
   { Braced~quantifier~'#1'~may~not~be~followed~by~'#2'. }
   {
     The~character~'#2'~is~invalid~in~the~braced~quantifier~'#1'.~
@@ -6040,13 +6040,13 @@
 % Messages for missing or extra closing brackets and parentheses, with
 % some fancy singular/plural handling for the case of parentheses.
 %    \begin{macrocode}
-\__msg_kernel_new:nnnn { regex } { missing-rbrack }
+\__msg_kernel_new:nnnn { kernel } { missing-rbrack }
   { Missing~right~bracket~inserted~in~regular~expression. }
   {
     LaTeX~was~given~a~regular~expression~where~a~character~class~
     was~started~with~'[',~but~the~matching~']'~is~missing.
   }
-\__msg_kernel_new:nnnn { regex } { missing-rparen }
+\__msg_kernel_new:nnnn { kernel } { missing-rparen }
   {
     Missing~right~
     \int_compare:nTF { #1 = 1 } { parenthesis } { parentheses } ~
@@ -6056,7 +6056,7 @@
     LaTeX~was~given~a~regular~expression~with~\int_eval:n {#1} ~
     more~left~parentheses~than~right~parentheses.
   }
-\__msg_kernel_new:nnnn { regex } { extra-rparen }
+\__msg_kernel_new:nnnn { kernel } { extra-rparen }
   { Extra~right~parenthesis~ignored~in~regular~expression. }
   {
     LaTeX~came~across~a~closing~parenthesis~when~no~submatch~group~
@@ -6066,7 +6066,7 @@
 %
 % Some escaped alphanumerics are not allowed everywhere.
 %    \begin{macrocode}
-\__msg_kernel_new:nnnn { regex } { bad-escape }
+\__msg_kernel_new:nnnn { kernel } { bad-escape }
   {
     Invalid~escape~'\iow_char:N\\#1'~
     \@@_if_in_cs:TF { within~a~control~sequence. }
@@ -6094,14 +6094,14 @@
 %
 % Range errors.
 %    \begin{macrocode}
-\__msg_kernel_new:nnnn { regex } { range-missing-end }
+\__msg_kernel_new:nnnn { kernel } { range-missing-end }
   { Invalid~end-point~for~range~'#1-#2'~in~character~class. }
   {
     The~end-point~'#2'~of~the~range~'#1-#2'~may~not~serve~as~an~
     end-point~for~a~range:~alphanumeric~characters~should~not~be~
     escaped,~and~non-alphanumeric~characters~should~be~escaped.
   }
-\__msg_kernel_new:nnnn { regex } { range-backwards }
+\__msg_kernel_new:nnnn { kernel } { range-backwards }
   { Range~'[#1-#2]'~out~of~order~in~character~class. }
   {
     In~ranges~of~characters~'[x-y]'~appearing~in~character~classes,~
@@ -6113,27 +6113,27 @@
 %
 % Errors related to |\c| and |\u|.
 %    \begin{macrocode}
-\__msg_kernel_new:nnnn { regex } { c-bad-mode }
+\__msg_kernel_new:nnnn { kernel } { c-bad-mode }
   { Invalid~nested~'\iow_char:N\\c'~escape~in~regular~expression. }
   {
     The~'\iow_char:N\\c'~escape~cannot~be~used~within~
     a~control~sequence~test~'\iow_char:N\\c{...}'.~
     To~combine~several~category~tests,~use~'\iow_char:N\\c[...]'.
   }
-\__msg_kernel_new:nnnn { regex } { c-missing-rbrace }
+\__msg_kernel_new:nnnn { kernel } { c-missing-rbrace }
   { Missing~right~brace~inserted~for~'\iow_char:N\\c'~escape. }
   {
     LaTeX~was~given~a~regular~expression~where~a~
     '\iow_char:N\\c\iow_char:N\{...'~construction~was~not~ended~
     with~a~closing~brace~'\iow_char:N\}'.
   }
-\__msg_kernel_new:nnnn { regex } { c-missing-rbrack }
+\__msg_kernel_new:nnnn { kernel } { c-missing-rbrack }
   { Missing~right~bracket~inserted~for~'\iow_char:N\\c'~escape. }
   {
     A~construction~'\iow_char:N\\c[...'~appears~in~a~
     regular~expression,~but~the~closing~']'~is~not~present.
   }
-\__msg_kernel_new:nnnn { regex } { c-missing-category }
+\__msg_kernel_new:nnnn { kernel } { c-missing-category }
   { Invalid~character~'#1'~following~'\iow_char:N\\c'~escape. }
   {
     In~regular~expressions,~the~'\iow_char:N\\c'~escape~sequence~
@@ -6141,19 +6141,19 @@
     capital~letter~representing~a~character~category,~namely~
     one~of~'ABCDELMOPSTU'.
   }
-\__msg_kernel_new:nnnn { regex } { c-trailing }
+\__msg_kernel_new:nnnn { kernel } { c-trailing }
   { Trailing~category~code~escape~'\iow_char:N\\c'... }
   {
     A~regular~expression~ends~with~'\iow_char:N\\c'~followed~
     by~a~letter.~It~will~be~ignored.
   }
-\__msg_kernel_new:nnnn { regex } { u-missing-lbrace }
+\__msg_kernel_new:nnnn { kernel } { u-missing-lbrace }
   { Missing~left~brace~following~'\iow_char:N\\u'~escape. }
   {
     The~'\iow_char:N\\u'~escape~sequence~must~be~followed~by~
     a~brace~group~with~the~name~of~the~variable~to~use.
   }
-\__msg_kernel_new:nnnn { regex } { u-missing-rbrace }
+\__msg_kernel_new:nnnn { kernel } { u-missing-rbrace }
   { Missing~right~brace~inserted~for~'\iow_char:N\\u'~escape. }
   {
     LaTeX~
@@ -6166,14 +6166,14 @@
 %
 % Errors when encountering the \textsc{posix} syntax |[:...:]|.
 %    \begin{macrocode}
-\__msg_kernel_new:nnnn { regex } { posix-unsupported }
+\__msg_kernel_new:nnnn { kernel } { posix-unsupported }
   { POSIX~collating~element~'[#1 ~ #1]'~not~supported. }
   {
     The~'[.foo.]'~and~'[=bar=]'~syntaxes~have~a~special~meaning~
     in~POSIX~regular~expressions.~This~is~not~supported~by~LaTeX.~
     Maybe~you~forgot~to~escape~a~left~bracket~in~a~character~class?
   }
-\__msg_kernel_new:nnnn { regex } { posix-unknown }
+\__msg_kernel_new:nnnn { kernel } { posix-unknown }
   { POSIX~class~'[:#1:]'~unknown. }
   {
     '[:#1:]'~is~not~among~the~known~POSIX~classes~
@@ -6182,7 +6182,7 @@
     '[:print:]',~'[:punct:]',~'[:space:]',~'[:upper:]',~
     '[:word:]',~and~'[:xdigit:]'.
   }
-\__msg_kernel_new:nnnn { regex } { posix-missing-close }
+\__msg_kernel_new:nnnn { kernel } { posix-missing-close }
   { Missing~closing~':]'~for~POSIX~class. }
   { The~POSIX~syntax~'#1'~must~be~followed~by~':]',~not~'#2'. }
 %    \end{macrocode}
@@ -6191,7 +6191,7 @@
 % with an unbalanced token list, which we must re-balance by adding
 % begin-group or end-group character tokens.
 %    \begin{macrocode}
-\__msg_kernel_new:nnnn { regex } { result-unbalanced }
+\__msg_kernel_new:nnnn { kernel } { result-unbalanced }
   { Missing~brace~inserted~when~#1. }
   {
     LaTeX~was~asked~to~do~some~regular~expression~operation,~
@@ -6203,13 +6203,13 @@
 %
 % Error message for unknown options.
 %    \begin{macrocode}
-\__msg_kernel_new:nnnn { regex } { unknown-option }
+\__msg_kernel_new:nnnn { kernel } { unknown-option }
   { Unknown~option~'#1'~for~regular~expressions. }
   {
     The~only~available~option~is~'case-insensitive',~toggled~by~
     '(?i)'~and~'(?-i)'.
   }
-\__msg_kernel_new:nnnn { regex } { special-group-unknown }
+\__msg_kernel_new:nnnn { kernel } { special-group-unknown }
   { Unknown~special~group~'#1~...'~in~a~regular~expression. }
   {
     The~only~valid~constructions~starting~with~'(?'~are~
@@ -6219,21 +6219,21 @@
 %
 % Errors in the replacement text.
 %    \begin{macrocode}
-\__msg_kernel_new:nnnn { regex } { replacement-c }
+\__msg_kernel_new:nnnn { kernel } { replacement-c }
   { Misused~'\iow_char:N\\c'~command~in~a~replacement~text. }
   {
     In~a~replacement~text,~the~'\iow_char:N\\c'~escape~sequence~
     can~be~followed~by~one~of~the~letters~'ABCDELMOPSTU'~
     or~a~brace~group,~not~by~'#1'.
   }
-\__msg_kernel_new:nnnn { regex } { replacement-u }
+\__msg_kernel_new:nnnn { kernel } { replacement-u }
   { Misused~'\iow_char:N\\u'~command~in~a~replacement~text. }
   {
     In~a~replacement~text,~the~'\iow_char:N\\u'~escape~sequence~
     must~be~~followed~by~a~brace~group~holding~the~name~of~the~
     variable~to~use.
   }
-\__msg_kernel_new:nnnn { regex } { replacement-g }
+\__msg_kernel_new:nnnn { kernel } { replacement-g }
   {
     Missing~brace~for~the~'\iow_char:N\\g'~construction~
     in~a~replacement~text.
@@ -6243,7 +6243,7 @@
     submatches~are~represented~either~as~'\iow_char:N \\g{dd..d}',~
     or~'\\d',~where~'d'~are~single~digits.~Here,~a~brace~is~missing.
   }
-\__msg_kernel_new:nnnn { regex } { replacement-catcode-end }
+\__msg_kernel_new:nnnn { kernel } { replacement-catcode-end }
   {
     Missing~character~for~the~'\iow_char:N\\c<category><character>'~
     construction~in~a~replacement~text.
@@ -6254,7 +6254,7 @@
     the~character~category.~Then,~a~character~must~follow.~LaTeX~
     reached~the~end~of~the~replacement~when~looking~for~that.
   }
-\__msg_kernel_new:nnnn { regex } { replacement-catcode-in-cs }
+\__msg_kernel_new:nnnn { kernel } { replacement-catcode-in-cs }
   {
     Category~code~'\iow_char:N\\c#1#3'~ignored~inside~
     '\iow_char:N\\c\{...\}'~in~a~replacement~text.
@@ -6264,7 +6264,7 @@
     '\iow_char:N\\c\{...\}'~are~ignored~when~building~the~control~
     sequence~name.
   }
-\__msg_kernel_new:nnnn { regex } { replacement-null-space }
+\__msg_kernel_new:nnnn { kernel } { replacement-null-space }
   { TeX~cannot~build~a~space~token~with~character~code~0. }
   {
     You~asked~for~a~character~token~with~category~space,~
@@ -6273,13 +6273,13 @@
     This~specific~case~is~impossible~and~will~be~replaced~
     by~a~normal~space.
   }
-\__msg_kernel_new:nnnn { regex } { replacement-missing-rbrace }
+\__msg_kernel_new:nnnn { kernel } { replacement-missing-rbrace }
   { Missing~right~brace~inserted~in~replacement~text. }
   {
     There~ \int_compare:nTF { #1 = 1 } { was } { were } ~ #1~
     missing~right~\int_compare:nTF { #1 = 1 } { brace } { braces } .
   }
-\__msg_kernel_new:nnnn { regex } { replacement-missing-rparen }
+\__msg_kernel_new:nnnn { kernel } { replacement-missing-rparen }
   { Missing~right~parenthesis~inserted~in~replacement~text. }
   {
     There~ \int_compare:nTF { #1 = 1 } { was } { were } ~ #1~

Modified: trunk/l3kernel/l3sort.dtx
===================================================================
--- trunk/l3kernel/l3sort.dtx	2017-06-25 20:27:28 UTC (rev 7307)
+++ trunk/l3kernel/l3sort.dtx	2017-06-25 21:25:21 UTC (rev 7308)
@@ -585,14 +585,14 @@
 \cs_new_protected:Npn \@@_return_mark:N #1 { }
 \cs_new_protected:Npn \@@_return_none_error:
   {
-    \__msg_kernel_error:nnxx { sort } { return-none }
+    \__msg_kernel_error:nnxx { kernel } { return-none }
       { \tex_the:D \tex_toks:D \l_@@_A_int }
       { \tex_the:D \tex_toks:D \l_@@_C_int }
     \@@_return_same:
   }
 \cs_new_protected:Npn \@@_return_two_error:w
     #1 \@@_return_none_error:
-  { \__msg_kernel_error:nn { sort } { return-two } }
+  { \__msg_kernel_error:nn { kernel } { return-two } }
 %    \end{macrocode}
 % \end{macro}
 % \end{macro}
@@ -1013,12 +1013,12 @@
   { \cs_set_eq:NN \toksdef \@@_disabled_toksdef:n }
 \cs_new_protected:Npn \@@_disabled_toksdef:n #1
   {
-    \__msg_kernel_error:nnx { sort } { toksdef }
+    \__msg_kernel_error:nnx { kernel } { toksdef }
       { \token_to_str:N #1 }
     \@@_error:
     \tex_toksdef:D #1
   }
-\__msg_kernel_new:nnnn { sort } { toksdef }
+\__msg_kernel_new:nnnn { kernel } { toksdef }
   { Allocation~of~\iow_char:N\\toks~registers~impossible~while~sorting. }
   {
     The~comparison~code~used~for~sorting~a~list~has~attempted~to~
@@ -1037,13 +1037,13 @@
 \cs_new_protected:Npn \@@_too_long_error:NNw #1#2 \fi:
   {
     \fi:
-    \__msg_kernel_error:nnxxx { sort } { too-large }
+    \__msg_kernel_error:nnxxx { kernel } { too-large }
       { \token_to_str:N #2 }
       { \int_eval:n { \l_@@_true_max_int - \l_@@_min_int } }
       { \int_eval:n { \l_@@_top_int - \l_@@_min_int } }
     #1 \@@_error:
   }
-\__msg_kernel_new:nnnn { sort } { too-large }
+\__msg_kernel_new:nnnn { kernel } { too-large }
   { The~list~#1~is~too~long~to~be~sorted~by~TeX. }
   {
     TeX~has~#2~toks~registers~still~available:~
@@ -1054,7 +1054,7 @@
 % \end{macro}
 %
 %    \begin{macrocode}
-\__msg_kernel_new:nnnn { sort } { return-none }
+\__msg_kernel_new:nnnn { kernel } { return-none }
   { The~comparison~code~did~not~return. }
   {
     When~sorting~a~list,~the~code~to~compare~items~#1~and~#2~
@@ -1063,7 +1063,7 @@
     \iow_char:N\\sort_return_swapped: .~
     Exactly~one~of~these~should~be~called.
   }
-\__msg_kernel_new:nnnn { sort } { return-two }
+\__msg_kernel_new:nnnn { kernel } { return-two }
   { The~comparison~code~returned~multiple~times. }
   {
     When~sorting~a~list,~the~code~to~compare~items~called~

Modified: trunk/l3kernel/testfiles/m3expl001.luatex.tlg
===================================================================
--- trunk/l3kernel/testfiles/m3expl001.luatex.tlg	2017-06-25 20:27:28 UTC (rev 7307)
+++ trunk/l3kernel/testfiles/m3expl001.luatex.tlg	2017-06-25 21:25:21 UTC (rev 7308)
@@ -4383,11 +4383,11 @@
 Defining \__sort_error: on line ...
 Defining \__sort_disable_toksdef: on line ...
 Defining \__sort_disabled_toksdef:n on line ...
-Defining message LaTeX/sort/toksdef on line ...
+Defining message LaTeX/kernel/toksdef on line ...
 Defining \__sort_too_long_error:NNw on line ...
-Defining message LaTeX/sort/too-large on line ...
-Defining message LaTeX/sort/return-none on line ...
-Defining message LaTeX/sort/return-two on line ...
+Defining message LaTeX/kernel/too-large on line ...
+Defining message LaTeX/kernel/return-none on line ...
+Defining message LaTeX/kernel/return-two on line ...
 Defining \sort_ordered: on line ...
 Defining \sort_reversed: on line ...
 Defining \l__tl_build_start_index_int on line ...
@@ -4918,37 +4918,37 @@
 Defining \__regex_replace_once:nnN on line ...
 Defining \__regex_replace_all:nnN on line ...
 Defining \__regex_group_end_replace:N on line ...
-Defining message LaTeX/regex/trailing-backslash on line ...
-Defining message LaTeX/regex/x-missing-rbrace on line ...
-Defining message LaTeX/regex/x-overflow on line ...
-Defining message LaTeX/regex/invalid-quantifier on line ...
-Defining message LaTeX/regex/missing-rbrack on line ...
-Defining message LaTeX/regex/missing-rparen on line ...
-Defining message LaTeX/regex/extra-rparen on line ...
-Defining message LaTeX/regex/bad-escape on line ...
-Defining message LaTeX/regex/range-missing-end on line ...
-Defining message LaTeX/regex/range-backwards on line ...
-Defining message LaTeX/regex/c-bad-mode on line ...
-Defining message LaTeX/regex/c-missing-rbrace on line ...
-Defining message LaTeX/regex/c-missing-rbrack on line ...
-Defining message LaTeX/regex/c-missing-category on line ...
-Defining message LaTeX/regex/c-trailing on line ...
-Defining message LaTeX/regex/u-missing-lbrace on line ...
-Defining message LaTeX/regex/u-missing-rbrace on line ...
-Defining message LaTeX/regex/posix-unsupported on line ...
-Defining message LaTeX/regex/posix-unknown on line ...
-Defining message LaTeX/regex/posix-missing-close on line ...
-Defining message LaTeX/regex/result-unbalanced on line ...
-Defining message LaTeX/regex/unknown-option on line ...
-Defining message LaTeX/regex/special-group-unknown on line ...
-Defining message LaTeX/regex/replacement-c on line ...
-Defining message LaTeX/regex/replacement-u on line ...
-Defining message LaTeX/regex/replacement-g on line ...
-Defining message LaTeX/regex/replacement-catcode-end on line ...
-Defining message LaTeX/regex/replacement-catcode-in-cs on line ...
-Defining message LaTeX/regex/replacement-null-space on line ...
-Defining message LaTeX/regex/replacement-missing-rbrace on line ...
-Defining message LaTeX/regex/replacement-missing-rparen on line ...
+Defining message LaTeX/kernel/trailing-backslash on line ...
+Defining message LaTeX/kernel/x-missing-rbrace on line ...
+Defining message LaTeX/kernel/x-overflow on line ...
+Defining message LaTeX/kernel/invalid-quantifier on line ...
+Defining message LaTeX/kernel/missing-rbrack on line ...
+Defining message LaTeX/kernel/missing-rparen on line ...
+Defining message LaTeX/kernel/extra-rparen on line ...
+Defining message LaTeX/kernel/bad-escape on line ...
+Defining message LaTeX/kernel/range-missing-end on line ...
+Defining message LaTeX/kernel/range-backwards on line ...
+Defining message LaTeX/kernel/c-bad-mode on line ...
+Defining message LaTeX/kernel/c-missing-rbrace on line ...
+Defining message LaTeX/kernel/c-missing-rbrack on line ...
+Defining message LaTeX/kernel/c-missing-category on line ...
+Defining message LaTeX/kernel/c-trailing on line ...
+Defining message LaTeX/kernel/u-missing-lbrace on line ...
+Defining message LaTeX/kernel/u-missing-rbrace on line ...
+Defining message LaTeX/kernel/posix-unsupported on line ...
+Defining message LaTeX/kernel/posix-unknown on line ...
+Defining message LaTeX/kernel/posix-missing-close on line ...
+Defining message LaTeX/kernel/result-unbalanced on line ...
+Defining message LaTeX/kernel/unknown-option on line ...
+Defining message LaTeX/kernel/special-group-unknown on line ...
+Defining message LaTeX/kernel/replacement-c on line ...
+Defining message LaTeX/kernel/replacement-u on line ...
+Defining message LaTeX/kernel/replacement-g on line ...
+Defining message LaTeX/kernel/replacement-catcode-end on line ...
+Defining message LaTeX/kernel/replacement-catcode-in-cs on line ...
+Defining message LaTeX/kernel/replacement-null-space on line ...
+Defining message LaTeX/kernel/replacement-missing-rbrace on line ...
+Defining message LaTeX/kernel/replacement-missing-rparen on line ...
 Defining \__regex_msg_repeated:nnN on line ...
 Defining \box_new:N on line ...
 Defining \box_new:c on line ...

Modified: trunk/l3kernel/testfiles/m3expl001.ptex.tlg
===================================================================
--- trunk/l3kernel/testfiles/m3expl001.ptex.tlg	2017-06-25 20:27:28 UTC (rev 7307)
+++ trunk/l3kernel/testfiles/m3expl001.ptex.tlg	2017-06-25 21:25:21 UTC (rev 7308)
@@ -4371,11 +4371,11 @@
 Defining \__sort_error: on line ...
 Defining \__sort_disable_toksdef: on line ...
 Defining \__sort_disabled_toksdef:n on line ...
-Defining message LaTeX/sort/toksdef on line ...
+Defining message LaTeX/kernel/toksdef on line ...
 Defining \__sort_too_long_error:NNw on line ...
-Defining message LaTeX/sort/too-large on line ...
-Defining message LaTeX/sort/return-none on line ...
-Defining message LaTeX/sort/return-two on line ...
+Defining message LaTeX/kernel/too-large on line ...
+Defining message LaTeX/kernel/return-none on line ...
+Defining message LaTeX/kernel/return-two on line ...
 Defining \sort_ordered: on line ...
 Defining \sort_reversed: on line ...
 Defining \l__tl_build_start_index_int on line ...
@@ -4908,37 +4908,37 @@
 Defining \__regex_replace_once:nnN on line ...
 Defining \__regex_replace_all:nnN on line ...
 Defining \__regex_group_end_replace:N on line ...
-Defining message LaTeX/regex/trailing-backslash on line ...
-Defining message LaTeX/regex/x-missing-rbrace on line ...
-Defining message LaTeX/regex/x-overflow on line ...
-Defining message LaTeX/regex/invalid-quantifier on line ...
-Defining message LaTeX/regex/missing-rbrack on line ...
-Defining message LaTeX/regex/missing-rparen on line ...
-Defining message LaTeX/regex/extra-rparen on line ...
-Defining message LaTeX/regex/bad-escape on line ...
-Defining message LaTeX/regex/range-missing-end on line ...
-Defining message LaTeX/regex/range-backwards on line ...
-Defining message LaTeX/regex/c-bad-mode on line ...
-Defining message LaTeX/regex/c-missing-rbrace on line ...
-Defining message LaTeX/regex/c-missing-rbrack on line ...
-Defining message LaTeX/regex/c-missing-category on line ...
-Defining message LaTeX/regex/c-trailing on line ...
-Defining message LaTeX/regex/u-missing-lbrace on line ...
-Defining message LaTeX/regex/u-missing-rbrace on line ...
-Defining message LaTeX/regex/posix-unsupported on line ...
-Defining message LaTeX/regex/posix-unknown on line ...
-Defining message LaTeX/regex/posix-missing-close on line ...
-Defining message LaTeX/regex/result-unbalanced on line ...
-Defining message LaTeX/regex/unknown-option on line ...
-Defining message LaTeX/regex/special-group-unknown on line ...
-Defining message LaTeX/regex/replacement-c on line ...
-Defining message LaTeX/regex/replacement-u on line ...
-Defining message LaTeX/regex/replacement-g on line ...
-Defining message LaTeX/regex/replacement-catcode-end on line ...
-Defining message LaTeX/regex/replacement-catcode-in-cs on line ...
-Defining message LaTeX/regex/replacement-null-space on line ...
-Defining message LaTeX/regex/replacement-missing-rbrace on line ...
-Defining message LaTeX/regex/replacement-missing-rparen on line ...
+Defining message LaTeX/kernel/trailing-backslash on line ...
+Defining message LaTeX/kernel/x-missing-rbrace on line ...
+Defining message LaTeX/kernel/x-overflow on line ...
+Defining message LaTeX/kernel/invalid-quantifier on line ...
+Defining message LaTeX/kernel/missing-rbrack on line ...
+Defining message LaTeX/kernel/missing-rparen on line ...
+Defining message LaTeX/kernel/extra-rparen on line ...
+Defining message LaTeX/kernel/bad-escape on line ...
+Defining message LaTeX/kernel/range-missing-end on line ...
+Defining message LaTeX/kernel/range-backwards on line ...
+Defining message LaTeX/kernel/c-bad-mode on line ...
+Defining message LaTeX/kernel/c-missing-rbrace on line ...
+Defining message LaTeX/kernel/c-missing-rbrack on line ...
+Defining message LaTeX/kernel/c-missing-category on line ...
+Defining message LaTeX/kernel/c-trailing on line ...
+Defining message LaTeX/kernel/u-missing-lbrace on line ...
+Defining message LaTeX/kernel/u-missing-rbrace on line ...
+Defining message LaTeX/kernel/posix-unsupported on line ...
+Defining message LaTeX/kernel/posix-unknown on line ...
+Defining message LaTeX/kernel/posix-missing-close on line ...
+Defining message LaTeX/kernel/result-unbalanced on line ...
+Defining message LaTeX/kernel/unknown-option on line ...
+Defining message LaTeX/kernel/special-group-unknown on line ...
+Defining message LaTeX/kernel/replacement-c on line ...
+Defining message LaTeX/kernel/replacement-u on line ...
+Defining message LaTeX/kernel/replacement-g on line ...
+Defining message LaTeX/kernel/replacement-catcode-end on line ...
+Defining message LaTeX/kernel/replacement-catcode-in-cs on line ...
+Defining message LaTeX/kernel/replacement-null-space on line ...
+Defining message LaTeX/kernel/replacement-missing-rbrace on line ...
+Defining message LaTeX/kernel/replacement-missing-rparen on line ...
 Defining \__regex_msg_repeated:nnN on line ...
 Defining \box_new:N on line ...
 Defining \box_new:c on line ...

Modified: trunk/l3kernel/testfiles/m3expl001.tlg
===================================================================
--- trunk/l3kernel/testfiles/m3expl001.tlg	2017-06-25 20:27:28 UTC (rev 7307)
+++ trunk/l3kernel/testfiles/m3expl001.tlg	2017-06-25 21:25:21 UTC (rev 7308)
@@ -4371,11 +4371,11 @@
 Defining \__sort_error: on line ...
 Defining \__sort_disable_toksdef: on line ...
 Defining \__sort_disabled_toksdef:n on line ...
-Defining message LaTeX/sort/toksdef on line ...
+Defining message LaTeX/kernel/toksdef on line ...
 Defining \__sort_too_long_error:NNw on line ...
-Defining message LaTeX/sort/too-large on line ...
-Defining message LaTeX/sort/return-none on line ...
-Defining message LaTeX/sort/return-two on line ...
+Defining message LaTeX/kernel/too-large on line ...
+Defining message LaTeX/kernel/return-none on line ...
+Defining message LaTeX/kernel/return-two on line ...
 Defining \sort_ordered: on line ...
 Defining \sort_reversed: on line ...
 Defining \l__tl_build_start_index_int on line ...
@@ -4908,37 +4908,37 @@
 Defining \__regex_replace_once:nnN on line ...
 Defining \__regex_replace_all:nnN on line ...
 Defining \__regex_group_end_replace:N on line ...
-Defining message LaTeX/regex/trailing-backslash on line ...
-Defining message LaTeX/regex/x-missing-rbrace on line ...
-Defining message LaTeX/regex/x-overflow on line ...
-Defining message LaTeX/regex/invalid-quantifier on line ...
-Defining message LaTeX/regex/missing-rbrack on line ...
-Defining message LaTeX/regex/missing-rparen on line ...
-Defining message LaTeX/regex/extra-rparen on line ...
-Defining message LaTeX/regex/bad-escape on line ...
-Defining message LaTeX/regex/range-missing-end on line ...
-Defining message LaTeX/regex/range-backwards on line ...
-Defining message LaTeX/regex/c-bad-mode on line ...
-Defining message LaTeX/regex/c-missing-rbrace on line ...
-Defining message LaTeX/regex/c-missing-rbrack on line ...
-Defining message LaTeX/regex/c-missing-category on line ...
-Defining message LaTeX/regex/c-trailing on line ...
-Defining message LaTeX/regex/u-missing-lbrace on line ...
-Defining message LaTeX/regex/u-missing-rbrace on line ...
-Defining message LaTeX/regex/posix-unsupported on line ...
-Defining message LaTeX/regex/posix-unknown on line ...
-Defining message LaTeX/regex/posix-missing-close on line ...
-Defining message LaTeX/regex/result-unbalanced on line ...
-Defining message LaTeX/regex/unknown-option on line ...
-Defining message LaTeX/regex/special-group-unknown on line ...
-Defining message LaTeX/regex/replacement-c on line ...
-Defining message LaTeX/regex/replacement-u on line ...
-Defining message LaTeX/regex/replacement-g on line ...
-Defining message LaTeX/regex/replacement-catcode-end on line ...
-Defining message LaTeX/regex/replacement-catcode-in-cs on line ...
-Defining message LaTeX/regex/replacement-null-space on line ...
-Defining message LaTeX/regex/replacement-missing-rbrace on line ...
-Defining message LaTeX/regex/replacement-missing-rparen on line ...
+Defining message LaTeX/kernel/trailing-backslash on line ...
+Defining message LaTeX/kernel/x-missing-rbrace on line ...
+Defining message LaTeX/kernel/x-overflow on line ...
+Defining message LaTeX/kernel/invalid-quantifier on line ...
+Defining message LaTeX/kernel/missing-rbrack on line ...
+Defining message LaTeX/kernel/missing-rparen on line ...
+Defining message LaTeX/kernel/extra-rparen on line ...
+Defining message LaTeX/kernel/bad-escape on line ...
+Defining message LaTeX/kernel/range-missing-end on line ...
+Defining message LaTeX/kernel/range-backwards on line ...
+Defining message LaTeX/kernel/c-bad-mode on line ...
+Defining message LaTeX/kernel/c-missing-rbrace on line ...
+Defining message LaTeX/kernel/c-missing-rbrack on line ...
+Defining message LaTeX/kernel/c-missing-category on line ...
+Defining message LaTeX/kernel/c-trailing on line ...
+Defining message LaTeX/kernel/u-missing-lbrace on line ...
+Defining message LaTeX/kernel/u-missing-rbrace on line ...
+Defining message LaTeX/kernel/posix-unsupported on line ...
+Defining message LaTeX/kernel/posix-unknown on line ...
+Defining message LaTeX/kernel/posix-missing-close on line ...
+Defining message LaTeX/kernel/result-unbalanced on line ...
+Defining message LaTeX/kernel/unknown-option on line ...
+Defining message LaTeX/kernel/special-group-unknown on line ...
+Defining message LaTeX/kernel/replacement-c on line ...
+Defining message LaTeX/kernel/replacement-u on line ...
+Defining message LaTeX/kernel/replacement-g on line ...
+Defining message LaTeX/kernel/replacement-catcode-end on line ...
+Defining message LaTeX/kernel/replacement-catcode-in-cs on line ...
+Defining message LaTeX/kernel/replacement-null-space on line ...
+Defining message LaTeX/kernel/replacement-missing-rbrace on line ...
+Defining message LaTeX/kernel/replacement-missing-rparen on line ...
 Defining \__regex_msg_repeated:nnN on line ...
 Defining \box_new:N on line ...
 Defining \box_new:c on line ...

Modified: trunk/l3kernel/testfiles/m3expl001.uptex.tlg
===================================================================
--- trunk/l3kernel/testfiles/m3expl001.uptex.tlg	2017-06-25 20:27:28 UTC (rev 7307)
+++ trunk/l3kernel/testfiles/m3expl001.uptex.tlg	2017-06-25 21:25:21 UTC (rev 7308)
@@ -4371,11 +4371,11 @@
 Defining \__sort_error: on line ...
 Defining \__sort_disable_toksdef: on line ...
 Defining \__sort_disabled_toksdef:n on line ...
-Defining message LaTeX/sort/toksdef on line ...
+Defining message LaTeX/kernel/toksdef on line ...
 Defining \__sort_too_long_error:NNw on line ...
-Defining message LaTeX/sort/too-large on line ...
-Defining message LaTeX/sort/return-none on line ...
-Defining message LaTeX/sort/return-two on line ...
+Defining message LaTeX/kernel/too-large on line ...
+Defining message LaTeX/kernel/return-none on line ...
+Defining message LaTeX/kernel/return-two on line ...
 Defining \sort_ordered: on line ...
 Defining \sort_reversed: on line ...
 Defining \l__tl_build_start_index_int on line ...
@@ -4906,37 +4906,37 @@
 Defining \__regex_replace_once:nnN on line ...
 Defining \__regex_replace_all:nnN on line ...
 Defining \__regex_group_end_replace:N on line ...
-Defining message LaTeX/regex/trailing-backslash on line ...
-Defining message LaTeX/regex/x-missing-rbrace on line ...
-Defining message LaTeX/regex/x-overflow on line ...
-Defining message LaTeX/regex/invalid-quantifier on line ...
-Defining message LaTeX/regex/missing-rbrack on line ...
-Defining message LaTeX/regex/missing-rparen on line ...
-Defining message LaTeX/regex/extra-rparen on line ...
-Defining message LaTeX/regex/bad-escape on line ...
-Defining message LaTeX/regex/range-missing-end on line ...
-Defining message LaTeX/regex/range-backwards on line ...
-Defining message LaTeX/regex/c-bad-mode on line ...
-Defining message LaTeX/regex/c-missing-rbrace on line ...
-Defining message LaTeX/regex/c-missing-rbrack on line ...
-Defining message LaTeX/regex/c-missing-category on line ...
-Defining message LaTeX/regex/c-trailing on line ...
-Defining message LaTeX/regex/u-missing-lbrace on line ...
-Defining message LaTeX/regex/u-missing-rbrace on line ...
-Defining message LaTeX/regex/posix-unsupported on line ...
-Defining message LaTeX/regex/posix-unknown on line ...
-Defining message LaTeX/regex/posix-missing-close on line ...
-Defining message LaTeX/regex/result-unbalanced on line ...
-Defining message LaTeX/regex/unknown-option on line ...
-Defining message LaTeX/regex/special-group-unknown on line ...
-Defining message LaTeX/regex/replacement-c on line ...
-Defining message LaTeX/regex/replacement-u on line ...
-Defining message LaTeX/regex/replacement-g on line ...
-Defining message LaTeX/regex/replacement-catcode-end on line ...
-Defining message LaTeX/regex/replacement-catcode-in-cs on line ...
-Defining message LaTeX/regex/replacement-null-space on line ...
-Defining message LaTeX/regex/replacement-missing-rbrace on line ...
-Defining message LaTeX/regex/replacement-missing-rparen on line ...
+Defining message LaTeX/kernel/trailing-backslash on line ...
+Defining message LaTeX/kernel/x-missing-rbrace on line ...
+Defining message LaTeX/kernel/x-overflow on line ...
+Defining message LaTeX/kernel/invalid-quantifier on line ...
+Defining message LaTeX/kernel/missing-rbrack on line ...
+Defining message LaTeX/kernel/missing-rparen on line ...
+Defining message LaTeX/kernel/extra-rparen on line ...
+Defining message LaTeX/kernel/bad-escape on line ...
+Defining message LaTeX/kernel/range-missing-end on line ...
+Defining message LaTeX/kernel/range-backwards on line ...
+Defining message LaTeX/kernel/c-bad-mode on line ...
+Defining message LaTeX/kernel/c-missing-rbrace on line ...
+Defining message LaTeX/kernel/c-missing-rbrack on line ...
+Defining message LaTeX/kernel/c-missing-category on line ...
+Defining message LaTeX/kernel/c-trailing on line ...
+Defining message LaTeX/kernel/u-missing-lbrace on line ...
+Defining message LaTeX/kernel/u-missing-rbrace on line ...
+Defining message LaTeX/kernel/posix-unsupported on line ...
+Defining message LaTeX/kernel/posix-unknown on line ...
+Defining message LaTeX/kernel/posix-missing-close on line ...
+Defining message LaTeX/kernel/result-unbalanced on line ...
+Defining message LaTeX/kernel/unknown-option on line ...
+Defining message LaTeX/kernel/special-group-unknown on line ...
+Defining message LaTeX/kernel/replacement-c on line ...
+Defining message LaTeX/kernel/replacement-u on line ...
+Defining message LaTeX/kernel/replacement-g on line ...
+Defining message LaTeX/kernel/replacement-catcode-end on line ...
+Defining message LaTeX/kernel/replacement-catcode-in-cs on line ...
+Defining message LaTeX/kernel/replacement-null-space on line ...
+Defining message LaTeX/kernel/replacement-missing-rbrace on line ...
+Defining message LaTeX/kernel/replacement-missing-rparen on line ...
 Defining \__regex_msg_repeated:nnN on line ...
 Defining \box_new:N on line ...
 Defining \box_new:c on line ...

Modified: trunk/l3kernel/testfiles/m3expl001.xetex.tlg
===================================================================
--- trunk/l3kernel/testfiles/m3expl001.xetex.tlg	2017-06-25 20:27:28 UTC (rev 7307)
+++ trunk/l3kernel/testfiles/m3expl001.xetex.tlg	2017-06-25 21:25:21 UTC (rev 7308)
@@ -4361,11 +4361,11 @@
 Defining \__sort_error: on line ...
 Defining \__sort_disable_toksdef: on line ...
 Defining \__sort_disabled_toksdef:n on line ...
-Defining message LaTeX/sort/toksdef on line ...
+Defining message LaTeX/kernel/toksdef on line ...
 Defining \__sort_too_long_error:NNw on line ...
-Defining message LaTeX/sort/too-large on line ...
-Defining message LaTeX/sort/return-none on line ...
-Defining message LaTeX/sort/return-two on line ...
+Defining message LaTeX/kernel/too-large on line ...
+Defining message LaTeX/kernel/return-none on line ...
+Defining message LaTeX/kernel/return-two on line ...
 Defining \sort_ordered: on line ...
 Defining \sort_reversed: on line ...
 Defining \l__tl_build_start_index_int on line ...
@@ -4896,37 +4896,37 @@
 Defining \__regex_replace_once:nnN on line ...
 Defining \__regex_replace_all:nnN on line ...
 Defining \__regex_group_end_replace:N on line ...
-Defining message LaTeX/regex/trailing-backslash on line ...
-Defining message LaTeX/regex/x-missing-rbrace on line ...
-Defining message LaTeX/regex/x-overflow on line ...
-Defining message LaTeX/regex/invalid-quantifier on line ...
-Defining message LaTeX/regex/missing-rbrack on line ...
-Defining message LaTeX/regex/missing-rparen on line ...
-Defining message LaTeX/regex/extra-rparen on line ...
-Defining message LaTeX/regex/bad-escape on line ...
-Defining message LaTeX/regex/range-missing-end on line ...
-Defining message LaTeX/regex/range-backwards on line ...
-Defining message LaTeX/regex/c-bad-mode on line ...
-Defining message LaTeX/regex/c-missing-rbrace on line ...
-Defining message LaTeX/regex/c-missing-rbrack on line ...
-Defining message LaTeX/regex/c-missing-category on line ...
-Defining message LaTeX/regex/c-trailing on line ...
-Defining message LaTeX/regex/u-missing-lbrace on line ...
-Defining message LaTeX/regex/u-missing-rbrace on line ...
-Defining message LaTeX/regex/posix-unsupported on line ...
-Defining message LaTeX/regex/posix-unknown on line ...
-Defining message LaTeX/regex/posix-missing-close on line ...
-Defining message LaTeX/regex/result-unbalanced on line ...
-Defining message LaTeX/regex/unknown-option on line ...
-Defining message LaTeX/regex/special-group-unknown on line ...
-Defining message LaTeX/regex/replacement-c on line ...
-Defining message LaTeX/regex/replacement-u on line ...
-Defining message LaTeX/regex/replacement-g on line ...
-Defining message LaTeX/regex/replacement-catcode-end on line ...
-Defining message LaTeX/regex/replacement-catcode-in-cs on line ...
-Defining message LaTeX/regex/replacement-null-space on line ...
-Defining message LaTeX/regex/replacement-missing-rbrace on line ...
-Defining message LaTeX/regex/replacement-missing-rparen on line ...
+Defining message LaTeX/kernel/trailing-backslash on line ...
+Defining message LaTeX/kernel/x-missing-rbrace on line ...
+Defining message LaTeX/kernel/x-overflow on line ...
+Defining message LaTeX/kernel/invalid-quantifier on line ...
+Defining message LaTeX/kernel/missing-rbrack on line ...
+Defining message LaTeX/kernel/missing-rparen on line ...
+Defining message LaTeX/kernel/extra-rparen on line ...
+Defining message LaTeX/kernel/bad-escape on line ...
+Defining message LaTeX/kernel/range-missing-end on line ...
+Defining message LaTeX/kernel/range-backwards on line ...
+Defining message LaTeX/kernel/c-bad-mode on line ...
+Defining message LaTeX/kernel/c-missing-rbrace on line ...
+Defining message LaTeX/kernel/c-missing-rbrack on line ...
+Defining message LaTeX/kernel/c-missing-category on line ...
+Defining message LaTeX/kernel/c-trailing on line ...
+Defining message LaTeX/kernel/u-missing-lbrace on line ...
+Defining message LaTeX/kernel/u-missing-rbrace on line ...
+Defining message LaTeX/kernel/posix-unsupported on line ...
+Defining message LaTeX/kernel/posix-unknown on line ...
+Defining message LaTeX/kernel/posix-missing-close on line ...
+Defining message LaTeX/kernel/result-unbalanced on line ...
+Defining message LaTeX/kernel/unknown-option on line ...
+Defining message LaTeX/kernel/special-group-unknown on line ...
+Defining message LaTeX/kernel/replacement-c on line ...
+Defining message LaTeX/kernel/replacement-u on line ...
+Defining message LaTeX/kernel/replacement-g on line ...
+Defining message LaTeX/kernel/replacement-catcode-end on line ...
+Defining message LaTeX/kernel/replacement-catcode-in-cs on line ...
+Defining message LaTeX/kernel/replacement-null-space on line ...
+Defining message LaTeX/kernel/replacement-missing-rbrace on line ...
+Defining message LaTeX/kernel/replacement-missing-rparen on line ...
 Defining \__regex_msg_repeated:nnN on line ...
 Defining \box_new:N on line ...
 Defining \box_new:c on line ...

Modified: trunk/l3kernel/testfiles/m3expl003.luatex.tlg
===================================================================
--- trunk/l3kernel/testfiles/m3expl003.luatex.tlg	2017-06-25 20:27:28 UTC (rev 7307)
+++ trunk/l3kernel/testfiles/m3expl003.luatex.tlg	2017-06-25 21:25:21 UTC (rev 7308)
@@ -4384,11 +4384,11 @@
 Defining \__sort_error: on line ...
 Defining \__sort_disable_toksdef: on line ...
 Defining \__sort_disabled_toksdef:n on line ...
-Defining message LaTeX/sort/toksdef on line ...
+Defining message LaTeX/kernel/toksdef on line ...
 Defining \__sort_too_long_error:NNw on line ...
-Defining message LaTeX/sort/too-large on line ...
-Defining message LaTeX/sort/return-none on line ...
-Defining message LaTeX/sort/return-two on line ...
+Defining message LaTeX/kernel/too-large on line ...
+Defining message LaTeX/kernel/return-none on line ...
+Defining message LaTeX/kernel/return-two on line ...
 Defining \sort_ordered: on line ...
 Defining \sort_reversed: on line ...
 Defining \l__tl_build_start_index_int on line ...
@@ -4919,37 +4919,37 @@
 Defining \__regex_replace_once:nnN on line ...
 Defining \__regex_replace_all:nnN on line ...
 Defining \__regex_group_end_replace:N on line ...
-Defining message LaTeX/regex/trailing-backslash on line ...
-Defining message LaTeX/regex/x-missing-rbrace on line ...
-Defining message LaTeX/regex/x-overflow on line ...
-Defining message LaTeX/regex/invalid-quantifier on line ...
-Defining message LaTeX/regex/missing-rbrack on line ...
-Defining message LaTeX/regex/missing-rparen on line ...
-Defining message LaTeX/regex/extra-rparen on line ...
-Defining message LaTeX/regex/bad-escape on line ...
-Defining message LaTeX/regex/range-missing-end on line ...
-Defining message LaTeX/regex/range-backwards on line ...
-Defining message LaTeX/regex/c-bad-mode on line ...
-Defining message LaTeX/regex/c-missing-rbrace on line ...
-Defining message LaTeX/regex/c-missing-rbrack on line ...
-Defining message LaTeX/regex/c-missing-category on line ...
-Defining message LaTeX/regex/c-trailing on line ...
-Defining message LaTeX/regex/u-missing-lbrace on line ...
-Defining message LaTeX/regex/u-missing-rbrace on line ...
-Defining message LaTeX/regex/posix-unsupported on line ...
-Defining message LaTeX/regex/posix-unknown on line ...
-Defining message LaTeX/regex/posix-missing-close on line ...
-Defining message LaTeX/regex/result-unbalanced on line ...
-Defining message LaTeX/regex/unknown-option on line ...
-Defining message LaTeX/regex/special-group-unknown on line ...
-Defining message LaTeX/regex/replacement-c on line ...
-Defining message LaTeX/regex/replacement-u on line ...
-Defining message LaTeX/regex/replacement-g on line ...
-Defining message LaTeX/regex/replacement-catcode-end on line ...
-Defining message LaTeX/regex/replacement-catcode-in-cs on line ...
-Defining message LaTeX/regex/replacement-null-space on line ...
-Defining message LaTeX/regex/replacement-missing-rbrace on line ...
-Defining message LaTeX/regex/replacement-missing-rparen on line ...
+Defining message LaTeX/kernel/trailing-backslash on line ...
+Defining message LaTeX/kernel/x-missing-rbrace on line ...
+Defining message LaTeX/kernel/x-overflow on line ...
+Defining message LaTeX/kernel/invalid-quantifier on line ...
+Defining message LaTeX/kernel/missing-rbrack on line ...
+Defining message LaTeX/kernel/missing-rparen on line ...
+Defining message LaTeX/kernel/extra-rparen on line ...
+Defining message LaTeX/kernel/bad-escape on line ...
+Defining message LaTeX/kernel/range-missing-end on line ...
+Defining message LaTeX/kernel/range-backwards on line ...
+Defining message LaTeX/kernel/c-bad-mode on line ...
+Defining message LaTeX/kernel/c-missing-rbrace on line ...
+Defining message LaTeX/kernel/c-missing-rbrack on line ...
+Defining message LaTeX/kernel/c-missing-category on line ...
+Defining message LaTeX/kernel/c-trailing on line ...
+Defining message LaTeX/kernel/u-missing-lbrace on line ...
+Defining message LaTeX/kernel/u-missing-rbrace on line ...
+Defining message LaTeX/kernel/posix-unsupported on line ...
+Defining message LaTeX/kernel/posix-unknown on line ...
+Defining message LaTeX/kernel/posix-missing-close on line ...
+Defining message LaTeX/kernel/result-unbalanced on line ...
+Defining message LaTeX/kernel/unknown-option on line ...
+Defining message LaTeX/kernel/special-group-unknown on line ...
+Defining message LaTeX/kernel/replacement-c on line ...
+Defining message LaTeX/kernel/replacement-u on line ...
+Defining message LaTeX/kernel/replacement-g on line ...
+Defining message LaTeX/kernel/replacement-catcode-end on line ...
+Defining message LaTeX/kernel/replacement-catcode-in-cs on line ...
+Defining message LaTeX/kernel/replacement-null-space on line ...
+Defining message LaTeX/kernel/replacement-missing-rbrace on line ...
+Defining message LaTeX/kernel/replacement-missing-rparen on line ...
 Defining \__regex_msg_repeated:nnN on line ...
 Defining \box_new:N on line ...
 Defining \box_new:c on line ...

Modified: trunk/l3kernel/testfiles/m3expl003.ptex.tlg
===================================================================
--- trunk/l3kernel/testfiles/m3expl003.ptex.tlg	2017-06-25 20:27:28 UTC (rev 7307)
+++ trunk/l3kernel/testfiles/m3expl003.ptex.tlg	2017-06-25 21:25:21 UTC (rev 7308)
@@ -4372,11 +4372,11 @@
 Defining \__sort_error: on line ...
 Defining \__sort_disable_toksdef: on line ...
 Defining \__sort_disabled_toksdef:n on line ...
-Defining message LaTeX/sort/toksdef on line ...
+Defining message LaTeX/kernel/toksdef on line ...
 Defining \__sort_too_long_error:NNw on line ...
-Defining message LaTeX/sort/too-large on line ...
-Defining message LaTeX/sort/return-none on line ...
-Defining message LaTeX/sort/return-two on line ...
+Defining message LaTeX/kernel/too-large on line ...
+Defining message LaTeX/kernel/return-none on line ...
+Defining message LaTeX/kernel/return-two on line ...
 Defining \sort_ordered: on line ...
 Defining \sort_reversed: on line ...
 Defining \l__tl_build_start_index_int on line ...
@@ -4909,37 +4909,37 @@
 Defining \__regex_replace_once:nnN on line ...
 Defining \__regex_replace_all:nnN on line ...
 Defining \__regex_group_end_replace:N on line ...
-Defining message LaTeX/regex/trailing-backslash on line ...
-Defining message LaTeX/regex/x-missing-rbrace on line ...
-Defining message LaTeX/regex/x-overflow on line ...
-Defining message LaTeX/regex/invalid-quantifier on line ...
-Defining message LaTeX/regex/missing-rbrack on line ...
-Defining message LaTeX/regex/missing-rparen on line ...
-Defining message LaTeX/regex/extra-rparen on line ...
-Defining message LaTeX/regex/bad-escape on line ...
-Defining message LaTeX/regex/range-missing-end on line ...
-Defining message LaTeX/regex/range-backwards on line ...
-Defining message LaTeX/regex/c-bad-mode on line ...
-Defining message LaTeX/regex/c-missing-rbrace on line ...
-Defining message LaTeX/regex/c-missing-rbrack on line ...
-Defining message LaTeX/regex/c-missing-category on line ...
-Defining message LaTeX/regex/c-trailing on line ...
-Defining message LaTeX/regex/u-missing-lbrace on line ...
-Defining message LaTeX/regex/u-missing-rbrace on line ...
-Defining message LaTeX/regex/posix-unsupported on line ...
-Defining message LaTeX/regex/posix-unknown on line ...
-Defining message LaTeX/regex/posix-missing-close on line ...
-Defining message LaTeX/regex/result-unbalanced on line ...
-Defining message LaTeX/regex/unknown-option on line ...
-Defining message LaTeX/regex/special-group-unknown on line ...
-Defining message LaTeX/regex/replacement-c on line ...
-Defining message LaTeX/regex/replacement-u on line ...
-Defining message LaTeX/regex/replacement-g on line ...
-Defining message LaTeX/regex/replacement-catcode-end on line ...
-Defining message LaTeX/regex/replacement-catcode-in-cs on line ...
-Defining message LaTeX/regex/replacement-null-space on line ...
-Defining message LaTeX/regex/replacement-missing-rbrace on line ...
-Defining message LaTeX/regex/replacement-missing-rparen on line ...
+Defining message LaTeX/kernel/trailing-backslash on line ...
+Defining message LaTeX/kernel/x-missing-rbrace on line ...
+Defining message LaTeX/kernel/x-overflow on line ...
+Defining message LaTeX/kernel/invalid-quantifier on line ...
+Defining message LaTeX/kernel/missing-rbrack on line ...
+Defining message LaTeX/kernel/missing-rparen on line ...
+Defining message LaTeX/kernel/extra-rparen on line ...
+Defining message LaTeX/kernel/bad-escape on line ...
+Defining message LaTeX/kernel/range-missing-end on line ...
+Defining message LaTeX/kernel/range-backwards on line ...
+Defining message LaTeX/kernel/c-bad-mode on line ...
+Defining message LaTeX/kernel/c-missing-rbrace on line ...
+Defining message LaTeX/kernel/c-missing-rbrack on line ...
+Defining message LaTeX/kernel/c-missing-category on line ...
+Defining message LaTeX/kernel/c-trailing on line ...
+Defining message LaTeX/kernel/u-missing-lbrace on line ...
+Defining message LaTeX/kernel/u-missing-rbrace on line ...
+Defining message LaTeX/kernel/posix-unsupported on line ...
+Defining message LaTeX/kernel/posix-unknown on line ...
+Defining message LaTeX/kernel/posix-missing-close on line ...
+Defining message LaTeX/kernel/result-unbalanced on line ...
+Defining message LaTeX/kernel/unknown-option on line ...
+Defining message LaTeX/kernel/special-group-unknown on line ...
+Defining message LaTeX/kernel/replacement-c on line ...
+Defining message LaTeX/kernel/replacement-u on line ...
+Defining message LaTeX/kernel/replacement-g on line ...
+Defining message LaTeX/kernel/replacement-catcode-end on line ...
+Defining message LaTeX/kernel/replacement-catcode-in-cs on line ...
+Defining message LaTeX/kernel/replacement-null-space on line ...
+Defining message LaTeX/kernel/replacement-missing-rbrace on line ...
+Defining message LaTeX/kernel/replacement-missing-rparen on line ...
 Defining \__regex_msg_repeated:nnN on line ...
 Defining \box_new:N on line ...
 Defining \box_new:c on line ...

Modified: trunk/l3kernel/testfiles/m3expl003.tlg
===================================================================
--- trunk/l3kernel/testfiles/m3expl003.tlg	2017-06-25 20:27:28 UTC (rev 7307)
+++ trunk/l3kernel/testfiles/m3expl003.tlg	2017-06-25 21:25:21 UTC (rev 7308)
@@ -4372,11 +4372,11 @@
 Defining \__sort_error: on line ...
 Defining \__sort_disable_toksdef: on line ...
 Defining \__sort_disabled_toksdef:n on line ...
-Defining message LaTeX/sort/toksdef on line ...
+Defining message LaTeX/kernel/toksdef on line ...
 Defining \__sort_too_long_error:NNw on line ...
-Defining message LaTeX/sort/too-large on line ...
-Defining message LaTeX/sort/return-none on line ...
-Defining message LaTeX/sort/return-two on line ...
+Defining message LaTeX/kernel/too-large on line ...
+Defining message LaTeX/kernel/return-none on line ...
+Defining message LaTeX/kernel/return-two on line ...
 Defining \sort_ordered: on line ...
 Defining \sort_reversed: on line ...
 Defining \l__tl_build_start_index_int on line ...
@@ -4909,37 +4909,37 @@
 Defining \__regex_replace_once:nnN on line ...
 Defining \__regex_replace_all:nnN on line ...
 Defining \__regex_group_end_replace:N on line ...
-Defining message LaTeX/regex/trailing-backslash on line ...
-Defining message LaTeX/regex/x-missing-rbrace on line ...
-Defining message LaTeX/regex/x-overflow on line ...
-Defining message LaTeX/regex/invalid-quantifier on line ...
-Defining message LaTeX/regex/missing-rbrack on line ...
-Defining message LaTeX/regex/missing-rparen on line ...
-Defining message LaTeX/regex/extra-rparen on line ...
-Defining message LaTeX/regex/bad-escape on line ...
-Defining message LaTeX/regex/range-missing-end on line ...
-Defining message LaTeX/regex/range-backwards on line ...
-Defining message LaTeX/regex/c-bad-mode on line ...
-Defining message LaTeX/regex/c-missing-rbrace on line ...
-Defining message LaTeX/regex/c-missing-rbrack on line ...
-Defining message LaTeX/regex/c-missing-category on line ...
-Defining message LaTeX/regex/c-trailing on line ...
-Defining message LaTeX/regex/u-missing-lbrace on line ...
-Defining message LaTeX/regex/u-missing-rbrace on line ...
-Defining message LaTeX/regex/posix-unsupported on line ...
-Defining message LaTeX/regex/posix-unknown on line ...
-Defining message LaTeX/regex/posix-missing-close on line ...
-Defining message LaTeX/regex/result-unbalanced on line ...
-Defining message LaTeX/regex/unknown-option on line ...
-Defining message LaTeX/regex/special-group-unknown on line ...
-Defining message LaTeX/regex/replacement-c on line ...
-Defining message LaTeX/regex/replacement-u on line ...
-Defining message LaTeX/regex/replacement-g on line ...
-Defining message LaTeX/regex/replacement-catcode-end on line ...
-Defining message LaTeX/regex/replacement-catcode-in-cs on line ...
-Defining message LaTeX/regex/replacement-null-space on line ...
-Defining message LaTeX/regex/replacement-missing-rbrace on line ...
-Defining message LaTeX/regex/replacement-missing-rparen on line ...
+Defining message LaTeX/kernel/trailing-backslash on line ...
+Defining message LaTeX/kernel/x-missing-rbrace on line ...
+Defining message LaTeX/kernel/x-overflow on line ...
+Defining message LaTeX/kernel/invalid-quantifier on line ...
+Defining message LaTeX/kernel/missing-rbrack on line ...
+Defining message LaTeX/kernel/missing-rparen on line ...
+Defining message LaTeX/kernel/extra-rparen on line ...
+Defining message LaTeX/kernel/bad-escape on line ...
+Defining message LaTeX/kernel/range-missing-end on line ...
+Defining message LaTeX/kernel/range-backwards on line ...
+Defining message LaTeX/kernel/c-bad-mode on line ...
+Defining message LaTeX/kernel/c-missing-rbrace on line ...
+Defining message LaTeX/kernel/c-missing-rbrack on line ...
+Defining message LaTeX/kernel/c-missing-category on line ...
+Defining message LaTeX/kernel/c-trailing on line ...
+Defining message LaTeX/kernel/u-missing-lbrace on line ...
+Defining message LaTeX/kernel/u-missing-rbrace on line ...
+Defining message LaTeX/kernel/posix-unsupported on line ...
+Defining message LaTeX/kernel/posix-unknown on line ...
+Defining message LaTeX/kernel/posix-missing-close on line ...
+Defining message LaTeX/kernel/result-unbalanced on line ...
+Defining message LaTeX/kernel/unknown-option on line ...
+Defining message LaTeX/kernel/special-group-unknown on line ...
+Defining message LaTeX/kernel/replacement-c on line ...
+Defining message LaTeX/kernel/replacement-u on line ...
+Defining message LaTeX/kernel/replacement-g on line ...
+Defining message LaTeX/kernel/replacement-catcode-end on line ...
+Defining message LaTeX/kernel/replacement-catcode-in-cs on line ...
+Defining message LaTeX/kernel/replacement-null-space on line ...
+Defining message LaTeX/kernel/replacement-missing-rbrace on line ...
+Defining message LaTeX/kernel/replacement-missing-rparen on line ...
 Defining \__regex_msg_repeated:nnN on line ...
 Defining \box_new:N on line ...
 Defining \box_new:c on line ...

Modified: trunk/l3kernel/testfiles/m3expl003.uptex.tlg
===================================================================
--- trunk/l3kernel/testfiles/m3expl003.uptex.tlg	2017-06-25 20:27:28 UTC (rev 7307)
+++ trunk/l3kernel/testfiles/m3expl003.uptex.tlg	2017-06-25 21:25:21 UTC (rev 7308)
@@ -4372,11 +4372,11 @@
 Defining \__sort_error: on line ...
 Defining \__sort_disable_toksdef: on line ...
 Defining \__sort_disabled_toksdef:n on line ...
-Defining message LaTeX/sort/toksdef on line ...
+Defining message LaTeX/kernel/toksdef on line ...
 Defining \__sort_too_long_error:NNw on line ...
-Defining message LaTeX/sort/too-large on line ...
-Defining message LaTeX/sort/return-none on line ...
-Defining message LaTeX/sort/return-two on line ...
+Defining message LaTeX/kernel/too-large on line ...
+Defining message LaTeX/kernel/return-none on line ...
+Defining message LaTeX/kernel/return-two on line ...
 Defining \sort_ordered: on line ...
 Defining \sort_reversed: on line ...
 Defining \l__tl_build_start_index_int on line ...
@@ -4907,37 +4907,37 @@
 Defining \__regex_replace_once:nnN on line ...
 Defining \__regex_replace_all:nnN on line ...
 Defining \__regex_group_end_replace:N on line ...
-Defining message LaTeX/regex/trailing-backslash on line ...
-Defining message LaTeX/regex/x-missing-rbrace on line ...
-Defining message LaTeX/regex/x-overflow on line ...
-Defining message LaTeX/regex/invalid-quantifier on line ...
-Defining message LaTeX/regex/missing-rbrack on line ...
-Defining message LaTeX/regex/missing-rparen on line ...
-Defining message LaTeX/regex/extra-rparen on line ...
-Defining message LaTeX/regex/bad-escape on line ...
-Defining message LaTeX/regex/range-missing-end on line ...
-Defining message LaTeX/regex/range-backwards on line ...
-Defining message LaTeX/regex/c-bad-mode on line ...
-Defining message LaTeX/regex/c-missing-rbrace on line ...
-Defining message LaTeX/regex/c-missing-rbrack on line ...
-Defining message LaTeX/regex/c-missing-category on line ...
-Defining message LaTeX/regex/c-trailing on line ...
-Defining message LaTeX/regex/u-missing-lbrace on line ...
-Defining message LaTeX/regex/u-missing-rbrace on line ...
-Defining message LaTeX/regex/posix-unsupported on line ...
-Defining message LaTeX/regex/posix-unknown on line ...
-Defining message LaTeX/regex/posix-missing-close on line ...
-Defining message LaTeX/regex/result-unbalanced on line ...
-Defining message LaTeX/regex/unknown-option on line ...
-Defining message LaTeX/regex/special-group-unknown on line ...
-Defining message LaTeX/regex/replacement-c on line ...
-Defining message LaTeX/regex/replacement-u on line ...
-Defining message LaTeX/regex/replacement-g on line ...
-Defining message LaTeX/regex/replacement-catcode-end on line ...
-Defining message LaTeX/regex/replacement-catcode-in-cs on line ...
-Defining message LaTeX/regex/replacement-null-space on line ...
-Defining message LaTeX/regex/replacement-missing-rbrace on line ...
-Defining message LaTeX/regex/replacement-missing-rparen on line ...
+Defining message LaTeX/kernel/trailing-backslash on line ...
+Defining message LaTeX/kernel/x-missing-rbrace on line ...
+Defining message LaTeX/kernel/x-overflow on line ...
+Defining message LaTeX/kernel/invalid-quantifier on line ...
+Defining message LaTeX/kernel/missing-rbrack on line ...
+Defining message LaTeX/kernel/missing-rparen on line ...
+Defining message LaTeX/kernel/extra-rparen on line ...
+Defining message LaTeX/kernel/bad-escape on line ...
+Defining message LaTeX/kernel/range-missing-end on line ...
+Defining message LaTeX/kernel/range-backwards on line ...
+Defining message LaTeX/kernel/c-bad-mode on line ...
+Defining message LaTeX/kernel/c-missing-rbrace on line ...
+Defining message LaTeX/kernel/c-missing-rbrack on line ...
+Defining message LaTeX/kernel/c-missing-category on line ...
+Defining message LaTeX/kernel/c-trailing on line ...
+Defining message LaTeX/kernel/u-missing-lbrace on line ...
+Defining message LaTeX/kernel/u-missing-rbrace on line ...
+Defining message LaTeX/kernel/posix-unsupported on line ...
+Defining message LaTeX/kernel/posix-unknown on line ...
+Defining message LaTeX/kernel/posix-missing-close on line ...
+Defining message LaTeX/kernel/result-unbalanced on line ...
+Defining message LaTeX/kernel/unknown-option on line ...
+Defining message LaTeX/kernel/special-group-unknown on line ...
+Defining message LaTeX/kernel/replacement-c on line ...
+Defining message LaTeX/kernel/replacement-u on line ...
+Defining message LaTeX/kernel/replacement-g on line ...
+Defining message LaTeX/kernel/replacement-catcode-end on line ...
+Defining message LaTeX/kernel/replacement-catcode-in-cs on line ...
+Defining message LaTeX/kernel/replacement-null-space on line ...
+Defining message LaTeX/kernel/replacement-missing-rbrace on line ...
+Defining message LaTeX/kernel/replacement-missing-rparen on line ...
 Defining \__regex_msg_repeated:nnN on line ...
 Defining \box_new:N on line ...
 Defining \box_new:c on line ...

Modified: trunk/l3kernel/testfiles/m3expl003.xetex.tlg
===================================================================
--- trunk/l3kernel/testfiles/m3expl003.xetex.tlg	2017-06-25 20:27:28 UTC (rev 7307)
+++ trunk/l3kernel/testfiles/m3expl003.xetex.tlg	2017-06-25 21:25:21 UTC (rev 7308)
@@ -4362,11 +4362,11 @@
 Defining \__sort_error: on line ...
 Defining \__sort_disable_toksdef: on line ...
 Defining \__sort_disabled_toksdef:n on line ...
-Defining message LaTeX/sort/toksdef on line ...
+Defining message LaTeX/kernel/toksdef on line ...
 Defining \__sort_too_long_error:NNw on line ...
-Defining message LaTeX/sort/too-large on line ...
-Defining message LaTeX/sort/return-none on line ...
-Defining message LaTeX/sort/return-two on line ...
+Defining message LaTeX/kernel/too-large on line ...
+Defining message LaTeX/kernel/return-none on line ...
+Defining message LaTeX/kernel/return-two on line ...
 Defining \sort_ordered: on line ...
 Defining \sort_reversed: on line ...
 Defining \l__tl_build_start_index_int on line ...
@@ -4897,37 +4897,37 @@
 Defining \__regex_replace_once:nnN on line ...
 Defining \__regex_replace_all:nnN on line ...
 Defining \__regex_group_end_replace:N on line ...
-Defining message LaTeX/regex/trailing-backslash on line ...
-Defining message LaTeX/regex/x-missing-rbrace on line ...
-Defining message LaTeX/regex/x-overflow on line ...
-Defining message LaTeX/regex/invalid-quantifier on line ...
-Defining message LaTeX/regex/missing-rbrack on line ...
-Defining message LaTeX/regex/missing-rparen on line ...
-Defining message LaTeX/regex/extra-rparen on line ...
-Defining message LaTeX/regex/bad-escape on line ...
-Defining message LaTeX/regex/range-missing-end on line ...
-Defining message LaTeX/regex/range-backwards on line ...
-Defining message LaTeX/regex/c-bad-mode on line ...
-Defining message LaTeX/regex/c-missing-rbrace on line ...
-Defining message LaTeX/regex/c-missing-rbrack on line ...
-Defining message LaTeX/regex/c-missing-category on line ...
-Defining message LaTeX/regex/c-trailing on line ...
-Defining message LaTeX/regex/u-missing-lbrace on line ...
-Defining message LaTeX/regex/u-missing-rbrace on line ...
-Defining message LaTeX/regex/posix-unsupported on line ...
-Defining message LaTeX/regex/posix-unknown on line ...
-Defining message LaTeX/regex/posix-missing-close on line ...
-Defining message LaTeX/regex/result-unbalanced on line ...
-Defining message LaTeX/regex/unknown-option on line ...
-Defining message LaTeX/regex/special-group-unknown on line ...
-Defining message LaTeX/regex/replacement-c on line ...
-Defining message LaTeX/regex/replacement-u on line ...
-Defining message LaTeX/regex/replacement-g on line ...
-Defining message LaTeX/regex/replacement-catcode-end on line ...
-Defining message LaTeX/regex/replacement-catcode-in-cs on line ...
-Defining message LaTeX/regex/replacement-null-space on line ...
-Defining message LaTeX/regex/replacement-missing-rbrace on line ...
-Defining message LaTeX/regex/replacement-missing-rparen on line ...
+Defining message LaTeX/kernel/trailing-backslash on line ...
+Defining message LaTeX/kernel/x-missing-rbrace on line ...
+Defining message LaTeX/kernel/x-overflow on line ...
+Defining message LaTeX/kernel/invalid-quantifier on line ...
+Defining message LaTeX/kernel/missing-rbrack on line ...
+Defining message LaTeX/kernel/missing-rparen on line ...
+Defining message LaTeX/kernel/extra-rparen on line ...
+Defining message LaTeX/kernel/bad-escape on line ...
+Defining message LaTeX/kernel/range-missing-end on line ...
+Defining message LaTeX/kernel/range-backwards on line ...
+Defining message LaTeX/kernel/c-bad-mode on line ...
+Defining message LaTeX/kernel/c-missing-rbrace on line ...
+Defining message LaTeX/kernel/c-missing-rbrack on line ...
+Defining message LaTeX/kernel/c-missing-category on line ...
+Defining message LaTeX/kernel/c-trailing on line ...
+Defining message LaTeX/kernel/u-missing-lbrace on line ...
+Defining message LaTeX/kernel/u-missing-rbrace on line ...
+Defining message LaTeX/kernel/posix-unsupported on line ...
+Defining message LaTeX/kernel/posix-unknown on line ...
+Defining message LaTeX/kernel/posix-missing-close on line ...
+Defining message LaTeX/kernel/result-unbalanced on line ...
+Defining message LaTeX/kernel/unknown-option on line ...
+Defining message LaTeX/kernel/special-group-unknown on line ...
+Defining message LaTeX/kernel/replacement-c on line ...
+Defining message LaTeX/kernel/replacement-u on line ...
+Defining message LaTeX/kernel/replacement-g on line ...
+Defining message LaTeX/kernel/replacement-catcode-end on line ...
+Defining message LaTeX/kernel/replacement-catcode-in-cs on line ...
+Defining message LaTeX/kernel/replacement-null-space on line ...
+Defining message LaTeX/kernel/replacement-missing-rbrace on line ...
+Defining message LaTeX/kernel/replacement-missing-rparen on line ...
 Defining \__regex_msg_repeated:nnN on line ...
 Defining \box_new:N on line ...
 Defining \box_new:c on line ...

Modified: trunk/l3kernel/testfiles/m3regex001.tlg
===================================================================
--- trunk/l3kernel/testfiles/m3regex001.tlg	2017-06-25 20:27:28 UTC (rev 7307)
+++ trunk/l3kernel/testfiles/m3regex001.tlg	2017-06-25 21:25:21 UTC (rev 7308)
@@ -95,7 +95,7 @@
 TEST 6: Special characters
 ============================================================
 *************************************************
-* LaTeX warning: "regex/invalid-quantifier"
+* LaTeX warning: "kernel/invalid-quantifier"
 * 
 * Braced quantifier '{' may not be followed by 'x'.
 *************************************************

Modified: trunk/l3kernel/testfiles/m3regex005.tlg
===================================================================
--- trunk/l3kernel/testfiles/m3regex005.tlg	2017-06-25 20:27:28 UTC (rev 7307)
+++ trunk/l3kernel/testfiles/m3regex005.tlg	2017-06-25 21:25:21 UTC (rev 7308)
@@ -68,7 +68,7 @@
 l. ...  }
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 !
-! LaTeX error: "regex/result-unbalanced"
+! LaTeX error: "kernel/result-unbalanced"
 ! 
 ! Missing brace inserted when splitting or extracting submatches.
 ! 
@@ -145,7 +145,7 @@
 ============================================================
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 !
-! LaTeX error: "regex/result-unbalanced"
+! LaTeX error: "kernel/result-unbalanced"
 ! 
 ! Missing brace inserted when replacing.
 ! 
@@ -161,7 +161,7 @@
 |...............................................
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 !
-! LaTeX error: "regex/result-unbalanced"
+! LaTeX error: "kernel/result-unbalanced"
 ! 
 ! Missing brace inserted when replacing.
 ! 
@@ -194,7 +194,7 @@
 ============================================================
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 !
-! LaTeX error: "regex/replacement-catcode-in-cs"
+! LaTeX error: "kernel/replacement-catcode-in-cs"
 ! 
 ! Category code '\cP' ignored inside '\c{...}' in a replacement text.
 ! 
@@ -264,7 +264,7 @@
 {d} {a} {d} {ace} {a} {e} {d} {b} {d} {ce} {b} {e} 
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 !
-! LaTeX error: "regex/bad-escape"
+! LaTeX error: "kernel/bad-escape"
 ! 
 ! Invalid escape '\K' within a control sequence.
 ! 
@@ -286,7 +286,7 @@
 {c3} {bc} 
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 !
-! LaTeX error: "regex/replacement-catcode-in-cs"
+! LaTeX error: "kernel/replacement-catcode-in-cs"
 ! 
 ! Category code '\cB' ignored inside '\c{...}' in a replacement text.
 ! 
@@ -334,7 +334,7 @@
 |\{}|
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 !
-! LaTeX error: "regex/replacement-missing-rbrace"
+! LaTeX error: "kernel/replacement-missing-rbrace"
 ! 
 ! Missing right brace inserted in replacement text.
 ! 
@@ -388,7 +388,7 @@
 l. ...  }
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 !
-! LaTeX error: "regex/replacement-missing-rparen"
+! LaTeX error: "kernel/replacement-missing-rparen"
 ! 
 ! Missing right parenthesis inserted in replacement text.
 ! 
@@ -403,7 +403,7 @@
 > \l_tmpb_tl=.
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 !
-! LaTeX error: "regex/replacement-missing-rparen"
+! LaTeX error: "kernel/replacement-missing-rparen"
 ! 
 ! Missing right parenthesis inserted in replacement text.
 ! 

Modified: trunk/l3kernel/testfiles/m3regex006.luatex.tlg
===================================================================
--- trunk/l3kernel/testfiles/m3regex006.luatex.tlg	2017-06-25 20:27:28 UTC (rev 7307)
+++ trunk/l3kernel/testfiles/m3regex006.luatex.tlg	2017-06-25 21:25:21 UTC (rev 7308)
@@ -66,7 +66,7 @@
 |[] [] [] [] [] [] [] [] [] |
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 !
-! LaTeX error: "regex/result-unbalanced"
+! LaTeX error: "kernel/result-unbalanced"
 ! 
 ! Missing brace inserted when splitting or extracting submatches.
 ! 
@@ -84,7 +84,7 @@
 |[a] [b] [{}] [c] [{}] [a] [d] [e] |
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 !
-! LaTeX error: "regex/result-unbalanced"
+! LaTeX error: "kernel/result-unbalanced"
 ! 
 ! Missing brace inserted when splitting or extracting submatches.
 ! 
@@ -102,7 +102,7 @@
 |[a] [b] [{}] [c] [{}] [a] [d] [e] |
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 !
-! LaTeX error: "regex/result-unbalanced"
+! LaTeX error: "kernel/result-unbalanced"
 ! 
 ! Missing brace inserted when splitting or extracting submatches.
 ! 
@@ -119,7 +119,7 @@
 |[a] [b] [{}] [c] [{}] [a] [d] [e] |
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 !
-! LaTeX error: "regex/result-unbalanced"
+! LaTeX error: "kernel/result-unbalanced"
 ! 
 ! Missing brace inserted when splitting or extracting submatches.
 ! 
@@ -148,7 +148,7 @@
 |[] [] [] [] [] [] [] [] [] |
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 !
-! LaTeX error: "regex/result-unbalanced"
+! LaTeX error: "kernel/result-unbalanced"
 ! 
 ! Missing brace inserted when splitting or extracting submatches.
 ! 
@@ -166,7 +166,7 @@
 |[a] [b] [{}] [c] [{}] [a] [d] [e] |
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 !
-! LaTeX error: "regex/result-unbalanced"
+! LaTeX error: "kernel/result-unbalanced"
 ! 
 ! Missing brace inserted when splitting or extracting submatches.
 ! 
@@ -184,7 +184,7 @@
 |[a] [b] [{}] [c] [{}] [a] [d] [e] |
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 !
-! LaTeX error: "regex/result-unbalanced"
+! LaTeX error: "kernel/result-unbalanced"
 ! 
 ! Missing brace inserted when splitting or extracting submatches.
 ! 
@@ -201,7 +201,7 @@
 |[a] [b] [{}] [c] [{}] [a] [d] [e] |
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 !
-! LaTeX error: "regex/result-unbalanced"
+! LaTeX error: "kernel/result-unbalanced"
 ! 
 ! Missing brace inserted when splitting or extracting submatches.
 ! 
@@ -338,7 +338,7 @@
 |[c] [d] [e] |
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 !
-! LaTeX error: "regex/result-unbalanced"
+! LaTeX error: "kernel/result-unbalanced"
 ! 
 ! Missing brace inserted when splitting or extracting submatches.
 ! 
@@ -356,7 +356,7 @@
 |[ab{}] [{}a] [] [] |
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 !
-! LaTeX error: "regex/result-unbalanced"
+! LaTeX error: "kernel/result-unbalanced"
 ! 
 ! Missing brace inserted when splitting or extracting submatches.
 ! 
@@ -374,7 +374,7 @@
 |[ab{}] [{}a] [] [] |
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 !
-! LaTeX error: "regex/result-unbalanced"
+! LaTeX error: "kernel/result-unbalanced"
 ! 
 ! Missing brace inserted when splitting or extracting submatches.
 ! 
@@ -391,7 +391,7 @@
 |[ab{}] [{}a] [] [] |
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 !
-! LaTeX error: "regex/result-unbalanced"
+! LaTeX error: "kernel/result-unbalanced"
 ! 
 ! Missing brace inserted when splitting or extracting submatches.
 ! 
@@ -420,7 +420,7 @@
 |[c] [d] [e] |
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 !
-! LaTeX error: "regex/result-unbalanced"
+! LaTeX error: "kernel/result-unbalanced"
 ! 
 ! Missing brace inserted when splitting or extracting submatches.
 ! 
@@ -438,7 +438,7 @@
 |[ab{}] [{}a] [] [] |
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 !
-! LaTeX error: "regex/result-unbalanced"
+! LaTeX error: "kernel/result-unbalanced"
 ! 
 ! Missing brace inserted when splitting or extracting submatches.
 ! 
@@ -456,7 +456,7 @@
 |[ab{}] [{}a] [] [] |
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 !
-! LaTeX error: "regex/result-unbalanced"
+! LaTeX error: "kernel/result-unbalanced"
 ! 
 ! Missing brace inserted when splitting or extracting submatches.
 ! 
@@ -473,7 +473,7 @@
 |[ab{}] [{}a] [] [] |
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 !
-! LaTeX error: "regex/result-unbalanced"
+! LaTeX error: "kernel/result-unbalanced"
 ! 
 ! Missing brace inserted when splitting or extracting submatches.
 ! 
@@ -680,7 +680,7 @@
 macro:->ab{c}ade
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 !
-! LaTeX error: "regex/result-unbalanced"
+! LaTeX error: "kernel/result-unbalanced"
 ! 
 ! Missing brace inserted when replacing.
 ! 
@@ -698,7 +698,7 @@
 macro:->\aa{b}##d}
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 !
-! LaTeX error: "regex/result-unbalanced"
+! LaTeX error: "kernel/result-unbalanced"
 ! 
 ! Missing brace inserted when replacing.
 ! 
@@ -716,7 +716,7 @@
 macro:->\aa{b}##d}
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 !
-! LaTeX error: "regex/result-unbalanced"
+! LaTeX error: "kernel/result-unbalanced"
 ! 
 ! Missing brace inserted when replacing.
 ! 
@@ -733,7 +733,7 @@
 macro:->\aa{b}##d}
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 !
-! LaTeX error: "regex/result-unbalanced"
+! LaTeX error: "kernel/result-unbalanced"
 ! 
 ! Missing brace inserted when replacing.
 ! 
@@ -750,7 +750,7 @@
 macro:->\aa{b}##d}
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 !
-! LaTeX error: "regex/result-unbalanced"
+! LaTeX error: "kernel/result-unbalanced"
 ! 
 ! Missing brace inserted when replacing.
 ! 
@@ -768,7 +768,7 @@
 macro:->\aa{b}##d}
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 !
-! LaTeX error: "regex/result-unbalanced"
+! LaTeX error: "kernel/result-unbalanced"
 ! 
 ! Missing brace inserted when replacing.
 ! 
@@ -786,7 +786,7 @@
 macro:->\aa{b}##d}
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 !
-! LaTeX error: "regex/result-unbalanced"
+! LaTeX error: "kernel/result-unbalanced"
 ! 
 ! Missing brace inserted when replacing.
 ! 
@@ -803,7 +803,7 @@
 macro:->\aa{b}##d}
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 !
-! LaTeX error: "regex/result-unbalanced"
+! LaTeX error: "kernel/result-unbalanced"
 ! 
 ! Missing brace inserted when replacing.
 ! 

Modified: trunk/l3kernel/testfiles/m3regex006.tlg
===================================================================
--- trunk/l3kernel/testfiles/m3regex006.tlg	2017-06-25 20:27:28 UTC (rev 7307)
+++ trunk/l3kernel/testfiles/m3regex006.tlg	2017-06-25 21:25:21 UTC (rev 7308)
@@ -66,7 +66,7 @@
 |[] [] [] [] [] [] [] [] [] |
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 !
-! LaTeX error: "regex/result-unbalanced"
+! LaTeX error: "kernel/result-unbalanced"
 ! 
 ! Missing brace inserted when splitting or extracting submatches.
 ! 
@@ -84,7 +84,7 @@
 |[a] [b] [{}] [c] [{}] [a] [d] [e] |
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 !
-! LaTeX error: "regex/result-unbalanced"
+! LaTeX error: "kernel/result-unbalanced"
 ! 
 ! Missing brace inserted when splitting or extracting submatches.
 ! 
@@ -102,7 +102,7 @@
 |[a] [b] [{}] [c] [{}] [a] [d] [e] |
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 !
-! LaTeX error: "regex/result-unbalanced"
+! LaTeX error: "kernel/result-unbalanced"
 ! 
 ! Missing brace inserted when splitting or extracting submatches.
 ! 
@@ -119,7 +119,7 @@
 |[a] [b] [{}] [c] [{}] [a] [d] [e] |
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 !
-! LaTeX error: "regex/result-unbalanced"
+! LaTeX error: "kernel/result-unbalanced"
 ! 
 ! Missing brace inserted when splitting or extracting submatches.
 ! 
@@ -148,7 +148,7 @@
 |[] [] [] [] [] [] [] [] [] |
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 !
-! LaTeX error: "regex/result-unbalanced"
+! LaTeX error: "kernel/result-unbalanced"
 ! 
 ! Missing brace inserted when splitting or extracting submatches.
 ! 
@@ -166,7 +166,7 @@
 |[a] [b] [{}] [c] [{}] [a] [d] [e] |
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 !
-! LaTeX error: "regex/result-unbalanced"
+! LaTeX error: "kernel/result-unbalanced"
 ! 
 ! Missing brace inserted when splitting or extracting submatches.
 ! 
@@ -184,7 +184,7 @@
 |[a] [b] [{}] [c] [{}] [a] [d] [e] |
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 !
-! LaTeX error: "regex/result-unbalanced"
+! LaTeX error: "kernel/result-unbalanced"
 ! 
 ! Missing brace inserted when splitting or extracting submatches.
 ! 
@@ -201,7 +201,7 @@
 |[a] [b] [{}] [c] [{}] [a] [d] [e] |
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 !
-! LaTeX error: "regex/result-unbalanced"
+! LaTeX error: "kernel/result-unbalanced"
 ! 
 ! Missing brace inserted when splitting or extracting submatches.
 ! 
@@ -338,7 +338,7 @@
 |[c] [d] [e] |
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 !
-! LaTeX error: "regex/result-unbalanced"
+! LaTeX error: "kernel/result-unbalanced"
 ! 
 ! Missing brace inserted when splitting or extracting submatches.
 ! 
@@ -356,7 +356,7 @@
 |[ab{}] [{}a] [] [] |
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 !
-! LaTeX error: "regex/result-unbalanced"
+! LaTeX error: "kernel/result-unbalanced"
 ! 
 ! Missing brace inserted when splitting or extracting submatches.
 ! 
@@ -374,7 +374,7 @@
 |[ab{}] [{}a] [] [] |
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 !
-! LaTeX error: "regex/result-unbalanced"
+! LaTeX error: "kernel/result-unbalanced"
 ! 
 ! Missing brace inserted when splitting or extracting submatches.
 ! 
@@ -391,7 +391,7 @@
 |[ab{}] [{}a] [] [] |
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 !
-! LaTeX error: "regex/result-unbalanced"
+! LaTeX error: "kernel/result-unbalanced"
 ! 
 ! Missing brace inserted when splitting or extracting submatches.
 ! 
@@ -420,7 +420,7 @@
 |[c] [d] [e] |
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 !
-! LaTeX error: "regex/result-unbalanced"
+! LaTeX error: "kernel/result-unbalanced"
 ! 
 ! Missing brace inserted when splitting or extracting submatches.
 ! 
@@ -438,7 +438,7 @@
 |[ab{}] [{}a] [] [] |
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 !
-! LaTeX error: "regex/result-unbalanced"
+! LaTeX error: "kernel/result-unbalanced"
 ! 
 ! Missing brace inserted when splitting or extracting submatches.
 ! 
@@ -456,7 +456,7 @@
 |[ab{}] [{}a] [] [] |
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 !
-! LaTeX error: "regex/result-unbalanced"
+! LaTeX error: "kernel/result-unbalanced"
 ! 
 ! Missing brace inserted when splitting or extracting submatches.
 ! 
@@ -473,7 +473,7 @@
 |[ab{}] [{}a] [] [] |
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 !
-! LaTeX error: "regex/result-unbalanced"
+! LaTeX error: "kernel/result-unbalanced"
 ! 
 ! Missing brace inserted when splitting or extracting submatches.
 ! 
@@ -680,7 +680,7 @@
 macro:->ab{c}ade
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 !
-! LaTeX error: "regex/result-unbalanced"
+! LaTeX error: "kernel/result-unbalanced"
 ! 
 ! Missing brace inserted when replacing.
 ! 
@@ -698,7 +698,7 @@
 macro:->\aa{b}##d}
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 !
-! LaTeX error: "regex/result-unbalanced"
+! LaTeX error: "kernel/result-unbalanced"
 ! 
 ! Missing brace inserted when replacing.
 ! 
@@ -716,7 +716,7 @@
 macro:->\aa{b}##d}
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 !
-! LaTeX error: "regex/result-unbalanced"
+! LaTeX error: "kernel/result-unbalanced"
 ! 
 ! Missing brace inserted when replacing.
 ! 
@@ -733,7 +733,7 @@
 macro:->\aa{b}##d}
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 !
-! LaTeX error: "regex/result-unbalanced"
+! LaTeX error: "kernel/result-unbalanced"
 ! 
 ! Missing brace inserted when replacing.
 ! 
@@ -750,7 +750,7 @@
 macro:->\aa{b}##d}
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 !
-! LaTeX error: "regex/result-unbalanced"
+! LaTeX error: "kernel/result-unbalanced"
 ! 
 ! Missing brace inserted when replacing.
 ! 
@@ -768,7 +768,7 @@
 macro:->\aa{b}##d}
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 !
-! LaTeX error: "regex/result-unbalanced"
+! LaTeX error: "kernel/result-unbalanced"
 ! 
 ! Missing brace inserted when replacing.
 ! 
@@ -786,7 +786,7 @@
 macro:->\aa{b}##d}
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 !
-! LaTeX error: "regex/result-unbalanced"
+! LaTeX error: "kernel/result-unbalanced"
 ! 
 ! Missing brace inserted when replacing.
 ! 
@@ -803,7 +803,7 @@
 macro:->\aa{b}##d}
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 !
-! LaTeX error: "regex/result-unbalanced"
+! LaTeX error: "kernel/result-unbalanced"
 ! 
 ! Missing brace inserted when replacing.
 ! 

Modified: trunk/l3kernel/testfiles/m3regex007.tlg
===================================================================
--- trunk/l3kernel/testfiles/m3regex007.tlg	2017-06-25 20:27:28 UTC (rev 7307)
+++ trunk/l3kernel/testfiles/m3regex007.tlg	2017-06-25 21:25:21 UTC (rev 7308)
@@ -5,7 +5,7 @@
 TEST 1: regex_show
 ============================================================
 *************************************************
-* LaTeX warning: "regex/extra-rparen"
+* LaTeX warning: "kernel/extra-rparen"
 * 
 * Extra right parenthesis ignored in regular expression.
 *************************************************
@@ -148,7 +148,7 @@
 l. ...  }
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 !
-! LaTeX error: "regex/missing-rbrack"
+! LaTeX error: "kernel/missing-rbrack"
 ! 
 ! Missing right bracket inserted in regular expression.
 ! 
@@ -163,7 +163,7 @@
 |...............................................
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 !
-! LaTeX error: "regex/missing-rparen"
+! LaTeX error: "kernel/missing-rparen"
 ! 
 ! Missing right parentheses inserted in regular expression.
 ! 
@@ -190,7 +190,7 @@
 l. ...  }
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 !
-! LaTeX error: "regex/c-missing-rbrace"
+! LaTeX error: "kernel/c-missing-rbrace"
 ! 
 ! Missing right brace inserted for '\c' escape.
 ! 
@@ -205,7 +205,7 @@
 |...............................................
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 !
-! LaTeX error: "regex/missing-rbrack"
+! LaTeX error: "kernel/missing-rbrack"
 ! 
 ! Missing right bracket inserted in regular expression.
 ! 
@@ -220,7 +220,7 @@
 |...............................................
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 !
-! LaTeX error: "regex/missing-rparen"
+! LaTeX error: "kernel/missing-rparen"
 ! 
 ! Missing right parenthesis inserted in regular expression.
 ! 
@@ -235,7 +235,7 @@
 |...............................................
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 !
-! LaTeX error: "regex/missing-rbrack"
+! LaTeX error: "kernel/missing-rbrack"
 ! 
 ! Missing right bracket inserted in regular expression.
 ! 
@@ -250,7 +250,7 @@
 |...............................................
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 !
-! LaTeX error: "regex/missing-rparen"
+! LaTeX error: "kernel/missing-rparen"
 ! 
 ! Missing right parenthesis inserted in regular expression.
 ! 
@@ -342,7 +342,7 @@
 l. ...  }
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 !
-! LaTeX error: "regex/c-missing-category"
+! LaTeX error: "kernel/c-missing-category"
 ! 
 ! Invalid character 'd' following '\c' escape.
 ! 
@@ -358,7 +358,7 @@
 |...............................................
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 !
-! LaTeX error: "regex/u-missing-lbrace"
+! LaTeX error: "kernel/u-missing-lbrace"
 ! 
 ! Missing left brace following '\u' escape.
 ! 

Modified: trunk/l3kernel/testfiles/m3regex009.tlg
===================================================================
--- trunk/l3kernel/testfiles/m3regex009.tlg	2017-06-25 20:27:28 UTC (rev 7307)
+++ trunk/l3kernel/testfiles/m3regex009.tlg	2017-06-25 21:25:21 UTC (rev 7308)
@@ -7,7 +7,7 @@
 "\"
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 !
-! LaTeX error: "regex/trailing-backslash"
+! LaTeX error: "kernel/trailing-backslash"
 ! 
 ! Trailing escape character '\'.
 ! 
@@ -53,7 +53,7 @@
 "\x{"
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 !
-! LaTeX error: "regex/x-missing-rbrace"
+! LaTeX error: "kernel/x-missing-rbrace"
 ! 
 ! Missing closing brace in '\x' hexadecimal sequence.
 ! 
@@ -69,7 +69,7 @@
 "\x{45"
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 !
-! LaTeX error: "regex/x-missing-rbrace"
+! LaTeX error: "kernel/x-missing-rbrace"
 ! 
 ! Missing closing brace in '\x' hexadecimal sequence.
 ! 
@@ -84,7 +84,7 @@
 "\x{34k}"
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 !
-! LaTeX error: "regex/x-missing-rbrace"
+! LaTeX error: "kernel/x-missing-rbrace"
 ! 
 ! Missing closing brace in '\x' hexadecimal sequence.
 ! 
@@ -103,7 +103,7 @@
 "["
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 !
-! LaTeX error: "regex/missing-rbrack"
+! LaTeX error: "kernel/missing-rbrack"
 ! 
 ! Missing right bracket inserted in regular expression.
 ! 
@@ -119,7 +119,7 @@
 "[abc"
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 !
-! LaTeX error: "regex/missing-rbrack"
+! LaTeX error: "kernel/missing-rbrack"
 ! 
 ! Missing right bracket inserted in regular expression.
 ! 
@@ -134,19 +134,19 @@
 |...............................................
 "[a-]"
 *************************************************
-* LaTeX warning: "regex/range-missing-end"
+* LaTeX warning: "kernel/range-missing-end"
 * 
 * Invalid end-point for range 'a-\]' in character class.
 *************************************************
 "[]-"
 *************************************************
-* LaTeX warning: "regex/range-missing-end"
+* LaTeX warning: "kernel/range-missing-end"
 * 
 * Invalid end-point for range ']-\' in character class.
 *************************************************
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 !
-! LaTeX error: "regex/missing-rbrack"
+! LaTeX error: "kernel/missing-rbrack"
 ! 
 ! Missing right bracket inserted in regular expression.
 ! 
@@ -162,7 +162,7 @@
 "[a-\]"
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 !
-! LaTeX error: "regex/range-backwards"
+! LaTeX error: "kernel/range-backwards"
 ! 
 ! Range '[a-]]' out of order in character class.
 ! 
@@ -178,7 +178,7 @@
 |...............................................
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 !
-! LaTeX error: "regex/missing-rbrack"
+! LaTeX error: "kernel/missing-rbrack"
 ! 
 ! Missing right bracket inserted in regular expression.
 ! 
@@ -194,7 +194,7 @@
 "[^"
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 !
-! LaTeX error: "regex/missing-rbrack"
+! LaTeX error: "kernel/missing-rbrack"
 ! 
 ! Missing right bracket inserted in regular expression.
 ! 
@@ -210,7 +210,7 @@
 "[^abc"
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 !
-! LaTeX error: "regex/missing-rbrack"
+! LaTeX error: "kernel/missing-rbrack"
 ! 
 ! Missing right bracket inserted in regular expression.
 ! 
@@ -225,19 +225,19 @@
 |...............................................
 "[^a-]"
 *************************************************
-* LaTeX warning: "regex/range-missing-end"
+* LaTeX warning: "kernel/range-missing-end"
 * 
 * Invalid end-point for range 'a-\]' in character class.
 *************************************************
 "[^]-"
 *************************************************
-* LaTeX warning: "regex/range-missing-end"
+* LaTeX warning: "kernel/range-missing-end"
 * 
 * Invalid end-point for range ']-\' in character class.
 *************************************************
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 !
-! LaTeX error: "regex/missing-rbrack"
+! LaTeX error: "kernel/missing-rbrack"
 ! 
 ! Missing right bracket inserted in regular expression.
 ! 
@@ -253,7 +253,7 @@
 "[^a-\]"
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 !
-! LaTeX error: "regex/range-backwards"
+! LaTeX error: "kernel/range-backwards"
 ! 
 ! Range '[a-]]' out of order in character class.
 ! 
@@ -269,7 +269,7 @@
 |...............................................
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 !
-! LaTeX error: "regex/missing-rbrack"
+! LaTeX error: "kernel/missing-rbrack"
 ! 
 ! Missing right bracket inserted in regular expression.
 ! 
@@ -284,19 +284,19 @@
 |...............................................
 "[[:up:]]"
 *************************************************
-* LaTeX warning: "regex/posix-unknown"
+* LaTeX warning: "kernel/posix-unknown"
 * 
 * POSIX class '[:up:]' unknown.
 *************************************************
 "[[:^up:]]"
 *************************************************
-* LaTeX warning: "regex/posix-unknown"
+* LaTeX warning: "kernel/posix-unknown"
 * 
 * POSIX class '[:up:]' unknown.
 *************************************************
 "[a[:Upper:]]"
 *************************************************
-* LaTeX warning: "regex/posix-unknown"
+* LaTeX warning: "kernel/posix-unknown"
 * 
 * POSIX class '[:Upper:]' unknown.
 *************************************************
@@ -306,45 +306,45 @@
 ============================================================
 "x{"
 *************************************************
-* LaTeX warning: "regex/invalid-quantifier"
+* LaTeX warning: "kernel/invalid-quantifier"
 * 
 * Braced quantifier '{' may not be followed by ''.
 *************************************************
 "x{{"
 *************************************************
-* LaTeX warning: "regex/invalid-quantifier"
+* LaTeX warning: "kernel/invalid-quantifier"
 * 
 * Braced quantifier '{' may not be followed by '{'.
 *************************************************
 *************************************************
-* LaTeX warning: "regex/invalid-quantifier"
+* LaTeX warning: "kernel/invalid-quantifier"
 * 
 * Braced quantifier '{' may not be followed by ''.
 *************************************************
 "x{1"
 *************************************************
-* LaTeX warning: "regex/invalid-quantifier"
+* LaTeX warning: "kernel/invalid-quantifier"
 * 
 * Braced quantifier '{1' may not be followed by ''.
 *************************************************
 "x{1x}"
 *************************************************
-* LaTeX warning: "regex/invalid-quantifier"
+* LaTeX warning: "kernel/invalid-quantifier"
 * 
 * Braced quantifier '{1' may not be followed by 'x'.
 *************************************************
 "x{1,3"
 *************************************************
-* LaTeX warning: "regex/invalid-quantifier"
+* LaTeX warning: "kernel/invalid-quantifier"
 * 
 * Braced quantifier '{1,3' may not be followed by ''.
 *************************************************
 "x{3,1}"
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 !
-! LaTeX error: "regex/backwards-quantifier"
+! LaTeX error: "kernel/backwards-quantifier"
 ! 
-! \msg text > LaTeX/regex/backwards-quantifier {3}{1}{}{}
+! \msg text > LaTeX/kernel/backwards-quantifier {3}{1}{}{}
 ! 
 ! See the LaTeX3 documentation for further information.
 ! 
@@ -352,30 +352,30 @@
 !...............................................  
 l. ...  }
 |'''''''''''''''''''''''''''''''''''''''''''''''
-| \msg extra text > LaTeX/regex/backwards-quantifier {3}{1}{}{}
+| \msg extra text > LaTeX/kernel/backwards-quantifier {3}{1}{}{}
 |...............................................
 "x{0,0}"
 "x{1,3x}"
 *************************************************
-* LaTeX warning: "regex/invalid-quantifier"
+* LaTeX warning: "kernel/invalid-quantifier"
 * 
 * Braced quantifier '{1,3' may not be followed by 'x'.
 *************************************************
 "x{1,3,}"
 *************************************************
-* LaTeX warning: "regex/invalid-quantifier"
+* LaTeX warning: "kernel/invalid-quantifier"
 * 
 * Braced quantifier '{1,3' may not be followed by ','.
 *************************************************
 "x{1,3,5}"
 *************************************************
-* LaTeX warning: "regex/invalid-quantifier"
+* LaTeX warning: "kernel/invalid-quantifier"
 * 
 * Braced quantifier '{1,3' may not be followed by ','.
 *************************************************
 "x{1,3,5}?"
 *************************************************
-* LaTeX warning: "regex/invalid-quantifier"
+* LaTeX warning: "kernel/invalid-quantifier"
 * 
 * Braced quantifier '{1,3' may not be followed by ','.
 *************************************************
@@ -386,7 +386,7 @@
 "x("
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 !
-! LaTeX error: "regex/missing-rparen"
+! LaTeX error: "kernel/missing-rparen"
 ! 
 ! Missing right parenthesis inserted in regular expression.
 ! 
@@ -401,13 +401,13 @@
 |...............................................
 "x(?"
 *************************************************
-* LaTeX warning: "regex/special-group-unknown"
+* LaTeX warning: "kernel/special-group-unknown"
 * 
 * Unknown special group '(? ...' in a regular expression.
 *************************************************
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 !
-! LaTeX error: "regex/missing-rparen"
+! LaTeX error: "kernel/missing-rparen"
 ! 
 ! Missing right parenthesis inserted in regular expression.
 ! 
@@ -422,26 +422,26 @@
 |...............................................
 "x(?)"
 *************************************************
-* LaTeX warning: "regex/special-group-unknown"
+* LaTeX warning: "kernel/special-group-unknown"
 * 
 * Unknown special group '(?) ...' in a regular expression.
 *************************************************
 "x(?a)"
 *************************************************
-* LaTeX warning: "regex/special-group-unknown"
+* LaTeX warning: "kernel/special-group-unknown"
 * 
 * Unknown special group '(?a ...' in a regular expression.
 *************************************************
 "x(?I)"
 *************************************************
-* LaTeX warning: "regex/special-group-unknown"
+* LaTeX warning: "kernel/special-group-unknown"
 * 
 * Unknown special group '(?I ...' in a regular expression.
 *************************************************
 "x(?:"
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 !
-! LaTeX error: "regex/missing-rparen"
+! LaTeX error: "kernel/missing-rparen"
 ! 
 ! Missing right parenthesis inserted in regular expression.
 ! 
@@ -457,7 +457,7 @@
 "x(?|"
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 !
-! LaTeX error: "regex/missing-rparen"
+! LaTeX error: "kernel/missing-rparen"
 ! 
 ! Missing right parenthesis inserted in regular expression.
 ! 
@@ -473,7 +473,7 @@
 "x((("
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 !
-! LaTeX error: "regex/missing-rparen"
+! LaTeX error: "kernel/missing-rparen"
 ! 
 ! Missing right parentheses inserted in regular expression.
 ! 
@@ -493,7 +493,7 @@
 "\c"
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 !
-! LaTeX error: "regex/c-missing-category"
+! LaTeX error: "kernel/c-missing-category"
 ! 
 ! Invalid character '' following '\c' escape.
 ! 
@@ -510,7 +510,7 @@
 "\cL"
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 !
-! LaTeX error: "regex/c-trailing"
+! LaTeX error: "kernel/c-trailing"
 ! 
 ! Trailing category code escape '\c'...
 ! 
@@ -526,7 +526,7 @@
 "\c[^O]"
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 !
-! LaTeX error: "regex/c-trailing"
+! LaTeX error: "kernel/c-trailing"
 ! 
 ! Trailing category code escape '\c'...
 ! 
@@ -542,7 +542,7 @@
 "\cX."
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 !
-! LaTeX error: "regex/c-missing-category"
+! LaTeX error: "kernel/c-missing-category"
 ! 
 ! Invalid character 'X' following '\c' escape.
 ! 
@@ -559,7 +559,7 @@
 "\ca."
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 !
-! LaTeX error: "regex/c-missing-category"
+! LaTeX error: "kernel/c-missing-category"
 ! 
 ! Invalid character 'a' following '\c' escape.
 ! 
@@ -576,7 +576,7 @@
 "[\c]"
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 !
-! LaTeX error: "regex/c-missing-category"
+! LaTeX error: "kernel/c-missing-category"
 ! 
 ! Invalid character ']' following '\c' escape.
 ! 
@@ -593,7 +593,7 @@
 "[\cL]"
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 !
-! LaTeX error: "regex/missing-rbrack"
+! LaTeX error: "kernel/missing-rbrack"
 ! 
 ! Missing right bracket inserted in regular expression.
 ! 
@@ -609,7 +609,7 @@
 "[\c[^O]]"
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 !
-! LaTeX error: "regex/missing-rbrack"
+! LaTeX error: "kernel/missing-rbrack"
 ! 
 ! Missing right bracket inserted in regular expression.
 ! 
@@ -625,7 +625,7 @@
 "[\cX.]"
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 !
-! LaTeX error: "regex/c-missing-category"
+! LaTeX error: "kernel/c-missing-category"
 ! 
 ! Invalid character 'X' following '\c' escape.
 ! 
@@ -642,7 +642,7 @@
 "[\ca.]"
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 !
-! LaTeX error: "regex/c-missing-category"
+! LaTeX error: "kernel/c-missing-category"
 ! 
 ! Invalid character 'a' following '\c' escape.
 ! 
@@ -659,7 +659,7 @@
 "\c{abc"
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 !
-! LaTeX error: "regex/c-missing-rbrace"
+! LaTeX error: "kernel/c-missing-rbrace"
 ! 
 ! Missing right brace inserted for '\c' escape.
 ! 
@@ -675,7 +675,7 @@
 "\c{x\cL.}"
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 !
-! LaTeX error: "regex/c-bad-mode"
+! LaTeX error: "kernel/c-bad-mode"
 ! 
 ! Invalid nested '\c' escape in regular expression.
 ! 
@@ -691,7 +691,7 @@
 "\c{x\c[AL].}"
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 !
-! LaTeX error: "regex/c-bad-mode"
+! LaTeX error: "kernel/c-bad-mode"
 ! 
 ! Invalid nested '\c' escape in regular expression.
 ! 
@@ -707,7 +707,7 @@
 "\c{x\cL}"
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 !
-! LaTeX error: "regex/c-bad-mode"
+! LaTeX error: "kernel/c-bad-mode"
 ! 
 ! Invalid nested '\c' escape in regular expression.
 ! 
@@ -723,7 +723,7 @@
 "\c{x\c[AL]}"
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 !
-! LaTeX error: "regex/c-bad-mode"
+! LaTeX error: "kernel/c-bad-mode"
 ! 
 ! Invalid nested '\c' escape in regular expression.
 ! 
@@ -739,7 +739,7 @@
 "[\c{abc]"
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 !
-! LaTeX error: "regex/c-missing-rbrace"
+! LaTeX error: "kernel/c-missing-rbrace"
 ! 
 ! Missing right brace inserted for '\c' escape.
 ! 
@@ -754,7 +754,7 @@
 |...............................................
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 !
-! LaTeX error: "regex/missing-rbrack"
+! LaTeX error: "kernel/missing-rbrack"
 ! 
 ! Missing right bracket inserted in regular expression.
 ! 
@@ -770,7 +770,7 @@
 "[\c{x\cL.}]"
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 !
-! LaTeX error: "regex/c-bad-mode"
+! LaTeX error: "kernel/c-bad-mode"
 ! 
 ! Invalid nested '\c' escape in regular expression.
 ! 
@@ -786,7 +786,7 @@
 "[\c{x\c[AL].}]"
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 !
-! LaTeX error: "regex/c-bad-mode"
+! LaTeX error: "kernel/c-bad-mode"
 ! 
 ! Invalid nested '\c' escape in regular expression.
 ! 
@@ -802,7 +802,7 @@
 "[\c{x\cL}]"
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 !
-! LaTeX error: "regex/c-bad-mode"
+! LaTeX error: "kernel/c-bad-mode"
 ! 
 ! Invalid nested '\c' escape in regular expression.
 ! 
@@ -818,7 +818,7 @@
 "[\c{x\c[AL]}]"
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 !
-! LaTeX error: "regex/c-bad-mode"
+! LaTeX error: "kernel/c-bad-mode"
 ! 
 ! Invalid nested '\c' escape in regular expression.
 ! 
@@ -838,7 +838,7 @@
 "\u"
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 !
-! LaTeX error: "regex/u-missing-lbrace"
+! LaTeX error: "kernel/u-missing-lbrace"
 ! 
 ! Missing left brace following '\u' escape.
 ! 
@@ -854,7 +854,7 @@
 "\ufoo"
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 !
-! LaTeX error: "regex/u-missing-lbrace"
+! LaTeX error: "kernel/u-missing-lbrace"
 ! 
 ! Missing left brace following '\u' escape.
 ! 
@@ -870,7 +870,7 @@
 "\u{"
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 !
-! LaTeX error: "regex/u-missing-rbrace"
+! LaTeX error: "kernel/u-missing-rbrace"
 ! 
 ! Missing right brace inserted for '\u' escape.
 ! 
@@ -905,7 +905,7 @@
 "[\ufoo]"
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 !
-! LaTeX error: "regex/bad-escape"
+! LaTeX error: "kernel/bad-escape"
 ! 
 ! Invalid escape '\u' in a character class.
 ! 
@@ -921,7 +921,7 @@
 "[\u{l_tmpa_tl}]"
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 !
-! LaTeX error: "regex/bad-escape"
+! LaTeX error: "kernel/bad-escape"
 ! 
 ! Invalid escape '\u' in a character class.
 ! 
@@ -937,7 +937,7 @@
 "\cL\u{l_tmpa_tl}"
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 !
-! LaTeX error: "regex/bad-escape"
+! LaTeX error: "kernel/bad-escape"
 ! 
 ! Invalid escape '\u' following a category test.
 ! 
@@ -951,7 +951,7 @@
 | '\cL' because it does not match exactly one character.
 |...............................................
 *************************************************
-* LaTeX warning: "regex/invalid-quantifier"
+* LaTeX warning: "kernel/invalid-quantifier"
 * 
 * Braced quantifier '{' may not be followed by 'l'.
 *************************************************
@@ -959,7 +959,7 @@
 "\u{\u{l_tmpa_tl}}"
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 !
-! LaTeX error: "regex/u-missing-rbrace"
+! LaTeX error: "kernel/u-missing-rbrace"
 ! 
 ! Missing right brace inserted for '\u' escape.
 ! 

Modified: trunk/l3kernel/testfiles/m3sort001.luatex.tlg
===================================================================
--- trunk/l3kernel/testfiles/m3sort001.luatex.tlg	2017-06-25 20:27:28 UTC (rev 7307)
+++ trunk/l3kernel/testfiles/m3sort001.luatex.tlg	2017-06-25 21:25:21 UTC (rev 7308)
@@ -32,7 +32,7 @@
 ============================================================
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 !
-! LaTeX error: "sort/too-large"
+! LaTeX error: "kernel/too-large"
 ! 
 ! The list \l_tmpa_tl is too long to be sorted by TeX.
 ! 
@@ -47,7 +47,7 @@
 |...............................................
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 !
-! LaTeX error: "sort/too-large"
+! LaTeX error: "kernel/too-large"
 ! 
 ! The list \l_tmpa_clist is too long to be sorted by TeX.
 ! 
@@ -62,7 +62,7 @@
 |...............................................
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 !
-! LaTeX error: "sort/too-large"
+! LaTeX error: "kernel/too-large"
 ! 
 ! The list \l_tmpa_seq is too long to be sorted by TeX.
 ! 
@@ -84,7 +84,7 @@
 ca
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 !
-! LaTeX error: "sort/toksdef"
+! LaTeX error: "kernel/toksdef"
 ! 
 ! Allocation of \toks registers impossible while sorting.
 ! 
@@ -102,7 +102,7 @@
 dcba
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 !
-! LaTeX error: "sort/return-two"
+! LaTeX error: "kernel/return-two"
 ! 
 ! The comparison code returned multiple times.
 ! 
@@ -117,7 +117,7 @@
 |...............................................
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 !
-! LaTeX error: "sort/return-none"
+! LaTeX error: "kernel/return-none"
 ! 
 ! The comparison code did not return.
 ! 
@@ -133,7 +133,7 @@
 |...............................................
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 !
-! LaTeX error: "sort/return-none"
+! LaTeX error: "kernel/return-none"
 ! 
 ! The comparison code did not return.
 ! 
@@ -149,7 +149,7 @@
 |...............................................
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 !
-! LaTeX error: "sort/return-two"
+! LaTeX error: "kernel/return-two"
 ! 
 ! The comparison code returned multiple times.
 ! 

Modified: trunk/l3kernel/testfiles/m3sort001.tlg
===================================================================
--- trunk/l3kernel/testfiles/m3sort001.tlg	2017-06-25 20:27:28 UTC (rev 7307)
+++ trunk/l3kernel/testfiles/m3sort001.tlg	2017-06-25 21:25:21 UTC (rev 7308)
@@ -32,7 +32,7 @@
 ============================================================
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 !
-! LaTeX error: "sort/too-large"
+! LaTeX error: "kernel/too-large"
 ! 
 ! The list \l_tmpa_tl is too long to be sorted by TeX.
 ! 
@@ -47,7 +47,7 @@
 |...............................................
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 !
-! LaTeX error: "sort/too-large"
+! LaTeX error: "kernel/too-large"
 ! 
 ! The list \l_tmpa_clist is too long to be sorted by TeX.
 ! 
@@ -62,7 +62,7 @@
 |...............................................
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 !
-! LaTeX error: "sort/too-large"
+! LaTeX error: "kernel/too-large"
 ! 
 ! The list \l_tmpa_seq is too long to be sorted by TeX.
 ! 
@@ -84,7 +84,7 @@
 ca
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 !
-! LaTeX error: "sort/toksdef"
+! LaTeX error: "kernel/toksdef"
 ! 
 ! Allocation of \toks registers impossible while sorting.
 ! 
@@ -102,7 +102,7 @@
 dcba
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 !
-! LaTeX error: "sort/return-two"
+! LaTeX error: "kernel/return-two"
 ! 
 ! The comparison code returned multiple times.
 ! 
@@ -117,7 +117,7 @@
 |...............................................
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 !
-! LaTeX error: "sort/return-none"
+! LaTeX error: "kernel/return-none"
 ! 
 ! The comparison code did not return.
 ! 
@@ -133,7 +133,7 @@
 |...............................................
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 !
-! LaTeX error: "sort/return-none"
+! LaTeX error: "kernel/return-none"
 ! 
 ! The comparison code did not return.
 ! 
@@ -149,7 +149,7 @@
 |...............................................
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 !
-! LaTeX error: "sort/return-two"
+! LaTeX error: "kernel/return-two"
 ! 
 ! The comparison code returned multiple times.
 !