Merge c09a6a9213c11096e96cdcb780548cb5c86f52d8 into 627f5b9d4f39f91affc529f276bb500d42887dae

Add show rule for smallcaps in HTML (#6600 )
Merge branch 'main' into main
2025-08-05 10:47:54 +08:00 · 2025-07-17 12:15:57 -04:00 · 2025-07-17 16:09:13 +00:00 · 2025-07-15 11:21:45 +03:00 · 2025-07-11 17:58:03 +03:00 · 2025-07-10 21:37:01 +03:00
5 changed files with 38 additions and 3 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/text/lang.rs
+++ b/crates/typst-library/src/text/lang.rs
@ -37,6 +37,7 @@ const TRANSLATIONS: &[(&str, &str)] = &[
    translation!("it"),
    translation!("ja"),
    translation!("la"),
+    translation!("lt"),
    translation!("lv"),
    translation!("nb"),
    translation!("nl"),
@ -90,6 +91,7 @@ impl Lang {
    pub const JAPANESE: Self = Self(*b"ja ", 2);
    pub const LATIN: Self = Self(*b"la ", 2);
    pub const LATVIAN: Self = Self(*b"lv ", 2);
+    pub const LITHUANIAN: Self = Self(*b"lt ", 2);
    pub const LOWER_SORBIAN: Self = Self(*b"dsb", 3);
    pub const NYNORSK: Self = Self(*b"nn ", 2);
    pub const POLISH: Self = Self(*b"pl ", 2);
--- a/crates/typst-library/translations/lt.txt
+++ b/crates/typst-library/translations/lt.txt
@ -0,0 +1,8 @@
+figure = Pav.
+table = Lent.
+equation = Lygt.
+bibliography = Literatūra
+heading = Antraštė
+outline = Turinys
+raw = Kodo fragmentas
+page = Psl.
--- 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
pog102	2b27d4a331	Merge c09a6a9213c11096e96cdcb780548cb5c86f52d8 into 627f5b9d4f39f91affc529f276bb500d42887dae	2025-07-17 12:15:57 -04:00
Lachlan Kermode	627f5b9d4f	Add show rule for smallcaps in HTML (#6600 )	2025-07-17 16:09:13 +00:00
pog102	c09a6a9213	Merge branch 'main' into main	2025-07-15 11:21:45 +03:00
pog102	bb85b59aef	forgot to add the constant	2025-07-11 17:58:03 +03:00
pog102	87c46e0145	Add Lithuanian translations some translations needed	2025-07-10 21:37:01 +03:00