diff options
Diffstat (limited to 'Master/texmf-dist/source/latex/l3kernel/l3box.dtx')
-rw-r--r-- | Master/texmf-dist/source/latex/l3kernel/l3box.dtx | 242 |
1 files changed, 136 insertions, 106 deletions
diff --git a/Master/texmf-dist/source/latex/l3kernel/l3box.dtx b/Master/texmf-dist/source/latex/l3kernel/l3box.dtx index d839bee4342..539d04ed4b9 100644 --- a/Master/texmf-dist/source/latex/l3kernel/l3box.dtx +++ b/Master/texmf-dist/source/latex/l3kernel/l3box.dtx @@ -9,7 +9,7 @@ %% %% http://www.latex-project.org/lppl.txt %% -%% This file is part of the "expl3 bundle" (The Work in LPPL) +%% This file is part of the "l3kernel bundle" (The Work in LPPL) %% and all files in that bundle must be distributed together. %% %% The released version of this bundle is available from CTAN. @@ -35,7 +35,7 @@ % %<*driver|package> \RequirePackage{l3names} -\GetIdInfo$Id: l3box.dtx 2711 2011-09-02 12:15:53Z joseph $ +\GetIdInfo$Id: l3box.dtx 2799 2011-09-10 15:46:33Z will $ {L3 Experimental boxes} %</driver|package> %<*driver> @@ -168,7 +168,7 @@ % Inserts the current content of the \meta{box} onto the current % list for typesetting. % \begin{texnote} -% This is the \TeX{} primitive \cs{copy}. +% This is the \TeX{} primitive \tn{copy}. % \end{texnote} % \end{function} % @@ -180,7 +180,7 @@ % list for typesetting, then globally clears the content of the % \meta{box}. % \begin{texnote} -% This is the \TeX{} primitive \cs{box}. +% This is the \TeX{} primitive \tn{box}. % \end{texnote} % \end{function} % @@ -212,7 +212,7 @@ % % \section{Measuring and setting box dimensions} % -% \begin{function}{\box_dp:N, \box_dp:c} +% \begin{function}[EXP]{\box_dp:N, \box_dp:c} % \begin{syntax} % \cs{box_dp:N} \meta{box} % \end{syntax} @@ -221,11 +221,11 @@ % is suitable for use in a \meta{dimension expression} for % calculations. % \begin{texnote} -% This is the \TeX{} primitive \cs{dp}. +% This is the \TeX{} primitive \tn{dp}. % \end{texnote} % \end{function} % -% \begin{function}{\box_ht:N, \box_ht:c} +% \begin{function}[EXP]{\box_ht:N, \box_ht:c} % \begin{syntax} % \cs{box_ht:N} \meta{box} % \end{syntax} @@ -234,11 +234,11 @@ % is suitable for use in a \meta{dimension expression} for % calculations. % \begin{texnote} -% This is the \TeX{} primitive \cs{ht}. +% This is the \TeX{} primitive \tn{ht}. % \end{texnote} % \end{function} % -% \begin{function}{\box_wd:N, \box_wd:c} +% \begin{function}[EXP]{\box_wd:N, \box_wd:c} % \begin{syntax} % \cs{box_wd:N} \meta{box} % \end{syntax} @@ -246,7 +246,7 @@ % input stream. The output of this function is suitable for use in a % \meta{dimension expression} for calculations. % \begin{texnote} -% This is the \TeX{} primitive \cs{wd}. +% This is the \TeX{} primitive \tn{wd}. % \end{texnote} % \end{function} % @@ -273,16 +273,16 @@ % Set the width of the \meta{box} to the value of the % \Arg{dimension expression}. This is a global assignment. % \end{function} -% +% % \section{Affine transformations} -% +% % Affine transformations are changes which (informally) preserve straight % lines. Simple translations are affine transformations, but are better handled % in \TeX{} by doing the translation first, then inserting an unmodified box. % On the other hand, rotation and resizing of boxed material can best be % handled by modifying boxes. These transformations are described here. -% -% \begin{function}{\box_resize:Nnn, \box_resize:cnn} +% +% \begin{function}[added = 2011-09-02]{\box_resize:Nnn, \box_resize:cnn} % \begin{syntax} % \cs{box_resize:Nnn} \meta{box} \Arg{x-size} \Arg{y-size} % \end{syntax} @@ -294,11 +294,12 @@ % cause the material in the \meta{box} to be reversed in direction, but the % reference point of the \meta{box} will be unchanged. The resizing applies % within the current \TeX{} group level. -% +% % \textbf{This function is experimental} % \end{function} -% -% \begin{function}{\box_resize_to_ht_plus_dp:Nn, \box_resize_to_ht_plus_dp:cn} +% +% \begin{function}[added = 2011-09-02] +% {\box_resize_to_ht_plus_dp:Nn, \box_resize_to_ht_plus_dp:cn} % \begin{syntax} % \cs{box_resize_to_ht_plus_dp:Nnn} \meta{box} \Arg{y-size} % \end{syntax} @@ -314,8 +315,9 @@ % % \textbf{This function is experimental} % \end{function} -% -% \begin{function}{\box_resize_to_wd:Nn, \box_resize_to_wd:cn} +% +% \begin{function}[added = 2011-09-02] +% {\box_resize_to_wd:Nn, \box_resize_to_wd:cn} % \begin{syntax} % \cs{box_resize_to_wd:Nnn} \meta{box} \Arg{x-size} % \end{syntax} @@ -329,8 +331,8 @@ % % \textbf{This function is experimental} % \end{function} -% -% \begin{function}{\box_rotate:Nn, \box_rotate:cn} +% +% \begin{function}[added = 2011-09-02]{\box_rotate:Nn, \box_rotate:cn} % \begin{syntax} % \cs{box_rotate:Nn} \meta{box} \Arg{angle} % \end{syntax} @@ -344,8 +346,8 @@ % % \textbf{This function is experimental} % \end{function} -% -% \begin{function}{\box_scale:Nnn, \box_scale:cnn} +% +% \begin{function}[added = 2011-09-02]{\box_scale:Nnn, \box_scale:cnn} % \begin{syntax} % \cs{box_scale:Nnn} \meta{box} \Arg{x-scale} \Arg{y-scale} % \end{syntax} @@ -395,20 +397,20 @@ % not a constant, it is \emph{not} settable by the programmer but is % instead varied by \TeX{}. % \begin{texnote} -% This is the \TeX{} primitive \cs{lastbox} renamed. +% This is the \TeX{} primitive \tn{lastbox} renamed. % \end{texnote} % \end{variable} % % \section{Constant boxes} % -% \begin{variable}{\c_empty_box} -% This is a permanently empty box, which is neither set as horizontal -% nor vertical. -% \end{variable} +% \begin{variable}{\c_empty_box} +% This is a permanently empty box, which is neither set as horizontal +% nor vertical. +% \end{variable} % -% \section{Scratch boxes} +% \section{Scratch boxes} % -% \begin{variable}{\l_tmpa_tl, \l_tmpb_tl} +% \begin{variable}{\l_tmpa_box, \l_tmpb_box} % Scratch boxes for local assignment. These are never used by % the kernel code, and so are safe for use with any \LaTeX3-defined % function. However, they may be overwritten by other non-kernel @@ -423,7 +425,7 @@ % \end{syntax} % Writes the contents of \meta{box} to the log file. % \begin{texnote} -% This is the \TeX{} primitive \cs{showbox}. +% This is the \TeX{} primitive \tn{showbox}. % \end{texnote} % \end{function} % @@ -436,7 +438,7 @@ % Typesets the \meta{contents} into a horizontal box of natural % width and then includes this box in the current list for typesetting. % \begin{texnote} -% This is the \TeX{} primitive \cs{hbox}. +% This is the \TeX{} primitive \tn{hbox}. % \end{texnote} % \end{function} % @@ -511,12 +513,11 @@ % % \begin{function} % { -% \hbox_set_inline_begin:N, \hbox_set_inline_begin:c, -% \hbox_set_inline_end: +% \hbox_set:Nw, \hbox_set:cw, +% \hbox_set_end: % } % \begin{syntax} -% \cs{hbox_set_inline_begin:N} \meta{box} \meta{contents} -% ~~\cs{hbox_set_inline_end:} +% \cs{hbox_set:Nw} \meta{box} \meta{contents} \cs{hbox_set_end:} % \end{syntax} % Typesets the \meta{contents} at natural width and then stores the % result inside the \meta{box}. The assignment is local. In contrast @@ -527,12 +528,11 @@ % % \begin{function} % { -% \hbox_gset_inline_begin:N, \hbox_gset_inline_begin:c, -% \hbox_gset_inline_end: +% \hbox_gset:Nw, \hbox_gset:cw, +% \hbox_gset_end: % } % \begin{syntax} -% \cs{hbox_gset_inline_begin:N} \meta{box} \meta{contents} -% ~~\cs{hbox_gset_inline_end:} +% \cs{hbox_gset:Nw} \meta{box} \meta{contents} \cs{hbox_gset_end:} % \end{syntax} % Typesets the \meta{contents} at natural width and then stores the % result inside the \meta{box}. The assignment is global. In contrast @@ -548,7 +548,7 @@ % Unpacks the content of the horizontal \meta{box}, retaining any stretching % or shrinking applied when the \meta{box} was set. % \begin{texnote} -% This is the \TeX{} primitive \cs{unhcopy}. +% This is the \TeX{} primitive \tn{unhcopy}. % \end{texnote} % \end{function} % @@ -560,7 +560,7 @@ % or shrinking applied when the \meta{box} was set. The \meta{box} is % then cleared globally. % \begin{texnote} -% This is the \TeX{} primitive \cs{unhbox}. +% This is the \TeX{} primitive \tn{unhbox}. % \end{texnote} % \end{function} % @@ -573,7 +573,7 @@ % result most vertical boxes have a large height value and small or % zero depth. The exception are |_top| boxes, where the reference point % is that of the first item added. These tend to have a large depth and -% small height, although the later will typically be non-zero. +% small height, although the latter will typically be non-zero. % % \begin{function}{\vbox:n} % \begin{syntax} @@ -582,7 +582,7 @@ % Typesets the \meta{contents} into a vertical box of natural height % and includes this box in the current list for typesetting. % \begin{texnote} -% This is the \TeX{} primitive \cs{vbox}. +% This is the \TeX{} primitive \tn{vbox}. % \end{texnote} % \end{function} % @@ -595,7 +595,7 @@ % baseline of the box will tbe equal to that of the \emph{first} % item added to the box. % \begin{texnote} -% This is the \TeX{} primitive \cs{vtop}. +% This is the \TeX{} primitive \tn{vtop}. % \end{texnote} % \end{function} % @@ -672,12 +672,11 @@ % % \begin{function} % { -% \vbox_set_inline_begin:N, \vbox_set_inline_begin:c, -% \vbox_set_inline_end: +% \vbox_set:Nw, \vbox_set:cw, +% \vbox_set_end: % } % \begin{syntax} -% \cs{vbox_set_inline_begin:N} \meta{box} \meta{contents} -% ~~\cs{vbox_set_inline_end:} +% \cs{vbox_begin:Nw} \meta{box} \meta{contents} \cs{vbox_set_end:} % \end{syntax} % Typesets the \meta{contents} at natural height and then stores the % result inside the \meta{box}. The assignment is local. In contrast @@ -688,12 +687,11 @@ % % \begin{function} % { -% \vbox_gset_inline_begin:N, \vbox_gset_inline_begin:c, -% \vbox_gset_inline_end: +% \vbox_gset:Nw, \vbox_gset:cw, +% \vbox_gset_end: % } % \begin{syntax} -% \cs{vbox_gset_inline_begin:N} \meta{box} \meta{contents} -% ~~\cs{vbox_set_inline_end:} +% \cs{vbox_gset:Nw} \meta{box} \meta{contents} \cs{vbox_gset_end:} % \end{syntax} % Typesets the \meta{contents} at natural height and then stores the % result inside the \meta{box}. The assignment is global. In contrast @@ -710,7 +708,7 @@ % \meta{dimexpr} by removing content from the top of \meta{box2} % (which must be a vertical box). % \begin{texnote} -% This is the \TeX{} primitive \cs{vsplit}. +% This is the \TeX{} primitive \tn{vsplit}. % \end{texnote} % \end{function} % @@ -721,7 +719,7 @@ % Unpacks the content of the vertical \meta{box}, retaining any stretching % or shrinking applied when the \meta{box} was set. % \begin{texnote} -% This is the \TeX{} primitive \cs{unvcopy}. +% This is the \TeX{} primitive \tn{unvcopy}. % \end{texnote} % \end{function} % @@ -733,7 +731,7 @@ % or shrinking applied when the \meta{box} was set. The \meta{box} % is then cleared globally. % \begin{texnote} -% This is the \TeX{} primitive \cs{unvbox}. +% This is the \TeX{} primitive \tn{unvbox}. % \end{texnote} % \end{function} % @@ -749,7 +747,7 @@ % \end{syntax} % Tests is \meta{box} is a horizontal box. % \begin{texnote} -% This is the \TeX{} primitive \cs{ifhbox}. +% This is the \TeX{} primitive \tn{ifhbox}. % \end{texnote} % \end{function} % @@ -763,7 +761,7 @@ % \end{syntax} % Tests is \meta{box} is a vertical box. % \begin{texnote} -% This is the \TeX{} primitive \cs{ifvbox}. +% This is the \TeX{} primitive \tn{ifvbox}. % \end{texnote} % \end{function} % @@ -777,7 +775,7 @@ % \end{syntax} % Tests is \meta{box} is an empty (void) box. % \begin{texnote} -% This is the \TeX{} primitive \cs{ifvoid}. +% This is the \TeX{} primitive \tn{ifvoid}. % \end{texnote} % \end{function} % @@ -869,7 +867,7 @@ \cs_new_protected_nopar:Npn \box_set_eq:NN #1#2 { \tex_setbox:D #1 \tex_copy:D #2 } \cs_new_protected_nopar:Npn \box_gset_eq:NN - { \pref_global:D \box_set_eq:NN } + { \tex_global:D \box_set_eq:NN } \cs_generate_variant:Nn \box_set_eq:NN { cN , Nc , cc } \cs_generate_variant:Nn \box_gset_eq:NN { cN , Nc , cc } % \end{macrocode} @@ -894,7 +892,7 @@ \cs_new_protected_nopar:Npn \box_set_eq_clear:NN #1#2 { \tex_setbox:D #1 \tex_box:D #2 } \cs_new_protected_nopar:Npn \box_gset_eq_clear:NN - { \pref_global:D \box_set_eq_clear:NN } + { \tex_global:D \box_set_eq_clear:NN } \cs_generate_variant:Nn \box_set_eq_clear:NN { cN , Nc , cc } \cs_generate_variant:Nn \box_gset_eq_clear:NN { cN , Nc , cc } % \end{macrocode} @@ -1041,7 +1039,7 @@ \cs_new_protected_nopar:Npn \box_set_to_last:N #1 { \tex_setbox:D #1 \l_last_box } \cs_new_protected_nopar:Npn \box_gset_to_last:N - { \pref_global:D \box_set_to_last:N } + { \tex_global:D \box_set_to_last:N } \cs_generate_variant:Nn \box_set_to_last:N { c } \cs_generate_variant:Nn \box_gset_to_last:N { c } % \end{macrocode} @@ -1101,7 +1099,7 @@ % \testfile* % \begin{macrocode} \cs_new_protected:Npn \hbox_set:Nn #1#2 { \tex_setbox:D #1 \tex_hbox:D {#2} } -\cs_new_protected_nopar:Npn \hbox_gset:Nn { \pref_global:D \hbox_set:Nn } +\cs_new_protected_nopar:Npn \hbox_gset:Nn { \tex_global:D \hbox_set:Nn } \cs_generate_variant:Nn \hbox_set:Nn { c } \cs_generate_variant:Nn \hbox_gset:Nn { c } % \end{macrocode} @@ -1116,33 +1114,48 @@ \cs_new_protected:Npn \hbox_set_to_wd:Nnn #1#2#3 { \tex_setbox:D #1 \tex_hbox:D to \dim_eval:w #2 \dim_eval_end: {#3} } \cs_new_protected_nopar:Npn \hbox_gset_to_wd:Nnn - { \pref_global:D \hbox_set_to_wd:Nnn } + { \tex_global:D \hbox_set_to_wd:Nnn } \cs_generate_variant:Nn \hbox_set_to_wd:Nnn { c } \cs_generate_variant:Nn \hbox_gset_to_wd:Nnn {cnn} % \end{macrocode} % \end{macro} % \end{macro} % -% \begin{macro}{\hbox_set_inline_begin:N, \hbox_set_inline_begin:c} -% \begin{macro}{\hbox_gset_inline_begin:N, \hbox_gset_inline_begin:c} -% \begin{macro}{\hbox_set_inline_end:} -% \begin{macro}{\hbox_gset_inline_end:} +% \begin{macro}{\hbox_set:Nw, \hbox_set:cw} +% \begin{macro}{\hbox_gset:Nw, \hbox_gset:cw} +% \begin{macro}{\hbox_set_end:, \hbox_gset_end:} % \testfile* % Storing material in a horizontal box. This type is useful in % environment definitions. % \begin{macrocode} -\cs_new_protected_nopar:Npn \hbox_set_inline_begin:N #1 +\cs_new_protected_nopar:Npn \hbox_set:Nw #1 { \tex_setbox:D #1 \tex_hbox:D \c_group_begin_token } -\cs_new_protected_nopar:Npn \hbox_gset_inline_begin:N - { \pref_global:D \hbox_set_inline_begin:N } -\cs_generate_variant:Nn \hbox_set_inline_begin:N { c } -\cs_generate_variant:Nn \hbox_gset_inline_begin:N { c } -\cs_new_eq:NN \hbox_set_inline_end: \c_group_end_token -\cs_new_eq:NN \hbox_gset_inline_end: \c_group_end_token +\cs_new_protected_nopar:Npn \hbox_gset:Nw + { \tex_global:D \hbox_set:Nw } +\cs_generate_variant:Nn \hbox_set:Nw { c } +\cs_generate_variant:Nn \hbox_gset:Nw { c } +\cs_new_eq:NN \hbox_set_end: \c_group_end_token +\cs_new_eq:NN \hbox_gset_end: \c_group_end_token % \end{macrocode} % \end{macro} % \end{macro} % \end{macro} +% +% \begin{macro}{\hbox_set_inline_begin:N, \hbox_set_inline_begin:c} +% \begin{macro}{\hbox_gset_inline_begin:N, \hbox_gset_inline_begin:c} +% \begin{macro}{\hbox_set_inline_end:,\hbox_gset_inline_end:} +% \testfile* +% Renamed September 2011. +% \begin{macrocode} +\cs_new_eq:NN \hbox_set_inline_begin:N \hbox_set:Nw +\cs_new_eq:NN \hbox_set_inline_begin:c \hbox_set:cw +\cs_new_eq:NN \hbox_set_inline_end: \hbox_set_end: +\cs_new_eq:NN \hbox_gset_inline_begin:N \hbox_gset:Nw +\cs_new_eq:NN \hbox_gset_inline_begin:c \hbox_gset:cw +\cs_new_eq:NN \hbox_gset_inline_end: \hbox_gset_end: +% \end{macrocode} +% \end{macro} +% \end{macro} % \end{macro} % % \begin{macro}{\hbox_to_wd:nn} @@ -1215,7 +1228,7 @@ % Storing material in a vertical box with a natural height. % \begin{macrocode} \cs_new_protected:Npn \vbox_set:Nn #1#2 { \tex_setbox:D #1 \tex_vbox:D {#2} } -\cs_new_protected_nopar:Npn \vbox_gset:Nn { \pref_global:D \vbox_set:Nn } +\cs_new_protected_nopar:Npn \vbox_gset:Nn { \tex_global:D \vbox_set:Nn } \cs_generate_variant:Nn \vbox_set:Nn { c } \cs_generate_variant:Nn \vbox_gset:Nn { c } % \end{macrocode} @@ -1231,7 +1244,7 @@ \cs_new_protected:Npn \vbox_set_top:Nn #1#2 { \tex_setbox:D #1 \tex_vtop:D {#2} } \cs_new_protected_nopar:Npn \vbox_gset_top:Nn - { \pref_global:D \vbox_set_top:Nn } + { \tex_global:D \vbox_set_top:Nn } \cs_generate_variant:Nn \vbox_set_top:Nn { c } \cs_generate_variant:Nn \vbox_gset_top:Nn { c } % \end{macrocode} @@ -1246,29 +1259,46 @@ \cs_new_protected:Npn \vbox_set_to_ht:Nnn #1#2#3 { \tex_setbox:D #1 \tex_vbox:D to \dim_eval:w #2 \dim_eval_end: {#3} } \cs_new_protected_nopar:Npn \vbox_gset_to_ht:Nnn - { \pref_global:D \vbox_set_to_ht:Nnn } + { \tex_global:D \vbox_set_to_ht:Nnn } \cs_generate_variant:Nn \vbox_set_to_ht:Nnn { c } \cs_generate_variant:Nn \vbox_gset_to_ht:Nnn { c } % \end{macrocode} % \end{macro} % \end{macro} % -% \begin{macro}{\vbox_set_inline_begin:N, \vbox_set_inline_begin:c} -% \begin{macro}{\vbox_gset_inline_begin:N, \vbox_gset_inline_begin:c} -% \begin{macro}{\vbox_set_inline_end:} -% \begin{macro}{\vbox_gset_inline_end:} +% \begin{macro}{\vbox_set:Nw, \vbox_set:cw} +% \begin{macro}{\vbox_gset:Nw, \vbox_gset:cw} +% \begin{macro}{\vbox_set_end:, \vbox_gset_end:} % \testfile* % Storing material in a vertical box. This type is useful in % environment definitions. % \begin{macrocode} -\cs_new_nopar:Npn \vbox_set_inline_begin:N #1 +\cs_new_nopar:Npn \vbox_set:Nw #1 { \tex_setbox:D #1 \tex_vbox:D \c_group_begin_token } -\cs_new_protected_nopar:Npn \vbox_gset_inline_begin:N - { \pref_global:D \vbox_set_inline_begin:N } -\cs_generate_variant:Nn \vbox_set_inline_begin:N { c } -\cs_generate_variant:Nn \vbox_gset_inline_begin:N { c } -\cs_new_eq:NN \vbox_set_inline_end: \c_group_end_token -\cs_new_eq:NN \vbox_gset_inline_end: \c_group_end_token +\cs_new_protected_nopar:Npn \vbox_gset:Nw + { \tex_global:D \vbox_set:Nw } +\cs_generate_variant:Nn \vbox_set:Nw { c } +\cs_generate_variant:Nn \vbox_gset:Nw { c } +\cs_new_eq:NN \vbox_set_end: \c_group_end_token +\cs_new_eq:NN \vbox_gset_end: \c_group_end_token +% \end{macrocode} +% \end{macro} +% \end{macro} +% \end{macro} +% +% \begin{macro}{\vbox_set_inline_begin:N, \vbox_set_inline_begin:c} +% \begin{macro}{\vbox_gset_inline_begin:N, \vbox_gset_inline_begin:c} +% \begin{macro}{\vbox_set_inline_end:} +% \begin{macro}{\vbox_gset_inline_end:} +% \testfile* +% Renamed September 2011. +% \begin{macrocode} +\cs_new_eq:NN \vbox_set_inline_begin:N \vbox_set:Nw +\cs_new_eq:NN \vbox_set_inline_begin:c \vbox_set:cw +\cs_new_eq:NN \vbox_set_inline_end: \vbox_set_end: +\cs_new_eq:NN \vbox_gset_inline_begin:N \vbox_gset:Nw +\cs_new_eq:NN \vbox_gset_inline_begin:c \vbox_gset:cw +\cs_new_eq:NN \vbox_gset_inline_end: \vbox_gset_end: % \end{macrocode} % \end{macro} % \end{macro} @@ -1296,9 +1326,9 @@ { \tex_setbox:D #1 \tex_vsplit:D #2 to \dim_eval:w #3 \dim_eval_end: } % \end{macrocode} % \end{macro} -% +% % \subsection{Affine transformations} -% +% % \begin{variable}{\l_box_angle_fp} % When rotating boxes, the angle itself may be needed by the % engine-dependent code. This is done using the \pkg{fp} module so @@ -1307,7 +1337,7 @@ \fp_new:N \l_box_angle_fp % \end{macrocode} % \end{variable} -% +% % \begin{variable}{\l_box_cos_fp, \l_box_sin_fp} % These are used to hold the calculated sine and cosine values while % carrying out a rotation. @@ -1362,7 +1392,7 @@ \fp_new:N \l_box_y_new_fp % \end{macrocode} % \end{variable} -% +% % \begin{macro}{\box_rotate:Nn} % \begin{macro}[aux]{\box_rotate_aux:N} % \begin{macro}[aux]{\box_rotate_set_sin_cos:} @@ -1380,11 +1410,11 @@ { \hbox_set:Nn #1 { - \group_begin: + \group_begin: \fp_set:Nn \l_box_angle_fp {#2} \box_rotate_set_sin_cos: \fp_compare:NNNTF \l_box_sin_fp = \c_zero_fp - { + { \fp_compare:NNNTF \l_box_cos_fp = \c_one_fp { \box_use:N #1 } { \box_rotate_aux:N #1 } @@ -1471,7 +1501,7 @@ \driver_box_rotate_begin: \box_use:N \l_box_tmp_box \driver_box_rotate_end: - } + } } % \end{macrocode} % Tidy up the size of the box so that the material is actually inside @@ -1485,7 +1515,7 @@ \box_use:N \l_box_tmp_box } % \end{macrocode} -% When loaded on top of \LaTeXe{} the \cs{rotatebox} function can be +% When loaded on top of \LaTeXe{} the \tn{rotatebox} function can be % used. There is just a slight adjustment in the syntax. % \begin{macrocode} %<*package> @@ -1639,7 +1669,7 @@ % find the new dimensions. % \begin{macrocode} \fp_compare:NNNTF \l_box_scale_x_fp = \c_one_fp - { + { \fp_compare:NNNTF \l_box_scale_y_fp = \c_one_fp { \box_use:N #1 } { \box_resize_aux:Nnn #1 {#2} {#3} } @@ -1669,17 +1699,17 @@ { \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 } - } + } \box_resize_common:N #1 } % \end{macrocode} -% When loaded on top of \LaTeXe{} the \cs{resizebox} function can be +% When loaded on top of \LaTeXe{} the \tn{resizebox} function can be % used. There is just a slight adjustment in the syntax. % \begin{macrocode} %<*package> @@ -1687,7 +1717,7 @@ { \hbox_set:Nn #1 { - \resizebox * + \resizebox * { \etex_dimexpr:D #2 \scan_stop: } { \etex_dimexpr:D #3 \scan_stop: } { \box_use:N #1 } @@ -1697,7 +1727,7 @@ % \end{macrocode} % \end{macro} % \end{macro} -% +% % \begin{macro}{\box_resize_to_ht_plus_dp:Nn, \box_resize_to_ht_plus_dp:cn} % \begin{macro}{\box_resize_to_wd:Nn, \box_resize_to_wd:cn} % Scaling to a total height or to a width is a simplified version of the main @@ -1748,7 +1778,7 @@ } \cs_generate_variant:Nn \box_resize_to_wd:Nn { c } % \end{macrocode} -% Again, in package mode the scaling can be handled by \cs{resizebox}. +% Again, in package mode the scaling can be handled by \tn{resizebox}. % \begin{macrocode} %<*package> \cs_set_protected_nopar:Npn \box_resize_to_ht_plus_dp:Nn #1#2 @@ -1792,7 +1822,7 @@ \dim_set:Nn \l_box_right_dim { \box_wd:N #1 } \dim_zero:N \l_box_left_dim \fp_compare:NNNTF \l_box_scale_x_fp = \c_one_fp - { + { \fp_compare:NNNTF \l_box_scale_y_fp = \c_one_fp { \box_use:N #1 } { \box_scale_aux:Nnn #1 {#2} {#3} } @@ -1819,7 +1849,7 @@ \box_resize_common:N #1 } % \end{macrocode} -% When loaded on top of \LaTeXe{} the \cs{scalebox} function can be +% When loaded on top of \LaTeXe{} the \tn{scalebox} function can be % used. There is just a slight adjustment in the syntax. % \begin{macrocode} %<*package> |