From 1e2e07adffcaf28704af2b26450c293711cc1352 Mon Sep 17 00:00:00 2001
From: Laurenz <laurmaedje@gmail.com>
Date: Tue, 4 Jun 2024 17:05:37 +0200
Subject: [PATCH] Add regression test for #2631 (#4328)

---
 tests/ref/issue-2631-page-header-ordering.png | Bin 0 -> 1287 bytes
 tests/suite/layout/page.typ                   |  20 ++++++++++++++++++
 2 files changed, 20 insertions(+)
 create mode 100644 tests/ref/issue-2631-page-header-ordering.png

diff --git a/tests/ref/issue-2631-page-header-ordering.png b/tests/ref/issue-2631-page-header-ordering.png
new file mode 100644
index 0000000000000000000000000000000000000000..5477f68a2848962a1267874ef86ab26b06e00dc0
GIT binary patch
literal 1287
zcmV+i1^D`jP)<h;3K|Lk000e1NJLTq004LZ003nO0{{R3vGUiY00060P)t-s|NsC0
z{{H^{{{8*^|NHy={QUd-`}+F&`T6<y`1tqt_xASo_4W1i^z`%d^YZfY@$vEd>+SIH
z@bB;M`|0cM?(X~O>Fw?9?Ck98>+9<3>iOd2>FMeD;pFJ(==tB_=H}-3-QVTq<>ch#
z_}bj#<Ky?)+~VTm;Nalj-{0Qe-re2Z+uPgP+S=LK+4aoO*x1<D*VpvP&DPe|)YR1T
z#mUpt)6&w?^TNi_(b3S*(9h4$&d$#Ay~54S&GNj#%*@R3yTQxL%gV~i$;rv^x4g*6
z$j8UW@U*$c#>Vioxy8lB@3FVU#KgnH!@|PC!NI}6z`*XSvhJ#}zrVlksjt4izP-J@
zyu7@-ySweAtGc?nxw*NxxVX2sx3;#nwY9ahw6wFcv$C?Xv9Yo0m!Gh(u&=MLuCA`F
zt*xxAtgEZ5s;a7~si~-_sHdl=rlzK)rKO~#q@$ywqN1Xqp`oClpr4<go}Qkaot>PV
zoSU1QnwpxKnVFcFn3tEAmX?;4m6eo~l#`Q_l9G~<k&%#)kdKd#j*gCvjg5?qjEjql
zii(PfiHV4ah=+%Vg@uKLgoJ~GgMxyBfq{X5fPj8}etms?e0+R+dwY6%dU<(yczAes
zcXxJnc6D`ib8~ZXadB{PaBOUBX=!O@W@chyVqjokMn*;e006rmb&3E00>nu~K~#9!
z?b+E^5@8s}@m~-Kl1thmWo8(OnWb5pyQyiUATA*$pk`4ns4POFp*Vwzdup1MEm~Ut
zWoHEI(CG#*M)N$MyP0{<`JQ*q`(8aDgpmJQJtC2fkXdw%WQ!~Ryk@1)ArcI1V=1+s
z@-|muRb@hPGJtD!x6VDfa<}f%)d#0T84m_5DaD;xJJo0h$A>qGB3(T?z3C29+KwLX
z7_f*$04tJFX9m7c=KB4(AOmpkVp9_yKSAU3vJ&i>^WNE56K|=(0IE><W4By3j1^$X
z1O{AqI>H@)olraD!497FjKG}1h0iqIepu3oru$`=rS82&qj3uZS++S$sNoBR7lH0?
zau!0{BHXQ!?^p{~2u@Vk>l5IdM0y@V#9`lO@S6l2Mv8j6G2}>Cad@@hWG8@E&Yp5M
zKG3G`m^SeozNuWqD*P6E8hG{AjO~KmsNva8Go8C*ifuW+6<-Vf*-H~Pl-k1xcNKgV
z&VzpeP4sT+CitgFk|~oEbk+$Wgb;F!{X8V}=LsRlZ!};}%^fpCgCON8)Myb-szOke
z4%WV~PcgNsK2*pKG8zDb-cnhH9ogdz4Nl3YF=^Zo_7sk`C>%xl6wQk*g+vbkeaQ;1
zK<qGL$gCXBZy(7~PuajA))nz+AQbi$f<c20{jWt9CHBKlbJ%ICPxeD3?}tzs48#0E
zKeJk_1tXZ81>?WYg%OB&G!P1BqG+eEAs?;F@&cCIamx)ZtYVu7b@p~k)Vnm9I~Y!K
zuO&~tj9oGqJpByVSMyvr&UK*CfGrjK1R?;a(ZDSD=ZK(E2T5?12*DLXsCrNlO}B^q
zEfYL3sSRPz>tgW3Zxv=464X|Cy;1kfh2~u$_#x0NueaupM^A}1ON|S8#u>iCeoYtC
xEPLNkZR)i+wsV)i<j^@Mgb+dqA%q+)zX0sV|6IJ;@16hv002ovPDHLkV1ghN&*=aF

literal 0
HcmV?d00001

diff --git a/tests/suite/layout/page.typ b/tests/suite/layout/page.typ
index e881bc470..c3576edea 100644
--- a/tests/suite/layout/page.typ
+++ b/tests/suite/layout/page.typ
@@ -238,3 +238,23 @@ Look, ma, no page numbers!
 
 #set page(header: auto, footer: auto)
 Default page numbers now.
+
+--- issue-2631-page-header-ordering ---
+#set text(6pt)
+#show heading: set text(6pt, weight: "regular")
+#set page(
+  margin: (x: 10pt, top: 20pt, bottom: 10pt),
+  height: 50pt,
+  header: context {
+    let prev = query(selector(heading).before(here()))
+    let next = query(selector(heading).after(here()))
+    let prev = if prev != () { prev.last().body }
+    let next = if next != () { next.first().body }
+    (prev: prev, next: next)
+  }
+)
+
+= First
+Hi
+#pagebreak()
+= Second