[latex3-commits] [l3svn] r6928 - Fix \cs_show:N of a few commands

noreply at latex-project.org noreply at latex-project.org
Tue Feb 14 16:51:06 CET 2017


Author: bruno
Date: 2017-02-14 16:51:06 +0100 (Tue, 14 Feb 2017)
New Revision: 6928

Modified:
   trunk/l3kernel/l3basics.dtx
   trunk/l3kernel/l3box.dtx
   trunk/l3kernel/l3int.dtx
   trunk/l3kernel/l3msg.dtx
   trunk/l3kernel/testfiles/m3basics001.tlg
   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/m3show002.luatex.tlg
   trunk/l3kernel/testfiles/m3show002.lvt
   trunk/l3kernel/testfiles/m3show002.tlg
Log:
Fix \cs_show:N of a few commands

Since the wrapping code redefines a few commands the \meaning
to be shown must be evaluated before entering the wrapping code.
I've also simplified \int_show:N with no change in output, and
made \box_show:N marginally more robust.


Modified: trunk/l3kernel/l3basics.dtx
===================================================================
--- trunk/l3kernel/l3basics.dtx	2017-02-14 12:18:32 UTC (rev 6927)
+++ trunk/l3kernel/l3basics.dtx	2017-02-14 15:51:06 UTC (rev 6928)
@@ -686,7 +686,7 @@
 %   \end{texnote}
 % \end{function}
 %
-% \begin{function}[updated = 2015-08-03]{\cs_show:N, \cs_show:c}
+% \begin{function}[updated = 2017-02-14]{\cs_show:N, \cs_show:c}
 %   \begin{syntax}
 %     \cs{cs_show:N} \meta{control sequence}
 %   \end{syntax}
@@ -698,7 +698,7 @@
 %   \end{texnote}
 % \end{function}
 %
-% \begin{function}[added = 2014-08-22, updated = 2015-08-03]{\cs_log:N, \cs_log:c}
+% \begin{function}[added = 2014-08-22, updated = 2017-02-14]{\cs_log:N, \cs_log:c}
 %   \begin{syntax}
 %     \cs{cs_log:N} \meta{control sequence}
 %   \end{syntax}
@@ -2915,21 +2915,28 @@
 % \subsection{Diagnostic functions}
 %
 % \begin{macro}[int]{\__kernel_register_show:N, \__kernel_register_show:c}
+% \begin{macro}[aux]{\__kernel_register_show_aux:n}
 %   Simply using the \tn{showthe} primitive does not allow for
 %   line-wrapping, so instead use \cs{__msg_show_variable:NNNnn} (defined
 %   in \pkg{l3msg}).  This checks that the variable exists (using
 %   \cs{cs_if_exist:NTF}), then displays the third argument, namely
-%   |>~|\meta{variable}|=|\meta{value}.
+%   |>~|\meta{variable}|=|\meta{value}.  We expand the value before-hand
+%   as otherwise some integers (such as \tn{currentgrouplevel} or
+%   \tn{currentgrouptype}) altered by the line-wrapping code would show
+%   wrong values.
 %    \begin{macrocode}
 \cs_new_protected:Npn \__kernel_register_show:N #1
