Merge 01f73c35ed279d26678fe9c991ef55a0e44a1b76 into 5661c20580584d86897d139cdeffd6fb1a9a6d5c

2025-07-29 23:37:55 +08:00 · 2025-07-17 02:22:58 +08:00
3 changed files with 3 additions and 28 deletions
--- a/crates/typst-html/src/rules.rs
+++ b/crates/typst-html/src/rules.rs
@ -14,8 +14,8 @@ use typst_library::model::{
    RefElem, StrongElem, TableCell, TableElem, TermsElem,
 };
 use typst_library::text::{
-    HighlightElem, LinebreakElem, OverlineElem, RawElem, RawLine, SmallcapsElem,
+    HighlightElem, LinebreakElem, OverlineElem, RawElem, RawLine, SpaceElem, StrikeElem,
-    SpaceElem, StrikeElem, SubElem, SuperElem, UnderlineElem,
+    SubElem, SuperElem, UnderlineElem,
 };
 use typst_library::visualize::ImageElem;
@ -47,7 +47,6 @@ pub fn register(rules: &mut NativeRuleMap) {
    rules.register(Html, OVERLINE_RULE);
    rules.register(Html, STRIKE_RULE);
    rules.register(Html, HIGHLIGHT_RULE);
    rules.register(Html, SMALLCAPS_RULE);
    rules.register(Html, RAW_RULE);
    rules.register(Html, RAW_LINE_RULE);
@ -391,20 +390,6 @@ const STRIKE_RULE: ShowFn<StrikeElem> =
 const HIGHLIGHT_RULE: ShowFn<HighlightElem> =
    |elem, _, _| Ok(HtmlElem::new(tag::mark).with_body(Some(elem.body.clone())).pack());
 const SMALLCAPS_RULE: ShowFn<SmallcapsElem> = |elem, _, styles| {
    Ok(HtmlElem::new(tag::span)
        .with_attr(
            attr::style,
            if elem.all.get(styles) {
                "font-variant-caps: all-small-caps"
            } else {
                "font-variant-caps: small-caps"
            },
        )
        .with_body(Some(elem.body.clone()))
        .pack())
 };
 const RAW_RULE: ShowFn<RawElem> = |elem, _, styles| {
    let lines = elem.lines.as_deref().unwrap_or_default();
--- a/tests/ref/html/smallcaps-all.html
+++ b/tests/ref/html/smallcaps-all.html
@ -1,10 +0,0 @@
 <!DOCTYPE html>
 <html>
  <head>
    <meta charset="utf-8">
    <meta name="viewport" content="width=device-width, initial-scale=1">
  </head>
  <body>
    <p><span style="font-variant-caps: small-caps">Test 012</span><br><span style="font-variant-caps: all-small-caps">Test 012</span></p>
  </body>
 </html>
--- a/tests/suite/text/smallcaps.typ
+++ b/tests/suite/text/smallcaps.typ
@ -11,6 +11,6 @@
 #show smallcaps: set text(fill: red)
 #smallcaps[Smallcaps]
--- smallcaps-all render html ---
+--- smallcaps-all ---
 #smallcaps(all: false)[Test 012] \
 #smallcaps(all: true)[Test 012]