[latex3-commits] [git/LaTeX3-latex3-latex3] main: Add new ht_plus_dp function directly to stable (3f7576653)

[Joseph Wright]

Repository : https://github.com/latex3/latex3
On branch  : main
Link       : https://github.com/latex3/latex3/commit/3f7576653404a4af75b66a4c4af3a3ca613c2000

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

commit 3f7576653404a4af75b66a4c4af3a3ca613c2000
Author: Joseph Wright <joseph.wright at morningstar2.co.uk>
Date:   Wed May 5 09:31:55 2021 +0100

    Add new ht_plus_dp function directly to stable


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

3f7576653404a4af75b66a4c4af3a3ca613c2000
 l3kernel/l3box.dtx        | 21 +++++++++++++++++++++
 l3kernel/l3candidates.dtx | 21 ---------------------
 2 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/l3kernel/l3box.dtx b/l3kernel/l3box.dtx
index 3016dd981..774232bc3 100644
--- a/l3kernel/l3box.dtx
+++ b/l3kernel/l3box.dtx
@@ -179,6 +179,14 @@
 %   \end{texnote}
 % \end{function}
 %
+% \begin{function}[added = 2021-05-05]{\box_ht_plus_dp:N, \box_ht_plus_dp:c}
+%   \begin{syntax}
+%     \cs{box_ht_plus_dp:N} \meta{box}
+%   \end{syntax}
+%   Calculates the total vertical size (height plus depth) of the \meta{box}
+%   in a form suitable for use in a \meta{dimension expression}.
+% \end{function}
+%
 % \begin{function}[updated = 2019-01-22]
 %   {
 %     \box_set_dp:Nn, \box_set_dp:cn,
@@ -1043,6 +1051,19 @@
 % \end{macro}
 % \end{macro}
 %
+% \begin{macro}{\box_ht_plus_dp:N}
+%   The \cs{box_ht:N} and \cs{box_dp:N} primitives do not expand but
+%   rather are suitable for use after \tn{the} or inside dimension
+%   expressions.  Here we obtain the same behaviour by using
+%   \cs{@@_dim_eval:n} (basically \tn{dimexpr}) rather than
+%   \cs{dim_eval:n} (basically \tn{the} \tn{dimexpr}).
+%    \begin{macrocode}
+\cs_new_protected:Npn \box_ht_plus_dp:N #1
+  { \@@_dim_eval:n { \box_ht:N #1 + \box_dp:N #1 } }
+\cs_generate_variant:Nn \box_ht_plus_dp:N { c }
+%    \end{macrocode}
+% \end{macro}
+%
 % \begin{macro}{\box_set_ht:Nn, \box_set_ht:cn, \box_gset_ht:Nn, \box_gset_ht:cn}
 % \begin{macro}{\box_set_dp:Nn, \box_set_dp:cn, \box_gset_dp:Nn, \box_gset_dp:cn}
 % \begin{macro}{\box_set_wd:Nn, \box_set_wd:cn, \box_gset_wd:Nn, \box_gset_wd:cn}
diff --git a/l3kernel/l3candidates.dtx b/l3kernel/l3candidates.dtx
index 6ca22b96d..6cfb0d745 100644
--- a/l3kernel/l3candidates.dtx
+++ b/l3kernel/l3candidates.dtx
@@ -146,14 +146,6 @@
 %   operation is applied.
 % \end{function}
 %
-% \begin{function}[added = 2021-05-05]{\box_ht_plus_dp:N, \box_ht_plus_dp:c}
-%   \begin{syntax}
-%     \cs{box_ht_plus_dp:N} \meta{box}
-%   \end{syntax}
-%   Calculates the total vertical size (height plus depth) of the \meta{box}
-%   in a form suitable for use in a \meta{dimension expression}.
-% \end{function}
-%
 % \section{Additions to \pkg{l3expan}}
 %
 % \begin{function}[added = 2018-04-04, updated = 2019-02-08]
@@ -869,19 +861,6 @@
 % \end{macro}
 % \end{macro}
 %
-% \begin{macro}{\box_ht_plus_dp:N}
-%   The \cs{box_ht:N} and \cs{box_dp:N} primitives do not expand but
-%   rather are suitable for use after \tn{the} or inside dimension
-%   expressions.  Here we obtain the same behaviour by using
-%   \cs{@@_dim_eval:n} (basically \tn{dimexpr}) rather than
-%   \cs{dim_eval:n} (basically \tn{the} \tn{dimexpr}).
-%    \begin{macrocode}
-\cs_new_protected:Npn \box_ht_plus_dp:N #1
-  { \@@_dim_eval:n { \box_ht:N #1 + \box_dp:N #1 } }
-\cs_generate_variant:Nn \box_ht_plus_dp:N { c }
-%    \end{macrocode}
-% \end{macro}
-%
 % \subsection{Additions to \pkg{l3flag}}
 %
 %    \begin{macrocode}