summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/latex
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2012-05-21 23:57:28 +0000
committerKarl Berry <karl@freefriends.org>2012-05-21 23:57:28 +0000
commiteec1bcc6efce237f93a0615bee7089ba973beedc (patch)
tree123014d5eb055403791c76550cb071306d62dabd /Master/texmf-dist/tex/latex
parentfe0f3a9dd1cb2415d2d961e1e6f46b410b6f722e (diff)
collectbox (21may12)
git-svn-id: svn://tug.org/texlive/trunk@26557 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/latex')
-rw-r--r--Master/texmf-dist/tex/latex/collectbox/collectbox.sty25
1 files changed, 18 insertions, 7 deletions
diff --git a/Master/texmf-dist/tex/latex/collectbox/collectbox.sty b/Master/texmf-dist/tex/latex/collectbox/collectbox.sty
index 4e265aef03a..fd732223393 100644
--- a/Master/texmf-dist/tex/latex/collectbox/collectbox.sty
+++ b/Master/texmf-dist/tex/latex/collectbox/collectbox.sty
@@ -39,8 +39,8 @@
%%
\NeedsTeXFormat{LaTeX2e}[1999/12/01]
\ProvidesPackage{collectbox}[%
- 2012/05/13
- v0.4a
+ 2012/05/17
+ v0.4b
Collect macro arguments as boxes]
\newsavebox\collectedbox
\newcommand*\collectbox{%
@@ -115,12 +115,27 @@
\aftergroup\@temptokena
\collectbox@bgroup
}
+\newcommand\@Collectbox[2]{%
+ \begingroup
+ \collectbox@mode
+ \sbox\collectedbox{#2}%
+ \collectbox@setdims
+ #1%
+ \endgroup
+}
\def\collectbox@arg#1{%
#1\egroup
}
\def\collectbox@end{%
\collectbox@endgroup
\egroup
+ \collectbox@setdims
+ \ifcollectboxenv
+ \collectbox@reset
+ \collectbox@currenvir
+ \fi
+}
+\def\collectbox@setdims{%
\collectbox@protecteddef\BOXCONTENT{\usebox\collectedbox}%
\collectbox@protecteddef\width{\wd\collectedbox}%
\collectbox@protecteddef\height{\ht\collectedbox}%
@@ -128,11 +143,7 @@
\collectbox@protecteddef\totalheight{\@ovri}%
\totalheight\height
\advance\totalheight\depth
- \ifcollectboxenv
- \collectbox@reset
- \collectbox@currenvir
- \fi
-}
+}%
\def\collectbox@reset{%
\let\collectbox@endcode\relax
\let\collectbox@bgroup\collectbox@macro@bgroup