[latex3-commits] [git/LaTeX3-latex3-latex2e] OR-lab: update to footmisc 6.0b (6ac16bca)

[Frank Mittelbach]

Repository : https://github.com/latex3/latex2e
On branch  : OR-lab
Link       : https://github.com/latex3/latex2e/commit/6ac16bca2451a046a8fbbca0f03fba2b97f80fcd

>---------------------------------------------------------------

commit 6ac16bca2451a046a8fbbca0f03fba2b97f80fcd
Author: Frank Mittelbach <frank.mittelbach at latex-project.org>
Date:   Mon Feb 14 20:14:43 2022 +0100

    update to footmisc 6.0b


>---------------------------------------------------------------

6ac16bca2451a046a8fbbca0f03fba2b97f80fcd
 required/latex-lab/latex-lab-new-or.dtx | 106 ++++++++++++++++++++++++--------
 1 file changed, 79 insertions(+), 27 deletions(-)

diff --git a/required/latex-lab/latex-lab-new-or.dtx b/required/latex-lab/latex-lab-new-or.dtx
index 96d2ebc9..f26e0823 100644
--- a/required/latex-lab/latex-lab-new-or.dtx
+++ b/required/latex-lab/latex-lab-new-or.dtx
@@ -386,6 +386,51 @@
 %
 %
 %
+% \fmi{Some temp interfaces until configuration points are available.}
+%
+%  \begin{macro}{\@if at flushbottom@TF}
+%    Test for \cs{flushbottom} (currently not used).
+%    \begin{macrocode}
+\def\@if at flushbottom@TF{%
+  \ifx\@textbottom\relax
+    \expandafter\@firstoftwo
+  \else
+    \expandafter\@secondoftwo
+  \fi
+}
+%    \end{macrocode}
+%  \end{macro}
+%
+%
+%  \begin{macro}{\@if at footnotes@TF}
+%    Test if footnotes are present on the current page.
+%    \begin{macrocode}
+\def\@if at footnotes@TF{%
+  \ifvoid\footins
+    \expandafter\@secondoftwo
+  \else
+    \expandafter\@firstoftwo
+  \fi
+}
+%    \end{macrocode}
+%  \end{macro}
+%
+%
+%  \begin{macro}{\@if at bfloats@TF}
+%    Test if bottom floats are around.
+%    \begin{macrocode}
+\def\@if at bfloats@TF{%
+  \ifx \@botlist\@empty
+    \expandafter\@secondoftwo
+  \else
+    \expandafter\@firstoftwo
+  \fi
+}
+%    \end{macrocode}
+%  \end{macro}
+%
+%
+%
 % \subsection{The \cs{@makecol} configuration}
 %
 %
@@ -427,7 +472,7 @@
 %<*footmisc>
 %%
 %% Copyright (c) 1995-2011 Robin Fairbairns
