Skip to content

Commit 8731d84

Browse files
authored
Merge pull request #632 from googlefonts/add-sparse-dspace
[fontdrasil] Typed coordinate spaces
2 parents 794c88c + 135a2ed commit 8731d84

File tree

17 files changed

+294
-348
lines changed

17 files changed

+294
-348
lines changed

fea-rs/src/compile/compile_ctx.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ use std::{
88
ops::Range,
99
};
1010

11-
use fontdrasil::coords::{Coord, DesignCoord, NormalizedCoord, NormalizedLocation, UserCoord};
11+
use fontdrasil::coords::{DesignCoord, NormalizedCoord, NormalizedLocation, UserCoord};
1212
use smol_str::SmolStr;
1313
use write_fonts::{
1414
tables::{

fea-rs/src/compile/variations.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ pub enum AxisLocation {
8686
/// Create an axis where user coords == design coords
8787
#[cfg(any(test, feature = "test", feature = "cli"))]
8888
fn simple_axis(tag: Tag, min: i16, default: i16, max: i16) -> Axis {
89-
use fontdrasil::coords::{Coord, CoordConverter, DesignCoord, UserCoord};
89+
use fontdrasil::coords::{CoordConverter, DesignCoord, UserCoord};
9090

9191
let min = UserCoord::new(min);
9292
let default = UserCoord::new(default);

fontbe/src/avar.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
//! Generates a [avar](https://learn.microsoft.com/en-us/typography/opentype/spec/avar) table.
22
33
use fontdrasil::{
4-
coords::{Coord, CoordConverter, DesignCoord, NormalizedCoord},
4+
coords::{CoordConverter, DesignCoord, NormalizedCoord},
55
orchestration::{Access, Work},
66
types::Axis,
77
};
@@ -123,7 +123,7 @@ impl Work<Context, AnyWorkId, Error> for AvarWork {
123123
#[cfg(test)]
124124
mod tests {
125125
use fontdrasil::{
126-
coords::{Coord, CoordConverter, DesignCoord, UserCoord},
126+
coords::{CoordConverter, DesignCoord, UserCoord},
127127
types::Axis,
128128
};
129129
use std::{cmp, str::FromStr};

fontbe/src/features.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -495,7 +495,7 @@ mod tests {
495495

496496
use fea_rs::compile::VariationInfo;
497497
use fontdrasil::{
498-
coords::{Coord, CoordConverter, DesignCoord, NormalizedCoord, UserCoord},
498+
coords::{CoordConverter, DesignCoord, NormalizedCoord, UserCoord},
499499
types::Axis,
500500
};
501501
use fontir::ir::StaticMetadata;

fontbe/src/glyphs.rs

+3-3
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
use std::collections::{BTreeSet, HashMap, HashSet};
77

88
use fontdrasil::{
9-
coords::{Location, NormalizedCoord, NormalizedLocation},
9+
coords::NormalizedLocation,
1010
orchestration::{Access, AccessBuilder, Work},
1111
types::GlyphName,
1212
};
@@ -246,7 +246,7 @@ fn compute_deltas(
246246
glyph_name: &GlyphName,
247247
var_model: &VariationModel,
248248
should_iup: bool,
249-
point_seqs: &HashMap<Location<NormalizedCoord>, Vec<Point>>,
249+
point_seqs: &HashMap<NormalizedLocation, Vec<Point>>,
250250
coords: &Vec<Point>,
251251
contour_ends: &Vec<usize>,
252252
) -> Result<Deltas, Error> {
@@ -902,7 +902,7 @@ mod tests {
902902
use super::*;
903903

904904
use fontdrasil::{
905-
coords::{Coord, NormalizedCoord, NormalizedLocation},
905+
coords::{NormalizedCoord, NormalizedLocation},
906906
types::GlyphName,
907907
};
908908
use fontir::ir;

fontbe/src/orchestration.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -757,7 +757,7 @@ where
757757

758758
#[cfg(test)]
759759
mod tests {
760-
use fontdrasil::coords::{Coord, NormalizedCoord};
760+
use fontdrasil::coords::NormalizedCoord;
761761
use fontir::variations::{Tent, VariationRegion};
762762

763763
use super::*;

fontbe/src/test_util.rs

-2
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,6 @@ use write_fonts::types::Tag;
1010

1111
#[cfg(test)]
1212
pub(crate) fn axis(min: f32, default: f32, max: f32) -> Axis {
13-
use fontdrasil::coords::Coord;
14-
1513
let mut mappings = Vec::new();
1614
if min < default {
1715
mappings.push((UserCoord::new(min), DesignCoord::new(min / 10.0)));

fontc/src/lib.rs

+1-5
Original file line numberDiff line numberDiff line change
@@ -454,11 +454,7 @@ mod tests {
454454
use fontbe::orchestration::{
455455
AnyWorkId, Context as BeContext, Glyph, LocaFormatWrapper, WorkId as BeWorkIdentifier,
456456
};
457-
use fontdrasil::{
458-
coords::{Coord, NormalizedCoord},
459-
paths::safe_filename,
460-
types::GlyphName,
461-
};
457+
use fontdrasil::{coords::NormalizedCoord, paths::safe_filename, types::GlyphName};
462458
use fontir::{
463459
ir::{self, GlyphOrder, KernPair, KernParticipant},
464460
orchestration::{Context as FeContext, Persistable, WorkId as FeWorkIdentifier},

0 commit comments

Comments
 (0)