diff options
author | Karl Berry <karl@freefriends.org> | 2010-05-23 23:50:45 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2010-05-23 23:50:45 +0000 |
commit | ad61437dbc77ced3998eeb1fbc47f07382a9740b (patch) | |
tree | 43555571c2b6a10cae679df9a7e3677823a5bfa1 /Master/texmf-dist/tex/latex/expl3/l3box.sty | |
parent | 64ba2a9dbcc524178aec8cecbb6947b449724990 (diff) |
expl3 1925 (23may10)
git-svn-id: svn://tug.org/texlive/trunk@18438 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/latex/expl3/l3box.sty')
-rw-r--r-- | Master/texmf-dist/tex/latex/expl3/l3box.sty | 18 |
1 files changed, 7 insertions, 11 deletions
diff --git a/Master/texmf-dist/tex/latex/expl3/l3box.sty b/Master/texmf-dist/tex/latex/expl3/l3box.sty index f703cba4faf..69baad3296b 100644 --- a/Master/texmf-dist/tex/latex/expl3/l3box.sty +++ b/Master/texmf-dist/tex/latex/expl3/l3box.sty @@ -48,7 +48,7 @@ %% %% ----------------------------------------------------------------------- \RequirePackage{l3names} -\GetIdInfo$Id: l3box.dtx 1902 2010-05-13 14:58:53Z mittelba $ +\GetIdInfo$Id: l3box.dtx 1919 2010-05-22 05:56:38Z will $ {L3 Experimental Box module} \ProvidesExplPackage {\filename}{\filedate}{\fileversion}{\filedescription} @@ -57,15 +57,7 @@ \chk_if_free_cs:N #1 \newbox #1 } -\cs_new_protected:Npn \box_new_local:N #1 { - \chk_if_free_cs:N #1 - \intexpr_compare:nNnTF - \etex_currentgrouplevel:D = 0 - \newbox \locbox - #1 -} \cs_generate_variant:Nn \box_new:N {c} -\cs_generate_variant:Nn \box_new_local:N {c} \cs_new_eq:NN \if_hbox:N \tex_ifhbox:D \cs_new_eq:NN \if_vbox:N \tex_ifvbox:D \cs_new_eq:NN \if_box_empty:N \tex_ifvoid:D @@ -90,10 +82,14 @@ \cs_generate_variant:Nn \box_if_empty:NTF {c} \cs_generate_variant:Nn \box_if_empty:NT {c} \cs_generate_variant:Nn \box_if_empty:NF {c} -\cs_new_protected_nopar:Npn \box_set_eq:NN #1#2 {\tex_setbox:D #1 \tex_box:D #2} +\cs_new_protected_nopar:Npn \box_set_eq:NN #1#2 {\tex_setbox:D #1 \tex_copy:D #2} \cs_generate_variant:Nn \box_set_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_generate_variant:Nn \box_set_eq_clear:NN {cN,Nc,cc} \cs_new_protected_nopar:Npn \box_gset_eq:NN {\pref_global:D\box_set_eq:NN} \cs_generate_variant:Nn \box_gset_eq:NN {cN,Nc,cc} +\cs_new_protected_nopar:Npn \box_gset_eq_clear:NN {\pref_global:D\box_set_eq_clear:NN} +\cs_generate_variant:Nn \box_gset_eq_clear:NN {cN,Nc,cc} \cs_new_eq:NN \l_last_box \tex_lastbox:D \cs_new_protected_nopar:Npn \box_set_to_last:N #1{\tex_setbox:D#1\l_last_box} \cs_generate_variant:Nn \box_set_to_last:N {c} @@ -103,7 +99,7 @@ \cs_new:Npn \box_move_right:nn #1#2{\tex_moveright:D\dim_eval:n{#1} #2} \cs_new:Npn \box_move_up:nn #1#2{\tex_raise:D\dim_eval:n{#1} #2} \cs_new:Npn \box_move_down:nn #1#2{\tex_lower:D\dim_eval:n{#1} #2} -\cs_new_protected_nopar:Npn \box_clear:N #1{\box_set_eq:NN #1 \c_empty_box } +\cs_new_protected_nopar:Npn \box_clear:N #1{\box_set_eq_clear:NN #1 \c_empty_box } \cs_generate_variant:Nn \box_clear:N {c} \cs_new_protected_nopar:Npn \box_gclear:N {\pref_global:D\box_clear:N} \cs_generate_variant:Nn \box_gclear:N {c} |