Pictures: WMF and EMF draw, with the metafile reader ported from WordCraft

Co-Authored-By: Claude Opus 5.5 (1M context) <noreply@anthropic.com>

ATTRIBUTION.md

@@ -28,8 +28,6 @@ deck and UI icons are original work of the DeckCraft contributors (drawn or gene
 | `crates/media/tests/fixtures/clip-*` (`clip-h264.mp4`, `clip-h264.mov`, `clip-hevc.mp4`, `clip-vp9.webm`, `clip-av1.mkv`) | DeckCraft contributors | 6 frames of a colour gradient generated by `make.sh` (python3), encoded by ffmpeg (x264 / x265 / libvpx / SVT-AV1 as encoders only) | CC0-1.0 | Video decoding tests |
 | `crates/media/tests/fixtures/make.sh` | DeckCraft contributors | this repository | MIT OR Apache-2.0 | Regenerates the media fixtures |
 | `crates/render/tests/fixtures/colr-squares.ttf` | DeckCraft contributors | two squares as a COLRv0/CPAL test font, built by `make_colr_font.py` (fontTools as the builder only) | CC0-1.0 | Colour glyph rendering tests |
-| `crates/fonts/tests/fixtures/legacy-semibold.ttf` | DeckCraft contributors | a one-glyph Semibold face named like Segoe UI Semibold (its Windows family differs from the typographic one), built by `make_legacy_font.py` (fontTools as the builder only) | CC0-1.0 | Font lookup by Windows family name tests |
-| `crates/fonts/tests/fixtures/legacy-regular.ttf` | DeckCraft contributors | the same family's one-glyph Regular face, built by `make_legacy_font.py` (fontTools as the builder only) | CC0-1.0 | Font lookup by Windows family name tests |
 | `crates/render/tests/fixtures/make_colr_font.py` | DeckCraft contributors | this repository | MIT OR Apache-2.0 | Regenerates the COLR test font |
 
 ## Bundled through dependencies

crates/engine/src/cmd/file.rs

@@ -79,10 +79,7 @@ pub fn open_presentation(name: &str, bytes: &[u8]) -> Result<Presentation> {
 
 pub fn add_opened(s: &mut Session, name: &str, path: Option<String>, p: Presentation) -> usize {
     let title = std::path::Path::new(name).file_stem().map(|n| n.to_string_lossy().to_string()).unwrap_or_else(|| name.to_string());
-    let missing_fonts = crate::fonts::missing_fonts(&p);
-    let mut st = DocState::new(p, path, title);
-    st.missing_fonts = missing_fonts;
-    s.add_document(st)
+    s.add_document(DocState::new(p, path, title))
 }
 
 #[cfg(not(target_arch = "wasm32"))]
@@ -92,8 +89,7 @@ fn open(s: &mut Session, p: &Value) -> Result<Value> {
     let doc = open_presentation(path, &bytes)?;
     let native = deckcraft_format::sniff(&bytes) || deckcraft_pptx::sniff(&bytes);
     let i = add_opened(s, path, native.then(|| path.to_string()), doc);
-    let st = s.doc()?;
-    Ok(json!({"document": i, "slides": st.doc.slides.len(), "missingFonts": st.missing_fonts}))
+    Ok(json!({"document": i, "slides": s.doc()?.doc.slides.len()}))
 }
 #[cfg(target_arch = "wasm32")]
 fn open(_s: &mut Session, _p: &Value) -> Result<Value> {
@@ -105,7 +101,7 @@ fn open_bytes(s: &mut Session, p: &Value) -> Result<Value> {
     let data = str_param(p, "data").and_then(base64_decode).ok_or_else(|| bad("file.openBytes", "missing or invalid base64 `data`"))?;
     let doc = open_presentation(name, &data)?;
     let i = add_opened(s, name, None, doc);
-    Ok(json!({"document": i, "missingFonts": s.doc()?.missing_fonts}))
+    Ok(json!({"document": i}))
 }
 
 /// Encode the presentation in `format` (`deckcraft`, `pptx`, `outline`).

crates/engine/src/fonts.rs

@@ -1,65 +0,0 @@
-//! 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 deckcraft_fonts::FontDb;
-use deckcraft_model::resolve::{self, Ctx};
-use deckcraft_model::text::{Bullet, TextBody};
-use deckcraft_model::{Presentation, Shape, ShapeKind};
-
-/// The font families the slides' text is drawn in (theme fonts resolved, bullet fonts included)
-/// that aren't installed or bundled, sorted, without duplicates (case-insensitive).
-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 !db.has_family(&family) && !out.iter().any(|f| f.eq_ignore_ascii_case(&family)) {
-            out.push(family);
-        }
-    }
-    out.sort_by_key(|f| f.to_lowercase());
-    out
-}
-
-/// The families the slides' text runs and bullets are drawn in.
-fn used_fonts(p: &Presentation) -> Vec<String> {
-    let mut out: Vec<String> = Vec::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)) {
-            out.push(f);
-        }
-    };
-    for slide in &p.slides {
-        let Some(ctx) = Ctx::for_slide(p, slide) else { continue };
-        deckcraft_model::walk(&slide.shapes, &mut |s, _| {
-            if let Some(body) = &s.text {
-                body_fonts(&ctx, s, body, &mut add);
-            }
-            if let ShapeKind::Table(t) = &s.kind {
-                for cell in t.rows.iter().flat_map(|r| &r.cells) {
-                    body_fonts(&ctx, s, &cell.text, &mut add);
-                }
-            }
-        });
-    }
-    out
-}
-
-fn body_fonts(ctx: &Ctx, s: &Shape, body: &TextBody, add: &mut dyn FnMut(String)) {
-    for para in &body.paragraphs {
-        let has_text = para.runs.iter().any(|r| !r.text.trim().is_empty());
-        if !has_text {
-            continue;
-        }
-        for run in para.runs.iter().filter(|r| !r.text.trim().is_empty()) {
-            let r = resolve::run(ctx, s, para, &run.props);
-            add(resolve::font_family(ctx, &r));
-        }
-        let pp = resolve::para(ctx, s, para);
-        if matches!(pp.bullet, Some(Bullet::Char { .. }))
-            && let Some(f) = pp.bullet_font.as_deref()
-        {
-            add(ctx.master.theme.font(f));
-        }
-    }
-}

