From 66fc4fde29ab7f4315fa60cca50b476e53668acf Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Wed, 29 Jun 2016 21:06:07 +0000 Subject: sttools (29jun16) git-svn-id: svn://tug.org/texlive/trunk@41567 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/tex/latex/sttools/flushend.sty | 7 +- Master/texmf-dist/tex/latex/sttools/marginal.sty | 154 ---- Master/texmf-dist/tex/latex/sttools/stfloats.sty | 1032 +++++++++++----------- 3 files changed, 516 insertions(+), 677 deletions(-) delete mode 100644 Master/texmf-dist/tex/latex/sttools/marginal.sty (limited to 'Master/texmf-dist/tex/latex/sttools') diff --git a/Master/texmf-dist/tex/latex/sttools/flushend.sty b/Master/texmf-dist/tex/latex/sttools/flushend.sty index 4d9cfed37cb..c63fe7fb884 100644 --- a/Master/texmf-dist/tex/latex/sttools/flushend.sty +++ b/Master/texmf-dist/tex/latex/sttools/flushend.sty @@ -6,7 +6,7 @@ %% %% flushend.dtx (with options: `package') %% -%% Copyright (C) 1997-2015 by Sigitas Tolu\v{s}is +%% Copyright (C) 1997-2016 by Sigitas Tolu\v{s}is %% VTeX Ltd., Mokslinink\k{u} 2a, Vilnius, Lithuania %% http://www.vtex.lt/tex/download/macros/ %% -------------------------------------------------------------------------- @@ -22,7 +22,7 @@ %% \NeedsTeXFormat{LaTeX2e}[1999/12/01] \ProvidesPackage{flushend} - [2015/04/14 v3.1 Balancing columns in twocolumn mode] + [2016/06/21 v3.2 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 @@ -285,7 +285,8 @@ \var@@temp@a=-1\p@ \fi \else - \ifdim\ht\flushend@@tempbox@c>\z@ + \ifdim\ht\flushend@@tempbox@c<\z@ + \else \var@@temp@a=-1\p@ \fi \fi diff --git a/Master/texmf-dist/tex/latex/sttools/marginal.sty b/Master/texmf-dist/tex/latex/sttools/marginal.sty deleted file mode 100644 index 40378958876..00000000000 --- a/Master/texmf-dist/tex/latex/sttools/marginal.sty +++ /dev/null @@ -1,154 +0,0 @@ -%% -%% This is file `marginal.sty', -%% generated with the docstrip utility. -%% -%% The original source files were: -%% -%% marginal.dtx (with options: `package') -%% -%% Copyright (C) 1997-2012 by Sigitas Tolu\v{s}is -%% VTeX Ltd., Akademijos 4, Vilnius, Lithuania -%% http://www.vtex.lt/tex/download/macros/ -%% -------------------------------------------------------------------------- -%% This work may be distributed and/or modified under the -%% conditions of the LaTeX Project Public License, either version 1.3 -%% of this license or (at your option) any later version. -%% The latest version of this license is in -%% http://www.latex-project.org/lppl.txt -%% and version 1.3 or later is part of all distributions of LaTeX -%% version 2005/12/01 or later. -%% -%% PURPOSE: Enlarge free and show lost marginal inserts. -%% -\NeedsTeXFormat{LaTeX2e}[1999/12/01] -\ProvidesPackage{marginal} - [2012/05/29 v1.1 Enlarge free and show lost marginal inserts] -\newif\if@mparlost \@mparlostfalse -\newbox\@mparlostbox -\setbox\@mparlostbox\vbox{} -\gdef\@fltovfpar{\global\@mparlosttrue - \@latex@warning{Too many unprocessed (marginal)floats}\relax - } -\gdef\@fltovfmess{% - \@latex@error{Too many unprocessed floats}\@ehb - } -\def\marginpar{% - \ifhmode - \@bsphack\@floatpenalty -\@Mii - \else - \@floatpenalty-\@Miii - \fi - \ifinner - \@parmoderr\@floatpenalty\z@ - \else - \@next\@currbox\@freelist{}{}% - \@next\@marbox\@freelist{\global\count\@marbox\m@ne}{\@floatpenalty\z@ - \@fltovfmess \def\@currbox{\@tempboxa}\def\@marbox{\@tempboxa}}% - \fi - \@ifnextchar[\@xmpar\@ympar - } -\long\def\@savemarbox#1#2{% - \global\setbox#1% - \color@vbox - \vtop{% - \hsize\marginparwidth - \@parboxrestore - \@marginparreset - #2% - \global\@minipagefalse - \outer@nobreak - }% - \color@endbox - \if@mparlost - \global\setbox\@mparlostbox\vbox{\unvbox\@mparlostbox\copy#1}% - \global\@mparlostfalse - \fi - } -\def\showlostmarginals{% - \global\let\old@textbottom\@textbottom - \gdef\@textbottom{% - \vtop to\z@{% - \hbox to\z@{\kern-\wd\@mparlostbox - \vbox to\z@{\kern-\ht\@mparlostbox - \box\@mparlostbox - \vfill - }% - }% - }% - \old@textbottom - }% - \global\let\@fltovfmess\@fltovfpar - } -\def\enlargefreelist{% - \@for\curr@option:={S,T,U,W,X,Y,Z,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}% - \do{\expandafter\newinsert\csname bx@\curr@option\endcsname}% - \gdef\@freelist{% - \@elt\bx@A \@elt\bx@B \@elt\bx@C \@elt\bx@D \@elt\bx@E \@elt\bx@F - \@elt\bx@G \@elt\bx@H \@elt\bx@I \@elt\bx@J \@elt\bx@K \@elt\bx@L - \@elt\bx@M \@elt\bx@N \@elt\bx@O \@elt\bx@P \@elt\bx@Q \@elt\bx@R - \@elt\bx@S \@elt\bx@T \@elt\bx@U \@elt\bx@V \@elt\bx@W \@elt\bx@X - \@elt\bx@Y \@elt\bx@Z - \@elt\bx@a \@elt\bx@b \@elt\bx@c \@elt\bx@d \@elt\bx@e \@elt\bx@f - \@elt\bx@g \@elt\bx@h \@elt\bx@i \@elt\bx@j \@elt\bx@k \@elt\bx@l - \@elt\bx@m \@elt\bx@n \@elt\bx@o \@elt\bx@p \@elt\bx@q \@elt\bx@r - \@elt\bx@s \@elt\bx@t \@elt\bx@u \@elt\bx@v \@elt\bx@w \@elt\bx@x - \@elt\bx@y \@elt\bx@z - }% - }% -%% \onesidemarginals - outputs marginals only on one side -\def\onesidemarginals{% - \newbox\@marbox - \gdef\@addmarginpar{\@cons\@freelist\@currbox - \@tempdima\@mparbottom - \advance\@tempdima -\@pageht - \advance\@tempdima\ht\@currbox - \ifdim\@tempdima >\z@ - \@latex@warning@no@line {Marginpar on page \thepage\space moved}% - \else - \@tempdima\z@ - \fi - \global\@mparbottom\@pageht - \global\advance\@mparbottom\@tempdima - \global\advance\@mparbottom\dp\@currbox - \global\advance\@mparbottom\marginparpush - \advance\@tempdima -\ht\@currbox - \global\setbox\@currbox - \vbox {\vskip\@tempdima \box\@currbox}% - \global \ht\@currbox \z@ - \global \dp\@currbox \z@ - \kern -\@pagedp - \nointerlineskip - \hb@xt@\columnwidth - {\hskip\columnwidth \hskip\marginparsep \box\@currbox \hss}% - \nointerlineskip - \hbox{\vrule \@height\z@ \@width\z@ \@depth\@pagedp}% - }% - \gdef\marginpar{% - \ifhmode - \@bsphack\@floatpenalty -\@Mii - \else - \@floatpenalty-\@Miii - \fi - \ifinner - \@parmoderr\@floatpenalty\z@ - \else - \@next\@currbox\@freelist{\global\count\@currbox\m@ne}{\@floatpenalty\z@ - \@fltovfmess \def\@currbox{\@tempboxa}}% - \fi - \@ifnextchar[\@xmpar\@ympar - }% - \long\gdef\@xmpar[##1]##2{\@savemarbox\@currbox{##2}\@xympar}% - \long\gdef\@ympar##1{\@savemarbox\@currbox{##1}\@xympar}% - \def\@xympar{% - \ifnum\@floatpenalty<\z@ \@cons\@currlist\@marbox \fi - \setbox\@tempboxa - \color@vbox - \vbox\bgroup - \end@float - \global\@ignorefalse \@esphack - }% - } -\endinput -%% -%% End of file `marginal.sty'. diff --git a/Master/texmf-dist/tex/latex/sttools/stfloats.sty b/Master/texmf-dist/tex/latex/sttools/stfloats.sty index 1698703b456..585ee0d61db 100644 --- a/Master/texmf-dist/tex/latex/sttools/stfloats.sty +++ b/Master/texmf-dist/tex/latex/sttools/stfloats.sty @@ -21,476 +21,468 @@ %% \NeedsTeXFormat{LaTeX2e}[1999/12/01] \ProvidesPackage{stfloats} - [2016/02/08 v2.0 Improve float mechanism and baselineskip settings] + [2016/06/28 v3.2 Improve float mechanism and baselineskip settings] \gdef\@dblbotlist{} \newcount\@dblbotnum \newcount\c@dblbotnumber \setcounter{dblbotnumber}{2} \def\@dbflt#1{\@ifnextchar[{\@xdblfloat{#1}}{\@xdblfloat{#1}[tbp]}} -\def \@dblfloatplacement {% - \global \@dbltopnum \c@dbltopnumber - \global \@dblbotnum \c@dblbotnumber - \global \@dbltoproom \dbltopfraction\@colht - \@textmin \@colht - \advance \@textmin -\@dbltoproom - \@fpmin \dblfloatpagefraction\textheight - \@fptop \@dblfptop - \@fpsep \@dblfpsep - \@fpbot \@dblfpbot - \def\f@depth{1sp}% - } +\def\@dblfloatplacement{% + \global\@dbltopnum\c@dbltopnumber + \global\@dblbotnum\c@dblbotnumber + \global\@dbltoproom\dbltopfraction\@colht + \@textmin\@colht + \advance\@textmin -\@dbltoproom + \@fpmin\dblfloatpagefraction\textheight + \@fptop\@dblfptop + \@fpsep\@dblfpsep + \@fpbot\@dblfpbot + \def\f@depth{1sp}% + } \newif\if@before@latex@release \def\tmp@reserved@a#1/#2/#3\@nil{% - \ifnum#1<2015\relax - \@before@latex@releasetrue - \else - \@before@latex@releasefalse - \fi - } + \ifnum #1<2015\relax + \@before@latex@releasetrue + \else + \@before@latex@releasefalse + \fi + } \expandafter\tmp@reserved@a\fmtversion\@nil \if@before@latex@release -%%% < 2015 start -\def\@addtodblcol{% - \begingroup - \@insertfalse - \@setfloattypecounts - \@getfpsbit \tw@ - \ifodd\@tempcnta - \@flsetnum \@dbltopnum - \ifnum \@dbltopnum>\z@ - \@tempswafalse - \ifdim \@dbltoproom>\ht\@currbox - \@tempswatrue - \else - \ifnum \@fpstype<\sixt@@n - \advance \@dbltoproom \@textmin - \ifdim \@dbltoproom>\ht\@currbox - \@tempswatrue - \fi - \advance \@dbltoproom -\@textmin - \fi - \fi - \if@tempswa - \@bitor \@currtype \@dbldeferlist - \if@test - \else - \@bitor \@currtype \@dblbotlist - \if@test - \else - \@tempdima -\ht\@currbox - \advance\@tempdima - -\ifx \@dbltoplist\@empty \dbltextfloatsep \else - \dblfloatsep \fi - \global \advance \@dbltoproom \@tempdima - \global \advance \@colht \@tempdima - \global \advance \@dbltopnum \m@ne - \@cons \@dbltoplist \@currbox - \@inserttrue - \fi - \fi - \fi - \fi - \fi - \if@insert - \else - \@getfpsbit 4\relax - \ifodd\@tempcnta - \@flsetnum \@dblbotnum - \ifnum \@dblbotnum>\z@ - \@tempswafalse - \ifdim \@dbltoproom>\ht\@currbox - \@tempswatrue - \else - \ifnum \@fpstype<\sixt@@n - \advance \@dbltoproom \@textmin - \ifdim \@dbltoproom>\ht\@currbox - \@tempswatrue - \fi - \advance \@dbltoproom -\@textmin + %%% < 2015 start + \def\@addtodblcol{% + \begingroup + \@insertfalse + \@setfloattypecounts + \@getfpsbit \tw@ + \ifodd\@tempcnta + \@flsetnum \@dbltopnum + \ifnum \@dbltopnum>\z@ + \@tempswafalse + \ifdim \@dbltoproom>\ht\@currbox + \@tempswatrue + \else + \ifnum \@fpstype<\sixt@@n + \advance\@dbltoproom \@textmin + \ifdim \@dbltoproom>\ht\@currbox + \@tempswatrue + \fi + \advance\@dbltoproom -\@textmin + \fi + \fi + \if@tempswa + \@bitor \@currtype \@dbldeferlist + \if@test + \else + \@bitor \@currtype \@dblbotlist + \if@test + \else + \@tempdima -\ht\@currbox + \advance\@tempdima + -\ifx \@dbltoplist\@empty \dbltextfloatsep \else + \dblfloatsep \fi + \global \advance \@dbltoproom \@tempdima + \global \advance \@colht \@tempdima + \global \advance \@dbltopnum \m@ne + \@cons \@dbltoplist \@currbox + \@inserttrue + \fi + \fi + \fi + \fi + \fi + \if@insert + \else + \@getfpsbit 4\relax + \ifodd\@tempcnta + \@flsetnum \@dblbotnum + \ifnum \@dblbotnum>\z@ + \@tempswafalse + \ifdim \@dbltoproom>\ht\@currbox + \@tempswatrue + \else + \ifnum \@fpstype<\sixt@@n + \advance \@dbltoproom \@textmin + \ifdim \@dbltoproom>\ht\@currbox + \@tempswatrue + \fi + \advance \@dbltoproom -\@textmin + \fi + \fi + \if@tempswa + \@bitor \@currtype \@dbldeferlist + \if@test + \else + \@tempdima -\ht\@currbox + \advance\@tempdima + -\ifx \@dblbotlist\@empty \dbltextfloatsep \else + \dblfloatsep \fi + \global \advance \@dbltoproom \@tempdima + \global \advance \@colht \@tempdima + \global \advance \@dblbotnum \m@ne + \@cons \@dblbotlist \@currbox + \@inserttrue + \fi + \fi + \fi + \fi + \if@insert + \else + \@cons\@dbldeferlist\@currbox + \fi + \fi + \endgroup + } + \def\@doclearpage{% + \ifvoid\footins + \ifvbox\@kludgeins + {\setbox \@tempboxa \box \@kludgeins}% + \fi + \setbox\@tempboxa\vsplit\@cclv to\z@ \unvbox\@tempboxa + \setbox\@tempboxa\box\@cclv + \xdef\@deferlist{\@toplist\@botlist\@deferlist}% + \global \let \@toplist \@empty + \global \let \@botlist \@empty + \global \@colroom \@colht + \ifx \@currlist\@empty + \else + \@latexerr{Float(s) lost}\@ehb + \global \let \@currlist \@empty \fi - \fi - \if@tempswa - \@bitor \@currtype \@dbldeferlist - \if@test - \else - \@tempdima -\ht\@currbox - \advance\@tempdima - -\ifx \@dblbotlist\@empty \dbltextfloatsep \else - \dblfloatsep \fi - \global \advance \@dbltoproom \@tempdima - \global \advance \@colht \@tempdima - \global \advance \@dblbotnum \m@ne - \@cons \@dblbotlist \@currbox - \@inserttrue - \fi - \fi + \@makefcolumn\@deferlist + \@whilesw\if@fcolmade \fi{\@opcol\@makefcolumn\@deferlist}% + \if@twocolumn + \if@firstcolumn + \xdef\@dbldeferlist{\@dbltoplist\@dblbotlist\@dbldeferlist}% + \global \let \@dbltoplist \@empty + \global \let \@dblbotlist \@empty + \global \@colht \textheight + \begingroup + \@dblfloatplacement + \@makefcolumn\@dbldeferlist + \@whilesw\if@fcolmade \fi{\@outputpage + \@makefcolumn\@dbldeferlist}% + \endgroup + \else + \vbox{}\clearpage + \fi + \fi + \else + \setbox\@cclv\vbox{\box\@cclv\vfil}% + \@makecol\@opcol + \clearpage \fi - \fi - \if@insert - \else - \@cons\@dbldeferlist\@currbox - \fi - \fi - \endgroup - } -\def \@doclearpage {% - \ifvoid\footins - \ifvbox\@kludgeins - {\setbox \@tempboxa \box \@kludgeins}% - \fi - \setbox\@tempboxa\vsplit\@cclv to\z@ \unvbox\@tempboxa - \setbox\@tempboxa\box\@cclv - \xdef\@deferlist{\@toplist\@botlist\@deferlist}% - \global \let \@toplist \@empty - \global \let \@botlist \@empty - \global \@colroom \@colht - \ifx \@currlist\@empty - \else - \@latexerr{Float(s) lost}\@ehb - \global \let \@currlist \@empty - \fi - \@makefcolumn\@deferlist - \@whilesw\if@fcolmade \fi{\@opcol\@makefcolumn\@deferlist}% - \if@twocolumn - \if@firstcolumn - \xdef\@dbldeferlist{\@dbltoplist\@dblbotlist\@dbldeferlist}% - \global \let \@dbltoplist \@empty - \global \let \@dblbotlist \@empty - \global \@colht \textheight - \begingroup - \@dblfloatplacement - \@makefcolumn\@dbldeferlist - \@whilesw\if@fcolmade \fi{\@outputpage - \@makefcolumn\@dbldeferlist}% - \endgroup - \else - \vbox{}\clearpage - \fi - \fi - \else - \setbox\@cclv\vbox{\box\@cclv\vfil}% - \@makecol\@opcol - \clearpage - \fi - } -%%% < 2015 end + } + %%% < 2015 end \else -%%% > 2015 start -\def\@addtodblcol{% - \begingroup - \@insertfalse - \@setfloattypecounts - \@getfpsbit \tw@ - \ifodd\@tempcnta - \@flsetnum \@dbltopnum - \ifnum \@dbltopnum>\z@ - \@tempswafalse - \ifdim \@dbltoproom>\ht\@currbox - \@tempswatrue - \else - \ifnum \@fpstype<\sixt@@n - \advance \@dbltoproom \@textmin - \ifdim \@dbltoproom>\ht\@currbox - \@tempswatrue - \fi - \advance \@dbltoproom -\@textmin - \fi - \fi - \if@tempswa - \@bitor \@currtype \@deferlist - \@testwrongwidth\@currbox - \if@test - \else - \@bitor \@currtype \@dblbotlist - \if@test - \else - \@tempdima -\ht\@currbox - \advance\@tempdima - -\ifx \@dbltoplist\@empty \dbltextfloatsep \else - \dblfloatsep \fi - \global \advance \@dbltoproom \@tempdima - \global \advance \@colht \@tempdima - \global \advance \@dbltopnum \m@ne - \@cons \@dbltoplist \@currbox - \@inserttrue - \fi - \fi - \fi - \fi - \fi - \if@insert - \else - \@getfpsbit 4\relax - \ifodd\@tempcnta - \@flsetnum \@dblbotnum - \ifnum \@dblbotnum>\z@ - \@tempswafalse - \ifdim \@dbltoproom>\ht\@currbox - \@tempswatrue - \else - \ifnum \@fpstype<\sixt@@n - \advance \@dbltoproom \@textmin - \ifdim \@dbltoproom>\ht\@currbox - \@tempswatrue - \fi - \advance \@dbltoproom -\@textmin + %%% > 2015 start + \def\@addtodblcol{% + \begingroup + \@insertfalse + \@setfloattypecounts + \@getfpsbit \tw@ + \ifodd\@tempcnta + \@flsetnum \@dbltopnum + \ifnum \@dbltopnum>\z@ + \@tempswafalse + \ifdim \@dbltoproom>\ht\@currbox + \@tempswatrue + \else + \ifnum \@fpstype<\sixt@@n + \advance \@dbltoproom \@textmin + \ifdim \@dbltoproom>\ht\@currbox + \@tempswatrue + \fi + \advance \@dbltoproom -\@textmin + \fi + \fi + \if@tempswa + \@bitor \@currtype \@deferlist + \@testwrongwidth\@currbox + \if@test + \else + \@bitor \@currtype \@dblbotlist + \if@test + \else + \@tempdima -\ht\@currbox + \advance\@tempdima + -\ifx \@dbltoplist\@empty \dbltextfloatsep \else + \dblfloatsep \fi + \global \advance \@dbltoproom \@tempdima + \global \advance \@colht \@tempdima + \global \advance \@dbltopnum \m@ne + \@cons \@dbltoplist \@currbox + \@inserttrue + \fi + \fi + \fi + \fi + \fi + \if@insert + \else + \@getfpsbit 4\relax + \ifodd\@tempcnta + \@flsetnum \@dblbotnum + \ifnum \@dblbotnum>\z@ + \@tempswafalse + \ifdim \@dbltoproom>\ht\@currbox + \@tempswatrue + \else + \ifnum \@fpstype<\sixt@@n + \advance \@dbltoproom \@textmin + \ifdim \@dbltoproom>\ht\@currbox + \@tempswatrue + \fi + \advance \@dbltoproom -\@textmin + \fi + \fi + \if@tempswa + \@bitor \@currtype \@deferlist + \@testwrongwidth\@currbox + \if@test + \else + \@tempdima -\ht\@currbox + \advance\@tempdima + -\ifx \@dblbotlist\@empty \dbltextfloatsep \else + \dblfloatsep \fi + \global \advance \@dbltoproom \@tempdima + \global \advance \@colht \@tempdima + \global \advance \@dblbotnum \m@ne + \@cons \@dblbotlist \@currbox + \@inserttrue + \fi + \fi + \fi + \fi + \if@insert + \else + \@cons\@deferlist\@currbox + \fi + \fi + \endgroup + } + \def\@addtocurcol{% + \@insertfalse + \@setfloattypecounts + \ifnum \@fpstype=8 + \else + \ifnum \@fpstype=24 + \else + \@flsettextmin + \advance \@textmin \@textfloatsheight + \@reqcolroom \@pageht + \ifdim \@textmin>\@reqcolroom + \@reqcolroom \@textmin + \fi + \advance \@reqcolroom \ht\@currbox + \ifdim \@colroom>\@reqcolroom + \@flsetnum \@colnum + \ifnum \@colnum>\z@ + \@bitor\@currtype\@deferlist + \if@test + \else + \@testwrongwidth\@currbox + \if@test + \if@firstcolumn + \@getfpsbit \tw@ + \ifodd\@tempcnta + \@flsetnum \@dbltopnum + \ifnum \@dbltopnum>\z@ + \@tempswafalse + \ifdim \@dbltoproom>\ht\@currbox + \@tempswatrue + \else + \ifnum \@fpstype<\sixt@@n + \advance \@dbltoproom \@textmin + \ifdim \@dbltoproom>\ht\@currbox + \@tempswatrue + \fi + \advance \@dbltoproom -\@textmin + \fi + \fi + \if@tempswa + \@bitor\@currtype{\@toplist\@midlist\@botlist\@dblbotlist}% + \if@test + \else + \@tempdima -\ht\@currbox + \advance\@tempdima + -\ifx \@dbltoplist\@empty \dbltextfloatsep \else + \dblfloatsep \fi + \global \advance \@dbltoproom \@tempdima + \global \advance \@colht \@tempdima + \global \advance \@colroom \@tempdima + \global \advance \@dbltopnum \m@ne + \@cons \@dbltoplist \@currbox + \@inserttrue + \fi + \fi + \fi + \else + \@getfpsbit 4\relax + \ifodd\@tempcnta + \@flsetnum \@dblbotnum + \ifnum \@dblbotnum>\z@ + \@tempswafalse + \ifdim \@dbltoproom>\ht\@currbox + \@tempswatrue + \else + \ifnum \@fpstype<\sixt@@n + \advance \@dbltoproom \@textmin + \ifdim \@dbltoproom>\ht\@currbox + \@tempswatrue + \fi + \advance \@dbltoproom -\@textmin + \fi + \fi + \if@tempswa + \@tempdima -\ht\@currbox + \advance\@tempdima + -\ifx \@dblbotlist\@empty \dbltextfloatsep \else + \dblfloatsep \fi + \global \advance \@dbltoproom \@tempdima + \global \advance \@colht \@tempdima + \global \advance \@colroom \@tempdima + \global \advance \@dblbotnum \m@ne + \@cons \@dblbotlist \@currbox + \@inserttrue + \fi + \fi + \fi + \fi + \fi + \else + \@bitor\@currtype\@botlist + \if@test + \@addtobot + \else + \ifodd \count\@currbox + \advance \@reqcolroom \intextsep + \ifdim \@colroom>\@reqcolroom + \global \advance \@colnum \m@ne + \global \advance \@textfloatsheight \ht\@currbox + \global \advance \@textfloatsheight 2\intextsep + \@cons \@midlist \@currbox + \if@nobreak + \nobreak + \@nobreakfalse + \everypar{}% + \else + \addpenalty \interlinepenalty + \fi + \vskip \intextsep + \box\@currbox + \penalty\interlinepenalty + \vskip\intextsep + \ifnum\outputpenalty <-\@Mii \vskip -\parskip\fi + \outputpenalty \z@ + \@inserttrue + \fi + \fi + \if@insert + \else + \@addtotoporbot + \fi + \fi + \fi + \fi + \fi + \fi \fi - \fi - \if@tempswa - \@bitor \@currtype \@deferlist - \@testwrongwidth\@currbox - \if@test - \else - \@tempdima -\ht\@currbox - \advance\@tempdima - -\ifx \@dblbotlist\@empty \dbltextfloatsep \else - \dblfloatsep \fi - \global \advance \@dbltoproom \@tempdima - \global \advance \@colht \@tempdima - \global \advance \@dblbotnum \m@ne - \@cons \@dblbotlist \@currbox - \@inserttrue - \fi - \fi \fi - \fi - \if@insert - \else - \@cons\@deferlist\@currbox - \fi - \fi - \endgroup - } -\def \@addtocurcol {% - \@insertfalse - \@setfloattypecounts - \ifnum \@fpstype=8 - \else - \ifnum \@fpstype=24 - \else - \@flsettextmin - \advance \@textmin \@textfloatsheight - \@reqcolroom \@pageht - \ifdim \@textmin>\@reqcolroom - \@reqcolroom \@textmin - \fi - \advance \@reqcolroom \ht\@currbox - \ifdim \@colroom>\@reqcolroom - \@flsetnum \@colnum - \ifnum \@colnum>\z@ - \@bitor\@currtype\@deferlist - \@testwrongwidth\@currbox - \if@test - \if@firstcolumn - \@getfpsbit \tw@ - \ifodd\@tempcnta - \@flsetnum \@dbltopnum - \ifnum \@dbltopnum>\z@ - \@tempswafalse - \ifdim \@dbltoproom>\ht\@currbox - \@tempswatrue - \else - \ifnum \@fpstype<\sixt@@n - \advance \@dbltoproom \@textmin - \ifdim \@dbltoproom>\ht\@currbox - \@tempswatrue - \fi - \advance \@dbltoproom -\@textmin - \fi - \fi - \if@tempswa - \@bitor\@currtype{\@toplist\@midlist\@botlist\@dblbotlist}% - \if@test - \else - \@tempdima -\ht\@currbox - \advance\@tempdima - -\ifx \@dbltoplist\@empty \dbltextfloatsep \else - \dblfloatsep \fi - \global \advance \@dbltoproom \@tempdima - \global \advance \@colht \@tempdima - \global \advance \@colroom \@tempdima - \global \advance \@dbltopnum \m@ne - \@cons \@dbltoplist \@currbox - \@inserttrue - \fi - \fi - \fi - \else - \@getfpsbit 4\relax - \ifodd\@tempcnta - \@flsetnum \@dblbotnum - \ifnum \@dblbotnum>\z@ - \@tempswafalse - \ifdim \@dbltoproom>\ht\@currbox - \@tempswatrue - \else - \ifnum \@fpstype<\sixt@@n - \advance \@dbltoproom \@textmin - \ifdim \@dbltoproom>\ht\@currbox - \@tempswatrue - \fi - \advance \@dbltoproom -\@textmin - \fi - \fi - \if@tempswa - \@tempdima -\ht\@currbox - \advance\@tempdima - -\ifx \@dblbotlist\@empty \dbltextfloatsep \else - \dblfloatsep \fi - \global \advance \@dbltoproom \@tempdima - \global \advance \@colht \@tempdima - \global \advance \@colroom \@tempdima - \global \advance \@dblbotnum \m@ne - \@cons \@dblbotlist \@currbox - \@inserttrue - \fi - \fi - \fi - \fi - \fi - \else - \@bitor\@currtype\@botlist - \if@test - \@addtobot - \else - \ifodd \count\@currbox - \advance \@reqcolroom \intextsep - \ifdim \@colroom>\@reqcolroom - \global \advance \@colnum \m@ne - \global \advance \@textfloatsheight \ht\@currbox - \global \advance \@textfloatsheight 2\intextsep - \@cons \@midlist \@currbox - \if@nobreak - \nobreak - \@nobreakfalse - \everypar{}% - \else - \addpenalty \interlinepenalty - \fi - \vskip \intextsep - \box\@currbox - \penalty\interlinepenalty - \vskip\intextsep - \ifnum\outputpenalty <-\@Mii \vskip -\parskip\fi - \outputpenalty \z@ - \@inserttrue - \fi - \fi - \if@insert - \else - \@addtotoporbot - \fi - \fi - \fi - \fi - \fi - \fi - \fi - \if@insert - \else - \@resethfps - \@cons\@deferlist\@currbox - \fi -}% -\def \@addtotoporbot {% - \@getfpsbit \tw@ - \ifodd \@tempcnta - \@flsetnum \@topnum - \ifnum \@topnum>\z@ - \@tempswafalse - \@flcheckspace \@toproom \@toplist - \if@tempswa - \@bitor\@currtype{\@midlist\@botlist\@dblbotlist}% - \if@test - \else - \@flupdates \@topnum \@toproom \@toplist - \@inserttrue - \fi - \fi - \fi - \fi - \if@insert - \else - \@addtobot - \fi -} -\def \@addtobot {% - \@getfpsbit 4\relax - \ifodd \@tempcnta - \@flsetnum \@botnum - \ifnum \@botnum>\z@ - \@tempswafalse - \@flcheckspace \@botroom \@botlist - \if@tempswa - \@bitor\@currtype{\@dblbotlist}% - \if@test - \else - \global \maxdepth \z@ - \@flupdates \@botnum \@botroom \@botlist - \@inserttrue - \fi - \fi - \fi - \fi -} -\def \@doclearpage {% - \ifvoid\footins - \ifvbox\@kludgeins - {\setbox \@tempboxa \box \@kludgeins}% - \fi - \setbox\@tempboxa\vsplit\@cclv to\z@ \unvbox\@tempboxa - \setbox\@tempboxa\box\@cclv - \if@twocolumn - \xdef\@topbotlist{\@toplist\@botlist}% - \global \let \@toplist \@empty - \global \let \@botlist \@empty - \global \@colroom \@colht - \ifx \@currlist\@empty - \else - \@latexerr{Float(s) lost}\@ehb - \global \let \@currlist \@empty - \fi - \@makefcolumn\@topbotlist - \@whilesw\if@fcolmade \fi{\@opcol\@makefcolumn\@topbotlist}% - \if@firstcolumn - \xdef\@deferlist{\@dbltoplist\@dblbotlist\@deferlist}% - \global \let \@dbltoplist \@empty - \global \let \@dblbotlist \@empty - \global \@colht \textheight - \begingroup - \@dblfloatplacement - \@makefcolumn\@deferlist - \@whilesw\if@fcolmade \fi{\@outputpage - \@makefcolumn\@deferlist}% - \endgroup - \else - \vbox{}\clearpage - \fi - \else - \xdef\@deferlist{\@toplist\@botlist\@deferlist}% - \global \let \@toplist \@empty - \global \let \@botlist \@empty - \global \@colroom \@colht - \ifx \@currlist\@empty - \else - \@latexerr{Float(s) lost}\@ehb - \global \let \@currlist \@empty - \fi - \@makefcolumn\@deferlist - \@whilesw\if@fcolmade \fi{\@opcol\@makefcolumn\@deferlist}% - \fi - \else - \setbox\@cclv\vbox{\box\@cclv\vfil}% - \@makecol\@opcol - \clearpage - \fi - } -%%% > 2015 end + \if@insert + \else + \@resethfps + \@cons\@deferlist\@currbox + \fi + }% + \def\@addtotoporbot{% + \@getfpsbit \tw@ + \ifodd \@tempcnta + \@flsetnum \@topnum + \ifnum \@topnum>\z@ + \@tempswafalse + \@flcheckspace \@toproom \@toplist + \if@tempswa + \@bitor\@currtype{\@midlist\@botlist\@dblbotlist}% + \if@test + \else + \@flupdates \@topnum \@toproom \@toplist + \@inserttrue + \fi + \fi + \fi + \fi + \if@insert + \else + \@addtobot + \fi + } + \def\@addtobot{% + \@getfpsbit 4\relax + \ifodd \@tempcnta + \@flsetnum \@botnum + \ifnum \@botnum>\z@ + \@tempswafalse + \@flcheckspace \@botroom \@botlist + \if@tempswa + \@bitor\@currtype{\@dblbotlist}% + \if@test + \else + \global \maxdepth \z@ + \@flupdates \@botnum \@botroom \@botlist + \@inserttrue + \fi + \fi + \fi + \fi + } + \def\@doclearpage{% + \ifvoid\footins + \ifvbox\@kludgeins + {\setbox \@tempboxa \box \@kludgeins}% + \fi + \setbox\@tempboxa\vsplit\@cclv to\z@ \unvbox\@tempboxa + \setbox\@tempboxa\box\@cclv + \xdef\@deferlist{\@toplist\@botlist\@deferlist}% + \global \let \@toplist \@empty + \global \let \@botlist \@empty + \global \@colroom \@colht + \ifx \@currlist\@empty + \else + \@latexerr{Float(s) lost}\@ehb + \global \let \@currlist \@empty + \fi + \@makefcolumn\@deferlist + \@whilesw\if@fcolmade \fi{\@opcol\@makefcolumn\@deferlist}% + \if@twocolumn + \if@firstcolumn + \xdef\@deferlist{\@dbltoplist\@dblbotlist\@deferlist}% + \global \let \@dbltoplist \@empty + \global \let \@dblbotlist \@empty + \global \@colht \textheight + \begingroup + \@dblfloatplacement + \@makefcolumn\@deferlist + \@whilesw\if@fcolmade \fi{\@outputpage + \@makefcolumn\@deferlist}% + \endgroup + \else + \vbox{}\clearpage + \fi + \fi + \ifx\@deferlist\@empty \else\clearpage \fi + \else + \setbox\@cclv\vbox{\box\@cclv\vfil}% + \@makecol\@opcol + \clearpage + \fi + } + %%% > 2015 end \fi \def\@combinedblfloats{% - \ifx \@dbltoplist\@empty \else \@cdblflt \fi - \ifx \@dblbotlist\@empty \else \@cdblflb \fi - } + \ifx \@dbltoplist\@empty \else \@cdblflt \fi + \ifx \@dblbotlist\@empty \else \@cdblflb \fi + } \def\@cdblflt{% \setbox\@tempboxa \vbox{}% \let \@elt \@comdblflelt @@ -499,15 +491,15 @@ \xdef \@freelist {\@freelist\@dbltoplist}% \global\let \@dbltoplist \@empty \setbox\@outputbox \vbox% to\textheight - {%\boxmaxdepth\maxdepth %% probably not needed, CAR - \unvbox\@tempboxa\vskip-\dblfloatsep - \ifnum \@dbltopnum>\m@ne - \dblfigrule - \fi - \vskip \dbltextfloatsep - \unvbox \@outputbox - }% -} + {%\boxmaxdepth\maxdepth %% probably not needed, CAR + \unvbox\@tempboxa\vskip-\dblfloatsep + \ifnum \@dbltopnum>\m@ne + \dblfigrule + \fi + \vskip \dbltextfloatsep + \unvbox \@outputbox + }% + } \def\@cdblflb{% \setbox\@tempboxa \vbox{}% \let \@elt \@comdblflelt @@ -516,55 +508,55 @@ \xdef \@freelist {\@freelist\@dblbotlist}% \global\let \@dblbotlist \@empty \setbox\@outputbox \vbox% to\textheight - {%\boxmaxdepth\maxdepth %% probably not needed, CAR - \unvbox\@outputbox - \vskip \dbltextfloatsep - \ifnum \@dblbotnum>\m@ne - \dblfigrule - \fi - \unvbox\@tempboxa - \vskip -\dblfloatsep - }% -} + {%\boxmaxdepth\maxdepth %% probably not needed, CAR + \unvbox\@outputbox + \vskip \dbltextfloatsep + \ifnum \@dblbotnum>\m@ne + \dblfigrule + \fi + \unvbox\@tempboxa + \vskip -\dblfloatsep + }% + } \global\let\org@makecol\@makecol -\gdef \fn@makecol {% - \setbox\@outputbox \box\@cclv - \let\@elt\relax - \xdef\@freelist{\@freelist\@midlist}% - \global \let \@midlist \@empty - \@combinefloats - \ifvoid\footins - \else - \setbox\@outputbox \vbox {% - \boxmaxdepth \@maxdepth - \unvbox \@outputbox - \vskip \skip\footins - \color@begingroup - \normalcolor - \footnoterule - \unvbox \footins - \color@endgroup - }% - \fi - \ifvbox\@kludgeins - \@makespecialcolbox - \else - \setbox\@outputbox \vbox to\@colht {% - \@texttop - \dimen@ \dp\@outputbox - \unvbox \@outputbox - \vskip -\dimen@ - \@textbottom - }% - \fi - \global \maxdepth \@maxdepth - } +\gdef\fn@makecol{% + \setbox\@outputbox \box\@cclv + \let\@elt\relax + \xdef\@freelist{\@freelist\@midlist}% + \global \let \@midlist \@empty + \@combinefloats + \ifvoid\footins + \else + \setbox\@outputbox \vbox {% + \boxmaxdepth \@maxdepth + \unvbox \@outputbox + \vskip \skip\footins + \color@begingroup + \normalcolor + \footnoterule + \unvbox \footins + \color@endgroup + }% + \fi + \ifvbox\@kludgeins + \@makespecialcolbox + \else + \setbox\@outputbox \vbox to\@colht {% + \@texttop + \dimen@ \dp\@outputbox + \unvbox \@outputbox + \vskip -\dimen@ + \@textbottom + }% + \fi + \global \maxdepth \@maxdepth + } \def\fnbelowfloat{\global\let\@makecol\fn@makecol} \def\fnunderfloat{\global\let\@makecol\org@makecol} \def\set@floatfontsize#1#2#3{% - \@defaultunits\@tempdimb#2pt\relax\@nnil + \@defaultunits\@tempdimb#2\p@\relax\@nnil \edef\f@size{\strip@pt\@tempdimb}% - \@defaultunits\@tempskipa#3pt\relax\@nnil + \@defaultunits\@tempskipa#3\p@\relax\@nnil \edef\f@baselineskip{\the\@tempskipa}% \edef\f@linespread{#1}% \let\baselinestretch\f@linespread @@ -572,23 +564,23 @@ \baselineskip\f@baselineskip \@tempskipa\baselineskip\relax\baselineskip=1\baselineskip \advance\@tempskipa by-\baselineskip\baselineskip\f@baselineskip - \baselineskip\f@linespread\baselineskip - \advance\@tempskipa by\baselineskip\baselineskip\@tempskipa - \normalbaselineskip\baselineskip - \setbox\strutbox\hbox{% - \vrule\@height.7\baselineskip - \@depth.3\baselineskip - \@width\z@}% - \let\size@update\relax + \baselineskip\f@linespread\baselineskip + \advance\@tempskipa by\baselineskip\baselineskip\@tempskipa + \normalbaselineskip\baselineskip + \setbox\strutbox\hbox{% + \vrule\@height.7\baselineskip + \@depth.3\baselineskip + \@width\z@}% + \let\size@update\relax }% - } + } \let\set@@@fontsize\set@fontsize \def\setbaselinefloat{\let\set@fontsize\set@floatfontsize} \def\setbaselinefixed{% - \@tempdima=\baselinestretch\p@ - \edef\baselinestretch{\strip@pt\@tempdima}% - \let\set@fontsize\set@@@fontsize - } + \@tempdima=\baselinestretch\p@ + \edef\baselinestretch{\strip@pt\@tempdima}% + \let\set@fontsize\set@@@fontsize + } \endinput %% %% End of file `stfloats.sty'. -- cgit v1.2.3