summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2022-02-14 21:23:51 +0000
committerKarl Berry <karl@freefriends.org>2022-02-14 21:23:51 +0000
commit7dc67c656695cb1cf618bc583dd53f28fcddbf35 (patch)
tree9aba581bca8ec3342bb973041ecc81c0809ccdee /Master/texmf-dist/tex
parent62e2d0b7f2ea75c2d38bffd1e756a05c9d770626 (diff)
footmisc (14feb22)
git-svn-id: svn://tug.org/texlive/trunk@62025 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex')
-rw-r--r--Master/texmf-dist/tex/latex/footmisc/footmisc.sty63
1 files changed, 46 insertions, 17 deletions
diff --git a/Master/texmf-dist/tex/latex/footmisc/footmisc.sty b/Master/texmf-dist/tex/latex/footmisc/footmisc.sty
index e957609146c..1acee0fcda2 100644
--- a/Master/texmf-dist/tex/latex/footmisc/footmisc.sty
+++ b/Master/texmf-dist/tex/latex/footmisc/footmisc.sty
@@ -41,11 +41,12 @@
\providecommand\DeclareCurrentRelease[2]{}
\DeclareRelease{v5}{2011-06-06}{footmisc-2011-06-06.sty}
-\DeclareCurrentRelease{}{2022-02-10}
+\DeclareCurrentRelease{}{2022-02-14}
\ProvidesPackage{footmisc}%
- [2022/02/10 v6.0a
+ [2022/02/14 v6.0b
a miscellany of footnote facilities%
]
+
\NeedsTeXFormat{LaTeX2e}[2020/10/01]
\newtoks\FN@temptoken
\providecommand\protected@writeaux{%
@@ -96,23 +97,20 @@
\FN@perpagetrue
}
\newif\ifFN@fixskip \FN@fixskipfalse
-\let\FN@ORspacehandling\thr@@
+
+\let\FN@bottomcases\thr@@
+\newif\ifFN@abovefloats \FN@abovefloatstrue
\DeclareOption{bottom}{%
- \let\FN@ORspacehandling\@ne
+ \let\FN@bottomcases\@ne
\FN@abovefloatsfalse
\FN@fixskiptrue
}
-\newif\ifFN@abovefloats \FN@abovefloatstrue
-\DeclareOption{abovefloats}{\FN@abovefloatstrue \FN@fixskiptrue}
-\DeclareOption{belowfloats}{\FN@abovefloatsfalse \FN@fixskiptrue}
\DeclareOption{bottomfloats}{%
- \let\FN@ORspacehandling\tw@
+ \let\FN@bottomcases\tw@
\FN@abovefloatstrue \FN@fixskiptrue
}
-\DeclareOption{bottomfootnotes}{%
- \let\FN@ORspacehandling\tw@
- \FN@abovefloatsfalse \FN@fixskiptrue
-}
+\DeclareOption{abovefloats}{\FN@abovefloatstrue \FN@fixskiptrue}
+\DeclareOption{belowfloats}{\FN@abovefloatsfalse \FN@fixskiptrue}
\DeclareOption{marginal}{%
\footnotemargin-0.8em\relax
}
@@ -263,19 +261,45 @@
\global\setbox\footins\vbox{\FN@makefootnoteparagraph}%
}
\fi
-\ifcase \FN@ORspacehandling\relax
+\def\@if@flushbottom@TF{%
+ \ifx\@textbottom\relax
+ \expandafter\@firstoftwo
+ \else
+ \expandafter\@secondoftwo
+ \fi
+}
+\def\@if@footnotes@TF{%
+ \ifvoid\footins
+ \expandafter\@secondoftwo
+ \else
+ \expandafter\@firstoftwo
+ \fi
+}
+\def\@if@bfloats@TF{%
+ \ifx \@botlist\@empty
+ \expandafter\@secondoftwo
+ \else
+ \expandafter\@firstoftwo
+ \fi
+}
+\ifcase \FN@bottomcases\relax
\ERROR
\or
\ifFN@abovefloats
\def\@makecol@appendblocks {%
- \@outputbox@append{\vfill}%
+ \@if@footnotes@TF
+ {\@outputbox@append{\vfill}}%
+ {\@if@bfloats@TF{\@outputbox@append{\vfill}}%
+ {\@outputbox@reinsertbskip}}%
\@outputbox@appendfootnotes
\@outputbox@attachfloats
}
\else
\def\@makecol@appendblocks {%
- \@outputbox@append{\vfill}%
\@outputbox@attachfloats
+ \@if@footnotes@TF
+ {\@outputbox@append{\vfill}}%
+ {\@outputbox@reinsertbskip}%
\@outputbox@appendfootnotes
}
\fi
@@ -283,13 +307,18 @@
\ifFN@abovefloats
\def\@makecol@appendblocks {%
\@outputbox@appendfootnotes
- \@outputbox@append{\vfill}%
+ \@if@bfloats@TF
+ {\@outputbox@append{\vfill}}%
+ {\@outputbox@reinsertbskip}%
\@outputbox@attachfloats
}
\else
\def\@makecol@appendblocks {%
+ \@if@footnotes@TF
+ {\@outputbox@append{\vfill}}%
+ {\@if@bfloats@TF{\@outputbox@append{\vfill}}%
+ {\@outputbox@reinsertbskip}}%
\@outputbox@attachfloats
- \@outputbox@append{\vfill}%
\@outputbox@appendfootnotes
}
\fi