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/doc/latex/sttools/README | 80 -- Master/texmf-dist/doc/latex/sttools/README.md | 83 ++ Master/texmf-dist/doc/latex/sttools/flushend.pdf | Bin 139052 -> 138739 bytes Master/texmf-dist/doc/latex/sttools/marginal.pdf | Bin 89030 -> 0 bytes Master/texmf-dist/doc/latex/sttools/stfloats.pdf | Bin 126350 -> 125950 bytes Master/texmf-dist/doc/latex/sttools/sttools.pdf | Bin 106282 -> 107283 bytes .../texmf-dist/source/latex/sttools/flushend.dtx | 14 +- .../texmf-dist/source/latex/sttools/marginal.dtx | 339 ------- .../texmf-dist/source/latex/sttools/stfloats.dtx | 1041 ++++++++++---------- Master/texmf-dist/source/latex/sttools/sttools.dtx | 13 +- Master/texmf-dist/source/latex/sttools/sttools.ins | 3 +- 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 ++++++++++--------- 14 files changed, 1132 insertions(+), 1634 deletions(-) delete mode 100644 Master/texmf-dist/doc/latex/sttools/README create mode 100644 Master/texmf-dist/doc/latex/sttools/README.md delete mode 100644 Master/texmf-dist/doc/latex/sttools/marginal.pdf delete mode 100644 Master/texmf-dist/source/latex/sttools/marginal.dtx delete mode 100644 Master/texmf-dist/tex/latex/sttools/marginal.sty (limited to 'Master') diff --git a/Master/texmf-dist/doc/latex/sttools/README b/Master/texmf-dist/doc/latex/sttools/README deleted file mode 100644 index 4ec43257bd2..00000000000 --- a/Master/texmf-dist/doc/latex/sttools/README +++ /dev/null @@ -1,80 +0,0 @@ -README for sttools, v1.8 2016/02/08 - -INTRODUCTION -============ - -It is a collection of macro packages historically placed in a bundle -and maintained by Sigitas Tolušis. - -PACKAGES -======== - -* cuted.sty, v1.5 2012/10/04: - – puts some material page width wide at any place on twocolumn page - with existing text reformatted under inserted material; - TODO: add optional rules to separate from text; - -* floatpag.sty, v1.1 2012/05/29: - – sets pagestyle for floats page; - -* 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; - (2014/04/24): bugfix version; - (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; - -* midfloat.sty, v1.1 2012/05/29: - – inserts onecolumn stuff in twocolumn page; - TODO: extend to work on both columns; - -* stabular.sty, v2.0 2014/03/20: - – modifies tabular environment; - (2014/03/20): removed extra stuff and left only possibility to break - on page boundary; - added tabular variant from array package; - -* stfloats.sty, v2.0 2016/02/08: - – enriches floats output mechanism; - -* texsort.sty, v1.1 2012/05/29: - - sorts numerical values; - TODO: extend (rewrite) to support alphanumerical values - for sorting. - -INSTALLATION -============ - -Install in a standard way as any other LaTeX macro package. - -AUTHORS/MAINTAINER -================== - -* Sigitas Tolušis -* Vytas Statulevičius (floatpag.sty) - -DOCUMENTATION -============= - -Please see the sttools.pdf for a package list in collection -and .pdf for particular macro package. - -LICENSE -======= - -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. - - - diff --git a/Master/texmf-dist/doc/latex/sttools/README.md b/Master/texmf-dist/doc/latex/sttools/README.md new file mode 100644 index 00000000000..da5691dbe06 --- /dev/null +++ b/Master/texmf-dist/doc/latex/sttools/README.md @@ -0,0 +1,83 @@ +README for sttools, v1.9 2016/06/28 + +INTRODUCTION +============ + +It is a collection of macro packages historically placed in a bundle +and maintained by Sigitas Tolušis. + +PACKAGES +======== + +* cuted.sty, v1.5 2012/10/04: + – puts some material page width wide at any place on twocolumn page + with existing text reformatted under inserted material; + TODO: add optional rules to separate from text; + +* floatpag.sty, v1.1 2012/05/29: + – sets pagestyle for floats page; + +* flushend.sty, v3.2 2016/06/21: + – 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; + (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; + (2016/06/21): bugfix compatibility with luatexja package; + +* marginal.sty, v1.1 2012/05/29: + – enlarges room for marginal inserts; + (2016/06/28): removed from the bundle; + +* midfloat.sty, v1.1 2012/05/29: + – inserts onecolumn stuff in twocolumn page; + TODO: extend to work on both columns; + +* stabular.sty, v2.0 2014/03/20: + – modifies tabular environment; + (2014/03/20): removed extra stuff and left only possibility to break + on page boundary; + added tabular variant from array package; + +* stfloats.sty, v3.2 2016/06/28: + – enriches floats output mechanism; + (2016/06/28): compatibility bugfix with 2015 latexrelease; + +* texsort.sty, v1.1 2012/05/29: + - sorts numerical values; + TODO: extend (rewrite) to support alphanumerical values + for sorting. + +INSTALLATION +============ + +Install in a standard way as any other LaTeX macro package. + +AUTHORS/MAINTAINER +================== + +* Sigitas Tolušis +* Vytas Statulevičius (floatpag.sty) + +DOCUMENTATION +============= + +Please see the sttools.pdf for a package list in collection +and .pdf for particular macro package. + +LICENSE +======= + +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. + + + diff --git a/Master/texmf-dist/doc/latex/sttools/flushend.pdf b/Master/texmf-dist/doc/latex/sttools/flushend.pdf index 0001eeac885..53fa550f671 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/marginal.pdf b/Master/texmf-dist/doc/latex/sttools/marginal.pdf deleted file mode 100644 index 7b437ecec4c..00000000000 Binary files a/Master/texmf-dist/doc/latex/sttools/marginal.pdf and /dev/null differ diff --git a/Master/texmf-dist/doc/latex/sttools/stfloats.pdf b/Master/texmf-dist/doc/latex/sttools/stfloats.pdf index 8cec745a7ae..a8a904a3851 100644 Binary files a/Master/texmf-dist/doc/latex/sttools/stfloats.pdf and b/Master/texmf-dist/doc/latex/sttools/stfloats.pdf differ diff --git a/Master/texmf-dist/doc/latex/sttools/sttools.pdf b/Master/texmf-dist/doc/latex/sttools/sttools.pdf index ca117f4fd29..1bbf7449659 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 e050787f857..ed592669316 100644 --- a/Master/texmf-dist/source/latex/sttools/flushend.dtx +++ b/Master/texmf-dist/source/latex/sttools/flushend.dtx @@ -1,6 +1,6 @@ % \iffalse meta-comment % -% Copyright (C) 2015 by Sigitas Tolu\v{s}is +% Copyright (C) 2016 by Sigitas Tolu\v{s}is % --------------------------------------------------------------------------- % This work may be distributed and/or modified under the % conditions of the LaTeX Project Public License, either version 1.3 @@ -24,7 +24,7 @@ \ProvidesFile{flushend.dtx} % %<*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/ %% -------------------------------------------------------------------------- @@ -42,12 +42,12 @@ %\NeedsTeXFormat{LaTeX2e}[1999/12/01] %\ProvidesPackage{flushend} %<*package> - [2015/04/14 v3.1 Balancing columns in twocolumn mode] + [2016/06/21 v3.2 Balancing columns in twocolumn mode] % % %<*driver> \documentclass{ltxdoc} -\usepackage{flushend}[2015/04/14] +\usepackage{flushend}[2016/06/21] \EnableCrossrefs \CodelineIndex %%\RecordChanges @@ -59,7 +59,7 @@ % % \fi % -% \CheckSum{1737} +% \CheckSum{1738} % % \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 @@ -90,6 +90,7 @@ % spread/nospread, % removelastbox/keeplastbox} % \changes{v3.1}{2015/04/14}{set debug option off by default; keeplastbox modified;} +% \changes{v3.2}{2016/06/21}{bugfix compatibility with luatexja} % % \DoNotIndex{\newcommand,\newenvironment} % @@ -536,7 +537,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/source/latex/sttools/marginal.dtx b/Master/texmf-dist/source/latex/sttools/marginal.dtx deleted file mode 100644 index 4c619ffa2ca..00000000000 --- a/Master/texmf-dist/source/latex/sttools/marginal.dtx +++ /dev/null @@ -1,339 +0,0 @@ -% \iffalse meta-comment -% -% Copyright (C) 2012 by Sigitas Tolu\v{s}is -% --------------------------------------------------------------------------- -% 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. -% -% This work has the LPPL maintenance status `maintained'. -% -% The Current Maintainer of this work is Sigitas Tolu\v{s}is. -% -% This work consists of the files marginal.dtx and marginal.ins -% and the derived filebase marginal.sty. -% -% \fi -% -% \iffalse -%<*driver> -\ProvidesFile{marginal.dtx} -% -%<*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} -%<*package> - [2012/05/29 v1.1 Enlarge free and show lost marginal inserts] -% -% -%<*driver> -\documentclass{ltxdoc} -\usepackage{marginal}[2012/05/29] -%%\EnableCrossrefs -%%\CodelineIndex -\RecordChanges -\begin{document} - \DocInput{marginal.dtx} - %%\PrintChanges - %%\PrintIndex -\end{document} -% -% \fi -% -% \CheckSum{374} -% -% \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 -% Lower-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 -% Digits \0\1\2\3\4\5\6\7\8\9 -% Exclamation \! Double quote \" Hash (number) \# -% Dollar \$ Percent \% Ampersand \& -% Acute accent \' Left paren \( Right paren \) -% Asterisk \* Plus \+ Comma \, -% Minus \- Point \. Solidus \/ -% Colon \: Semicolon \; Less than \< -% Equals \= Greater than \> Question mark \? -% Commercial at \@ Left bracket \[ Backslash \\ -% Right bracket \] Circumflex \^ Underscore \_ -% Grave accent \` Left brace \{ Vertical bar \| -% Right brace \} Tilde \~} -% -% -% \changes{v1.1}{2012/05/29}{Converted to DTX file} -% -% \DoNotIndex{\newcommand,\newenvironment} -% -% \providecommand*{\url}{\texttt} -% \GetFileInfo{marginal.dtx} -% \title{The \textsf{marginal} package} -% \author{Sigitas Tolu\v{s}is \\ \url{sigitas@vtex.lt}} -% \date{\fileversion~from \filedate} -% -% \maketitle -% -% \section{Introduction} -% -% Enlarge free and show lost marginal inserts. -% -% \section{Usage} -% -% \DescribeMacro{\showlostmarginals} -% \indent Outputs lost marginal notes at the left of page. -% -% \medskip -% \DescribeMacro{\enlargefreelist} -% Adds more(34) free inserts to freelist. -% -% \medskip -% \DescribeMacro{\onesidemarginals} -% Outputs marginal notes only on one side. It saves one half -% of the available free inserts. -% -% \StopEventually{} -% -% \section{Implementation} -% -% \iffalse -%<*package> -% \fi -% -% \begin{macrocode} -\newif\if@mparlost \@mparlostfalse -% \end{macrocode} -% -% \begin{macrocode} -\newbox\@mparlostbox -\setbox\@mparlostbox\vbox{} -% \end{macrocode} -% -% \begin{macro}{\@fltovfpar} -% -% \begin{macrocode} -\gdef\@fltovfpar{\global\@mparlosttrue - \@latex@warning{Too many unprocessed (marginal)floats}\relax - } -% \end{macrocode} -% \end{macro} -% -% -% \begin{macro}{\@fltovfmess} -% \begin{macrocode} -\gdef\@fltovfmess{% - \@latex@error{Too many unprocessed floats}\@ehb - } -% \end{macrocode} -% \end{macro} -% -% -% \begin{macro}{\marginpar} -% -% \begin{macrocode} -\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 - } -% \end{macrocode} -% \end{macro} -% -% -% \begin{macro}{\@savemarbox} -% -% \begin{macrocode} -\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 - } -% \end{macrocode} -% \end{macro} -% -% -% \begin{macro}{\showlostmarginals} -% Outputs lost marginal notes at the left of the page. -% \begin{macrocode} -\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 - } -% \end{macrocode} -% \end{macro} -% -% -% \begin{macro}{\enlargefreelist} -% Adds more(34) free inserts to freelist -% \begin{macrocode} -\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 - }% - }% -% \end{macrocode} -% \end{macro} -% -% -% \begin{macro}{\onesidemarginals} -% -%% \onesidemarginals - outputs marginals only on one side -% -% \begin{macrocode} -\def\onesidemarginals{% - \newbox\@marbox -% \end{macrocode} -% \end{macro} -% -% -% \begin{macro}{\@addmarginpar} -% \begin{macrocode} - \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}% - }% -% \end{macrocode} -% \end{macro} -% -% -% \begin{macro}{\marginpar} -% -% \begin{macrocode} - \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 - }% -% \end{macrocode} -% \end{macro} -% -% -% \begin{macro}{\@xmpar} -% -% \begin{macrocode} - \long\gdef\@xmpar[##1]##2{\@savemarbox\@currbox{##2}\@xympar}% -% \end{macrocode} -% \end{macro} -% -% -% \begin{macro}{\@ympar} -% \begin{macrocode} - \long\gdef\@ympar##1{\@savemarbox\@currbox{##1}\@xympar}% -% \end{macrocode} -% \end{macro} -% -% -% \begin{macro}{\@xympar} -% \begin{macrocode} - \def\@xympar{% - \ifnum\@floatpenalty<\z@ \@cons\@currlist\@marbox \fi - \setbox\@tempboxa - \color@vbox - \vbox\bgroup - \end@float - \global\@ignorefalse \@esphack - }% - } -% \end{macrocode} -% \end{macro} -% -% \begin{macrocode} -%\endinput -% \end{macrocode} -% -% \iffalse -% -% \fi -% -% \Finale 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 @@ %\NeedsTeXFormat{LaTeX2e}[1999/12/01] %\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] % % %<*driver> \documentclass{ltxdoc} -\usepackage{stfloats}[2016/02/08] +\usepackage{stfloats}[2016/06/28] \EnableCrossrefs \CodelineIndex \RecordChanges @@ -58,7 +58,7 @@ % % \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} % diff --git a/Master/texmf-dist/source/latex/sttools/sttools.dtx b/Master/texmf-dist/source/latex/sttools/sttools.dtx index c5798f231a5..64cc03bad1b 100644 --- a/Master/texmf-dist/source/latex/sttools/sttools.dtx +++ b/Master/texmf-dist/source/latex/sttools/sttools.dtx @@ -1,6 +1,6 @@ % \iffalse meta-comment % -% Copyright (C) 2015 by Sigitas Tolu\v{s}is +% Copyright (C) 2016 by Sigitas Tolu\v{s}is % --------------------------------------------------------------------------- % This work may be distributed and/or modified under the % conditions of the LaTeX Project Public License, either version 1.3 @@ -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.14} +% \date{2016.06.28} % % \maketitle % @@ -79,22 +79,23 @@ % 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.1 2015/04/14} -- balance page in twocolumn mode; +% \item \textbf{flushend.sty, v3.2 2016/06/21} -- 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; -% \\(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; +% \\(2015/04/14): set debug option off by default; keeplastbox modified; +% \\(2016/06/21): bugfix compatibility with luatexja package}; % \item \textbf{midfloat.sty, v1.1 2012/05/29} -- insert onecolumn stuff in twocolumn % page; \\\texttt{TODO: extend to work on both columns}; % \item \textbf{stabular.sty, v2.0 2014/03/20} -- use modified tabular environment; % \\\texttt{(2014/03/20): removed extra stuff and left only possibility to break % on page boundary; % \\added tabular variant from array package}; -% \item \textbf{stfloats.sty, v1.1 2012/05/29} -- enable enriched floats output mechanism; +% \item \textbf{stfloats.sty, v3.2 2016/06/28} -- enable enriched floats output mechanism; +% \\\texttt{(2016/06/28): compatibility bugfix with 2015 latexrelease}; % \item \textbf{texsort.sty, v1.1 2012/05/29} -- sort numerical values; \\\texttt{TODO: % extend (rewrite) to support alphnanumerical values for sorting}. % \end{itemize} diff --git a/Master/texmf-dist/source/latex/sttools/sttools.ins b/Master/texmf-dist/source/latex/sttools/sttools.ins index 1395ad08617..9c32a854d93 100644 --- a/Master/texmf-dist/source/latex/sttools/sttools.ins +++ b/Master/texmf-dist/source/latex/sttools/sttools.ins @@ -1,4 +1,4 @@ -%% Copyright (C) 2014 by Sigitas Tolu\v{s}is +%% Copyright (C) 2016 by Sigitas Tolu\v{s}is %% -------------------------------------------------------------------------- %% This work may be distributed and/or modified under the %% conditions of the LaTeX Project Public License, either version 1.3 @@ -33,7 +33,6 @@ \SimplePackage{floatpag} \SimplePackage{flushend} \SimplePackage{midfloat} -\SimplePackage{marginal} \SimplePackage{stabular} \SimplePackage{stfloats} \SimplePackage{texsort} 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