Skip locatables

Make pretty much everything locatable
Add show rule for smallcaps in HTML (#6600 )
2025-07-30 15:57:54 +08:00 · 2025-07-18 11:22:16 +02:00 · 2025-07-18 11:22:16 +02:00 · 2025-07-17 16:09:13 +00:00 · 2025-07-16 16:15:49 +00:00
4 changed files with 36 additions and 10 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, 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/crates/typst-library/src/foundations/selector.rs
+++ b/crates/typst-library/src/foundations/selector.rs
@ -37,13 +37,12 @@ pub use crate::__select_where as select_where;

 /// A filter for selecting elements within the document.
 ///
-/// You can construct a selector in the following ways:
-/// - you can use an element [function]
-/// - you can filter for an element function with
-///   [specific fields]($function.where)
-/// - you can use a [string]($str) or [regular expression]($regex)
-/// - you can use a [`{<label>}`]($label)
-/// - you can use a [`location`]
+/// To construct a selector you can:
+/// - use an element [function]
+/// - filter for an element function with [specific fields]($function.where)
+/// - use a [string]($str) or [regular expression]($regex)
+/// - use a [`{<label>}`]($label)
+/// - use a [`location`]
 /// - call the [`selector`] constructor to convert any of the above types into a
 ///   selector value and use the methods below to refine it
 ///
@ -148,7 +147,9 @@ impl Selector {
 impl Selector {
    /// Turns a value into a selector. The following values are accepted:
    /// - An element function like a `heading` or `figure`.
+    /// - A [string]($str) or [regular expression]($regex).
    /// - A `{<label>}`.
+    /// - A [`location`].
    /// - A more complex selector like `{heading.where(level: 1)}`.
    #[func(constructor)]
    pub fn construct(
--- 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/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
Laurenz	34116cddf6	Skip locatables	2025-07-18 11:22:16 +02:00
Laurenz	70386c10f7	Make pretty much everything locatable	2025-07-18 11:22:16 +02:00
Lachlan Kermode	627f5b9d4f	Add show rule for smallcaps in HTML (#6600 )	2025-07-17 16:09:13 +00:00
Robin	5661c20580	Slightly improve selector docs (#6544 )	2025-07-16 16:15:49 +00:00