From 112ae858eade286063141e6f975a4fcc85ddb41e Mon Sep 17 00:00:00 2001 From: Tobias Schmitz Date: Fri, 2 May 2025 19:01:47 +0200 Subject: [PATCH] fix: use list spacing for leading spacing in tight lists --- crates/typst-library/src/model/enum.rs | 4 +++- crates/typst-library/src/model/list.rs | 4 +++- crates/typst-library/src/model/terms.rs | 4 +++- 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/crates/typst-library/src/model/enum.rs b/crates/typst-library/src/model/enum.rs index 2d95996ab..8b89044ab 100644 --- a/crates/typst-library/src/model/enum.rs +++ b/crates/typst-library/src/model/enum.rs @@ -259,7 +259,9 @@ impl Show for Packed { .spanned(self.span()); if tight { - let leading = ParElem::leading_in(styles); + let leading = self + .spacing(styles) + .unwrap_or_else(|| ParElem::leading_in(styles).into()); let spacing = VElem::new(leading.into()).with_weak(true).with_attach(true).pack(); realized = spacing + realized; diff --git a/crates/typst-library/src/model/list.rs b/crates/typst-library/src/model/list.rs index d93ec9172..efef2a4f0 100644 --- a/crates/typst-library/src/model/list.rs +++ b/crates/typst-library/src/model/list.rs @@ -166,7 +166,9 @@ impl Show for Packed { .spanned(self.span()); if tight { - let leading = ParElem::leading_in(styles); + let leading = self + .spacing(styles) + .unwrap_or_else(|| ParElem::leading_in(styles).into()); let spacing = VElem::new(leading.into()).with_weak(true).with_attach(true).pack(); realized = spacing + realized; diff --git a/crates/typst-library/src/model/terms.rs b/crates/typst-library/src/model/terms.rs index e197ff318..7d1c59176 100644 --- a/crates/typst-library/src/model/terms.rs +++ b/crates/typst-library/src/model/terms.rs @@ -189,7 +189,9 @@ impl Show for Packed { .styled(TermsElem::set_within(true)); if tight { - let leading = ParElem::leading_in(styles); + let leading = self + .spacing(styles) + .unwrap_or_else(|| ParElem::leading_in(styles).into()); let spacing = VElem::new(leading.into()) .with_weak(true) .with_attach(true)