diff options
Diffstat (limited to 'macros/latex/contrib/footmisc')
| -rw-r--r-- | macros/latex/contrib/footmisc/changes.txt | 9 | ||||
| -rw-r--r-- | macros/latex/contrib/footmisc/footmisc-code.pdf | bin | 363566 -> 363832 bytes | |||
| -rw-r--r-- | macros/latex/contrib/footmisc/footmisc-doc.pdf | bin | 249496 -> 249093 bytes | |||
| -rw-r--r-- | macros/latex/contrib/footmisc/footmisc.dtx | 40 |
4 files changed, 42 insertions, 7 deletions
diff --git a/macros/latex/contrib/footmisc/changes.txt b/macros/latex/contrib/footmisc/changes.txt index b5389c24db..8471cde6e0 100644 --- a/macros/latex/contrib/footmisc/changes.txt +++ b/macros/latex/contrib/footmisc/changes.txt @@ -1,8 +1,15 @@ +2022-03-07 Frank Mittelbach <Frank.Mittelbach@latex-project.org> + + * footmisc.dtx (subsection{The other footnote commands}): + Fix an issue in the perpage package (gh/03) + Footnotes on chapter pages in report/book class started with 2. + This should really be fixed in the perpage package. + 2022-02-14 Frank Mittelbach <Frank.Mittelbach@latex-project.org> * footmisc.dtx: Corrected the "bottom" option so that it behaves like in v5. Dropped - "bottomfloats" because everxything can be expressed with combinations + "bottomfootnotes", because everything can be expressed with combinations of the four options "bottom" (footnotes at the bottom), "bottomfloats", "abovefloats", and "belowfloats". (gh/1) diff --git a/macros/latex/contrib/footmisc/footmisc-code.pdf b/macros/latex/contrib/footmisc/footmisc-code.pdf Binary files differindex 3707200bb3..d1428e73fd 100644 --- a/macros/latex/contrib/footmisc/footmisc-code.pdf +++ b/macros/latex/contrib/footmisc/footmisc-code.pdf diff --git a/macros/latex/contrib/footmisc/footmisc-doc.pdf b/macros/latex/contrib/footmisc/footmisc-doc.pdf Binary files differindex 93f3d0f8ce..71f7811af1 100644 --- a/macros/latex/contrib/footmisc/footmisc-doc.pdf +++ b/macros/latex/contrib/footmisc/footmisc-doc.pdf diff --git a/macros/latex/contrib/footmisc/footmisc.dtx b/macros/latex/contrib/footmisc/footmisc.dtx index 2a9ea7bc13..c3a31d2e6a 100644 --- a/macros/latex/contrib/footmisc/footmisc.dtx +++ b/macros/latex/contrib/footmisc/footmisc.dtx @@ -38,7 +38,7 @@ %<+package>\DeclareCurrentRelease{}{2022-02-14} %<package>\ProvidesPackage{footmisc}% %<*!debugins> - [2022/02/14 v6.0b + [2022/03/07 v6.0c %</!debugins> %<package> a miscellany of footnote facilities% %<*dtx> @@ -410,8 +410,8 @@ % % This is automatically corrected if \pkg{footmisc} is loaded with any % of the options that deal with footnote placement, i.e., -% \texttt{abovefloats}, \texttt{belowfloats}, \texttt{bottom}, -% \texttt{bottomfloats}, or \texttt{bottomfootnotes}. In particular, +% \texttt{abovefloats}, \texttt{belowfloats}, \texttt{bottom}, or +% \texttt{bottomfloats}. In particular, % if you want to have the standard \LaTeX{} placement (but with this % strange behavior fixed, apply \texttt{abovefloats} (which is the % normal order but with the bug fixed). @@ -420,7 +420,7 @@ % \subsection{Option \texttt{marginal}} % % This option adjusts the position of footnote mark relative to the -% start of the line in which they appear (the the option is +% start of the line in which they appear (the option is % incompatible with option \texttt{para}, for obvious reasons). % % When this option is in effect, the footnote is set @@ -443,7 +443,7 @@ % This option sets the footnote mark flush with the margin, and makes % the body of the footnote hang at an indentation of % \cs{footnotemargin} (if that is a positive distance), or the width -% of the marker (if \cs{footnotemargin}$\leq0$). The option code +% of the marker (if \cs{footnotemargin} $\leq0$). The option code % itself leaves \cs{footnotemargin} at its default value of 1.8em. % % The footnote itself may of course be longer than one paragraph; if @@ -873,7 +873,7 @@ % % \subsubsection{The \texttt{bottomfloats} option} % -% \begin{macro}{ds@bottomfloats,ds@bottomfootnotes} +% \begin{macro}{ds@bottomfloats} % This option is for case 2. By default the footnotes are above % (close to the text). % \begin{macrocode} @@ -1858,6 +1858,34 @@ \ifFN@perpage \RequirePackage{perpage} \MakePerPage{footnote} +% \end{macrocode} +% Unfortunately \pkg{perpage} has a bug and doesn't handle founters +% correctly which are part of a reset list of another counter, +% e.g., it doesn't work correctly if you use the report class which +% resets footnotes at each chapter start. As a result the first +% footnote on the first page of a chapter starts with 2. We +% therefore alter one \LaTeX{} internal if \pkg{perpage} is in use: +% \changes{v6.0c}{2022/03/07}{Fix an issue in perpage packag (gh/03)} +% \begin{macrocode} + \def\@stpelt#1{\global\csname c@#1\endcsname \m@ne + \stepcounter{#1}% + \setcounter{#1}{0}% + } +% \end{macrocode} +% The above code may look a bit odd: the \cs{stepcounter} sets +% the counter to zero and then the \cs{setcounter} does the +% same. The reason is that \cs{stepcounter} resets other counters +% and when perpage is loaded this results in updating counters on +% the reset list to 1, which is precisely the problem here. So +% the second \cs{setcounter} undoes this if it happens. +% +% But to make this fully work we also need to update a suport +% command in \pkg{perpage}: +% \begin{macrocode} + \def\pp@cl@end@iii\stepcounter#1\setcounter#2#3{} +% \end{macrocode} +% +% \begin{macrocode} \fi % \end{macrocode} % |