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

Merge branch 'main' into add/lang-in-ref

Browse Source
This commit is contained in:
Shunsuke KIMURA 2025-05-07 07:44:11 +09:00 committed by GitHub
commit 99ce1230a1
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
5 changed files with 23 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
crates/typst-library/src/model/enum.rs
View File

@ -259,10 +259,11 @@ impl Show for Packed<EnumElem> {
.spanned(self.span()); .spanned(self.span());
if tight { if tight {
let leading = ParElem::leading_in(styles); let spacing = self
let spacing = .spacing(styles)
VElem::new(leading.into()).with_weak(true).with_attach(true).pack(); .unwrap_or_else(|| ParElem::leading_in(styles).into());
realized = spacing + realized; let v = VElem::new(spacing.into()).with_weak(true).with_attach(true).pack();
realized = v + realized;
} }
Ok(realized) Ok(realized)

9
crates/typst-library/src/model/list.rs
View File

@ -166,10 +166,11 @@ impl Show for Packed<ListElem> {
.spanned(self.span()); .spanned(self.span());
if tight { if tight {
let leading = ParElem::leading_in(styles); let spacing = self
let spacing = .spacing(styles)
VElem::new(leading.into()).with_weak(true).with_attach(true).pack(); .unwrap_or_else(|| ParElem::leading_in(styles).into());
realized = spacing + realized; let v = VElem::new(spacing.into()).with_weak(true).with_attach(true).pack();
realized = v + realized;
} }
Ok(realized) Ok(realized)

8
crates/typst-library/src/model/terms.rs
View File

@ -189,13 +189,15 @@ impl Show for Packed<TermsElem> {
.styled(TermsElem::set_within(true)); .styled(TermsElem::set_within(true));
if tight { if tight {
let leading = ParElem::leading_in(styles); let spacing = self
let spacing = VElem::new(leading.into()) .spacing(styles)
.unwrap_or_else(|| ParElem::leading_in(styles).into());
let v = VElem::new(spacing.into())
.with_weak(true) .with_weak(true)
.with_attach(true) .with_attach(true)
.pack() .pack()
.spanned(span); .spanned(span);
realized = spacing + realized; realized = v + realized;
} }
Ok(realized) Ok(realized)

BIN
tests/ref/issue-6242-tight-list-attach-spacing.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 410 B

8
tests/suite/model/list.typ
View File

@ -304,3 +304,11 @@ World
- C - C
- = D - = D
E E
--- issue-6242-tight-list-attach-spacing ---
// Nested tight lists should be uniformly spaced when list spacing is set.
#set list(spacing: 1.2em)
- A
- B
- C
- C