caisin/typst
1
0
Fork 0
mirror of https://github.com/typst/typst synced 2025-07-30 07:47:55 +08:00
Code Issues Packages Projects Releases Wiki Activity

Minimal tag work

Browse Source
This commit is contained in:
Laurenz 2025-07-18 12:32:29 +02:00
parent 94cf897d37
commit 88c234eb44
1 changed files with 25 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
crates/typst-realize/src/lib.rs
View File

@ -336,6 +336,21 @@ fn visit_kind_rules<'a>(
Ok(false) Ok(false)
} }
fn visit_with_tags_minimal<'a>(
s: &mut State<'a, '_, '_, '_>,
content: &'a Content,
styles: StyleChain<'a>,
) -> SourceResult<()> {
let mut elem = content.clone();
let key = typst_utils::hash128(&elem);
let loc = s.locator.next_location(s.engine.introspector, key);
elem.set_location(loc);
visit(s, s.store(TagElem::packed(Tag::Start(elem.clone()))), styles)?;
elem.mark_prepared();
visit(s, s.store(TagElem::packed(Tag::End(loc, key))), styles)?;
visit(s, s.store(elem), styles)
}
/// Tries to apply show rules to or prepare content. Returns `true` if the /// Tries to apply show rules to or prepare content. Returns `true` if the
/// element was handled. /// element was handled.
fn visit_show_rules<'a>( fn visit_show_rules<'a>(
@ -346,7 +361,12 @@ fn visit_show_rules<'a>(
// Determines whether and how to proceed with show rule application. // Determines whether and how to proceed with show rule application.
let Some(Verdict { prepared, mut map, step }) = verdict(s.engine, content, styles) let Some(Verdict { prepared, mut map, step }) = verdict(s.engine, content, styles)
else { else {
return Ok(false); if !content.is_prepared() && locatable(content) {
visit_with_tags_minimal(s, content, styles)?;
return Ok(true);
} else {
return Ok(false);
}
}; };
// Create a fresh copy that we can mutate. // Create a fresh copy that we can mutate.
@ -506,7 +526,7 @@ fn verdict<'a>(
elem.label().is_none() elem.label().is_none()
&& elem.location().is_none() && elem.location().is_none()
&& !elem.can::<dyn ShowSet>() && !elem.can::<dyn ShowSet>()
&& !locatable(elem) && !elem.can::<dyn Locatable>()
&& !elem.can::<dyn Synthesize>() && !elem.can::<dyn Synthesize>()
}) })
{ {
@ -535,7 +555,9 @@ fn prepare(
// The element could already have a location even if it is not prepared // The element could already have a location even if it is not prepared
// when it stems from a query. // when it stems from a query.
let key = typst_utils::hash128(&elem); let key = typst_utils::hash128(&elem);
if elem.location().is_none() && (locatable(elem) || elem.label().is_some()) { if elem.location().is_none()
&& (elem.can::<dyn Locatable>() || elem.label().is_some())
{
let loc = locator.next_location(engine.introspector, key); let loc = locator.next_location(engine.introspector, key);
elem.set_location(loc); elem.set_location(loc);
} }