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 compiler panic for float with no vertical alignment (#2437)

Browse Source
This commit is contained in:
MALO 2023-10-22 13:43:24 +02:00 committed by GitHub
parent 3ed6462ee0
commit cf9ca6cb59
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 16 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
crates/typst-library/src/layout/place.rs
View File

@ -95,7 +95,10 @@ impl Layout for PlaceElem {
let float = self.float(styles); let float = self.float(styles);
let alignment = self.alignment(styles); let alignment = self.alignment(styles);
if float && alignment.map_or(false, |align| align.y() == Some(VAlign::Horizon)) { if float
&& alignment
.map_or(false, |align| matches!(align.y(), None | Some(VAlign::Horizon)))
{
bail!(self.span(), "floating placement must be `auto`, `top`, or `bottom`"); bail!(self.span(), "floating placement must be `auto`, `top`, or `bottom`");
} else if !float && alignment.is_auto() { } else if !float && alignment.is_auto() {
return Err("automatic positioning is only available for floating placement") return Err("automatic positioning is only available for floating placement")

12
tests/typ/layout/place-float-auto.typ
View File

@ -17,3 +17,15 @@
--- ---
// Error: 2-45 floating placement must be `auto`, `top`, or `bottom` // Error: 2-45 floating placement must be `auto`, `top`, or `bottom`
#place(center + horizon, float: true)[Hello] #place(center + horizon, float: true)[Hello]
---
// Error: 2-36 floating placement must be `auto`, `top`, or `bottom`
#place(horizon, float: true)[Hello]
---
// Error: 2-27 floating placement must be `auto`, `top`, or `bottom`
#place(float: true)[Hello]
---
// Error: 2-34 floating placement must be `auto`, `top`, or `bottom`
#place(right, float: true)[Hello]