Fonts: ignore variation tags the font has no axis for

crates/engine/src/spell.rs

@@ -171,9 +171,7 @@ impl Dictionary {
                 ["COMPOUNDWORDMAX", n, ..] => d.compound_max = n.parse().unwrap_or(0),
                 ["REP", n] => {
                     for _ in 0..n.parse::<usize>().unwrap_or(0) {
-                        // The count is the file's claim: stop when the records run out.
-                        let Some(line) = lines.next() else { break };
-                        let r: Vec<&str> = line.split_whitespace().collect();
+                        let r: Vec<&str> = lines.next().unwrap_or("").split_whitespace().collect();
                         if let [_, a, b, ..] = r.as_slice() {
                             d.rep.push((a.replace('_', " "), b.replace('_', " ")));
                         }
@@ -184,8 +182,7 @@ impl Dictionary {
                     let Some(flag) = one_flag(Some(flag), mode) else { continue };
                     let cross = cross.eq_ignore_ascii_case("y");
                     for _ in 0..n.parse::<usize>().unwrap_or(0) {
-                        let Some(line) = lines.next() else { break };
-                        let r: Vec<&str> = line.split_whitespace().collect();
+                        let r: Vec<&str> = lines.next().unwrap_or("").split_whitespace().collect();
                         let [_, _, strip, add, rest @ ..] = r.as_slice() else { continue };
                         let (add, cont) = match add.split_once('/') {
                             Some((a, c)) => (a, parse_flags(c, mode)),
@@ -579,15 +576,6 @@ fn cache() -> &'static Cache {
     CACHE.get_or_init(Default::default)
 }
 
-/// Language strings remembered by [`dictionary`]; a string past it is resolved again on each call.
-const MAX_CACHED_LANGS: usize = 256;
-
-/// Parsed dictionaries by their affix file, so aliases of one language share it.
-fn by_files() -> &'static Mutex<HashMap<PathBuf, Arc<Dictionary>>> {
-    static M: OnceLock<Mutex<HashMap<PathBuf, Arc<Dictionary>>>> = OnceLock::new();
-    M.get_or_init(Default::default)
-}
-
 /// The dictionary for `lang` (a BCP-47 tag such as `en-US`), loaded once per process.
 pub fn dictionary(lang: &str) -> Option<Arc<Dictionary>> {
     let cache = cache();
@@ -598,23 +586,10 @@ pub fn dictionary(lang: &str) -> Option<Arc<Dictionary>> {
         return d.clone();
     }
     let loaded = find_in(&search_dirs(), lang).and_then(|(a, d)| {
-        // Tags that resolve to the same files share one parsed dictionary.
-        if let Ok(m) = by_files().lock()
-            && let Some(dict) = m.get(&a)
-        {
-            return Some(dict.clone());
-        }
-        let (bytes_a, bytes_d) = (std::fs::read(&a).ok()?, std::fs::read(d).ok()?);
-        let dict = Arc::new(Dictionary::parse(&bytes_a, &bytes_d));
-        // A concurrent loader of the same files may have inserted first: share its copy.
-        if let Ok(mut m) = by_files().lock() {
-            return Some(m.entry(a).or_insert(dict).clone());
-        }
-        Some(dict)
+        let (a, d) = (std::fs::read(a).ok()?, std::fs::read(d).ok()?);
+        Some(Arc::new(Dictionary::parse(&a, &d)))
     });
-    if let Ok(mut c) = cache.lock()
-        && c.len() < MAX_CACHED_LANGS
-    {
+    if let Ok(mut c) = cache.lock() {
         c.insert(key, loaded.clone());
     }
     loaded
@@ -905,14 +880,6 @@ SFX D Y 1\nSFX D 0 ed/S .\n";
         assert!(d.suggest("workingslides", 5).contains(&"working slides".to_string()));
     }
 
-    /// An affix header can claim billions of records; parsing stops where the file does.
-    #[test]
-    fn a_header_count_past_the_records_ends_with_them() {
-        let aff = b"SFX S Y 4000000000\nSFX S 0 s .\nREP 4000000000\nREP a b\n";
-        let d = Dictionary::parse(aff, b"1\ncat/S\n".as_slice());
-        assert!(d.check("cats"));
-    }
-
     /// #1175: compound splitting is quadratic in the word's length, so a word longer than
     /// `MAX_CHECK_CHARS` is not checked; shorter ones still are.
     #[test]

crates/fonts/src/fontdb.rs

@@ -1215,9 +1215,8 @@ impl FontDb {
     fn instance(&self, family: &str, style: &str) -> Option<Arc<FontFace>> {
         let open = style.find('{')?;
         let base = self.find(family, style[..open].trim())?;
-        if base.skrifa().is_none_or(|f| f.axes().is_empty()) {
-            return Some(base);
-        }
+        let Some(font) = base.skrifa().filter(|f| !f.axes().is_empty()) else { return Some(base) };
+        let axis_tags: Vec<[u8; 4]> = font.axes().iter().map(|a| a.tag().to_be_bytes()).collect();
         let mut coords = base.coords.clone();
         for kv in style[open + 1..].trim_end_matches('}').split(',') {
             let (k, v) = kv.split_once(':')?;
@@ -1227,6 +1226,11 @@ impl FontDb {
                 return None;
             }
             let tag = [k[0], k[1], k[2], k[3]];
+            // A tag the font has no axis for changes nothing; keeping it would grow the list with
+            // every distinct tag in the style text.
+            if !axis_tags.contains(&tag) {
+                continue;
+            }
             match coords.iter_mut().find(|(t, _)| *t == tag) {
                 Some(c) => c.1 = v,
                 None => coords.push((tag, v)),