Merge pull request #632 from googlefonts/add-sparse-dspace

[fontdrasil] Typed coordinate spaces

Author: cmyr

fea-rs/src/compile/compile_ctx.rs

@@ -8,7 +8,7 @@ use std::{
     ops::Range,
 };
 
-use fontdrasil::coords::{Coord, DesignCoord, NormalizedCoord, NormalizedLocation, UserCoord};
+use fontdrasil::coords::{DesignCoord, NormalizedCoord, NormalizedLocation, UserCoord};
 use smol_str::SmolStr;
 use write_fonts::{
     tables::{

fea-rs/src/compile/variations.rs

@@ -86,7 +86,7 @@ pub enum AxisLocation {
 /// Create an axis where user coords == design coords
 #[cfg(any(test, feature = "test", feature = "cli"))]
 fn simple_axis(tag: Tag, min: i16, default: i16, max: i16) -> Axis {
-    use fontdrasil::coords::{Coord, CoordConverter, DesignCoord, UserCoord};
+    use fontdrasil::coords::{CoordConverter, DesignCoord, UserCoord};
 
     let min = UserCoord::new(min);
     let default = UserCoord::new(default);

fontbe/src/avar.rs

@@ -1,7 +1,7 @@
 //! Generates a [avar](https://learn.microsoft.com/en-us/typography/opentype/spec/avar) table.
 
 use fontdrasil::{
-    coords::{Coord, CoordConverter, DesignCoord, NormalizedCoord},
+    coords::{CoordConverter, DesignCoord, NormalizedCoord},
     orchestration::{Access, Work},
     types::Axis,
 };
@@ -123,7 +123,7 @@ impl Work<Context, AnyWorkId, Error> for AvarWork {
 #[cfg(test)]
 mod tests {
     use fontdrasil::{
-        coords::{Coord, CoordConverter, DesignCoord, UserCoord},
+        coords::{CoordConverter, DesignCoord, UserCoord},
         types::Axis,
     };
     use std::{cmp, str::FromStr};

fontbe/src/features.rs

@@ -495,7 +495,7 @@ mod tests {
 
     use fea_rs::compile::VariationInfo;
     use fontdrasil::{
-        coords::{Coord, CoordConverter, DesignCoord, NormalizedCoord, UserCoord},
+        coords::{CoordConverter, DesignCoord, NormalizedCoord, UserCoord},
         types::Axis,
     };
     use fontir::ir::StaticMetadata;

fontbe/src/glyphs.rs

@@ -6,7 +6,7 @@
 use std::collections::{BTreeSet, HashMap, HashSet};
 
 use fontdrasil::{
-    coords::{Location, NormalizedCoord, NormalizedLocation},
+    coords::NormalizedLocation,
     orchestration::{Access, AccessBuilder, Work},
     types::GlyphName,
 };
@@ -246,7 +246,7 @@ fn compute_deltas(
     glyph_name: &GlyphName,
     var_model: &VariationModel,
     should_iup: bool,
-    point_seqs: &HashMap<Location<NormalizedCoord>, Vec<Point>>,
+    point_seqs: &HashMap<NormalizedLocation, Vec<Point>>,
     coords: &Vec<Point>,
     contour_ends: &Vec<usize>,
 ) -> Result<Deltas, Error> {
@@ -902,7 +902,7 @@ mod tests {
     use super::*;
 
     use fontdrasil::{
-        coords::{Coord, NormalizedCoord, NormalizedLocation},
+        coords::{NormalizedCoord, NormalizedLocation},
         types::GlyphName,
     };
     use fontir::ir;

fontbe/src/orchestration.rs

@@ -757,7 +757,7 @@ where
 
 #[cfg(test)]
 mod tests {
-    use fontdrasil::coords::{Coord, NormalizedCoord};
+    use fontdrasil::coords::NormalizedCoord;
     use fontir::variations::{Tent, VariationRegion};
 
     use super::*;

fontbe/src/test_util.rs

@@ -10,8 +10,6 @@ use write_fonts::types::Tag;
 
 #[cfg(test)]
 pub(crate) fn axis(min: f32, default: f32, max: f32) -> Axis {
-    use fontdrasil::coords::Coord;
-
     let mut mappings = Vec::new();
     if min < default {
         mappings.push((UserCoord::new(min), DesignCoord::new(min / 10.0)));

fontc/src/lib.rs

@@ -454,11 +454,7 @@ mod tests {
     use fontbe::orchestration::{
         AnyWorkId, Context as BeContext, Glyph, LocaFormatWrapper, WorkId as BeWorkIdentifier,
     };
-    use fontdrasil::{
-        coords::{Coord, NormalizedCoord},
-        paths::safe_filename,
-        types::GlyphName,
-    };
+    use fontdrasil::{coords::NormalizedCoord, paths::safe_filename, types::GlyphName};
     use fontir::{
         ir::{self, GlyphOrder, KernPair, KernParticipant},
         orchestration::{Context as FeContext, Persistable, WorkId as FeWorkIdentifier},