From d55bebeaa1efc6d49b94d3515cd0b9bea4440280 Mon Sep 17 00:00:00 2001 From: Malo <57839069+MDLC01@users.noreply.github.com> Date: Sat, 19 Apr 2025 17:41:49 +0200 Subject: [PATCH 1/3] Use OpenType features when possible --- crates/typst-layout/src/inline/shaping.rs | 90 ++++++++- crates/typst-library/src/layout/length.rs | 4 + crates/typst-library/src/text/font/mod.rs | 55 +++++ crates/typst-library/src/text/mod.rs | 5 + crates/typst-library/src/text/shift.rs | 236 +++++++++------------- 5 files changed, 241 insertions(+), 149 deletions(-) diff --git a/crates/typst-layout/src/inline/shaping.rs b/crates/typst-layout/src/inline/shaping.rs index 8236d1e36..7f16bbd0d 100644 --- a/crates/typst-layout/src/inline/shaping.rs +++ b/crates/typst-layout/src/inline/shaping.rs @@ -5,14 +5,15 @@ use std::sync::Arc; use az::SaturatingAs; use ecow::EcoString; -use rustybuzz::{BufferFlags, ShapePlan, UnicodeBuffer}; +use rustybuzz::{BufferFlags, Feature, ShapePlan, UnicodeBuffer}; +use ttf_parser::gsub::SubstitutionSubtable; use ttf_parser::Tag; use typst_library::engine::Engine; use typst_library::foundations::{Smart, StyleChain}; use typst_library::layout::{Abs, Dir, Em, Frame, FrameItem, Point, Size}; use typst_library::text::{ families, features, is_default_ignorable, variant, Font, FontFamily, FontVariant, - Glyph, Lang, Region, TextEdgeBounds, TextElem, TextItem, + Glyph, Lang, Region, ScriptSettings, TextEdgeBounds, TextElem, TextItem, }; use typst_library::World; use typst_utils::SliceExt; @@ -64,6 +65,8 @@ pub struct ShapedGlyph { pub x_offset: Em, /// The vertical offset of the glyph. pub y_offset: Em, + /// How much to scale the glyph compared to its normal size. + pub scale: Em, /// The adjustability of the glyph. pub adjustability: Adjustability, /// The byte range of this glyph's cluster in the full inline layout. A @@ -230,8 +233,10 @@ impl<'a> ShapedText<'a> { let stroke = TextElem::stroke_in(self.styles); let span_offset = TextElem::span_offset_in(self.styles); - for ((font, y_offset), group) in - self.glyphs.as_ref().group_by_key(|g| (g.font.clone(), g.y_offset)) + for ((font, y_offset, scale), group) in self + .glyphs + .as_ref() + .group_by_key(|g| (g.font.clone(), g.y_offset, g.scale)) { let mut range = group[0].range.clone(); for glyph in group { @@ -304,7 +309,7 @@ impl<'a> ShapedText<'a> { let item = TextItem { font, - size: self.size, + size: scale.at(self.size), lang: self.lang, region: self.region, fill: fill.clone(), @@ -420,7 +425,7 @@ impl<'a> ShapedText<'a> { styles: self.styles, size: self.size, variant: self.variant, - width: glyphs.iter().map(|g| g.x_advance).sum::().at(self.size), + width: glyphs_width(glyphs).at(self.size), glyphs: Cow::Borrowed(glyphs), } } else { @@ -491,6 +496,7 @@ impl<'a> ShapedText<'a> { x_advance, x_offset: Em::zero(), y_offset: Em::zero(), + scale: Em::one(), adjustability: Adjustability::default(), range, safe_to_break: true, @@ -666,6 +672,7 @@ fn shape<'a>( region: Option, ) -> ShapedText<'a> { let size = TextElem::size_in(styles); + let script_settings = TextElem::subperscript_in(styles); let mut ctx = ShapingContext { engine, size, @@ -679,7 +686,7 @@ fn shape<'a>( }; if !text.is_empty() { - shape_segment(&mut ctx, base, text, families(styles)); + shape_segment(&mut ctx, base, text, families(styles), script_settings); } track_and_space(&mut ctx); @@ -699,11 +706,17 @@ fn shape<'a>( styles, variant: ctx.variant, size, - width: ctx.glyphs.iter().map(|g| g.x_advance).sum::().at(size), + width: glyphs_width(&ctx.glyphs).at(size), glyphs: Cow::Owned(ctx.glyphs), } } +/// Computes the width of a run of glyphs relative to the font size, accounting +/// for their individual scaling factors and other font metrics. +fn glyphs_width(glyphs: &[ShapedGlyph]) -> Em { + glyphs.iter().map(|g| g.x_advance * g.scale.get()).sum() +} + /// Holds shaping results and metadata common to all shaped segments. struct ShapingContext<'a, 'v> { engine: &'a Engine<'v>, @@ -723,6 +736,7 @@ fn shape_segment<'a>( base: usize, text: &str, mut families: impl Iterator + Clone, + script_settings: Option, ) { // Don't try shaping newlines, tabs, or default ignorables. if text @@ -789,6 +803,52 @@ fn shape_segment<'a>( // text extraction. buffer.set_flags(BufferFlags::REMOVE_DEFAULT_IGNORABLES); + // Those values determine how the rendered text should be transformed to + // display sub-/super-scripts properly. If the text is not scripted, or if + // the OpenType feature can be used, the rendered text should not be + // transformed in any way, and so those values are neutral (`(0, 0, 1)`). If + // scripts should be synthesized, those values determine how to transform + // the rendered text to display scripts as expected. + let (script_shift, script_compensation, scale) = match script_settings { + None => (Em::zero(), Em::zero(), Em::one()), + Some(settings) => settings + .typographic + .then(|| { + // If typographic scripts are enabled (i.e., we want to use the + // OpenType feature instead of synthesizing if possible), we add + // "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::(0)? + .coverage(); + text.chars() + .all(|c| { + font.rusty().glyph_index(c).is_some_and(|i| coverage.contains(i)) + }) + .then(|| { + ctx.features.push(Feature::new(settings.kind.feature(), 1, ..)); + (Em::zero(), Em::zero(), Em::one()) + }) + }) + // Reunite the cases where `typographic` is `false` or where using + // the OpenType feature would not work. + .flatten() + .unwrap_or_else(|| { + let script_metrics = settings.kind.read_metrics(font.metrics()); + ( + settings.shift.unwrap_or(script_metrics.vertical_offset), + script_metrics.horizontal_offset, + settings.size.unwrap_or(script_metrics.height), + ) + }), + }; + // Prepare the shape plan. This plan depends on direction, script, language, // and features, but is independent from the text and can thus be memoized. let plan = create_shape_plan( @@ -869,8 +929,9 @@ fn shape_segment<'a>( glyph_id: info.glyph_id as u16, // TODO: Don't ignore y_advance. x_advance, - x_offset: font.to_em(pos[i].x_offset), - y_offset: font.to_em(pos[i].y_offset), + x_offset: font.to_em(pos[i].x_offset) + script_compensation, + y_offset: font.to_em(pos[i].y_offset) + script_shift, + scale, adjustability: Adjustability::default(), range: start..end, safe_to_break: !info.unsafe_to_break(), @@ -923,7 +984,13 @@ fn shape_segment<'a>( } // Recursively shape the tofu sequence with the next family. - shape_segment(ctx, base + start, &text[start..end], families.clone()); + shape_segment( + ctx, + base + start, + &text[start..end], + families.clone(), + script_settings, + ); } i += 1; @@ -963,6 +1030,7 @@ fn shape_tofus(ctx: &mut ShapingContext, base: usize, text: &str, font: Font) { x_advance, x_offset: Em::zero(), y_offset: Em::zero(), + scale: Em::one(), adjustability: Adjustability::default(), range: start..end, safe_to_break: true, diff --git a/crates/typst-library/src/layout/length.rs b/crates/typst-library/src/layout/length.rs index 800140c47..15a5e7b55 100644 --- a/crates/typst-library/src/layout/length.rs +++ b/crates/typst-library/src/layout/length.rs @@ -91,6 +91,10 @@ impl Length { hint: "or use `length.abs.{unit}()` instead to ignore its em component" ) } + + pub fn to_em(&self, text_size: Abs) -> Em { + self.em + Em::new(self.abs / text_size) + } } #[scope] diff --git a/crates/typst-library/src/text/font/mod.rs b/crates/typst-library/src/text/font/mod.rs index afa92e778..84ddc3fc7 100644 --- a/crates/typst-library/src/text/font/mod.rs +++ b/crates/typst-library/src/text/font/mod.rs @@ -215,6 +215,10 @@ pub struct FontMetrics { pub underline: LineMetrics, /// Recommended metrics for an overline. pub overline: LineMetrics, + /// Metrics for subscripts. + pub subscript: ScriptMetrics, + /// Metrics for superscripts. + pub superscript: ScriptMetrics, } impl FontMetrics { @@ -227,6 +231,7 @@ impl FontMetrics { let cap_height = ttf.capital_height().filter(|&h| h > 0).map_or(ascender, to_em); let x_height = ttf.x_height().filter(|&h| h > 0).map_or(ascender, to_em); let descender = to_em(ttf.typographic_descender().unwrap_or(ttf.descender())); + let strikeout = ttf.strikeout_metrics(); let underline = ttf.underline_metrics(); @@ -249,6 +254,26 @@ impl FontMetrics { thickness: underline.thickness, }; + let subscript = match ttf.subscript_metrics() { + None => ScriptMetrics::default_subscript(), + Some(metrics) => ScriptMetrics { + width: to_em(metrics.x_size), + height: to_em(metrics.y_size), + horizontal_offset: to_em(metrics.x_offset), + vertical_offset: -to_em(metrics.y_offset), + }, + }; + + let superscript = match ttf.superscript_metrics() { + None => ScriptMetrics::default_superscript(), + Some(metrics) => ScriptMetrics { + width: to_em(metrics.x_size), + height: to_em(metrics.y_size), + horizontal_offset: to_em(metrics.x_offset), + vertical_offset: to_em(metrics.y_offset), + }, + }; + Self { units_per_em, ascender, @@ -258,6 +283,8 @@ impl FontMetrics { strikethrough, underline, overline, + superscript, + subscript, } } @@ -283,6 +310,34 @@ pub struct LineMetrics { pub thickness: Em, } +/// Metrics for subscripts or superscripts. +#[derive(Debug, Copy, Clone)] +pub struct ScriptMetrics { + pub width: Em, + pub height: Em, + pub horizontal_offset: Em, + pub vertical_offset: Em, +} + +impl ScriptMetrics { + pub const fn default_with_vertical_offset(offset: Em) -> Self { + Self { + width: Em::new(0.6), + height: Em::new(0.6), + horizontal_offset: Em::zero(), + vertical_offset: offset, + } + } + + pub const fn default_subscript() -> Self { + Self::default_with_vertical_offset(Em::new(-0.2)) + } + + pub const fn default_superscript() -> Self { + Self::default_with_vertical_offset(Em::new(0.5)) + } +} + /// Identifies a vertical metric of a font. #[derive(Debug, Copy, Clone, Eq, PartialEq, Hash, Cast)] pub enum VerticalFontMetric { diff --git a/crates/typst-library/src/text/mod.rs b/crates/typst-library/src/text/mod.rs index 462d16060..3eada5a76 100644 --- a/crates/typst-library/src/text/mod.rs +++ b/crates/typst-library/src/text/mod.rs @@ -752,6 +752,11 @@ pub struct TextElem { #[internal] #[ghost] pub smallcaps: Option, + + /// Whether subscripts or superscripts are enabled. + #[internal] + #[ghost] + pub subperscript: Option, } impl TextElem { diff --git a/crates/typst-library/src/text/shift.rs b/crates/typst-library/src/text/shift.rs index dbf1be8a1..fc85777d8 100644 --- a/crates/typst-library/src/text/shift.rs +++ b/crates/typst-library/src/text/shift.rs @@ -1,11 +1,10 @@ -use ecow::EcoString; - use crate::diag::SourceResult; use crate::engine::Engine; -use crate::foundations::{elem, Content, Packed, SequenceElem, Show, StyleChain}; +use crate::foundations::{elem, Content, Packed, Show, Smart, StyleChain}; use crate::layout::{Em, Length}; -use crate::text::{variant, SpaceElem, TextElem, TextSize}; -use crate::World; +use crate::text::{FontMetrics, TextElem, TextSize}; +use ttf_parser::Tag; +use typst_library::text::ScriptMetrics; /// Renders text in subscript. /// @@ -17,11 +16,17 @@ use crate::World; /// ``` #[elem(title = "Subscript", Show)] pub struct SubElem { - /// Whether to prefer the dedicated subscript characters of the font. + /// Whether to create artificial subscripts by shifting and scaling down + /// regular glyphs. /// - /// If this is enabled, Typst first tries to transform the text to subscript - /// codepoints. If that fails, it falls back to rendering lowered and shrunk - /// normal letters. + /// Ideally, subscripts glyphs should be provided by the font (using the + /// `subs` OpenType feature). Otherwise, Typst is able to synthesize + /// subscripts as explained above. + /// + /// When this is set to `{false}`, synthesized glyphs will be used + /// regardless of whether the font provides dedicated subscript glyphs. When + /// `{true}`, synthesized glyphs may still be used in case the font does not + /// provide the necessary subscript glyphs. /// /// ```example /// N#sub(typographic: true)[1] @@ -30,17 +35,19 @@ pub struct SubElem { #[default(true)] pub typographic: bool, - /// The baseline shift for synthetic subscripts. Does not apply if - /// `typographic` is true and the font has subscript codepoints for the - /// given `body`. - #[default(Em::new(0.2).into())] - pub baseline: Length, + /// The baseline shift for synthesized subscripts. + /// + /// This only applies to synthesized subscripts. In other words, this has no + /// effect if `typographic` is `{true}` and the font provides the necessary + /// subscript glyphs. + pub baseline: Smart, - /// The font size for synthetic subscripts. Does not apply if - /// `typographic` is true and the font has subscript codepoints for the - /// given `body`. - #[default(TextSize(Em::new(0.6).into()))] - pub size: TextSize, + /// The font size for synthesized subscripts. + /// + /// This only applies to synthesized subscripts. In other words, this has no + /// effect if `typographic` is `{true}` and the font provides the necessary + /// subscript glyphs. + pub size: Smart, /// The text to display in subscript. #[required] @@ -49,20 +56,17 @@ pub struct SubElem { impl Show for Packed { #[typst_macros::time(name = "sub", span = self.span())] - fn show(&self, engine: &mut Engine, styles: StyleChain) -> SourceResult { - let body = self.body.clone(); - - if self.typographic(styles) { - if let Some(text) = convert_script(&body, true) { - if is_shapable(engine, &text, styles) { - return Ok(TextElem::packed(text)); - } - } - }; - - Ok(body - .styled(TextElem::set_baseline(self.baseline(styles))) - .styled(TextElem::set_size(self.size(styles)))) + fn show(&self, _: &mut Engine, styles: StyleChain) -> SourceResult { + let outer_text_size = TextElem::size_in(styles); + Ok(self + .body + .clone() + .styled(TextElem::set_subperscript(Some(ScriptSettings { + typographic: self.typographic(styles), + shift: self.baseline(styles).map(|l| -l.to_em(outer_text_size)), + size: self.size(styles).map(|t| t.0.to_em(outer_text_size)), + kind: ScriptKind::Sub, + })))) } } @@ -76,11 +80,17 @@ impl Show for Packed { /// ``` #[elem(title = "Superscript", Show)] pub struct SuperElem { - /// Whether to prefer the dedicated superscript characters of the font. + /// Whether to create artificial superscripts by shifting and scaling down + /// regular glyphs. /// - /// If this is enabled, Typst first tries to transform the text to - /// superscript codepoints. If that fails, it falls back to rendering - /// raised and shrunk normal letters. + /// Ideally, superscripts glyphs should be provided by the font (using the + /// `subs` OpenType feature). Otherwise, Typst is able to synthesize + /// superscripts as explained above. + /// + /// When this is set to `{false}`, synthesized glyphs will be used + /// regardless of whether the font provides dedicated superscript glyphs. + /// When `{true}`, synthesized glyphs may still be used in case the font + /// does not provide the necessary superscript glyphs. /// /// ```example /// N#super(typographic: true)[1] @@ -89,17 +99,19 @@ pub struct SuperElem { #[default(true)] pub typographic: bool, - /// The baseline shift for synthetic superscripts. Does not apply if - /// `typographic` is true and the font has superscript codepoints for the - /// given `body`. - #[default(Em::new(-0.5).into())] - pub baseline: Length, + /// The baseline shift for synthesized superscripts. + /// + /// This only applies to synthesized superscripts. In other words, this has + /// no effect if `typographic` is `{true}` and the font provides the + /// necessary superscript glyphs. + pub baseline: Smart, - /// The font size for synthetic superscripts. Does not apply if - /// `typographic` is true and the font has superscript codepoints for the - /// given `body`. - #[default(TextSize(Em::new(0.6).into()))] - pub size: TextSize, + /// The font size for synthesized superscripts. + /// + /// This only applies to synthesized superscripts. In other words, this has + /// no effect if `typographic` is `{true}` and the font provides the + /// necessary superscript glyphs. + pub size: Smart, /// The text to display in superscript. #[required] @@ -108,107 +120,55 @@ pub struct SuperElem { impl Show for Packed { #[typst_macros::time(name = "super", span = self.span())] - fn show(&self, engine: &mut Engine, styles: StyleChain) -> SourceResult { - let body = self.body.clone(); - - if self.typographic(styles) { - if let Some(text) = convert_script(&body, false) { - if is_shapable(engine, &text, styles) { - return Ok(TextElem::packed(text)); - } - } - }; - - Ok(body - .styled(TextElem::set_baseline(self.baseline(styles))) - .styled(TextElem::set_size(self.size(styles)))) + fn show(&self, _: &mut Engine, styles: StyleChain) -> SourceResult { + let outer_text_size = TextElem::size_in(styles); + Ok(self + .body + .clone() + .styled(TextElem::set_subperscript(Some(ScriptSettings { + typographic: self.typographic(styles), + shift: self.baseline(styles).map(|l| -l.to_em(outer_text_size)), + size: self.size(styles).map(|t| t.0.to_em(outer_text_size)), + kind: ScriptKind::Super, + })))) } } -/// Find and transform the text contained in `content` to the given script kind -/// if and only if it only consists of `Text`, `Space`, and `Empty` leaves. -fn convert_script(content: &Content, sub: bool) -> Option { - if content.is::() { - Some(' '.into()) - } else if let Some(elem) = content.to_packed::() { - if sub { - elem.text.chars().map(to_subscript_codepoint).collect() - } else { - elem.text.chars().map(to_superscript_codepoint).collect() - } - } else if let Some(sequence) = content.to_packed::() { - sequence - .children - .iter() - .map(|item| convert_script(item, sub)) - .collect() - } else { - None - } +#[derive(Debug, Copy, Clone, Eq, PartialEq, Hash)] +pub enum ScriptKind { + Sub, + Super, } -/// Checks whether the first retrievable family contains all code points of the -/// given string. -fn is_shapable(engine: &Engine, text: &str, styles: StyleChain) -> bool { - let world = engine.world; - for family in TextElem::font_in(styles) { - if let Some(font) = world - .book() - .select(family.as_str(), variant(styles)) - .and_then(|id| world.font(id)) - { - let covers = family.covers(); - return text.chars().all(|c| { - covers.is_none_or(|cov| cov.is_match(c.encode_utf8(&mut [0; 4]))) - && font.ttf().glyph_index(c).is_some() - }); +impl ScriptKind { + pub const fn default_metrics(self) -> ScriptMetrics { + match self { + Self::Sub => ScriptMetrics::default_subscript(), + Self::Super => ScriptMetrics::default_superscript(), } } - false -} + pub const fn read_metrics(self, font_metrics: &FontMetrics) -> ScriptMetrics { + match self { + Self::Sub => font_metrics.subscript, + Self::Super => font_metrics.superscript, + } + } -/// Convert a character to its corresponding Unicode superscript. -fn to_superscript_codepoint(c: char) -> Option { - match c { - '1' => Some('¹'), - '2' => Some('²'), - '3' => Some('³'), - '0' | '4'..='9' => char::from_u32(c as u32 - '0' as u32 + '⁰' as u32), - '+' => Some('⁺'), - '−' => Some('⁻'), - '=' => Some('⁼'), - '(' => Some('⁽'), - ')' => Some('⁾'), - 'n' => Some('ⁿ'), - 'i' => Some('ⁱ'), - ' ' => Some(' '), - _ => None, + /// The corresponding OpenType feature. + pub const fn feature(self) -> Tag { + match self { + Self::Sub => Tag::from_bytes(b"subs"), + Self::Super => Tag::from_bytes(b"sups"), + } } } -/// Convert a character to its corresponding Unicode subscript. -fn to_subscript_codepoint(c: char) -> Option { - match c { - '0'..='9' => char::from_u32(c as u32 - '0' as u32 + '₀' as u32), - '+' => Some('₊'), - '−' => Some('₋'), - '=' => Some('₌'), - '(' => Some('₍'), - ')' => Some('₎'), - 'a' => Some('ₐ'), - 'e' => Some('ₑ'), - 'o' => Some('ₒ'), - 'x' => Some('ₓ'), - 'h' => Some('ₕ'), - 'k' => Some('ₖ'), - 'l' => Some('ₗ'), - 'm' => Some('ₘ'), - 'n' => Some('ₙ'), - 'p' => Some('ₚ'), - 's' => Some('ₛ'), - 't' => Some('ₜ'), - ' ' => Some(' '), - _ => None, - } +#[derive(Debug, Copy, Clone, Eq, PartialEq, Hash)] +pub struct ScriptSettings { + /// Whether the OpenType feature should be used if possible. + pub typographic: bool, + pub shift: Smart, + pub size: Smart, + pub kind: ScriptKind, } From 3a08d63b4b9d43b0fd250104ac98df5f53f579b8 Mon Sep 17 00:00:00 2001 From: Malo <57839069+MDLC01@users.noreply.github.com> Date: Sat, 19 Apr 2025 17:57:47 +0200 Subject: [PATCH 2/3] Apply baseline shift and italic compensation to non-textual elements --- crates/typst-layout/src/inline/collect.rs | 4 +-- crates/typst-layout/src/inline/line.rs | 31 +++++++++++++++++++---- crates/typst-layout/src/inline/mod.rs | 2 +- 3 files changed, 29 insertions(+), 8 deletions(-) diff --git a/crates/typst-layout/src/inline/collect.rs b/crates/typst-layout/src/inline/collect.rs index 5a1b7b4fc..829f64b66 100644 --- a/crates/typst-layout/src/inline/collect.rs +++ b/crates/typst-layout/src/inline/collect.rs @@ -206,7 +206,7 @@ pub fn collect<'a>( } InlineItem::Frame(mut frame) => { frame.modify(&FrameModifiers::get_in(styles)); - apply_baseline_shift(&mut frame, styles); + apply_shift(&engine.world, &mut frame, styles); collector.push_item(Item::Frame(frame)); } } @@ -221,7 +221,7 @@ pub fn collect<'a>( let mut frame = layout_and_modify(styles, |styles| { layout_box(elem, engine, loc, styles, region) })?; - apply_baseline_shift(&mut frame, styles); + apply_shift(&engine.world, &mut frame, styles); collector.push_item(Item::Frame(frame)); } } else if let Some(elem) = child.to_packed::() { diff --git a/crates/typst-layout/src/inline/line.rs b/crates/typst-layout/src/inline/line.rs index 659d33f4a..3782f7034 100644 --- a/crates/typst-layout/src/inline/line.rs +++ b/crates/typst-layout/src/inline/line.rs @@ -5,7 +5,7 @@ use typst_library::engine::Engine; use typst_library::introspection::{SplitLocator, Tag}; use typst_library::layout::{Abs, Dir, Em, Fr, Frame, FrameItem, Point}; use typst_library::model::ParLineMarker; -use typst_library::text::{Lang, TextElem}; +use typst_library::text::{variant, Lang, TextElem}; use typst_utils::Numeric; use super::*; @@ -412,9 +412,30 @@ fn should_repeat_hyphen(pred_line: &Line, text: &str) -> bool { } } -/// Apply the current baseline shift to a frame. -pub fn apply_baseline_shift(frame: &mut Frame, styles: StyleChain) { - frame.translate(Point::with_y(TextElem::baseline_in(styles))); +/// Apply the current baseline shift and italic compensation to a frame. +pub fn apply_shift<'a>( + world: &Tracked<'a, dyn World + 'a>, + frame: &mut Frame, + styles: StyleChain, +) { + let mut baseline = TextElem::baseline_in(styles); + let mut compensation = Abs::zero(); + if let Some(scripts) = TextElem::subperscript_in(styles) { + let font_metrics = TextElem::font_in(styles) + .into_iter() + .find_map(|family| { + world + .book() + .select(family.as_str(), variant(styles)) + .and_then(|id| world.font(id)) + }) + .map_or(scripts.kind.default_metrics(), |f| { + scripts.kind.read_metrics(f.metrics()) + }); + baseline -= scripts.shift.unwrap_or(font_metrics.vertical_offset).resolve(styles); + compensation += font_metrics.horizontal_offset.resolve(styles); + } + frame.translate(Point::new(compensation, baseline)); } /// Commit to a line and build its frame. @@ -519,7 +540,7 @@ pub fn commit( let mut frame = layout_and_modify(*styles, |styles| { layout_box(elem, engine, loc.relayout(), styles, region) })?; - apply_baseline_shift(&mut frame, *styles); + apply_shift(&engine.world, &mut frame, *styles); push(&mut offset, frame); } else { offset += amount; diff --git a/crates/typst-layout/src/inline/mod.rs b/crates/typst-layout/src/inline/mod.rs index 5ef820d07..f5033b170 100644 --- a/crates/typst-layout/src/inline/mod.rs +++ b/crates/typst-layout/src/inline/mod.rs @@ -28,7 +28,7 @@ use typst_utils::{Numeric, SliceExt}; use self::collect::{collect, Item, Segment, SpanMapper}; use self::deco::decorate; use self::finalize::finalize; -use self::line::{apply_baseline_shift, commit, line, Line}; +use self::line::{apply_shift, commit, line, Line}; use self::linebreak::{linebreak, Breakpoint}; use self::prepare::{prepare, Preparation}; use self::shaping::{ From ce7636b5bd8bfa5aff2490a973ff925f984e3a22 Mon Sep 17 00:00:00 2001 From: Malo <57839069+MDLC01@users.noreply.github.com> Date: Sat, 19 Apr 2025 18:01:58 +0200 Subject: [PATCH 3/3] Update tests --- .../ref/issue-4454-footnote-ref-numbering.png | Bin 802 -> 815 bytes tests/ref/long-scripts.png | Bin 0 -> 956 bytes tests/ref/scripts-with-bundeled-fonts.png | Bin 0 -> 3110 bytes tests/ref/sub-super-italic-compensation.png | Bin 0 -> 1281 bytes tests/ref/sub-super-non-typographic.png | Bin 311 -> 318 bytes tests/ref/sub-super-typographic.png | Bin 0 -> 1337 bytes tests/ref/sub-super.png | Bin 1114 -> 1194 bytes tests/ref/super-1em.png | Bin 0 -> 265 bytes tests/ref/super-highlight.png | Bin 0 -> 6453 bytes tests/ref/super-underline.png | Bin 1833 -> 4006 bytes tests/suite/text/shift.typ | 71 ++++++++++++++++-- 11 files changed, 65 insertions(+), 6 deletions(-) create mode 100644 tests/ref/long-scripts.png create mode 100644 tests/ref/scripts-with-bundeled-fonts.png create mode 100644 tests/ref/sub-super-italic-compensation.png create mode 100644 tests/ref/sub-super-typographic.png create mode 100644 tests/ref/super-1em.png create mode 100644 tests/ref/super-highlight.png diff --git a/tests/ref/issue-4454-footnote-ref-numbering.png b/tests/ref/issue-4454-footnote-ref-numbering.png index a517d5fb4e7de6d801c62ab1052fc125c2165236..c561426f6a418593da16185e9395e5b0748c987f 100644 GIT binary patch delta 792 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 r3DkDbi%z&en541&oor!S_|^FnI3ghh0h>RUJe zkG%Kh)BnGJsb}#!%m0T{K#bErfP~-8|C;|UZ`*d`4UlvEz?>+^xYF7Ubyh`Ql zw5H(hoU)fd#+0r9|KBZMc`0|#lNm4e_5elN-@oblzxnY0{~xORo|P=5RROZ)GmJH5 q?%p%EM~lo+iycQT9<_LoSquPnI&V511!zqG0000O@VoBv1NYdiRV z_EqXx{Lb?K;S><#^ba86ck{pIzsuXU-FO4!9RKs{#Q(cbfvlR<{{yd5IaRMIxI3rp zC6F;?>;M0Ei&tLC-ScF|i@iNSk@oj*y8drI{Qv)l>b_?s3u%>)w|s`Nrp(=Y=JsgG jHEQvw#iJGvG8T&g%vEnNuDA|p00000NkvXXu0mjfgY2Q~ diff --git a/tests/ref/sub-super-typographic.png b/tests/ref/sub-super-typographic.png new file mode 100644 index 0000000000000000000000000000000000000000..a0c53d5002b540dadc26f36160e9aaf511a90d3b GIT binary patch literal 1337 zcmV-91;+Y`P)CJDl2m~roMa*mMdW2zl z3L4im^KOVs>Eomr6lq*|4`{QGp^q#Ps?gBTa8kHuAu}l4=_mzI9(VAhj}S3{+~z8< zdy+kUp+}@;M)g8fS_%p0zq`p(ZkBtfMWq_@SF`SOlDoP>LK?BR3NzZWJ)E$M+2)N za!{ux?7N@fIIZEkD@>NP^V9Hi9o%?hVe#}8VW-AvY=*YUdEvDmUv`FR0Q zT3FCVTx?5WaZx3;{xqbu(4&3&Y*oWN8QQHJQLDDUgGTjI7nkKS1UkYp%N0HndMGcd zK@ii(^KvZqy5^xn>o~`~7YsZ=u9}K@AwQGd=#*?`i-F;sk%NnQk&DCMZb6q~ON$)C z!p#fntgO1xt;DW+lp8vo!8w~eR7Vlz6`%`7Lza6TI^Hsecysf0we&A;j=6-Qai+HEdWWkD@@tUg7UnggU0GpX6V-Wzxt;W{ zrXatHrYBPxjDH};urX{58^gx1G5kLY-;Ga)6O!+IGApr=gDiL%=o|Xf&MIUdaM}q13?-S6WYS`xA_hC?&V6!Cv z-TtGK5$<1h2CV^_Kj{qF!c$uY?m(yWrVBAJTs3f19RlYRfTrKbn+!Zo=cp%7#hK6S z29SDw1uFlo^RGbQS{n&ZJsSLa6+ma8H5y@C7a!0S?p~Zd&i?PKh@f2nsx32Q&&Gb1 zIoKP(-9Zfb3pqcI)?NH8riW_D?Ma`ifxrzS9@siLIZDTAW#jh1|cwaYz0~7L;Rb2!sOdj0g3B}wj#)0X`V{;B-3rB&#xky>~5kp zoEZ_GP5Gs$uyU}u0$J)V2PHm~v{OatR1hRZhE;GUEb>w#1b-ofoLUPz0L75&ns7vT zCY6^W!|papGoMxP{J6G$LuJ>6TQw)N8k@PEYr_TxQySuv|grJRktLZIjr;oQv vB9X)>w?BDGu5VabghsCMvuF$(!+QA(zLpk~LW$FI00000NkvXXu0mjf&n|^o literal 0 HcmV?d00001 diff --git a/tests/ref/sub-super.png b/tests/ref/sub-super.png index 10fe77b07b5a1d65ec87de08f54bc8d13db6ee8d..803e128f88c0f18e61c0069fbd1e92e78e6c0aee 100644 GIT binary patch delta 1174 zcmV;H1Zn%)2&xH?B!6*9L_t(|+U?nCOcZAv$8i(;iY85(kiKXGQq(d~c-5v#L#Ux4 z6$vFaoJKifEGb8kmcxQ_$Qdb@p`aWU1qxUwu83GU3`bd^K$O^>5M_6{Tn-JCYY%4k z*P$_T%|5fceNofSH@mO?Px482=9xU3*@b_pT>>n?0{kC>^M8Yq$pr_J=SO0b`3lPC zfP)Stk#lh-&&|V<_&OBG0VgMcTv`H%Q8ajB4FNU*Ub*v3en-s#Q=W0R2kh%{lp zeOq}pK-XbYp>wP~)nFKmb5$rtXf-|`&KBV-(H7XcCU~}e`gZCIxB*V{n_*Pi{ebi` z6r(gkcZybj0@%uy4;u(8oI9T&@;)*uj)_s8xdo;G$bSoRLtp;X0mGYN4Hhlb&m6@P zR9r%I_d0xl{TKk3L<2Y;2}HK*eC35_5Y_#7dIQ$Ir3HdUI=)1JSZj+^k;)TY8?ZJ4 z_zXB10u<*Xymjs1D&B*}0sSf-cp@?G5m0rPg`+QY16MCLqEWm7{~UfD=*hYr(-&LV z64BR`pMN)wc;+RHobRuVv#V}Glaez3T>%n*>@4?Tsh!`m^pIsQRMml-Z{Qv1OI_2KL`cr7HHK0TL|i=;gi^?tA6Fs}Mc zVt+juP17n47DU#z?XdDp z^+e(f*x0Go2zb%`VHuzX{qFAFyE8f9Wse7!u_Rjs{Mi*B&2NJ-;N3a|eVBL7EVihqoT zf6AJ7Ye6Q9GR!YraDD2cdlS>!p@h{FhS>qHMD;bDkY5{vUp2${8hgA|TvCl#v)3qF z-(B6=rIX+UyTWmS>#kN^EI}bVwfsZa$FCIZY3W36j|F*d_JI>$mYy82xW1cQ1J8o; owr;)}dWE+z0xZA+{LlLfIb~IWbr1b@vj6}907*qoM6N<$g3akVF8}}l delta 1093 zcmV-L1iJgG3EBvdB!3}EL_t(|+U?nIOcQq;$8nP_S;7*NWn>TBbctp|h(6jDF(J6H zEQ)R#9HYZIgc&8{Z`t^xs4Y+^WKIF+?1Xm0Kq%VAlp>G;8Y!cIKw8F*m`W)W5JZGk zptR6_RuW^uw7)x=g>B~EY5L@Q$t%74^_RQcI{ZtmV__C%;eQthE{Mz^7j=X@-z_ay_4E5HgL0Wi3$pj9` z3Ez_yOn|Gl6sDxY(UYKVYMV8@`Z>5mlFh@iCScsm1a3mvY1}5j*a9?Ssb~#$AiL%{ zm^0@XJ2M9Y{(nqhpfVHvp>^h%hQsCQ#jxZ_uB?Q8=5J0vs7f$B_vdC^Myb$e*n!+ z*cK1$298Dpq5{M7`Cr@Trsua_LFr`8%x>G;J7MgHvsiE>*ks z*El+mHKC4kDjD~sfzoP^W*MeN`LJcY)ztpo28={Dw5s8c8y@w@JRon zegg6C;nDtufrl9Tv05u|1>5>ZX7%Qw`c=a+Kg*GOqryMk!U~_cqm))TUDYPmxqug< zFnMuR9W)RZSC|lseL8e~#&LAq#2D@f>LSD4AE}A(rC_Tk zdw+FX>X;uzf;+#R^zCsEFBH^>qNY87^#k+N5D7NuEz}?ZrY6U!zt~5Z|0Wz0DkaAW zAKk|J2UJgxOf3Vk>h5yg+KmylMmX#@dg>TMnA;D#5X3pMr z51UV1HS)#*9E`|!Bg8@fHZ+0$*Z0j=&~3~sREu}tp{ zMh+KfmaQHx5(!}lA;1zb4>cY3%ko^8@a(1VUb``8)o?}LRB#>A+`}?~X`j-3x2UE^ z=n9@qYFB<`=+b(4U%kJVysEWQ&AB?R&fTguf6d32pKu+0AYb#p)8qW5O4*&u1wMRW zQvkWQHD!oG!JVHRfLf1tks?=69MA@eAY00000 LNkvXXu0mjf@!%l+ diff --git a/tests/ref/super-1em.png b/tests/ref/super-1em.png new file mode 100644 index 0000000000000000000000000000000000000000..da222a29457ae9cb648dea2d55cec27f9f37b25e GIT binary patch literal 265 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 P00000NkvXXu0mjfRCkpS literal 0 HcmV?d00001 diff --git a/tests/ref/super-underline.png b/tests/ref/super-underline.png index 4608d1a8308c5729a6b0b10905ebe2683019e2fc..8564d720572d1e2e0f763355fab8859ab73f4dca 100644 GIT binary patch literal 4006 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 M07*qoM6N<$f-^gF-v9sr delta 1831 zcmV+?2iW+gAE^$I7k^I(000001#n&)000K?NklV`b=Pk8 z)K;tYOX{j!553jd;@1@rOK?(j%CIw{50V z<$DWRXSTO-6n}P!5Z>dG@;LgKgZ02Xxu}`a^eD4cb|$}dW4=$c9q@bo7b1t3UvpJJ z|5^%rC91w0{!G<2L_Mk|7XKh>SAl&dAd)2Y>`P|*cfg1>(z23um(0?8Sn%udupR=h;^#h-;>;VJ} zEUWsct<~h7`$&sR3xdhPGC!zx;p;u-Sv^CY(D|osojx?BAb4ml6`S$B%3SVl;(2wO z$lI;)v@X}B5}6Au=5qAVtghjXm;4|19c?q(@Dj8_1wpg;3&9n)eXX#&~vTxt%r_+@hir}gqAVh zrbiBf6=#+dm+Yh^DX?vK&cO^Ma--;*ir14&cYhQ~){!%Dvm6BHoMvY+3kWW_Jt&f} zuJWos{#Ow&ysFMUJ35cm4uVCw_!T3d<*z=7i-D95n2bgrr_M=ja3CUpPINOZT4F(9Es=)xyRH*w)d*gwEXhI#lEtLGup}Z?jHY+=lJHF5-_Ey+QLa8Q z7Kw`MNjFJP=necPB=cH;23d#vyCw0de1Cr%Wy)+!sgW(f!t)UZniMLylvdv=YTTb~ z2fRd+a?<*-*83t1ts_MzQS~K`d_eg>@C~=VrYZMDhA!AT3NLC*KVgmLeKKVCnt*xc zE4y)S-;s6Uc=H@SmKj&rxg@Gqsq;Ia#0!w9xF~<~`%6Nk2W`OfB~g^RNZ_LoSkr>&~#QaIYt-CzxIN_!X^VG*}m-Pb4Ub5aDds??Cg#{6= zmBOPnt4kAI+89sj+IdvizBS$FY=7dZugrj#^pKf&Z<(RXGc2!ZQ%cQ;1uyY{6doU~ z{3pL$M#E^PnOpsfgpDSCq+W}oVEvNor0_#Mc&)`zFnfz>VM6N|Z=<7@M9CSa;tC0d z3~8sNCZd`owJ}2TY)L%ID1f~91rCC59l@h`@GU~hvituj?tQ;0#~;5d2!Ft3XnUbT z&I$*?`>u>FiAsSKaS_K(jW3BiPD**p-y0mZB#s=#N6i9C2AwrxHKLoPKJ2^1Vsvj? zv24#^O|!-92-x5f>K$0Hup}_~OT^yc$1r<_@7jxdxcTsB@w(=X5$;l@%+Uu#Tr@qG ztAEYGk!gVk?rTP7J`z7QY=41a#v8^qtCfj$6au$3_P`l?&+|g{zw4Dc^IiY_JvOz! zS3Vm1OM9tYjcR z4OaDQH*_WxkW>sTYn3)(xSS1TskOk?OK1DAUcPLhMb&6g-Osr26o0-Dd&+KjYz%$5 zK6lXF>Q)ocbEt3>W_JqVCSYz_sT)BfUYag1gZvq+s$0pS+N>ahH!HOP9#tRcbF^eC zrwE@t!A