From a9b7bc30b28ec77ad1e0de52a2193de4225ad780 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Mon, 30 Jan 2017 23:32:20 +0000 Subject: xsavebox (30jan17) git-svn-id: svn://tug.org/texlive/trunk@43098 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/tex/latex/xsavebox/xsavebox.sty | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) (limited to 'Master/texmf-dist/tex/latex/xsavebox') diff --git a/Master/texmf-dist/tex/latex/xsavebox/xsavebox.sty b/Master/texmf-dist/tex/latex/xsavebox/xsavebox.sty index 976507d9545..b79d15b222b 100644 --- a/Master/texmf-dist/tex/latex/xsavebox/xsavebox.sty +++ b/Master/texmf-dist/tex/latex/xsavebox/xsavebox.sty @@ -1,4 +1,4 @@ -%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% % % xsavebox.sty % @@ -49,8 +49,8 @@ \RequirePackage{pdfbase} %everything with `pbs_' prefix \RequirePackage{l3keys2e} -\def\g@xsb@version@tl{0.2} -\def\g@xsb@date@tl{2016/03/07} +\def\g@xsb@version@tl{0.3} +\def\g@xsb@date@tl{2017/01/30} \ProvidesExplPackage{xsavebox}{\g@xsb@date@tl}{\g@xsb@version@tl} {saveboxes for repeating content without code replication} @@ -97,6 +97,7 @@ %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \DeclareDocumentCommand\xsavebox{smO{\width}O{c}m}{ \group_begin: + \int_compare:nT{\TeXXeTstate>\c_zero}{\beginL} \IfBooleanTF{#1}{ %later colour injection possible (pdfTeX, LuaTeX) \hbox_set:Nn\l_xsb_raw_box{\color@begingroup#5\color@endgroup} %raw @@ -132,6 +133,7 @@ }{ \xsb_process_box:nnnN{#2}{\width}{c}\l_xsb_box } + \int_compare:nT{\TeXXeTstate>\c_zero}{\endL} \group_end: } @@ -152,6 +154,7 @@ \cs_new_nopar:Nn\xsb_xlrbox:{ \group_begin: + \int_compare:nT{\TeXXeTstate>\c_zero}{\beginL} \hbox_set:Nn\l_xsb_box\bgroup\bgroup \ignorespaces } @@ -161,11 +164,13 @@ \egroup\egroup \sbox\l_xsb_box{\hbox_unpack_clear:N\l_xsb_box} \xsb_process_box:nnnN{#1}{\width}{c}\l_xsb_box + \int_compare:nT{\TeXXeTstate>\c_zero}{\endL} \group_end: } \cs_new_nopar:Nn\xsb_xlrbox_star:{ \group_begin: + \int_compare:nT{\TeXXeTstate>\c_zero}{\beginL} \hbox_set:Nn\l_xsb_box\bgroup\color@begingroup \ignorespaces } @@ -174,6 +179,7 @@ \unskip \color@endgroup\egroup \xsb_process_box:nnnN{#1}{\width}{c}\l_xsb_box + \int_compare:nT{\TeXXeTstate>\c_zero}{\endL} \group_end: } @@ -200,6 +206,7 @@ \pbs_pdfxform:nnn{1}{0}{#4} %define command for inserting the m-boxed XObject reference \tl_gset:cx{the#1}{ + \exp_not:N\int_compare:nT{\TeXXeTstate>\c_zero}{\beginL} \exp_not:N\makebox[\l_xsb_new_wd_tl][#3]{ \exp_not:N\hbox_to_wd:nn{\l_xsb_wd_tl}{ \exp_not:N\vrule~width~\c_zero_dim~height~\l_xsb_ht_tl~ @@ -208,6 +215,7 @@ \exp_not:N\pbs_pdfrefxform:n{\pbs_pdflastxform:}\hss } } + \exp_not:N\int_compare:nT{\TeXXeTstate>\c_zero}{\endL} } } -- cgit v1.2.3