diff options
Diffstat (limited to 'Master')
| -rw-r--r-- | Master/texmf-dist/doc/latex/footmisc/changes.txt | 5 | ||||
| -rw-r--r-- | Master/texmf-dist/doc/latex/footmisc/footmisc-code.pdf | bin | 363832 -> 363788 bytes | |||
| -rw-r--r-- | Master/texmf-dist/doc/latex/footmisc/footmisc-doc.pdf | bin | 249093 -> 249001 bytes | |||
| -rw-r--r-- | Master/texmf-dist/source/latex/footmisc/footmisc.dtx | 29 | ||||
| -rw-r--r-- | Master/texmf-dist/tex/latex/footmisc/footmisc.sty | 10 |
5 files changed, 30 insertions, 14 deletions
diff --git a/Master/texmf-dist/doc/latex/footmisc/changes.txt b/Master/texmf-dist/doc/latex/footmisc/changes.txt index 8471cde6e07..dc51273e127 100644 --- a/Master/texmf-dist/doc/latex/footmisc/changes.txt +++ b/Master/texmf-dist/doc/latex/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/Master/texmf-dist/doc/latex/footmisc/footmisc-code.pdf b/Master/texmf-dist/doc/latex/footmisc/footmisc-code.pdf Binary files differindex d1428e73fde..affa9e8a4d1 100644 --- a/Master/texmf-dist/doc/latex/footmisc/footmisc-code.pdf +++ b/Master/texmf-dist/doc/latex/footmisc/footmisc-code.pdf diff --git a/Master/texmf-dist/doc/latex/footmisc/footmisc-doc.pdf b/Master/texmf-dist/doc/latex/footmisc/footmisc-doc.pdf Binary files differindex 71f7811af1d..d738cb5e0dd 100644 --- a/Master/texmf-dist/doc/latex/footmisc/footmisc-doc.pdf +++ b/Master/texmf-dist/doc/latex/footmisc/footmisc-doc.pdf diff --git a/Master/texmf-dist/source/latex/footmisc/footmisc.dtx b/Master/texmf-dist/source/latex/footmisc/footmisc.dtx index c3a31d2e6a8..bafdb76df3a 100644 --- a/Master/texmf-dist/source/latex/footmisc/footmisc.dtx +++ b/Master/texmf-dist/source/latex/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} diff --git a/Master/texmf-dist/tex/latex/footmisc/footmisc.sty b/Master/texmf-dist/tex/latex/footmisc/footmisc.sty index a7c69ebf633..04c35db2a91 100644 --- a/Master/texmf-dist/tex/latex/footmisc/footmisc.sty +++ b/Master/texmf-dist/tex/latex/footmisc/footmisc.sty @@ -43,7 +43,7 @@ \DeclareRelease{v5}{2011-06-06}{footmisc-2011-06-06.sty} \DeclareCurrentRelease{}{2022-02-14} \ProvidesPackage{footmisc}% - [2022/03/07 v6.0c + [2022/03/08 v6.0d a miscellany of footnote facilities% ] @@ -477,9 +477,13 @@ \MakePerPage{footnote} \def\@stpelt#1{\global\csname c@#1\endcsname \m@ne \stepcounter{#1}% - \setcounter{#1}{0}% + \pp@fix@MakePerPage{#1}% } - \def\pp@cl@end@iii\stepcounter#1\setcounter#2#3{} + \def\pp@fix@MakePerPage#1{% + \ifnum \value{#1}>\z@ + \addtocounter{#1}\m@ne\fi + } + \def\pp@cl@end@iii\stepcounter#1\pp@fix@MakePerPage#2{} \fi \ifFN@para \else |