Merge upstream main 464a442 (7 PRs landed) into next

Landed: #119 #294 #144 #199 #248 #222 #223. #119 #144 #199 #248 #223 were
already on next; #222 (Spanish hyphenation) and #294 (Ukrainian catalog
test) are new here and come in whole. Each squash equals its landed PR
head (fetched to refs/remotes/pr-landed/N).

Conflict: contributors/people.toml: next's side (keeps emanuelebonaventura between moppeeer and thaynej)
Conflict: crates/doc/src/styles.rs: next's side (next's cell/table style tests)
Conflict: crates/pdf/src/export.rs: next's side in both hunks (no Exporter `interpolate` field on next; `let i = mode.interpolate` kept once)
Conflict: crates/ui-egui/src/dialogs.rs: confirm: next's `paragraphRules` arm; basic_character_formats: upstream's side (maintainer's font menu, see below)
Conflict: crates/ui-egui/src/i18n.rs: next's translated "Tint:" row
Conflict: crates/ui-egui/src/lib.rs: next's side (keeps ClipboardFn)
Conflict: crates/ui-egui/src/widgets.rs: next's side (next's numeric field grid test)

Maintainer edits in the landed PR heads:
- #119 (bfe02c9): inbox and PDF page dialog imports go through open_file; import_file uses opens_as_document. Already on next.
- #144 (fa5b942): paragraph_style_options reads a cloned doc; already on next. Basic Character Formats' Font Family is a ComboBox over font_menu_body (blank row clears a sparse family, "—" when unset). Taken from upstream in place of next's font_combo + "×" button.
- #199 (7afa9b7): one Properties test module with both tests. Already on next.
- #248 (856a432): people.toml keeps moppeeer and thaynej. Already on next.
- #222 (ac9b68d): ROADMAP Language line combines #199's "Properties ▸ Character" with #222's Spanish hyphenation note. Comes in with #222.
- #223 (c3d8a07): `mode.interpolate &= self.interpolate` and the decode check in lossless. The decode check is on next; the interpolate line is not, because next has no Exporter `interpolate` field and RasterMode::for_standard already turns interpolation off for every standard, PDF/A included.

Cargo.lock

