[latex3-commits] [git/LaTeX3-latex3-latex2e] develop: draft for #735 (and latex3/179) (#737) (cdf9e217)

GitHub noreply at github.com
Sat Jan 1 23:45:08 CET 2022


Repository : https://github.com/latex3/latex2e
On branch  : develop
Link       : https://github.com/latex3/latex2e/commit/cdf9e21785bfb2a080bca37d797fc89a66fc8a41

>---------------------------------------------------------------

commit cdf9e21785bfb2a080bca37d797fc89a66fc8a41
Author: Frank Mittelbach <frank.mittelbach at latex-project.org>
Date:   Sat Jan 1 23:45:08 2022 +0100

    draft for #735 (and latex3/179) (#737)


>---------------------------------------------------------------

cdf9e21785bfb2a080bca37d797fc89a66fc8a41
 base/changes.txt                                   | 11 +++-
 base/doc/ltnews35.tex                              | 41 +++++++++++++++
 base/doc/usrguide3.tex                             | 61 +++++++++++++++++++++-
 base/ltexpl.dtx                                    | 48 +++++++++++++++++
 base/testfiles/github-0479-often.luatex.tlg        |  2 +
 base/testfiles/github-0479-often.tlg               |  2 +
 base/testfiles/github-0479-often.xetex.tlg         |  2 +
 base/testfiles/github-0735.lvt                     | 28 ++++++++++
 base/testfiles/github-0735.tlg                     | 31 +++++++++++
 .../tlb-latexrelease-rollback-003-often.luatex.tlg |  4 ++
 .../tlb-latexrelease-rollback-003-often.tlg        |  4 ++
 .../tlb-latexrelease-rollback-003-often.xetex.tlg  |  4 ++
 base/testfiles/tlb-rollback-004-often.luatex.tlg   |  2 +
 base/testfiles/tlb-rollback-004-often.tlg          |  2 +
 base/testfiles/tlb-rollback-004-often.xetex.tlg    |  2 +
 base/testfiles/tlb-rollback-005.luatex.tlg         |  2 +
 base/testfiles/tlb-rollback-005.tlg                |  2 +
 base/testfiles/tlb-rollback-005.xetex.tlg          |  2 +
 18 files changed, 247 insertions(+), 3 deletions(-)

diff --git a/base/changes.txt b/base/changes.txt
index ca0f92a6..3902e2b1 100644
--- a/base/changes.txt
+++ b/base/changes.txt
@@ -6,9 +6,16 @@ completeness or accuracy and it contains some references to files that
 are not part of the distribution.
 ================================================================================
 
+2021-12-28  Frank Mittelbach  <Frank.Mittelbach at latex-project.org>
+
+	* ltexpl.dtx (section{Document-level command names for expl3 functions}):
+	Added document.level names for \exp_args:Nc and the like
+	for use with \NewDocumentCommand, etc. (gh/735)
+
 2021-12-27  Marcel Krüger  <Marcel.Krueger at latex-project.org>
-  * ltluatex.dtx:
-  Added \newluacmd and \newprotectedluacmd to simply allocating Lua command ids.
+
+	* ltluatex.dtx:
+	Added \newluacmd and \newprotectedluacmd for easy allocation of Lua command ids.
 
 2021-12-13  Frank Mittelbach  <Frank.Mittelbach at latex-project.org>
 
diff --git a/base/doc/ltnews35.tex b/base/doc/ltnews35.tex
index 79c439ef..428555e9 100644
--- a/base/doc/ltnews35.tex
+++ b/base/doc/ltnews35.tex
@@ -232,6 +232,47 @@ a given number of text lines.
 \githubissue{711}
 
 
