diff options
Diffstat (limited to 'Master/texmf-dist/tex/latex/l3kernel/l3box.sty')
-rw-r--r-- | Master/texmf-dist/tex/latex/l3kernel/l3box.sty | 72 |
1 files changed, 36 insertions, 36 deletions
diff --git a/Master/texmf-dist/tex/latex/l3kernel/l3box.sty b/Master/texmf-dist/tex/latex/l3kernel/l3box.sty index 14f032e0ea5..9176a912928 100644 --- a/Master/texmf-dist/tex/latex/l3kernel/l3box.sty +++ b/Master/texmf-dist/tex/latex/l3kernel/l3box.sty @@ -13,7 +13,7 @@ %% %% Do not distribute a modified version of this file. %% -%% File: l3box.dtx Copyright (C) 2005-2011 The LaTeX3 Project +%% File: l3box.dtx Copyright (C) 2005-2012 The LaTeX3 Project %% %% It may be distributed and/or modified under the conditions of the %% LaTeX Project Public License (LPPL), either version 1.3c of this @@ -46,7 +46,7 @@ %% %% ----------------------------------------------------------------------- \RequirePackage{l3names} -\GetIdInfo$Id: l3box.dtx 3086 2011-12-22 17:55:46Z bruno $ +\GetIdInfo$Id: l3box.dtx 3158 2012-01-09 00:47:42Z bruno $ {L3 Experimental boxes} \ProvidesExplPackage {\ExplFileName}{\ExplFileDate}{\ExplFileVersion}{\ExplFileDescription} @@ -263,8 +263,8 @@ \dim_new:N \l_box_bottom_new_dim \dim_new:N \l_box_left_new_dim \dim_new:N \l_box_right_new_dim -\box_new:N \l_box_tmp_box -\fp_new:N \l_box_tmp_fp +\box_new:N \l_box_internal_box +\fp_new:N \l_box_internal_fp \fp_new:N \l_box_x_fp \fp_new:N \l_box_y_fp \fp_new:N \l_box_x_new_fp @@ -303,40 +303,40 @@ { \box_rotate_quadrant_three: } { \box_rotate_quadrant_four: } } - \hbox_set:Nn \l_box_tmp_box { \box_use:N #1 } - \hbox_set:Nn \l_box_tmp_box + \hbox_set:Nn \l_box_internal_box { \box_use:N #1 } + \hbox_set:Nn \l_box_internal_box { \tex_kern:D -\l_box_left_new_dim \hbox:n { \driver_box_rotate_begin: - \box_use:N \l_box_tmp_box + \box_use:N \l_box_internal_box \driver_box_rotate_end: } } - \box_set_ht:Nn \l_box_tmp_box { \l_box_top_new_dim } - \box_set_dp:Nn \l_box_tmp_box { -\l_box_bottom_new_dim } - \box_set_wd:Nn \l_box_tmp_box + \box_set_ht:Nn \l_box_internal_box { \l_box_top_new_dim } + \box_set_dp:Nn \l_box_internal_box { -\l_box_bottom_new_dim } + \box_set_wd:Nn \l_box_internal_box { \l_box_right_new_dim - \l_box_left_new_dim } - \box_use:N \l_box_tmp_box + \box_use:N \l_box_internal_box } \cs_new_protected:Npn \box_rotate_set_sin_cos: { - \fp_set_eq:NN \l_box_tmp_fp \l_box_angle_fp - \fp_div:Nn \l_box_tmp_fp { 180 } - \fp_mul:Nn \l_box_tmp_fp { \c_pi_fp } - \fp_sin:Nn \l_box_sin_fp { \l_box_tmp_fp } - \fp_cos:Nn \l_box_cos_fp { \l_box_tmp_fp } + \fp_set_eq:NN \l_box_internal_fp \l_box_angle_fp + \fp_div:Nn \l_box_internal_fp { 180 } + \fp_mul:Nn \l_box_internal_fp { \c_pi_fp } + \fp_sin:Nn \l_box_sin_fp { \l_box_internal_fp } + \fp_cos:Nn \l_box_cos_fp { \l_box_internal_fp } } \cs_new_protected:Npn \box_rotate_x:nnN #1#2#3 { \fp_set_from_dim:Nn \l_box_x_fp {#1} \fp_set_from_dim:Nn \l_box_y_fp {#2} \fp_set_eq:NN \l_box_x_new_fp \l_box_x_fp - \fp_set_eq:NN \l_box_tmp_fp \l_box_y_fp + \fp_set_eq:NN \l_box_internal_fp \l_box_y_fp \fp_mul:Nn \l_box_x_new_fp { \l_box_cos_fp } - \fp_mul:Nn \l_box_tmp_fp { \l_box_sin_fp } - \fp_sub:Nn \l_box_x_new_fp { \l_box_tmp_fp } + \fp_mul:Nn \l_box_internal_fp { \l_box_sin_fp } + \fp_sub:Nn \l_box_x_new_fp { \l_box_internal_fp } \dim_set:Nn #3 { \fp_to_dim:N \l_box_x_new_fp } } \cs_new_protected:Npn \box_rotate_y:nnN #1#2#3 @@ -344,10 +344,10 @@ \fp_set_from_dim:Nn \l_box_x_fp {#1} \fp_set_from_dim:Nn \l_box_y_fp {#2} \fp_set_eq:NN \l_box_y_new_fp \l_box_y_fp - \fp_set_eq:NN \l_box_tmp_fp \l_box_x_fp + \fp_set_eq:NN \l_box_internal_fp \l_box_x_fp \fp_mul:Nn \l_box_y_new_fp { \l_box_cos_fp } - \fp_mul:Nn \l_box_tmp_fp { \l_box_sin_fp } - \fp_add:Nn \l_box_y_new_fp { \l_box_tmp_fp } + \fp_mul:Nn \l_box_internal_fp { \l_box_sin_fp } + \fp_add:Nn \l_box_y_new_fp { \l_box_internal_fp } \dim_set:Nn #3 { \fp_to_dim:N \l_box_y_new_fp } } \cs_new_protected:Npn \box_rotate_quadrant_one: @@ -406,12 +406,12 @@ \dim_set:Nn \l_box_right_dim { \box_wd:N #1 } \dim_zero:N \l_box_left_dim \fp_set_from_dim:Nn \l_box_scale_x_fp {#2} - \fp_set_from_dim:Nn \l_box_tmp_fp { \l_box_right_dim } - \fp_div:Nn \l_box_scale_x_fp { \l_box_tmp_fp } + \fp_set_from_dim:Nn \l_box_internal_fp { \l_box_right_dim } + \fp_div:Nn \l_box_scale_x_fp { \l_box_internal_fp } \fp_set_from_dim:Nn \l_box_scale_y_fp {#3} - \fp_set_from_dim:Nn \l_box_tmp_fp + \fp_set_from_dim:Nn \l_box_internal_fp { \l_box_top_dim - \l_box_bottom_dim } - \fp_div:Nn \l_box_scale_y_fp { \l_box_tmp_fp } + \fp_div:Nn \l_box_scale_y_fp { \l_box_internal_fp } \fp_compare:NNNTF \l_box_scale_x_fp = \c_one_fp { \fp_compare:NNNTF \l_box_scale_y_fp = \c_one_fp @@ -453,9 +453,9 @@ \dim_set:Nn \l_box_right_dim { \box_wd:N #1 } \dim_zero:N \l_box_left_dim \fp_set_from_dim:Nn \l_box_scale_y_fp {#2} - \fp_set_from_dim:Nn \l_box_tmp_fp + \fp_set_from_dim:Nn \l_box_internal_fp { \l_box_top_dim - \l_box_bottom_dim } - \fp_div:Nn \l_box_scale_y_fp { \l_box_tmp_fp } + \fp_div:Nn \l_box_scale_y_fp { \l_box_internal_fp } \fp_set_eq:NN \l_box_scale_x_fp \l_box_scale_y_fp \fp_compare:NNNTF \l_box_scale_y_fp = \c_one_fp { \box_use:N #1 } @@ -474,8 +474,8 @@ \dim_set:Nn \l_box_right_dim { \box_wd:N #1 } \dim_zero:N \l_box_left_dim \fp_set_from_dim:Nn \l_box_scale_x_fp {#2} - \fp_set_from_dim:Nn \l_box_tmp_fp { \l_box_right_dim } - \fp_div:Nn \l_box_scale_x_fp { \l_box_tmp_fp } + \fp_set_from_dim:Nn \l_box_internal_fp { \l_box_right_dim } + \fp_div:Nn \l_box_scale_x_fp { \l_box_internal_fp } \fp_set_eq:NN \l_box_scale_y_fp \l_box_scale_x_fp \fp_compare:NNNTF \l_box_scale_x_fp = \c_one_fp { \box_use:N #1 } @@ -524,26 +524,26 @@ } \cs_new_protected:Npn \box_resize_common:N #1 { - \hbox_set:Nn \l_box_tmp_box + \hbox_set:Nn \l_box_internal_box { \driver_box_scale_begin: \hbox_overlap_right:n { \box_use:N #1 } \driver_box_scale_end: } - \box_set_ht:Nn \l_box_tmp_box { \l_box_top_new_dim } - \box_set_dp:Nn \l_box_tmp_box { \l_box_bottom_new_dim } + \box_set_ht:Nn \l_box_internal_box { \l_box_top_new_dim } + \box_set_dp:Nn \l_box_internal_box { \l_box_bottom_new_dim } \fp_compare:NNNTF \l_box_scale_x_fp < \c_zero_fp { \hbox_to_wd:nn { \l_box_right_new_dim } { \tex_kern:D \l_box_right_new_dim - \box_use:N \l_box_tmp_box + \box_use:N \l_box_internal_box \tex_hss:D } } { - \box_set_wd:Nn \l_box_tmp_box { \l_box_right_new_dim } - \box_use:N \l_box_tmp_box + \box_set_wd:Nn \l_box_internal_box { \l_box_right_new_dim } + \box_use:N \l_box_internal_box } } \cs_new_protected:Npn \box_clip:N #1 |