summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2021-07-22 20:40:48 +0000
committerKarl Berry <karl@freefriends.org>2021-07-22 20:40:48 +0000
commit37dc925c2724645c07a728b091e75fd70beaa8e5 (patch)
tree6a3cd75613058944b747303b2424369ad3022043
parentcb737e560f3ee443eec9884d81c023e139c3ffa1 (diff)
stackengine (22jul21)
git-svn-id: svn://tug.org/texlive/trunk@60019 c570f23f-e606-0410-a88d-b1316a301751
-rw-r--r--Master/texmf-dist/doc/latex/stackengine/stackengine.pdfbin385976 -> 385801 bytes
-rw-r--r--Master/texmf-dist/tex/latex/stackengine/stackengine.sty15
2 files changed, 9 insertions, 6 deletions
diff --git a/Master/texmf-dist/doc/latex/stackengine/stackengine.pdf b/Master/texmf-dist/doc/latex/stackengine/stackengine.pdf
index 829e001d2d8..796a9e9cda7 100644
--- a/Master/texmf-dist/doc/latex/stackengine/stackengine.pdf
+++ b/Master/texmf-dist/doc/latex/stackengine/stackengine.pdf
Binary files differ
diff --git a/Master/texmf-dist/tex/latex/stackengine/stackengine.sty b/Master/texmf-dist/tex/latex/stackengine/stackengine.sty
index d99282df7dd..4e37b5e2ddc 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{v4.1}
+\def\stackengineversionnumber{v4.11}
\ProvidesPackage{stackengine}
-[2021/07/15 \stackengineversionnumber\
+[2021/07/22 \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
@@ -88,6 +88,9 @@
% -Introduce \lstackMath and \lstackText as local versions of
% \stackMath and \stackText (which are global).
% -Eliminated \usestackstrut (became internal \@usestackstrut)
+% V4.11 -Renamed \@backgroundbox to \se@backgroundbox, to avoid
+% conflict with adjustbox package. Thanks to
+% samuel.wein AT uni-tuebingen.de for the tip.
\RequirePackage{etoolbox}
\RequirePackage{listofitems}% REQUIRES listofitems.sty AND listofitems.tex
\usepackage{calc}
@@ -102,7 +105,7 @@
\newsavebox\@addedbox
\newsavebox\@anchorbox
\newsavebox\@insetbox
-\newsavebox\@backgroundbox
+\newsavebox\se@backgroundbox
\newsavebox\stackedbox
\newsavebox{\@centerbox}
\newcounter{ROWcellindex@}
@@ -363,13 +366,13 @@
%\stackinset{l/c/r}{x}{b/c/t}{y}{inset}{anchor}
\newcommand*\stackinset[6]{%
- \sbox\@backgroundbox{\stack@delim#6\stack@delim}%
+ \sbox\se@backgroundbox{\stack@delim#6\stack@delim}%
\sbox\@insetbox{\stack@delim#5\stack@delim}%
\ifstrequal{#4}{}%
{\setlength{\stack@tmplength}{0pt}}%
{\setlength{\stack@tmplength}{#4}}%
\if c#3%
- \setlength{\temp@stkl}{\ht\@backgroundbox+\dp\@backgroundbox%
+ \setlength{\temp@stkl}{\ht\se@backgroundbox+\dp\se@backgroundbox%
-\ht\@insetbox-\dp\@insetbox}%
\addtolength{\stack@tmplength}{.5\temp@stkl}%
\fi%
@@ -381,7 +384,7 @@
\else%
\def\conditioned@inset{\stack@lroffset\usebox{\@insetbox}\stack@lroffset}%
\fi%
- \stackengine{-\stack@tmplength}{\usebox{\@backgroundbox}}%
+ \stackengine{-\stack@tmplength}{\usebox{\se@backgroundbox}}%
{\conditioned@inset}{\inset@valign{#3}}{#1}{\quietstack}{T}{S}%
}