2 files changed, 24 insertions, 14 deletions
diff --git a/Master/texmf-dist/source/latex/l3experimental/l3str/l3regex.dtx b/Master/texmf-dist/source/latex/l3experimental/l3str/l3regex.dtx
index 498036bdaa7..ce26a6098ba 100644
--- a/Master/texmf-dist/source/latex/l3experimental/l3str/l3regex.dtx
+++ b/Master/texmf-dist/source/latex/l3experimental/l3str/l3regex.dtx
@@ -35,7 +35,7 @@
 %
 %<*driver|package>
 \RequirePackage{expl3}
-\GetIdInfo$Id: l3regex.dtx 3940 2012-07-09 00:41:44Z bruno $
+\GetIdInfo$Id: l3regex.dtx 4219 2012-09-09 13:28:51Z bruno $
   {L3 Experimental regular expressions}
 %</driver|package>
 %<*driver>
@@ -3085,7 +3085,7 @@
       \@@_show_push:n { ~ }
       #1
     \__tl_build_end:
-    \__msg_show_variable:x { > Compiled~regex~#2: \l_@@_internal_a_tl }
+    \__msg_show_variable:n { >~Compiled~regex~#2: \l_@@_internal_a_tl }
   }
 %    \end{macrocode}
 % \end{macro}
@@ -3099,7 +3099,7 @@
     \int_incr:N \l_@@_show_lines_int
     \__tl_build_one:x
       {
-        \iow_newline:
+        \exp_not:N \\
         \seq_map_function:NN \l_@@_show_prefix_seq \use:n
         #1
       }
diff --git a/Master/texmf-dist/source/latex/l3experimental/l3str/l3tl-analysis.dtx b/Master/texmf-dist/source/latex/l3experimental/l3str/l3tl-analysis.dtx
index 6cc38e6afd9..b6d28da057f 100644
--- a/Master/texmf-dist/source/latex/l3experimental/l3str/l3tl-analysis.dtx
+++ b/Master/texmf-dist/source/latex/l3experimental/l3str/l3tl-analysis.dtx
@@ -948,25 +948,35 @@
 %
 % \subsection{Showing the results}
 %
-% \begin{macro}{\tl_show_analysis:N}
-% \begin{macro}{\tl_show_analysis:n}
+% \begin{macro}{\tl_show_analysis:N, \tl_show_analysis:n}
+% \begin{macro}[int]{\@@_show:N}
 %   Add to \cs{@@:n} a third pass to display tokens to the terminal.
 %    \begin{macrocode}
 \cs_new_protected:Npn \tl_show_analysis:N #1
   {
     \exp_args:No \@@:n {#1}
-    \__msg_show_variable:Nnx #1
-      { tl-analysis }
-      {
-        \exp_after:wN \@@_show_loop:wNw \g_@@_result_tl
-          \s__tl { ? \__prg_break: } \s__tl
-        \__prg_break_point:
-      }
+    \@@_show:N #1
   }
 \cs_new_protected:Npn \tl_show_analysis:n #1
   {
+    \@@:n {#1}
     \tl_set:Nn \l_@@_internal_tl {#1}
-    \tl_show_analysis:N \l_@@_internal_tl
+    \@@_show:N \l_@@_internal_tl
+  }
+\cs_new_protected:Npn \@@_show:N #1
+  {
+    \group_begin:
+    \use:x
+      {
+        \group_end:
+        \exp_not:n { \__msg_show_variable:Nnn #1 }
+          { tl-analysis }
+          {
+            \exp_after:wN \@@_show_loop:wNw \g_@@_result_tl
+              \s__tl { ? \__prg_break: } \s__tl
+            \__prg_break_point:
+          }
+      }
   }
 %    \end{macrocode}
 % \end{macro}
@@ -984,7 +994,7 @@
 \cs_new:Npn \@@_show_loop:wNw #1 \s__tl #2 #3 \s__tl
   {
     \use_none:n #2
-    \iow_newline: > \c_space_tl \c_space_tl
+    \exp_not:n { \\ > \ \  }
     \if_int_compare:w "#2 = \c_zero
       \exp_after:wN \@@_show_cs:n
     \else: