guard against fancyhdr patch

latex3 · Jan 1, 2025 · 783ed19 · 783ed19
1 parent ad67b97
commit 783ed19
Show file tree

Hide file tree

Showing 6 changed files with 25 additions and 6 deletions.
diff --git a/testfiles-luatex/test-struct-user.lvt b/testfiles-luatex/test-struct-user.lvt
@@ -33,13 +33,15 @@
 \usepackage{fancyhdr}
 \pagestyle{fancy}
 \fancyhf{}
-
+\makeatletter
 \ExplSyntaxOn
+%Avoid killing of para hooks:
+\def\f@nch@clear@par@hook:n#1{}
 \cfoot{\leavevmode\tag_mc_end_push:\tagmcbegin{artifact=pagination}\thepage\tagmcend\tag_mc_begin_pop:n{artifact}}
 
 \pdfmanagement_add:nnn {Catalog}{Lang}{(en-UK)}
 \pdfmanagement_add:nnn {Info}{Title}{(Title)}
-\ExplSyntaxOff
+\ExplSyntaxOff\makeatletter
 \begin{document}\showoutput
 \START
 

diff --git a/testfiles-luatex/testauxtree.lvt b/testfiles-luatex/testauxtree.lvt
@@ -37,9 +37,13 @@
 \fancyhf{}
 
 \ExplSyntaxOn
+\makeatletter
+%Avoid killing of para hooks:
+\def\f@nch@clear@par@hook:n#1{}
+
 \cfoot{\leavevmode\tag_mc_end_push:\tagmcbegin{artifact=pagination}\thepage\tagmcend\tag_mc_begin_pop:n{artifact}}
 \pdfmanagement_add:nnn{Info}{Title}{(title)}
-\ExplSyntaxOff
+\ExplSyntaxOff\makeatother
 
 \begin{document}\showoutput
 \START

diff --git a/testfiles-pdftex/test-mc-manual-para-split.lvt b/testfiles-pdftex/test-mc-manual-para-split.lvt
@@ -26,12 +26,15 @@
 \fancyhf{}
 
 \ExplSyntaxOn
+\makeatletter
+%Avoid killing of para hooks:
+\def\f@nch@clear@par@hook:n#1{}
 \pdfmanagement_add:nnn {Catalog} {Lang}{(en-UK)}
 \pdfmanagement_add:nnn {Info} {Title}{(Title)}
 
 \cfoot{\leavevmode\tag_mc_end_push:\tagmcbegin{artifact=pagination}\thepage\tagmcend\tag_mc_begin_pop:n{artifact}}
 
-\ExplSyntaxOff
+\ExplSyntaxOff\makeatother
 \textheight=3cm
 \begin{document}\showoutput
 \START

diff --git a/testfiles-pdftex/test-struct-user.lvt b/testfiles-pdftex/test-struct-user.lvt
@@ -36,11 +36,14 @@
 \fancyhf{}
 
 \ExplSyntaxOn
+\makeatletter
+%Avoid killing of para hooks:
+\def\f@nch@clear@par@hook:n#1{}
 \cfoot{\leavevmode\tag_mc_end_push:\tagmcbegin{artifact=pagination}\thepage\tagmcend\tag_mc_begin_pop:n{artifact}}
 
 \pdfmanagement_add:nnn {Catalog}{Lang}{(en-UK)}
 \pdfmanagement_add:nnn {Info}{Title}{(Title)}
-\ExplSyntaxOff
+\ExplSyntaxOff\makeatother
 \begin{document}\showoutput
 \START
  \tagstructbegin{tag=Sect}

diff --git a/testfiles-pdftex/testauxtree.lvt b/testfiles-pdftex/testauxtree.lvt
@@ -31,9 +31,12 @@
 \fancyhf{}
 
 \ExplSyntaxOn
+\makeatletter
+%Avoid killing of para hooks:
+\def\f@nch@clear@par@hook:n#1{}
 \cfoot{\leavevmode\tag_mc_end_push:\tagmcbegin{artifact=pagination}\thepage\tagmcend\tag_mc_begin_pop:n{artifact}}
 \pdfmanagement_add:nnn{Info}{Title}{(title)}
-\ExplSyntaxOff
+\ExplSyntaxOff\makeatother
 
 \begin{document}\showoutput
 \START

diff --git a/testfiles/test-fancyhdr.lvt b/testfiles/test-fancyhdr.lvt
@@ -6,6 +6,10 @@
 \input{regression-test}
 \documentclass{article}
 \usepackage{fancyhdr}
+\makeatletter\ExplSyntaxOn
+%Avoid fancyhdr killing of para hooks:
+\def\f@nch@clear@par@hook:n#1{}
+\makeatother\ExplSyntaxOff
 \pagestyle{fancy}
 \lhead{some \emph{text} }
 \lfoot{some \emph{text} }