texlive[72910] Master/texmf-dist: fancyhdr (20nov24)
commits+karl at tug.org
commits+karl at tug.org
Wed Nov 20 22:15:28 CET 2024
Revision: 72910
https://tug.org/svn/texlive?view=revision&revision=72910
Author: karl
Date: 2024-11-20 22:15:28 +0100 (Wed, 20 Nov 2024)
Log Message:
-----------
fancyhdr (20nov24)
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
Modified: trunk/Master/texmf-dist/doc/latex/fancyhdr/README
===================================================================
--- trunk/Master/texmf-dist/doc/latex/fancyhdr/README 2024-11-20 21:15:19 UTC (rev 72909)
+++ trunk/Master/texmf-dist/doc/latex/fancyhdr/README 2024-11-20 21:15:28 UTC (rev 72910)
@@ -1,22 +1,36 @@
-fancyhdr – Extensive control of page headers and footers in LaTeX2ε
+fancyhdr – Extensive control of page headers and footers in LaTeX
+extramarks - Extra marks for LaTeX
The package provides extensive facilities, both for constructing headers
and footers, and for controlling their use (for example, at times when
LaTeX would automatically change the heading style in use).
-The distribution package consists of the following files:
+This is version 4.4 of fancyhdr.sty and extramarks.sty. They are
+described in the third edition of The LaTeX Companion.
-README This file
-fancyhdr.dtx The complete source of the package and documentation
-fancyhdr.ins The installation file; run through TeX to generate *.sty
-fancyhdr.pdf PDF of the documentation
+The distribution package (fancyhdr.zip) consists of the following files:
+README This file
+fancyhdr.dtx The complete source of the package and documentation
+fancyhdr.ins The installation file; run through TeX to generate *.sty
+fancyhdr.pdf PDF of the documentation
+
After processing (by tex) of fancyhdr.ins, the following package files will be generated:
-fancyhdr.sty the LaTeX package
-extramarks.sty a package for additional marks
-fancyheadings.sty this loads fancyhdr with a warning message
+fancyhdr.sty v4.4 2024/11/20 the LaTeX package
+extramarks.sty v4.4 2024/11/20 a package for additional marks
+fancyheadings.sty v4.1 2022/11/09 this loads fancyhdr with a warning message
+If you have a user distribution package (fancyhdr-dist-4.4.zip),
+then you don't have to do this processing.
+
+If you have a source distribution fancyhdr-4.4.zip, it will also contain
+the .sty files, but not the .pdf file.
+To recreate the .sty files run
+tex fancyhdr.ins
+To create fancyhdr.pdf, either just run the 'make' command, or
+latexmk fancyhdr.dtx
+
Fancyhdr is a replacement for the old LaTeX2 package fancyheadings. That
one should not be used anymore. The package fancyheadings included here
just loads fancyhdr with a warning message.
@@ -27,11 +41,6 @@
boxedminipage.sty (CTAN:/macros/latex/contrib/boxedminipage) and
refcount.sty (CTAN:/macros/latex/contrib/oberdiek/) installed.
-This is version 4.3.1 of fancyhdr.sty and extramarks.sty. They are
-described in the third edition of The LaTeX Companion.
-Extramarks.sty has not been changed, except for the version and
-copyright information.
-
The older versions fancyhdr.sty version 3 and extramarks.sty version 2
are the packages as described in the second edition of The LaTeX
Companion. That documentation can still be used for the newer
@@ -45,5 +54,3 @@
Pieter van Oostrum.
<pieter at vanoostrum.org>
http://pieter.vanoostrum.org/
-
-
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 2024-11-20 21:15:19 UTC (rev 72909)
+++ trunk/Master/texmf-dist/source/latex/fancyhdr/fancyhdr.dtx 2024-11-20 21:15:28 UTC (rev 72910)
@@ -26,7 +26,7 @@
%<fancyhdr>\ProvidesPackage{fancyhdr}%
%<fancyheadings>\ProvidesPackage{fancyheadings}
%<extramarks>\ProvidesPackage{extramarks}
-%<fancyhdr|extramarks> [2024/07/23 v4.3.1
+%<fancyhdr|extramarks> [2024/11/20 v4.4
%<fancyhdr> Extensive control of page headers and footers]%
%<fancyheadings> [2022/11/09 v4.1
%<fancyheadings> Legacy package to call fancyhdr]
@@ -3075,7 +3075,7 @@
% Therefore paragraph hooks will not work inside \Package{fancyhdr} headers and
% footers to avoid unwanted interactions with the main text.
% \end{itemize}
-% \item % Version 4.3.1, July 23, 2024
+% \item Version 4.3.1, July 23, 2024
% \begin{itemize}
% \item Also reset \cs{everypar} to its original \TeX{} value
% \cs{tex\_everypar:D} in \cs{f at nch@resetpar}, otherwise environments
@@ -3082,6 +3082,12 @@
% based on \cs{trivlist} will not work properly in \Package{fancyhdr}
% headers and footers.
% \end{itemize}
+% \item Version 4.4, Nov 20, 2024
+% \begin{itemize}
+% \item Add setting the new style marks for \cs{leftmark}
+% (\texttt{2e-left}) and \cs{rightmark} (\texttt{2e-right} and
+% \texttt{2e-right-nonempty}) in \Package{extramarks.sty}.
+% \end{itemize}
% \end{itemize}
%
%
@@ -4798,7 +4804,34 @@
% \begin{macro}{\markboth}
% Our own definition of \cs{markboth}, mainly because \cs{@markboth}
% gets more parameters.
+% \changes{extramarks v4.4}{2024/11/20}{Add setting the new style marks
+% for \cs{leftmark} (\texttt{2e-left}) and \cs{rightmark}
+% (\texttt{2e-right} and \texttt{2e-right-nonempty}). We do this only if
+% the new marks are defined in the \LaTeX{} kernel.}
+% First the definition for modern \LaTeX{} distributions.
% \begin{macrocode}
+\ifdefined\ExplSyntaxOn
+\ExplSyntaxOn
+\DeclareRobustCommand*\markboth[2]{%
+ \begingroup
+ \let\label\relax \let\index\relax \let\glossary\relax
+ \expandafter\@markboth\@themark{#1}{#2}%
+ \@temptokena \expandafter{\@themark}%
+ \ifdefined\mark_insert:nn
+ % 3 new lines to set the new marks
+ \mark_insert:nn{2e-left}{#1}
+ \mark_insert:nn{2e-right}{#2}
+ \tl_if_empty:nF{#2}{ \mark_insert:nn{2e-right-nonempty}{#2} }
+ \fi
+ \mark{\the\@temptokena}%
+ \endgroup
+ \if at nobreak\ifvmode\nobreak\fi\fi}
+\ExplSyntaxOff
+% \end{macrocode}
+% If we are with a pre-\LaTeX3 kernel, we use the definition from an
+% older version of \Package{extramarks}.
+% \begin{macrocode}
+\else
\def\markboth#1#2{%
\begingroup
\let\label\relax \let\index\relax \let\glossary\relax
@@ -4807,6 +4840,7 @@
\mark{\the\@temptokena}%
\endgroup
\if at nobreak\ifvmode\nobreak\fi\fi}
+\fi
% \end{macrocode}
% \end{macro}
% \begin{macro}{\@mkboth}
Modified: trunk/Master/texmf-dist/tex/latex/fancyhdr/extramarks.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/fancyhdr/extramarks.sty 2024-11-20 21:15:19 UTC (rev 72909)
+++ trunk/Master/texmf-dist/tex/latex/fancyhdr/extramarks.sty 2024-11-20 21:15:28 UTC (rev 72910)
@@ -21,7 +21,7 @@
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\NeedsTeXFormat{LaTeX2e}
\ProvidesPackage{extramarks}
- [2024/07/23 v4.3.1
+ [2024/11/20 v4.4
Extra marks for LaTeX]
% Copyright (C) 1994-2024 by Pieter van Oostrum <pieter at vanoostrum.org>
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -28,6 +28,24 @@
\newtoks\@temptokenb
\providecommand\unrestored at protected@xdef{%
\let\protect\@unexpandable at protect \xdef}
+\ifdefined\ExplSyntaxOn
+\ExplSyntaxOn
+\DeclareRobustCommand*\markboth[2]{%
+ \begingroup
+ \let\label\relax \let\index\relax \let\glossary\relax
+ \expandafter\@markboth\@themark{#1}{#2}%
+ \@temptokena \expandafter{\@themark}%
+ \ifdefined\mark_insert:nn
+ % 3 new lines to set the new marks
+ \mark_insert:nn{2e-left}{#1}
+ \mark_insert:nn{2e-right}{#2}
+ \tl_if_empty:nF{#2}{ \mark_insert:nn{2e-right-nonempty}{#2} }
+ \fi
+ \mark{\the\@temptokena}%
+ \endgroup
+ \if at nobreak\ifvmode\nobreak\fi\fi}
+\ExplSyntaxOff
+\else
\def\markboth#1#2{%
\begingroup
\let\label\relax \let\index\relax \let\glossary\relax
@@ -36,6 +54,7 @@
\mark{\the\@temptokena}%
\endgroup
\if at nobreak\ifvmode\nobreak\fi\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}}
Modified: trunk/Master/texmf-dist/tex/latex/fancyhdr/fancyhdr.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/fancyhdr/fancyhdr.sty 2024-11-20 21:15:19 UTC (rev 72909)
+++ trunk/Master/texmf-dist/tex/latex/fancyhdr/fancyhdr.sty 2024-11-20 21:15:28 UTC (rev 72910)
@@ -21,7 +21,7 @@
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\NeedsTeXFormat{LaTeX2e}
\ProvidesPackage{fancyhdr}%
- [2024/07/23 v4.3.1
+ [2024/11/20 v4.4
Extensive control of page headers and footers]%
% Copyright (C) 1994-2024 by Pieter van Oostrum <pieter at vanoostrum.org>
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
More information about the tex-live-commits
mailing list.