removal of font mod

raphamorim · Feb 16, 2024 · aa1c229 · aa1c229
1 parent 3132205
commit aa1c229
Show file tree

Hide file tree

Showing 20 changed files with 23 additions and 2,602 deletions.
diff --git a/sugarloaf/src/font/mod.rs b/sugarloaf/src/font/mod.rs
@@ -21,12 +21,10 @@ use fnv::FnvHashMap;
 use std::ops::Index;
 use std::ops::IndexMut;
 use swash::proxy::CharmapProxy;
-use swash::text::cluster::{Char, CharCluster, Status};
-use swash::Attributes;
-use swash::CacheKey;
-use swash::Charmap;
-use swash::FontRef;
-use swash::Synthesis;
+use swash::text::cluster::{CharCluster, Status};
+use swash::{Attributes, CacheKey, Charmap, FontRef, Synthesis};
+
+pub use swash::{Style, Weight};
 
 #[derive(Default)]
 pub struct FontLibrary {
@@ -58,6 +56,11 @@ impl FontLibrary {
         self.inner.is_empty()
     }
 
+    #[inline]
+    pub fn font_by_id(&self, font_id: usize) -> FontRef {
+        self.inner[font_id].as_ref()
+    }
+
     #[inline]
     pub fn lookup_for_best_font(
         &mut self,
@@ -88,10 +91,8 @@ impl FontLibrary {
         let mut font_id = FONT_ID_REGULAR;
         if let Some(cached_font_id) = self.cache.get(&chars[0].ch) {
             font_id = *cached_font_id;
-        } else {
-            if cluster.info().is_emoji() {
-                font_id = FONT_ID_EMOJIS_NATIVE;
-            }
+        } else if cluster.info().is_emoji() {
+            font_id = FONT_ID_EMOJIS_NATIVE;
         }
 
         let charmap = self.inner[font_id]
@@ -184,7 +185,7 @@ impl FontData {
 
     #[inline]
     pub fn from_slice(data: &[u8]) -> Result<Self, Box<dyn std::error::Error>> {
-        let font = FontRef::from_index(&data, 0).unwrap();
+        let font = FontRef::from_index(data, 0).unwrap();
         let (offset, key) = (font.offset, font.key);
         // Return our struct with the original file data and copies of the
         // offset and key from the font reference

diff --git a/sugarloaf/src/layout/builder.rs b/sugarloaf/src/layout/builder.rs
@@ -13,7 +13,7 @@ use super::builder_data::*;
 use super::span_style::*;
 use super::Paragraph;
 use super::{SpanId, MAX_ID};
-use crate::font::{FontData, FontLibrary};
+use crate::font::FontLibrary;
 use core::borrow::Borrow;
 use swash::shape::{self, ShapeContext};
 use swash::text::cluster::{CharCluster, CharInfo, Parser, Token};
@@ -583,9 +583,9 @@ where
     }
 
     let current_font_id = state.font_id.unwrap();
-    let font = fcx[current_font_id].clone();
+    let font = fcx.inner[current_font_id].clone();
     let mut shaper = scx
-        .builder(font.as_ref())
+        .builder(&font)
         .script(state.script)
         .language(state.span.lang)
         .direction(dir)

diff --git a/sugarloaf/src/layout/builder_data.rs b/sugarloaf/src/layout/builder_data.rs
@@ -11,7 +11,6 @@
 
 use super::span_style::*;
 use super::{SpanId, MAX_ID};
-use crate::font::FontLibrary;
 use crate::sugarloaf::primitives::SugarCursor;
 use core::borrow::Borrow;
 use swash::text::{cluster::CharInfo, Script};
@@ -204,7 +203,7 @@ impl BuilderState {
         }
         let parent_id = *self.span_stack.last()?;
         let parent = self.spans.get_mut(parent_id.to_usize())?;
-        let mut span = parent.clone();
+        let mut span = parent.to_owned();
         let last_child = if let Some(last_child) = parent.last_child {
             parent.last_child = Some(next_id);
             Some(last_child)