caisin/typst
1
0
Fork 0
mirror of https://github.com/typst/typst synced 2025-05-14 04:56:26 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix unstoppable empty footnote loop (#5354) (#5364)

Browse Source
This commit is contained in:
wznmickey 2024-11-05 03:27:25 -05:00 committed by GitHub
parent 5b11db0ef2
commit ada30cd5b1
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
crates/typst-layout/src/flow/compose.rs
View File

@ -431,6 +431,9 @@ impl<'a, 'b> Composer<'a, 'b, '_, '_> {
// Find nested footnotes in the entry.
let nested = find_in_frames::<FootnoteElem>(&frames);
// Check if there are any non-empty frames.
let exist_non_empty_frame = frames.iter().any(|f| !f.is_empty());
// Extract the first frame.
let mut iter = frames.into_iter();
let first = iter.next().unwrap();
@ -440,7 +443,7 @@ impl<'a, 'b> Composer<'a, 'b, '_, '_> {
// possible, we then migrate the origin frame to the next region to
// uphold the footnote invariant (that marker and entry are on the same
// page). If not, we just queue the footnote for the next page.
if first.is_empty() {
if first.is_empty() && exist_non_empty_frame {
if migratable {
return Err(Stop::Finish(false));
} else {

BIN
tests/ref/issue-5354-footnote-empty-frame-infinite-loop.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 2.3 KiB

5
tests/suite/layout/flow/footnote.typ
View File

@ -286,3 +286,8 @@ B #footnote[b]
--- issue-4454-footnote-ref-numbering ---
// Test that footnote references are numbered correctly.
A #footnote(numbering: "*")[B]<fn>, C @fn, D @fn, E @fn.
--- issue-5354-footnote-empty-frame-infinite-loop ---
// Test whether an empty footnote would cause infinite loop
#show footnote.entry: it => {}
#lorem(3) #footnote[A footnote]