Remove rusttype, use font-kit handle font

Author: 38

Cargo.toml

@@ -24,8 +24,9 @@ optional = true
 default_features = false
 
 [target.'cfg(not(target_arch = "wasm32"))'.dependencies]
-rusttype = { version = "0.9", optional = true }
+ttf-parser = { version = "0.8.2", optional = true }
 lazy_static = { version = "1.4.0", optional = true }
+pathfinder_geometry = { version = "0.5.1", optional = true }
 font-kit = { version = "0.7.0", optional = true }
 
 [target.'cfg(not(target_arch = "wasm32"))'.dependencies.image]
@@ -81,7 +82,7 @@ point_series = []
 surface_series = []
 
 # Font implemnetation
-ttf = ["font-kit", "rusttype", "lazy_static"]
+ttf = ["font-kit", "ttf-parser", "lazy_static", "pathfinder_geometry"]
 
 # Misc
 datetime = ["chrono"]

examples/3d-plot.rs

@@ -47,3 +47,7 @@ fn main() -> Result<(), Box<dyn std::error::Error>> {
         .draw()?;
     Ok(())
 }
+#[test]
+fn entry_point() {
+    main().unwrap()
+}

examples/3d-plot2.rs

@@ -42,3 +42,7 @@ fn main() -> Result<(), Box<dyn std::error::Error>> {
 
     Ok(())
 }
+#[test]
+fn entry_point() {
+    main().unwrap()
+}

examples/tick_control.rs

@@ -80,8 +80,7 @@ fn main() -> Result<(), Box<dyn std::error::Error>> {
 
     Ok(())
 }
-
 #[test]
 fn entry_point() {
-    main().unwrap();
+    main().unwrap()
 }

src/chart/context.rs

@@ -302,11 +302,10 @@ impl<'a, DB: DrawingBackend, X: Ranged, Y: Ranged> ChartContext<'a, DB, Cartesia
             .iter()
             .map(|(_, text)| {
                 if orientation.0 > 0 && orientation.1 == 0 && tick_size >= 0 {
-                    let ((x0, _), (x1, _)) = label_style
-                        .font
-                        .layout_box(text)
-                        .unwrap_or(((0, 0), (0, 0)));
-                    x1 - x0
+                    self.drawing_area
+                        .estimate_text_size(text, &label_style)
+                        .map(|(w, _)| w)
+                        .unwrap_or(0) as i32
                 } else {
                     // Don't ever do the layout estimationfor the drawing area that is either not
                     // the right one or the tick mark is inward.

src/lib.rs

@@ -789,8 +789,8 @@ pub mod prelude {
 
     // Elements
     pub use crate::element::{
-        Circle, Cross, DynElement, EmptyElement, IntoDynElement, MultiLineText, PathElement, Pixel,
-        Polygon, Rectangle, Text, TriangleMarker, Cubiod,
+        Circle, Cross, Cubiod, DynElement, EmptyElement, IntoDynElement, MultiLineText,
+        PathElement, Pixel, Polygon, Rectangle, Text, TriangleMarker,
     };
 
     #[cfg(feature = "boxplot")]

src/series/surface.rs

@@ -96,7 +96,6 @@ where
         self.style = StyleConfig::Fixed(s.into());
         self
     }
-
 }
 
 macro_rules! impl_constructor {
@@ -131,7 +130,10 @@ where
 {
     type Item = Polygon<(X, Y, Z)>;
     fn next(&mut self) -> Option<Self::Item> {
-        let (b0, b1) = if let (Some(b0), Some(b1)) = (self.free_var_2.get(self.vidx_2), self.free_var_2.get(self.vidx_2 + 1)) {
+        let (b0, b1) = if let (Some(b0), Some(b1)) = (
+            self.free_var_2.get(self.vidx_2),
+            self.free_var_2.get(self.vidx_2 + 1),
+        ) {
             self.vidx_2 += 1;
             (b0, b1)
         } else {
@@ -143,7 +145,7 @@ where
                 return None;
             }
         };
-        
+
         match (
             self.free_var_1.get(self.vidx_1),
             self.free_var_1.get(self.vidx_1 + 1),