summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/latex/fancyhdr
diff options
context:
space:
mode:
Diffstat (limited to 'Master/texmf-dist/tex/latex/fancyhdr')
-rw-r--r--Master/texmf-dist/tex/latex/fancyhdr/extramarks.sty6
-rw-r--r--Master/texmf-dist/tex/latex/fancyhdr/fancyhdr.sty55
2 files changed, 46 insertions, 15 deletions
diff --git a/Master/texmf-dist/tex/latex/fancyhdr/extramarks.sty b/Master/texmf-dist/tex/latex/fancyhdr/extramarks.sty
index 9f4cf8e57b1..8cd63b9d55c 100644
--- a/Master/texmf-dist/tex/latex/fancyhdr/extramarks.sty
+++ b/Master/texmf-dist/tex/latex/fancyhdr/extramarks.sty
@@ -21,14 +21,14 @@
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\NeedsTeXFormat{LaTeX2e}
\ProvidesPackage{extramarks}
- [2025/01/01 v5.0
+ [2025/01/06 v5.1
Extra marks for LaTeX]
% Copyright (C) 1994-2025 by Pieter van Oostrum <pieter@vanoostrum.org>
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\providecommand\DeclareRelease[3]{}
\providecommand\DeclareCurrentRelease[2]{}
\DeclareRelease{v4}{2024/11/30}{extramarks-v4.sty}
-\DeclareCurrentRelease{}{2025/01/01}
+\DeclareCurrentRelease{}{2025/01/06}
\@ifundefined{NewMarkClass}
{\PackageWarningNoLine{extramarks}{%
**************************************************\MessageBreak
@@ -40,7 +40,7 @@ You are advised to update your LaTeX installation.\MessageBreak
**************************************************}
\RequirePackage{extramarks-v4}\endinput}{}
\AtBeginDocument{%
- \@ifpackageloaded{multicol}%
+ \IfPackageLoadedT{multicol}%
{\IfPackageAtLeastF{multicol}{2024-11-21}{%
\PackageWarningNoLine{extramarks}{%
You are using package `extramarks' with a version\MessageBreak
diff --git a/Master/texmf-dist/tex/latex/fancyhdr/fancyhdr.sty b/Master/texmf-dist/tex/latex/fancyhdr/fancyhdr.sty
index 4a8932b6db3..5371c91febb 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}%
- [2025/01/01 v5.0
+ [2025/01/06 v5.1
Extensive control of page headers and footers]%
% Copyright (C) 1994-2025 by Pieter van Oostrum <pieter@vanoostrum.org>
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -269,26 +269,55 @@
\ExplSyntaxOn
\providecommand\IfFormatAtLeastTF{\@ifl@t@r\fmtversion}
\IfFormatAtLeastTF{2021-06-01}{
- \cs_new:Npn \f@nch@clear@par@hook:n #1{
- \tl_clear:c {__hook~#1}
+ \def\f@nch@saveclr@parhook #1{
+ \expandafter\let\csname f@nch@__hook~#1\expandafter\endcsname
+ \csname __hook~#1\endcsname
+ \tl_gclear:c {__hook~#1}
+ \expandafter\let\csname f@nch@__hook_toplevel~#1\expandafter\endcsname
+ \csname __hook_toplevel~#1\endcsname
+ \tl_gclear:c {__hook_toplevel~#1}
+ \expandafter\let\csname f@nch@__hook_next~#1\expandafter\endcsname
+ \csname __hook_next~#1\endcsname
+ \tl_gclear:c {__hook_next~#1}
+ \expandafter\let\csname f@nch@g__hook_#1_code_prop\expandafter\endcsname
+ \csname g__hook_#1_code_prop\endcsname
+ \prop_gclear_new:c {g__hook_#1_code_prop}
}
- \newcommand\f@nch@resetpar{
+ \def\f@nch@restore@parhook #1{
+ \global\expandafter\let\csname __hook~#1\expandafter\endcsname
+ \csname f@nch@__hook~#1\endcsname
+ \global\expandafter\let\csname __hook_toplevel~#1\expandafter\endcsname
+ \csname f@nch@__hook_toplevel~#1\endcsname
+ \global\expandafter\let\csname __hook_next~#1\expandafter\endcsname
+ \csname f@nch@__hook_next~#1\endcsname
+ \global\expandafter\let\csname g__hook_#1_code_prop\expandafter\endcsname
+ \csname f@nch@g__hook_#1_code_prop\endcsname
+ }
+ \def\f@nch@resetpar{
\f@nch@everypar{}
- \f@nch@clear@par@hook:n{para/before}
- \f@nch@clear@par@hook:n{para/begin}
- \f@nch@clear@par@hook:n{para/end}
- \f@nch@clear@par@hook:n{para/after}
+ \f@nch@saveclr@parhook{para/before}
+ \f@nch@saveclr@parhook{para/begin}
+ \f@nch@saveclr@parhook{para/end}
+ \f@nch@saveclr@parhook{para/after}
+ }
+ \def\f@nch@restorepar{
+ \f@nch@restore@parhook{para/before}
+ \f@nch@restore@parhook{para/begin}
+ \f@nch@restore@parhook{para/end}
+ \f@nch@restore@parhook{para/after}
}
}{
- \newcommand\f@nch@resetpar{
- \f@nch@everypar{}
+ \def\f@nch@resetpar{
+ \f@nch@everypar{}
+ }
+ \def\f@nch@restorepar{}
}
-}
\ExplSyntaxOff
\else
- \newcommand\f@nch@resetpar{%
+ \def\f@nch@resetpar{%
\f@nch@everypar{}%
}
+ \def\f@nch@restorepar{}
\fi
\newcommand\f@nch@noUppercase[2][]{#2}
\def\f@nch@reset{\f@nch@resetpar\restorecr\endlinechar=13
@@ -427,6 +456,7 @@
}%
#5%
\ifdefined\UseHook\UseHook{fancyhdr/head/end}\UseHook{fancyhdr/after}\fi
+ \f@nch@restorepar
}
\newcommand\f@nch@foot[8]{%
\f@nch@reset
@@ -443,6 +473,7 @@
}%
#5%
\ifdefined\UseHook\UseHook{fancyhdr/foot/end}\UseHook{fancyhdr/after}\fi
+ \f@nch@restorepar
}
\newlength\f@nch@widthL
\newlength\f@nch@widthC