Merge 01f73c35ed279d26678fe9c991ef55a0e44a1b76 into 627f5b9d4f39f91affc529f276bb500d42887dae

Add show rule for smallcaps in HTML (#6600 )
Fix test spans for real
2025-07-28 14:57:54 +08:00 · 2025-07-18 12:24:07 +08:00 · 2025-07-17 16:09:13 +00:00 · 2025-06-11 16:42:00 +02:00 · 2025-06-11 16:37:03 +02:00 · 2025-06-11 16:33:26 +02:00
7 changed files with 64 additions and 4 deletions
--- a/crates/typst-eval/src/code.rs
+++ b/crates/typst-eval/src/code.rs
@ -7,6 +7,7 @@ use typst_library::foundations::{
 };
 use typst_library::introspection::{Counter, State};
 use typst_syntax::ast::{self, AstNode};
+use typst_syntax::Span;
 use typst_utils::singleton;

 use crate::{CapturesVisitor, Eval, FlowEvent, Vm};
@ -284,8 +285,19 @@ impl Eval for ast::CodeBlock<'_> {
    type Output = Value;

    fn eval(self, vm: &mut Vm) -> SourceResult<Self::Output> {
+        let body = self.body();
+        match body.exprs().next_back() {
+            Some(expr @ ast::Expr::ShowRule(_)) => {
+                warn_for_useless_rule(&mut vm.engine, expr.span(), "show")
+            }
+            Some(expr @ ast::Expr::SetRule(_)) => {
+                warn_for_useless_rule(&mut vm.engine, expr.span(), "set")
+            }
+            _ => {}
+        }
+
        vm.scopes.enter();
-        let output = self.body().eval(vm)?;
+        let output = body.eval(vm)?;
        vm.scopes.exit();
        Ok(output)
    }
@ -393,3 +405,12 @@ fn warn_for_discarded_content(engine: &mut Engine, event: &FlowEvent, joined: &V

    engine.sink.warn(warning);
 }
+
+/// Emits a warning when a set or show rule has no effect.
+fn warn_for_useless_rule(engine: &mut Engine, span: Span, kind: &str) {
+    engine.sink.warn(warning!(
+        span,
+        "{kind} rule has no effect";
+        hint: "a {kind} rule is only in effect until the end of the surrounding code block"
+    ));
+}
--- 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, SpaceElem, StrikeElem,
-    SubElem, SuperElem, UnderlineElem,
+    HighlightElem, LinebreakElem, OverlineElem, RawElem, RawLine, SmallcapsElem,
+    SpaceElem, StrikeElem, SubElem, SuperElem, UnderlineElem,
 };
 use typst_library::visualize::ImageElem;

@ -47,6 +47,7 @@ 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);

@ -390,6 +391,20 @@ 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
@ -0,0 +1,10 @@
+<!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/foundations/context.typ
+++ b/tests/suite/foundations/context.typ
@ -48,4 +48,5 @@
  let n = query(<a>).len()
  let fonts = ("nope", "Roboto")
  set text(font: fonts.at(n))
+  []
 }
--- a/tests/suite/model/document.typ
+++ b/tests/suite/model/document.typ
@ -51,4 +51,5 @@ Hello
 #context {
  set document(author: "Changed") if "Normal" in document.author
  set document(title: "Changed") if document.title ==  "Normal"
+  []
 }
--- a/tests/suite/styling/in-block.typ
+++ b/tests/suite/styling/in-block.typ
@ -0,0 +1,12 @@
+--- warn-show-set-last-in-block ---
+#{
+  // Warning: 3-16 show rule has no effect
+  // Hint: 3-16 a show rule is only in effect until the end of the surrounding code block
+  show "a": "b"
+}
+
+#{
+  // Warning: 3-17 set rule has no effect
+  // Hint: 3-17 a set rule is only in effect until the end of the surrounding code block
+  set text(blue)
+}
--- 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 ---
+--- smallcaps-all render html ---
 #smallcaps(all: false)[Test 012] \
 #smallcaps(all: true)[Test 012]
Author	SHA1	Message	Date
T0mstone	5953a60f06	Merge 01f73c35ed279d26678fe9c991ef55a0e44a1b76 into 627f5b9d4f39f91affc529f276bb500d42887dae	2025-07-18 12:24:07 +08:00
Lachlan Kermode	627f5b9d4f	Add show rule for smallcaps in HTML (#6600 )	2025-07-17 16:09:13 +00:00
T0mstone	01f73c35ed	Fix test spans for real Haste is the enemy of correctness	2025-06-11 16:42:00 +02:00
T0mstone	fb0b01d45c	Fix test spans	2025-06-11 16:37:03 +02:00
T0mstone	801b689dae	Apply suggestions Co-authored-by: Laurenz <laurmaedje@gmail.com>	2025-06-11 16:33:26 +02:00
T0mstone	d799a4207b	Change test fix to empty content	2025-06-11 14:36:09 +02:00
T0mstone	72c219d24a	Suppress warning in tests	2025-06-11 14:26:23 +02:00
T0mstone	ea3ca30a65	Merge branch 'main' into warn-last-show	2025-06-11 14:16:42 +02:00
T0mstone	a517a08d2f	Warn on last show/set rule in block	2025-03-22 22:31:51 +01:00