Merge upstream v0.14.1

Cargo.toml

@@ -4,8 +4,8 @@ default-members = ["crates/typst-cli"]
 resolver = "2"
 
 [workspace.package]
-version = "0.14.0"
-rust-version = "1.88" # also change in ci.yml
+version = "0.14.1"
+rust-version = "1.89" # also change in ci.yml
 authors = ["The Typst Project Developers"]
 edition = "2024"
 homepage = "https://typst.app"
@@ -16,24 +16,24 @@ keywords = ["typst"]
 readme = "README.md"
 
 [workspace.dependencies]
-typst = { path = "crates/typst", version = "0.14.0" }
-typst-cli = { path = "crates/typst-cli", version = "0.14.0" }
-typst-eval = { path = "crates/typst-eval", version = "0.14.0" }
-typst-html = { path = "crates/typst-html", version = "0.14.0" }
-typst-ide = { path = "crates/typst-ide", version = "0.14.0" }
-typst-kit = { path = "crates/typst-kit", version = "0.14.0" }
-typst-layout = { path = "crates/typst-layout", version = "0.14.0" }
-typst-library = { path = "crates/typst-library", version = "0.14.0" }
-typst-macros = { path = "crates/typst-macros", version = "0.14.0" }
-typst-pdf = { path = "crates/typst-pdf", version = "0.14.0" }
-typst-realize = { path = "crates/typst-realize", version = "0.14.0" }
-typst-render = { path = "crates/typst-render", version = "0.14.0" }
-typst-svg = { path = "crates/typst-svg", version = "0.14.0" }
-typst-syntax = { path = "crates/typst-syntax", version = "0.14.0" }
-typst-timing = { path = "crates/typst-timing", version = "0.14.0" }
-typst-utils = { path = "crates/typst-utils", version = "0.14.0" }
-typst-assets = "0.14.0"
-typst-dev-assets = { git = "https://github.com/typst/typst-dev-assets", tag = "v0.14.0" }
+typst = { path = "crates/typst", version = "0.14.1" }
+typst-cli = { path = "crates/typst-cli", version = "0.14.1" }
+typst-eval = { path = "crates/typst-eval", version = "0.14.1" }
+typst-html = { path = "crates/typst-html", version = "0.14.1" }
+typst-ide = { path = "crates/typst-ide", version = "0.14.1" }
+typst-kit = { path = "crates/typst-kit", version = "0.14.1" }
+typst-layout = { path = "crates/typst-layout", version = "0.14.1" }
+typst-library = { path = "crates/typst-library", version = "0.14.1" }
+typst-macros = { path = "crates/typst-macros", version = "0.14.1" }
+typst-pdf = { path = "crates/typst-pdf", version = "0.14.1" }
+typst-realize = { path = "crates/typst-realize", version = "0.14.1" }
+typst-render = { path = "crates/typst-render", version = "0.14.1" }
+typst-svg = { path = "crates/typst-svg", version = "0.14.1" }
+typst-syntax = { path = "crates/typst-syntax", version = "0.14.1" }
+typst-timing = { path = "crates/typst-timing", version = "0.14.1" }
+typst-utils = { path = "crates/typst-utils", version = "0.14.1" }
+typst-assets = "0.14.1"
+typst-dev-assets = { git = "https://github.com/typst/typst-dev-assets", tag = "v0.14.1" }
 arrayvec = "0.7.4"
 az = "1.2"
 base64 = "0.22"
@@ -77,8 +77,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 = { version = "0.5.0", default-features = false, features = ["raster-images", "comemo", "rayon", "pdf"] }
-krilla-svg = "0.2"
+krilla = { version = "0.6.0", default-features = false, features = ["raster-images", "comemo", "rayon", "pdf"] }
+krilla-svg = "0.3.0"
 kurbo = "0.12"
 libfuzzer-sys = "0.4"
 lipsum = "0.9"
