[latex3-commits] [l3svn] 03/04: Drop some unnecessary groups
noreply at latex-project.org
noreply at latex-project.org
Wed Apr 5 21:43:23 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 94d4263f0aab47c181ad2fca6917c806b7dac9f9
Author: Joseph Wright <joseph.wright at morningstar2.co.uk>
Date: Wed Apr 5 20:18:48 2017 +0100
Drop some unnecessary groups
No idea why I included these in the first place ...
---
l3kernel/l3candidates.dtx | 120 ++++++++++++++++++++-------------------------
1 file changed, 52 insertions(+), 68 deletions(-)
diff --git a/l3kernel/l3candidates.dtx b/l3kernel/l3candidates.dtx
index b882f76..b8a7cf4 100644
--- a/l3kernel/l3candidates.dtx
+++ b/l3kernel/l3candidates.dtx
@@ -1060,12 +1060,10 @@
{
\hbox_set:Nn #1
{
- \group_begin:
- \fp_set:Nn \l_@@_angle_fp {#2}
- \fp_set:Nn \l_@@_sin_fp { sind ( \l_@@_angle_fp ) }
- \fp_set:Nn \l_@@_cos_fp { cosd ( \l_@@_angle_fp ) }
- \@@_rotate:N #1
- \group_end:
+ \fp_set:Nn \l_@@_angle_fp {#2}
+ \fp_set:Nn \l_@@_sin_fp { sind ( \l_@@_angle_fp ) }
+ \fp_set:Nn \l_@@_cos_fp { cosd ( \l_@@_angle_fp ) }
+ \@@_rotate:N #1
}
}
% \end{macrocode}
@@ -1269,28 +1267,26 @@
{
\hbox_set:Nn #1
{
- \group_begin:
- \@@_resize_set_corners:N #1
+ \@@_resize_set_corners:N #1
% \end{macrocode}
% The $x$-scaling and resulting box size is easy enough to work
% out: the dimension is that given as |#2|, and the scale is simply the
% new width divided by the old one.
% \begin{macrocode}
- \fp_set:Nn \l_@@_scale_x_fp
- { \dim_to_fp:n {#2} / \dim_to_fp:n { \l_@@_right_dim } }
+ \fp_set:Nn \l_@@_scale_x_fp
+ { \dim_to_fp:n {#2} / \dim_to_fp:n { \l_@@_right_dim } }
% \end{macrocode}
% The $y$-scaling needs both the height and the depth of the current box.
% \begin{macrocode}
- \fp_set:Nn \l_@@_scale_y_fp
- {
- \dim_to_fp:n {#3}
- / \dim_to_fp:n { \l_@@_top_dim - \l_@@_bottom_dim }
- }
+ \fp_set:Nn \l_@@_scale_y_fp
+ {
+ \dim_to_fp:n {#3}
+ / \dim_to_fp:n { \l_@@_top_dim - \l_@@_bottom_dim }
+ }
% \end{macrocode}
% Hand off to the auxiliary which does the rest of the work.
% \begin{macrocode}
- \@@_resize:N #1
- \group_end:
+ \@@_resize:N #1
}
}
\cs_generate_variant:Nn \box_resize:Nnn { c }
@@ -1343,16 +1339,14 @@
{
\hbox_set:Nn #1
{
- \group_begin:
- \@@_resize_set_corners:N #1
- \fp_set:Nn \l_@@_scale_y_fp
- {
- \dim_to_fp:n {#2}
- / \dim_to_fp:n { \l_@@_top_dim }
- }
- \fp_set_eq:NN \l_@@_scale_x_fp \l_@@_scale_y_fp
- \@@_resize:N #1
- \group_end:
+ \@@_resize_set_corners:N #1
+ \fp_set:Nn \l_@@_scale_y_fp
+ {
+ \dim_to_fp:n {#2}
+ / \dim_to_fp:n { \l_@@_top_dim }
+ }
+ \fp_set_eq:NN \l_@@_scale_x_fp \l_@@_scale_y_fp
+ \@@_resize:N #1
}
}
\cs_generate_variant:Nn \box_resize_to_ht:Nn { c }
@@ -1360,16 +1354,14 @@
{
\hbox_set:Nn #1
{
- \group_begin:
- \@@_resize_set_corners:N #1
- \fp_set:Nn \l_@@_scale_y_fp
- {
- \dim_to_fp:n {#2}
- / \dim_to_fp:n { \l_@@_top_dim - \l_@@_bottom_dim }
- }
- \fp_set_eq:NN \l_@@_scale_x_fp \l_@@_scale_y_fp
- \@@_resize:N #1
- \group_end:
+ \@@_resize_set_corners:N #1
+ \fp_set:Nn \l_@@_scale_y_fp
+ {
+ \dim_to_fp:n {#2}
+ / \dim_to_fp:n { \l_@@_top_dim - \l_@@_bottom_dim }
+ }
+ \fp_set_eq:NN \l_@@_scale_x_fp \l_@@_scale_y_fp
+ \@@_resize:N #1
}
}
\cs_generate_variant:Nn \box_resize_to_ht_plus_dp:Nn { c }
@@ -1377,13 +1369,11 @@
{
\hbox_set:Nn #1
{
- \group_begin:
- \@@_resize_set_corners:N #1
- \fp_set:Nn \l_@@_scale_x_fp
- { \dim_to_fp:n {#2} / \dim_to_fp:n { \l_@@_right_dim } }
- \fp_set_eq:NN \l_@@_scale_y_fp \l_@@_scale_x_fp
- \@@_resize:N #1
- \group_end:
+ \@@_resize_set_corners:N #1
+ \fp_set:Nn \l_@@_scale_x_fp
+ { \dim_to_fp:n {#2} / \dim_to_fp:n { \l_@@_right_dim } }
+ \fp_set_eq:NN \l_@@_scale_y_fp \l_@@_scale_x_fp
+ \@@_resize:N #1
}
}
\cs_generate_variant:Nn \box_resize_to_wd:Nn { c }
@@ -1391,17 +1381,15 @@
{
\hbox_set:Nn #1
{
- \group_begin:
- \@@_resize_set_corners:N #1
- \fp_set:Nn \l_@@_scale_x_fp
- { \dim_to_fp:n {#2} / \dim_to_fp:n { \l_@@_right_dim } }
- \fp_set:Nn \l_@@_scale_y_fp
- {
- \dim_to_fp:n {#3}
- / \dim_to_fp:n { \l_@@_top_dim }
- }
- \@@_resize:N #1
- \group_end:
+ \@@_resize_set_corners:N #1
+ \fp_set:Nn \l_@@_scale_x_fp
+ { \dim_to_fp:n {#2} / \dim_to_fp:n { \l_@@_right_dim } }
+ \fp_set:Nn \l_@@_scale_y_fp
+ {
+ \dim_to_fp:n {#3}
+ / \dim_to_fp:n { \l_@@_top_dim }
+ }
+ \@@_resize:N #1
}
}
\cs_generate_variant:Nn \box_resize_to_wd_and_ht:Nnn { c }
@@ -1424,11 +1412,9 @@
{
\hbox_set:Nn #1
{
- \group_begin:
- \fp_set:Nn \l_@@_scale_x_fp {#2}
- \fp_set:Nn \l_@@_scale_y_fp {#3}
- \@@_scale_aux:N #1
- \group_end:
+ \fp_set:Nn \l_@@_scale_x_fp {#2}
+ \fp_set:Nn \l_@@_scale_y_fp {#3}
+ \@@_scale_aux:N #1
}
}
\cs_generate_variant:Nn \box_scale:Nnn { c }
@@ -1472,14 +1458,12 @@
{
\hbox_set:Nn #1
{
- \group_begin:
- \fp_set:Nn \l_@@_scale_x_fp { ( #2 ) / \box_wd:N #1 }
- \fp_set:Nn \l_@@_scale_y_fp { ( #3 ) / ( #4 ) }
- \fp_compare:nNnTF \l_@@_scale_x_fp > \l_@@_scale_y_fp
- { \fp_set_eq:NN \l_@@_scale_x_fp \l_@@_scale_y_fp }
- { \fp_set_eq:NN \l_@@_scale_y_fp \l_@@_scale_x_fp }
- \@@_scale_aux:N #1
- \group_end:
+ \fp_set:Nn \l_@@_scale_x_fp { ( #2 ) / \box_wd:N #1 }
+ \fp_set:Nn \l_@@_scale_y_fp { ( #3 ) / ( #4 ) }
+ \fp_compare:nNnTF \l_@@_scale_x_fp > \l_@@_scale_y_fp
+ { \fp_set_eq:NN \l_@@_scale_x_fp \l_@@_scale_y_fp }
+ { \fp_set_eq:NN \l_@@_scale_y_fp \l_@@_scale_x_fp }
+ \@@_scale_aux:N #1
}
}
% \end{macrocode}
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the latex3-commits
mailing list