From ad9f9da66a5459b5b58caf5de7af2309b97bf185 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Thu, 26 Sep 2013 22:25:51 +0000 Subject: stackengine (26sep13) git-svn-id: svn://tug.org/texlive/trunk@31778 c570f23f-e606-0410-a88d-b1316a301751 --- .../doc/latex/stackengine/stackengine.pdf | Bin 317215 -> 317952 bytes .../doc/latex/stackengine/stackengine.tex | 12 ++++++------ .../tex/latex/stackengine/stackengine.sty | 11 +++++++---- 3 files changed, 13 insertions(+), 10 deletions(-) diff --git a/Master/texmf-dist/doc/latex/stackengine/stackengine.pdf b/Master/texmf-dist/doc/latex/stackengine/stackengine.pdf index 0c7772aead6..b084e86fca2 100644 Binary files a/Master/texmf-dist/doc/latex/stackengine/stackengine.pdf and b/Master/texmf-dist/doc/latex/stackengine/stackengine.pdf differ diff --git a/Master/texmf-dist/doc/latex/stackengine/stackengine.tex b/Master/texmf-dist/doc/latex/stackengine/stackengine.tex index 7aeacf2b2bc..a61771b421d 100644 --- a/Master/texmf-dist/doc/latex/stackengine/stackengine.tex +++ b/Master/texmf-dist/doc/latex/stackengine/stackengine.tex @@ -412,8 +412,8 @@ follows: The first item is at the top of the stack, farthest from the baseline, while the last item is the anchor of the stack. If an item (the contents of a single row) contains spaces, enclose the item in braces. -If the item ends with a macro, enclose the item in braces. While not -particularly intended for math mode (see \S\ref{s:mm} for more +If the item ends with a macro, enclose the item in braces. +If used in a mixed text/math mode (see \S\ref{s:mm} for more details), math items may be enclosed within dollar-sign delimiters. \bfseries Note that, because of the parsing algorithm, macros in the argument of \vb|\Shortstack| and \vb|\Longstack| may need to be @@ -1104,7 +1104,7 @@ alleviated). \begin{myverbbox}{\figa}\stackon{(a)}{\imga}\end{myverbbox}% \begin{myverbbox}{\figb}\stackunder{\imgb}{(b)}\end{myverbbox}% \begin{myverbbox}[\small]{\figc} -\Shortstack{{\imgi} (c1) {} {\imgi} (c2)} +\Shortstack{{\protect\imgi} (c1) {} {\protect\imgi} (c2)} \end{myverbbox}% \begin{myverbbox}% {\figd}\belowbaseline[0pt]{\stackunder{\imgi}{(d)}}\end{myverbbox}% @@ -1184,7 +1184,7 @@ package, {\ste} may not be the best package for math mode since there are many packages that already cater directly to the need to stack and align mathematical objects. However, if there is a need to use {\ste} there, because of its particular facility with -stacking gaps, there are several hints to remember. +stacking gaps and alignment, there are several hints to remember. \textsc{Hints for use in math mode:} (operating under \vb|\stackMath|) \stackMath @@ -1233,8 +1233,8 @@ will set their arguments as text, \item To set an argument in math style, it must be set between math delimiters. -\vb|\( y = \stackunder{\(a\)}{+} x\)|:\hfill -\( y = \stackunder{\(a\)}{+} x\) +\vb|\( y = \stackunder{$a$}{+} x\)|:\hfill +\( y = \stackunder{$a$}{+} x\) \item Each space-separated item of the argument to \vb|\Shortstack|, \vb|\Longstack|, and the corresponding understacks must each be enclosed diff --git a/Master/texmf-dist/tex/latex/stackengine/stackengine.sty b/Master/texmf-dist/tex/latex/stackengine/stackengine.sty index 50103f0e9b8..999f532132e 100644 --- a/Master/texmf-dist/tex/latex/stackengine/stackengine.sty +++ b/Master/texmf-dist/tex/latex/stackengine/stackengine.sty @@ -1,6 +1,6 @@ -\def\stackengineversionnumber{v3.1} +\def\stackengineversionnumber{v3.11} \ProvidesPackage{stackengine} -[2013/09/11 \stackengineversionnumber +[2013/09/25 \stackengineversionnumber\ Stacking text and objects in convenient ways] % This work may be distributed and/or modified under the % conditions of the LaTeX Project Public License, either version 1.3 @@ -47,6 +47,8 @@ % each row of a long stack % -Recommend \strutshortanchors{} mode in preference to % \def\usestackstrut{} definition (now deprecated). +% V3.11 -Corrected bug in \stackinset which did not condition the +% anchor when using vertical centering in \stackMath mode \usepackage{calc} \usepackage{ifthen} \newcounter{@stackindex} @@ -322,12 +324,13 @@ %\stackinset{l/c/r}{x}{b/c/t}{y}{inset}{anchor} \newcommand*\stackinset[6]{% \def\conditioned@inset{\stack@delim#5\stack@delim}% + \def\conditioned@anchor{\stack@delim#6\stack@delim}% \ifthenelse{\equal{#4}{}}% {\setlength{\stack@tmplength}{0pt}}% {\setlength{\stack@tmplength}{#4}}% \if c#3% \setlength{\temp@stkl}{% - \heightof{#6}+\depthof{#6}% + \heightof{\conditioned@anchor}+\depthof{\conditioned@anchor}% -\heightof{\conditioned@inset}-\depthof{\conditioned@inset}}% \addtolength{\stack@tmplength}{.5\temp@stkl}% \fi% @@ -340,7 +343,7 @@ \else% \def\conditioned@inset{\stack@lroffset#5\stack@lroffset}% \fi% - \stackengine{-\stack@tmplength}{#6}{\conditioned@inset}% + \stackengine{-\stack@tmplength}{#6}{#5}% {\inset@valign{#3}}{#1}{\quietstack}{T}{S}% } -- cgit v1.2.3