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

Prepend section numbers to headings in HTML output. (#5522)

Browse Source
This commit is contained in:
Michael Färber 2024-12-04 17:55:37 +01:00 committed by GitHub
parent bf1c7db6fc
commit 60f1d8f9b5
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 22 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
crates/typst-library/src/model/heading.rs
View File

@ -217,21 +217,7 @@ impl Synthesize for Packed<HeadingElem> {
impl Show for Packed<HeadingElem> { impl Show for Packed<HeadingElem> {
#[typst_macros::time(name = "heading", span = self.span())] #[typst_macros::time(name = "heading", span = self.span())]
fn show(&self, engine: &mut Engine, styles: StyleChain) -> SourceResult<Content> { fn show(&self, engine: &mut Engine, styles: StyleChain) -> SourceResult<Content> {
if TargetElem::target_in(styles).is_html() { let html = TargetElem::target_in(styles).is_html();
// HTML's h1 is closer to a title element. There should only be one.
// Meanwhile, a level 1 Typst heading is a section heading. For this
// reason, levels are offset by one: A Typst level 1 heading becomes
// a `<h2>`.
let level = self.resolve_level(styles);
let t = [tag::h2, tag::h3, tag::h4, tag::h5, tag::h6][level.get().min(5) - 1];
// TODO: Don't ignore the various non-body properties.
let body = self.body().clone();
return Ok(HtmlElem::new(t)
.with_body(Some(body))
.pack()
.spanned(self.span()));
}
const SPACING_TO_NUMBERING: Em = Em::new(0.3); const SPACING_TO_NUMBERING: Em = Em::new(0.3);
@ -250,7 +236,7 @@ impl Show for Packed<HeadingElem> {
.display_at_loc(engine, location, styles, numbering)? .display_at_loc(engine, location, styles, numbering)?
.spanned(span); .spanned(span);
if hanging_indent.is_auto() { if hanging_indent.is_auto() && !html {
let pod = Region::new(Axes::splat(Abs::inf()), Axes::splat(false)); let pod = Region::new(Axes::splat(Abs::inf()), Axes::splat(false));
// We don't have a locator for the numbering here, so we just // We don't have a locator for the numbering here, so we just
@ -268,19 +254,31 @@ impl Show for Packed<HeadingElem> {
indent = size.x + SPACING_TO_NUMBERING.resolve(styles); indent = size.x + SPACING_TO_NUMBERING.resolve(styles);
} }
realized = numbering let spacing = if html {
+ HElem::new(SPACING_TO_NUMBERING.into()).with_weak(true).pack() SpaceElem::shared().clone()
+ realized; } else {
HElem::new(SPACING_TO_NUMBERING.into()).with_weak(true).pack()
};
realized = numbering + spacing + realized;
} }
if indent != Abs::zero() { if indent != Abs::zero() && !html {
realized = realized.styled(ParElem::set_hanging_indent(indent.into())); realized = realized.styled(ParElem::set_hanging_indent(indent.into()));
} }
Ok(BlockElem::new() Ok(if html {
.with_body(Some(BlockBody::Content(realized))) // HTML's h1 is closer to a title element. There should only be one.
.pack() // Meanwhile, a level 1 Typst heading is a section heading. For this
.spanned(span)) // reason, levels are offset by one: A Typst level 1 heading becomes
// a `<h2>`.
let level = self.resolve_level(styles);
let t = [tag::h2, tag::h3, tag::h4, tag::h5, tag::h6][level.get().min(5) - 1];
HtmlElem::new(t).with_body(Some(realized)).pack().spanned(span)
} else {
let realized = BlockBody::Content(realized);
BlockElem::new().with_body(Some(realized)).pack().spanned(span)
})
} }
} }