From 61030150dc71f0eacdef5708103d42d618cc71e7 Mon Sep 17 00:00:00 2001
From: Martin Ball <martin.ball@ucscaregroup.co.uk>
Date: Mon, 2 Nov 2026 21:56:44 +0000
Subject: [PATCH] =?UTF-8?q?craft-proof=20cs,=20hr,=20it=20=E2=80=94=20a=20?=
 =?UTF-8?q?hyphenated=20word=20is=20looked=20up=20whole=20before=20its=20p?=
 =?UTF-8?q?arts,=20and=20an=20elision=20(l'ex-amico)=20is=20read=20in=20ea?=
 =?UTF-8?q?ch=20part=20(#496=20review)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
---
 crates/proof/src/cs/mod.rs | 11 ++++++++++-
 crates/proof/src/hr/mod.rs | 11 ++++++++++-
 crates/proof/src/it/mod.rs | 18 +++++++++++++++++-
 3 files changed, 37 insertions(+), 3 deletions(-)

diff --git a/crates/proof/src/cs/mod.rs b/crates/proof/src/cs/mod.rs
index 2be5e3f0..b1695140 100644
--- a/crates/proof/src/cs/mod.rs
+++ b/crates/proof/src/cs/mod.rs
@@ -63,7 +63,8 @@ fn check(d: &AffixDict, word: &str, opts: &crate::Options) -> bool {
         return true;
     };
     if w.contains('-') {
-        return w.split('-').all(|p| p.chars().count() <= 1 || known(d, p));
+        // The whole word first, as Hunspell does: a hyphenated entry or user word.
+        return known(d, w) || w.split('-').all(|p| p.chars().count() <= 1 || known(d, p));
     }
     known(d, w)
 }
@@ -142,6 +143,14 @@ mod tests {
         }
     }
 
+    /// craft-libs#496 review: a hyphenated dictionary entry is a word even when its parts aren't.
+    #[test]
+    fn a_hyphenated_entry_is_looked_up_whole() {
+        let d = AffixDict::from_hunspell("SET UTF-8\n", "1\ntic-tac\n", &[]).unwrap();
+        assert!(is_correct_with(&d, "tic-tac"));
+        assert!(!is_correct_with(&d, "tic-tacc"));
+    }
+
     #[test]
     fn missing_dictionary_and_ignored_inputs_are_quiet() {
         let empty = AffixDict::default();
diff --git a/crates/proof/src/hr/mod.rs b/crates/proof/src/hr/mod.rs
index 53edf067..e0bda809 100644
--- a/crates/proof/src/hr/mod.rs
+++ b/crates/proof/src/hr/mod.rs
@@ -65,7 +65,8 @@ fn check(d: &AffixDict, word: &str, opts: &crate::Options) -> bool {
         return true;
     };
     if w.contains('-') {
-        return w.split('-').all(|p| p.chars().count() <= 1 || known(d, p));
+        // The whole word first, as Hunspell does: a hyphenated entry or user word.
+        return known(d, w) || w.split('-').all(|p| p.chars().count() <= 1 || known(d, p));
     }
     known(d, w)
 }
@@ -105,6 +106,14 @@ mod tests {
         }
     }
 
+    /// craft-libs#496 review: a hyphenated dictionary entry is a word even when its parts aren't.
+    #[test]
+    fn a_hyphenated_entry_is_looked_up_whole() {
+        let d = AffixDict::from_hunspell("SET UTF-8\n", "1\ntic-tac\n", &[]).unwrap();
+        assert!(is_correct_with(&d, "tic-tac"));
+        assert!(!is_correct_with(&d, "tic-tacc"));
+    }
+
     #[test]
     fn missing_dictionary_is_silent() {
         assert!(is_correct_with(&AffixDict::default(), "nepostojećariječ"));
diff --git a/crates/proof/src/it/mod.rs b/crates/proof/src/it/mod.rs
index a742eaa2..44550501 100644
--- a/crates/proof/src/it/mod.rs
+++ b/crates/proof/src/it/mod.rs
@@ -97,8 +97,14 @@ fn check(d: &AffixDict, word: &str, opts: &crate::Options) -> bool {
     }
     // The whole word first, as Hunspell does: a hyphenated entry or user word.
     if w.contains('-') {
-        return known(d, w) || w.split('-').all(|p| p.chars().count() <= 1 || known(d, p));
+        return known(d, w) || w.split('-').all(|p| p.chars().count() <= 1 || known_elided(d, p));
     }
+    known_elided(d, w)
+}
+
+/// [`known`] for a word that may start with an elided proclitic (`l'amico`, `l'ex`): the word after
+/// the apostrophe is what gets checked.
+fn known_elided(d: &AffixDict, w: &str) -> bool {
     if let Some((head, tail)) = w.split_once(['\'', '’'])
         && PROCLITICS.contains(&head.to_lowercase().as_str())
         && !tail.is_empty()
@@ -148,6 +154,16 @@ mod tests {
         assert!(!is_correct_with(&d, "tic-tacc"));
     }
 
+    /// craft-libs#496 review: an elision inside a hyphenated word (`l'ex-amico`) is read per part.
+    #[test]
+    fn an_elision_in_a_hyphenated_part_is_read() {
+        let d = AffixDict::from_hunspell("SET UTF-8\n", "2\nex\namico\n", &[]).unwrap();
+        for w in ["l'ex-amico", "dell’ex-amico", "ex-amico"] {
+            assert!(is_correct_with(&d, w), "{w}");
+        }
+        assert!(!is_correct_with(&d, "l'exx-amico"));
+    }
+
     #[test]
     fn without_a_dictionary_nothing_is_flagged() {
         let none = AffixDict::default();