[latex3-commits] [git/LaTeX3-latex3-latex2e] develop: Gh711 (#718) (3b863434)
GitHub
noreply at github.com
Fri Dec 10 16:04:11 CET 2021
Repository : https://github.com/latex3/latex2e
On branch : develop
Link : https://github.com/latex3/latex2e/commit/3b86343464aa0d753a82bbc008201c7de7374d82
>---------------------------------------------------------------
commit 3b86343464aa0d753a82bbc008201c7de7374d82
Author: Frank Mittelbach <frank.mittelbach at latex-project.org>
Date: Fri Dec 10 16:04:11 2021 +0100
Gh711 (#718)
* Adding code and documentation for #711
* adding \dimeval, \skipeval and documentation
* move defs to ltexpl for now
* fix typos
>---------------------------------------------------------------
3b86343464aa0d753a82bbc008201c7de7374d82
base/TEMPLATE-IncludeInRelease.txt | 2 +-
base/changes.txt | 5 +
base/doc/ltnews35.tex | 40 +++++
base/doc/usrguide3.tex | 169 ++++++++++++++++++++-
base/ltexpl.dtx | 76 ++++++++-
base/ltfinal.dtx | 11 +-
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 +
18 files changed, 322 insertions(+), 11 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 5f1fabcf..51e6cea9 100644
--- a/base/changes.txt
+++ b/base/changes.txt
@@ -16,6 +16,11 @@ are not part of the distribution.
* lttextcomp.dtx (section{Sub-encodings}):
Describe correctly (I hope) how sub-encodings work for TS1.
+2021-11-30 Frank Mittelbach <Frank.Mittelbach at latex-project.org>
+
+ * ltexpl.dtx:
+ Added \fpeval, \inteval, \dimeval, and \skipeval (gh711)
+
2021-11-18 Frank Mittelbach <Frank.Mittelbach at latex-project.org>
* All *.dtx: Replaced \StopEventually by \MaybeStop
diff --git a/base/doc/ltnews35.tex b/base/doc/ltnews35.tex
index cc65c4b2..02736853 100644
--- a/base/doc/ltnews35.tex
+++ b/base/doc/ltnews35.tex
@@ -139,6 +139,46 @@
\section{New or improved commands}
+\subsection{Floating point and integer calculations}
+
+The L3 programming layer offers expandable commands for calculating
+floating point and integer values, but so far these functions have
+only been available to programmers, because they require
+\cs{ExplSyntaxOn} to be in force. To make them easily available at the
+document-level, the small package \pkg{xfp} defined \cs{fpeval} and
+\cs{inteval}.
+
+
+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}
+These two commands have now been moved into the kernel and in addition
+we also provide \cs{dimeval} and \cs{skipeval}. The details of their
+syntax are described in \file{usrguide3.pdf}. The command \cs{fpeval}
+offers a rich syntax allows for extensive calculations whereas the
+other three commands are essentially thin wrappers for \cs{numexpr},
+\cs{dimexpr}, and \cs{glueexpr} \Dash therefore inheriting some syntax
+peculiars and limitations in expressiveness.
+\begin{verbatim}
+\newcommand\calulateheight[1]{%
+ \setlength\textheight{\dimeval{\topskip
+ + \baselineskip * \inteval{#1-1}}}}
+\end{verbatim}
+The above, for example, calculates the appropriate \cs{textheight} for
+a given number of text lines.
+%
+\githubissue{711}
+
+
\subsection{???}
%
\githubissue{???}
diff --git a/base/doc/usrguide3.tex b/base/doc/usrguide3.tex
index 82c1c068..8f416765 100644
--- a/base/doc/usrguide3.tex
+++ b/base/doc/usrguide3.tex
@@ -31,12 +31,13 @@
\documentclass{ltxguide}
\usepackage[T1]{fontenc} % needed for \textbackslash in tt
+\usepackage{csquotes}
\title{New \LaTeX\ methods for authors (starting 2020)}
\author{\copyright~Copyright 2020-2021, \LaTeX\ Project Team.\\
All rights reserved.}
-\date{2021-06-11}
+\date{2021-12-07}
\NewDocumentCommand\cs{m}{\texttt{\textbackslash\detokenize{#1}}}
\NewDocumentCommand\marg{m}{\arg{#1}}
@@ -48,6 +49,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
@@ -554,10 +567,12 @@ spaces are trimmed at both ends of the body: in the example there would
otherwise be spaces coming from the ends the lines after |[\itshape]| and
|world!|. Putting the prefix |!| before \texttt{b} suppresses space-trimming.
-When \texttt{b} is used in the argument specification, the last argument of the environment declaration (e.g., \cs{NewDocumentEnvironment}), which consists of an \meta{end code} to insert at
-|\end|\marg{environment}, is redundant since one can simply put that code at
-the end of the \meta{start code}. Nevertheless this (empty) \meta{end code}
-must be provided.
+When \texttt{b} is used in the argument specification, the last
+argument of the environment declaration (e.g.,
+\cs{NewDocumentEnvironment}), which consists of an \meta{end code} to
+insert at |\end|\marg{environment}, is redundant since one can simply
+put that code at the end of the \meta{start code}. Nevertheless this
+(empty) \meta{end code} must be provided.
Environments that use this feature can be nested.
@@ -710,4 +725,148 @@ 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.
+
+ This is basically a thin wrapper for the primitive \cs{numexpr}
+ command and therefore has some syntax restrictions. These 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
+\enquote{\LaTeX{} can now compute: The sum of the numbers is $\inteval{1 + 2 + 3}$.}
+
+
+\begin{decl}
+ |\dimeval| \arg{dimen expression} \qquad
+ |\skipeval| \arg{skip expression}
+\end{decl}
+
+Similar to \cs{inteval} but computing a length (\texttt{dimen}) or a
+rubber length (\texttt{skip}) value. Both are thin wrappers arround
+the corresponding engine primitives, which makes them fast, but
+therefore shows the same syntax peculiars as discussed
+above. Nevertheless, in practice they are usually sufficient. For
+example
+\begin{verbatim}
+\newcommand\calulateheight[1]{%
+ \setlength\textheight{\dimeval{\topskip+\baselineskip*\inteval{#1-1}}}}
+\end{verbatim}
+sets the \cs{textheight} to the appropriate value if a page should
+hold a specific number of text lines. Thus after |\calulateheight{40}|
+it is set to \dimeval{\topskip+\baselineskip*\inteval{40-1}}, given
+the values \cs{topskip} (\dimeval{\topskip}) and \cs{baselineskip}
+(\dimeval{\baselineskip}) in the current document.
+
\end{document}
diff --git a/base/ltexpl.dtx b/base/ltexpl.dtx
index 382ac31c..2291a1a9 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\fpeval
+% 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\inteval
+% \DescribeMacro\dimeval
+% \DescribeMacro\skipeval
+% 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 9604b019..876c7ba2 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/12/07 v2.2q LaTeX Kernel (Final Settings)]
% \iffalse
\documentclass{ltxdoc}
\GetFileInfo{ltfinal.dtx}
@@ -57,9 +57,12 @@
%
%
% \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.
+%
+%
%
% \MaybeStop{}
%
diff --git a/base/testfiles/github-0479-often.luatex.tlg b/base/testfiles/github-0479-often.luatex.tlg
index 7d561984..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 ....
diff --git a/base/testfiles/github-0479-often.tlg b/base/testfiles/github-0479-often.tlg
index 696384e7..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 ....
diff --git a/base/testfiles/github-0479-often.xetex.tlg b/base/testfiles/github-0479-often.xetex.tlg
index d55c3286..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 ....
diff --git a/base/testfiles/tlb-latexrelease-rollback-003-often.luatex.tlg b/base/testfiles/tlb-latexrelease-rollback-003-often.luatex.tlg
index 12eb31e1..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 ....
@@ -630,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 ....
diff --git a/base/testfiles/tlb-latexrelease-rollback-003-often.tlg b/base/testfiles/tlb-latexrelease-rollback-003-often.tlg
index d993f95d..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 ....
@@ -614,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 ....
diff --git a/base/testfiles/tlb-latexrelease-rollback-003-often.xetex.tlg b/base/testfiles/tlb-latexrelease-rollback-003-often.xetex.tlg
index 5749d356..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 ....
@@ -623,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 ....
diff --git a/base/testfiles/tlb-rollback-004-often.luatex.tlg b/base/testfiles/tlb-rollback-004-often.luatex.tlg
index 2136fa74..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 ....
diff --git a/base/testfiles/tlb-rollback-004-often.tlg b/base/testfiles/tlb-rollback-004-often.tlg
index 3c8dbb15..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 ....
diff --git a/base/testfiles/tlb-rollback-004-often.xetex.tlg b/base/testfiles/tlb-rollback-004-often.xetex.tlg
index 21b6178f..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 ....
diff --git a/base/testfiles/tlb-rollback-005.luatex.tlg b/base/testfiles/tlb-rollback-005.luatex.tlg
index bdcc80a9..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 ....
diff --git a/base/testfiles/tlb-rollback-005.tlg b/base/testfiles/tlb-rollback-005.tlg
index 448d0e1b..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 ....
diff --git a/base/testfiles/tlb-rollback-005.xetex.tlg b/base/testfiles/tlb-rollback-005.xetex.tlg
index bb3f4135..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 ....
More information about the latex3-commits
mailing list.