texlive[41567] Master/texmf-dist: sttools (29jun16)
commits+karl at tug.org
commits+karl at tug.org
Wed Jun 29 23:06:07 CEST 2016
Revision: 41567
http://tug.org/svn/texlive?view=revision&revision=41567
Author: karl
Date: 2016-06-29 23:06:07 +0200 (Wed, 29 Jun 2016)
Log Message:
-----------
sttools (29jun16)
Modified Paths:
--------------
trunk/Master/texmf-dist/doc/latex/sttools/flushend.pdf
trunk/Master/texmf-dist/doc/latex/sttools/stfloats.pdf
trunk/Master/texmf-dist/doc/latex/sttools/sttools.pdf
trunk/Master/texmf-dist/source/latex/sttools/flushend.dtx
trunk/Master/texmf-dist/source/latex/sttools/stfloats.dtx
trunk/Master/texmf-dist/source/latex/sttools/sttools.dtx
trunk/Master/texmf-dist/source/latex/sttools/sttools.ins
trunk/Master/texmf-dist/tex/latex/sttools/flushend.sty
trunk/Master/texmf-dist/tex/latex/sttools/stfloats.sty
Added Paths:
-----------
trunk/Master/texmf-dist/doc/latex/sttools/README.md
Removed Paths:
-------------
trunk/Master/texmf-dist/doc/latex/sttools/README
trunk/Master/texmf-dist/doc/latex/sttools/marginal.pdf
trunk/Master/texmf-dist/source/latex/sttools/marginal.dtx
trunk/Master/texmf-dist/tex/latex/sttools/marginal.sty
Deleted: trunk/Master/texmf-dist/doc/latex/sttools/README
===================================================================
--- trunk/Master/texmf-dist/doc/latex/sttools/README 2016-06-29 16:04:35 UTC (rev 41566)
+++ trunk/Master/texmf-dist/doc/latex/sttools/README 2016-06-29 21:06:07 UTC (rev 41567)
@@ -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 <package>.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.
-
-
-
Added: trunk/Master/texmf-dist/doc/latex/sttools/README.md
===================================================================
--- trunk/Master/texmf-dist/doc/latex/sttools/README.md (rev 0)
+++ trunk/Master/texmf-dist/doc/latex/sttools/README.md 2016-06-29 21:06:07 UTC (rev 41567)
@@ -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 <package>.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.
+
+
+
Property changes on: trunk/Master/texmf-dist/doc/latex/sttools/README.md
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Modified: trunk/Master/texmf-dist/doc/latex/sttools/flushend.pdf
===================================================================
(Binary files differ)
Deleted: trunk/Master/texmf-dist/doc/latex/sttools/marginal.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/sttools/stfloats.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/sttools/sttools.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/source/latex/sttools/flushend.dtx
===================================================================
--- trunk/Master/texmf-dist/source/latex/sttools/flushend.dtx 2016-06-29 16:04:35 UTC (rev 41566)
+++ trunk/Master/texmf-dist/source/latex/sttools/flushend.dtx 2016-06-29 21:06:07 UTC (rev 41567)
@@ -1,6 +1,6 @@
% \iffalse meta-comment
%
-% Copyright (C) 2015 by Sigitas Tolu\v{s}is <sigitas at vtex.lt>
+% Copyright (C) 2016 by Sigitas Tolu\v{s}is <sigitas at vtex.lt>
% ---------------------------------------------------------------------------
% 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}
%</driver>
%<*package>
-%% Copyright (C) 1997-2015 by Sigitas Tolu\v{s}is <sigitas at vtex.lt>
+%% Copyright (C) 1997-2016 by Sigitas Tolu\v{s}is <sigitas at vtex.lt>
%% VTeX Ltd., Mokslinink\k{u} 2a, Vilnius, Lithuania
%% http://www.vtex.lt/tex/download/macros/
%% --------------------------------------------------------------------------
@@ -42,12 +42,12 @@
%<package>\NeedsTeXFormat{LaTeX2e}[1999/12/01]
%<package>\ProvidesPackage{flushend}
%<*package>
- [2015/04/14 v3.1 Balancing columns in twocolumn mode]
+ [2016/06/21 v3.2 Balancing columns in twocolumn mode]
%</package>
%
%<*driver>
\documentclass{ltxdoc}
-\usepackage{flushend}[2015/04/14]
+\usepackage{flushend}[2016/06/21]
\EnableCrossrefs
\CodelineIndex
%%\RecordChanges
@@ -59,7 +59,7 @@
%</driver>
% \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 at a=-1\p@
\fi
\else
- \ifdim\ht\flushend@@tempbox at c>\z@
+ \ifdim\ht\flushend@@tempbox at c<\z@
+ \else
\var@@temp at a=-1\p@
\fi
\fi
Deleted: trunk/Master/texmf-dist/source/latex/sttools/marginal.dtx
===================================================================
--- trunk/Master/texmf-dist/source/latex/sttools/marginal.dtx 2016-06-29 16:04:35 UTC (rev 41566)
+++ trunk/Master/texmf-dist/source/latex/sttools/marginal.dtx 2016-06-29 21:06:07 UTC (rev 41567)
@@ -1,339 +0,0 @@
-% \iffalse meta-comment
-%
-% Copyright (C) 2012 by Sigitas Tolu\v{s}is <sigitas at vtex.lt>
-% ---------------------------------------------------------------------------
-% 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}
-%</driver>
-%<*package>
-%% Copyright (C) 1997-2012 by Sigitas Tolu\v{s}is <sigitas at vtex.lt>
-%% 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.
-%%
-%</package>
-%<package>\NeedsTeXFormat{LaTeX2e}[1999/12/01]
-%<package>\ProvidesPackage{marginal}
-%<*package>
- [2012/05/29 v1.1 Enlarge free and show lost marginal inserts]
-%</package>
-%
-%<*driver>
-\documentclass{ltxdoc}
-\usepackage{marginal}[2012/05/29]
-%%\EnableCrossrefs
-%%\CodelineIndex
-\RecordChanges
-\begin{document}
- \DocInput{marginal.dtx}
- %%\PrintChanges
- %%\PrintIndex
-\end{document}
-%</driver>
-% \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 at 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 at mparlost \@mparlostfalse
-% \end{macrocode}
-%
-% \begin{macrocode}
-\newbox\@mparlostbox
-\setbox\@mparlostbox\vbox{}
-% \end{macrocode}
-%
-% \begin{macro}{\@fltovfpar}
-%
-% \begin{macrocode}
-\gdef\@fltovfpar{\global\@mparlosttrue
- \@latex at warning{Too many unprocessed (marginal)floats}\relax
- }
-% \end{macrocode}
-% \end{macro}
-%
-%
-% \begin{macro}{\@fltovfmess}
-% \begin{macrocode}
-\gdef\@fltovfmess{%
- \@latex at 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 at 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 at vbox
- \vtop{%
- \hsize\marginparwidth
- \@parboxrestore
- \@marginparreset
- #2%
- \global\@minipagefalse
- \outer at nobreak
- }%
- \color at endbox
- \if at 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 at textbottom\@textbottom
- \gdef\@textbottom{%
- \vtop to\z@{%
- \hbox to\z@{\kern-\wd\@mparlostbox
- \vbox to\z@{\kern-\ht\@mparlostbox
- \box\@mparlostbox
- \vfill
- }%
- }%
- }%
- \old at 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 at 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 at option\endcsname}%
- \gdef\@freelist{%
- \@elt\bx at A \@elt\bx at B \@elt\bx at C \@elt\bx at D \@elt\bx at E \@elt\bx at F
- \@elt\bx at G \@elt\bx at H \@elt\bx at I \@elt\bx at J \@elt\bx at K \@elt\bx at L
- \@elt\bx at M \@elt\bx at N \@elt\bx at O \@elt\bx at P \@elt\bx at Q \@elt\bx at R
- \@elt\bx at S \@elt\bx at T \@elt\bx at U \@elt\bx at V \@elt\bx at W \@elt\bx at X
- \@elt\bx at Y \@elt\bx at Z
- \@elt\bx at a \@elt\bx at b \@elt\bx at c \@elt\bx at d \@elt\bx at e \@elt\bx at f
- \@elt\bx at g \@elt\bx at h \@elt\bx at i \@elt\bx at j \@elt\bx at k \@elt\bx at l
- \@elt\bx at m \@elt\bx at n \@elt\bx at o \@elt\bx at p \@elt\bx at q \@elt\bx at r
- \@elt\bx at s \@elt\bx at t \@elt\bx at u \@elt\bx at v \@elt\bx at w \@elt\bx at x
- \@elt\bx at y \@elt\bx at 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 at warning@no at 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 at 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 at 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 at vbox
- \vbox\bgroup
- \end at float
- \global\@ignorefalse \@esphack
- }%
- }
-% \end{macrocode}
-% \end{macro}
-%
-% \begin{macrocode}
-%\endinput
-% \end{macrocode}
-%
-% \iffalse
-%</package>
-% \fi
-%
-% \Finale
Modified: trunk/Master/texmf-dist/source/latex/sttools/stfloats.dtx
===================================================================
--- trunk/Master/texmf-dist/source/latex/sttools/stfloats.dtx 2016-06-29 16:04:35 UTC (rev 41566)
+++ trunk/Master/texmf-dist/source/latex/sttools/stfloats.dtx 2016-06-29 21:06:07 UTC (rev 41567)
@@ -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 at 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 at dbltopnumber
- \global \@dblbotnum \c at dblbotnumber
- \global \@dbltoproom \dbltopfraction\@colht
- \@textmin \@colht
- \advance \@textmin -\@dbltoproom
- \@fpmin \dblfloatpagefraction\textheight
- \@fptop \@dblfptop
- \@fpsep \@dblfpsep
- \@fpbot \@dblfpbot
- \def\f at depth{1sp}%
- }
+\def\@dblfloatplacement{%
+ \global\@dbltopnum\c at dbltopnumber
+ \global\@dblbotnum\c at dblbotnumber
+ \global\@dbltoproom\dbltopfraction\@colht
+ \@textmin\@colht
+ \advance\@textmin -\@dbltoproom
+ \@fpmin\dblfloatpagefraction\textheight
+ \@fptop\@dblfptop
+ \@fpsep\@dblfpsep
+ \@fpbot\@dblfpbot
+ \def\f at depth{1sp}%
+ }
% \end{macrocode}
% \end{macro}
%
@@ -218,12 +219,12 @@
% \begin{macrocode}
\newif\if at before@latex at release
\def\tmp at reserved@a#1/#2/#3\@nil{%
- \ifnum#1<2015\relax
- \@before at latex@releasetrue
- \else
- \@before at latex@releasefalse
- \fi
- }
+ \ifnum #1<2015\relax
+ \@before at latex@releasetrue
+ \else
+ \@before at latex@releasefalse
+ \fi
+ }
\expandafter\tmp at 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 at before@latex at 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 at tempswa
- \@bitor \@currtype \@dbldeferlist
- \if at test
- \else
- \@bitor \@currtype \@dblbotlist
- \if at 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 at ne
- \@cons \@dbltoplist \@currbox
- \@inserttrue
- \fi
- \fi
- \fi
- \fi
- \fi
- \if at 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 at tempswa
+ \@bitor \@currtype \@dbldeferlist
+ \if at test
+ \else
+ \@bitor \@currtype \@dblbotlist
+ \if at 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 at ne
+ \@cons \@dbltoplist \@currbox
+ \@inserttrue
+ \fi
+ \fi
+ \fi
+ \fi
\fi
- \fi
- \if at tempswa
- \@bitor \@currtype \@dbldeferlist
- \if at 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 at ne
- \@cons \@dblbotlist \@currbox
- \@inserttrue
- \fi
- \fi
- \fi
- \fi
- \if at insert
- \else
- \@cons\@dbldeferlist\@currbox
- \fi
- \fi
- \endgroup
- }
+ \if at 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 at tempswa
+ \@bitor \@currtype \@dbldeferlist
+ \if at 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 at ne
+ \@cons \@dblbotlist \@currbox
+ \@inserttrue
+ \fi
+ \fi
+ \fi
+ \fi
+ \if at 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 at fcolmade \fi{\@opcol\@makefcolumn\@deferlist}%
- \if at twocolumn
- \if at firstcolumn
- \xdef\@dbldeferlist{\@dbltoplist\@dblbotlist\@dbldeferlist}%
- \global \let \@dbltoplist \@empty
- \global \let \@dblbotlist \@empty
- \global \@colht \textheight
- \begingroup
- \@dblfloatplacement
- \@makefcolumn\@dbldeferlist
- \@whilesw\if at 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 at fcolmade \fi{\@opcol\@makefcolumn\@deferlist}%
+ \if at twocolumn
+ \if at firstcolumn
+ \xdef\@dbldeferlist{\@dbltoplist\@dblbotlist\@dbldeferlist}%
+ \global \let \@dbltoplist \@empty
+ \global \let \@dblbotlist \@empty
+ \global \@colht \textheight
+ \begingroup
+ \@dblfloatplacement
+ \@makefcolumn\@dbldeferlist
+ \@whilesw\if at 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,7 +376,7 @@
% Newer \LaTeX\ release version from 2015/01/01 support goes here.
%
% \begin{macrocode}
-%%% > 2015 start
+ %%% > 2015 start
% \end{macrocode}
%
%
@@ -382,91 +383,91 @@
% \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 at tempswa
- \@bitor \@currtype \@deferlist
- \@testwrongwidth\@currbox
- \if at test
- \else
- \@bitor \@currtype \@dblbotlist
- \if at 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 at ne
- \@cons \@dbltoplist \@currbox
- \@inserttrue
- \fi
- \fi
- \fi
- \fi
- \fi
- \if at 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 at tempswa
+ \@bitor \@currtype \@deferlist
+ \@testwrongwidth\@currbox
+ \if at test
+ \else
+ \@bitor \@currtype \@dblbotlist
+ \if at 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 at ne
+ \@cons \@dbltoplist \@currbox
+ \@inserttrue
+ \fi
+ \fi
+ \fi
+ \fi
\fi
- \fi
- \if at tempswa
- \@bitor \@currtype \@deferlist
- \@testwrongwidth\@currbox
- \if at 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 at ne
- \@cons \@dblbotlist \@currbox
- \@inserttrue
- \fi
- \fi
- \fi
- \fi
- \if at insert
- \else
- \@cons\@deferlist\@currbox
- \fi
- \fi
- \endgroup
- }
+ \if at 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 at tempswa
+ \@bitor \@currtype \@deferlist
+ \@testwrongwidth\@currbox
+ \if at 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 at ne
+ \@cons \@dblbotlist \@currbox
+ \@inserttrue
+ \fi
+ \fi
+ \fi
+ \fi
+ \if at 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 at test
- \if at 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 at tempswa
- \@bitor\@currtype{\@toplist\@midlist\@botlist\@dblbotlist}%
- \if at 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 at 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 at 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 at ne
- \@cons \@dblbotlist \@currbox
- \@inserttrue
- \fi
- \fi
- \fi
- \fi
- \fi
- \else
- \@bitor\@currtype\@botlist
- \if at test
- \@addtobot
- \else
- \ifodd \count\@currbox
- \advance \@reqcolroom \intextsep
- \ifdim \@colroom>\@reqcolroom
- \global \advance \@colnum \m at ne
- \global \advance \@textfloatsheight \ht\@currbox
- \global \advance \@textfloatsheight 2\intextsep
- \@cons \@midlist \@currbox
- \if at 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 at insert
- \else
- \@addtotoporbot
- \fi
- \fi
- \fi
- \fi
- \fi
- \fi
- \fi
- \if at 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 at test
+ \else
+ \@testwrongwidth\@currbox
+ \if at test
+ \if at 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 at tempswa
+ \@bitor\@currtype{\@toplist\@midlist\@botlist\@dblbotlist}%
+ \if at 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 at 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 at 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 at ne
+ \@cons \@dblbotlist \@currbox
+ \@inserttrue
+ \fi
+ \fi
+ \fi
+ \fi
+ \fi
+ \else
+ \@bitor\@currtype\@botlist
+ \if at test
+ \@addtobot
+ \else
+ \ifodd \count\@currbox
+ \advance \@reqcolroom \intextsep
+ \ifdim \@colroom>\@reqcolroom
+ \global \advance \@colnum \m at ne
+ \global \advance \@textfloatsheight \ht\@currbox
+ \global \advance \@textfloatsheight 2\intextsep
+ \@cons \@midlist \@currbox
+ \if at 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 at insert
+ \else
+ \@addtotoporbot
+ \fi
+ \fi
+ \fi
+ \fi
+ \fi
+ \fi
+ \fi
+ \fi
+ \if at 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 at tempswa
- \@bitor\@currtype{\@midlist\@botlist\@dblbotlist}%
- \if at test
- \else
- \@flupdates \@topnum \@toproom \@toplist
- \@inserttrue
- \fi
- \fi
- \fi
- \fi
- \if at insert
- \else
- \@addtobot
- \fi
-}
+ \def\@addtotoporbot{%
+ \@getfpsbit \tw@
+ \ifodd \@tempcnta
+ \@flsetnum \@topnum
+ \ifnum \@topnum>\z@
+ \@tempswafalse
+ \@flcheckspace \@toproom \@toplist
+ \if at tempswa
+ \@bitor\@currtype{\@midlist\@botlist\@dblbotlist}%
+ \if at test
+ \else
+ \@flupdates \@topnum \@toproom \@toplist
+ \@inserttrue
+ \fi
+ \fi
+ \fi
+ \fi
+ \if at 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 at tempswa
- \@bitor\@currtype{\@dblbotlist}%
- \if at 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 at tempswa
+ \@bitor\@currtype{\@dblbotlist}%
+ \if at 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 at 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 at fcolmade \fi{\@opcol\@makefcolumn\@topbotlist}%
- \if at firstcolumn
- \xdef\@deferlist{\@dbltoplist\@dblbotlist\@deferlist}%
- \global \let \@dbltoplist \@empty
- \global \let \@dblbotlist \@empty
- \global \@colht \textheight
- \begingroup
- \@dblfloatplacement
- \@makefcolumn\@deferlist
- \@whilesw\if at 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 at 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 at fcolmade \fi{\@opcol\@makefcolumn\@deferlist}%
+ \if at twocolumn
+ \if at firstcolumn
+ \xdef\@deferlist{\@dbltoplist\@dblbotlist\@deferlist}%
+ \global \let \@dbltoplist \@empty
+ \global \let \@dblbotlist \@empty
+ \global \@colht \textheight
+ \begingroup
+ \@dblfloatplacement
+ \@makefcolumn\@deferlist
+ \@whilesw\if at 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 at ne
- \dblfigrule
- \fi
- \vskip \dbltextfloatsep
- \unvbox \@outputbox
- }%
-}
+ {%\boxmaxdepth\maxdepth %% probably not needed, CAR
+ \unvbox\@tempboxa\vskip-\dblfloatsep
+ \ifnum \@dbltopnum>\m at 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 at ne
- \dblfigrule
- \fi
- \unvbox\@tempboxa
- \vskip -\dblfloatsep
- }%
-}
+ {%\boxmaxdepth\maxdepth %% probably not needed, CAR
+ \unvbox\@outputbox
+ \vskip \dbltextfloatsep
+ \ifnum \@dblbotnum>\m at ne
+ \dblfigrule
+ \fi
+ \unvbox\@tempboxa
+ \vskip -\dblfloatsep
+ }%
+ }
% \end{macrocode}
% \end{macro}
%
@@ -792,38 +785,38 @@
% \begin{macro}{\fn at makecol}
% Redefined macro |\@makecol| which puts footnotes below the bottom floats.
% \begin{macrocode}
-\gdef \fn at 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 at begingroup
- \normalcolor
- \footnoterule
- \unvbox \footins
- \color at 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 at 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 at begingroup
+ \normalcolor
+ \footnoterule
+ \unvbox \footins
+ \color at 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 at update| is redefined.
% \begin{macrocode}
\def\set at floatfontsize#1#2#3{%
- \@defaultunits\@tempdimb#2pt\relax\@nnil
+ \@defaultunits\@tempdimb#2\p@\relax\@nnil
\edef\f at size{\strip at pt\@tempdimb}%
- \@defaultunits\@tempskipa#3pt\relax\@nnil
+ \@defaultunits\@tempskipa#3\p@\relax\@nnil
\edef\f at baselineskip{\the\@tempskipa}%
\edef\f at linespread{#1}%
\let\baselinestretch\f at linespread
@@ -866,19 +859,19 @@
% \end{macrocode}
% Removes the |\baselineskip| glue in case |\f at linespread| not empty.
% \begin{macrocode}
- \baselineskip\f at linespread\baselineskip
+ \baselineskip\f at 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 at update\relax
+ \advance\@tempskipa by\baselineskip\baselineskip\@tempskipa
+ \normalbaselineskip\baselineskip
+ \setbox\strutbox\hbox{%
+ \vrule\@height.7\baselineskip
+ \@depth.3\baselineskip
+ \@width\z@}%
+ \let\size at 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 at pt\@tempdima}%
- \let\set at fontsize\set@@@fontsize
- }
+ \@tempdima=\baselinestretch\p@
+ \edef\baselinestretch{\strip at pt\@tempdima}%
+ \let\set at fontsize\set@@@fontsize
+ }
% \end{macrocode}
% \end{macro}
%
Modified: trunk/Master/texmf-dist/source/latex/sttools/sttools.dtx
===================================================================
--- trunk/Master/texmf-dist/source/latex/sttools/sttools.dtx 2016-06-29 16:04:35 UTC (rev 41566)
+++ trunk/Master/texmf-dist/source/latex/sttools/sttools.dtx 2016-06-29 21:06:07 UTC (rev 41567)
@@ -1,6 +1,6 @@
% \iffalse meta-comment
%
-% Copyright (C) 2015 by Sigitas Tolu\v{s}is <sigitas at vtex.lt>
+% Copyright (C) 2016 by Sigitas Tolu\v{s}is <sigitas at vtex.lt>
% ---------------------------------------------------------------------------
% 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 at vtex.lt}}
-% \date{2015.04.14}
+% \date{2016.06.28}
%
% \maketitle
%
@@ -79,7 +79,7 @@
% 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;
@@ -86,8 +86,8 @@
% \\(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;
@@ -94,7 +94,8 @@
% \\\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}
Modified: trunk/Master/texmf-dist/source/latex/sttools/sttools.ins
===================================================================
--- trunk/Master/texmf-dist/source/latex/sttools/sttools.ins 2016-06-29 16:04:35 UTC (rev 41566)
+++ trunk/Master/texmf-dist/source/latex/sttools/sttools.ins 2016-06-29 21:06:07 UTC (rev 41567)
@@ -1,4 +1,4 @@
-%% Copyright (C) 2014 by Sigitas Tolu\v{s}is <sigitas at vtex.lt>
+%% Copyright (C) 2016 by Sigitas Tolu\v{s}is <sigitas at vtex.lt>
%% --------------------------------------------------------------------------
%% 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}
Modified: trunk/Master/texmf-dist/tex/latex/sttools/flushend.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/sttools/flushend.sty 2016-06-29 16:04:35 UTC (rev 41566)
+++ trunk/Master/texmf-dist/tex/latex/sttools/flushend.sty 2016-06-29 21:06:07 UTC (rev 41567)
@@ -6,7 +6,7 @@
%%
%% flushend.dtx (with options: `package')
%%
-%% Copyright (C) 1997-2015 by Sigitas Tolu\v{s}is <sigitas at vtex.lt>
+%% Copyright (C) 1997-2016 by Sigitas Tolu\v{s}is <sigitas at vtex.lt>
%% 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 at auto@baselineskip \@auto at baselineskiptrue
\newif\if at ancient@balance at version \@ancient at balance@versionfalse
\newif\if at right@column at spread \@right at column@spreadtrue
@@ -285,7 +285,8 @@
\var@@temp at a=-1\p@
\fi
\else
- \ifdim\ht\flushend@@tempbox at c>\z@
+ \ifdim\ht\flushend@@tempbox at c<\z@
+ \else
\var@@temp at a=-1\p@
\fi
\fi
Deleted: trunk/Master/texmf-dist/tex/latex/sttools/marginal.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/sttools/marginal.sty 2016-06-29 16:04:35 UTC (rev 41566)
+++ trunk/Master/texmf-dist/tex/latex/sttools/marginal.sty 2016-06-29 21:06:07 UTC (rev 41567)
@@ -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 <sigitas at vtex.lt>
-%% 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 at mparlost \@mparlostfalse
-\newbox\@mparlostbox
-\setbox\@mparlostbox\vbox{}
-\gdef\@fltovfpar{\global\@mparlosttrue
- \@latex at warning{Too many unprocessed (marginal)floats}\relax
- }
-\gdef\@fltovfmess{%
- \@latex at 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 at ne}{\@floatpenalty\z@
- \@fltovfmess \def\@currbox{\@tempboxa}\def\@marbox{\@tempboxa}}%
- \fi
- \@ifnextchar[\@xmpar\@ympar
- }
-\long\def\@savemarbox#1#2{%
- \global\setbox#1%
- \color at vbox
- \vtop{%
- \hsize\marginparwidth
- \@parboxrestore
- \@marginparreset
- #2%
- \global\@minipagefalse
- \outer at nobreak
- }%
- \color at endbox
- \if at mparlost
- \global\setbox\@mparlostbox\vbox{\unvbox\@mparlostbox\copy#1}%
- \global\@mparlostfalse
- \fi
- }
-\def\showlostmarginals{%
- \global\let\old at textbottom\@textbottom
- \gdef\@textbottom{%
- \vtop to\z@{%
- \hbox to\z@{\kern-\wd\@mparlostbox
- \vbox to\z@{\kern-\ht\@mparlostbox
- \box\@mparlostbox
- \vfill
- }%
- }%
- }%
- \old at textbottom
- }%
- \global\let\@fltovfmess\@fltovfpar
- }
-\def\enlargefreelist{%
- \@for\curr at 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 at option\endcsname}%
- \gdef\@freelist{%
- \@elt\bx at A \@elt\bx at B \@elt\bx at C \@elt\bx at D \@elt\bx at E \@elt\bx at F
- \@elt\bx at G \@elt\bx at H \@elt\bx at I \@elt\bx at J \@elt\bx at K \@elt\bx at L
- \@elt\bx at M \@elt\bx at N \@elt\bx at O \@elt\bx at P \@elt\bx at Q \@elt\bx at R
- \@elt\bx at S \@elt\bx at T \@elt\bx at U \@elt\bx at V \@elt\bx at W \@elt\bx at X
- \@elt\bx at Y \@elt\bx at Z
- \@elt\bx at a \@elt\bx at b \@elt\bx at c \@elt\bx at d \@elt\bx at e \@elt\bx at f
- \@elt\bx at g \@elt\bx at h \@elt\bx at i \@elt\bx at j \@elt\bx at k \@elt\bx at l
- \@elt\bx at m \@elt\bx at n \@elt\bx at o \@elt\bx at p \@elt\bx at q \@elt\bx at r
- \@elt\bx at s \@elt\bx at t \@elt\bx at u \@elt\bx at v \@elt\bx at w \@elt\bx at x
- \@elt\bx at y \@elt\bx at 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 at warning@no at 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 at 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 at 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 at vbox
- \vbox\bgroup
- \end at float
- \global\@ignorefalse \@esphack
- }%
- }
-\endinput
-%%
-%% End of file `marginal.sty'.
Modified: trunk/Master/texmf-dist/tex/latex/sttools/stfloats.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/sttools/stfloats.sty 2016-06-29 16:04:35 UTC (rev 41566)
+++ trunk/Master/texmf-dist/tex/latex/sttools/stfloats.sty 2016-06-29 21:06:07 UTC (rev 41567)
@@ -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 at dblbotnumber
\setcounter{dblbotnumber}{2}
\def\@dbflt#1{\@ifnextchar[{\@xdblfloat{#1}}{\@xdblfloat{#1}[tbp]}}
-\def \@dblfloatplacement {%
- \global \@dbltopnum \c at dbltopnumber
- \global \@dblbotnum \c at dblbotnumber
- \global \@dbltoproom \dbltopfraction\@colht
- \@textmin \@colht
- \advance \@textmin -\@dbltoproom
- \@fpmin \dblfloatpagefraction\textheight
- \@fptop \@dblfptop
- \@fpsep \@dblfpsep
- \@fpbot \@dblfpbot
- \def\f at depth{1sp}%
- }
+\def\@dblfloatplacement{%
+ \global\@dbltopnum\c at dbltopnumber
+ \global\@dblbotnum\c at dblbotnumber
+ \global\@dbltoproom\dbltopfraction\@colht
+ \@textmin\@colht
+ \advance\@textmin -\@dbltoproom
+ \@fpmin\dblfloatpagefraction\textheight
+ \@fptop\@dblfptop
+ \@fpsep\@dblfpsep
+ \@fpbot\@dblfpbot
+ \def\f at depth{1sp}%
+ }
\newif\if at before@latex at release
\def\tmp at reserved@a#1/#2/#3\@nil{%
- \ifnum#1<2015\relax
- \@before at latex@releasetrue
- \else
- \@before at latex@releasefalse
- \fi
- }
+ \ifnum #1<2015\relax
+ \@before at latex@releasetrue
+ \else
+ \@before at latex@releasefalse
+ \fi
+ }
\expandafter\tmp at reserved@a\fmtversion\@nil
\if at before@latex at 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 at tempswa
- \@bitor \@currtype \@dbldeferlist
- \if at test
- \else
- \@bitor \@currtype \@dblbotlist
- \if at 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 at ne
- \@cons \@dbltoplist \@currbox
- \@inserttrue
- \fi
- \fi
- \fi
- \fi
- \fi
- \if at 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 at tempswa
+ \@bitor \@currtype \@dbldeferlist
+ \if at test
+ \else
+ \@bitor \@currtype \@dblbotlist
+ \if at 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 at ne
+ \@cons \@dbltoplist \@currbox
+ \@inserttrue
+ \fi
+ \fi
+ \fi
+ \fi
\fi
- \fi
- \if at tempswa
- \@bitor \@currtype \@dbldeferlist
- \if at 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 at ne
- \@cons \@dblbotlist \@currbox
- \@inserttrue
- \fi
- \fi
+ \if at 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 at tempswa
+ \@bitor \@currtype \@dbldeferlist
+ \if at 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 at ne
+ \@cons \@dblbotlist \@currbox
+ \@inserttrue
+ \fi
+ \fi
+ \fi
+ \fi
+ \if at 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 at fcolmade \fi{\@opcol\@makefcolumn\@deferlist}%
+ \if at twocolumn
+ \if at firstcolumn
+ \xdef\@dbldeferlist{\@dbltoplist\@dblbotlist\@dbldeferlist}%
+ \global \let \@dbltoplist \@empty
+ \global \let \@dblbotlist \@empty
+ \global \@colht \textheight
+ \begingroup
+ \@dblfloatplacement
+ \@makefcolumn\@dbldeferlist
+ \@whilesw\if at fcolmade \fi{\@outputpage
+ \@makefcolumn\@dbldeferlist}%
+ \endgroup
+ \else
+ \vbox{}\clearpage
+ \fi
+ \fi
+ \else
+ \setbox\@cclv\vbox{\box\@cclv\vfil}%
+ \@makecol\@opcol
+ \clearpage
\fi
- \fi
- \if at 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 at fcolmade \fi{\@opcol\@makefcolumn\@deferlist}%
- \if at twocolumn
- \if at firstcolumn
- \xdef\@dbldeferlist{\@dbltoplist\@dblbotlist\@dbldeferlist}%
- \global \let \@dbltoplist \@empty
- \global \let \@dblbotlist \@empty
- \global \@colht \textheight
- \begingroup
- \@dblfloatplacement
- \@makefcolumn\@dbldeferlist
- \@whilesw\if at 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 at tempswa
- \@bitor \@currtype \@deferlist
- \@testwrongwidth\@currbox
- \if at test
- \else
- \@bitor \@currtype \@dblbotlist
- \if at 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 at ne
- \@cons \@dbltoplist \@currbox
- \@inserttrue
- \fi
- \fi
- \fi
- \fi
- \fi
- \if at 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 at tempswa
+ \@bitor \@currtype \@deferlist
+ \@testwrongwidth\@currbox
+ \if at test
+ \else
+ \@bitor \@currtype \@dblbotlist
+ \if at 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 at ne
+ \@cons \@dbltoplist \@currbox
+ \@inserttrue
+ \fi
+ \fi
+ \fi
+ \fi
\fi
- \fi
- \if at tempswa
- \@bitor \@currtype \@deferlist
- \@testwrongwidth\@currbox
- \if at 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 at ne
- \@cons \@dblbotlist \@currbox
- \@inserttrue
- \fi
- \fi
+ \if at 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 at tempswa
+ \@bitor \@currtype \@deferlist
+ \@testwrongwidth\@currbox
+ \if at 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 at ne
+ \@cons \@dblbotlist \@currbox
+ \@inserttrue
+ \fi
+ \fi
+ \fi
+ \fi
+ \if at 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 at test
+ \else
+ \@testwrongwidth\@currbox
+ \if at test
+ \if at 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 at tempswa
+ \@bitor\@currtype{\@toplist\@midlist\@botlist\@dblbotlist}%
+ \if at 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 at 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 at 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 at ne
+ \@cons \@dblbotlist \@currbox
+ \@inserttrue
+ \fi
+ \fi
+ \fi
+ \fi
+ \fi
+ \else
+ \@bitor\@currtype\@botlist
+ \if at test
+ \@addtobot
+ \else
+ \ifodd \count\@currbox
+ \advance \@reqcolroom \intextsep
+ \ifdim \@colroom>\@reqcolroom
+ \global \advance \@colnum \m at ne
+ \global \advance \@textfloatsheight \ht\@currbox
+ \global \advance \@textfloatsheight 2\intextsep
+ \@cons \@midlist \@currbox
+ \if at 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 at insert
+ \else
+ \@addtotoporbot
+ \fi
+ \fi
+ \fi
+ \fi
+ \fi
+ \fi
+ \fi
\fi
- \fi
- \if at 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 at test
- \if at 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 at tempswa
- \@bitor\@currtype{\@toplist\@midlist\@botlist\@dblbotlist}%
- \if at 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 at 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 at 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 at ne
- \@cons \@dblbotlist \@currbox
- \@inserttrue
- \fi
- \fi
- \fi
- \fi
- \fi
- \else
- \@bitor\@currtype\@botlist
- \if at test
- \@addtobot
- \else
- \ifodd \count\@currbox
- \advance \@reqcolroom \intextsep
- \ifdim \@colroom>\@reqcolroom
- \global \advance \@colnum \m at ne
- \global \advance \@textfloatsheight \ht\@currbox
- \global \advance \@textfloatsheight 2\intextsep
- \@cons \@midlist \@currbox
- \if at 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 at insert
- \else
- \@addtotoporbot
- \fi
- \fi
- \fi
- \fi
- \fi
- \fi
- \fi
- \if at insert
- \else
- \@resethfps
- \@cons\@deferlist\@currbox
- \fi
-}%
-\def \@addtotoporbot {%
- \@getfpsbit \tw@
- \ifodd \@tempcnta
- \@flsetnum \@topnum
- \ifnum \@topnum>\z@
- \@tempswafalse
- \@flcheckspace \@toproom \@toplist
- \if at tempswa
- \@bitor\@currtype{\@midlist\@botlist\@dblbotlist}%
- \if at test
- \else
- \@flupdates \@topnum \@toproom \@toplist
- \@inserttrue
- \fi
- \fi
- \fi
- \fi
- \if at insert
- \else
- \@addtobot
- \fi
-}
-\def \@addtobot {%
- \@getfpsbit 4\relax
- \ifodd \@tempcnta
- \@flsetnum \@botnum
- \ifnum \@botnum>\z@
- \@tempswafalse
- \@flcheckspace \@botroom \@botlist
- \if at tempswa
- \@bitor\@currtype{\@dblbotlist}%
- \if at 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 at 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 at fcolmade \fi{\@opcol\@makefcolumn\@topbotlist}%
- \if at firstcolumn
- \xdef\@deferlist{\@dbltoplist\@dblbotlist\@deferlist}%
- \global \let \@dbltoplist \@empty
- \global \let \@dblbotlist \@empty
- \global \@colht \textheight
- \begingroup
- \@dblfloatplacement
- \@makefcolumn\@deferlist
- \@whilesw\if at 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 at fcolmade \fi{\@opcol\@makefcolumn\@deferlist}%
- \fi
- \else
- \setbox\@cclv\vbox{\box\@cclv\vfil}%
- \@makecol\@opcol
- \clearpage
- \fi
- }
-%%% > 2015 end
+ \if at insert
+ \else
+ \@resethfps
+ \@cons\@deferlist\@currbox
+ \fi
+ }%
+ \def\@addtotoporbot{%
+ \@getfpsbit \tw@
+ \ifodd \@tempcnta
+ \@flsetnum \@topnum
+ \ifnum \@topnum>\z@
+ \@tempswafalse
+ \@flcheckspace \@toproom \@toplist
+ \if at tempswa
+ \@bitor\@currtype{\@midlist\@botlist\@dblbotlist}%
+ \if at test
+ \else
+ \@flupdates \@topnum \@toproom \@toplist
+ \@inserttrue
+ \fi
+ \fi
+ \fi
+ \fi
+ \if at insert
+ \else
+ \@addtobot
+ \fi
+ }
+ \def\@addtobot{%
+ \@getfpsbit 4\relax
+ \ifodd \@tempcnta
+ \@flsetnum \@botnum
+ \ifnum \@botnum>\z@
+ \@tempswafalse
+ \@flcheckspace \@botroom \@botlist
+ \if at tempswa
+ \@bitor\@currtype{\@dblbotlist}%
+ \if at 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 at fcolmade \fi{\@opcol\@makefcolumn\@deferlist}%
+ \if at twocolumn
+ \if at firstcolumn
+ \xdef\@deferlist{\@dbltoplist\@dblbotlist\@deferlist}%
+ \global \let \@dbltoplist \@empty
+ \global \let \@dblbotlist \@empty
+ \global \@colht \textheight
+ \begingroup
+ \@dblfloatplacement
+ \@makefcolumn\@deferlist
+ \@whilesw\if at 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 at ne
- \dblfigrule
- \fi
- \vskip \dbltextfloatsep
- \unvbox \@outputbox
- }%
-}
+ {%\boxmaxdepth\maxdepth %% probably not needed, CAR
+ \unvbox\@tempboxa\vskip-\dblfloatsep
+ \ifnum \@dbltopnum>\m at 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 at ne
- \dblfigrule
- \fi
- \unvbox\@tempboxa
- \vskip -\dblfloatsep
- }%
-}
+ {%\boxmaxdepth\maxdepth %% probably not needed, CAR
+ \unvbox\@outputbox
+ \vskip \dbltextfloatsep
+ \ifnum \@dblbotnum>\m at ne
+ \dblfigrule
+ \fi
+ \unvbox\@tempboxa
+ \vskip -\dblfloatsep
+ }%
+ }
\global\let\org at makecol\@makecol
-\gdef \fn at 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 at begingroup
- \normalcolor
- \footnoterule
- \unvbox \footins
- \color at 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 at 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 at begingroup
+ \normalcolor
+ \footnoterule
+ \unvbox \footins
+ \color at 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 at makecol}
\def\fnunderfloat{\global\let\@makecol\org at makecol}
\def\set at floatfontsize#1#2#3{%
- \@defaultunits\@tempdimb#2pt\relax\@nnil
+ \@defaultunits\@tempdimb#2\p@\relax\@nnil
\edef\f at size{\strip at pt\@tempdimb}%
- \@defaultunits\@tempskipa#3pt\relax\@nnil
+ \@defaultunits\@tempskipa#3\p@\relax\@nnil
\edef\f at baselineskip{\the\@tempskipa}%
\edef\f at linespread{#1}%
\let\baselinestretch\f at linespread
@@ -572,23 +564,23 @@
\baselineskip\f at baselineskip
\@tempskipa\baselineskip\relax\baselineskip=1\baselineskip
\advance\@tempskipa by-\baselineskip\baselineskip\f at baselineskip
- \baselineskip\f at linespread\baselineskip
- \advance\@tempskipa by\baselineskip\baselineskip\@tempskipa
- \normalbaselineskip\baselineskip
- \setbox\strutbox\hbox{%
- \vrule\@height.7\baselineskip
- \@depth.3\baselineskip
- \@width\z@}%
- \let\size at update\relax
+ \baselineskip\f at linespread\baselineskip
+ \advance\@tempskipa by\baselineskip\baselineskip\@tempskipa
+ \normalbaselineskip\baselineskip
+ \setbox\strutbox\hbox{%
+ \vrule\@height.7\baselineskip
+ \@depth.3\baselineskip
+ \@width\z@}%
+ \let\size at update\relax
}%
- }
+ }
\let\set@@@fontsize\set at fontsize
\def\setbaselinefloat{\let\set at fontsize\set at floatfontsize}
\def\setbaselinefixed{%
- \@tempdima=\baselinestretch\p@
- \edef\baselinestretch{\strip at pt\@tempdima}%
- \let\set at fontsize\set@@@fontsize
- }
+ \@tempdima=\baselinestretch\p@
+ \edef\baselinestretch{\strip at pt\@tempdima}%
+ \let\set at fontsize\set@@@fontsize
+ }
\endinput
%%
%% End of file `stfloats.sty'.
More information about the tex-live-commits
mailing list