summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2023-05-27 20:23:03 +0000
committerKarl Berry <karl@freefriends.org>2023-05-27 20:23:03 +0000
commit418f9e6faf1f09fcfb5efd02b2030bcea23ddec3 (patch)
tree40ab17367d8ab42fe64d9af71cf5660652e415d0
parentf5b0a7d3bc3455052dc96c5f181319310910e593 (diff)
footmisc (27may23)
git-svn-id: svn://tug.org/texlive/trunk@67232 c570f23f-e606-0410-a88d-b1316a301751
-rw-r--r--Master/texmf-dist/doc/latex/footmisc/changes.txt7
-rw-r--r--Master/texmf-dist/doc/latex/footmisc/footmisc-code.pdfbin363788 -> 365983 bytes
-rw-r--r--Master/texmf-dist/doc/latex/footmisc/footmisc-doc.pdfbin249001 -> 250295 bytes
-rw-r--r--Master/texmf-dist/source/latex/footmisc/footmisc.dtx17
-rw-r--r--Master/texmf-dist/tex/latex/footmisc/footmisc.sty6
5 files changed, 19 insertions, 11 deletions
diff --git a/Master/texmf-dist/doc/latex/footmisc/changes.txt b/Master/texmf-dist/doc/latex/footmisc/changes.txt
index dc51273e127..6e75e6a932c 100644
--- a/Master/texmf-dist/doc/latex/footmisc/changes.txt
+++ b/Master/texmf-dist/doc/latex/footmisc/changes.txt
@@ -1,8 +1,13 @@
+2023-05-26 Frank Mittelbach <Frank.Mittelbach@latex-project.org>
+
+ * footmisc.dtx (subsection{The output routine configuration components}):
+ Fix an incompatibility with marginfix package (gh/10)
+
2022-03-08 Frank Mittelbach <Frank.Mittelbach@latex-project.org>
* footmisc.dtx (subsection{The other footnote commands}):
Also support optional arg of \cs{MakePerPage} (gh/03)
-
+
2022-03-07 Frank Mittelbach <Frank.Mittelbach@latex-project.org>
* footmisc.dtx (subsection{The other footnote commands}):
diff --git a/Master/texmf-dist/doc/latex/footmisc/footmisc-code.pdf b/Master/texmf-dist/doc/latex/footmisc/footmisc-code.pdf
index affa9e8a4d1..e92f075688d 100644
--- a/Master/texmf-dist/doc/latex/footmisc/footmisc-code.pdf
+++ b/Master/texmf-dist/doc/latex/footmisc/footmisc-code.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/footmisc/footmisc-doc.pdf b/Master/texmf-dist/doc/latex/footmisc/footmisc-doc.pdf
index d738cb5e0dd..ac9b567fb4f 100644
--- a/Master/texmf-dist/doc/latex/footmisc/footmisc-doc.pdf
+++ b/Master/texmf-dist/doc/latex/footmisc/footmisc-doc.pdf
Binary files differ
diff --git a/Master/texmf-dist/source/latex/footmisc/footmisc.dtx b/Master/texmf-dist/source/latex/footmisc/footmisc.dtx
index bafdb76df3a..4df11e32c4f 100644
--- a/Master/texmf-dist/source/latex/footmisc/footmisc.dtx
+++ b/Master/texmf-dist/source/latex/footmisc/footmisc.dtx
@@ -1,7 +1,7 @@
% \iffalse meta-comment
%
%% File: footmisc.dtx (C) Copyright 1995-2011 Robin Fairbairns
-%% (C) Copyright 2018-2022 Frank Mittelbach
+%% (C) Copyright 2018-2023 Frank Mittelbach
%
% It may be distributed and/or modified under the conditions of the
% LaTeX Project Public License (LPPL), either version 1.3c of this
@@ -38,7 +38,7 @@
%<+package>\DeclareCurrentRelease{}{2022-02-14}
%<package>\ProvidesPackage{footmisc}%
%<*!debugins>
- [2022/03/08 v6.0d
+ [2023/05/26 v6.0e
%</!debugins>
%<package> a miscellany of footnote facilities%
%<*dtx>
@@ -145,7 +145,7 @@
% In 2022 a few new options (\texttt{abovefloats},
% \texttt{belowfloats}, and \texttt{bottomfloats}
% got introduced and the package now works
-% with \textsf{hyperref} regardless of loading order. There arem
+% with \textsf{hyperref} regardless of loading order. There are
% however, still a few restrictions when using both packages together,
% in particular the \texttt{multiple} option does not fully work.
%
@@ -294,7 +294,7 @@
% \end{center}
% Defined this way, the symbol set produces a ``counter too large''
% error; a robust version of the set (cf.~the \texttt{symbol*} option
-% (see \ref{doc-symbol*}) using the \cs{DefineFNsymbols} command
+% (see \ref{doc-symbol*})) is established by using the \cs{DefineFNsymbols} command
% without the optional |*|.
% You may select a set of symbols by use of the \cs{setfnsymbol}
% command; so to restore use of the default set, you would type:
@@ -303,7 +303,7 @@
% \end{center}
%
% This package defines a small selection of alternative sets of
-% symbols, using \cs{DefineFNsymbol}:
+% symbols, using \cs{DefineFNsymbols}:
% \begin{center}
% \begin{tabular}{ll}
% \texttt{bringhurst} & $*\,\dagger\,\ddagger\,\S\,\|\,\P$ \\
@@ -1240,7 +1240,7 @@
% \cs{@makecol@appendblocks}.
%
%
-% \begin{macro}{@outputbox@append}
+% \begin{macro}{\@outputbox@append}
%
% This general purpose command alters the \cs{@outputbox} box by
% appending material to it. As this is a box typesetting operation
@@ -1308,8 +1308,11 @@
% Attaching top and bottom floats can usually be done in one go,
% but for special layouts we might want more control so we provide
% also separate commands.
+% There are packages out there that patch \cs{@combinefloats} so we
+% are careful to call it rather than give it a new name.
+% \changes{v6.0e}{2023/05/26}{Fix an incompatibility with marginfix package (gh/10)}
% \begin{macrocode}
-\let \@outputbox@attachfloats \@combinefloats
+\def \@outputbox@attachfloats {\@combinefloats}
% \end{macrocode}
%
% \begin{macrocode}
diff --git a/Master/texmf-dist/tex/latex/footmisc/footmisc.sty b/Master/texmf-dist/tex/latex/footmisc/footmisc.sty
index 04c35db2a91..6146d8993cb 100644
--- a/Master/texmf-dist/tex/latex/footmisc/footmisc.sty
+++ b/Master/texmf-dist/tex/latex/footmisc/footmisc.sty
@@ -35,7 +35,7 @@
%% where one can also log issues in case there are any.
%%
%% File: footmisc.dtx (C) Copyright 1995-2011 Robin Fairbairns
-%% (C) Copyright 2018-2022 Frank Mittelbach
+%% (C) Copyright 2018-2023 Frank Mittelbach
\NeedsTeXFormat{LaTeX2e}
\providecommand\DeclareRelease[3]{}
\providecommand\DeclareCurrentRelease[2]{}
@@ -43,7 +43,7 @@
\DeclareRelease{v5}{2011-06-06}{footmisc-2011-06-06.sty}
\DeclareCurrentRelease{}{2022-02-14}
\ProvidesPackage{footmisc}%
- [2022/03/08 v6.0d
+ [2023/05/26 v6.0e
a miscellany of footnote facilities%
]
@@ -242,7 +242,7 @@
}%
\fi
}
-\let \@outputbox@attachfloats \@combinefloats
+\def \@outputbox@attachfloats {\@combinefloats}
\def \@outputbox@attachtopfloats {%
\ifx \@toplist\@empty \else \@cflt \fi
}