@@ -912,6 +912,7 @@ dependencies = [
  "designcraft-doc",
  "designcraft-fonts",
  "designcraft-geom",
+ "hypher",
  "log",
  "miniz_oxide 0.8.9",
  "proptest",
@@ -2089,6 +2090,12 @@ version = "0.4.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70"
 
+[[package]]
+name = "hypher"
+version = "0.1.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "45f2b4f6b5da34d400d4c112eadcc14512cc5d04307a8eee182586d9bebd7ce6"
+
 [[package]]
 name = "icu_collections"
 version = "2.3.0"

NOTICE

@@ -18,6 +18,20 @@ list (author, source, license) is in ASSETS.md.
 - English hyphenation word list (assets/hyphenation/en-us.dic) — derived from the Moby Hyphenator II
   list by Grady Ward, public domain (Project Gutenberg eBook #3204). The hyphenation patterns
   (assets/hyphenation/en-us.pat) are trained from it by DesignCraft and released as CC0-1.0.
+- Spanish hyphenation patterns, embedded through the hypher crate (feature "spanish"):
+  hyph-es.tex 5.0 from hyph-utf8, https://github.com/hyphenation/tex-hyphen.
+  Copyright (C) 1993, 1997 Javier Bezos, 2001-2019 Javier Bezos, CervanTeX. MIT License:
+  Permission is hereby granted, free of charge, to any person obtaining a copy of this software
+  and associated documentation files (the "Software"), to deal in the Software without
+  restriction, including without limitation the rights to use, copy, modify, merge, publish,
+  distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the
+  Software is furnished to do so, subject to the following conditions: The above copyright notice
+  and this permission notice shall be included in all copies or substantial portions of the
+  Software. THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,
+  INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE
+  AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,
+  DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 - Japanese fonts (craft-fonts): builds made with craft-fonts (CRAFT_FONTS_DIR; all official
   releases) embed the fonts listed in
   https://github.com/storytold/craft-fonts/blob/main/ATTRIBUTION.md (BIZ UDPGothic, BIZ UDMincho,

ROADMAP.md

@@ -119,7 +119,7 @@ DesignCraft aims at full Adobe InDesign parity — and to be better: faster, ope
 - Edit ▸ Menus (`window.hideMenuItem`): hide menu items; menus with hidden items end in Show All Menu Items.
 - View ▸ Separations Preview (`view.separations`): one process plate as ink density, or areas over an ink limit in red (a GCR preview of the rendered view; spot plates and the flattener preview aren't there).
 - Separations Preview plates now come from each object's own colour (CMYK as authored; RGB and images through the colour settings, images via a cached 17³ table), so pure black shows only on the black plate.
-- Language (Character panel ▸ Language, Properties ▸ Character, `type.char {language}`): text in other languages isn't hyphenated or spell-checked with the English dictionaries, typographer's quotes follow the language (German „…“, French and Russian «…», Swiss, Spanish, Dutch, Nordic, Japanese and Traditional Chinese 「…」, Simplified Chinese “…”), the font's localized forms (OpenType `locl`: Turkish i, Bulgarian Cyrillic, Japanese / Chinese / Korean glyph variants) follow it too, and so does the fallback for CJK characters the font lacks (with Draw Missing Glyphs from Fallback Fonts on): Japanese, Simplified Chinese, Traditional Chinese and Korean each try their own installed system fonts (Japanese starts with the craft-fonts Japanese faces, Mincho first, when built with them; Hangul, kana and Bopomofo pick their language's fonts whatever the language). Language names from IDML keep their spelling; locale codes as InDesign writes them for some languages (`de_DE_2006`, `nl_NL_2005`; any `ll`, `ll_CC`, `ll-CC`) are their language and region for all of the above, and Chinese is also recognised in its common spellings ("Simplified Chinese", "Chinese (Traditional)", `zh_CN`, `zh-Hant`). Hyphenation dictionaries for other languages aren't bundled yet.
+- Language (Character panel ▸ Language, Properties ▸ Character, `type.char {language}`): text in other languages isn't hyphenated or spell-checked with the English dictionaries, typographer's quotes follow the language (German „…“, French and Russian «…», Swiss, Spanish, Dutch, Nordic, Japanese and Traditional Chinese 「…」, Simplified Chinese “…”), the font's localized forms (OpenType `locl`: Turkish i, Bulgarian Cyrillic, Japanese / Chinese / Korean glyph variants) follow it too, and so does the fallback for CJK characters the font lacks (with Draw Missing Glyphs from Fallback Fonts on): Japanese, Simplified Chinese, Traditional Chinese and Korean each try their own installed system fonts (Japanese starts with the craft-fonts Japanese faces, Mincho first, when built with them; Hangul, kana and Bopomofo pick their language's fonts whatever the language). Language names from IDML keep their spelling; locale codes as InDesign writes them for some languages (`de_DE_2006`, `nl_NL_2005`; any `ll`, `ll_CC`, `ll-CC`) are their language and region for all of the above, and Chinese is also recognised in its common spellings ("Simplified Chinese", "Chinese (Traditional)", `zh_CN`, `zh-Hant`). Spanish is hyphenated with Javier Bezos's Liang patterns (`hyph-es.tex` 5.0, MIT) through the `hypher` crate; hyphenation for other languages isn't bundled yet.
 - Books (`book.new/open/add/remove/list/styleSource/paginate/syncStyles/exportPdf`, Book panel): `.dcbook` files, continuous page numbering, style sync from a style source, one merged PDF.
 - Track Changes (`changes.track/list/acceptAll/rejectAll`, Type ▸ Track Changes): typing is marked added (highlighted on screen), deletions are kept but hidden from layout and exports until accepted or rejected. Per-change accept/reject and authors aren't there yet.
 - Track Changes: per-change Accept / Reject (`changes.accept`, `changes.reject`) and a Track Changes panel listing every change.

crates/compose/Cargo.toml

@@ -19,6 +19,7 @@ designcraft-fonts = { workspace = true }
 log = { workspace = true }
 regex = { workspace = true }
 miniz_oxide = "0.8"
+hypher = { version = "0.1.8", default-features = false, features = ["alloc", "spanish"] }
 
 [dev-dependencies]
 designcraft-fonts = { workspace = true, features = ["testing"] }

crates/compose/src/hyphen/mod.rs

@@ -1,6 +1,8 @@
-//! English hyphenation.
+//! Hyphenation. English uses the bundled dictionary and patterns below. Other languages use the
+//! Liang patterns compiled into `hypher`, one cargo feature per language: Spanish is Javier Bezos's
+//! `hyph-es.tex` 5.0 from hyph-utf8, MIT (see NOTICE).
 //!
-//! Lookup order for each word:
+//! English lookup order for each word:
 //! 1. the **dictionary** ([`Dictionary::en_us`]) — the public-domain Moby Hyphenator II word list
 //!    by Grady Ward (~160k words), stored compactly in `assets/hyphenation/en-us.dic`; simple
 //!    inflections (`'s`, `-s`, `-es`, `-ed`, `-d`) inherit the breaks of their stem;
@@ -61,6 +63,33 @@ impl Default for Limits {
     }
 }
 
