diff options
Diffstat (limited to 'Master/texmf-dist/source/latex/l3kernel/l3box.dtx')
-rw-r--r-- | Master/texmf-dist/source/latex/l3kernel/l3box.dtx | 74 |
1 files changed, 37 insertions, 37 deletions
diff --git a/Master/texmf-dist/source/latex/l3kernel/l3box.dtx b/Master/texmf-dist/source/latex/l3kernel/l3box.dtx index 89e41ce8b8b..d00cad8139b 100644 --- a/Master/texmf-dist/source/latex/l3kernel/l3box.dtx +++ b/Master/texmf-dist/source/latex/l3kernel/l3box.dtx @@ -1,6 +1,6 @@ % \iffalse meta-comment % -%% 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 @@ -35,7 +35,7 @@ % %<*driver|package> \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} %</driver|package> %<*driver> @@ -1403,11 +1403,11 @@ % \end{macrocode} % \end{variable} % -% \begin{variable}{\l_box_tmp_box, \l_box_tmp_fp} +% \begin{variable}{\l_box_internal_box, \l_box_internal_fp} % Scratch space. % \begin{macrocode} -\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 % \end{macrocode} % \end{variable} % @@ -1521,14 +1521,14 @@ % content of the box is moved such that the reference point of the % rotated box will be in the same place as the original. % \begin{macrocode} - \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: } } @@ -1537,11 +1537,11 @@ % the bounding box. The result can then be used to reset the original % box. % \begin{macrocode} - \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 } % \end{macrocode} % \end{macro} @@ -1551,11 +1551,11 @@ % \begin{macrocode} \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 } } % \end{macrocode} % These functions take a general point $(|#1|, |#2|)$ and rotate its @@ -1572,10 +1572,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_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 @@ -1583,10 +1583,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 } } % \end{macrocode} @@ -1675,15 +1675,15 @@ % new width divided by the old one. % \begin{macrocode} \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 } % \end{macrocode} % The $y$-scaling needs both the height and the depth of the current box. % \begin{macrocode} \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 } % \end{macrocode} % At this stage, check for trivial scaling. If both scalings are unity, then % the code does nothing. Otherwise, pass on to the auxiliary function to @@ -1751,9 +1751,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 } @@ -1772,8 +1772,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 } @@ -1844,7 +1844,7 @@ % \begin{macrocode} \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 } @@ -1853,8 +1853,8 @@ % \end{macrocode} % The new height and depth can be applied directly. % \begin{macrocode} - \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 } % \end{macrocode} % Things are not quite as obvious for the width, as the reference point % needs to remain unchanged. For positive scaling factors resizing the @@ -1867,13 +1867,13 @@ \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 } } % \end{macrocode} |