From 88dfe4d2766587b811863cfc2bd1668e6fbadb6a Mon Sep 17 00:00:00 2001
From: Laurenz <laurmaedje@gmail.com>
Date: Thu, 31 Jul 2025 10:45:03 +0200
Subject: [PATCH 01/19] Use `rustc-hash` for hash maps and sets (#6678)

---
 Cargo.lock                                    | 13 +++++++
 Cargo.toml                                    |  1 +
 crates/typst-cli/Cargo.toml                   |  1 +
 crates/typst-cli/src/watch.rs                 | 10 +++---
 crates/typst-cli/src/world.rs                 |  6 ++--
 crates/typst-eval/Cargo.toml                  |  1 +
 crates/typst-eval/src/binding.rs              |  5 ++-
 crates/typst-eval/src/code.rs                 |  2 +-
 crates/typst-html/Cargo.toml                  |  1 +
 crates/typst-html/src/document.rs             |  8 ++---
 crates/typst-html/src/link.rs                 | 19 ++++++-----
 crates/typst-ide/Cargo.toml                   |  1 +
 crates/typst-ide/src/analyze.rs               |  5 ++-
 crates/typst-ide/src/complete.rs              |  9 ++---
 crates/typst-ide/src/tests.rs                 |  6 ++--
 crates/typst-layout/Cargo.toml                |  1 +
 crates/typst-layout/src/flow/mod.rs           |  6 ++--
 crates/typst-layout/src/pages/collect.rs      |  5 ++-
 crates/typst-library/Cargo.toml               |  1 +
 crates/typst-library/src/engine.rs            |  4 +--
 crates/typst-library/src/foundations/dict.rs  | 11 +++---
 crates/typst-library/src/foundations/scope.rs |  3 +-
 .../typst-library/src/foundations/styles.rs   |  6 ++--
 .../typst-library/src/foundations/symbol.rs   |  5 +--
 .../src/introspection/introspector.rs         | 21 ++++++------
 .../src/introspection/locator.rs              |  6 ++--
 .../typst-library/src/model/bibliography.rs   | 20 ++++++-----
 crates/typst-library/src/text/lang.rs         | 12 +++----
 .../typst-library/src/visualize/image/svg.rs  | 10 +++---
 crates/typst-pdf/Cargo.toml                   |  1 +
 crates/typst-pdf/src/convert.rs               | 33 +++++++++---------
 crates/typst-svg/Cargo.toml                   |  1 +
 crates/typst-svg/src/lib.rs                   | 10 ++++--
 crates/typst-syntax/Cargo.toml                |  1 +
 crates/typst-syntax/src/file.rs               |  7 ++--
 crates/typst-syntax/src/parser.rs             | 34 +++++++++----------
 crates/typst-utils/Cargo.toml                 |  1 +
 crates/typst-utils/src/pico.rs                | 10 +++---
 crates/typst/Cargo.toml                       |  1 +
 crates/typst/src/lib.rs                       |  4 +--
 docs/Cargo.toml                               |  1 +
 docs/src/contribs.rs                          |  4 +--
 docs/src/lib.rs                               |  5 ++-
 tests/Cargo.toml                              |  1 +
 tests/src/collect.rs                          |  8 ++---
 tests/src/world.rs                            |  6 ++--
 46 files changed, 183 insertions(+), 144 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index bcf430a43..d35e708bc 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -2906,6 +2906,7 @@ version = "0.13.1"
 dependencies = [
  "comemo",
  "ecow",
+ "rustc-hash",
  "typst-eval",
  "typst-html",
  "typst-layout",
@@ -2941,6 +2942,7 @@ dependencies = [
  "parking_lot",
  "pathdiff",
  "rayon",
+ "rustc-hash",
  "same-file",
  "self-replace",
  "semver",
@@ -2981,6 +2983,7 @@ dependencies = [
  "ecow",
  "heck",
  "pulldown-cmark",
+ "rustc-hash",
  "serde",
  "serde_json",
  "serde_yaml 0.9.34+deprecated",
@@ -3003,6 +3006,7 @@ dependencies = [
  "comemo",
  "ecow",
  "indexmap 2.7.1",
+ "rustc-hash",
  "stacker",
  "toml",
  "typst-library",
@@ -3033,6 +3037,7 @@ dependencies = [
  "comemo",
  "ecow",
  "palette",
+ "rustc-hash",
  "time",
  "typst-assets",
  "typst-library",
@@ -3051,6 +3056,7 @@ dependencies = [
  "ecow",
  "once_cell",
  "pathdiff",
+ "rustc-hash",
  "serde",
  "typst",
  "typst-assets",
@@ -3100,6 +3106,7 @@ dependencies = [
  "icu_segmenter",
  "kurbo",
  "memchr",
+ "rustc-hash",
  "rustybuzz",
  "smallvec",
  "ttf-parser",
@@ -3151,6 +3158,7 @@ dependencies = [
  "regex-syntax",
  "roxmltree",
  "rust_decimal",
+ "rustc-hash",
  "rustybuzz",
  "serde",
  "serde_json",
@@ -3200,6 +3208,7 @@ dependencies = [
  "infer",
  "krilla",
  "krilla-svg",
+ "rustc-hash",
  "serde",
  "typst-assets",
  "typst-library",
@@ -3253,6 +3262,7 @@ dependencies = [
  "flate2",
  "hayro",
  "image",
+ "rustc-hash",
  "ttf-parser",
  "typst-assets",
  "typst-library",
@@ -3268,6 +3278,7 @@ name = "typst-syntax"
 version = "0.13.1"
 dependencies = [
  "ecow",
+ "rustc-hash",
  "serde",
  "toml",
  "typst-timing",
@@ -3290,6 +3301,7 @@ dependencies = [
  "parking_lot",
  "rayon",
  "regex",
+ "rustc-hash",
  "tiny-skia",
  "typst",
  "typst-assets",
@@ -3321,6 +3333,7 @@ dependencies = [
  "once_cell",
  "portable-atomic",
  "rayon",
+ "rustc-hash",
  "siphasher",
  "thin-vec",
  "unicode-math-class",
diff --git a/Cargo.toml b/Cargo.toml
index 259a8a9f3..04c25cb6b 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -59,6 +59,7 @@ fastrand = "2.3"
 flate2 = "1"
 fontdb = { version = "0.23", default-features = false }
 fs_extra = "1.3"
+rustc-hash = "2.1"
 glidesort = "0.1.2"
 hayagriva = "0.8.1"
 hayro-syntax = { git = "https://github.com/LaurenzV/hayro", rev = "e701f95" }
diff --git a/crates/typst-cli/Cargo.toml b/crates/typst-cli/Cargo.toml
index 792cabae1..dcc4af868 100644
--- a/crates/typst-cli/Cargo.toml
+++ b/crates/typst-cli/Cargo.toml
@@ -41,6 +41,7 @@ open = { workspace = true }
 parking_lot = { workspace = true }
 pathdiff = { workspace = true }
 rayon = { workspace = true }
+rustc-hash = { workspace = true }
 same-file = { workspace = true }
 self-replace = { workspace = true, optional = true }
 semver = { workspace = true }
diff --git a/crates/typst-cli/src/watch.rs b/crates/typst-cli/src/watch.rs
index 151c0ca1d..860ae8ebd 100644
--- a/crates/typst-cli/src/watch.rs
+++ b/crates/typst-cli/src/watch.rs
@@ -1,4 +1,3 @@
-use std::collections::{HashMap, HashSet};
 use std::io::{self, Write};
 use std::iter;
 use std::path::PathBuf;
@@ -9,6 +8,7 @@ use codespan_reporting::term::termcolor::WriteColor;
 use codespan_reporting::term::{self, termcolor};
 use ecow::eco_format;
 use notify::{Event, RecommendedWatcher, RecursiveMode, Watcher as _};
+use rustc_hash::{FxHashMap, FxHashSet};
 use same_file::is_same_file;
 use typst::diag::{StrResult, bail, warning};
 use typst::syntax::Span;
@@ -91,10 +91,10 @@ struct Watcher {
     /// Keeps track of which paths are watched via `watcher`. The boolean is
     /// used during updating for mark-and-sweep garbage collection of paths we
     /// should unwatch.
-    watched: HashMap<PathBuf, bool>,
+    watched: FxHashMap<PathBuf, bool>,
     /// A set of files that should be watched, but don't exist. We manually poll
     /// for those.
-    missing: HashSet<PathBuf>,
+    missing: FxHashSet<PathBuf>,
 }
 
 impl Watcher {
@@ -127,8 +127,8 @@ impl Watcher {
             output,
             rx,
             watcher,
-            watched: HashMap::new(),
-            missing: HashSet::new(),
+            watched: FxHashMap::default(),
+            missing: FxHashSet::default(),
         })
     }
 
diff --git a/crates/typst-cli/src/world.rs b/crates/typst-cli/src/world.rs
index 34ebda64b..6dd362524 100644
--- a/crates/typst-cli/src/world.rs
+++ b/crates/typst-cli/src/world.rs
@@ -1,4 +1,3 @@
-use std::collections::HashMap;
 use std::io::Read;
 use std::path::{Path, PathBuf};
 use std::sync::{LazyLock, OnceLock};
@@ -7,6 +6,7 @@ use std::{fmt, fs, io, mem};
 use chrono::{DateTime, Datelike, FixedOffset, Local, Utc};
 use ecow::{EcoString, eco_format};
 use parking_lot::Mutex;
+use rustc_hash::FxHashMap;
 use typst::diag::{FileError, FileResult};
 use typst::foundations::{Bytes, Datetime, Dict, IntoValue};
 use typst::syntax::{FileId, Lines, Source, VirtualPath};
@@ -41,7 +41,7 @@ pub struct SystemWorld {
     /// Locations of and storage for lazily loaded fonts.
     fonts: Vec<FontSlot>,
     /// Maps file ids to source files and buffers.
-    slots: Mutex<HashMap<FileId, FileSlot>>,
+    slots: Mutex<FxHashMap<FileId, FileSlot>>,
     /// Holds information about where packages are stored.
     package_storage: PackageStorage,
     /// The current datetime if requested. This is stored here to ensure it is
@@ -139,7 +139,7 @@ impl SystemWorld {
             library: LazyHash::new(library),
             book: LazyHash::new(fonts.book),
             fonts: fonts.fonts,
-            slots: Mutex::new(HashMap::new()),
+            slots: Mutex::new(FxHashMap::default()),
             package_storage: package::storage(&world_args.package),
             now,
         })
diff --git a/crates/typst-eval/Cargo.toml b/crates/typst-eval/Cargo.toml
index b39382ffe..d4fb0235b 100644
--- a/crates/typst-eval/Cargo.toml
+++ b/crates/typst-eval/Cargo.toml
@@ -21,6 +21,7 @@ typst-utils = { workspace = true }
 comemo = { workspace = true }
 ecow = { workspace = true }
 indexmap = { workspace = true }
+rustc-hash = { workspace = true }
 toml = { workspace = true }
 unicode-segmentation = { workspace = true }
 
diff --git a/crates/typst-eval/src/binding.rs b/crates/typst-eval/src/binding.rs
index 9a53ac069..ccfb38583 100644
--- a/crates/typst-eval/src/binding.rs
+++ b/crates/typst-eval/src/binding.rs
@@ -1,6 +1,5 @@
-use std::collections::HashSet;
-
 use ecow::eco_format;
+use rustc_hash::FxHashSet;
 use typst_library::diag::{At, SourceDiagnostic, SourceResult, bail, error};
 use typst_library::foundations::{Array, Dict, Value};
 use typst_syntax::ast::{self, AstNode};
@@ -137,7 +136,7 @@ where
     F: Fn(&mut Vm, ast::Expr, Value) -> SourceResult<()>,
 {
     let mut sink = None;
-    let mut used = HashSet::new();
+    let mut used = FxHashSet::default();
 
     for p in destruct.items() {
         match p {
diff --git a/crates/typst-eval/src/code.rs b/crates/typst-eval/src/code.rs
index d3e0c937f..d15089f9a 100644
--- a/crates/typst-eval/src/code.rs
+++ b/crates/typst-eval/src/code.rs
@@ -246,7 +246,7 @@ impl Eval for ast::Dict<'_> {
     type Output = Dict;
 
     fn eval(self, vm: &mut Vm) -> SourceResult<Self::Output> {
-        let mut map = indexmap::IndexMap::new();
+        let mut map = indexmap::IndexMap::default();
         let mut invalid_keys = eco_vec![];
 
         for item in self.items() {
diff --git a/crates/typst-html/Cargo.toml b/crates/typst-html/Cargo.toml
index 54cad0124..8d592bc5a 100644
--- a/crates/typst-html/Cargo.toml
+++ b/crates/typst-html/Cargo.toml
@@ -24,6 +24,7 @@ bumpalo = { workspace = true }
 comemo = { workspace = true }
 ecow = { workspace = true }
 palette = { workspace = true }
+rustc-hash = { workspace = true }
 time = { workspace = true }
 
 [lints]
diff --git a/crates/typst-html/src/document.rs b/crates/typst-html/src/document.rs
index ca84d3354..5345e5911 100644
--- a/crates/typst-html/src/document.rs
+++ b/crates/typst-html/src/document.rs
@@ -1,7 +1,7 @@
-use std::collections::HashSet;
 use std::num::NonZeroUsize;
 
 use comemo::{Tracked, TrackedMut};
+use rustc_hash::FxHashSet;
 use typst_library::World;
 use typst_library::diag::{SourceResult, bail};
 use typst_library::engine::{Engine, Route, Sink, Traced};
@@ -87,7 +87,7 @@ fn html_document_impl(
         children.iter().copied(),
     )?;
 
-    let mut link_targets = HashSet::new();
+    let mut link_targets = FxHashSet::default();
     let mut introspector = introspect_html(&output, &mut link_targets);
     let mut root = root_element(output, &info)?;
     crate::link::identify_link_targets(&mut root, &mut introspector, link_targets);
@@ -99,12 +99,12 @@ fn html_document_impl(
 #[typst_macros::time(name = "introspect html")]
 fn introspect_html(
     output: &[HtmlNode],
-    link_targets: &mut HashSet<Location>,
+    link_targets: &mut FxHashSet<Location>,
 ) -> Introspector {
     fn discover(
         builder: &mut IntrospectorBuilder,
         sink: &mut Vec<(Content, Position)>,
-        link_targets: &mut HashSet<Location>,
+        link_targets: &mut FxHashSet<Location>,
         nodes: &[HtmlNode],
     ) {
         for node in nodes {
diff --git a/crates/typst-html/src/link.rs b/crates/typst-html/src/link.rs
index ad70f06fe..58dd49cd3 100644
--- a/crates/typst-html/src/link.rs
+++ b/crates/typst-html/src/link.rs
@@ -1,7 +1,8 @@
-use std::collections::{HashMap, HashSet, VecDeque};
+use std::collections::VecDeque;
 
 use comemo::Track;
 use ecow::{EcoString, eco_format};
+use rustc_hash::{FxHashMap, FxHashSet};
 use typst_library::foundations::{Label, NativeElement};
 use typst_library::introspection::{Introspector, Location, Tag};
 use typst_library::layout::{Frame, FrameItem, Point};
@@ -16,7 +17,7 @@ use crate::{HtmlElement, HtmlNode, attr, tag};
 /// in favor of the query in `identify_link_targets`. For the time being, some
 /// links are created without existence of a `LinkElem`, so this is
 /// unfortunately necessary.
-pub fn introspect_frame_links(frame: &Frame, targets: &mut HashSet<Location>) {
+pub fn introspect_frame_links(frame: &Frame, targets: &mut FxHashSet<Location>) {
     for (_, item) in frame.items() {
         match item {
             FrameItem::Link(Destination::Location(loc), _) => {
@@ -35,7 +36,7 @@ pub fn introspect_frame_links(frame: &Frame, targets: &mut HashSet<Location>) {
 pub fn identify_link_targets(
     root: &mut HtmlElement,
     introspector: &mut Introspector,
-    mut targets: HashSet<Location>,
+    mut targets: FxHashSet<Location>,
 ) {
     // Query for all links with an intra-doc (i.e. `Location`) destination to
     // know what needs IDs.
@@ -72,7 +73,7 @@ pub fn identify_link_targets(
 /// Traverses a list of nodes.
 fn traverse(
     work: &mut Work,
-    targets: &HashSet<Location>,
+    targets: &FxHashSet<Location>,
     identificator: &mut Identificator<'_>,
     nodes: &mut Vec<HtmlNode>,
 ) {
@@ -144,7 +145,7 @@ fn traverse(
 /// Traverses a frame embedded in HTML.
 fn traverse_frame(
     work: &mut Work,
-    targets: &HashSet<Location>,
+    targets: &FxHashSet<Location>,
     identificator: &mut Identificator<'_>,
     frame: &Frame,
     link_points: &mut Vec<(Point, EcoString)>,
@@ -174,13 +175,13 @@ struct Work {
     /// now.
     queue: VecDeque<(Location, Option<Label>)>,
     /// The resulting mapping from element location's to HTML IDs.
-    ids: HashMap<Location, EcoString>,
+    ids: FxHashMap<Location, EcoString>,
 }
 
 impl Work {
     /// Sets up.
     fn new() -> Self {
-        Self { queue: VecDeque::new(), ids: HashMap::new() }
+        Self { queue: VecDeque::new(), ids: FxHashMap::default() }
     }
 
     /// Marks the element with the given location and label as in need of an
@@ -215,7 +216,7 @@ impl Work {
 struct Identificator<'a> {
     introspector: &'a Introspector,
     loc_counter: usize,
-    label_counter: HashMap<Label, usize>,
+    label_counter: FxHashMap<Label, usize>,
 }
 
 impl<'a> Identificator<'a> {
@@ -224,7 +225,7 @@ impl<'a> Identificator<'a> {
         Self {
             introspector,
             loc_counter: 0,
-            label_counter: HashMap::new(),
+            label_counter: FxHashMap::default(),
         }
     }
 
diff --git a/crates/typst-ide/Cargo.toml b/crates/typst-ide/Cargo.toml
index e7918e634..d3d5e0542 100644
--- a/crates/typst-ide/Cargo.toml
+++ b/crates/typst-ide/Cargo.toml
@@ -18,6 +18,7 @@ typst-eval = { workspace = true }
 comemo = { workspace = true }
 ecow = { workspace = true }
 pathdiff = { workspace = true }
+rustc-hash = { workspace = true }
 serde = { workspace = true }
 unscanny = { workspace = true }
 
diff --git a/crates/typst-ide/src/analyze.rs b/crates/typst-ide/src/analyze.rs
index 6f80c85d4..d2d5d22b1 100644
--- a/crates/typst-ide/src/analyze.rs
+++ b/crates/typst-ide/src/analyze.rs
@@ -1,7 +1,6 @@
-use std::collections::HashSet;
-
 use comemo::Track;
 use ecow::{EcoString, EcoVec, eco_vec};
+use rustc_hash::FxHashSet;
 use typst::foundations::{Label, Styles, Value};
 use typst::layout::PagedDocument;
 use typst::model::{BibliographyElem, FigureElem};
@@ -76,7 +75,7 @@ pub fn analyze_labels(
     document: &PagedDocument,
 ) -> (Vec<(Label, Option<EcoString>)>, usize) {
     let mut output = vec![];
-    let mut seen_labels = HashSet::new();
+    let mut seen_labels = FxHashSet::default();
 
     // Labels in the document.
     for elem in document.introspector.all() {
diff --git a/crates/typst-ide/src/complete.rs b/crates/typst-ide/src/complete.rs
index 96fd7f265..0abc38400 100644
--- a/crates/typst-ide/src/complete.rs
+++ b/crates/typst-ide/src/complete.rs
@@ -1,8 +1,9 @@
 use std::cmp::Reverse;
-use std::collections::{BTreeMap, HashSet};
+use std::collections::BTreeMap;
 use std::ffi::OsStr;
 
 use ecow::{EcoString, eco_format};
+use rustc_hash::FxHashSet;
 use serde::{Deserialize, Serialize};
 use typst::foundations::{
     AutoValue, CastInfo, Func, Label, NoneValue, ParamInfo, Repr, StyleChain, Styles,
@@ -739,7 +740,7 @@ fn param_completions<'a>(
 
     // Determine which arguments are already present.
     let mut existing_positional = 0;
-    let mut existing_named = HashSet::new();
+    let mut existing_named = FxHashSet::default();
     for arg in args.items() {
         match arg {
             ast::Arg::Pos(_) => {
@@ -1116,7 +1117,7 @@ struct CompletionContext<'a> {
     explicit: bool,
     from: usize,
     completions: Vec<Completion>,
-    seen_casts: HashSet<u128>,
+    seen_casts: FxHashSet<u128>,
 }
 
 impl<'a> CompletionContext<'a> {
@@ -1141,7 +1142,7 @@ impl<'a> CompletionContext<'a> {
             explicit,
             from: cursor,
             completions: vec![],
-            seen_casts: HashSet::new(),
+            seen_casts: FxHashSet::default(),
         })
     }
 
diff --git a/crates/typst-ide/src/tests.rs b/crates/typst-ide/src/tests.rs
index 08fef6811..f3c6cfd0d 100644
--- a/crates/typst-ide/src/tests.rs
+++ b/crates/typst-ide/src/tests.rs
@@ -1,8 +1,8 @@
 use std::borrow::Borrow;
-use std::collections::HashMap;
 use std::sync::Arc;
 
 use ecow::EcoString;
+use rustc_hash::FxHashMap;
 use typst::diag::{FileError, FileResult};
 use typst::foundations::{Bytes, Datetime, Smart};
 use typst::layout::{Abs, Margin, PageElem};
@@ -137,8 +137,8 @@ impl IdeWorld for TestWorld {
 /// Test-specific files.
 #[derive(Default, Clone)]
 struct TestFiles {
-    assets: HashMap<FileId, Bytes>,
-    sources: HashMap<FileId, Source>,
+    assets: FxHashMap<FileId, Bytes>,
+    sources: FxHashMap<FileId, Source>,
 }
 
 /// Shared foundation of all test worlds.
diff --git a/crates/typst-layout/Cargo.toml b/crates/typst-layout/Cargo.toml
index 2c314e5c5..7bd1343e4 100644
--- a/crates/typst-layout/Cargo.toml
+++ b/crates/typst-layout/Cargo.toml
@@ -32,6 +32,7 @@ icu_provider_blob = { workspace = true }
 icu_segmenter = { workspace = true }
 kurbo = { workspace = true }
 memchr = { workspace = true }
+rustc-hash = { workspace = true }
 rustybuzz = { workspace = true }
 smallvec = { workspace = true }
 ttf-parser = { workspace = true }
diff --git a/crates/typst-layout/src/flow/mod.rs b/crates/typst-layout/src/flow/mod.rs
index b6ecc92f7..a32e629dd 100644
--- a/crates/typst-layout/src/flow/mod.rs
+++ b/crates/typst-layout/src/flow/mod.rs
@@ -7,13 +7,13 @@ mod distribute;
 
 pub(crate) use self::block::unbreakable_pod;
 
-use std::collections::HashSet;
 use std::num::NonZeroUsize;
 use std::rc::Rc;
 
 use bumpalo::Bump;
 use comemo::{Track, Tracked, TrackedMut};
 use ecow::EcoVec;
+use rustc_hash::FxHashSet;
 use typst_library::World;
 use typst_library::diag::{At, SourceDiagnostic, SourceResult, bail};
 use typst_library::engine::{Engine, Route, Sink, Traced};
@@ -303,7 +303,7 @@ struct Work<'a, 'b> {
     /// Identifies floats and footnotes that can be skipped if visited because
     /// they were already handled and incorporated as column or page level
     /// insertions.
-    skips: Rc<HashSet<Location>>,
+    skips: Rc<FxHashSet<Location>>,
 }
 
 impl<'a, 'b> Work<'a, 'b> {
@@ -316,7 +316,7 @@ impl<'a, 'b> Work<'a, 'b> {
             footnotes: EcoVec::new(),
             footnote_spill: None,
             tags: EcoVec::new(),
-            skips: Rc::new(HashSet::new()),
+            skips: Rc::new(FxHashSet::default()),
         }
     }
 
diff --git a/crates/typst-layout/src/pages/collect.rs b/crates/typst-layout/src/pages/collect.rs
index 64167d080..16e319de5 100644
--- a/crates/typst-layout/src/pages/collect.rs
+++ b/crates/typst-layout/src/pages/collect.rs
@@ -1,5 +1,4 @@
-use std::collections::HashSet;
-
+use rustc_hash::FxHashSet;
 use typst_library::foundations::StyleChain;
 use typst_library::introspection::{Locator, SplitLocator, Tag, TagElem};
 use typst_library::layout::{PagebreakElem, Parity};
@@ -134,7 +133,7 @@ fn migrate_unterminated_tags(children: &mut [Pair], mid: usize) -> usize {
 
     // Determine the set of tag locations which we won't migrate (because they
     // are terminated).
-    let excluded: HashSet<_> = children[start..mid]
+    let excluded: FxHashSet<_> = children[start..mid]
         .iter()
         .filter_map(|(c, _)| match c.to_packed::<TagElem>()?.tag {
             Tag::Start(_) => None,
diff --git a/crates/typst-library/Cargo.toml b/crates/typst-library/Cargo.toml
index 2297f7ca7..0bbaa77ef 100644
--- a/crates/typst-library/Cargo.toml
+++ b/crates/typst-library/Cargo.toml
@@ -50,6 +50,7 @@ regex = { workspace = true }
 regex-syntax = { workspace = true }
 roxmltree = { workspace = true }
 rust_decimal = { workspace = true }
+rustc-hash = { workspace = true }
 rustybuzz = { workspace = true }
 serde = { workspace = true }
 serde_json = { workspace = true }
diff --git a/crates/typst-library/src/engine.rs b/crates/typst-library/src/engine.rs
index cb98f4599..d0a117804 100644
--- a/crates/typst-library/src/engine.rs
+++ b/crates/typst-library/src/engine.rs
@@ -1,11 +1,11 @@
 //! Definition of the central compilation context.
 
-use std::collections::HashSet;
 use std::sync::atomic::{AtomicUsize, Ordering};
 
 use comemo::{Track, Tracked, TrackedMut, Validate};
 use ecow::EcoVec;
 use rayon::iter::{IndexedParallelIterator, IntoParallelIterator, ParallelIterator};
+use rustc_hash::FxHashSet;
 use typst_syntax::{FileId, Span};
 
 use crate::World;
@@ -135,7 +135,7 @@ pub struct Sink {
     /// Warnings emitted during iteration.
     warnings: EcoVec<SourceDiagnostic>,
     /// Hashes of all warning's spans and messages for warning deduplication.
-    warnings_set: HashSet<u128>,
+    warnings_set: FxHashSet<u128>,
     /// A sequence of traced values for a span.
     values: EcoVec<(Value, Option<Styles>)>,
 }
diff --git a/crates/typst-library/src/foundations/dict.rs b/crates/typst-library/src/foundations/dict.rs
index d5dfc7aa4..f58325658 100644
--- a/crates/typst-library/src/foundations/dict.rs
+++ b/crates/typst-library/src/foundations/dict.rs
@@ -5,6 +5,7 @@ use std::sync::Arc;
 
 use ecow::{EcoString, eco_format};
 use indexmap::IndexMap;
+use rustc_hash::FxBuildHasher;
 use serde::{Deserialize, Deserializer, Serialize, Serializer};
 use typst_syntax::is_ident;
 use typst_utils::ArcExt;
@@ -20,7 +21,7 @@ use crate::foundations::{
 macro_rules! __dict {
     ($($key:expr => $value:expr),* $(,)?) => {{
         #[allow(unused_mut)]
-        let mut map = $crate::foundations::IndexMap::new();
+        let mut map = $crate::foundations::IndexMap::default();
         $(map.insert($key.into(), $crate::foundations::IntoValue::into_value($value));)*
         $crate::foundations::Dict::from(map)
     }};
@@ -66,7 +67,7 @@ pub use crate::__dict as dict;
 /// ```
 #[ty(scope, cast, name = "dictionary")]
 #[derive(Default, Clone, PartialEq)]
-pub struct Dict(Arc<IndexMap<Str, Value>>);
+pub struct Dict(Arc<IndexMap<Str, Value, FxBuildHasher>>);
 
 impl Dict {
     /// Create a new, empty dictionary.
@@ -343,7 +344,7 @@ impl<'de> Deserialize<'de> for Dict {
     where
         D: Deserializer<'de>,
     {
-        Ok(IndexMap::<Str, Value>::deserialize(deserializer)?.into())
+        Ok(IndexMap::<Str, Value, FxBuildHasher>::deserialize(deserializer)?.into())
     }
 }
 
@@ -377,8 +378,8 @@ impl<'a> IntoIterator for &'a Dict {
     }
 }
 
-impl From<IndexMap<Str, Value>> for Dict {
-    fn from(map: IndexMap<Str, Value>) -> Self {
+impl From<IndexMap<Str, Value, FxBuildHasher>> for Dict {
+    fn from(map: IndexMap<Str, Value, FxBuildHasher>) -> Self {
         Self(Arc::new(map))
     }
 }
diff --git a/crates/typst-library/src/foundations/scope.rs b/crates/typst-library/src/foundations/scope.rs
index 18d972d33..76d4abe77 100644
--- a/crates/typst-library/src/foundations/scope.rs
+++ b/crates/typst-library/src/foundations/scope.rs
@@ -4,6 +4,7 @@ use std::hash::{Hash, Hasher};
 use ecow::{EcoString, eco_format};
 use indexmap::IndexMap;
 use indexmap::map::Entry;
+use rustc_hash::FxBuildHasher;
 use typst_syntax::Span;
 
 use crate::diag::{DeprecationSink, HintedStrResult, HintedString, StrResult, bail};
@@ -102,7 +103,7 @@ impl<'a> Scopes<'a> {
 /// A map from binding names to values.
 #[derive(Default, Clone)]
 pub struct Scope {
-    map: IndexMap<EcoString, Binding>,
+    map: IndexMap<EcoString, Binding, FxBuildHasher>,
     deduplicate: bool,
     category: Option<Category>,
 }
diff --git a/crates/typst-library/src/foundations/styles.rs b/crates/typst-library/src/foundations/styles.rs
index 74dd039de..b2bb36a6a 100644
--- a/crates/typst-library/src/foundations/styles.rs
+++ b/crates/typst-library/src/foundations/styles.rs
@@ -1,11 +1,11 @@
 use std::any::{Any, TypeId};
-use std::collections::HashMap;
 use std::fmt::{self, Debug, Formatter};
 use std::hash::{Hash, Hasher};
 use std::{mem, ptr};
 
 use comemo::Tracked;
 use ecow::{EcoString, EcoVec, eco_vec};
+use rustc_hash::FxHashMap;
 use smallvec::SmallVec;
 use typst_syntax::Span;
 use typst_utils::LazyHash;
@@ -938,7 +938,7 @@ fn block_wrong_type(func: Element, id: u8, value: &Block) -> ! {
 
 /// Holds native show rules.
 pub struct NativeRuleMap {
-    rules: HashMap<(Element, Target), NativeShowRule>,
+    rules: FxHashMap<(Element, Target), NativeShowRule>,
 }
 
 /// The signature of a native show rule.
@@ -956,7 +956,7 @@ impl NativeRuleMap {
     ///
     /// Contains built-in rules for a few special elements.
     pub fn new() -> Self {
-        let mut rules = Self { rules: HashMap::new() };
+        let mut rules = Self { rules: FxHashMap::default() };
 
         // ContextElem is as special as SequenceElem and StyledElem and could,
         // in theory, also be special cased in realization.
diff --git a/crates/typst-library/src/foundations/symbol.rs b/crates/typst-library/src/foundations/symbol.rs
index c3a13d07c..1f55db59d 100644
--- a/crates/typst-library/src/foundations/symbol.rs
+++ b/crates/typst-library/src/foundations/symbol.rs
@@ -1,9 +1,10 @@
-use std::collections::{BTreeSet, HashMap};
+use std::collections::BTreeSet;
 use std::fmt::{self, Debug, Display, Formatter, Write};
 use std::sync::Arc;
 
 use codex::ModifierSet;
 use ecow::{EcoString, eco_format};
+use rustc_hash::FxHashMap;
 use serde::{Serialize, Serializer};
 use typst_syntax::{Span, Spanned, is_ident};
 use typst_utils::hash128;
@@ -221,7 +222,7 @@ impl Symbol {
 
         // Maps from canonicalized 128-bit hashes to indices of variants we've
         // seen before.
-        let mut seen = HashMap::<u128, usize>::new();
+        let mut seen = FxHashMap::<u128, usize>::default();
 
         // A list of modifiers, cleared & reused in each iteration.
         let mut modifiers = Vec::new();
diff --git a/crates/typst-library/src/introspection/introspector.rs b/crates/typst-library/src/introspection/introspector.rs
index 377b577fb..0d12f58b7 100644
--- a/crates/typst-library/src/introspection/introspector.rs
+++ b/crates/typst-library/src/introspection/introspector.rs
@@ -1,10 +1,11 @@
-use std::collections::{BTreeSet, HashMap, HashSet};
+use std::collections::BTreeSet;
 use std::fmt::{self, Debug, Formatter};
 use std::hash::Hash;
 use std::num::NonZeroUsize;
 use std::sync::RwLock;
 
 use ecow::{EcoString, EcoVec};
+use rustc_hash::{FxHashMap, FxHashSet};
 use smallvec::SmallVec;
 use typst_utils::NonZeroExt;
 
@@ -31,14 +32,14 @@ pub struct Introspector {
     keys: MultiMap<u128, Location>,
 
     /// Accelerates lookup of elements by location.
-    locations: HashMap<Location, usize>,
+    locations: FxHashMap<Location, usize>,
     /// Accelerates lookup of elements by label.
     labels: MultiMap<Label, usize>,
 
     /// Maps from element locations to assigned HTML IDs. This used to support
     /// intra-doc links in HTML export. In paged export, is is simply left
     /// empty and [`Self::html_id`] is not used.
-    html_ids: HashMap<Location, EcoString>,
+    html_ids: FxHashMap<Location, EcoString>,
 
     /// Caches queries done on the introspector. This is important because
     /// even if all top-level queries are distinct, they often have shared
@@ -63,7 +64,7 @@ impl Introspector {
 
     /// Enriches an existing introspector with HTML IDs, which were assigned
     /// to the DOM in a post-processing step.
-    pub fn set_html_ids(&mut self, html_ids: HashMap<Location, EcoString>) {
+    pub fn set_html_ids(&mut self, html_ids: FxHashMap<Location, EcoString>) {
         self.html_ids = html_ids;
     }
 
@@ -313,7 +314,7 @@ impl Debug for Introspector {
 
 /// A map from one keys to multiple elements.
 #[derive(Clone)]
-struct MultiMap<K, V>(HashMap<K, SmallVec<[V; 1]>>);
+struct MultiMap<K, V>(FxHashMap<K, SmallVec<[V; 1]>>);
 
 impl<K, V> MultiMap<K, V>
 where
@@ -334,13 +335,13 @@ where
 
 impl<K, V> Default for MultiMap<K, V> {
     fn default() -> Self {
-        Self(HashMap::new())
+        Self(FxHashMap::default())
     }
 }
 
 /// Caches queries.
 #[derive(Default)]
-struct QueryCache(RwLock<HashMap<u128, EcoVec<Content>>>);
+struct QueryCache(RwLock<FxHashMap<u128, EcoVec<Content>>>);
 
 impl QueryCache {
     fn get(&self, hash: u128) -> Option<EcoVec<Content>> {
@@ -364,11 +365,11 @@ pub struct IntrospectorBuilder {
     pub pages: usize,
     pub page_numberings: Vec<Option<Numbering>>,
     pub page_supplements: Vec<Content>,
-    pub html_ids: HashMap<Location, EcoString>,
-    seen: HashSet<Location>,
+    pub html_ids: FxHashMap<Location, EcoString>,
+    seen: FxHashSet<Location>,
     insertions: MultiMap<Location, Vec<Pair>>,
     keys: MultiMap<u128, Location>,
-    locations: HashMap<Location, usize>,
+    locations: FxHashMap<Location, usize>,
     labels: MultiMap<Label, usize>,
 }
 
diff --git a/crates/typst-library/src/introspection/locator.rs b/crates/typst-library/src/introspection/locator.rs
index 3ba3d6486..192d20ab0 100644
--- a/crates/typst-library/src/introspection/locator.rs
+++ b/crates/typst-library/src/introspection/locator.rs
@@ -1,9 +1,9 @@
-use std::collections::HashMap;
 use std::fmt::{self, Debug, Formatter};
 use std::hash::Hash;
 use std::sync::OnceLock;
 
 use comemo::{Tracked, Validate};
+use rustc_hash::FxHashMap;
 
 use crate::introspection::{Introspector, Location};
 
@@ -188,7 +188,7 @@ impl<'a> Locator<'a> {
         SplitLocator {
             local: self.local,
             outer: self.outer,
-            disambiguators: HashMap::new(),
+            disambiguators: FxHashMap::default(),
         }
     }
 
@@ -244,7 +244,7 @@ pub struct SplitLocator<'a> {
     /// for all the layers beyond the memoization boundary on-demand.
     outer: Option<&'a LocatorLink<'a>>,
     /// Simply counts up the number of times we've seen each local hash.
-    disambiguators: HashMap<u128, usize>,
+    disambiguators: FxHashMap<u128, usize>,
 }
 
 impl<'a> SplitLocator<'a> {
diff --git a/crates/typst-library/src/model/bibliography.rs b/crates/typst-library/src/model/bibliography.rs
index 23e89f86b..1f972ddfe 100644
--- a/crates/typst-library/src/model/bibliography.rs
+++ b/crates/typst-library/src/model/bibliography.rs
@@ -1,5 +1,4 @@
 use std::any::TypeId;
-use std::collections::HashMap;
 use std::ffi::OsStr;
 use std::fmt::{self, Debug, Formatter};
 use std::path::Path;
@@ -14,6 +13,7 @@ use hayagriva::{
     SpecificLocator, citationberg,
 };
 use indexmap::IndexMap;
+use rustc_hash::{FxBuildHasher, FxHashMap};
 use smallvec::{SmallVec, smallvec};
 use typst_syntax::{Span, Spanned, SyntaxMode};
 use typst_utils::{ManuallyHash, PicoStr};
@@ -217,7 +217,9 @@ impl LocalName for Packed<BibliographyElem> {
 
 /// A loaded bibliography.
 #[derive(Clone, PartialEq, Hash)]
-pub struct Bibliography(Arc<ManuallyHash<IndexMap<Label, hayagriva::Entry>>>);
+pub struct Bibliography(
+    Arc<ManuallyHash<IndexMap<Label, hayagriva::Entry, FxBuildHasher>>>,
+);
 
 impl Bibliography {
     /// Load a bibliography from data sources.
@@ -234,7 +236,7 @@ impl Bibliography {
     #[comemo::memoize]
     #[typst_macros::time(name = "load bibliography")]
     fn decode(data: &[Loaded]) -> SourceResult<Bibliography> {
-        let mut map = IndexMap::new();
+        let mut map = IndexMap::default();
         let mut duplicates = Vec::<EcoString>::new();
 
         // We might have multiple bib/yaml files
@@ -486,7 +488,7 @@ impl IntoValue for CslSource {
 /// citations to do it.
 pub struct Works {
     /// Maps from the location of a citation group to its rendered content.
-    pub citations: HashMap<Location, SourceResult<Content>>,
+    pub citations: FxHashMap<Location, SourceResult<Content>>,
     /// Lists all references in the bibliography, with optional prefix, or
     /// `None` if the citation style can't be used for bibliographies.
     pub references: Option<Vec<(Option<Content>, Content)>>,
@@ -528,7 +530,7 @@ struct Generator<'a> {
     /// bibliography driver and needed when processing hayagriva's output.
     infos: Vec<GroupInfo>,
     /// Citations with unresolved keys.
-    failures: HashMap<Location, SourceResult<Content>>,
+    failures: FxHashMap<Location, SourceResult<Content>>,
 }
 
 /// Details about a group of merged citations. All citations are put into groups
@@ -571,7 +573,7 @@ impl<'a> Generator<'a> {
             bibliography,
             groups,
             infos,
-            failures: HashMap::new(),
+            failures: FxHashMap::default(),
         })
     }
 
@@ -702,10 +704,10 @@ impl<'a> Generator<'a> {
     fn display_citations(
         &mut self,
         rendered: &hayagriva::Rendered,
-    ) -> StrResult<HashMap<Location, SourceResult<Content>>> {
+    ) -> StrResult<FxHashMap<Location, SourceResult<Content>>> {
         // Determine for each citation key where in the bibliography it is,
         // so that we can link there.
-        let mut links = HashMap::new();
+        let mut links = FxHashMap::default();
         if let Some(bibliography) = &rendered.bibliography {
             let location = self.bibliography.location().unwrap();
             for (k, item) in bibliography.items.iter().enumerate() {
@@ -760,7 +762,7 @@ impl<'a> Generator<'a> {
 
         // Determine for each citation key where it first occurred, so that we
         // can link there.
-        let mut first_occurrences = HashMap::new();
+        let mut first_occurrences = FxHashMap::default();
         for info in &self.infos {
             for subinfo in &info.subinfos {
                 let key = subinfo.key.resolve();
diff --git a/crates/typst-library/src/text/lang.rs b/crates/typst-library/src/text/lang.rs
index ed21ade17..53905c8b5 100644
--- a/crates/typst-library/src/text/lang.rs
+++ b/crates/typst-library/src/text/lang.rs
@@ -1,7 +1,7 @@
-use std::collections::HashMap;
 use std::str::FromStr;
 
 use ecow::{EcoString, eco_format};
+use rustc_hash::FxHashMap;
 
 use crate::diag::Hint;
 use crate::foundations::{StyleChain, cast};
@@ -278,13 +278,13 @@ pub fn localized_str(lang: Lang, region: Option<Region>, key: &str) -> &'static
 fn parse_language_bundle(
     lang: Lang,
     region: Option<Region>,
-) -> Result<HashMap<&'static str, &'static str>, &'static str> {
+) -> Result<FxHashMap<&'static str, &'static str>, &'static str> {
     let language_tuple = TRANSLATIONS.iter().find(|it| it.0 == lang_str(lang, region));
     let Some((_lang_name, language_file)) = language_tuple else {
-        return Ok(HashMap::new());
+        return Ok(FxHashMap::default());
     };
 
-    let mut bundle = HashMap::new();
+    let mut bundle = FxHashMap::default();
     let lines = language_file.trim().lines();
     for line in lines {
         if line.trim().starts_with('#') {
@@ -313,9 +313,9 @@ fn lang_str(lang: Lang, region: Option<Region>) -> EcoString {
 
 #[cfg(test)]
 mod tests {
-    use std::collections::HashSet;
     use std::path::PathBuf;
 
+    use rustc_hash::FxHashSet;
     use typst_utils::option_eq;
 
     use super::*;
@@ -337,7 +337,7 @@ mod tests {
     #[test]
     fn test_all_translations_included() {
         let defined_keys =
-            HashSet::<&str>::from_iter(TRANSLATIONS.iter().map(|(lang, _)| *lang));
+            FxHashSet::<&str>::from_iter(TRANSLATIONS.iter().map(|(lang, _)| *lang));
         let mut checked = 0;
         for file in translation_files_iter() {
             assert!(
diff --git a/crates/typst-library/src/visualize/image/svg.rs b/crates/typst-library/src/visualize/image/svg.rs
index 11253c85a..dab6eaa0f 100644
--- a/crates/typst-library/src/visualize/image/svg.rs
+++ b/crates/typst-library/src/visualize/image/svg.rs
@@ -1,8 +1,8 @@
-use std::collections::HashMap;
 use std::hash::{Hash, Hasher};
 use std::sync::{Arc, Mutex};
 
 use comemo::Tracked;
+use rustc_hash::FxHashMap;
 use siphasher::sip128::{Hasher128, SipHasher13};
 
 use crate::World;
@@ -144,9 +144,9 @@ struct FontResolver<'a> {
     /// The active list of font families at the location of the SVG.
     families: &'a [&'a str],
     /// A mapping from Typst font indices to fontdb IDs.
-    to_id: HashMap<usize, Option<fontdb::ID>>,
+    to_id: FxHashMap<usize, Option<fontdb::ID>>,
     /// The reverse mapping.
-    from_id: HashMap<fontdb::ID, Font>,
+    from_id: FxHashMap<fontdb::ID, Font>,
     /// Accumulates a hash of all used fonts.
     hasher: SipHasher13,
 }
@@ -162,8 +162,8 @@ impl<'a> FontResolver<'a> {
             book,
             world,
             families,
-            to_id: HashMap::new(),
-            from_id: HashMap::new(),
+            to_id: FxHashMap::default(),
+            from_id: FxHashMap::default(),
             hasher: SipHasher13::new(),
         }
     }
diff --git a/crates/typst-pdf/Cargo.toml b/crates/typst-pdf/Cargo.toml
index 5745d0530..b652da5e8 100644
--- a/crates/typst-pdf/Cargo.toml
+++ b/crates/typst-pdf/Cargo.toml
@@ -26,6 +26,7 @@ image = { workspace = true }
 infer = { workspace = true }
 krilla = { workspace = true }
 krilla-svg = { workspace = true }
+rustc-hash = { workspace = true }
 serde = { workspace = true }
 
 [lints]
diff --git a/crates/typst-pdf/src/convert.rs b/crates/typst-pdf/src/convert.rs
index 12d1a78eb..c660c6c6b 100644
--- a/crates/typst-pdf/src/convert.rs
+++ b/crates/typst-pdf/src/convert.rs
@@ -1,4 +1,4 @@
-use std::collections::{BTreeMap, HashMap, HashSet};
+use std::collections::BTreeMap;
 use std::num::NonZeroU64;
 
 use ecow::{EcoVec, eco_format};
@@ -13,6 +13,7 @@ use krilla::pdf::PdfError;
 use krilla::surface::Surface;
 use krilla::{Document, SerializeSettings};
 use krilla_svg::render_svg_glyph;
+use rustc_hash::{FxHashMap, FxHashSet};
 use typst_library::diag::{SourceDiagnostic, SourceResult, bail, error};
 use typst_library::foundations::{NativeElement, Repr};
 use typst_library::introspection::Location;
@@ -207,22 +208,22 @@ impl FrameContext {
 /// Globally needed context for converting a typst document.
 pub(crate) struct GlobalContext<'a> {
     /// Cache the conversion between krilla and Typst fonts (forward and backward).
-    pub(crate) fonts_forward: HashMap<Font, krilla::text::Font>,
-    pub(crate) fonts_backward: HashMap<krilla::text::Font, Font>,
+    pub(crate) fonts_forward: FxHashMap<Font, krilla::text::Font>,
+    pub(crate) fonts_backward: FxHashMap<krilla::text::Font, Font>,
     /// Mapping between images and their span.
     // Note: In theory, the same image can have multiple spans
     // if it appears in the document multiple times. We just store the
     // first appearance, though.
-    pub(crate) image_to_spans: HashMap<krilla::image::Image, Span>,
+    pub(crate) image_to_spans: FxHashMap<krilla::image::Image, Span>,
     /// The spans of all images that appear in the document. We use this so
     /// we can give more accurate error messages.
-    pub(crate) image_spans: HashSet<Span>,
+    pub(crate) image_spans: FxHashSet<Span>,
     /// The document to convert.
     pub(crate) document: &'a PagedDocument,
     /// Options for PDF export.
     pub(crate) options: &'a PdfOptions<'a>,
     /// Mapping between locations in the document and named destinations.
-    pub(crate) loc_to_names: HashMap<Location, NamedDestination>,
+    pub(crate) loc_to_names: FxHashMap<Location, NamedDestination>,
     /// The languages used throughout the document.
     pub(crate) languages: BTreeMap<Lang, usize>,
     pub(crate) page_index_converter: PageIndexConverter,
@@ -232,17 +233,17 @@ impl<'a> GlobalContext<'a> {
     pub(crate) fn new(
         document: &'a PagedDocument,
         options: &'a PdfOptions,
-        loc_to_names: HashMap<Location, NamedDestination>,
+        loc_to_names: FxHashMap<Location, NamedDestination>,
         page_index_converter: PageIndexConverter,
     ) -> GlobalContext<'a> {
         Self {
-            fonts_forward: HashMap::new(),
-            fonts_backward: HashMap::new(),
+            fonts_forward: FxHashMap::default(),
+            fonts_backward: FxHashMap::default(),
             document,
             options,
             loc_to_names,
-            image_to_spans: HashMap::new(),
-            image_spans: HashSet::new(),
+            image_to_spans: FxHashMap::default(),
+            image_spans: FxHashSet::default(),
             languages: BTreeMap::new(),
             page_index_converter,
         }
@@ -632,13 +633,13 @@ fn to_span(loc: Option<krilla::surface::Location>) -> Span {
 fn collect_named_destinations(
     document: &PagedDocument,
     pic: &PageIndexConverter,
-) -> HashMap<Location, NamedDestination> {
-    let mut locs_to_names = HashMap::new();
+) -> FxHashMap<Location, NamedDestination> {
+    let mut locs_to_names = FxHashMap::default();
 
     // Find all headings that have a label and are the first among other
     // headings with the same label.
     let matches: Vec<_> = {
-        let mut seen = HashSet::new();
+        let mut seen = FxHashSet::default();
         document
             .introspector
             .query(&HeadingElem::ELEM.select())
@@ -673,13 +674,13 @@ fn collect_named_destinations(
 }
 
 pub(crate) struct PageIndexConverter {
-    page_indices: HashMap<usize, usize>,
+    page_indices: FxHashMap<usize, usize>,
     skipped_pages: usize,
 }
 
 impl PageIndexConverter {
     pub fn new(document: &PagedDocument, options: &PdfOptions) -> Self {
-        let mut page_indices = HashMap::new();
+        let mut page_indices = FxHashMap::default();
         let mut skipped_pages = 0;
 
         for i in 0..document.pages.len() {
diff --git a/crates/typst-svg/Cargo.toml b/crates/typst-svg/Cargo.toml
index 9b7dc538e..9de6a777b 100644
--- a/crates/typst-svg/Cargo.toml
+++ b/crates/typst-svg/Cargo.toml
@@ -24,6 +24,7 @@ ecow = { workspace = true }
 flate2 = { workspace = true }
 hayro = { workspace = true }
 image = { workspace = true }
+rustc-hash = { workspace = true }
 ttf-parser = { workspace = true }
 xmlparser = { workspace = true }
 xmlwriter = { workspace = true }
diff --git a/crates/typst-svg/src/lib.rs b/crates/typst-svg/src/lib.rs
index c33747b31..80145d51e 100644
--- a/crates/typst-svg/src/lib.rs
+++ b/crates/typst-svg/src/lib.rs
@@ -6,10 +6,10 @@ mod shape;
 mod text;
 
 pub use image::{convert_image_scaling, convert_image_to_base64_url};
+use rustc_hash::FxHashMap;
 use typst_library::introspection::Introspector;
 use typst_library::model::Destination;
 
-use std::collections::HashMap;
 use std::fmt::{self, Display, Formatter, Write};
 
 use ecow::EcoString;
@@ -421,12 +421,16 @@ impl<'a> SVGRenderer<'a> {
 struct Deduplicator<T> {
     kind: char,
     vec: Vec<(u128, T)>,
-    present: HashMap<u128, Id>,
+    present: FxHashMap<u128, Id>,
 }
 
 impl<T> Deduplicator<T> {
     fn new(kind: char) -> Self {
-        Self { kind, vec: Vec::new(), present: HashMap::new() }
+        Self {
+            kind,
+            vec: Vec::new(),
+            present: FxHashMap::default(),
+        }
     }
 
     /// Inserts a value into the vector. If the hash is already present, returns
diff --git a/crates/typst-syntax/Cargo.toml b/crates/typst-syntax/Cargo.toml
index 263595bd4..8194684b2 100644
--- a/crates/typst-syntax/Cargo.toml
+++ b/crates/typst-syntax/Cargo.toml
@@ -16,6 +16,7 @@ readme = { workspace = true }
 typst-timing = { workspace = true }
 typst-utils = { workspace = true }
 ecow = { workspace = true }
+rustc-hash = { workspace = true }
 serde = { workspace = true }
 toml = { workspace = true }
 unicode-ident = { workspace = true }
diff --git a/crates/typst-syntax/src/file.rs b/crates/typst-syntax/src/file.rs
index 0fcea91c2..c05027c42 100644
--- a/crates/typst-syntax/src/file.rs
+++ b/crates/typst-syntax/src/file.rs
@@ -1,21 +1,22 @@
 //! File and package management.
 
-use std::collections::HashMap;
 use std::fmt::{self, Debug, Formatter};
 use std::num::NonZeroU16;
 use std::sync::{LazyLock, RwLock};
 
+use rustc_hash::FxHashMap;
+
 use crate::VirtualPath;
 use crate::package::PackageSpec;
 
 /// The global package-path interner.
 static INTERNER: LazyLock<RwLock<Interner>> = LazyLock::new(|| {
-    RwLock::new(Interner { to_id: HashMap::new(), from_id: Vec::new() })
+    RwLock::new(Interner { to_id: FxHashMap::default(), from_id: Vec::new() })
 });
 
 /// A package-path interner.
 struct Interner {
-    to_id: HashMap<Pair, FileId>,
+    to_id: FxHashMap<Pair, FileId>,
     from_id: Vec<Pair>,
 }
 
diff --git a/crates/typst-syntax/src/parser.rs b/crates/typst-syntax/src/parser.rs
index 5b354e9cd..78b39e1e3 100644
--- a/crates/typst-syntax/src/parser.rs
+++ b/crates/typst-syntax/src/parser.rs
@@ -1,8 +1,8 @@
-use std::collections::{HashMap, HashSet};
 use std::mem;
 use std::ops::{Index, IndexMut, Range};
 
 use ecow::{EcoString, eco_format};
+use rustc_hash::{FxHashMap, FxHashSet};
 use typst_utils::default_math_class;
 use unicode_math_class::MathClass;
 
@@ -481,7 +481,7 @@ fn math_args(p: &mut Parser) {
     let mut has_arrays = false;
 
     let mut maybe_array_start = p.marker();
-    let mut seen = HashSet::new();
+    let mut seen = FxHashSet::default();
     while !p.at_set(syntax_set!(End, Dollar, RightParen)) {
         positional = math_arg(p, &mut seen);
 
@@ -522,7 +522,7 @@ fn math_args(p: &mut Parser) {
 /// Parses a single argument in a math argument list.
 ///
 /// Returns whether the parsed argument was positional or not.
-fn math_arg<'s>(p: &mut Parser<'s>, seen: &mut HashSet<&'s str>) -> bool {
+fn math_arg<'s>(p: &mut Parser<'s>, seen: &mut FxHashSet<&'s str>) -> bool {
     let m = p.marker();
     let start = p.current_start();
 
@@ -831,7 +831,7 @@ fn let_binding(p: &mut Parser) {
             closure = true;
         }
     } else {
-        pattern(p, false, &mut HashSet::new(), None);
+        pattern(p, false, &mut FxHashSet::default(), None);
         other = true;
     }
 
@@ -923,7 +923,7 @@ fn for_loop(p: &mut Parser) {
     let m = p.marker();
     p.assert(SyntaxKind::For);
 
-    let mut seen = HashSet::new();
+    let mut seen = FxHashSet::default();
     pattern(p, false, &mut seen, None);
 
     if p.at(SyntaxKind::Comma) {
@@ -1084,7 +1084,7 @@ fn expr_with_paren(p: &mut Parser, atomic: bool) {
     } else if p.at(SyntaxKind::Eq) && kind != SyntaxKind::Parenthesized {
         p.restore(checkpoint);
         let m = p.marker();
-        destructuring_or_parenthesized(p, true, &mut HashSet::new());
+        destructuring_or_parenthesized(p, true, &mut FxHashSet::default());
         if !p.expect(SyntaxKind::Eq) {
             return;
         }
@@ -1107,7 +1107,7 @@ fn parenthesized_or_array_or_dict(p: &mut Parser) -> SyntaxKind {
         count: 0,
         maybe_just_parens: true,
         kind: None,
-        seen: HashSet::new(),
+        seen: FxHashSet::default(),
     };
 
     // An edge case with parens is whether we can interpret a leading spread
@@ -1169,7 +1169,7 @@ struct GroupState {
     /// The `SyntaxKind` to wrap as (if we've figured it out yet).
     kind: Option<SyntaxKind>,
     /// Store named arguments so we can give an error if they're repeated.
-    seen: HashSet<EcoString>,
+    seen: FxHashSet<EcoString>,
 }
 
 /// Parses a single item in an array or dictionary.
@@ -1238,7 +1238,7 @@ fn args(p: &mut Parser) {
         p.with_nl_mode(AtNewline::Continue, |p| {
             p.assert(SyntaxKind::LeftParen);
 
-            let mut seen = HashSet::new();
+            let mut seen = FxHashSet::default();
             while !p.current().is_terminator() {
                 if !p.at_set(set::ARG) {
                     p.unexpected();
@@ -1264,7 +1264,7 @@ fn args(p: &mut Parser) {
 }
 
 /// Parses a single argument in an argument list.
-fn arg<'s>(p: &mut Parser<'s>, seen: &mut HashSet<&'s str>) {
+fn arg<'s>(p: &mut Parser<'s>, seen: &mut FxHashSet<&'s str>) {
     let m = p.marker();
 
     // Parses a spread argument: `..args`.
@@ -1301,7 +1301,7 @@ fn params(p: &mut Parser) {
     p.with_nl_mode(AtNewline::Continue, |p| {
         p.assert(SyntaxKind::LeftParen);
 
-        let mut seen = HashSet::new();
+        let mut seen = FxHashSet::default();
         let mut sink = false;
 
         while !p.current().is_terminator() {
@@ -1323,7 +1323,7 @@ fn params(p: &mut Parser) {
 }
 
 /// Parses a single parameter in a parameter list.
-fn param<'s>(p: &mut Parser<'s>, seen: &mut HashSet<&'s str>, sink: &mut bool) {
+fn param<'s>(p: &mut Parser<'s>, seen: &mut FxHashSet<&'s str>, sink: &mut bool) {
     let m = p.marker();
 
     // Parses argument sink: `..sink`.
@@ -1358,7 +1358,7 @@ fn param<'s>(p: &mut Parser<'s>, seen: &mut HashSet<&'s str>, sink: &mut bool) {
 fn pattern<'s>(
     p: &mut Parser<'s>,
     reassignment: bool,
-    seen: &mut HashSet<&'s str>,
+    seen: &mut FxHashSet<&'s str>,
     dupe: Option<&'s str>,
 ) {
     match p.current() {
@@ -1372,7 +1372,7 @@ fn pattern<'s>(
 fn destructuring_or_parenthesized<'s>(
     p: &mut Parser<'s>,
     reassignment: bool,
-    seen: &mut HashSet<&'s str>,
+    seen: &mut FxHashSet<&'s str>,
 ) {
     let mut sink = false;
     let mut count = 0;
@@ -1410,7 +1410,7 @@ fn destructuring_or_parenthesized<'s>(
 fn destructuring_item<'s>(
     p: &mut Parser<'s>,
     reassignment: bool,
-    seen: &mut HashSet<&'s str>,
+    seen: &mut FxHashSet<&'s str>,
     maybe_just_parens: &mut bool,
     sink: &mut bool,
 ) {
@@ -1457,7 +1457,7 @@ fn destructuring_item<'s>(
 fn pattern_leaf<'s>(
     p: &mut Parser<'s>,
     reassignment: bool,
-    seen: &mut HashSet<&'s str>,
+    seen: &mut FxHashSet<&'s str>,
     dupe: Option<&'s str>,
 ) {
     if p.current().is_keyword() {
@@ -1920,7 +1920,7 @@ struct MemoArena {
     /// A map from the parser's current position to a range of previously parsed
     /// nodes in the arena and a checkpoint of the parser's state. These allow
     /// us to reset the parser to avoid parsing the same location again.
-    memo_map: HashMap<MemoKey, (Range<usize>, PartialState)>,
+    memo_map: FxHashMap<MemoKey, (Range<usize>, PartialState)>,
 }
 
 /// A type alias for the memo key so it doesn't get confused with other usizes.
diff --git a/crates/typst-utils/Cargo.toml b/crates/typst-utils/Cargo.toml
index 360e07d89..f96eaef43 100644
--- a/crates/typst-utils/Cargo.toml
+++ b/crates/typst-utils/Cargo.toml
@@ -16,6 +16,7 @@ readme = { workspace = true }
 once_cell = { workspace = true }
 portable-atomic = { workspace = true }
 rayon = { workspace = true }
+rustc-hash = { workspace = true }
 siphasher = { workspace = true }
 thin-vec = { workspace = true }
 unicode-math-class = { workspace = true }
diff --git a/crates/typst-utils/src/pico.rs b/crates/typst-utils/src/pico.rs
index b6f269af8..e0429737f 100644
--- a/crates/typst-utils/src/pico.rs
+++ b/crates/typst-utils/src/pico.rs
@@ -1,22 +1,24 @@
 use std::borrow::Borrow;
 use std::cmp::Ordering;
-use std::collections::HashMap;
 use std::fmt::{self, Debug, Display, Formatter};
 use std::hash::{Hash, Hasher};
 use std::num::NonZeroU64;
 use std::ops::Deref;
 use std::sync::{LazyLock, RwLock};
 
+use rustc_hash::FxHashMap;
+
 /// Marks a number as a bitcode encoded `PicoStr``.
 const MARKER: u64 = 1 << 63;
 
 /// The global runtime string interner.
-static INTERNER: LazyLock<RwLock<Interner>> =
-    LazyLock::new(|| RwLock::new(Interner { seen: HashMap::new(), strings: Vec::new() }));
+static INTERNER: LazyLock<RwLock<Interner>> = LazyLock::new(|| {
+    RwLock::new(Interner { seen: FxHashMap::default(), strings: Vec::new() })
+});
 
 /// A string interner.
 struct Interner {
-    seen: HashMap<&'static str, PicoStr>,
+    seen: FxHashMap<&'static str, PicoStr>,
     strings: Vec<&'static str>,
 }
 
diff --git a/crates/typst/Cargo.toml b/crates/typst/Cargo.toml
index 3eb6dea9b..33e06cedd 100644
--- a/crates/typst/Cargo.toml
+++ b/crates/typst/Cargo.toml
@@ -24,6 +24,7 @@ typst-timing = { workspace = true }
 typst-utils = { workspace = true }
 comemo = { workspace = true }
 ecow = { workspace = true }
+rustc-hash = { workspace = true }
 
 [lints]
 workspace = true
diff --git a/crates/typst/src/lib.rs b/crates/typst/src/lib.rs
index 47e5531fd..0588a57f7 100644
--- a/crates/typst/src/lib.rs
+++ b/crates/typst/src/lib.rs
@@ -38,11 +38,11 @@ pub use typst_syntax as syntax;
 #[doc(inline)]
 pub use typst_utils as utils;
 
-use std::collections::HashSet;
 use std::sync::LazyLock;
 
 use comemo::{Track, Tracked, Validate};
 use ecow::{EcoString, EcoVec, eco_format, eco_vec};
+use rustc_hash::FxHashSet;
 use typst_html::HtmlDocument;
 use typst_library::diag::{
     FileError, SourceDiagnostic, SourceResult, Warned, bail, warning,
@@ -176,7 +176,7 @@ fn compile_impl<D: Document>(
 
 /// Deduplicate diagnostics.
 fn deduplicate(mut diags: EcoVec<SourceDiagnostic>) -> EcoVec<SourceDiagnostic> {
-    let mut unique = HashSet::new();
+    let mut unique = FxHashSet::default();
     diags.retain(|diag| {
         let hash = typst_utils::hash128(&(&diag.span, &diag.message));
         unique.insert(hash)
diff --git a/docs/Cargo.toml b/docs/Cargo.toml
index 64e261289..6b5b29527 100644
--- a/docs/Cargo.toml
+++ b/docs/Cargo.toml
@@ -26,6 +26,7 @@ codex = { workspace = true }
 ecow = { workspace = true }
 heck = { workspace = true }
 pulldown-cmark = { workspace = true }
+rustc-hash = { workspace = true }
 serde = { workspace = true }
 serde_json = { workspace = true, optional = true }
 serde_yaml = { workspace = true }
diff --git a/docs/src/contribs.rs b/docs/src/contribs.rs
index d9824c39a..8a420ec7a 100644
--- a/docs/src/contribs.rs
+++ b/docs/src/contribs.rs
@@ -1,7 +1,7 @@
 use std::cmp::Reverse;
-use std::collections::HashMap;
 use std::fmt::Write;
 
+use rustc_hash::FxHashMap;
 use serde::{Deserialize, Serialize};
 
 use crate::{Html, Resolver};
@@ -12,7 +12,7 @@ pub fn contributors(resolver: &dyn Resolver, from: &str, to: &str) -> Option<Htm
     let bots = ["dependabot[bot]"];
 
     // Determine number of contributions per person.
-    let mut contributors = HashMap::<String, Contributor>::new();
+    let mut contributors = FxHashMap::<String, Contributor>::default();
     for commit in resolver.commits(from, to) {
         contributors
             .entry(commit.author.login.clone())
diff --git a/docs/src/lib.rs b/docs/src/lib.rs
index 2d9e9bdbc..340b41467 100644
--- a/docs/src/lib.rs
+++ b/docs/src/lib.rs
@@ -9,10 +9,9 @@ pub use self::contribs::*;
 pub use self::html::*;
 pub use self::model::*;
 
-use std::collections::HashSet;
-
 use ecow::{EcoString, eco_format};
 use heck::ToTitleCase;
+use rustc_hash::FxHashSet;
 use serde::Deserialize;
 use serde_yaml as yaml;
 use std::sync::LazyLock;
@@ -260,7 +259,7 @@ fn category_page(resolver: &dyn Resolver, category: Category) -> PageModel {
         shorthands = Some(ShorthandsModel { markup, math });
     }
 
-    let mut skip = HashSet::new();
+    let mut skip = FxHashSet::default();
     if category == Category::Math {
         skip = GROUPS
             .iter()
diff --git a/tests/Cargo.toml b/tests/Cargo.toml
index cb979b6c2..28aeed029 100644
--- a/tests/Cargo.toml
+++ b/tests/Cargo.toml
@@ -46,6 +46,7 @@ oxipng = { workspace = true }
 parking_lot = { workspace = true }
 rayon = { workspace = true }
 regex = { workspace = true }
+rustc-hash = { workspace = true }
 tiny-skia = { workspace = true }
 unscanny = { workspace = true }
 walkdir = { workspace = true }
diff --git a/tests/src/collect.rs b/tests/src/collect.rs
index d1b59cb9b..af03c72d4 100644
--- a/tests/src/collect.rs
+++ b/tests/src/collect.rs
@@ -1,4 +1,3 @@
-use std::collections::{HashMap, HashSet};
 use std::fmt::{self, Display, Formatter};
 use std::ops::Range;
 use std::path::{Path, PathBuf};
@@ -6,6 +5,7 @@ use std::str::FromStr;
 use std::sync::LazyLock;
 
 use ecow::{EcoString, eco_format};
+use rustc_hash::{FxHashMap, FxHashSet};
 use typst_syntax::package::PackageVersion;
 use typst_syntax::{
     FileId, Lines, Source, VirtualPath, is_id_continue, is_ident, is_newline,
@@ -122,7 +122,7 @@ impl Display for NoteKind {
 struct Collector {
     tests: Vec<Test>,
     errors: Vec<TestParseError>,
-    seen: HashMap<EcoString, (FilePos, Vec<Attr>)>,
+    seen: FxHashMap<EcoString, (FilePos, Vec<Attr>)>,
     skipped: usize,
 }
 
@@ -132,7 +132,7 @@ impl Collector {
         Self {
             tests: vec![],
             errors: vec![],
-            seen: HashMap::new(),
+            seen: FxHashMap::default(),
             skipped: 0,
         }
     }
@@ -507,7 +507,7 @@ impl<'a> Parser<'a> {
 
 /// Whether a test is within the selected set to run.
 fn selected(name: &str, abs: PathBuf) -> bool {
-    static SKIPPED: LazyLock<HashSet<&'static str>> = LazyLock::new(|| {
+    static SKIPPED: LazyLock<FxHashSet<&'static str>> = LazyLock::new(|| {
         String::leak(std::fs::read_to_string(crate::SKIP_PATH).unwrap())
             .lines()
             .map(|line| line.trim())
diff --git a/tests/src/world.rs b/tests/src/world.rs
index 85969700d..50fbef445 100644
--- a/tests/src/world.rs
+++ b/tests/src/world.rs
@@ -1,5 +1,4 @@
 use std::borrow::Cow;
-use std::collections::HashMap;
 use std::fs;
 use std::io::Write;
 use std::path::{Path, PathBuf};
@@ -8,6 +7,7 @@ use std::sync::OnceLock;
 
 use comemo::Tracked;
 use parking_lot::Mutex;
+use rustc_hash::FxHashMap;
 use typst::diag::{At, FileError, FileResult, SourceResult, StrResult, bail};
 use typst::engine::Engine;
 use typst::foundations::{
@@ -108,7 +108,7 @@ struct TestBase {
     library: LazyHash<Library>,
     book: LazyHash<FontBook>,
     fonts: Vec<Font>,
-    slots: Mutex<HashMap<FileId, FileSlot>>,
+    slots: Mutex<FxHashMap<FileId, FileSlot>>,
 }
 
 impl Default for TestBase {
@@ -122,7 +122,7 @@ impl Default for TestBase {
             library: LazyHash::new(library()),
             book: LazyHash::new(FontBook::from_fonts(&fonts)),
             fonts,
-            slots: Mutex::new(HashMap::new()),
+            slots: Mutex::new(FxHashMap::default()),
         }
     }
 }

From 492bd278850e4d2f371717f22f2b86c88e3173c8 Mon Sep 17 00:00:00 2001
From: Laurenz <laurmaedje@gmail.com>
Date: Thu, 31 Jul 2025 11:21:24 +0200
Subject: [PATCH 02/19] Faster constraint checking in comemo (bumps comemo &
 krilla) (#6683)

---
 Cargo.lock                                    | 42 +++++++++----------
 Cargo.toml                                    |  6 +--
 crates/typst-library/src/engine.rs            |  4 +-
 .../src/introspection/locator.rs              |  4 +-
 crates/typst-pdf/src/convert.rs               |  4 +-
 crates/typst-pdf/src/embed.rs                 |  2 +-
 crates/typst-pdf/src/image.rs                 |  2 +-
 crates/typst-pdf/src/shape.rs                 |  2 +-
 crates/typst-pdf/src/text.rs                  |  2 +-
 crates/typst/src/lib.rs                       |  6 +--
 10 files changed, 35 insertions(+), 39 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index d35e708bc..424b61f44 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -450,21 +450,22 @@ checksum = "5b63caa9aa9397e2d9480a9b13673856c78d8ac123288526c37d7839f2a86990"
 
 [[package]]
 name = "comemo"
-version = "0.4.0"
+version = "0.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "df6916408a724339aa77b18214233355f3eb04c42eb895e5f8909215bd8a7a91"
+checksum = "649d7b2d867b569729c03c0f6968db10bc95921182a1f2b2012b1b549492f39d"
 dependencies = [
  "comemo-macros",
- "once_cell",
  "parking_lot",
+ "rustc-hash",
  "siphasher",
+ "slab",
 ]
 
 [[package]]
 name = "comemo-macros"
-version = "0.4.0"
+version = "0.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c8936e42f9b4f5bdfaf23700609ac1f11cb03ad4c1ec128a4ee4fd0903e228db"
+checksum = "51c87fc7e85487493ddedae1a3a34b897c77ad8825375b79265a8a162c28d535"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -861,15 +862,6 @@ version = "2.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e6d5a32815ae3f33302d95fdcb2ce17862f8c65363dcfd29360480ba1001fc9c"
 
-[[package]]
-name = "fxhash"
-version = "0.2.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c31b6d751ae2c7f11320402d34e41349dd1016f8d5d45e48c4312bc8625af50c"
-dependencies = [
- "byteorder",
-]
-
 [[package]]
 name = "getopts"
 version = "0.2.21"
@@ -1424,14 +1416,13 @@ dependencies = [
 [[package]]
 name = "krilla"
 version = "0.4.0"
-source = "git+https://github.com/LaurenzV/krilla?rev=37b9a00#37b9a00bfac87ed0b347b7cf8e9d37a6f68fcccd"
+source = "git+https://github.com/LaurenzV/krilla?rev=abdf031#abdf031c9e5ba89d606f6f145fad648c75812aec"
 dependencies = [
  "base64",
  "bumpalo",
  "comemo",
  "flate2",
  "float-cmp 0.10.0",
- "fxhash",
  "gif",
  "hayro-write",
  "image-webp",
@@ -1440,6 +1431,7 @@ dependencies = [
  "pdf-writer",
  "png",
  "rayon",
+ "rustc-hash",
  "rustybuzz",
  "siphasher",
  "skrifa",
@@ -1454,7 +1446,7 @@ dependencies = [
 [[package]]
 name = "krilla-svg"
 version = "0.1.0"
-source = "git+https://github.com/LaurenzV/krilla?rev=37b9a00#37b9a00bfac87ed0b347b7cf8e9d37a6f68fcccd"
+source = "git+https://github.com/LaurenzV/krilla?rev=abdf031#abdf031c9e5ba89d606f6f145fad648c75812aec"
 dependencies = [
  "flate2",
  "fontdb",
@@ -2270,9 +2262,9 @@ dependencies = [
 
 [[package]]
 name = "rustc-hash"
-version = "2.1.0"
+version = "2.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c7fb8039b3032c191086b10f11f319a6e99e1e82889c5cc6046f515c9db1d497"
+checksum = "357703d41365b4b27c590e3ed91eabb1b663f07c4c084095e60cbed4362dff0d"
 
 [[package]]
 name = "rustix"
@@ -2499,6 +2491,12 @@ dependencies = [
  "read-fonts",
 ]
 
+[[package]]
+name = "slab"
+version = "0.4.10"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "04dc19736151f35336d325007ac991178d504a119863a2fcb3758cdb5e52c50d"
+
 [[package]]
 name = "slotmap"
 version = "1.0.7"
@@ -2588,11 +2586,11 @@ dependencies = [
 
 [[package]]
 name = "subsetter"
-version = "0.2.1"
+version = "0.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "35539e8de3dcce8dd0c01f3575f85db1e5ac1aea1b996d2d09d89f148bc91497"
+checksum = "35725d9d2d056905865f8a36146e45be43691b15fc5d973bd7f79dd438288544"
 dependencies = [
- "fxhash",
+ "rustc-hash",
 ]
 
 [[package]]
diff --git a/Cargo.toml b/Cargo.toml
index 04c25cb6b..6dfb36bb4 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -49,7 +49,7 @@ clap_mangen = "0.2.10"
 codespan-reporting = "0.11"
 codex = { git = "https://github.com/typst/codex", rev = "9ac86f9" }
 color-print = "0.3.6"
-comemo = "0.4"
+comemo = "0.5.0"
 csv = "1"
 ctrlc = "3.4.1"
 dirs = "6"
@@ -75,8 +75,8 @@ image = { version = "0.25.5", default-features = false, features = ["png", "jpeg
 indexmap = { version = "2", features = ["serde"] }
 infer = { version = "0.19.0", default-features = false }
 kamadak-exif = "0.6"
-krilla = { git = "https://github.com/LaurenzV/krilla", rev = "37b9a00", default-features = false, features = ["raster-images", "comemo", "rayon", "pdf"] }
-krilla-svg = { git = "https://github.com/LaurenzV/krilla", rev = "37b9a00"}
+krilla = { git = "https://github.com/LaurenzV/krilla", rev = "abdf031", default-features = false, features = ["raster-images", "comemo", "rayon", "pdf"] }
+krilla-svg = { git = "https://github.com/LaurenzV/krilla", rev = "abdf031" }
 kurbo = "0.11"
 libfuzzer-sys = "0.4"
 lipsum = "0.9"
diff --git a/crates/typst-library/src/engine.rs b/crates/typst-library/src/engine.rs
index d0a117804..1deb41da3 100644
--- a/crates/typst-library/src/engine.rs
+++ b/crates/typst-library/src/engine.rs
@@ -2,7 +2,7 @@
 
 use std::sync::atomic::{AtomicUsize, Ordering};
 
-use comemo::{Track, Tracked, TrackedMut, Validate};
+use comemo::{Track, Tracked, TrackedMut};
 use ecow::EcoVec;
 use rayon::iter::{IndexedParallelIterator, IntoParallelIterator, ParallelIterator};
 use rustc_hash::FxHashSet;
@@ -219,7 +219,7 @@ pub struct Route<'a> {
     // We need to override the constraint's lifetime here so that `Tracked` is
     // covariant over the constraint. If it becomes invariant, we're in for a
     // world of lifetime pain.
-    outer: Option<Tracked<'a, Self, <Route<'static> as Validate>::Constraint>>,
+    outer: Option<Tracked<'a, Self, <Route<'static> as Track>::Call>>,
     /// This is set if this route segment was inserted through the start of a
     /// module evaluation.
     id: Option<FileId>,
diff --git a/crates/typst-library/src/introspection/locator.rs b/crates/typst-library/src/introspection/locator.rs
index 192d20ab0..d9793a52f 100644
--- a/crates/typst-library/src/introspection/locator.rs
+++ b/crates/typst-library/src/introspection/locator.rs
@@ -2,7 +2,7 @@ use std::fmt::{self, Debug, Formatter};
 use std::hash::Hash;
 use std::sync::OnceLock;
 
-use comemo::{Tracked, Validate};
+use comemo::{Track, Tracked};
 use rustc_hash::FxHashMap;
 
 use crate::introspection::{Introspector, Location};
@@ -312,7 +312,7 @@ enum LinkKind<'a> {
     /// We need to override the constraint's lifetime here so that `Tracked` is
     /// covariant over the constraint. If it becomes invariant, we're in for a
     /// world of lifetime pain.
-    Outer(Tracked<'a, Locator<'a>, <Locator<'static> as Validate>::Constraint>),
+    Outer(Tracked<'a, Locator<'a>, <Locator<'static> as Track>::Call>),
     /// A link which indicates that we are in measurement mode.
     Measure(Location),
 }
diff --git a/crates/typst-pdf/src/convert.rs b/crates/typst-pdf/src/convert.rs
index c660c6c6b..728bda9e8 100644
--- a/crates/typst-pdf/src/convert.rs
+++ b/crates/typst-pdf/src/convert.rs
@@ -1,5 +1,4 @@
 use std::collections::BTreeMap;
-use std::num::NonZeroU64;
 
 use ecow::{EcoVec, eco_format};
 use krilla::annotation::Annotation;
@@ -626,8 +625,7 @@ fn convert_error(
 
 /// Convert a krilla location to a span.
 fn to_span(loc: Option<krilla::surface::Location>) -> Span {
-    loc.map(|l| Span::from_raw(NonZeroU64::new(l).unwrap()))
-        .unwrap_or(Span::detached())
+    loc.map(Span::from_raw).unwrap_or(Span::detached())
 }
 
 fn collect_named_destinations(
diff --git a/crates/typst-pdf/src/embed.rs b/crates/typst-pdf/src/embed.rs
index b50f4a56d..203e39607 100644
--- a/crates/typst-pdf/src/embed.rs
+++ b/crates/typst-pdf/src/embed.rs
@@ -47,7 +47,7 @@ pub(crate) fn embed_files(
             association_kind,
             data: data.into(),
             compress,
-            location: Some(span.into_raw().get()),
+            location: Some(span.into_raw()),
         };
 
         if document.embed_file(file).is_none() {
diff --git a/crates/typst-pdf/src/image.rs b/crates/typst-pdf/src/image.rs
index b846d1799..8f2887300 100644
--- a/crates/typst-pdf/src/image.rs
+++ b/crates/typst-pdf/src/image.rs
@@ -27,7 +27,7 @@ pub(crate) fn handle_image(
     span: Span,
 ) -> SourceResult<()> {
     surface.push_transform(&fc.state().transform().to_krilla());
-    surface.set_location(span.into_raw().get());
+    surface.set_location(span.into_raw());
 
     let interpolate = image.scaling() == Smart::Custom(ImageScaling::Smooth);
 
diff --git a/crates/typst-pdf/src/shape.rs b/crates/typst-pdf/src/shape.rs
index 5dc23563b..f3419c6cc 100644
--- a/crates/typst-pdf/src/shape.rs
+++ b/crates/typst-pdf/src/shape.rs
@@ -16,7 +16,7 @@ pub(crate) fn handle_shape(
     gc: &mut GlobalContext,
     span: Span,
 ) -> SourceResult<()> {
-    surface.set_location(span.into_raw().get());
+    surface.set_location(span.into_raw());
     surface.push_transform(&fc.state().transform().to_krilla());
 
     if let Some(path) = convert_geometry(&shape.geometry) {
diff --git a/crates/typst-pdf/src/text.rs b/crates/typst-pdf/src/text.rs
index 8bce738ce..b4ace9401 100644
--- a/crates/typst-pdf/src/text.rs
+++ b/crates/typst-pdf/src/text.rs
@@ -132,6 +132,6 @@ impl krilla::text::Glyph for PdfGlyph {
     }
 
     fn location(&self) -> Option<Location> {
-        Some(self.0.span.0.into_raw().get())
+        Some(self.0.span.0.into_raw())
     }
 }
diff --git a/crates/typst/src/lib.rs b/crates/typst/src/lib.rs
index 0588a57f7..d00b98795 100644
--- a/crates/typst/src/lib.rs
+++ b/crates/typst/src/lib.rs
@@ -40,7 +40,7 @@ pub use typst_utils as utils;
 
 use std::sync::LazyLock;
 
-use comemo::{Track, Tracked, Validate};
+use comemo::{Track, Tracked};
 use ecow::{EcoString, EcoVec, eco_format, eco_vec};
 use rustc_hash::FxHashSet;
 use typst_html::HtmlDocument;
@@ -135,7 +135,7 @@ fn compile_impl<D: Document>(
 
         subsink = Sink::new();
 
-        let constraint = <Introspector as Validate>::Constraint::new();
+        let constraint = comemo::Constraint::new();
         let mut engine = Engine {
             world,
             introspector: introspector.track_with(&constraint),
@@ -150,7 +150,7 @@ fn compile_impl<D: Document>(
         introspector = document.introspector();
         iter += 1;
 
-        if timed!("check stabilized", introspector.validate(&constraint)) {
+        if timed!("check stabilized", constraint.validate(introspector)) {
             break;
         }
 

From a7ad9d426aaec1dff83e6b98c02e2906d62ea1ce Mon Sep 17 00:00:00 2001
From: Malo <57839069+MDLC01@users.noreply.github.com>
Date: Fri, 1 Aug 2025 08:18:45 +0100
Subject: [PATCH 03/19] Add `--target` argument for `typst query` (#6405)

Co-authored-by: Laurenz <laurmaedje@gmail.com>
---
 crates/typst-cli/src/args.rs                  | 16 +++++++++++++
 crates/typst-cli/src/query.rs                 | 23 +++++++++++--------
 crates/typst-library/src/diag.rs              |  7 ++++++
 .../typst-library/src/introspection/query.rs  |  8 +++++++
 4 files changed, 44 insertions(+), 10 deletions(-)

diff --git a/crates/typst-cli/src/args.rs b/crates/typst-cli/src/args.rs
index 7459be0f2..f31d26a2e 100644
--- a/crates/typst-cli/src/args.rs
+++ b/crates/typst-cli/src/args.rs
@@ -155,6 +155,10 @@ pub struct QueryCommand {
     #[clap(long)]
     pub pretty: bool,
 
+    /// The target to compile for.
+    #[clap(long, default_value_t)]
+    pub target: Target,
+
     /// World arguments.
     #[clap(flatten)]
     pub world: WorldArgs,
@@ -457,6 +461,18 @@ pub enum OutputFormat {
 
 display_possible_values!(OutputFormat);
 
+/// The target to compile for.
+#[derive(Debug, Default, Copy, Clone, Eq, PartialEq, Ord, PartialOrd, ValueEnum)]
+pub enum Target {
+    /// PDF and image formats.
+    #[default]
+    Paged,
+    /// HTML.
+    Html,
+}
+
+display_possible_values!(Target);
+
 /// Which format to use for diagnostics.
 #[derive(Debug, Default, Copy, Clone, Eq, PartialEq, Ord, PartialOrd, ValueEnum)]
 pub enum DiagnosticFormat {
diff --git a/crates/typst-cli/src/query.rs b/crates/typst-cli/src/query.rs
index 30688b3b6..19c0b0348 100644
--- a/crates/typst-cli/src/query.rs
+++ b/crates/typst-cli/src/query.rs
@@ -5,11 +5,13 @@ use typst::World;
 use typst::diag::{HintedStrResult, StrResult, Warned, bail};
 use typst::engine::Sink;
 use typst::foundations::{Content, IntoValue, LocatableSelector, Scope};
+use typst::introspection::Introspector;
 use typst::layout::PagedDocument;
 use typst::syntax::{Span, SyntaxMode};
 use typst_eval::eval_string;
+use typst_html::HtmlDocument;
 
-use crate::args::{QueryCommand, SerializationFormat};
+use crate::args::{QueryCommand, SerializationFormat, Target};
 use crate::compile::print_diagnostics;
 use crate::set_failed;
 use crate::world::SystemWorld;
@@ -22,12 +24,17 @@ pub fn query(command: &QueryCommand) -> HintedStrResult<()> {
     world.reset();
     world.source(world.main()).map_err(|err| err.to_string())?;
 
-    let Warned { output, warnings } = typst::compile(&world);
+    let Warned { output, warnings } = match command.target {
+        Target::Paged => typst::compile::<PagedDocument>(&world)
+            .map(|output| output.map(|document| document.introspector)),
+        Target::Html => typst::compile::<HtmlDocument>(&world)
+            .map(|output| output.map(|document| document.introspector)),
+    };
 
     match output {
         // Retrieve and print query results.
-        Ok(document) => {
-            let data = retrieve(&world, command, &document)?;
+        Ok(introspector) => {
+            let data = retrieve(&world, command, &introspector)?;
             let serialized = format(data, command)?;
             println!("{serialized}");
             print_diagnostics(&world, &[], &warnings, command.process.diagnostic_format)
@@ -54,7 +61,7 @@ pub fn query(command: &QueryCommand) -> HintedStrResult<()> {
 fn retrieve(
     world: &dyn World,
     command: &QueryCommand,
-    document: &PagedDocument,
+    introspector: &Introspector,
 ) -> HintedStrResult<Vec<Content>> {
     let selector = eval_string(
         &typst::ROUTINES,
@@ -76,11 +83,7 @@ fn retrieve(
     })?
     .cast::<LocatableSelector>()?;
 
-    Ok(document
-        .introspector
-        .query(&selector.0)
-        .into_iter()
-        .collect::<Vec<_>>())
+    Ok(introspector.query(&selector.0).into_iter().collect::<Vec<_>>())
 }
 
 /// Format the query result in the output format.
diff --git a/crates/typst-library/src/diag.rs b/crates/typst-library/src/diag.rs
index 90686b25f..018f16167 100644
--- a/crates/typst-library/src/diag.rs
+++ b/crates/typst-library/src/diag.rs
@@ -151,6 +151,13 @@ pub struct Warned<T> {
     pub warnings: EcoVec<SourceDiagnostic>,
 }
 
+impl<T> Warned<T> {
+    /// Maps the output, keeping the same warnings.
+    pub fn map<R, F: FnOnce(T) -> R>(self, f: F) -> Warned<R> {
+        Warned { output: f(self.output), warnings: self.warnings }
+    }
+}
+
 /// An error or warning in a source or text file.
 ///
 /// The contained spans will only be detached if any of the input source files
diff --git a/crates/typst-library/src/introspection/query.rs b/crates/typst-library/src/introspection/query.rs
index 02f6385e9..65afe9e75 100644
--- a/crates/typst-library/src/introspection/query.rs
+++ b/crates/typst-library/src/introspection/query.rs
@@ -117,6 +117,8 @@ use crate::foundations::{Array, Context, LocatableSelector, Value, func};
 /// ]
 /// ```
 ///
+/// ## Retrieving a specific field
+///
 /// Frequently, you're interested in only one specific field of the resulting
 /// elements. In the case of the `metadata` element, the `value` field is the
 /// interesting one. You can extract just this field with the `--field`
@@ -134,6 +136,12 @@ use crate::foundations::{Array, Context, LocatableSelector, Value, func};
 /// $ typst query example.typ "<note>" --field value --one
 /// "This is a note"
 /// ```
+///
+/// ## Querying for a specific export target
+///
+/// In case you need to query a document when exporting for a specific target,
+/// you can use the `--target` argument. Valid values are `paged`, and `html`
+/// (if the [`html`]($html) feature is enabled).
 #[func(contextual)]
 pub fn query(
     engine: &mut Engine,

From 7dc99e92ecec28cd62436e344cebc3052c756ac3 Mon Sep 17 00:00:00 2001
From: Max <max@mkor.je>
Date: Fri, 1 Aug 2025 08:37:49 +0000
Subject: [PATCH 04/19] Require parentheses in all function-like
 sub/superscripts (#6442)

Co-authored-by: Laurenz <laurmaedje@gmail.com>
---
 crates/typst-eval/src/math.rs                 |  20 +++++++--
 crates/typst-syntax/src/parser.rs             |   4 +-
 ...h-attach-followed-by-func-call-complex.png | Bin 0 -> 927 bytes
 ...h-attach-followed-by-func-call-warning.png | Bin 0 -> 630 bytes
 .../ref/math-attach-followed-by-func-call.png | Bin 1206 -> 2901 bytes
 tests/ref/raw-highlight-typm.png              | Bin 9269 -> 9516 bytes
 tests/suite/math/accent.typ                   |   2 +-
 tests/suite/math/attach.typ                   |  38 ++++++++++++++++--
 tests/suite/text/raw.typ                      |   2 +-
 9 files changed, 56 insertions(+), 10 deletions(-)
 create mode 100644 tests/ref/math-attach-followed-by-func-call-complex.png
 create mode 100644 tests/ref/math-attach-followed-by-func-call-warning.png

diff --git a/crates/typst-eval/src/math.rs b/crates/typst-eval/src/math.rs
index c2325a8c5..994ac9808 100644
--- a/crates/typst-eval/src/math.rs
+++ b/crates/typst-eval/src/math.rs
@@ -1,5 +1,5 @@
 use ecow::eco_format;
-use typst_library::diag::{At, SourceResult};
+use typst_library::diag::{At, SourceResult, warning};
 use typst_library::foundations::{Content, NativeElement, Symbol, SymbolElem, Value};
 use typst_library::math::{
     AlignPointElem, AttachElem, FracElem, LrElem, PrimesElem, RootElem,
@@ -80,7 +80,14 @@ impl Eval for ast::MathAttach<'_> {
         let mut elem = AttachElem::new(base);
 
         if let Some(expr) = self.top() {
-            elem.t.set(Some(expr.eval_display(vm)?));
+            let top = expr.eval(vm)?;
+            if let Value::Func(_) = top {
+                vm.engine.sink.warn(warning!(
+                    expr.span(), "function literal used as superscript";
+                    hint: "wrap the entire function call in parentheses",
+                ));
+            }
+            elem.t.set(Some(top.display().spanned(self.span())));
         }
 
         // Always attach primes in scripts style (not limits style),
@@ -90,7 +97,14 @@ impl Eval for ast::MathAttach<'_> {
         }
 
         if let Some(expr) = self.bottom() {
-            elem.b.set(Some(expr.eval_display(vm)?));
+            let bottom = expr.eval(vm)?;
+            if let Value::Func(_) = bottom {
+                vm.engine.sink.warn(warning!(
+                    expr.span(), "function literal used as subscript";
+                    hint: "wrap the entire function call in parentheses",
+                ));
+            }
+            elem.b.set(Some(bottom.display().spanned(self.span())));
         }
 
         Ok(elem.pack())
diff --git a/crates/typst-syntax/src/parser.rs b/crates/typst-syntax/src/parser.rs
index 78b39e1e3..14c99cabb 100644
--- a/crates/typst-syntax/src/parser.rs
+++ b/crates/typst-syntax/src/parser.rs
@@ -384,10 +384,10 @@ fn math_expr_prec(p: &mut Parser, min_prec: usize, stop: SyntaxKind) {
 fn math_op(kind: SyntaxKind) -> Option<(SyntaxKind, SyntaxKind, ast::Assoc, usize)> {
     match kind {
         SyntaxKind::Underscore => {
-            Some((SyntaxKind::MathAttach, SyntaxKind::Hat, ast::Assoc::Right, 2))
+            Some((SyntaxKind::MathAttach, SyntaxKind::Hat, ast::Assoc::Right, 3))
         }
         SyntaxKind::Hat => {
-            Some((SyntaxKind::MathAttach, SyntaxKind::Underscore, ast::Assoc::Right, 2))
+            Some((SyntaxKind::MathAttach, SyntaxKind::Underscore, ast::Assoc::Right, 3))
         }
         SyntaxKind::Slash => {
             Some((SyntaxKind::MathFrac, SyntaxKind::End, ast::Assoc::Left, 1))
diff --git a/tests/ref/math-attach-followed-by-func-call-complex.png b/tests/ref/math-attach-followed-by-func-call-complex.png
new file mode 100644
index 0000000000000000000000000000000000000000..36de777dee460c269f339a7f820033be36e75f21
GIT binary patch
literal 927
zcmV;Q17Q4#P)<h;3K|Lk000e1NJLTq004LZ000{Z0{{R3fZDqh0005qP)t-s|NsB`
z`uf`1+WY(a-{0T-{QUIv^z7{H*x1;$wY6JYTk7iSnwpw~goOO=@ZxfP@bK`zzrSK)
zVwIJZudlD;<KyDu;$vfDii(Qy@$sUfqO7c}j*gD&>+6w`k#KNuot>TMij%9Wt9EvF
zoSdA(!ot43zP-J@{r&yz?d|^e_?DKIsi~>3u(0s6x#^Xi`1tr|XJ=ksUj6d(?4zpb
zlAHP9;`Y$f;&XlU%Fg3=f%)O&^To>6*4E|a<))^lo}QkNkdXZC?)cr`=ZTX1@$&re
z@&Eh#-(+yxQD5njn(CIG_}bm+l$_>*jOBoe_t@L%k(q{uhM%9GqobqE&CTI#cjSDA
z?WV2t$<26pc;@Ej&(F`8n3zvbPv__7rKP3khmhZ8ar5)@#Kgq$y1&)c)%MZV+uPgq
z%g=Ffam>uj?(Xi&%F3Xip!fIp!NI}ig^tI^$9j5tLPA1$d3iZGIlR2Q>z$?Tr>@1t
z#m2_Q@U*$&aeUL$)Bg7N=#G|ha&q_9+3)Y~X=!OzR#tp`d~0iKxVX5Ro11iWbgr(h
z$jHdx;Na-!=%}cuhlhvq^78rl`KPC+_V)I+wzkyN)VjL5l9H0-<mArI&j0=W*Vos8
zfPnt~{te4gRsaA2eMv+?RCwC$)J0QUVE~2U_a<o?EWul#g|^gPpj2^pcXxMphoB(=
zazo^|GILkV5C*;(V0EA6*__>rN~KcWF+UwQ_TY@$<Bxz72e)O{z*SZ|xWs~(CYwDR
zuO0#R=8AGF08&zv9@q;5x~eL_yyx@p^t69Q<}v0KWWu@@5p9jq<|n)ghBKGBw9F5{
zvymA28rWR~sHt{>DJ~;5{wE8V@{0?>(v1jNW}_dkzJZ6WP82@AT+lNEn0|nAoReEp
z1P%3w*qpVF4_sPZzQA{IX(yTE_y|6JU}zt3=mA!z0TU3HU~DBj3n$dpA;Ms`ZEcgB
za&TxFjd~Koi)c+y$Q#_ij+Oxb3ELhgy>KiC4N8Fg3c$I%yu@?h@1OV<5`K-$Kn&vE
zMZ>mvOm?_EZU}xEs~n%&0Yx9zi+F~(w=v-nvBNv^nwyodrvW+*j}5?~9>u{v*Nc=u
z+{4hX|JyY>t%jq}K*{G6>y$DJlq*mzy-Ibj&H;~9PE5N6D(L_K002ovPDHLkV1iz<
BAd&z8

literal 0
HcmV?d00001

diff --git a/tests/ref/math-attach-followed-by-func-call-warning.png b/tests/ref/math-attach-followed-by-func-call-warning.png
new file mode 100644
index 0000000000000000000000000000000000000000..1b05ef8416c0622a1e27af466852a540ffb28b55
GIT binary patch
literal 630
zcmV-+0*U>JP)<h;3K|Lk000e1NJLTq004LZ001Zm000005P@O&0006#Nkl<Zc-rmN
z-%C?r90qXzq3F7sz`6;#kh+K<j4&udq%KSlmcG%*u;JDgPR~Z>=GoMiZHmnfv=Z8J
zp0&j0be*Nu38(DXIAhw{k9?|a2fWzs-r0rcz4@M(=Yh}7;r%w@Kb<BG)?f`jDsbvc
zWeSH4Gu5d~94<T+SHB+ZH2~gnb5iZrRRA0tapu8I0<XtHRN-t(LFcXAY6Cv3+3t^|
zkknz^f@4%+vl$oCwOiMLeYD2_<Zj{k-c~DBSQpHn64Z;!ez0{JSSy|Y|9AAE8KaCq
z6OP;5?Q`DF-k1$cti`$eEEYBx{4fp_&{>3@>2`;J$sk6i2lR=JfXhntueN%9qx!`u
z5M)d|cN-);17L+yb7OTTKN)g#VgH<c^<)tQr7j~!KxEx|2^in4#7mKC@6Cf(^Hkw)
zvMecg01<dE$Rb2Y(*UqjiDk7H-wqe4KOk;JTM`;f8(z)StBF4v33r5Vx@xz&-x5pX
zU|$z*h&4;WHuUg~gS$AK-c&D32bV-Yi!+jXi9e<d&ph{?Wupw6UH~6E=PWF5OF`x<
z-VOZ@+PUVj&%<nz2fu#a4nYw^PveLT=BU8fP^4d0hjT)gGFO+xwd`HV{Bs}Qcam9;
z!!g*K?E?Wwg6&B6WbPI6beF{J6&VD%{+Ap9`RJ)89{=pa#Y>4YEU*M*a~Plp2cpsW
zQY+vEET$DNUf_wbP)@?pWj`*K6T4;MU*a+;bRUqRNWHczpgoxytig59AE+lirv`E-
QM*si-07*qoM6N<$g2*-_xc~qF

literal 0
HcmV?d00001

diff --git a/tests/ref/math-attach-followed-by-func-call.png b/tests/ref/math-attach-followed-by-func-call.png
index 71d78c16e784cc9ae84ae27a6ef0dc91318f8a44..096fb5d0091988c30a0068f5be2e8b5172aa3890 100644
GIT binary patch
literal 2901
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

literal 1206
zcmV;n1WEgeP)<h;3K|Lk000e1NJLTq004LZ001@!00000DO~~*000DiNkl<Zc-rmO
z-A_|z9Kdn^nO*N@FBiL5X4JT4i`%kIqnlH=;WWA!=iDaRIgRsW(+TRzRtpZW2$T{S
zrG>)UDbRt6B2W=pOQljv3(}U;($kmk5}yzuP&i35Nld>N&y%OWrk^x9d2&{;Os&Yl
zIXL@56Um3*e)h0?FtQ$+mIEH!*7^Uzw%W{aby=}PA^hN`ucJ*O(BW|3MoG@5hd@I@
zoNDL7ho$|JLRd{?+sEMeY=l3fDCj6a*G)v8#yPN~q8?>%>s9D`fv6e?o@41eS^yO@
zspi1IVsKdX!G{}b0N5P@UcP!h0kBz&C(m3gWudNX)YkO+D=DNM@Tlx`xe8RnVpgI%
zF(HKkMl-{vNO4IT0KNbyd_DB^0B?^DZABCpizu*`vo*vDtGIgxT39#I0#{lAs5r%{
z>7_4_ZnFwTH8SJ@oVWmhI551L(o&%6Ebb71>=5Jg1*{K(HA-J0z)AppGXQUR<8J{#
zyTM@S&jjy?ZWt%BZxZriz#8#IJ|SuX-%j3X>xM7W)Bu1nj>7@khKbjV0EBjdrfX}m
z9*zxQio$#74>bT#l1L;{nP4pqLD)YDh8s}*O*sHlKQZw+&{*4`OVhB`?>Azv`=yY<
zHrjrLDZNSC2>{=N#$0+i4hP`875eMi3OoR2FZZpBKGgzF7QsxF0qA5VV;#5c#GCan
zUPbB#vopC6P3T}C45AQdu$<`%E(#B?s|4=c0+GiCxR~kq2y!)={EC10*NHdAoGvHC
zUY3R-5cxLK?jkRYyeOQA$H?5xBY=e%GFVVpg}Dqmt(K`Q?&=OFAo&5pK@^r;>sY22
zfuY>1PY!;b;IvquJ=`}M_z{|y1D5td({jL;y=P-eVADChJ^?tz(Umo<3jE+z0LP2O
zUK<p<q{|jAvge}!j+Ov0t_6|)ewHvEmV&2Et|(Q-c6*Yd9`MzVH-_;aMs)4^6bmG`
z7>za-%vU#tGYDW`6i#mP@6{naayVeSOyW|{oAqYcBBlqg8Fn(i$bns@J8D>{dpo5U
zCzV_vrAOJ~<*LPENwOUz*-!|u9f135Db~TX1a4qvWr}m&Y9Izte|M9_jczf4k8ZIV
z03P@D_KszSzqPS)5K*3tEPr*&Jw5Y}jYrtj7ohoM#2y7;*aZONM{F9R7f(S8p;wR#
zd}*tgyvpr8;`c80_xA@f!)=<fcPkP7){FM!#>z`DrlMm5OdhOXqe+<upd4)0x(MZr
zy#y4r_vM506p1Q0WT;3%Ijp`1KU<IQwgL=YTjH*c5eHGA7{Y`AgA?pPGLB3>pyomB
z(+4Tkh|eMQ1n#lJ@Tvr$2EQASm<Hev0w+(072aI>$6}9_!&DcD_5xal2fphAE&Pq>
z3G8cx)(bFq;#K2qA<q*>A<R9o4W*e?{rj!xxnr{oGHv8(vhH^edSWGi0qB|4*TFJ4
z7Hkh?cUN002#Fh|XWq;e5xdXNtcLcOfx8mfz@nH~GYsZUj^$o`a&QjL!Osi)A55-m
U{pD=NXaE2J07*qoM6N<$f=31~`Tzg`

diff --git a/tests/ref/raw-highlight-typm.png b/tests/ref/raw-highlight-typm.png
index 016a3e7a2ac68b0246ddc7480b19d27f4a858885..b0688f6b35bc20d6cf9eab2cfc2b8d6542122b3b 100644
GIT binary patch
literal 9516
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
KMNUMnLSTZOn!Hm0

literal 9269
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
Xbc0CFfl~S{00000NkvXXu0mjfLJj=E

diff --git a/tests/suite/math/accent.typ b/tests/suite/math/accent.typ
index 0aef41e20..8ebfe7731 100644
--- a/tests/suite/math/accent.typ
+++ b/tests/suite/math/accent.typ
@@ -34,7 +34,7 @@ $tilde(sum), tilde(sum, size: #50%), accent(H, hat, size: #200%)$
 
 --- math-accent-sized-script ---
 // Test accent size in script size.
-$tilde(U, size: #1.1em), x^tilde(U, size: #1.1em), sscript(tilde(U, size: #1.1em))$
+$tilde(U, size: #1.1em), x^(tilde(U, size: #1.1em)), sscript(tilde(U, size: #1.1em))$
 
 --- math-accent-dotless ---
 // Test dotless glyph variants.
diff --git a/tests/suite/math/attach.typ b/tests/suite/math/attach.typ
index 979018478..994355652 100644
--- a/tests/suite/math/attach.typ
+++ b/tests/suite/math/attach.typ
@@ -42,9 +42,41 @@ attach(a, tl: u, t: t, tr: v, bl: x, b: b, br: y)
 $
 
 --- math-attach-followed-by-func-call ---
-// Test function call after subscript.
-$pi_1(Y), a_f(x), a^zeta (x), a^abs(b)_sqrt(c) \
- a^subset.eq (x), a_(zeta(x)), pi_(1(Y)), a^(abs(b))_(sqrt(c))$
+// Test function call after subscripts and superscripts.
+#set page(width: auto)
+$a_1(x), a^10(x), a_f(x), a^zeta(x), a_"text"(x),
+// Warning: 22-25 function literal used as subscript
+// Hint: 22-25 wrap the entire function call in parentheses
+// Warning: 32-36 function literal used as superscript
+// Hint: 32-36 wrap the entire function call in parentheses
+ a_∂(x), a^cos(x), a_abs(x), a^root(2, x), a_subset.eq(x) \
+ a_(1(x)), a^(10(x)), a_(f(x)), a^(zeta(x)), a_("text"(x)),
+ a_(∂(x)), a^(cos(x)), a_(abs(x)), a^(root(2, x)), a_(subset.eq(x))$
+
+--- math-attach-followed-by-func-call-complex ---
+// Test function call with named arguments after scripts.
+#let cross = $c$
+// Warning: 4-10 function literal used as subscript
+// Hint: 4-10 wrap the entire function call in parentheses
+$a_cancel(x, cross: #true)$
+
+--- math-attach-followed-by-func-call-error ---
+// Error: 14-19 unknown variable: cross
+// Hint: 14-19 if you meant to display multiple letters as is, try adding spaces between each letter: `c r o s s`
+// Hint: 14-19 or if you meant to display this as text, try placing it in quotes: `"cross"`
+// Warning: 4-10 function literal used as subscript
+// Hint: 4-10 wrap the entire function call in parentheses
+$a_cancel(x, cross: #true)$
+
+--- math-attach-followed-by-func-call-warning ---
+// Test warning for function literal as subscripts and superscripts.
+#let myfunc(arg) = $arg$
+// Warning: 4-10 function literal used as subscript
+// Hint: 4-10 wrap the entire function call in parentheses
+$a_myfunc(x) a_(myfunc(x))$
+// Warning: 4-10 function literal used as subscript
+// Hint: 4-10 wrap the entire function call in parentheses
+$a_myfunc a_(myfunc)$
 
 --- math-attach-nested ---
 // Test associativity and scaling.
diff --git a/tests/suite/text/raw.typ b/tests/suite/text/raw.typ
index 827edaf8c..97e77adae 100644
--- a/tests/suite/text/raw.typ
+++ b/tests/suite/text/raw.typ
@@ -215,7 +215,7 @@ box[]
 hello.world
 hello.world()
 hello.my.world()
-f_zeta(x), f_zeta(x)/1
+f_(zeta(x)), f_(zeta(x))/1
 emph(hello.my.world())
 emph(hello.my().world)
 emph(hello.my().world())

From 210968f54f118d8b6f7d81649e6ba9409aa8a3ba Mon Sep 17 00:00:00 2001
From: "Y.D.X." <73375426+YDX-2147483647@users.noreply.github.com>
Date: Fri, 1 Aug 2025 17:11:11 +0800
Subject: [PATCH 05/19] Fix several wrong anchors in `$` docs link resolution 
 (#6684)

---
 docs/src/link.rs | 145 +++++++++++++++++++++++++++++++++++++++++++++--
 1 file changed, 139 insertions(+), 6 deletions(-)

diff --git a/docs/src/link.rs b/docs/src/link.rs
index 2c2fce21c..efbf3e8f2 100644
--- a/docs/src/link.rs
+++ b/docs/src/link.rs
@@ -1,5 +1,5 @@
 use typst::diag::{StrResult, bail};
-use typst::foundations::{Binding, Func};
+use typst::foundations::{Binding, Func, Type};
 
 use crate::{GROUPS, LIBRARY, get_module};
 
@@ -94,25 +94,158 @@ fn resolve_definition(head: &str, base: &str) -> StrResult<String> {
     let mut route = format!("{}reference/{}/{name}", base, category.name());
     if let Some(next) = parts.next() {
         if let Ok(field) = value.field(next, ()) {
+            // For top-level definitions
             route.push_str("/#definitions-");
             route.push_str(next);
-            if let Some(next) = parts.next()
-                && field.cast::<Func>().is_ok_and(|func| func.param(next).is_some())
-            {
-                route.push('-');
-                route.push_str(next);
+
+            let mut focus = field;
+            // For subsequent parameters, definitions, or definitions’ parameters
+            for next in parts.by_ref() {
+                if let Ok(field) = focus.field(next, ()) {
+                    // For definitions
+                    route.push_str("-definitions-");
+                    route.push_str(next);
+                    focus = field.clone();
+                } else if focus
+                    .clone()
+                    .cast::<Func>()
+                    .is_ok_and(|func| func.param(next).is_some())
+                {
+                    // For parameters
+                    route.push('-');
+                    route.push_str(next);
+                }
             }
+        } else if let Ok(ty) = value.clone().cast::<Type>()
+            && let Ok(func) = ty.constructor()
+            && func.param(next).is_some()
+        {
+            // For parameters of a constructor function
+            route.push_str("/#constructor-");
+            route.push_str(next);
         } else if value
             .clone()
             .cast::<Func>()
             .is_ok_and(|func| func.param(next).is_some())
         {
+            // For parameters of a function (except for constructor functions)
             route.push_str("/#parameters-");
             route.push_str(next);
         } else {
             bail!("field {next} not found");
         }
+
+        if let Some(next) = parts.next() {
+            bail!("found redundant field {next}");
+        }
     }
 
     Ok(route)
 }
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    #[test]
+    fn test_function() {
+        assert_eq!(
+            resolve_definition("$figure", "/"),
+            Ok("/reference/model/figure".into())
+        );
+        assert_eq!(
+            resolve_definition("$figure.body", "/"),
+            Ok("/reference/model/figure/#parameters-body".into())
+        );
+        assert_eq!(
+            resolve_definition("$figure.caption", "/"),
+            Ok("/reference/model/figure/#definitions-caption".into())
+        );
+        assert_eq!(
+            resolve_definition("$figure.caption.position", "/"),
+            Ok("/reference/model/figure/#definitions-caption-position".into())
+        );
+    }
+
+    #[test]
+    fn test_function_definition() {
+        assert_eq!(
+            resolve_definition("$outline", "/"),
+            Ok("/reference/model/outline".into())
+        );
+        assert_eq!(
+            resolve_definition("$outline.title", "/"),
+            Ok("/reference/model/outline/#parameters-title".into())
+        );
+
+        assert_eq!(
+            resolve_definition("$outline.entry", "/"),
+            Ok("/reference/model/outline/#definitions-entry".into())
+        );
+        assert_eq!(
+            resolve_definition("$outline.entry.fill", "/"),
+            Ok("/reference/model/outline/#definitions-entry-fill".into())
+        );
+    }
+
+    #[test]
+    fn test_function_definition_definition() {
+        assert_eq!(
+            resolve_definition("$outline.entry.indented", "/"),
+            Ok("/reference/model/outline/#definitions-entry-definitions-indented".into())
+        );
+        assert_eq!(
+            resolve_definition("$outline.entry.indented.prefix", "/"),
+            Ok("/reference/model/outline/#definitions-entry-definitions-indented-prefix"
+                .into())
+        );
+    }
+
+    #[test]
+    fn test_type() {
+        assert_eq!(
+            resolve_definition("$array", "/"),
+            Ok("/reference/foundations/array".into())
+        );
+        assert_eq!(
+            resolve_definition("$array.at", "/"),
+            Ok("/reference/foundations/array/#definitions-at".into())
+        );
+        assert_eq!(
+            resolve_definition("$array.at.index", "/"),
+            Ok("/reference/foundations/array/#definitions-at-index".into())
+        );
+    }
+
+    #[test]
+    fn test_type_constructor() {
+        assert_eq!(
+            resolve_definition("$str.base", "/"),
+            Ok("/reference/foundations/str/#constructor-base".into())
+        );
+        assert_eq!(
+            resolve_definition("$tiling.relative", "/"),
+            Ok("/reference/visualize/tiling/#constructor-relative".into())
+        );
+    }
+
+    #[test]
+    fn test_group() {
+        assert_eq!(
+            resolve_definition("$calc.abs", "/"),
+            Ok("/reference/foundations/calc/#functions-abs".into())
+        );
+        assert_eq!(
+            resolve_definition("$calc.pow.exponent", "/"),
+            Ok("/reference/foundations/calc/#functions-pow-exponent".into())
+        );
+    }
+
+    #[test]
+    fn test_redundant_field() {
+        assert_eq!(
+            resolve_definition("$figure.body.anything", "/"),
+            Err("found redundant field anything".into())
+        );
+    }
+}

From 7dff22db8a72ea0f2b2924a588238ba6c6a0c219 Mon Sep 17 00:00:00 2001
From: Abdul-Rahman Sibahi <asibahi@users.noreply.github.com>
Date: Fri, 1 Aug 2025 12:11:34 +0300
Subject: [PATCH 06/19] Add `cargo testit` alias for running integration tests
 (#6682)

Co-authored-by: Laurenz <laurmaedje@gmail.com>
---
 .cargo/config.toml |  2 ++
 tests/README.md    | 47 +++++++++++++---------------------------------
 2 files changed, 15 insertions(+), 34 deletions(-)
 create mode 100644 .cargo/config.toml

diff --git a/.cargo/config.toml b/.cargo/config.toml
new file mode 100644
index 000000000..53e2ac1a7
--- /dev/null
+++ b/.cargo/config.toml
@@ -0,0 +1,2 @@
+[alias]
+testit = "test --workspace --test tests --"
diff --git a/tests/README.md b/tests/README.md
index e625581a3..1792145ca 100644
--- a/tests/README.md
+++ b/tests/README.md
@@ -21,37 +21,37 @@ Running just the integration tests (the tests in this directory):
 cargo test --workspace --test tests
 ```
 
-You may want to [make yourself an alias](#making-an-alias) `testit` so that you can
-write shorter commands. In the examples below, we will use this alias.
+The repository includes the alias `cargo testit` to make this less verbose. In
+the examples below, we will use this alias.
 
 Running all tests with the given name pattern. You can use
 [regular expression](https://docs.rs/regex/latest/regex/)s.
 ```bash
-testit math            # The name has "math" anywhere
-testit math page       # The name has "math" or "page" anywhere
-testit "^math" "^page" # The name begins with "math" or "page"
-testit "^(math|page)"  # Same as above.
+cargo testit math            # The name has "math" anywhere
+cargo testit math page       # The name has "math" or "page" anywhere
+cargo testit "^math" "^page" # The name begins with "math" or "page"
+cargo testit "^(math|page)"  # Same as above.
 ```
 
 Running all tests discovered under given paths:
 ```bash
-testit -p tests/suite/math/attach.typ
-testit -p tests/suite/model -p tests/suite/text
+cargo testit -p tests/suite/math/attach.typ
+cargo testit -p tests/suite/model -p tests/suite/text
 ```
 
 Running tests that begin with `issue` under a given path:
 ```bash
-testit "^issue" -p tests/suite/model
+cargo testit "^issue" -p tests/suite/model
 ```
 
 Running a test with the exact test name `math-attach-mixed`.
 ```bash
-testit --exact math-attach-mixed
+cargo testit --exact math-attach-mixed
 ```
 
 You may find more options in the help message:
 ```bash
-testit --help
+cargo testit --help
 ```
 
 To make the integration tests go faster they don't generate PDFs or SVGs by
@@ -59,7 +59,7 @@ default. Pass the `--pdf` or `--svg` flag to generate those. Mind that PDFs and
 SVGs are **not** tested automatically at the moment, so you should always check
 the output manually when making changes.
 ```bash
-testit --pdf
+cargo testit --pdf
 ```
 
 ## Writing tests
@@ -119,7 +119,7 @@ If you created a new test or fixed a bug in an existing test, you may need to
 update the reference output used for comparison. For this, you can use the
 `--update` flag:
 ```bash
-testit --exact my-test-name --update
+cargo testit --exact my-test-name --update
 ```
 
 For visual tests, this will generally generate compressed reference images (to
@@ -127,24 +127,3 @@ remain within the size limit).
 
 If you use the VS Code test helper extension (see the `tools` folder), you can
 alternatively use the save button to update the reference output.
-
-## Making an alias
-If you want to have a quicker way to run the tests, consider adding a shortcut
-to your shell profile so that you can simply write something like:
-```bash
-testit --exact my-test-name
-```
-
-### Bash
-Open your Bash configuration by executing `nano ~/.bashrc`.
-```bash
-alias testit="cargo test --workspace --test tests --"
-```
-
-### PowerShell
-Open your PowerShell profile by executing `notepad $profile`.
-```ps
-function testit {
-    cargo test --workspace --test tests -- $args
-}
-```

From ef862654c2c92feffdd15777d0afa7a916da1d4e Mon Sep 17 00:00:00 2001
From: 3w36zj6 <52315048+3w36zj6@users.noreply.github.com>
Date: Fri, 1 Aug 2025 18:12:07 +0900
Subject: [PATCH 07/19] Update guides welcome text to refer to list instead of
 specific guides (#6685)

Co-authored-by: Laurenz <laurmaedje@gmail.com>
---
 docs/guides/welcome.md | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/docs/guides/welcome.md b/docs/guides/welcome.md
index c5c927828..36610fef1 100644
--- a/docs/guides/welcome.md
+++ b/docs/guides/welcome.md
@@ -4,9 +4,8 @@ description: Guides for Typst.
 
 # Guides
 Welcome to the Guides section! Here, you'll find helpful material for specific
-user groups or use cases. Currently, two guides are available: An introduction
-to Typst for LaTeX users, and a detailed look at page setup. Feel free to
-propose other topics for guides!
+user groups or use cases. Please see the list below for the available guides.
+Feel free to propose other topics for guides!
 
 ## List of Guides
 - [Guide for LaTeX users]($guides/guide-for-latex-users)

From cd1a786539e81c8b83b774289fd16645d740d5de Mon Sep 17 00:00:00 2001
From: Max <max@mkor.je>
Date: Fri, 1 Aug 2025 10:55:37 +0000
Subject: [PATCH 08/19] Prevent broken glyph assemblies when font data is
 incorrect (#6688)

---
 crates/typst-layout/src/math/fragment.rs          |   4 +++-
 .../ref/math-stretch-min-overlap-exceeds-max.png  | Bin 0 -> 585 bytes
 tests/suite/math/stretch.typ                      |   9 +++++++++
 3 files changed, 12 insertions(+), 1 deletion(-)
 create mode 100644 tests/ref/math-stretch-min-overlap-exceeds-max.png

diff --git a/crates/typst-layout/src/math/fragment.rs b/crates/typst-layout/src/math/fragment.rs
index 3497587c0..fce0ca302 100644
--- a/crates/typst-layout/src/math/fragment.rs
+++ b/crates/typst-layout/src/math/fragment.rs
@@ -739,7 +739,9 @@ fn assemble(
                 }
 
                 advance -= max_overlap;
-                growable += max_overlap - min_overlap;
+                // In case we have that max_overlap < min_overlap, ensure we
+                // don't decrease the value of growable.
+                growable += (max_overlap - min_overlap).max(Abs::zero());
             }
 
             full += advance;
diff --git a/tests/ref/math-stretch-min-overlap-exceeds-max.png b/tests/ref/math-stretch-min-overlap-exceeds-max.png
new file mode 100644
index 0000000000000000000000000000000000000000..a75437fd960a4dad089f5c72add051e356fc7cb1
GIT binary patch
literal 585
zcmV-P0=E5$P)<h;3K|Lk000e1NJLTq004LZ001Ef00000H;ynd0006INkl<Zc-rlg
z?@v-u7{~qFdS{#TV@+SsfXtcJjbY8LnK>;&D#2^~3Qv@fvP8U?8{}bHu>naS)-?i6
z6l(+4S}3)|NjyDU&8^<ua&vR%IotR7e!p)%+u1pFa6nVXzzod547|_asK-9~cjvxY
z{q3Iddu6)A*Y}|jrhcWp4PPt8`F{X^X$NpZ?B$M7c?^sGYUnwZaU;B%2XCbK{=VT`
zI9+-gNntC8cUxR}y6jIRB1<KIX(pTkaSk+-@#R`LxjV5Ok^-Kwz-qMcM)RW`+Mp%z
zx<6Lkh6UaeoeXx&u8gD%@y&~HYC{D8N1qshgR{`M-jHj>jcsj?&uWVymubx^p2;X`
z62RhR_}sMpK)!PUI0zii+s`dow-$!_a-yxPJRV#(WIfHm;Q=@e`2xB>&PaDsTa3H7
z??His&WZ#uXveJPNUvt`p1CP~RVTQw0R;4kjCr`A4CUnxwdIjAE6d3~LFS0>$_v@r
zv0TGSeWpGu+raj1+n{^Q;JFcVm^M$W%0>2_4mCLMl?DzH9Mu3JMg^K4HHx|iMQJ2t
zK!v7TgTnO^GOXYUx!sJZ>k`WO>x9@8cL~wAU>fWsCtJ%>z)6au_fjh8&^S#fW+#eH
zpw!!s=Ai{;$VIW5qIBXG8ix&qAEh*)o2GR94kn+Ss<gWYa@8Ma*{fz?24-Le{_pt-
XS)<TNa^RPw00000NkvXXu0mjf`3V(;

literal 0
HcmV?d00001

diff --git a/tests/suite/math/stretch.typ b/tests/suite/math/stretch.typ
index d145f72a1..800155409 100644
--- a/tests/suite/math/stretch.typ
+++ b/tests/suite/math/stretch.typ
@@ -91,3 +91,12 @@ $ body^"text" $
   }
   $body^"long text"$
 }
+
+--- math-stretch-min-overlap-exceeds-max ---
+// Test that glyph assembly doesn't end up with negative lengths if the max
+// overlap calculated is less than the minConnectorOverlap.
+#show math.equation: set text(font: "STIX Two Math")
+// Warning: glyph has assembly parts with overlap less than minConnectorOverlap
+// Hint: its rendering may appear broken - this is probably a font bug
+// Hint: please file an issue at https://github.com/typst/typst/issues
+$ stretch(->)^"Gauss-Jordan Elimination" $

From b825df6bbc81856b979848361c4f11ce5ed61810 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9E=9A=E9=B4=89?= <ling@omots.io>
Date: Fri, 1 Aug 2025 21:57:07 +0900
Subject: [PATCH 09/19] Allow custom element names in HTML tag syntax  (#6676)

Co-authored-by: Laurenz <laurmaedje@gmail.com>
---
 crates/typst-html/src/dom.rs         | 49 ++++++++++++++++++++++++++--
 tests/ref/html/html-elem-custom.html |  8 +++++
 tests/suite/html/elem.typ            | 22 +++++++++++++
 3 files changed, 77 insertions(+), 2 deletions(-)
 create mode 100644 tests/ref/html/html-elem-custom.html

diff --git a/crates/typst-html/src/dom.rs b/crates/typst-html/src/dom.rs
index 2c9a2e640..48b433fd5 100644
--- a/crates/typst-html/src/dom.rs
+++ b/crates/typst-html/src/dom.rs
@@ -105,8 +105,53 @@ impl HtmlTag {
             bail!("tag name must not be empty");
         }
 
-        if let Some(c) = string.chars().find(|&c| !charsets::is_valid_in_tag_name(c)) {
-            bail!("the character {} is not valid in a tag name", c.repr());
+        let mut has_hyphen = false;
+        let mut has_uppercase = false;
+
+        for c in string.chars() {
+            if c == '-' {
+                has_hyphen = true;
+            } else if !charsets::is_valid_in_tag_name(c) {
+                bail!("the character {} is not valid in a tag name", c.repr());
+            } else {
+                has_uppercase |= c.is_ascii_uppercase();
+            }
+        }
+
+        // If we encounter a hyphen, we are dealing with a custom element rather
+        // than a standard HTML element.
+        //
+        // A valid custom element name must:
+        // - Contain at least one hyphen (U+002D)
+        // - Start with an ASCII lowercase letter (a-z)
+        // - Not contain any ASCII uppercase letters (A-Z)
+        // - Not be one of the reserved names
+        // - Only contain valid characters (ASCII alphanumeric and hyphens)
+        //
+        // See https://html.spec.whatwg.org/multipage/custom-elements.html#valid-custom-element-name
+        if has_hyphen {
+            if !string.starts_with(|c: char| c.is_ascii_lowercase()) {
+                bail!("custom element name must start with a lowercase letter");
+            }
+            if has_uppercase {
+                bail!("custom element name must not contain uppercase letters");
+            }
+
+            // These names are used in SVG and MathML. Since `html.elem` only
+            // supports creation of _HTML_ elements, they are forbidden.
+            if matches!(
+                string,
+                "annotation-xml"
+                    | "color-profile"
+                    | "font-face"
+                    | "font-face-src"
+                    | "font-face-uri"
+                    | "font-face-format"
+                    | "font-face-name"
+                    | "missing-glyph"
+            ) {
+                bail!("name is reserved and not valid for a custom element");
+            }
         }
 
         Ok(Self(PicoStr::intern(string)))
diff --git a/tests/ref/html/html-elem-custom.html b/tests/ref/html/html-elem-custom.html
new file mode 100644
index 000000000..bd917117f
--- /dev/null
+++ b/tests/ref/html/html-elem-custom.html
@@ -0,0 +1,8 @@
+<!DOCTYPE html>
+<html>
+  <head>
+    <meta charset="utf-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1">
+  </head>
+  <body><my-element>Hi</my-element><custom-button>Hi</custom-button><multi-word-component>Hi</multi-word-component><element->Hi</element-></body>
+</html>
diff --git a/tests/suite/html/elem.typ b/tests/suite/html/elem.typ
index b416fdf94..54c82f7f3 100644
--- a/tests/suite/html/elem.typ
+++ b/tests/suite/html/elem.typ
@@ -13,3 +13,25 @@ Text
   val
 })
 #metadata("Hi") <l>
+
+--- html-elem-custom html ---
+#html.elem("my-element")[Hi]
+#html.elem("custom-button")[Hi]
+#html.elem("multi-word-component")[Hi]
+#html.elem("element-")[Hi]
+
+--- html-elem-invalid ---
+// Error: 12-24 the character "@" is not valid in a tag name
+#html.elem("my@element")
+
+--- html-elem-custom-bad-start html ---
+// Error: 12-22 custom element name must start with a lowercase letter
+#html.elem("1-custom")
+
+--- html-elem-custom-uppercase html ---
+// Error: 12-21 custom element name must not contain uppercase letters
+#html.elem("my-ELEM")
+
+--- html-elem-custom-reserved html ---
+// Error: 12-28 name is reserved and not valid for a custom element
+#html.elem("annotation-xml")

From 3683399a95d4b357b42df9f36776e0be91678ceb Mon Sep 17 00:00:00 2001
From: Myriad-Dreamin <35292584+Myriad-Dreamin@users.noreply.github.com>
Date: Mon, 4 Aug 2025 17:08:01 +0800
Subject: [PATCH 10/19] Add interface to disable timer (#6695)

Co-authored-by: Derived Cat <hooyuser@outlook.com>
---
 crates/typst-timing/src/lib.rs | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/crates/typst-timing/src/lib.rs b/crates/typst-timing/src/lib.rs
index 6da2cdf02..8329f7e2a 100644
--- a/crates/typst-timing/src/lib.rs
+++ b/crates/typst-timing/src/lib.rs
@@ -71,6 +71,14 @@ pub fn enable() {
     ENABLED.store(true, Ordering::Relaxed);
 }
 
+/// Disable the timer.
+#[inline]
+pub fn disable() {
+    // We only need atomicity and no synchronization of other
+    // operations, so `Relaxed` is fine.
+    ENABLED.store(false, Ordering::Relaxed);
+}
+
 /// Whether the timer is enabled.
 #[inline]
 pub fn is_enabled() -> bool {

From 0fe8f09ba98e8dac115c32c7182feff750d22525 Mon Sep 17 00:00:00 2001
From: Laurenz Stampfl <47084093+LaurenzV@users.noreply.github.com>
Date: Mon, 4 Aug 2025 11:49:51 +0200
Subject: [PATCH 11/19] Add support for drawing COLR glyphs in SVG export
 (#6693)

---
 crates/typst-library/src/text/font/color.rs | 29 +++++++++----
 crates/typst-svg/src/text.rs                | 46 ++++++++++++++++++++-
 2 files changed, 65 insertions(+), 10 deletions(-)

diff --git a/crates/typst-library/src/text/font/color.rs b/crates/typst-library/src/text/font/color.rs
index 0a7b13c97..92f4814df 100644
--- a/crates/typst-library/src/text/font/color.rs
+++ b/crates/typst-library/src/text/font/color.rs
@@ -127,13 +127,8 @@ fn draw_raster_glyph(
     Some(())
 }
 
-/// Draws a glyph from the COLR table into the frame.
-fn draw_colr_glyph(
-    frame: &mut Frame,
-    font: &Font,
-    upem: Abs,
-    glyph_id: GlyphId,
-) -> Option<()> {
+/// Convert a COLR glyph into an SVG file.
+pub fn colr_glyph_to_svg(font: &Font, glyph_id: GlyphId) -> Option<String> {
     let mut svg = XmlWriter::new(xmlwriter::Options::default());
 
     let ttf = font.ttf();
@@ -176,7 +171,25 @@ fn draw_colr_glyph(
     ttf.paint_color_glyph(glyph_id, 0, RgbaColor::new(0, 0, 0, 255), &mut glyph_painter)?;
     svg.end_element();
 
-    let data = Bytes::from_string(svg.end_document());
+    Some(svg.end_document())
+}
+
+/// Draws a glyph from the COLR table into the frame.
+fn draw_colr_glyph(
+    frame: &mut Frame,
+    font: &Font,
+    upem: Abs,
+    glyph_id: GlyphId,
+) -> Option<()> {
+    let svg_string = colr_glyph_to_svg(font, glyph_id)?;
+
+    let ttf = font.ttf();
+    let width = ttf.global_bounding_box().width() as f64;
+    let height = ttf.global_bounding_box().height() as f64;
+    let x_min = ttf.global_bounding_box().x_min as f64;
+    let y_max = ttf.global_bounding_box().y_max as f64;
+
+    let data = Bytes::from_string(svg_string);
     let image = Image::plain(SvgImage::new(data).ok()?);
 
     let y_shift = Abs::pt(upem.to_pt() - y_max);
diff --git a/crates/typst-svg/src/text.rs b/crates/typst-svg/src/text.rs
index fdc3497e9..0c4cd22f7 100644
--- a/crates/typst-svg/src/text.rs
+++ b/crates/typst-svg/src/text.rs
@@ -5,6 +5,7 @@ use ecow::EcoString;
 use ttf_parser::GlyphId;
 use typst_library::foundations::Bytes;
 use typst_library::layout::{Abs, Point, Ratio, Size, Transform};
+use typst_library::text::color::colr_glyph_to_svg;
 use typst_library::text::{Font, TextItem};
 use typst_library::visualize::{
     ExchangeFormat, FillRule, Image, Paint, RasterImage, RelativeTo,
@@ -31,7 +32,8 @@ impl SVGRenderer<'_> {
             let x_offset = x + glyph.x_offset.at(text.size).to_pt();
             let y_offset = y + glyph.y_offset.at(text.size).to_pt();
 
-            self.render_svg_glyph(text, id, x_offset, y_offset, scale)
+            self.render_colr_glyph(text, id, x_offset, y_offset, scale)
+                .or_else(|| self.render_svg_glyph(text, id, x_offset, y_offset, scale))
                 .or_else(|| self.render_bitmap_glyph(text, id, x_offset, y_offset))
                 .or_else(|| {
                     self.render_outline_glyph(
@@ -87,6 +89,42 @@ impl SVGRenderer<'_> {
         Some(())
     }
 
+    /// Render a glyph defined by COLR glyph descriptions.
+    fn render_colr_glyph(
+        &mut self,
+        text: &TextItem,
+        id: GlyphId,
+        x_offset: f64,
+        y_offset: f64,
+        scale: f64,
+    ) -> Option<()> {
+        let ttf = text.font.ttf();
+        let converted = colr_glyph_to_svg(&text.font, id)?;
+        let width = ttf.global_bounding_box().width() as f64;
+        let height = ttf.global_bounding_box().height() as f64;
+        let data_url = svg_to_base64(&converted);
+
+        let x_min = ttf.global_bounding_box().x_min as f64;
+        let y_max = ttf.global_bounding_box().y_max as f64;
+
+        let glyph_hash = hash128(&(&text.font, id));
+        let id = self.glyphs.insert_with(glyph_hash, || RenderedGlyph::Image {
+            url: data_url,
+            width,
+            height,
+            ts: Transform::scale(Ratio::new(scale), Ratio::new(-scale))
+                .pre_concat(Transform::translate(Abs::pt(x_min), -Abs::pt(y_max))),
+        });
+
+        self.xml.start_element("use");
+        self.xml.write_attribute_fmt("xlink:href", format_args!("#{id}"));
+        self.xml.write_attribute("x", &(x_offset));
+        self.xml.write_attribute("y", &(y_offset));
+        self.xml.end_element();
+
+        Some(())
+    }
+
     /// Render a glyph defined by a bitmap.
     fn render_bitmap_glyph(
         &mut self,
@@ -320,10 +358,14 @@ fn convert_svg_glyph_to_base64_url(font: &Font, id: GlyphId) -> Option<EcoString
         );
     }
 
+    Some(svg_to_base64(&svg_str))
+}
+
+fn svg_to_base64(svg_str: &str) -> EcoString {
     let mut url: EcoString = "data:image/svg+xml;base64,".into();
     let b64_encoded =
         base64::engine::general_purpose::STANDARD.encode(svg_str.as_bytes());
     url.push_str(&b64_encoded);
 
-    Some(url)
+    url
 }

From 2809dac6a783318c1b07e237a0fba284c445fee2 Mon Sep 17 00:00:00 2001
From: Laurenz Stampfl <47084093+LaurenzV@users.noreply.github.com>
Date: Mon, 4 Aug 2025 11:59:10 +0200
Subject: [PATCH 12/19] Apply aspect ratio correction for linear gradients in
 PDF export (#6689)

---
 crates/typst-pdf/src/paint.rs                     |   3 ++-
 ...680-gradient-linear-with-aspect-correction.png | Bin 0 -> 137 bytes
 tests/suite/visualize/gradient.typ                |   3 +++
 3 files changed, 5 insertions(+), 1 deletion(-)
 create mode 100644 tests/ref/issue-6680-gradient-linear-with-aspect-correction.png

diff --git a/crates/typst-pdf/src/paint.rs b/crates/typst-pdf/src/paint.rs
index e03d0e945..c994e0e21 100644
--- a/crates/typst-pdf/src/paint.rs
+++ b/crates/typst-pdf/src/paint.rs
@@ -152,11 +152,12 @@ fn convert_gradient(
         RelativeTo::Parent => state.container_size(),
     };
 
-    let angle = gradient.angle().unwrap_or_else(Angle::zero);
+    let mut angle = gradient.angle().unwrap_or_else(Angle::zero);
     let base_transform = correct_transform(state, gradient.unwrap_relative(on_text));
     let stops = convert_gradient_stops(gradient);
     match &gradient {
         Gradient::Linear(_) => {
+            angle = Gradient::correct_aspect_ratio(angle, size.aspect_ratio());
             let (x1, y1, x2, y2) = {
                 let (mut sin, mut cos) = (angle.sin(), angle.cos());
 
diff --git a/tests/ref/issue-6680-gradient-linear-with-aspect-correction.png b/tests/ref/issue-6680-gradient-linear-with-aspect-correction.png
new file mode 100644
index 0000000000000000000000000000000000000000..38769ed9d549717aee5c75b76bfbc086a10e8c13
GIT binary patch
literal 137
zcmeAS@N?(olHy`uVBq!ia0vp^CxBRlkr_yS%6iZVq}T#{LR=Y2ZvJ;P%hJ5|7${=r
z>Eaktacl1Rg@OzQ90wfS(oNhFSyY-9Z&gU@s1>c;Jn7;j7fuoTj)fXs6HL4os&p-u
k=#q2skWvjy;(k~2H;*ae_RODBK$93eUHx3vIVCg!0B1-mhyVZp

literal 0
HcmV?d00001

diff --git a/tests/suite/visualize/gradient.typ b/tests/suite/visualize/gradient.typ
index 8446ca030..0071dd91f 100644
--- a/tests/suite/visualize/gradient.typ
+++ b/tests/suite/visualize/gradient.typ
@@ -692,3 +692,6 @@ $ A = mat(
     (blue, 100%),
   )
 )
+
+--- issue-6680-gradient-linear-with-aspect-correction ---
+#set page(width: 200pt, height: auto, margin: 10pt, fill: gradient.linear(red, blue, angle: 45deg).sharp(2))

From 04b8b3195fbbcb8c3aa9ab22a358241580c2d6d5 Mon Sep 17 00:00:00 2001
From: Laurenz <laurmaedje@gmail.com>
Date: Mon, 4 Aug 2025 15:21:27 +0200
Subject: [PATCH 13/19] Wrap raw blocks in `<code>` tag additionally to `<pre>`
 tag (#6701)

---
 crates/typst-html/src/rules.rs | 11 +++++++++--
 tests/ref/html/raw-html.html   | 11 +++++++++++
 tests/suite/text/raw.typ       |  7 +++++++
 3 files changed, 27 insertions(+), 2 deletions(-)
 create mode 100644 tests/ref/html/raw-html.html

diff --git a/crates/typst-html/src/rules.rs b/crates/typst-html/src/rules.rs
index c358a181e..acf9046c5 100644
--- a/crates/typst-html/src/rules.rs
+++ b/crates/typst-html/src/rules.rs
@@ -415,9 +415,16 @@ const RAW_RULE: ShowFn<RawElem> = |elem, _, styles| {
         seq.push(line.clone().pack());
     }
 
-    Ok(HtmlElem::new(if elem.block.get(styles) { tag::pre } else { tag::code })
+    let code = HtmlElem::new(tag::code)
         .with_body(Some(Content::sequence(seq)))
-        .pack())
+        .pack()
+        .spanned(elem.span());
+
+    Ok(if elem.block.get(styles) {
+        HtmlElem::new(tag::pre).with_body(Some(code)).pack()
+    } else {
+        code
+    })
 };
 
 const RAW_LINE_RULE: ShowFn<RawLine> = |elem, _, _| Ok(elem.body.clone());
diff --git a/tests/ref/html/raw-html.html b/tests/ref/html/raw-html.html
new file mode 100644
index 000000000..2df62ca80
--- /dev/null
+++ b/tests/ref/html/raw-html.html
@@ -0,0 +1,11 @@
+<!DOCTYPE html>
+<html>
+  <head>
+    <meta charset="utf-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1">
+  </head>
+  <body>
+    <p>This is <code><strong>*</strong><strong>inline</strong><strong>*</strong></code>.</p>
+    <pre><code>#set text(blue)<br><strong>*</strong><strong>Hello</strong><strong>*</strong> <em>_</em><em>world</em><em>_</em>!</code></pre>
+  </body>
+</html>
diff --git a/tests/suite/text/raw.typ b/tests/suite/text/raw.typ
index 97e77adae..79a1c0004 100644
--- a/tests/suite/text/raw.typ
+++ b/tests/suite/text/raw.typ
@@ -487,6 +487,13 @@ test
   assert.eq(block, c.input.block, message: "in point " + c.name + ", expect " + repr(block) + ", got " + repr(c.input.block) + "")
 }
 
+--- raw-html html ---
+This is ```typ *inline*```.
+```typ
+#set text(blue)
+*Hello* _world_!
+```
+
 --- raw-line ---
 #set page(width: 200pt)
 

From 6177c1b22df6d675646102247eb4382a3f1db60d Mon Sep 17 00:00:00 2001
From: Laurenz <laurmaedje@gmail.com>
Date: Mon, 4 Aug 2025 15:35:00 +0200
Subject: [PATCH 14/19] Support for raw syntax highlighting in HTML export
 (#6691)

---
 crates/typst-html/src/css.rs         |  1 -
 crates/typst-html/src/lib.rs         |  2 +-
 crates/typst-html/src/rules.rs       | 16 ++++++++++++-
 crates/typst-library/src/routines.rs |  7 ++++++
 crates/typst-library/src/text/raw.rs | 34 +++++++++++++++++++++++-----
 crates/typst/src/lib.rs              |  1 +
 tests/ref/html/raw-html.html         |  2 +-
 7 files changed, 53 insertions(+), 10 deletions(-)

diff --git a/crates/typst-html/src/css.rs b/crates/typst-html/src/css.rs
index 5916d3147..ba0b8942f 100644
--- a/crates/typst-html/src/css.rs
+++ b/crates/typst-html/src/css.rs
@@ -26,7 +26,6 @@ impl Properties {
     }
 
     /// Adds a new property in builder-style.
-    #[expect(unused)]
     pub fn with(mut self, property: &str, value: impl Display) -> Self {
         self.push(property, value);
         self
diff --git a/crates/typst-html/src/lib.rs b/crates/typst-html/src/lib.rs
index 373da607f..68311e8a3 100644
--- a/crates/typst-html/src/lib.rs
+++ b/crates/typst-html/src/lib.rs
@@ -16,7 +16,7 @@ mod typed;
 pub use self::document::html_document;
 pub use self::dom::*;
 pub use self::encode::html;
-pub use self::rules::register;
+pub use self::rules::{html_span_filled, register};
 
 use ecow::EcoString;
 use typst_library::Category;
diff --git a/crates/typst-html/src/rules.rs b/crates/typst-html/src/rules.rs
index acf9046c5..0633d4a9f 100644
--- a/crates/typst-html/src/rules.rs
+++ b/crates/typst-html/src/rules.rs
@@ -17,7 +17,7 @@ use typst_library::text::{
     HighlightElem, LinebreakElem, OverlineElem, RawElem, RawLine, SmallcapsElem,
     SpaceElem, StrikeElem, SubElem, SuperElem, UnderlineElem,
 };
-use typst_library::visualize::ImageElem;
+use typst_library::visualize::{Color, ImageElem};
 
 use crate::{FrameElem, HtmlAttrs, HtmlElem, HtmlTag, attr, css, tag};
 
@@ -427,6 +427,20 @@ const RAW_RULE: ShowFn<RawElem> = |elem, _, styles| {
     })
 };
 
+/// This is used by `RawElem::synthesize` through a routine.
+///
+/// It's a temporary workaround until `TextElem::fill` is supported in HTML
+/// export.
+#[doc(hidden)]
+pub fn html_span_filled(content: Content, color: Color) -> Content {
+    let span = content.span();
+    HtmlElem::new(tag::span)
+        .with_styles(css::Properties::new().with("color", css::color(color)))
+        .with_body(Some(content))
+        .pack()
+        .spanned(span)
+}
+
 const RAW_LINE_RULE: ShowFn<RawLine> = |elem, _, _| Ok(elem.body.clone());
 
 const IMAGE_RULE: ShowFn<ImageElem> = |elem, engine, styles| {
diff --git a/crates/typst-library/src/routines.rs b/crates/typst-library/src/routines.rs
index 6fa7d69c8..3a16e1029 100644
--- a/crates/typst-library/src/routines.rs
+++ b/crates/typst-library/src/routines.rs
@@ -15,6 +15,7 @@ use crate::foundations::{
 use crate::introspection::{Introspector, Locator, SplitLocator};
 use crate::layout::{Frame, Region};
 use crate::model::DocumentInfo;
+use crate::visualize::Color;
 
 /// Defines the `Routines` struct.
 macro_rules! routines {
@@ -95,6 +96,12 @@ routines! {
 
     /// Constructs the `html` module.
     fn html_module() -> Module
+
+    /// Wraps content in a span with a color.
+    ///
+    /// This is a temporary workaround until `TextElem::fill` is supported in
+    /// HTML export.
+    fn html_span_filled(content: Content, color: Color) -> Content
 }
 
 /// Defines what kind of realization we are performing.
diff --git a/crates/typst-library/src/text/raw.rs b/crates/typst-library/src/text/raw.rs
index 3d74ed0a6..7a3af26ff 100644
--- a/crates/typst-library/src/text/raw.rs
+++ b/crates/typst-library/src/text/raw.rs
@@ -18,11 +18,12 @@ use crate::diag::{
 use crate::engine::Engine;
 use crate::foundations::{
     Bytes, Content, Derived, OneOrMultiple, Packed, PlainText, ShowSet, Smart,
-    StyleChain, Styles, Synthesize, cast, elem, scope,
+    StyleChain, Styles, Synthesize, Target, TargetElem, cast, elem, scope,
 };
 use crate::layout::{Em, HAlignment};
 use crate::loading::{DataSource, Load};
 use crate::model::{Figurable, ParElem};
+use crate::routines::Routines;
 use crate::text::{FontFamily, FontList, LocalName, TextElem, TextSize};
 use crate::visualize::Color;
 
@@ -300,8 +301,12 @@ impl RawElem {
 }
 
 impl Synthesize for Packed<RawElem> {
-    fn synthesize(&mut self, _: &mut Engine, styles: StyleChain) -> SourceResult<()> {
-        let seq = self.highlight(styles);
+    fn synthesize(
+        &mut self,
+        engine: &mut Engine,
+        styles: StyleChain,
+    ) -> SourceResult<()> {
+        let seq = self.highlight(engine.routines, styles);
         self.lines = Some(seq);
         Ok(())
     }
@@ -309,7 +314,7 @@ impl Synthesize for Packed<RawElem> {
 
 impl Packed<RawElem> {
     #[comemo::memoize]
-    fn highlight(&self, styles: StyleChain) -> Vec<Packed<RawLine>> {
+    fn highlight(&self, routines: &Routines, styles: StyleChain) -> Vec<Packed<RawLine>> {
         let elem = self.as_ref();
         let lines = preprocess(&elem.text, styles, self.span());
 
@@ -341,6 +346,7 @@ impl Packed<RawElem> {
         };
 
         let foreground = theme.settings.foreground.unwrap_or(synt::Color::BLACK);
+        let target = styles.get(TargetElem::target);
 
         let mut seq = vec![];
         if matches!(lang.as_deref(), Some("typ" | "typst" | "typc" | "typm")) {
@@ -363,7 +369,15 @@ impl Packed<RawElem> {
                     let span_offset = text[..range.start]
                         .rfind('\n')
                         .map_or(0, |i| range.start - (i + 1));
-                    styled(&text[range], foreground, style, span, span_offset)
+                    styled(
+                        routines,
+                        target,
+                        &text[range],
+                        foreground,
+                        style,
+                        span,
+                        span_offset,
+                    )
                 },
                 &mut |i, range, line| {
                     let span = lines.get(i).map_or_else(Span::detached, |l| l.1);
@@ -400,6 +414,8 @@ impl Packed<RawElem> {
                     .flatten()
                 {
                     line_content.push(styled(
+                        routines,
+                        target,
                         piece,
                         foreground,
                         style,
@@ -769,6 +785,8 @@ fn preprocess(
 
 /// Style a piece of text with a syntect style.
 fn styled(
+    routines: &Routines,
+    target: Target,
     piece: &str,
     foreground: synt::Color,
     style: synt::Style,
@@ -782,7 +800,11 @@ fn styled(
     }
 
     if style.foreground != foreground {
-        body = body.set(TextElem::fill, to_typst(style.foreground).into());
+        let color = to_typst(style.foreground);
+        body = match target {
+            Target::Html => (routines.html_span_filled)(body, color),
+            Target::Paged => body.set(TextElem::fill, color.into()),
+        };
     }
 
     if style.font_style.contains(synt::FontStyle::BOLD) {
diff --git a/crates/typst/src/lib.rs b/crates/typst/src/lib.rs
index d00b98795..cad7a8295 100644
--- a/crates/typst/src/lib.rs
+++ b/crates/typst/src/lib.rs
@@ -358,4 +358,5 @@ pub static ROUTINES: LazyLock<Routines> = LazyLock::new(|| Routines {
     realize: typst_realize::realize,
     layout_frame: typst_layout::layout_frame,
     html_module: typst_html::module,
+    html_span_filled: typst_html::html_span_filled,
 });
diff --git a/tests/ref/html/raw-html.html b/tests/ref/html/raw-html.html
index 2df62ca80..18cf19c99 100644
--- a/tests/ref/html/raw-html.html
+++ b/tests/ref/html/raw-html.html
@@ -6,6 +6,6 @@
   </head>
   <body>
     <p>This is <code><strong>*</strong><strong>inline</strong><strong>*</strong></code>.</p>
-    <pre><code>#set text(blue)<br><strong>*</strong><strong>Hello</strong><strong>*</strong> <em>_</em><em>world</em><em>_</em>!</code></pre>
+    <pre><code><span style="color: #d73a49">#</span><span style="color: #d73a49">set</span> <span style="color: #4b69c6">text</span>(blue)<br><strong>*</strong><strong>Hello</strong><strong>*</strong> <em>_</em><em>world</em><em>_</em>!</code></pre>
   </body>
 </html>

From 4a975fdb8b4c2700f2ed0cb9d77f62b3573bdb80 Mon Sep 17 00:00:00 2001
From: Laurenz <laurmaedje@gmail.com>
Date: Tue, 5 Aug 2025 17:13:21 +0200
Subject: [PATCH 15/19] Ensure that whitespace is not collapsed in inline raw
 blocks (#6703)

---
 crates/typst-html/src/rules.rs             | 14 +++++++++-----
 tests/ref/html/raw-html-inline-spaces.html | 10 ++++++++++
 tests/ref/html/raw-html.html               |  2 +-
 tests/suite/text/raw.typ                   |  3 +++
 4 files changed, 23 insertions(+), 6 deletions(-)
 create mode 100644 tests/ref/html/raw-html-inline-spaces.html

diff --git a/crates/typst-html/src/rules.rs b/crates/typst-html/src/rules.rs
index 0633d4a9f..0f73ef8c8 100644
--- a/crates/typst-html/src/rules.rs
+++ b/crates/typst-html/src/rules.rs
@@ -415,16 +415,20 @@ const RAW_RULE: ShowFn<RawElem> = |elem, _, styles| {
         seq.push(line.clone().pack());
     }
 
+    let mut inline = css::Properties::new();
+    let block = elem.block.get(styles);
+    if !block {
+        // Without the `<pre>` tag, whitespace would be collapsed by default.
+        inline.push("white-space", "pre-wrap");
+    }
+
     let code = HtmlElem::new(tag::code)
+        .with_styles(inline)
         .with_body(Some(Content::sequence(seq)))
         .pack()
         .spanned(elem.span());
 
-    Ok(if elem.block.get(styles) {
-        HtmlElem::new(tag::pre).with_body(Some(code)).pack()
-    } else {
-        code
-    })
+    Ok(if block { HtmlElem::new(tag::pre).with_body(Some(code)).pack() } else { code })
 };
 
 /// This is used by `RawElem::synthesize` through a routine.
diff --git a/tests/ref/html/raw-html-inline-spaces.html b/tests/ref/html/raw-html-inline-spaces.html
new file mode 100644
index 000000000..193d0425c
--- /dev/null
+++ b/tests/ref/html/raw-html-inline-spaces.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>This has <code style="white-space: pre-wrap">double  spaces  inside</code>, which should be kept.</p>
+  </body>
+</html>
diff --git a/tests/ref/html/raw-html.html b/tests/ref/html/raw-html.html
index 18cf19c99..cd476c8b4 100644
--- a/tests/ref/html/raw-html.html
+++ b/tests/ref/html/raw-html.html
@@ -5,7 +5,7 @@
     <meta name="viewport" content="width=device-width, initial-scale=1">
   </head>
   <body>
-    <p>This is <code><strong>*</strong><strong>inline</strong><strong>*</strong></code>.</p>
+    <p>This is <code style="white-space: pre-wrap"><strong>*</strong><strong>inline</strong><strong>*</strong></code>.</p>
     <pre><code><span style="color: #d73a49">#</span><span style="color: #d73a49">set</span> <span style="color: #4b69c6">text</span>(blue)<br><strong>*</strong><strong>Hello</strong><strong>*</strong> <em>_</em><em>world</em><em>_</em>!</code></pre>
   </body>
 </html>
diff --git a/tests/suite/text/raw.typ b/tests/suite/text/raw.typ
index 79a1c0004..7add8cdc1 100644
--- a/tests/suite/text/raw.typ
+++ b/tests/suite/text/raw.typ
@@ -494,6 +494,9 @@ This is ```typ *inline*```.
 *Hello* _world_!
 ```
 
+--- raw-html-inline-spaces html ---
+This has `double  spaces  inside`, which should be kept.
+
 --- raw-line ---
 #set page(width: 200pt)
 

From b98954c78b0c9247db0a669838872227dbdd59e4 Mon Sep 17 00:00:00 2001
From: "Y.D.X." <73375426+YDX-2147483647@users.noreply.github.com>
Date: Tue, 5 Aug 2025 23:18:27 +0800
Subject: [PATCH 16/19] Show aliases of citation styles in docs and completions
 (#6696)

---
 .../typst-library/src/model/bibliography.rs   | 56 ++++++++++++++++++-
 1 file changed, 53 insertions(+), 3 deletions(-)

diff --git a/crates/typst-library/src/model/bibliography.rs b/crates/typst-library/src/model/bibliography.rs
index 1f972ddfe..40de37939 100644
--- a/crates/typst-library/src/model/bibliography.rs
+++ b/crates/typst-library/src/model/bibliography.rs
@@ -442,9 +442,35 @@ impl Reflect for CslSource {
     #[comemo::memoize]
     fn input() -> CastInfo {
         let source = std::iter::once(DataSource::input());
-        let names = ArchivedStyle::all().iter().map(|name| {
-            CastInfo::Value(name.names()[0].into_value(), name.display_name())
-        });
+
+        /// All possible names and their short documentation for `ArchivedStyle`, including aliases.
+        static ARCHIVED_STYLE_NAMES: LazyLock<Vec<(&&str, &'static str)>> =
+            LazyLock::new(|| {
+                ArchivedStyle::all()
+                    .iter()
+                    .flat_map(|name| {
+                        let (main_name, aliases) = name
+                            .names()
+                            .split_first()
+                            .expect("all ArchivedStyle should have at least one name");
+
+                        std::iter::once((main_name, name.display_name())).chain(
+                            aliases.iter().map(move |alias| {
+                                // Leaking is okay here, because we are in a `LazyLock`.
+                                let docs: &'static str = Box::leak(
+                                    format!("A short alias of `{main_name}`")
+                                        .into_boxed_str(),
+                                );
+                                (alias, docs)
+                            }),
+                        )
+                    })
+                    .collect()
+            });
+        let names = ARCHIVED_STYLE_NAMES
+            .iter()
+            .map(|(value, docs)| CastInfo::Value(value.into_value(), docs));
+
         CastInfo::Union(source.into_iter().chain(names).collect())
     }
 
@@ -1056,4 +1082,28 @@ mod tests {
             let _ = CslStyle::from_archived(archived);
         }
     }
+
+    #[test]
+    fn test_csl_source_cast_info_include_all_names() {
+        let CastInfo::Union(cast_info) = CslSource::input() else {
+            panic!("the cast info of CslSource should be a union");
+        };
+
+        let missing: Vec<_> = ArchivedStyle::all()
+            .iter()
+            .flat_map(|style| style.names())
+            .filter(|name| {
+                let found = cast_info.iter().any(|info| match info {
+                    CastInfo::Value(Value::Str(n), _) => n.as_str() == **name,
+                    _ => false,
+                });
+                !found
+            })
+            .collect();
+
+        assert!(
+            missing.is_empty(),
+            "missing style names in CslSource cast info: '{missing:?}'"
+        );
+    }
 }

From 6de2d9586aed64b9f5e17babd82277b1d800a488 Mon Sep 17 00:00:00 2001
From: Sebastian Eberle <152992757+sebaseb98@users.noreply.github.com>
Date: Wed, 6 Aug 2025 10:11:20 +0200
Subject: [PATCH 17/19] Correct CeTZ spelling (#6706)

---
 docs/guides/guide-for-latex-users.md | 6 +++---
 docs/reference/library/visualize.md  | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/docs/guides/guide-for-latex-users.md b/docs/guides/guide-for-latex-users.md
index eb0ce14e5..d87fcb2fd 100644
--- a/docs/guides/guide-for-latex-users.md
+++ b/docs/guides/guide-for-latex-users.md
@@ -477,12 +477,12 @@ and their corresponding Typst functions.
 
 Although _many_ things are built-in, not everything can be. That's why Typst has
 its own [package ecosystem]($universe) where the community share its creations
-and automations. Let's take, for instance, the _cetz_ package: This package
-allows you to create complex drawings and plots. To use cetz in your document,
+and automations. Let's take, for instance, the _CeTZ_ package: This package
+allows you to create complex drawings and plots. To use CeTZ in your document,
 you can just write:
 
 ```typ
-#import "@preview/cetz:0.2.1"
+#import "@preview/cetz:0.4.1"
 ```
 
 (The `@preview` is a _namespace_ that is used while the package manager is still
diff --git a/docs/reference/library/visualize.md b/docs/reference/library/visualize.md
index 9259401f8..01522fe81 100644
--- a/docs/reference/library/visualize.md
+++ b/docs/reference/library/visualize.md
@@ -1,5 +1,5 @@
 Drawing and data visualization.
 
 If you want to create more advanced drawings or plots, also have a look at the
-[CetZ](https://github.com/johannes-wolf/cetz) package as well as more
+[CeTZ](https://github.com/johannes-wolf/cetz) package as well as more
 specialized [packages]($universe) for your use case.

From d0026093d4410b45a82f9217b548e7969a262f24 Mon Sep 17 00:00:00 2001
From: Johann Birnick <6528009+jbirnick@users.noreply.github.com>
Date: Wed, 6 Aug 2025 10:13:41 +0200
Subject: [PATCH 18/19] Add `title` element (#5618)

Co-authored-by: Laurenz <laurmaedje@gmail.com>
---
 crates/typst-html/src/rules.rs          |   9 ++-
 crates/typst-layout/src/rules.rs        |   9 ++-
 crates/typst-library/src/model/mod.rs   |   3 +
 crates/typst-library/src/model/title.rs |  77 ++++++++++++++++++++++++
 tests/ref/html/title-and-heading.html   |  11 ++++
 tests/ref/html/title-basic.html         |  10 +++
 tests/ref/html/title-with-body.html     |  11 ++++
 tests/ref/html/title.html               |  12 ++++
 tests/ref/title-show-set.png            | Bin 0 -> 1231 bytes
 tests/ref/title-with-body-auto.png      | Bin 0 -> 615 bytes
 tests/ref/title-with-body.png           | Bin 0 -> 1068 bytes
 tests/ref/title.png                     | Bin 0 -> 1455 bytes
 tests/suite/model/title.typ             |  24 ++++++++
 13 files changed, 164 insertions(+), 2 deletions(-)
 create mode 100644 crates/typst-library/src/model/title.rs
 create mode 100644 tests/ref/html/title-and-heading.html
 create mode 100644 tests/ref/html/title-basic.html
 create mode 100644 tests/ref/html/title-with-body.html
 create mode 100644 tests/ref/html/title.html
 create mode 100644 tests/ref/title-show-set.png
 create mode 100644 tests/ref/title-with-body-auto.png
 create mode 100644 tests/ref/title-with-body.png
 create mode 100644 tests/ref/title.png
 create mode 100644 tests/suite/model/title.typ

diff --git a/crates/typst-html/src/rules.rs b/crates/typst-html/src/rules.rs
index 0f73ef8c8..472e155b0 100644
--- a/crates/typst-html/src/rules.rs
+++ b/crates/typst-html/src/rules.rs
@@ -11,7 +11,7 @@ use typst_library::layout::{OuterVAlignment, Sizing};
 use typst_library::model::{
     Attribution, CiteElem, CiteGroup, Destination, EmphElem, EnumElem, FigureCaption,
     FigureElem, HeadingElem, LinkElem, LinkTarget, ListElem, ParbreakElem, QuoteElem,
-    RefElem, StrongElem, TableCell, TableElem, TermsElem,
+    RefElem, StrongElem, TableCell, TableElem, TermsElem, TitleElem,
 };
 use typst_library::text::{
     HighlightElem, LinebreakElem, OverlineElem, RawElem, RawLine, SmallcapsElem,
@@ -32,6 +32,7 @@ pub fn register(rules: &mut NativeRuleMap) {
     rules.register(Html, ENUM_RULE);
     rules.register(Html, TERMS_RULE);
     rules.register(Html, LINK_RULE);
+    rules.register(Html, TITLE_RULE);
     rules.register(Html, HEADING_RULE);
     rules.register(Html, FIGURE_RULE);
     rules.register(Html, FIGURE_CAPTION_RULE);
@@ -161,6 +162,12 @@ const LINK_RULE: ShowFn<LinkElem> = |elem, engine, _| {
         .pack())
 };
 
+const TITLE_RULE: ShowFn<TitleElem> = |elem, _, styles| {
+    Ok(HtmlElem::new(tag::h1)
+        .with_body(Some(elem.resolve_body(styles).at(elem.span())?))
+        .pack())
+};
+
 const HEADING_RULE: ShowFn<HeadingElem> = |elem, engine, styles| {
     let span = elem.span();
 
diff --git a/crates/typst-layout/src/rules.rs b/crates/typst-layout/src/rules.rs
index a3616f96e..089b4e671 100644
--- a/crates/typst-layout/src/rules.rs
+++ b/crates/typst-layout/src/rules.rs
@@ -21,7 +21,7 @@ use typst_library::model::{
     Attribution, BibliographyElem, CiteElem, CiteGroup, CslSource, Destination, EmphElem,
     EnumElem, FigureCaption, FigureElem, FootnoteElem, FootnoteEntry, HeadingElem,
     LinkElem, ListElem, Outlinable, OutlineElem, OutlineEntry, ParElem, ParbreakElem,
-    QuoteElem, RefElem, StrongElem, TableCell, TableElem, TermsElem, Works,
+    QuoteElem, RefElem, StrongElem, TableCell, TableElem, TermsElem, TitleElem, Works,
 };
 use typst_library::pdf::EmbedElem;
 use typst_library::text::{
@@ -47,6 +47,7 @@ pub fn register(rules: &mut NativeRuleMap) {
     rules.register(Paged, ENUM_RULE);
     rules.register(Paged, TERMS_RULE);
     rules.register(Paged, LINK_RULE);
+    rules.register(Paged, TITLE_RULE);
     rules.register(Paged, HEADING_RULE);
     rules.register(Paged, FIGURE_RULE);
     rules.register(Paged, FIGURE_CAPTION_RULE);
@@ -216,6 +217,12 @@ const LINK_RULE: ShowFn<LinkElem> = |elem, engine, _| {
     Ok(body.linked(dest))
 };
 
+const TITLE_RULE: ShowFn<TitleElem> = |elem, _, styles| {
+    Ok(BlockElem::new()
+        .with_body(Some(BlockBody::Content(elem.resolve_body(styles).at(elem.span())?)))
+        .pack())
+};
+
 const HEADING_RULE: ShowFn<HeadingElem> = |elem, engine, styles| {
     const SPACING_TO_NUMBERING: Em = Em::new(0.3);
 
diff --git a/crates/typst-library/src/model/mod.rs b/crates/typst-library/src/model/mod.rs
index a0f7e11af..015fdd272 100644
--- a/crates/typst-library/src/model/mod.rs
+++ b/crates/typst-library/src/model/mod.rs
@@ -20,6 +20,7 @@ mod reference;
 mod strong;
 mod table;
 mod terms;
+mod title;
 
 pub use self::bibliography::*;
 pub use self::cite::*;
@@ -39,6 +40,7 @@ pub use self::reference::*;
 pub use self::strong::*;
 pub use self::table::*;
 pub use self::terms::*;
+pub use self::title::*;
 
 use crate::foundations::Scope;
 
@@ -54,6 +56,7 @@ pub fn define(global: &mut Scope) {
     global.define_elem::<EnumElem>();
     global.define_elem::<TermsElem>();
     global.define_elem::<LinkElem>();
+    global.define_elem::<TitleElem>();
     global.define_elem::<HeadingElem>();
     global.define_elem::<FigureElem>();
     global.define_elem::<QuoteElem>();
diff --git a/crates/typst-library/src/model/title.rs b/crates/typst-library/src/model/title.rs
new file mode 100644
index 000000000..d1c8b48f8
--- /dev/null
+++ b/crates/typst-library/src/model/title.rs
@@ -0,0 +1,77 @@
+use crate::diag::{Hint, HintedStrResult};
+use crate::foundations::{Content, Packed, ShowSet, Smart, StyleChain, Styles, elem};
+use crate::introspection::Locatable;
+use crate::layout::{BlockElem, Em};
+use crate::model::DocumentElem;
+use crate::text::{FontWeight, TextElem, TextSize};
+
+/// A document title.
+///
+/// This should be used to display the main title of the whole document and
+/// should occur only once per document. In contrast, level 1
+/// [headings]($heading) are intended to be used for the top-level sections of
+/// the document.
+///
+/// Note that additional frontmatter (like an author list) that should appear
+/// together with the title does not belong in its body.
+///
+/// In HTML export, this shows as a `h1` element while level 1 headings show
+/// as `h2` elements.
+///
+/// # Example
+/// ```example
+/// #set document(
+///   title: [Interstellar Mail Delivery]
+/// )
+///
+/// #title()
+///
+/// = Introduction
+/// In recent years, ...
+/// ```
+#[elem(Locatable, ShowSet)]
+pub struct TitleElem {
+    /// The content of the title.
+    ///
+    /// When omitted (or `{auto}`), this will default to [`document.title`]. In
+    /// this case, a document title must have been previously set with
+    /// `{set document(title: [..])}`.
+    ///
+    /// ```example
+    /// #set document(title: "Course ABC, Homework 1")
+    /// #title[Homework 1]
+    ///
+    /// ...
+    /// ```
+    #[positional]
+    pub body: Smart<Content>,
+}
+
+impl TitleElem {
+    pub fn resolve_body(&self, styles: StyleChain) -> HintedStrResult<Content> {
+        match self.body.get_cloned(styles) {
+            Smart::Auto => styles
+                .get_cloned(DocumentElem::title)
+                .ok_or("document title was not set")
+                .hint("set the title with `set document(title: [...])`")
+                .hint("or provide an explicit body with `title[..]`"),
+            Smart::Custom(body) => Ok(body),
+        }
+    }
+}
+
+impl ShowSet for Packed<TitleElem> {
+    fn show_set(&self, _styles: StyleChain) -> Styles {
+        const SIZE: Em = Em::new(1.7);
+        const ABOVE: Em = Em::new(1.125);
+        const BELOW: Em = Em::new(0.75);
+
+        let mut out = Styles::new();
+        out.set(TextElem::size, TextSize(SIZE.into()));
+        out.set(TextElem::weight, FontWeight::BOLD);
+        out.set(BlockElem::above, Smart::Custom(ABOVE.into()));
+        out.set(BlockElem::below, Smart::Custom(BELOW.into()));
+        out.set(BlockElem::sticky, true);
+        out
+    }
+}
diff --git a/tests/ref/html/title-and-heading.html b/tests/ref/html/title-and-heading.html
new file mode 100644
index 000000000..c09062ec3
--- /dev/null
+++ b/tests/ref/html/title-and-heading.html
@@ -0,0 +1,11 @@
+<!DOCTYPE html>
+<html>
+  <head>
+    <meta charset="utf-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1">
+  </head>
+  <body>
+    <h1>A cool title</h1>
+    <h2>Some level one heading</h2>
+  </body>
+</html>
diff --git a/tests/ref/html/title-basic.html b/tests/ref/html/title-basic.html
new file mode 100644
index 000000000..c9995358e
--- /dev/null
+++ b/tests/ref/html/title-basic.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>
+    <h1>Some Title</h1>
+  </body>
+</html>
diff --git a/tests/ref/html/title-with-body.html b/tests/ref/html/title-with-body.html
new file mode 100644
index 000000000..7b58813be
--- /dev/null
+++ b/tests/ref/html/title-with-body.html
@@ -0,0 +1,11 @@
+<!DOCTYPE html>
+<html>
+  <head>
+    <meta charset="utf-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1">
+    <title>My title</title>
+  </head>
+  <body>
+    <h1>My display title</h1>
+  </body>
+</html>
diff --git a/tests/ref/html/title.html b/tests/ref/html/title.html
new file mode 100644
index 000000000..b1a59cdf3
--- /dev/null
+++ b/tests/ref/html/title.html
@@ -0,0 +1,12 @@
+<!DOCTYPE html>
+<html>
+  <head>
+    <meta charset="utf-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1">
+    <title>My title</title>
+  </head>
+  <body>
+    <h1>My title</h1>
+    <h2>A level one heading</h2>
+  </body>
+</html>
diff --git a/tests/ref/title-show-set.png b/tests/ref/title-show-set.png
new file mode 100644
index 0000000000000000000000000000000000000000..4f7431b983c85f183a7201470c60d4f93f48f1de
GIT binary patch
literal 1231
zcmV;=1Tg!FP)<h;3K|Lk000e1NJLTq004LZ0018d0{{R38%y~D0006jP)t-s|NsB+
z_x<|({}_SX0d(07d)mL;_NLDA0(IFHf84d!^agj?19jPz#qW{B@5A2q1a{fM-S))a
z_Ls)+l*I4({Qm9r{r&#`=<@s`hTgW<^hulKu+;OZ(DG`n>0+tpGLPW)`u-Ds+w%DR
z1$Nok>iNgu_q*Elv(@xClHqW%>WRMXBZuBFj^O9={K?_>PoL#gqUDUh?v26jSEJ@%
zr{@xV+wArH>GS-2x9j2W``+#P4}9ASdD^GX@~hGFdA94X)AO;^^Rm_SHIU&-oaBbR
z?Y`UfKbGQ}$nZm$;~j(DSfu90;P(-I+nmYp+w1zu;`ih5`*^kMb+hW?@B2QL;+Dqm
zi@@%PzU_Lp>wmfINSouC$M773-IBxaMw;VPq2->+@j8>?3wqk-@%%)Y<7}_#j=}C=
zsOMRv=GW=@L6_pw=lRX#_|N6|oyqX=_x*OX>Z8r^WUA<Nv+8oP>OGa>9)#Vr*7QuB
z<k9B%Z?NfMspqKA@&|X?g}m*X$nfj*{9LBzHj&|5rRMkh{*S`$LYU*d+x5%i_j9u9
zJCxx-m*Uy#`hB?U#oza;(DE#d-$j|@Wvl4Y=J?<3`fac2GmqdJg4`g5-RkrF6n@-L
zpXDEf-K^5{CWziDir-VA<+s@M)aUtLr{`U!=V+|x40_t3%<<Le`K8YCyxR2+d)xE)
z{`C3&7J%Fcc-pPf^CXAfCyCw(c-s8^|MmI){{H`C<^Mwf00Li0L_t(|+U?a<QyWnj
z#_@;nq@0itBzTLvQ+IcFcXxM(8tz^kf|Ei>BOk9>W_Q@>3~gZAyZv44?8VOf=e+yQ
z9B4Ee&A;OZnY*SjD+7|l$Mz-SFLcq6l~r86ggKjX3_uYqxD}F=qg;>KdEnJ*9F^ZA
zpV5K2a=oJ74TXV$m^M!R?Aew{KL9OX+JW-YMgULwbM6NouyYIwe<i%&58)%E4zdc~
z1Q0Nf@I7lM7plYQo8siK&Kwk;KjD2u0=WLDs2tNGPg7VdN!H9Aqo}Ro4NHa+ZaQ_c
z89usy6(5+oY9?H{*udrTi8qs5q5{YT!2WB+MI3_U&>5P{mWX(A40V+(HHXUKC5E!X
z)D7^>&=t6cX`Ttc#!ia2@~CYLgeQc-NJ{pH`y-nn8D$8(45Axo<a1@z!KSZ>^>xeq
zhI8}s^kSR(AG?e!mcx^b1)K~+CJlXkwqYwIO*FylyO;vrvqA~KV{c!BGX_4nbsIpx
z5NWC~R&f0HaJFg>@Q?yZcz`dIa6Om8R~|<#0GC0mR)r%{*XiW&UM`Ztp~&H+8;H<B
z@_>X_mlPgkHh?kq01Yez@B_X$*ak_0=#sxTcuV0T2-rx|H((F%+zl}DY}6W?*tNUl
z#BoT{$bKu(Ax3~9X06S~MH+xQGGV0V4SW!Pz&;2dC)epr427g^u&c8^2#9ky?N!wX
zOE$HRIQ-8QV7yltUslU=T4vNgdE9At_H-jXM)Ve(zu>fQk48xcZJ*tkmrroDL&f6<
tOkmoCYKSROs{O=_l`ie((`YpR!!HGOk;Oi1FyjCK002ovPDHLkV1gQ;#z6o8

literal 0
HcmV?d00001

diff --git a/tests/ref/title-with-body-auto.png b/tests/ref/title-with-body-auto.png
new file mode 100644
index 0000000000000000000000000000000000000000..3c861186a61c68dde05a6d6f38d92267d4327f3c
GIT binary patch
literal 615
zcmV-t0+{`YP)<h;3K|Lk000e1NJLTq004LZ0018d000003I0~>0006mNkl<Zc-rmO
zNl4TI6vuJjv(mA^EKsttjW)HMOJ1VX7EC=viBX}&WFaIP6o~|89kMVe21#3lqEi`Y
z5VV?xLIo0mG^LbjnINVXn%d|%-wv}7(joW{49I*>@Af(VUJ!mNC;$iG06eW=yTge)
z$2k9PU=(*(3sOsc13U6&$UXqBi)`v-YEGahbcN^cSg-lMfnl|Teg{ZU?PW?`yOM#C
zL<?{;_AZdEg}#E9oAe^kxJR{zDOJlBJjKfc;Goao-{u@$31q!hZKb)Qvf??d6;~Pn
z-tU$8s(WKCcg~DCYa*qvs@)AwG?do-GzfR4G^^J0C2KNRU+{IS%=^gT_Kj@-^}8j`
zTGzQvWMJGnUyfS4T<}Et=BA|!+l|4mGKtkJiW&*mTCfGH4QE_809=v`;El*I#K<#n
z!6kB=W0G$St~<<S4f&h|OSBqD(<9us;Hq5Gfe#|TAX=V!;5CwxX*T5<gDZ;|H0io)
zkf7zjV-4#|vf=82q<P^edE$n@iM#_a2A7<NY>gO!BrOJ5t2@(hS0<@mI8q(~2ebhD
zEU5&BjlnxkLz5l{GSmW4rTP$eR$1_=lNOO)Sf(d!b~1E7<jS10w=89b;M}nA8({8$
zbK$1Br+|^@Re0()>!RA18%&|eZCE2_ruXNW!e*af=un6*F89SqO!8MbR`B)%Z}w5V
zIs1ISPW>@M{+Pv<#HeEY0l$tda0EV(033k-zd!mFm2EGRjrITl002ovPDHLkV1l!B
B8@m7i

literal 0
HcmV?d00001

diff --git a/tests/ref/title-with-body.png b/tests/ref/title-with-body.png
new file mode 100644
index 0000000000000000000000000000000000000000..d71df8b1a7968705420f317878af0fde78b08db5
GIT binary patch
literal 1068
zcmV+{1k?M8P)<h;3K|Lk000e1NJLTq004LZ001=z00000ugP${000B?Nkl<Zc-rmO
zYfKen7{GC#2M`Z6L0g&RWpkDjVUjJKmm+Nr$qJh@M-%VPVYM+?L`X~{BvdqGU`nnw
zR$DW{HB(z4mKQ1r2qKaDr3;B1!XOTp!@rK_fNU^3JKLew&i~W<;eGep-uJ`%jNxBu
zj0<+bF8F^1clY&UtFMRQHSgN|NGb3W!>f!554_<Z+_&9b!T>lX@>m_i>iJNl5H{#Z
zhGlw3<hp|}%#v{}0CQEFVFX#E7*hR<7+$qVtHbaNgYF0No>%>u5i;L`N3Pa!7*k-l
zJ_xKSRxRaXYI<rerKxG>u~w9@*8<mmelQ0pcq8^R`l~)kB74{A+i-SV{1v$L_t_lE
zQqyzng6o%FRL!AbjoD2v(D<ZGtirf_aRmTf%NG|Ox4`@Fl2}M{%X;%}8kdM{*f?3X
z4Zy)G%4T^L(X?EADlrBxx@s4kzZySXLv$YAng!)<T2B9*CIASNOSY?CD!U;-&hcs&
zl_Hg#5iPL7)t>RhX%t*_(=z(~8?g({-pV2MtPO(c`W_IX+c>oe06NA=n+;wmdmu&(
z2h7kc(nQZ#dD{wOqAfxfW7)KsPuF7~oF0wQpaDl=uI>ZQsn_+Oa=@|{X&DOl#=7gG
zKdmrR^j#Z#Ipn$Rx)At648JWcvlD(j3D)U^P6*N%fY}-vg0=6(a@DGZR`~Z!a(yI|
zX4NLlo?2{$3q05Jfi3~?m(XDBgjdAFSGp5esha?fsGh-^dA_b{PE$?pCrDnQ+pCr>
zT4I6gIjCXqt;jVJG~D!}&L}s-F_F`D!dtw&Ga#@A61@#Ru|TKqLkv_iPv?E?>-$v6
z4uj#o!z`S*>46k1@PcJicXyLJ*I;<`N|~=NIWgWnv>m#p%<Q)hwq<5W;fJ}M5jq&m
z^efzg8;lI86}qjvHXd^Pce*j{CU?yG#v|4`t=&<$VE&{S{-J9kKQKbyEx11#N8zvi
zUhd=0l>|+i^mq}&`)1BdeXa?_1-oF3CTtyz3`rb4xY6K;t%}(aIT~=?>R{mJ!<&Kk
z{j-3z5;Yp|5e*(P>7E5%(9wW@T&sZ@r@D$yBzBum-Xl>N)i${A%Y^JdoCu$NMgvl^
zs)9t?O({OIBc;I#_l7)?J9T=E^I(#76_77tg2{3LtZ=M+M1({-5#FnzK$%E4+$(tl
z@Jv~@I=~~siEx5GI|xsd^ES9nq!Pf1@E(175S}18K$z~N(_M}O9ZrM~=(PGq@<m!<
zio{j)6093xop>i@Zh6azaIK&CW?!D?;l8YjedFCjj9Wd%8eXGqorn4+<3t!*7_6&<
m!FqpjeTy#G1-sz?5d0UiMflZ*f?cct0000<MNUMnLSTYA$^Rn&

literal 0
HcmV?d00001

diff --git a/tests/ref/title.png b/tests/ref/title.png
new file mode 100644
index 0000000000000000000000000000000000000000..9495e96b1c8b9568df8b23efcdfa57e582758910
GIT binary patch
literal 1455
zcmV;g1yK5lP)<h;3K|Lk000e1NJLTq004LZ002w~00000gXAo=000GcNkl<Zc-rmO
zdrXye7{KwK=ZFWiQoCu9rdfF@i)Jy)3{8{3h}1xBP~l}P6?3O$8j)#ej+*U=X_;My
z*%VD|Zr(-Hyp$K_9T7OFh=d2h%K^@X^NpRsnL7T0qipSbw|DRR+xvU>+1@|i=e>g#
z>JC5bhyC#X3bwo4)aP>0c;!{p_gzx>Oy9t+#8xr}fF&XWEZm$MI3L)(;kw{yo#Y!B
zdPv|!fM--oxv8Sz0|8rT0`PP1l|Y<M@fG}NkbVVhk5xU-O)ZsIXy_?f2fXVuxF#fC
z9|vM`RFAMLeNp;0j--E^4RB(#JhgaL_5Kx~SGzMGkSU8#)x*y0nVFT%go_64Qr*g#
zm|BDG;Ot<z=QNjI?Vk&<b%Z==&aw;<DR-Ffm5JseJg_tJ<(*xFPc;wTJCfcS!?f+R
z(=~A1pvQ4Pc@9tWWf*W!<SKNLEr173kqkbNNzH?^#`BFD3&Y?MT?$0#1lA^ir!<KK
zPKsQEhh%dD+*1aP3<*kX9=vE8mx8p<_wbCS0UNbVS=e##G*2SDa7Wox4;PCZ185$c
z@+HJ+2OEUxbbwwO9YK9_CEN=?ARB;pGzoiaSp-~d9{k#8uv1OIFiikhth%21%<^Eq
zh5aI>&`m!&ZfBUj4ddj_S-&LAZ5BMPO}if;qyXl$3u^xfV0-8Z8afxE53kwtd{E%P
zT+AH;BCUx*ZQ6dwm9a+coaT!mQOkA3o55QJ-t1L)bC>ykI$671X^FA8KeXd?S_0nJ
zJIUq$1M$Ot*bn<*KTONRHV1gh`sB?D8td$w2}^ws|ImIFc(OhrWi*y+jwJgWcJ!2J
z>Kh_f8f~3?>T~$F?>ZUFZ-6UG;8IzcmC`aBTrR!=E-L__2=Z$H9QjR!hhCeki?4%S
zqvHp?Y+Zhr%ymZf%5lFpI=o-07e4disPPZ4VM}L8k1%w$!h!+sciGz{_~1BpYya!u
zlz^(uGK;CQgh_uhPcQA3X<m3p2RknY<T75qAz4<j%dpNK)W1n^!ho2V`?UZs+~Xe8
z#HbAN3<IwYgJ<tHO^#a90Nb=DOxJ}>l^raVg(S&1Q}ooPz}CJ%vd;Fx&Vc*yG}K`F
z9opVm3pBu0L7m`h{n`r;l><Oi;Lp>5Bih3az;lvMn53TFyaLv0w_1pl<TKeB{3=NR
zjL^Rr8<@)k*}!~BWv)c!9iG<&c&2f%1?M!?;Uz$tQC}}V-B$zS>`>dy3>5WKV{BE<
zvl^TQa5c8`hmWsfU9d)$_R+_-ImQ?ap_V4VwYUKn)Z$rr&Xv^w*zk142DrhECzsW;
z^gQWyLrsN$Ncdqt+_Lb|pFhs0(eg7={sGsmf{Q|B4~<qFE}4{fNV!EYiL#Hzn=Pwx
zP1$}c;Tk;I0dUr@s=la$!2viM?%8dB#x3(1Jby^5m#QK2)#yQm*kWhhHxXDr^5d?$
z+8NU+f)ydg?4hk*b5R_T)NR0_l|F+PIO1dz2aJDI285H^ohfQzSKtOxWi>}73I@yk
z>NjOS@on8{a=@3bI$eImq+?AXV{q3Lj?xvpD<vNIj6_4M<S|>ac(1j~EIWM-hv`Xx
zyq9Jq*TH=>k5s(@Uc<Quhd)0VU%~ORois6H()VjBe`IiX7U*)`(Vv)6cjQSpydlS!
zF3VUx@}do2!5f3+?XrFndZaQ`TL&K^-Y|ZWcHdgk_3lv-+UrE3+`oQPCz(<Fv<%F9
z%h>0I5nnlc179e#<X0CI6;wcOjvHJ#HV$8a>I2Tp7M%H(!jifzMYg&vmlwv*GWC=%
zZ~M18&yWeuj$3a#Y;E5+d*>Hv+;*6MGrrw?(Lay<uphpm{{Vo%Ewdr<c2xiX002ov
JPDHLkV1l|k#Z~|S

literal 0
HcmV?d00001

diff --git a/tests/suite/model/title.typ b/tests/suite/model/title.typ
new file mode 100644
index 000000000..6a7ff131d
--- /dev/null
+++ b/tests/suite/model/title.typ
@@ -0,0 +1,24 @@
+// Test title element.
+
+--- title render html ---
+#set document(title: "My title")
+#title()
+= A level one heading
+
+--- title-with-body render html ---
+#set document(title: "My title")
+#title[My display title]
+
+--- title-with-body-auto render ---
+#set document(title: "My title")
+#title(auto)
+
+--- title-show-set ---
+#show title: set text(blue)
+#title[A blue title]
+
+--- title-unset ---
+// Error: 2-9 document title was not set
+// Hint: 2-9 set the title with `set document(title: [...])`
+// Hint: 2-9 or provide an explicit body with `title[..]`
+#title()

From 15d5591a42e716125351a3fd55497e2e1b10bbaf Mon Sep 17 00:00:00 2001
From: Laurenz <laurmaedje@gmail.com>
Date: Wed, 6 Aug 2025 11:30:45 +0200
Subject: [PATCH 19/19] Make HTML data structures cheaper to clone (#6708)

---
 crates/typst-html/src/convert.rs  |  9 +++++----
 crates/typst-html/src/document.rs | 18 +++++++++++-------
 crates/typst-html/src/dom.rs      | 10 +++++-----
 crates/typst-html/src/fragment.rs |  5 +++--
 crates/typst-html/src/link.rs     | 10 +++++-----
 5 files changed, 29 insertions(+), 23 deletions(-)

diff --git a/crates/typst-html/src/convert.rs b/crates/typst-html/src/convert.rs
index 09d89313c..208ea3dd3 100644
--- a/crates/typst-html/src/convert.rs
+++ b/crates/typst-html/src/convert.rs
@@ -1,3 +1,4 @@
+use ecow::EcoVec;
 use typst_library::diag::{SourceResult, warning};
 use typst_library::engine::Engine;
 use typst_library::foundations::{Content, StyleChain, Target, TargetElem};
@@ -15,8 +16,8 @@ pub fn convert_to_nodes<'a>(
     engine: &mut Engine,
     locator: &mut SplitLocator,
     children: impl IntoIterator<Item = Pair<'a>>,
-) -> SourceResult<Vec<HtmlNode>> {
-    let mut output = Vec::new();
+) -> SourceResult<EcoVec<HtmlNode>> {
+    let mut output = EcoVec::new();
     for (child, styles) in children {
         handle(engine, child, locator, styles, &mut output)?;
     }
@@ -29,12 +30,12 @@ fn handle(
     child: &Content,
     locator: &mut SplitLocator,
     styles: StyleChain,
-    output: &mut Vec<HtmlNode>,
+    output: &mut EcoVec<HtmlNode>,
 ) -> SourceResult<()> {
     if let Some(elem) = child.to_packed::<TagElem>() {
         output.push(HtmlNode::Tag(elem.tag.clone()));
     } else if let Some(elem) = child.to_packed::<HtmlElem>() {
-        let mut children = vec![];
+        let mut children = EcoVec::new();
         if let Some(body) = elem.body.get_ref(styles) {
             children = html_fragment(engine, body, locator.next(&elem.span()), styles)?;
         }
diff --git a/crates/typst-html/src/document.rs b/crates/typst-html/src/document.rs
index 5345e5911..d5ba536ca 100644
--- a/crates/typst-html/src/document.rs
+++ b/crates/typst-html/src/document.rs
@@ -1,6 +1,7 @@
 use std::num::NonZeroUsize;
 
 use comemo::{Tracked, TrackedMut};
+use ecow::{EcoVec, eco_vec};
 use rustc_hash::FxHashSet;
 use typst_library::World;
 use typst_library::diag::{SourceResult, bail};
@@ -141,19 +142,22 @@ fn introspect_html(
 
 /// Wrap the nodes in `<html>` and `<body>` if they are not yet rooted,
 /// supplying a suitable `<head>`.
-fn root_element(output: Vec<HtmlNode>, info: &DocumentInfo) -> SourceResult<HtmlElement> {
+fn root_element(
+    output: EcoVec<HtmlNode>,
+    info: &DocumentInfo,
+) -> SourceResult<HtmlElement> {
     let head = head_element(info);
     let body = match classify_output(output)? {
         OutputKind::Html(element) => return Ok(element),
         OutputKind::Body(body) => body,
         OutputKind::Leafs(leafs) => HtmlElement::new(tag::body).with_children(leafs),
     };
-    Ok(HtmlElement::new(tag::html).with_children(vec![head.into(), body.into()]))
+    Ok(HtmlElement::new(tag::html).with_children(eco_vec![head.into(), body.into()]))
 }
 
 /// Generate a `<head>` element.
 fn head_element(info: &DocumentInfo) -> HtmlElement {
-    let mut children = vec![];
+    let mut children = EcoVec::new();
 
     children.push(HtmlElement::new(tag::meta).with_attr(attr::charset, "utf-8").into());
 
@@ -167,7 +171,7 @@ fn head_element(info: &DocumentInfo) -> HtmlElement {
     if let Some(title) = &info.title {
         children.push(
             HtmlElement::new(tag::title)
-                .with_children(vec![HtmlNode::Text(title.clone(), Span::detached())])
+                .with_children(eco_vec![HtmlNode::Text(title.clone(), Span::detached())])
                 .into(),
         );
     }
@@ -203,9 +207,9 @@ fn head_element(info: &DocumentInfo) -> HtmlElement {
 }
 
 /// Determine which kind of output the user generated.
-fn classify_output(mut output: Vec<HtmlNode>) -> SourceResult<OutputKind> {
+fn classify_output(mut output: EcoVec<HtmlNode>) -> SourceResult<OutputKind> {
     let count = output.iter().filter(|node| !matches!(node, HtmlNode::Tag(_))).count();
-    for node in &mut output {
+    for node in output.make_mut() {
         let HtmlNode::Element(elem) = node else { continue };
         let tag = elem.tag;
         let mut take = || std::mem::replace(elem, HtmlElement::new(tag::html));
@@ -232,5 +236,5 @@ enum OutputKind {
     /// one, but need supply the `<html>` element.
     Body(HtmlElement),
     /// The user generated leafs which we wrap in a `<body>` and `<html>`.
-    Leafs(Vec<HtmlNode>),
+    Leafs(EcoVec<HtmlNode>),
 }
diff --git a/crates/typst-html/src/dom.rs b/crates/typst-html/src/dom.rs
index 48b433fd5..5f40473a0 100644
--- a/crates/typst-html/src/dom.rs
+++ b/crates/typst-html/src/dom.rs
@@ -57,7 +57,7 @@ pub struct HtmlElement {
     /// The element's attributes.
     pub attrs: HtmlAttrs,
     /// The element's children.
-    pub children: Vec<HtmlNode>,
+    pub children: EcoVec<HtmlNode>,
     /// The span from which the element originated, if any.
     pub span: Span,
 }
@@ -68,7 +68,7 @@ impl HtmlElement {
         Self {
             tag,
             attrs: HtmlAttrs::default(),
-            children: vec![],
+            children: EcoVec::new(),
             span: Span::detached(),
         }
     }
@@ -76,7 +76,7 @@ impl HtmlElement {
     /// Attach children to the element.
     ///
     /// Note: This overwrites potential previous children.
-    pub fn with_children(mut self, children: Vec<HtmlNode>) -> Self {
+    pub fn with_children(mut self, children: EcoVec<HtmlNode>) -> Self {
         self.children = children;
         self
     }
@@ -337,7 +337,7 @@ pub struct HtmlFrame {
     /// An ID to assign to the SVG itself.
     pub id: Option<EcoString>,
     /// IDs to assign to destination jump points within the SVG.
-    pub link_points: Vec<(Point, EcoString)>,
+    pub link_points: EcoVec<(Point, EcoString)>,
 }
 
 impl HtmlFrame {
@@ -347,7 +347,7 @@ impl HtmlFrame {
             inner,
             text_size: styles.resolve(TextElem::size),
             id: None,
-            link_points: vec![],
+            link_points: EcoVec::new(),
         }
     }
 }
diff --git a/crates/typst-html/src/fragment.rs b/crates/typst-html/src/fragment.rs
index 66a59b678..73a5ed878 100644
--- a/crates/typst-html/src/fragment.rs
+++ b/crates/typst-html/src/fragment.rs
@@ -1,4 +1,5 @@
 use comemo::{Track, Tracked, TrackedMut};
+use ecow::EcoVec;
 use typst_library::diag::{At, SourceResult};
 use typst_library::engine::{Engine, Route, Sink, Traced};
 use typst_library::foundations::{Content, StyleChain};
@@ -16,7 +17,7 @@ pub fn html_fragment(
     content: &Content,
     locator: Locator,
     styles: StyleChain,
-) -> SourceResult<Vec<HtmlNode>> {
+) -> SourceResult<EcoVec<HtmlNode>> {
     html_fragment_impl(
         engine.routines,
         engine.world,
@@ -43,7 +44,7 @@ fn html_fragment_impl(
     content: &Content,
     locator: Tracked<Locator>,
     styles: StyleChain,
-) -> SourceResult<Vec<HtmlNode>> {
+) -> SourceResult<EcoVec<HtmlNode>> {
     let link = LocatorLink::new(locator);
     let mut locator = Locator::link(&link).split();
     let mut engine = Engine {
diff --git a/crates/typst-html/src/link.rs b/crates/typst-html/src/link.rs
index 58dd49cd3..885458fd1 100644
--- a/crates/typst-html/src/link.rs
+++ b/crates/typst-html/src/link.rs
@@ -1,7 +1,7 @@
 use std::collections::VecDeque;
 
 use comemo::Track;
-use ecow::{EcoString, eco_format};
+use ecow::{EcoString, EcoVec, eco_format, eco_vec};
 use rustc_hash::{FxHashMap, FxHashSet};
 use typst_library::foundations::{Label, NativeElement};
 use typst_library::introspection::{Introspector, Location, Tag};
@@ -75,11 +75,11 @@ fn traverse(
     work: &mut Work,
     targets: &FxHashSet<Location>,
     identificator: &mut Identificator<'_>,
-    nodes: &mut Vec<HtmlNode>,
+    nodes: &mut EcoVec<HtmlNode>,
 ) {
     let mut i = 0;
     while i < nodes.len() {
-        let node = &mut nodes[i];
+        let node = &mut nodes.make_mut()[i];
         match node {
             // When visiting a start tag, we check whether the element needs an
             // ID and if so, add it to the queue, so that its first child node
@@ -115,7 +115,7 @@ fn traverse(
             HtmlNode::Text(..) => {
                 work.drain(|label| {
                     let mut element =
-                        HtmlElement::new(tag::span).with_children(vec![node.clone()]);
+                        HtmlElement::new(tag::span).with_children(eco_vec![node.clone()]);
                     let id = identificator.assign(&mut element, label);
                     *node = HtmlNode::Element(element);
                     id
@@ -148,7 +148,7 @@ fn traverse_frame(
     targets: &FxHashSet<Location>,
     identificator: &mut Identificator<'_>,
     frame: &Frame,
-    link_points: &mut Vec<(Point, EcoString)>,
+    link_points: &mut EcoVec<(Point, EcoString)>,
 ) {
     for (_, item) in frame.items() {
         match item {