Merge pull request #58 from googlefonts/rebuild-reference-font

Rebuild reference font, fixing test failures
googlefonts · Jul 26, 2024 · 085e97d · 085e97d
2 parents dde9588 + 1b8fd4d
commit 085e97d
Show file tree

Hide file tree

Showing 8 changed files with 122 additions and 173 deletions.
diff --git a/tests/data/GlyphsUnitTestSans3.fontra/font-data.json b/tests/data/GlyphsUnitTestSans3.fontra/font-data.json
@@ -51,56 +51,6 @@
 ]
 },
 "sources": {
-"C4872ECA-A3A9-40AB-960A-1DB2202F16DE": {
-"name": "Light",
-"location": {
-"Weight": 17
-},
-"lineMetricsHorizontalLayout": {
-"ascender": {
-"value": 800,
-"zone": 10
-},
-"capHeight": {
-"value": 700,
-"zone": 10
-},
-"xHeight": {
-"value": 470,
-"zone": 10
-},
-"baseline": {
-"value": 0,
-"zone": -10
-},
-"descender": {
-"value": -200,
-"zone": -10
-}
-},
-"guidelines": [
-{
-"name": "",
-"x": -113,
-"y": 574
-},
-{
-"name": "",
-"x": 524,
-"y": 141
-},
-{
-"name": "",
-"x": -113,
-"y": 765
-},
-{
-"name": "",
-"x": 524,
-"y": -122
-}
-]
-},
 "3E7589AA-8194-470F-8E2F-13C1C581BE24": {
 "name": "Regular",
 "location": {
@@ -216,6 +166,56 @@
 "y": -212
 }
 ]
+},
+"C4872ECA-A3A9-40AB-960A-1DB2202F16DE": {
+"name": "Light",
+"location": {
+"Weight": 17
+},
+"lineMetricsHorizontalLayout": {
+"ascender": {
+"value": 800,
+"zone": 10
+},
+"capHeight": {
+"value": 700,
+"zone": 10
+},
+"xHeight": {
+"value": 470,
+"zone": 10
+},
+"baseline": {
+"value": 0,
+"zone": -10
+},
+"descender": {
+"value": -200,
+"zone": -10
+}
+},
+"guidelines": [
+{
+"name": "",
+"x": -113,
+"y": 574
+},
+{
+"name": "",
+"x": 524,
+"y": 141
+},
+{
+"name": "",
+"x": -113,
+"y": 765
+},
+{
+"name": "",
+"x": 524,
+"y": -122
+}
+]
 }
 }
 }
diff --git a/tests/data/GlyphsUnitTestSans3.fontra/glyphs/A^1.json b/tests/data/GlyphsUnitTestSans3.fontra/glyphs/A^1.json
@@ -93,20 +93,17 @@
 {
 "name": "bottom",
 "x": 377,
-"y": 0,
-"customData": {}
+"y": 0
 },
 {
 "name": "ogonek",
 "x": 678,
-"y": 10,
-"customData": {}
+"y": 10
 },
 {
 "name": "top",
 "x": 377,
-"y": 700,
-"customData": {}
+"y": 700
 }
 ]
 }
@@ -123,7 +120,10 @@
 },
 {
 "x": 321,
-"y": 700
+"y": 700,
+"attrs": {
+"name": "Hello World"
+}
 },
 {
 "x": 275,
@@ -180,20 +180,17 @@
 {
 "name": "bottom",
 "x": 297,
-"y": 0,
-"customData": {}
+"y": 0
 },
 {
 "name": "ogonek",
 "x": 548,
-"y": 0,
-"customData": {}
+"y": 0
 },
 {
 "name": "top",
 "x": 297,
-"y": 700,
-"customData": {}
+"y": 700
 }
 ]
 }
@@ -267,20 +264,17 @@
 {
 "name": "bottom",
 "x": 329,
-"y": 0,
-"customData": {}
+"y": 0
 },
 {
 "name": "ogonek",
 "x": 591,
-"y": 10,
-"customData": {}
+"y": 10
 },
 {
 "name": "top",
 "x": 329,
-"y": 700,
-"customData": {}
+"y": 700
 }
 ]
 }

diff --git a/tests/data/GlyphsUnitTestSans3.fontra/glyphs/V^1.json b/tests/data/GlyphsUnitTestSans3.fontra/glyphs/V^1.json
@@ -106,7 +106,10 @@
 },
 {
 "x": 321,
-"y": 0
+"y": 0,
+"attrs": {
+"name": "Hello World"
+}
 }
 ],
 "isClosed": true

diff --git a/tests/data/GlyphsUnitTestSans3.fontra/glyphs/_part.shoulder.json b/tests/data/GlyphsUnitTestSans3.fontra/glyphs/_part.shoulder.json
@@ -180,14 +180,12 @@
 {
 "name": "_connect",
 "x": 250,
-"y": 0,
-"customData": {}
+"y": 0
 },
 {
 "name": "connect",
 "x": 530,
-"y": 0,
-"customData": {}
+"y": 0
 }
 ]
 }
@@ -286,14 +284,12 @@
 {
 "name": "_connect",
 "x": 250,
-"y": 0,
-"customData": {}
+"y": 0
 },
 {
 "name": "connect",
 "x": 530,
-"y": 0,
-"customData": {}
+"y": 0
 }
 ]
 }
@@ -392,14 +388,12 @@
 {
 "name": "_connect",
 "x": 250,
-"y": 0,
-"customData": {}
+"y": 0
 },
 {
 "name": "connect",
 "x": 520,
-"y": 0,
-"customData": {}
+"y": 0
 }
 ]
 }
@@ -498,14 +492,12 @@
 {
 "name": "_connect",
 "x": 117,
-"y": 0,
-"customData": {}
+"y": 0
 },
 {
 "name": "connect",
 "x": 411,
-"y": 0,
-"customData": {}
+"y": 0
 }
 ]
 }
@@ -604,14 +596,12 @@
 {
 "name": "_connect",
 "x": 117,
-"y": 0,
-"customData": {}
+"y": 0
 },
 {
 "name": "connect",
 "x": 411,
-"y": 0,
-"customData": {}
+"y": 0
 }
 ]
 }
@@ -710,14 +700,12 @@
 {
 "name": "_connect",
 "x": 117,
-"y": 0,
-"customData": {}
+"y": 0
 },
 {
 "name": "connect",
 "x": 381,
-"y": 0,
-"customData": {}
+"y": 0
 }
 ]
 }
@@ -816,14 +804,12 @@
 {
 "name": "_connect",
 "x": 167,
-"y": 0,
-"customData": {}
+"y": 0
 },
 {
 "name": "connect",
 "x": 455,
-"y": 0,
-"customData": {}
+"y": 0
 }
 ]
 }
@@ -922,14 +908,12 @@
 {
 "name": "_connect",
 "x": 167,
-"y": 0,
-"customData": {}
+"y": 0
 },
 {
 "name": "connect",
 "x": 455,
-"y": 0,
-"customData": {}
+"y": 0
 }
 ]
 }
@@ -1028,14 +1012,12 @@
 {
 "name": "_connect",
 "x": 167,
-"y": 0,
-"customData": {}
+"y": 0
 },
 {
 "name": "connect",
 "x": 425,
-"y": 0,
-"customData": {}
+"y": 0
 }
 ]
 }