@@ -141,7 +141,7 @@ ureq = { version = "2", default-features = false, features = ["native-tls", "gzi
 usvg = { version = "0.45", default-features = false, features = ["text"] }
 utf8_iter = "1.0.4"
 walkdir = "2"
-wasmi = { version = "0.51.0", default-features = false, features = ["simd"] }
+wasmi = { version = "0.51.2", default-features = false, features = ["simd"] }
 web-sys = "0.3"
 xmlparser = "0.13.5"
 xmlwriter = "0.1.0"

crates/typst-cli/src/deps.rs

@@ -64,7 +64,7 @@ fn write_deps_make(
     dest: &Output,
     outputs: &[Output],
 ) -> io::Result<()> {
-    let mut dest = dest.open()?;
+    let mut buffer = Vec::new();
     for (i, output) in outputs.iter().enumerate() {
         let path = match output {
             Output::Path(path) => path.as_os_str(),
@@ -82,10 +82,14 @@ fn write_deps_make(
         // processed.
         let Some(string) = path.to_str() else { continue };
         if i != 0 {
-            dest.write_all(b" ")?;
+            buffer.write_all(b" ")?;
         }
-        dest.write_all(munge(string).as_bytes())?;
+        buffer.write_all(munge(string).as_bytes())?;
     }
+
+    // Only create the deps file in case of valid output paths.
+    let mut dest = dest.open()?;
+    dest.write_all(&buffer)?;
     dest.write_all(b":")?;
 
     for dep in relative_dependencies(world)? {

crates/typst-html/src/rules.rs

@@ -8,7 +8,7 @@ use typst_library::foundations::{
     Content, Context, NativeElement, NativeRuleMap, ShowFn, Smart, StyleChain, Target,
 };
 use typst_library::introspection::Counter;
-use typst_library::layout::resolve::{Cell, CellGrid, Entry};
+use typst_library::layout::resolve::{Cell, CellGrid, Entry, Header};
 use typst_library::layout::{
     BlockBody, BlockElem, BoxElem, HElem, OuterVAlignment, Sizing,
 };
@@ -563,26 +563,42 @@ fn show_cellgrid(grid: &CellGrid, styles: StyleChain) -> Content {
     // TODO(subfooters): similarly to headers, take consecutive footers from
     // the end for 'tfoot'.
     let footer = grid.footer.as_ref().map(|ft| {
-        let rows = rows.drain(ft.start..);
+        // Convert from gutter to non-gutter coordinates. Use ceil as it might
+        // include the previous gutter row
+        // (cf. typst-library/layout/grid/resolve.rs).
+        let footer_start = if grid.has_gutter { ft.start.div_ceil(2) } else { ft.start };
+        let rows = rows.drain(footer_start..);
         elem(tag::tfoot, Content::sequence(rows.map(|row| tr(tag::td, row))))
     });
 
+    // Header range converting from gutter (doubled) to non-gutter coordinates.
+    let header_range = |hd: &Header| {
+        if grid.has_gutter {
+            // Use ceil as it might be `2 * row_amount - 1` if the header is at
+            // the end (cf. typst-library/layout/grid/resolve.rs).
+            hd.range.start / 2..hd.range.end.div_ceil(2)
+        } else {
+            hd.range.clone()
+        }
+    };
+
     // Store all consecutive headers at the start in 'thead'. All remaining
     // headers are just 'th' rows across the table body.
     let mut consecutive_header_end = 0;
     let first_mid_table_header = grid
         .headers
         .iter()
         .take_while(|hd| {
-            let is_consecutive = hd.range.start == consecutive_header_end;
-            consecutive_header_end = hd.range.end;
+            let range = header_range(hd);
+            let is_consecutive = range.start == consecutive_header_end;
+            consecutive_header_end = range.end;
             is_consecutive
         })
         .count();
 
     let (y_offset, header) = if first_mid_table_header > 0 {
         let removed_header_rows =
-            grid.headers.get(first_mid_table_header - 1).unwrap().range.end;
+            header_range(grid.headers.get(first_mid_table_header - 1).unwrap()).end;
         let rows = rows.drain(..removed_header_rows);
 
         (
@@ -601,10 +617,11 @@ fn show_cellgrid(grid: &CellGrid, styles: StyleChain) -> Content {
     let mut body =
         Content::sequence(rows.into_iter().enumerate().map(|(relative_y, row)| {
             let y = relative_y + y_offset;
-            if let Some(current_header) =
-                grid.headers.get(next_header).filter(|h| h.range.contains(&y))
+            if let Some(current_header_range) =
+                grid.headers.get(next_header).map(|h| header_range(h))
+                && current_header_range.contains(&y)
             {
-                if y + 1 == current_header.range.end {
+                if y + 1 == current_header_range.end {
                     next_header += 1;
                 }
 

crates/typst-layout/src/inline/line.rs

@@ -222,9 +222,9 @@ fn collect_items<'a>(
 
     // Add fallback text to expand the line height, if necessary.
     if !items.iter().any(|item| matches!(item, Item::Text(_)))
-        && let Some(fallback) = fallback
+        && let Some((idx, fallback)) = fallback
     {
-        items.push(fallback, LogicalIndex::FALLBACK_TEXT);
+        items.push(fallback, idx);
     }
 }
 
@@ -287,7 +287,7 @@ fn collect_range<'a>(
     range: Range,
     trim: &Trim,
     items: &mut Items<'a>,
-    fallback: &mut Option<ItemEntry<'a>>,
+    fallback: &mut Option<(LogicalIndex, ItemEntry<'a>)>,
 ) {
     for (i, (subrange, item)) in p.slice(range.clone()) {
         let idx = LogicalIndex::from_item_index(i);
@@ -310,7 +310,7 @@ fn collect_range<'a>(
             // When there is no text, still keep this as a fallback item, which
             // we can use to force a non-zero line-height when the line doesn't
             // contain any other text.
-            *fallback = Some(ItemEntry::from(Item::Text(shaped.empty())));
+            *fallback = Some((idx, ItemEntry::from(Item::Text(shaped.empty()))));
             continue;
         }
 
@@ -782,7 +782,6 @@ pub struct LogicalIndex(usize);
 
 impl LogicalIndex {
     const START_HYPHEN: Self = Self(0);
-    const FALLBACK_TEXT: Self = Self(usize::MAX - 1);
     const END_HYPHEN: Self = Self(usize::MAX);
 
     /// Create a logical index from the index of an item in the [`p.items`](Preparation::items).

crates/typst-layout/src/inline/shaping.rs

@@ -1100,17 +1100,17 @@ fn determine_shift(
             // "subs"/"sups" to the feature list if supported by the font.
             // In case of a problem, we just early exit
             let gsub = font.rusty().tables().gsub?;
-            let subtable_index =
-                gsub.features.find(settings.kind.feature())?.lookup_indices.get(0)?;
-            let coverage = gsub
-                .lookups
-                .get(subtable_index)?
-                .subtables
-                .get::<SubstitutionSubtable>(0)?
-                .coverage();
+            let lookups = gsub.features.find(settings.kind.feature())?.lookup_indices;
             text.chars()
                 .all(|c| {
-                    font.rusty().glyph_index(c).is_some_and(|i| coverage.contains(i))
+                    let Some(i) = font.rusty().glyph_index(c) else { return false };
+                    lookups
+                        .into_iter()
+                        .flat_map(|i| gsub.lookups.get(i))
+                        .flat_map(|lookup| {
+                            lookup.subtables.into_iter::<SubstitutionSubtable>()
+                        })
+                        .any(|subtable| subtable.coverage().contains(i))
                 })
                 .then(|| {
                     // If we can use the OpenType feature, we can keep the text

crates/typst-layout/src/math/fragment.rs

@@ -839,7 +839,16 @@ fn assemble(
     }
 
     match axis {
-        Axis::X => base.size.x = full,
+        Axis::X => {
+            base.size.x = full;
+            let (ascent, descent) = glyphs
+                .iter()
+                .filter_map(|glyph| ascent_descent(&base.item.font, GlyphId(glyph.id)))
+                .reduce(|(ma, md), (a, d)| (ma.max(a), md.max(d)))
+                .unwrap_or((Em::zero(), Em::zero()));
+            base.baseline = Some(ascent.at(base.item.size));
+            base.size.y = (ascent + descent).at(base.item.size);
+        }
         Axis::Y => {
             base.baseline = None;
             base.size.y = full;

crates/typst-layout/src/math/mat.rs

@@ -7,6 +7,7 @@ use typst_library::math::{Augment, AugmentOffsets, CasesElem, MatElem, VecElem};
 use typst_library::text::TextElem;
 use typst_library::visualize::{FillRule, FixedStroke, Geometry, LineCap, Shape};
 use typst_syntax::Span;
+use unicode_math_class::MathClass;
 
 use super::{
     AlignmentResult, DELIM_SHORT_FALL, FrameFragment, GlyphFragment, LeftRightAlternator,
@@ -348,6 +349,7 @@ fn layout_delimiters(
             ctx.layout_into_fragment(&SymbolElem::packed(left_c).spanned(span), styles)?;
         left.stretch_vertical(ctx, target, short_fall);
         left.center_on_axis();
+        left.set_class(MathClass::Opening);
         ctx.push(left);
     }
 
@@ -358,6 +360,7 @@ fn layout_delimiters(
             ctx.layout_into_fragment(&SymbolElem::packed(right_c).spanned(span), styles)?;
         right.stretch_vertical(ctx, target, short_fall);
         right.center_on_axis();
+        right.set_class(MathClass::Closing);
         ctx.push(right);
     }
 

crates/typst-layout/src/math/text.rs

@@ -97,8 +97,6 @@ fn layout_inline_text(
             .chars()
             .flat_map(|c| to_style(c, MathStyle::select(c, variant, bold, italic)))
             .collect();
-
-        let spaced = styled_text.graphemes(true).nth(1).is_some();
         let elem = TextElem::packed(styled_text).spanned(span);
 
         // There isn't a natural width for a paragraph in a math environment;
@@ -118,7 +116,7 @@ fn layout_inline_text(
         Ok(FrameFragment::new(styles, frame)
             .with_class(MathClass::Alphabetic)
             .with_text_like(true)
-            .with_spaced(spaced))
+            .with_spaced(true))
     }
 }
 

crates/typst-library/src/diag.rs

@@ -1,5 +1,6 @@
 //! Diagnostics.
 
+use std::backtrace::{Backtrace, BacktraceStatus};
 use std::fmt::{self, Display, Formatter, Write as _};
 use std::io;
 use std::path::{Path, PathBuf};
@@ -868,3 +869,55 @@ pub fn format_xml_like_error(format: &str, error: roxmltree::Error) -> LoadError
 
     LoadError { pos: pos.into(), message }
 }
+
+/// Asserts a condition, generating an internal compiler error with the provided
+/// message on failure.
+#[track_caller]
+pub fn assert_internal(cond: bool, msg: &str) -> HintedStrResult<()> {
+    if !cond { Err(internal_error(msg)) } else { Ok(()) }
+}
+
+/// Generates an internal compiler error with the provided message.
+#[track_caller]
+pub fn panic_internal(msg: &str) -> HintedStrResult<()> {
+    Err(internal_error(msg))
+}
+
+/// Adds a method analogous to [`Option::expect`] that raises an internal
+/// compiler error instead of panicking.
+pub trait ExpectInternal<T> {
+    /// Extracts the value, producing an internal error if `self` is `None`.
+    fn expect_internal(self, msg: &str) -> HintedStrResult<T>;
+}
+
+impl<T> ExpectInternal<T> for Option<T> {
+    #[track_caller]
+    fn expect_internal(self, msg: &str) -> HintedStrResult<T> {
+        match self {
+            Some(val) => Ok(val),
+            None => Err(internal_error(msg)),
+        }
+    }
+}
+
+/// The shared internal implementation of [`assert_internal`] and
+/// [`expect_internal`].
+#[track_caller]
+fn internal_error(msg: &str) -> HintedString {
+    let loc = std::panic::Location::caller();
+    let mut error = error!(
+        "internal error: {msg} (occurred at {loc})";
+        hint: "please report this as a bug"
+    );
+
+    if cfg!(debug_assertions) {
+        let backtrace = Backtrace::capture();
+        if backtrace.status() == BacktraceStatus::Captured {
+            error.hint(eco_format!("compiler backtrace:\n{backtrace}"));
+        } else {
+            error.hint("set `RUST_BACKTRACE` to `1` or `full` to capture a backtrace");
+        }
+    }
+
+    error
+}