DesignCraft: An open-source page and layout design editor written by scratch in pure Rust
FONT3: prompt for missing fonts when opening documents
Shao Wenbin4f1aa8773d22
diff --git a/ROADMAP.md b/ROADMAP.mdindex b682b0328..9a319dc24 100644--- a/ROADMAP.md+++ b/ROADMAP.md@@ -3,6 +3,7 @@- AR1.1: Kashida justification tests verify space fallback without Tatweel fonts using an isolated font database, while retaining elongation assertions when fonts support it.- AR1: Arabic IDML controls now retain character direction, kashida switches, diacritic offsets/forms, paragraph policy values and independent story/table directions. Shaping preserves joining context and script/language selection; paragraph-level bidi, contextual digit conversion, mark-safe elongation, RTL columns/tables and physical column insertion have regression coverage. Vendor-specific justification and diacritic presets remain explicit preflight warnings; see docs/arabic-typography.md.+- FONT3: opening documents with unavailable font families or styles automatically offers Find/Replace Font. The dialog supports repeated replacements, refreshed inventory and visible validation errors; native builds without craft-fonts use system CJK fonts for readable names.- FONT2: font replacements validate available targets and resolve inherited formatting in nested text and empty paragraphs, with undo and composite component preservation.- FONT1: composite-font references resolve by resource identity, retain literal display names, and export as object references. Font inventory and preflight share the character-selected component fonts, including nested notes and cells.- CJK1: IDML composite fonts now retain character mappings and metrics; explicit aki, tsume, jidori, em alignment/leading, named/custom kinsoku boundaries, hanging punctuation, tate-chu-yoko offsets and kenten symbols flow through composition and IDML export. Automatic kerning no longer imports inactive numeric values as enormous manual spacing. Composite definitions are editable through commands with undo/cache invalidation. Mojikumi definitions are retained and unsupported spacing-table / push-in-push-out policies are reported by preflight. Full InDesign CJK composition parity, frame-grid layout and detailed ruby/warichu remain unfinished.diff --git a/crates/ui-egui/src/dialogs.rs b/crates/ui-egui/src/dialogs.rsindex 34832db14..f4334e77e 100644--- a/crates/ui-egui/src/dialogs.rs+++ b/crates/ui-egui/src/dialogs.rs@@ -1373,7 +1373,7 @@ pub fn show(app: &mut DesignApp, ctx: &egui::Context) {ui.with_layout(egui::Layout::right_to_left(egui::Align::Center), |ui| {if ui.add(- egui::Button::new(crate::rtl::widget(ui, egui::RichText::new(crate::i18n::tr(&app.ui.language, " OK ")).color(egui::Color32::WHITE)))+ egui::Button::new(crate::rtl::widget(ui, egui::RichText::new(crate::i18n::tr(&app.ui.language, if d.id == "findFont" { "Replace All" } else { " OK " })).color(egui::Color32::WHITE))).fill(crate::theme::Tokens::get(ui.ctx()).accent_strong),).clicked()@@ -1381,7 +1381,7 @@ pub fn show(app: &mut DesignApp, ctx: &egui::Context) {{result = Some(true);}- if ui.button(crate::rtl::widget(ui, crate::i18n::tr(&app.ui.language, "Cancel"))).clicked() || ui.input(|i| i.key_pressed(egui::Key::Escape)) {+ if ui.button(crate::rtl::widget(ui, crate::i18n::tr(&app.ui.language, if d.id == "findFont" { "Done" } else { "Cancel" }))).clicked() || ui.input(|i| i.key_pressed(egui::Key::Escape)) {result = Some(false);}});@@ -1627,11 +1627,19 @@ pub fn confirm(app: &mut DesignApp) -> Result<Value, String> {}"polygonSettings" => app.run("tool.polygonSettings", json!({"sides": d.n("sides").unwrap_or(6.0) as u64, "starInset": d.n("starInset").unwrap_or(0.0)})),"findFont" => {- let (f, st) = (d.s("family"), d.s("style"));- if f.is_empty() || d.s("toFamily").is_empty() {- return Ok(Value::Null);- }- app.run("font.replace", json!({"family": f, "style": st, "toFamily": d.s("toFamily"), "toStyle": d.s("toStyle")}))+ let result = app.run("font.replace", json!({"family": d.s("family"), "style": d.s("style"), "toFamily": d.s("toFamily"), "toStyle": d.s("toStyle")}));+ let mut d = d;+ match &result {+ Ok(_) => {+ d.fields.remove("_fonts");+ d.fields.remove("family");+ d.fields.remove("style");+ d.fields.remove("error");+ }+ Err(error) => { d.fields.insert("error".into(), json!(error)); }+ }+ app.ui.dialog = Some(d);+ result}"insertXref" => {let format = d.s("format");@@ -2603,6 +2611,24 @@ fn find_font(app: &mut DesignApp, ui: &mut egui::Ui, d: &mut Dialog) {d.fields.insert("_fonts".into(), list);}let fonts = d.fields.get("_fonts").and_then(Value::as_array).cloned().unwrap_or_default();+ if d.s("family").is_empty()+ && let Some(font) = fonts.first()+ {+ d.fields.insert("family".into(), font["family"].clone());+ d.fields.insert("style".into(), font["style"].clone());+ }+ if d.b("onOpen") {+ crate::rtl::label(+ ui,+ crate::i18n::tr(+ &app.ui.language,+ "This document uses unavailable fonts. Choose replacements, or select Done to continue with fallback fonts.",+ ),+ );+ }+ if !d.s("error").is_empty() {+ crate::rtl::label(ui, d.s("error"));+ }let missing = fonts.iter().filter(|f| f["missing"] == true || f["styleMissing"] == true).count();crate::rtl::label(ui,@@ -2617,8 +2643,8 @@ fn find_font(app: &mut DesignApp, ui: &mut egui::Ui, d: &mut Dialog) {let label = format!("{}{fam} {st}", if warn { "\u{26A0} " } else { "" });let on = d.s("family") == fam && d.s("style") == st;let mut text = egui::RichText::new(label);- if warn {- text = text.color(egui::Color32::from_rgb(0xe5, 0x4b, 0x4b));+ if warn && !on {+ text = text.color(crate::theme::Tokens::get(ui.ctx()).text_strong);}if ui.selectable_label(on, text).clicked() {d.fields.insert("family".into(), json!(fam));@@ -2630,6 +2656,9 @@ fn find_font(app: &mut DesignApp, ui: &mut egui::Ui, d: &mut Dialog) {crate::rtl::label(ui, egui::RichText::new(crate::i18n::tr(&app.ui.language, "Replace With")).font(semibold(12.0)));let db = crate::panels::fonts(app);let menu = crate::panels::font_menu(app);+ if d.s("toFamily").is_empty() {+ d.fields.insert("toFamily".into(), json!(designcraft_fonts::FALLBACK_FAMILY));+ }let english = app.session.prefs.show_font_names_in_english;let fam_opts: Vec<(&str, &str)> = menu.iter().map(|f| (f.family.as_str(), f.label(english))).collect();egui::Grid::new("ff_to").num_columns(2).spacing([8.0, 6.0]).show(ui, |ui| {@@ -2637,6 +2666,17 @@ fn find_font(app: &mut DesignApp, ui: &mut egui::Ui, d: &mut Dialog) {combo(ui, d, "toFamily", &fam_opts);ui.end_row();let styles = db.styles(&d.s("toFamily"));+ if !styles.iter().any(|style| style == &d.s("toStyle")) {+ let preferred = d.s("style");+ let style = styles+ .iter()+ .find(|s| s.eq_ignore_ascii_case(&preferred))+ .or_else(|| styles.iter().find(|s| s.eq_ignore_ascii_case("Regular")))+ .or_else(|| styles.first());+ if let Some(style) = style {+ d.fields.insert("toStyle".into(), json!(style));+ }+ }let st_opts: Vec<(&str, &str)> = styles.iter().map(|s| (s.as_str(), s.as_str())).collect();crate::rtl::label(ui, crate::i18n::tr(&app.ui.language, "Font Style:"));combo(ui, d, "toStyle", &st_opts);@@ -2644,9 +2684,12 @@ fn find_font(app: &mut DesignApp, ui: &mut egui::Ui, d: &mut Dialog) {});ui.label(crate::rtl::widget(ui,- egui::RichText::new(crate::i18n::tr(&app.ui.language, "OK changes all: text and paragraph/character styles."))- .color(crate::theme::Tokens::get(ui.ctx()).text_dim)- .size(11.0),+ egui::RichText::new(crate::i18n::tr(+ &app.ui.language,+ "Replace All updates this font throughout text and styles. Done keeps remaining fallback fonts.",+ ))+ .color(crate::theme::Tokens::get(ui.ctx()).text_dim)+ .size(11.0),));}diff --git a/crates/ui-egui/src/lib.rs b/crates/ui-egui/src/lib.rsindex 7b474fa21..0d7bb8a0b 100644--- a/crates/ui-egui/src/lib.rs+++ b/crates/ui-egui/src/lib.rs@@ -499,6 +499,24 @@ impl DesignApp {}let r = self.session.execute(id, ¶ms).map_err(|e| e.to_string());self.after_engine();+ if r.is_ok() && matches!(id, "file.open" | "file.openIdml" | "file.openBytes") {+ if self.ui.dialog.as_ref().is_some_and(|d| d.id == "findFont") {+ self.ui.dialog = None;+ }+ match self.session.execute("font.list", &json!({})) {+ Ok(fonts) if fonts.as_array().is_some_and(|fonts| fonts.iter().any(|f| f["missing"] == true || f["styleMissing"] == true)) => {+ self.ui.dialog = Some(dialogs::Dialog::new("findFont", json!({"_fonts": fonts, "onOpen": true})));+ }+ Err(e) => self.status(e.to_string()),+ _ => {}+ }+ }+ if r.is_ok()+ && matches!(id, "font.replace" | "edit.undo" | "edit.redo")+ && let Some(dialog) = self.ui.dialog.as_mut().filter(|d| d.id == "findFont")+ {+ dialog.fields.remove("_fonts");+ }if let Err(e) = &r {self.status(e.clone());}@@ -872,6 +890,40 @@ pub fn now_ms() -> f64 {mod tests {use super::*;+ #[test]+ fn opening_missing_fonts_offers_repeated_replacement_and_keeps_errors_visible() {+ let mut app = DesignApp::new(Session::new(), Services::default());+ app.run("file.new", json!({})).unwrap();+ app.run("frame.create", json!({"rect":[0,0,200,200], "content":"text", "text":"Sample"})).unwrap();+ let d = std::sync::Arc::make_mut(&mut app.session.doc_mut().unwrap().doc);+ let sid = *d.stories.keys().next().unwrap();+ d.story_mut(sid).unwrap().format_chars(0..6, |f| {+ f.over.font_family = Some("Unavailable Test Family".into());+ f.over.font_style = Some("Regular".into());+ });+ let path = std::env::temp_dir().join(format!("designcraft-font-open-{}.designcraft", std::process::id()));+ app.run("file.save", json!({"path":path})).unwrap();+ app.run("file.open", json!({"path":path})).unwrap();+ let dialog = app.ui.dialog.as_mut().unwrap();+ assert_eq!(dialog.id, "findFont");+ assert_eq!(dialog.fields["onOpen"], true);+ dialog.fields.insert("family".into(), json!("Unavailable Test Family"));+ dialog.fields.insert("style".into(), json!("Regular"));+ dialog.fields.insert("toFamily".into(), json!("Unavailable Target"));+ dialog.fields.insert("toStyle".into(), json!("Regular"));+ assert!(dialogs::confirm(&mut app).is_err());+ assert!(app.ui.dialog.as_ref().unwrap().fields.contains_key("error"));+ app.ui.dialog.as_mut().unwrap().fields.insert("toFamily".into(), json!("Source Sans 3"));+ dialogs::confirm(&mut app).unwrap();+ assert!(!app.ui.dialog.as_ref().unwrap().fields.contains_key("_fonts"));+ assert!(app.run("font.list", json!({})).unwrap().as_array().unwrap().iter().all(|f| f["missing"] == false));+ app.ui.dialog = None;+ app.run("file.save", json!({"path":path})).unwrap();+ app.run("file.open", json!({"path":path})).unwrap();+ assert!(app.ui.dialog.is_none());+ std::fs::remove_file(path).unwrap();+ }+#[test]fn snap_view_uses_the_saved_switches() {let mut ui = UiState::default();diff --git a/crates/ui-egui/src/theme.rs b/crates/ui-egui/src/theme.rsindex 6d86bb565..948e45c51 100644--- a/crates/ui-egui/src/theme.rs+++ b/crates/ui-egui/src/theme.rs@@ -255,7 +255,34 @@ impl Tokens {/// Install the UI fonts for the interface language `lang` (it orders the CJK fallbacks).pub fn install_fonts(ctx: &egui::Context, lang: &str) {- ctx.set_fonts(font_definitions(designcraft_fonts::CRAFT_FONTS, lang));+ let fonts = font_definitions(designcraft_fonts::CRAFT_FONTS, lang);+ #[cfg(not(target_arch = "wasm32"))]+ let fonts = {+ let mut fonts = fonts;+ // Local builds may omit craft-fonts. Use the shared resolver for readable document+ // names and font menus without bundling or copying installed fonts into the project.+ if designcraft_fonts::CRAFT_FONTS.is_empty() {+ let db = designcraft_fonts::FontDb::global();+ for c in ['中', 'あ', '한'] {+ if let Some(face) = db.fallback_for(c, u32::MAX, Some(lang)) {+ let name = format!("system-ui-{}", face.id());+ if fonts.font_data.contains_key(&name) {+ continue;+ }+ let mut data = FontData::from_owned(face.data().to_vec());+ data.index = face.index();+ fonts.font_data.insert(name.clone(), Arc::new(data));+ for (family, stack) in &mut fonts.families {+ if !matches!(family, FontFamily::Name(name) if name.starts_with("arabic")) {+ stack.push(name.clone());+ }+ }+ }+ }+ }+ fonts+ };+ ctx.set_fonts(fonts);}/// The UI fonts: the app's own, then the craft-fonts faces from `craft` (empty without