summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--Master/texmf-dist/doc/latex/fancyhdr/README2
-rw-r--r--Master/texmf-dist/doc/latex/fancyhdr/fancyhdr.pdfbin851692 -> 853305 bytes
-rw-r--r--Master/texmf-dist/source/latex/fancyhdr/fancyhdr.dtx30
-rw-r--r--Master/texmf-dist/tex/latex/fancyhdr/extramarks.sty3
-rw-r--r--Master/texmf-dist/tex/latex/fancyhdr/fancyhdr.sty10
-rw-r--r--Master/texmf-dist/tex/latex/fancyhdr/fancyheadings.sty2
6 files changed, 34 insertions, 13 deletions
diff --git a/Master/texmf-dist/doc/latex/fancyhdr/README b/Master/texmf-dist/doc/latex/fancyhdr/README
index e44d05f032f..87b7370185f 100644
--- a/Master/texmf-dist/doc/latex/fancyhdr/README
+++ b/Master/texmf-dist/doc/latex/fancyhdr/README
@@ -25,7 +25,7 @@ In order to latex the documentation you need to have a copy of
boxedminipage.sty (CTAN:/macros/latex/contrib/boxedminipage) and
refcount.sty (CTAN:/macros/latex/contrib/oberdiek/) installed.
-This is version 4.0.2 of fancyhdr.sty and extramarks.sty. They are
+This is version 4.0.3 of fancyhdr.sty and extramarks.sty. They are
described in the forthcoming third edition of The LaTeX Companion.
Extramarks.sty has not been changed, except for the version and
copyright information.
diff --git a/Master/texmf-dist/doc/latex/fancyhdr/fancyhdr.pdf b/Master/texmf-dist/doc/latex/fancyhdr/fancyhdr.pdf
index 2138e986d7d..174d358effd 100644
--- a/Master/texmf-dist/doc/latex/fancyhdr/fancyhdr.pdf
+++ b/Master/texmf-dist/doc/latex/fancyhdr/fancyhdr.pdf
Binary files differ
diff --git a/Master/texmf-dist/source/latex/fancyhdr/fancyhdr.dtx b/Master/texmf-dist/source/latex/fancyhdr/fancyhdr.dtx
index 41e7ebb5988..9c7a90992ed 100644
--- a/Master/texmf-dist/source/latex/fancyhdr/fancyhdr.dtx
+++ b/Master/texmf-dist/source/latex/fancyhdr/fancyhdr.dtx
@@ -26,7 +26,7 @@
%<fancyhdr>\ProvidesPackage{fancyhdr}%
%<fancyheadings>\ProvidesPackage{fancyheadings}
%<extramarks>\ProvidesPackage{extramarks}
-%<fancyhdr|fancyheadings|extramarks> [2022/05/10 v4.0.2
+%<fancyhdr|fancyheadings|extramarks> [2022/05/18 v4.0.3
%<fancyhdr> Extensive control of page headers and footers]%
%<fancyheadings> Legacy package to call fancyhdr]
%<extramarks> Extra marks for LaTeX]
@@ -2993,6 +2993,11 @@
% \item Miscellaneous small documentation changes.
% \item Make \cs{fancyhead} etc. \cs{long}.
% \end{itemize}
+% \item Version 4.0.3, May 18, 2022
+% \begin{itemize}
+% \item Initialize \cs{@mkboth} in \texttt{extramarks.sty} so that
+% it will pick up changes to \cs{markboth}.
+% \end{itemize}
% \end{itemize}
%
%
@@ -3490,6 +3495,10 @@
% The redefinition of the \texttt{headings} style also differs for
% book-like and article-like classes. It also differs for
% one-side and two-side modes.
+% \changes{fancyhdr v4.0.3}{2022/05/18}{Changed definition of
+% \cs{@mkboth} from \cs{let}\cs{@mkboth}\cs{markboth} to
+% \cs{def}\Cmd{@mkboth\{\cs{protect}\cs{markboth}\}} so that it will pick up changes
+% to \cs{markboth}}
% \begin{macrocode}
\DeclareOption{headings}{%
\f@nch@ifundefined{chapter}{%
@@ -3497,7 +3506,7 @@
% \end{macrocode}
% An article in two-side mode:
% \begin{macrocode}
- \def\ps@headings{\ps@f@nch@fancyproto \let\@mkboth\markboth
+ \def\ps@headings{\ps@f@nch@fancyproto \def\@mkboth{\protect\markboth}
\fancyhf{}
\fancyhead[LE,RO]{\thepage}%
\fancyhead[RE]{\slshape\leftmark}%
@@ -3513,7 +3522,7 @@
% \end{macrocode}
% An article in one-side mode:
% \begin{macrocode}
- \def\ps@headings{\ps@f@nch@fancyproto \let\@mkboth\markboth
+ \def\ps@headings{\ps@f@nch@fancyproto \def\@mkboth{\protect\markboth}
\fancyhf{}
\fancyhead[LE,RO]{\thepage}%
\fancyhead[RE]{\slshape\leftmark}%
@@ -3528,7 +3537,7 @@
% \end{macrocode}
% A book in two-side mode:
% \begin{macrocode}
- \def\ps@headings{\ps@f@nch@fancyproto \let\@mkboth\markboth
+ \def\ps@headings{\ps@f@nch@fancyproto \def\@mkboth{\protect\markboth}
\fancyhf{}
\fancyhead[LE,RO]{\thepage}%
\fancyhead[RE]{\slshape\leftmark}%
@@ -3545,7 +3554,7 @@
% \end{macrocode}
% A book in one-side mode:
% \begin{macrocode}
- \def\ps@headings{\ps@f@nch@fancyproto \let\@mkboth\markboth
+ \def\ps@headings{\ps@f@nch@fancyproto \def\@mkboth{\protect\markboth}
\fancyhf{}
\fancyhead[LE,RO]{\thepage}%
\fancyhead[RE]{\slshape\leftmark}%
@@ -4606,6 +4615,17 @@
\if@nobreak\ifvmode\nobreak\fi\fi}
% \end{macrocode}
% \end{macro}
+% \begin{macro}{\@mkboth}
+% Initialization of \cs{@mkboth}, so that it will pick up changes to
+% \cs{markboth}
+% \changes{extramarks v4.0.3}{2022/05/18}{Initialize definition of
+% \cs{@mkboth} to \cs{def}\Cmd{@mkboth\{\cs{protect}\cs{markboth}\}}
+% if it wasn't equal to \cs{@gobbletwo} so that it will pick up
+% changes to \cs{markboth}}
+% \begin{macrocode}
+\ifx\@mkboth\@gobbletwo\else\def\@mkboth{\protect\markboth}\fi
+% \end{macrocode}
+% \end{macro}
% \begin{macro}{\markright}
% We use the standard definition of \cs{markright}. No use to duplicate here.
% \end{macro}
diff --git a/Master/texmf-dist/tex/latex/fancyhdr/extramarks.sty b/Master/texmf-dist/tex/latex/fancyhdr/extramarks.sty
index 9c9a59eca8b..029f0c29c53 100644
--- a/Master/texmf-dist/tex/latex/fancyhdr/extramarks.sty
+++ b/Master/texmf-dist/tex/latex/fancyhdr/extramarks.sty
@@ -21,7 +21,7 @@
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\NeedsTeXFormat{LaTeX2e}
\ProvidesPackage{extramarks}
- [2022/05/10 v4.0.2
+ [2022/05/18 v4.0.3
Extra marks for LaTeX]
% Copyright (C) 1994-2022 by Pieter van Oostrum <pieter@vanoostrum.org>
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -36,6 +36,7 @@
\mark{\the\@temptokena}%
\endgroup
\if@nobreak\ifvmode\nobreak\fi\fi}
+\ifx\@mkboth\@gobbletwo\else\def\@mkboth{\protect\markboth}\fi
\def\@markboth#1#2#3#4#5#6{\@temptokena{{#3}{#4}}%
\unrestored@protected@xdef\@themark{{#5}{#6}\the\@temptokena}}
\def\@markright#1#2#3#4#5{\@temptokena{#1}\@temptokenb{{#3}{#4}}%
diff --git a/Master/texmf-dist/tex/latex/fancyhdr/fancyhdr.sty b/Master/texmf-dist/tex/latex/fancyhdr/fancyhdr.sty
index 39a70767af9..7d0fb439081 100644
--- a/Master/texmf-dist/tex/latex/fancyhdr/fancyhdr.sty
+++ b/Master/texmf-dist/tex/latex/fancyhdr/fancyhdr.sty
@@ -21,7 +21,7 @@
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\NeedsTeXFormat{LaTeX2e}
\ProvidesPackage{fancyhdr}%
- [2022/05/10 v4.0.2
+ [2022/05/18 v4.0.3
Extensive control of page headers and footers]%
% Copyright (C) 1994-2022 by Pieter van Oostrum <pieter@vanoostrum.org>
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -70,7 +70,7 @@
\DeclareOption{headings}{%
\f@nch@ifundefined{chapter}{%
\if@twoside
- \def\ps@headings{\ps@f@nch@fancyproto \let\@mkboth\markboth
+ \def\ps@headings{\ps@f@nch@fancyproto \def\@mkboth{\protect\markboth}
\fancyhf{}
\fancyhead[LE,RO]{\thepage}%
\fancyhead[RE]{\slshape\leftmark}%
@@ -83,7 +83,7 @@
\ifnum \c@secnumdepth >\@ne \thesubsection\quad \fi##1}}%
}%
\else
- \def\ps@headings{\ps@f@nch@fancyproto \let\@mkboth\markboth
+ \def\ps@headings{\ps@f@nch@fancyproto \def\@mkboth{\protect\markboth}
\fancyhf{}
\fancyhead[LE,RO]{\thepage}%
\fancyhead[RE]{\slshape\leftmark}%
@@ -95,7 +95,7 @@
}%
\fi
}{\if@twoside
- \def\ps@headings{\ps@f@nch@fancyproto \let\@mkboth\markboth
+ \def\ps@headings{\ps@f@nch@fancyproto \def\@mkboth{\protect\markboth}
\fancyhf{}
\fancyhead[LE,RO]{\thepage}%
\fancyhead[RE]{\slshape\leftmark}%
@@ -109,7 +109,7 @@
\ifnum \c@secnumdepth >\z@ \thesection. \ \fi##1}}}%
}%
\else
- \def\ps@headings{\ps@f@nch@fancyproto \let\@mkboth\markboth
+ \def\ps@headings{\ps@f@nch@fancyproto \def\@mkboth{\protect\markboth}
\fancyhf{}
\fancyhead[LE,RO]{\thepage}%
\fancyhead[RE]{\slshape\leftmark}%
diff --git a/Master/texmf-dist/tex/latex/fancyhdr/fancyheadings.sty b/Master/texmf-dist/tex/latex/fancyhdr/fancyheadings.sty
index 11248ad9821..ddba41735e8 100644
--- a/Master/texmf-dist/tex/latex/fancyhdr/fancyheadings.sty
+++ b/Master/texmf-dist/tex/latex/fancyhdr/fancyheadings.sty
@@ -21,7 +21,7 @@
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\NeedsTeXFormat{LaTeX2e}
\ProvidesPackage{fancyheadings}
- [2022/05/10 v4.0.2
+ [2022/05/18 v4.0.3
Legacy package to call fancyhdr]
% Public domain
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
generated by cgit v1.2.3 (git 2.39.1) at 2024-11-05 01:09:47 +0000