+/// The hyphenator for a run of text.
+#[derive(Clone, Copy, Debug, PartialEq, Eq, Hash)]
+pub enum Lang {
+    English,
+    Patterns(hypher::Lang),
+}
+
+impl Lang {
+    /// The hyphenator for a language name or locale code (see [`designcraft_doc::language_tag`]).
+    /// None when the language has no bundled hyphenation.
+    pub fn for_language(language: &str) -> Option<Lang> {
+        if language.starts_with("English") {
+            return Some(Lang::English);
+        }
+        let tag = designcraft_doc::language_tag(language)?;
+        let sub = designcraft_doc::language_subtag(tag);
+        if sub == "en" {
+            return Some(Lang::English);
+        }
+        let b = sub.as_bytes();
+        if b.len() != 2 {
+            return None;
+        }
+        hypher::Lang::from_iso([b[0], b[1]]).map(Lang::Patterns)
+    }
+}
+
 /// Where a word's break points came from.
 #[derive(Clone, Copy, Debug, PartialEq, Eq)]
 pub enum Source {
@@ -79,11 +108,25 @@ fn is_word_char(c: char) -> bool {
 }
 
 /// Unrestricted break points of one lowercase core (letters and `'` only, no leading/trailing `'`).
-fn core_breaks(core: &[char]) -> (Vec<usize>, Source) {
+fn core_breaks(core: &[char], lang: Lang) -> (Vec<usize>, Source) {
     let n = core.len();
     if n < 2 {
         return (vec![], Source::None);
     }
+    if let Lang::Patterns(l) = lang {
+        if core.contains(&'\'') {
+            return (vec![], Source::None);
+        }
+        let s: String = core.iter().collect();
+        let mut out = Vec::new();
+        let mut at = 0;
+        let syl: Vec<&str> = hypher::hyphenate_bounded(&s, l, 1, 1).collect();
+        for part in &syl[..syl.len().saturating_sub(1)] {
+            at += part.chars().count();
+            out.push(at);
+        }
+        return (out, Source::Patterns);
+    }
     let dict = Dictionary::en_us();
     let s: String = core.iter().collect();
     let from_mask = |m: u64, len: usize| (1..len.min(64)).filter(|&i| m & (1 << i) != 0).collect::<Vec<_>>();
@@ -112,6 +155,11 @@ fn core_breaks(core: &[char]) -> (Vec<usize>, Source) {
 /// case, apostrophes (`don't`, `’s`), surrounding punctuation and compounds (each letter run is
 /// hyphenated separately). No break is ever placed next to an apostrophe or non-letter.
 pub fn word_breaks(word: &str) -> (Vec<usize>, Source) {
+    word_breaks_in(word, Lang::English)
+}
+
+/// [`word_breaks`] for a language.
+pub fn word_breaks_in(word: &str, lang: Lang) -> (Vec<usize>, Source) {
     let chars: Vec<char> = word.chars().collect();
     let mut out = Vec::new();
     let mut src = Source::None;
@@ -133,7 +181,7 @@ pub fn word_breaks(word: &str) -> (Vec<usize>, Source) {
             b -= 1;
         }
         let core: Vec<char> = chars[a..b].iter().map(|&c| if is_apostrophe(c) { '\'' } else { c.to_lowercase().next().unwrap_or(c) }).collect();
-        let (pts, s) = core_breaks(&core);
+        let (pts, s) = core_breaks(&core, lang);
         if src == Source::None {
             src = s;
         }
@@ -146,8 +194,13 @@ pub fn word_breaks(word: &str) -> (Vec<usize>, Source) {
 /// Allowed hyphenation points in `word` as char indices (a hyphen goes before that char), with
 /// the paragraph limits applied to each letter run.
 pub fn hyphen_points(word: &str, lim: &Limits) -> Vec<usize> {
+    hyphen_points_in(word, lim, Lang::English)
+}
+
+/// [`hyphen_points`] for a language.
+pub fn hyphen_points_in(word: &str, lim: &Limits, lang: Lang) -> Vec<usize> {
     let chars: Vec<char> = word.chars().collect();
-    let (pts, _) = word_breaks(word);
+    let (pts, _) = word_breaks_in(word, lang);
     if pts.is_empty() {
         return pts;
     }
@@ -319,6 +372,23 @@ mod tests {
         assert!(hyphen_points("typography", &lim).is_empty());
     }
 
+    #[test]
+    fn spanish_uses_the_bezos_patterns() {
+        let es = Lang::for_language("Spanish").unwrap();
+        assert_eq!(es, Lang::for_language("es_ES").unwrap());
+        let h = |w: &str| {
+            let pts = hyphen_points_in(w, &Limits::default(), es);
+            w.chars().enumerate().map(|(i, c)| if pts.contains(&i) { format!("-{c}") } else { c.to_string() }).collect::<String>()
+        };
+        assert_eq!(h("transición"), "tran-si-ción");
+        assert_eq!(h("pingüino"), "pin-güino");
+        assert_eq!(h("Construcción"), "Cons-truc-ción");
+        assert_eq!(h("desesperación"), "de-ses-pe-ra-ción");
+        assert_eq!(h("teatro"), "tea-tro", "a vowel run stays whole");
+        assert_eq!(h("calle"), "ca-lle", "ll stays whole");
+        assert!(Lang::for_language("French").is_none(), "only languages built in");
+    }
+
     #[test]
     fn heuristic_fallback() {
         let c: Vec<char> = "happen".chars().collect();

crates/compose/src/lib.rs

@@ -2844,9 +2844,14 @@ pub fn is_english(language: &str) -> bool {
     language.starts_with("English") || designcraft_doc::language_tag(language).is_some_and(|t| designcraft_doc::language_subtag(t) == "en")
 }
 
-/// Byte ranges of paragraph `prange` set in a language other than English (no English
-/// hyphenation there).
-fn foreign_ranges(doc: &Document, story: &designcraft_doc::Story, prange: Range<usize>, base: &designcraft_doc::CharProps) -> Vec<Range<usize>> {
+/// Byte ranges of paragraph `prange` set in a language other than English, with the hyphenator
+/// for that language (None: not hyphenated).
+fn foreign_ranges(
+    doc: &Document,
+    story: &designcraft_doc::Story,
+    prange: Range<usize>,
+    base: &designcraft_doc::CharProps,
+) -> Vec<(Range<usize>, Option<hyphen::Lang>)> {
     if is_english(&base.language)
         && story.runs().all(|(_, f)| f.over.language.as_deref().is_none_or(is_english) && f.style == designcraft_doc::story::NO_CHAR_STYLE)
     {
@@ -2855,12 +2860,19 @@ fn foreign_ranges(doc: &Document, story: &designcraft_doc::Story, prange: Range<
     story
         .runs()
         .filter(|(r, _)| r.start < prange.end && r.end > prange.start)
-        .filter(|(_, f)| !is_english(&doc.styles.resolve_char(base, f).language))
-        .map(|(r, _)| r)
+        .map(|(r, f)| (r, doc.styles.resolve_char(base, f).language.clone()))
+        .filter(|(_, l)| !is_english(l))
+        .map(|(r, l)| (r, hyphen::Lang::for_language(&l)))
         .collect()
 }
 
-fn hyphenation_points(text: &str, glyphs: &[Glyph], pp: &ParaProps, exceptions: &HashMap<String, Vec<usize>>, foreign: &[Range<usize>]) -> Vec<bool> {
+fn hyphenation_points(
+    text: &str,
+    glyphs: &[Glyph],
+    pp: &ParaProps,
+    exceptions: &HashMap<String, Vec<usize>>,
+    foreign: &[(Range<usize>, Option<hyphen::Lang>)],
+) -> Vec<bool> {
     let mut out = vec![false; glyphs.len()];
     if !pp.hyphenate {
         return out;
@@ -2872,7 +2884,7 @@ fn hyphenation_points(text: &str, glyphs: &[Glyph], pp: &ParaProps, exceptions:
         capitalized: pp.hyph_capitalized,
     };
     // Words repeat a lot: remember their points per set of limits.
-    static CACHE: Mutex<Vec<(LimitsKey, HashMap<Box<str>, Box<[usize]>>)>> = Mutex::new(Vec::new());
+    static CACHE: Mutex<Vec<(LimitsKey, HashMap<(hyphen::Lang, Box<str>), Box<[usize]>>)>> = Mutex::new(Vec::new());
     let key = (lim.min_word, lim.after_first, lim.before_last, lim.capitalized);
     let mut guard = CACHE.lock().unwrap_or_else(|e| e.into_inner());
     let idx = match guard.iter().position(|e| e.0 == key) {
@@ -2911,13 +2923,13 @@ fn hyphenation_points(text: &str, glyphs: &[Glyph], pp: &ParaProps, exceptions:
             let word = &text[a..b];
             // Do not hyphenate the paragraph's last word unless allowed.
             let is_last_word = !pp.hyph_last_word && glyphs[j..].iter().all(|g| !g.is_letter());
-            let in_foreign = foreign.iter().any(|r| r.contains(&a));
-            if !is_last_word && !in_foreign {
+            let lang = foreign.iter().find(|(r, _)| r.contains(&a)).map_or(Some(hyphen::Lang::English), |(_, l)| *l);
+            if !is_last_word && let Some(lang) = lang {
                 let user = (!exceptions.is_empty()).then(|| exceptions.get(&word.to_lowercase())).flatten();
                 let pts: &[usize] = match user {
                     // User dictionary exceptions win over the patterns and the built-in list.
                     Some(v) => v,
-                    None => cache.entry(word.into()).or_insert_with(|| hyphen::hyphen_points(word, &lim).into_boxed_slice()),
+                    None => cache.entry((lang, word.into())).or_insert_with(|| hyphen::hyphen_points_in(word, &lim, lang).into_boxed_slice()),
                 };
                 for &p in pts.iter() {
                     // char index p → byte → glyph whose cluster ends at that byte.

crates/compose/src/tests.rs

@@ -2348,6 +2348,27 @@ fn empty_paragraph_uses_its_own_mark_not_the_previous_one() {
     assert!((lines[1].baseline - lines[0].baseline - 8.0).abs() < 1e-6, "{} {}", lines[0].baseline, lines[1].baseline);
 }
 
+#[test]
+fn spanish_text_gets_spanish_hyphenation() {
+    let text = "La transición democrática fue una construcción colectiva extraordinariamente compleja y desesperadamente necesaria.";
+    let narrow = Rect::new(36.0, 36.0, 120.0, 700.0);
+    let (mut d, sid, _) = doc_with(text, narrow, ParaAttrs::default());
+    let st = d.story_mut(sid).unwrap();
+    let n = st.len();
+    st.format_chars(0..n, |f| f.over.language = Some("Spanish".into()));
+    let cs = compose_story(&d, sid, &ComposeOptions::default());
+    let lines = all_lines(&cs);
+    let hy: Vec<&str> = lines.iter().filter(|l| l.hyphenated).map(|l| text[l.range.clone()].trim_end()).collect();
+    assert!(!hy.is_empty(), "Spanish hyphenates");
+    for l in &hy {
+        let last: String = l.chars().rev().take_while(|c| c.is_alphabetic()).collect::<Vec<_>>().into_iter().rev().collect();
+        let whole = text[text.find(l).unwrap() + l.len() - last.len()..].split(|c: char| !c.is_alphabetic()).next().unwrap();
+        let es = hyphen::Lang::for_language("Spanish").unwrap();
+        let pts = hyphen::hyphen_points_in(whole, &hyphen::Limits::default(), es);
+        assert!(pts.contains(&last.chars().count()), "break {last}- in {whole} is a Bezos point");
+    }
+}
+
 #[test]
 fn cjk_aki_adds_space_without_scaling_outlines() {
     let (mut d, sid, _) = doc_with("AB", Rect::new(0.0, 0.0, 300.0, 100.0), ParaAttrs::default());

crates/ui-egui/src/dialogs.rs

@@ -2770,18 +2770,24 @@ fn basic_character_formats(app: &mut DesignApp, ui: &mut egui::Ui, d: &mut Dialo
     let lang = app.ui.language.clone();
     let lang = lang.as_str();
     let fonts = crate::panels::fonts(app);
+    let menu = crate::panels::font_menu(app);
     egui::Grid::new("psc").num_columns(2).spacing([8.0, 6.0]).show(ui, |ui| {
         crate::rtl::label(ui, crate::i18n::tr(lang, "Font Family:"));
         let fam = cf.get(d, "fontFamily").as_str().unwrap_or("").to_string();
-        ui.horizontal(|ui| {
-            if let Some(f) = crate::panels::font_combo(app, ui, "psfam", &fam, 200.0) {
-                cf.set(d, "fontFamily", json!(f));
-            }
-            // A style may leave the family unset.
-            if cf.sparse && !fam.is_empty() && ui.small_button("×").on_hover_text(crate::i18n::tr(lang, "Clear")).clicked() {
-                cf.set(d, "fontFamily", Value::Null);
-            }
-        });
+        let shown = if fam.is_empty() { "—".to_string() } else { crate::panels::font_label(app, &menu, &fam) };
+        egui::ComboBox::from_id_salt("psfam")
+            .selected_text(shown)
+            .width(200.0)
+            .height(440.0)
+            .close_behavior(egui::PopupCloseBehavior::CloseOnClickOutside)
+            .show_ui(ui, |ui| {
+                if cf.sparse && ui.selectable_label(fam.is_empty(), " ").clicked() {
+                    cf.set(d, "fontFamily", Value::Null);
+                }
+                if let Some(f) = crate::panels::font_menu_body(app, ui, &menu, &fam, 200.0) {
+                    cf.set(d, "fontFamily", json!(f));
+                }
+            });
         ui.end_row();
         crate::rtl::label(ui, crate::i18n::tr(lang, "Font Style:"));
         let sty = cf.get(d, "fontStyle").as_str().unwrap_or("").to_string();

crates/ui-egui/src/i18n.rs

@@ -2958,7 +2958,10 @@ mod tests {
         keys.extend(TABLE.iter().map(|(key, _)| *key));
         keys.extend(ar::TABLE.iter().map(|(key, _)| *key));
         keys.extend(pt_br::TABLE.iter().map(|(key, _)| *key));
-        assert_eq!(keys, catalog.keys().copied().collect());
+        // A new English string falls back to English until it is translated, so only stale
+        // entries (keys no catalog knows any more) fail.
+        let stale: Vec<_> = catalog.keys().filter(|k| !keys.contains(*k)).collect();
+        assert!(stale.is_empty(), "Ukrainian entries for unknown keys: {stale:?}");
         let placeholders =
             |s: &str| s.split('{').skip(1).filter_map(|part| part.split_once('}').map(|(name, _)| name.to_owned())).collect::<Vec<_>>();
         for (key, translation) in uk::TABLE {