diff options
Diffstat (limited to 'Master/texmf-dist/tex/latex/l3kernel/l3box.sty')
-rw-r--r-- | Master/texmf-dist/tex/latex/l3kernel/l3box.sty | 60 |
1 files changed, 36 insertions, 24 deletions
diff --git a/Master/texmf-dist/tex/latex/l3kernel/l3box.sty b/Master/texmf-dist/tex/latex/l3kernel/l3box.sty index cb83228019a..c0e5ce553b8 100644 --- a/Master/texmf-dist/tex/latex/l3kernel/l3box.sty +++ b/Master/texmf-dist/tex/latex/l3kernel/l3box.sty @@ -22,7 +22,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. @@ -46,7 +46,7 @@ %% %% ----------------------------------------------------------------------- \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} \ProvidesExplPackage {\ExplFileName}{\ExplFileDate}{\ExplFileVersion}{\ExplFileDescription} @@ -80,13 +80,13 @@ \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 } \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 } \cs_new_eq:NN \box_ht:N \tex_ht:D @@ -141,7 +141,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 } \cs_new_eq:NN \c_empty_box \voidb@x @@ -151,23 +151,29 @@ \cs_generate_variant:Nn \box_show:N { c } \cs_new_protected_nopar:Npn \hbox:n { \tex_hbox:D \scan_stop: } \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 } \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} -\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 +\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: \cs_new_protected:Npn \hbox_to_wd:nn #1#2 { \tex_hbox:D to \dim_eval:w #1 \dim_eval_end: {#2} } \cs_new_protected:Npn \hbox_to_zero:n #1 { \tex_hbox:D to \c_zero_skip {#1} } @@ -185,29 +191,35 @@ { \tex_vbox:D to \dim_eval:w #1 \dim_eval_end: {#2} } \cs_new_protected:Npn \vbox_to_zero:n #1 { \tex_vbox:D to \c_zero_dim {#1} } \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 } \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 } \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 } -\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 +\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: \cs_new_eq:NN \vbox_unpack:N \tex_unvcopy:D \cs_new_eq:NN \vbox_unpack_clear:N \tex_unvbox:D \cs_generate_variant:Nn \vbox_unpack:N { c } |