sttools (24apr14)

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

4 files changed, 31 insertions, 15 deletions

diff --git a/Master/texmf-dist/doc/latex/sttools/README b/Master/texmf-dist/doc/latex/sttools/README
index f8109914c39..196e1de95d0 100644
--- a/Master/texmf-dist/doc/latex/sttools/README
+++ b/Master/texmf-dist/doc/latex/sttools/README
@@ -1,4 +1,4 @@
-README for sttools, 2014/03/20
+README for sttools, 2014/04/24
 
 INTRODUCTION
 ============
@@ -21,6 +21,7 @@ PACKAGES
   – balances page in twocolumn mode;
    (2014/03/03): totally rewritten with new algorithm to support footnotes,
         top floats and column break before one line section title;
+   (2014/04/24): bugfix version;
 
 * marginal.sty:
   – enlarges room for marginal inserts;
@@ -31,7 +32,7 @@ PACKAGES
 
 * stabular.sty:
   – modifies tabular environment; 
-  NEW: removed extra stuff and left only possibility to break 
+  (2014/03/20): removed extra stuff and left only possibility to break 
        on page boundary;
        added tabular variant from array package;
 
diff --git a/Master/texmf-dist/doc/latex/sttools/flushend.pdf b/Master/texmf-dist/doc/latex/sttools/flushend.pdf
index e1d68b34275..db30208e886 100644
--- a/Master/texmf-dist/doc/latex/sttools/flushend.pdf
+++ b/Master/texmf-dist/doc/latex/sttools/flushend.pdf
diff --git a/Master/texmf-dist/source/latex/sttools/flushend.dtx b/Master/texmf-dist/source/latex/sttools/flushend.dtx
index e2ca6861b07..21aacf2b6a4 100644
--- a/Master/texmf-dist/source/latex/sttools/flushend.dtx
+++ b/Master/texmf-dist/source/latex/sttools/flushend.dtx
@@ -42,7 +42,7 @@
 %<package>\NeedsTeXFormat{LaTeX2e}[1999/12/01]
 %<package>\ProvidesPackage{flushend}
 %<*package>
-    [2014/03/18 v2.1 Balancing columns in twocolumn mode]
+    [2014/04/24 v2.2 Balancing columns in twocolumn mode]
 %</package>
 %
 %<*driver>
@@ -59,7 +59,7 @@
 %</driver>
 % \fi
 %
-% \CheckSum{1306}
+% \CheckSum{1312}
 %
 % \CharacterTable
 %  {Upper-case    \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z
@@ -84,6 +84,7 @@
 % \changes{v1.1}{2012/05/29}{Converted to DTX file}
 % \changes{v2.0}{2014/03/03}{rewritten with new balance algorithm}
 % \changes{v2.1}{2014/03/18}{Switched debug option off}
+% \changes{v2.2}{2014/04/24}{bugfix version: removing empty box at the right column end}
 %
 % \DoNotIndex{\newcommand,\newenvironment}
 %
@@ -229,15 +230,22 @@
 % \begin{macro}{\remove@lastbox@at@balancing}
 % It is used to remove empty box at the right column end.
 %    \begin{macrocode}
-\gdef\remove@lastbox@at@balancing{%
-  \unskip\unkern\unpenalty
-  \unskip\unkern\unpenalty
-  \unskip\unkern\unpenalty
-  {\setbox\z@\lastbox}%
+\def\unskip@three@kern@penalty{%
   \unskip\unkern\unpenalty
   \unskip\unkern\unpenalty
   \unskip\unkern\unpenalty
   }
+\gdef\remove@lastbox@at@balancing{%
+  \unskip@three@kern@penalty
+  \bgroup
+    \setbox\z@\lastbox
+    \ifdim\wd\z@>\z@
+      \box\z@
+    \else
+      \aftergroup\unskip@three@kern@penalty
+    \fi
+  \egroup
+  }
 %    \end{macrocode}
 % \end{macro}
 %
diff --git a/Master/texmf-dist/tex/latex/sttools/flushend.sty b/Master/texmf-dist/tex/latex/sttools/flushend.sty
index da79299fb1d..68e6fad9213 100644
--- a/Master/texmf-dist/tex/latex/sttools/flushend.sty
+++ b/Master/texmf-dist/tex/latex/sttools/flushend.sty
@@ -22,7 +22,7 @@
 %%
 \NeedsTeXFormat{LaTeX2e}[1999/12/01]
 \ProvidesPackage{flushend}
-    [2014/03/18 v2.1 Balancing columns in twocolumn mode]
+    [2014/04/24 v2.2 Balancing columns in twocolumn mode]
 \newif\if@auto@baselineskip \@auto@baselineskiptrue
 \newif\if@balance@debug \@balance@debugfalse
 \DeclareOption{autobase}{\global\@auto@baselineskiptrue}
@@ -50,15 +50,22 @@
 \newtoks\atColsEnd   \atColsEnd={}
 \@ifundefined{fmt@box@adds}{\def\fmt@box@adds#1{#1}}{}
 \@ifundefined{fmt@vbox@adds}{\def\fmt@vbox@adds[#1]#2{#2}}{}
-\gdef\remove@lastbox@at@balancing{%
-  \unskip\unkern\unpenalty
-  \unskip\unkern\unpenalty
-  \unskip\unkern\unpenalty
-  {\setbox\z@\lastbox}%
+\def\unskip@three@kern@penalty{%
   \unskip\unkern\unpenalty
   \unskip\unkern\unpenalty
   \unskip\unkern\unpenalty
   }
+\gdef\remove@lastbox@at@balancing{%
+  \unskip@three@kern@penalty
+  \bgroup
+    \setbox\z@\lastbox
+    \ifdim\wd\z@>\z@
+      \box\z@
+    \else
+      \aftergroup\unskip@three@kern@penalty
+    \fi
+  \egroup
+  }
 \def\show@@box#1{%
   \bgroup
     \showboxbreadth=20000\showboxdepth=20000%