From feb0c913954d385a3f906f9d9d8ec33cbcf2b2d0 Mon Sep 17 00:00:00 2001
From: Laurenz <laurmaedje@gmail.com>
Date: Fri, 16 Aug 2024 11:18:45 +0200
Subject: [PATCH] Move paragraph widow and orphan prevention into flow (#4767)

---
 crates/typst/src/layout/flow.rs               |  44 +++++++++++++++++-
 crates/typst/src/layout/inline/collect.rs     |   6 +--
 crates/typst/src/layout/inline/finalize.rs    |  36 ++------------
 crates/typst/src/layout/inline/prepare.rs     |   3 --
 tests/ref/flow-widow-forced.png               | Bin 0 -> 1453 bytes
 .../grid-header-and-footer-lack-of-space.png  | Bin 3768 -> 3985 bytes
 tests/ref/grid-header-lack-of-space.png       | Bin 3193 -> 2785 bytes
 tests/ref/grid-rowspan-split-9.png            | Bin 967 -> 965 bytes
 ...sue-1445-widow-orphan-unnecessary-skip.png | Bin 0 -> 3549 bytes
 .../issue-multiple-footnote-in-one-line.png   | Bin 713 -> 704 bytes
 tests/suite/layout/flow/orphan.typ            |  11 +++++
 tests/suite/layout/grid/headers.typ           |   2 +-
 tests/suite/model/footnote.typ                |   7 ++-
 13 files changed, 63 insertions(+), 46 deletions(-)
 create mode 100644 tests/ref/flow-widow-forced.png
 create mode 100644 tests/ref/issue-1445-widow-orphan-unnecessary-skip.png

diff --git a/crates/typst/src/layout/flow.rs b/crates/typst/src/layout/flow.rs
index a1f1402e4..e15159e11 100644
--- a/crates/typst/src/layout/flow.rs
+++ b/crates/typst/src/layout/flow.rs
@@ -14,10 +14,12 @@ use crate::foundations::{
 use crate::introspection::{Locator, SplitLocator, Tag, TagElem};
 use crate::layout::{
     Abs, AlignElem, Axes, BlockElem, ColbreakElem, FixedAlignment, FlushElem, Fr,
-    Fragment, Frame, FrameItem, PlaceElem, Point, Regions, Rel, Size, Spacing, VElem,
+    Fragment, Frame, FrameItem, PlaceElem, Point, Ratio, Regions, Rel, Size, Spacing,
+    VElem,
 };
 use crate::model::{FootnoteElem, FootnoteEntry, ParElem};
 use crate::realize::StyleVec;
+use crate::text::TextElem;
 use crate::utils::Numeric;
 
 /// Arranges spacing, paragraphs and block-level elements into a flow.
@@ -278,6 +280,7 @@ impl<'a, 'e> FlowLayouter<'a, 'e> {
         // Fetch properties.
         let align = AlignElem::alignment_in(styles).resolve(styles);
         let leading = ParElem::leading_in(styles);
+        let costs = TextElem::costs_in(styles);
 
         // Layout the paragraph into lines. This only depends on the base size,
         // not on the Y position.
@@ -305,12 +308,51 @@ impl<'a, 'e> FlowLayouter<'a, 'e> {
             }
         }
 
+        // Determine whether to prevent widow and orphans.
+        let len = lines.len();
+        let prevent_orphans =
+            costs.orphan() > Ratio::zero() && len >= 2 && !lines[1].is_empty();
+        let prevent_widows =
+            costs.widow() > Ratio::zero() && len >= 2 && !lines[len - 2].is_empty();
+        let prevent_all = len == 3 && prevent_orphans && prevent_widows;
+
+        // Store the heights of lines at the edges because we'll potentially
+        // need these later when `lines` is already moved.
+        let height_at = |i| lines.get(i).map(Frame::height).unwrap_or_default();
+        let front_1 = height_at(0);
+        let front_2 = height_at(1);
+        let back_2 = height_at(len.saturating_sub(2));
+        let back_1 = height_at(len.saturating_sub(1));
+
         // Layout the lines.
         for (i, mut frame) in lines.into_iter().enumerate() {
             if i > 0 {
                 self.handle_item(FlowItem::Absolute(leading, true))?;
             }
 
+            // To prevent widows and orphans, we require enough space for
+            // - all lines if it's just three
+            // - the first two lines if we're at the first line
+            // - the last two lines if we're at the second to last line
+            let needed = if prevent_all && i == 0 {
+                front_1 + leading + front_2 + leading + back_1
+            } else if prevent_orphans && i == 0 {
+                front_1 + leading + front_2
+            } else if prevent_widows && i >= 2 && i + 2 == len {
+                back_2 + leading + back_1
+            } else {
+                frame.height()
+            };
+
+            // If the line(s) don't fit into this region, but they do fit into
+            // the next, then advance.
+            if !self.regions.in_last()
+                && !self.regions.size.y.fits(needed)
+                && self.regions.iter().nth(1).is_some_and(|region| region.y.fits(needed))
+            {
+                self.finish_region(false)?;
+            }
+
             self.drain_tag(&mut frame);
             self.handle_item(FlowItem::Frame {
                 frame,
diff --git a/crates/typst/src/layout/inline/collect.rs b/crates/typst/src/layout/inline/collect.rs
index b6a847f57..5021dc555 100644
--- a/crates/typst/src/layout/inline/collect.rs
+++ b/crates/typst/src/layout/inline/collect.rs
@@ -128,11 +128,11 @@ pub fn collect<'a>(
     let mut iter = children.chain(styles).peekable();
     let mut locator = locator.split();
 
+    let outer_dir = TextElem::dir_in(*styles);
     let first_line_indent = ParElem::first_line_indent_in(*styles);
     if !first_line_indent.is_zero()
         && consecutive
-        && AlignElem::alignment_in(*styles).resolve(*styles).x
-            == TextElem::dir_in(*styles).start().into()
+        && AlignElem::alignment_in(*styles).resolve(*styles).x == outer_dir.start().into()
     {
         collector.push_item(Item::Absolute(first_line_indent.resolve(*styles), false));
         collector.spans.push(1, Span::detached());
@@ -144,8 +144,6 @@ pub fn collect<'a>(
         collector.spans.push(1, Span::detached());
     }
 
-    let outer_dir = TextElem::dir_in(*styles);
-
     while let Some((child, styles)) = iter.next() {
         let prev_len = collector.full.len();
 
diff --git a/crates/typst/src/layout/inline/finalize.rs b/crates/typst/src/layout/inline/finalize.rs
index c8ba47292..03493af5a 100644
--- a/crates/typst/src/layout/inline/finalize.rs
+++ b/crates/typst/src/layout/inline/finalize.rs
@@ -1,5 +1,4 @@
 use super::*;
-use crate::layout::{Abs, Frame, Point};
 use crate::utils::Numeric;
 
 /// Turns the selected lines into frames.
@@ -26,38 +25,9 @@ pub fn finalize(
 
     // Stack the lines into one frame per region.
     let shrink = ParElem::shrink_in(styles);
-    let mut frames: Vec<Frame> = lines
+    lines
         .iter()
         .map(|line| commit(engine, p, line, width, region.y, shrink))
-        .collect::<SourceResult<_>>()?;
-
-    // Positive ratios enable prevention, while zero and negative ratios disable
-    // it.
-    if p.costs.orphan().get() > 0.0 {
-        // Prevent orphans.
-        if frames.len() >= 2 && !frames[1].is_empty() {
-            let second = frames.remove(1);
-            let first = &mut frames[0];
-            merge(first, second, p.leading);
-        }
-    }
-    if p.costs.widow().get() > 0.0 {
-        // Prevent widows.
-        let len = frames.len();
-        if len >= 2 && !frames[len - 2].is_empty() {
-            let second = frames.pop().unwrap();
-            let first = frames.last_mut().unwrap();
-            merge(first, second, p.leading);
-        }
-    }
-
-    Ok(Fragment::frames(frames))
-}
-
-/// Merge two line frames
-fn merge(first: &mut Frame, second: Frame, leading: Abs) {
-    let offset = first.height() + leading;
-    let total = offset + second.height();
-    first.push_frame(Point::with_y(offset), second);
-    first.size_mut().y = total;
+        .collect::<SourceResult<_>>()
+        .map(Fragment::frames)
 }
diff --git a/crates/typst/src/layout/inline/prepare.rs b/crates/typst/src/layout/inline/prepare.rs
index 59682b2c8..9e73af660 100644
--- a/crates/typst/src/layout/inline/prepare.rs
+++ b/crates/typst/src/layout/inline/prepare.rs
@@ -43,8 +43,6 @@ pub struct Preparation<'a> {
     pub cjk_latin_spacing: bool,
     /// Whether font fallback is enabled for this paragraph.
     pub fallback: bool,
-    /// The leading of the paragraph.
-    pub leading: Abs,
     /// How to determine line breaks.
     pub linebreaks: Smart<Linebreaks>,
     /// The text size.
@@ -136,7 +134,6 @@ pub fn prepare<'a>(
         hang: ParElem::hanging_indent_in(styles),
         cjk_latin_spacing,
         fallback: TextElem::fallback_in(styles),
-        leading: ParElem::leading_in(styles),
         linebreaks: ParElem::linebreaks_in(styles),
         size: TextElem::size_in(styles),
     })
diff --git a/tests/ref/flow-widow-forced.png b/tests/ref/flow-widow-forced.png
new file mode 100644
index 0000000000000000000000000000000000000000..98a953afe56ea2f1085b9461752cffe6431b3224
GIT binary patch
literal 1453
zcmV;e1ycHnP)<h;3K|Lk000e1NJLTq004LZ003nO00000qepm4000GaNkl<Zc-rmR
zSx;1F0EcnEhOw=!twBvqD=rXCFvhelxD(upMWk3+M34cE1yOJm7ZiaEFvuK1L2<(k
zbd*(!;sT7aIU>7*$g1ElEHm?zq~(TKMk<L(^FBA{@|T>G_kS+laeSu630S}a7BB!s
zj{)e;==?A6nMoJ;*Q)k1LP}o%-p#FKSicU?Y6<2WMyQ_=Dv<rdykJ;;6m7K#PXWk?
zJ@lr|{;Io4rMjqFnH8Xr+)DvPP{XqHol$61+dJI~pRX~*$WQ%}D-Q<9KJFwVKl(^D
zgK(U5#CXs3cocA2Qk4JP7r7wqW8kLMl&)dL&F+}c>`81)H-6Wn4gpG?S)I?^H$K@<
z*>jt@z0c<vL!+2)gf=JgWcr1?wi|?R$cYVS!s~7@*}c~=+f?KMmf^m;o-hpu9nR-p
zHR1dM8}em9<z^fk@VWD9r7L^Y*!5LAapF7+^^oIAfvnU4rVhgUQ+VWz4FH#{Z!y<w
z88(f_<k4(nY~IY$Dh_+n$l7wIlIaDMti!Q}b)6DxYa*m>tLn0~ge5Ys9U7+fp5Cbc
zQLlHv@tN9{D@rB<R6cB7!VJB}MQ;H<=M}jxn1YDtt_t5s`olu+*ZU>sdp%R^ZU=>|
z+VSA25@MtTT7#tUv;_aU;KNluSAo=BHv(QiJr>>a(l3@|WrA7lnGU=OjVpfQeYtPP
z^-ny<4t1YrK(w>>iOCf3n85}tW*B;oC0yZ(#cYTE5}yF~Uy7-D@0k@6l_4vnIw{-`
zV|N*V-iVk7oR?zB+MVHDNM6c8o}W3<PrNGa*`$Q7^0N^G@+CJ@!r7Z%?{p_%)NtXW
z=iUT{VO3wX*}SN1SIjdv0Py>>OUel(GK#NsnoZchE$Cld=AER9BLW)?OUt*V=I)|y
z6{jOuapBdd;qG{qJ)s%c(7dwVT2tII1kY*#c@j^Yutn!U&P=Ido~F3XIR~(zWPzr*
zeGqP1P0C3e8yGdb|F&)^f!CQ~Y*^YezLoYeXLGj>*eFqd!-L!5Os94km-=UQPUxil
zpda;E)AD5(?e~1m@8)xSKP#$64;Kcdxjps{D|gB~=Te*bdt67~<`nG~pxISkMU*mf
zK)s<P*`?b5bRy~7lwCbL_Y@+R_gwRcfB)7cjS~mrJRi9n8=G@nn<th_zycPqfCVgI
z0Soxk;m?)$#sU_wfX5K7Rr7Hf?l$qEO!r;@@cP>5V68RR&jCPuHbaF}GQ6H;xom(o
zhQmH80GcL`4#pOf2>=F0z8Ub(r;qFah8LR%0Ja|q>ysnPsgsAyW@pmF4Of24Fl@br
zQkjG#g|%%c&T+fE^$sPe!TTzJq_ff>T(pP~`*Z+GRNIXW3GxP#qZTFt?FWud<n598
zRLgLYM(fTpBXdYRiB(6>_Z+;~^;54VSH@Yh`$N9&(5}bcct#0alx0uq_s?erS$hCr
zd!B|xnTK{f4k9`caB5>V+cc~yw+OdICEA-NgDoj1u>rf*qnD7Z^N*YaydPmp^D2U}
z0xJMN#j8dJVH<|v#^r8|*EPP4jQIOiTMb~#oOc9Yum}gKUoOF_y5`%Sgu~3lu$<7d
z5475i>IJ=3X16@1Qn#4E8UsMWdYa5$cbQ_&_0{WY0SSk?AMVq5d%4+94lK^>_@cx6
z3LZ5j-4@_dx!PY_>~k&P{{EnM(^WCLjz2=RhZL2Z^3Q4vIG*WMe8IQssQZ>pCNM_?
zXE*ISTHuw@wL@Jd0~C^qYM<y9P6VeOFhH$W%7IKnxH5~lm!laFYd%=_7Km*eegKQd
zZn^GFyvzr4Q>5jJtroC=1uS3z3s}Gc7O;Q?EMNiu-{8LhkGC*q!%ZAo00000NkvXX
Hu0mjf1hc}b

literal 0
HcmV?d00001

diff --git a/tests/ref/grid-header-and-footer-lack-of-space.png b/tests/ref/grid-header-and-footer-lack-of-space.png
index 78705776d59660b30c6dd12e15051299b3f153aa..303c6f31f0eff679188c2b05f3e89a16c4340cd7 100644
GIT binary patch
delta 3329
zcmY+HbySq=7KevWU<ly|gD|ub(r|_xN+bjXB$T0tW?+CJ1f*s_x;vGW?k<ryGzu!I
zG?F6>At`l%bIx7&{?@zJxA*?u{p|SfZDNdLjs@Kzpdtob37>%v4*<9Wt7gx_N26o8
zvH{UQ6wr{^O@UPEL{*6GBe)?OB#8BazrQa1y?2kPxE>IGmmNgLRj_ia*HM&|^RY(S
zsYKX*Wl@NFN7yM(R-NKV9z6%m838+<yD)5bZZG`#W*0)f7#o*5j6I9@k^03ZAvU)w
zY2H-Bi+01IR6G+IzDcy~T6H@ypzTPzGLo`Jf|40MG~2^LCJDslX|*{``)0N#vWy(&
zL9Kd;#sWAXYx9A}@r$Nrb8)5P`2mQ_tHob7`$Wr!{$cy?jb7is>`c%%{{Ci3X9w==
z?j}6`yD&Fp=MNCbBp%fgJr9Gy?j0z#X*rF7Z$3tNdL1;VTh|`?Dk_jtb)_v!=r@gq
zglki<0>iTaY{JJzdF9O&HKwRt0jAt*-Xb}tN&c5p_w<Gv6cluYp3V{|61&OhYQnz)
z5MQNU`=r;Jz9MfeGu_xfuE-TEk=JN3ESit^O30hi-v7k@u6or5c1sKd0x7kf69xQz
zduyfZs&AuC>3@bfbRqc{ZVA0MNpIi_O#jsOZVtR^&Vh4!;Hvv)|Bin>_fX(<&xSDc
z|8K_ZW;Or4X?Crf<iPtOBf4&d$D3RFkQtbE(o*gAz@C>}rtwdWUBvGy+a?#y=i!<-
z#z_QSP~q+079m7Gzn4n><*DVcyc45-ZYJDnKgXv;F>gdGUo<7l%mn@VhmPIE8ZTOE
zdV1}zwkWN3=hMMr%4jCwO3y33+~C59^e#_aE2`?Z!)jmZqTsB1o&y)zSXLIomj2hx
z)PL{v!F%e(3gbThv8V4?8D4O91sfvb(rLXLeCWAlWn9}G`JFeqD?Jx$kAQb`*e^AI
zPOeEjo|ZIM{Zy)7J3q+*Mn8URVmfbGwlh<5_^cKhsPk?6uld6*2-n~#=Ere_M&W4M
z@P6uQdV>%m-hjt0lGu}7D9mQ;0hdVblE2>Ay$recY@QKpi=t0NSkwSCcu{eRgw)jf
zmSOyg6nOemK`XFi3y&<Tm^DK>>%j+kRJLOUzs^i>7g;CoJy%aYouN(7qAz**)lP~Q
zj>ofbcRoMrv6q|b3ROO5Bn?Bv6w3L~hG|>LKs>RPnST8zJ^tQZEhW7nZ)*4v*{q#^
z@cwhYjv0FO-FWJ4`NfTpgXDs_t5~|1+9&o;H1C=NAbPPfoCqx6zrWMf0@z_!2i*cy
z@!;IRJ(zv_;Mfo4V#$4^z9!<w(%OLcOtu&)ShXT1ipyAq__65u06J=21O?HzD8KRu
zW;zLEv*wNR(h9$fN~6fm?MQT#nvaw|&D}7MSj}xaTYbymVh`A)W0jc_DC#JUPj*#b
z=buczL+#G1%N+VSMusxyd*R#fGH4ktUxh*3Uve|%=c%DjZTg}!T9FYW8NumyIW0fV
zCa;l&@~FM`ff>-9elu?JQyj_-7-WqrBm$c1hY1EWkC)B9^x;t(bY>r+<uVKpp|70j
zMu_bWEsW#rGy@VmN68fJo3J_}V3QV7=1_Kfkvurd&a)>1sUhM_9^|F%gy{F&DAw(}
z*+>$mmt_x&xf#db|6sTqR1!qUxfe`Tp??49M~lir@6uo_94IR6F1NFhrM&&p`lPyz
z*0G%$GbphaII%(6Q#sV2i41AGkCnntINy!;b~j0<6=LJ{OkAB!sz<Bd?gK*`$VQKY
z1KCU7Qq+y8Oc#AP8!Gef2tfCkQ+2?5I8r;!I{0B_0qT?rf~4*-;qFypk{!$I@|2s_
zzh(&lw?hDo`0kG|pg70QJqu93WzP>p#WabEw%(;|$00a|L{!1KIMkaxmWU&t9za1(
zJ+YcGt-C}N@>1@IoGQvdFS_JzU4ETp5)4m}J2JFKeX1ft44P9mg?{8qH%0ALdb;sq
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

delta 3111
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
NZ7l=MYIS({e*pT*7e@d9

diff --git a/tests/ref/grid-header-lack-of-space.png b/tests/ref/grid-header-lack-of-space.png
index 4d2b483f19276e5fb1d10ab05241027d149682b8..8b222174bff9efcfddd99d60f6023e25a86fb004 100644
GIT binary patch
literal 2785
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
EUrf>H`Tzg`

literal 3193
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

diff --git a/tests/ref/grid-rowspan-split-9.png b/tests/ref/grid-rowspan-split-9.png
index 5346be718c84989b96bd417b2869c04821772f32..8d878c284b16bd1764fc09946d0ff24249cb54b0 100644
GIT binary patch
delta 711
zcmX@kew2NJPCWwyLqkJDy`uDgM>7Fd78e&64rZnoFJ653@ZtIM=Lrc36DCY>5af%G
zkH2ZId%{?&R$l6|sm?EZlT0bGt7f{BROP*e1xjTlJcamo>Z`XZ$=tEfTd1itSyldx
zjo}4TowFv|U+s*SYALVRQB9Q;^%Ca)Y-`-8D7`~Z{i&6~?0R*Dc^ZnRjJ0l<>#osO
znXaagCnJ8(Lcc;@svL+sl`FiIYiepdJw2<dt35nCI5{~vSefhnR2%$N1-MxM&-Hvi
z*|kAYy1u^ty{)l;fWZ6r?;q>!6J%guTJ7oL7*cWT?Vam>T8ScU4>yYIBsg#Ues6a|
z_`Cm;Y$6*ij~&pj|FoyQ_>+qD%o%TIo%fkkci&~9{rwLSVzzgl&)d52&=ZG!6F=&#
zx@YIU^<&wAzs$`)+g?R}`TI|7@3n&u^jfxW6Mr`Oz-;Nu#hwqoZoOJ0v?C-k(u?W5
zPPo|ey?zM>J47qK{duIt8DnF++lT4B{QN1C53skpS9?B4%1pn`&uJi0&%^fJCT7N;
z6Xr&<T(9n)zQXJlUq#X@<NF1+-SgyTpZ_BlbSZv?e&D~Ss(;Tfe&+i)vb}#+{Mqz`
zg6#(julO(=4>V?!aX;&K7{a;ynuV=7+BQqA;qi)@41J5!m@N8c$+kUS@v@yof`_fS
znj!D&ipskc&sJ!j47?l|JZZ89lbTt0SHgy+%a$&?&dI|TofQRyO$QSUByv`2diKql
zBx9;;S}Vu7?aCG){36$UaM~;ojGNrTWaL@9lmjYZ)p#($+t=H7y)eikU7#k_lRyg=
zFI%c6!Sn6y+W*VECaHK%Qi0gJblG|lh<a~d1CWNvjLhzg@smB719j)SgRKV&f?NS|
gl2w-1tKK?>IZjJvRQecx2BujCPgg&ebxsLQ07RBC0ssI2

delta 713
zcmX@gew=-RPW^`uAKt%z|Ki1q=g*)2pX>R4vg?Ei6B-&C>g(%kYHF&htN%Ni{jxXt
zYG?e}*7&`x@f#b%r&b2{EcEYK=-o8ey<x6<)lB!Ysm=vcowFv|2?+_OjJ4w9<4+iC
zHTbL6`>F2KSKpzhUg4!&?y0<9M|F+1%2F-mg_=t9G!#8OJ!jXeD|mQ#OjlEwtSUcA
zRo=zLrBz9$QBk@<QMz7Hx>jDQLSCv|UaC}9B2Pv<Q%WpVQq)^mz)P6lQ;6R|kWT;z
zxL7$kIR#i*I9QoEn3)(D7=&95_AoFot@U(q45_&F_U>`NtVEHvhq~YHX@9$C9VX)X
z;h+A=lU#2M+3F_NKbJMCoHY5(jK{a;r%d|tyRBRK=epmUUX<v3kCfI5d-wS&`=%AU
z_RC&nyT#al$N$N1t(1$$FC=`4WN6+kFwbgNlpoXjwR-zh8q@XrPkTPNbnZ~KP{q@<
z=b0BDv#>QsH>&gNKbw4D_G|C+o)2Dbo?ImKqpbX$F6W*|tBSAAOgwD$%?EAy#kI?S
zzWN&(a`$#u*59`c?dEQuW5qYUsM+&#=6z?cU);6or}pnz^1t#*O-{|Vhl`*2d^R@N
zar=QqmRiH(6*C$77N;$L2;saeWNJRRR?bxTK;ac1hU0<8j56+L`3@Ie`2w;GXcxow
zsw*`aHP2RPo(#Mk7(8jR29ugubXUTLrOTEsJI=|&7M&FZgiQw%3?y<^YI^p~nj~YY
zYr0pCbK8|IK=?(b`QWr!ASgGvg~`Z!?@|t^gheAr56F@PZ(na;&!Q_+o~+1R$;sBd
zxBB(|m6KFFfvD(8$(1Q7D_`om8r%rF41~fwY`^_{@2`AmZ94fslRIPnWOwF3-SzHZ
n2Y?L&nHimBmF4xSw~j&V)c)w2m3KvfvCQD<>gTe~DWM4fLlZg@

diff --git a/tests/ref/issue-1445-widow-orphan-unnecessary-skip.png b/tests/ref/issue-1445-widow-orphan-unnecessary-skip.png
new file mode 100644
index 0000000000000000000000000000000000000000..7cd7888da70b3daab81d86edaa02d04fe830cc94
GIT binary patch
literal 3549
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
XTpLak-i}o000000NkvXXu0mjf+1$t5

literal 0
HcmV?d00001

diff --git a/tests/ref/issue-multiple-footnote-in-one-line.png b/tests/ref/issue-multiple-footnote-in-one-line.png
index 1d8c017d4329c3d8d5dacdfa66aff49d96e36fbe..cdb83af204902f3fea498fd5d19b764976fab52e 100644
GIT binary patch
delta 680
zcmV;Z0$2UX1;7Q6B!5a!OjJex|Nq(9*`}tZsHmvP$;s>M>*nX{O;1-(Pft}<RZL7w
zNl8gaNJwgGYRk*Z+uPeiMNP)Y(6h6%#Kgpfg@uoinWd+%s;soMw!W#Wv#zkX;NarT
z&CmP${Pgtpn3<ivz{s4QrkR?a<KyFddwY3#d3t(!e}8{~fPa8iR#s6_QKhA&>gwu}
zl9H^ftXWxE;Nala*4Ce&pQ)*-`T6<%{r$$q#_#X%jg5`n-QBdbw7|f?V`F3T^77u^
z-d$g3R8&-AVq%@0opW<@_V)IXk&%>?l!=Ln)YR0lu&{1!Zfb0FMMqD}&eq-E=kD+G
z_xJhn@$tdI!GG1&)ym4sYiny{WMp@Dcd@at_4W1V=<J`NskOJimzkk)b9?IR?_y+Z
zla-yJp`mbaaLCBW`1tsimX>~gelRdFH8nLpK0ZG`KO-X}0002xX^waR00A*cL_t(|
z+U?ZEPD4=?h2e!1cXumJaSFwy^cFp*#idZ(dH*Q`(tjzV<{py%-wXW7PWBQ200000
z000000000000000x#HUqE)O7^s-=v)HTk0=B-Pd!DY&t@6}`N=Ubpf?Rpq#3_Kl>N
zr}GP&y74C*Nq$I&2PsKjeCI4sRD7G34+5u0?|CxDNb>e}Cnu~iRz8TF9KXC~!k(tS
zd<t(zrGMwQ@NYOC*Yu}P;n+|}Pmd4QS}E8+Fgue>Sesy80000000000Kz8N-Nm*9F
z!E;e(N4uP`jcty?O|4p(4?74qw<xkW>>zB6mX}7HgjZJrqw-zCS``$Ih4^n|T~~Ks
zuuKlvo?ey8f%M(I$|uI%EZ3+S>Yap3<<&U}mm$m!hUG$dj_(HWZ~Xv!>0pn^E6U&i
O0000<MNUMnLSTX*pllBS

delta 689
zcmV;i0#5zF1<3`FB!5s)OjJex|Ns8}{{8*^`}_R)`T6+x`1kku_V)Jl^!D=d^6~NU
z?(g&O@9*mC@9XR9>gwv|=k4R;<KW=p-QVZj-saui-P+vb+}zyT+uPXM;@R2R)z#I^
z&eqM%&&$ip$jZ{n%F4;f$;Qag$jHdY$H&IT#>B+L!NI}4z<<cVz`(e;xV5*xw6?yq
zw6wFcv$3(UuCTbSuCA)Aw5+VGsjIW9s;a4}si>%^rKhi^rlzH(rK6*xp`oFmprD+d
zrkR_gnVO!MnVpxHmzI{6la-y6l$4T^l8=#@k&%&&kC%;&jfIDgg@uKLgoJ>Cihh8I
zfPjF1e}8^{et&v;dU<(yb8~ZWaBymDbZcvCYHDg?WNc$&V_aNZR#sM3RaH?@QBO}#
zOiWBkNl8dZNJU3aLq$zKK0Z4;J32Z#H8nLbFfb@6C?g{yARr(b8X5oq01r9gUjP6B
zG)Y83RCwC$)mKsiK@>*e-!VHX=$LcPIfIG`Q88jh1%J#r?ElRj@FI3wc)kss>h8L?
z1poj50000000000000000Kk9oWeGPAAd~83-kneCc<^LeOFSZZXXeAvl1HiOeo%&$
zpZC5r$n!iI7Hw->JG2lkJdyHW9rNMMm`|Oj3$E+3QjlG8YI9`R{L^BrOG}|Gnf5N<
zv%KwAnSb`?jP7c0KP=Ne0>|<En))j9CzcY^7Ct9^N>>9G!okF9a9n=BpPd2#00000
zfS(JbrQg$#77vq6a+@n<g}X6kDLgl&(r(8>cw$J=>H`a5&r|<!!b-UKvOFc@3S3vS
z?Li;&jf^W=S+2N|1#VwRNm)>K5!UTw#LnhQX)343N;s+Y5i8;AnIlIwIC)GrfIsUS
XlzLqRLaK3000000NkvXXu0mjfZgXzZ

diff --git a/tests/suite/layout/flow/orphan.typ b/tests/suite/layout/flow/orphan.typ
index 70eac731b..bd938d96d 100644
--- a/tests/suite/layout/flow/orphan.typ
+++ b/tests/suite/layout/flow/orphan.typ
@@ -29,3 +29,14 @@ This is the start and it goes on.
 // All three lines go to the next page.
 #set text(olive)
 #lorem(10)
+
+--- flow-widow-forced ---
+// Ensure that a widow is allowed when the three lines don't all fit.
+#set page(height: 50pt)
+#lorem(10)
+
+--- issue-1445-widow-orphan-unnecessary-skip ---
+// Ensure that widow/orphan prevention doesn't unnecessarily move things
+// to another page.
+#set page(width: 16cm)
+#block(height: 30pt, fill: aqua, columns(2, lorem(19)))
diff --git a/tests/suite/layout/grid/headers.typ b/tests/suite/layout/grid/headers.typ
index c9c95e134..c3b929979 100644
--- a/tests/suite/layout/grid/headers.typ
+++ b/tests/suite/layout/grid/headers.typ
@@ -220,7 +220,7 @@
 
 --- grid-header-lack-of-space ---
 // Test lack of space for header + text.
-#set page(height: 9em)
+#set page(height: 8em)
 
 #table(
   rows: (auto, 2.5em, auto, auto, 10em),
diff --git a/tests/suite/model/footnote.typ b/tests/suite/model/footnote.typ
index d72ca25a0..993725518 100644
--- a/tests/suite/model/footnote.typ
+++ b/tests/suite/model/footnote.typ
@@ -163,11 +163,10 @@ Ref @fn
 --- issue-multiple-footnote-in-one-line ---
 // Test that the logic that keeps footnote entry together with
 // their markers also works for multiple footnotes in a single
-// line or frame (here, there are two lines, but they are one
-// unit due to orphan prevention).
+// line.
 #set page(height: 100pt)
-#v(40pt)
-A #footnote[a] \
+#v(50pt)
+A #footnote[a]
 B #footnote[b]
 
 --- issue-1433-footnote-in-list ---