fancyhdr (18may22)

git-svn-id: svn://tug.org/texlive/trunk@63329 c570f23f-e606-0410-a88d-b1316a301751

3 files changed, 8 insertions, 7 deletions

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
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%