From 506a4194beef138cfc9b121b71f73147a0c3cf55 Mon Sep 17 00:00:00 2001
From: Edgar Geier <egeier@rhrk.uni-kl.de>
Date: Wed, 1 Mar 2023 02:50:10 +0100
Subject: [PATCH 1/5] Make `FontSystem` not self-referencing

---
 Cargo.toml                |   1 -
 src/cache.rs              |  10 ++-
 src/font/fallback/mod.rs  |  31 ++++---
 src/font/matches.rs       |  14 ---
 src/font/mod.rs           |  41 ++++++++-
 src/font/system/no_std.rs |  33 ++++---
 src/font/system/redox.rs  |  33 ++++---
 src/font/system/std.rs    | 177 ++++++++++++++++++--------------------
 src/shape.rs              |  33 +++----
 src/swash.rs              |   8 +-
 10 files changed, 206 insertions(+), 175 deletions(-)
 delete mode 100644 src/font/matches.rs

diff --git a/Cargo.toml b/Cargo.toml
index 1e82553..0cd125f 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -12,7 +12,6 @@ repository = "https://github.com/pop-os/cosmic-text"
 fontdb = { version = "0.10.0", default-features = false }
 libm = "0.2.6"
 log = "0.4.17"
-ouroboros = "0.15.5"
 rustybuzz = { version = "0.6.0", default-features = false, features = ["libm"] }
 swash = { version = "0.1.6", optional = true }
 syntect = { version = "5.0.0", optional = true }
diff --git a/src/cache.rs b/src/cache.rs
index ce93b38..0da1f52 100644
--- a/src/cache.rs
+++ b/src/cache.rs
@@ -1,10 +1,12 @@
 // SPDX-License-Identifier: MIT OR Apache-2.0
 
