Merge pull request #452 from googlefonts/skip-node-userdata

glyphs-reader: ignore nodes userData
googlefonts · Sep 22, 2023 · 0ad1c9d · 0ad1c9d
2 parents 33fb7c0 + 3dc0f4b
commit 0ad1c9d
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 6 deletions.
diff --git a/glyphs-reader/src/font.rs b/glyphs-reader/src/font.rs
@@ -429,11 +429,17 @@ impl FromPlist for Node {
                 let x = spl.next().unwrap().parse().unwrap();
                 let y = spl.next().unwrap().parse().unwrap();
                 let pt = Point::new(x, y);
-                let node_type = spl.next().unwrap().parse().unwrap();
+                let mut raw_node_type = spl.next().unwrap();
+                // drop the userData dict, we don't use it for compilation
+                if raw_node_type.contains('{') {
+                    raw_node_type = raw_node_type.split('{').next().unwrap().trim_end();
+                }
+                let node_type = raw_node_type.parse().unwrap();
                 Node { pt, node_type }
             }
             Plist::Array(value) => {
-                if value.len() != 3 {
+                // ignore the fourth element (userData) unused for compilation
+                if value.len() < 3 {
                     panic!("Invalid node content {plist:?}");
                 };
                 let x = value[0].as_f64().unwrap();

diff --git a/resources/testdata/glyphs2/WghtVar.glyphs b/resources/testdata/glyphs2/WghtVar.glyphs
@@ -146,7 +146,7 @@ paths = (
 {
 closed = 1;
 nodes = (
-"131 250 LINE",
+"131 250 LINE {name = hr00;}",
 "470 250 LINE",
 "470 330 LINE",
 "131 330 LINE"

diff --git a/resources/testdata/glyphs2/WghtVar.glyphspackage/glyphs/hyphen.glyph b/resources/testdata/glyphs2/WghtVar.glyphspackage/glyphs/hyphen.glyph
@@ -7,7 +7,7 @@ paths = (
 {
 closed = 1;
 nodes = (
-"131 250 LINE",
+"131 250 LINE {name = hr00;}",
 "470 250 LINE",
 "470 330 LINE",
 "131 330 LINE"

diff --git a/resources/testdata/glyphs3/WghtVar.glyphs b/resources/testdata/glyphs3/WghtVar.glyphs
@@ -155,7 +155,9 @@ shapes = (
 {
 closed = 1;
 nodes = (
-(131,250,l),
+(131,250,l,{
+name = hr00;
+}),
 (470,250,l),
 (470,330,l),
 (131,330,l)

diff --git a/resources/testdata/glyphs3/WghtVar.glyphspackage/glyphs/hyphen.glyph b/resources/testdata/glyphs3/WghtVar.glyphspackage/glyphs/hyphen.glyph
@@ -7,7 +7,9 @@ shapes = (
 {
 closed = 1;
 nodes = (
-(131,250,l),
+(131,250,l,{
+name = hr00;
+}),
 (470,250,l),
 (470,330,l),
 (131,330,l)