texlive[63329] Master/texmf-dist: fancyhdr (18may22)
commits+karl at tug.org
commits+karl at tug.org
Wed May 18 21:50:36 CEST 2022
Revision: 63329
http://tug.org/svn/texlive?view=revision&revision=63329
Author: karl
Date: 2022-05-18 21:50:36 +0200 (Wed, 18 May 2022)
Log Message:
-----------
fancyhdr (18may22)
Modified Paths:
--------------
trunk/Master/texmf-dist/doc/latex/fancyhdr/README
trunk/Master/texmf-dist/doc/latex/fancyhdr/fancyhdr.pdf
trunk/Master/texmf-dist/source/latex/fancyhdr/fancyhdr.dtx
trunk/Master/texmf-dist/tex/latex/fancyhdr/extramarks.sty
trunk/Master/texmf-dist/tex/latex/fancyhdr/fancyhdr.sty
trunk/Master/texmf-dist/tex/latex/fancyhdr/fancyheadings.sty
Modified: trunk/Master/texmf-dist/doc/latex/fancyhdr/README
===================================================================
--- trunk/Master/texmf-dist/doc/latex/fancyhdr/README 2022-05-18 19:50:21 UTC (rev 63328)
+++ trunk/Master/texmf-dist/doc/latex/fancyhdr/README 2022-05-18 19:50:36 UTC (rev 63329)
@@ -25,7 +25,7 @@
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.
Modified: trunk/Master/texmf-dist/doc/latex/fancyhdr/fancyhdr.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/source/latex/fancyhdr/fancyhdr.dtx
===================================================================
--- trunk/Master/texmf-dist/source/latex/fancyhdr/fancyhdr.dtx 2022-05-18 19:50:21 UTC (rev 63328)
+++ trunk/Master/texmf-dist/source/latex/fancyhdr/fancyhdr.dtx 2022-05-18 19:50:36 UTC (rev 63329)
@@ -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 at nch@ifundefined{chapter}{%
@@ -3497,7 +3506,7 @@
% \end{macrocode}
% An article in two-side mode:
% \begin{macrocode}
- \def\ps at headings{\ps at f@nch at fancyproto \let\@mkboth\markboth
+ \def\ps at headings{\ps at f@nch at 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 at headings{\ps at f@nch at fancyproto \let\@mkboth\markboth
+ \def\ps at headings{\ps at f@nch at 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 at headings{\ps at f@nch at fancyproto \let\@mkboth\markboth
+ \def\ps at headings{\ps at f@nch at 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 at headings{\ps at f@nch at fancyproto \let\@mkboth\markboth
+ \def\ps at headings{\ps at f@nch at fancyproto \def\@mkboth{\protect\markboth}
\fancyhf{}
\fancyhead[LE,RO]{\thepage}%
\fancyhead[RE]{\slshape\leftmark}%
@@ -4606,6 +4615,17 @@
\if at 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}
Modified: trunk/Master/texmf-dist/tex/latex/fancyhdr/extramarks.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/fancyhdr/extramarks.sty 2022-05-18 19:50:21 UTC (rev 63328)
+++ trunk/Master/texmf-dist/tex/latex/fancyhdr/extramarks.sty 2022-05-18 19:50:36 UTC (rev 63329)
@@ -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 at vanoostrum.org>
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -36,6 +36,7 @@
\mark{\the\@temptokena}%
\endgroup
\if at 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 at protected@xdef\@themark{{#5}{#6}\the\@temptokena}}
\def\@markright#1#2#3#4#5{\@temptokena{#1}\@temptokenb{{#3}{#4}}%
Modified: trunk/Master/texmf-dist/tex/latex/fancyhdr/fancyhdr.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/fancyhdr/fancyhdr.sty 2022-05-18 19:50:21 UTC (rev 63328)
+++ trunk/Master/texmf-dist/tex/latex/fancyhdr/fancyhdr.sty 2022-05-18 19:50:36 UTC (rev 63329)
@@ -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 at vanoostrum.org>
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -70,7 +70,7 @@
\DeclareOption{headings}{%
\f at nch@ifundefined{chapter}{%
\if at twoside
- \def\ps at headings{\ps at f@nch at fancyproto \let\@mkboth\markboth
+ \def\ps at headings{\ps at f@nch at fancyproto \def\@mkboth{\protect\markboth}
\fancyhf{}
\fancyhead[LE,RO]{\thepage}%
\fancyhead[RE]{\slshape\leftmark}%
@@ -83,7 +83,7 @@
\ifnum \c at secnumdepth >\@ne \thesubsection\quad \fi##1}}%
}%
\else
- \def\ps at headings{\ps at f@nch at fancyproto \let\@mkboth\markboth
+ \def\ps at headings{\ps at f@nch at fancyproto \def\@mkboth{\protect\markboth}
\fancyhf{}
\fancyhead[LE,RO]{\thepage}%
\fancyhead[RE]{\slshape\leftmark}%
@@ -95,7 +95,7 @@
}%
\fi
}{\if at twoside
- \def\ps at headings{\ps at f@nch at fancyproto \let\@mkboth\markboth
+ \def\ps at headings{\ps at f@nch at fancyproto \def\@mkboth{\protect\markboth}
\fancyhf{}
\fancyhead[LE,RO]{\thepage}%
\fancyhead[RE]{\slshape\leftmark}%
@@ -109,7 +109,7 @@
\ifnum \c at secnumdepth >\z@ \thesection. \ \fi##1}}}%
}%
\else
- \def\ps at headings{\ps at f@nch at fancyproto \let\@mkboth\markboth
+ \def\ps at headings{\ps at f@nch at fancyproto \def\@mkboth{\protect\markboth}
\fancyhf{}
\fancyhead[LE,RO]{\thepage}%
\fancyhead[RE]{\slshape\leftmark}%
Modified: trunk/Master/texmf-dist/tex/latex/fancyhdr/fancyheadings.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/fancyhdr/fancyheadings.sty 2022-05-18 19:50:21 UTC (rev 63328)
+++ trunk/Master/texmf-dist/tex/latex/fancyhdr/fancyheadings.sty 2022-05-18 19:50:36 UTC (rev 63329)
@@ -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
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
More information about the tex-live-commits
mailing list.