chore(deps): bump the fonts group across 1 directory with 2 updates

Bumps the fonts group with 2 updates in the / directory: [skrifa](https://github.com/googlefonts/fontations) and [harfrust](https://github.com/harfbuzz/harfrust).


Updates `skrifa` from 0.47.0 to 0.49.0
- [Release notes](https://github.com/googlefonts/fontations/releases)
- [Changelog](https://github.com/googlefonts/fontations/blob/main/docs/RELEASE.md)
- [Commits](https://github.com/googlefonts/fontations/compare/skrifa-v0.47.0...skrifa-v0.49.0)

Updates `harfrust` from 0.13.3 to 0.15.0
- [Release notes](https://github.com/harfbuzz/harfrust/releases)
- [Changelog](https://github.com/harfbuzz/harfrust/blob/main/CHANGELOG.md)
- [Commits](https://github.com/harfbuzz/harfrust/compare/0.13.3...0.15.0)

---
updated-dependencies:
- dependency-name: harfrust
  dependency-version: 0.15.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: fonts
- dependency-name: skrifa
  dependency-version: 0.49.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: fonts
...

Signed-off-by: dependabot[bot] <support@github.com>

Cargo.lock

@@ -1672,7 +1672,7 @@ dependencies = [
  "ecolor",
  "emath",
  "epaint_default_fonts",
- "font-types 0.12.6",
+ "font-types 0.12.7",
  "harfrust 0.12.0",
  "log",
  "nohash-hasher",
@@ -1898,9 +1898,9 @@ dependencies = [
 
 [[package]]
 name = "font-types"
-version = "0.12.6"
+version = "0.12.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6c92d9081c7ab3bd83ef1eecdfad090f3d966e3ce74106779664114cfe1a6274"
+checksum = "835ae9d781464a79026cde387f9cbc650c9a4909d7cf7e658b127e3c35d2f35d"
 dependencies = [
  "bytemuck",
 ]
@@ -2297,15 +2297,15 @@ dependencies = [
 
 [[package]]
 name = "harfrust"
-version = "0.13.3"
+version = "0.15.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "948d0741125ba89cd3e1c23e5642415b6ade7e1d29d67ba25fb925b533e989d6"
+checksum = "865dcc4105d51c323d8fedbb2d75b5e9c8ecddf5613f74c82f851d0afbc97114"
 dependencies = [
  "bitflags 2.13.2",
  "bytemuck",
- "once_cell",
- "read-fonts 0.43.3",
+ "read-fonts 0.46.0",
  "smallvec",
+ "yoke",
 ]
 
 [[package]]
@@ -4335,18 +4335,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "046a7d674daf459825b32f5062056d6882db0d2f5a479fbd76ccfc870ac18709"
 dependencies = [
  "bytemuck",
- "font-types 0.12.6",
- "once_cell",
-]
-
-[[package]]
-name = "read-fonts"
-version = "0.43.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "005c8acf251756c478b0bf402885bfd88a1476020c4c7e6060edc1aa68da38ea"
-dependencies = [
- "bytemuck",
- "font-types 0.12.6",
+ "font-types 0.12.7",
  "once_cell",
 ]
 
@@ -4357,10 +4346,24 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d5a0cf4bb6cbce4c29756270d189a5e400ac05e91192161d83a0bcb6e68492e8"
 dependencies = [
  "bytemuck",
- "font-types 0.12.6",
+ "font-types 0.12.7",
  "once_cell",
 ]
 
+[[package]]
+name = "read-fonts"
+version = "0.46.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bdaa4fffe9ff3ca2c353fa9729792805b9b3e324695ff5a081f860612e81b330"
+dependencies = [
+ "bytemuck",
+ "foldhash 0.2.0",
+ "font-types 0.12.7",
+ "once_cell",
+ "smallvec",
+ "yoke",
+]
+
 [[package]]
 name = "redox_syscall"
 version = "0.4.1"
@@ -5124,6 +5127,19 @@ dependencies = [
  "read-fonts 0.44.0",
 ]
 
+[[package]]
+name = "skrifa"
+version = "0.49.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a7459fb60888ad9a5f367dd293fa2fb9df142cb451aa6bfd6cd66a7d6a9b739d"
+dependencies = [
+ "bytemuck",
+ "once_cell",
+ "read-fonts 0.46.0",
+ "smallvec",
+ "yoke",
+]
+
 [[package]]
 name = "slab"
 version = "0.4.12"
@@ -6956,10 +6972,10 @@ name = "wordcraft-fonts"
 version = "0.15.1"
 dependencies = [
  "brotli-decompressor",
- "harfrust 0.13.3",
+ "harfrust 0.15.0",
  "kurbo",
  "log",
- "skrifa 0.47.0",
+ "skrifa 0.49.0",
  "unicode-bidi",
  "unicode-script",
  "wuff",

Cargo.toml

@@ -56,8 +56,8 @@ regex = { version = "1", default-features = false, features = ["std", "unicode",
 regex-automata = { version = "0.4", default-features = false, features = ["std", "syntax", "meta", "nfa-pikevm", "unicode"] }
 
 # text / rendering / formats
-skrifa = "0.47"
-harfrust = "0.13"
+skrifa = "0.49"
+harfrust = "0.15"
 # WOFF / WOFF2 web fonts added by the user (#582): pure Rust (MIT); its brotli and zlib decoders
 # (brotli-decompressor, flate2) are already in the tree.
 wuff = "0.2.9"

crates/formats/src/markdown/inlines.rs

@@ -276,9 +276,6 @@ fn tokenize(s: &str, base: &Fmt, depth: usize, refs: &Refs) -> Vec<Node> {
     // text. A scan pays for what it reads; earlier bracket matches are looked up in `known`.
     let ticks = Backticks::new(s);
     let mut links = LinkScan { text: s, refs, ticks: &ticks, known: HashMap::new(), budget: s.len().saturating_mul(8).saturating_add(8192) };
-    // Where the last comment end is: a comment opener after it has none to find, so a run of
-    // unclosed `<!--` doesn't search the rest of the text once each.
-    let last_comment_end = s.rfind("-->");
     let b = s.as_bytes();
     let mut i = 0usize;
     let mut text_start = 0usize;
@@ -369,7 +366,7 @@ fn tokenize(s: &str, base: &Fmt, depth: usize, refs: &Refs) -> Vec<Node> {
                 }
             }
             b'<' => {
-                if let Some((end, parsed)) = angle_inlines(s, i, base, last_comment_end) {
+                if let Some((end, parsed)) = angle_inlines(s, i, base) {
                     flush!();
                     nodes.extend(parsed);
                     i = end;
@@ -397,9 +394,8 @@ fn tokenize(s: &str, base: &Fmt, depth: usize, refs: &Refs) -> Vec<Node> {
     nodes
 }
 
-fn angle_inlines(s: &str, start: usize, base: &Fmt, last_comment_end: Option<usize>) -> Option<(usize, Vec<Node>)> {
-    let closable = last_comment_end.is_some_and(|e| e >= start + 4);
-    if let Some(pos) = s.get(start..).and_then(|rest| rest.strip_prefix("<!--")).filter(|_| closable).and_then(|rest| rest.find("-->")) {
+fn angle_inlines(s: &str, start: usize, base: &Fmt) -> Option<(usize, Vec<Node>)> {
+    if let Some(pos) = s.get(start..).and_then(|rest| rest.strip_prefix("<!--")).and_then(|rest| rest.find("-->")) {
         return Some((start + 4 + pos + 3, Vec::new()));
     }
     let rest = s.get(start + 1..).unwrap_or("");

crates/formats/src/markdown/tests.rs

@@ -797,16 +797,3 @@ fn heading_trailing_hash_survives_round_trip() {
         assert_eq!(export(&import(&md)), want, "second export of {src:?}");
     }
 }
-
-#[test]
-fn unclosed_inline_comments_are_text_without_a_search_each() {
-    // #3714-style: each unclosed `<!--` searched the rest of the paragraph for `-->`.
-    let src = "<!--".repeat(200_000);
-    let t = std::time::Instant::now();
-    let text: String = inl(&src).into_iter().filter_map(|i| if let Inline::Text(t, _) = i { Some(t) } else { None }).collect();
-    assert_eq!(text, src);
-    assert!(t.elapsed() < std::time::Duration::from_secs(10), "{:?}", t.elapsed());
-    // A comment that does close still goes, after an unclosed one too.
-    let text: String = inl("a <!-- b --> c <!-- d").into_iter().filter_map(|i| if let Inline::Text(t, _) = i { Some(t) } else { None }).collect();
-    assert_eq!(text, "a  c <!-- d");
-}

crates/ui-egui/src/backstage.rs

@@ -92,7 +92,6 @@ pub fn show(app: &mut WordApp, ui: &mut Ui) {
                 if drag.drag_started() {
                     ui.ctx().send_viewport_cmd(egui::ViewportCommand::StartDrag);
                 }
-                crate::chrome::note_title_drag(ui.ctx(), band);
                 // The chevron's stroke starts at the content edge.
                 let c = if rtl {
                     pos2(band.max.x - 26.0, band.center().y)

crates/ui-egui/src/chrome.rs

@@ -281,24 +281,6 @@ fn autosave_knob_x(rtl: bool, on: bool, r: Rect) -> f32 {
     crate::rtl::lead_x(rtl != on, r, 8.0)
 }
 
-/// The `ctx.data` key for the part of the title bar that drags this document window.
-fn title_drag_id(ctx: &egui::Context) -> egui::Id {
-    egui::Id::unique(("title_drag_rect", ctx.viewport_id()))
-}
-
-/// Notes `rect` as the part of the title bar that drags the window in this frame: behind a modal
-/// dialog its backdrop has the pointer there, and moves the window instead ([`title_drag_rect`]).
-pub(crate) fn note_title_drag(ctx: &egui::Context, rect: Rect) {
-    let (key, pass) = (title_drag_id(ctx), ctx.cumulative_pass_nr());
-    ctx.data_mut(|d| d.insert_temp(key, (rect, pass)));
-}
-
-/// The part of the title bar that drags the window, if it was drawn in this frame.
-pub(crate) fn title_drag_rect(ctx: &egui::Context) -> Option<Rect> {
-    let (key, pass) = (title_drag_id(ctx), ctx.cumulative_pass_nr());
-    ctx.data(|d| d.get_temp::<(Rect, u64)>(key)).filter(|(_, p)| *p == pass).map(|(r, _)| r)
-}
-
 /// Draws the title bar with window dragging, AutoSave, quick access, account, community and search
 /// controls, and the centred clickable document title.
 pub fn title_bar(app: &mut WordApp, ui: &mut Ui) {
@@ -319,10 +301,6 @@ pub fn title_bar(app: &mut WordApp, ui: &mut Ui) {
             if drag.drag_started() {
                 ui.ctx().send_viewport_cmd(egui::ViewportCommand::StartDrag);
             }
-            // Elsewhere the system's own title bar above this one moves the window.
-            if mac {
-                note_title_drag(ui.ctx(), full);
-            }
             if drag.double_clicked() {
                 let max = ui.ctx().input(|i| i.viewport().maximized.unwrap_or(false));
                 ui.ctx().send_viewport_cmd(egui::ViewportCommand::Maximized(!max));

crates/ui-egui/src/colors.rs

@@ -455,7 +455,6 @@ pub fn show(app: &mut WordApp, ctx: &egui::Context) {
     let resp = egui::Modal::new(Id::unique("wordcraft.colorsDialog")).show(ctx, |ui| body(ui, &mut d));
     // egui's Modal blocks the window behind it, but not the document's keyboard.
     crate::dialogs::release_keyboard(app, ctx);
-    crate::dialogs::drag_by_title_bar(ctx, &resp.backdrop_response, resp.response.rect);
     let mut done = resp.inner;
     if done.is_none() && resp.should_close() {
         done = Some(false);

crates/ui-egui/src/dialogs.rs

@@ -34,9 +34,7 @@ use bookmarks::bookmark_at_caret;
 #[cfg(test)]
 use bookmarks::bookmark_names;
 pub use chrome::show;
-pub(crate) use chrome::{
-    block_behind, buttons, cancel_key_pressed, color_menu, drag_by_title_bar, forget_nudge, ok_cancel_responses, release_keyboard,
-};
+pub(crate) use chrome::{block_behind, buttons, cancel_key_pressed, color_menu, forget_nudge, ok_cancel_responses, release_keyboard};
 pub(crate) use dispatch::search_results;
 pub(crate) use find::swallow_shortcut_text;
 pub use find::{FindExtra, FindTab, GoToWhat};

crates/ui-egui/src/dialogs/chrome.rs

@@ -67,16 +67,6 @@ fn count_dialog_frame(ctx: &egui::Context, id: egui::Id) {
     }
 }
 
-/// Behind a modal window, whose `backdrop` has the pointer, the app still moves by its title bar,
-/// as in Word for Mac (#5124); not from just inside the window's edge, where it reaches over the
-/// title bar.
-pub(crate) fn drag_by_title_bar(ctx: &egui::Context, backdrop: &egui::Response, window: egui::Rect) {
-    let origin = ctx.input(|i| i.pointer.press_origin()).filter(|p| !window.contains(*p));
-    if backdrop.drag_started() && origin.is_some_and(|p| crate::chrome::title_drag_rect(ctx).is_some_and(|r| r.contains(p))) {
-        ctx.send_viewport_cmd(egui::ViewportCommand::StartDrag);
-    }
-}
-
 /// Makes `window` modal (#3859): the document gives up the keyboard now, and from the next frame
 /// nothing beneath the window takes the pointer or Tab. A press beside it nudges it ([`nudge`]).
 pub(crate) fn block_behind(app: &WordApp, ctx: &egui::Context, window: &egui::Response) {
@@ -91,7 +81,6 @@ pub(crate) fn block_behind(app: &WordApp, ctx: &egui::Context, window: &egui::Re
         .inner;
     // The backdrop also has the pointer just inside the window's edge (egui's hit radius).
     let beside = ctx.input(|i| i.pointer.any_pressed() && i.pointer.press_origin().is_some_and(|p| !window.rect.contains(p)));
-    drag_by_title_bar(ctx, &backdrop, window.rect);
     ctx.move_to_top(layer);
     ctx.memory_mut(|m| m.set_modal_layer(layer));
     ctx.accesskit_node_builder(window.id, |node| node.set_modal());

crates/ui-egui/src/dialogs/tests.rs

@@ -2078,116 +2078,6 @@ fn the_page_waits_for_the_keyboard_until_a_modal_dialog_closes() {
     assert_eq!(h.state().session.doc.plain_text(wordcraft_doc::StoryRef::Body), "!", "the page has it after the dialog");
 }
 
-/// Drags from `at` to 30 points right in `h`, and counts the window drags the app asked for.
-fn window_drags(h: &mut egui_kittest::Harness<WordApp>, at: egui::Pos2) -> usize {
-    let mut drags = 0;
-    let button = |pos, pressed| egui::Event::PointerButton { pos, button: egui::PointerButton::Primary, pressed, modifiers: egui::Modifiers::NONE };
-    let events = [egui::Event::PointerMoved(at), button(at, true)]
-        .into_iter()
-        .chain([10.0, 20.0, 30.0].map(|dx| egui::Event::PointerMoved(at + vec2(dx, 0.0))))
-        .chain([button(at + vec2(30.0, 0.0), false)]);
-    for e in events {
-        h.event(e);
-        h.step();
-        drags += h.output().viewport_output.values().flat_map(|v| &v.commands).filter(|c| matches!(c, egui::ViewportCommand::StartDrag)).count();
-    }
-    drags
-}
-
-/// #5124: behind a modal dialog the window still moves by its title bar, as in Word for Mac, where
-/// WordCraft draws it, or by the top of File's side menu, which covers it there; elsewhere the
-/// system's title bar does, and WordCraft's bar under it doesn't.
-#[test]
-fn the_window_moves_by_its_title_bar_behind_a_modal_dialog() {
-    for (mac, backstage) in [(true, false), (true, true), (false, false), (false, true)] {
-        let mut a = WordApp::new(Session::new(wordcraft_doc::Document::new()), crate::Services::default());
-        a.integrated_titlebar = mac;
-        a.ui.backstage = backstage;
-        let mut h = app_harness(a);
-        h.run_steps(6);
-        let font = Dialog::open("font", h.state_mut());
-        h.state_mut().dialog = font;
-        h.run_steps(4);
-        let at = egui::pos2(if backstage { 100.0 } else { 300.0 }, 12.0);
-        assert_eq!(window_drags(&mut h, at), usize::from(mac), "macOS: {mac}, File: {backstage}");
-        assert!(matches!(h.state().dialog, Some(Dialog::Font { .. })), "Font stays");
-        assert_eq!(h.state().ui.backstage, backstage, "nothing behind it opened or closed");
-    }
-}
-
-/// Opens a modal state in `a`: the built-in file browser, a dialog by name, or Colors.
-fn open_modal_state(a: &mut WordApp, state: &str) {
-    match state {
-        "none" => {}
-        "fileBrowser" => {
-            let document = a.session.document_id();
-            a.show_file_browser(
-                crate::file_dialogs::FileDialogRequest::Open { purpose: "document".into() },
-                crate::file_dialogs::AfterPick::OpenDocument { document },
-                false,
-            );
-        }
-        "colors" => a.colors = Some(crate::colors::ColorsDialog::new(None, crate::colors::Target::cmd("format.color"))),
-        dialog => a.dialog = Dialog::open(dialog, a),
-    }
-}
-
-/// The file browser, a modal dialog and Colors each block the window; nothing open or a modeless
-/// dialog doesn't.
-#[test]
-fn modal_open_is_true_for_the_file_browser_a_modal_dialog_and_colors() {
-    for (state, modal) in [("none", false), ("find", false), ("font", true), ("fileBrowser", true), ("colors", true)] {
-        let mut a = WordApp::new(Session::new(wordcraft_doc::Document::new()), crate::Services::default());
-        open_modal_state(&mut a, state);
-        assert_eq!(a.modal_open(), modal, "{state}");
-    }
-}
-
-/// #5124: whatever is open, a drag on the title bar macOS draws moves the window; where the system
-/// draws it, WordCraft's bar under it only does while nothing blocks it.
-#[test]
-fn the_title_bar_moves_the_window_in_every_modal_state() {
-    for (state, modal) in [("none", false), ("find", false), ("font", true), ("fileBrowser", true), ("colors", true)] {
-        for mac in [true, false] {
-            let mut a = WordApp::new(Session::new(wordcraft_doc::Document::new()), crate::Services::default());
-            a.integrated_titlebar = mac;
-            let mut h = app_harness(a);
-            h.run_steps(6);
-            open_modal_state(h.state_mut(), state);
-            h.run_steps(4);
-            assert_eq!(h.state().modal_open(), modal, "{state}");
-            assert_eq!(window_drags(&mut h, egui::pos2(300.0, 12.0)), usize::from(mac || !modal), "{state}, macOS: {mac}");
-            assert_eq!(h.state().modal_open(), modal, "{state} stays open");
-        }
-    }
-}
-
-/// #5124: where a dialog reaches over the title bar (a short window), a drag on the dialog is the
-/// dialog's own and doesn't move the window.
-#[test]
-fn a_drag_on_a_dialog_over_the_title_bar_doesnt_move_the_window() {
-    let mut a = WordApp::new(Session::new(wordcraft_doc::Document::new()), crate::Services::default());
-    a.integrated_titlebar = true;
-    let mut h = egui_kittest::Harness::builder().with_size(egui::vec2(1440.0, 420.0)).build_ui_state(
-        |ui, app: &mut WordApp| {
-            let ctx = ui.ctx().clone();
-            app.logic(&ctx);
-            app.ui(ui);
-        },
-        a,
-    );
-    h.run_steps(6);
-    let font = Dialog::open("font", h.state_mut());
-    h.state_mut().dialog = font;
-    h.run_steps(4);
-    let rect = h.ctx.memory(|m| m.area_rect(egui::Id::unique(("dialog", "Font")))).expect("the dialog is open");
-    let at = egui::pos2(rect.center().x, rect.top() + 8.0);
-    assert!(at.y < 30.0, "the dialog reaches over the title bar: {rect:?}");
-    assert_eq!(window_drags(&mut h, at), 0, "a drag on its title");
-    let rect = h.ctx.memory(|m| m.area_rect(egui::Id::unique(("dialog", "Font")))).expect("the dialog is open");
-    assert_eq!(window_drags(&mut h, egui::pos2(rect.center().x, rect.top() + 1.0)), 0, "nor just inside its edge");
-}
-
 #[test]
 fn font_sample_props_map_each_field_to_its_property() {
     use super::font::font_sample_props;

packaging/freebsd/package.sh

@@ -55,7 +55,7 @@ esac
 # Only binaries for this machine run here (the --version check at the end); a FreeBSD target built
 # on another OS never does.
 HOST_ARCH="$(release_arch "$(uname -m)" 2>/dev/null)" || HOST_ARCH="$(uname -m)"
-if [[ -n "${CARGO_BUILD_TARGET:-}" ]] && [[ "$(uname -s)" != FreeBSD ]]; then
+if [ -n "${CARGO_BUILD_TARGET:-}" ] && [ "$(uname -s)" != FreeBSD ]; then
   HOST_ARCH="$(uname -s) $HOST_ARCH"
 fi
 BASENAME="wordcraft-$VERSION-freebsd-$ARCH"
@@ -96,12 +96,12 @@ mkdir -p "$DIST"
 tar -C "$WORK" -czf "$DIST/$BASENAME.tar.gz" "$BASENAME"
 echo "wrote $DIST/$BASENAME.tar.gz"
 
-if [[ -z "${CARGO_BUILD_TARGET:-}" ]] && [[ "$ARCH" = "$HOST_ARCH" ]]; then
+if [ -z "${CARGO_BUILD_TARGET:-}" ] && [ "$ARCH" = "$HOST_ARCH" ]; then
   "$STAGE/bin/wordcraft-cli" --version
 else
   # They cannot run here, so check what they are instead: executables, not libraries or objects.
   # An older file(1) calls a PIE a shared object; its interpreter still marks it as a program.
-  want="$ARCH"; [[ "$ARCH" != x86_64 ]] || want=x86-64
+  want="$ARCH"; [ "$ARCH" != x86_64 ] || want=x86-64
   for b in "$STAGE"/bin/*; do
     case "$(file -b "$b")" in
       ELF*" executable, "*"$want"*FreeBSD* | ELF*"$want"*FreeBSD*interpreter*) ;;

sonar-project.properties

@@ -1,9 +1,2 @@
 sonar.projectKey=storytold_wordcraft
 sonar.organization=storytold
-
-# S4790 (weak hash): SHA-1 is a start-key and "SHA1/1K" checksum algorithm that ODF package
-# encryption (ODF 1.3 Part 2 §4.16) names, and older office suites wrote it. It is needed to open
-# those files, not chosen for new security: WordCraft writes a SHA-256 start key and checksum.
-sonar.issue.ignore.multicriteria=odt_sha1
-sonar.issue.ignore.multicriteria.odt_sha1.ruleKey=rust:S4790
-sonar.issue.ignore.multicriteria.odt_sha1.resourceKey=crates/formats/src/odt/crypt.rs