[latex3-commits] [l3svn] 02/03: Rename \box_resize:Nnn => \box_resize_to_ht_plus_dp:Nnn
noreply at latex-project.org
noreply at latex-project.org
Thu Apr 6 21:39:52 CEST 2017
This is an automated email from the git hooks/post-receive script.
joseph pushed a commit to branch master
in repository l3svn.
commit bbfd9386614387ff520abd58728aa82044906d98
Author: Joseph Wright <joseph.wright at morningstar2.co.uk>
Date: Thu Apr 6 19:53:54 2017 +0100
Rename \box_resize:Nnn => \box_resize_to_ht_plus_dp:Nnn
As the old name is used in the wild and as we are making the
new function stable, the original will go down as formally
deprecated.
---
l3kernel/expl3.dtx | 4 ++--
l3kernel/l3box.dtx | 21 ++++++++++++++++-----
l3kernel/l3candidates.dtx | 2 +-
l3kernel/l3obsolete.txt | 2 ++
l3kernel/testfiles/m3box004.lvt | 14 +++++++-------
l3kernel/testfiles/m3expl001.luatex.tlg | 6 ++++--
l3kernel/testfiles/m3expl001.ptex.tlg | 6 ++++--
l3kernel/testfiles/m3expl001.tlg | 6 ++++--
l3kernel/testfiles/m3expl001.uptex.tlg | 6 ++++--
l3kernel/testfiles/m3expl001.xetex.tlg | 6 ++++--
l3kernel/testfiles/m3expl003.luatex.tlg | 6 ++++--
l3kernel/testfiles/m3expl003.ptex.tlg | 6 ++++--
l3kernel/testfiles/m3expl003.tlg | 6 ++++--
l3kernel/testfiles/m3expl003.uptex.tlg | 6 ++++--
l3kernel/testfiles/m3expl003.xetex.tlg | 6 ++++--
15 files changed, 68 insertions(+), 35 deletions(-)
diff --git a/l3kernel/expl3.dtx b/l3kernel/expl3.dtx
index a7b84d8..1009d1a 100644
--- a/l3kernel/expl3.dtx
+++ b/l3kernel/expl3.dtx
@@ -1417,7 +1417,7 @@
% \begin{macro}
% {
% \box_rotate:Nn,
-% \box_resize:Nnn,
+% \box_resize_to_wd_and_ht_plus_dp:Nnn,
% \box_resize_to_ht_plus_dp:Nn,
% \box_resize_to_wd:Nn,
% \box_scale:Nnn
@@ -1444,7 +1444,7 @@
}
\cs_set_protected:Npn \box_rotate:Nn #1#2
{ \hbox_set:Nn #1 { \rotatebox {#2} { \box_use:N #1 } } }
- \cs_set_protected:Npn \box_resize:Nnn #1#2#3
+ \cs_set_protected:Npn \box_resize_to_wd_and_ht_plus_dp:Nnn #1#2#3
{
\hbox_set:Nn #1
{
diff --git a/l3kernel/l3box.dtx b/l3kernel/l3box.dtx
index dbbce92..f6f8627 100644
--- a/l3kernel/l3box.dtx
+++ b/l3kernel/l3box.dtx
@@ -626,9 +626,10 @@
% The resizing applies within the current \TeX{} group level.
% \end{function}
%
-% \begin{function}{\box_resize:Nnn, \box_resize:cnn}
+% \begin{function}[added = 2017-04-06]
+% {\box_resize_to_wd_and_ht_plus_dp:Nnn, \box_resize_to_wd_and_ht_plus_dp:cnn}
% \begin{syntax}
-% \cs{box_resize:Nnn} \meta{box} \Arg{x-size} \Arg{y-size}
+% \cs{box_resize_to_wd_and_ht_plus_dp:Nnn} \meta{box} \Arg{x-size} \Arg{y-size}
% \end{syntax}
% Resize the \meta{box} to \meta{x-size} horizontally and \meta{y-size}
% vertically (both of the sizes are dimension expressions).
@@ -1652,14 +1653,15 @@
% \end{macrocode}
% \end{variable}
%
-% \begin{macro}{\box_resize:Nnn, \box_resize:cnn}
+% \begin{macro}
+% {\box_resize_to_wd_and_ht_plus_dp:Nnn, \box_resize_to_wd_and_ht_plus_dp:cnn}
% \begin{macro}[aux]{\@@_resize_set_corners:N}
% \begin{macro}[aux]{\@@_resize:N}
% \begin{macro}[aux]{\@@_resize:NNN}
% Resizing a box starts by working out the various dimensions of the
% existing box.
% \begin{macrocode}
-\cs_new_protected:Npn \box_resize:Nnn #1#2#3
+\cs_new_protected:Npn \box_resize_to_wd_and_ht_plus_dp:Nnn #1#2#3
{
\hbox_set:Nn #1
{
@@ -1685,7 +1687,7 @@
\@@_resize:N #1
}
}
-\cs_generate_variant:Nn \box_resize:Nnn { c }
+\cs_generate_variant:Nn \box_resize_to_wd_and_ht_plus_dp:Nnn { c }
\cs_new_protected:Npn \@@_resize_set_corners:N #1
{
\dim_set:Nn \l_@@_top_dim { \box_ht:N #1 }
@@ -1920,6 +1922,15 @@
% \end{macrocode}
% \end{macro}
%
+% \subsection{Deprecated functions}
+%
+% \begin{macro}[deprecated = 2017-04-06]{\box_resize:Nnn, \box_resize:cnn}
+% \begin{macrocode}
+\cs_new_eq:NN \box_resize:Nnn \box_resize_to_wd_and_ht_plus_dp:Nnn
+\cs_new_eq:NN \box_resize:cnn \box_resize_to_wd_and_ht_plus_dp:cnn
+% \end{macrocode}
+% \end{macro}
+%
% \begin{macrocode}
%</initex|package>
% \end{macrocode}
diff --git a/l3kernel/l3candidates.dtx b/l3kernel/l3candidates.dtx
index 257eeb4..40d30b8 100644
--- a/l3kernel/l3candidates.dtx
+++ b/l3kernel/l3candidates.dtx
@@ -1332,7 +1332,7 @@
\dim_to_fp:n {#3}
/ \dim_to_fp:n { \coffin_ht:N #1 + \coffin_dp:N #1 }
}
- \box_resize:Nnn #1 {#2} {#3}
+ \box_resize_to_wd_and_ht_plus_dp:Nnn #1 {#2} {#3}
\@@_resize_common:Nnn #1 {#2} {#3}
}
\cs_generate_variant:Nn \coffin_resize:Nnn { c }
diff --git a/l3kernel/l3obsolete.txt b/l3kernel/l3obsolete.txt
index 8d53477..5d8e254 100644
--- a/l3kernel/l3obsolete.txt
+++ b/l3kernel/l3obsolete.txt
@@ -16,6 +16,8 @@ They will be removed from the sources at the end of the given year.
Function Expires end
--------------------------------------
\c_minus_one 2018
+\box_resize:cnn 2018
+\box_resize:Nnn 2018
\ior_get_str:NN 2017
\sort_ordered: 2018
\sort_reversed: 2018
diff --git a/l3kernel/testfiles/m3box004.lvt b/l3kernel/testfiles/m3box004.lvt
index fa7572f..8b454b5 100644
--- a/l3kernel/testfiles/m3box004.lvt
+++ b/l3kernel/testfiles/m3box004.lvt
@@ -86,31 +86,31 @@
\TEST{Resize~boxes}{
\hbox_set:Nn \l_tmpa_box {ggg}
\group_begin:
- \box_resize:Nnn \l_tmpa_box { 1cm } { 1cm }
+ \box_resize_to_wd_and_ht_plus_dp:Nnn \l_tmpa_box { 1cm } { 1cm }
\box_show:N \l_tmpa_box
\group_end:
\group_begin:
- \box_resize:Nnn \l_tmpa_box { -1cm } { 1cm }
+ \box_resize_to_wd_and_ht_plus_dp:Nnn \l_tmpa_box { -1cm } { 1cm }
\box_show:N \l_tmpa_box
\group_end:
\group_begin:
- \box_resize:Nnn \l_tmpa_box { 1cm } { -1cm }
+ \box_resize_to_wd_and_ht_plus_dp:Nnn \l_tmpa_box { 1cm } { -1cm }
\box_show:N \l_tmpa_box
\group_end:
\group_begin:
- \box_resize:Nnn \l_tmpa_box { 0.5cm } { 1cm }
+ \box_resize_to_wd_and_ht_plus_dp:Nnn \l_tmpa_box { 0.5cm } { 1cm }
\box_show:N \l_tmpa_box
\group_end:
\group_begin:
- \box_resize:Nnn \l_tmpa_box { 1cm } { 0.5cm }
+ \box_resize_to_wd_and_ht_plus_dp:Nnn \l_tmpa_box { 1cm } { 0.5cm }
\box_show:N \l_tmpa_box
\group_end:
\group_begin:
- \box_resize:Nnn \l_tmpa_box { 2cm } { 2cm }
+ \box_resize_to_wd_and_ht_plus_dp:Nnn \l_tmpa_box { 2cm } { 2cm }
\box_show:N \l_tmpa_box
\group_end:
\group_begin:
- \box_resize:Nnn \l_tmpa_box { 0.1cm } { 10cm }
+ \box_resize_to_wd_and_ht_plus_dp:Nnn \l_tmpa_box { 0.1cm } { 10cm }
\box_show:N \l_tmpa_box
\group_end:
}
diff --git a/l3kernel/testfiles/m3expl001.luatex.tlg b/l3kernel/testfiles/m3expl001.luatex.tlg
index 47e86b2..4b89497 100644
--- a/l3kernel/testfiles/m3expl001.luatex.tlg
+++ b/l3kernel/testfiles/m3expl001.luatex.tlg
@@ -4532,8 +4532,8 @@ Defining \__box_rotate_quadrant_three: on line ...
Defining \__box_rotate_quadrant_four: on line ...
Defining \l__box_scale_x_fp on line ...
Defining \l__box_scale_y_fp on line ...
-Defining \box_resize:Nnn on line ...
-Defining \box_resize:cnn on line ...
+Defining \box_resize_to_wd_and_ht_plus_dp:Nnn on line ...
+Defining \box_resize_to_wd_and_ht_plus_dp:cnn on line ...
Defining \__box_resize_set_corners:N on line ...
Defining \__box_resize:N on line ...
Defining \__box_resize:NNN on line ...
@@ -4554,6 +4554,8 @@ Defining \box_autosize_to_wd_and_ht_plus_dp:Nnn on line ...
Defining \box_autosize_to_wd_and_ht_plus_dp:cnn on line ...
Defining \__box_autosize:Nnnn on line ...
Defining \__box_resize_common:N on line ...
+Defining \box_resize:Nnn on line ...
+Defining \box_resize:cnn on line ...
Defining \l__coffin_internal_box on line ...
\l__coffin_internal_box=\box62
Defining \l__coffin_internal_dim on line ...
diff --git a/l3kernel/testfiles/m3expl001.ptex.tlg b/l3kernel/testfiles/m3expl001.ptex.tlg
index edec775..0966187 100644
--- a/l3kernel/testfiles/m3expl001.ptex.tlg
+++ b/l3kernel/testfiles/m3expl001.ptex.tlg
@@ -4500,8 +4500,8 @@ Defining \__box_rotate_quadrant_three: on line ...
Defining \__box_rotate_quadrant_four: on line ...
Defining \l__box_scale_x_fp on line ...
Defining \l__box_scale_y_fp on line ...
-Defining \box_resize:Nnn on line ...
-Defining \box_resize:cnn on line ...
+Defining \box_resize_to_wd_and_ht_plus_dp:Nnn on line ...
+Defining \box_resize_to_wd_and_ht_plus_dp:cnn on line ...
Defining \__box_resize_set_corners:N on line ...
Defining \__box_resize:N on line ...
Defining \__box_resize:NNN on line ...
@@ -4522,6 +4522,8 @@ Defining \box_autosize_to_wd_and_ht_plus_dp:Nnn on line ...
Defining \box_autosize_to_wd_and_ht_plus_dp:cnn on line ...
Defining \__box_autosize:Nnnn on line ...
Defining \__box_resize_common:N on line ...
+Defining \box_resize:Nnn on line ...
+Defining \box_resize:cnn on line ...
Defining \l__coffin_internal_box on line ...
\l__coffin_internal_box=\box62
Defining \l__coffin_internal_dim on line ...
diff --git a/l3kernel/testfiles/m3expl001.tlg b/l3kernel/testfiles/m3expl001.tlg
index 60fc063..7b13cde 100644
--- a/l3kernel/testfiles/m3expl001.tlg
+++ b/l3kernel/testfiles/m3expl001.tlg
@@ -4520,8 +4520,8 @@ Defining \__box_rotate_quadrant_three: on line ...
Defining \__box_rotate_quadrant_four: on line ...
Defining \l__box_scale_x_fp on line ...
Defining \l__box_scale_y_fp on line ...
-Defining \box_resize:Nnn on line ...
-Defining \box_resize:cnn on line ...
+Defining \box_resize_to_wd_and_ht_plus_dp:Nnn on line ...
+Defining \box_resize_to_wd_and_ht_plus_dp:cnn on line ...
Defining \__box_resize_set_corners:N on line ...
Defining \__box_resize:N on line ...
Defining \__box_resize:NNN on line ...
@@ -4542,6 +4542,8 @@ Defining \box_autosize_to_wd_and_ht_plus_dp:Nnn on line ...
Defining \box_autosize_to_wd_and_ht_plus_dp:cnn on line ...
Defining \__box_autosize:Nnnn on line ...
Defining \__box_resize_common:N on line ...
+Defining \box_resize:Nnn on line ...
+Defining \box_resize:cnn on line ...
Defining \l__coffin_internal_box on line ...
\l__coffin_internal_box=\box62
Defining \l__coffin_internal_dim on line ...
diff --git a/l3kernel/testfiles/m3expl001.uptex.tlg b/l3kernel/testfiles/m3expl001.uptex.tlg
index 29a5d96..a49af68 100644
--- a/l3kernel/testfiles/m3expl001.uptex.tlg
+++ b/l3kernel/testfiles/m3expl001.uptex.tlg
@@ -4500,8 +4500,8 @@ Defining \__box_rotate_quadrant_three: on line ...
Defining \__box_rotate_quadrant_four: on line ...
Defining \l__box_scale_x_fp on line ...
Defining \l__box_scale_y_fp on line ...
-Defining \box_resize:Nnn on line ...
-Defining \box_resize:cnn on line ...
+Defining \box_resize_to_wd_and_ht_plus_dp:Nnn on line ...
+Defining \box_resize_to_wd_and_ht_plus_dp:cnn on line ...
Defining \__box_resize_set_corners:N on line ...
Defining \__box_resize:N on line ...
Defining \__box_resize:NNN on line ...
@@ -4522,6 +4522,8 @@ Defining \box_autosize_to_wd_and_ht_plus_dp:Nnn on line ...
Defining \box_autosize_to_wd_and_ht_plus_dp:cnn on line ...
Defining \__box_autosize:Nnnn on line ...
Defining \__box_resize_common:N on line ...
+Defining \box_resize:Nnn on line ...
+Defining \box_resize:cnn on line ...
Defining \l__coffin_internal_box on line ...
\l__coffin_internal_box=\box62
Defining \l__coffin_internal_dim on line ...
diff --git a/l3kernel/testfiles/m3expl001.xetex.tlg b/l3kernel/testfiles/m3expl001.xetex.tlg
index 0c74c36..5852bb0 100644
--- a/l3kernel/testfiles/m3expl001.xetex.tlg
+++ b/l3kernel/testfiles/m3expl001.xetex.tlg
@@ -4510,8 +4510,8 @@ Defining \__box_rotate_quadrant_three: on line ...
Defining \__box_rotate_quadrant_four: on line ...
Defining \l__box_scale_x_fp on line ...
Defining \l__box_scale_y_fp on line ...
-Defining \box_resize:Nnn on line ...
-Defining \box_resize:cnn on line ...
+Defining \box_resize_to_wd_and_ht_plus_dp:Nnn on line ...
+Defining \box_resize_to_wd_and_ht_plus_dp:cnn on line ...
Defining \__box_resize_set_corners:N on line ...
Defining \__box_resize:N on line ...
Defining \__box_resize:NNN on line ...
@@ -4532,6 +4532,8 @@ Defining \box_autosize_to_wd_and_ht_plus_dp:Nnn on line ...
Defining \box_autosize_to_wd_and_ht_plus_dp:cnn on line ...
Defining \__box_autosize:Nnnn on line ...
Defining \__box_resize_common:N on line ...
+Defining \box_resize:Nnn on line ...
+Defining \box_resize:cnn on line ...
Defining \l__coffin_internal_box on line ...
\l__coffin_internal_box=\box62
Defining \l__coffin_internal_dim on line ...
diff --git a/l3kernel/testfiles/m3expl003.luatex.tlg b/l3kernel/testfiles/m3expl003.luatex.tlg
index 453c269..a6fceb7 100644
--- a/l3kernel/testfiles/m3expl003.luatex.tlg
+++ b/l3kernel/testfiles/m3expl003.luatex.tlg
@@ -4533,8 +4533,8 @@ Defining \__box_rotate_quadrant_three: on line ...
Defining \__box_rotate_quadrant_four: on line ...
Defining \l__box_scale_x_fp on line ...
Defining \l__box_scale_y_fp on line ...
-Defining \box_resize:Nnn on line ...
-Defining \box_resize:cnn on line ...
+Defining \box_resize_to_wd_and_ht_plus_dp:Nnn on line ...
+Defining \box_resize_to_wd_and_ht_plus_dp:cnn on line ...
Defining \__box_resize_set_corners:N on line ...
Defining \__box_resize:N on line ...
Defining \__box_resize:NNN on line ...
@@ -4555,6 +4555,8 @@ Defining \box_autosize_to_wd_and_ht_plus_dp:Nnn on line ...
Defining \box_autosize_to_wd_and_ht_plus_dp:cnn on line ...
Defining \__box_autosize:Nnnn on line ...
Defining \__box_resize_common:N on line ...
+Defining \box_resize:Nnn on line ...
+Defining \box_resize:cnn on line ...
Defining \l__coffin_internal_box on line ...
\l__coffin_internal_box=\box62
Defining \l__coffin_internal_dim on line ...
diff --git a/l3kernel/testfiles/m3expl003.ptex.tlg b/l3kernel/testfiles/m3expl003.ptex.tlg
index c4bfa7c..3492779 100644
--- a/l3kernel/testfiles/m3expl003.ptex.tlg
+++ b/l3kernel/testfiles/m3expl003.ptex.tlg
@@ -4501,8 +4501,8 @@ Defining \__box_rotate_quadrant_three: on line ...
Defining \__box_rotate_quadrant_four: on line ...
Defining \l__box_scale_x_fp on line ...
Defining \l__box_scale_y_fp on line ...
-Defining \box_resize:Nnn on line ...
-Defining \box_resize:cnn on line ...
+Defining \box_resize_to_wd_and_ht_plus_dp:Nnn on line ...
+Defining \box_resize_to_wd_and_ht_plus_dp:cnn on line ...
Defining \__box_resize_set_corners:N on line ...
Defining \__box_resize:N on line ...
Defining \__box_resize:NNN on line ...
@@ -4523,6 +4523,8 @@ Defining \box_autosize_to_wd_and_ht_plus_dp:Nnn on line ...
Defining \box_autosize_to_wd_and_ht_plus_dp:cnn on line ...
Defining \__box_autosize:Nnnn on line ...
Defining \__box_resize_common:N on line ...
+Defining \box_resize:Nnn on line ...
+Defining \box_resize:cnn on line ...
Defining \l__coffin_internal_box on line ...
\l__coffin_internal_box=\box62
Defining \l__coffin_internal_dim on line ...
diff --git a/l3kernel/testfiles/m3expl003.tlg b/l3kernel/testfiles/m3expl003.tlg
index 857f8ee..f358590 100644
--- a/l3kernel/testfiles/m3expl003.tlg
+++ b/l3kernel/testfiles/m3expl003.tlg
@@ -4521,8 +4521,8 @@ Defining \__box_rotate_quadrant_three: on line ...
Defining \__box_rotate_quadrant_four: on line ...
Defining \l__box_scale_x_fp on line ...
Defining \l__box_scale_y_fp on line ...
-Defining \box_resize:Nnn on line ...
-Defining \box_resize:cnn on line ...
+Defining \box_resize_to_wd_and_ht_plus_dp:Nnn on line ...
+Defining \box_resize_to_wd_and_ht_plus_dp:cnn on line ...
Defining \__box_resize_set_corners:N on line ...
Defining \__box_resize:N on line ...
Defining \__box_resize:NNN on line ...
@@ -4543,6 +4543,8 @@ Defining \box_autosize_to_wd_and_ht_plus_dp:Nnn on line ...
Defining \box_autosize_to_wd_and_ht_plus_dp:cnn on line ...
Defining \__box_autosize:Nnnn on line ...
Defining \__box_resize_common:N on line ...
+Defining \box_resize:Nnn on line ...
+Defining \box_resize:cnn on line ...
Defining \l__coffin_internal_box on line ...
\l__coffin_internal_box=\box62
Defining \l__coffin_internal_dim on line ...
diff --git a/l3kernel/testfiles/m3expl003.uptex.tlg b/l3kernel/testfiles/m3expl003.uptex.tlg
index 9acf4f6..daa9428 100644
--- a/l3kernel/testfiles/m3expl003.uptex.tlg
+++ b/l3kernel/testfiles/m3expl003.uptex.tlg
@@ -4501,8 +4501,8 @@ Defining \__box_rotate_quadrant_three: on line ...
Defining \__box_rotate_quadrant_four: on line ...
Defining \l__box_scale_x_fp on line ...
Defining \l__box_scale_y_fp on line ...
-Defining \box_resize:Nnn on line ...
-Defining \box_resize:cnn on line ...
+Defining \box_resize_to_wd_and_ht_plus_dp:Nnn on line ...
+Defining \box_resize_to_wd_and_ht_plus_dp:cnn on line ...
Defining \__box_resize_set_corners:N on line ...
Defining \__box_resize:N on line ...
Defining \__box_resize:NNN on line ...
@@ -4523,6 +4523,8 @@ Defining \box_autosize_to_wd_and_ht_plus_dp:Nnn on line ...
Defining \box_autosize_to_wd_and_ht_plus_dp:cnn on line ...
Defining \__box_autosize:Nnnn on line ...
Defining \__box_resize_common:N on line ...
+Defining \box_resize:Nnn on line ...
+Defining \box_resize:cnn on line ...
Defining \l__coffin_internal_box on line ...
\l__coffin_internal_box=\box62
Defining \l__coffin_internal_dim on line ...
diff --git a/l3kernel/testfiles/m3expl003.xetex.tlg b/l3kernel/testfiles/m3expl003.xetex.tlg
index 2f75573..a3775ca 100644
--- a/l3kernel/testfiles/m3expl003.xetex.tlg
+++ b/l3kernel/testfiles/m3expl003.xetex.tlg
@@ -4511,8 +4511,8 @@ Defining \__box_rotate_quadrant_three: on line ...
Defining \__box_rotate_quadrant_four: on line ...
Defining \l__box_scale_x_fp on line ...
Defining \l__box_scale_y_fp on line ...
-Defining \box_resize:Nnn on line ...
-Defining \box_resize:cnn on line ...
+Defining \box_resize_to_wd_and_ht_plus_dp:Nnn on line ...
+Defining \box_resize_to_wd_and_ht_plus_dp:cnn on line ...
Defining \__box_resize_set_corners:N on line ...
Defining \__box_resize:N on line ...
Defining \__box_resize:NNN on line ...
@@ -4533,6 +4533,8 @@ Defining \box_autosize_to_wd_and_ht_plus_dp:Nnn on line ...
Defining \box_autosize_to_wd_and_ht_plus_dp:cnn on line ...
Defining \__box_autosize:Nnnn on line ...
Defining \__box_resize_common:N on line ...
+Defining \box_resize:Nnn on line ...
+Defining \box_resize:cnn on line ...
Defining \l__coffin_internal_box on line ...
\l__coffin_internal_box=\box62
Defining \l__coffin_internal_dim on line ...
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the latex3-commits
mailing list