Merge main into fix/sec-engine-font-scan

Merge pull request #1474 from zberry/pptx-show-media-controls
PPTX: Show media controls survives a save and reopen
2026-11-08 03:19:31 -06:00 · 2026-11-05 00:33:45 +00:00 · 2026-11-04 19:17:57 -05:00 · 2026-11-04 19:03:38 -05:00 · 2026-11-05 00:52:05 +01:00 · 2026-11-04 23:51:52 +00:00
4 changed files with 61 additions and 36 deletions
@@ -984,7 +984,7 @@ checksum = "0c87e182de0887fd5361989c677c4e8f5000cd9491d6d563161a8f3a5519fc7f"

 [[package]]
 name = "deckcraft"
-version = "0.15.1"
+version = "0.15.0"
 dependencies = [
 "arboard",
 "chrono",
@@ -1006,7 +1006,7 @@ dependencies = [

 [[package]]
 name = "deckcraft-anim"
-version = "0.15.1"
+version = "0.15.0"
 dependencies = [
 "deckcraft-geom",
 "deckcraft-model",
@@ -1015,7 +1015,7 @@ dependencies = [

 [[package]]
 name = "deckcraft-av1"
-version = "0.15.1"
+version = "0.15.0"
 dependencies = [
 "deckcraft-bitstream",
 "rayon",
@@ -1024,14 +1024,14 @@ dependencies = [

 [[package]]
 name = "deckcraft-bitstream"
-version = "0.15.1"
+version = "0.15.0"
 dependencies = [
 "craft-media",
 ]

 [[package]]
 name = "deckcraft-cli"
-version = "0.15.1"
+version = "0.15.0"
 dependencies = [
 "deckcraft-engine",
 "deckcraft-mcp",
@@ -1041,14 +1041,14 @@ dependencies = [

 [[package]]
 name = "deckcraft-color"
-version = "0.15.1"
+version = "0.15.0"
 dependencies = [
 "serde",
 ]

 [[package]]
 name = "deckcraft-engine"
-version = "0.15.1"
+version = "0.15.0"
 dependencies = [
 "chrono",
 "deckcraft-anim",
@@ -1074,7 +1074,7 @@ dependencies = [

 [[package]]
 name = "deckcraft-fonts"
-version = "0.15.1"
+version = "0.15.0"
 dependencies = [
 "epaint_default_fonts",
 "harfrust 0.13.3",
@@ -1086,7 +1086,7 @@ dependencies = [

 [[package]]
 name = "deckcraft-format"
-version = "0.15.1"
+version = "0.15.0"
 dependencies = [
 "deckcraft-model",
 "serde",
@@ -1097,7 +1097,7 @@ dependencies = [

 [[package]]
 name = "deckcraft-geom"
-version = "0.15.1"
+version = "0.15.0"
 dependencies = [
 "kurbo",
 "serde",
@@ -1105,7 +1105,7 @@ dependencies = [

 [[package]]
 name = "deckcraft-h264"
-version = "0.15.1"
+version = "0.15.0"
 dependencies = [
 "deckcraft-bitstream",
 "rayon",
@@ -1114,7 +1114,7 @@ dependencies = [

 [[package]]
 name = "deckcraft-hevc"
-version = "0.15.1"
+version = "0.15.0"
 dependencies = [
 "deckcraft-bitstream",
 "rayon",
@@ -1123,21 +1123,21 @@ dependencies = [

 [[package]]
 name = "deckcraft-isobmff"
-version = "0.15.1"
+version = "0.15.0"
 dependencies = [
 "craft-media",
 ]

 [[package]]
 name = "deckcraft-matroska"
-version = "0.15.1"
+version = "0.15.0"
 dependencies = [
 "craft-media",
 ]

 [[package]]
 name = "deckcraft-mcp"
-version = "0.15.1"
+version = "0.15.0"
 dependencies = [
 "deckcraft-engine",
 "deckcraft-render",
@@ -1147,7 +1147,7 @@ dependencies = [

 [[package]]
 name = "deckcraft-media"
-version = "0.15.1"
+version = "0.15.0"
 dependencies = [
 "deckcraft-av1",
 "deckcraft-h264",
@@ -1165,7 +1165,7 @@ dependencies = [

 [[package]]
 name = "deckcraft-metafile"
-version = "0.15.1"
+version = "0.15.0"
 dependencies = [
 "image",
 "kurbo",
@@ -1174,7 +1174,7 @@ dependencies = [

 [[package]]
 name = "deckcraft-model"
-version = "0.15.1"
+version = "0.15.0"
 dependencies = [
 "deckcraft-color",
 "deckcraft-geom",
@@ -1186,15 +1186,15 @@ dependencies = [

 [[package]]
 name = "deckcraft-ogg"
-version = "0.15.1"
+version = "0.15.0"

 [[package]]
 name = "deckcraft-opus"
-version = "0.15.1"
+version = "0.15.0"

 [[package]]
 name = "deckcraft-pdf"
-version = "0.15.1"
+version = "0.15.0"
 dependencies = [
 "craft-pdf",
 "deckcraft-fonts",
@@ -1212,7 +1212,7 @@ dependencies = [

 [[package]]
 name = "deckcraft-pptx"
-version = "0.15.1"
+version = "0.15.0"
 dependencies = [
 "deckcraft-color",
 "deckcraft-engine",
@@ -1228,7 +1228,7 @@ dependencies = [

 [[package]]
 name = "deckcraft-render"
-version = "0.15.1"
+version = "0.15.0"
 dependencies = [
 "deckcraft-anim",
 "deckcraft-color",
@@ -1247,7 +1247,7 @@ dependencies = [

 [[package]]
 name = "deckcraft-text"
-version = "0.15.1"
+version = "0.15.0"
 dependencies = [
 "chrono",
 "deckcraft-color",
@@ -1261,7 +1261,7 @@ dependencies = [

 [[package]]
 name = "deckcraft-ui-egui"
-version = "0.15.1"
+version = "0.15.0"
 dependencies = [
 "craft-ui",
 "craft-update",
@@ -1286,7 +1286,7 @@ dependencies = [

 [[package]]
 name = "deckcraft-vp9"
-version = "0.15.1"
+version = "0.15.0"
 dependencies = [
 "deckcraft-bitstream",
 "rayon",
@@ -1295,7 +1295,7 @@ dependencies = [

 [[package]]
 name = "deckcraft-web"
-version = "0.15.1"
+version = "0.15.0"
 dependencies = [
 "deckcraft-engine",
 "deckcraft-ui-egui",
@@ -6177,7 +6177,7 @@ checksum = "9440ea3e5aeabb0ac63af70daf835274065238cdd0cec83418f417eae38bacee"

 [[package]]
 name = "xtask"
-version = "0.15.1"
+version = "0.15.0"
 dependencies = [
 "serde_json",
 ]
@@ -4,7 +4,7 @@ members = ["crates/*", "apps/*", "xtask"]
 default-members = ["crates/*", "apps/deckcraft", "apps/deckcraft-cli"]

 [workspace.package]
-version = "0.15.1"
+version = "0.15.0"
 edition = "2024"
 license = "MIT OR Apache-2.0"
 rust-version = "1.95"
@@ -1,6 +1,8 @@
 //! Fonts a presentation uses that this machine doesn't have, so opening it can say so (its text
 //! draws in a stand-in; see `FontDb::document_face`).

+use std::collections::HashSet;
+
 use deckcraft_fonts::FontDb;
 use deckcraft_model::resolve::{self, Ctx};
 use deckcraft_model::text::{Bullet, TextBody};
@@ -12,8 +14,13 @@ use deckcraft_model::{Presentation, Shape, ShapeKind};
 /// font to load and are left for the round trip.
 pub fn install_embedded_fonts(p: &Presentation) {
    let db = FontDb::global();
+    // Faces can name one media item many times; each is copied and enumerated once.
+    let mut seen = HashSet::new();
    for font in &p.embedded_fonts {
        for id in font.faces().into_iter().flatten() {
+            if !seen.insert(id) {
+                continue;
+            }
            let Some(item) = p.media(id) else { continue };
            let Some(sfnt) = deckcraft_fonts::embedded_sfnt(&item.data) else { continue };
            db.add_font(sfnt.to_vec());
@@ -27,12 +34,8 @@ pub fn install_embedded_fonts(p: &Presentation) {
 /// and can't be installed, so they aren't reported.
 pub fn missing_fonts(p: &Presentation) -> Vec<String> {
    let db = FontDb::global();
-    let mut out: Vec<String> = Vec::new();
-    for family in used_fonts(p) {
-        if !family.starts_with('.') && !db.has_family(&family) && !out.iter().any(|f| f.eq_ignore_ascii_case(&family)) {
-            out.push(family);
-        }
-    }
+    // used_fonts is already free of case-insensitive duplicates.
+    let mut out: Vec<String> = used_fonts(p).into_iter().filter(|f| !f.starts_with('.') && !db.has_family(f)).collect();
    out.sort_by_key(|f| f.to_lowercase());
    out
 }
@@ -40,9 +43,10 @@ pub fn missing_fonts(p: &Presentation) -> Vec<String> {
 /// The families the slides' text runs and bullets are drawn in.
 pub fn used_fonts(p: &Presentation) -> Vec<String> {
    let mut out: Vec<String> = Vec::new();
+    let mut seen: HashSet<String> = HashSet::new();
    let mut add = |f: String| {
        let f = f.trim().to_string();
-        if !f.is_empty() && !out.iter().any(|o| o.eq_ignore_ascii_case(&f)) {
+        if !f.is_empty() && seen.insert(f.to_ascii_lowercase()) {
            out.push(f);
        }
    };
@@ -6483,6 +6483,27 @@ fn master_body_placeholder_format_keeps_per_level_formatting() {
    assert_eq!(shown(&s), vec![Some(28.0), Some(24.0)]);
 }

+#[test]
+fn many_distinct_fonts_are_listed_once_each_without_a_quadratic_scan() {
+    // 30,000 runs in 15,000 families, each written twice in different case.
+    let mut p = deckcraft_model::Presentation::default();
+    let slide = std::sync::Arc::make_mut(&mut p.slides[0]);
+    let mut body = deckcraft_model::text::TextBody::from_text("x");
+    let run = body.paragraphs[0].runs[0].clone();
+    body.paragraphs[0].runs = (0..30_000)
+        .map(|i| {
+            let mut r = run.clone();
+            let name = format!("Qqq Font {}", i / 2);
+            r.props.font = Some(if i % 2 == 0 { name } else { name.to_uppercase() });
+            r
+        })
+        .collect();
+    slide.shapes[0].text = Some(body);
+    let used = crate::fonts::used_fonts(&p);
+    assert_eq!(used.iter().filter(|f| f.starts_with("Qqq Font ")).count(), 15_000);
+    assert_eq!(crate::fonts::missing_fonts(&p).iter().filter(|f| f.to_ascii_lowercase().starts_with("qqq font ")).count(), 15_000);
+}
+
 #[test]
 fn slide_master_view_rejects_invalid_indices() {
    let mut s = Session::with_new();