Merge pull request #1145 from googlefonts/glyphs-kern-floats

[glyphs] Parse kerning as floats
googlefonts · Nov 28, 2024 · ce8c851 · ce8c851
2 parents 80cc208 + a99597e
commit ce8c851
Show file tree

Hide file tree

Showing 3 changed files with 53 additions and 15 deletions.
diff --git a/glyphs-reader/src/font.rs b/glyphs-reader/src/font.rs
@@ -98,18 +98,20 @@ pub struct FontCustomParameters {
 
 /// master id => { (name or class, name or class) => adjustment }
 #[derive(Clone, Debug, Default, PartialEq, Hash)]
-pub struct Kerning(BTreeMap<String, BTreeMap<(String, String), i32>>);
+pub struct Kerning(BTreeMap<String, BTreeMap<(String, String), OrderedFloat<f64>>>);
 
 impl Kerning {
-    pub fn get(&self, master_id: &str) -> Option<&BTreeMap<(String, String), i32>> {
+    pub fn get(&self, master_id: &str) -> Option<&BTreeMap<(String, String), OrderedFloat<f64>>> {
         self.0.get(master_id)
     }
 
     pub fn keys(&self) -> impl Iterator<Item = &String> {
         self.0.keys()
     }
 
-    pub fn iter(&self) -> impl Iterator<Item = (&String, &BTreeMap<(String, String), i32>)> {
+    pub fn iter(
+        &self,
+    ) -> impl Iterator<Item = (&String, &BTreeMap<(String, String), OrderedFloat<f64>>)> {
         self.0.iter()
     }
 
@@ -118,14 +120,14 @@ impl Kerning {
         master_id: String,
         lhs_class_or_group: String,
         rhs_class_or_group: String,
-        kern: i64,
+        kern: f64,
     ) {
         *self
             .0
             .entry(master_id)
             .or_default()
             .entry((lhs_class_or_group, rhs_class_or_group))
-            .or_default() = kern as i32;
+            .or_default() = kern.into();
     }
 }
 
@@ -163,7 +165,7 @@ impl FromPlist for Kerning {
 
                     let rhs_name_or_class: String = tokenizer.parse()?;
                     tokenizer.eat(b'=')?;
-                    let value: i64 = tokenizer.parse()?;
+                    let value: f64 = tokenizer.parse()?;
                     tokenizer.eat(b';')?;
 
                     kerning.insert(
@@ -3384,7 +3386,7 @@ mod tests {
             .get("m01")
             .unwrap()
             .iter()
-            .map(|((n1, n2), value)| (n1.as_str(), n2.as_str(), *value))
+            .map(|((n1, n2), value)| (n1.as_str(), n2.as_str(), value.0))
             .collect::<Vec<_>>();
 
         assert_eq!(
@@ -3398,12 +3400,12 @@ mod tests {
                     ),
                 ],
                 vec![
-                    ("@MMK_L_bracketleft_R", "exclam", -165),
-                    ("bracketleft", "bracketright", -300),
-                    ("exclam", "@MMK_R_bracketright_L", -160),
-                    ("exclam", "exclam", -360),
-                    ("exclam", "hyphen", 20),
-                    ("hyphen", "hyphen", -150),
+                    ("@MMK_L_bracketleft_R", "exclam", -165.),
+                    ("bracketleft", "bracketright", -300.),
+                    ("exclam", "@MMK_R_bracketright_L", -160.),
+                    ("exclam", "exclam", -360.),
+                    ("exclam", "hyphen", 20.),
+                    ("hyphen", "hyphen", -150.),
                 ],
             ),
             (actual_groups, actual_kerning),
@@ -3412,6 +3414,15 @@ mod tests {
         );
     }
 
+    #[test]
+    fn kern_floats() {
+        let font = Font::load(&glyphs3_dir().join("KernFloats.glyphs")).unwrap();
+
+        let kerns = font.kerning_ltr.get("m01").unwrap();
+        let key = ("space".to_string(), "space".to_string());
+        assert_eq!(kerns.get(&key), Some(&OrderedFloat(4.2001)));
+    }
+
     #[test]
     fn read_simple_anchor() {
         let font = Font::load(&glyphs3_dir().join("WghtVar_Anchors.glyphs")).unwrap();
@@ -3569,7 +3580,6 @@ mod tests {
             Some(&OrderedFloat(0f64))
         );
     }
-
     #[test]
     fn read_font_metrics() {
         let font =

diff --git a/glyphs2fontir/src/source.rs b/glyphs2fontir/src/source.rs
@@ -804,7 +804,7 @@ impl Work<Context, WorkId, Error> for KerningInstanceWork {
                 Some(((side1, side2), pos_adjust))
             })
             .for_each(|(participants, (_, value))| {
-                *kerning.kerns.entry(participants).or_default() = (value as f32).into();
+                *kerning.kerns.entry(participants).or_default() = (value.0 as f32).into();
             });
 
         context.kerning_at.set(kerning);

diff --git a/resources/testdata/glyphs3/KernFloats.glyphs b/resources/testdata/glyphs3/KernFloats.glyphs
@@ -0,0 +1,28 @@
+{
+.formatVersion = 3;
+familyName = KernFloats;
+fontMaster = (
+{
+id = m01;
+}
+);
+glyphs = (
+{
+glyphname = space;
+layers = (
+{
+layerId = m01;
+width = 200;
+}
+);
+}
+);
+unitsPerEm = 1000;
+kerning = {
+    "m01" = {
+        space = {
+        space = 4.2001;
+        };
+    };
+};
+}