+\subsection{CamelCase commands for changing arguments to csnames}
+
+It is sometimes helpful to \enquote{construct} a command name on the
+fly rather than providing it as a single \cs{...} token. For these
+kind of tasks the \LaTeX3 programming layer offers a general mechanism
+(in form of \cs{exp\_args:N...} and
+\cs{cs\_generate\_variant:Nn}). However, when declaring new
+document-level commands with \cs{NewDocumentCommand} or
+\cs{NewCommandCopy}, etc.\ the L3 programming layer may not be active,
+and even if it is, mixing CamelCase syntax with L3 programming syntax
+is not really a good approach. We have therefore added the commands
+\cs{ExpandNc}, \cs{ExpandNcc}, and \cs{ExpandNNc} to assist in such
+situations, e.g.,
+\begin{verbatim}
+\NewDocumentCommand\newcopyedit{mO{red}}
+  {\newcounter{todo#1}% 
+   \ExpandNc\NewDocumentCommand{#1}{s m}%
+     {\stepcounter{todo#1}%
+      \IfBooleanTF {##1}%
+         {\todo[color=#2!10]%
+            {\Expandc{thetodo#1}: ##2}}%
+         {\todo[inline,color=#2!10]%
+            {\Expandc{thetodo#1}: ##2}}%
+     }%
+  }
+\end{verbatim}
+which provides a declaration mechanism for copyedit commands, so that
+\verb=\newcopyedit{FMi}[blue]= then defines \cs{FMi} (and the
+necessary counter).
+
+The commands \cs{ExpandNcc} and \cs{ExpandNNc} can be useful in
+combination with \cs{NewCommandCopy} if the old or new command name
+or both need constructing. Finally, there is \cs{Expandc} which
+takes its argument and turns it into a command (i.e., a CamelCase
+version of \cs{@nameuse} (\LaTeXe) or \cs{use:c} (L3 programming
+layer)) which was also used in the example above.
+%
+\githubissue{735}
+
+
+
 \subsection{???}
 %
 \githubissue{???}
diff --git a/base/doc/usrguide3.tex b/base/doc/usrguide3.tex
index 8f416765..7d12958a 100644
--- a/base/doc/usrguide3.tex
+++ b/base/doc/usrguide3.tex
@@ -37,7 +37,7 @@
 \author{\copyright~Copyright 2020-2021, \LaTeX\ Project Team.\\
    All rights reserved.}
 
-\date{2021-12-07}
+\date{2021-12-28}
 
 \NewDocumentCommand\cs{m}{\texttt{\textbackslash\detokenize{#1}}}
 \NewDocumentCommand\marg{m}{\arg{#1}}
@@ -727,6 +727,65 @@ specification then an error is issued.
 
 
 
+\section{Copying and showing (robust) commands}
+
+\begin{decl}
+  |\NewCommandCopy|       \arg{cmd} \arg{existing-cmd} \\
+  |\RenewCommandCopy|     \arg{cmd} \arg{existing-cmd} \\
+  |\DeclareCommandCopy|   \arg{cmd} \arg{existing-cmd}
+\end{decl}
+
+\emph{documentation to write}
+
+\begin{decl}
+  |\ShowCommand|       \arg{cmd}
+\end{decl}
+
+\emph{documentation to write}
+
+
+\section{Preconstructing command names}
+
+\begin{decl}
+  |\Expandc|               \arg{string} \\
+  |\ExpandNc|    \arg{cmd} \arg{string} \\
+  |\ExpandNcc|   \arg{cmd} \arg{string} \arg{string} \\
+  |\ExpandNNc|   \arg{cmd} \arg{cmd\textsubscript{2}} \arg{string} 
+\end{decl}
+
+When declaring new commands with \cs{NewDocumentCommand} or
+\cs{NewCommandCopy} or similar, it is sometimes necessary to
+``construct'' the csname. As a general mechanism the L3 programming
+layer has \cs{exp_args:N...} for this, but there is no mechanism for
+it if \cs{ExplSyntaxOn} is not active (and mixing programming and user
+interface level commands is not a good approach anyhow). We therefore
+offer a few of these commands also with CamelCase names.
+
+All four commands first turn the \meta{string} argument(s) into
+csnames and then execute \meta{cmd}, or in case of \cs{Expandc}
+execute the generated csname.
+
+As an example, the following declaration provides a method to generate
+copyedit commands:
+\begin{verbatim}
+\NewDocumentCommand\newcopyedit{mO{red}}
+  {\newcounter{todo#1}% 
+   \ExpandNc\NewDocumentCommand{#1}{s m}%
+     {\stepcounter{todo#1}%
+      \IfBooleanTF {##1}%
+         {\todo[color=#2!10]{\Expandc{thetodo#1}: ##2}}%
+         {\todo[inline,color=#2!10]{\Expandc{thetodo#1}: ##2}}%
+     }%
+  }
+\end{verbatim}
+Given that declaration you can then write
+\verb/\newcopyedit{note}[blue]/ which defines the command \cs{note}
+and corresponding counter for you.
+
+
+
+
+
 \section{Expandable floating point (and other) calculations}
 
 The \LaTeX3 programming layer which is part of the format offers a
diff --git a/base/ltexpl.dtx b/base/ltexpl.dtx
index 2291a1a9..eb1dd78b 100644
--- a/base/ltexpl.dtx
+++ b/base/ltexpl.dtx
@@ -461,4 +461,52 @@
 %<latexrelease>\EndIncludeInRelease
 %    \end{macrocode}
 %
+%
+% \DescribeMacro\Expandc
+% \DescribeMacro\ExpandNc
+% \DescribeMacro\ExpandNcc
+% \DescribeMacro\ExpandNNc
+%    When declaring new commands with \cs{NewDocumentCommand} or
+%    \cs{NewCommandCopy} or similar, it is sometimes necessary to
+%    ``construct'' the csname. As a general mechanism the L3
+%    programming layer has \cs{exp\_args:N...} for this, but there is
+%    no mechanism for it  if \cs{ExplSyntaxOn} is not active. We
+%    therefore offer a few of these commands also with CamelCase names.
+%
+%
+% \begin{macro}{\Expandc,\ExpandNc,\ExpandNcc,\ExpandNNc}
+%    A document wrapper for changing arguments to cs names for use
+%    with \cs{NewDocumentCommand} and similar functions.
+%
+% \changes{v1.3d}{2021/12/28}{Added document level names for \cs{exp\_args:Nc} and the like (gh/735)}
+%    \begin{macrocode}
+%<*2ekernel|latexrelease>
+%<latexrelease>\IncludeInRelease{2022/06/01}%
+%<latexrelease>                 {\Expandc}{Some pre-expansion commands}%
+\ExplSyntaxOn
+\cs_new_eq:NN \Expandc \use:c
+%    \end{macrocode}
+%
+%    \begin{macrocode}
+\cs_new_eq:NN \ExpandNc \exp_args:Nc
+\cs_new_eq:NN \ExpandNcc \exp_args:Ncc
+\cs_new_eq:NN \ExpandNNc \exp_args:NNc
+\ExplSyntaxOff
+%    \end{macrocode}
+% \end{macro}
+%
+%    \begin{macrocode}
+%</2ekernel|latexrelease>
+%<latexrelease>\EndIncludeInRelease
+%<latexrelease>\IncludeInRelease{0000/00/00}%
+%<latexrelease>                 {\Expandc}{Some pre-expansion commands}%
+
+%<latexrelease>
+%<latexrelease>\let\Expandc\@undefined
+%<latexrelease>\let\ExpandNc\@undefined
+%<latexrelease>\let\ExpandNcc\@undefined
+%<latexrelease>\let\ExpandNNc\@undefined
+%<latexrelease>\EndIncludeInRelease
+%    \end{macrocode}
+%
 % \Finale
diff --git a/base/testfiles/github-0479-often.luatex.tlg b/base/testfiles/github-0479-often.luatex.tlg
index da2f19a0..efd29c6e 100644
--- a/base/testfiles/github-0479-often.luatex.tlg
+++ b/base/testfiles/github-0479-often.luatex.tlg
@@ -53,6 +53,8 @@ Applying: [....-..-..] expl3 macros added for the ....-..-.. release on input li
 Already applied: [....-..-..] expl3 macros added for the ....-..-.. release on input line ....
 Skipping: [....-..-..] fp and int calculations on input line ....
 Applying: [....-..-..] fp and int calculations on input line ....
+Skipping: [....-..-..] Some pre-expansion commands on input line ....
+Applying: [....-..-..] Some pre-expansion commands on input line ....
 Applying: [....-..-..] Allow "par" in \typeout  on input line ....
 Already applied: [....-..-..] Allow "par" in \typeout  on input line ....
 Applying: [....-..-..] Make \@carcube long on input line ....
diff --git a/base/testfiles/github-0479-often.tlg b/base/testfiles/github-0479-often.tlg
index ec64e8af..240819f8 100644
--- a/base/testfiles/github-0479-often.tlg
+++ b/base/testfiles/github-0479-often.tlg
@@ -42,6 +42,8 @@ Applying: [....-..-..] expl3 macros added for the ....-..-.. release on input li
 Already applied: [....-..-..] expl3 macros added for the ....-..-.. release on input line ....
 Skipping: [....-..-..] fp and int calculations on input line ....
 Applying: [....-..-..] fp and int calculations on input line ....
+Skipping: [....-..-..] Some pre-expansion commands on input line ....
+Applying: [....-..-..] Some pre-expansion commands on input line ....
 Applying: [....-..-..] Allow "par" in \typeout  on input line ....
 Already applied: [....-..-..] Allow "par" in \typeout  on input line ....
 Applying: [....-..-..] Make \@carcube long on input line ....
diff --git a/base/testfiles/github-0479-often.xetex.tlg b/base/testfiles/github-0479-often.xetex.tlg
index a7723130..1d0fa3d3 100644
--- a/base/testfiles/github-0479-often.xetex.tlg
+++ b/base/testfiles/github-0479-often.xetex.tlg
@@ -42,6 +42,8 @@ Applying: [....-..-..] expl3 macros added for the ....-..-.. release on input li
 Already applied: [....-..-..] expl3 macros added for the ....-..-.. release on input line ....
 Skipping: [....-..-..] fp and int calculations on input line ....
 Applying: [....-..-..] fp and int calculations on input line ....
+Skipping: [....-..-..] Some pre-expansion commands on input line ....
+Applying: [....-..-..] Some pre-expansion commands on input line ....
 Applying: [....-..-..] Allow "par" in \typeout  on input line ....
 Already applied: [....-..-..] Allow "par" in \typeout  on input line ....
 Applying: [....-..-..] Make \@carcube long on input line ....
diff --git a/base/testfiles/github-0735.lvt b/base/testfiles/github-0735.lvt
new file mode 100644
index 00000000..247aed99
--- /dev/null
+++ b/base/testfiles/github-0735.lvt
@@ -0,0 +1,28 @@
+
+\documentclass{minimal}
+\input{regression-test}
+
+\START
+
+
+\TEST { pre-expansion one argument}
+  {
+    \ExpandNc \NewDocumentCommand{foo}{om}{???}   
+    \ShowCommand\foo
+    \ExpandNc \ShowCommand {foo}
+    \ExpandNc \NewCommandCopy {baz} \foo
+    \ShowCommand\baz
+    \Expandc {typeout}{Ok?}
+  }
+
+\TEST { pre-expansion two arguments}
+  {
+    \NewDocumentCommand\foo {om}{???}   
+    \ExpandNcc \NewCommandCopy {baz} {foo}
+    \ShowCommand\baz
+    \ExpandNNc \RenewCommandCopy \baz {foo}
+    \ShowCommand\baz
+  }
+
+
+\END
diff --git a/base/testfiles/github-0735.tlg b/base/testfiles/github-0735.tlg
new file mode 100644
index 00000000..5a521cac
--- /dev/null
+++ b/base/testfiles/github-0735.tlg
@@ -0,0 +1,31 @@
+This is a generated file for the l3build validation system.
+Don't change this file in any respect.
+============================================================
+TEST 1:  pre-expansion one argument
+============================================================
+> \foo=document command:
+  #1:o
+  #2:m
+->???.
+> \foo=document command:
+  #1:o
+  #2:m
+->???.
+> \baz=document command:
+  #1:o
+  #2:m
+->???.
+Ok?
+============================================================
+============================================================
+TEST 2:  pre-expansion two arguments
+============================================================
+> \baz=document command:
+  #1:o
+  #2:m
+->???.
+> \baz=document command:
+  #1:o
+  #2:m
+->???.
+============================================================
diff --git a/base/testfiles/tlb-latexrelease-rollback-003-often.luatex.tlg b/base/testfiles/tlb-latexrelease-rollback-003-often.luatex.tlg
index e1965ad9..be045025 100644
--- a/base/testfiles/tlb-latexrelease-rollback-003-often.luatex.tlg
+++ b/base/testfiles/tlb-latexrelease-rollback-003-often.luatex.tlg
@@ -50,6 +50,8 @@ Skipping: [....-..-..] expl3 macros added for the ....-..-.. release on input li
 Applying: [....-..-..] expl3 macros added for the ....-..-.. release on input line ....
 Skipping: [....-..-..] fp and int calculations on input line ....
 Applying: [....-..-..] fp and int calculations on input line ....
+Skipping: [....-..-..] Some pre-expansion commands on input line ....
+Applying: [....-..-..] Some pre-expansion commands on input line ....
 Skipping: [....-..-..] Allow "par" in \typeout  on input line ....
 Applying: [....-..-..] Allow "par" in \typeout  on input line ....
 Skipping: [....-..-..] Make \@carcube long on input line ....
@@ -639,6 +641,8 @@ Skipping: [....-..-..] expl3 macros added for the ....-.-.. release on input li
 Applying: [....-..-..] expl3 macros added for the ....-..-.. release on input line ....
 Skipping: [....-..-..] fp and int calculations on input line ....
 Applying: [....-..-..] fp and int calculations on input line ....
+Skipping: [....-..-..] Some pre-expansion commands on input line ....
+Applying: [....-..-..] Some pre-expansion commands on input line ....
 Skipping: [....-..-..] Allow "par" in \typeout  on input line ....
 Applying: [....-..-..] Allow "par" in \typeout  on input line ....
 Skipping: [....-..-..] Make \@carcube long on input line ....
diff --git a/base/testfiles/tlb-latexrelease-rollback-003-often.tlg b/base/testfiles/tlb-latexrelease-rollback-003-often.tlg
index 370552d1..ff5c367d 100644
--- a/base/testfiles/tlb-latexrelease-rollback-003-often.tlg
+++ b/base/testfiles/tlb-latexrelease-rollback-003-often.tlg
@@ -44,6 +44,8 @@ Skipping: [....-..-..] expl3 macros added for the ....-..-.. release on input li
 Applying: [....-..-..] expl3 macros added for the ....-..-.. release on input line ....
 Skipping: [....-..-..] fp and int calculations on input line ....
 Applying: [....-..-..] fp and int calculations on input line ....
+Skipping: [....-..-..] Some pre-expansion commands on input line ....
+Applying: [....-..-..] Some pre-expansion commands on input line ....
 Skipping: [....-..-..] Allow "par" in \typeout  on input line ....
 Applying: [....-..-..] Allow "par" in \typeout  on input line ....
 Skipping: [....-..-..] Make \@carcube long on input line ....
@@ -623,6 +625,8 @@ Skipping: [....-..-..] expl3 macros added for the ....-.-.. release on input li
 Applying: [....-..-..] expl3 macros added for the ....-..-.. release on input line ....
 Skipping: [....-..-..] fp and int calculations on input line ....
 Applying: [....-..-..] fp and int calculations on input line ....
+Skipping: [....-..-..] Some pre-expansion commands on input line ....
+Applying: [....-..-..] Some pre-expansion commands on input line ....
 Skipping: [....-..-..] Allow "par" in \typeout  on input line ....
 Applying: [....-..-..] Allow "par" in \typeout  on input line ....
 Skipping: [....-..-..] Make \@carcube long on input line ....
diff --git a/base/testfiles/tlb-latexrelease-rollback-003-often.xetex.tlg b/base/testfiles/tlb-latexrelease-rollback-003-often.xetex.tlg
index 0fe53e1a..0af3d791 100644
--- a/base/testfiles/tlb-latexrelease-rollback-003-often.xetex.tlg
+++ b/base/testfiles/tlb-latexrelease-rollback-003-often.xetex.tlg
@@ -44,6 +44,8 @@ Skipping: [....-..-..] expl3 macros added for the ....-..-.. release on input li
 Applying: [....-..-..] expl3 macros added for the ....-..-.. release on input line ....
 Skipping: [....-..-..] fp and int calculations on input line ....
 Applying: [....-..-..] fp and int calculations on input line ....
+Skipping: [....-..-..] Some pre-expansion commands on input line ....
+Applying: [....-..-..] Some pre-expansion commands on input line ....
 Skipping: [....-..-..] Allow "par" in \typeout  on input line ....
 Applying: [....-..-..] Allow "par" in \typeout  on input line ....
 Skipping: [....-..-..] Make \@carcube long on input line ....
@@ -632,6 +634,8 @@ Skipping: [....-..-..] expl3 macros added for the ....-.-.. release on input li
 Applying: [....-..-..] expl3 macros added for the ....-..-.. release on input line ....
 Skipping: [....-..-..] fp and int calculations on input line ....
 Applying: [....-..-..] fp and int calculations on input line ....
+Skipping: [....-..-..] Some pre-expansion commands on input line ....
+Applying: [....-..-..] Some pre-expansion commands on input line ....
 Skipping: [....-..-..] Allow "par" in \typeout  on input line ....
 Applying: [....-..-..] Allow "par" in \typeout  on input line ....
 Skipping: [....-..-..] Make \@carcube long on input line ....
diff --git a/base/testfiles/tlb-rollback-004-often.luatex.tlg b/base/testfiles/tlb-rollback-004-often.luatex.tlg
index b5d48cc8..57928cbd 100644
--- a/base/testfiles/tlb-rollback-004-often.luatex.tlg
+++ b/base/testfiles/tlb-rollback-004-often.luatex.tlg
@@ -53,6 +53,8 @@ Skipping: [....-..-..] expl3 macros added for the ....-..-.. release on input li
 Applying: [....-..-..] expl3 macros added for the ....-..-.. release on input line ....
 Skipping: [....-..-..] fp and int calculations on input line ....
 Applying: [....-..-..] fp and int calculations on input line ....
+Skipping: [....-..-..] Some pre-expansion commands on input line ....
+Applying: [....-..-..] Some pre-expansion commands on input line ....
 Skipping: [....-..-..] Allow "par" in \typeout  on input line ....
 Applying: [....-..-..] Allow "par" in \typeout  on input line ....
 Skipping: [....-..-..] Make \@carcube long on input line ....
diff --git a/base/testfiles/tlb-rollback-004-often.tlg b/base/testfiles/tlb-rollback-004-often.tlg
index 83d5d3e4..4337dca6 100644
--- a/base/testfiles/tlb-rollback-004-often.tlg
+++ b/base/testfiles/tlb-rollback-004-often.tlg
@@ -42,6 +42,8 @@ Skipping: [....-..-..] expl3 macros added for the ....-..-.. release on input li
 Applying: [....-..-..] expl3 macros added for the ....-..-.. release on input line ....
 Skipping: [....-..-..] fp and int calculations on input line ....
 Applying: [....-..-..] fp and int calculations on input line ....
+Skipping: [....-..-..] Some pre-expansion commands on input line ....
+Applying: [....-..-..] Some pre-expansion commands on input line ....
 Skipping: [....-..-..] Allow "par" in \typeout  on input line ....
 Applying: [....-..-..] Allow "par" in \typeout  on input line ....
 Skipping: [....-..-..] Make \@carcube long on input line ....
diff --git a/base/testfiles/tlb-rollback-004-often.xetex.tlg b/base/testfiles/tlb-rollback-004-often.xetex.tlg
index 727a3f21..a5df1705 100644
--- a/base/testfiles/tlb-rollback-004-often.xetex.tlg
+++ b/base/testfiles/tlb-rollback-004-often.xetex.tlg
@@ -42,6 +42,8 @@ Skipping: [....-..-..] expl3 macros added for the ....-..-.. release on input li
 Applying: [....-..-..] expl3 macros added for the ....-..-.. release on input line ....
 Skipping: [....-..-..] fp and int calculations on input line ....
 Applying: [....-..-..] fp and int calculations on input line ....
+Skipping: [....-..-..] Some pre-expansion commands on input line ....
+Applying: [....-..-..] Some pre-expansion commands on input line ....
 Skipping: [....-..-..] Allow "par" in \typeout  on input line ....
 Applying: [....-..-..] Allow "par" in \typeout  on input line ....
 Skipping: [....-..-..] Make \@carcube long on input line ....
diff --git a/base/testfiles/tlb-rollback-005.luatex.tlg b/base/testfiles/tlb-rollback-005.luatex.tlg
index 9a8bb0cd..a15b1e85 100644
--- a/base/testfiles/tlb-rollback-005.luatex.tlg
+++ b/base/testfiles/tlb-rollback-005.luatex.tlg
@@ -57,6 +57,8 @@ Applying: [....-..-..] expl3 macros added for the ....-..-.. release on input li
 Already applied: [....-..-..] expl3 macros added for the ....-..-.. release on input line ....
 Skipping: [....-..-..] fp and int calculations on input line ....
 Applying: [....-..-..] fp and int calculations on input line ....
+Skipping: [....-..-..] Some pre-expansion commands on input line ....
+Applying: [....-..-..] Some pre-expansion commands on input line ....
 Applying: [....-..-..] Allow "par" in \typeout  on input line ....
 Already applied: [....-..-..] Allow "par" in \typeout  on input line ....
 Applying: [....-..-..] Make \@carcube long on input line ....
diff --git a/base/testfiles/tlb-rollback-005.tlg b/base/testfiles/tlb-rollback-005.tlg
index c32a7ad9..7e870ab6 100644
--- a/base/testfiles/tlb-rollback-005.tlg
+++ b/base/testfiles/tlb-rollback-005.tlg
@@ -46,6 +46,8 @@ Applying: [....-..-..] expl3 macros added for the ....-..-.. release on input li
 Already applied: [....-..-..] expl3 macros added for the ....-..-.. release on input line ....
 Skipping: [....-..-..] fp and int calculations on input line ....
 Applying: [....-..-..] fp and int calculations on input line ....
+Skipping: [....-..-..] Some pre-expansion commands on input line ....
+Applying: [....-..-..] Some pre-expansion commands on input line ....
 Applying: [....-..-..] Allow "par" in \typeout  on input line ....
 Already applied: [....-..-..] Allow "par" in \typeout  on input line ....
 Applying: [....-..-..] Make \@carcube long on input line ....
diff --git a/base/testfiles/tlb-rollback-005.xetex.tlg b/base/testfiles/tlb-rollback-005.xetex.tlg
index 61065f03..84352cad 100644
--- a/base/testfiles/tlb-rollback-005.xetex.tlg
+++ b/base/testfiles/tlb-rollback-005.xetex.tlg
@@ -46,6 +46,8 @@ Applying: [....-..-..] expl3 macros added for the ....-..-.. release on input li
 Already applied: [....-..-..] expl3 macros added for the ....-..-.. release on input line ....
 Skipping: [....-..-..] fp and int calculations on input line ....
 Applying: [....-..-..] fp and int calculations on input line ....
+Skipping: [....-..-..] Some pre-expansion commands on input line ....
+Applying: [....-..-..] Some pre-expansion commands on input line ....
 Applying: [....-..-..] Allow "par" in \typeout  on input line ....
 Already applied: [....-..-..] Allow "par" in \typeout  on input line ....
 Applying: [....-..-..] Make \@carcube long on input line ....





More information about the latex3-commits mailing list.