+  { \exp_args:No \__kernel_register_show_aux:nN { \tex_the:D #1 } #1 }
+\cs_new_protected:Npn \__kernel_register_show_aux:nN #1#2
   {
-    \__msg_show_variable:NNNnn #1 \cs_if_exist:NTF ? { }
-      { > ~ \token_to_str:N #1 = \tex_the:D #1 }
+    \__msg_show_variable:NNNnn #2 \cs_if_exist:NTF ? { }
+      { > ~ \token_to_str:N #2 = #1 }
   }
 \cs_new_protected:Npn \__kernel_register_show:c
   { \exp_args:Nc \__kernel_register_show:N }
 %    \end{macrocode}
 % \end{macro}
+% \end{macro}
 %
 % \begin{macro}[int]{\__kernel_register_log:N, \__kernel_register_log:c}
 %   Redirect the output of \cs{__kernel_register_show:N} to the log.
@@ -2946,12 +2953,22 @@
 %   simply using \TeX{}'s primitive \tn{show} could lead to overlong
 %   lines.  The output of this primitive is mimicked to some extent,
 %   then the re-built string is given to \cs{iow_wrap:nnnN} for
-%   line-wrapping.  The \cs{cs_show:c} command converts its argument to
-%   a control sequence within a group to avoid showing \tn{relax} for
-%   undefined control sequences.
+%   line-wrapping.  We must expand the meaning before passing it to the
+%   wrapping code as otherwise we would wrongly see the definitions that
+%   are in place there.  To get correct escape characters, set the
+%   \tn{escapechar} in a group; this also localizes the assignment
+%   performed by \texttt{x}-expansion.  The \cs{cs_show:c} command also
+%   converts its argument to a control sequence within a group to avoid
+%   showing \tn{relax} for undefined control sequences.
 %    \begin{macrocode}
 \cs_new_protected:Npn \cs_show:N #1
-  { \__msg_show_wrap:n { > ~ \token_to_str:N #1 = \cs_meaning:N #1 } }
+  {
+    \group_begin:
+      \int_set:Nn \tex_escapechar:D { `\\ }
+      \exp_args:NNx
+    \group_end:
+    \__msg_show_wrap:n { > ~ \token_to_str:N #1 = \cs_meaning:N #1 }
+  }
 \cs_new_protected:Npn \cs_show:c
   { \group_begin: \exp_args:NNc \group_end: \cs_show:N }
 %    \end{macrocode}

Modified: trunk/l3kernel/l3box.dtx
===================================================================
--- trunk/l3kernel/l3box.dtx	2017-02-14 12:18:32 UTC (rev 6927)
+++ trunk/l3kernel/l3box.dtx	2017-02-14 15:51:06 UTC (rev 6928)
@@ -915,13 +915,14 @@
 %
 % \begin{macro}{\box_show:N, \box_show:c}
 % \begin{macro}{\box_show:Nnn, \box_show:cnn}
-%   Essentially a wrapper around the internal function.
+%   Essentially a wrapper around the internal function, but evaluating
+%   the breadth and depth arguments now outside the group.
 %    \begin{macrocode}
 \cs_new_protected:Npn \box_show:N #1
   { \box_show:Nnn #1 \c_max_int \c_max_int }
 \cs_generate_variant:Nn \box_show:N { c }
-\cs_new_protected:Npn \box_show:Nnn
-  { \@@_show:NNnn \c_one }
+\cs_new_protected:Npn \box_show:Nnn #1#2#3
+  { \@@_show:NNff \c_one #1 { \int_eval:n {#2} } { \int_eval:n {#3} } }
 \cs_generate_variant:Nn \box_show:Nnn { c }
 %    \end{macrocode}
 % \end{macro}
@@ -929,29 +930,28 @@
 %
 % \begin{macro}{\box_log:N, \box_log:c}
 % \begin{macro}{\box_log:Nnn, \box_log:cnn}
+% \begin{macro}[aux]{\@@_log:nNnn}
 %   Getting \TeX{} to write to the log without interruption the run is done by
 %   altering the interaction mode. For that, the \eTeX{} extensions are needed.
 %    \begin{macrocode}
 \cs_new_protected:Npn \box_log:N #1
   { \box_log:Nnn #1 \c_max_int \c_max_int }
 \cs_generate_variant:Nn \box_log:N { c }
-\cs_new_protected:Npn \box_log:Nnn #1#2#3
+\cs_new_protected:Npn \box_log:Nnn
+  { \exp_args:No \@@_log:nNnn { \tex_the:D \etex_interactionmode:D } }
+\cs_new_protected:Npn \@@_log:nNnn #1#2#3#4
   {
-    \use:x
-      {
-        \etex_interactionmode:D \c_zero
-        \@@_show:NNnn \c_zero \exp_not:N #1
-          { \int_eval:n {#2} } { \int_eval:n {#3} }
-        \etex_interactionmode:D
-            = \tex_the:D \etex_interactionmode:D \scan_stop:
-      }
+    \etex_interactionmode:D \c_zero
+    \@@_show:NNff \c_zero #2 { \int_eval:n {#3} } { \int_eval:n {#4} }
+    \etex_interactionmode:D #1 \scan_stop:
   }
 \cs_generate_variant:Nn \box_log:Nnn { c }
 %    \end{macrocode}
 % \end{macro}
 % \end{macro}
+% \end{macro}
 %
-% \begin{macro}[aux]{\@@_show:NNnn}
+% \begin{macro}[aux]{\@@_show:NNnn, \@@_show:NNff}
 %   The internal auxiliary to actually do the output uses a group to deal
 %   with breadth and depth values. The \cs{use:n} here gives better output
 %   appearance. Setting \tn{tracingonline} and \tn{errorcontextlines} is
@@ -959,19 +959,22 @@
 %    \begin{macrocode}
 \cs_new_protected:Npn \@@_show:NNnn #1#2#3#4
   {
-    \group_begin:
-      \int_set:Nn \tex_showboxbreadth:D {#3}
-      \int_set:Nn \tex_showboxdepth:D   {#4}
-      \int_set_eq:NN \tex_tracingonline:D #1
-      \int_set:Nn \tex_errorcontextlines:D { - \c_one }
-      \box_if_exist:NTF #2
-        { \tex_showbox:D \use:n {#2} }
-        {
-          \__msg_kernel_error:nnx { kernel } { variable-not-defined }
-            { \token_to_str:N #2 }
-        }
-    \group_end:
+    \box_if_exist:NTF #2
+      {
+        \group_begin:
+          \int_set:Nn \tex_showboxbreadth:D {#3}
+          \int_set:Nn \tex_showboxdepth:D   {#4}
+          \int_set_eq:NN \tex_tracingonline:D #1
+          \int_set:Nn \tex_errorcontextlines:D { - \c_one }
+          \tex_showbox:D \use:n {#2}
+        \group_end:
+      }
+      {
+        \__msg_kernel_error:nnx { kernel } { variable-not-defined }
+          { \token_to_str:N #2 }
+      }
   }
+\cs_generate_variant:Nn \@@_show:NNnn { NNff }
 %    \end{macrocode}
 % \end{macro}
 %

Modified: trunk/l3kernel/l3int.dtx
===================================================================
--- trunk/l3kernel/l3int.dtx	2017-02-14 12:18:32 UTC (rev 6927)
+++ trunk/l3kernel/l3int.dtx	2017-02-14 15:51:06 UTC (rev 6928)
@@ -2342,24 +2342,14 @@
 %
 % \begin{macro}{\int_show:N, \int_show:c}
 % \UnitTested
-%   This is very similar to other registers done using
-%   \cs{__kernel_register_show:N}, but differs because the variable
-%   |#1| may be \tn{currentgrouplevel} or \tn{currentgrouptype}, in
-%   which case the value must be expanded in the current scope rather
-%   than when processing \cs{iow_wrap:nnnN}.
+% \begin{macro}[aux]{\@@_show:nN}
+%   Diagnostics.
 %    \begin{macrocode}
-\cs_new_protected:Npn \int_show:N #1
-  {
-    \use:x
-      {
-        \exp_not:n
-          { \__msg_show_variable:NNNnn #1 \cs_if_exist:NTF ? { } }
-              { > ~ \token_to_str:N #1 = \tex_the:D #1 }
-      }
-  }
+\cs_new_eq:NN \int_show:N \__kernel_register_show:N
 \cs_generate_variant:Nn \int_show:N { c }
 %    \end{macrocode}
 % \end{macro}
+% \end{macro}
 %
 % \begin{macro}{\int_show:n}
 % \UnitTested
@@ -2372,13 +2362,9 @@
 % \end{macro}
 %
 % \begin{macro}{\int_log:N, \int_log:c}
-%   Redirect output of \cs{int_show:N} to the log.  This is not just a
-%   copy of \cs{__kernel_register_log:N} because of subtleties
-%   involving \tn{currentgrouplevel} and \tn{currentgrouptype}.  See
-%   \cs{int_show:N} for details.
+%   Diagnostics.
 %    \begin{macrocode}
-\cs_new_protected:Npn \int_log:N
-  { \__msg_log_next: \int_show:N }
+\cs_new_eq:NN \int_log:N \__kernel_register_log:N
 \cs_generate_variant:Nn \int_log:N { c }
 %    \end{macrocode}
 % \end{macro}

Modified: trunk/l3kernel/l3msg.dtx
===================================================================
--- trunk/l3kernel/l3msg.dtx	2017-02-14 12:18:32 UTC (rev 6927)
+++ trunk/l3kernel/l3msg.dtx	2017-02-14 15:51:06 UTC (rev 6928)
@@ -2205,12 +2205,17 @@
 %   show command is called, rather than in the group created by
 %   \cs{iow_wrap:nnnN}.  This is only important for expressions
 %   involving the \tn{currentgrouplevel} or \tn{currentgrouptype}.
-%   This does not lead to double expansion because the
-%   \texttt{x}-expansion of |#1| |{#2}| is a string in all cases where
-%   \cs{@@_show_wrap:Nn} is used.
+%   On the other hand we want the expression to be converted to a string
+%   with the usual escape character, hence within the wrapping code.
 %    \begin{macrocode}
 \cs_new_protected:Npn \@@_show_wrap:Nn #1#2
-  { \exp_args:Nx \@@_show_wrap:n { > ~ \tl_to_str:n {#2} = #1 {#2} } }
+  {
+    \exp_args:Nx \@@_show_wrap:n
+      {
+        > ~ \exp_not:n { \tl_to_str:n {#2} } =
+        \exp_not:N \tl_to_str:n { #1 {#2} }
+      }
+  }
 %    \end{macrocode}
 % \end{macro}
 %

Modified: trunk/l3kernel/testfiles/m3basics001.tlg
===================================================================
--- trunk/l3kernel/testfiles/m3basics001.tlg	2017-02-14 12:18:32 UTC (rev 6927)
+++ trunk/l3kernel/testfiles/m3basics001.tlg	2017-02-14 15:51:06 UTC (rev 6928)
@@ -52,8 +52,9 @@
 > \foobar=\relax.
 <recently read> }
 l. ...}
-> \cs_show:N=\protected\long macro:#1->\__msg_show_wrap:n {> \token_to_str:N
-#1=\cs_meaning:N #1}.
+> \cs_show:N=\protected\long macro:#1->\group_begin: \int_set:Nn
+\tex_escapechar:D {`\\}\exp_args:NNx \group_end: \__msg_show_wrap:n {>
+\token_to_str:N #1=\cs_meaning:N #1}.
 <recently read> }
 l. ...}
 ============================================================

Modified: trunk/l3kernel/testfiles/m3expl001.luatex.tlg
===================================================================
--- trunk/l3kernel/testfiles/m3expl001.luatex.tlg	2017-02-14 12:18:32 UTC (rev 6927)
+++ trunk/l3kernel/testfiles/m3expl001.luatex.tlg	2017-02-14 15:51:06 UTC (rev 6928)
@@ -115,6 +115,7 @@
 Defining \cs_if_eq:ccT on line ...
 Defining \cs_if_eq:ccF on line ...
 Defining \__kernel_register_show:N on line ...
+Defining \__kernel_register_show_aux:nN on line ...
 Defining \__kernel_register_show:c on line ...
 Defining \__kernel_register_log:N on line ...
 Defining \__kernel_register_log:c on line ...
@@ -4418,8 +4419,11 @@
 Defining \box_log:N on line ...
 Defining \box_log:c on line ...
 Defining \box_log:Nnn on line ...
+Defining \__box_log:nNnn on line ...
 Defining \box_log:cnn on line ...
 Defining \__box_show:NNnn on line ...
+Defining \exp_args:NNNff on line ...
+Defining \__box_show:NNff on line ...
 Defining \hbox:n on line ...
 Defining \hbox_set:Nn on line ...
 Defining \hbox_gset:Nn on line ...

Modified: trunk/l3kernel/testfiles/m3expl001.ptex.tlg
===================================================================
--- trunk/l3kernel/testfiles/m3expl001.ptex.tlg	2017-02-14 12:18:32 UTC (rev 6927)
+++ trunk/l3kernel/testfiles/m3expl001.ptex.tlg	2017-02-14 15:51:06 UTC (rev 6928)
@@ -114,6 +114,7 @@
 Defining \cs_if_eq:ccT on line ...
 Defining \cs_if_eq:ccF on line ...
 Defining \__kernel_register_show:N on line ...
+Defining \__kernel_register_show_aux:nN on line ...
 Defining \__kernel_register_show:c on line ...
 Defining \__kernel_register_log:N on line ...
 Defining \__kernel_register_log:c on line ...
@@ -4386,8 +4387,11 @@
 Defining \box_log:N on line ...
 Defining \box_log:c on line ...
 Defining \box_log:Nnn on line ...
+Defining \__box_log:nNnn on line ...
 Defining \box_log:cnn on line ...
 Defining \__box_show:NNnn on line ...
+Defining \exp_args:NNNff on line ...
+Defining \__box_show:NNff on line ...
 Defining \hbox:n on line ...
 Defining \hbox_set:Nn on line ...
 Defining \hbox_gset:Nn on line ...

Modified: trunk/l3kernel/testfiles/m3expl001.tlg
===================================================================
--- trunk/l3kernel/testfiles/m3expl001.tlg	2017-02-14 12:18:32 UTC (rev 6927)
+++ trunk/l3kernel/testfiles/m3expl001.tlg	2017-02-14 15:51:06 UTC (rev 6928)
@@ -114,6 +114,7 @@
 Defining \cs_if_eq:ccT on line ...
 Defining \cs_if_eq:ccF on line ...
 Defining \__kernel_register_show:N on line ...
+Defining \__kernel_register_show_aux:nN on line ...
 Defining \__kernel_register_show:c on line ...
 Defining \__kernel_register_log:N on line ...
 Defining \__kernel_register_log:c on line ...
@@ -4406,8 +4407,11 @@
 Defining \box_log:N on line ...
 Defining \box_log:c on line ...
 Defining \box_log:Nnn on line ...
+Defining \__box_log:nNnn on line ...
 Defining \box_log:cnn on line ...
 Defining \__box_show:NNnn on line ...
+Defining \exp_args:NNNff on line ...
+Defining \__box_show:NNff on line ...
 Defining \hbox:n on line ...
 Defining \hbox_set:Nn on line ...
 Defining \hbox_gset:Nn on line ...

Modified: trunk/l3kernel/testfiles/m3expl001.uptex.tlg
===================================================================
--- trunk/l3kernel/testfiles/m3expl001.uptex.tlg	2017-02-14 12:18:32 UTC (rev 6927)
+++ trunk/l3kernel/testfiles/m3expl001.uptex.tlg	2017-02-14 15:51:06 UTC (rev 6928)
@@ -114,6 +114,7 @@
 Defining \cs_if_eq:ccT on line ...
 Defining \cs_if_eq:ccF on line ...
 Defining \__kernel_register_show:N on line ...
+Defining \__kernel_register_show_aux:nN on line ...
 Defining \__kernel_register_show:c on line ...
 Defining \__kernel_register_log:N on line ...
 Defining \__kernel_register_log:c on line ...
@@ -4386,8 +4387,11 @@
 Defining \box_log:N on line ...
 Defining \box_log:c on line ...
 Defining \box_log:Nnn on line ...
+Defining \__box_log:nNnn on line ...
 Defining \box_log:cnn on line ...
 Defining \__box_show:NNnn on line ...
+Defining \exp_args:NNNff on line ...
+Defining \__box_show:NNff on line ...
 Defining \hbox:n on line ...
 Defining \hbox_set:Nn on line ...
 Defining \hbox_gset:Nn on line ...

Modified: trunk/l3kernel/testfiles/m3expl001.xetex.tlg
===================================================================
--- trunk/l3kernel/testfiles/m3expl001.xetex.tlg	2017-02-14 12:18:32 UTC (rev 6927)
+++ trunk/l3kernel/testfiles/m3expl001.xetex.tlg	2017-02-14 15:51:06 UTC (rev 6928)
@@ -114,6 +114,7 @@
 Defining \cs_if_eq:ccT on line ...
 Defining \cs_if_eq:ccF on line ...
 Defining \__kernel_register_show:N on line ...
+Defining \__kernel_register_show_aux:nN on line ...
 Defining \__kernel_register_show:c on line ...
 Defining \__kernel_register_log:N on line ...
 Defining \__kernel_register_log:c on line ...
@@ -4396,8 +4397,11 @@
 Defining \box_log:N on line ...
 Defining \box_log:c on line ...
 Defining \box_log:Nnn on line ...
+Defining \__box_log:nNnn on line ...
 Defining \box_log:cnn on line ...
 Defining \__box_show:NNnn on line ...
+Defining \exp_args:NNNff on line ...
+Defining \__box_show:NNff on line ...
 Defining \hbox:n on line ...
 Defining \hbox_set:Nn on line ...
 Defining \hbox_gset:Nn on line ...

Modified: trunk/l3kernel/testfiles/m3expl003.luatex.tlg
===================================================================
--- trunk/l3kernel/testfiles/m3expl003.luatex.tlg	2017-02-14 12:18:32 UTC (rev 6927)
+++ trunk/l3kernel/testfiles/m3expl003.luatex.tlg	2017-02-14 15:51:06 UTC (rev 6928)
@@ -115,6 +115,7 @@
 Defining \cs_if_eq:ccT on line ...
 Defining \cs_if_eq:ccF on line ...
 Defining \__kernel_register_show:N on line ...
+Defining \__kernel_register_show_aux:nN on line ...
 Defining \__kernel_register_show:c on line ...
 Defining \__kernel_register_log:N on line ...
 Defining \__kernel_register_log:c on line ...
@@ -4419,8 +4420,11 @@
 Defining \box_log:N on line ...
 Defining \box_log:c on line ...
 Defining \box_log:Nnn on line ...
+Defining \__box_log:nNnn on line ...
 Defining \box_log:cnn on line ...
 Defining \__box_show:NNnn on line ...
+Defining \exp_args:NNNff on line ...
+Defining \__box_show:NNff on line ...
 Defining \hbox:n on line ...
 Defining \hbox_set:Nn on line ...
 Defining \hbox_gset:Nn on line ...

Modified: trunk/l3kernel/testfiles/m3expl003.ptex.tlg
===================================================================
--- trunk/l3kernel/testfiles/m3expl003.ptex.tlg	2017-02-14 12:18:32 UTC (rev 6927)
+++ trunk/l3kernel/testfiles/m3expl003.ptex.tlg	2017-02-14 15:51:06 UTC (rev 6928)
@@ -114,6 +114,7 @@
 Defining \cs_if_eq:ccT on line ...
 Defining \cs_if_eq:ccF on line ...
 Defining \__kernel_register_show:N on line ...
+Defining \__kernel_register_show_aux:nN on line ...
 Defining \__kernel_register_show:c on line ...
 Defining \__kernel_register_log:N on line ...
 Defining \__kernel_register_log:c on line ...
@@ -4387,8 +4388,11 @@
 Defining \box_log:N on line ...
 Defining \box_log:c on line ...
 Defining \box_log:Nnn on line ...
+Defining \__box_log:nNnn on line ...
 Defining \box_log:cnn on line ...
 Defining \__box_show:NNnn on line ...
+Defining \exp_args:NNNff on line ...
+Defining \__box_show:NNff on line ...
 Defining \hbox:n on line ...
 Defining \hbox_set:Nn on line ...
 Defining \hbox_gset:Nn on line ...

Modified: trunk/l3kernel/testfiles/m3expl003.tlg
===================================================================
--- trunk/l3kernel/testfiles/m3expl003.tlg	2017-02-14 12:18:32 UTC (rev 6927)
+++ trunk/l3kernel/testfiles/m3expl003.tlg	2017-02-14 15:51:06 UTC (rev 6928)
@@ -114,6 +114,7 @@
 Defining \cs_if_eq:ccT on line ...
 Defining \cs_if_eq:ccF on line ...
 Defining \__kernel_register_show:N on line ...
+Defining \__kernel_register_show_aux:nN on line ...
 Defining \__kernel_register_show:c on line ...
 Defining \__kernel_register_log:N on line ...
 Defining \__kernel_register_log:c on line ...
@@ -4407,8 +4408,11 @@
 Defining \box_log:N on line ...
 Defining \box_log:c on line ...
 Defining \box_log:Nnn on line ...
+Defining \__box_log:nNnn on line ...
 Defining \box_log:cnn on line ...
 Defining \__box_show:NNnn on line ...
+Defining \exp_args:NNNff on line ...
+Defining \__box_show:NNff on line ...
 Defining \hbox:n on line ...
 Defining \hbox_set:Nn on line ...
 Defining \hbox_gset:Nn on line ...

Modified: trunk/l3kernel/testfiles/m3expl003.uptex.tlg
===================================================================
--- trunk/l3kernel/testfiles/m3expl003.uptex.tlg	2017-02-14 12:18:32 UTC (rev 6927)
+++ trunk/l3kernel/testfiles/m3expl003.uptex.tlg	2017-02-14 15:51:06 UTC (rev 6928)
@@ -114,6 +114,7 @@
 Defining \cs_if_eq:ccT on line ...
 Defining \cs_if_eq:ccF on line ...
 Defining \__kernel_register_show:N on line ...
+Defining \__kernel_register_show_aux:nN on line ...
 Defining \__kernel_register_show:c on line ...
 Defining \__kernel_register_log:N on line ...
 Defining \__kernel_register_log:c on line ...
@@ -4387,8 +4388,11 @@
 Defining \box_log:N on line ...
 Defining \box_log:c on line ...
 Defining \box_log:Nnn on line ...
+Defining \__box_log:nNnn on line ...
 Defining \box_log:cnn on line ...
 Defining \__box_show:NNnn on line ...
+Defining \exp_args:NNNff on line ...
+Defining \__box_show:NNff on line ...
 Defining \hbox:n on line ...
 Defining \hbox_set:Nn on line ...
 Defining \hbox_gset:Nn on line ...

Modified: trunk/l3kernel/testfiles/m3expl003.xetex.tlg
===================================================================
--- trunk/l3kernel/testfiles/m3expl003.xetex.tlg	2017-02-14 12:18:32 UTC (rev 6927)
+++ trunk/l3kernel/testfiles/m3expl003.xetex.tlg	2017-02-14 15:51:06 UTC (rev 6928)
@@ -114,6 +114,7 @@
 Defining \cs_if_eq:ccT on line ...
 Defining \cs_if_eq:ccF on line ...
 Defining \__kernel_register_show:N on line ...
+Defining \__kernel_register_show_aux:nN on line ...
 Defining \__kernel_register_show:c on line ...
 Defining \__kernel_register_log:N on line ...
 Defining \__kernel_register_log:c on line ...
@@ -4397,8 +4398,11 @@
 Defining \box_log:N on line ...
 Defining \box_log:c on line ...
 Defining \box_log:Nnn on line ...
+Defining \__box_log:nNnn on line ...
 Defining \box_log:cnn on line ...
 Defining \__box_show:NNnn on line ...
+Defining \exp_args:NNNff on line ...
+Defining \__box_show:NNff on line ...
 Defining \hbox:n on line ...
 Defining \hbox_set:Nn on line ...
 Defining \hbox_gset:Nn on line ...

Modified: trunk/l3kernel/testfiles/m3show002.luatex.tlg
===================================================================
--- trunk/l3kernel/testfiles/m3show002.luatex.tlg	2017-02-14 12:18:32 UTC (rev 6927)
+++ trunk/l3kernel/testfiles/m3show002.luatex.tlg	2017-02-14 15:51:06 UTC (rev 6928)
@@ -101,6 +101,9 @@
 > :=the letter :.
 <recently read> }
 l. ...  }
+> \\=\long macro:->\test .
+<recently read> }
+l. ...  }
 ============================================================
 ============================================================
 TEST 6: COFFIN

Modified: trunk/l3kernel/testfiles/m3show002.lvt
===================================================================
--- trunk/l3kernel/testfiles/m3show002.lvt	2017-02-14 12:18:32 UTC (rev 6927)
+++ trunk/l3kernel/testfiles/m3show002.lvt	2017-02-14 15:51:06 UTC (rev 6928)
@@ -75,6 +75,9 @@
     \cs_show:c { \prg_replicate:nn { 75 } { a } }
     \cs_show:N &
     \cs_show:N :
+    \int_set:Nn \tex_escapechar:D { `\X }
+    \cs_set:Npn \\ { \test }
+    \cs_show:N \\
   }
 
 \TEST { COFFIN }

Modified: trunk/l3kernel/testfiles/m3show002.tlg
===================================================================
--- trunk/l3kernel/testfiles/m3show002.tlg	2017-02-14 12:18:32 UTC (rev 6927)
+++ trunk/l3kernel/testfiles/m3show002.tlg	2017-02-14 15:51:06 UTC (rev 6928)
@@ -99,6 +99,9 @@
 > :=the letter :.
 <recently read> }
 l. ...  }
+> \\=\long macro:->\test .
+<recently read> }
+l. ...  }
 ============================================================
 ============================================================
 TEST 6: COFFIN



More information about the latex3-commits mailing list