[latex3-commits] [git/LaTeX3-latex3-latex2e] gh711: move defs to ltexpl for now (959b846c)
Frank Mittelbach
frank.mittelbach at latex-project.org
Tue Dec 7 17:30:14 CET 2021
Repository : https://github.com/latex3/latex2e
On branch : gh711
Link : https://github.com/latex3/latex2e/commit/959b846c0b6905598efa6acf021951f00c4ab675
>---------------------------------------------------------------
commit 959b846c0b6905598efa6acf021951f00c4ab675
Author: Frank Mittelbach <frank.mittelbach at latex-project.org>
Date: Tue Dec 7 17:30:14 2021 +0100
move defs to ltexpl for now
>---------------------------------------------------------------
959b846c0b6905598efa6acf021951f00c4ab675
base/changes.txt | 2 +-
base/ltexpl.dtx | 76 +++++++++++++++++++++-
base/ltfinal.dtx | 68 +------------------
base/testfiles/github-0479-often.luatex.tlg | 4 +-
base/testfiles/github-0479-often.tlg | 4 +-
base/testfiles/github-0479-often.xetex.tlg | 4 +-
.../tlb-latexrelease-rollback-003-often.luatex.tlg | 8 +--
.../tlb-latexrelease-rollback-003-often.tlg | 8 +--
.../tlb-latexrelease-rollback-003-often.xetex.tlg | 8 +--
base/testfiles/tlb-rollback-004-often.luatex.tlg | 4 +-
base/testfiles/tlb-rollback-004-often.tlg | 4 +-
base/testfiles/tlb-rollback-004-often.xetex.tlg | 4 +-
base/testfiles/tlb-rollback-005.luatex.tlg | 4 +-
base/testfiles/tlb-rollback-005.tlg | 4 +-
base/testfiles/tlb-rollback-005.xetex.tlg | 4 +-
15 files changed, 108 insertions(+), 98 deletions(-)
diff --git a/base/changes.txt b/base/changes.txt
index 6c4997ce..18f55a69 100644
--- a/base/changes.txt
+++ b/base/changes.txt
@@ -8,7 +8,7 @@ are not part of the distribution.
2021-11-30 Frank Mittelbach <Frank.Mittelbach at latex-project.org>
- * ltfinal.dtx (subsection{Homeless declarations}):
+ * ltexpl.dtx:
Added \fpeval, \inteval, \dimeval, and \skipeval (gh711)
2021-11-17 Marcel Krüger <Marcel.Krueger at latex-project.org>
diff --git a/base/ltexpl.dtx b/base/ltexpl.dtx
index 021edc64..ff7e1128 100644
--- a/base/ltexpl.dtx
+++ b/base/ltexpl.dtx
@@ -33,7 +33,7 @@
%<*driver>
% \fi
\ProvidesFile{ltexpl.dtx}
- [2021/04/20 v1.3c LaTeX Kernel (expl3-dependent code)]
+ [2021/12/07 v1.3d LaTeX Kernel (expl3-dependent code)]
% \iffalse
\documentclass{ltxdoc}
\GetFileInfo{ltexpl.dtx}
@@ -387,4 +387,78 @@
% \end{macrocode}
%
%
+%
+%
+%
+%
+% \section{Document-level command names for \pkg{expl3} functions}
+%
+% Current home for L3 programing layer functions that we make
+% directly available at the document level. This section may need
+% to be moved later (after \cs{NewDocumentCommand} is defined in
+% case we want to use that in the setup.
+%
+%
+% \DescribeMacro\fpval
+% The expandable command \cs{fpeval} takes as its argument a
+% floating point expression and produces a result using the normal
+% rules of mathematics. As this command is expandable it can be
+% used where \TeX{} requires a number and for example within a
+% low-level \cs{edef} operation to give a purely numerical
+% result. See \texttt{usrguide3} for further explanation.
+%
+% \DescribeMacro\intval
+% \DescribeMacro\dimval
+% \DescribeMacro\skipval
+% The expandable command \cs{inteval} takes as its argument an
+% integer expression and produces a result using the normal rules
+% of mathematics. The operations recognised are |+|, |-|, |*| and
+% |/| plus parentheses. Division occurs with \emph{rounding}, and
+% ties are rounded away from zero. As this command is expandable it
+% can be used where \TeX{} requires a number and for example within
+% a low-level \cs{edef} operation to give a purely numerical
+% result. See \texttt{usrguide3} for further explanation.
+% \cs{dimeval} and \cs{skipeval} are similar, but generate fixed and
+% rubber length values, respectively.
+%
+%
+%
+% \begin{macro}{\fpeval,\inteval,\dimeval,\skipeval}
+% A document level wrapper around the code level function for
+% floating point calculations.
+% \changes{v1.3d}{2021/11/30}{Moved over from \texttt{xfp} package (gh/711)}
+% \begin{macrocode}
+%<*2ekernel|latexrelease>
+%<latexrelease>\IncludeInRelease{2022/06/01}%
+%<latexrelease> {\fpeval}{fp and int calculations}%
+\ExplSyntaxOn
+\cs_new_eq:NN \fpeval \fp_eval:n
+% \end{macrocode}
+% And a few more, this time wrappers around the e\TeX{} primitives.
+% \begin{macrocode}
+\cs_new_eq:NN \inteval \int_eval:n
+% \end{macrocode}
+%
+% \changes{v1.3d}{2021/12/07}{Added \cs{dimeval} and \cs{skipeval} (gh/711)}
+% \begin{macrocode}
+\cs_new_eq:NN \dimeval \dim_eval:n
+\cs_new_eq:NN \skipeval \skip_eval:n
+\ExplSyntaxOff
+% \end{macrocode}
+% \end{macro}
+%
+% \begin{macrocode}
+%</2ekernel|latexrelease>
+%<latexrelease>\EndIncludeInRelease
+%<latexrelease>\IncludeInRelease{0000/00/00}%
+%<latexrelease> {\fpeval}{fp and int calculations}%
+
+%<latexrelease>
+%<latexrelease>\let\fpeval\@undefined
+%<latexrelease>\let\inteval\@undefined
+%<latexrelease>\let\dimeval\@undefined
+%<latexrelease>\let\skipeval\@undefined
+%<latexrelease>\EndIncludeInRelease
+% \end{macrocode}
+%
% \Finale
diff --git a/base/ltfinal.dtx b/base/ltfinal.dtx
index 83d552ea..93fcd157 100644
--- a/base/ltfinal.dtx
+++ b/base/ltfinal.dtx
@@ -33,7 +33,7 @@
%<*driver>
% \fi
\ProvidesFile{ltfinal.dtx}
- [2021/12/07 v2.2r LaTeX Kernel (Final Settings)]
+ [2021/12/07 v2.2q LaTeX Kernel (Final Settings)]
% \iffalse
\documentclass{ltxdoc}
\GetFileInfo{ltfinal.dtx}
@@ -62,29 +62,6 @@
% some debugging and typesetting parameters, sets the default
% |\catcode|s and uc/lc codes, and inputs the hyphenation file.
%
-% It also is the home for definitions that are so far ``homeless''
-% because they do not (yet) fit into the current kernel structure
-% andd need integration at a later stage.
-%
-% \subsection{Homeless declarations}
-%
-% \DescribeMacro\fpval
-% The expandable command \cs{fpeval} takes as its argument a
-% floating point expression and produces a result using the normal
-% rules of mathematics. As this command is expandable it can be
-% used where \TeX{} requires a number and for example within a
-% low-level \cs{edef} operation to give a purely numerical
-% result. See \texttt{usrguide3} for further explanation.
-%
-% \DescribeMacro\intval
-% The expandable command \cs{inteval} takes as its argument an
-% integer expression and produces a result using the normal rules
-% of mathematics. The operations recognised are |+|, |-|, |*| and
-% |/| plus parentheses. Division occurs with \emph{rounding}, and
-% ties are rounded away from zero. As this command is expandable it
-% can be used where \TeX{} requires a number and for example within
-% a low-level \cs{edef} operation to give a purely numerical
-% result. See \texttt{usrguide3} for further explanation.
%
%
% \StopEventually{}
@@ -117,54 +94,13 @@
% \changes{v2.2i}{2020/08/21}{Integration of new hook management interface}
%
%
-% \begin{macrocode}
-% \end{macrocode}
-%
-% \begin{macro}{\fpeval,\inteval,\dimeval,\skipeval}
-% A document level wrapper around the code level function for
-% floating point calculations.
-% \changes{v2.2r}{2021/11/30}{Moved over from \texttt{xfp} package (gh/711)}
-% \begin{macrocode}
-%<*2ekernel|latexrelease>
-%<latexrelease>\IncludeInRelease{2022/06/01}%
-%<latexrelease> {\fpeval}{fp and int calculations}%
-\ExplSyntaxOn
-\NewExpandableDocumentCommand \fpeval { m } { \fp_eval:n {#1} }
-% \end{macrocode}
-% And a few more, this time wrappers around the \eTeX{} primitives.
-% \begin{macrocode}
-\NewExpandableDocumentCommand \inteval { m } { \int_eval:n {#1} }
-% \end{macrocode}
-%
-% \changes{v2.2r}{2021/12/07}{Added \cs{dimeval} and \cs{skipeval} (gh/711)}
-% \begin{macrocode}
-\NewExpandableDocumentCommand \dimeval { m } { \dim_eval:n {#1} }
-\NewExpandableDocumentCommand \skipeval { m }{ \skip_eval:n {#1} }
-\ExplSyntaxOff
-% \end{macrocode}
-% \end{macro}
-%
-% \begin{macrocode}
-%</2ekernel|latexrelease>
-%<latexrelease>\EndIncludeInRelease
-%<latexrelease>\IncludeInRelease{0000/00/00}%
-%<latexrelease> {\fpeval}{fp and int calculations}%
-
-%<latexrelease>
-%<latexrelease>\let\fpeval\@undefined
-%<latexrelease>\let\inteval\@undefined
-%<latexrelease>\let\dimeval\@undefined
-%<latexrelease>\let\skipeval\@undefined
-%<latexrelease>\EndIncludeInRelease
-%<*2ekernel>
-% \end{macrocode}
-%
%
%
% \subsection{Debugging}
%
% By default, \LaTeX{} shows statistics:
% \begin{macrocode}
+%<*2ekernel>
\tracingstats1
% \end{macrocode}
%
diff --git a/base/testfiles/github-0479-often.luatex.tlg b/base/testfiles/github-0479-often.luatex.tlg
index 9d2db624..4c28040c 100644
--- a/base/testfiles/github-0479-often.luatex.tlg
+++ b/base/testfiles/github-0479-often.luatex.tlg
@@ -51,6 +51,8 @@ Skipping: expl3 code already part of the format on input line ....
Already applied: [....-..-..] Pre-load expl3 on input line ....
Applying: [....-..-..] expl3 macros added for the ....-..-.. release on input line ....
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 ....
Applying: [....-..-..] Allow "par" in \typeout on input line ....
Already applied: [....-..-..] Allow "par" in \typeout on input line ....
Applying: [....-..-..] Make \@carcube long on input line ....
@@ -677,8 +679,6 @@ Applying: [....-..-..] 2 column marks on input line ....
Already applied: [....-..-..] 2 column marks on input line ....
Applying: [....-..-..] NFSS version1 commands on input line ....
Already applied: [....-..-..] NFSS version1 commands on input line ....
-Skipping: [....-..-..] fp and int calculations on input line ....
-Applying: [....-..-..] fp and int calculations on input line ....
Applying: [....-..-..] Extended Allocation on input line ....
Already applied: [....-..-..] Extended Allocation on input line ....
Applying: [....-..-..] Extended Allocation on input line ....
diff --git a/base/testfiles/github-0479-often.tlg b/base/testfiles/github-0479-often.tlg
index 4ba43aba..68538c56 100644
--- a/base/testfiles/github-0479-often.tlg
+++ b/base/testfiles/github-0479-often.tlg
@@ -40,6 +40,8 @@ Skipping: expl3 code already part of the format on input line ....
Already applied: [....-..-..] Pre-load expl3 on input line ....
Applying: [....-..-..] expl3 macros added for the ....-..-.. release on input line ....
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 ....
Applying: [....-..-..] Allow "par" in \typeout on input line ....
Already applied: [....-..-..] Allow "par" in \typeout on input line ....
Applying: [....-..-..] Make \@carcube long on input line ....
@@ -665,8 +667,6 @@ Applying: [....-..-..] 2 column marks on input line ....
Already applied: [....-..-..] 2 column marks on input line ....
Applying: [....-..-..] NFSS version1 commands on input line ....
Already applied: [....-..-..] NFSS version1 commands on input line ....
-Skipping: [....-..-..] fp and int calculations on input line ....
-Applying: [....-..-..] fp and int calculations on input line ....
Applying: [....-..-..] Extended Allocation on input line ....
Already applied: [....-..-..] Extended Allocation on input line ....
Applying: [....-..-..] Extended Allocation on input line ....
diff --git a/base/testfiles/github-0479-often.xetex.tlg b/base/testfiles/github-0479-often.xetex.tlg
index ee08bccd..445880cf 100644
--- a/base/testfiles/github-0479-often.xetex.tlg
+++ b/base/testfiles/github-0479-often.xetex.tlg
@@ -40,6 +40,8 @@ Skipping: expl3 code already part of the format on input line ....
Already applied: [....-..-..] Pre-load expl3 on input line ....
Applying: [....-..-..] expl3 macros added for the ....-..-.. release on input line ....
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 ....
Applying: [....-..-..] Allow "par" in \typeout on input line ....
Already applied: [....-..-..] Allow "par" in \typeout on input line ....
Applying: [....-..-..] Make \@carcube long on input line ....
@@ -666,8 +668,6 @@ Applying: [....-..-..] 2 column marks on input line ....
Already applied: [....-..-..] 2 column marks on input line ....
Applying: [....-..-..] NFSS version1 commands on input line ....
Already applied: [....-..-..] NFSS version1 commands on input line ....
-Skipping: [....-..-..] fp and int calculations on input line ....
-Applying: [....-..-..] fp and int calculations on input line ....
Applying: [....-..-..] Extended Allocation on input line ....
Already applied: [....-..-..] Extended Allocation on input line ....
Applying: [....-..-..] Extended Allocation on input line ....
diff --git a/base/testfiles/tlb-latexrelease-rollback-003-often.luatex.tlg b/base/testfiles/tlb-latexrelease-rollback-003-often.luatex.tlg
index 717a404b..137e67c4 100644
--- a/base/testfiles/tlb-latexrelease-rollback-003-often.luatex.tlg
+++ b/base/testfiles/tlb-latexrelease-rollback-003-often.luatex.tlg
@@ -48,6 +48,8 @@ Skipping: [....-..-..] Pre-load expl3 on input line ....
Skipping: [....-..-..] Pre-load expl3 on input line ....
Skipping: [....-..-..] expl3 macros added for the ....-..-.. release on input line ....
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: [....-..-..] Allow "par" in \typeout on input line ....
Applying: [....-..-..] Allow "par" in \typeout on input line ....
Skipping: [....-..-..] Make \@carcube long on input line ....
@@ -560,8 +562,6 @@ Skipping: [....-..-..] 2 column marks on input line ....
Applying: [....-..-..] 2 column marks on input line ....
Skipping: [....-..-..] NFSS version1 commands on input line ....
Applying: [....-..-..] NFSS version1 commands on input line ....
-Skipping: [....-..-..] fp and int calculations on input line ....
-Applying: [....-..-..] fp and int calculations on input line ....
Skipping: [....-..-..] Extended Allocation on input line ....
Applying: [....-..-..] Extended Allocation on input line ....
Skipping: [....-..-..] Extended Allocation on input line ....
@@ -632,6 +632,8 @@ Skipping: [....-..-..] Pre-load expl3 on input line ....
Skipping: [....-..-..] Pre-load expl3 on input line ....
Skipping: [....-..-..] expl3 macros added for the ....-..-.. release on input line ....
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: [....-..-..] Allow "par" in \typeout on input line ....
Applying: [....-..-..] Allow "par" in \typeout on input line ....
Skipping: [....-..-..] Make \@carcube long on input line ....
@@ -1226,8 +1228,6 @@ Applying: [....-..-..] 2 column marks on input line ...
Already applied: [....-..-..] 2 column marks on input line ....
Applying: [....-..-..] NFSS version1 commands on input line ....
Already applied: [....-..-..] NFSS version1 commands on input line ....
-Skipping: [....-..-..] fp and int calculations on input line ....
-Applying: [....-..-..] fp and int calculations on input line ....
Applying: [....-..-..] Extended Allocation on input line ....
Already applied: [....-..-..] Extended Allocation on input line ....
Applying: [....-..-..] Extended Allocation on input line ....
diff --git a/base/testfiles/tlb-latexrelease-rollback-003-often.tlg b/base/testfiles/tlb-latexrelease-rollback-003-often.tlg
index bf892cad..91d0fb82 100644
--- a/base/testfiles/tlb-latexrelease-rollback-003-often.tlg
+++ b/base/testfiles/tlb-latexrelease-rollback-003-often.tlg
@@ -42,6 +42,8 @@ Skipping: [....-..-..] Pre-load expl3 on input line ....
Skipping: [....-..-..] Pre-load expl3 on input line ....
Skipping: [....-..-..] expl3 macros added for the ....-..-.. release on input line ....
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: [....-..-..] Allow "par" in \typeout on input line ....
Applying: [....-..-..] Allow "par" in \typeout on input line ....
Skipping: [....-..-..] Make \@carcube long on input line ....
@@ -554,8 +556,6 @@ Skipping: [....-..-..] 2 column marks on input line ....
Applying: [....-..-..] 2 column marks on input line ....
Skipping: [....-..-..] NFSS version1 commands on input line ....
Applying: [....-..-..] NFSS version1 commands on input line ....
-Skipping: [....-..-..] fp and int calculations on input line ....
-Applying: [....-..-..] fp and int calculations on input line ....
Skipping: [....-..-..] Extended Allocation on input line ....
Applying: [....-..-..] Extended Allocation on input line ....
Skipping: [....-..-..] Extended Allocation on input line ....
@@ -616,6 +616,8 @@ Skipping: [....-..-..] Pre-load expl3 on input line ....
Skipping: [....-..-..] Pre-load expl3 on input line ....
Skipping: [....-..-..] expl3 macros added for the ....-..-.. release on input line ....
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: [....-..-..] Allow "par" in \typeout on input line ....
Applying: [....-..-..] Allow "par" in \typeout on input line ....
Skipping: [....-..-..] Make \@carcube long on input line ....
@@ -1210,8 +1212,6 @@ Applying: [....-..-..] 2 column marks on input line ...
Already applied: [....-..-..] 2 column marks on input line ....
Applying: [....-..-..] NFSS version1 commands on input line ....
Already applied: [....-..-..] NFSS version1 commands on input line ....
-Skipping: [....-..-..] fp and int calculations on input line ....
-Applying: [....-..-..] fp and int calculations on input line ....
Applying: [....-..-..] Extended Allocation on input line ....
Already applied: [....-..-..] Extended Allocation on input line ....
Applying: [....-..-..] Extended Allocation 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 c639d467..0abfb0b6 100644
--- a/base/testfiles/tlb-latexrelease-rollback-003-often.xetex.tlg
+++ b/base/testfiles/tlb-latexrelease-rollback-003-often.xetex.tlg
@@ -42,6 +42,8 @@ Skipping: [....-..-..] Pre-load expl3 on input line ....
Skipping: [....-..-..] Pre-load expl3 on input line ....
Skipping: [....-..-..] expl3 macros added for the ....-..-.. release on input line ....
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: [....-..-..] Allow "par" in \typeout on input line ....
Applying: [....-..-..] Allow "par" in \typeout on input line ....
Skipping: [....-..-..] Make \@carcube long on input line ....
@@ -554,8 +556,6 @@ Skipping: [....-..-..] 2 column marks on input line ....
Applying: [....-..-..] 2 column marks on input line ....
Skipping: [....-..-..] NFSS version1 commands on input line ....
Applying: [....-..-..] NFSS version1 commands on input line ....
-Skipping: [....-..-..] fp and int calculations on input line ....
-Applying: [....-..-..] fp and int calculations on input line ....
Skipping: [....-..-..] Extended Allocation on input line ....
Applying: [....-..-..] Extended Allocation on input line ....
Skipping: [....-..-..] Extended Allocation on input line ....
@@ -625,6 +625,8 @@ Skipping: [....-..-..] Pre-load expl3 on input line ....
Skipping: [....-..-..] Pre-load expl3 on input line ....
Skipping: [....-..-..] expl3 macros added for the ....-..-.. release on input line ....
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: [....-..-..] Allow "par" in \typeout on input line ....
Applying: [....-..-..] Allow "par" in \typeout on input line ....
Skipping: [....-..-..] Make \@carcube long on input line ....
@@ -1219,8 +1221,6 @@ Applying: [....-..-..] 2 column marks on input line ...
Already applied: [....-..-..] 2 column marks on input line ....
Applying: [....-..-..] NFSS version1 commands on input line ....
Already applied: [....-..-..] NFSS version1 commands on input line ....
-Skipping: [....-..-..] fp and int calculations on input line ....
-Applying: [....-..-..] fp and int calculations on input line ....
Applying: [....-..-..] Extended Allocation on input line ....
Already applied: [....-..-..] Extended Allocation on input line ....
Applying: [....-..-..] Extended Allocation on input line ....
diff --git a/base/testfiles/tlb-rollback-004-often.luatex.tlg b/base/testfiles/tlb-rollback-004-often.luatex.tlg
index 69754cc3..8ce46c23 100644
--- a/base/testfiles/tlb-rollback-004-often.luatex.tlg
+++ b/base/testfiles/tlb-rollback-004-often.luatex.tlg
@@ -51,6 +51,8 @@ Applying: [....-..-..] Pre-load expl3 on input line ....
(../expl3.ltx)
Skipping: [....-..-..] expl3 macros added for the ....-..-.. release on input line ....
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: [....-..-..] Allow "par" in \typeout on input line ....
Applying: [....-..-..] Allow "par" in \typeout on input line ....
Skipping: [....-..-..] Make \@carcube long on input line ....
@@ -674,8 +676,6 @@ Applying: [....-..-..] 2 column marks on input line ....
Already applied: [....-..-..] 2 column marks on input line ....
Applying: [....-..-..] NFSS version1 commands on input line ....
Already applied: [....-..-..] NFSS version1 commands on input line ....
-Skipping: [....-..-..] fp and int calculations on input line ....
-Applying: [....-..-..] fp and int calculations on input line ....
Applying: [....-..-..] Extended Allocation on input line ....
Already applied: [....-..-..] Extended Allocation on input line ....
Applying: [....-..-..] Extended Allocation on input line ....
diff --git a/base/testfiles/tlb-rollback-004-often.tlg b/base/testfiles/tlb-rollback-004-often.tlg
index 5d0f4593..7586b7f8 100644
--- a/base/testfiles/tlb-rollback-004-often.tlg
+++ b/base/testfiles/tlb-rollback-004-often.tlg
@@ -40,6 +40,8 @@ Applying: [....-..-..] Pre-load expl3 on input line ....
(../expl3.ltx)
Skipping: [....-..-..] expl3 macros added for the ....-..-.. release on input line ....
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: [....-..-..] Allow "par" in \typeout on input line ....
Applying: [....-..-..] Allow "par" in \typeout on input line ....
Skipping: [....-..-..] Make \@carcube long on input line ....
@@ -662,8 +664,6 @@ Applying: [....-..-..] 2 column marks on input line ....
Already applied: [....-..-..] 2 column marks on input line ....
Applying: [....-..-..] NFSS version1 commands on input line ....
Already applied: [....-..-..] NFSS version1 commands on input line ....
-Skipping: [....-..-..] fp and int calculations on input line ....
-Applying: [....-..-..] fp and int calculations on input line ....
Applying: [....-..-..] Extended Allocation on input line ....
Already applied: [....-..-..] Extended Allocation on input line ....
Applying: [....-..-..] Extended Allocation on input line ....
diff --git a/base/testfiles/tlb-rollback-004-often.xetex.tlg b/base/testfiles/tlb-rollback-004-often.xetex.tlg
index e31d6eed..5711c964 100644
--- a/base/testfiles/tlb-rollback-004-often.xetex.tlg
+++ b/base/testfiles/tlb-rollback-004-often.xetex.tlg
@@ -40,6 +40,8 @@ Applying: [....-..-..] Pre-load expl3 on input line ....
(../expl3.ltx)
Skipping: [....-..-..] expl3 macros added for the ....-..-.. release on input line ....
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: [....-..-..] Allow "par" in \typeout on input line ....
Applying: [....-..-..] Allow "par" in \typeout on input line ....
Skipping: [....-..-..] Make \@carcube long on input line ....
@@ -663,8 +665,6 @@ Applying: [....-..-..] 2 column marks on input line ....
Already applied: [....-..-..] 2 column marks on input line ....
Applying: [....-..-..] NFSS version1 commands on input line ....
Already applied: [....-..-..] NFSS version1 commands on input line ....
-Skipping: [....-..-..] fp and int calculations on input line ....
-Applying: [....-..-..] fp and int calculations on input line ....
Applying: [....-..-..] Extended Allocation on input line ....
Already applied: [....-..-..] Extended Allocation on input line ....
Applying: [....-..-..] Extended Allocation on input line ....
diff --git a/base/testfiles/tlb-rollback-005.luatex.tlg b/base/testfiles/tlb-rollback-005.luatex.tlg
index 2f948649..1345df68 100644
--- a/base/testfiles/tlb-rollback-005.luatex.tlg
+++ b/base/testfiles/tlb-rollback-005.luatex.tlg
@@ -55,6 +55,8 @@ Skipping: expl3 code already part of the format on input line ....
Already applied: [....-..-..] Pre-load expl3 on input line ....
Applying: [....-..-..] expl3 macros added for the ....-..-.. release on input line ....
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 ....
Applying: [....-..-..] Allow "par" in \typeout on input line ....
Already applied: [....-..-..] Allow "par" in \typeout on input line ....
Applying: [....-..-..] Make \@carcube long on input line ....
@@ -681,8 +683,6 @@ Applying: [....-..-..] 2 column marks on input line ....
Already applied: [....-..-..] 2 column marks on input line ....
Applying: [....-..-..] NFSS version1 commands on input line ....
Already applied: [....-..-..] NFSS version1 commands on input line ....
-Skipping: [....-..-..] fp and int calculations on input line ....
-Applying: [....-..-..] fp and int calculations on input line ....
Applying: [....-..-..] Extended Allocation on input line ....
Already applied: [....-..-..] Extended Allocation on input line ....
Applying: [....-..-..] Extended Allocation on input line ....
diff --git a/base/testfiles/tlb-rollback-005.tlg b/base/testfiles/tlb-rollback-005.tlg
index 6a13ef17..1be72076 100644
--- a/base/testfiles/tlb-rollback-005.tlg
+++ b/base/testfiles/tlb-rollback-005.tlg
@@ -44,6 +44,8 @@ Skipping: expl3 code already part of the format on input line ....
Already applied: [....-..-..] Pre-load expl3 on input line ....
Applying: [....-..-..] expl3 macros added for the ....-..-.. release on input line ....
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 ....
Applying: [....-..-..] Allow "par" in \typeout on input line ....
Already applied: [....-..-..] Allow "par" in \typeout on input line ....
Applying: [....-..-..] Make \@carcube long on input line ....
@@ -669,8 +671,6 @@ Applying: [....-..-..] 2 column marks on input line ....
Already applied: [....-..-..] 2 column marks on input line ....
Applying: [....-..-..] NFSS version1 commands on input line ....
Already applied: [....-..-..] NFSS version1 commands on input line ....
-Skipping: [....-..-..] fp and int calculations on input line ....
-Applying: [....-..-..] fp and int calculations on input line ....
Applying: [....-..-..] Extended Allocation on input line ....
Already applied: [....-..-..] Extended Allocation on input line ....
Applying: [....-..-..] Extended Allocation on input line ....
diff --git a/base/testfiles/tlb-rollback-005.xetex.tlg b/base/testfiles/tlb-rollback-005.xetex.tlg
index 20f17c1e..29eabcbc 100644
--- a/base/testfiles/tlb-rollback-005.xetex.tlg
+++ b/base/testfiles/tlb-rollback-005.xetex.tlg
@@ -44,6 +44,8 @@ Skipping: expl3 code already part of the format on input line ....
Already applied: [....-..-..] Pre-load expl3 on input line ....
Applying: [....-..-..] expl3 macros added for the ....-..-.. release on input line ....
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 ....
Applying: [....-..-..] Allow "par" in \typeout on input line ....
Already applied: [....-..-..] Allow "par" in \typeout on input line ....
Applying: [....-..-..] Make \@carcube long on input line ....
@@ -670,8 +672,6 @@ Applying: [....-..-..] 2 column marks on input line ....
Already applied: [....-..-..] 2 column marks on input line ....
Applying: [....-..-..] NFSS version1 commands on input line ....
Already applied: [....-..-..] NFSS version1 commands on input line ....
-Skipping: [....-..-..] fp and int calculations on input line ....
-Applying: [....-..-..] fp and int calculations on input line ....
Applying: [....-..-..] Extended Allocation on input line ....
Already applied: [....-..-..] Extended Allocation on input line ....
Applying: [....-..-..] Extended Allocation on input line ....
More information about the latex3-commits
mailing list.