summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/source/latex/sttools/stfloats.dtx
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2016-06-29 21:06:07 +0000
committerKarl Berry <karl@freefriends.org>2016-06-29 21:06:07 +0000
commit66fc4fde29ab7f4315fa60cca50b476e53668acf (patch)
tree2415341d73ceab3f6a2108fa94550f702354ef5c /Master/texmf-dist/source/latex/sttools/stfloats.dtx
parent2597736aa760a011c7f8f0b9061139ba1131ac73 (diff)
sttools (29jun16)
git-svn-id: svn://tug.org/texlive/trunk@41567 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/source/latex/sttools/stfloats.dtx')
-rw-r--r--Master/texmf-dist/source/latex/sttools/stfloats.dtx1041
1 files changed, 517 insertions, 524 deletions
diff --git a/Master/texmf-dist/source/latex/sttools/stfloats.dtx b/Master/texmf-dist/source/latex/sttools/stfloats.dtx
index 61aa0c63b0b..cbd8781c7fc 100644
--- a/Master/texmf-dist/source/latex/sttools/stfloats.dtx
+++ b/Master/texmf-dist/source/latex/sttools/stfloats.dtx
@@ -41,12 +41,12 @@
%<package>\NeedsTeXFormat{LaTeX2e}[1999/12/01]
%<package>\ProvidesPackage{stfloats}
%<*package>
- [2016/02/08 v2.0 Improve float mechanism and baselineskip settings]
+ [2016/06/28 v3.2 Improve float mechanism and baselineskip settings]
%</package>
%
%<*driver>
\documentclass{ltxdoc}
-\usepackage{stfloats}[2016/02/08]
+\usepackage{stfloats}[2016/06/28]
\EnableCrossrefs
\CodelineIndex
\RecordChanges
@@ -58,7 +58,7 @@
%</driver>
% \fi
%
-% \CheckSum{1210}
+% \CheckSum{1186}
%
% \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
@@ -85,6 +85,7 @@
% \changes{v2.2}{1999/10/22}{changed cs{output} for older LaTeX distributions}
% \changes{v3.0}{2012/05/29}{Converted to DTX file}
% \changes{v3.1}{2016/02/08}{Compatibility with 2015 latexrelease}
+% \changes{v3.2}{2016/06/28}{Compatibility bugfix with 2015 latexrelease}
%
% \DoNotIndex{\newcommand,\newenvironment}
%
@@ -197,18 +198,18 @@
% From \LaTeX\ release 2015/01/01 |\f@depth| is used in |\@testwrongwidth| to look
% for either column or dblcolumn floats. A value of 1sp signals the latter.
% \begin{macrocode}
-\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}%
+ }
% \end{macrocode}
% \end{macro}
%
@@ -218,12 +219,12 @@
% \begin{macrocode}
\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
% \end{macrocode}
% \end{macro}
@@ -236,90 +237,90 @@
% With adds to support dblfoat(s) placement at the page bottom.
% \begin{macrocode}
\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
- \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
- }
+ \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
+ }
% \end{macrocode}
% \end{macro}
%
@@ -327,47 +328,47 @@
% \begin{macro}{\@doclearpage}
% With adds to support dblfoat(s) placement at the page bottom.
% \begin{macrocode}
-\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
+ \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
\else
% \end{macrocode}
% \end{macro}
@@ -375,98 +376,98 @@
% Newer \LaTeX\ release version from 2015/01/01 support goes here.
%
% \begin{macrocode}
-%%% > 2015 start
+ %%% > 2015 start
% \end{macrocode}
%
%
% \begin{macro}{\@addtodblcol}
% With adds to support dblfoat(s) placement on the current page and at the page bottom.
% \begin{macrocode}
-\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
+ \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
- \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
- }
+ \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
+ }
% \end{macrocode}
% \end{macro}
%
@@ -474,137 +475,140 @@
% \begin{macro}{\@addtocurcol}
% With adds to support dblfoat(s) placement on the current page and at the page bottom.
% \begin{macrocode}
-\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\@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@insert
+ \else
+ \@resethfps
+ \@cons\@deferlist\@currbox
+ \fi
+ }%
% \end{macrocode}
% \end{macro}
%
@@ -612,28 +616,28 @@
% \begin{macro}{\@addtotoporbot}
% With adds to support dblfoat(s) placement on the current page and at the page bottom.
% \begin{macrocode}
-\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\@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
+ }
% \end{macrocode}
% \end{macro}
%
@@ -641,25 +645,25 @@
% \begin{macro}{\@addtobot}
% With adds to support dblfoat(s) placement on the current page and at the page bottom.
% \begin{macrocode}
-\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\@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
+ }
% \end{macrocode}
% \end{macro}
%
@@ -667,59 +671,48 @@
% \begin{macro}{\@doclearpage}
% With adds to support dblfoat(s) placement on the current page and at the page bottom.
% \begin{macrocode}
-\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
+ \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
% \end{macrocode}
% \end{macro}
@@ -729,9 +722,9 @@
% Combines outputbox with top and bottom placed dblfloat(s).
% \begin{macrocode}
\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
+ }
% \end{macrocode}
% \end{macro}
%
@@ -747,15 +740,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
+ }%
+ }
% \end{macrocode}
% \end{macro}
%
@@ -771,16 +764,16 @@
\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
+ }%
+ }
% \end{macrocode}
% \end{macro}
%
@@ -792,38 +785,38 @@
% \begin{macro}{\fn@makecol}
% Redefined macro |\@makecol| which puts footnotes below the bottom floats.
% \begin{macrocode}
-\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
+ }
% \end{macrocode}
% \end{macro}
%
@@ -850,9 +843,9 @@
% not empty. To prevent this |\size@update| is redefined.
% \begin{macrocode}
\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
@@ -866,19 +859,19 @@
% \end{macrocode}
% Removes the |\baselineskip| glue in case |\f@linespread| not empty.
% \begin{macrocode}
- \baselineskip\f@linespread\baselineskip
+ \baselineskip\f@linespread\baselineskip
% \end{macrocode}
% Restoring of the |\baselineskip| glue.
% \begin{macrocode}
- \advance\@tempskipa by\baselineskip\baselineskip\@tempskipa
- \normalbaselineskip\baselineskip
- \setbox\strutbox\hbox{%
- \vrule\@height.7\baselineskip
- \@depth.3\baselineskip
- \@width\z@}%
- \let\size@update\relax
+ \advance\@tempskipa by\baselineskip\baselineskip\@tempskipa
+ \normalbaselineskip\baselineskip
+ \setbox\strutbox\hbox{%
+ \vrule\@height.7\baselineskip
+ \@depth.3\baselineskip
+ \@width\z@}%
+ \let\size@update\relax
}%
- }
+ }
% \end{macrocode}
% \end{macro}
%
@@ -903,10 +896,10 @@
% without glue in the case |\baselinestretch| is not empty.
% \begin{macrocode}
\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
+ }
% \end{macrocode}
% \end{macro}
%