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

feat: mark numbering prefix of heading and outline as Lbl

Browse Source
This commit is contained in:
Tobias Schmitz 2025-07-14 17:11:02 +02:00
parent 0df9da7ce6
commit 451b0815ff
No known key found for this signature in database
4 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
crates/typst-layout/src/rules.rs
View File

@ -275,7 +275,7 @@ const HEADING_RULE: ShowFn<HeadingElem> = |elem, engine, styles| {
let spacing = HElem::new(SPACING_TO_NUMBERING.into()).with_weak(true).pack(); let spacing = HElem::new(SPACING_TO_NUMBERING.into()).with_weak(true).pack();
realized = numbering + spacing + realized; realized = PdfMarkerTag::Label(numbering) + spacing + realized;
} }
let block = if indent != Abs::zero() { let block = if indent != Abs::zero() {
@ -477,7 +477,6 @@ const OUTLINE_ENTRY_RULE: ShowFn<OutlineEntry> = |elem, engine, styles| {
let context = Context::new(None, Some(styles)); let context = Context::new(None, Some(styles));
let context = context.track(); let context = context.track();
// TODO(accessibility): prefix should be wrapped in a `Lbl` structure element
let prefix = elem.prefix(engine, context, span)?; let prefix = elem.prefix(engine, context, span)?;
let body = elem.body().at(span)?; let body = elem.body().at(span)?;
let page = elem.page(engine, context, span)?; let page = elem.page(engine, context, span)?;

3
crates/typst-library/src/model/outline.rs
View File

@ -21,6 +21,7 @@ use crate::layout::{
RepeatElem, Sides, RepeatElem, Sides,
}; };
use crate::model::{HeadingElem, NumberingPattern, ParElem, Refable}; use crate::model::{HeadingElem, NumberingPattern, ParElem, Refable};
use crate::pdf::PdfMarkerTag;
use crate::text::{LocalName, SpaceElem, TextElem}; use crate::text::{LocalName, SpaceElem, TextElem};
/// A table of contents, figures, or other elements. /// A table of contents, figures, or other elements.
@ -493,7 +494,7 @@ impl OutlineEntry {
let styles = context.styles().at(span)?; let styles = context.styles().at(span)?;
let numbers = let numbers =
outlinable.counter().display_at_loc(engine, loc, styles, numbering)?; outlinable.counter().display_at_loc(engine, loc, styles, numbering)?;
Ok(Some(outlinable.prefix(numbers))) Ok(Some(PdfMarkerTag::Label(outlinable.prefix(numbers))))
} }
/// Creates the default inner content of the entry. /// Creates the default inner content of the entry.

2
crates/typst-library/src/pdf/accessibility.rs
View File

@ -138,4 +138,6 @@ pdf_marker_tag! {
ListItemLabel, ListItemLabel,
/// `LBody` of the enum item /// `LBody` of the enum item
ListItemBody, ListItemBody,
/// A generic `Lbl`
Label,
} }

1
crates/typst-pdf/src/tags/mod.rs
View File

@ -69,6 +69,7 @@ pub(crate) fn handle_start(
push_stack(gc, loc, StackEntryKind::ListItemBody)?; push_stack(gc, loc, StackEntryKind::ListItemBody)?;
return Ok(()); return Ok(());
} }
PdfMarkerTagKind::Label => TagKind::Lbl.into(),
} }
} else if let Some(entry) = elem.to_packed::<OutlineEntry>() { } else if let Some(entry) = elem.to_packed::<OutlineEntry>() {
push_stack(gc, loc, StackEntryKind::OutlineEntry(entry.clone()))?; push_stack(gc, loc, StackEntryKind::OutlineEntry(entry.clone()))?;