From f61aa2d3251989da4697ecc33018b2aa894bc71d Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Wed, 15 Apr 2015 14:27:59 +0000 Subject: sttools (14apr15) git-svn-id: svn://tug.org/texlive/trunk@36868 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/doc/latex/sttools/README | 5 +++-- Master/texmf-dist/doc/latex/sttools/flushend.pdf | Bin 139206 -> 139052 bytes Master/texmf-dist/doc/latex/sttools/sttools.pdf | Bin 106635 -> 106282 bytes .../texmf-dist/source/latex/sttools/flushend.dtx | 19 +++++++++---------- Master/texmf-dist/source/latex/sttools/sttools.dtx | 7 ++++--- Master/texmf-dist/tex/latex/sttools/flushend.sty | 14 ++++++-------- 6 files changed, 22 insertions(+), 23 deletions(-) (limited to 'Master/texmf-dist') diff --git a/Master/texmf-dist/doc/latex/sttools/README b/Master/texmf-dist/doc/latex/sttools/README index 6f47696ec27..a219fcb9a49 100644 --- a/Master/texmf-dist/doc/latex/sttools/README +++ b/Master/texmf-dist/doc/latex/sttools/README @@ -1,4 +1,4 @@ -README for sttools, v1.6 2015/04/08 +README for sttools, v1.7 2015/04/14 INTRODUCTION ============ @@ -17,7 +17,7 @@ PACKAGES * floatpag.sty, v1.1 2012/05/29: – sets pagestyle for floats page; -* flushend.sty, v3.0 2015/04/08: +* flushend.sty, v3.1 2015/04/14: – 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; @@ -25,6 +25,7 @@ PACKAGES (2015/04/08): bugfix version with improved funcionality: - spreaded or fixed right column height; - optional old algorithm for backward compatability; + (2015/04/14): set debug option off by default; keeplastbox modified; * marginal.sty, v1.1 2012/05/29: – enlarges room for marginal inserts; diff --git a/Master/texmf-dist/doc/latex/sttools/flushend.pdf b/Master/texmf-dist/doc/latex/sttools/flushend.pdf index fa506d9c755..0001eeac885 100644 Binary files a/Master/texmf-dist/doc/latex/sttools/flushend.pdf and b/Master/texmf-dist/doc/latex/sttools/flushend.pdf differ diff --git a/Master/texmf-dist/doc/latex/sttools/sttools.pdf b/Master/texmf-dist/doc/latex/sttools/sttools.pdf index 4a996b7ec47..ca117f4fd29 100644 Binary files a/Master/texmf-dist/doc/latex/sttools/sttools.pdf and b/Master/texmf-dist/doc/latex/sttools/sttools.pdf differ diff --git a/Master/texmf-dist/source/latex/sttools/flushend.dtx b/Master/texmf-dist/source/latex/sttools/flushend.dtx index 8bcf181d193..e050787f857 100644 --- a/Master/texmf-dist/source/latex/sttools/flushend.dtx +++ b/Master/texmf-dist/source/latex/sttools/flushend.dtx @@ -42,12 +42,12 @@ %\NeedsTeXFormat{LaTeX2e}[1999/12/01] %\ProvidesPackage{flushend} %<*package> - [2015/04/08 v3.0 Balancing columns in twocolumn mode] + [2015/04/14 v3.1 Balancing columns in twocolumn mode] % % %<*driver> \documentclass{ltxdoc} -\usepackage{flushend}[2015/04/08] +\usepackage{flushend}[2015/04/14] \EnableCrossrefs \CodelineIndex %%\RecordChanges @@ -59,7 +59,7 @@ % % \fi % -% \CheckSum{1739} +% \CheckSum{1737} % % \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 @@ -89,6 +89,7 @@ % ancient/modern, % spread/nospread, % removelastbox/keeplastbox} +% \changes{v3.1}{2015/04/14}{set debug option off by default; keeplastbox modified;} % % \DoNotIndex{\newcommand,\newenvironment} % @@ -215,7 +216,7 @@ \newif\if@ancient@balance@version \@ancient@balance@versionfalse \newif\if@right@column@spread \@right@column@spreadtrue \newif\if@remove@lastbox@at@balancing \@remove@lastbox@at@balancingtrue -\newif\if@balance@debug \@balance@debugtrue +\newif\if@balance@debug \@balance@debugfalse \DeclareOption{autobase}{\global\@auto@baselineskiptrue} \DeclareOption{noautobase}{\global\@auto@baselineskipfalse} \DeclareOption{ancient}{\global\@ancient@balance@versiontrue} @@ -280,6 +281,10 @@ } \gdef\remove@lastbox@at@balancing{% \unskip@three@kern@penalty + \if@remove@lastbox@at@balancing + \else + \expandafter\null + \fi \bgroup \setbox\z@\lastbox \ifdim\wd\z@>\z@ @@ -289,12 +294,6 @@ \fi \egroup } -\AtBeginDocument{% - \if@remove@lastbox@at@balancing - \else - \let\remove@lastbox@at@balancing\relax - \fi - } % \end{macrocode} % \end{macro} % diff --git a/Master/texmf-dist/source/latex/sttools/sttools.dtx b/Master/texmf-dist/source/latex/sttools/sttools.dtx index 6527d3750f5..c5798f231a5 100644 --- a/Master/texmf-dist/source/latex/sttools/sttools.dtx +++ b/Master/texmf-dist/source/latex/sttools/sttools.dtx @@ -62,7 +62,7 @@ % \GetFileInfo{sttools.dtx} % \title{The \textsf{sttools} collection} % \author{Sigitas Tolu\v{s}is \\ \url{sigitas@vtex.lt}} -% \date{2015.04.08} +% \date{2015.04.14} % % \maketitle % @@ -79,13 +79,14 @@ % place on twocolumn page with existing text reformatted under inserted % material; \\\texttt{TODO: add optional rules to separate from text}; % \item \textbf{floatpag.sty, v1.1 2012/05/29} -- set pagestyle for floats page; -% \item \textbf{flushend.sty, v3.0 2015/04/08} -- balance page in twocolumn mode; +% \item \textbf{flushend.sty, v3.1 2015/04/14} -- balance page in twocolumn mode; % \\\texttt{(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; % \\(2015/03/27): bugfix version with improved funcionality: % \\ - spreaded or fixed right column height; -% \\ - optional old algorithm for backward compatability;} +% \\ - optional old algorithm for backward compatability; +% \\(2015/04/14): set debug option off by default; keeplastbox modified;} % \item \textbf{marginal.sty, v1.1 2012/05/29} -- use enlarged room for marginal inserts; % \item \textbf{midfloat.sty, v1.1 2012/05/29} -- insert onecolumn stuff in twocolumn % page; \\\texttt{TODO: extend to work on both columns}; diff --git a/Master/texmf-dist/tex/latex/sttools/flushend.sty b/Master/texmf-dist/tex/latex/sttools/flushend.sty index 72f24701f98..4d9cfed37cb 100644 --- a/Master/texmf-dist/tex/latex/sttools/flushend.sty +++ b/Master/texmf-dist/tex/latex/sttools/flushend.sty @@ -22,12 +22,12 @@ %% \NeedsTeXFormat{LaTeX2e}[1999/12/01] \ProvidesPackage{flushend} - [2015/04/08 v3.0 Balancing columns in twocolumn mode] + [2015/04/14 v3.1 Balancing columns in twocolumn mode] \newif\if@auto@baselineskip \@auto@baselineskiptrue \newif\if@ancient@balance@version \@ancient@balance@versionfalse \newif\if@right@column@spread \@right@column@spreadtrue \newif\if@remove@lastbox@at@balancing \@remove@lastbox@at@balancingtrue -\newif\if@balance@debug \@balance@debugtrue +\newif\if@balance@debug \@balance@debugfalse \DeclareOption{autobase}{\global\@auto@baselineskiptrue} \DeclareOption{noautobase}{\global\@auto@baselineskipfalse} \DeclareOption{ancient}{\global\@ancient@balance@versiontrue} @@ -67,6 +67,10 @@ } \gdef\remove@lastbox@at@balancing{% \unskip@three@kern@penalty + \if@remove@lastbox@at@balancing + \else + \expandafter\null + \fi \bgroup \setbox\z@\lastbox \ifdim\wd\z@>\z@ @@ -76,12 +80,6 @@ \fi \egroup } -\AtBeginDocument{% - \if@remove@lastbox@at@balancing - \else - \let\remove@lastbox@at@balancing\relax - \fi - } \def\show@@box#1{% \bgroup \showboxbreadth=20000\showboxdepth=20000% -- cgit v1.2.3