-%% Copyright (c) 2018 Robin Fairbairns, Frank Mittelbach
+%% Copyright (c) 2018-2022 Robin Fairbairns, Frank Mittelbach
 %% 
 %% This file is part of the `latex-lab Bundle'.
 %% --------------------------------------------
@@ -436,9 +481,9 @@
 %% conditions of the LaTeX Project Public License, either version 1.3c
 %% 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
+%%    https://www.latex-project.org/lppl.txt
 %% and version 1.3c or later is part of all distributions of LaTeX
-%% version 2005/12/01 or later.
+%% version 2008 or later.
 %% 
 %% This work has the LPPL maintenance status 'maintained'.
 %% 
@@ -450,11 +495,12 @@
 \providecommand\DeclareCurrentRelease[2]{}
 
 \DeclareRelease{v5}{2011-06-06}{footmisc-2011-06-06.sty}
-\DeclareCurrentRelease{}{2022-02-01}
-\ProvidesPackage{latex-lab-footmisc}%
-        [2022/02/01 v6.0a
+\DeclareCurrentRelease{}{2022-02-14}
+\ProvidesPackage{footmisc}%
+        [2022/02/14 v6.0b
      a miscellany of footnote facilities%
                    ]
+
 \NeedsTeXFormat{LaTeX2e}[2020/10/01]
 \newtoks\FN at temptoken
 \providecommand\protected at writeaux{%
@@ -505,23 +551,20 @@
   \FN at perpagetrue
 }
 \newif\ifFN at fixskip      \FN at fixskipfalse
-\let\FN at ORspacehandling\thr@@
+
+\let\FN at bottomcases\thr@@
+\newif\ifFN at abovefloats  \FN at abovefloatstrue
 \DeclareOption{bottom}{%
-  \let\FN at ORspacehandling\@ne
+  \let\FN at bottomcases\@ne
   \FN at abovefloatsfalse
   \FN at fixskiptrue
 }
-\newif\ifFN at abovefloats  \FN at abovefloatstrue
-\DeclareOption{abovefloats}{\FN at abovefloatstrue  \FN at fixskiptrue}
-\DeclareOption{belowfloats}{\FN at abovefloatsfalse \FN at fixskiptrue}
 \DeclareOption{bottomfloats}{%
-  \let\FN at ORspacehandling\tw@
+  \let\FN at bottomcases\tw@
   \FN at abovefloatstrue \FN at fixskiptrue
 }
-\DeclareOption{bottomfootnotes}{%
-  \let\FN at ORspacehandling\tw@
-  \FN at abovefloatsfalse \FN at fixskiptrue
-}
+\DeclareOption{abovefloats}{\FN at abovefloatstrue  \FN at fixskiptrue}
+\DeclareOption{belowfloats}{\FN at abovefloatsfalse \FN at fixskiptrue}
 \DeclareOption{marginal}{%
   \footnotemargin-0.8em\relax
 }
@@ -601,25 +644,29 @@
   \let\@outputbox at removebskip \relax
   \let\@outputbox at reinsertbskip\relax
 \fi
-
-\ifFN at para
-  \def\@makecol at preparefootinshook {%
-     \global\setbox\footins\vbox{\FN at makefootnoteparagraph}%
-    }
-\fi
-\ifcase \FN at ORspacehandling\relax
+%    \end{macrocode}
+%
+%
+%
+%    \begin{macrocode}
+\ifcase \FN at bottomcases\relax
 \ERROR
 \or
   \ifFN at abovefloats
     \def\@makecol at appendblocks {%
-       \@outputbox at append{\vfill}%
+       \@if at footnotes@TF
+          {\@outputbox at append{\vfill}}%
+          {\@if at bfloats@TF{\@outputbox at append{\vfill}}%
+                          {\@outputbox at reinsertbskip}}%
        \@outputbox at appendfootnotes
        \@outputbox at attachfloats
       }
   \else
     \def\@makecol at appendblocks {%
-       \@outputbox at append{\vfill}%
        \@outputbox at attachfloats
+       \@if at footnotes@TF
+          {\@outputbox at append{\vfill}}%
+          {\@outputbox at reinsertbskip}%
        \@outputbox at appendfootnotes
     }
   \fi
@@ -627,13 +674,18 @@
   \ifFN at abovefloats
      \def\@makecol at appendblocks {%
         \@outputbox at appendfootnotes
-        \@outputbox at append{\vfill}%
+        \@if at bfloats@TF
+            {\@outputbox at append{\vfill}}%
+            {\@outputbox at reinsertbskip}%
         \@outputbox at attachfloats
      }
   \else
      \def\@makecol at appendblocks {%
+       \@if at footnotes@TF
+          {\@outputbox at append{\vfill}}%
+          {\@if at bfloats@TF{\@outputbox at append{\vfill}}%
+                          {\@outputbox at reinsertbskip}}%
         \@outputbox at attachfloats
-        \@outputbox at append{\vfill}%
         \@outputbox at appendfootnotes
      }
   \fi