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

Partially automate span assignment in native show rule (#6613)

Browse Source
This commit is contained in:
Laurenz 2025-07-16 10:55:06 +02:00 committed by GitHub
parent c58766440c
commit 0a4b72f8f6
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 42 additions and 102 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
crates/typst-html/src/rules.rs
View File

@ -59,19 +59,11 @@ pub fn register(rules: &mut NativeRuleMap) {
rules.register::<FrameElem>(Paged, |elem, _, _| Ok(elem.body.clone())); rules.register::<FrameElem>(Paged, |elem, _, _| Ok(elem.body.clone()));
} }
const STRONG_RULE: ShowFn<StrongElem> = |elem, _, _| { const STRONG_RULE: ShowFn<StrongElem> =
Ok(HtmlElem::new(tag::strong) |elem, _, _| Ok(HtmlElem::new(tag::strong).with_body(Some(elem.body.clone())).pack());
.with_body(Some(elem.body.clone()))
.pack()
.spanned(elem.span()))
};
const EMPH_RULE: ShowFn<EmphElem> = |elem, _, _| { const EMPH_RULE: ShowFn<EmphElem> =
Ok(HtmlElem::new(tag::em) |elem, _, _| Ok(HtmlElem::new(tag::em).with_body(Some(elem.body.clone())).pack());
.with_body(Some(elem.body.clone()))
.pack()
.spanned(elem.span()))
};
const LIST_RULE: ShowFn<ListElem> = |elem, _, styles| { const LIST_RULE: ShowFn<ListElem> = |elem, _, styles| {
Ok(HtmlElem::new(tag::ul) Ok(HtmlElem::new(tag::ul)
@ -86,8 +78,7 @@ const LIST_RULE: ShowFn<ListElem> = |elem, _, styles| {
.pack() .pack()
.spanned(item.span()) .spanned(item.span())
})))) }))))
.pack() .pack())
.spanned(elem.span()))
}; };
const ENUM_RULE: ShowFn<EnumElem> = |elem, _, styles| { const ENUM_RULE: ShowFn<EnumElem> = |elem, _, styles| {
@ -114,7 +105,7 @@ const ENUM_RULE: ShowFn<EnumElem> = |elem, _, styles| {
li.with_body(Some(body)).pack().spanned(item.span()) li.with_body(Some(body)).pack().spanned(item.span())
})); }));
Ok(ol.with_body(Some(body)).pack().spanned(elem.span())) Ok(ol.with_body(Some(body)).pack())
}; };
const TERMS_RULE: ShowFn<TermsElem> = |elem, _, styles| { const TERMS_RULE: ShowFn<TermsElem> = |elem, _, styles| {
@ -166,8 +157,7 @@ const LINK_RULE: ShowFn<LinkElem> = |elem, engine, _| {
Ok(HtmlElem::new(tag::a) Ok(HtmlElem::new(tag::a)
.with_optional_attr(attr::href, href) .with_optional_attr(attr::href, href)
.with_body(Some(elem.body.clone())) .with_body(Some(elem.body.clone()))
.pack() .pack())
.spanned(elem.span()))
}; };
const HEADING_RULE: ShowFn<HeadingElem> = |elem, engine, styles| { const HEADING_RULE: ShowFn<HeadingElem> = |elem, engine, styles| {
@ -203,10 +193,9 @@ const HEADING_RULE: ShowFn<HeadingElem> = |elem, engine, styles| {
.with_attr(attr::role, "heading") .with_attr(attr::role, "heading")
.with_attr(attr::aria_level, eco_format!("{}", level + 1)) .with_attr(attr::aria_level, eco_format!("{}", level + 1))
.pack() .pack()
.spanned(span)
} else { } else {
let t = [tag::h2, tag::h3, tag::h4, tag::h5, tag::h6][level - 1]; let t = [tag::h2, tag::h3, tag::h4, tag::h5, tag::h6][level - 1];
HtmlElem::new(t).with_body(Some(realized)).pack().spanned(span) HtmlElem::new(t).with_body(Some(realized)).pack()
}) })
}; };
@ -225,17 +214,13 @@ const FIGURE_RULE: ShowFn<FigureElem> = |elem, _, styles| {
// Ensure that the body is considered a paragraph. // Ensure that the body is considered a paragraph.
realized += ParbreakElem::shared().clone().spanned(span); realized += ParbreakElem::shared().clone().spanned(span);
Ok(HtmlElem::new(tag::figure) Ok(HtmlElem::new(tag::figure).with_body(Some(realized)).pack())
.with_body(Some(realized))
.pack()
.spanned(span))
}; };
const FIGURE_CAPTION_RULE: ShowFn<FigureCaption> = |elem, engine, styles| { const FIGURE_CAPTION_RULE: ShowFn<FigureCaption> = |elem, engine, styles| {
Ok(HtmlElem::new(tag::figcaption) Ok(HtmlElem::new(tag::figcaption)
.with_body(Some(elem.realize(engine, styles)?)) .with_body(Some(elem.realize(engine, styles)?))
.pack() .pack())
.spanned(elem.span()))
}; };
const QUOTE_RULE: ShowFn<QuoteElem> = |elem, _, styles| { const QUOTE_RULE: ShowFn<QuoteElem> = |elem, _, styles| {
@ -376,19 +361,11 @@ fn show_cell(tag: HtmlTag, cell: &Cell, styles: StyleChain) -> Content {
.spanned(cell.span()) .spanned(cell.span())
} }
const SUB_RULE: ShowFn<SubElem> = |elem, _, _| { const SUB_RULE: ShowFn<SubElem> =
Ok(HtmlElem::new(tag::sub) |elem, _, _| Ok(HtmlElem::new(tag::sub).with_body(Some(elem.body.clone())).pack());
.with_body(Some(elem.body.clone()))
.pack()
.spanned(elem.span()))
};
const SUPER_RULE: ShowFn<SuperElem> = |elem, _, _| { const SUPER_RULE: ShowFn<SuperElem> =
Ok(HtmlElem::new(tag::sup) |elem, _, _| Ok(HtmlElem::new(tag::sup).with_body(Some(elem.body.clone())).pack());
.with_body(Some(elem.body.clone()))
.pack()
.spanned(elem.span()))
};
const UNDERLINE_RULE: ShowFn<UnderlineElem> = |elem, _, _| { const UNDERLINE_RULE: ShowFn<UnderlineElem> = |elem, _, _| {
// Note: In modern HTML, `<u>` is not the underline element, but // Note: In modern HTML, `<u>` is not the underline element, but
@ -427,8 +404,7 @@ const RAW_RULE: ShowFn<RawElem> = |elem, _, styles| {
Ok(HtmlElem::new(if elem.block.get(styles) { tag::pre } else { tag::code }) Ok(HtmlElem::new(if elem.block.get(styles) { tag::pre } else { tag::code })
.with_body(Some(Content::sequence(seq))) .with_body(Some(Content::sequence(seq)))
.pack() .pack())
.spanned(elem.span()))
}; };
const RAW_LINE_RULE: ShowFn<RawLine> = |elem, _, _| Ok(elem.body.clone()); const RAW_LINE_RULE: ShowFn<RawLine> = |elem, _, _| Ok(elem.body.clone());

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

@ -272,7 +272,7 @@ const HEADING_RULE: ShowFn<HeadingElem> = |elem, engine, styles| {
BlockElem::new().with_body(Some(BlockBody::Content(realized))) BlockElem::new().with_body(Some(BlockBody::Content(realized)))
}; };
Ok(block.pack().spanned(span)) Ok(block.pack())
}; };
const FIGURE_RULE: ShowFn<FigureElem> = |elem, _, styles| { const FIGURE_RULE: ShowFn<FigureElem> = |elem, _, styles| {
@ -326,8 +326,7 @@ const FIGURE_RULE: ShowFn<FigureElem> = |elem, _, styles| {
const FIGURE_CAPTION_RULE: ShowFn<FigureCaption> = |elem, engine, styles| { const FIGURE_CAPTION_RULE: ShowFn<FigureCaption> = |elem, engine, styles| {
Ok(BlockElem::new() Ok(BlockElem::new()
.with_body(Some(BlockBody::Content(elem.realize(engine, styles)?))) .with_body(Some(BlockBody::Content(elem.realize(engine, styles)?)))
.pack() .pack())
.spanned(elem.span()))
}; };
const QUOTE_RULE: ShowFn<QuoteElem> = |elem, _, styles| { const QUOTE_RULE: ShowFn<QuoteElem> = |elem, _, styles| {
@ -550,9 +549,7 @@ const BIBLIOGRAPHY_RULE: ShowFn<BibliographyElem> = |elem, engine, styles| {
}; };
const TABLE_RULE: ShowFn<TableElem> = |elem, _, _| { const TABLE_RULE: ShowFn<TableElem> = |elem, _, _| {
Ok(BlockElem::multi_layouter(elem.clone(), crate::grid::layout_table) Ok(BlockElem::multi_layouter(elem.clone(), crate::grid::layout_table).pack())
.pack()
.spanned(elem.span()))
}; };
const TABLE_CELL_RULE: ShowFn<TableCell> = |elem, _, styles| { const TABLE_CELL_RULE: ShowFn<TableCell> = |elem, _, styles| {
@ -703,27 +700,19 @@ const ALIGN_RULE: ShowFn<AlignElem> =
|elem, _, styles| Ok(elem.body.clone().aligned(elem.alignment.get(styles))); |elem, _, styles| Ok(elem.body.clone().aligned(elem.alignment.get(styles)));
const PAD_RULE: ShowFn<PadElem> = |elem, _, _| { const PAD_RULE: ShowFn<PadElem> = |elem, _, _| {
Ok(BlockElem::multi_layouter(elem.clone(), crate::pad::layout_pad) Ok(BlockElem::multi_layouter(elem.clone(), crate::pad::layout_pad).pack())
.pack()
.spanned(elem.span()))
}; };
const COLUMNS_RULE: ShowFn<ColumnsElem> = |elem, _, _| { const COLUMNS_RULE: ShowFn<ColumnsElem> = |elem, _, _| {
Ok(BlockElem::multi_layouter(elem.clone(), crate::flow::layout_columns) Ok(BlockElem::multi_layouter(elem.clone(), crate::flow::layout_columns).pack())
.pack()
.spanned(elem.span()))
}; };
const STACK_RULE: ShowFn<StackElem> = |elem, _, _| { const STACK_RULE: ShowFn<StackElem> = |elem, _, _| {
Ok(BlockElem::multi_layouter(elem.clone(), crate::stack::layout_stack) Ok(BlockElem::multi_layouter(elem.clone(), crate::stack::layout_stack).pack())
.pack()
.spanned(elem.span()))
}; };
const GRID_RULE: ShowFn<GridElem> = |elem, _, _| { const GRID_RULE: ShowFn<GridElem> = |elem, _, _| {
Ok(BlockElem::multi_layouter(elem.clone(), crate::grid::layout_grid) Ok(BlockElem::multi_layouter(elem.clone(), crate::grid::layout_grid).pack())
.pack()
.spanned(elem.span()))
}; };
const GRID_CELL_RULE: ShowFn<GridCell> = |elem, _, styles| { const GRID_CELL_RULE: ShowFn<GridCell> = |elem, _, styles| {
@ -753,33 +742,23 @@ fn show_cell(
} }
const MOVE_RULE: ShowFn<MoveElem> = |elem, _, _| { const MOVE_RULE: ShowFn<MoveElem> = |elem, _, _| {
Ok(BlockElem::single_layouter(elem.clone(), crate::transforms::layout_move) Ok(BlockElem::single_layouter(elem.clone(), crate::transforms::layout_move).pack())
.pack()
.spanned(elem.span()))
}; };
const SCALE_RULE: ShowFn<ScaleElem> = |elem, _, _| { const SCALE_RULE: ShowFn<ScaleElem> = |elem, _, _| {
Ok(BlockElem::single_layouter(elem.clone(), crate::transforms::layout_scale) Ok(BlockElem::single_layouter(elem.clone(), crate::transforms::layout_scale).pack())
.pack()
.spanned(elem.span()))
}; };
const ROTATE_RULE: ShowFn<RotateElem> = |elem, _, _| { const ROTATE_RULE: ShowFn<RotateElem> = |elem, _, _| {
Ok(BlockElem::single_layouter(elem.clone(), crate::transforms::layout_rotate) Ok(BlockElem::single_layouter(elem.clone(), crate::transforms::layout_rotate).pack())
.pack()
.spanned(elem.span()))
}; };
const SKEW_RULE: ShowFn<SkewElem> = |elem, _, _| { const SKEW_RULE: ShowFn<SkewElem> = |elem, _, _| {
Ok(BlockElem::single_layouter(elem.clone(), crate::transforms::layout_skew) Ok(BlockElem::single_layouter(elem.clone(), crate::transforms::layout_skew).pack())
.pack()
.spanned(elem.span()))
}; };
const REPEAT_RULE: ShowFn<RepeatElem> = |elem, _, _| { const REPEAT_RULE: ShowFn<RepeatElem> = |elem, _, _| {
Ok(BlockElem::single_layouter(elem.clone(), crate::repeat::layout_repeat) Ok(BlockElem::single_layouter(elem.clone(), crate::repeat::layout_repeat).pack())
.pack()
.spanned(elem.span()))
}; };
const HIDE_RULE: ShowFn<HideElem> = const HIDE_RULE: ShowFn<HideElem> =
@ -801,83 +780,66 @@ const LAYOUT_RULE: ShowFn<LayoutElem> = |elem, _, _| {
crate::flow::layout_fragment(engine, &result, locator, styles, regions) crate::flow::layout_fragment(engine, &result, locator, styles, regions)
}, },
) )
.pack() .pack())
.spanned(elem.span()))
}; };
const IMAGE_RULE: ShowFn<ImageElem> = |elem, _, styles| { const IMAGE_RULE: ShowFn<ImageElem> = |elem, _, styles| {
Ok(BlockElem::single_layouter(elem.clone(), crate::image::layout_image) Ok(BlockElem::single_layouter(elem.clone(), crate::image::layout_image)
.with_width(elem.width.get(styles)) .with_width(elem.width.get(styles))
.with_height(elem.height.get(styles)) .with_height(elem.height.get(styles))
.pack() .pack())
.spanned(elem.span()))
}; };
const LINE_RULE: ShowFn<LineElem> = |elem, _, _| { const LINE_RULE: ShowFn<LineElem> = |elem, _, _| {
Ok(BlockElem::single_layouter(elem.clone(), crate::shapes::layout_line) Ok(BlockElem::single_layouter(elem.clone(), crate::shapes::layout_line).pack())
.pack()
.spanned(elem.span()))
}; };
const RECT_RULE: ShowFn<RectElem> = |elem, _, styles| { const RECT_RULE: ShowFn<RectElem> = |elem, _, styles| {
Ok(BlockElem::single_layouter(elem.clone(), crate::shapes::layout_rect) Ok(BlockElem::single_layouter(elem.clone(), crate::shapes::layout_rect)
.with_width(elem.width.get(styles)) .with_width(elem.width.get(styles))
.with_height(elem.height.get(styles)) .with_height(elem.height.get(styles))
.pack() .pack())
.spanned(elem.span()))
}; };
const SQUARE_RULE: ShowFn<SquareElem> = |elem, _, styles| { const SQUARE_RULE: ShowFn<SquareElem> = |elem, _, styles| {
Ok(BlockElem::single_layouter(elem.clone(), crate::shapes::layout_square) Ok(BlockElem::single_layouter(elem.clone(), crate::shapes::layout_square)
.with_width(elem.width.get(styles)) .with_width(elem.width.get(styles))
.with_height(elem.height.get(styles)) .with_height(elem.height.get(styles))
.pack() .pack())
.spanned(elem.span()))
}; };
const ELLIPSE_RULE: ShowFn<EllipseElem> = |elem, _, styles| { const ELLIPSE_RULE: ShowFn<EllipseElem> = |elem, _, styles| {
Ok(BlockElem::single_layouter(elem.clone(), crate::shapes::layout_ellipse) Ok(BlockElem::single_layouter(elem.clone(), crate::shapes::layout_ellipse)
.with_width(elem.width.get(styles)) .with_width(elem.width.get(styles))
.with_height(elem.height.get(styles)) .with_height(elem.height.get(styles))
.pack() .pack())
.spanned(elem.span()))
}; };
const CIRCLE_RULE: ShowFn<CircleElem> = |elem, _, styles| { const CIRCLE_RULE: ShowFn<CircleElem> = |elem, _, styles| {
Ok(BlockElem::single_layouter(elem.clone(), crate::shapes::layout_circle) Ok(BlockElem::single_layouter(elem.clone(), crate::shapes::layout_circle)
.with_width(elem.width.get(styles)) .with_width(elem.width.get(styles))
.with_height(elem.height.get(styles)) .with_height(elem.height.get(styles))
.pack() .pack())
.spanned(elem.span()))
}; };
const POLYGON_RULE: ShowFn<PolygonElem> = |elem, _, _| { const POLYGON_RULE: ShowFn<PolygonElem> = |elem, _, _| {
Ok(BlockElem::single_layouter(elem.clone(), crate::shapes::layout_polygon) Ok(BlockElem::single_layouter(elem.clone(), crate::shapes::layout_polygon).pack())
.pack()
.spanned(elem.span()))
}; };
const CURVE_RULE: ShowFn<CurveElem> = |elem, _, _| { const CURVE_RULE: ShowFn<CurveElem> = |elem, _, _| {
Ok(BlockElem::single_layouter(elem.clone(), crate::shapes::layout_curve) Ok(BlockElem::single_layouter(elem.clone(), crate::shapes::layout_curve).pack())
.pack()
.spanned(elem.span()))
}; };
const PATH_RULE: ShowFn<PathElem> = |elem, _, _| { const PATH_RULE: ShowFn<PathElem> = |elem, _, _| {
Ok(BlockElem::single_layouter(elem.clone(), crate::shapes::layout_path) Ok(BlockElem::single_layouter(elem.clone(), crate::shapes::layout_path).pack())
.pack()
.spanned(elem.span()))
}; };
const EQUATION_RULE: ShowFn<EquationElem> = |elem, _, styles| { const EQUATION_RULE: ShowFn<EquationElem> = |elem, _, styles| {
if elem.block.get(styles) { if elem.block.get(styles) {
Ok(BlockElem::multi_layouter(elem.clone(), crate::math::layout_equation_block) Ok(BlockElem::multi_layouter(elem.clone(), crate::math::layout_equation_block)
.pack() .pack())
.spanned(elem.span()))
} else { } else {
Ok(InlineElem::layouter(elem.clone(), crate::math::layout_equation_inline) Ok(InlineElem::layouter(elem.clone(), crate::math::layout_equation_inline).pack())
.pack()
.spanned(elem.span()))
} }
}; };

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

@ -374,7 +374,9 @@ fn visit_show_rules<'a>(
} }
// Apply a built-in show rule. // Apply a built-in show rule.
ShowStep::Builtin(rule) => rule.apply(&output, s.engine, chained), ShowStep::Builtin(rule) => rule
.apply(&output, s.engine, chained)
.map(|content| content.spanned(output.span())),
}; };
// Errors in show rules don't terminate compilation immediately. We just // Errors in show rules don't terminate compilation immediately. We just