caisin/typst
1
0
Fork 0
mirror of https://github.com/typst/typst synced 2025-07-19 02:22:53 +08:00
Code Issues Packages Projects Releases Wiki Activity

Change enum.item.number to Smart instead of Option (#6609)

Browse Source
This commit is contained in:
Malo 2025-07-16 09:05:52 +01:00 committed by GitHub
parent 9a6268050f
commit cdbf60e883
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
5 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
crates/typst-eval/src/markup.rs
View File

@ -251,7 +251,7 @@ impl Eval for ast::EnumItem<'_> {
let body = self.body().eval(vm)?; let body = self.body().eval(vm)?;
let mut elem = EnumItem::new(body); let mut elem = EnumItem::new(body);
if let Some(number) = self.number() { if let Some(number) = self.number() {
elem.number.set(Some(number)); elem.number.set(Smart::Custom(number));
} }
Ok(elem.pack()) Ok(elem.pack())
} }

2
crates/typst-html/src/rules.rs
View File

@ -103,7 +103,7 @@ const ENUM_RULE: ShowFn<EnumElem> = |elem, _, styles| {
let body = Content::sequence(elem.children.iter().map(|item| { let body = Content::sequence(elem.children.iter().map(|item| {
let mut li = HtmlElem::new(tag::li); let mut li = HtmlElem::new(tag::li);
if let Some(nr) = item.number.get(styles) { if let Smart::Custom(nr) = item.number.get(styles) {
li = li.with_attr(attr::value, eco_format!("{nr}")); li = li.with_attr(attr::value, eco_format!("{nr}"));
} }
// Text in wide enums shall always turn into paragraphs. // Text in wide enums shall always turn into paragraphs.

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

@ -220,7 +220,7 @@ impl EnumElem {
pub struct EnumItem { pub struct EnumItem {
/// The item's number. /// The item's number.
#[positional] #[positional]
pub number: Option<u64>, pub number: Smart<u64>,
/// The item's body. /// The item's body.
#[required] #[required]

BIN
tests/ref/enum-item-number-optional.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 474 B

6
tests/suite/model/enum.typ
View File

@ -56,6 +56,10 @@ a + 0.
enum.item(5)[Fifth] enum.item(5)[Fifth]
) )
--- enum-item-number-optional ---
#enum.item[First]
#enum.item[Second]
--- enum-numbering-pattern --- --- enum-numbering-pattern ---
// Test numbering pattern. // Test numbering pattern.
#set enum(numbering: "(1.a.*)") #set enum(numbering: "(1.a.*)")
@ -217,7 +221,7 @@ a + 0.
--- issue-2530-enum-item-panic --- --- issue-2530-enum-item-panic ---
// Enum item (pre-emptive) // Enum item (pre-emptive)
#enum.item(none)[Hello] #enum.item(auto)[Hello]
#enum.item(17)[Hello] #enum.item(17)[Hello]
--- issue-5503-enum-in-align --- --- issue-5503-enum-in-align ---