Harfrust for Text Shaping

Cargo.toml

@@ -23,6 +23,7 @@ repository = "https://github.com/linebender/parley"
 accesskit = "0.21.0"
 bytemuck = { version = "1.23.0", default-features = false }
 fontique = { version = "0.5.0", default-features = false, path = "fontique" }
+harfrust = "0.1.1"
 hashbrown = "0.15.3"
 parley = { version = "0.5.0", default-features = false, path = "parley" }
 peniko = { version = "0.4.0", default-features = false }

README.md

@@ -17,7 +17,7 @@ It is backed by [Swash](https://github.com/dfrg/swash).
 
 ## The Parley text stack
 
-Currently, Parley directly depends on four crates: Fontique, Swash, Skrifa, and Peniko.
+Currently, Parley directly depends on five crates: Fontique, Harfrust, Swash, Skrifa, and Peniko.
 These crates cover different pieces of the text-rendering process.
 
 ### Peniko
@@ -39,6 +39,11 @@ This is necessary because fonts typically don't cover the entire Unicode range:
 But if you have, say arabic text or emoji embedded within latin text, you don't typically specify the font for the arabic text or the emoji, one is chosen for you.
 Font fallback is the process which makes that choice.
 
+### Harfrust
+
+Harfrust is a Rust port of HarfBuzz text shaping engine. **Text shaping** means mapping runs of Unicode codepoints to specific glyphs within fonts.
+This includes applying ligatures, resolving emoji modifiers, but also much more complex transformations for some scripts.
+
 ### Skrifa
 
 Skrifa reads TrueType and OpenType fonts.
@@ -50,15 +55,7 @@ Notably it converts the raw glyph representations in font files into scaled, hin
 
 ### Swash
 
-Swash implements text shaping and [some miscellaneous Unicode-related features](https://github.com/dfrg/swash#text-analysis).
-
-**Text shaping** means mapping runs of Unicode codepoints to specific glyphs within fonts.
-This includes applying ligatures, resolving emoji modifiers, but also much more complex transformations for some scripts.
-
-Swash's implementation is faster but less complete and tested than Harfbuzz and Rustybuzz.
-
-Swash also implements font parsing, scaling, and hinting.
-This part of Swash is now superseded by Skrifa: the implementation in Skrifa is directly descended from the one in Swash.
+Within the context of Parley, Swash implements [some miscellaneous Unicode-related features](https://github.com/dfrg/swash#text-analysis).
 
 ### Parley
 
@@ -106,6 +103,7 @@ at your option.
 
 Some files used for tests are under different licenses:
 
+- The font file `Arimo-VariableFont_wght.ttf` in `/parley/tests/assets/arimo_fonts/` is licensed solely as documented in that folder (and is licensed under the Apache License, Version 2.0).
 - The font file `Roboto-Regular.ttf` in `/parley/tests/assets/roboto_fonts/` is licensed solely as documented in that folder (and is licensed under the Apache License, Version 2.0).
 - The font file `NotoKufiArabic-Regular.otf` in `/parley/tests/assets/noto_fonts/` is licensed solely as documented in that folder (and is licensed under the SIL Open Font License, Version 1.1).
 

examples/swash_render/src/main.rs

@@ -322,7 +322,7 @@ fn render_glyph(
     // Apply the fractional offset
     .offset(offset)
     // Render the image
-    .render(scaler, glyph.id)
+    .render(scaler, glyph.id as u16)
     .unwrap();
 
     let glyph_width = rendered_glyph.placement.width;

examples/vello_editor/src/text.rs

@@ -408,7 +408,7 @@ impl Editor {
                             let gy = y - glyph.y;
                             x += glyph.advance;
                             vello::Glyph {
-                                id: glyph.id as _,
+                                id: glyph.id,
                                 x: gx,
                                 y: gy,
                             }

fontique/src/font.rs

@@ -319,7 +319,7 @@ pub struct AxisInfo {
 /// as well as [`QueryFont::synthesis`].
 ///
 /// [`QueryFont::synthesis`]: crate::QueryFont::synthesis
-#[derive(Copy, Clone, Default)]
+#[derive(Copy, Clone, Default, PartialEq)]
 pub struct Synthesis {
     vars: [(Tag, f32); 3],
     len: u8,

parley/Cargo.toml

@@ -32,6 +32,7 @@ fontique = { workspace = true }
 core_maths = { version = "0.1.1", optional = true }
 accesskit = { workspace = true, optional = true }
 hashbrown = { workspace = true }
+harfrust = { workspace = true }
 
 [dev-dependencies]
 tiny-skia = "0.11.4"

parley/src/context.rs

@@ -13,11 +13,11 @@ use super::builder::RangedBuilder;
 use super::resolve::{RangedStyle, RangedStyleBuilder, ResolveContext, ResolvedStyle, tree};
 use super::style::{Brush, TextStyle};
 
-use swash::shape::ShapeContext;
 use swash::text::cluster::CharInfo;
 
 use crate::builder::TreeBuilder;
 use crate::inline_box::InlineBox;
+use crate::shape::ShapeContext;
 
 /// Shared scratch space used when constructing text layouts.
 ///

parley/src/layout/cluster.rs

@@ -1,9 +1,7 @@
 // Copyright 2021 the Parley Authors
 // SPDX-License-Identifier: Apache-2.0 OR MIT
 
-use super::{
-    BreakReason, Brush, Cluster, ClusterInfo, Glyph, Layout, Line, LineItem, Range, Run, Style,
-};
+use super::{BreakReason, Brush, Cluster, Glyph, Layout, Line, LineItem, Range, Run, Style, data};
 use swash::text::cluster::Whitespace;
 
 /// Defines the visual side of the cluster for hit testing.
@@ -390,8 +388,8 @@ impl<'a, B: Brush> Cluster<'a, B> {
         Some(offset)
     }
 
-    pub(crate) fn info(&self) -> ClusterInfo {
-        self.data.info
+    pub(crate) fn info(&self) -> &data::ClusterInfo {
+        &self.data.info
     }
 }