summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/latex/l3kernel/l3candidates.sty
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2012-08-16 22:41:08 +0000
committerKarl Berry <karl@freefriends.org>2012-08-16 22:41:08 +0000
commitca1c73f9a8de69e467230c4a57ccf8b07cd275a9 (patch)
tree6272657307f73c14327d6b8bce5d6b7ff97c3f66 /Master/texmf-dist/tex/latex/l3kernel/l3candidates.sty
parent22c251adda514ed7b453066de05b2f89707d0fe6 (diff)
finish l3 update
git-svn-id: svn://tug.org/texlive/trunk@27427 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/latex/l3kernel/l3candidates.sty')
-rw-r--r--Master/texmf-dist/tex/latex/l3kernel/l3candidates.sty72
1 files changed, 25 insertions, 47 deletions
diff --git a/Master/texmf-dist/tex/latex/l3kernel/l3candidates.sty b/Master/texmf-dist/tex/latex/l3kernel/l3candidates.sty
index 1a867d3501c..6ee3e3a018b 100644
--- a/Master/texmf-dist/tex/latex/l3kernel/l3candidates.sty
+++ b/Master/texmf-dist/tex/latex/l3kernel/l3candidates.sty
@@ -46,7 +46,7 @@
%%
%% -----------------------------------------------------------------------
%%
-\RequirePackage{l3names}
+\RequirePackage{l3bootstrap}
\GetIdInfo$Id: l3candidates.dtx 3633 2012-05-12 20:11:32Z joseph $
{L3 Experimental additions to l3kernel}
\ProvidesExplPackage
@@ -201,22 +201,11 @@
\cs_generate_variant:Nn \box_resize:Nnn { c }
\cs_new_protected:Npn \__box_resize:Nnn #1#2#3
{
- \dim_compare:nNnTF {#2} > \c_zero_dim
- { \dim_set:Nn \l__box_right_new_dim {#2} }
- { \dim_set:Nn \l__box_right_new_dim { \c_zero_dim - ( #2 ) } }
- \dim_compare:nNnTF {#3} > \c_zero_dim
- {
- \dim_set:Nn \l__box_top_new_dim
- { \fp_use:N \l__box_scale_y_fp \l__box_top_dim }
- \dim_set:Nn \l__box_bottom_new_dim
- { \fp_use:N \l__box_scale_y_fp \l__box_bottom_dim }
- }
- {
- \dim_set:Nn \l__box_top_new_dim
- { - \fp_use:N \l__box_scale_y_fp \l__box_top_dim }
- \dim_set:Nn \l__box_bottom_new_dim
- { - \fp_use:N \l__box_scale_y_fp \l__box_bottom_dim }
- }
+ \dim_set:Nn \l__box_right_new_dim { \dim_abs:n {#2} }
+ \dim_set:Nn \l__box_bottom_new_dim
+ { \fp_abs:n { \l__box_scale_y_fp } \l__box_bottom_dim }
+ \dim_set:Nn \l__box_top_new_dim
+ { \fp_abs:n { \l__box_scale_y_fp } \l__box_top_dim }
\__box_resize_common:N #1
}
\cs_new_protected:Npn \box_resize_to_ht_plus_dp:Nn #1#2
@@ -267,27 +256,17 @@
\dim_set:Nn \l__box_bottom_dim { -\box_dp:N #1 }
\dim_set:Nn \l__box_right_dim { \box_wd:N #1 }
\dim_zero:N \l__box_left_dim
- \__box_scale:Nnn #1 {#2} {#3}
+ \dim_set:Nn \l__box_top_new_dim
+ { \fp_abs:n { \l__box_scale_y_fp } \l__box_top_dim }
+ \dim_set:Nn \l__box_bottom_new_dim
+ { \fp_abs:n { \l__box_scale_y_fp } \l__box_bottom_dim }
+ \dim_set:Nn \l__box_right_new_dim
+ { \fp_abs:n { \l__box_scale_x_fp } \l__box_right_dim }
+ \__box_resize_common:N #1
\group_end:
}
}
\cs_generate_variant:Nn \box_scale:Nnn { c }
-\cs_new_protected:Npn \__box_scale:Nnn #1#2#3
- {
- \fp_compare:nNnTF \l__box_scale_y_fp > \c_zero_fp
- {
- \dim_set:Nn \l__box_top_new_dim { #3 \l__box_top_dim }
- \dim_set:Nn \l__box_bottom_new_dim { #3 \l__box_bottom_dim }
- }
- {
- \dim_set:Nn \l__box_top_new_dim { -#3 \l__box_bottom_dim }
- \dim_set:Nn \l__box_bottom_new_dim { -#3 \l__box_top_dim }
- }
- \fp_compare:nNnTF \l__box_scale_x_fp > \c_zero_fp
- { \l__box_right_new_dim #2 \l__box_right_dim }
- { \l__box_right_new_dim -#2 \l__box_right_dim }
- \__box_resize_common:N #1
- }
\cs_new_protected:Npn \__box_resize_common:N #1
{
\hbox_set:Nn \l__box_internal_box
@@ -635,12 +614,13 @@
\dim_new:N \l__coffin_scaled_width_dim
\cs_new_protected:Npn \coffin_resize:Nnn #1#2#3
{
- \__coffin_set_user_dimensions:N #1
- \box_resize:Nnn #1 {#2} {#3}
\fp_set:Nn \l__coffin_scale_x_fp
- { \dim_to_fp:n {#2} / \dim_to_fp:n \Width }
+ { \dim_to_fp:n {#2} / \dim_to_fp:n { \coffin_wd:N #1 } }
\fp_set:Nn \l__coffin_scale_y_fp
- { \dim_to_fp:n {#3} / \dim_to_fp:n \TotalHeight }
+ {
+ \dim_to_fp:n {#3} / \dim_to_fp:n { \coffin_ht:N #1 + \coffin_dp:N #1 }
+ }
+ \box_resize:Nnn #1 {#2} {#3}
\__coffin_resize_common:Nnn #1 {#2} {#3}
}
\cs_generate_variant:Nn \coffin_resize:Nnn { c }
@@ -657,20 +637,18 @@
\prop_map_inline:cn { l__coffin_poles_ \__int_value:w #1 _prop }
{ \__coffin_x_shift_pole:Nnnnnn #1 {##1} ##2 }
}
- \__coffin_end_user_dimensions:
}
\cs_new_protected:Npn \coffin_scale:Nnn #1#2#3
{
- \box_scale:Nnn #1 {#2} {#3}
- \__coffin_set_user_dimensions:N #1
\fp_set:Nn \l__coffin_scale_x_fp {#2}
\fp_set:Nn \l__coffin_scale_y_fp {#3}
- \fp_compare:nNnTF \l__coffin_scale_y_fp > \c_zero_fp
- { \l__coffin_scaled_total_height_dim #3 \TotalHeight }
- { \l__coffin_scaled_total_height_dim -#3 \TotalHeight }
- \fp_compare:nNnTF \l__coffin_scale_x_fp > \c_zero_fp
- { \l__coffin_scaled_width_dim -#2 \Width }
- { \l__coffin_scaled_width_dim #2 \Width }
+ \box_scale:Nnn #1 { \l__coffin_scale_x_fp } { \l__coffin_scale_y_fp }
+ \dim_set:Nn \l__coffin_internal_dim
+ { \coffin_ht:N #1 + \coffin_dp:N #1 }
+ \dim_set:Nn \l__coffin_scaled_total_height_dim
+ { \fp_abs:n { \l__coffin_scale_y_fp } \l__coffin_internal_dim }
+ \dim_set:Nn \l__coffin_scaled_width_dim
+ { -\fp_abs:n { \l__coffin_scale_x_fp } \coffin_wd:N #1 }
\__coffin_resize_common:Nnn #1
{ \l__coffin_scaled_width_dim } { \l__coffin_scaled_total_height_dim }
}