+use crate::FontKey;
+
 /// Key for building a glyph cache
 #[derive(Clone, Copy, Debug, Eq, Hash, Ord, PartialEq, PartialOrd)]
 pub struct CacheKey {
-    /// Font ID
-    pub font_id: fontdb::ID,
+    /// Font key
+    pub font_key: FontKey,
     /// Glyph ID
     pub glyph_id: u16,
     /// `f32` bits of font size
@@ -17,7 +19,7 @@ pub struct CacheKey {
 
 impl CacheKey {
     pub fn new(
-        font_id: fontdb::ID,
+        font_key: FontKey,
         glyph_id: u16,
         font_size: f32,
         pos: (f32, f32),
@@ -26,7 +28,7 @@ impl CacheKey {
         let (y, y_bin) = SubpixelBin::new(pos.1);
         (
             Self {
-                font_id,
+                font_key,
                 glyph_id,
                 font_size_bits: font_size.to_bits(),
                 x_bin,
diff --git a/src/font/fallback/mod.rs b/src/font/fallback/mod.rs
index 7b8fa8c..dec12d9 100644
--- a/src/font/fallback/mod.rs
+++ b/src/font/fallback/mod.rs
@@ -1,11 +1,10 @@
 // SPDX-License-Identifier: MIT OR Apache-2.0
 
-use alloc::sync::Arc;
 #[cfg(not(feature = "std"))]
 use alloc::vec::Vec;
 use unicode_script::Script;
 
-use crate::Font;
+use crate::{Font, FontKey};
 
 use self::platform::*;
 
@@ -26,7 +25,8 @@ mod platform;
 mod platform;
 
 pub struct FontFallbackIter<'a> {
-    fonts: &'a [Arc<Font<'a>>],
+    db: &'a fontdb::Database,
+    font_keys: &'a [FontKey],
     default_families: &'a [&'a str],
     default_i: usize,
     scripts: Vec<Script>,
@@ -39,13 +39,15 @@ pub struct FontFallbackIter<'a> {
 
 impl<'a> FontFallbackIter<'a> {
     pub fn new(
-        fonts: &'a [Arc<Font<'a>>],
+        db: &'a fontdb::Database,
+        font_keys: &'a [FontKey],
         default_families: &'a [&'a str],
         scripts: Vec<Script>,
         locale: &'a str,
     ) -> Self {
         Self {
-            fonts,
+            db,
+            font_keys,
             default_families,
             default_i: 0,
             scripts,
@@ -66,7 +68,8 @@ impl<'a> FontFallbackIter<'a> {
                 word
             );
         } else if self.other_i > 0 {
-            let font = &self.fonts[self.other_i - 1];
+            let font_key = self.font_keys[self.other_i - 1];
+            let font = Font::from_key(self.db, font_key).expect("invalid font key");
             log::debug!(
                 "Failed to find preset fallback for {:?} locale '{}', used '{}': '{}'",
                 self.scripts,
@@ -88,13 +91,14 @@ impl<'a> FontFallbackIter<'a> {
 }
 
 impl<'a> Iterator for FontFallbackIter<'a> {
-    type Item = &'a Arc<Font<'a>>;
+    type Item = Font<'a>;
     fn next(&mut self) -> Option<Self::Item> {
         while self.default_i < self.default_families.len() {
             let default_family = self.default_families[self.default_i];
             self.default_i += 1;
 
-            for font in self.fonts.iter() {
+            for font_key in self.font_keys.iter().copied() {
+                let font = Font::from_key(self.db, font_key).expect("invalid font key");
                 if font.info.family == default_family {
                     return Some(font);
                 }
@@ -108,7 +112,8 @@ impl<'a> Iterator for FontFallbackIter<'a> {
             while self.script_i.1 < script_families.len() {
                 let script_family = script_families[self.script_i.1];
                 self.script_i.1 += 1;
-                for font in self.fonts.iter() {
+                for font_key in self.font_keys.iter().copied() {
+                    let font = Font::from_key(self.db, font_key).expect("invalid font key");
                     if font.info.family == script_family {
                         return Some(font);
                     }
@@ -129,7 +134,8 @@ impl<'a> Iterator for FontFallbackIter<'a> {
         while self.common_i < common_families.len() {
             let common_family = common_families[self.common_i];
             self.common_i += 1;
-            for font in self.fonts.iter() {
+            for font_key in self.font_keys.iter().copied() {
+                let font = Font::from_key(self.db, font_key).expect("invalid font key");
                 if font.info.family == common_family {
                     return Some(font);
                 }
@@ -140,8 +146,9 @@ impl<'a> Iterator for FontFallbackIter<'a> {
         //TODO: do we need to do this?
         //TODO: do not evaluate fonts more than once!
         let forbidden_families = forbidden_fallback();
-        while self.other_i < self.fonts.len() {
-            let font = &self.fonts[self.other_i];
+        while self.other_i < self.font_keys.len() {
+            let font_key = self.font_keys[self.other_i];
+            let font = Font::from_key(self.db, font_key).expect("invalid font key");
             self.other_i += 1;
             if !forbidden_families.contains(&font.info.family.as_str()) {
                 return Some(font);
diff --git a/src/font/matches.rs b/src/font/matches.rs
deleted file mode 100644
index 4b9cab2..0000000
--- a/src/font/matches.rs
+++ /dev/null
@@ -1,14 +0,0 @@
-// SPDX-License-Identifier: MIT OR Apache-2.0
-
-use alloc::sync::Arc;
-#[cfg(not(feature = "std"))]
-use alloc::{string::String, vec::Vec};
-
-use crate::Font;
-
-/// Fonts that match a pattern
-pub struct FontMatches<'a> {
-    pub locale: &'a str,
-    pub default_family: String,
-    pub fonts: Vec<Arc<Font<'a>>>,
-}
diff --git a/src/font/mod.rs b/src/font/mod.rs
index f82481b..1a116f9 100644
--- a/src/font/mod.rs
+++ b/src/font/mod.rs
@@ -4,12 +4,17 @@ use core::ops::Deref;
 
 pub(crate) mod fallback;
 
-pub use self::matches::*;
-mod matches;
-
 pub use self::system::*;
 mod system;
 
+#[derive(Clone, Copy, Debug, Eq, Hash, Ord, PartialEq, PartialOrd)]
+/// Identifies a [`Font`] in a [`FontSystem`]
+pub struct FontKey {
+    pub id: fontdb::ID,
+    #[cfg(feature = "swash")]
+    pub swash: (u32, swash::CacheKey),
+}
+
 /// A font
 pub struct Font<'a> {
     pub info: &'a fontdb::FaceInfo,
@@ -44,6 +49,36 @@ impl<'a> Font<'a> {
         })
     }
 
+    pub fn from_key(db: &'a fontdb::Database, key: FontKey) -> Option<Self> {
+        let info = db.face(key.id)?;
+        let data = match &info.source {
+            fontdb::Source::Binary(data) => data.deref().as_ref(),
+            #[cfg(feature = "std")]
+            fontdb::Source::File(path) => {
+                log::warn!("Unsupported fontdb Source::File('{}')", path.display());
+                return None;
+            }
+            #[cfg(feature = "std")]
+            fontdb::Source::SharedFile(_path, data) => data.deref().as_ref(),
+        };
+
+        Some(Self {
+            info,
+            data,
+            rustybuzz: rustybuzz::Face::from_slice(data, info.index)?,
+            #[cfg(feature = "swash")]
+            swash: key.swash,
+        })
+    }
+
+    pub fn key(&self) -> FontKey {
+        FontKey {
+            id: self.info.id,
+            #[cfg(feature = "swash")]
+            swash: self.swash,
+        }
+    }
+
     #[cfg(feature = "swash")]
     pub fn as_swash(&self) -> swash::FontRef {
         swash::FontRef {
diff --git a/src/font/system/no_std.rs b/src/font/system/no_std.rs
index 6542310..bbe0bde 100644
--- a/src/font/system/no_std.rs
+++ b/src/font/system/no_std.rs
@@ -6,7 +6,7 @@ use alloc::{
     vec::Vec,
 };
 
-use crate::{Attrs, Font, FontMatches};
+use crate::{Attrs, Font, FontKey};
 
 /// Access system fonts
 pub struct FontSystem {
@@ -45,33 +45,38 @@ impl FontSystem {
 
     // Clippy false positive
     #[allow(clippy::needless_lifetimes)]
-    pub fn get_font<'a>(&'a self, id: fontdb::ID) -> Option<Arc<Font<'a>>> {
-        let face = self.db.face(id)?;
-        match Font::new(face) {
-            Some(font) => Some(Arc::new(font)),
+    pub fn get_font<'a>(&'a self, key: FontKey) -> Option<Font<'a>> {
+        match Font::from_key(&self.db, key) {
+            Some(font) => Some(font),
             None => {
+                let face = self.db.face(key.id)?;
                 log::warn!("failed to load font '{}'", face.post_script_name);
                 None
             }
         }
     }
 
-    pub fn get_font_matches<'a>(&'a self, attrs: Attrs) -> Arc<FontMatches<'a>> {
-        let mut fonts = Vec::new();
+    pub fn get_font_key(&self, id: fontdb::ID) -> Option<FontKey> {
+        Some(Font::new(self.db.face(id)?)?.key())
+    }
+
+    pub fn get_font_matches(&self, attrs: Attrs) -> Arc<Vec<FontKey>> {
+        let mut font_keys = Vec::new();
         for face in self.db.faces() {
             if !attrs.matches(face) {
                 continue;
             }
 
-            if let Some(font) = self.get_font(face.id) {
-                fonts.push(font);
+            let font_key = match self.get_font_key(face.id) {
+                Some(font_key) => font_key,
+                None => continue,
+            };
+
+            if self.get_font(font_key).is_some() {
+                font_keys.push(font_key);
             }
         }
 
-        Arc::new(FontMatches {
-            locale: &self.locale,
-            default_family: self.db.family_name(&attrs.family).to_string(),
-            fonts,
-        })
+        Arc::new(font_keys)
     }
 }
diff --git a/src/font/system/redox.rs b/src/font/system/redox.rs
index 3ba463d..0e830bb 100644
--- a/src/font/system/redox.rs
+++ b/src/font/system/redox.rs
@@ -6,7 +6,7 @@ use alloc::{
     vec::Vec,
 };
 
-use crate::{Attrs, Font, FontMatches};
+use crate::{Attrs, Font, FontKey};
 
 /// Access system fonts
 pub struct FontSystem {
@@ -71,33 +71,38 @@ impl FontSystem {
 
     // Clippy false positive
     #[allow(clippy::needless_lifetimes)]
-    pub fn get_font<'a>(&'a self, id: fontdb::ID) -> Option<Arc<Font<'a>>> {
-        let face = self.db.face(id)?;
-        match Font::new(face) {
-            Some(font) => Some(Arc::new(font)),
+    pub fn get_font<'a>(&'a self, key: FontKey) -> Option<Font<'a>> {
+        match Font::from_key(&self.db, key) {
+            Some(font) => Some(font),
             None => {
+                let face = self.db.face(key.id)?;
                 log::warn!("failed to load font '{}'", face.post_script_name);
                 None
             }
         }
     }
 
-    pub fn get_font_matches<'a>(&'a self, attrs: Attrs) -> Arc<FontMatches<'a>> {
-        let mut fonts = Vec::new();
+    pub fn get_font_key(&self, id: fontdb::ID) -> Option<FontKey> {
+        Some(Font::new(self.db.face(id)?)?.key())
+    }
+
+    pub fn get_font_matches<'a>(&'a self, attrs: Attrs) -> Arc<Vec<FontKey>> {
+        let mut font_keys = Vec::new();
         for face in self.db.faces() {
             if !attrs.matches(face) {
                 continue;
             }
 
-            if let Some(font) = self.get_font(face.id) {
-                fonts.push(font);
+            let font_key = match self.get_font_key(face.id) {
+                Some(font_key) => font_key,
+                None => continue,
+            };
+
+            if self.get_font(font_key).is_some() {
+                font_keys.push(font_key);
             }
         }
 
-        Arc::new(FontMatches {
-            locale: &self.locale,
-            default_family: self.db.family_name(&attrs.family).to_string(),
-            fonts,
-        })
+        Arc::new(font_keys)
     }
 }
diff --git a/src/font/system/std.rs b/src/font/system/std.rs
index 53fb10d..c3474ac 100644
--- a/src/font/system/std.rs
+++ b/src/font/system/std.rs
@@ -1,26 +1,22 @@
 // SPDX-License-Identifier: MIT OR Apache-2.0
 
+#[cfg(feature = "swash")]
+use std::collections::hash_map::Entry;
 use std::{
     collections::HashMap,
     sync::{Arc, Mutex},
 };
 
-use crate::{Attrs, AttrsOwned, Font, FontMatches};
-
-#[ouroboros::self_referencing]
-struct FontSystemInner {
-    locale: String,
-    db: fontdb::Database,
-    #[borrows(db)]
-    #[not_covariant]
-    font_cache: Mutex<HashMap<fontdb::ID, Option<Arc<Font<'this>>>>>,
-    #[borrows(locale, db)]
-    #[not_covariant]
-    font_matches_cache: Mutex<HashMap<AttrsOwned, Arc<FontMatches<'this>>>>,
-}
+use crate::{Attrs, AttrsOwned, Font, FontKey};
 
 /// Access system fonts
-pub struct FontSystem(FontSystemInner);
+pub struct FontSystem {
+    locale: String,
+    db: fontdb::Database,
+    font_matches_cache: Mutex<HashMap<AttrsOwned, Arc<Vec<FontKey>>>>,
+    #[cfg(feature = "swash")]
+    font_key_cache: Mutex<HashMap<fontdb::ID, Option<FontKey>>>,
+}
 
 impl FontSystem {
     /// Create a new [`FontSystem`], that allows access to any installed system fonts
@@ -90,97 +86,92 @@ impl FontSystem {
             );
         }
 
-        Self(
-            FontSystemInnerBuilder {
-                locale,
-                db,
-                font_cache_builder: |_| Mutex::new(HashMap::new()),
-                font_matches_cache_builder: |_, _| Mutex::new(HashMap::new()),
-            }
-            .build(),
-        )
+        Self {
+            locale,
+            db,
+            font_matches_cache: Mutex::new(HashMap::new()),
+            #[cfg(feature = "swash")]
+            font_key_cache: Mutex::new(HashMap::new()),
+        }
     }
 
     pub fn locale(&self) -> &str {
-        self.0.borrow_locale()
+        &self.locale
     }
 
     pub fn db(&self) -> &fontdb::Database {
-        self.0.borrow_db()
+        &self.db
     }
 
     pub fn into_locale_and_db(self) -> (String, fontdb::Database) {
-        let heads = self.0.into_heads();
-        (heads.locale, heads.db)
+        (self.locale, self.db)
     }
 
     // Clippy false positive
     #[allow(clippy::needless_lifetimes)]
-    pub fn get_font<'a>(&'a self, id: fontdb::ID) -> Option<Arc<Font<'a>>> {
-        self.0.with(|fields| get_font(&fields, id))
-    }
-
-    pub fn get_font_matches<'a>(&'a self, attrs: Attrs) -> Arc<FontMatches<'a>> {
-        self.0.with(|fields| {
-            let mut font_matches_cache = fields
-                .font_matches_cache
-                .lock()
-                .expect("failed to lock font matches cache");
-            //TODO: do not create AttrsOwned unless entry does not already exist
-            font_matches_cache
-                .entry(AttrsOwned::new(attrs))
-                .or_insert_with(|| {
-                    #[cfg(not(target_arch = "wasm32"))]
-                    let now = std::time::Instant::now();
-
-                    let mut fonts = Vec::new();
-                    for face in fields.db.faces() {
-                        if !attrs.matches(face) {
-                            continue;
-                        }
-
-                        if let Some(font) = get_font(&fields, face.id) {
-                            fonts.push(font);
-                        }
-                    }
-
-                    let font_matches = Arc::new(FontMatches {
-                        locale: fields.locale,
-                        default_family: fields.db.family_name(&attrs.family).to_string(),
-                        fonts,
-                    });
-
-                    #[cfg(not(target_arch = "wasm32"))]
-                    {
-                        let elapsed = now.elapsed();
-                        log::debug!("font matches for {:?} in {:?}", attrs, elapsed);
-                    }
-
-                    font_matches
-                })
-                .clone()
-        })
-    }
-}
-
-fn get_font<'b>(
-    fields: &ouroboros_impl_font_system_inner::BorrowedFields<'_, 'b>,
-    id: fontdb::ID,
-) -> Option<Arc<Font<'b>>> {
-    fields
-        .font_cache
-        .lock()
-        .expect("failed to lock font cache")
-        .entry(id)
-        .or_insert_with(|| {
-            let face = fields.db.face(id)?;
-            match Font::new(face) {
-                Some(font) => Some(Arc::new(font)),
-                None => {
-                    log::warn!("failed to load font '{}'", face.post_script_name);
-                    None
-                }
+    pub fn get_font<'a>(&'a self, key: FontKey) -> Option<Font<'a>> {
+        match Font::from_key(&self.db, key) {
+            Some(font) => Some(font),
+            None => {
+                let face = self.db.face(key.id)?;
+                log::warn!("failed to load font '{}'", face.post_script_name);
+                None
             }
-        })
-        .clone()
+        }
+    }
+
+    #[cfg(feature = "swash")]
+    pub fn get_font_key(&self, id: fontdb::ID) -> Option<FontKey> {
+        let mut font_key_cache = self
+            .font_key_cache
+            .lock()
+            .expect("failed to lock font matches cache");
+        match font_key_cache.entry(id) {
+            Entry::Occupied(entry) => *entry.get(),
+            Entry::Vacant(entry) => {
+                let key = self.db.face(id).and_then(Font::new).as_ref().map(Font::key);
+                entry.insert(key);
+                key
+            }
+        }
+    }
+
+    #[cfg(not(feature = "swash"))]
+    pub fn get_font_key(&self, id: fontdb::ID) -> Option<FontKey> {
+        Some(Font::new(self.db.face(id)?)?.key())
+    }
+
+    pub fn get_font_matches(&self, attrs: Attrs) -> Arc<Vec<FontKey>> {
+        let mut font_matches_cache = self
+            .font_matches_cache
+            .lock()
+            .expect("failed to lock font matches cache");
+        //TODO: do not create AttrsOwned unless entry does not already exist
+        font_matches_cache
+            .entry(AttrsOwned::new(attrs))
+            .or_insert_with(|| {
+                #[cfg(not(target_arch = "wasm32"))]
+                let now = std::time::Instant::now();
+
+                let mut font_keys = Vec::new();
+                for face in self.db.faces() {
+                    if !attrs.matches(face) {
+                        continue;
+                    }
+
+                    if let Some(key) = self.get_font_key(face.id) {
+                        font_keys.push(key);
+                    }
+                }
+
+                #[cfg(not(target_arch = "wasm32"))]
+                {
+                    let elapsed = now.elapsed();
+                    log::debug!("font matches for {:?} in {:?}", attrs, elapsed);
+                }
+
+                Arc::new(font_keys)
+            })
+            .clone()
+    }
 }
diff --git a/src/shape.rs b/src/shape.rs
index 4136d97..c4a0fce 100644
--- a/src/shape.rs
+++ b/src/shape.rs
@@ -9,7 +9,9 @@ use unicode_script::{Script, UnicodeScript};
 use unicode_segmentation::UnicodeSegmentation;
 
 use crate::fallback::FontFallbackIter;
-use crate::{Align, AttrsList, CacheKey, Color, Font, FontSystem, LayoutGlyph, LayoutLine, Wrap};
+use crate::{
+    Align, AttrsList, CacheKey, Color, Font, FontKey, FontSystem, LayoutGlyph, LayoutLine, Wrap,
+};
 
 fn shape_fallback(
     font: &Font,
@@ -62,7 +64,7 @@ fn shape_fallback(
             y_advance,
             x_offset,
             y_offset,
-            font_id: font.info.id,
+            font_key: font.key(),
             glyph_id: info.glyph_id.try_into().expect("failed to cast glyph ID"),
             //TODO: color should not be related to shaping
             color_opt: attrs.color_opt,
@@ -125,22 +127,21 @@ fn shape_run(
 
     let font_matches = font_system.get_font_matches(attrs);
 
-    let default_families = [font_matches.default_family.as_str()];
+    let db = font_system.db();
+
+    let default_families = [db.family_name(&attrs.family)];
     let mut font_iter = FontFallbackIter::new(
-        &font_matches.fonts,
+        db,
+        &font_matches,
         &default_families,
         scripts,
-        font_matches.locale,
+        font_system.locale(),
     );
 
-    let (mut glyphs, mut missing) = shape_fallback(
-        font_iter.next().expect("no default font found"),
-        line,
-        attrs_list,
-        start_run,
-        end_run,
-        span_rtl,
-    );
+    let font = font_iter.next().expect("no default font found");
+
+    let (mut glyphs, mut missing) =
+        shape_fallback(&font, line, attrs_list, start_run, end_run, span_rtl);
 
     //TODO: improve performance!
     while !missing.is_empty() {
@@ -151,7 +152,7 @@ fn shape_run(
 
         log::trace!("Evaluating fallback with font '{}'", font.info.family);
         let (mut fb_glyphs, fb_missing) =
-            shape_fallback(font, line, attrs_list, start_run, end_run, span_rtl);
+            shape_fallback(&font, line, attrs_list, start_run, end_run, span_rtl);
 
         // Insert all matching glyphs
         let mut fb_i = 0;
@@ -228,7 +229,7 @@ pub struct ShapeGlyph {
     pub y_advance: f32,
     pub x_offset: f32,
     pub y_offset: f32,
-    pub font_id: fontdb::ID,
+    pub font_key: FontKey,
     pub glyph_id: u16,
     pub color_opt: Option<Color>,
     pub metadata: usize,
@@ -247,7 +248,7 @@ impl ShapeGlyph {
         let y_offset = font_size * self.y_offset;
 
         let (cache_key, x_int, y_int) = CacheKey::new(
-            self.font_id,
+            self.font_key,
             self.glyph_id,
             font_size,
             (x + x_offset, y - y_offset),
diff --git a/src/swash.rs b/src/swash.rs
index f951c3e..93ac074 100644
--- a/src/swash.rs
+++ b/src/swash.rs
@@ -20,10 +20,10 @@ fn swash_image(
     context: &mut ScaleContext,
     cache_key: CacheKey,
 ) -> Option<SwashImage> {
-    let font = match font_system.get_font(cache_key.font_id) {
+    let font = match font_system.get_font(cache_key.font_key) {
         Some(some) => some,
         None => {
-            log::warn!("did not find font {:?}", cache_key.font_id);
+            log::warn!("did not find font {:?}", cache_key.font_key.id);
             return None;
         }
     };
@@ -63,10 +63,10 @@ fn swash_outline_commands(
 ) -> Option<Vec<swash::zeno::Command>> {
     use swash::zeno::PathData as _;
 
-    let font = match font_system.get_font(cache_key.font_id) {
+    let font = match font_system.get_font(cache_key.font_key) {
         Some(some) => some,
         None => {
-            log::warn!("did not find font {:?}", cache_key.font_id);
+            log::warn!("did not find font {:?}", cache_key.font_key.id);
             return None;
         }
     };

From 750d98842953c92448f617cc976c42260aa9df8e Mon Sep 17 00:00:00 2001
From: Edgar Geier <egeier@rhrk.uni-kl.de>
Date: Wed, 1 Mar 2023 12:15:58 +0100
Subject: [PATCH 2/5] Make `FontKey` `repr(transparent)` if `swash` feature is
 disabled

---
 src/font/mod.rs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/font/mod.rs b/src/font/mod.rs
index 1a116f9..066656f 100644
--- a/src/font/mod.rs
+++ b/src/font/mod.rs
@@ -8,6 +8,7 @@ pub use self::system::*;
 mod system;
 
 #[derive(Clone, Copy, Debug, Eq, Hash, Ord, PartialEq, PartialOrd)]
+#[cfg_attr(not(feature = "swash"), repr(transparent))]
 /// Identifies a [`Font`] in a [`FontSystem`]
 pub struct FontKey {
     pub id: fontdb::ID,

From f8bc71af0a2b18a0b28cf532358760a3d519a881 Mon Sep 17 00:00:00 2001
From: Edgar Geier <egeier@rhrk.uni-kl.de>
Date: Wed, 1 Mar 2023 11:50:10 +0100
Subject: [PATCH 3/5] Update fontdb dependency to version 0.13

---
 Cargo.toml               |  2 +-
 src/font/fallback/mod.rs | 13 ++++++++-----
 src/font/mod.rs          | 12 ++++++++++++
 src/font/system/redox.rs |  3 +--
 src/font/system/std.rs   |  3 +--
 src/shape.rs             |  2 +-
 6 files changed, 24 insertions(+), 11 deletions(-)

diff --git a/Cargo.toml b/Cargo.toml
index 0cd125f..8bc754e 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -9,7 +9,7 @@ documentation = "https://docs.rs/cosmic-text/latest/cosmic_text/"
 repository = "https://github.com/pop-os/cosmic-text"
 
 [dependencies]
-fontdb = { version = "0.10.0", default-features = false }
+fontdb = { version = "0.13.0", default-features = false }
 libm = "0.2.6"
 log = "0.4.17"
 rustybuzz = { version = "0.6.0", default-features = false, features = ["libm"] }
diff --git a/src/font/fallback/mod.rs b/src/font/fallback/mod.rs
index dec12d9..752bd02 100644
--- a/src/font/fallback/mod.rs
+++ b/src/font/fallback/mod.rs
@@ -74,7 +74,7 @@ impl<'a> FontFallbackIter<'a> {
                 "Failed to find preset fallback for {:?} locale '{}', used '{}': '{}'",
                 self.scripts,
                 self.locale,
-                font.info.family,
+                font.name(),
                 word
             );
         } else if !self.scripts.is_empty() && self.common_i > 0 {
@@ -99,7 +99,7 @@ impl<'a> Iterator for FontFallbackIter<'a> {
 
             for font_key in self.font_keys.iter().copied() {
                 let font = Font::from_key(self.db, font_key).expect("invalid font key");
-                if font.info.family == default_family {
+                if font.contains_family(default_family) {
                     return Some(font);
                 }
             }
@@ -114,7 +114,7 @@ impl<'a> Iterator for FontFallbackIter<'a> {
                 self.script_i.1 += 1;
                 for font_key in self.font_keys.iter().copied() {
                     let font = Font::from_key(self.db, font_key).expect("invalid font key");
-                    if font.info.family == script_family {
+                    if font.contains_family(script_family) {
                         return Some(font);
                     }
                 }
@@ -136,7 +136,7 @@ impl<'a> Iterator for FontFallbackIter<'a> {
             self.common_i += 1;
             for font_key in self.font_keys.iter().copied() {
                 let font = Font::from_key(self.db, font_key).expect("invalid font key");
-                if font.info.family == common_family {
+                if font.contains_family(common_family) {
                     return Some(font);
                 }
             }
@@ -150,7 +150,10 @@ impl<'a> Iterator for FontFallbackIter<'a> {
             let font_key = self.font_keys[self.other_i];
             let font = Font::from_key(self.db, font_key).expect("invalid font key");
             self.other_i += 1;
-            if !forbidden_families.contains(&font.info.family.as_str()) {
+            if forbidden_families
+                .iter()
+                .all(|family| !font.contains_family(family))
+            {
                 return Some(font);
             }
         }
diff --git a/src/font/mod.rs b/src/font/mod.rs
index 066656f..a8dbfed 100644
--- a/src/font/mod.rs
+++ b/src/font/mod.rs
@@ -80,6 +80,18 @@ impl<'a> Font<'a> {
         }
     }
 
+    pub fn name(&self) -> &str {
+        if let Some((name, _)) = self.info.families.first() {
+            name
+        } else {
+            &self.info.post_script_name
+        }
+    }
+
+    pub fn contains_family(&self, family: &str) -> bool {
+        self.info.families.iter().any(|(name, _)| name == family)
+    }
+
     #[cfg(feature = "swash")]
     pub fn as_swash(&self) -> swash::FontRef {
         swash::FontRef {
diff --git a/src/font/system/redox.rs b/src/font/system/redox.rs
index 0e830bb..a22a1ab 100644
--- a/src/font/system/redox.rs
+++ b/src/font/system/redox.rs
@@ -44,8 +44,7 @@ impl FontSystem {
             let now = std::time::Instant::now();
 
             //TODO only do this on demand!
-            for i in 0..db.faces().len() {
-                let id = db.faces()[i].id;
+            for id in db.faces().map(|face| face.id).collect::<Vec<_>>() {
                 unsafe {
                     db.make_shared_face_data(id);
                 }
diff --git a/src/font/system/std.rs b/src/font/system/std.rs
index c3474ac..bae88a9 100644
--- a/src/font/system/std.rs
+++ b/src/font/system/std.rs
@@ -71,8 +71,7 @@ impl FontSystem {
             let now = std::time::Instant::now();
 
             //TODO only do this on demand!
-            for i in 0..db.faces().len() {
-                let id = db.faces()[i].id;
+            for id in db.faces().map(|face| face.id).collect::<Vec<_>>() {
                 unsafe {
                     db.make_shared_face_data(id);
                 }
diff --git a/src/shape.rs b/src/shape.rs
index c4a0fce..d2689e2 100644
--- a/src/shape.rs
+++ b/src/shape.rs
@@ -150,7 +150,7 @@ fn shape_run(
             None => break,
         };
 
-        log::trace!("Evaluating fallback with font '{}'", font.info.family);
+        log::trace!("Evaluating fallback with font '{}'", font.name());
         let (mut fb_glyphs, fb_missing) =
             shape_fallback(&font, line, attrs_list, start_run, end_run, span_rtl);
 

From 20234f8d1143f3864dd49165ab60ae3e43ca0896 Mon Sep 17 00:00:00 2001
From: Edgar Geier <egeier@rhrk.uni-kl.de>
Date: Wed, 1 Mar 2023 22:10:49 +0100
Subject: [PATCH 4/5] Bump `rustybuzz` version to `0.7`

---
 Cargo.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Cargo.toml b/Cargo.toml
index 8bc754e..7202f6a 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -12,7 +12,7 @@ repository = "https://github.com/pop-os/cosmic-text"
 fontdb = { version = "0.13.0", default-features = false }
 libm = "0.2.6"
 log = "0.4.17"
-rustybuzz = { version = "0.6.0", default-features = false, features = ["libm"] }
+rustybuzz = { version = "0.7.0", default-features = false, features = ["libm"] }
 swash = { version = "0.1.6", optional = true }
 syntect = { version = "5.0.0", optional = true }
 sys-locale = { version = "0.2.3", optional = true }

From c1636f6381b069848faa953355fec2ed76bfda66 Mon Sep 17 00:00:00 2001
From: Edgar Geier <egeier@rhrk.uni-kl.de>
Date: Fri, 3 Mar 2023 01:01:41 +0100
Subject: [PATCH 5/5] Allow Zlib in dependencies

---
 deny.toml | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/deny.toml b/deny.toml
index fda1256..04c6416 100644
--- a/deny.toml
+++ b/deny.toml
@@ -112,6 +112,7 @@ allow = [
     "Apache-2.0",
     "Unicode-DFS-2016",
     "BSD-2-Clause",
+    "Zlib",
     #"Apache-2.0 WITH LLVM-exception",
 ]
 # List of explicitly disallowed licenses
@@ -163,8 +164,8 @@ exceptions = [
 # and the crate will be checked normally, which may produce warnings or errors
 # depending on the rest of your configuration
 #license-files = [
-    # Each entry is a crate relative path, and the (opaque) hash of its contents
-    #{ path = "LICENSE", hash = 0xbd0eed23 }
+# Each entry is a crate relative path, and the (opaque) hash of its contents
+#{ path = "LICENSE", hash = 0xbd0eed23 }
 #]
 
 [licenses.private]