From 1f8128111825410fdfcea056448fb37fe92a589e Mon Sep 17 00:00:00 2001 From: Leedehai <18319900+Leedehai@users.noreply.github.com> Date: Mon, 5 Aug 2024 06:04:35 -0400 Subject: [PATCH] Fix the show rule effect for bibliography heading level (#4622) --- crates/typst/src/model/bibliography.rs | 2 +- ...issue-4618-bibliography-set-heading-level.png | Bin 0 -> 5227 bytes tests/suite/model/bibliography.typ | 13 +++++++++++++ 3 files changed, 14 insertions(+), 1 deletion(-) create mode 100644 tests/ref/issue-4618-bibliography-set-heading-level.png diff --git a/crates/typst/src/model/bibliography.rs b/crates/typst/src/model/bibliography.rs index ed593d45..71616616 100644 --- a/crates/typst/src/model/bibliography.rs +++ b/crates/typst/src/model/bibliography.rs @@ -217,7 +217,7 @@ impl Show for Packed { }) { seq.push( HeadingElem::new(title) - .with_level(Smart::Custom(NonZeroUsize::ONE)) + .with_depth(NonZeroUsize::ONE) .pack() .spanned(self.span()), ); diff --git a/tests/ref/issue-4618-bibliography-set-heading-level.png b/tests/ref/issue-4618-bibliography-set-heading-level.png new file mode 100644 index 0000000000000000000000000000000000000000..29a4e51741b06126efcec3f3a1b2bc91a629633b GIT binary patch literal 5227 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 literal 0 HcmV?d00001 diff --git a/tests/suite/model/bibliography.typ b/tests/suite/model/bibliography.typ index 7197082f..18c62620 100644 --- a/tests/suite/model/bibliography.typ +++ b/tests/suite/model/bibliography.typ @@ -53,3 +53,16 @@ Now we have multiple bibliographies containing @glacier-melt @keshav2007read @Zee04 #bibliography("/assets/bib/works_too.bib", style: "mla") + +--- issue-4618-bibliography-set-heading-level --- +// Test that the bibliography block's heading is set to 2 by the show rule, +// and therefore should be rendered like a level-2 heading. Notably, this +// bibliography heading should not be underlined. +#show heading.where(level: 1): it => [ #underline(it.body) ] +#show bibliography: set heading(level: 2) + += Level 1 +== Level 2 +@Zee04 + +#bibliography("/assets/bib/works_too.bib")