caisin/typst
1
0
Fork 0
mirror of https://github.com/typst/typst synced 2025-05-18 11:05:28 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix footnote in columns

Browse Source 
Fixes #1433
This commit is contained in:
Laurenz 2023-06-08 12:24:47 +02:00
parent a1b0a41883
commit 2b812259c2
3 changed files with 16 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
library/src/layout/flow.rs
View File

@ -285,12 +285,16 @@ impl<'a> FlowLayouter<'a> {
} }
.resolve(styles); .resolve(styles);
let is_columns = block.is::<ColumnsElem>(); // Temporarily delegerate rootness to the columns.
let is_root = self.root;
if is_root && block.is::<ColumnsElem>() {
self.root = false;
self.regions.root = true;
}
// Layout the block itself. // Layout the block itself.
let sticky = BlockElem::sticky_in(styles); let sticky = BlockElem::sticky_in(styles);
let fragment = block.layout(vt, styles, self.regions)?; let fragment = block.layout(vt, styles, self.regions)?;
self.regions.root = self.root && is_columns;
for (i, frame) in fragment.into_iter().enumerate() { for (i, frame) in fragment.into_iter().enumerate() {
if i > 0 if i > 0
@ -305,6 +309,7 @@ impl<'a> FlowLayouter<'a> {
)?; )?;
} }
self.root = is_root;
self.regions.root = false; self.regions.root = false;
self.last_was_par = false; self.last_was_par = false;

BIN
tests/ref/meta/footnote-columns.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 11 KiB

9
tests/typ/meta/footnote-columns.typ Normal file
View File

@ -0,0 +1,9 @@
// Test footnotes in columns, even those
// that are not enabled via `set page`.
---
#set page(height: 120pt)
#align(center, strong[Title])
#show: columns.with(2)
#lorem(3) #footnote(lorem(6))
Hello there #footnote(lorem(2))