diff options
author | Norbert Preining <norbert@preining.info> | 2022-03-09 03:01:03 +0000 |
---|---|---|
committer | Norbert Preining <norbert@preining.info> | 2022-03-09 03:01:03 +0000 |
commit | b23d702a4a177c6d047cd03020e5a0fb7effd88a (patch) | |
tree | 60f860c1b86caf0fa6637b79a3490f642b57c761 /macros/latex/contrib/footmisc | |
parent | b1f3f2681b2bf35570ad11f65270777f38c55f7e (diff) |
CTAN sync 202203090301
Diffstat (limited to 'macros/latex/contrib/footmisc')
-rw-r--r-- | macros/latex/contrib/footmisc/changes.txt | 5 | ||||
-rw-r--r-- | macros/latex/contrib/footmisc/footmisc-code.pdf | bin | 363832 -> 363788 bytes | |||
-rw-r--r-- | macros/latex/contrib/footmisc/footmisc-doc.pdf | bin | 249093 -> 249001 bytes | |||
-rw-r--r-- | macros/latex/contrib/footmisc/footmisc.dtx | 29 |
4 files changed, 23 insertions, 11 deletions
diff --git a/macros/latex/contrib/footmisc/changes.txt b/macros/latex/contrib/footmisc/changes.txt index 8471cde6e0..dc51273e12 100644 --- a/macros/latex/contrib/footmisc/changes.txt +++ b/macros/latex/contrib/footmisc/changes.txt @@ -1,3 +1,8 @@ +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/macros/latex/contrib/footmisc/footmisc-code.pdf b/macros/latex/contrib/footmisc/footmisc-code.pdf Binary files differindex d1428e73fd..affa9e8a4d 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 71f7811af1..d738cb5e0d 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 c3a31d2e6a..bafdb76df3 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/03/07 v6.0c + [2022/03/08 v6.0d %</!debugins> %<package> a miscellany of footnote facilities% %<*dtx> @@ -1865,24 +1865,31 @@ % 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)} +% \changes{v6.0c}{2022/03/07}{Fix an issue in perpage package (gh/03)} +% \changes{v6.0d}{2022/03/07}{Also support optional arg of \cs{MakePerPage} (gh/03)} % \begin{macrocode} \def\@stpelt#1{\global\csname c@#1\endcsname \m@ne \stepcounter{#1}% - \setcounter{#1}{0}% + \pp@fix@MakePerPage{#1}% + } + \def\pp@fix@MakePerPage#1{% + \ifnum \value{#1}>\z@ + \addtocounter{#1}\m@ne\fi } % \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. +% The above code may look a bit odd: the \cs{stepcounter} sets the +% counter to zero and then we alter it if it is not zero. 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 (or to a higher starting value if \cs{MakePerPage} is +% used with an optional argument, which is precisely the problem +% here. By subtracting 1 in that case we set it back to 1 lower +% than the starting value. % -% But to make this fully work we also need to update a suport +% But to make this fully work we also need to update a support % command in \pkg{perpage}: % \begin{macrocode} - \def\pp@cl@end@iii\stepcounter#1\setcounter#2#3{} + \def\pp@cl@end@iii\stepcounter#1\pp@fix@MakePerPage#2{} % \end{macrocode} % % \begin{macrocode} |