Merge remote-tracking branch 'upstream/main' into font-system-builder

Author: vbfox

CHANGELOG.md

@@ -5,6 +5,74 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [0.14.2] - 2025-04-14
+
+### Fixed
+
+- Ensure MSRV of 1.75.0
+
+## [0.14.1] - 2025-04-04
+
+### Added
+
+- Allow font to be stored as `peniko::Font` with `peniko` feature
+
+## [0.14.0] - 2025-03-31
+
+### Added
+
+- Add configurable font fallback lists using `Fallback` trait
+- Add letter spacing support in `Attrs`
+- Add arbitrary variable font features in `Attrs`
+
+## [0.13.2] - 2025-03-11
+
+### Fixed
+
+- Fix build for Android targets
+
+## [0.13.1] - 2025-03-10
+
+### Fixed
+
+- Fix glyph start+end indices in `Basic` shaping
+
+## [0.13.0] - 2025-03-10
+
+### Added
+
+- Add `Buffer::set_tab_width` function
+- Add `AttrsList::spans_iter` and use it in `Buffer::append`
+- Add alignment option to `Buffer::set_rich_text`
+- Add `SwashCache::get_outline_commands_uncached`
+
+### Fixed
+
+- Fix typo in fallback font name `Noto Sans CJK JP`
+- Fix the character index used for getting a glyph attribute in basic shaping
+- Avoid debug assertion when handling `Motion::BufferEnd`
+- Handle single wrapped line scrolling
+- Reduce memory usage and loading time of FontSystem
+- Resolve lints
+- Use FreeMono as Braille script fallback
+- Load fonts prior to setting defaults
+
+### Changed
+
+- Use `smol_str` for family name in `FamilyOwned`
+- Optimize `Buffer::set_rich_text` for when the buffer is reconstructed
+- Move `ShapeBuffer` to `FontSystem`
+- Cache the monospace fallbacks buffer in `FontSystem`
+- Apply fallback font to more Unix-like operating systems
+- Use hinting for `swash_outline_commands`
+- Update swash to `0.2.0` and hook up `std` feature
+- Update minimum supported Rust version to `1.75`
+- Update default fonts (for COSMIC, users should set their own as desired)
+
+### Removed
+
+- Drop `ShapePlanCache`
+
 ## [0.12.1] - 2024-06-31
 
 ### Changed

Cargo.toml

@@ -1,18 +1,18 @@
 [package]
 name = "cosmic-text"
 description = "Pure Rust multi-line text handling"
-version = "0.12.1"
+version = "0.14.2"
 authors = ["Jeremy Soller <jeremy@system76.com>"]
 edition = "2021"
 license = "MIT OR Apache-2.0"
 documentation = "https://docs.rs/cosmic-text/latest/cosmic_text/"
 repository = "https://github.com/pop-os/cosmic-text"
-rust-version = "1.65"
+rust-version = "1.75"
 
 [dependencies]
 bitflags = "2.4.1"
 cosmic_undo_2 = { version = "0.2.0", optional = true }
-fontdb = { version = "0.16", default-features = false }
+fontdb = { version = "0.23", default-features = false }
 hashbrown = { version = "0.14.1", optional = true, default-features = false }
 libm = { version = "0.2.8", optional = true }
 log = "0.4.20"
@@ -22,34 +22,43 @@ rustc-hash = { version = "1.1.0", default-features = false }
 rustybuzz = { version = "0.14", default-features = false, features = ["libm"] }
 self_cell = "1.0.1"
 smol_str = { version = "0.2.2", default-features = false }
-swash = { version = "0.1.17", optional = true }
 syntect = { version = "5.1.0", optional = true }
 sys-locale = { version = "0.3.1", optional = true }
 ttf-parser = { version = "0.21", default-features = false }
 unicode-linebreak = "0.1.5"
 unicode-script = "0.5.5"
 unicode-segmentation = "1.10.1"
-rayon = { version = "1", optional = true }
+
+[dependencies.swash]
+version = "0.2.0"
+default-features = false
+features = ["render", "scale"]
+optional = true
 
 [dependencies.unicode-bidi]
 version = "0.3.13"
 default-features = false
 features = ["hardcoded-data"]
 
+[dependencies.peniko]
+version = "0.3.1"
+optional = true
+
 [features]
 default = ["std", "swash", "fontconfig"]
 fontconfig = ["fontdb/fontconfig", "std"]
 monospace_fallback = []
 no_std = ["rustybuzz/libm", "hashbrown", "dep:libm"]
+peniko = ["dep:peniko"]
 shape-run-cache = []
 std = [
     "fontdb/memmap",
     "fontdb/std",
     "rustybuzz/std",
+    "swash?/std",
     "sys-locale",
     "ttf-parser/std",
     "unicode-bidi/std",
-    "rayon"
 ]
 vi = ["modit", "syntect", "cosmic_undo_2"]
 wasm-web = ["sys-locale?/js"]

benches/layout.rs

@@ -26,7 +26,7 @@ fn layout(c: &mut Criterion) {
 
             let mut run_on_text = |text: &str| {
                 buffer.lines.clear();
-                buffer.set_text(&mut fs, text, ct::Attrs::new(), *shape);
+                buffer.set_text(&mut fs, text, &ct::Attrs::new(), *shape);
                 buffer.shape_until_scroll(&mut fs, false);
             };