crates/engine/src/lib.rs

@@ -9,7 +9,6 @@
 
 pub mod cmd;
 pub mod connect;
-pub mod fonts;
 pub mod guard;
 pub mod keys;
 pub mod links;
@@ -142,9 +141,6 @@ pub struct DocState {
     pub interaction: Option<Interaction>,
     pub uid: u64,
     pub title: String,
-    /// Fonts the file's text uses that aren't installed, found when it was opened (empty for new
-    /// documents); the app mentions them once.
-    pub missing_fonts: Vec<String>,
 }
 
 static NEXT_UID: std::sync::atomic::AtomicU64 = std::sync::atomic::AtomicU64::new(1);
@@ -162,7 +158,6 @@ impl DocState {
             interaction: None,
             uid: NEXT_UID.fetch_add(1, std::sync::atomic::Ordering::Relaxed),
             title,
-            missing_fonts: Vec::new(),
         }
     }
     pub fn is_dirty(&self) -> bool {

crates/engine/src/tests.rs

@@ -504,30 +504,6 @@ fn hyperlink_on_a_word_or_shape_links_it() {
     assert!(s.doc().unwrap().current_slide().unwrap().shapes[0].click.is_some(), "a selected shape gets the link as its click action");
 }
 
-/// A .pptx (base64) whose first slide's title is set in `font`.
-fn deck_in_font(font: &str) -> String {
-    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("Hello");
-    body.paragraphs[0].runs[0].props.font = Some(font.into());
-    slide.shapes[0].text = Some(body);
-    crate::cmd::base64_encode(&crate::cmd::file::save_bytes(&p, "pptx").unwrap())
-}
-
-#[test]
-fn opening_a_file_lists_the_fonts_it_uses_that_are_missing() {
-    let mut s = Session::with_new();
-    let r = s.execute("file.openBytes", &json!({"name": "a.pptx", "data": deck_in_font("Qqq Nonexistent Sans")})).unwrap();
-    assert_eq!(r["missingFonts"], json!(["Qqq Nonexistent Sans"]));
-    assert_eq!(s.doc().unwrap().missing_fonts, vec!["Qqq Nonexistent Sans".to_string()]);
-    // A font that is there (bundled or installed) isn't listed; new documents list nothing.
-    let have = deckcraft_fonts::FontDb::global().face(deckcraft_fonts::FALLBACK_FAMILY, "Regular").family.clone();
-    let r = s.execute("file.openBytes", &json!({"name": "b.pptx", "data": deck_in_font(&have)})).unwrap();
-    assert_eq!(r["missingFonts"], json!([]));
-    s.execute("file.new", &json!({})).unwrap();
-    assert!(s.doc().unwrap().missing_fonts.is_empty());
-}
-
 #[test]
 fn clicks_in_flipped_shapes_hit_the_text_where_it_is_drawn() {
     // Flips don't mirror text, so a click lands on the character drawn under it.

crates/fonts/src/fontdb.rs

@@ -52,53 +52,6 @@ pub fn substitutes(family: &str) -> &'static [&'static str] {
     }
 }
 
