diff options
Diffstat (limited to 'Master/texmf-dist/source/latex/l3experimental/xcoffins/xcoffins.dtx')
| -rw-r--r-- | Master/texmf-dist/source/latex/l3experimental/xcoffins/xcoffins.dtx | 66 |
1 files changed, 35 insertions, 31 deletions
diff --git a/Master/texmf-dist/source/latex/l3experimental/xcoffins/xcoffins.dtx b/Master/texmf-dist/source/latex/l3experimental/xcoffins/xcoffins.dtx index f8639cd6807..0cee83f61ab 100644 --- a/Master/texmf-dist/source/latex/l3experimental/xcoffins/xcoffins.dtx +++ b/Master/texmf-dist/source/latex/l3experimental/xcoffins/xcoffins.dtx @@ -36,7 +36,7 @@ % %<*driver|package> \RequirePackage{xparse} -\GetIdInfo$Id: xcoffins.dtx 3483 2012-03-03 18:56:29Z bruno $ +\GetIdInfo$Id: xcoffins.dtx 3876 2012-06-30 15:35:39Z joseph $ {L3 Experimental design-level coffins} %</driver|package> %<*driver> @@ -335,7 +335,7 @@ % % \begin{function}{\ResizeCoffin} % \begin{syntax} -% \cs{RotateCoffin} \meta{coffin} \Arg{width} \Arg{total-height} +% \cs{ResizeCoffin} \meta{coffin} \Arg{width} \Arg{total-height} % \end{syntax} % Resized the \meta{coffin} to \meta{width} and \meta{total-height}, % both of which should be given as dimension expressions. These may @@ -618,7 +618,7 @@ % % \begin{function}{\CoffinWidth} % \begin{syntax} -% \cs{CoffinHeight} \meta{coffin} +% \cs{CoffinWidth} \meta{coffin} % \end{syntax} % Calculates the width of the \meta{coffin} in a form % suitable for use in a \meta{dimension expression}, for example @@ -702,6 +702,10 @@ % \begin{macrocode} %<*package> % \end{macrocode} +% +% \begin{macrocode} +%<@@=coffin> +% \end{macrocode} % % \begin{macrocode} \ProvidesExplPackage @@ -711,13 +715,13 @@ % % \begin{variable} % { -% \l_coffin_A_hpole_tl , -% \l_coffin_A_vpole_tl , -% \l_coffin_B_hpole_tl , -% \l_coffin_B_vpole_tl , -% \l_coffin_bound_box_grow_bool , -% \l_coffin_hoffset_dim , -% \l_coffin_voffset_dim +% \l_@@_A_hpole_tl , +% \l_@@_A_vpole_tl , +% \l_@@_B_hpole_tl , +% \l_@@_B_vpole_tl , +% \l_@@_bound_box_grow_bool , +% \l_@@_hoffset_dim , +% \l_@@_voffset_dim % } % Key--value definitions for the alignment system. With the exception % of \texttt{grow-bounding-box}, all of these have to be given with a @@ -725,19 +729,19 @@ % \begin{macrocode} \keys_define:nn { coffin } { - coffin1-hpole .tl_set:N = \l_coffin_A_hpole_tl , + coffin1-hpole .tl_set:N = \l_@@_A_hpole_tl , coffin1-hpole .value_required: , - coffin1-vpole .tl_set:N = \l_coffin_A_vpole_tl , + coffin1-vpole .tl_set:N = \l_@@_A_vpole_tl , coffin1-vpole .value_required: , - coffin2-hpole .tl_set:N = \l_coffin_B_hpole_tl , + coffin2-hpole .tl_set:N = \l_@@_B_hpole_tl , coffin2-hpole .value_required: , - coffin2-vpole .tl_set:N = \l_coffin_B_vpole_tl , + coffin2-vpole .tl_set:N = \l_@@_B_vpole_tl , coffin2-vpole .value_required: , - grow-bounding-box .bool_set:N = \l_coffin_bound_box_grow_bool , + grow-bounding-box .bool_set:N = \l_@@_bound_box_grow_bool , grow-bounding-box .default:n = true , - hoffset .dim_set:N = \l_coffin_hoffset_dim , + hoffset .dim_set:N = \l_@@_hoffset_dim , hoffset .value_required: , - voffset .dim_set:N = \l_coffin_voffset_dim , + voffset .dim_set:N = \l_@@_voffset_dim , voffset .value_required: } \keys_set:nn { coffin } @@ -768,10 +772,10 @@ % \begin{macrocode} \NewDocumentCommand \BoxToCoffin { m } { - \prop_clear_new:c { l_coffin_corners_ \int_value:w #1 _prop } - \prop_clear_new:c { l_coffin_poles_ \int_value:w #1 _prop } - \coffin_update_corners:N #1 - \coffin_update_poles:N #1 + \prop_clear_new:c { l_@@_corners_ \__int_value:w #1 _prop } + \prop_clear_new:c { l_@@_poles_ \__int_value:w #1 _prop } + \@@_update_corners:N #1 + \@@_update_poles:N #1 } % \end{macrocode} % \end{macro} @@ -828,22 +832,22 @@ { \group_begin: \keys_set:nn { coffin } {#1} - \tl_set:Nx \l_coffin_tmp_tl + \tl_set:Nx \l_@@_tmp_tl { \group_end: - \bool_if:NTF \l_coffin_bound_box_grow_bool + \bool_if:NTF \l_@@_bound_box_grow_bool { \coffin_join:NnnNnnnn } { \coffin_attach:NnnNnnnn } \exp_not:N #3 - { \exp_not:o { \l_coffin_A_hpole_tl } } - { \exp_not:o { \l_coffin_A_vpole_tl } } + { \exp_not:o { \l_@@_A_hpole_tl } } + { \exp_not:o { \l_@@_A_vpole_tl } } \exp_not:N #5 - { \exp_not:o { \l_coffin_B_hpole_tl } } - { \exp_not:o { \l_coffin_B_vpole_tl } } - { \dim_use:N \l_coffin_hoffset_dim } - { \dim_use:N \l_coffin_voffset_dim } + { \exp_not:o { \l_@@_B_hpole_tl } } + { \exp_not:o { \l_@@_B_vpole_tl } } + { \dim_use:N \l_@@_hoffset_dim } + { \dim_use:N \l_@@_voffset_dim } } - \l_coffin_tmp_tl + \l_@@_tmp_tl } } % \end{macrocode} @@ -890,7 +894,7 @@ \NewDocumentCommand \CoffinHeight { m } { \coffin_ht:N #1 } \NewDocumentCommand \CoffinTotalHeight { m } - { \dim_eval:w \coffin_ht:N #1 + \coffin_dp:N #1 \dim_eval_end: } + { \__dim_eval:w \coffin_ht:N #1 + \coffin_dp:N #1 \__dim_eval_end: } \NewDocumentCommand \CoffinWidth { m } { \coffin_wd:N #1 } % \end{macrocode} |