caisin/typst
1
0
Fork 0
mirror of https://github.com/typst/typst synced 2025-05-17 02:25:27 +08:00
Code Issues Packages Projects Releases Wiki Activity

Clean up list styling (#4324)

Browse Source
This commit is contained in:
Laurenz 2024-06-03 12:04:07 +02:00 committed by GitHub
parent 3257efd03a
commit a9b3273a2b
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
5 changed files with 59 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
crates/typst/src/foundations/content.rs
View File

@ -385,6 +385,19 @@ impl Content {
}
}
/// Style this content with a full style map in-place.
pub fn style_in_place(&mut self, styles: Styles) {
if styles.is_empty() {
return;
}
if let Some(style_elem) = self.to_packed_mut::<StyledElem>() {
style_elem.styles.apply(styles);
} else {
*self = StyledElem::new(std::mem::take(self), styles).into();
}
}
/// Queries the content tree for all elements that match the given selector.
///
/// Elements produced in `show` rules will not be included in the results.

10
crates/typst/src/model/enum.rs
View File

@ -7,7 +7,7 @@ use crate::diag::{bail, SourceResult};
use crate::engine::Engine;
use crate::foundations::{
cast, elem, scope, Array, Content, Context, NativeElement, Packed, Show, Smart,
StyleChain,
StyleChain, Styles,
};
use crate::layout::{
Alignment, Axes, BlockElem, Cell, CellGrid, Em, Fragment, GridLayouter, HAlignment,
@ -316,6 +316,14 @@ pub struct EnumItem {
pub body: Content,
}
impl Packed<EnumItem> {
/// Apply styles to this enum item.
pub fn styled(mut self, styles: Styles) -> Self {
self.body.style_in_place(styles);
self
}
}
cast! {
EnumItem,
array: Array => {

10
crates/typst/src/model/list.rs
View File

@ -4,7 +4,7 @@ use crate::diag::{bail, SourceResult};
use crate::engine::Engine;
use crate::foundations::{
cast, elem, scope, Array, Content, Context, Depth, Func, NativeElement, Packed, Show,
Smart, StyleChain, Value,
Smart, StyleChain, Styles, Value,
};
use crate::layout::{
Axes, BlockElem, Cell, CellGrid, Em, Fragment, GridLayouter, HAlignment, Length,
@ -206,6 +206,14 @@ pub struct ListItem {
pub body: Content,
}
impl Packed<ListItem> {
/// Apply styles to this list item.
pub fn styled(mut self, styles: Styles) -> Self {
self.body.style_in_place(styles);
self
}
}
cast! {
ListItem,
v: Content => v.unpack::<Self>().unwrap_or_else(Self::new)

10
crates/typst/src/model/terms.rs
View File

@ -2,6 +2,7 @@ use crate::diag::{bail, SourceResult};
use crate::engine::Engine;
use crate::foundations::{
cast, elem, scope, Array, Content, NativeElement, Packed, Show, Smart, StyleChain,
Styles,
};
use crate::layout::{
BlockElem, Dir, Em, HElem, Length, Sides, Spacing, StackChild, StackElem, VElem,
@ -168,6 +169,15 @@ pub struct TermItem {
pub description: Content,
}
impl Packed<TermItem> {
/// Apply styles to this term item.
pub fn styled(mut self, styles: Styles) -> Self {
self.term.style_in_place(styles.clone());
self.description.style_in_place(styles);
self
}
}
cast! {
TermItem,
array: Array => {

60
crates/typst/src/realize/mod.rs
View File

@ -508,50 +508,26 @@ impl<'a> ListBuilder<'a> {
let mut items = items.into_iter().peekable();
let (first, _) = items.peek().unwrap();
let output = if first.is::<ListItem>() {
ListElem::new(
items
.map(|(item, local)| {
let mut item = item.to_packed::<ListItem>().unwrap().clone();
let body = item.body().clone().styled_with_map(local);
item.push_body(body);
item
})
.collect(),
)
.with_tight(self.tight)
.pack()
.spanned(span)
let children = items
.map(|(item, local)| {
item.into_packed::<ListItem>().unwrap().styled(local)
})
.collect();
ListElem::new(children).with_tight(self.tight).pack().spanned(span)
} else if first.is::<EnumItem>() {
EnumElem::new(
items
.map(|(item, local)| {
let mut item = item.to_packed::<EnumItem>().unwrap().clone();
let body = item.body().clone().styled_with_map(local);
item.push_body(body);
item
})
.collect(),
)
.with_tight(self.tight)
.pack()
.spanned(span)
let children = items
.map(|(item, local)| {
item.into_packed::<EnumItem>().unwrap().styled(local)
})
.collect();
EnumElem::new(children).with_tight(self.tight).pack().spanned(span)
} else if first.is::<TermItem>() {
TermsElem::new(
items
.map(|(item, local)| {
let mut item = item.to_packed::<TermItem>().unwrap().clone();
let term = item.term().clone().styled_with_map(local.clone());
let description =
item.description().clone().styled_with_map(local);
item.push_term(term);
item.push_description(description);
item
})
.collect(),
)
.with_tight(self.tight)
.pack()
.spanned(span)
let children = items
.map(|(item, local)| {
item.into_packed::<TermItem>().unwrap().styled(local)
})
.collect();
TermsElem::new(children).with_tight(self.tight).pack().spanned(span)
} else {
unreachable!()
};