stackengine (19jul16)

git-svn-id: svn://tug.org/texlive/trunk@41733 c570f23f-e606-0410-a88d-b1316a301751

3 files changed, 16 insertions, 8 deletions

diff --git a/Master/texmf-dist/doc/latex/stackengine/stackengine.pdf b/Master/texmf-dist/doc/latex/stackengine/stackengine.pdf
index e27a4033161..e3a65107752 100644
--- a/Master/texmf-dist/doc/latex/stackengine/stackengine.pdf
+++ b/Master/texmf-dist/doc/latex/stackengine/stackengine.pdf
diff --git a/Master/texmf-dist/doc/latex/stackengine/stackengine.tex b/Master/texmf-dist/doc/latex/stackengine/stackengine.tex
index 181f1ad4faa..75097995270 100644
--- a/Master/texmf-dist/doc/latex/stackengine/stackengine.tex
+++ b/Master/texmf-dist/doc/latex/stackengine/stackengine.tex
@@ -42,7 +42,6 @@ steven.b.segletes.civ@mail.mil\\
 \sffamily%
 A sectional index for this package is found in \S\ref{s:index}.
 
-Note: See \S\ref{s:bc} for details on backward compatibility.
 \rmfamily%
 
 \section{Definitions and Terms}
@@ -72,14 +71,19 @@ Notice the consistent inter-baseline spacing on a long stack:
 \Longstack{{{\rl t}} {{\rl y}} {{\rl k}} {{\rl e}}}
 \normalsize\\
 
+\begin{sloppypar}
 In this package, the default spacing (\textit{i.e.}, stacklength) for
-the long stack, saved in \vb|\Lstackgap| is the value
-\vb|\baselineskip|.  For short stacks, the default stacklength, stored in
+the long stack, saved in \vb|\Lstackgap| is the length
+\vb|\normalbaselineskip| (note that \vb|\normalbaselineskip| has the same 
+value as \vb|\baselineskip|, but can be safely used inside a \vb|tabular|
+environment).
+For short stacks, the default stacklength, stored in
 \vb|\Sstackgap|, is 3pt, which corresponds to the same spacing found in
 \TeX's \vb|\shortstack| command.  The default stack type constructed by
 this package is short, denoted by the definition of \vb|\stacktype| as
 ``S'' (as opposed to ``L'' for long stacks).  These defaults can be
 changed.
+\end{sloppypar}
 
 \subsection{Baseline}
 \setstackgap{L}{.8\baselineskip}
@@ -174,7 +178,7 @@ Correspondingly,
 \margcmd{Lstackgap}
 \vb|\Lstackgap| is the inter-item baselineskip for
 any stacking command that builds a long stack.  It defaults to
-\vb|\baselineskip|.  To change these defaults, the following macro
+\vb|\normalbaselineskip|.  To change these defaults, the following macro
 is provided:
 \margcmd{setstackgap}
 
@@ -306,10 +310,12 @@ commands prior to the invocation of a desired stacking macro.
 
 \subsubsection{\cmd{stackengine}\label{s:stackeng}}
 
+\begin{sloppypar}
 The basic (and most general) stacking macro provided by this package is
 \vb|\stackengine|.  Nearly all other macros of this package merely
 provide an abbreviated invocation form of this macro, tailored for a
 particular application.  The syntax is:
+\end{sloppypar}
 
 \itshape
 \vb|\stackengine{\Sstackgap| or
diff --git a/Master/texmf-dist/tex/latex/stackengine/stackengine.sty b/Master/texmf-dist/tex/latex/stackengine/stackengine.sty
index b0402a1f9a6..701bab0ee12 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.24}
+\def\stackengineversionnumber{v3.25}
 \ProvidesPackage{stackengine}
-[2014/01/06 \stackengineversionnumber\ 
+[2016/07/19 \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
@@ -68,6 +68,8 @@
 %       -Reinstated \usepackage{calc} (Oops!)
 % V3.24 -Replaced references to \roman with \romannumeral, since \roman
 %        is redefined by packages like spanish babel.
+% V3.25 -Default longstack gap is now \normalbaselineskip, so as to
+%        automatically work in tabular environments.
 \RequirePackage{etoolbox}
 \usepackage{calc}
 
@@ -110,7 +112,7 @@
   \setcounter{ROWcellindex@}{0}%
   \whileboolexpr{test {\nottoggle{@doneROWreads}}}{%
     \stepcounter{ROWcellindex@}%
-    \expandafter\@processROW\@postSEP||%
+      \expandafter\@processROW\@postSEP||%
     \expandafter\ifstrempty\expandafter{\@postSEP}{%
       \toggletrue{@doneROWreads}%
     }{}%
@@ -134,7 +136,7 @@
 \newlength\Sstackgap\newlength\Lstackgap
 \newcommand\stackgap{\if S\stacktype\the\Sstackgap\else\the\Lstackgap\fi}
 \global\setlength{\Sstackgap}{3pt}
-\global\setlength{\Lstackgap}{\baselineskip}
+\global\setlength{\Lstackgap}{\normalbaselineskip}
 \else%
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %%%%% AND REPLACED WITH THE FOLLOWING %%%%%%%%%%%%%%%%%%%%%%%%%%