-/// Families whose open substitutes ([`substitutes`]) keep their metrics, so text drawn with
-/// them breaks into the same lines.
-fn has_metric_twin(family: &str) -> bool {
-    matches!(
-        family.to_ascii_lowercase().as_str(),
-        "calibri" | "calibri light" | "cambria" | "cambria math" | "arial" | "helvetica" | "times new roman" | "times" | "courier new" | "courier"
-    )
-}
-
-/// The installed family PowerPoint draws a missing `family` with instead of Calibri: Liberation
-/// Sans and Serif as Arial and Times New Roman (observed in PowerPoint; Liberation Mono, Carlito,
-/// Caladea, Arimo and Tinos are not mapped and draw in Calibri), and Windows' standard font
-/// substitutes (Arial CE, Times New Roman CYR…).
-fn office_twin(family: &str) -> Option<&'static str> {
-    let f = family.to_ascii_lowercase();
-    Some(match f.as_str() {
-        "liberation sans" | "helvetica" | "helv" => "Arial",
-        "liberation serif" | "times" | "tms rmn" => "Times New Roman",
-        _ => {
-            let base = f
-                .strip_suffix(" baltic")
-                .or(f.strip_suffix(" ce"))
-                .or(f.strip_suffix(" cyr"))
-                .or(f.strip_suffix(" greek"))
-                .or(f.strip_suffix(" tur"))?;
-            match base {
-                "arial" => "Arial",
-                "courier new" => "Courier New",
-                "times new roman" => "Times New Roman",
-                _ => return None,
-            }
-        }
-    })
-}
-
-/// Office's downloadable (cloud) families: PowerPoint fetches them when a document uses them, so
-/// they draw as themselves there, not as Calibri. Without them DeckCraft keeps their closest open
-/// substitute ([`substitutes`]; Aptos as Inter).
-fn is_office_cloud_font(family: &str) -> bool {
-    let f = family.to_ascii_lowercase();
-    f.starts_with("aptos") || ["bierstadt", "grandview", "seaford", "skeena", "tenorite"].iter().any(|c| f.starts_with(c))
-}
-
-/// The family PowerPoint draws a document's Latin text in when the font it names isn't installed,
-/// whatever the theme, `panose` or `pitchFamily` say.
-pub const MISSING_FONT_FAMILY: &str = "Calibri";
-
 #[derive(Clone)]
 enum FontBytes {
     Static(&'static [u8]),
@@ -112,10 +65,6 @@ pub struct FontFace {
     pub family: String,
     /// Typographic style name (e.g. "Semibold", "Italic").
     pub style: String,
-    /// The Windows (GDI) family and style names (`name` IDs 1 and 2) when the family differs from
-    /// the typographic one: "Segoe UI Semibold" / "Regular" for Segoe UI Semibold. Documents name
-    /// fonts this way.
-    pub legacy: Option<(String, String)>,
     /// usWeightClass-style weight (400 = regular).
     pub weight: f32,
     pub italic: bool,
@@ -304,11 +253,6 @@ pub struct FontDb {
     /// scan, so what they find doesn't depend on what ran before them.
     #[cfg(not(target_arch = "wasm32"))]
     cataloged: std::sync::OnceLock<()>,
-    /// Families (lower case) whose cataloged files have all been loaded: a family's files load
-    /// together, so a lookup never settles for the one face another name loaded ("Segoe UI
-    /// Semibold" loads a face of the family "Segoe UI").
-    #[cfg(not(target_arch = "wasm32"))]
-    loaded_families: Mutex<std::collections::HashSet<String>>,
     /// System fallback state: enabled, and characters no system font covers.
     #[cfg(not(target_arch = "wasm32"))]
     sys: Mutex<SysFallback>,
@@ -372,16 +316,6 @@ fn face_names(f: &skrifa::FontRef<'_>) -> Option<(String, String)> {
     Some((family, style))
 }
 
-/// A face's Windows (GDI) family and style (`name` IDs 1 and 2) when that family differs from the
-/// typographic `family`.
-fn legacy_names(f: &skrifa::FontRef<'_>, family: &str) -> Option<(String, String)> {
-    let legacy = name(f, &[StringId::FAMILY_NAME])?;
-    if legacy.eq_ignore_ascii_case(family) {
-        return None;
-    }
-    Some((legacy, name(f, &[StringId::SUBFAMILY_NAME]).unwrap_or_else(|| "Regular".into())))
-}
-
 /// (family, style) of every face in the font file at `path`, reading only its table directories
 /// and `name` tables: a scan opens hundreds of font files, many of them megabytes long. A
 /// variable font is cataloged under its default style; its named instances appear once it loads.
@@ -428,13 +362,8 @@ fn file_face_names(path: &std::path::Path) -> Vec<(String, String)> {
                 font.extend_from_slice(&u32::to_be_bytes(v));
             }
             font.extend_from_slice(&table);
-            let f = skrifa::FontRef::new(&font).ok()?;
-            let (family, style) = face_names(&f)?;
-            // Cataloged under its Windows family too, so "Segoe UI Semibold" finds the file.
-            let legacy = legacy_names(&f, &family);
-            Some(std::iter::once((family, style)).chain(legacy))
+            face_names(&skrifa::FontRef::new(&font).ok()?)
         })
-        .flatten()
         .collect()
 }
 
@@ -450,12 +379,6 @@ pub fn system_font_dirs() -> Vec<std::path::PathBuf> {
         dirs.extend(["/System/Library/Fonts", "/Library/Fonts"].map(Into::into));
         if let Some(h) = &home {
             dirs.push(h.join("Library/Fonts"));
-            // Fonts Microsoft Office downloads on demand (Aptos…), used where Office put them.
-            dirs.push(h.join("Library/Group Containers/UBF8T346G9.Office/FontCache/4/CloudFonts"));
-        }
-        // Fonts Office installs inside its apps.
-        for app in ["Microsoft PowerPoint", "Microsoft Word", "Microsoft Excel"] {
-            dirs.push(std::path::PathBuf::from(format!("/Applications/{app}.app/Contents/Resources/DFonts")));
         }
         // Fonts macOS ships as assets (PingFang, Yu Mincho, …): com_apple_MobileAsset_Font<N>.
         for parent in ["/System/Library/AssetsV2", "/System/Library/AssetsV2/PreinstalledAssetsV2/InstallWithOs"] {
@@ -470,11 +393,7 @@ pub fn system_font_dirs() -> Vec<std::path::PathBuf> {
         let root = std::env::var_os("WINDIR").map(std::path::PathBuf::from).unwrap_or_else(|| "C:\\Windows".into());
         dirs.push(root.join("Fonts"));
         if let Some(l) = std::env::var_os("LOCALAPPDATA") {
-            let l = std::path::PathBuf::from(l);
-            dirs.push(l.join("Microsoft\\Windows\\Fonts"));
-            // Fonts Microsoft Office downloads on demand (Aptos…), used where Office put them;
-            // DeckCraft never ships or needs them.
-            dirs.push(l.join("Microsoft\\FontCache\\4\\CloudFonts"));
+            dirs.push(std::path::PathBuf::from(l).join("Microsoft\\Windows\\Fonts"));
         }
     } else {
         dirs.extend(["/usr/share/fonts", "/usr/local/share/fonts"].map(Into::into));
@@ -572,12 +491,10 @@ fn make_face(bytes: FontBytes, index: u32, family: String, style: String, coords
         .map(|v| v >= 0.5)
         .or(axis(b"slnt").map(|v| v.abs() > 0.1))
         .unwrap_or(!matches!(a.style, skrifa::attribute::Style::Normal) || style_italic(&style));
-    let legacy = if coords.is_empty() { legacy_names(&f, &family) } else { None };
     Some(FontFace {
         id: NEXT_ID.fetch_add(1, Ordering::Relaxed),
         family,
         style,
-        legacy,
         weight,
         italic,
         upem: m.units_per_em.max(1) as f64,
@@ -654,8 +571,6 @@ impl FontDb {
             #[cfg(not(target_arch = "wasm32"))]
             cataloged: std::sync::OnceLock::new(),
             #[cfg(not(target_arch = "wasm32"))]
-            loaded_families: Mutex::new(std::collections::HashSet::new()),
-            #[cfg(not(target_arch = "wasm32"))]
             sys: Mutex::new(SysFallback { enabled: true, ..Default::default() }),
         }
     }
@@ -761,8 +676,6 @@ impl FontDb {
     /// Returns the number of faces cataloged.
     #[cfg(not(target_arch = "wasm32"))]
     pub fn load_system_fonts(&self) -> usize {
-        // Families load again from the new catalog when next looked up.
-        self.loaded_families.lock().unwrap_or_else(|e| e.into_inner()).clear();
         // The first scan, or a rescan once it is done (never both at once).
         let mut first = None;
         self.cataloged.get_or_init(|| first = Some(self.scan_font_dirs()));
@@ -843,35 +756,17 @@ impl FontDb {
             .unwrap_or_else(last_resort_face)
     }
 
-    /// The face a document's text in `family` is drawn with, as PowerPoint draws it: the family
-    /// when it is installed or bundled, or a metric-compatible stand-in (Carlito for Calibri,
-    /// Liberation Sans for Arial…), or the family PowerPoint maps it to (Liberation Sans as Arial,
-    /// see `office_twin`); any other missing family is drawn in Calibri (or Carlito).
-    /// DeckCraft's own default family keeps [`FontDb::face`]'s fallbacks.
-    pub fn document_face(&self, family: &str, style: &str) -> Arc<FontFace> {
-        if family.eq_ignore_ascii_case(FALLBACK_FAMILY) || has_metric_twin(family) || is_office_cloud_font(family) || self.has_family(family) {
-            return self.face(family, style);
-        }
-        if let Some(twin) = office_twin(family) {
-            return self.face(twin, style);
-        }
-        self.face(MISSING_FONT_FAMILY, style)
-    }
-
     fn try_family(&self, family: &str, style: &str) -> Option<Arc<FontFace>> {
-        // Every installed file of the family first, so the best style is among the candidates. The
-        // lock is held while the files load, so another thread looking up the family waits for
-        // them rather than finding none and falling back to another family.
-        #[cfg(not(target_arch = "wasm32"))]
-        {
-            let mut loaded = self.loaded_families.lock().unwrap_or_else(|e| e.into_inner());
-            let key = family.to_lowercase();
-            if !loaded.contains(&key) {
-                self.load_cataloged(family);
-                loaded.insert(key);
-            }
+        if let Some(f) = self.find(family, style) {
+            return Some(f);
         }
-        self.find(family, style)
+        #[cfg(not(target_arch = "wasm32"))]
+        if self.load_cataloged(family)
+            && let Some(f) = self.find(family, style)
+        {
+            return Some(f);
+        }
+        None
     }
 
     /// Is `family` available (loaded, or installed on the system)?
@@ -887,9 +782,7 @@ impl FontDb {
     }
 
     pub(crate) fn is_loaded(&self, family: &str) -> bool {
-        self.read_faces()
-            .iter()
-            .any(|f| f.family.eq_ignore_ascii_case(family) || f.legacy.as_ref().is_some_and(|(lf, _)| lf.eq_ignore_ascii_case(family)))
+        self.read_faces().iter().any(|f| f.family.eq_ignore_ascii_case(family))
     }
 
     /// A variable font's axes: (tag, name, min, default, max), empty for static fonts.
@@ -944,27 +837,11 @@ impl FontDb {
             return self.instance(family, style);
         }
         let faces = self.read_faces();
-        let mut cands: Vec<&Arc<FontFace>> = faces.iter().filter(|f| f.family.eq_ignore_ascii_case(family)).collect();
-        let ns = norm(style);
-        if cands.is_empty() {
-            // A Windows family name ("Segoe UI Semibold", "Arial Black"): its faces, matched by
-            // their Windows style ("Regular", "Bold"…).
-            cands = faces.iter().filter(|f| f.legacy.as_ref().is_some_and(|(lf, _)| lf.eq_ignore_ascii_case(family))).collect();
-            if let Some(f) = cands.iter().find(|f| f.legacy.as_ref().is_some_and(|(_, ls)| norm(ls) == ns)) {
-                return Some((*f).clone());
-            }
-            // Bold of a family that is itself a weight (Semibold, Light): the face, made bolder
-            // by the caller, as Windows does, rather than a face of another weight.
-            if let Some(f) = cands
-                .iter()
-                .find(|f| f.legacy.as_ref().is_some_and(|(_, ls)| norm(ls) == norm(if style_italic(style) { "Italic" } else { "Regular" })))
-            {
-                return Some((*f).clone());
-            }
-        }
+        let cands: Vec<&Arc<FontFace>> = faces.iter().filter(|f| f.family.eq_ignore_ascii_case(family)).collect();
         if cands.is_empty() {
             return None;
         }
+        let ns = norm(style);
         if let Some(f) = cands.iter().find(|f| norm(&f.style) == ns) {
             return Some((*f).clone());
         }

crates/fonts/src/lib.rs

@@ -14,9 +14,7 @@ pub mod script;
 mod shape;
 
 pub use fallback::{bundled_families, covers_cluster, is_emoji_cluster, ligature_carets};
-pub use fontdb::{
-    FALLBACK_FAMILY, FaceRef, FontDb, FontFace, LAST_RESORT_FAMILY, MISSING_FONT_FAMILY, base_style, bundled, substitutes, system_font_dirs,
-};
+pub use fontdb::{FALLBACK_FAMILY, FaceRef, FontDb, FontFace, LAST_RESORT_FAMILY, base_style, bundled, substitutes, system_font_dirs};
 pub use harfrust::Feature;
 use harfrust::Tag;
 pub use kurbo::BezPath;
@@ -184,65 +182,6 @@ mod tests {
         assert!(!shape(&f, "Hello", &[], |c| c).is_empty());
     }
 
-    #[test]
-    fn windows_family_names_find_their_faces() {
-        // Documents name fonts by their Windows family ("Segoe UI Semibold"); the font's
-        // typographic family is "Segoe UI" with a "Semibold" style. The fixture is named the same way.
-        let check = |db: &FontDb| {
-            assert!(db.has_family("DeckCraft Legacy Semibold"));
-            for style in ["Regular", "Bold"] {
-                let f = db.face("DeckCraft Legacy Semibold", style);
-                assert_eq!((f.family.as_str(), f.style.as_str()), ("DeckCraft Legacy", "Semibold"), "{style}");
-            }
-            assert_eq!(db.document_face("DeckCraft Legacy Semibold", "Regular").family, "DeckCraft Legacy", "installed, so not Calibri");
-            // The typographic name still works.
-            assert_eq!(db.face("DeckCraft Legacy", "Semibold").style, "Semibold");
-        };
-        // Loaded directly…
-        let db = FontDb::with_font_dirs(Vec::new());
-        db.set_system_fallback(false);
-        assert_eq!(db.add_font(include_bytes!("../tests/fixtures/legacy-semibold.ttf").to_vec()), 1);
-        check(&db);
-        // …and found by the system font scan under its Windows name, then loaded.
-        #[cfg(not(target_arch = "wasm32"))]
-        {
-            let dir = std::path::PathBuf::from(env!("CARGO_MANIFEST_DIR")).join("tests/fixtures");
-            let db = FontDb::with_font_dirs(vec![dir.clone()]);
-            db.set_system_fallback(false);
-            check(&db);
-            // Looking up the Windows name loads the Semibold file only; a later lookup of the
-            // family's Regular must still load and pick the Regular file, not settle for Semibold.
-            let db = FontDb::with_font_dirs(vec![dir]);
-            db.set_system_fallback(false);
-            assert_eq!(db.face("DeckCraft Legacy Semibold", "Regular").style, "Semibold");
-            let regular = db.face("DeckCraft Legacy", "Regular");
-            assert_eq!((regular.style.as_str(), regular.weight), ("Regular", 400.0));
-        }
-    }
-
-    #[test]
-    fn missing_document_fonts_are_drawn_in_calibri() {
-        // PowerPoint draws a missing family in Calibri, whatever its panose or the theme says.
-        let db = FontDb::global();
-        for missing in ["Qqq Nonexistent", "Avenir Next Qqq", "", "Arimo Qqq"] {
-            let f = db.document_face(missing, "Bold");
-            assert_eq!(f.family, db.face(MISSING_FONT_FAMILY, "Bold").family, "{missing:?}");
-        }
-        // PowerPoint's own twins and Windows' substitutes, when the font itself is missing.
-        for (missing, twin) in
-            [("Liberation Sans", "Arial"), ("Liberation Serif", "Times New Roman"), ("Arial CE", "Arial"), ("Times New Roman CYR", "Times New Roman")]
-        {
-            if !db.has_family(missing) {
-                assert_eq!(db.document_face(missing, "Regular").family, db.face(twin, "Regular").family, "{missing}");
-            }
-        }
-        // Metric-compatible stand-ins and DeckCraft's default keep their own fallbacks.
-        // So do Office's cloud fonts, which PowerPoint downloads and draws as themselves.
-        for kept in ["Arial", "Times New Roman", "Cambria", "Courier New", FALLBACK_FAMILY, "Aptos", "Aptos Display", "Grandview"] {
-            assert_eq!(db.document_face(kept, "Regular").family, db.face(kept, "Regular").family, "{kept}");
-        }
-    }
-
     #[test]
     fn office_fonts_have_substitutes() {
         assert!(substitutes("Calibri").contains(&"Carlito"));

crates/fonts/tests/fixtures/make_legacy_font.py

@@ -1,55 +0,0 @@
-"""Build the legacy-name test font: DeckCraft Legacy Semibold (contributor-original, CC0-1.0).
-
-Usage: python make_legacy_font.py legacy-semibold.ttf legacy-regular.ttf  (needs fontTools)
-
-legacy-semibold.ttf: typographic family "DeckCraft Legacy", style "Semibold" (name IDs 16/17,
-weight 600); Windows family "DeckCraft Legacy Semibold", style "Regular" (name IDs 1/2), as fonts
-like Segoe UI Semibold are named. legacy-regular.ttf: the family's Regular ("DeckCraft Legacy",
-"Regular", weight 400), named only by IDs 1/2 as Segoe UI's regular file is. Glyphs: .notdef and
-a square for "A".
-"""
-import sys
-
-from fontTools.fontBuilder import FontBuilder
-from fontTools.pens.ttGlyphPen import TTGlyphPen
-
-
-def square():
-    pen = TTGlyphPen(None)
-    pen.moveTo((100, 0))
-    pen.lineTo((100, 700))
-    pen.lineTo((600, 700))
-    pen.lineTo((600, 0))
-    pen.closePath()
-    return pen.glyph()
-
-
-def build(path, names, weight):
-    fb = FontBuilder(1000, isTTF=True)
-    fb.setupGlyphOrder([".notdef", "A"])
-    fb.setupCharacterMap({ord("A"): "A"})
-    fb.setupGlyf({".notdef": TTGlyphPen(None).glyph(), "A": square()})
-    fb.setupHorizontalMetrics({".notdef": (500, 0), "A": (700, 100)})
-    fb.setupHorizontalHeader(ascent=800, descent=-200)
-    fb.setupNameTable(names)
-    fb.setupOS2(usWeightClass=weight, sTypoAscender=800, sTypoDescender=-200, usWinAscent=800, usWinDescent=200)
-    fb.setupPost()
-    fb.save(path)
-
-
-build(sys.argv[1], {
-    "familyName": "DeckCraft Legacy Semibold",
-    "styleName": "Regular",
-    "typographicFamily": "DeckCraft Legacy",
-    "typographicSubfamily": "Semibold",
-    "uniqueFontIdentifier": "DeckCraft Legacy Semibold",
-    "fullName": "DeckCraft Legacy Semibold",
-    "psName": "DeckCraftLegacy-Semibold",
-}, 600)
-build(sys.argv[2], {
-    "familyName": "DeckCraft Legacy",
-    "styleName": "Regular",
-    "uniqueFontIdentifier": "DeckCraft Legacy Regular",
-    "fullName": "DeckCraft Legacy",
-    "psName": "DeckCraftLegacy-Regular",
-}, 400)

crates/render/src/tests.rs

@@ -1037,8 +1037,7 @@ fn wordart_arch_up_lifts_the_middle_of_the_line() {
     // at the box top and the ends sit clearly lower.
     let (al, am, ar) = (top_near(&atops, ax0 + 20).unwrap(), top_near(&atops, (ax0 + ax1) / 2).unwrap(), top_near(&atops, ax1 - 20).unwrap());
     assert!(al > am + 10 && ar > am + 10, "arched {al} {am} {ar}");
-    // At the box top (y = 100), give or take the font: Linux's fallback face reaches 79.
-    assert!((70..=110).contains(&ay0), "arch top {ay0}");
+    assert!((80..=110).contains(&ay0), "arch top {ay0}");
 }
 
 #[test]

crates/text/src/lib.rs

@@ -261,7 +261,7 @@ fn make_style(ctx: &Ctx, r: &RunProps, scale: f64, prompt: Option<Rgba>) -> Styl
     let family = resolve::font_family(ctx, r);
     let bold = r.bold.unwrap_or(false);
     let italic = r.italic.unwrap_or(false);
-    let face = FontDb::global().document_face(&family, style_name(bold, italic));
+    let face = FontDb::global().face(&family, style_name(bold, italic));
     let fake_bold = bold && face.weight < 550.0;
     let fake_italic = italic && !face.italic;
     let size = (r.size.unwrap_or(18.0) * scale).clamp(0.5, 4000.0);

crates/ui-egui/src/lib.rs

@@ -22,7 +22,6 @@ pub mod status;
 pub mod textures;
 pub mod theme;
 pub mod thumbs;
-pub mod toast;
 pub mod widgets;
 
 use std::sync::mpsc::{Receiver, Sender};
@@ -182,10 +181,6 @@ pub struct SlideApp {
     /// Audio/video playback (editor control bar, slide show, `media.*` commands).
     pub media: media::MediaHost,
     pub status: Option<(String, f64)>,
-    /// A brief notice over the bottom of the window (missing fonts on opening a file).
-    pub toast: Option<toast::Toast>,
-    /// Documents (by uid) whose missing fonts have been mentioned.
-    fonts_noted: std::collections::HashSet<u64>,
     pub perf: Perf,
     /// Synthetic input events (control channel `ui.click` etc.), injected one per frame.
     pub synthetic: Vec<egui::Event>,
@@ -229,8 +224,6 @@ impl SlideApp {
             show: None,
             media: media::MediaHost::new(audio_out),
             status: None,
-            toast: None,
-            fonts_noted: Default::default(),
             perf: Perf { frame_ms: 0.0, render_ms: 0.0, fps: 0.0 },
             synthetic: vec![],
             canvas_rect: None,
@@ -737,8 +730,6 @@ impl SlideApp {
                 }
             }
         });
-        toast::note_missing_fonts(self);
-        toast::show(self, &ctx);
         dialogs::show(self, &ctx);
         menus::palette(self, &ctx);
         for url in std::mem::take(&mut self.pending_urls) {
@@ -898,37 +889,6 @@ mod tests {
         sh.text.as_ref().map(|t| t.paragraphs.iter().map(|p| p.text()).collect::<Vec<_>>().join("\n")).unwrap_or_default()
     }
 
-    #[test]
-    fn opening_a_file_with_missing_fonts_shows_a_toast_once() {
-        use egui_kittest::kittest::Queryable;
-        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("Hello");
-        body.paragraphs[0].runs[0].props.font = Some("Qqq Nonexistent Sans".into());
-        slide.shapes[0].text = Some(body);
-        let data = deckcraft_engine::cmd::base64_encode(&deckcraft_engine::cmd::file::save_bytes(&p, "pptx").unwrap());
-        let mut harness = egui_kittest::Harness::builder().with_size(egui::vec2(1200.0, 800.0)).build_ui_state(
-            |ui, app: &mut SlideApp| {
-                app.logic(ui.ctx());
-                app.ui(ui);
-            },
-            SlideApp::new(Session::with_new(), Services::default()),
-        );
-        harness.run_steps(2);
-        assert!(harness.state().toast.is_none(), "a new presentation has nothing to say");
-        harness.state_mut().session.execute("file.openBytes", &json!({"name": "a.pptx", "data": data})).unwrap();
-        harness.run_steps(2);
-        let text = harness.state().toast.as_ref().map(|t| t.text.clone()).unwrap_or_default();
-        assert!(text.starts_with("Qqq Nonexistent Sans isn't installed"), "{text}");
-        assert!(harness.query_by_label_contains("Qqq Nonexistent Sans isn't installed").is_some());
-        // Closed, it stays closed for that document.
-        harness.get_by_label("Close").click();
-        harness.run_steps(2);
-        assert!(harness.state().toast.is_none());
-        harness.run_steps(2);
-        assert!(harness.state().toast.is_none());
-    }
-
     /// #17: Home created a new blank presentation instead of going to the start screen.
     #[test]
     fn home_shows_the_start_screen_over_the_open_presentation() {

crates/ui-egui/src/toast.rs

@@ -1,94 +0,0 @@
-//! Brief notices over the window's bottom edge: shown once, gone after a few seconds or when
-//! closed. Used to say a presentation's fonts aren't installed when it is first opened.
-
-use egui::{Align2, CornerRadius, Margin, Stroke, vec2};
-
-use crate::SlideApp;
-use crate::icons::{self, Icon};
-use crate::theme::{self, Tokens};
-
-/// How long a toast stays, in milliseconds.
-const SHOW_MS: f64 = 8000.0;
-
-pub struct Toast {
-    pub text: String,
-    pub at: f64,
-}
-
-/// The notice for fonts a presentation uses that aren't installed, or `None` when all are.
-pub fn missing_fonts_message(fonts: &[String]) -> Option<String> {
-    let names = match fonts {
-        [] => return None,
-        [a] => a.clone(),
-        [a, b] => format!("{a} and {b}"),
-        [a, b, c] => format!("{a}, {b} and {c}"),
-        [a, b, c, rest @ ..] => format!("{a}, {b}, {c} and {} more", rest.len()),
-    };
-    let (it, them) = if fonts.len() == 1 { ("isn't", "it") } else { ("aren't", "them") };
-    Some(format!("{names} {it} installed on this computer. Text that uses {them} is shown in a similar font."))
-}
-
-/// Toast the active presentation's missing fonts, once per opened document.
-pub fn note_missing_fonts(app: &mut SlideApp) {
-    let Some(d) = app.session.active() else { return };
-    if !app.fonts_noted.insert(d.uid) {
-        return;
-    }
-    if let Some(text) = missing_fonts_message(&d.missing_fonts) {
-        app.toast = Some(Toast { text, at: crate::now_ms() });
-    }
-}
-
-pub fn show(app: &mut SlideApp, ctx: &egui::Context) {
-    let Some(toast) = &app.toast else { return };
-    if crate::now_ms() - toast.at > SHOW_MS {
-        app.toast = None;
-        return;
-    }
-    let t = Tokens::get(ctx);
-    let text = toast.text.clone();
-    let mut close = false;
-    egui::Area::new(egui::Id::new("toast")).anchor(Align2::CENTER_BOTTOM, vec2(0.0, -44.0)).order(egui::Order::Foreground).show(ctx, |ui| {
-        egui::Frame::NONE
-            .fill(t.card)
-            .stroke(Stroke::new(1.0, t.card_border))
-            .corner_radius(CornerRadius::same(6))
-            .inner_margin(Margin::symmetric(14, 10))
-            .shadow(egui::epaint::Shadow { offset: [0, 2], blur: 8, spread: 0, color: t.shadow })
-            .show(ui, |ui| {
-                ui.set_max_width(520.0);
-                ui.horizontal(|ui| {
-                    ui.add(egui::Label::new(egui::RichText::new(&text).font(theme::font(13.0)).color(t.text)).wrap());
-                    let (r, resp) = ui.allocate_exact_size(vec2(20.0, 20.0), egui::Sense::click());
-                    resp.widget_info(|| egui::WidgetInfo::labeled(egui::WidgetType::Button, true, "Close"));
-                    if resp.hovered() {
-                        ui.painter().rect_filled(r, CornerRadius::same(4), t.hover);
-                    }
-                    icons::paint(ui.painter(), r.shrink(3.0), Icon::Close, t.text_dim, false);
-                    if resp.on_hover_text("Close").clicked() {
-                        close = true;
-                    }
-                });
-            });
-    });
-    if close {
-        app.toast = None;
-    } else {
-        ctx.request_repaint_after(std::time::Duration::from_millis(500));
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-
-    #[test]
-    fn the_message_names_the_fonts() {
-        let f = |v: &[&str]| missing_fonts_message(&v.iter().map(|s| s.to_string()).collect::<Vec<_>>());
-        assert_eq!(f(&[]), None);
-        assert_eq!(f(&["Aptos"]).unwrap(), "Aptos isn't installed on this computer. Text that uses it is shown in a similar font.");
-        assert!(f(&["Aptos", "Sora"]).unwrap().starts_with("Aptos and Sora aren't installed"));
-        assert!(f(&["A", "B", "C"]).unwrap().starts_with("A, B and C aren't"));
-        assert!(f(&["A", "B", "C", "D", "E"]).unwrap().starts_with("A, B, C and 2 more aren't"));
-    }
-}