summaryrefslogtreecommitdiff
path: root/crates
diff options
context:
space:
mode:
authorEmmett Rayes <109030944+emmett-rayes@users.noreply.github.com>2023-12-18 18:25:28 +0100
committerGitHub <noreply@github.com>2023-12-18 18:25:28 +0100
commit6808e58a3bb2782c49517c02634b65d85fe28664 (patch)
tree02c2dde57299115765a1e15857ad830eaa865058 /crates
parent1f983ced90f1660958eb9ec9854dbbc2b3aa3509 (diff)
Cycle list markers by default (#2788)
Co-authored-by: Laurenz <laurmaedje@gmail.com>
Diffstat (limited to 'crates')
-rw-r--r--crates/typst/src/model/list.rs13
1 files changed, 10 insertions, 3 deletions
diff --git a/crates/typst/src/model/list.rs b/crates/typst/src/model/list.rs
index 623cafa2..afbf9472 100644
--- a/crates/typst/src/model/list.rs
+++ b/crates/typst/src/model/list.rs
@@ -69,7 +69,7 @@ pub struct ListElem {
///
/// Instead of plain content, you can also pass an array with multiple
/// markers that should be used for nested lists. If the list nesting depth
- /// exceeds the number of markers, the last one is repeated. For total
+ /// exceeds the number of markers, the markers are cycled. For total
/// control, you may pass a function that maps the list's nesting depth
/// (starting from `{0}`) to a desired marker.
///
@@ -85,7 +85,14 @@ pub struct ListElem {
/// - Items
/// ```
#[borrowed]
- #[default(ListMarker::Content(vec![TextElem::packed('•')]))]
+ #[default(ListMarker::Content(vec![
+ // These are all available in the default font, vertically centered, and
+ // roughly of the same size (with the last one having slightly lower
+ // weight because it is not filled).
+ TextElem::packed('\u{2022}'), // Bullet
+ TextElem::packed('\u{2023}'), // Triangular Bullet
+ TextElem::packed('\u{2013}'), // En-dash
+ ]))]
pub marker: ListMarker,
/// The indent of each item.
@@ -202,7 +209,7 @@ impl ListMarker {
fn resolve(&self, engine: &mut Engine, depth: usize) -> SourceResult<Content> {
Ok(match self {
Self::Content(list) => {
- list.get(depth).or(list.last()).cloned().unwrap_or_default()
+ list.get(depth % list.len()).cloned().unwrap_or_default()
}
Self::Func(func) => func.call(engine, [depth])?.display(),
})