[latex3-commits] [git/LaTeX3-latex3-latex2e] gh711: Adding code and documentation for #711 (00a573a7)
Frank Mittelbach
frank.mittelbach at latex-project.org
Sun Dec 5 11:01:48 CET 2021
Repository : https://github.com/latex3/latex2e
On branch : gh711
Link : https://github.com/latex3/latex2e/commit/00a573a7ba08c80a5b2433a99944ada7ec3fa99e
>---------------------------------------------------------------
commit 00a573a7ba08c80a5b2433a99944ada7ec3fa99e
Author: Frank Mittelbach <frank.mittelbach at latex-project.org>
Date: Sun Dec 5 11:01:48 2021 +0100
Adding code and documentation for #711
>---------------------------------------------------------------
00a573a7ba08c80a5b2433a99944ada7ec3fa99e
base/TEMPLATE-IncludeInRelease.txt | 2 +-
base/changes.txt | 5 +
base/doc/ltnews35.tex | 7 +
base/doc/usrguide3.tex | 141 ++++++++++++++++++++-
base/ltfinal.dtx | 69 +++++++++-
base/testfiles/github-0479-often.luatex.tlg | 2 +
base/testfiles/github-0479-often.tlg | 2 +
base/testfiles/github-0479-often.xetex.tlg | 2 +
.../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 +
17 files changed, 247 insertions(+), 7 deletions(-)
diff --git a/base/TEMPLATE-IncludeInRelease.txt b/base/TEMPLATE-IncludeInRelease.txt
index 9236ecd4..37e6e7af 100644
--- a/base/TEMPLATE-IncludeInRelease.txt
+++ b/base/TEMPLATE-IncludeInRelease.txt
@@ -1,6 +1,6 @@
%</2ekernel>
%<*2ekernel|latexrelease>
-%<latexrelease>\IncludeInRelease{2021/06/01}%
+%<latexrelease>\IncludeInRelease{2022/06/01}%
%<latexrelease> {\XXX}{Info}%
diff --git a/base/changes.txt b/base/changes.txt
index de6cc373..ca8bde2c 100644
--- a/base/changes.txt
+++ b/base/changes.txt
@@ -6,6 +6,11 @@ completeness or accuracy and it contains some references to files that
are not part of the distribution.
================================================================================
+2021-11-30 Frank Mittelbach <Frank.Mittelbach at latex-project.org>
+
+ * ltfinal.dtx (subsection{Homeless declarations}):
+ Added \fpeval and \inteval (gh711)
+
2021-11-17 Marcel Krüger <Marcel.Krueger at latex-project.org>
* ltluatex.dtx:
diff --git a/base/doc/ltnews35.tex b/base/doc/ltnews35.tex
index 6b5d4816..8c998962 100644
--- a/base/doc/ltnews35.tex
+++ b/base/doc/ltnews35.tex
@@ -139,6 +139,13 @@
\section{New or improved commands}
+\subsection{Floating point and integer calculations}
+
+\emph{write doc}
+%
+\githubissue{711}
+
+
\subsection{???}
%
\githubissue{???}
diff --git a/base/doc/usrguide3.tex b/base/doc/usrguide3.tex
index 82c1c068..4c0ff3aa 100644
--- a/base/doc/usrguide3.tex
+++ b/base/doc/usrguide3.tex
@@ -36,7 +36,7 @@
\author{\copyright~Copyright 2020-2021, \LaTeX\ Project Team.\\
All rights reserved.}
-\date{2021-06-11}
+\date{2021-11-30}
\NewDocumentCommand\cs{m}{\texttt{\textbackslash\detokenize{#1}}}
\NewDocumentCommand\marg{m}{\arg{#1}}
@@ -48,6 +48,18 @@
\renewcommand \verbatim at font {\normalfont \ttfamily}
\makeatother
+
+% for fpeval documentation
+
+\providecommand\fpop[1]{\mathop{\texttt{#1}}}
+\providecommand\fpbin[1]{\mathbin{\texttt{#1}}}
+\providecommand\fprel[1]{\mathrel{\texttt{#1}}}
+\providecommand\nan{\texttt{NaN}}
+
+\ExplSyntaxOn
+\ProvideExpandableDocumentCommand \fpeval { m } { \fp_eval:n {#1} }
+\ExplSyntaxOff
+
\begin{document}
\maketitle
@@ -710,4 +722,131 @@ requested \meta{function} or \meta{environment} at the terminal. If
the \meta{function} or \meta{environment} has no known argument
specification then an error is issued.
+
+
+\section{Expandable floating point (and other) calculations}
+
+The \LaTeX3 programming layer which is part of the format offers a
+rich interface to manipulate floating point variables and values. To
+allow for (simpler) applications to use this on document-level or in
+packages otherwise not making use of the L3 programming layer a few
+interface commands are made available.
+
+
+\begin{decl}
+ |\fpeval| \arg{floating point expression}
+\end{decl}
+
+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.
+
+
+
+Briefly, the floating point expressions may comprise:
+\begin{itemize}
+ \item Basic arithmetic: addition $x\fpbin{+}y$, subtraction $x\fpbin{-}y$,
+ multiplication $x\fpbin{*}y$, division $x\fpbin{/}y$, square root~$\sqrt{x}$,
+ and parentheses.
+ \item Comparison operators: $x\fprel{<}y$,
+ $x\fprel{<=}y$, $x\fprel{>?}y$,
+ $x\fprel{!=}y$ \emph{etc.}
+ \item Boolean logic: sign $\fpop{sign} x$,
+ negation $\fpop{!}x$, conjunction
+ $x\fprel{\&\&}y$, disjunction $x\fprel{\string|\string|}y$, ternary
+ operator $x\fprel{?}y\fprel{:}z$.
+ \item Exponentials: $\fpop{exp} x$, $\fpop{ln} x$, $x\mathord{\texttt{\^{}}}y$.
+ \item Integer factorial: $\fpop{fact} x$.
+ \item Trigonometry: $\fpop{sin} x$, $\fpop{cos} x$, $\fpop{tan} x$, $\fpop{cot} x$, $\fpop{sec}
+ x$, $\fpop{csc} x$ expecting their arguments in radians, and
+ $\fpop{sind} x$, $\fpop{cosd} x$,
+ $\fpop{tand} x$, $\fpop{cotd} x$,
+ $\fpop{secd} x$, $\fpop{cscd} x$ expecting their
+ arguments in degrees.
+ \item Inverse trigonometric functions: $\fpop{asin} x$,
+ $\fpop{acos} x$, $\fpop{atan} x$,
+ $\fpop{acot} x$, $\fpop{asec} x$,
+ $\fpop{acsc} x$ giving a result in radians, and
+ $\fpop{asind} x$, $\fpop{acosd} x$,
+ $\fpop{atand} x$, $\fpop{acotd} x$,
+ $\fpop{asecd} x$, $\fpop{acscd} x$ giving a result
+ in degrees.
+ \item Extrema: $\fpop{max}(x_{1},x_{2},\ldots)$, $\fpop{min}(x_{1},x_{2},\ldots)$,
+ $\fpop{abs}(x)$.
+ \item Rounding functions, controlled by two optional
+ values, $n$ (number of places, $0$ by default) and
+ $t$ (behavior on a tie, $\nan$ by default):
+ \begin{itemize}
+ \item $\fpop{trunc}(x,n)$ rounds towards zero,
+ \item $\fpop{floor}(x,n)$ rounds towards~$-\infty$,
+ \item $\fpop{ceil}(x,n)$ rounds towards~$+\infty$,
+ \item $\fpop{round}(x,n,t)$ rounds to the closest value, with
+ ties rounded to an even value by default, towards zero if $t=0$,
+ towards $+\infty$ if $t>0$ and towards $-\infty$ if $t<0$.
+ \end{itemize}
+ \item Random numbers: $\fpop{rand}()$, $\fpop{randint}(m,n)$.
+ \item Constants: \texttt{pi}, \texttt{deg} (one degree in radians).
+ \item Dimensions, automatically expressed in points, \emph{e.g.},
+ \texttt{pc} is~$12$.
+ \item Automatic conversion (no need for \cs{number}) of
+ integer, dimension, and skip variables to floating points numbers,
+ expressing dimensions in points and ignoring the stretch and
+ shrink components of skips.
+ \item Tuples: $(x_1,\ldots{},x_n)$ that can be added together,
+ multiplied or divided by a floating point number, and nested.
+\end{itemize}
+
+An example of use could be the following:
+\begin{verbatim}
+ \LaTeX{} can now compute: $ \frac{\sin (3.5)}{2} + 2\cdot 10^{-3}
+ = \fpeval{sin(3.5)/2 + 2e-3} $.
+\end{verbatim}
+which produces the following output:
+\begin{quote}
+ \LaTeX{} can now compute: $ \frac{\sin (3.5)}{2} + 2\cdot 10^{-3}
+ = \fpeval{sin(3.5)/2 + 2e-3} $.
+\end{quote}
+
+\begin{decl}
+ |\inteval| \arg{integer expression}
+\end{decl}
+
+ The expandable command \cs{inteval} takes as its argument an integer
+ expression and produces a result using the normal rules of
+ mathematics with some restrictions, see below. The operations
+ recognised are |+|, |-|, |*| and |/| plus parentheses. 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.
+
+ The restrictions are:
+ \begin{itemize}
+ \item \texttt{/} denotes division rounded to the closest integer with
+ ties rounded away from zero;
+ \item there is an error and the overall expression evaluates to zero
+ whenever the absolute value of any intermediate result exceeds
+ $2^{31}-1$, except in the case of scaling operations
+ $a$\texttt{*}$b$\texttt{/}$c$, for which $a$\texttt{*}$b$ may be
+ arbitrarily large;
+ \item parentheses may not appear after unary \texttt{+} or
+ \texttt{-}, namely placing \texttt{+(} or \texttt{-(} at the start
+ of an expression or after \texttt{+}, \texttt{-}, \texttt{*},
+ \texttt{/} or~\texttt{(} leads to an error.
+ \end{itemize}
+
+
+An example of use could be the following.
+\begin{verbatim}
+ \LaTeX{} can now compute: The sum of the numbers is $\inteval{1 + 2 + 3}$.
+\end{verbatim}
+which results in
+\begin{quote}
+ \LaTeX{} can now compute: The sum of the numbers is $\inteval{1 + 2 + 3}$.
+\end{quote}
+
+
+
+
\end{document}
diff --git a/base/ltfinal.dtx b/base/ltfinal.dtx
index 40017a20..4d98859a 100644
--- a/base/ltfinal.dtx
+++ b/base/ltfinal.dtx
@@ -33,7 +33,7 @@
%<*driver>
% \fi
\ProvidesFile{ltfinal.dtx}
- [2021/09/06 v2.2q LaTeX Kernel (Final Settings)]
+ [2021/11/30 v2.2r LaTeX Kernel (Final Settings)]
% \iffalse
\documentclass{ltxdoc}
\GetFileInfo{ltfinal.dtx}
@@ -57,9 +57,35 @@
%
%
% \section{Final settings}
-% This section contains the final settings for \LaTeX. It initializes
-% some debugging and typesetting parameters, sets the default
-% |\catcode|s and uc/lc codes, and inputs the hyphenation file.
+%
+% This section contains the final settings for \LaTeX. It initializes
+% 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{}
%
@@ -91,13 +117,46 @@
% \changes{v2.2i}{2020/08/21}{Integration of new hook management interface}
%
%
+% \begin{macrocode}
+% \end{macrocode}
+%
+% \begin{macro}{\fpeval,\inteval}
+% A document level wrapper around the code level function for
+% floating point calculations.
+% \changes{v2.2r}{2021/11/30}{Oved 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}
+% A second one, this time around an \eTeX{} primitive.
+% \begin{macrocode}
+\NewExpandableDocumentCommand \inteval { m } { \int_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>\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 7d561984..9d2db624 100644
--- a/base/testfiles/github-0479-often.luatex.tlg
+++ b/base/testfiles/github-0479-often.luatex.tlg
@@ -677,6 +677,8 @@ 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 696384e7..4ba43aba 100644
--- a/base/testfiles/github-0479-often.tlg
+++ b/base/testfiles/github-0479-often.tlg
@@ -665,6 +665,8 @@ 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 d55c3286..ee08bccd 100644
--- a/base/testfiles/github-0479-often.xetex.tlg
+++ b/base/testfiles/github-0479-often.xetex.tlg
@@ -666,6 +666,8 @@ 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 12eb31e1..717a404b 100644
--- a/base/testfiles/tlb-latexrelease-rollback-003-often.luatex.tlg
+++ b/base/testfiles/tlb-latexrelease-rollback-003-often.luatex.tlg
@@ -560,6 +560,8 @@ 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 ....
@@ -1224,6 +1226,8 @@ 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 d993f95d..bf892cad 100644
--- a/base/testfiles/tlb-latexrelease-rollback-003-often.tlg
+++ b/base/testfiles/tlb-latexrelease-rollback-003-often.tlg
@@ -554,6 +554,8 @@ 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 ....
@@ -1208,6 +1210,8 @@ 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 5749d356..c639d467 100644
--- a/base/testfiles/tlb-latexrelease-rollback-003-often.xetex.tlg
+++ b/base/testfiles/tlb-latexrelease-rollback-003-often.xetex.tlg
@@ -554,6 +554,8 @@ 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 ....
@@ -1217,6 +1219,8 @@ 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 2136fa74..69754cc3 100644
--- a/base/testfiles/tlb-rollback-004-often.luatex.tlg
+++ b/base/testfiles/tlb-rollback-004-often.luatex.tlg
@@ -674,6 +674,8 @@ 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 3c8dbb15..5d0f4593 100644
--- a/base/testfiles/tlb-rollback-004-often.tlg
+++ b/base/testfiles/tlb-rollback-004-often.tlg
@@ -662,6 +662,8 @@ 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 21b6178f..e31d6eed 100644
--- a/base/testfiles/tlb-rollback-004-often.xetex.tlg
+++ b/base/testfiles/tlb-rollback-004-often.xetex.tlg
@@ -663,6 +663,8 @@ 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 bdcc80a9..2f948649 100644
--- a/base/testfiles/tlb-rollback-005.luatex.tlg
+++ b/base/testfiles/tlb-rollback-005.luatex.tlg
@@ -681,6 +681,8 @@ 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 448d0e1b..6a13ef17 100644
--- a/base/testfiles/tlb-rollback-005.tlg
+++ b/base/testfiles/tlb-rollback-005.tlg
@@ -669,6 +669,8 @@ 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 bb3f4135..20f17c1e 100644
--- a/base/testfiles/tlb-rollback-005.xetex.tlg
+++ b/base/testfiles/tlb-rollback-005.xetex.tlg
@@ -670,6 +670,8 @@ 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.