diff --git a/tests/data/MutatorSans.fontra/font-data.json b/tests/data/MutatorSans.fontra/font-data.json index 34c140b..ea0ff30 100644 --- a/tests/data/MutatorSans.fontra/font-data.json +++ b/tests/data/MutatorSans.fontra/font-data.json @@ -7,36 +7,34 @@ "copyright": "License same as MutatorMath. BSD 3-clause. [test-token: C]", "licenseDescription": "License same as MutatorMath. BSD 3-clause. [test-token: C]" }, -"lib": {}, "axes": [ { "name": "width", "label": "width", "tag": "wdth", -"minValue": 0.0, -"defaultValue": 0.0, -"maxValue": 1000.0, -"mapping": [], -"hidden": false +"minValue": 0, +"defaultValue": 0, +"maxValue": 1000 }, { "name": "weight", "label": "weight", "tag": "wght", -"minValue": 100.0, -"defaultValue": 100.0, -"maxValue": 900.0, +"minValue": 100, +"defaultValue": 100, +"maxValue": 900, "mapping": [ [ -100.0, -150.0 +100, +150 ], [ -900.0, -850.0 +900, +850 ] -], -"hidden": false -} ] } +], +"sources": {}, +"customData": {} +} diff --git a/tests/data/MutatorSans.fontra/glyph-info.csv b/tests/data/MutatorSans.fontra/glyph-info.csv index 9d1d39f..004933d 100644 --- a/tests/data/MutatorSans.fontra/glyph-info.csv +++ b/tests/data/MutatorSans.fontra/glyph-info.csv @@ -1,54 +1,54 @@ glyph name;code points -A;0041,0061 -Aacute;00C1,00E1 -Adieresis;00C4,00E4 -B;0042,0062 -C;0043,0063 -D;0044,0064 -E;0045,0065 -F;0046,0066 -G;0047,0067 -H;0048,0068 -I;0049,0069 +A;U+0041,U+0061 +Aacute;U+00C1,U+00E1 +Adieresis;U+00C4,U+00E4 +B;U+0042,U+0062 +C;U+0043,U+0063 +D;U+0044,U+0064 +E;U+0045,U+0065 +F;U+0046,U+0066 +G;U+0047,U+0067 +H;U+0048,U+0068 +I;U+0049,U+0069 I.narrow; IJ; -J;004A,006A +J;U+004A,U+006A J.narrow; -K;004B,006B -L;004C,006C -M;004D,006D -N;004E,006E -O;004F,006F -P;0050,0070 -Q;0051,0071 -R;0052,0072 +K;U+004B,U+006B +L;U+004C,U+006C +M;U+004D,U+006D +N;U+004E,U+006E +O;U+004F,U+006F +P;U+0050,U+0070 +Q;U+0051,U+0071 +R;U+0052,U+0072 R.alt; -S;0053,0073 +S;U+0053,U+0073 S.closed; -T;0054,0074 -U;0055,0075 -V;0056,0076 -W;0057,0077 -X;0058,0078 -Y;0059,0079 -Z;005A,007A -acute;00B4 -arrowdown;2193 -arrowleft;2190 -arrowright;2192 -arrowup;2191 -colon;003A -comma;002C -dieresis;00A8 -dot;27D1 +T;U+0054,U+0074 +U;U+0055,U+0075 +V;U+0056,U+0076 +W;U+0057,U+0077 +X;U+0058,U+0078 +Y;U+0059,U+0079 +Z;U+005A,U+007A +acute;U+00B4 +arrowdown;U+2193 +arrowleft;U+2190 +arrowright;U+2192 +arrowup;U+2191 +colon;U+003A +comma;U+002C +dieresis;U+00A8 +dot;U+27D1 em; nlitest; -period;002E -quotedblbase;201E -quotedblleft;201C -quotedblright;201D -quotesinglbase;201A -semicolon;003B -space;0020 -varcotest1;E000 -varcotest2;E001 +period;U+002E +quotedblbase;U+201E +quotedblleft;U+201C +quotedblright;U+201D +quotesinglbase;U+201A +semicolon;U+003B +space;U+0020 +varcotest1;U+E000 +varcotest2;U+E001 diff --git a/tests/data/MutatorSans.fontra/glyphs/A^1.json b/tests/data/MutatorSans.fontra/glyphs/A^1.json index 45aceb6..e1bcdb2 100644 --- a/tests/data/MutatorSans.fontra/glyphs/A^1.json +++ b/tests/data/MutatorSans.fontra/glyphs/A^1.json @@ -5,57 +5,57 @@ "name": "LightCondensed", "layerName": "MutatorSansLightCondensed/foreground", "location": { -"width": 0.0, -"weight": 150.0 +"weight": 150, +"width": 0 } }, { "name": "BoldCondensed", "layerName": "MutatorSansBoldCondensed/foreground", "location": { -"width": 0.0, -"weight": 850.0 +"weight": 850, +"width": 0 } }, { "name": "LightWide", "layerName": "MutatorSansLightWide/foreground", "location": { -"width": 1000.0, -"weight": 150.0 +"weight": 150, +"width": 1000 } }, { "name": "BoldWide", "layerName": "MutatorSansBoldWide/foreground", "location": { -"width": 1000.0, -"weight": 850.0 +"weight": 850, +"width": 1000 } } ], "layers": { -"MutatorSansLightCondensed/foreground": { +"MutatorSansBoldCondensed/foreground": { "glyph": { "path": { "contours": [ { "points": [ { -"x": 20, +"x": -10, "y": 0 }, { -"x": 60, +"x": 250, "y": 0 }, { -"x": 200, -"y": 700 +"x": 334, +"y": 800 }, { -"x": 165, -"y": 700 +"x": 104, +"y": 800 } ], "isClosed": true @@ -63,20 +63,20 @@ { "points": [ { -"x": 75, -"y": 164 +"x": 110, +"y": 120 }, { -"x": 325, -"y": 164 +"x": 580, +"y": 120 }, { -"x": 325, -"y": 200 +"x": 580, +"y": 330 }, { -"x": 75, -"y": 200 +"x": 110, +"y": 330 } ], "isClosed": true @@ -84,20 +84,20 @@ { "points": [ { -"x": 332, +"x": 390, "y": 0 }, { -"x": 376, +"x": 730, "y": 0 }, { -"x": 231, -"y": 700 +"x": 614, +"y": 800 }, { -"x": 192, -"y": 700 +"x": 294, +"y": 800 } ], "isClosed": true @@ -105,54 +105,49 @@ { "points": [ { -"x": 175, -"y": 661 +"x": 204, +"y": 540 }, { -"x": 222, -"y": 661 +"x": 474, +"y": 540 }, { -"x": 222, -"y": 700 +"x": 474, +"y": 800 }, { -"x": 175, -"y": 700 +"x": 204, +"y": 800 } ], "isClosed": true } ] }, -"xAdvance": 396 -} -}, -"MutatorSansLightCondensed/support": { -"glyph": { -"xAdvance": 930 +"xAdvance": 740 } }, -"MutatorSansBoldCondensed/foreground": { +"MutatorSansBoldWide/foreground": { "glyph": { "path": { "contours": [ { "points": [ { -"x": -10, +"x": 20, "y": 0 }, { -"x": 250, +"x": 350, "y": 0 }, { -"x": 334, +"x": 640, "y": 800 }, { -"x": 104, +"x": 360, "y": 800 } ], @@ -161,20 +156,20 @@ { "points": [ { -"x": 110, +"x": 210, "y": 120 }, { -"x": 580, +"x": 940, "y": 120 }, { -"x": 580, -"y": 330 +"x": 940, +"y": 340 }, { -"x": 110, -"y": 330 +"x": 210, +"y": 340 } ], "isClosed": true @@ -182,19 +177,19 @@ { "points": [ { -"x": 390, +"x": 800, "y": 0 }, { -"x": 730, +"x": 1270, "y": 0 }, { -"x": 614, +"x": 930, "y": 800 }, { -"x": 294, +"x": 480, "y": 800 } ], @@ -203,19 +198,19 @@ { "points": [ { -"x": 204, +"x": 410, "y": 540 }, { -"x": 474, +"x": 830, "y": 540 }, { -"x": 474, +"x": 830, "y": 800 }, { -"x": 204, +"x": 410, "y": 800 } ], @@ -223,29 +218,29 @@ } ] }, -"xAdvance": 740 +"xAdvance": 1290 } }, -"MutatorSansLightWide/foreground": { +"MutatorSansLightCondensed/foreground": { "glyph": { "path": { "contours": [ { "points": [ { -"x": 50, +"x": 20, "y": 0 }, { -"x": 97, +"x": 60, "y": 0 }, { -"x": 612, +"x": 200, "y": 700 }, { -"x": 570, +"x": 165, "y": 700 } ], @@ -254,20 +249,20 @@ { "points": [ { -"x": 245, -"y": 224 +"x": 75, +"y": 164 }, { -"x": 945, -"y": 224 +"x": 325, +"y": 164 }, { -"x": 945, -"y": 254 +"x": 325, +"y": 200 }, { -"x": 245, -"y": 254 +"x": 75, +"y": 200 } ], "isClosed": true @@ -275,19 +270,19 @@ { "points": [ { -"x": 1087, +"x": 332, "y": 0 }, { -"x": 1140, +"x": 376, "y": 0 }, { -"x": 620, +"x": 231, "y": 700 }, { -"x": 572, +"x": 192, "y": 700 } ], @@ -296,19 +291,19 @@ { "points": [ { -"x": 570, -"y": 664 +"x": 175, +"y": 661 }, { -"x": 620, -"y": 664 +"x": 222, +"y": 661 }, { -"x": 620, +"x": 222, "y": 700 }, { -"x": 570, +"x": 175, "y": 700 } ], @@ -316,30 +311,35 @@ } ] }, -"xAdvance": 1190 +"xAdvance": 396 } }, -"MutatorSansBoldWide/foreground": { +"MutatorSansLightCondensed/support": { +"glyph": { +"xAdvance": 930 +} +}, +"MutatorSansLightWide/foreground": { "glyph": { "path": { "contours": [ { "points": [ { -"x": 20, +"x": 50, "y": 0 }, { -"x": 350, +"x": 97, "y": 0 }, { -"x": 640, -"y": 800 +"x": 612, +"y": 700 }, { -"x": 360, -"y": 800 +"x": 570, +"y": 700 } ], "isClosed": true @@ -347,20 +347,20 @@ { "points": [ { -"x": 210, -"y": 120 +"x": 245, +"y": 224 }, { -"x": 940, -"y": 120 +"x": 945, +"y": 224 }, { -"x": 940, -"y": 340 +"x": 945, +"y": 254 }, { -"x": 210, -"y": 340 +"x": 245, +"y": 254 } ], "isClosed": true @@ -368,20 +368,20 @@ { "points": [ { -"x": 800, +"x": 1087, "y": 0 }, { -"x": 1270, +"x": 1140, "y": 0 }, { -"x": 930, -"y": 800 +"x": 620, +"y": 700 }, { -"x": 480, -"y": 800 +"x": 572, +"y": 700 } ], "isClosed": true @@ -389,27 +389,27 @@ { "points": [ { -"x": 410, -"y": 540 +"x": 570, +"y": 664 }, { -"x": 830, -"y": 540 +"x": 620, +"y": 664 }, { -"x": 830, -"y": 800 +"x": 620, +"y": 700 }, { -"x": 410, -"y": 800 +"x": 570, +"y": 700 } ], "isClosed": true } ] }, -"xAdvance": 1290 +"xAdvance": 1190 } } } diff --git a/tests/data/MutatorSans.fontra/glyphs/Aacute^1.json b/tests/data/MutatorSans.fontra/glyphs/Aacute^1.json index 8e5f3bf..09cd8ac 100644 --- a/tests/data/MutatorSans.fontra/glyphs/Aacute^1.json +++ b/tests/data/MutatorSans.fontra/glyphs/Aacute^1.json @@ -5,37 +5,37 @@ "name": "LightCondensed", "layerName": "MutatorSansLightCondensed/foreground", "location": { -"width": 0.0, -"weight": 150.0 +"weight": 150, +"width": 0 } }, { "name": "BoldCondensed", "layerName": "MutatorSansBoldCondensed/foreground", "location": { -"width": 0.0, -"weight": 850.0 +"weight": 850, +"width": 0 } }, { "name": "LightWide", "layerName": "MutatorSansLightWide/foreground", "location": { -"width": 1000.0, -"weight": 150.0 +"weight": 150, +"width": 1000 } }, { "name": "BoldWide", "layerName": "MutatorSansBoldWide/foreground", "location": { -"width": 1000.0, -"weight": 850.0 +"weight": 850, +"width": 1000 } } ], "layers": { -"MutatorSansLightCondensed/foreground": { +"MutatorSansBoldCondensed/foreground": { "glyph": { "components": [ { @@ -44,15 +44,14 @@ { "name": "acute", "transformation": { -"translateX": 99, -"translateY": 20 +"translateX": 204 } } ], -"xAdvance": 396 +"xAdvance": 740 } }, -"MutatorSansBoldCondensed/foreground": { +"MutatorSansBoldWide/foreground": { "glyph": { "components": [ { @@ -61,14 +60,15 @@ { "name": "acute", "transformation": { -"translateX": 204 +"translateX": 484, +"translateY": 20 } } ], -"xAdvance": 740 +"xAdvance": 1290 } }, -"MutatorSansLightWide/foreground": { +"MutatorSansLightCondensed/foreground": { "glyph": { "components": [ { @@ -77,15 +77,15 @@ { "name": "acute", "transformation": { -"translateX": 494, +"translateX": 99, "translateY": 20 } } ], -"xAdvance": 1190 +"xAdvance": 396 } }, -"MutatorSansBoldWide/foreground": { +"MutatorSansLightWide/foreground": { "glyph": { "components": [ { @@ -94,12 +94,12 @@ { "name": "acute", "transformation": { -"translateX": 484, +"translateX": 494, "translateY": 20 } } ], -"xAdvance": 1290 +"xAdvance": 1190 } } } diff --git a/tests/data/MutatorSans.fontra/glyphs/Adieresis^1.json b/tests/data/MutatorSans.fontra/glyphs/Adieresis^1.json index 43fd0cc..5612263 100644 --- a/tests/data/MutatorSans.fontra/glyphs/Adieresis^1.json +++ b/tests/data/MutatorSans.fontra/glyphs/Adieresis^1.json @@ -5,73 +5,73 @@ "name": "LightCondensed", "layerName": "MutatorSansLightCondensed/foreground", "location": { -"width": 0.0, -"weight": 150.0 +"weight": 150, +"width": 0 } }, { "name": "BoldCondensed", "layerName": "MutatorSansBoldCondensed/foreground", "location": { -"width": 0.0, -"weight": 850.0 +"weight": 850, +"width": 0 } }, { "name": "LightWide", "layerName": "MutatorSansLightWide/foreground", "location": { -"width": 1000.0, -"weight": 150.0 +"weight": 150, +"width": 1000 } }, { "name": "BoldWide", "layerName": "MutatorSansBoldWide/foreground", "location": { -"width": 1000.0, -"weight": 850.0 +"weight": 850, +"width": 1000 } } ], "layers": { -"MutatorSansLightCondensed/foreground": { +"MutatorSansBoldCondensed/foreground": { "glyph": { "components": [ { -"name": "A" +"name": "A", +"transformation": { +"translateX": 20 +} }, { "name": "dieresis", "transformation": { -"translateX": 89, -"translateY": 20 +"translateX": 120 } } ], -"xAdvance": 396 +"xAdvance": 760 } }, -"MutatorSansBoldCondensed/foreground": { +"MutatorSansBoldWide/foreground": { "glyph": { "components": [ { -"name": "A", -"transformation": { -"translateX": 20 -} +"name": "A" }, { "name": "dieresis", "transformation": { -"translateX": 120 +"translateX": 362, +"translateY": 20 } } ], -"xAdvance": 760 +"xAdvance": 1290 } }, -"MutatorSansLightWide/foreground": { +"MutatorSansLightCondensed/foreground": { "glyph": { "components": [ { @@ -80,15 +80,15 @@ { "name": "dieresis", "transformation": { -"translateX": 421, +"translateX": 89, "translateY": 20 } } ], -"xAdvance": 1190 +"xAdvance": 396 } }, -"MutatorSansBoldWide/foreground": { +"MutatorSansLightWide/foreground": { "glyph": { "components": [ { @@ -97,12 +97,12 @@ { "name": "dieresis", "transformation": { -"translateX": 362, +"translateX": 421, "translateY": 20 } } ], -"xAdvance": 1290 +"xAdvance": 1190 } } } diff --git a/tests/data/MutatorSans.fontra/glyphs/B^1.json b/tests/data/MutatorSans.fontra/glyphs/B^1.json index 486f767..7ca132e 100644 --- a/tests/data/MutatorSans.fontra/glyphs/B^1.json +++ b/tests/data/MutatorSans.fontra/glyphs/B^1.json @@ -5,65 +5,65 @@ "name": "LightCondensed", "layerName": "MutatorSansLightCondensed/foreground", "location": { -"width": 0.0, -"weight": 150.0 +"weight": 150, +"width": 0 } }, { "name": "BoldCondensed", "layerName": "MutatorSansBoldCondensed/foreground", "location": { -"width": 0.0, -"weight": 850.0 +"weight": 850, +"width": 0 } }, { "name": "LightWide", "layerName": "MutatorSansLightWide/foreground", "location": { -"width": 1000.0, -"weight": 150.0 +"weight": 150, +"width": 1000 } }, { "name": "BoldWide", "layerName": "MutatorSansBoldWide/foreground", "location": { -"width": 1000.0, -"weight": 850.0 +"weight": 850, +"width": 1000 } }, { "name": "support.crossbar", "layerName": "MutatorSansLightCondensed/support.crossbar", "location": { -"width": 0.0, -"weight": 595.0 +"weight": 595, +"width": 0 } } ], "layers": { -"MutatorSansLightCondensed/foreground": { +"MutatorSansBoldCondensed/foreground": { "glyph": { "path": { "contours": [ { "points": [ { -"x": 60, +"x": 30, "y": 0 }, { -"x": 100, +"x": 340, "y": 0 }, { -"x": 100, -"y": 700 +"x": 340, +"y": 800 }, { -"x": 60, -"y": 700 +"x": 30, +"y": 800 } ], "isClosed": true @@ -71,196 +71,196 @@ { "points": [ { -"x": 80, -"y": 333 +"x": 280, +"y": 347 }, { -"x": 210, -"y": 333, +"x": 345, +"y": 347, "smooth": true }, { -"x": 315, -"y": 333, +"x": 374, +"y": 347, "type": "cubic" }, { -"x": 364, -"y": 269, +"x": 397, +"y": 340, "type": "cubic" }, { -"x": 364, -"y": 183, +"x": 397, +"y": 292, "smooth": true }, { -"x": 364.0, -"y": 93.0, +"x": 397, +"y": 249, "type": "cubic" }, { -"x": 312, -"y": 36, +"x": 374, +"y": 238, "type": "cubic" }, { -"x": 200, -"y": 36, +"x": 345, +"y": 238, "smooth": true }, { -"x": 80, -"y": 36 +"x": 280, +"y": 238 }, { -"x": 80, +"x": 280, "y": 0 }, { -"x": 190, +"x": 396, "y": 0, "smooth": true }, { -"x": 343, +"x": 651, "y": 0, "type": "cubic" }, { -"x": 403.0, -"y": 79, +"x": 700, +"y": 94, "type": "cubic" }, { -"x": 403, -"y": 183, +"x": 700, +"y": 230, "smooth": true }, { -"x": 403, -"y": 273, +"x": 700, +"y": 356, "type": "cubic" }, { -"x": 353, -"y": 351, +"x": 645, +"y": 417, "type": "cubic" }, { -"x": 233, -"y": 361 +"x": 551, +"y": 434 }, { -"x": 253, -"y": 350 +"x": 541, +"y": 377 }, { -"x": 342, -"y": 366, +"x": 618, +"y": 392, "type": "cubic" }, { -"x": 383.0, -"y": 439.0, +"x": 690, +"y": 444, "type": "cubic" }, { -"x": 383, -"y": 517, +"x": 690, +"y": 563, "smooth": true }, { -"x": 383.0, -"y": 618.0, +"x": 690, +"y": 711, "type": "cubic" }, { -"x": 341.0, -"y": 700.0, +"x": 621, +"y": 800, "type": "cubic" }, { -"x": 180, -"y": 700, +"x": 385, +"y": 800, "smooth": true }, { -"x": 80, -"y": 700 +"x": 280, +"y": 800 }, { -"x": 80, -"y": 664 +"x": 280, +"y": 574 }, { -"x": 190, -"y": 664, +"x": 345, +"y": 574, "smooth": true }, { -"x": 310.0, -"y": 664.0, +"x": 374, +"y": 574, "type": "cubic" }, { -"x": 344.0, -"y": 603.0, +"x": 397, +"y": 564, "type": "cubic" }, { -"x": 344, -"y": 517, +"x": 397, +"y": 523, "smooth": true }, { -"x": 344.0, -"y": 431.0, +"x": 397, +"y": 475, "type": "cubic" }, { -"x": 295.0, -"y": 368.0, +"x": 374, +"y": 470, "type": "cubic" }, { -"x": 190, -"y": 368, +"x": 345, +"y": 470, "smooth": true }, { -"x": 80, -"y": 368 +"x": 280, +"y": 470 } ], "isClosed": true } ] }, -"xAdvance": 443 +"xAdvance": 710 } }, -"MutatorSansLightCondensed/support.crossbar": { +"MutatorSansBoldWide/foreground": { "glyph": { "path": { "contours": [ { "points": [ { -"x": 39, +"x": 60, "y": 0 }, { -"x": 272, +"x": 480, "y": 0 }, { -"x": 272, -"y": 772 +"x": 480, +"y": 801 }, { -"x": 39, -"y": 772 +"x": 60, +"y": 801 } ], "isClosed": true @@ -268,196 +268,196 @@ { "points": [ { -"x": 223.0, -"y": 321 +"x": 450, +"y": 337 }, { -"x": 317.0, -"y": 321, +"x": 732, +"y": 337, "smooth": true }, { -"x": 367, -"y": 321, +"x": 774, +"y": 337, "type": "cubic" }, { -"x": 398.0, -"y": 302, +"x": 807, +"y": 330, "type": "cubic" }, { -"x": 398.0, -"y": 250, +"x": 807, +"y": 286, "smooth": true }, { -"x": 398.0, -"y": 201, +"x": 807, +"y": 248, "type": "cubic" }, { -"x": 366.0, -"y": 181.0, +"x": 774, +"y": 238, "type": "cubic" }, { -"x": 314.0, -"y": 181, +"x": 732, +"y": 238, "smooth": true }, { -"x": 223.0, -"y": 181 +"x": 450, +"y": 238 }, { -"x": 223, +"x": 450, "y": 0 }, { -"x": 347, +"x": 906, "y": 0, "smooth": true }, { -"x": 573.0, -"y": 0.0, +"x": 1161, +"y": 0, "type": "cubic" }, { -"x": 626, -"y": 90, +"x": 1230, +"y": 94, "type": "cubic" }, { -"x": 626, -"y": 217, +"x": 1230, +"y": 230, "smooth": true }, { -"x": 626, -"y": 332, +"x": 1230, +"y": 356, "type": "cubic" }, { -"x": 572, -"y": 398, +"x": 1155, +"y": 417, "type": "cubic" }, { -"x": 471, -"y": 413 +"x": 1061, +"y": 434 }, { -"x": 469, -"y": 369 +"x": 1031, +"y": 377 }, { -"x": 550, -"y": 385, +"x": 1108, +"y": 392, "type": "cubic" }, { -"x": 613, -"y": 443, +"x": 1200, +"y": 444, "type": "cubic" }, { -"x": 613, -"y": 550, +"x": 1200, +"y": 563, "smooth": true }, { -"x": 613, -"y": 685, +"x": 1200, +"y": 711, "type": "cubic" }, { -"x": 551.0, -"y": 772.0, +"x": 1111, +"y": 800, "type": "cubic" }, { -"x": 337, -"y": 772, +"x": 846, +"y": 800, "smooth": true }, { -"x": 223, -"y": 772 +"x": 450, +"y": 800 }, { -"x": 223.0, -"y": 600 +"x": 450, +"y": 574 }, { -"x": 311.0, -"y": 600, +"x": 693, +"y": 574, "smooth": true }, { -"x": 366, -"y": 600, +"x": 744, +"y": 574, "type": "cubic" }, { -"x": 392.0, -"y": 581, +"x": 777, +"y": 565, "type": "cubic" }, { -"x": 392.0, -"y": 534, +"x": 777, +"y": 528, "smooth": true }, { -"x": 392.0, -"y": 483, +"x": 777, +"y": 476, "type": "cubic" }, { -"x": 362, -"y": 467, +"x": 744, +"y": 480, "type": "cubic" }, { -"x": 311.0, -"y": 467, +"x": 693, +"y": 480, "smooth": true }, { -"x": 223.0, -"y": 467 +"x": 450, +"y": 480 } ], "isClosed": true } ] }, -"xAdvance": 645 +"xAdvance": 1270 } }, -"MutatorSansBoldCondensed/foreground": { +"MutatorSansLightCondensed/foreground": { "glyph": { "path": { "contours": [ { "points": [ { -"x": 30, +"x": 60, "y": 0 }, { -"x": 340, +"x": 100, "y": 0 }, { -"x": 340, -"y": 800 +"x": 100, +"y": 700 }, { -"x": 30, -"y": 800 +"x": 60, +"y": 700 } ], "isClosed": true @@ -465,196 +465,196 @@ { "points": [ { -"x": 280, -"y": 347 +"x": 80, +"y": 333 }, { -"x": 345, -"y": 347, +"x": 210, +"y": 333, "smooth": true }, { -"x": 374.0, -"y": 347.0, +"x": 315, +"y": 333, "type": "cubic" }, { -"x": 397, -"y": 340, +"x": 364, +"y": 269, "type": "cubic" }, { -"x": 397, -"y": 292, +"x": 364, +"y": 183, "smooth": true }, { -"x": 397, -"y": 249, +"x": 364, +"y": 93, "type": "cubic" }, { -"x": 374.0, -"y": 238.0, +"x": 312, +"y": 36, "type": "cubic" }, { -"x": 345, -"y": 238, +"x": 200, +"y": 36, "smooth": true }, { -"x": 280, -"y": 238 +"x": 80, +"y": 36 }, { -"x": 280, +"x": 80, "y": 0 }, { -"x": 396, +"x": 190, "y": 0, "smooth": true }, { -"x": 651.0, -"y": 0.0, +"x": 343, +"y": 0, "type": "cubic" }, { -"x": 700, -"y": 94, +"x": 403, +"y": 79, "type": "cubic" }, { -"x": 700, -"y": 230, +"x": 403, +"y": 183, "smooth": true }, { -"x": 700, -"y": 356, +"x": 403, +"y": 273, "type": "cubic" }, { -"x": 645, -"y": 417, +"x": 353, +"y": 351, "type": "cubic" }, { -"x": 551, -"y": 434 +"x": 233, +"y": 361 }, { -"x": 541, -"y": 377 +"x": 253, +"y": 350 }, { -"x": 618, -"y": 392, +"x": 342, +"y": 366, "type": "cubic" }, { -"x": 690, -"y": 444, +"x": 383, +"y": 439, "type": "cubic" }, { -"x": 690, -"y": 563, +"x": 383, +"y": 517, "smooth": true }, { -"x": 690, -"y": 711, +"x": 383, +"y": 618, "type": "cubic" }, { -"x": 621.0, -"y": 800.0, +"x": 341, +"y": 700, "type": "cubic" }, { -"x": 385, -"y": 800, +"x": 180, +"y": 700, "smooth": true }, { -"x": 280, -"y": 800 +"x": 80, +"y": 700 }, { -"x": 280, -"y": 574 +"x": 80, +"y": 664 }, { -"x": 345, -"y": 574, +"x": 190, +"y": 664, "smooth": true }, { -"x": 374.0, -"y": 574.0, +"x": 310, +"y": 664, "type": "cubic" }, { -"x": 397, -"y": 564, +"x": 344, +"y": 603, "type": "cubic" }, { -"x": 397, -"y": 523, +"x": 344, +"y": 517, "smooth": true }, { -"x": 397, -"y": 475, +"x": 344, +"y": 431, "type": "cubic" }, { -"x": 374.0, -"y": 470.0, +"x": 295, +"y": 368, "type": "cubic" }, { -"x": 345, -"y": 470, +"x": 190, +"y": 368, "smooth": true }, { -"x": 280, -"y": 470 +"x": 80, +"y": 368 } ], "isClosed": true } ] }, -"xAdvance": 710 +"xAdvance": 443 } }, -"MutatorSansLightWide/foreground": { +"MutatorSansLightCondensed/support.crossbar": { "glyph": { "path": { "contours": [ { "points": [ { -"x": 120, +"x": 39, "y": 0 }, { -"x": 160, +"x": 272, "y": 0 }, { -"x": 160, -"y": 700 +"x": 272, +"y": 772 }, { -"x": 120, -"y": 700 +"x": 39, +"y": 772 } ], "isClosed": true @@ -662,196 +662,196 @@ { "points": [ { -"x": 140, -"y": 333 +"x": 223, +"y": 321 }, { -"x": 880, -"y": 333, +"x": 317, +"y": 321, "smooth": true }, { -"x": 999, -"y": 333, +"x": 367, +"y": 321, "type": "cubic" }, { -"x": 1054, -"y": 269, +"x": 398, +"y": 302, "type": "cubic" }, { -"x": 1054, -"y": 183, +"x": 398, +"y": 250, "smooth": true }, { -"x": 1054, -"y": 97, +"x": 398, +"y": 201, "type": "cubic" }, { -"x": 999, -"y": 36, +"x": 366, +"y": 181, "type": "cubic" }, { -"x": 880, -"y": 36, +"x": 314, +"y": 181, "smooth": true }, { -"x": 140, -"y": 36 +"x": 223, +"y": 181 }, { -"x": 140, +"x": 223, "y": 0 }, { -"x": 870, +"x": 347, "y": 0, "smooth": true }, { -"x": 1030, +"x": 573, "y": 0, "type": "cubic" }, { -"x": 1093, -"y": 83, +"x": 626, +"y": 90, "type": "cubic" }, { -"x": 1093, -"y": 183, +"x": 626, +"y": 217, "smooth": true }, { -"x": 1093, -"y": 273, +"x": 626, +"y": 332, "type": "cubic" }, { -"x": 1043, -"y": 347, +"x": 572, +"y": 398, "type": "cubic" }, { -"x": 920, -"y": 363 +"x": 471, +"y": 413 }, { -"x": 900, -"y": 345 +"x": 469, +"y": 369 }, { -"x": 994, -"y": 371, +"x": 550, +"y": 385, "type": "cubic" }, { -"x": 1033, -"y": 439, +"x": 613, +"y": 443, "type": "cubic" }, { -"x": 1033, -"y": 517, +"x": 613, +"y": 550, "smooth": true }, { -"x": 1033, -"y": 618, +"x": 613, +"y": 685, "type": "cubic" }, { -"x": 970, -"y": 700, +"x": 551, +"y": 772, "type": "cubic" }, { -"x": 810, -"y": 700, +"x": 337, +"y": 772, "smooth": true }, { -"x": 140, -"y": 700 +"x": 223, +"y": 772 }, { -"x": 140, -"y": 664 +"x": 223, +"y": 600 }, { -"x": 820, -"y": 664, +"x": 311, +"y": 600, "smooth": true }, { -"x": 939, -"y": 664, +"x": 366, +"y": 600, "type": "cubic" }, { -"x": 994, -"y": 603, +"x": 392, +"y": 581, "type": "cubic" }, { -"x": 994, -"y": 517, +"x": 392, +"y": 534, "smooth": true }, { -"x": 994, -"y": 431, +"x": 392, +"y": 483, "type": "cubic" }, { -"x": 939, -"y": 368, +"x": 362, +"y": 467, "type": "cubic" }, { -"x": 820, -"y": 368, +"x": 311, +"y": 467, "smooth": true }, { -"x": 140, -"y": 368 +"x": 223, +"y": 467 } ], "isClosed": true } ] }, -"xAdvance": 1173 +"xAdvance": 645 } }, -"MutatorSansBoldWide/foreground": { +"MutatorSansLightWide/foreground": { "glyph": { "path": { "contours": [ { "points": [ { -"x": 60, +"x": 120, "y": 0 }, { -"x": 480, +"x": 160, "y": 0 }, { -"x": 480, -"y": 801 +"x": 160, +"y": 700 }, { -"x": 60, -"y": 801 +"x": 120, +"y": 700 } ], "isClosed": true @@ -859,173 +859,173 @@ { "points": [ { -"x": 450, -"y": 337 +"x": 140, +"y": 333 }, { -"x": 732.0, -"y": 337.0, +"x": 880, +"y": 333, "smooth": true }, { -"x": 774.0, -"y": 337.0, +"x": 999, +"y": 333, "type": "cubic" }, { -"x": 807, -"y": 330, +"x": 1054, +"y": 269, "type": "cubic" }, { -"x": 807, -"y": 286, +"x": 1054, +"y": 183, "smooth": true }, { -"x": 807, -"y": 248, +"x": 1054, +"y": 97, "type": "cubic" }, { -"x": 774.0, -"y": 238.0, +"x": 999, +"y": 36, "type": "cubic" }, { -"x": 732.0, -"y": 238.0, +"x": 880, +"y": 36, "smooth": true }, { -"x": 450, -"y": 238 +"x": 140, +"y": 36 }, { -"x": 450, +"x": 140, "y": 0 }, { -"x": 906, +"x": 870, "y": 0, "smooth": true }, { -"x": 1161.0, -"y": 0.0, +"x": 1030, +"y": 0, "type": "cubic" }, { -"x": 1230, -"y": 94, +"x": 1093, +"y": 83, "type": "cubic" }, { -"x": 1230, -"y": 230, +"x": 1093, +"y": 183, "smooth": true }, { -"x": 1230, -"y": 356, +"x": 1093, +"y": 273, "type": "cubic" }, { -"x": 1155, -"y": 417, +"x": 1043, +"y": 347, "type": "cubic" }, { -"x": 1061, -"y": 434 +"x": 920, +"y": 363 }, { -"x": 1031, -"y": 377 +"x": 900, +"y": 345 }, { -"x": 1108, -"y": 392, +"x": 994, +"y": 371, "type": "cubic" }, { -"x": 1200, -"y": 444, +"x": 1033, +"y": 439, "type": "cubic" }, { -"x": 1200, -"y": 563, +"x": 1033, +"y": 517, "smooth": true }, { -"x": 1200, -"y": 711, +"x": 1033, +"y": 618, "type": "cubic" }, { -"x": 1111.0, -"y": 800.0, +"x": 970, +"y": 700, "type": "cubic" }, { -"x": 846, -"y": 800.0, +"x": 810, +"y": 700, "smooth": true }, { -"x": 450, -"y": 800 +"x": 140, +"y": 700 }, { -"x": 450, -"y": 574 +"x": 140, +"y": 664 }, { -"x": 693.0, -"y": 574.0, +"x": 820, +"y": 664, "smooth": true }, { -"x": 744.0, -"y": 574.0, +"x": 939, +"y": 664, "type": "cubic" }, { -"x": 777, -"y": 565, +"x": 994, +"y": 603, "type": "cubic" }, { -"x": 777, -"y": 528, +"x": 994, +"y": 517, "smooth": true }, { -"x": 777, -"y": 476, +"x": 994, +"y": 431, "type": "cubic" }, { -"x": 744.0, -"y": 480.0, +"x": 939, +"y": 368, "type": "cubic" }, { -"x": 693.0, -"y": 480.0, +"x": 820, +"y": 368, "smooth": true }, { -"x": 450, -"y": 480 +"x": 140, +"y": 368 } ], "isClosed": true } ] }, -"xAdvance": 1270 +"xAdvance": 1173 } } } diff --git a/tests/data/MutatorSans.fontra/glyphs/C^1.json b/tests/data/MutatorSans.fontra/glyphs/C^1.json index f495715..4a8965e 100644 --- a/tests/data/MutatorSans.fontra/glyphs/C^1.json +++ b/tests/data/MutatorSans.fontra/glyphs/C^1.json @@ -5,673 +5,673 @@ "name": "LightCondensed", "layerName": "MutatorSansLightCondensed/foreground", "location": { -"width": 0.0, -"weight": 150.0 +"weight": 150, +"width": 0 } }, { "name": "BoldCondensed", "layerName": "MutatorSansBoldCondensed/foreground", "location": { -"width": 0.0, -"weight": 850.0 +"weight": 850, +"width": 0 } }, { "name": "LightWide", "layerName": "MutatorSansLightWide/foreground", "location": { -"width": 1000.0, -"weight": 150.0 +"weight": 150, +"width": 1000 } }, { "name": "BoldWide", "layerName": "MutatorSansBoldWide/foreground", "location": { -"width": 1000.0, -"weight": 850.0 +"weight": 850, +"width": 1000 } } ], "layers": { -"MutatorSansLightCondensed/foreground": { +"MutatorSansBoldCondensed/foreground": { "glyph": { "path": { "contours": [ { "points": [ { -"x": 410, -"y": 264 +"x": 512, +"y": 378 }, { -"x": 397, -"y": 85, +"x": 510, +"y": 284, "type": "cubic" }, { -"x": 340, -"y": 26, +"x": 486, +"y": 254, "type": "cubic" }, { -"x": 257, -"y": 26, +"x": 426, +"y": 254, "smooth": true }, { -"x": 246, -"y": 26, +"x": 418, +"y": 254, "smooth": true }, { -"x": 152, -"y": 26, +"x": 362, +"y": 254, "type": "cubic" }, { -"x": 92, -"y": 104, +"x": 342, +"y": 298, "type": "cubic" }, { -"x": 92, -"y": 352, +"x": 342, +"y": 403, "smooth": true }, { -"x": 92, -"y": 599, +"x": 342, +"y": 504, "type": "cubic" }, { -"x": 152, -"y": 674, +"x": 362, +"y": 546, "type": "cubic" }, { -"x": 246, -"y": 674, +"x": 418, +"y": 546, "smooth": true }, { -"x": 257, -"y": 674, +"x": 426, +"y": 546, "smooth": true }, { -"x": 339, -"y": 674, +"x": 486, +"y": 546, "type": "cubic" }, { -"x": 396, -"y": 618, +"x": 510, +"y": 518, "type": "cubic" }, { -"x": 410, -"y": 442 +"x": 512, +"y": 428 }, { -"x": 449, -"y": 447 +"x": 802, +"y": 457 }, { -"x": 432, -"y": 638, +"x": 783, +"y": 696, "type": "cubic" }, { -"x": 361, -"y": 710, +"x": 645, +"y": 810, "type": "cubic" }, { -"x": 257, -"y": 710, +"x": 434, +"y": 810, "smooth": true }, { -"x": 246, -"y": 710, +"x": 409, +"y": 810, "smooth": true }, { -"x": 125, -"y": 710, +"x": 170, +"y": 810, "type": "cubic" }, { -"x": 50, -"y": 615, +"x": 20, +"y": 679, "type": "cubic" }, { -"x": 50, -"y": 352 +"x": 20, +"y": 403, +"smooth": true }, { -"x": 50, -"y": 88, +"x": 20, +"y": 124, "type": "cubic" }, { -"x": 125, +"x": 170, "y": -10, "type": "cubic" }, { -"x": 246, +"x": 409, "y": -10, "smooth": true }, { -"x": 257, +"x": 434, "y": -10, "smooth": true }, { -"x": 362, +"x": 645, "y": -10, "type": "cubic" }, { -"x": 433, -"y": 64, +"x": 784, +"y": 107, "type": "cubic" }, { -"x": 449, -"y": 258 +"x": 802, +"y": 350 } ], "isClosed": true } ] }, -"xAdvance": 499 +"xAdvance": 822 } }, -"MutatorSansBoldCondensed/foreground": { +"MutatorSansBoldWide/foreground": { "glyph": { "path": { "contours": [ { "points": [ { -"x": 512, -"y": 378 +"x": 906, +"y": 362 }, { -"x": 510, -"y": 284, +"x": 890, +"y": 286, "type": "cubic" }, { -"x": 486, +"x": 829, "y": 254, "type": "cubic" }, { -"x": 426, +"x": 738, "y": 254, "smooth": true }, { -"x": 418, +"x": 644, "y": 254, "smooth": true }, { -"x": 362, +"x": 538, "y": 254, "type": "cubic" }, { -"x": 342, +"x": 472, "y": 298, "type": "cubic" }, { -"x": 342, +"x": 472, "y": 403, "smooth": true }, { -"x": 342, +"x": 472, "y": 504, "type": "cubic" }, { -"x": 362, +"x": 538, "y": 546, "type": "cubic" }, { -"x": 418, +"x": 644, "y": 546, "smooth": true }, { -"x": 426, +"x": 738, "y": 546, "smooth": true }, { -"x": 486, +"x": 828, "y": 546, "type": "cubic" }, { -"x": 510, -"y": 518, +"x": 889, +"y": 516, "type": "cubic" }, { -"x": 512, -"y": 428 +"x": 906, +"y": 445 }, { -"x": 802, -"y": 457 +"x": 1333, +"y": 491 }, { -"x": 783, -"y": 696, +"x": 1291, +"y": 707, "type": "cubic" }, { -"x": 645, +"x": 1090, "y": 810, "type": "cubic" }, { -"x": 434, +"x": 790, "y": 810, "smooth": true }, { -"x": 409, +"x": 590, "y": 810, "smooth": true }, { -"x": 170, +"x": 252, "y": 810, "type": "cubic" }, { -"x": 20, +"x": 40, "y": 679, "type": "cubic" }, { -"x": 20, +"x": 40, "y": 403, "smooth": true }, { -"x": 20, +"x": 40, "y": 124, "type": "cubic" }, { -"x": 170, +"x": 252, "y": -10, "type": "cubic" }, { -"x": 409, +"x": 590, "y": -10, "smooth": true }, { -"x": 434, +"x": 790, "y": -10, "smooth": true }, { -"x": 645, +"x": 1092, "y": -10, "type": "cubic" }, { -"x": 784, -"y": 107, +"x": 1294, +"y": 97, "type": "cubic" }, { -"x": 802, -"y": 350 +"x": 1334, +"y": 319 } ], "isClosed": true } ] }, -"xAdvance": 822 +"xAdvance": 1374 } }, -"MutatorSansLightWide/foreground": { +"MutatorSansLightCondensed/foreground": { "glyph": { "path": { "contours": [ { "points": [ { -"x": 1183, -"y": 277 +"x": 410, +"y": 264 }, { -"x": 1143, -"y": 102, +"x": 397, +"y": 85, "type": "cubic" }, { -"x": 956, +"x": 340, "y": 26, "type": "cubic" }, { -"x": 680, +"x": 257, "y": 26, "smooth": true }, { -"x": 630, +"x": 246, "y": 26, "smooth": true }, { -"x": 318, +"x": 152, "y": 26, "type": "cubic" }, { -"x": 120, -"y": 124, +"x": 92, +"y": 104, "type": "cubic" }, { -"x": 120, +"x": 92, "y": 352, "smooth": true }, { -"x": 120, -"y": 579, +"x": 92, +"y": 599, "type": "cubic" }, { -"x": 318, +"x": 152, "y": 674, "type": "cubic" }, { -"x": 630, +"x": 246, "y": 674, "smooth": true }, { -"x": 680, +"x": 257, "y": 674, "smooth": true }, { -"x": 954, +"x": 339, "y": 674, "type": "cubic" }, { -"x": 1140, -"y": 601, +"x": 396, +"y": 618, "type": "cubic" }, { -"x": 1182, -"y": 431 +"x": 410, +"y": 442 }, { -"x": 1222, -"y": 435 +"x": 449, +"y": 447 }, { -"x": 1178, -"y": 621, +"x": 432, +"y": 638, "type": "cubic" }, { -"x": 977, +"x": 361, "y": 710, "type": "cubic" }, { -"x": 680, +"x": 257, "y": 710, "smooth": true }, { -"x": 630, +"x": 246, "y": 710, "smooth": true }, { -"x": 292, +"x": 125, "y": 710, "type": "cubic" }, { -"x": 80, -"y": 595, +"x": 50, +"y": 615, "type": "cubic" }, { -"x": 80, -"y": 352, -"smooth": true +"x": 50, +"y": 352 }, { -"x": 80, -"y": 108, +"x": 50, +"y": 88, "type": "cubic" }, { -"x": 292, +"x": 125, "y": -10, "type": "cubic" }, { -"x": 630, +"x": 246, "y": -10, "smooth": true }, { -"x": 680, +"x": 257, "y": -10, "smooth": true }, { -"x": 979, +"x": 362, "y": -10, "type": "cubic" }, { -"x": 1180, -"y": 82, +"x": 433, +"y": 64, "type": "cubic" }, { -"x": 1223, -"y": 273 +"x": 449, +"y": 258 } ], "isClosed": true } ] }, -"xAdvance": 1303 +"xAdvance": 499 } }, -"MutatorSansBoldWide/foreground": { +"MutatorSansLightWide/foreground": { "glyph": { "path": { "contours": [ { "points": [ { -"x": 906, -"y": 362 +"x": 1183, +"y": 277 }, { -"x": 890, -"y": 286, +"x": 1143, +"y": 102, "type": "cubic" }, { -"x": 829, -"y": 254, +"x": 956, +"y": 26, "type": "cubic" }, { -"x": 738, -"y": 254, +"x": 680, +"y": 26, "smooth": true }, { -"x": 644, -"y": 254, +"x": 630, +"y": 26, "smooth": true }, { -"x": 538, -"y": 254, +"x": 318, +"y": 26, "type": "cubic" }, { -"x": 472, -"y": 298, +"x": 120, +"y": 124, "type": "cubic" }, { -"x": 472, -"y": 403, +"x": 120, +"y": 352, "smooth": true }, { -"x": 472, -"y": 504, +"x": 120, +"y": 579, "type": "cubic" }, { -"x": 538, -"y": 546, +"x": 318, +"y": 674, "type": "cubic" }, { -"x": 644, -"y": 546, +"x": 630, +"y": 674, "smooth": true }, { -"x": 738, -"y": 546, +"x": 680, +"y": 674, "smooth": true }, { -"x": 828, -"y": 546, +"x": 954, +"y": 674, "type": "cubic" }, { -"x": 889, -"y": 516, +"x": 1140, +"y": 601, "type": "cubic" }, { -"x": 906, -"y": 445 +"x": 1182, +"y": 431 }, { -"x": 1333, -"y": 491 +"x": 1222, +"y": 435 }, { -"x": 1291, -"y": 707, +"x": 1178, +"y": 621, "type": "cubic" }, { -"x": 1090, -"y": 810, +"x": 977, +"y": 710, "type": "cubic" }, { -"x": 790, -"y": 810, +"x": 680, +"y": 710, "smooth": true }, { -"x": 590, -"y": 810, +"x": 630, +"y": 710, "smooth": true }, { -"x": 252, -"y": 810, +"x": 292, +"y": 710, "type": "cubic" }, { -"x": 40, -"y": 679, +"x": 80, +"y": 595, "type": "cubic" }, { -"x": 40, -"y": 403, +"x": 80, +"y": 352, "smooth": true }, { -"x": 40, -"y": 124, +"x": 80, +"y": 108, "type": "cubic" }, { -"x": 252, +"x": 292, "y": -10, "type": "cubic" }, { -"x": 590, +"x": 630, "y": -10, "smooth": true }, { -"x": 790, +"x": 680, "y": -10, "smooth": true }, { -"x": 1092, +"x": 979, "y": -10, "type": "cubic" }, { -"x": 1294, -"y": 97, +"x": 1180, +"y": 82, "type": "cubic" }, { -"x": 1334, -"y": 319 +"x": 1223, +"y": 273 } ], "isClosed": true } ] }, -"xAdvance": 1374 +"xAdvance": 1303 } } } diff --git a/tests/data/MutatorSans.fontra/glyphs/D^1.json b/tests/data/MutatorSans.fontra/glyphs/D^1.json index e901eee..9e60e4e 100644 --- a/tests/data/MutatorSans.fontra/glyphs/D^1.json +++ b/tests/data/MutatorSans.fontra/glyphs/D^1.json @@ -5,57 +5,57 @@ "name": "LightCondensed", "layerName": "MutatorSansLightCondensed/foreground", "location": { -"width": 0.0, -"weight": 150.0 +"weight": 150, +"width": 0 } }, { "name": "BoldCondensed", "layerName": "MutatorSansBoldCondensed/foreground", "location": { -"width": 0.0, -"weight": 850.0 +"weight": 850, +"width": 0 } }, { "name": "LightWide", "layerName": "MutatorSansLightWide/foreground", "location": { -"width": 1000.0, -"weight": 150.0 +"weight": 150, +"width": 1000 } }, { "name": "BoldWide", "layerName": "MutatorSansBoldWide/foreground", "location": { -"width": 1000.0, -"weight": 850.0 +"weight": 850, +"width": 1000 } } ], "layers": { -"MutatorSansLightCondensed/foreground": { +"MutatorSansBoldCondensed/foreground": { "glyph": { "path": { "contours": [ { "points": [ { -"x": 60, +"x": 30, "y": 0 }, { -"x": 100, +"x": 319, "y": 0 }, { -"x": 100, -"y": 700 +"x": 319, +"y": 800 }, { -"x": 60, -"y": 700 +"x": 30, +"y": 800 } ], "isClosed": true @@ -63,119 +63,119 @@ { "points": [ { -"x": 86, -"y": 664 +"x": 263, +"y": 546 }, { -"x": 207, -"y": 664, +"x": 345, +"y": 546, "smooth": true }, { -"x": 320.0, -"y": 664.0, +"x": 401, +"y": 546, "type": "cubic" }, { -"x": 401, -"y": 599, +"x": 421, +"y": 504, "type": "cubic" }, { -"x": 401, -"y": 352, +"x": 421, +"y": 403, "smooth": true }, { -"x": 401, -"y": 104, +"x": 421, +"y": 298, "type": "cubic" }, { -"x": 320.0, -"y": 36.0, +"x": 401, +"y": 254, "type": "cubic" }, { -"x": 207, -"y": 36, +"x": 345, +"y": 254, "smooth": true }, { -"x": 86, -"y": 36 +"x": 255, +"y": 254 }, { -"x": 86, +"x": 255, "y": 0 }, { -"x": 207, +"x": 353, "y": 0, "smooth": true }, { -"x": 345.0, -"y": 0.0, +"x": 592, +"y": 0, "type": "cubic" }, { -"x": 443, -"y": 88, +"x": 743, +"y": 131, "type": "cubic" }, { -"x": 443, -"y": 352, +"x": 743, +"y": 403, "smooth": true }, { -"x": 443, -"y": 615, +"x": 743, +"y": 672, "type": "cubic" }, { -"x": 345.0, -"y": 700.0, +"x": 592, +"y": 800, "type": "cubic" }, { -"x": 207, -"y": 700, +"x": 353, +"y": 800, "smooth": true }, { -"x": 86, -"y": 700 +"x": 263, +"y": 800 } ], "isClosed": true } ] }, -"xAdvance": 493 +"xAdvance": 763 } }, -"MutatorSansBoldCondensed/foreground": { +"MutatorSansBoldWide/foreground": { "glyph": { "path": { "contours": [ { "points": [ { -"x": 30, +"x": 60, "y": 0 }, { -"x": 319, +"x": 480, "y": 0 }, { -"x": 319, +"x": 480, "y": 800 }, { -"x": 30, +"x": 60, "y": 800 } ], @@ -184,89 +184,89 @@ { "points": [ { -"x": 263, +"x": 430, "y": 546 }, { -"x": 345, +"x": 653, "y": 546, "smooth": true }, { -"x": 401, +"x": 759, "y": 546, "type": "cubic" }, { -"x": 421, +"x": 825, "y": 504, "type": "cubic" }, { -"x": 421, +"x": 825, "y": 403, "smooth": true }, { -"x": 421, +"x": 825, "y": 298, "type": "cubic" }, { -"x": 401, +"x": 759, "y": 254, "type": "cubic" }, { -"x": 345, +"x": 653, "y": 254, "smooth": true }, { -"x": 255, +"x": 430, "y": 254 }, { -"x": 255, +"x": 430, "y": 0 }, { -"x": 353, +"x": 705, "y": 0, "smooth": true }, { -"x": 592, +"x": 1043, "y": 0, "type": "cubic" }, { -"x": 743, -"y": 131, +"x": 1256, +"y": 124, "type": "cubic" }, { -"x": 743, +"x": 1256, "y": 403, "smooth": true }, { -"x": 743, -"y": 672, +"x": 1256, +"y": 679, "type": "cubic" }, { -"x": 592, +"x": 1043, "y": 800, "type": "cubic" }, { -"x": 353, +"x": 705, "y": 800, "smooth": true }, { -"x": 263, +"x": 430, "y": 800 } ], @@ -274,29 +274,29 @@ } ] }, -"xAdvance": 763 +"xAdvance": 1316 } }, -"MutatorSansLightWide/foreground": { +"MutatorSansLightCondensed/foreground": { "glyph": { "path": { "contours": [ { "points": [ { -"x": 120, +"x": 60, "y": 0 }, { -"x": 160, +"x": 100, "y": 0 }, { -"x": 160, +"x": 100, "y": 700 }, { -"x": 120, +"x": 60, "y": 700 } ], @@ -305,89 +305,89 @@ { "points": [ { -"x": 140, +"x": 86, "y": 664 }, { -"x": 570, +"x": 207, "y": 664, "smooth": true }, { -"x": 883, +"x": 320, "y": 664, "type": "cubic" }, { -"x": 1081, -"y": 579, +"x": 401, +"y": 599, "type": "cubic" }, { -"x": 1081, +"x": 401, "y": 352, "smooth": true }, { -"x": 1081, -"y": 124, +"x": 401, +"y": 104, "type": "cubic" }, { -"x": 883, +"x": 320, "y": 36, "type": "cubic" }, { -"x": 570, +"x": 207, "y": 36, "smooth": true }, { -"x": 140, +"x": 86, "y": 36 }, { -"x": 140, +"x": 86, "y": 0 }, { -"x": 570, +"x": 207, "y": 0, "smooth": true }, { -"x": 908, +"x": 345, "y": 0, "type": "cubic" }, { -"x": 1121, -"y": 108, +"x": 443, +"y": 88, "type": "cubic" }, { -"x": 1121, +"x": 443, "y": 352, "smooth": true }, { -"x": 1121, -"y": 595, +"x": 443, +"y": 615, "type": "cubic" }, { -"x": 908, +"x": 345, "y": 700, "type": "cubic" }, { -"x": 570, +"x": 207, "y": 700, "smooth": true }, { -"x": 140, +"x": 86, "y": 700 } ], @@ -395,30 +395,30 @@ } ] }, -"xAdvance": 1201 +"xAdvance": 493 } }, -"MutatorSansBoldWide/foreground": { +"MutatorSansLightWide/foreground": { "glyph": { "path": { "contours": [ { "points": [ { -"x": 60, +"x": 120, "y": 0 }, { -"x": 480, +"x": 160, "y": 0 }, { -"x": 480, -"y": 800 +"x": 160, +"y": 700 }, { -"x": 60, -"y": 800 +"x": 120, +"y": 700 } ], "isClosed": true @@ -426,97 +426,97 @@ { "points": [ { -"x": 430, -"y": 546 +"x": 140, +"y": 664 }, { -"x": 653, -"y": 546, +"x": 570, +"y": 664, "smooth": true }, { -"x": 759.0, -"y": 546.0, +"x": 883, +"y": 664, "type": "cubic" }, { -"x": 825, -"y": 504, +"x": 1081, +"y": 579, "type": "cubic" }, { -"x": 825, -"y": 403, +"x": 1081, +"y": 352, "smooth": true }, { -"x": 825, -"y": 298, +"x": 1081, +"y": 124, "type": "cubic" }, { -"x": 759.0, -"y": 254.0, +"x": 883, +"y": 36, "type": "cubic" }, { -"x": 653, -"y": 254, +"x": 570, +"y": 36, "smooth": true }, { -"x": 430, -"y": 254 +"x": 140, +"y": 36 }, { -"x": 430, +"x": 140, "y": 0 }, { -"x": 705, +"x": 570, "y": 0, "smooth": true }, { -"x": 1043.0, -"y": 0.0, +"x": 908, +"y": 0, "type": "cubic" }, { -"x": 1256, -"y": 124, +"x": 1121, +"y": 108, "type": "cubic" }, { -"x": 1256, -"y": 403, +"x": 1121, +"y": 352, "smooth": true }, { -"x": 1256, -"y": 679, +"x": 1121, +"y": 595, "type": "cubic" }, { -"x": 1043.0, -"y": 800.0, +"x": 908, +"y": 700, "type": "cubic" }, { -"x": 705, -"y": 800, +"x": 570, +"y": 700, "smooth": true }, { -"x": 430, -"y": 800 +"x": 140, +"y": 700 } ], "isClosed": true } ] }, -"xAdvance": 1316 +"xAdvance": 1201 } } } diff --git a/tests/data/MutatorSans.fontra/glyphs/E^1.json b/tests/data/MutatorSans.fontra/glyphs/E^1.json index 3c9d1aa..523437a 100644 --- a/tests/data/MutatorSans.fontra/glyphs/E^1.json +++ b/tests/data/MutatorSans.fontra/glyphs/E^1.json @@ -5,65 +5,67 @@ "name": "LightCondensed", "layerName": "MutatorSansLightCondensed/foreground", "location": { -"width": 0.0, -"weight": 150.0 +"weight": 150, +"width": 0 } }, { "name": "BoldCondensed", "layerName": "MutatorSansBoldCondensed/foreground", "location": { -"width": 0.0, -"weight": 850.0 +"weight": 850, +"width": 0 } }, { "name": "LightWide", "layerName": "MutatorSansLightWide/foreground", "location": { -"width": 1000.0, -"weight": 150.0 +"weight": 150, +"width": 1000 } }, { "name": "BoldWide", "layerName": "MutatorSansBoldWide/foreground", "location": { -"width": 1000.0, -"weight": 850.0 +"weight": 850, +"width": 1000 } }, { "name": "support.crossbar", "layerName": "MutatorSansLightCondensed/support.crossbar", "location": { -"width": 0.0, -"weight": 595.0 +"weight": 595, +"width": 0 } } ], "layers": { -"MutatorSansLightCondensed/foreground": { +"MutatorSansBoldCondensed/foreground": { "glyph": { "path": { "contours": [ { "points": [ { -"x": 60, -"y": 0 +"x": 40, +"y": 0, +"smooth": true }, { -"x": 100, +"x": 330, "y": 0 }, { -"x": 100, -"y": 700 +"x": 330, +"y": 800 }, { -"x": 60, -"y": 700 +"x": 40, +"y": 800, +"smooth": true } ], "isClosed": true @@ -71,20 +73,20 @@ { "points": [ { -"x": 80, -"y": 664 +"x": 130, +"y": 530 }, { -"x": 340, -"y": 664 +"x": 570, +"y": 530 }, { -"x": 340, -"y": 700 +"x": 570, +"y": 800 }, { -"x": 80, -"y": 700 +"x": 130, +"y": 800 } ], "isClosed": true @@ -92,20 +94,20 @@ { "points": [ { -"x": 80, +"x": 130, "y": 0 }, { -"x": 340, +"x": 570, "y": 0 }, { -"x": 340, -"y": 36 +"x": 570, +"y": 270 }, { -"x": 80, -"y": 36 +"x": 130, +"y": 270 } ], "isClosed": true @@ -113,50 +115,50 @@ { "points": [ { -"x": 80, -"y": 334 +"x": 130, +"y": 315 }, { -"x": 320, -"y": 334 +"x": 536, +"y": 315 }, { -"x": 320, -"y": 370 +"x": 536, +"y": 485 }, { -"x": 80, -"y": 370 +"x": 130, +"y": 485 } ], "isClosed": true } ] }, -"xAdvance": 380 +"xAdvance": 597 } }, -"MutatorSansLightCondensed/support.crossbar": { +"MutatorSansBoldWide/foreground": { "glyph": { "path": { "contours": [ { "points": [ { -"x": 45.68544, -"y": 0.0 +"x": 60, +"y": 0 }, { -"x": 264.61744, -"y": 0.0 +"x": 480, +"y": 0 }, { -"x": 264.61744, -"y": 771.5728 +"x": 480, +"y": 800 }, { -"x": 45.68544, -"y": 771.5728 +"x": 60, +"y": 800 } ], "isClosed": true @@ -164,20 +166,20 @@ { "points": [ { -"x": 115.78639999999999, -"y": 568.092448 +"x": 150, +"y": 530 }, { -"x": 504.61744, -"y": 568.092448 +"x": 1075, +"y": 530 }, { -"x": 504.61744, -"y": 771.5728 +"x": 1075, +"y": 800 }, { -"x": 115.78639999999999, -"y": 771.5728 +"x": 150, +"y": 800 } ], "isClosed": true @@ -185,20 +187,20 @@ { "points": [ { -"x": 115.78639999999999, -"y": 0.0 +"x": 150, +"y": 0 }, { -"x": 504.61744, -"y": 0.0 +"x": 1075, +"y": 0 }, { -"x": 504.61744, -"y": 203.48035199999998 +"x": 1075, +"y": 270 }, { -"x": 115.78639999999999, -"y": 203.48035199999998 +"x": 150, +"y": 270 } ], "isClosed": true @@ -206,52 +208,50 @@ { "points": [ { -"x": 116, -"y": 297 +"x": 150, +"y": 315 }, { -"x": 475, -"y": 297 +"x": 986, +"y": 315 }, { -"x": 475, -"y": 479 +"x": 986, +"y": 485 }, { -"x": 116, -"y": 479 +"x": 150, +"y": 485 } ], "isClosed": true } ] }, -"xAdvance": 551 +"xAdvance": 1120 } }, -"MutatorSansBoldCondensed/foreground": { +"MutatorSansLightCondensed/foreground": { "glyph": { "path": { "contours": [ { "points": [ { -"x": 40, -"y": 0, -"smooth": true +"x": 60, +"y": 0 }, { -"x": 330, +"x": 100, "y": 0 }, { -"x": 330, -"y": 800 +"x": 100, +"y": 700 }, { -"x": 40, -"y": 800, -"smooth": true +"x": 60, +"y": 700 } ], "isClosed": true @@ -259,20 +259,20 @@ { "points": [ { -"x": 130, -"y": 530 +"x": 80, +"y": 664 }, { -"x": 570, -"y": 530 +"x": 340, +"y": 664 }, { -"x": 570, -"y": 800 +"x": 340, +"y": 700 }, { -"x": 130, -"y": 800 +"x": 80, +"y": 700 } ], "isClosed": true @@ -280,20 +280,20 @@ { "points": [ { -"x": 130, +"x": 80, "y": 0 }, { -"x": 570, +"x": 340, "y": 0 }, { -"x": 570, -"y": 270 +"x": 340, +"y": 36 }, { -"x": 130, -"y": 270 +"x": 80, +"y": 36 } ], "isClosed": true @@ -301,50 +301,50 @@ { "points": [ { -"x": 130, -"y": 315 +"x": 80, +"y": 334 }, { -"x": 536, -"y": 315 +"x": 320, +"y": 334 }, { -"x": 536, -"y": 485 +"x": 320, +"y": 370 }, { -"x": 130, -"y": 485 +"x": 80, +"y": 370 } ], "isClosed": true } ] }, -"xAdvance": 597 +"xAdvance": 380 } }, -"MutatorSansLightWide/foreground": { +"MutatorSansLightCondensed/support.crossbar": { "glyph": { "path": { "contours": [ { "points": [ { -"x": 120, +"x": 45.68544, "y": 0 }, { -"x": 160, +"x": 264.61744, "y": 0 }, { -"x": 160, -"y": 700 +"x": 264.61744, +"y": 771.5728 }, { -"x": 120, -"y": 700 +"x": 45.68544, +"y": 771.5728 } ], "isClosed": true @@ -352,20 +352,20 @@ { "points": [ { -"x": 140, -"y": 664 +"x": 115.78639999999999, +"y": 568.092448 }, { -"x": 940, -"y": 664 +"x": 504.61744, +"y": 568.092448 }, { -"x": 940, -"y": 700 +"x": 504.61744, +"y": 771.5728 }, { -"x": 140, -"y": 700 +"x": 115.78639999999999, +"y": 771.5728 } ], "isClosed": true @@ -373,20 +373,20 @@ { "points": [ { -"x": 140, +"x": 115.78639999999999, "y": 0 }, { -"x": 940, +"x": 504.61744, "y": 0 }, { -"x": 940, -"y": 36 +"x": 504.61744, +"y": 203.48035199999998 }, { -"x": 140, -"y": 36 +"x": 115.78639999999999, +"y": 203.48035199999998 } ], "isClosed": true @@ -394,50 +394,50 @@ { "points": [ { -"x": 140, -"y": 334 +"x": 116, +"y": 297 }, { -"x": 860, -"y": 334 +"x": 475, +"y": 297 }, { -"x": 860, -"y": 370 +"x": 475, +"y": 479 }, { -"x": 140, -"y": 370 +"x": 116, +"y": 479 } ], "isClosed": true } ] }, -"xAdvance": 1010 +"xAdvance": 551 } }, -"MutatorSansBoldWide/foreground": { +"MutatorSansLightWide/foreground": { "glyph": { "path": { "contours": [ { "points": [ { -"x": 60, +"x": 120, "y": 0 }, { -"x": 480, +"x": 160, "y": 0 }, { -"x": 480, -"y": 800 +"x": 160, +"y": 700 }, { -"x": 60, -"y": 800 +"x": 120, +"y": 700 } ], "isClosed": true @@ -445,20 +445,20 @@ { "points": [ { -"x": 150, -"y": 530 +"x": 140, +"y": 664 }, { -"x": 1075, -"y": 530 +"x": 940, +"y": 664 }, { -"x": 1075, -"y": 800 +"x": 940, +"y": 700 }, { -"x": 150, -"y": 800 +"x": 140, +"y": 700 } ], "isClosed": true @@ -466,20 +466,20 @@ { "points": [ { -"x": 150, +"x": 140, "y": 0 }, { -"x": 1075, +"x": 940, "y": 0 }, { -"x": 1075, -"y": 270 +"x": 940, +"y": 36 }, { -"x": 150, -"y": 270 +"x": 140, +"y": 36 } ], "isClosed": true @@ -487,27 +487,27 @@ { "points": [ { -"x": 150, -"y": 315 +"x": 140, +"y": 334 }, { -"x": 986, -"y": 315 +"x": 860, +"y": 334 }, { -"x": 986, -"y": 485 +"x": 860, +"y": 370 }, { -"x": 150, -"y": 485 +"x": 140, +"y": 370 } ], "isClosed": true } ] }, -"xAdvance": 1120 +"xAdvance": 1010 } } } diff --git a/tests/data/MutatorSans.fontra/glyphs/F^1.json b/tests/data/MutatorSans.fontra/glyphs/F^1.json index 6a25fd1..4cf7193 100644 --- a/tests/data/MutatorSans.fontra/glyphs/F^1.json +++ b/tests/data/MutatorSans.fontra/glyphs/F^1.json @@ -5,65 +5,65 @@ "name": "LightCondensed", "layerName": "MutatorSansLightCondensed/foreground", "location": { -"width": 0.0, -"weight": 150.0 +"weight": 150, +"width": 0 } }, { "name": "BoldCondensed", "layerName": "MutatorSansBoldCondensed/foreground", "location": { -"width": 0.0, -"weight": 850.0 +"weight": 850, +"width": 0 } }, { "name": "LightWide", "layerName": "MutatorSansLightWide/foreground", "location": { -"width": 1000.0, -"weight": 150.0 +"weight": 150, +"width": 1000 } }, { "name": "BoldWide", "layerName": "MutatorSansBoldWide/foreground", "location": { -"width": 1000.0, -"weight": 850.0 +"weight": 850, +"width": 1000 } }, { "name": "support.crossbar", "layerName": "MutatorSansLightCondensed/support.crossbar", "location": { -"width": 0.0, -"weight": 595.0 +"weight": 595, +"width": 0 } } ], "layers": { -"MutatorSansLightCondensed/foreground": { +"MutatorSansBoldCondensed/foreground": { "glyph": { "path": { "contours": [ { "points": [ { -"x": 60, +"x": 30, "y": 0 }, { -"x": 100, +"x": 350, "y": 0 }, { -"x": 100, -"y": 700 +"x": 350, +"y": 800 }, { -"x": 60, -"y": 700 +"x": 30, +"y": 800 } ], "isClosed": true @@ -71,20 +71,20 @@ { "points": [ { -"x": 80, -"y": 664 +"x": 130, +"y": 550 }, { -"x": 340, -"y": 664 +"x": 530, +"y": 550 }, { -"x": 340, -"y": 700 +"x": 530, +"y": 800 }, { -"x": 80, -"y": 700 +"x": 130, +"y": 800 } ], "isClosed": true @@ -92,50 +92,50 @@ { "points": [ { -"x": 80, -"y": 314 +"x": 130, +"y": 275 }, { -"x": 320, -"y": 314 +"x": 516, +"y": 275 }, { -"x": 320, -"y": 350 +"x": 516, +"y": 485 }, { -"x": 80, -"y": 350 +"x": 130, +"y": 485 } ], "isClosed": true } ] }, -"xAdvance": 380 +"xAdvance": 560 } }, -"MutatorSansLightCondensed/support.crossbar": { +"MutatorSansBoldWide/foreground": { "glyph": { "path": { "contours": [ { "points": [ { -"x": 46, -"y": 0.0 +"x": 60, +"y": 0 }, { -"x": 265, -"y": 0.0 +"x": 480, +"y": 0 }, { -"x": 265, -"y": 772 +"x": 480, +"y": 800 }, { -"x": 46, -"y": 772 +"x": 60, +"y": 800 } ], "isClosed": true @@ -143,20 +143,20 @@ { "points": [ { -"x": 116, -"y": 568 +"x": 150, +"y": 530 }, { -"x": 505, -"y": 568 +"x": 1075, +"y": 530 }, { -"x": 505, -"y": 772 +"x": 1075, +"y": 800 }, { -"x": 116, -"y": 772 +"x": 150, +"y": 800 } ], "isClosed": true @@ -164,50 +164,50 @@ { "points": [ { -"x": 116, -"y": 297 +"x": 150, +"y": 235 }, { -"x": 475, -"y": 297 +"x": 961, +"y": 235 }, { -"x": 475, -"y": 479 +"x": 961, +"y": 465 }, { -"x": 116, -"y": 479 +"x": 150, +"y": 465 } ], "isClosed": true } ] }, -"xAdvance": 551 +"xAdvance": 1090 } }, -"MutatorSansBoldCondensed/foreground": { +"MutatorSansLightCondensed/foreground": { "glyph": { "path": { "contours": [ { "points": [ { -"x": 30, +"x": 60, "y": 0 }, { -"x": 350, +"x": 100, "y": 0 }, { -"x": 350, -"y": 800 +"x": 100, +"y": 700 }, { -"x": 30, -"y": 800 +"x": 60, +"y": 700 } ], "isClosed": true @@ -215,20 +215,20 @@ { "points": [ { -"x": 130, -"y": 550 +"x": 80, +"y": 664 }, { -"x": 530, -"y": 550 +"x": 340, +"y": 664 }, { -"x": 530, -"y": 800 +"x": 340, +"y": 700 }, { -"x": 130, -"y": 800 +"x": 80, +"y": 700 } ], "isClosed": true @@ -236,50 +236,50 @@ { "points": [ { -"x": 130, -"y": 275 +"x": 80, +"y": 314 }, { -"x": 516, -"y": 275 +"x": 320, +"y": 314 }, { -"x": 516, -"y": 485 +"x": 320, +"y": 350 }, { -"x": 130, -"y": 485 +"x": 80, +"y": 350 } ], "isClosed": true } ] }, -"xAdvance": 560 +"xAdvance": 380 } }, -"MutatorSansLightWide/foreground": { +"MutatorSansLightCondensed/support.crossbar": { "glyph": { "path": { "contours": [ { "points": [ { -"x": 120, +"x": 46, "y": 0 }, { -"x": 160, +"x": 265, "y": 0 }, { -"x": 160, -"y": 700 +"x": 265, +"y": 772 }, { -"x": 120, -"y": 700 +"x": 46, +"y": 772 } ], "isClosed": true @@ -287,20 +287,20 @@ { "points": [ { -"x": 140, -"y": 664 +"x": 116, +"y": 568 }, { -"x": 980, -"y": 664 +"x": 505, +"y": 568 }, { -"x": 980, -"y": 700 +"x": 505, +"y": 772 }, { -"x": 140, -"y": 700 +"x": 116, +"y": 772 } ], "isClosed": true @@ -308,50 +308,50 @@ { "points": [ { -"x": 140, -"y": 294 +"x": 116, +"y": 297 }, { -"x": 960, -"y": 294 +"x": 475, +"y": 297 }, { -"x": 960, -"y": 330 +"x": 475, +"y": 479 }, { -"x": 140, -"y": 330 +"x": 116, +"y": 479 } ], "isClosed": true } ] }, -"xAdvance": 1100 +"xAdvance": 551 } }, -"MutatorSansBoldWide/foreground": { +"MutatorSansLightWide/foreground": { "glyph": { "path": { "contours": [ { "points": [ { -"x": 60, +"x": 120, "y": 0 }, { -"x": 480, +"x": 160, "y": 0 }, { -"x": 480, -"y": 800 +"x": 160, +"y": 700 }, { -"x": 60, -"y": 800 +"x": 120, +"y": 700 } ], "isClosed": true @@ -359,20 +359,20 @@ { "points": [ { -"x": 150, -"y": 530 +"x": 140, +"y": 664 }, { -"x": 1075, -"y": 530 +"x": 980, +"y": 664 }, { -"x": 1075, -"y": 800 +"x": 980, +"y": 700 }, { -"x": 150, -"y": 800 +"x": 140, +"y": 700 } ], "isClosed": true @@ -380,27 +380,27 @@ { "points": [ { -"x": 150, -"y": 235 +"x": 140, +"y": 294 }, { -"x": 961, -"y": 235 +"x": 960, +"y": 294 }, { -"x": 961, -"y": 465 +"x": 960, +"y": 330 }, { -"x": 150, -"y": 465 +"x": 140, +"y": 330 } ], "isClosed": true } ] }, -"xAdvance": 1090 +"xAdvance": 1100 } } } diff --git a/tests/data/MutatorSans.fontra/glyphs/G^1.json b/tests/data/MutatorSans.fontra/glyphs/G^1.json index 0c30610..84983bc 100644 --- a/tests/data/MutatorSans.fontra/glyphs/G^1.json +++ b/tests/data/MutatorSans.fontra/glyphs/G^1.json @@ -5,44 +5,430 @@ "name": "LightCondensed", "layerName": "MutatorSansLightCondensed/foreground", "location": { -"width": 0.0, -"weight": 150.0 +"weight": 150, +"width": 0 } }, { "name": "BoldCondensed", "layerName": "MutatorSansBoldCondensed/foreground", "location": { -"width": 0.0, -"weight": 850.0 +"weight": 850, +"width": 0 } }, { "name": "LightWide", "layerName": "MutatorSansLightWide/foreground", "location": { -"width": 1000.0, -"weight": 150.0 +"weight": 150, +"width": 1000 } }, { "name": "BoldWide", "layerName": "MutatorSansBoldWide/foreground", "location": { -"width": 1000.0, -"weight": 850.0 +"weight": 850, +"width": 1000 } }, { "name": "support.crossbar", "layerName": "MutatorSansLightCondensed/support.crossbar", "location": { -"width": 0.0, -"weight": 595.0 +"weight": 595, +"width": 0 } } ], "layers": { +"MutatorSansBoldCondensed/foreground": { +"glyph": { +"path": { +"contours": [ +{ +"points": [ +{ +"x": 420, +"y": 305 +}, +{ +"x": 587, +"y": 305 +}, +{ +"x": 587, +"y": 216 +}, +{ +"x": 687, +"y": 0 +}, +{ +"x": 800, +"y": 0 +}, +{ +"x": 800, +"y": 430 +}, +{ +"x": 420, +"y": 430 +} +], +"isClosed": true +}, +{ +"points": [ +{ +"x": 532, +"y": 378 +}, +{ +"x": 530, +"y": 284, +"type": "cubic" +}, +{ +"x": 500, +"y": 254, +"type": "cubic" +}, +{ +"x": 426, +"y": 254, +"smooth": true +}, +{ +"x": 418, +"y": 254, +"smooth": true +}, +{ +"x": 362, +"y": 254, +"type": "cubic" +}, +{ +"x": 342, +"y": 298, +"type": "cubic" +}, +{ +"x": 342, +"y": 403, +"smooth": true +}, +{ +"x": 342, +"y": 504, +"type": "cubic" +}, +{ +"x": 366, +"y": 546, +"type": "cubic" +}, +{ +"x": 433, +"y": 546, +"smooth": true +}, +{ +"x": 441, +"y": 546, +"smooth": true +}, +{ +"x": 505, +"y": 546, +"type": "cubic" +}, +{ +"x": 530.3387986715655, +"y": 522.7540597795514, +"type": "cubic" +}, +{ +"x": 532, +"y": 448 +}, +{ +"x": 792, +"y": 457 +}, +{ +"x": 773, +"y": 696, +"type": "cubic" +}, +{ +"x": 640, +"y": 810, +"type": "cubic" +}, +{ +"x": 434, +"y": 810, +"smooth": true +}, +{ +"x": 409, +"y": 810, +"smooth": true +}, +{ +"x": 170, +"y": 810, +"type": "cubic" +}, +{ +"x": 20, +"y": 679, +"type": "cubic" +}, +{ +"x": 20, +"y": 403, +"smooth": true +}, +{ +"x": 20, +"y": 124, +"type": "cubic" +}, +{ +"x": 170, +"y": -10, +"type": "cubic" +}, +{ +"x": 409, +"y": -10, +"smooth": true +}, +{ +"x": 434, +"y": -10, +"smooth": true +}, +{ +"x": 640, +"y": -10, +"type": "cubic" +}, +{ +"x": 774, +"y": 107, +"type": "cubic" +}, +{ +"x": 792, +"y": 350 +} +], +"isClosed": true +} +] +}, +"xAdvance": 830 +} +}, +"MutatorSansBoldWide/foreground": { +"glyph": { +"path": { +"contours": [ +{ +"points": [ +{ +"x": 640, +"y": 315 +}, +{ +"x": 907, +"y": 315 +}, +{ +"x": 907, +"y": 216 +}, +{ +"x": 1107, +"y": 0 +}, +{ +"x": 1350, +"y": 0 +}, +{ +"x": 1350, +"y": 420 +}, +{ +"x": 640, +"y": 420 +} +], +"isClosed": true +}, +{ +"points": [ +{ +"x": 906, +"y": 372 +}, +{ +"x": 890, +"y": 296, +"type": "cubic" +}, +{ +"x": 829, +"y": 254, +"type": "cubic" +}, +{ +"x": 738, +"y": 254, +"smooth": true +}, +{ +"x": 644, +"y": 254, +"smooth": true +}, +{ +"x": 538, +"y": 254, +"type": "cubic" +}, +{ +"x": 472, +"y": 298, +"type": "cubic" +}, +{ +"x": 472, +"y": 403, +"smooth": true +}, +{ +"x": 472, +"y": 504, +"type": "cubic" +}, +{ +"x": 538, +"y": 546, +"type": "cubic" +}, +{ +"x": 644, +"y": 546, +"smooth": true +}, +{ +"x": 738, +"y": 546, +"smooth": true +}, +{ +"x": 828, +"y": 546, +"type": "cubic" +}, +{ +"x": 889, +"y": 516, +"type": "cubic" +}, +{ +"x": 906, +"y": 445 +}, +{ +"x": 1333, +"y": 491 +}, +{ +"x": 1291, +"y": 707, +"type": "cubic" +}, +{ +"x": 1090, +"y": 810, +"type": "cubic" +}, +{ +"x": 790, +"y": 810, +"smooth": true +}, +{ +"x": 590, +"y": 810, +"smooth": true +}, +{ +"x": 252, +"y": 810, +"type": "cubic" +}, +{ +"x": 40, +"y": 679, +"type": "cubic" +}, +{ +"x": 40, +"y": 403, +"smooth": true +}, +{ +"x": 40, +"y": 124, +"type": "cubic" +}, +{ +"x": 252, +"y": -10, +"type": "cubic" +}, +{ +"x": 590, +"y": -10, +"smooth": true +}, +{ +"x": 610, +"y": -10, +"smooth": true +}, +{ +"x": 912, +"y": -10, +"type": "cubic" +}, +{ +"x": 1114, +"y": 107, +"type": "cubic" +}, +{ +"x": 1154, +"y": 329 +} +], +"isClosed": true +} +] +}, +"xAdvance": 1410 +} +}, "MutatorSansLightCondensed/foreground": { "glyph": { "path": { @@ -252,15 +638,15 @@ }, { "x": 516, -"y": 216.0 +"y": 216 }, { "x": 591, -"y": 0.0 +"y": 0 }, { "x": 699.367712, -"y": 0.0 +"y": 0 }, { "x": 699, @@ -331,295 +717,102 @@ }, { "x": 391.25239999999997, -"y": 582.386816, -"smooth": true -}, -{ -"x": 453, -"y": 582, -"type": "cubic" -}, -{ -"x": 488, -"y": 545, -"type": "cubic" -}, -{ -"x": 497, -"y": 462 -}, -{ -"x": 694, -"y": 484 -}, -{ -"x": 692, -"y": 673, -"type": "cubic" -}, -{ -"x": 563.24656, -"y": 781.5728, -"type": "cubic" -}, -{ -"x": 386.242304, -"y": 781.5728, -"smooth": true -}, -{ -"x": 365.222112, -"y": 781.5728, -"smooth": true -}, -{ -"x": 159.766208, -"y": 781.5728, -"type": "cubic" -}, -{ -"x": 28.528160000000003, -"y": 660.806592, -"type": "cubic" -}, -{ -"x": 28.528160000000003, -"y": 388.50212799999997, -"smooth": true -}, -{ -"x": 28.528160000000003, -"y": 113.766208, -"type": "cubic" -}, -{ -"x": 157.20776, -"y": -10.0, -"type": "cubic" -}, -{ -"x": 362.663664, -"y": -10.0, -"smooth": true -}, -{ -"x": 383.683856, -"y": -10.0, -"smooth": true -}, -{ -"x": 560.9723839999999, -"y": -10.0, -"type": "cubic" -}, -{ -"x": 673.367712, -"y": 94.776304, -"type": "cubic" -}, -{ -"x": 687.9564479999999, -"y": 329.532416 -} -], -"isClosed": true -} -] -}, -"xAdvance": 738 -} -}, -"MutatorSansBoldCondensed/foreground": { -"glyph": { -"path": { -"contours": [ -{ -"points": [ -{ -"x": 420, -"y": 305 -}, -{ -"x": 587, -"y": 305 -}, -{ -"x": 587, -"y": 216 -}, -{ -"x": 687, -"y": 0 -}, -{ -"x": 800, -"y": 0 -}, -{ -"x": 800, -"y": 430 -}, -{ -"x": 420, -"y": 430 -} -], -"isClosed": true -}, -{ -"points": [ -{ -"x": 532, -"y": 378 -}, -{ -"x": 530, -"y": 284, -"type": "cubic" -}, -{ -"x": 500, -"y": 254, -"type": "cubic" -}, -{ -"x": 426, -"y": 254, -"smooth": true -}, -{ -"x": 418, -"y": 254, -"smooth": true -}, -{ -"x": 362, -"y": 254, -"type": "cubic" -}, -{ -"x": 342, -"y": 298, -"type": "cubic" -}, -{ -"x": 342, -"y": 403, -"smooth": true -}, -{ -"x": 342, -"y": 504, -"type": "cubic" -}, -{ -"x": 366, -"y": 546, -"type": "cubic" -}, -{ -"x": 433, -"y": 546, -"smooth": true -}, -{ -"x": 441, -"y": 546, +"y": 582.386816, "smooth": true }, { -"x": 505.0, -"y": 546, +"x": 453, +"y": 582, "type": "cubic" }, { -"x": 530.3387986715655, -"y": 522.7540597795514, +"x": 488, +"y": 545, "type": "cubic" }, { -"x": 532, -"y": 448 +"x": 497, +"y": 462 }, { -"x": 792, -"y": 457 +"x": 694, +"y": 484 }, { -"x": 773.0, -"y": 696.0, +"x": 692, +"y": 673, "type": "cubic" }, { -"x": 640.0, -"y": 810, +"x": 563.24656, +"y": 781.5728, "type": "cubic" }, { -"x": 434, -"y": 810, +"x": 386.242304, +"y": 781.5728, "smooth": true }, { -"x": 409, -"y": 810, +"x": 365.222112, +"y": 781.5728, "smooth": true }, { -"x": 170, -"y": 810, +"x": 159.766208, +"y": 781.5728, "type": "cubic" }, { -"x": 20, -"y": 679, +"x": 28.528160000000003, +"y": 660.806592, "type": "cubic" }, { -"x": 20, -"y": 403, +"x": 28.528160000000003, +"y": 388.50212799999997, "smooth": true }, { -"x": 20, -"y": 124, +"x": 28.528160000000003, +"y": 113.766208, "type": "cubic" }, { -"x": 170, +"x": 157.20776, "y": -10, "type": "cubic" }, { -"x": 409, +"x": 362.663664, "y": -10, "smooth": true }, { -"x": 434, +"x": 383.683856, "y": -10, "smooth": true }, { -"x": 640, +"x": 560.9723839999999, "y": -10, "type": "cubic" }, { -"x": 774, -"y": 107, +"x": 673.367712, +"y": 94.776304, "type": "cubic" }, { -"x": 792, -"y": 350 +"x": 687.9564479999999, +"y": 329.532416 } ], "isClosed": true } ] }, -"xAdvance": 830 +"xAdvance": 738 } }, "MutatorSansLightWide/foreground": { @@ -814,199 +1007,6 @@ }, "xAdvance": 1372 } -}, -"MutatorSansBoldWide/foreground": { -"glyph": { -"path": { -"contours": [ -{ -"points": [ -{ -"x": 640, -"y": 315 -}, -{ -"x": 907, -"y": 315 -}, -{ -"x": 907, -"y": 216 -}, -{ -"x": 1107, -"y": 0 -}, -{ -"x": 1350, -"y": 0 -}, -{ -"x": 1350, -"y": 420 -}, -{ -"x": 640, -"y": 420 -} -], -"isClosed": true -}, -{ -"points": [ -{ -"x": 906, -"y": 372 -}, -{ -"x": 890, -"y": 296, -"type": "cubic" -}, -{ -"x": 829, -"y": 254, -"type": "cubic" -}, -{ -"x": 738, -"y": 254, -"smooth": true -}, -{ -"x": 644, -"y": 254, -"smooth": true -}, -{ -"x": 538, -"y": 254, -"type": "cubic" -}, -{ -"x": 472, -"y": 298, -"type": "cubic" -}, -{ -"x": 472, -"y": 403, -"smooth": true -}, -{ -"x": 472, -"y": 504, -"type": "cubic" -}, -{ -"x": 538, -"y": 546, -"type": "cubic" -}, -{ -"x": 644, -"y": 546, -"smooth": true -}, -{ -"x": 738, -"y": 546, -"smooth": true -}, -{ -"x": 828, -"y": 546, -"type": "cubic" -}, -{ -"x": 889, -"y": 516, -"type": "cubic" -}, -{ -"x": 906, -"y": 445 -}, -{ -"x": 1333, -"y": 491 -}, -{ -"x": 1291, -"y": 707, -"type": "cubic" -}, -{ -"x": 1090, -"y": 810, -"type": "cubic" -}, -{ -"x": 790, -"y": 810, -"smooth": true -}, -{ -"x": 590, -"y": 810, -"smooth": true -}, -{ -"x": 252, -"y": 810, -"type": "cubic" -}, -{ -"x": 40, -"y": 679, -"type": "cubic" -}, -{ -"x": 40, -"y": 403, -"smooth": true -}, -{ -"x": 40, -"y": 124, -"type": "cubic" -}, -{ -"x": 252, -"y": -10, -"type": "cubic" -}, -{ -"x": 590, -"y": -10, -"smooth": true -}, -{ -"x": 610, -"y": -10, -"smooth": true -}, -{ -"x": 912, -"y": -10, -"type": "cubic" -}, -{ -"x": 1114, -"y": 107, -"type": "cubic" -}, -{ -"x": 1154, -"y": 329 -} -], -"isClosed": true -} -] -}, -"xAdvance": 1410 -} } } } diff --git a/tests/data/MutatorSans.fontra/glyphs/H^1.json b/tests/data/MutatorSans.fontra/glyphs/H^1.json index e05b9c5..f773e83 100644 --- a/tests/data/MutatorSans.fontra/glyphs/H^1.json +++ b/tests/data/MutatorSans.fontra/glyphs/H^1.json @@ -5,57 +5,57 @@ "name": "LightCondensed", "layerName": "MutatorSansLightCondensed/foreground", "location": { -"width": 0.0, -"weight": 150.0 +"weight": 150, +"width": 0 } }, { "name": "BoldCondensed", "layerName": "MutatorSansBoldCondensed/foreground", "location": { -"width": 0.0, -"weight": 850.0 +"weight": 850, +"width": 0 } }, { "name": "LightWide", "layerName": "MutatorSansLightWide/foreground", "location": { -"width": 1000.0, -"weight": 150.0 +"weight": 150, +"width": 1000 } }, { "name": "BoldWide", "layerName": "MutatorSansBoldWide/foreground", "location": { -"width": 1000.0, -"weight": 850.0 +"weight": 850, +"width": 1000 } } ], "layers": { -"MutatorSansLightCondensed/foreground": { +"MutatorSansBoldCondensed/foreground": { "glyph": { "path": { "contours": [ { "points": [ { -"x": 60, +"x": 30, "y": 0 }, { -"x": 100, +"x": 350, "y": 0 }, { -"x": 100, -"y": 700 +"x": 350, +"y": 800 }, { -"x": 60, -"y": 700 +"x": 30, +"y": 800 } ], "isClosed": true @@ -63,20 +63,20 @@ { "points": [ { -"x": 80, -"y": 334 +"x": 140, +"y": 260 }, { -"x": 380, -"y": 334 +"x": 610, +"y": 260 }, { -"x": 380, -"y": 370 +"x": 610, +"y": 520 }, { -"x": 80, -"y": 370 +"x": 140, +"y": 520 } ], "isClosed": true @@ -84,49 +84,49 @@ { "points": [ { -"x": 360, +"x": 400, "y": 0 }, { -"x": 400, +"x": 720, "y": 0 }, { -"x": 400, -"y": 700 +"x": 720, +"y": 800 }, { -"x": 360, -"y": 700 +"x": 400, +"y": 800 } ], "isClosed": true } ] }, -"xAdvance": 460 +"xAdvance": 750 } }, -"MutatorSansBoldCondensed/foreground": { +"MutatorSansBoldWide/foreground": { "glyph": { "path": { "contours": [ { "points": [ { -"x": 30, +"x": 60, "y": 0 }, { -"x": 350, +"x": 480, "y": 0 }, { -"x": 350, +"x": 480, "y": 800 }, { -"x": 30, +"x": 60, "y": 800 } ], @@ -135,20 +135,20 @@ { "points": [ { -"x": 140, -"y": 260 +"x": 230, +"y": 270 }, { -"x": 610, -"y": 260 +"x": 1130, +"y": 270 }, { -"x": 610, -"y": 520 +"x": 1130, +"y": 530 }, { -"x": 140, -"y": 520 +"x": 230, +"y": 530 } ], "isClosed": true @@ -156,19 +156,19 @@ { "points": [ { -"x": 400, +"x": 880, "y": 0 }, { -"x": 720, +"x": 1300, "y": 0 }, { -"x": 720, +"x": 1300, "y": 800 }, { -"x": 400, +"x": 880, "y": 800 } ], @@ -176,29 +176,29 @@ } ] }, -"xAdvance": 750 +"xAdvance": 1360 } }, -"MutatorSansLightWide/foreground": { +"MutatorSansLightCondensed/foreground": { "glyph": { "path": { "contours": [ { "points": [ { -"x": 120, +"x": 60, "y": 0 }, { -"x": 160, +"x": 100, "y": 0 }, { -"x": 160, +"x": 100, "y": 700 }, { -"x": 120, +"x": 60, "y": 700 } ], @@ -207,19 +207,19 @@ { "points": [ { -"x": 143, +"x": 80, "y": 334 }, { -"x": 1004, +"x": 380, "y": 334 }, { -"x": 1004, +"x": 380, "y": 370 }, { -"x": 143, +"x": 80, "y": 370 } ], @@ -228,19 +228,19 @@ { "points": [ { -"x": 980, +"x": 360, "y": 0 }, { -"x": 1020, +"x": 400, "y": 0 }, { -"x": 1020, +"x": 400, "y": 700 }, { -"x": 980, +"x": 360, "y": 700 } ], @@ -248,30 +248,30 @@ } ] }, -"xAdvance": 1140 +"xAdvance": 460 } }, -"MutatorSansBoldWide/foreground": { +"MutatorSansLightWide/foreground": { "glyph": { "path": { "contours": [ { "points": [ { -"x": 60, +"x": 120, "y": 0 }, { -"x": 480, +"x": 160, "y": 0 }, { -"x": 480, -"y": 800 +"x": 160, +"y": 700 }, { -"x": 60, -"y": 800 +"x": 120, +"y": 700 } ], "isClosed": true @@ -279,20 +279,20 @@ { "points": [ { -"x": 230, -"y": 270 +"x": 143, +"y": 334 }, { -"x": 1130, -"y": 270 +"x": 1004, +"y": 334 }, { -"x": 1130, -"y": 530 +"x": 1004, +"y": 370 }, { -"x": 230, -"y": 530 +"x": 143, +"y": 370 } ], "isClosed": true @@ -300,27 +300,27 @@ { "points": [ { -"x": 880, +"x": 980, "y": 0 }, { -"x": 1300, +"x": 1020, "y": 0 }, { -"x": 1300, -"y": 800 +"x": 1020, +"y": 700 }, { -"x": 880, -"y": 800 +"x": 980, +"y": 700 } ], "isClosed": true } ] }, -"xAdvance": 1360 +"xAdvance": 1140 } } } diff --git a/tests/data/MutatorSans.fontra/glyphs/I.narrow^1.json b/tests/data/MutatorSans.fontra/glyphs/I.narrow^1.json index d85e8f9..e8e9acb 100644 --- a/tests/data/MutatorSans.fontra/glyphs/I.narrow^1.json +++ b/tests/data/MutatorSans.fontra/glyphs/I.narrow^1.json @@ -5,86 +5,86 @@ "name": "LightCondensed", "layerName": "MutatorSansLightCondensed/foreground", "location": { -"width": 0.0, -"weight": 150.0 +"weight": 150, +"width": 0 } }, { "name": "BoldCondensed", "layerName": "MutatorSansBoldCondensed/foreground", "location": { -"width": 0.0, -"weight": 850.0 +"weight": 850, +"width": 0 } }, { "name": "LightWide", "layerName": "MutatorSansLightWide/foreground", "location": { -"width": 1000.0, -"weight": 150.0 +"weight": 150, +"width": 1000 } }, { "name": "BoldWide", "layerName": "MutatorSansBoldWide/foreground", "location": { -"width": 1000.0, -"weight": 850.0 +"weight": 850, +"width": 1000 } } ], "layers": { -"MutatorSansLightCondensed/foreground": { +"MutatorSansBoldCondensed/foreground": { "glyph": { "path": { "contours": [ { "points": [ { -"x": 60, +"x": 30, "y": 0 }, { -"x": 100, +"x": 350, "y": 0 }, { -"x": 100, -"y": 700 +"x": 350, +"y": 800 }, { -"x": 60, -"y": 700 +"x": 30, +"y": 800 } ], "isClosed": true } ] }, -"xAdvance": 160 +"xAdvance": 380 } }, -"MutatorSansBoldCondensed/foreground": { +"MutatorSansBoldWide/foreground": { "glyph": { "path": { "contours": [ { "points": [ { -"x": 30, +"x": 60, "y": 0 }, { -"x": 350, +"x": 480, "y": 0 }, { -"x": 350, +"x": 480, "y": 800 }, { -"x": 30, +"x": 60, "y": 800 } ], @@ -92,29 +92,29 @@ } ] }, -"xAdvance": 380 +"xAdvance": 540 } }, -"MutatorSansLightWide/foreground": { +"MutatorSansLightCondensed/foreground": { "glyph": { "path": { "contours": [ { "points": [ { -"x": 120, +"x": 60, "y": 0 }, { -"x": 160, +"x": 100, "y": 0 }, { -"x": 160, +"x": 100, "y": 700 }, { -"x": 120, +"x": 60, "y": 700 } ], @@ -122,37 +122,37 @@ } ] }, -"xAdvance": 280 +"xAdvance": 160 } }, -"MutatorSansBoldWide/foreground": { +"MutatorSansLightWide/foreground": { "glyph": { "path": { "contours": [ { "points": [ { -"x": 60, +"x": 120, "y": 0 }, { -"x": 480, +"x": 160, "y": 0 }, { -"x": 480, -"y": 800 +"x": 160, +"y": 700 }, { -"x": 60, -"y": 800 +"x": 120, +"y": 700 } ], "isClosed": true } ] }, -"xAdvance": 540 +"xAdvance": 280 } } } diff --git a/tests/data/MutatorSans.fontra/glyphs/IJ^3.json b/tests/data/MutatorSans.fontra/glyphs/IJ^3.json index 7f0bf52..94371df 100644 --- a/tests/data/MutatorSans.fontra/glyphs/IJ^3.json +++ b/tests/data/MutatorSans.fontra/glyphs/IJ^3.json @@ -5,57 +5,57 @@ "name": "LightCondensed", "layerName": "MutatorSansLightCondensed/foreground", "location": { -"width": 0.0, -"weight": 150.0 +"weight": 150, +"width": 0 } }, { "name": "BoldCondensed", "layerName": "MutatorSansBoldCondensed/foreground", "location": { -"width": 0.0, -"weight": 850.0 +"weight": 850, +"width": 0 } }, { "name": "LightWide", "layerName": "MutatorSansLightWide/foreground", "location": { -"width": 1000.0, -"weight": 150.0 +"weight": 150, +"width": 1000 } }, { "name": "BoldWide", "layerName": "MutatorSansBoldWide/foreground", "location": { -"width": 1000.0, -"weight": 850.0 +"weight": 850, +"width": 1000 } } ], "layers": { -"MutatorSansLightCondensed/foreground": { +"MutatorSansBoldCondensed/foreground": { "glyph": { "path": { "contours": [ { "points": [ { -"x": 100, -"y": 320 +"x": 350, +"y": 377 }, { -"x": 100, -"y": 700 +"x": 350, +"y": 800 }, { -"x": 60, -"y": 700 +"x": 30, +"y": 800 }, { -"x": 60, -"y": 320 +"x": 30, +"y": 377 } ], "isClosed": true @@ -63,88 +63,88 @@ { "points": [ { -"x": 232, +"x": 377, "y": -10, "smooth": true }, { -"x": 338, +"x": 628, "y": -10, "type": "cubic" }, { -"x": 403, -"y": 38, +"x": 726, +"y": 105, "type": "cubic" }, { -"x": 403, -"y": 182, +"x": 726, +"y": 343, "smooth": true }, { -"x": 403, -"y": 700 +"x": 726, +"y": 800 }, { -"x": 363, -"y": 700 +"x": 406, +"y": 800 }, { -"x": 363, -"y": 182, +"x": 406, +"y": 293, "smooth": true }, { -"x": 363, -"y": 60, +"x": 406, +"y": 265, "type": "cubic" }, { -"x": 313, -"y": 26, +"x": 399, +"y": 254, "type": "cubic" }, { -"x": 232, -"y": 26, +"x": 377, +"y": 254, "smooth": true }, { -"x": 151, -"y": 26, +"x": 357, +"y": 254, "type": "cubic" }, { -"x": 100, -"y": 60, +"x": 350, +"y": 265, "type": "cubic" }, { -"x": 100, -"y": 182, +"x": 350, +"y": 293, "smooth": true }, { -"x": 100, -"y": 240 +"x": 350, +"y": 332 }, { -"x": 60, -"y": 240 +"x": 30, +"y": 332 }, { -"x": 60, -"y": 182, +"x": 30, +"y": 303, "smooth": true }, { -"x": 60, -"y": 38, +"x": 30, +"y": 95, "type": "cubic" }, { -"x": 124, +"x": 125, "y": -10, "type": "cubic" } @@ -153,30 +153,30 @@ } ] }, -"xAdvance": 463 +"xAdvance": 756 } }, -"MutatorSansBoldCondensed/foreground": { +"MutatorSansBoldWide/foreground": { "glyph": { "path": { "contours": [ { "points": [ { -"x": 350, -"y": 377 +"x": 522, +"y": 460 }, { -"x": 350, +"x": 522, "y": 800 }, { -"x": 30, +"x": 90, "y": 800 }, { -"x": 30, -"y": 377 +"x": 90, +"y": 460 } ], "isClosed": true @@ -184,88 +184,88 @@ { "points": [ { -"x": 377, +"x": 663, "y": -10, "smooth": true }, { -"x": 628, +"x": 1016, "y": -10, "type": "cubic" }, { -"x": 726, -"y": 105, +"x": 1237, +"y": 134, "type": "cubic" }, { -"x": 726, -"y": 343, +"x": 1237, +"y": 433, "smooth": true }, { -"x": 726, +"x": 1237, "y": 800 }, { -"x": 406, +"x": 806, "y": 800 }, { -"x": 406, -"y": 293, +"x": 806, +"y": 433, "smooth": true }, { -"x": 406, -"y": 265, +"x": 806, +"y": 328, "type": "cubic" }, { -"x": 399, -"y": 254, +"x": 752, +"y": 284, "type": "cubic" }, { -"x": 377, -"y": 254, +"x": 664, +"y": 284, "smooth": true }, { -"x": 357, -"y": 254, +"x": 576, +"y": 284, "type": "cubic" }, { -"x": 350, -"y": 265, +"x": 522, +"y": 310.0740740740741, "type": "cubic" }, { -"x": 350, -"y": 293, +"x": 522, +"y": 372, "smooth": true }, { -"x": 350, -"y": 332 +"x": 522, +"y": 410 }, { -"x": 30, -"y": 332 +"x": 90, +"y": 410 }, { -"x": 30, -"y": 303, +"x": 90, +"y": 372, "smooth": true }, { -"x": 30, -"y": 95.0, +"x": 90, +"y": 114.48258706467664, "type": "cubic" }, { -"x": 125, +"x": 310, "y": -10, "type": "cubic" } @@ -274,30 +274,30 @@ } ] }, -"xAdvance": 756 +"xAdvance": 1327 } }, -"MutatorSansLightWide/foreground": { +"MutatorSansLightCondensed/foreground": { "glyph": { "path": { "contours": [ { "points": [ { -"x": 160, -"y": 433 +"x": 100, +"y": 320 }, { -"x": 160, +"x": 100, "y": 700 }, { -"x": 120, +"x": 60, "y": 700 }, { -"x": 120, -"y": 433 +"x": 60, +"y": 320 } ], "isClosed": true @@ -305,89 +305,89 @@ { "points": [ { -"x": 590, +"x": 232, "y": -10, "smooth": true }, { -"x": 879, +"x": 338, "y": -10, "type": "cubic" }, { -"x": 1061, -"y": 108, +"x": 403, +"y": 38, "type": "cubic" }, { -"x": 1061, -"y": 352, +"x": 403, +"y": 182, "smooth": true }, { -"x": 1061, +"x": 403, "y": 700 }, { -"x": 1021, +"x": 363, "y": 700 }, { -"x": 1021, -"y": 352, +"x": 363, +"y": 182, "smooth": true }, { -"x": 1021, -"y": 124, +"x": 363, +"y": 60, "type": "cubic" }, { -"x": 854, +"x": 313, "y": 26, "type": "cubic" }, { -"x": 590, +"x": 232, "y": 26, "smooth": true }, { -"x": 327.0, -"y": 26.0, +"x": 151, +"y": 26, "type": "cubic" }, { -"x": 160, -"y": 111.97546012269939, +"x": 100, +"y": 60, "type": "cubic" }, { -"x": 160, -"y": 312, +"x": 100, +"y": 182, "smooth": true }, { -"x": 160, -"y": 343 +"x": 100, +"y": 240 }, { -"x": 120, -"y": 343 +"x": 60, +"y": 240 }, { -"x": 120, -"y": 312, +"x": 60, +"y": 182, "smooth": true }, { -"x": 120, -"y": 94.96132596685081, +"x": 60, +"y": 38, "type": "cubic" }, { -"x": 301.0, -"y": -10.0, +"x": 124, +"y": -10, "type": "cubic" } ], @@ -395,30 +395,30 @@ } ] }, -"xAdvance": 1181 +"xAdvance": 463 } }, -"MutatorSansBoldWide/foreground": { +"MutatorSansLightWide/foreground": { "glyph": { "path": { "contours": [ { "points": [ { -"x": 522, -"y": 460 +"x": 160, +"y": 433 }, { -"x": 522, -"y": 800 +"x": 160, +"y": 700 }, { -"x": 90, -"y": 800 +"x": 120, +"y": 700 }, { -"x": 90, -"y": 460 +"x": 120, +"y": 433 } ], "isClosed": true @@ -426,89 +426,89 @@ { "points": [ { -"x": 663, +"x": 590, "y": -10, "smooth": true }, { -"x": 1016, +"x": 879, "y": -10, "type": "cubic" }, { -"x": 1237, -"y": 134, +"x": 1061, +"y": 108, "type": "cubic" }, { -"x": 1237, -"y": 433, +"x": 1061, +"y": 352, "smooth": true }, { -"x": 1237, -"y": 800 +"x": 1061, +"y": 700 }, { -"x": 806, -"y": 800 +"x": 1021, +"y": 700 }, { -"x": 806, -"y": 433, +"x": 1021, +"y": 352, "smooth": true }, { -"x": 806, -"y": 328, +"x": 1021, +"y": 124, "type": "cubic" }, { -"x": 752, -"y": 284, +"x": 854, +"y": 26, "type": "cubic" }, { -"x": 664, -"y": 284, +"x": 590, +"y": 26, "smooth": true }, { -"x": 576.0, -"y": 284.0, +"x": 327, +"y": 26, "type": "cubic" }, { -"x": 522, -"y": 310.0740740740741, +"x": 160, +"y": 111.97546012269939, "type": "cubic" }, { -"x": 522, -"y": 372, +"x": 160, +"y": 312, "smooth": true }, { -"x": 522, -"y": 410 +"x": 160, +"y": 343 }, { -"x": 90, -"y": 410 +"x": 120, +"y": 343 }, { -"x": 90, -"y": 372, +"x": 120, +"y": 312, "smooth": true }, { -"x": 90, -"y": 114.48258706467664, +"x": 120, +"y": 94.96132596685081, "type": "cubic" }, { -"x": 310.0, -"y": -10.0, +"x": 301, +"y": -10, "type": "cubic" } ], @@ -516,7 +516,7 @@ } ] }, -"xAdvance": 1327 +"xAdvance": 1181 } } } diff --git a/tests/data/MutatorSans.fontra/glyphs/I^1.json b/tests/data/MutatorSans.fontra/glyphs/I^1.json index af6a703..921585b 100644 --- a/tests/data/MutatorSans.fontra/glyphs/I^1.json +++ b/tests/data/MutatorSans.fontra/glyphs/I^1.json @@ -5,57 +5,57 @@ "name": "LightCondensed", "layerName": "MutatorSansLightCondensed/foreground", "location": { -"width": 0.0, -"weight": 150.0 +"weight": 150, +"width": 0 } }, { "name": "BoldCondensed", "layerName": "MutatorSansBoldCondensed/foreground", "location": { -"width": 0.0, -"weight": 850.0 +"weight": 850, +"width": 0 } }, { "name": "LightWide", "layerName": "MutatorSansLightWide/foreground", "location": { -"width": 1000.0, -"weight": 150.0 +"weight": 150, +"width": 1000 } }, { "name": "BoldWide", "layerName": "MutatorSansBoldWide/foreground", "location": { -"width": 1000.0, -"weight": 850.0 +"weight": 850, +"width": 1000 } } ], "layers": { -"MutatorSansLightCondensed/foreground": { +"MutatorSansBoldCondensed/foreground": { "glyph": { "path": { "contours": [ { "points": [ { -"x": 140, +"x": 120, "y": 0 }, { -"x": 180, +"x": 440, "y": 0 }, { -"x": 180, -"y": 700 +"x": 440, +"y": 800 }, { -"x": 140, -"y": 700 +"x": 120, +"y": 800 } ], "isClosed": true @@ -63,20 +63,20 @@ { "points": [ { -"x": 60, -"y": 664 +"x": 30, +"y": 520 }, { -"x": 260, -"y": 664 +"x": 530, +"y": 520 }, { -"x": 260, -"y": 700 +"x": 530, +"y": 800 }, { -"x": 60, -"y": 700 +"x": 30, +"y": 800 } ], "isClosed": true @@ -84,49 +84,49 @@ { "points": [ { -"x": 60, +"x": 30, "y": 0 }, { -"x": 260, +"x": 530, "y": 0 }, { -"x": 260, -"y": 36 +"x": 530, +"y": 280 }, { -"x": 60, -"y": 36 +"x": 30, +"y": 280 } ], "isClosed": true } ] }, -"xAdvance": 320 +"xAdvance": 560 } }, -"MutatorSansBoldCondensed/foreground": { +"MutatorSansBoldWide/foreground": { "glyph": { "path": { "contours": [ { "points": [ { -"x": 120, +"x": 300, "y": 0 }, { -"x": 440, +"x": 720, "y": 0 }, { -"x": 440, +"x": 720, "y": 800 }, { -"x": 120, +"x": 300, "y": 800 } ], @@ -135,19 +135,19 @@ { "points": [ { -"x": 30, -"y": 520 +"x": 60, +"y": 550 }, { -"x": 530, -"y": 520 +"x": 960, +"y": 550 }, { -"x": 530, +"x": 960, "y": 800 }, { -"x": 30, +"x": 60, "y": 800 } ], @@ -156,49 +156,49 @@ { "points": [ { -"x": 30, +"x": 60, "y": 0 }, { -"x": 530, +"x": 960, "y": 0 }, { -"x": 530, -"y": 280 +"x": 960, +"y": 250 }, { -"x": 30, -"y": 280 +"x": 60, +"y": 250 } ], "isClosed": true } ] }, -"xAdvance": 560 +"xAdvance": 1020 } }, -"MutatorSansLightWide/foreground": { +"MutatorSansLightCondensed/foreground": { "glyph": { "path": { "contours": [ { "points": [ { -"x": 450, +"x": 140, "y": 0 }, { -"x": 490, +"x": 180, "y": 0 }, { -"x": 490, +"x": 180, "y": 700 }, { -"x": 450, +"x": 140, "y": 700 } ], @@ -207,19 +207,19 @@ { "points": [ { -"x": 120, +"x": 60, "y": 664 }, { -"x": 810, +"x": 260, "y": 664 }, { -"x": 810, +"x": 260, "y": 700 }, { -"x": 120, +"x": 60, "y": 700 } ], @@ -228,19 +228,19 @@ { "points": [ { -"x": 120, +"x": 60, "y": 0 }, { -"x": 810, +"x": 260, "y": 0 }, { -"x": 810, +"x": 260, "y": 36 }, { -"x": 120, +"x": 60, "y": 36 } ], @@ -248,30 +248,30 @@ } ] }, -"xAdvance": 930 +"xAdvance": 320 } }, -"MutatorSansBoldWide/foreground": { +"MutatorSansLightWide/foreground": { "glyph": { "path": { "contours": [ { "points": [ { -"x": 300, +"x": 450, "y": 0 }, { -"x": 720, +"x": 490, "y": 0 }, { -"x": 720, -"y": 800 +"x": 490, +"y": 700 }, { -"x": 300, -"y": 800 +"x": 450, +"y": 700 } ], "isClosed": true @@ -279,20 +279,20 @@ { "points": [ { -"x": 60, -"y": 550 +"x": 120, +"y": 664 }, { -"x": 960, -"y": 550 +"x": 810, +"y": 664 }, { -"x": 960, -"y": 800 +"x": 810, +"y": 700 }, { -"x": 60, -"y": 800 +"x": 120, +"y": 700 } ], "isClosed": true @@ -300,27 +300,27 @@ { "points": [ { -"x": 60, +"x": 120, "y": 0 }, { -"x": 960, +"x": 810, "y": 0 }, { -"x": 960, -"y": 250 +"x": 810, +"y": 36 }, { -"x": 60, -"y": 250 +"x": 120, +"y": 36 } ], "isClosed": true } ] }, -"xAdvance": 1020 +"xAdvance": 930 } } } diff --git a/tests/data/MutatorSans.fontra/glyphs/J.narrow^1.json b/tests/data/MutatorSans.fontra/glyphs/J.narrow^1.json index 10e80db..ac28b7d 100644 --- a/tests/data/MutatorSans.fontra/glyphs/J.narrow^1.json +++ b/tests/data/MutatorSans.fontra/glyphs/J.narrow^1.json @@ -5,115 +5,115 @@ "name": "LightCondensed", "layerName": "MutatorSansLightCondensed/foreground", "location": { -"width": 0.0, -"weight": 150.0 +"weight": 150, +"width": 0 } }, { "name": "BoldCondensed", "layerName": "MutatorSansBoldCondensed/foreground", "location": { -"width": 0.0, -"weight": 850.0 +"weight": 850, +"width": 0 } }, { "name": "LightWide", "layerName": "MutatorSansLightWide/foreground", "location": { -"width": 1000.0, -"weight": 150.0 +"weight": 150, +"width": 1000 } }, { "name": "BoldWide", "layerName": "MutatorSansBoldWide/foreground", "location": { -"width": 1000.0, -"weight": 850.0 +"weight": 850, +"width": 1000 } } ], "layers": { -"MutatorSansLightCondensed/foreground": { +"MutatorSansBoldCondensed/foreground": { "glyph": { "path": { "contours": [ { "points": [ { -"x": 122, +"x": 226, "y": -10, "smooth": true }, { -"x": 247, +"x": 477, "y": -10, "type": "cubic" }, { -"x": 323, -"y": 48, +"x": 628, +"y": 105, "type": "cubic" }, { -"x": 323, -"y": 222, +"x": 628, +"y": 343, "smooth": true }, { -"x": 323, -"y": 700 +"x": 628, +"y": 800 }, { -"x": 283, -"y": 700 +"x": 306, +"y": 800 }, { -"x": 283, -"y": 222, +"x": 306, +"y": 409, "smooth": true }, { -"x": 283, -"y": 68, +"x": 306, +"y": 314, "type": "cubic" }, { -"x": 222, -"y": 26, +"x": 268, +"y": 274, "type": "cubic" }, { -"x": 122, -"y": 26, +"x": 190, +"y": 274, "smooth": true }, { -"x": 104, -"y": 26, +"x": 152.11111111111111, +"y": 274, "type": "cubic" }, { -"x": 87, -"y": 28, +"x": 118, +"y": 277, "type": "cubic" }, { -"x": 72, -"y": 32 +"x": 80, +"y": 287 }, { -"x": 60, -"y": -3 +"x": 30, +"y": 20 }, { -"x": 79, -"y": -8, +"x": 86, +"y": 0, "type": "cubic" }, { -"x": 100, +"x": 152, "y": -10, "type": "cubic" } @@ -122,88 +122,88 @@ } ] }, -"xAdvance": 383 +"xAdvance": 658 } }, -"MutatorSansBoldCondensed/foreground": { +"MutatorSansBoldWide/foreground": { "glyph": { "path": { "contours": [ { "points": [ { -"x": 226, +"x": 225, "y": -10, "smooth": true }, { -"x": 477, +"x": 596, "y": -10, "type": "cubic" }, { -"x": 628, -"y": 105, +"x": 829, +"y": 134, "type": "cubic" }, { -"x": 628, -"y": 343, +"x": 829, +"y": 433, "smooth": true }, { -"x": 628, +"x": 829, "y": 800 }, { -"x": 306, +"x": 398, "y": 800 }, { -"x": 306, -"y": 409, +"x": 398, +"y": 463, "smooth": true }, { -"x": 306.0, -"y": 314.0, +"x": 398, +"y": 337, "type": "cubic" }, { -"x": 268, -"y": 274, +"x": 332, +"y": 284, "type": "cubic" }, { -"x": 190, -"y": 274, +"x": 226, +"y": 284, "smooth": true }, { -"x": 152.11111111111111, -"y": 274.0, +"x": 205, +"y": 284, "type": "cubic" }, { -"x": 118, -"y": 277, +"x": 156, +"y": 285, "type": "cubic" }, { -"x": 80, -"y": 287 +"x": 104, +"y": 293 }, { -"x": 30, -"y": 20 +"x": 60, +"y": 1 }, { -"x": 86, -"y": 0, +"x": 112, +"y": -7, "type": "cubic" }, { -"x": 152, +"x": 167, "y": -10, "type": "cubic" } @@ -212,88 +212,88 @@ } ] }, -"xAdvance": 658 +"xAdvance": 889 } }, -"MutatorSansLightWide/foreground": { +"MutatorSansLightCondensed/foreground": { "glyph": { "path": { "contours": [ { "points": [ { -"x": 285, +"x": 122, "y": -10, "smooth": true }, { -"x": 574, +"x": 247, "y": -10, "type": "cubic" }, { -"x": 756, -"y": 108, +"x": 323, +"y": 48, "type": "cubic" }, { -"x": 756, -"y": 352, +"x": 323, +"y": 222, "smooth": true }, { -"x": 756, +"x": 323, "y": 700 }, { -"x": 716, +"x": 283, "y": 700 }, { -"x": 716, -"y": 352, +"x": 283, +"y": 222, "smooth": true }, { -"x": 716, -"y": 124, +"x": 283, +"y": 68, "type": "cubic" }, { -"x": 549, +"x": 222, "y": 26, "type": "cubic" }, { -"x": 285, +"x": 122, "y": 26, "smooth": true }, { -"x": 229, +"x": 104, "y": 26, "type": "cubic" }, { -"x": 178, -"y": 32, +"x": 87, +"y": 28, "type": "cubic" }, { -"x": 132, -"y": 42 +"x": 72, +"y": 32 }, { -"x": 120, -"y": 5 +"x": 60, +"y": -3 }, { -"x": 170, -"y": -5, +"x": 79, +"y": -8, "type": "cubic" }, { -"x": 225, +"x": 100, "y": -10, "type": "cubic" } @@ -302,88 +302,88 @@ } ] }, -"xAdvance": 876 +"xAdvance": 383 } }, -"MutatorSansBoldWide/foreground": { +"MutatorSansLightWide/foreground": { "glyph": { "path": { "contours": [ { "points": [ { -"x": 225, +"x": 285, "y": -10, "smooth": true }, { -"x": 596, +"x": 574, "y": -10, "type": "cubic" }, { -"x": 829, -"y": 134, +"x": 756, +"y": 108, "type": "cubic" }, { -"x": 829, -"y": 433, +"x": 756, +"y": 352, "smooth": true }, { -"x": 829, -"y": 800 +"x": 756, +"y": 700 }, { -"x": 398, -"y": 800 +"x": 716, +"y": 700 }, { -"x": 398, -"y": 463, +"x": 716, +"y": 352, "smooth": true }, { -"x": 398, -"y": 337, +"x": 716, +"y": 124, "type": "cubic" }, { -"x": 332, -"y": 284, +"x": 549, +"y": 26, "type": "cubic" }, { -"x": 226, -"y": 284, +"x": 285, +"y": 26, "smooth": true }, { -"x": 205, -"y": 284, +"x": 229, +"y": 26, "type": "cubic" }, { -"x": 156, -"y": 285, +"x": 178, +"y": 32, "type": "cubic" }, { -"x": 104, -"y": 293 +"x": 132, +"y": 42 }, { -"x": 60, -"y": 1 +"x": 120, +"y": 5 }, { -"x": 112, -"y": -7, +"x": 170, +"y": -5, "type": "cubic" }, { -"x": 167, +"x": 225, "y": -10, "type": "cubic" } @@ -392,7 +392,7 @@ } ] }, -"xAdvance": 889 +"xAdvance": 876 } } } diff --git a/tests/data/MutatorSans.fontra/glyphs/J^1.json b/tests/data/MutatorSans.fontra/glyphs/J^1.json index 6d52184..6814426 100644 --- a/tests/data/MutatorSans.fontra/glyphs/J^1.json +++ b/tests/data/MutatorSans.fontra/glyphs/J^1.json @@ -5,125 +5,125 @@ "name": "LightCondensed", "layerName": "MutatorSansLightCondensed/foreground", "location": { -"width": 0.0, -"weight": 150.0 +"weight": 150, +"width": 0 } }, { "name": "BoldCondensed", "layerName": "MutatorSansBoldCondensed/foreground", "location": { -"width": 0.0, -"weight": 850.0 +"weight": 850, +"width": 0 } }, { "name": "LightWide", "layerName": "MutatorSansLightWide/foreground", "location": { -"width": 1000.0, -"weight": 150.0 +"weight": 150, +"width": 1000 } }, { "name": "BoldWide", "layerName": "MutatorSansBoldWide/foreground", "location": { -"width": 1000.0, -"weight": 850.0 +"weight": 850, +"width": 1000 } } ], "layers": { -"MutatorSansLightCondensed/foreground": { +"MutatorSansBoldCondensed/foreground": { "glyph": { "path": { "contours": [ { "points": [ { -"x": 232, +"x": 377, "y": -10, "smooth": true }, { -"x": 338, +"x": 628, "y": -10, "type": "cubic" }, { -"x": 403, -"y": 38, +"x": 726, +"y": 105, "type": "cubic" }, { -"x": 403, -"y": 182, +"x": 726, +"y": 343, "smooth": true }, { -"x": 403, -"y": 700 +"x": 726, +"y": 800 }, { -"x": 363, -"y": 700 +"x": 406, +"y": 800 }, { -"x": 363, -"y": 182, +"x": 406, +"y": 293, "smooth": true }, { -"x": 363, -"y": 60, +"x": 406, +"y": 265, "type": "cubic" }, { -"x": 313, -"y": 26, +"x": 399, +"y": 254, "type": "cubic" }, { -"x": 232, -"y": 26, +"x": 377, +"y": 254, "smooth": true }, { -"x": 151, -"y": 26, +"x": 357, +"y": 254, "type": "cubic" }, { -"x": 100, -"y": 60, +"x": 350, +"y": 265, "type": "cubic" }, { -"x": 100, -"y": 182, +"x": 350, +"y": 293, "smooth": true }, { -"x": 100, -"y": 280 +"x": 350, +"y": 429 }, { -"x": 60, -"y": 280 +"x": 30, +"y": 429 }, { -"x": 60, -"y": 182, +"x": 30, +"y": 343, "smooth": true }, { -"x": 60, -"y": 38, +"x": 30, +"y": 105, "type": "cubic" }, { -"x": 124, +"x": 125, "y": -10, "type": "cubic" } @@ -132,98 +132,98 @@ } ] }, -"xAdvance": 463 +"xAdvance": 756 } }, -"MutatorSansBoldCondensed/foreground": { +"MutatorSansBoldWide/foreground": { "glyph": { "path": { "contours": [ { "points": [ { -"x": 377, +"x": 513, "y": -10, "smooth": true }, { -"x": 628, +"x": 829, "y": -10, "type": "cubic" }, { -"x": 726, -"y": 105, +"x": 1027, +"y": 127, "type": "cubic" }, { -"x": 726, -"y": 343, +"x": 1027, +"y": 413, "smooth": true }, { -"x": 726, +"x": 1027, "y": 800 }, { -"x": 406, +"x": 596, "y": 800 }, { -"x": 406, -"y": 293, +"x": 596, +"y": 393, "smooth": true }, { -"x": 406, -"y": 265, +"x": 596, +"y": 316, "type": "cubic" }, { -"x": 399, -"y": 254, +"x": 565, +"y": 284, "type": "cubic" }, { -"x": 377, -"y": 254, +"x": 514, +"y": 284, "smooth": true }, { -"x": 357, -"y": 254, +"x": 463, +"y": 284, "type": "cubic" }, { -"x": 350, -"y": 265, +"x": 432, +"y": 310, "type": "cubic" }, { -"x": 350, -"y": 293, +"x": 432, +"y": 389, "smooth": true }, { -"x": 350, -"y": 429 +"x": 432, +"y": 458 }, { "x": 30, -"y": 429 +"y": 458 }, { "x": 30, -"y": 343, +"y": 377, "smooth": true }, { "x": 30, -"y": 105, +"y": 104, "type": "cubic" }, { -"x": 125, +"x": 215, "y": -10, "type": "cubic" } @@ -232,99 +232,99 @@ } ] }, -"xAdvance": 756 +"xAdvance": 1117 } }, -"MutatorSansLightWide/foreground": { +"MutatorSansLightCondensed/foreground": { "glyph": { "path": { "contours": [ { "points": [ { -"x": 470, +"x": 232, "y": -10, "smooth": true }, { -"x": 684.7628032345013, -"y": -10.0, +"x": 338, +"y": -10, "type": "cubic" }, { -"x": 821, -"y": 98.53846153846152, +"x": 403, +"y": 38, "type": "cubic" }, { -"x": 821, -"y": 322, +"x": 403, +"y": 182, "smooth": true }, { -"x": 821, +"x": 403, "y": 700 }, { -"x": 781, +"x": 363, "y": 700 }, { -"x": 781, -"y": 322, +"x": 363, +"y": 182, "smooth": true }, { -"x": 781, -"y": 115.01449275362319, +"x": 363, +"y": 60, "type": "cubic" }, { -"x": 659.7945619335347, -"y": 26.0, +"x": 313, +"y": 26, "type": "cubic" }, { -"x": 470, +"x": 232, "y": 26, "smooth": true }, { -"x": 256.8181818181818, -"y": 26.0, +"x": 151, +"y": 26, "type": "cubic" }, { -"x": 120, -"y": 103.01694915254237, +"x": 100, +"y": 60, "type": "cubic" }, { -"x": 120, -"y": 282, +"x": 100, +"y": 182, "smooth": true }, { -"x": 120, -"y": 330 +"x": 100, +"y": 280 }, { -"x": 80, -"y": 330 +"x": 60, +"y": 280 }, { -"x": 80, -"y": 282, +"x": 60, +"y": 182, "smooth": true }, { -"x": 80, -"y": 85.54411764705881, +"x": 60, +"y": 38, "type": "cubic" }, { -"x": 230.72972972972974, -"y": -10.0, +"x": 124, +"y": -10, "type": "cubic" } ], @@ -332,98 +332,98 @@ } ] }, -"xAdvance": 941 +"xAdvance": 463 } }, -"MutatorSansBoldWide/foreground": { +"MutatorSansLightWide/foreground": { "glyph": { "path": { "contours": [ { "points": [ { -"x": 513, +"x": 470, "y": -10, "smooth": true }, { -"x": 829, +"x": 684.7628032345013, "y": -10, "type": "cubic" }, { -"x": 1027, -"y": 127, +"x": 821, +"y": 98.53846153846152, "type": "cubic" }, { -"x": 1027, -"y": 413, +"x": 821, +"y": 322, "smooth": true }, { -"x": 1027, -"y": 800 +"x": 821, +"y": 700 }, { -"x": 596, -"y": 800 +"x": 781, +"y": 700 }, { -"x": 596, -"y": 393, +"x": 781, +"y": 322, "smooth": true }, { -"x": 596, -"y": 316, +"x": 781, +"y": 115.01449275362319, "type": "cubic" }, { -"x": 565, -"y": 284, +"x": 659.7945619335347, +"y": 26, "type": "cubic" }, { -"x": 514, -"y": 284, +"x": 470, +"y": 26, "smooth": true }, { -"x": 463, -"y": 284, +"x": 256.8181818181818, +"y": 26, "type": "cubic" }, { -"x": 432, -"y": 310, +"x": 120, +"y": 103.01694915254237, "type": "cubic" }, { -"x": 432, -"y": 389, +"x": 120, +"y": 282, "smooth": true }, { -"x": 432, -"y": 458 +"x": 120, +"y": 330 }, { -"x": 30, -"y": 458 +"x": 80, +"y": 330 }, { -"x": 30, -"y": 377, +"x": 80, +"y": 282, "smooth": true }, { -"x": 30, -"y": 104, +"x": 80, +"y": 85.54411764705881, "type": "cubic" }, { -"x": 215, +"x": 230.72972972972974, "y": -10, "type": "cubic" } @@ -432,7 +432,7 @@ } ] }, -"xAdvance": 1117 +"xAdvance": 941 } } } diff --git a/tests/data/MutatorSans.fontra/glyphs/K^1.json b/tests/data/MutatorSans.fontra/glyphs/K^1.json index 5be1244..9706443 100644 --- a/tests/data/MutatorSans.fontra/glyphs/K^1.json +++ b/tests/data/MutatorSans.fontra/glyphs/K^1.json @@ -5,57 +5,57 @@ "name": "LightCondensed", "layerName": "MutatorSansLightCondensed/foreground", "location": { -"width": 0.0, -"weight": 150.0 +"weight": 150, +"width": 0 } }, { "name": "BoldCondensed", "layerName": "MutatorSansBoldCondensed/foreground", "location": { -"width": 0.0, -"weight": 850.0 +"weight": 850, +"width": 0 } }, { "name": "LightWide", "layerName": "MutatorSansLightWide/foreground", "location": { -"width": 1000.0, -"weight": 150.0 +"weight": 150, +"width": 1000 } }, { "name": "BoldWide", "layerName": "MutatorSansBoldWide/foreground", "location": { -"width": 1000.0, -"weight": 850.0 +"weight": 850, +"width": 1000 } } ], "layers": { -"MutatorSansLightCondensed/foreground": { +"MutatorSansBoldCondensed/foreground": { "glyph": { "path": { "contours": [ { "points": [ { -"x": 60, +"x": 30, "y": 0 }, { -"x": 100, +"x": 350, "y": 0 }, { -"x": 100, -"y": 700 +"x": 350, +"y": 800 }, { -"x": 60, -"y": 700 +"x": 30, +"y": 800 } ], "isClosed": true @@ -63,32 +63,32 @@ { "points": [ { -"x": 74, -"y": 334 +"x": 324, +"y": 312 }, { -"x": 145, -"y": 334 +"x": 362, +"y": 312 }, { -"x": 358, +"x": 460, "y": 0 }, { -"x": 407, +"x": 811, "y": 0 }, { -"x": 160, -"y": 370 +"x": 649, +"y": 533 }, { -"x": 154, -"y": 370 +"x": 376, +"y": 452 }, { -"x": 74, -"y": 370 +"x": 324, +"y": 452 } ], "isClosed": true @@ -96,49 +96,49 @@ { "points": [ { -"x": 124, -"y": 353 +"x": 367, +"y": 426 }, { -"x": 151, -"y": 338 +"x": 614, +"y": 318 }, { -"x": 399, -"y": 700 +"x": 806, +"y": 800 }, { -"x": 353, -"y": 700 +"x": 474, +"y": 800 } ], "isClosed": true } ] }, -"xAdvance": 427 +"xAdvance": 821 } }, -"MutatorSansBoldCondensed/foreground": { +"MutatorSansBoldWide/foreground": { "glyph": { "path": { "contours": [ { "points": [ { -"x": 30, +"x": 60, "y": 0 }, { -"x": 350, +"x": 480, "y": 0 }, { -"x": 350, +"x": 480, "y": 800 }, { -"x": 30, +"x": 60, "y": 800 } ], @@ -151,23 +151,23 @@ "y": 312 }, { -"x": 362, +"x": 488, "y": 312 }, { -"x": 460, +"x": 754, "y": 0 }, { -"x": 811, +"x": 1266, "y": 0 }, { -"x": 649, +"x": 797, "y": 533 }, { -"x": 376, +"x": 488, "y": 452 }, { @@ -180,19 +180,19 @@ { "points": [ { -"x": 367, +"x": 460, "y": 426 }, { -"x": 614, -"y": 318 +"x": 661, +"y": 288 }, { -"x": 806, +"x": 1270, "y": 800 }, { -"x": 474, +"x": 798, "y": 800 } ], @@ -200,29 +200,29 @@ } ] }, -"xAdvance": 821 +"xAdvance": 1286 } }, -"MutatorSansLightWide/foreground": { +"MutatorSansLightCondensed/foreground": { "glyph": { "path": { "contours": [ { "points": [ { -"x": 120, +"x": 60, "y": 0 }, { -"x": 160, +"x": 100, "y": 0 }, { -"x": 160, +"x": 100, "y": 700 }, { -"x": 120, +"x": 60, "y": 700 } ], @@ -231,32 +231,32 @@ { "points": [ { -"x": 134, -"y": 295 +"x": 74, +"y": 334 }, { -"x": 225, -"y": 295 +"x": 145, +"y": 334 }, { -"x": 854, +"x": 358, "y": 0 }, { -"x": 937, +"x": 407, "y": 0 }, { -"x": 247, -"y": 325 +"x": 160, +"y": 370 }, { -"x": 240, -"y": 328 +"x": 154, +"y": 370 }, { -"x": 134, -"y": 328 +"x": 74, +"y": 370 } ], "isClosed": true @@ -264,19 +264,19 @@ { "points": [ { -"x": 204, -"y": 313 +"x": 124, +"y": 353 }, { -"x": 245, -"y": 302 +"x": 151, +"y": 338 }, { -"x": 939, +"x": 399, "y": 700 }, { -"x": 873, +"x": 353, "y": 700 } ], @@ -284,30 +284,30 @@ } ] }, -"xAdvance": 1019 +"xAdvance": 427 } }, -"MutatorSansBoldWide/foreground": { +"MutatorSansLightWide/foreground": { "glyph": { "path": { "contours": [ { "points": [ { -"x": 60, +"x": 120, "y": 0 }, { -"x": 480, +"x": 160, "y": 0 }, { -"x": 480, -"y": 800 +"x": 160, +"y": 700 }, { -"x": 60, -"y": 800 +"x": 120, +"y": 700 } ], "isClosed": true @@ -315,32 +315,32 @@ { "points": [ { -"x": 324, -"y": 312 +"x": 134, +"y": 295 }, { -"x": 488, -"y": 312 +"x": 225, +"y": 295 }, { -"x": 754, +"x": 854, "y": 0 }, { -"x": 1266, +"x": 937, "y": 0 }, { -"x": 797, -"y": 533 +"x": 247, +"y": 325 }, { -"x": 488, -"y": 452 +"x": 240, +"y": 328 }, { -"x": 324, -"y": 452 +"x": 134, +"y": 328 } ], "isClosed": true @@ -348,27 +348,27 @@ { "points": [ { -"x": 460, -"y": 426 +"x": 204, +"y": 313 }, { -"x": 661, -"y": 288 +"x": 245, +"y": 302 }, { -"x": 1270, -"y": 800 +"x": 939, +"y": 700 }, { -"x": 798, -"y": 800 +"x": 873, +"y": 700 } ], "isClosed": true } ] }, -"xAdvance": 1286 +"xAdvance": 1019 } } } diff --git a/tests/data/MutatorSans.fontra/glyphs/L^1.json b/tests/data/MutatorSans.fontra/glyphs/L^1.json index dc47243..d053331 100644 --- a/tests/data/MutatorSans.fontra/glyphs/L^1.json +++ b/tests/data/MutatorSans.fontra/glyphs/L^1.json @@ -5,57 +5,57 @@ "name": "LightCondensed", "layerName": "MutatorSansLightCondensed/foreground", "location": { -"width": 0.0, -"weight": 150.0 +"weight": 150, +"width": 0 } }, { "name": "BoldCondensed", "layerName": "MutatorSansBoldCondensed/foreground", "location": { -"width": 0.0, -"weight": 850.0 +"weight": 850, +"width": 0 } }, { "name": "LightWide", "layerName": "MutatorSansLightWide/foreground", "location": { -"width": 1000.0, -"weight": 150.0 +"weight": 150, +"width": 1000 } }, { "name": "BoldWide", "layerName": "MutatorSansBoldWide/foreground", "location": { -"width": 1000.0, -"weight": 850.0 +"weight": 850, +"width": 1000 } } ], "layers": { -"MutatorSansLightCondensed/foreground": { +"MutatorSansBoldCondensed/foreground": { "glyph": { "path": { "contours": [ { "points": [ { -"x": 60, +"x": 30, "y": 0 }, { -"x": 100, +"x": 350, "y": 0 }, { -"x": 100, -"y": 700 +"x": 350, +"y": 800 }, { -"x": 60, -"y": 700 +"x": 30, +"y": 800 } ], "isClosed": true @@ -63,49 +63,49 @@ { "points": [ { -"x": 80, +"x": 130, "y": 0 }, { -"x": 340, +"x": 530, "y": 0 }, { -"x": 340, -"y": 36 +"x": 530, +"y": 250 }, { -"x": 80, -"y": 36 +"x": 130, +"y": 250 } ], "isClosed": true } ] }, -"xAdvance": 370 +"xAdvance": 550 } }, -"MutatorSansBoldCondensed/foreground": { +"MutatorSansBoldWide/foreground": { "glyph": { "path": { "contours": [ { "points": [ { -"x": 30, +"x": 60, "y": 0 }, { -"x": 350, +"x": 480, "y": 0 }, { -"x": 350, +"x": 480, "y": 800 }, { -"x": 30, +"x": 60, "y": 800 } ], @@ -114,49 +114,49 @@ { "points": [ { -"x": 130, +"x": 150, "y": 0 }, { -"x": 530, +"x": 1050, "y": 0 }, { -"x": 530, -"y": 250 +"x": 1050, +"y": 280 }, { -"x": 130, -"y": 250 +"x": 150, +"y": 280 } ], "isClosed": true } ] }, -"xAdvance": 550 +"xAdvance": 1070 } }, -"MutatorSansLightWide/foreground": { +"MutatorSansLightCondensed/foreground": { "glyph": { "path": { "contours": [ { "points": [ { -"x": 120, +"x": 60, "y": 0 }, { -"x": 160, +"x": 100, "y": 0 }, { -"x": 160, +"x": 100, "y": 700 }, { -"x": 120, +"x": 60, "y": 700 } ], @@ -165,19 +165,19 @@ { "points": [ { -"x": 140, +"x": 80, "y": 0 }, { -"x": 930, +"x": 340, "y": 0 }, { -"x": 930, +"x": 340, "y": 36 }, { -"x": 140, +"x": 80, "y": 36 } ], @@ -185,30 +185,30 @@ } ] }, -"xAdvance": 970 +"xAdvance": 370 } }, -"MutatorSansBoldWide/foreground": { +"MutatorSansLightWide/foreground": { "glyph": { "path": { "contours": [ { "points": [ { -"x": 60, +"x": 120, "y": 0 }, { -"x": 480, +"x": 160, "y": 0 }, { -"x": 480, -"y": 800 +"x": 160, +"y": 700 }, { -"x": 60, -"y": 800 +"x": 120, +"y": 700 } ], "isClosed": true @@ -216,27 +216,27 @@ { "points": [ { -"x": 150, +"x": 140, "y": 0 }, { -"x": 1050, +"x": 930, "y": 0 }, { -"x": 1050, -"y": 280 +"x": 930, +"y": 36 }, { -"x": 150, -"y": 280 +"x": 140, +"y": 36 } ], "isClosed": true } ] }, -"xAdvance": 1070 +"xAdvance": 970 } } } diff --git a/tests/data/MutatorSans.fontra/glyphs/M^1.json b/tests/data/MutatorSans.fontra/glyphs/M^1.json index 4488f4b..90594d2 100644 --- a/tests/data/MutatorSans.fontra/glyphs/M^1.json +++ b/tests/data/MutatorSans.fontra/glyphs/M^1.json @@ -5,57 +5,57 @@ "name": "LightCondensed", "layerName": "MutatorSansLightCondensed/foreground", "location": { -"width": 0.0, -"weight": 150.0 +"weight": 150, +"width": 0 } }, { "name": "BoldCondensed", "layerName": "MutatorSansBoldCondensed/foreground", "location": { -"width": 0.0, -"weight": 850.0 +"weight": 850, +"width": 0 } }, { "name": "LightWide", "layerName": "MutatorSansLightWide/foreground", "location": { -"width": 1000.0, -"weight": 150.0 +"weight": 150, +"width": 1000 } }, { "name": "BoldWide", "layerName": "MutatorSansBoldWide/foreground", "location": { -"width": 1000.0, -"weight": 850.0 +"weight": 850, +"width": 1000 } } ], "layers": { -"MutatorSansLightCondensed/foreground": { +"MutatorSansBoldCondensed/foreground": { "glyph": { "path": { "contours": [ { "points": [ { -"x": 60, +"x": 30, "y": 0 }, { -"x": 100, +"x": 280, "y": 0 }, { -"x": 100, -"y": 700 +"x": 280, +"y": 800 }, { -"x": 60, -"y": 700 +"x": 30, +"y": 800 } ], "isClosed": true @@ -63,19 +63,19 @@ { "points": [ { -"x": 470, +"x": 802, "y": 0 }, { -"x": 470, -"y": 700 +"x": 802, +"y": 800 }, { -"x": 430, -"y": 700 +"x": 552, +"y": 800 }, { -"x": 430, +"x": 552, "y": 0 } ], @@ -84,65 +84,65 @@ { "points": [ { -"x": 453, -"y": 658 +"x": 688, +"y": 429 }, { -"x": 430, -"y": 700 +"x": 552, +"y": 800 }, { -"x": 260, -"y": 342 +"x": 403, +"y": 551 }, { -"x": 277, -"y": 342 +"x": 429, +"y": 551 }, { -"x": 100, -"y": 700 +"x": 280, +"y": 800 }, { -"x": 78, -"y": 651 +"x": 144, +"y": 429 }, { -"x": 253, -"y": 299 +"x": 374, +"y": 118 }, { -"x": 278, -"y": 299 +"x": 458, +"y": 118 } ], "isClosed": true } ] }, -"xAdvance": 530 +"xAdvance": 832 } }, -"MutatorSansBoldCondensed/foreground": { +"MutatorSansBoldWide/foreground": { "glyph": { "path": { "contours": [ { "points": [ { -"x": 30, +"x": 60, "y": 0 }, { -"x": 280, +"x": 380, "y": 0 }, { -"x": 280, +"x": 380, "y": 800 }, { -"x": 30, +"x": 60, "y": 800 } ], @@ -151,19 +151,19 @@ { "points": [ { -"x": 802, +"x": 1238, "y": 0 }, { -"x": 802, +"x": 1238, "y": 800 }, { -"x": 552, +"x": 918, "y": 800 }, { -"x": 552, +"x": 918, "y": 0 } ], @@ -172,65 +172,65 @@ { "points": [ { -"x": 688, -"y": 429 +"x": 1034, +"y": 404 }, { -"x": 552, +"x": 918, "y": 800 }, { -"x": 403, -"y": 551 +"x": 624, +"y": 547 }, { -"x": 429, -"y": 551 +"x": 674, +"y": 547 }, { -"x": 280, +"x": 380, "y": 800 }, { -"x": 144, -"y": 429 +"x": 264, +"y": 404 }, { -"x": 374, -"y": 118 +"x": 582, +"y": 135 }, { -"x": 458, -"y": 118 +"x": 716, +"y": 135 } ], "isClosed": true } ] }, -"xAdvance": 832 +"xAdvance": 1298 } }, -"MutatorSansLightWide/foreground": { +"MutatorSansLightCondensed/foreground": { "glyph": { "path": { "contours": [ { "points": [ { -"x": 120, +"x": 60, "y": 0 }, { -"x": 160, +"x": 100, "y": 0 }, { -"x": 160, +"x": 100, "y": 700 }, { -"x": 120, +"x": 60, "y": 700 } ], @@ -239,19 +239,19 @@ { "points": [ { -"x": 1154, +"x": 470, "y": 0 }, { -"x": 1154, +"x": 470, "y": 700 }, { -"x": 1114, +"x": 430, "y": 700 }, { -"x": 1114, +"x": 430, "y": 0 } ], @@ -260,66 +260,66 @@ { "points": [ { -"x": 1132, -"y": 664 +"x": 453, +"y": 658 }, { -"x": 1114, +"x": 430, "y": 700 }, { -"x": 613, -"y": 261 +"x": 260, +"y": 342 }, { -"x": 661, -"y": 261 +"x": 277, +"y": 342 }, { -"x": 160, +"x": 100, "y": 700 }, { -"x": 142, -"y": 664 +"x": 78, +"y": 651 }, { -"x": 621, -"y": 241 +"x": 253, +"y": 299 }, { -"x": 653, -"y": 241 +"x": 278, +"y": 299 } ], "isClosed": true } ] }, -"xAdvance": 1274 +"xAdvance": 530 } }, -"MutatorSansBoldWide/foreground": { +"MutatorSansLightWide/foreground": { "glyph": { "path": { "contours": [ { "points": [ { -"x": 60, +"x": 120, "y": 0 }, { -"x": 380, +"x": 160, "y": 0 }, { -"x": 380, -"y": 800 +"x": 160, +"y": 700 }, { -"x": 60, -"y": 800 +"x": 120, +"y": 700 } ], "isClosed": true @@ -327,19 +327,19 @@ { "points": [ { -"x": 1238, +"x": 1154, "y": 0 }, { -"x": 1238, -"y": 800 +"x": 1154, +"y": 700 }, { -"x": 918, -"y": 800 +"x": 1114, +"y": 700 }, { -"x": 918, +"x": 1114, "y": 0 } ], @@ -348,43 +348,43 @@ { "points": [ { -"x": 1034, -"y": 404 +"x": 1132, +"y": 664 }, { -"x": 918, -"y": 800 +"x": 1114, +"y": 700 }, { -"x": 624, -"y": 547 +"x": 613, +"y": 261 }, { -"x": 674, -"y": 547 +"x": 661, +"y": 261 }, { -"x": 380, -"y": 800 +"x": 160, +"y": 700 }, { -"x": 264, -"y": 404 +"x": 142, +"y": 664 }, { -"x": 582, -"y": 135 +"x": 621, +"y": 241 }, { -"x": 716, -"y": 135 +"x": 653, +"y": 241 } ], "isClosed": true } ] }, -"xAdvance": 1298 +"xAdvance": 1274 } } } diff --git a/tests/data/MutatorSans.fontra/glyphs/N^1.json b/tests/data/MutatorSans.fontra/glyphs/N^1.json index cf7bf3a..e7b1c2c 100644 --- a/tests/data/MutatorSans.fontra/glyphs/N^1.json +++ b/tests/data/MutatorSans.fontra/glyphs/N^1.json @@ -5,57 +5,57 @@ "name": "LightCondensed", "layerName": "MutatorSansLightCondensed/foreground", "location": { -"width": 0.0, -"weight": 150.0 +"weight": 150, +"width": 0 } }, { "name": "BoldCondensed", "layerName": "MutatorSansBoldCondensed/foreground", "location": { -"width": 0.0, -"weight": 850.0 +"weight": 850, +"width": 0 } }, { "name": "LightWide", "layerName": "MutatorSansLightWide/foreground", "location": { -"width": 1000.0, -"weight": 150.0 +"weight": 150, +"width": 1000 } }, { "name": "BoldWide", "layerName": "MutatorSansBoldWide/foreground", "location": { -"width": 1000.0, -"weight": 850.0 +"weight": 850, +"width": 1000 } } ], "layers": { -"MutatorSansLightCondensed/foreground": { +"MutatorSansBoldCondensed/foreground": { "glyph": { "path": { "contours": [ { "points": [ { -"x": 60, +"x": 30, "y": 0 }, { -"x": 95, +"x": 280, "y": 0 }, { -"x": 95, -"y": 700 +"x": 280, +"y": 800 }, { -"x": 60, -"y": 700 +"x": 30, +"y": 800 } ], "isClosed": true @@ -63,20 +63,20 @@ { "points": [ { -"x": 76, -"y": 646 +"x": 100, +"y": 520 }, { -"x": 365, +"x": 470, "y": 0 }, { -"x": 384, -"y": 54 +"x": 650, +"y": 280 }, { -"x": 95, -"y": 700 +"x": 280, +"y": 800 } ], "isClosed": true @@ -84,49 +84,49 @@ { "points": [ { -"x": 365, +"x": 470, "y": 0 }, { -"x": 400, +"x": 720, "y": 0 }, { -"x": 400, -"y": 700 +"x": 720, +"y": 800 }, { -"x": 365, -"y": 700 +"x": 470, +"y": 800 } ], "isClosed": true } ] }, -"xAdvance": 460 +"xAdvance": 750 } }, -"MutatorSansBoldCondensed/foreground": { +"MutatorSansBoldWide/foreground": { "glyph": { "path": { "contours": [ { "points": [ { -"x": 30, +"x": 60, "y": 0 }, { -"x": 280, +"x": 380, "y": 0 }, { -"x": 280, +"x": 380, "y": 800 }, { -"x": 30, +"x": 60, "y": 800 } ], @@ -135,19 +135,19 @@ { "points": [ { -"x": 100, -"y": 520 +"x": 264, +"y": 454 }, { -"x": 470, +"x": 924, "y": 0 }, { -"x": 650, -"y": 280 +"x": 1040, +"y": 346 }, { -"x": 280, +"x": 380, "y": 800 } ], @@ -156,19 +156,19 @@ { "points": [ { -"x": 470, +"x": 925, "y": 0 }, { -"x": 720, +"x": 1245, "y": 0 }, { -"x": 720, +"x": 1245, "y": 800 }, { -"x": 470, +"x": 925, "y": 800 } ], @@ -176,29 +176,29 @@ } ] }, -"xAdvance": 750 +"xAdvance": 1305 } }, -"MutatorSansLightWide/foreground": { +"MutatorSansLightCondensed/foreground": { "glyph": { "path": { "contours": [ { "points": [ { -"x": 120, +"x": 60, "y": 0 }, { -"x": 160, +"x": 95, "y": 0 }, { -"x": 160, +"x": 95, "y": 700 }, { -"x": 120, +"x": 60, "y": 700 } ], @@ -207,19 +207,19 @@ { "points": [ { -"x": 143, -"y": 664 +"x": 76, +"y": 646 }, { -"x": 1020, +"x": 365, "y": 0 }, { -"x": 1039, -"y": 37 +"x": 384, +"y": 54 }, { -"x": 160, +"x": 95, "y": 700 } ], @@ -228,19 +228,19 @@ { "points": [ { -"x": 1020, +"x": 365, "y": 0 }, { -"x": 1060, +"x": 400, "y": 0 }, { -"x": 1060, +"x": 400, "y": 700 }, { -"x": 1020, +"x": 365, "y": 700 } ], @@ -248,30 +248,30 @@ } ] }, -"xAdvance": 1180 +"xAdvance": 460 } }, -"MutatorSansBoldWide/foreground": { +"MutatorSansLightWide/foreground": { "glyph": { "path": { "contours": [ { "points": [ { -"x": 60, +"x": 120, "y": 0 }, { -"x": 380, +"x": 160, "y": 0 }, { -"x": 380, -"y": 800 +"x": 160, +"y": 700 }, { -"x": 60, -"y": 800 +"x": 120, +"y": 700 } ], "isClosed": true @@ -279,20 +279,20 @@ { "points": [ { -"x": 264, -"y": 454 +"x": 143, +"y": 664 }, { -"x": 924, +"x": 1020, "y": 0 }, { -"x": 1040, -"y": 346 +"x": 1039, +"y": 37 }, { -"x": 380, -"y": 800 +"x": 160, +"y": 700 } ], "isClosed": true @@ -300,27 +300,27 @@ { "points": [ { -"x": 925, +"x": 1020, "y": 0 }, { -"x": 1245, +"x": 1060, "y": 0 }, { -"x": 1245, -"y": 800 +"x": 1060, +"y": 700 }, { -"x": 925, -"y": 800 +"x": 1020, +"y": 700 } ], "isClosed": true } ] }, -"xAdvance": 1305 +"xAdvance": 1180 } } } diff --git a/tests/data/MutatorSans.fontra/glyphs/O^1.json b/tests/data/MutatorSans.fontra/glyphs/O^1.json index c0ed4a1..90cb0f1 100644 --- a/tests/data/MutatorSans.fontra/glyphs/O^1.json +++ b/tests/data/MutatorSans.fontra/glyphs/O^1.json @@ -5,109 +5,107 @@ "name": "LightCondensed", "layerName": "MutatorSansLightCondensed/foreground", "location": { -"width": 0.0, -"weight": 150.0 +"weight": 150, +"width": 0 } }, { "name": "BoldCondensed", "layerName": "MutatorSansBoldCondensed/foreground", "location": { -"width": 0.0, -"weight": 850.0 +"weight": 850, +"width": 0 } }, { "name": "LightWide", "layerName": "MutatorSansLightWide/foreground", "location": { -"width": 1000.0, -"weight": 150.0 +"weight": 150, +"width": 1000 } }, { "name": "BoldWide", "layerName": "MutatorSansBoldWide/foreground", "location": { -"width": 1000.0, -"weight": 850.0 +"weight": 850, +"width": 1000 } } ], "layers": { -"MutatorSansLightCondensed/foreground": { +"MutatorSansBoldCondensed/foreground": { "glyph": { "path": { "contours": [ { "points": [ { -"x": 246, +"x": 409, "y": -10, "smooth": true }, { -"x": 257, -"y": -10, -"smooth": true +"x": 434, +"y": -10 }, { -"x": 377, +"x": 673, "y": -10, "type": "cubic" }, { -"x": 453, -"y": 88, +"x": 824, +"y": 124, "type": "cubic" }, { -"x": 453, -"y": 352, +"x": 824, +"y": 403, "smooth": true }, { -"x": 453, -"y": 615, +"x": 824, +"y": 679, "type": "cubic" }, { -"x": 377, -"y": 710, +"x": 673, +"y": 810, "type": "cubic" }, { -"x": 257, -"y": 710, +"x": 434, +"y": 810, "smooth": true }, { -"x": 246, -"y": 710, -"smooth": true +"x": 409, +"y": 810 }, { -"x": 125, -"y": 710, +"x": 170, +"y": 810, "type": "cubic" }, { -"x": 50, -"y": 615, +"x": 20, +"y": 679, "type": "cubic" }, { -"x": 50, -"y": 352, +"x": 20, +"y": 403, "smooth": true }, { -"x": 50, -"y": 88, +"x": 20, +"y": 124, "type": "cubic" }, { -"x": 125, +"x": 170, "y": -10, "type": "cubic" } @@ -117,73 +115,73 @@ { "points": [ { -"x": 246, -"y": 26, +"x": 418, +"y": 254, "smooth": true }, { -"x": 152, -"y": 26, +"x": 362, +"y": 254, "type": "cubic" }, { -"x": 92, -"y": 104, +"x": 342, +"y": 298, "type": "cubic" }, { -"x": 92, -"y": 352, +"x": 342, +"y": 403, "smooth": true }, { -"x": 92, -"y": 599, +"x": 342, +"y": 504, "type": "cubic" }, { -"x": 152, -"y": 674, +"x": 362, +"y": 546, "type": "cubic" }, { -"x": 246, -"y": 674, +"x": 418, +"y": 546, "smooth": true }, { -"x": 257, -"y": 674, +"x": 426, +"y": 546, "smooth": true }, { -"x": 352, -"y": 674, +"x": 482, +"y": 546, "type": "cubic" }, { -"x": 411, -"y": 599, +"x": 502, +"y": 504, "type": "cubic" }, { -"x": 411, -"y": 352, +"x": 502, +"y": 403, "smooth": true }, { -"x": 411, -"y": 104, +"x": 502, +"y": 298, "type": "cubic" }, { -"x": 352, -"y": 26, +"x": 482, +"y": 254, "type": "cubic" }, { -"x": 257, -"y": 26, +"x": 426, +"y": 254, "smooth": true } ], @@ -191,81 +189,83 @@ } ] }, -"xAdvance": 503 +"xAdvance": 844 } }, -"MutatorSansBoldCondensed/foreground": { +"MutatorSansBoldWide/foreground": { "glyph": { "path": { "contours": [ { "points": [ { -"x": 409, +"x": 590, "y": -10, "smooth": true }, { -"x": 434, -"y": -10 +"x": 790, +"y": -10, +"smooth": true }, { -"x": 673, +"x": 1128, "y": -10, "type": "cubic" }, { -"x": 824, +"x": 1341, "y": 124, "type": "cubic" }, { -"x": 824, +"x": 1341, "y": 403, "smooth": true }, { -"x": 824, +"x": 1341, "y": 679, "type": "cubic" }, { -"x": 673, +"x": 1128, "y": 810, "type": "cubic" }, { -"x": 434, +"x": 790, "y": 810, "smooth": true }, { -"x": 409, -"y": 810 +"x": 590, +"y": 810, +"smooth": true }, { -"x": 170, +"x": 252, "y": 810, "type": "cubic" }, { -"x": 20, +"x": 40, "y": 679, "type": "cubic" }, { -"x": 20, +"x": 40, "y": 403, "smooth": true }, { -"x": 20, +"x": 40, "y": 124, "type": "cubic" }, { -"x": 170.0, -"y": -10.0, +"x": 252, +"y": -10, "type": "cubic" } ], @@ -274,72 +274,72 @@ { "points": [ { -"x": 418, +"x": 644, "y": 254, "smooth": true }, { -"x": 362, +"x": 538, "y": 254, "type": "cubic" }, { -"x": 342, +"x": 472, "y": 298, "type": "cubic" }, { -"x": 342, +"x": 472, "y": 403, "smooth": true }, { -"x": 342, +"x": 472, "y": 504, "type": "cubic" }, { -"x": 362, +"x": 538, "y": 546, "type": "cubic" }, { -"x": 418, +"x": 644, "y": 546, "smooth": true }, { -"x": 426, +"x": 738, "y": 546, "smooth": true }, { -"x": 482, +"x": 844, "y": 546, "type": "cubic" }, { -"x": 502, +"x": 910, "y": 504, "type": "cubic" }, { -"x": 502, +"x": 910, "y": 403, "smooth": true }, { -"x": 502, +"x": 910, "y": 298, "type": "cubic" }, { -"x": 482, +"x": 844, "y": 254, "type": "cubic" }, { -"x": 426, +"x": 738, "y": 254, "smooth": true } @@ -348,82 +348,82 @@ } ] }, -"xAdvance": 844 +"xAdvance": 1381 } }, -"MutatorSansLightWide/foreground": { +"MutatorSansLightCondensed/foreground": { "glyph": { "path": { "contours": [ { "points": [ { -"x": 630, +"x": 246, "y": -10, "smooth": true }, { -"x": 690, +"x": 257, "y": -10, "smooth": true }, { -"x": 1028, +"x": 377, "y": -10, "type": "cubic" }, { -"x": 1241, -"y": 108, +"x": 453, +"y": 88, "type": "cubic" }, { -"x": 1241, +"x": 453, "y": 352, "smooth": true }, { -"x": 1241, -"y": 595, +"x": 453, +"y": 615, "type": "cubic" }, { -"x": 1028, +"x": 377, "y": 710, "type": "cubic" }, { -"x": 690, +"x": 257, "y": 710, "smooth": true }, { -"x": 630, +"x": 246, "y": 710, "smooth": true }, { -"x": 292, +"x": 125, "y": 710, "type": "cubic" }, { -"x": 80, -"y": 595, +"x": 50, +"y": 615, "type": "cubic" }, { -"x": 80, +"x": 50, "y": 352, "smooth": true }, { -"x": 80, -"y": 108, +"x": 50, +"y": 88, "type": "cubic" }, { -"x": 292, +"x": 125, "y": -10, "type": "cubic" } @@ -433,72 +433,72 @@ { "points": [ { -"x": 630, +"x": 246, "y": 26, "smooth": true }, { -"x": 318, +"x": 152, "y": 26, "type": "cubic" }, { -"x": 120, -"y": 124, +"x": 92, +"y": 104, "type": "cubic" }, { -"x": 120, +"x": 92, "y": 352, "smooth": true }, { -"x": 120, -"y": 579, +"x": 92, +"y": 599, "type": "cubic" }, { -"x": 318, +"x": 152, "y": 674, "type": "cubic" }, { -"x": 630, +"x": 246, "y": 674, "smooth": true }, { -"x": 690, +"x": 257, "y": 674, "smooth": true }, { -"x": 1003, +"x": 352, "y": 674, "type": "cubic" }, { -"x": 1201, -"y": 579, +"x": 411, +"y": 599, "type": "cubic" }, { -"x": 1201, +"x": 411, "y": 352, "smooth": true }, { -"x": 1201, -"y": 124, +"x": 411, +"y": 104, "type": "cubic" }, { -"x": 1003, +"x": 352, "y": 26, "type": "cubic" }, { -"x": 690, +"x": 257, "y": 26, "smooth": true } @@ -507,82 +507,82 @@ } ] }, -"xAdvance": 1321 +"xAdvance": 503 } }, -"MutatorSansBoldWide/foreground": { +"MutatorSansLightWide/foreground": { "glyph": { "path": { "contours": [ { "points": [ { -"x": 590, +"x": 630, "y": -10, "smooth": true }, { -"x": 790, +"x": 690, "y": -10, "smooth": true }, { -"x": 1128, +"x": 1028, "y": -10, "type": "cubic" }, { -"x": 1341, -"y": 124, +"x": 1241, +"y": 108, "type": "cubic" }, { -"x": 1341, -"y": 403, +"x": 1241, +"y": 352, "smooth": true }, { -"x": 1341, -"y": 679, +"x": 1241, +"y": 595, "type": "cubic" }, { -"x": 1128, -"y": 810, +"x": 1028, +"y": 710, "type": "cubic" }, { -"x": 790, -"y": 810, +"x": 690, +"y": 710, "smooth": true }, { -"x": 590, -"y": 810, +"x": 630, +"y": 710, "smooth": true }, { -"x": 252, -"y": 810, +"x": 292, +"y": 710, "type": "cubic" }, { -"x": 40, -"y": 679, +"x": 80, +"y": 595, "type": "cubic" }, { -"x": 40, -"y": 403, +"x": 80, +"y": 352, "smooth": true }, { -"x": 40, -"y": 124, +"x": 80, +"y": 108, "type": "cubic" }, { -"x": 252, +"x": 292, "y": -10, "type": "cubic" } @@ -592,73 +592,73 @@ { "points": [ { -"x": 644, -"y": 254, +"x": 630, +"y": 26, "smooth": true }, { -"x": 538, -"y": 254, +"x": 318, +"y": 26, "type": "cubic" }, { -"x": 472, -"y": 298, +"x": 120, +"y": 124, "type": "cubic" }, { -"x": 472, -"y": 403, +"x": 120, +"y": 352, "smooth": true }, { -"x": 472, -"y": 504, +"x": 120, +"y": 579, "type": "cubic" }, { -"x": 538, -"y": 546, +"x": 318, +"y": 674, "type": "cubic" }, { -"x": 644, -"y": 546, +"x": 630, +"y": 674, "smooth": true }, { -"x": 738, -"y": 546, +"x": 690, +"y": 674, "smooth": true }, { -"x": 844, -"y": 546, +"x": 1003, +"y": 674, "type": "cubic" }, { -"x": 910, -"y": 504, +"x": 1201, +"y": 579, "type": "cubic" }, { -"x": 910, -"y": 403, +"x": 1201, +"y": 352, "smooth": true }, { -"x": 910, -"y": 298, +"x": 1201, +"y": 124, "type": "cubic" }, { -"x": 844, -"y": 254, +"x": 1003, +"y": 26, "type": "cubic" }, { -"x": 738, -"y": 254, +"x": 690, +"y": 26, "smooth": true } ], @@ -666,7 +666,7 @@ } ] }, -"xAdvance": 1381 +"xAdvance": 1321 } } } diff --git a/tests/data/MutatorSans.fontra/glyphs/P^1.json b/tests/data/MutatorSans.fontra/glyphs/P^1.json index 3b7da1e..be704dd 100644 --- a/tests/data/MutatorSans.fontra/glyphs/P^1.json +++ b/tests/data/MutatorSans.fontra/glyphs/P^1.json @@ -5,57 +5,57 @@ "name": "LightCondensed", "layerName": "MutatorSansLightCondensed/foreground", "location": { -"width": 0.0, -"weight": 150.0 +"weight": 150, +"width": 0 } }, { "name": "BoldCondensed", "layerName": "MutatorSansBoldCondensed/foreground", "location": { -"width": 0.0, -"weight": 850.0 +"weight": 850, +"width": 0 } }, { "name": "LightWide", "layerName": "MutatorSansLightWide/foreground", "location": { -"width": 1000.0, -"weight": 150.0 +"weight": 150, +"width": 1000 } }, { "name": "BoldWide", "layerName": "MutatorSansBoldWide/foreground", "location": { -"width": 1000.0, -"weight": 850.0 +"weight": 850, +"width": 1000 } } ], "layers": { -"MutatorSansLightCondensed/foreground": { +"MutatorSansBoldCondensed/foreground": { "glyph": { "path": { "contours": [ { "points": [ { -"x": 60, +"x": 30, "y": 0 }, { -"x": 100, +"x": 350, "y": 0 }, { -"x": 100, -"y": 700 +"x": 350, +"y": 800 }, { -"x": 60, -"y": 700 +"x": 30, +"y": 800 } ], "isClosed": true @@ -63,119 +63,119 @@ { "points": [ { -"x": 80, -"y": 660 +"x": 280, +"y": 548 }, { -"x": 180, -"y": 660, +"x": 355, +"y": 548, "smooth": true }, { -"x": 299.0, -"y": 660.0, +"x": 384, +"y": 548, "type": "cubic" }, { -"x": 354, -"y": 565, +"x": 397, +"y": 535.9718309859155, "type": "cubic" }, { -"x": 354, -"y": 432, +"x": 397, +"y": 487, "smooth": true }, { -"x": 354, -"y": 299, +"x": 397, +"y": 432.3207547169811, "type": "cubic" }, { -"x": 299.0, -"y": 205.0, +"x": 384, +"y": 424, "type": "cubic" }, { -"x": 180, -"y": 205, +"x": 355, +"y": 424, "smooth": true }, { -"x": 80, -"y": 205 +"x": 280, +"y": 424 }, { -"x": 80, -"y": 165 +"x": 280, +"y": 171 }, { -"x": 170, -"y": 165, +"x": 378, +"y": 171, "smooth": true }, { -"x": 330.0, -"y": 165.0, +"x": 611, +"y": 171, "type": "cubic" }, { -"x": 393, -"y": 286, +"x": 690, +"y": 274.2679738562091, "type": "cubic" }, { -"x": 393, -"y": 432, +"x": 690, +"y": 487, "smooth": true }, { -"x": 393, -"y": 580, +"x": 690, +"y": 697.3024691358024, "type": "cubic" }, { -"x": 330.0, -"y": 700.0, +"x": 611, +"y": 800, "type": "cubic" }, { -"x": 170, -"y": 700, +"x": 379, +"y": 800, "smooth": true }, { -"x": 80, -"y": 700 +"x": 280, +"y": 800 } ], "isClosed": true } ] }, -"xAdvance": 443 +"xAdvance": 710 } }, -"MutatorSansBoldCondensed/foreground": { +"MutatorSansBoldWide/foreground": { "glyph": { "path": { "contours": [ { "points": [ { -"x": 30, +"x": 60, "y": 0 }, { -"x": 350, +"x": 480, "y": 0 }, { -"x": 350, +"x": 480, "y": 800 }, { -"x": 30, +"x": 60, "y": 800 } ], @@ -184,89 +184,89 @@ { "points": [ { -"x": 280, -"y": 548 +"x": 310, +"y": 513 }, { -"x": 355, -"y": 548, +"x": 727, +"y": 513, "smooth": true }, { -"x": 384.0, -"y": 548, +"x": 790, +"y": 513, "type": "cubic" }, { -"x": 397.0, -"y": 535.9718309859155, +"x": 818, +"y": 501, "type": "cubic" }, { -"x": 397, -"y": 487, +"x": 818, +"y": 455, "smooth": true }, { -"x": 397.0, -"y": 432.3207547169811, +"x": 818, +"y": 402, "type": "cubic" }, { -"x": 384.0, -"y": 424, +"x": 790, +"y": 394, "type": "cubic" }, { -"x": 355, -"y": 424, +"x": 727, +"y": 394, "smooth": true }, { -"x": 280, -"y": 424 +"x": 310, +"y": 394 }, { -"x": 280, -"y": 171 +"x": 310, +"y": 106 }, { -"x": 378, -"y": 171, +"x": 693, +"y": 106, "smooth": true }, { -"x": 611.0, -"y": 171, +"x": 1070, +"y": 106, "type": "cubic" }, { -"x": 690.0, -"y": 274.2679738562091, +"x": 1198, +"y": 220, "type": "cubic" }, { -"x": 690, -"y": 487, +"x": 1198, +"y": 455, "smooth": true }, { -"x": 690.0, -"y": 697.3024691358024, +"x": 1198, +"y": 687, "type": "cubic" }, { -"x": 611, +"x": 1070, "y": 800, "type": "cubic" }, { -"x": 379, +"x": 695, "y": 800, "smooth": true }, { -"x": 280, +"x": 310, "y": 800 } ], @@ -274,29 +274,29 @@ } ] }, -"xAdvance": 710 +"xAdvance": 1218 } }, -"MutatorSansLightWide/foreground": { +"MutatorSansLightCondensed/foreground": { "glyph": { "path": { "contours": [ { "points": [ { -"x": 120, +"x": 60, "y": 0 }, { -"x": 160, +"x": 100, "y": 0 }, { -"x": 160, +"x": 100, "y": 700 }, { -"x": 120, +"x": 60, "y": 700 } ], @@ -305,88 +305,89 @@ { "points": [ { -"x": 140, +"x": 80, "y": 660 }, { -"x": 630, +"x": 180, "y": 660, "smooth": true }, { -"x": 935, +"x": 299, "y": 660, "type": "cubic" }, { -"x": 1022, -"y": 575, +"x": 354, +"y": 565, "type": "cubic" }, { -"x": 1022, +"x": 354, "y": 432, "smooth": true }, { -"x": 1022, -"y": 289, +"x": 354, +"y": 299, "type": "cubic" }, { -"x": 935, +"x": 299, "y": 205, "type": "cubic" }, { -"x": 630, +"x": 180, "y": 205, "smooth": true }, { -"x": 140, +"x": 80, "y": 205 }, { -"x": 140, +"x": 80, "y": 165 }, { -"x": 620, -"y": 165 +"x": 170, +"y": 165, +"smooth": true }, { -"x": 995, +"x": 330, "y": 165, "type": "cubic" }, { -"x": 1061, +"x": 393, "y": 286, "type": "cubic" }, { -"x": 1061, +"x": 393, "y": 432, "smooth": true }, { -"x": 1061, +"x": 393, "y": 580, "type": "cubic" }, { -"x": 995, +"x": 330, "y": 700, "type": "cubic" }, { -"x": 620, +"x": 170, "y": 700, "smooth": true }, { -"x": 140, +"x": 80, "y": 700 } ], @@ -394,30 +395,30 @@ } ] }, -"xAdvance": 1101 +"xAdvance": 443 } }, -"MutatorSansBoldWide/foreground": { +"MutatorSansLightWide/foreground": { "glyph": { "path": { "contours": [ { "points": [ { -"x": 60, +"x": 120, "y": 0 }, { -"x": 480, +"x": 160, "y": 0 }, { -"x": 480, -"y": 800 +"x": 160, +"y": 700 }, { -"x": 60, -"y": 800 +"x": 120, +"y": 700 } ], "isClosed": true @@ -425,97 +426,96 @@ { "points": [ { -"x": 310, -"y": 513 +"x": 140, +"y": 660 }, { -"x": 727, -"y": 513, +"x": 630, +"y": 660, "smooth": true }, { -"x": 790, -"y": 513, +"x": 935, +"y": 660, "type": "cubic" }, { -"x": 818, -"y": 501, +"x": 1022, +"y": 575, "type": "cubic" }, { -"x": 818, -"y": 455, +"x": 1022, +"y": 432, "smooth": true }, { -"x": 818, -"y": 402, +"x": 1022, +"y": 289, "type": "cubic" }, { -"x": 790, -"y": 394, +"x": 935, +"y": 205, "type": "cubic" }, { -"x": 727, -"y": 394, +"x": 630, +"y": 205, "smooth": true }, { -"x": 310, -"y": 394 +"x": 140, +"y": 205 }, { -"x": 310, -"y": 106 +"x": 140, +"y": 165 }, { -"x": 693, -"y": 106, -"smooth": true +"x": 620, +"y": 165 }, { -"x": 1070, -"y": 106, +"x": 995, +"y": 165, "type": "cubic" }, { -"x": 1198, -"y": 220, +"x": 1061, +"y": 286, "type": "cubic" }, { -"x": 1198, -"y": 455, +"x": 1061, +"y": 432, "smooth": true }, { -"x": 1198, -"y": 687, +"x": 1061, +"y": 580, "type": "cubic" }, { -"x": 1070, -"y": 800, +"x": 995, +"y": 700, "type": "cubic" }, { -"x": 695, -"y": 800, +"x": 620, +"y": 700, "smooth": true }, { -"x": 310, -"y": 800 +"x": 140, +"y": 700 } ], "isClosed": true } ] }, -"xAdvance": 1218 +"xAdvance": 1101 } } } diff --git a/tests/data/MutatorSans.fontra/glyphs/Q^1.json b/tests/data/MutatorSans.fontra/glyphs/Q^1.json index c8ef060..a7c78ae 100644 --- a/tests/data/MutatorSans.fontra/glyphs/Q^1.json +++ b/tests/data/MutatorSans.fontra/glyphs/Q^1.json @@ -5,57 +5,57 @@ "name": "LightCondensed", "layerName": "MutatorSansLightCondensed/foreground", "location": { -"width": 0.0, -"weight": 150.0 +"weight": 150, +"width": 0 } }, { "name": "BoldCondensed", "layerName": "MutatorSansBoldCondensed/foreground", "location": { -"width": 0.0, -"weight": 850.0 +"weight": 850, +"width": 0 } }, { "name": "LightWide", "layerName": "MutatorSansLightWide/foreground", "location": { -"width": 1000.0, -"weight": 150.0 +"weight": 150, +"width": 1000 } }, { "name": "BoldWide", "layerName": "MutatorSansBoldWide/foreground", "location": { -"width": 1000.0, -"weight": 850.0 +"weight": 850, +"width": 1000 } } ], "layers": { -"MutatorSansLightCondensed/foreground": { +"MutatorSansBoldCondensed/foreground": { "glyph": { "path": { "contours": [ { "points": [ { -"x": 330, +"x": 410, "y": -130 }, { -"x": 374, +"x": 720, "y": -130 }, { -"x": 275, -"y": 13 +"x": 610, +"y": 170 }, { -"x": 243, -"y": -5 +"x": 327, +"y": 170 } ], "isClosed": true @@ -67,29 +67,29 @@ "name": "O" } ], -"xAdvance": 503 +"xAdvance": 844 } }, -"MutatorSansBoldCondensed/foreground": { +"MutatorSansBoldWide/foreground": { "glyph": { "path": { "contours": [ { "points": [ { -"x": 410, +"x": 560, "y": -130 }, { -"x": 720, +"x": 980, "y": -130 }, { -"x": 610, +"x": 840, "y": 170 }, { -"x": 327, +"x": 420, "y": 170 } ], @@ -102,29 +102,29 @@ "name": "O" } ], -"xAdvance": 844 +"xAdvance": 1381 } }, -"MutatorSansLightWide/foreground": { +"MutatorSansLightCondensed/foreground": { "glyph": { "path": { "contours": [ { "points": [ { -"x": 708, +"x": 330, "y": -130 }, { -"x": 752, +"x": 374, "y": -130 }, { -"x": 653, +"x": 275, "y": 13 }, { -"x": 621, +"x": 243, "y": -5 } ], @@ -137,30 +137,30 @@ "name": "O" } ], -"xAdvance": 1321 +"xAdvance": 503 } }, -"MutatorSansBoldWide/foreground": { +"MutatorSansLightWide/foreground": { "glyph": { "path": { "contours": [ { "points": [ { -"x": 560, +"x": 708, "y": -130 }, { -"x": 980, +"x": 752, "y": -130 }, { -"x": 840, -"y": 170 +"x": 653, +"y": 13 }, { -"x": 420, -"y": 170 +"x": 621, +"y": -5 } ], "isClosed": true @@ -172,7 +172,7 @@ "name": "O" } ], -"xAdvance": 1381 +"xAdvance": 1321 } } } diff --git a/tests/data/MutatorSans.fontra/glyphs/R.alt^1.json b/tests/data/MutatorSans.fontra/glyphs/R.alt^1.json index 47b0722..dcb828a 100644 --- a/tests/data/MutatorSans.fontra/glyphs/R.alt^1.json +++ b/tests/data/MutatorSans.fontra/glyphs/R.alt^1.json @@ -19,8 +19,8 @@ "name": "", "layerName": "", "location": { -"width": 0, -"weight": 0 +"weight": 0, +"width": 0 } }, { diff --git a/tests/data/MutatorSans.fontra/glyphs/R^1.json b/tests/data/MutatorSans.fontra/glyphs/R^1.json index 1c931e7..ab77ea4 100644 --- a/tests/data/MutatorSans.fontra/glyphs/R^1.json +++ b/tests/data/MutatorSans.fontra/glyphs/R^1.json @@ -5,72 +5,72 @@ "name": "LightCondensed", "layerName": "MutatorSansLightCondensed/foreground", "location": { -"width": 0.0, -"weight": 150.0 +"weight": 150, +"width": 0 } }, { "name": "BoldCondensed", "layerName": "MutatorSansBoldCondensed/foreground", "location": { -"width": 0.0, -"weight": 850.0 +"weight": 850, +"width": 0 } }, { "name": "LightWide", "layerName": "MutatorSansLightWide/foreground", "location": { -"width": 1000.0, -"weight": 150.0 +"weight": 150, +"width": 1000 } }, { "name": "BoldWide", "layerName": "MutatorSansBoldWide/foreground", "location": { -"width": 1000.0, -"weight": 850.0 +"weight": 850, +"width": 1000 } } ], "layers": { -"MutatorSansLightCondensed/foreground": { +"MutatorSansBoldCondensed/foreground": { "glyph": { "path": { "contours": [ { "points": [ { -"x": 350, +"x": 385, "y": 0 }, { -"x": 394, +"x": 705, "y": 0 }, { -"x": 300, -"y": 132, +"x": 672, +"y": 211, "smooth": true }, { -"x": 267, -"y": 179, +"x": 663, +"y": 266, "type": "cubic" }, { -"x": 254, -"y": 195, +"x": 624, +"y": 304, "type": "cubic" }, { -"x": 232, -"y": 195 +"x": 556, +"y": 304 }, { -"x": 213, -"y": 195 +"x": 366, +"y": 304 } ], "isClosed": true @@ -78,20 +78,20 @@ { "points": [ { -"x": 60, +"x": 30, "y": 0 }, { -"x": 100, +"x": 350, "y": 0 }, { -"x": 100, -"y": 700 +"x": 350, +"y": 800 }, { -"x": 60, -"y": 700 +"x": 30, +"y": 800 } ], "isClosed": true @@ -99,135 +99,135 @@ { "points": [ { -"x": 80, -"y": 660 +"x": 280, +"y": 548 }, { -"x": 180, -"y": 660, +"x": 365, +"y": 548, "smooth": true }, { -"x": 299.0, -"y": 660.0, +"x": 394, +"y": 548, "type": "cubic" }, { -"x": 354, -"y": 565, +"x": 407, +"y": 536, "type": "cubic" }, { -"x": 354, -"y": 432, +"x": 407, +"y": 487, "smooth": true }, { -"x": 354, -"y": 299, +"x": 407, +"y": 432, "type": "cubic" }, { -"x": 299.0, -"y": 205.0, +"x": 394, +"y": 424, "type": "cubic" }, { -"x": 180, -"y": 205, +"x": 365, +"y": 424, "smooth": true }, { -"x": 80, -"y": 205 +"x": 280, +"y": 424 }, { -"x": 80, -"y": 165 +"x": 280, +"y": 232 }, { -"x": 170, -"y": 165, +"x": 398, +"y": 232, "smooth": true }, { -"x": 330.0, -"y": 165.0, +"x": 611, +"y": 232, "type": "cubic" }, { -"x": 393, -"y": 286, +"x": 700, +"y": 325, "type": "cubic" }, { -"x": 393, -"y": 432, +"x": 700, +"y": 517, "smooth": true }, { -"x": 393, -"y": 580, +"x": 700, +"y": 708, "type": "cubic" }, { -"x": 330.0, -"y": 700.0, +"x": 601, +"y": 800, "type": "cubic" }, { -"x": 170, -"y": 700, +"x": 387, +"y": 800, "smooth": true }, { -"x": 80, -"y": 700 +"x": 280, +"y": 800 } ], "isClosed": true } ] }, -"xAdvance": 454 +"xAdvance": 720 } }, -"MutatorSansBoldCondensed/foreground": { +"MutatorSansBoldWide/foreground": { "glyph": { "path": { "contours": [ { "points": [ { -"x": 385, +"x": 800, "y": 0 }, { -"x": 705, +"x": 1231, "y": 0 }, { -"x": 672, -"y": 211, +"x": 1180, +"y": 83, "smooth": true }, { -"x": 663, -"y": 266, +"x": 1137, +"y": 153, "type": "cubic" }, { -"x": 624, -"y": 304, +"x": 1083, +"y": 210, "type": "cubic" }, { -"x": 556, -"y": 304 +"x": 985, +"y": 210 }, { -"x": 366, -"y": 304 +"x": 690, +"y": 210 } ], "isClosed": true @@ -235,19 +235,19 @@ { "points": [ { -"x": 30, +"x": 60, "y": 0 }, { -"x": 350, +"x": 480, "y": 0 }, { -"x": 350, +"x": 480, "y": 800 }, { -"x": 30, +"x": 60, "y": 800 } ], @@ -256,89 +256,89 @@ { "points": [ { -"x": 280, -"y": 548 +"x": 354, +"y": 513 }, { -"x": 365, -"y": 548, +"x": 771, +"y": 513, "smooth": true }, { -"x": 394, -"y": 548, +"x": 834, +"y": 513, "type": "cubic" }, { -"x": 407, -"y": 536, +"x": 862, +"y": 501, "type": "cubic" }, { -"x": 407, -"y": 487, +"x": 862, +"y": 455, "smooth": true }, { -"x": 407, -"y": 432, +"x": 862, +"y": 402, "type": "cubic" }, { -"x": 394, -"y": 424, +"x": 834, +"y": 394, "type": "cubic" }, { -"x": 365, -"y": 424, +"x": 771, +"y": 394, "smooth": true }, { -"x": 280, -"y": 424 +"x": 354, +"y": 394 }, { -"x": 280, -"y": 232 +"x": 354, +"y": 126 }, { -"x": 398, -"y": 232, +"x": 737, +"y": 126, "smooth": true }, { -"x": 611.0, -"y": 232, +"x": 1114, +"y": 126, "type": "cubic" }, { -"x": 700.0, -"y": 325, +"x": 1242, +"y": 231, "type": "cubic" }, { -"x": 700, -"y": 517, +"x": 1242, +"y": 445, "smooth": true }, { -"x": 700.0, -"y": 708, +"x": 1242, +"y": 684, "type": "cubic" }, { -"x": 601, +"x": 1114, "y": 800, "type": "cubic" }, { -"x": 387, +"x": 739, "y": 800, "smooth": true }, { -"x": 280, +"x": 354, "y": 800 } ], @@ -346,45 +346,45 @@ } ] }, -"xAdvance": 720 +"xAdvance": 1277 } }, -"MutatorSansLightWide/foreground": { +"MutatorSansLightCondensed/foreground": { "glyph": { "path": { "contours": [ { "points": [ { -"x": 980, +"x": 350, "y": 0 }, { -"x": 1048, +"x": 394, "y": 0 }, { -"x": 913, -"y": 98, +"x": 300, +"y": 132, "smooth": true }, { -"x": 826, -"y": 161, +"x": 267, +"y": 179, "type": "cubic" }, { -"x": 778, -"y": 187, +"x": 254, +"y": 195, "type": "cubic" }, { -"x": 740, -"y": 185 +"x": 232, +"y": 195 }, { -"x": 723, -"y": 185 +"x": 213, +"y": 195 } ], "isClosed": true @@ -392,19 +392,19 @@ { "points": [ { -"x": 120, +"x": 60, "y": 0 }, { -"x": 160, +"x": 100, "y": 0 }, { -"x": 160, +"x": 100, "y": 700 }, { -"x": 120, +"x": 60, "y": 700 } ], @@ -413,89 +413,89 @@ { "points": [ { -"x": 140, +"x": 80, "y": 660 }, { -"x": 640, +"x": 180, "y": 660, "smooth": true }, { -"x": 935, +"x": 299, "y": 660, "type": "cubic" }, { -"x": 1018, -"y": 575, +"x": 354, +"y": 565, "type": "cubic" }, { -"x": 1018, +"x": 354, "y": 432, "smooth": true }, { -"x": 1018, -"y": 289, +"x": 354, +"y": 299, "type": "cubic" }, { -"x": 935, +"x": 299, "y": 205, "type": "cubic" }, { -"x": 640, +"x": 180, "y": 205, "smooth": true }, { -"x": 140, +"x": 80, "y": 205 }, { -"x": 140, +"x": 80, "y": 165 }, { -"x": 620, +"x": 170, "y": 165, "smooth": true }, { -"x": 995, +"x": 330, "y": 165, "type": "cubic" }, { -"x": 1061, +"x": 393, "y": 286, "type": "cubic" }, { -"x": 1061, +"x": 393, "y": 432, "smooth": true }, { -"x": 1061, +"x": 393, "y": 580, "type": "cubic" }, { -"x": 995, +"x": 330, "y": 700, "type": "cubic" }, { -"x": 620, +"x": 170, "y": 700, "smooth": true }, { -"x": 140, +"x": 80, "y": 700 } ], @@ -503,45 +503,45 @@ } ] }, -"xAdvance": 1171 +"xAdvance": 454 } }, -"MutatorSansBoldWide/foreground": { +"MutatorSansLightWide/foreground": { "glyph": { "path": { "contours": [ { "points": [ { -"x": 800, +"x": 980, "y": 0 }, { -"x": 1231, +"x": 1048, "y": 0 }, { -"x": 1180, -"y": 83, +"x": 913, +"y": 98, "smooth": true }, { -"x": 1137, -"y": 153, +"x": 826, +"y": 161, "type": "cubic" }, { -"x": 1083, -"y": 210, +"x": 778, +"y": 187, "type": "cubic" }, { -"x": 985, -"y": 210 +"x": 740, +"y": 185 }, { -"x": 690, -"y": 210 +"x": 723, +"y": 185 } ], "isClosed": true @@ -549,20 +549,20 @@ { "points": [ { -"x": 60, +"x": 120, "y": 0 }, { -"x": 480, +"x": 160, "y": 0 }, { -"x": 480, -"y": 800 +"x": 160, +"y": 700 }, { -"x": 60, -"y": 800 +"x": 120, +"y": 700 } ], "isClosed": true @@ -570,97 +570,97 @@ { "points": [ { -"x": 354, -"y": 513 +"x": 140, +"y": 660 }, { -"x": 771, -"y": 513, +"x": 640, +"y": 660, "smooth": true }, { -"x": 834, -"y": 513, +"x": 935, +"y": 660, "type": "cubic" }, { -"x": 862, -"y": 501, +"x": 1018, +"y": 575, "type": "cubic" }, { -"x": 862, -"y": 455, +"x": 1018, +"y": 432, "smooth": true }, { -"x": 862, -"y": 402, +"x": 1018, +"y": 289, "type": "cubic" }, { -"x": 834, -"y": 394, +"x": 935, +"y": 205, "type": "cubic" }, { -"x": 771, -"y": 394, +"x": 640, +"y": 205, "smooth": true }, { -"x": 354, -"y": 394 +"x": 140, +"y": 205 }, { -"x": 354, -"y": 126 +"x": 140, +"y": 165 }, { -"x": 737, -"y": 126, +"x": 620, +"y": 165, "smooth": true }, { -"x": 1114.0, -"y": 126, +"x": 995, +"y": 165, "type": "cubic" }, { -"x": 1242.0, -"y": 231, +"x": 1061, +"y": 286, "type": "cubic" }, { -"x": 1242, -"y": 445, +"x": 1061, +"y": 432, "smooth": true }, { -"x": 1242.0, -"y": 684, +"x": 1061, +"y": 580, "type": "cubic" }, { -"x": 1114.0, -"y": 800, +"x": 995, +"y": 700, "type": "cubic" }, { -"x": 739, -"y": 800, +"x": 620, +"y": 700, "smooth": true }, { -"x": 354, -"y": 800 +"x": 140, +"y": 700 } ], "isClosed": true } ] }, -"xAdvance": 1277 +"xAdvance": 1171 } } } diff --git a/tests/data/MutatorSans.fontra/glyphs/S.closed^1.json b/tests/data/MutatorSans.fontra/glyphs/S.closed^1.json index 817e25f..2a79178 100644 --- a/tests/data/MutatorSans.fontra/glyphs/S.closed^1.json +++ b/tests/data/MutatorSans.fontra/glyphs/S.closed^1.json @@ -5,272 +5,272 @@ "name": "LightCondensed", "layerName": "MutatorSansLightCondensed/foreground", "location": { -"width": 0.0, -"weight": 150.0 +"weight": 150, +"width": 0 } }, { "name": "BoldCondensed", "layerName": "MutatorSansBoldCondensed/foreground", "location": { -"width": 0.0, -"weight": 850.0 +"weight": 850, +"width": 0 } }, { "name": "LightWide", "layerName": "MutatorSansLightWide/foreground", "location": { -"width": 1000.0, -"weight": 150.0 +"weight": 150, +"width": 1000 } }, { "name": "BoldWide", "layerName": "MutatorSansBoldWide/foreground", "location": { -"width": 1000.0, -"weight": 850.0 +"weight": 850, +"width": 1000 } }, { "name": "support.S.wide", "layerName": "MutatorSansLightCondensed/support.S.wide", "location": { -"width": 1000.0, -"weight": 595.0 +"weight": 595, +"width": 1000 } }, { "name": "support.S.middle", "layerName": "MutatorSansLightCondensed/support.S.middle", "location": { -"width": 569.078, -"weight": 595.0 +"weight": 595, +"width": 569.078 } } ], "layers": { -"MutatorSansLightCondensed/foreground": { +"MutatorSansBoldCondensed/background": { "glyph": { "path": { "contours": [ { "points": [ { -"x": 358, -"y": 157, +"x": 1206, +"y": 253, "smooth": true }, { -"x": 357, -"y": 238, +"x": 1206, +"y": 439, "type": "cubic" }, { -"x": 311, -"y": 300, +"x": 1081, +"y": 492, "type": "cubic" }, { -"x": 226, -"y": 358, +"x": 740, +"y": 501, "smooth": true }, { -"x": 168, -"y": 398, +"x": 548, +"y": 506, "smooth": true }, { -"x": 102, -"y": 443, +"x": 412, +"y": 510, "type": "cubic" }, { -"x": 85, -"y": 494, +"x": 411, +"y": 512, "type": "cubic" }, { -"x": 85, -"y": 557, +"x": 411, +"y": 522, "smooth": true }, { -"x": 85, -"y": 619, +"x": 411, +"y": 533, "type": "cubic" }, { -"x": 117, -"y": 673, +"x": 425, +"y": 537, "type": "cubic" }, { -"x": 196, -"y": 673, +"x": 514, +"y": 537, "smooth": true }, { -"x": 201, -"y": 673, +"x": 695, +"y": 537, "smooth": true }, { -"x": 297, -"y": 673, +"x": 812, +"y": 537, "type": "cubic" }, { -"x": 316, -"y": 614, +"x": 844, +"y": 530, "type": "cubic" }, { -"x": 316, -"y": 479 +"x": 844, +"y": 482 }, { -"x": 355, -"y": 479 +"x": 1150, +"y": 483 }, { -"x": 355, -"y": 653, +"x": 1150, +"y": 746, "type": "cubic" }, { -"x": 316, -"y": 711, +"x": 1027, +"y": 810, "type": "cubic" }, { -"x": 202, -"y": 711, +"x": 653, +"y": 810, "smooth": true }, { -"x": 195, -"y": 711, +"x": 608, +"y": 810, "smooth": true }, { -"x": 90, -"y": 711, +"x": 211, +"y": 810, "type": "cubic" }, { -"x": 46, -"y": 639, +"x": 49, +"y": 729, "type": "cubic" }, { -"x": 47, -"y": 544, +"x": 49, +"y": 529, "smooth": true }, { -"x": 48, -"y": 463, +"x": 49, +"y": 364, "type": "cubic" }, { -"x": 88, -"y": 399, +"x": 197, +"y": 305, "type": "cubic" }, { -"x": 173, -"y": 341, +"x": 517, +"y": 299, "smooth": true }, { -"x": 231, -"y": 301, +"x": 722, +"y": 295, "smooth": true }, { -"x": 305, -"y": 250, +"x": 824, +"y": 293, "type": "cubic" }, { -"x": 320, -"y": 207, +"x": 841, +"y": 289, "type": "cubic" }, { -"x": 320, -"y": 144, +"x": 841, +"y": 276, "smooth": true }, { -"x": 320, -"y": 82, +"x": 841, +"y": 268, "type": "cubic" }, { -"x": 283, -"y": 28, +"x": 816, +"y": 264, "type": "cubic" }, { -"x": 212, -"y": 28, +"x": 727, +"y": 264, "smooth": true }, { -"x": 204, -"y": 28, +"x": 460, +"y": 264, "smooth": true }, { -"x": 100, -"y": 28, +"x": 393, +"y": 264, "type": "cubic" }, { -"x": 80, -"y": 94, +"x": 349, +"y": 289, "type": "cubic" }, { -"x": 80, -"y": 222 +"x": 349, +"y": 336 }, { -"x": 40, -"y": 222 +"x": 43, +"y": 336 }, { -"x": 40, -"y": 36, +"x": 17, +"y": 69, "type": "cubic" }, { -"x": 102, +"x": 172, "y": -10, "type": "cubic" }, { -"x": 194, +"x": 488, "y": -10, "smooth": true }, { -"x": 201, +"x": 779, "y": -10, "smooth": true }, { -"x": 306, +"x": 1118, "y": -10, "type": "cubic" }, { -"x": 359, -"y": 62, +"x": 1206, +"y": 92, "type": "cubic" } ], @@ -278,449 +278,459 @@ } ] }, -"xAdvance": 398 +"xAdvance": 1246 } }, -"MutatorSansLightCondensed/background": { +"MutatorSansBoldCondensed/foreground": { "glyph": { "path": { "contours": [ { "points": [ { -"x": 410, -"y": 191, +"x": 726, +"y": 253, "smooth": true }, { -"x": 410, -"y": 317, +"x": 726, +"y": 453, "type": "cubic" }, { -"x": 330, -"y": 362, +"x": 615, +"y": 497, "type": "cubic" }, { -"x": 36, -"y": 372, +"x": 447, +"y": 507, "smooth": true }, { -"x": -138, -"y": 378, +"x": 378, +"y": 511, "smooth": true }, { -"x": -347, -"y": 385, +"x": 297, +"y": 516, "type": "cubic" }, { -"x": -486, -"y": 412, +"x": 290, +"y": 518, "type": "cubic" }, { -"x": -486, -"y": 518 +"x": 290, +"y": 528, +"smooth": true }, { -"x": -486, -"y": 615, +"x": 290, +"y": 539, "type": "cubic" }, { -"x": -373, -"y": 672, +"x": 304, +"y": 543, "type": "cubic" }, { -"x": -105, -"y": 672, +"x": 358, +"y": 543, "smooth": true }, { -"x": -34, -"y": 672, +"x": 386, +"y": 543, "smooth": true }, { -"x": 221.0, -"y": 672.0, +"x": 440, +"y": 543, "type": "cubic" }, { -"x": 312, -"y": 617, +"x": 451, +"y": 527, "type": "cubic" }, { -"x": 324, -"y": 479 +"x": 451, +"y": 490 }, { -"x": 363, -"y": 479 +"x": 711, +"y": 490 }, { -"x": 354, -"y": 633, +"x": 711, +"y": 712, "type": "cubic" }, { -"x": 254.0, -"y": 708.0, +"x": 620, +"y": 810, "type": "cubic" }, { -"x": -37, -"y": 708, +"x": 395, +"y": 810, "smooth": true }, { -"x": -105, -"y": 708, +"x": 372, +"y": 810, "smooth": true }, { -"x": -392, -"y": 708, +"x": 147, +"y": 810, "type": "cubic" }, { -"x": -525, -"y": 642, +"x": 25, +"y": 708, "type": "cubic" }, { -"x": -525, -"y": 518, +"x": 25, +"y": 529, "smooth": true }, { -"x": -525, -"y": 401, +"x": 25, +"y": 350, "type": "cubic" }, { -"x": -436, -"y": 352, +"x": 152, +"y": 290, "type": "cubic" }, { -"x": -152, -"y": 342, +"x": 305, +"y": 279, "smooth": true }, { -"x": 22, -"y": 336, +"x": 372, +"y": 274, "smooth": true }, { -"x": 252, -"y": 328, +"x": 445, +"y": 269, "type": "cubic" }, { -"x": 371, -"y": 310, +"x": 459, +"y": 269, "type": "cubic" }, { -"x": 371, -"y": 197, +"x": 459, +"y": 256, "smooth": true }, { -"x": 371, -"y": 85, +"x": 459, +"y": 248, "type": "cubic" }, { -"x": 249, -"y": 28, +"x": 443, +"y": 244, "type": "cubic" }, { -"x": -79, -"y": 28, +"x": 411, +"y": 244, "smooth": true }, { -"x": -110, -"y": 28, +"x": 377, +"y": 244, "smooth": true }, { -"x": -431, -"y": 28, +"x": 320, +"y": 244, "type": "cubic" }, { -"x": -505, -"y": 60, +"x": 309, +"y": 270, "type": "cubic" }, { -"x": -505, -"y": 221 +"x": 309, +"y": 296 }, { -"x": -545, -"y": 221 +"x": 29, +"y": 296 }, { -"x": -541, -"y": 59, +"x": 29, +"y": 73, "type": "cubic" }, { -"x": -506, -"y": -8, +"x": 149, +"y": -10, "type": "cubic" }, { -"x": -107, -"y": -8, +"x": 349, +"y": -10, "smooth": true }, { -"x": -79, -"y": -8, +"x": 380, +"y": -10, "smooth": true }, { -"x": 268, -"y": -8, +"x": 622, +"y": -10, "type": "cubic" }, { -"x": 410, -"y": 64, +"x": 726, +"y": 108, "type": "cubic" } ], "isClosed": true +} +] +}, +"xAdvance": 751 +} }, +"MutatorSansBoldWide/background": { +"glyph": { +"path": { +"contours": [ { "points": [ { -"x": 44.0, -"y": 544.0, +"x": 1180, +"y": 253, "smooth": true }, { -"x": 45.0, -"y": 463.0, +"x": 1180, +"y": 462, "type": "cubic" }, { -"x": 94.0, -"y": 408.0, +"x": 1055, +"y": 523, "type": "cubic" }, { -"x": 176.0, -"y": 343.0, +"x": 714, +"y": 531, "smooth": true }, { -"x": 226.0, -"y": 303.0, +"x": 509, +"y": 536, "smooth": true }, { -"x": 288.0, -"y": 254.0, +"x": 373, +"y": 539, "type": "cubic" }, { -"x": 309.0, -"y": 207.0, +"x": 362, +"y": 542, "type": "cubic" }, { -"x": 309.0, -"y": 144.0, +"x": 362, +"y": 552, "smooth": true }, { -"x": 309.0, -"y": 82.0, +"x": 362, +"y": 563, "type": "cubic" }, { -"x": 275.0, -"y": 28.0, +"x": 386, +"y": 567, "type": "cubic" }, { -"x": 190.0, -"y": 28.0, +"x": 475, +"y": 567, "smooth": true }, { -"x": 182.0, -"y": 28.0, +"x": 679, +"y": 567, "smooth": true }, { -"x": 92.0, -"y": 28.0, +"x": 828, +"y": 567, "type": "cubic" }, { -"x": 70.0, -"y": 79.0, +"x": 975, +"y": 558, "type": "cubic" }, { -"x": 73.0, -"y": 222.0 +"x": 1084, +"y": 548 }, { -"x": 30.0, -"y": 222.0 +"x": 1119, +"y": 780 }, { -"x": 20.0, -"y": 47.0, +"x": 1013, +"y": 793, "type": "cubic" }, { -"x": 68.0, -"y": -10.0, +"x": 831, +"y": 810, "type": "cubic" }, { -"x": 184.0, -"y": -10.0, +"x": 734, +"y": 810, "smooth": true }, { -"x": 191.0, -"y": -10.0, +"x": 604, +"y": 810, "smooth": true }, { -"x": 302.0, -"y": -10.0, +"x": 172, +"y": 810, "type": "cubic" }, { -"x": 348.0, -"y": 62.0, +"x": 10, +"y": 729, "type": "cubic" }, { -"x": 347.0, -"y": 157.0, +"x": 10, +"y": 529, "smooth": true }, { -"x": 346.0, -"y": 238.0, +"x": 10, +"y": 343, "type": "cubic" }, { -"x": 303.0, -"y": 295.0, +"x": 158, +"y": 277, "type": "cubic" }, { -"x": 221.0, -"y": 360.0, +"x": 478, +"y": 269, "smooth": true }, { -"x": 171.0, -"y": 400.0, +"x": 670, +"y": 264, "smooth": true }, { -"x": 100.0, -"y": 457.0, +"x": 792, +"y": 261, "type": "cubic" }, { -"x": 82.0, -"y": 494.0, +"x": 815, +"y": 259, "type": "cubic" }, { -"x": 82.0, -"y": 557.0, +"x": 815, +"y": 246, "smooth": true }, { -"x": 82.0, -"y": 619.0, +"x": 815, +"y": 238, "type": "cubic" }, { -"x": 126.0, -"y": 673.0, +"x": 790, +"y": 234, "type": "cubic" }, { -"x": 209.0, -"y": 673.0, +"x": 701, +"y": 234, "smooth": true }, { -"x": 217.0, -"y": 673.0, +"x": 509, +"y": 234, "smooth": true }, { -"x": 270.0, -"y": 673.0, +"x": 336, +"y": 234, "type": "cubic" }, { -"x": 313.0, -"y": 663.0, +"x": 175, +"y": 242, "type": "cubic" }, { -"x": 356.0, -"y": 637.0 +"x": 51, +"y": 255 }, { -"x": 373.0, -"y": 674.0 +"x": 16, +"y": 20 }, { -"x": 333.0, -"y": 694.0, +"x": 142, +"y": 5, "type": "cubic" }, { -"x": 294.0, -"y": 711.0, +"x": 339, +"y": -10, "type": "cubic" }, { -"x": 227.0, -"y": 711.0, +"x": 456, +"y": -10, "smooth": true }, { -"x": 220.0, -"y": 711.0, +"x": 603, +"y": -10, "smooth": true }, { -"x": 102.0, -"y": 711.0, +"x": 1049, +"y": -10, "type": "cubic" }, { -"x": 43.0, -"y": 639.0, +"x": 1180, +"y": 92, "type": "cubic" } ], @@ -728,229 +738,229 @@ } ] }, -"xAdvance": 1185 +"xAdvance": 1210 } }, -"MutatorSansLightCondensed/support.S.wide": { +"MutatorSansBoldWide/foreground": { "glyph": { "path": { "contours": [ { "points": [ { -"x": 1192.2196930462876, -"y": 242.20878881250002, +"x": 1283, +"y": 253, "smooth": true }, { -"x": 1192.5084644117717, -"y": 436.0700597012453, +"x": 1283, +"y": 432, "type": "cubic" }, { -"x": 1076.7970722135808, -"y": 493.3695717368422, +"x": 1188, +"y": 485, "type": "cubic" }, { -"x": 742.6578524113017, -"y": 495.40163018350563, +"x": 847, +"y": 491, "smooth": true }, { -"x": 526.5616770713111, -"y": 498.0326309195254, +"x": 515, +"y": 497, "smooth": true }, { -"x": 364.15012403606676, -"y": 496.96843224436094, +"x": 429, +"y": 498, "type": "cubic" }, { -"x": 316.77616334621706, -"y": 503.82929422391913, +"x": 428, +"y": 502, "type": "cubic" }, { -"x": 316.77616334621706, -"y": 540.4279093859258, +"x": 428, +"y": 512, "smooth": true }, { -"x": 316.77616334621706, -"y": 574.3794945885809, +"x": 428, +"y": 523, "type": "cubic" }, { -"x": 364.4831938505475, -"y": 590.8552462989896, +"x": 442, +"y": 527, "type": "cubic" }, { -"x": 508.83417386795116, -"y": 590.8552462989896, +"x": 515, +"y": 527, "smooth": true }, { -"x": 677.4707085027021, -"y": 590.8552462989896, +"x": 762, +"y": 527, "smooth": true }, { -"x": 857.3662880747501, -"y": 590.8552462989896, +"x": 879, +"y": 527, "type": "cubic" }, { -"x": 912.7750543234495, -"y": 571.5683508247506, +"x": 911, +"y": 520, "type": "cubic" }, { -"x": 917.5557342633929, -"y": 504.60439440625 +"x": 911, +"y": 472 }, { -"x": 1126.449554289826, -"y": 505.2781942590461 +"x": 1247, +"y": 472 }, { -"x": 1123.2249815995065, -"y": 720.2089523761747, +"x": 1247, +"y": 723, "type": "cubic" }, { -"x": 1022.8399531121945, -"y": 786.064525802514, +"x": 1104, +"y": 810, "type": "cubic" }, { -"x": 667.6364528529135, -"y": 786.064525802514, +"x": 750, +"y": 810, "smooth": true }, { -"x": 597.198211706062, -"y": 786.064525802514, +"x": 595, +"y": 810, "smooth": true }, { -"x": 201.68512284819445, -"y": 786.064525802514, +"x": 198, +"y": 810, "type": "cubic" }, { -"x": 44.93018377500611, -"y": 707.0699919355109, +"x": 36, +"y": 729, "type": "cubic" }, { -"x": 44.64141427878289, -"y": 523.9679415533365, +"x": 36, +"y": 529, "smooth": true }, { -"x": 44.35264291329887, -"y": 350.36875391846803, +"x": 36, +"y": 364, "type": "cubic" }, { -"x": 177.73791674612312, -"y": 288.4542703701833, +"x": 184, +"y": 303, "type": "cubic" }, { -"x": 493.0214813402256, -"y": 285.4970694869596, +"x": 504, +"y": 299, "smooth": true }, { -"x": 700.7432870811795, -"y": 283.53986860373595, +"x": 831, +"y": 295, "smooth": true }, { -"x": 857.5878744918938, -"y": 284.3741242535244, +"x": 901, +"y": 294, "type": "cubic" }, { -"x": 911.7105743798166, -"y": 281.0266063297697, +"x": 918, +"y": 289, "type": "cubic" }, { -"x": 911.7105743798166, -"y": 240.21944770077536, +"x": 918, +"y": 276, "smooth": true }, { -"x": 911.7105743798166, -"y": 203.30000272662124, +"x": 918, +"y": 268, "type": "cubic" }, { -"x": 863.9275877319653, -"y": 186.8242510162124, +"x": 903, +"y": 264, "type": "cubic" }, { -"x": 700.4067551730499, -"y": 186.8242510162124, +"x": 831, +"y": 264, "smooth": true }, { -"x": 538.6577706294643, -"y": 186.8242510162124, +"x": 487, +"y": 264, "smooth": true }, { -"x": 405.0727944934302, -"y": 186.8242510162124, +"x": 420, +"y": 264, "type": "cubic" }, { -"x": 284.8923939225515, -"y": 195.77026697470342, +"x": 376, +"y": 289, "type": "cubic" }, { -"x": 283.92587847309676, -"y": 270.7649319850799 +"x": 376, +"y": 336 }, { -"x": 41.208379903312974, -"y": 270.7649319850799 +"x": 30, +"y": 336 }, { -"x": 44.44879907067029, -"y": 71.12223504954079, +"x": 30, +"y": 44, "type": "cubic" }, { -"x": 144.601755581203, -"y": -9.347599705592105, +"x": 203, +"y": -10, "type": "cubic" }, { -"x": 502.5773791672932, -"y": -9.347599705592105, +"x": 475, +"y": -10, "smooth": true }, { -"x": 632.4492271624765, -"y": -9.347599705592105, +"x": 856, +"y": -10, "smooth": true }, { -"x": 1059.6521924328742, -"y": -9.347599705592105, +"x": 1195, +"y": -10, "type": "cubic" }, { -"x": 1192.8934961664945, -"y": 87.4864273219955, +"x": 1283, +"y": 92, "type": "cubic" } ], @@ -958,459 +968,449 @@ } ] }, -"xAdvance": 1227 +"xAdvance": 1313 } }, -"MutatorSansLightCondensed/support.S.middle": { +"MutatorSansLightCondensed/background": { "glyph": { "path": { "contours": [ { "points": [ { -"x": 944.9912554793951, -"y": 234.44840551983987, +"x": 410, +"y": 191, "smooth": true }, { -"x": 945.0241880449022, -"y": 404.47451903689887, +"x": 410, +"y": 317, "type": "cubic" }, { -"x": 839.9994748839171, -"y": 487.98677583242716, +"x": 330, +"y": 362, "type": "cubic" }, { -"x": 588.0, -"y": 498, +"x": 36, +"y": 372, "smooth": true }, { -"x": 407, -"y": 505, +"x": -138, +"y": 378, "smooth": true }, { -"x": 311, -"y": 509, +"x": -347, +"y": 385, "type": "cubic" }, { -"x": 280.0, -"y": 518, +"x": -486, +"y": 412, "type": "cubic" }, { -"x": 280.0, -"y": 545, -"smooth": true +"x": -486, +"y": 518 }, { -"x": 280.0, -"y": 574, +"x": -486, +"y": 615, "type": "cubic" }, { -"x": 315, -"y": 591, +"x": -373, +"y": 672, "type": "cubic" }, { -"x": 424.0, -"y": 591.0, +"x": -105, +"y": 672, "smooth": true }, { -"x": 544, -"y": 591, +"x": -34, +"y": 672, "smooth": true }, { -"x": 620.0, -"y": 591, +"x": 221, +"y": 672, "type": "cubic" }, { -"x": 648.5469644624299, -"y": 577.4750863699069, +"x": 312, +"y": 617, "type": "cubic" }, { -"x": 651.0, -"y": 537 +"x": 324, +"y": 479 }, { -"x": 903.0, -"y": 537 +"x": 363, +"y": 479 }, { -"x": 900.9154761331948, -"y": 697.5083377440018, +"x": 354, +"y": 633, "type": "cubic" }, { -"x": 811.1969422371814, -"y": 783.580464814643, +"x": 254, +"y": 708, "type": "cubic" }, { -"x": 526.4506973166303, -"y": 783.580464814643, +"x": -37, +"y": 708, "smooth": true }, { -"x": 478.5230635212623, -"y": 783.580464814643, +"x": -105, +"y": 708, "smooth": true }, { -"x": 172.00100794020477, -"y": 783.580464814643, +"x": -392, +"y": 708, "type": "cubic" }, { -"x": 40.0, -"y": 699.0, +"x": -525, +"y": 642, "type": "cubic" }, { -"x": 40, -"y": 528, +"x": -525, +"y": 518, "smooth": true }, { -"x": 40.0, -"y": 353.3080168776371, +"x": -525, +"y": 401, "type": "cubic" }, { -"x": 160, -"y": 287, +"x": -436, +"y": 352, "type": "cubic" }, { -"x": 396, -"y": 274, +"x": -152, +"y": 342, "smooth": true }, { -"x": 578, -"y": 264, +"x": 22, +"y": 336, "smooth": true }, { -"x": 663, -"y": 259, +"x": 252, +"y": 328, "type": "cubic" }, { -"x": 700, -"y": 252, +"x": 371, +"y": 310, "type": "cubic" }, { -"x": 700, -"y": 229, +"x": 371, +"y": 197, "smooth": true }, { -"x": 700, -"y": 197, +"x": 371, +"y": 85, "type": "cubic" }, { -"x": 663.1060475713314, -"y": 183.53879351980413, +"x": 249, +"y": 28, "type": "cubic" }, { -"x": 551.2186478203688, -"y": 183.53879351980413, +"x": -79, +"y": 28, "smooth": true }, { -"x": 401, -"y": 184, +"x": -110, +"y": 28, "smooth": true }, { -"x": 306, -"y": 184, +"x": -431, +"y": 28, "type": "cubic" }, { -"x": 266.6609631957784, -"y": 197.71546588284733, +"x": -505, +"y": 60, "type": "cubic" }, { -"x": 266, -"y": 242 +"x": -505, +"y": 221 }, { -"x": 39, -"y": 242 +"x": -545, +"y": 221 }, { -"x": 39.8934794640888, -"y": 58.83670986179621, -"type": "cubic" +"x": -541, +"y": 59, +"type": "cubic" }, { -"x": 141.67072946263988, -"y": -9.628733345258944, +"x": -506, +"y": -8, "type": "cubic" }, { -"x": 417.60930858176494, -"y": -9.628733345258944, +"x": -107, +"y": -8, "smooth": true }, { -"x": 501.7724636951678, -"y": -9.628733345258944, +"x": -79, +"y": -8, "smooth": true }, { -"x": 831.4565025653153, -"y": -9.628733345258944, +"x": 268, +"y": -8, "type": "cubic" }, { -"x": 945.5039786114363, -"y": 90.37945348754656, +"x": 410, +"y": 64, "type": "cubic" } ], "isClosed": true -} -] -}, -"xAdvance": 980 -} }, -"MutatorSansBoldCondensed/foreground": { -"glyph": { -"path": { -"contours": [ { "points": [ { -"x": 726, -"y": 253, +"x": 44, +"y": 544, "smooth": true }, { -"x": 726, -"y": 453, +"x": 45, +"y": 463, "type": "cubic" }, { -"x": 615, -"y": 497, +"x": 94, +"y": 408, "type": "cubic" }, { -"x": 447, -"y": 507, +"x": 176, +"y": 343, "smooth": true }, { -"x": 378, -"y": 511, +"x": 226, +"y": 303, "smooth": true }, { -"x": 297, -"y": 516, +"x": 288, +"y": 254, "type": "cubic" }, { -"x": 290, -"y": 518, +"x": 309, +"y": 207, "type": "cubic" }, { -"x": 290, -"y": 528, +"x": 309, +"y": 144, "smooth": true }, { -"x": 290, -"y": 539, +"x": 309, +"y": 82, "type": "cubic" }, { -"x": 304, -"y": 543, +"x": 275, +"y": 28, "type": "cubic" }, { -"x": 358, -"y": 543, +"x": 190, +"y": 28, "smooth": true }, { -"x": 386, -"y": 543, +"x": 182, +"y": 28, "smooth": true }, { -"x": 440, -"y": 543, +"x": 92, +"y": 28, "type": "cubic" }, { -"x": 451, -"y": 527, +"x": 70, +"y": 79, "type": "cubic" }, { -"x": 451, -"y": 490 +"x": 73, +"y": 222 }, { -"x": 711, -"y": 490 +"x": 30, +"y": 222 }, { -"x": 711, -"y": 712, +"x": 20, +"y": 47, "type": "cubic" }, { -"x": 620, -"y": 810, +"x": 68, +"y": -10, "type": "cubic" }, { -"x": 395, -"y": 810, +"x": 184, +"y": -10, "smooth": true }, { -"x": 372, -"y": 810, +"x": 191, +"y": -10, "smooth": true }, { -"x": 147, -"y": 810, +"x": 302, +"y": -10, "type": "cubic" }, { -"x": 25, -"y": 708, +"x": 348, +"y": 62, "type": "cubic" }, { -"x": 25, -"y": 529, +"x": 347, +"y": 157, "smooth": true }, { -"x": 25, -"y": 350, +"x": 346, +"y": 238, "type": "cubic" }, { -"x": 152, -"y": 290, +"x": 303, +"y": 295, "type": "cubic" }, { -"x": 305, -"y": 279, +"x": 221, +"y": 360, "smooth": true }, { -"x": 372, -"y": 274, +"x": 171, +"y": 400, "smooth": true }, { -"x": 445, -"y": 269, +"x": 100, +"y": 457, "type": "cubic" }, { -"x": 459, -"y": 269, +"x": 82, +"y": 494, "type": "cubic" }, { -"x": 459, -"y": 256, +"x": 82, +"y": 557, "smooth": true }, { -"x": 459, -"y": 248, +"x": 82, +"y": 619, "type": "cubic" }, { -"x": 443, -"y": 244, +"x": 126, +"y": 673, "type": "cubic" }, { -"x": 411, -"y": 244, +"x": 209, +"y": 673, "smooth": true }, { -"x": 377, -"y": 244, +"x": 217, +"y": 673, "smooth": true }, { -"x": 320, -"y": 244, +"x": 270, +"y": 673, "type": "cubic" }, { -"x": 309, -"y": 270, +"x": 313, +"y": 663, "type": "cubic" }, { -"x": 309, -"y": 296 +"x": 356, +"y": 637 }, { -"x": 29, -"y": 296 +"x": 373, +"y": 674 }, { -"x": 29, -"y": 73, +"x": 333, +"y": 694, "type": "cubic" }, { -"x": 149, -"y": -10, +"x": 294, +"y": 711, "type": "cubic" }, { -"x": 349, -"y": -10, +"x": 227, +"y": 711, "smooth": true }, { -"x": 380, -"y": -10, +"x": 220, +"y": 711, "smooth": true }, { -"x": 622, -"y": -10, +"x": 102, +"y": 711, "type": "cubic" }, { -"x": 726, -"y": 108, +"x": 43, +"y": 639, "type": "cubic" } ], @@ -1418,229 +1418,229 @@ } ] }, -"xAdvance": 751 +"xAdvance": 1185 } }, -"MutatorSansBoldCondensed/background": { +"MutatorSansLightCondensed/foreground": { "glyph": { "path": { "contours": [ { "points": [ { -"x": 1206, -"y": 253, +"x": 358, +"y": 157, "smooth": true }, { -"x": 1206, -"y": 439, +"x": 357, +"y": 238, "type": "cubic" }, { -"x": 1081, -"y": 492, +"x": 311, +"y": 300, "type": "cubic" }, { -"x": 740, -"y": 501, +"x": 226, +"y": 358, "smooth": true }, { -"x": 548, -"y": 506, +"x": 168, +"y": 398, "smooth": true }, { -"x": 412, -"y": 510, +"x": 102, +"y": 443, "type": "cubic" }, { -"x": 411, -"y": 512, +"x": 85, +"y": 494, "type": "cubic" }, { -"x": 411, -"y": 522, +"x": 85, +"y": 557, "smooth": true }, { -"x": 411, -"y": 533, +"x": 85, +"y": 619, "type": "cubic" }, { -"x": 425, -"y": 537, +"x": 117, +"y": 673, "type": "cubic" }, { -"x": 514, -"y": 537, +"x": 196, +"y": 673, "smooth": true }, { -"x": 695, -"y": 537, +"x": 201, +"y": 673, "smooth": true }, { -"x": 812, -"y": 537, +"x": 297, +"y": 673, "type": "cubic" }, { -"x": 844, -"y": 530, +"x": 316, +"y": 614, "type": "cubic" }, { -"x": 844, -"y": 482 +"x": 316, +"y": 479 }, { -"x": 1150, -"y": 483 +"x": 355, +"y": 479 }, { -"x": 1150, -"y": 746, +"x": 355, +"y": 653, "type": "cubic" }, { -"x": 1027, -"y": 810, +"x": 316, +"y": 711, "type": "cubic" }, { -"x": 653, -"y": 810, +"x": 202, +"y": 711, "smooth": true }, { -"x": 608, -"y": 810, +"x": 195, +"y": 711, "smooth": true }, { -"x": 211, -"y": 810, +"x": 90, +"y": 711, "type": "cubic" }, { -"x": 49, -"y": 729, +"x": 46, +"y": 639, "type": "cubic" }, { -"x": 49, -"y": 529, +"x": 47, +"y": 544, "smooth": true }, { -"x": 49, -"y": 364, +"x": 48, +"y": 463, "type": "cubic" }, { -"x": 197, -"y": 305, +"x": 88, +"y": 399, "type": "cubic" }, { -"x": 517, -"y": 299, +"x": 173, +"y": 341, "smooth": true }, { -"x": 722, -"y": 295, +"x": 231, +"y": 301, "smooth": true }, { -"x": 824, -"y": 293, +"x": 305, +"y": 250, "type": "cubic" }, { -"x": 841, -"y": 289, +"x": 320, +"y": 207, "type": "cubic" }, { -"x": 841, -"y": 276, +"x": 320, +"y": 144, "smooth": true }, { -"x": 841, -"y": 268, +"x": 320, +"y": 82, "type": "cubic" }, { -"x": 816, -"y": 264, +"x": 283, +"y": 28, "type": "cubic" }, { -"x": 727, -"y": 264, +"x": 212, +"y": 28, "smooth": true }, { -"x": 460, -"y": 264, +"x": 204, +"y": 28, "smooth": true }, { -"x": 393, -"y": 264, +"x": 100, +"y": 28, "type": "cubic" }, { -"x": 349, -"y": 289, +"x": 80, +"y": 94, "type": "cubic" }, { -"x": 349, -"y": 336 +"x": 80, +"y": 222 }, { -"x": 43, -"y": 336 +"x": 40, +"y": 222 }, { -"x": 17, -"y": 69, +"x": 40, +"y": 36, "type": "cubic" }, { -"x": 172, +"x": 102, "y": -10, "type": "cubic" }, { -"x": 488, +"x": 194, "y": -10, "smooth": true }, { -"x": 779, +"x": 201, "y": -10, "smooth": true }, { -"x": 1118, +"x": 306, "y": -10, "type": "cubic" }, { -"x": 1206, -"y": 92, +"x": 359, +"y": 62, "type": "cubic" } ], @@ -1648,228 +1648,229 @@ } ] }, -"xAdvance": 1246 +"xAdvance": 398 } }, -"MutatorSansLightWide/foreground": { +"MutatorSansLightCondensed/support.S.middle": { "glyph": { "path": { "contours": [ { "points": [ { -"x": 1095, -"y": 191, +"x": 944.9912554793951, +"y": 234.44840551983987, "smooth": true }, { -"x": 1095, -"y": 317, +"x": 945.0241880449022, +"y": 404.47451903689887, "type": "cubic" }, { -"x": 1015, -"y": 364, +"x": 839.9994748839171, +"y": 487.98677583242716, "type": "cubic" }, { -"x": 721, -"y": 372, +"x": 588, +"y": 498, "smooth": true }, { -"x": 487, -"y": 378, +"x": 407, +"y": 505, "smooth": true }, { -"x": 278, -"y": 383, +"x": 311, +"y": 509, "type": "cubic" }, { -"x": 149, -"y": 412, +"x": 280, +"y": 518, "type": "cubic" }, { -"x": 149, -"y": 518 +"x": 280, +"y": 545, +"smooth": true }, { -"x": 149, -"y": 615, +"x": 280, +"y": 574, "type": "cubic" }, { -"x": 252, -"y": 672, +"x": 315, +"y": 591, "type": "cubic" }, { -"x": 520, -"y": 672, +"x": 424, +"y": 591, "smooth": true }, { -"x": 651, -"y": 672, +"x": 544, +"y": 591, "smooth": true }, { -"x": 906, -"y": 672, +"x": 620, +"y": 591, "type": "cubic" }, { -"x": 997, -"y": 617, +"x": 648.5469644624299, +"y": 577.4750863699069, "type": "cubic" }, { -"x": 1009, -"y": 479 +"x": 651, +"y": 537 }, { -"x": 1048, -"y": 479 +"x": 903, +"y": 537 }, { -"x": 1039, -"y": 633, +"x": 900.9154761331948, +"y": 697.5083377440018, "type": "cubic" }, { -"x": 939, -"y": 708, +"x": 811.1969422371814, +"y": 783.580464814643, "type": "cubic" }, { -"x": 648, -"y": 708, +"x": 526.4506973166303, +"y": 783.580464814643, "smooth": true }, { -"x": 520, -"y": 708, +"x": 478.5230635212623, +"y": 783.580464814643, "smooth": true }, { -"x": 233, -"y": 708, +"x": 172.00100794020477, +"y": 783.580464814643, "type": "cubic" }, { -"x": 110, -"y": 642, +"x": 40, +"y": 699, "type": "cubic" }, { -"x": 110, -"y": 518, +"x": 40, +"y": 528, "smooth": true }, { -"x": 110, -"y": 401, +"x": 40, +"y": 353.3080168776371, "type": "cubic" }, { -"x": 189, -"y": 349, +"x": 160, +"y": 287, "type": "cubic" }, { -"x": 473, -"y": 342, +"x": 396, +"y": 274, "smooth": true }, { -"x": 707, -"y": 336, +"x": 578, +"y": 264, "smooth": true }, { -"x": 937, -"y": 330, +"x": 663, +"y": 259, "type": "cubic" }, { -"x": 1056, -"y": 310, +"x": 700, +"y": 252, "type": "cubic" }, { -"x": 1056, -"y": 197, +"x": 700, +"y": 229, "smooth": true }, { -"x": 1056, -"y": 85, +"x": 700, +"y": 197, "type": "cubic" }, { -"x": 954, -"y": 28, +"x": 663.1060475713314, +"y": 183.53879351980413, "type": "cubic" }, { -"x": 626, -"y": 28, +"x": 551.2186478203688, +"y": 183.53879351980413, "smooth": true }, { -"x": 535, -"y": 28, +"x": 401, +"y": 184, "smooth": true }, { -"x": 324, -"y": 28, +"x": 306, +"y": 184, "type": "cubic" }, { -"x": 120, -"y": 60, +"x": 266.6609631957784, +"y": 197.71546588284733, "type": "cubic" }, { -"x": 120, -"y": 221 +"x": 266, +"y": 242 }, { -"x": 80, -"y": 221 +"x": 39, +"y": 242 }, { -"x": 84, -"y": 59, +"x": 39.8934794640888, +"y": 58.83670986179621, "type": "cubic" }, { -"x": 229, -"y": -8, +"x": 141.67072946263988, +"y": -9.628733345258944, "type": "cubic" }, { -"x": 538, -"y": -8, +"x": 417.60930858176494, +"y": -9.628733345258944, "smooth": true }, { -"x": 626, -"y": -8, +"x": 501.7724636951678, +"y": -9.628733345258944, "smooth": true }, { -"x": 973, -"y": -8, +"x": 831.4565025653153, +"y": -9.628733345258944, "type": "cubic" }, { -"x": 1095, -"y": 64, +"x": 945.5039786114363, +"y": 90.37945348754656, "type": "cubic" } ], @@ -1877,7 +1878,237 @@ } ] }, -"xAdvance": 1175 +"xAdvance": 980 +} +}, +"MutatorSansLightCondensed/support.S.wide": { +"glyph": { +"path": { +"contours": [ +{ +"points": [ +{ +"x": 1192.2196930462876, +"y": 242.20878881250002, +"smooth": true +}, +{ +"x": 1192.5084644117717, +"y": 436.0700597012453, +"type": "cubic" +}, +{ +"x": 1076.7970722135808, +"y": 493.3695717368422, +"type": "cubic" +}, +{ +"x": 742.6578524113017, +"y": 495.40163018350563, +"smooth": true +}, +{ +"x": 526.5616770713111, +"y": 498.0326309195254, +"smooth": true +}, +{ +"x": 364.15012403606676, +"y": 496.96843224436094, +"type": "cubic" +}, +{ +"x": 316.77616334621706, +"y": 503.82929422391913, +"type": "cubic" +}, +{ +"x": 316.77616334621706, +"y": 540.4279093859258, +"smooth": true +}, +{ +"x": 316.77616334621706, +"y": 574.3794945885809, +"type": "cubic" +}, +{ +"x": 364.4831938505475, +"y": 590.8552462989896, +"type": "cubic" +}, +{ +"x": 508.83417386795116, +"y": 590.8552462989896, +"smooth": true +}, +{ +"x": 677.4707085027021, +"y": 590.8552462989896, +"smooth": true +}, +{ +"x": 857.3662880747501, +"y": 590.8552462989896, +"type": "cubic" +}, +{ +"x": 912.7750543234495, +"y": 571.5683508247506, +"type": "cubic" +}, +{ +"x": 917.5557342633929, +"y": 504.60439440625 +}, +{ +"x": 1126.449554289826, +"y": 505.2781942590461 +}, +{ +"x": 1123.2249815995065, +"y": 720.2089523761747, +"type": "cubic" +}, +{ +"x": 1022.8399531121945, +"y": 786.064525802514, +"type": "cubic" +}, +{ +"x": 667.6364528529135, +"y": 786.064525802514, +"smooth": true +}, +{ +"x": 597.198211706062, +"y": 786.064525802514, +"smooth": true +}, +{ +"x": 201.68512284819445, +"y": 786.064525802514, +"type": "cubic" +}, +{ +"x": 44.93018377500611, +"y": 707.0699919355109, +"type": "cubic" +}, +{ +"x": 44.64141427878289, +"y": 523.9679415533365, +"smooth": true +}, +{ +"x": 44.35264291329887, +"y": 350.36875391846803, +"type": "cubic" +}, +{ +"x": 177.73791674612312, +"y": 288.4542703701833, +"type": "cubic" +}, +{ +"x": 493.0214813402256, +"y": 285.4970694869596, +"smooth": true +}, +{ +"x": 700.7432870811795, +"y": 283.53986860373595, +"smooth": true +}, +{ +"x": 857.5878744918938, +"y": 284.3741242535244, +"type": "cubic" +}, +{ +"x": 911.7105743798166, +"y": 281.0266063297697, +"type": "cubic" +}, +{ +"x": 911.7105743798166, +"y": 240.21944770077536, +"smooth": true +}, +{ +"x": 911.7105743798166, +"y": 203.30000272662124, +"type": "cubic" +}, +{ +"x": 863.9275877319653, +"y": 186.8242510162124, +"type": "cubic" +}, +{ +"x": 700.4067551730499, +"y": 186.8242510162124, +"smooth": true +}, +{ +"x": 538.6577706294643, +"y": 186.8242510162124, +"smooth": true +}, +{ +"x": 405.0727944934302, +"y": 186.8242510162124, +"type": "cubic" +}, +{ +"x": 284.8923939225515, +"y": 195.77026697470342, +"type": "cubic" +}, +{ +"x": 283.92587847309676, +"y": 270.7649319850799 +}, +{ +"x": 41.208379903312974, +"y": 270.7649319850799 +}, +{ +"x": 44.44879907067029, +"y": 71.12223504954079, +"type": "cubic" +}, +{ +"x": 144.601755581203, +"y": -9.347599705592105, +"type": "cubic" +}, +{ +"x": 502.5773791672932, +"y": -9.347599705592105, +"smooth": true +}, +{ +"x": 632.4492271624765, +"y": -9.347599705592105, +"smooth": true +}, +{ +"x": 1059.6521924328742, +"y": -9.347599705592105, +"type": "cubic" +}, +{ +"x": 1192.8934961664945, +"y": 87.4864273219955, +"type": "cubic" +} +], +"isClosed": true +} +] +}, +"xAdvance": 1227 } }, "MutatorSansLightWide/background": { @@ -1946,8 +2177,8 @@ "smooth": true }, { -"x": 244.0, -"y": 28.0, +"x": 244, +"y": 28, "type": "cubic" }, { @@ -1969,8 +2200,8 @@ "type": "cubic" }, { -"x": 211.0, -"y": -8.0, +"x": 211, +"y": -8, "type": "cubic" }, { @@ -2109,456 +2340,225 @@ "xAdvance": 1185 } }, -"MutatorSansBoldWide/foreground": { +"MutatorSansLightWide/foreground": { "glyph": { "path": { "contours": [ { "points": [ { -"x": 1283, -"y": 253, +"x": 1095, +"y": 191, "smooth": true }, { -"x": 1283, -"y": 432, +"x": 1095, +"y": 317, "type": "cubic" }, { -"x": 1188, -"y": 485, +"x": 1015, +"y": 364, "type": "cubic" }, { -"x": 847, -"y": 491, +"x": 721, +"y": 372, "smooth": true }, { -"x": 515, -"y": 497, +"x": 487, +"y": 378, "smooth": true }, { -"x": 429, -"y": 498, -"type": "cubic" -}, -{ -"x": 428, -"y": 502, -"type": "cubic" -}, -{ -"x": 428, -"y": 512, -"smooth": true -}, -{ -"x": 428, -"y": 523, -"type": "cubic" -}, -{ -"x": 442, -"y": 527, -"type": "cubic" -}, -{ -"x": 515, -"y": 527, -"smooth": true -}, -{ -"x": 762, -"y": 527, -"smooth": true -}, -{ -"x": 879.0, -"y": 527.0, -"type": "cubic" -}, -{ -"x": 911, -"y": 520, -"type": "cubic" -}, -{ -"x": 911, -"y": 472 -}, -{ -"x": 1247, -"y": 472 -}, -{ -"x": 1247, -"y": 723, -"type": "cubic" -}, -{ -"x": 1104.0, -"y": 810.0, -"type": "cubic" -}, -{ -"x": 750, -"y": 810, -"smooth": true -}, -{ -"x": 595, -"y": 810, -"smooth": true -}, -{ -"x": 198, -"y": 810, -"type": "cubic" -}, -{ -"x": 36, -"y": 729, -"type": "cubic" -}, -{ -"x": 36, -"y": 529, -"smooth": true -}, -{ -"x": 36, -"y": 364, -"type": "cubic" -}, -{ -"x": 184, -"y": 303, -"type": "cubic" -}, -{ -"x": 504, -"y": 299, -"smooth": true -}, -{ -"x": 831, -"y": 295, -"smooth": true -}, -{ -"x": 901, -"y": 294, -"type": "cubic" -}, -{ -"x": 918, -"y": 289, -"type": "cubic" -}, -{ -"x": 918, -"y": 276, -"smooth": true -}, -{ -"x": 918, -"y": 268, -"type": "cubic" -}, -{ -"x": 903, -"y": 264, -"type": "cubic" -}, -{ -"x": 831, -"y": 264, -"smooth": true -}, -{ -"x": 487, -"y": 264, -"smooth": true -}, -{ -"x": 420, -"y": 264, -"type": "cubic" -}, -{ -"x": 376, -"y": 289, -"type": "cubic" -}, -{ -"x": 376, -"y": 336 -}, -{ -"x": 30, -"y": 336 -}, -{ -"x": 30, -"y": 44, -"type": "cubic" -}, -{ -"x": 203, -"y": -10, -"type": "cubic" -}, -{ -"x": 475, -"y": -10, -"smooth": true -}, -{ -"x": 856, -"y": -10, -"smooth": true -}, -{ -"x": 1195, -"y": -10, -"type": "cubic" -}, -{ -"x": 1283, -"y": 92, -"type": "cubic" -} -], -"isClosed": true -} -] -}, -"xAdvance": 1313 -} -}, -"MutatorSansBoldWide/background": { -"glyph": { -"path": { -"contours": [ -{ -"points": [ -{ -"x": 1180, -"y": 253, -"smooth": true -}, -{ -"x": 1180, -"y": 462, -"type": "cubic" -}, -{ -"x": 1055, -"y": 523, -"type": "cubic" -}, -{ -"x": 714, -"y": 531, -"smooth": true -}, -{ -"x": 509, -"y": 536, -"smooth": true -}, -{ -"x": 373, -"y": 539, +"x": 278, +"y": 383, "type": "cubic" }, { -"x": 362, -"y": 542, +"x": 149, +"y": 412, "type": "cubic" }, { -"x": 362, -"y": 552, -"smooth": true +"x": 149, +"y": 518 }, { -"x": 362, -"y": 563, +"x": 149, +"y": 615, "type": "cubic" }, { -"x": 386, -"y": 567, +"x": 252, +"y": 672, "type": "cubic" }, { -"x": 475, -"y": 567, +"x": 520, +"y": 672, "smooth": true }, { -"x": 679, -"y": 567, +"x": 651, +"y": 672, "smooth": true }, { -"x": 828, -"y": 567, +"x": 906, +"y": 672, "type": "cubic" }, { -"x": 975, -"y": 558, +"x": 997, +"y": 617, "type": "cubic" }, { -"x": 1084, -"y": 548 +"x": 1009, +"y": 479 }, { -"x": 1119, -"y": 780 +"x": 1048, +"y": 479 }, { -"x": 1013, -"y": 793, +"x": 1039, +"y": 633, "type": "cubic" }, { -"x": 831, -"y": 810, +"x": 939, +"y": 708, "type": "cubic" }, { -"x": 734, -"y": 810, +"x": 648, +"y": 708, "smooth": true }, { -"x": 604, -"y": 810, +"x": 520, +"y": 708, "smooth": true }, { -"x": 172, -"y": 810, +"x": 233, +"y": 708, "type": "cubic" }, { -"x": 10, -"y": 729, +"x": 110, +"y": 642, "type": "cubic" }, { -"x": 10, -"y": 529, +"x": 110, +"y": 518, "smooth": true }, { -"x": 10, -"y": 343, +"x": 110, +"y": 401, "type": "cubic" }, { -"x": 158, -"y": 277, +"x": 189, +"y": 349, "type": "cubic" }, { -"x": 478, -"y": 269, +"x": 473, +"y": 342, "smooth": true }, { -"x": 670, -"y": 264, +"x": 707, +"y": 336, "smooth": true }, { -"x": 792, -"y": 261, +"x": 937, +"y": 330, "type": "cubic" }, { -"x": 815, -"y": 259, +"x": 1056, +"y": 310, "type": "cubic" }, { -"x": 815, -"y": 246, +"x": 1056, +"y": 197, "smooth": true }, { -"x": 815, -"y": 238, +"x": 1056, +"y": 85, "type": "cubic" }, { -"x": 790, -"y": 234, +"x": 954, +"y": 28, "type": "cubic" }, { -"x": 701, -"y": 234, +"x": 626, +"y": 28, "smooth": true }, { -"x": 509, -"y": 234, +"x": 535, +"y": 28, "smooth": true }, { -"x": 336, -"y": 234, +"x": 324, +"y": 28, "type": "cubic" }, { -"x": 175, -"y": 242, +"x": 120, +"y": 60, "type": "cubic" }, { -"x": 51, -"y": 255 +"x": 120, +"y": 221 }, { -"x": 16, -"y": 20 +"x": 80, +"y": 221 }, { -"x": 142, -"y": 5, +"x": 84, +"y": 59, "type": "cubic" }, { -"x": 339, -"y": -10, +"x": 229, +"y": -8, "type": "cubic" }, { -"x": 456, -"y": -10, +"x": 538, +"y": -8, "smooth": true }, { -"x": 603, -"y": -10, +"x": 626, +"y": -8, "smooth": true }, { -"x": 1049, -"y": -10, +"x": 973, +"y": -8, "type": "cubic" }, { -"x": 1180, -"y": 92, +"x": 1095, +"y": 64, "type": "cubic" } ], @@ -2566,7 +2566,7 @@ } ] }, -"xAdvance": 1210 +"xAdvance": 1175 } } } diff --git a/tests/data/MutatorSans.fontra/glyphs/S^1.json b/tests/data/MutatorSans.fontra/glyphs/S^1.json index df3681f..3a49ee9 100644 --- a/tests/data/MutatorSans.fontra/glyphs/S^1.json +++ b/tests/data/MutatorSans.fontra/glyphs/S^1.json @@ -5,264 +5,264 @@ "name": "LightCondensed", "layerName": "MutatorSansLightCondensed/foreground", "location": { -"width": 0.0, -"weight": 150.0 +"weight": 150, +"width": 0 } }, { "name": "BoldCondensed", "layerName": "MutatorSansBoldCondensed/foreground", "location": { -"width": 0.0, -"weight": 850.0 +"weight": 850, +"width": 0 } }, { "name": "LightWide", "layerName": "MutatorSansLightWide/foreground", "location": { -"width": 1000.0, -"weight": 150.0 +"weight": 150, +"width": 1000 } }, { "name": "BoldWide", "layerName": "MutatorSansBoldWide/foreground", "location": { -"width": 1000.0, -"weight": 850.0 +"weight": 850, +"width": 1000 } }, { "name": "support.S.wide", "layerName": "MutatorSansLightCondensed/support.S.wide", "location": { -"width": 1000.0, -"weight": 595.0 +"weight": 595, +"width": 1000 } } ], "layers": { -"MutatorSansLightCondensed/foreground": { +"MutatorSansBoldCondensed/foreground": { "glyph": { "path": { "contours": [ { "points": [ { -"x": 349, -"y": 157, +"x": 678, +"y": 253, "smooth": true }, { -"x": 348, -"y": 238, +"x": 678, +"y": 462, "type": "cubic" }, { -"x": 299, -"y": 293, +"x": 568, +"y": 520, "type": "cubic" }, { -"x": 217, -"y": 358, +"x": 421, +"y": 531, "smooth": true }, { -"x": 167, -"y": 398, +"x": 369, +"y": 535, "smooth": true }, { -"x": 105, -"y": 447, +"x": 294, +"y": 541, "type": "cubic" }, { -"x": 84, -"y": 494, +"x": 288, +"y": 542, "type": "cubic" }, { -"x": 84.0, -"y": 546, +"x": 288, +"y": 552, "smooth": true }, { -"x": 84, -"y": 629, +"x": 288, +"y": 563, "type": "cubic" }, { -"x": 128, -"y": 673, +"x": 301, +"y": 567, "type": "cubic" }, { -"x": 211, -"y": 673, +"x": 350, +"y": 567, "smooth": true }, { -"x": 219, -"y": 673, +"x": 402, +"y": 567, "smooth": true }, { -"x": 268, -"y": 673, +"x": 484, +"y": 567, "type": "cubic" }, { -"x": 308, -"y": 664, +"x": 565, +"y": 558, "type": "cubic" }, { -"x": 348, -"y": 640 +"x": 625, +"y": 548 }, { -"x": 365, -"y": 677 +"x": 661, +"y": 780 }, { -"x": 328, -"y": 696, +"x": 598, +"y": 794, "type": "cubic" }, { -"x": 291, -"y": 711, +"x": 490, +"y": 810, "type": "cubic" }, { -"x": 229, -"y": 711, +"x": 432, +"y": 810, "smooth": true }, { -"x": 222, -"y": 711, +"x": 388, +"y": 810, "smooth": true }, { -"x": 104, -"y": 711, +"x": 150, +"y": 810, "type": "cubic" }, { -"x": 46, -"y": 645, +"x": 33, +"y": 705, "type": "cubic" }, { -"x": 46, -"y": 544, +"x": 33, +"y": 529, "smooth": true }, { -"x": 46, -"y": 463, +"x": 33, +"y": 343, "type": "cubic" }, { -"x": 90, -"y": 406, +"x": 158, +"y": 282, "type": "cubic" }, { -"x": 172, -"y": 341, +"x": 291, +"y": 269, "smooth": true }, { -"x": 222, -"y": 301, +"x": 342, +"y": 264, "smooth": true }, { -"x": 293, -"y": 244, +"x": 409, +"y": 257, "type": "cubic" }, { -"x": 311.0, -"y": 208, +"x": 422, +"y": 259, "type": "cubic" }, { -"x": 311, -"y": 144, +"x": 422, +"y": 246, "smooth": true }, { -"x": 311.0, -"y": 82.0, +"x": 422, +"y": 238, "type": "cubic" }, { -"x": 267, -"y": 28, +"x": 408, +"y": 234, "type": "cubic" }, { -"x": 184, -"y": 28, +"x": 359, +"y": 234, "smooth": true }, { -"x": 176, -"y": 28, +"x": 308, +"y": 234, "smooth": true }, { -"x": 123, -"y": 28, +"x": 213, +"y": 234, "type": "cubic" }, { -"x": 80, -"y": 38, +"x": 124, +"y": 242, "type": "cubic" }, { -"x": 37, -"y": 64 +"x": 56, +"y": 255 }, { "x": 20, -"y": 27 +"y": 20 }, { -"x": 60, -"y": 7, +"x": 91, +"y": 5, "type": "cubic" }, { -"x": 99, +"x": 213, "y": -10, "type": "cubic" }, { -"x": 166, +"x": 279, "y": -10, "smooth": true }, { -"x": 173, +"x": 323, "y": -10, "smooth": true }, { -"x": 291, +"x": 605, "y": -10, "type": "cubic" }, { -"x": 350, -"y": 62, +"x": 678, +"y": 110, "type": "cubic" } ], @@ -270,229 +270,229 @@ } ] }, -"xAdvance": 393 +"xAdvance": 698 } }, -"MutatorSansLightCondensed/support": { +"MutatorSansBoldWide/background": { "glyph": { "path": { "contours": [ { "points": [ { -"x": 728, -"y": 234, +"x": 1283, +"y": 253, "smooth": true }, { -"x": 728, -"y": 419, +"x": 1283, +"y": 464, "type": "cubic" }, { -"x": 627, -"y": 472, +"x": 1158, +"y": 526, "type": "cubic" }, { -"x": 450, -"y": 497, +"x": 817, +"y": 533, "smooth": true }, { -"x": 365, -"y": 509, +"x": 556, +"y": 538, "smooth": true }, { -"x": 279, -"y": 521, +"x": 420, +"y": 541, "type": "cubic" }, { -"x": 268, -"y": 532, +"x": 409, +"y": 543, "type": "cubic" }, { -"x": 268, -"y": 553, +"x": 409, +"y": 552, "smooth": true }, { -"x": 268, -"y": 574, +"x": 409, +"y": 563, "type": "cubic" }, { -"x": 290, -"y": 588, +"x": 433, +"y": 567, "type": "cubic" }, { -"x": 356, -"y": 588, +"x": 522, +"y": 567, "smooth": true }, { -"x": 431, -"y": 588, +"x": 712, +"y": 567, "smooth": true }, { -"x": 522, -"y": 588, +"x": 861, +"y": 567, "type": "cubic" }, { -"x": 609, -"y": 579, +"x": 901, +"y": 557, "type": "cubic" }, { -"x": 676, -"y": 566 +"x": 901, +"y": 492 }, { -"x": 708, -"y": 759 +"x": 1232, +"y": 493 }, { -"x": 641, -"y": 774, +"x": 1211, +"y": 710, "type": "cubic" }, { -"x": 530, -"y": 790, +"x": 1044, +"y": 810, "type": "cubic" }, { -"x": 462, -"y": 790, +"x": 700, +"y": 810, "smooth": true }, { -"x": 407, -"y": 790, +"x": 536, +"y": 810, "smooth": true }, { -"x": 151, -"y": 790, +"x": 222, +"y": 810, "type": "cubic" }, { -"x": 35, -"y": 697, +"x": 47, +"y": 729, "type": "cubic" }, { -"x": 36, -"y": 532, +"x": 47, +"y": 529, "smooth": true }, { -"x": 36, -"y": 366, +"x": 47, +"y": 342, "type": "cubic" }, { -"x": 150, -"y": 305, +"x": 188, +"y": 273, "type": "cubic" }, { -"x": 314, -"y": 283, +"x": 491, +"y": 268, "smooth": true }, { -"x": 395, -"y": 272, +"x": 773, +"y": 263, "smooth": true }, { -"x": 476, +"x": 895, "y": 261, "type": "cubic" }, { -"x": 492, -"y": 250, +"x": 918, +"y": 258, "type": "cubic" }, { -"x": 492, -"y": 226, +"x": 918, +"y": 246, "smooth": true }, { -"x": 492, -"y": 207, +"x": 918, +"y": 238, "type": "cubic" }, { -"x": 469, -"y": 193, +"x": 893, +"y": 234, "type": "cubic" }, { -"x": 404, -"y": 193, +"x": 804, +"y": 234, "smooth": true }, { -"x": 331, -"y": 193, +"x": 532, +"y": 234, "smooth": true }, { -"x": 227, -"y": 193, +"x": 439, +"y": 234, "type": "cubic" }, { -"x": 131, -"y": 202, +"x": 366, +"y": 240, "type": "cubic" }, { -"x": 56, -"y": 218 +"x": 366, +"y": 297 }, { -"x": 24, -"y": 22 +"x": 30, +"y": 297 }, { -"x": 101, -"y": 5, +"x": 30, +"y": 77, "type": "cubic" }, { -"x": 223, -"y": -10.0, +"x": 165, +"y": -10, "type": "cubic" }, { -"x": 301, -"y": -10.0, +"x": 534, +"y": -10, "smooth": true }, { -"x": 360, -"y": -10.0, +"x": 747, +"y": -10, "smooth": true }, { -"x": 645, -"y": -10.0, +"x": 1152, +"y": -10, "type": "cubic" }, { -"x": 728, -"y": 97, +"x": 1283, +"y": 92, "type": "cubic" } ], @@ -500,229 +500,229 @@ } ] }, -"xAdvance": 752 +"xAdvance": 1313 } }, -"MutatorSansLightCondensed/background": { +"MutatorSansBoldWide/foreground": { "glyph": { "path": { "contours": [ { "points": [ { -"x": 1194.0, -"y": 247.60000000000005, +"x": 1190, +"y": 253, "smooth": true }, { -"x": 1194.0, -"y": 444.6, +"x": 1190, +"y": 462, "type": "cubic" }, { -"x": 1073.8000000000002, -"y": 523.6, +"x": 1065, +"y": 523, "type": "cubic" }, { -"x": 736.3999999999999, -"y": 528.6, +"x": 697, +"y": 532, "smooth": true }, { -"x": 535.6, -"y": 531.8, +"x": 519, +"y": 536, "smooth": true }, { -"x": 385.1973977602231, -"y": 533.9697232549472, +"x": 383, +"y": 539, "type": "cubic" }, { -"x": 358.0, -"y": 537.1999999999999, +"x": 372, +"y": 542, "type": "cubic" }, { -"x": 358.0, -"y": 555.0, +"x": 372, +"y": 552, "smooth": true }, { -"x": 358.0, -"y": 575.0, +"x": 372, +"y": 563, "type": "cubic" }, { -"x": 396.99999999999994, -"y": 580.2, +"x": 396, +"y": 567, "type": "cubic" }, { -"x": 510.00000000000006, -"y": 580.2, +"x": 485, +"y": 567, "smooth": true }, { -"x": 716.1999999999999, -"y": 580.2, +"x": 689, +"y": 567, "smooth": true }, { -"x": 842.4000000000001, -"y": 580.2, +"x": 838, +"y": 567, "type": "cubic" }, { -"x": 879.9999999999999, -"y": 569.5999999999999, +"x": 985, +"y": 558, "type": "cubic" }, { -"x": 879.9999999999998, -"y": 528.2 +"x": 1094, +"y": 548 }, { -"x": 1144.0000000000002, -"y": 528.6 +"x": 1129, +"y": 780 }, { -"x": 1144.0, -"y": 731.1565217391305, +"x": 1023, +"y": 793, "type": "cubic" }, { -"x": 1052.4, -"y": 797.4000000000001, +"x": 841, +"y": 810, "type": "cubic" }, { -"x": 684.4000000000001, -"y": 797.4000000000001, +"x": 744, +"y": 810, "smooth": true }, { -"x": 578.4000000000001, -"y": 797.4000000000001, +"x": 614, +"y": 810, "smooth": true }, { -"x": 202.19999999999996, -"y": 797.4000000000001, +"x": 182, +"y": 810, "type": "cubic" }, { -"x": 48.6, -"y": 717.6, +"x": 20, +"y": 729, "type": "cubic" }, { -"x": 48.600000000000016, -"y": 526.0, +"x": 20, +"y": 529, "smooth": true }, { -"x": 48.60000000000001, -"y": 340.59999999999997, +"x": 20, +"y": 343, "type": "cubic" }, { -"x": 184.60000000000002, -"y": 263.2, +"x": 168, +"y": 277, "type": "cubic" }, { -"x": 502.80000000000007, -"y": 258.8, +"x": 488, +"y": 269, "smooth": true }, { -"x": 692.4, -"y": 256.2, +"x": 680, +"y": 264, "smooth": true }, { -"x": 833.6, -"y": 254.39999999999998, +"x": 802, +"y": 261, "type": "cubic" }, { -"x": 874.0000000000002, -"y": 254.2, +"x": 825, +"y": 259, "type": "cubic" }, { -"x": 874.0000000000002, -"y": 234.0, +"x": 825, +"y": 246, "smooth": true }, { -"x": 874.0000000000002, -"y": 216.33333333333331, +"x": 825, +"y": 238, "type": "cubic" }, { -"x": 832.8, -"y": 208.2, +"x": 800, +"y": 234, "type": "cubic" }, { -"x": 703.0, -"y": 208.2, +"x": 711, +"y": 234, "smooth": true }, { -"x": 538.6, -"y": 208.2, +"x": 519, +"y": 234, "smooth": true }, { -"x": 406.69876543209875, -"y": 208.2, +"x": 346, +"y": 234, "type": "cubic" }, { -"x": 330.9999876850477, -"y": 211.40076352704025, +"x": 185, +"y": 242, "type": "cubic" }, { -"x": 330.4, -"y": 267.4 +"x": 61, +"y": 255 }, { -"x": 46.000000000000014, -"y": 267.4 +"x": 26, +"y": 20 }, { -"x": 47.8, -"y": 61.99999999999999, +"x": 152, +"y": 5, "type": "cubic" }, { -"x": 134.8, -"y": -9.399999999999999, +"x": 349, +"y": -10, "type": "cubic" }, { -"x": 494.6000000000001, -"y": -9.399999999999999, +"x": 466, +"y": -10, "smooth": true }, { -"x": 621.8, -"y": -9.399999999999999, +"x": 613, +"y": -10, "smooth": true }, { -"x": 1058.1999999999998, -"y": -9.399999999999999, +"x": 1059, +"y": -10, "type": "cubic" }, { -"x": 1194.6000000000001, -"y": 89.6, +"x": 1190, +"y": 92, "type": "cubic" } ], @@ -730,229 +730,229 @@ } ] }, -"xAdvance": 500 +"xAdvance": 1210 } }, -"MutatorSansLightCondensed/support.S.wide": { +"MutatorSansLightCondensed/background": { "glyph": { "path": { "contours": [ { "points": [ { -"x": 1219.8299899343037, -"y": 252.6498416872039, +"x": 1194, +"y": 247.60000000000005, "smooth": true }, { -"x": 1219.981600932759, -"y": 461.10283052732257, +"x": 1194, +"y": 444.6, "type": "cubic" }, { -"x": 1096.5513403076734, -"y": 518.7112598673356, +"x": 1073.8000000000002, +"y": 523.6, "type": "cubic" }, { -"x": 756.9954361456862, -"y": 519.0050664076766, +"x": 736.3999999999999, +"y": 528.6, "smooth": true }, { -"x": 559.144621231021, -"y": 518.7874706917509, +"x": 535.6, +"y": 531.8, "smooth": true }, { -"x": 403.62446157355896, -"y": 516.2297986720174, +"x": 385.1973977602231, +"y": 533.9697232549472, "type": "cubic" }, { -"x": 364.12739730756726, -"y": 518.0252982261093, +"x": 358, +"y": 537.1999999999999, "type": "cubic" }, { -"x": 364.12739730756726, -"y": 543.0683372401004, +"x": 358, +"y": 555, "smooth": true }, { -"x": 364.12739730756726, -"y": 567.0105959664069, +"x": 358, +"y": 575, "type": "cubic" }, { -"x": 404.8230766883552, -"y": 576.1712581520039, +"x": 396.99999999999994, +"y": 580.2, "type": "cubic" }, { -"x": 531.6999436351347, -"y": 576.1712581520039, +"x": 510.00000000000006, +"y": 580.2, "smooth": true }, { -"x": 700.7815880436639, -"y": 576.1712581520039, +"x": 716.1999999999999, +"y": 580.2, "smooth": true }, { -"x": 869.4491649287147, -"y": 576.1712581520039, +"x": 842.4000000000001, +"y": 580.2, "type": "cubic" }, { -"x": 1019.7804131238614, -"y": 558.9976503843801, +"x": 879.9999999999999, +"y": 569.5999999999999, "type": "cubic" }, { -"x": 1130.3702317222073, -"y": 540.5425943105333 +"x": 879.9999999999998, +"y": 528.2 }, { -"x": 1165.1256377228813, -"y": 754.2670935458425 +"x": 1144.0000000000002, +"y": 528.6 }, { -"x": 1053.7413503922903, -"y": 777.3270488342453, +"x": 1144, +"y": 731.1565217391305, "type": "cubic" }, { -"x": 866.2657745280842, -"y": 800.4886655441884, +"x": 1052.4, +"y": 797.4000000000001, "type": "cubic" }, { -"x": 744.8705947621146, -"y": 800.4886655441884, +"x": 684.4000000000001, +"y": 797.4000000000001, "smooth": true }, { -"x": 633.7818111221454, -"y": 800.4886655441884, +"x": 578.4000000000001, +"y": 797.4000000000001, "smooth": true }, { -"x": 218.44652443415816, -"y": 800.4886655441884, +"x": 202.19999999999996, +"y": 797.4000000000001, "type": "cubic" }, { -"x": 54.62469314908569, -"y": 718.0915060220615, +"x": 48.6, +"y": 717.6, "type": "cubic" }, { -"x": 54.473082150630546, -"y": 524.081432510118, +"x": 48.600000000000016, +"y": 526, "smooth": true }, { -"x": 54.321471152175405, -"y": 338.7498934360344, +"x": 48.60000000000001, +"y": 340.59999999999997, "type": "cubic" }, { -"x": 200.5699595463858, -"y": 276.2302533260257, +"x": 184.60000000000002, +"y": 263.2, "type": "cubic" }, { -"x": 519.6477122430556, -"y": 275.6332247887744, +"x": 502.80000000000007, +"y": 258.8, "smooth": true }, { -"x": 707.4721191292393, -"y": 275.6992095062451, +"x": 692.4, +"y": 256.2, "smooth": true }, { -"x": 854.8288998090472, -"y": 279.0777582867049, +"x": 833.6, +"y": 254.39999999999998, "type": "cubic" }, { -"x": 900.1492667488855, -"y": 279.1441835711034, +"x": 874.0000000000002, +"y": 254.2, "type": "cubic" }, { -"x": 900.1492667488855, -"y": 249.6847106479086, +"x": 874.0000000000002, +"y": 234, "smooth": true }, { -"x": 900.1492667488855, -"y": 224.87008080469627, +"x": 874.0000000000002, +"y": 216.33333333333331, "type": "cubic" }, { -"x": 856.3787745419663, -"y": 215.709418619099, +"x": 832.8, +"y": 208.2, "type": "cubic" }, { -"x": 715.0778938876156, -"y": 215.709418619099, +"x": 703, +"y": 208.2, "smooth": true }, { -"x": 555.2630577360271, -"y": 215.709418619099, +"x": 538.6, +"y": 208.2, "smooth": true }, { -"x": 374.9032376315703, -"y": 215.709418619099, +"x": 406.69876543209875, +"y": 208.2, "type": "cubic" }, { -"x": 211.95453220425938, -"y": 231.58161912103742, +"x": 330.9999876850477, +"y": 211.40076352704025, "type": "cubic" }, { -"x": 88.5450229066787, -"y": 252.70567100519554 +"x": 330.4, +"y": 267.4 }, { -"x": 54.991618048302286, -"y": 36.247539459899585 +"x": 46.000000000000014, +"y": 267.4 }, { -"x": 183.06013811030292, -"y": 11.503270052203188, +"x": 47.8, +"y": 61.99999999999999, "type": "cubic" }, { -"x": 383.9095739293909, -"y": -9.519199543080955, +"x": 134.8, +"y": -9.399999999999999, "type": "cubic" }, { -"x": 512.8448615591127, -"y": -9.519199543080955, +"x": 494.6000000000001, +"y": -9.399999999999999, "smooth": true }, { -"x": 636.84684131527, -"y": -9.519199543080955, +"x": 621.8, +"y": -9.399999999999999, "smooth": true }, { -"x": 1083.9114224444215, -"y": -9.519199543080955, +"x": 1058.1999999999998, +"y": -9.399999999999999, "type": "cubic" }, { -"x": 1219.6783789358487, -"y": 92.5461215289805, +"x": 1194.6000000000001, +"y": 89.6, "type": "cubic" } ], @@ -960,229 +960,229 @@ } ] }, -"xAdvance": 1265 +"xAdvance": 500 } }, -"MutatorSansBoldCondensed/foreground": { +"MutatorSansLightCondensed/foreground": { "glyph": { "path": { "contours": [ { "points": [ { -"x": 678, -"y": 253, +"x": 349, +"y": 157, "smooth": true }, { -"x": 678, -"y": 462, +"x": 348, +"y": 238, "type": "cubic" }, { -"x": 568, -"y": 520, +"x": 299, +"y": 293, "type": "cubic" }, { -"x": 421, -"y": 531, +"x": 217, +"y": 358, "smooth": true }, { -"x": 369, -"y": 535, +"x": 167, +"y": 398, "smooth": true }, { -"x": 294, -"y": 541, +"x": 105, +"y": 447, "type": "cubic" }, { -"x": 288, -"y": 542, +"x": 84, +"y": 494, "type": "cubic" }, { -"x": 288, -"y": 552, +"x": 84, +"y": 546, "smooth": true }, { -"x": 288, -"y": 563, +"x": 84, +"y": 629, "type": "cubic" }, { -"x": 301, -"y": 567, +"x": 128, +"y": 673, "type": "cubic" }, { -"x": 350, -"y": 567, +"x": 211, +"y": 673, "smooth": true }, { -"x": 402, -"y": 567, +"x": 219, +"y": 673, "smooth": true }, { -"x": 484, -"y": 567, +"x": 268, +"y": 673, "type": "cubic" }, { -"x": 565, -"y": 558, +"x": 308, +"y": 664, "type": "cubic" }, { -"x": 625, -"y": 548 +"x": 348, +"y": 640 }, { -"x": 661, -"y": 780 +"x": 365, +"y": 677 }, { -"x": 598, -"y": 794, +"x": 328, +"y": 696, "type": "cubic" }, { -"x": 490, -"y": 810, +"x": 291, +"y": 711, "type": "cubic" }, { -"x": 432, -"y": 810, +"x": 229, +"y": 711, "smooth": true }, { -"x": 388, -"y": 810, +"x": 222, +"y": 711, "smooth": true }, { -"x": 150, -"y": 810, +"x": 104, +"y": 711, "type": "cubic" }, { -"x": 33, -"y": 705, +"x": 46, +"y": 645, "type": "cubic" }, { -"x": 33, -"y": 529, +"x": 46, +"y": 544, "smooth": true }, { -"x": 33, -"y": 343, +"x": 46, +"y": 463, "type": "cubic" }, { -"x": 158, -"y": 282, +"x": 90, +"y": 406, "type": "cubic" }, { -"x": 291, -"y": 269, +"x": 172, +"y": 341, "smooth": true }, { -"x": 342, -"y": 264, +"x": 222, +"y": 301, "smooth": true }, { -"x": 409, -"y": 257, +"x": 293, +"y": 244, "type": "cubic" }, { -"x": 422, -"y": 259, +"x": 311, +"y": 208, "type": "cubic" }, { -"x": 422, -"y": 246, +"x": 311, +"y": 144, "smooth": true }, { -"x": 422, -"y": 238, +"x": 311, +"y": 82, "type": "cubic" }, { -"x": 408, -"y": 234, +"x": 267, +"y": 28, "type": "cubic" }, { -"x": 359, -"y": 234, +"x": 184, +"y": 28, "smooth": true }, { -"x": 308, -"y": 234, +"x": 176, +"y": 28, "smooth": true }, { -"x": 213, -"y": 234, +"x": 123, +"y": 28, "type": "cubic" }, { -"x": 124, -"y": 242, +"x": 80, +"y": 38, "type": "cubic" }, { -"x": 56, -"y": 255 +"x": 37, +"y": 64 }, { "x": 20, -"y": 20 +"y": 27 }, { -"x": 91, -"y": 5, +"x": 60, +"y": 7, "type": "cubic" }, { -"x": 213, +"x": 99, "y": -10, "type": "cubic" }, { -"x": 279, +"x": 166, "y": -10, "smooth": true }, { -"x": 323, +"x": 173, "y": -10, "smooth": true }, { -"x": 605, +"x": 291, "y": -10, "type": "cubic" }, { -"x": 678, -"y": 110, +"x": 350, +"y": 62, "type": "cubic" } ], @@ -1190,228 +1190,229 @@ } ] }, -"xAdvance": 698 +"xAdvance": 393 } }, -"MutatorSansLightWide/foreground": { +"MutatorSansLightCondensed/support": { "glyph": { "path": { "contours": [ { "points": [ { -"x": 1080, -"y": 191, +"x": 728, +"y": 234, "smooth": true }, { -"x": 1080, -"y": 317, +"x": 728, +"y": 419, "type": "cubic" }, { -"x": 1000, -"y": 364, +"x": 627, +"y": 472, "type": "cubic" }, { -"x": 706, -"y": 372, +"x": 450, +"y": 497, "smooth": true }, { -"x": 492, -"y": 378, +"x": 365, +"y": 509, "smooth": true }, { -"x": 283, -"y": 384, +"x": 279, +"y": 521, "type": "cubic" }, { -"x": 144, -"y": 412, +"x": 268, +"y": 532, "type": "cubic" }, { -"x": 144, -"y": 518 +"x": 268, +"y": 553, +"smooth": true }, { -"x": 144, -"y": 615, +"x": 268, +"y": 574, "type": "cubic" }, { -"x": 257, -"y": 672, +"x": 290, +"y": 588, "type": "cubic" }, { -"x": 525, -"y": 672, +"x": 356, +"y": 588, "smooth": true }, { -"x": 596, -"y": 672, +"x": 431, +"y": 588, "smooth": true }, { -"x": 806, -"y": 672, +"x": 522, +"y": 588, "type": "cubic" }, { -"x": 941, -"y": 629, +"x": 609, +"y": 579, "type": "cubic" }, { -"x": 1044, -"y": 575 +"x": 676, +"y": 566 }, { -"x": 1066, -"y": 608 +"x": 708, +"y": 759 }, { -"x": 954, -"y": 666, +"x": 641, +"y": 774, "type": "cubic" }, { -"x": 794, -"y": 708, +"x": 530, +"y": 790, "type": "cubic" }, { -"x": 593, -"y": 708, +"x": 462, +"y": 790, "smooth": true }, { -"x": 525, -"y": 708, +"x": 407, +"y": 790, "smooth": true }, { -"x": 238, -"y": 708, +"x": 151, +"y": 790, "type": "cubic" }, { -"x": 105, -"y": 642, +"x": 35, +"y": 697, "type": "cubic" }, { -"x": 105, -"y": 518, +"x": 36, +"y": 532, "smooth": true }, { -"x": 105, -"y": 401, +"x": 36, +"y": 366, "type": "cubic" }, { -"x": 194, -"y": 350, +"x": 150, +"y": 305, "type": "cubic" }, { -"x": 478, -"y": 342, +"x": 314, +"y": 283, "smooth": true }, { -"x": 692, -"y": 336, +"x": 395, +"y": 272, "smooth": true }, { -"x": 922, -"y": 330, +"x": 476, +"y": 261, "type": "cubic" }, { -"x": 1041, -"y": 310, +"x": 492, +"y": 250, "type": "cubic" }, { -"x": 1041, -"y": 197, +"x": 492, +"y": 226, "smooth": true }, { -"x": 1041, -"y": 85, +"x": 492, +"y": 207, "type": "cubic" }, { -"x": 919, -"y": 28, +"x": 469, +"y": 193, "type": "cubic" }, { -"x": 591, -"y": 28, +"x": 404, +"y": 193, "smooth": true }, { -"x": 520, -"y": 28, +"x": 331, +"y": 193, "smooth": true }, { -"x": 343, -"y": 28, +"x": 227, +"y": 193, "type": "cubic" }, { -"x": 203, -"y": 70, +"x": 131, +"y": 202, "type": "cubic" }, { -"x": 97, -"y": 125 +"x": 56, +"y": 218 }, { -"x": 80, -"y": 92 +"x": 24, +"y": 22 }, { -"x": 195, -"y": 33, +"x": 101, +"y": 5, "type": "cubic" }, { -"x": 356, -"y": -8, +"x": 223, +"y": -10, "type": "cubic" }, { -"x": 523, -"y": -8, +"x": 301, +"y": -10, "smooth": true }, { -"x": 591, -"y": -8, +"x": 360, +"y": -10, "smooth": true }, { -"x": 938, -"y": -8, +"x": 645, +"y": -10, "type": "cubic" }, { -"x": 1080, -"y": 64, +"x": 728, +"y": 97, "type": "cubic" } ], @@ -1419,229 +1420,229 @@ } ] }, -"xAdvance": 1160 +"xAdvance": 752 } }, -"MutatorSansBoldWide/foreground": { +"MutatorSansLightCondensed/support.S.wide": { "glyph": { "path": { "contours": [ { "points": [ { -"x": 1190, -"y": 253, +"x": 1219.8299899343037, +"y": 252.6498416872039, "smooth": true }, { -"x": 1190, -"y": 462, +"x": 1219.981600932759, +"y": 461.10283052732257, "type": "cubic" }, { -"x": 1065, -"y": 523, +"x": 1096.5513403076734, +"y": 518.7112598673356, "type": "cubic" }, { -"x": 697, -"y": 532, +"x": 756.9954361456862, +"y": 519.0050664076766, "smooth": true }, { -"x": 519, -"y": 536, +"x": 559.144621231021, +"y": 518.7874706917509, "smooth": true }, { -"x": 383, -"y": 539, +"x": 403.62446157355896, +"y": 516.2297986720174, "type": "cubic" }, { -"x": 372, -"y": 542, +"x": 364.12739730756726, +"y": 518.0252982261093, "type": "cubic" }, { -"x": 372, -"y": 552, +"x": 364.12739730756726, +"y": 543.0683372401004, "smooth": true }, { -"x": 372, -"y": 563, +"x": 364.12739730756726, +"y": 567.0105959664069, "type": "cubic" }, { -"x": 396, -"y": 567, +"x": 404.8230766883552, +"y": 576.1712581520039, "type": "cubic" }, { -"x": 485, -"y": 567, +"x": 531.6999436351347, +"y": 576.1712581520039, "smooth": true }, { -"x": 689, -"y": 567, +"x": 700.7815880436639, +"y": 576.1712581520039, "smooth": true }, { -"x": 838, -"y": 567, +"x": 869.4491649287147, +"y": 576.1712581520039, "type": "cubic" }, { -"x": 985, -"y": 558, +"x": 1019.7804131238614, +"y": 558.9976503843801, "type": "cubic" }, { -"x": 1094, -"y": 548 +"x": 1130.3702317222073, +"y": 540.5425943105333 }, { -"x": 1129, -"y": 780 +"x": 1165.1256377228813, +"y": 754.2670935458425 }, { -"x": 1023, -"y": 793, +"x": 1053.7413503922903, +"y": 777.3270488342453, "type": "cubic" }, { -"x": 841, -"y": 810, +"x": 866.2657745280842, +"y": 800.4886655441884, "type": "cubic" }, { -"x": 744, -"y": 810, +"x": 744.8705947621146, +"y": 800.4886655441884, "smooth": true }, { -"x": 614, -"y": 810, +"x": 633.7818111221454, +"y": 800.4886655441884, "smooth": true }, { -"x": 182, -"y": 810, +"x": 218.44652443415816, +"y": 800.4886655441884, "type": "cubic" }, { -"x": 20, -"y": 729, +"x": 54.62469314908569, +"y": 718.0915060220615, "type": "cubic" }, { -"x": 20, -"y": 529, +"x": 54.473082150630546, +"y": 524.081432510118, "smooth": true }, { -"x": 20, -"y": 343, +"x": 54.321471152175405, +"y": 338.7498934360344, "type": "cubic" }, { -"x": 168, -"y": 277, +"x": 200.5699595463858, +"y": 276.2302533260257, "type": "cubic" }, { -"x": 488, -"y": 269, +"x": 519.6477122430556, +"y": 275.6332247887744, "smooth": true }, { -"x": 680, -"y": 264, +"x": 707.4721191292393, +"y": 275.6992095062451, "smooth": true }, { -"x": 802, -"y": 261, +"x": 854.8288998090472, +"y": 279.0777582867049, "type": "cubic" }, { -"x": 825, -"y": 259, +"x": 900.1492667488855, +"y": 279.1441835711034, "type": "cubic" }, { -"x": 825, -"y": 246, +"x": 900.1492667488855, +"y": 249.6847106479086, "smooth": true }, { -"x": 825, -"y": 238, +"x": 900.1492667488855, +"y": 224.87008080469627, "type": "cubic" }, { -"x": 800, -"y": 234, +"x": 856.3787745419663, +"y": 215.709418619099, "type": "cubic" }, { -"x": 711, -"y": 234, +"x": 715.0778938876156, +"y": 215.709418619099, "smooth": true }, { -"x": 519, -"y": 234, +"x": 555.2630577360271, +"y": 215.709418619099, "smooth": true }, { -"x": 346, -"y": 234, +"x": 374.9032376315703, +"y": 215.709418619099, "type": "cubic" }, { -"x": 185, -"y": 242, +"x": 211.95453220425938, +"y": 231.58161912103742, "type": "cubic" }, { -"x": 61, -"y": 255 +"x": 88.5450229066787, +"y": 252.70567100519554 }, { -"x": 26, -"y": 20 +"x": 54.991618048302286, +"y": 36.247539459899585 }, { -"x": 152, -"y": 5, +"x": 183.06013811030292, +"y": 11.503270052203188, "type": "cubic" }, { -"x": 349, -"y": -10, +"x": 383.9095739293909, +"y": -9.519199543080955, "type": "cubic" }, { -"x": 466, -"y": -10, +"x": 512.8448615591127, +"y": -9.519199543080955, "smooth": true }, { -"x": 613, -"y": -10, +"x": 636.84684131527, +"y": -9.519199543080955, "smooth": true }, { -"x": 1059, -"y": -10, +"x": 1083.9114224444215, +"y": -9.519199543080955, "type": "cubic" }, { -"x": 1190, -"y": 92, +"x": 1219.6783789358487, +"y": 92.5461215289805, "type": "cubic" } ], @@ -1649,229 +1650,228 @@ } ] }, -"xAdvance": 1210 +"xAdvance": 1265 } }, -"MutatorSansBoldWide/background": { +"MutatorSansLightWide/foreground": { "glyph": { "path": { "contours": [ { "points": [ { -"x": 1283, -"y": 253, +"x": 1080, +"y": 191, "smooth": true }, { -"x": 1283, -"y": 464, +"x": 1080, +"y": 317, "type": "cubic" }, { -"x": 1158, -"y": 526, +"x": 1000, +"y": 364, "type": "cubic" }, { -"x": 817, -"y": 533, +"x": 706, +"y": 372, "smooth": true }, { -"x": 556, -"y": 538, +"x": 492, +"y": 378, "smooth": true }, { -"x": 420, -"y": 541, +"x": 283, +"y": 384, "type": "cubic" }, { -"x": 409, -"y": 543, +"x": 144, +"y": 412, "type": "cubic" }, { -"x": 409, -"y": 552, -"smooth": true +"x": 144, +"y": 518 }, { -"x": 409, -"y": 563, +"x": 144, +"y": 615, "type": "cubic" }, { -"x": 433, -"y": 567, +"x": 257, +"y": 672, "type": "cubic" }, { -"x": 522, -"y": 567, +"x": 525, +"y": 672, "smooth": true }, { -"x": 712, -"y": 567, +"x": 596, +"y": 672, "smooth": true }, { -"x": 861, -"y": 567, +"x": 806, +"y": 672, "type": "cubic" }, { -"x": 901, -"y": 557, +"x": 941, +"y": 629, "type": "cubic" }, { -"x": 901, -"y": 492 +"x": 1044, +"y": 575 }, { -"x": 1232, -"y": 493 +"x": 1066, +"y": 608 }, { -"x": 1211, -"y": 710, +"x": 954, +"y": 666, "type": "cubic" }, { -"x": 1044, -"y": 810, +"x": 794, +"y": 708, "type": "cubic" }, { -"x": 700, -"y": 810, +"x": 593, +"y": 708, "smooth": true }, { -"x": 536, -"y": 810, +"x": 525, +"y": 708, "smooth": true }, { -"x": 222, -"y": 810, +"x": 238, +"y": 708, "type": "cubic" }, { -"x": 47, -"y": 729, +"x": 105, +"y": 642, "type": "cubic" }, { -"x": 47, -"y": 529, +"x": 105, +"y": 518, "smooth": true }, { -"x": 47, -"y": 342, +"x": 105, +"y": 401, "type": "cubic" }, { -"x": 188, -"y": 273, +"x": 194, +"y": 350, "type": "cubic" }, { -"x": 491, -"y": 268, +"x": 478, +"y": 342, "smooth": true }, { -"x": 773, -"y": 263, +"x": 692, +"y": 336, "smooth": true }, { -"x": 895, -"y": 261, +"x": 922, +"y": 330, "type": "cubic" }, { -"x": 918, -"y": 258, +"x": 1041, +"y": 310, "type": "cubic" }, { -"x": 918, -"y": 246, +"x": 1041, +"y": 197, "smooth": true }, { -"x": 918, -"y": 238, +"x": 1041, +"y": 85, "type": "cubic" }, { -"x": 893, -"y": 234, +"x": 919, +"y": 28, "type": "cubic" }, { -"x": 804, -"y": 234, +"x": 591, +"y": 28, "smooth": true }, { -"x": 532, -"y": 234, +"x": 520, +"y": 28, "smooth": true }, { -"x": 439, -"y": 234, +"x": 343, +"y": 28, "type": "cubic" }, { -"x": 366, -"y": 240, +"x": 203, +"y": 70, "type": "cubic" }, { -"x": 366, -"y": 297 +"x": 97, +"y": 125 }, { -"x": 30, -"y": 297 +"x": 80, +"y": 92 }, { -"x": 30, -"y": 77, +"x": 195, +"y": 33, "type": "cubic" }, { -"x": 165, -"y": -10, +"x": 356, +"y": -8, "type": "cubic" }, { -"x": 534, -"y": -10, +"x": 523, +"y": -8, "smooth": true }, { -"x": 747, -"y": -10, +"x": 591, +"y": -8, "smooth": true }, { -"x": 1152, -"y": -10, +"x": 938, +"y": -8, "type": "cubic" }, { -"x": 1283, -"y": 92, +"x": 1080, +"y": 64, "type": "cubic" } ], @@ -1879,7 +1879,7 @@ } ] }, -"xAdvance": 1313 +"xAdvance": 1160 } } } diff --git a/tests/data/MutatorSans.fontra/glyphs/T^1.json b/tests/data/MutatorSans.fontra/glyphs/T^1.json index 241272a..69cede1 100644 --- a/tests/data/MutatorSans.fontra/glyphs/T^1.json +++ b/tests/data/MutatorSans.fontra/glyphs/T^1.json @@ -5,57 +5,57 @@ "name": "LightCondensed", "layerName": "MutatorSansLightCondensed/foreground", "location": { -"width": 0.0, -"weight": 150.0 +"weight": 150, +"width": 0 } }, { "name": "BoldCondensed", "layerName": "MutatorSansBoldCondensed/foreground", "location": { -"width": 0.0, -"weight": 850.0 +"weight": 850, +"width": 0 } }, { "name": "LightWide", "layerName": "MutatorSansLightWide/foreground", "location": { -"width": 1000.0, -"weight": 150.0 +"weight": 150, +"width": 1000 } }, { "name": "BoldWide", "layerName": "MutatorSansBoldWide/foreground", "location": { -"width": 1000.0, -"weight": 850.0 +"weight": 850, +"width": 1000 } } ], "layers": { -"MutatorSansLightCondensed/foreground": { +"MutatorSansBoldCondensed/foreground": { "glyph": { "path": { "contours": [ { "points": [ { -"x": 200, +"x": 150, "y": 0 }, { -"x": 240, +"x": 470, "y": 0 }, { -"x": 240, -"y": 700 +"x": 470, +"y": 800 }, { -"x": 200, -"y": 700 +"x": 150, +"y": 800 } ], "isClosed": true @@ -63,49 +63,49 @@ { "points": [ { -"x": 30, -"y": 664 +"x": 20, +"y": 550 }, { -"x": 410, -"y": 664 +"x": 600, +"y": 550 }, { -"x": 410, -"y": 700 +"x": 600, +"y": 800 }, { -"x": 30, -"y": 700 +"x": 20, +"y": 800 } ], "isClosed": true } ] }, -"xAdvance": 440 +"xAdvance": 620 } }, -"MutatorSansBoldCondensed/foreground": { +"MutatorSansBoldWide/foreground": { "glyph": { "path": { "contours": [ { "points": [ { -"x": 150, +"x": 420, "y": 0 }, { -"x": 470, +"x": 840, "y": 0 }, { -"x": 470, +"x": 840, "y": 800 }, { -"x": 150, +"x": 420, "y": 800 } ], @@ -115,14 +115,14 @@ "points": [ { "x": 20, -"y": 550 +"y": 490 }, { -"x": 600, -"y": 550 +"x": 1240, +"y": 490 }, { -"x": 600, +"x": 1240, "y": 800 }, { @@ -134,29 +134,29 @@ } ] }, -"xAdvance": 620 +"xAdvance": 1260 } }, -"MutatorSansLightWide/foreground": { +"MutatorSansLightCondensed/foreground": { "glyph": { "path": { "contours": [ { "points": [ { -"x": 550, +"x": 200, "y": 0 }, { -"x": 590, +"x": 240, "y": 0 }, { -"x": 590, +"x": 240, "y": 700 }, { -"x": 550, +"x": 200, "y": 700 } ], @@ -165,19 +165,19 @@ { "points": [ { -"x": 40, +"x": 30, "y": 664 }, { -"x": 1100, +"x": 410, "y": 664 }, { -"x": 1100, +"x": 410, "y": 700 }, { -"x": 40, +"x": 30, "y": 700 } ], @@ -185,30 +185,30 @@ } ] }, -"xAdvance": 1140 +"xAdvance": 440 } }, -"MutatorSansBoldWide/foreground": { +"MutatorSansLightWide/foreground": { "glyph": { "path": { "contours": [ { "points": [ { -"x": 420, +"x": 550, "y": 0 }, { -"x": 840, +"x": 590, "y": 0 }, { -"x": 840, -"y": 800 +"x": 590, +"y": 700 }, { -"x": 420, -"y": 800 +"x": 550, +"y": 700 } ], "isClosed": true @@ -216,27 +216,27 @@ { "points": [ { -"x": 20, -"y": 490 +"x": 40, +"y": 664 }, { -"x": 1240, -"y": 490 +"x": 1100, +"y": 664 }, { -"x": 1240, -"y": 800 +"x": 1100, +"y": 700 }, { -"x": 20, -"y": 800 +"x": 40, +"y": 700 } ], "isClosed": true } ] }, -"xAdvance": 1260 +"xAdvance": 1140 } } } diff --git a/tests/data/MutatorSans.fontra/glyphs/U^1.json b/tests/data/MutatorSans.fontra/glyphs/U^1.json index b068147..629bf1c 100644 --- a/tests/data/MutatorSans.fontra/glyphs/U^1.json +++ b/tests/data/MutatorSans.fontra/glyphs/U^1.json @@ -5,125 +5,125 @@ "name": "LightCondensed", "layerName": "MutatorSansLightCondensed/foreground", "location": { -"width": 0.0, -"weight": 150.0 +"weight": 150, +"width": 0 } }, { "name": "BoldCondensed", "layerName": "MutatorSansBoldCondensed/foreground", "location": { -"width": 0.0, -"weight": 850.0 +"weight": 850, +"width": 0 } }, { "name": "LightWide", "layerName": "MutatorSansLightWide/foreground", "location": { -"width": 1000.0, -"weight": 150.0 +"weight": 150, +"width": 1000 } }, { "name": "BoldWide", "layerName": "MutatorSansBoldWide/foreground", "location": { -"width": 1000.0, -"weight": 850.0 +"weight": 850, +"width": 1000 } } ], "layers": { -"MutatorSansLightCondensed/foreground": { +"MutatorSansBoldCondensed/foreground": { "glyph": { "path": { "contours": [ { "points": [ { -"x": 232, +"x": 377, "y": -10, "smooth": true }, { -"x": 338, +"x": 628, "y": -10, "type": "cubic" }, { -"x": 403, -"y": 38, +"x": 726, +"y": 105, "type": "cubic" }, { -"x": 403, -"y": 182, +"x": 726, +"y": 343, "smooth": true }, { -"x": 403, -"y": 700 +"x": 726, +"y": 800 }, { -"x": 363, -"y": 700 +"x": 406, +"y": 800 }, { -"x": 363, -"y": 182, +"x": 406, +"y": 293, "smooth": true }, { -"x": 363, -"y": 60, +"x": 406, +"y": 265, "type": "cubic" }, { -"x": 313, -"y": 26, +"x": 399, +"y": 254, "type": "cubic" }, { -"x": 232, -"y": 26, +"x": 377, +"y": 254, "smooth": true }, { -"x": 151, -"y": 26, +"x": 357, +"y": 254, "type": "cubic" }, { -"x": 100, -"y": 60, +"x": 350, +"y": 265, "type": "cubic" }, { -"x": 100, -"y": 182, +"x": 350, +"y": 293, "smooth": true }, { -"x": 100, -"y": 700 +"x": 350, +"y": 800 }, { -"x": 60, -"y": 700 +"x": 30, +"y": 800 }, { -"x": 60, -"y": 182, +"x": 30, +"y": 343, "smooth": true }, { -"x": 60, -"y": 38, +"x": 30, +"y": 105, "type": "cubic" }, { -"x": 124, +"x": 125, "y": -10, "type": "cubic" } @@ -132,98 +132,98 @@ } ] }, -"xAdvance": 463 +"xAdvance": 756 } }, -"MutatorSansBoldCondensed/foreground": { +"MutatorSansBoldWide/foreground": { "glyph": { "path": { "contours": [ { "points": [ { -"x": 377, +"x": 663, "y": -10, "smooth": true }, { -"x": 628, +"x": 1015.5728476821191, "y": -10, "type": "cubic" }, { -"x": 726, -"y": 105, +"x": 1237, +"y": 134, "type": "cubic" }, { -"x": 726, -"y": 343, +"x": 1237, +"y": 433, "smooth": true }, { -"x": 726, +"x": 1237, "y": 800 }, { -"x": 406, +"x": 806, "y": 800 }, { -"x": 406, -"y": 293, +"x": 806, +"y": 433, "smooth": true }, { -"x": 406, -"y": 265, +"x": 806, +"y": 328.1173184357542, "type": "cubic" }, { -"x": 399, -"y": 254, +"x": 751.5116279069767, +"y": 284, "type": "cubic" }, { -"x": 377, -"y": 254, +"x": 664, +"y": 284, "smooth": true }, { -"x": 357, -"y": 254, +"x": 576.4883720930233, +"y": 284, "type": "cubic" }, { -"x": 350, -"y": 265, +"x": 522, +"y": 328.1173184357542, "type": "cubic" }, { -"x": 350, -"y": 293, +"x": 522, +"y": 433, "smooth": true }, { -"x": 350, +"x": 522, "y": 800 }, { -"x": 30, +"x": 90, "y": 800 }, { -"x": 30, -"y": 343, +"x": 90, +"y": 433, "smooth": true }, { -"x": 30, -"y": 105, +"x": 90, +"y": 134, "type": "cubic" }, { -"x": 125, +"x": 310.4577114427861, "y": -10, "type": "cubic" } @@ -232,98 +232,98 @@ } ] }, -"xAdvance": 756 +"xAdvance": 1327 } }, -"MutatorSansLightWide/foreground": { +"MutatorSansLightCondensed/foreground": { "glyph": { "path": { "contours": [ { "points": [ { -"x": 590, +"x": 232, "y": -10, "smooth": true }, { -"x": 879, +"x": 338, "y": -10, "type": "cubic" }, { -"x": 1061, -"y": 108, +"x": 403, +"y": 38, "type": "cubic" }, { -"x": 1061, -"y": 352, +"x": 403, +"y": 182, "smooth": true }, { -"x": 1061, +"x": 403, "y": 700 }, { -"x": 1021, +"x": 363, "y": 700 }, { -"x": 1021, -"y": 352, +"x": 363, +"y": 182, "smooth": true }, { -"x": 1021, -"y": 124, +"x": 363, +"y": 60, "type": "cubic" }, { -"x": 854, +"x": 313, "y": 26, "type": "cubic" }, { -"x": 590, +"x": 232, "y": 26, "smooth": true }, { -"x": 327, +"x": 151, "y": 26, "type": "cubic" }, { -"x": 160, -"y": 124, +"x": 100, +"y": 60, "type": "cubic" }, { -"x": 160, -"y": 352, +"x": 100, +"y": 182, "smooth": true }, { -"x": 160, +"x": 100, "y": 700 }, { -"x": 120, +"x": 60, "y": 700 }, { -"x": 120, -"y": 352, +"x": 60, +"y": 182, "smooth": true }, { -"x": 120, -"y": 108, +"x": 60, +"y": 38, "type": "cubic" }, { -"x": 301, +"x": 124, "y": -10, "type": "cubic" } @@ -332,99 +332,99 @@ } ] }, -"xAdvance": 1181 +"xAdvance": 463 } }, -"MutatorSansBoldWide/foreground": { +"MutatorSansLightWide/foreground": { "glyph": { "path": { "contours": [ { "points": [ { -"x": 663, +"x": 590, "y": -10, "smooth": true }, { -"x": 1015.5728476821191, -"y": -10.0, +"x": 879, +"y": -10, "type": "cubic" }, { -"x": 1237, -"y": 134.0, +"x": 1061, +"y": 108, "type": "cubic" }, { -"x": 1237, -"y": 433, +"x": 1061, +"y": 352, "smooth": true }, { -"x": 1237, -"y": 800 +"x": 1061, +"y": 700 }, { -"x": 806, -"y": 800 +"x": 1021, +"y": 700 }, { -"x": 806, -"y": 433, +"x": 1021, +"y": 352, "smooth": true }, { -"x": 806, -"y": 328.1173184357542, +"x": 1021, +"y": 124, "type": "cubic" }, { -"x": 751.5116279069767, -"y": 284.0, +"x": 854, +"y": 26, "type": "cubic" }, { -"x": 664, -"y": 284, +"x": 590, +"y": 26, "smooth": true }, { -"x": 576.4883720930233, -"y": 284.0, +"x": 327, +"y": 26, "type": "cubic" }, { -"x": 522, -"y": 328.1173184357542, +"x": 160, +"y": 124, "type": "cubic" }, { -"x": 522, -"y": 433, +"x": 160, +"y": 352, "smooth": true }, { -"x": 522, -"y": 800 +"x": 160, +"y": 700 }, { -"x": 90, -"y": 800 +"x": 120, +"y": 700 }, { -"x": 90, -"y": 433, +"x": 120, +"y": 352, "smooth": true }, { -"x": 90, -"y": 134.0, +"x": 120, +"y": 108, "type": "cubic" }, { -"x": 310.4577114427861, -"y": -10.0, +"x": 301, +"y": -10, "type": "cubic" } ], @@ -432,7 +432,7 @@ } ] }, -"xAdvance": 1327 +"xAdvance": 1181 } } } diff --git a/tests/data/MutatorSans.fontra/glyphs/V^1.json b/tests/data/MutatorSans.fontra/glyphs/V^1.json index d37f709..9dbcb55 100644 --- a/tests/data/MutatorSans.fontra/glyphs/V^1.json +++ b/tests/data/MutatorSans.fontra/glyphs/V^1.json @@ -5,56 +5,56 @@ "name": "LightCondensed", "layerName": "MutatorSansLightCondensed/foreground", "location": { -"width": 0.0, -"weight": 150.0 +"weight": 150, +"width": 0 } }, { "name": "BoldCondensed", "layerName": "MutatorSansBoldCondensed/foreground", "location": { -"width": 0.0, -"weight": 850.0 +"weight": 850, +"width": 0 } }, { "name": "LightWide", "layerName": "MutatorSansLightWide/foreground", "location": { -"width": 1000.0, -"weight": 150.0 +"weight": 150, +"width": 1000 } }, { "name": "BoldWide", "layerName": "MutatorSansBoldWide/foreground", "location": { -"width": 1000.0, -"weight": 850.0 +"weight": 850, +"width": 1000 } } ], "layers": { -"MutatorSansLightCondensed/foreground": { +"MutatorSansBoldCondensed/foreground": { "glyph": { "path": { "contours": [ { "points": [ { -"x": 378, -"y": 700 +"x": 730, +"y": 800 }, { -"x": 337, -"y": 700 +"x": 480, +"y": 800 }, { -"x": 207, +"x": 396, "y": 0 }, { -"x": 243, +"x": 616, "y": 0 } ], @@ -63,19 +63,19 @@ { "points": [ { -"x": 65, -"y": 700 +"x": 350, +"y": 800 }, { -"x": 20, -"y": 700 +"x": 10, +"y": 800 }, { -"x": 155, +"x": 126, "y": 0 }, { -"x": 195, +"x": 446, "y": 0 } ], @@ -84,19 +84,19 @@ { "points": [ { -"x": 235, -"y": 39 +"x": 536, +"y": 260 }, { -"x": 165, -"y": 39 +"x": 266, +"y": 260 }, { -"x": 165, +"x": 266, "y": 0 }, { -"x": 235, +"x": 536, "y": 0 } ], @@ -104,29 +104,29 @@ } ] }, -"xAdvance": 400 +"xAdvance": 740 } }, -"MutatorSansBoldCondensed/foreground": { +"MutatorSansBoldWide/foreground": { "glyph": { "path": { "contours": [ { "points": [ { -"x": 730, +"x": 1300, "y": 800 }, { -"x": 480, +"x": 970, "y": 800 }, { -"x": 396, +"x": 640, "y": 0 }, { -"x": 616, +"x": 920, "y": 0 } ], @@ -135,19 +135,19 @@ { "points": [ { -"x": 350, +"x": 490, "y": 800 }, { -"x": 10, +"x": 20, "y": 800 }, { -"x": 126, +"x": 390, "y": 0 }, { -"x": 446, +"x": 840, "y": 0 } ], @@ -156,19 +156,19 @@ { "points": [ { -"x": 536, +"x": 890, "y": 260 }, { -"x": 266, +"x": 470, "y": 260 }, { -"x": 266, +"x": 470, "y": 0 }, { -"x": 536, +"x": 890, "y": 0 } ], @@ -176,29 +176,29 @@ } ] }, -"xAdvance": 740 +"xAdvance": 1320 } }, -"MutatorSansLightWide/foreground": { +"MutatorSansLightCondensed/foreground": { "glyph": { "path": { "contours": [ { "points": [ { -"x": 1130, +"x": 378, "y": 700 }, { -"x": 1084, +"x": 337, "y": 700 }, { -"x": 583, +"x": 207, "y": 0 }, { -"x": 628, +"x": 243, "y": 0 } ], @@ -207,19 +207,19 @@ { "points": [ { -"x": 94, +"x": 65, "y": 700 }, { -"x": 40, +"x": 20, "y": 700 }, { -"x": 548, +"x": 155, "y": 0 }, { -"x": 597, +"x": 195, "y": 0 } ], @@ -228,19 +228,19 @@ { "points": [ { -"x": 618, -"y": 36 +"x": 235, +"y": 39 }, { -"x": 558, -"y": 36 +"x": 165, +"y": 39 }, { -"x": 558, +"x": 165, "y": 0 }, { -"x": 618, +"x": 235, "y": 0 } ], @@ -248,29 +248,29 @@ } ] }, -"xAdvance": 1170 +"xAdvance": 400 } }, -"MutatorSansBoldWide/foreground": { +"MutatorSansLightWide/foreground": { "glyph": { "path": { "contours": [ { "points": [ { -"x": 1300, -"y": 800 +"x": 1130, +"y": 700 }, { -"x": 970, -"y": 800 +"x": 1084, +"y": 700 }, { -"x": 640, +"x": 583, "y": 0 }, { -"x": 920, +"x": 628, "y": 0 } ], @@ -279,19 +279,19 @@ { "points": [ { -"x": 490, -"y": 800 +"x": 94, +"y": 700 }, { -"x": 20, -"y": 800 +"x": 40, +"y": 700 }, { -"x": 390, +"x": 548, "y": 0 }, { -"x": 840, +"x": 597, "y": 0 } ], @@ -300,19 +300,19 @@ { "points": [ { -"x": 890, -"y": 260 +"x": 618, +"y": 36 }, { -"x": 470, -"y": 260 +"x": 558, +"y": 36 }, { -"x": 470, +"x": 558, "y": 0 }, { -"x": 890, +"x": 618, "y": 0 } ], @@ -320,7 +320,7 @@ } ] }, -"xAdvance": 1320 +"xAdvance": 1170 } } } diff --git a/tests/data/MutatorSans.fontra/glyphs/W^1.json b/tests/data/MutatorSans.fontra/glyphs/W^1.json index 03888a6..716ebd4 100644 --- a/tests/data/MutatorSans.fontra/glyphs/W^1.json +++ b/tests/data/MutatorSans.fontra/glyphs/W^1.json @@ -5,104 +5,104 @@ "name": "LightCondensed", "layerName": "MutatorSansLightCondensed/foreground", "location": { -"width": 0.0, -"weight": 150.0 +"weight": 150, +"width": 0 } }, { "name": "BoldCondensed", "layerName": "MutatorSansBoldCondensed/foreground", "location": { -"width": 0.0, -"weight": 850.0 +"weight": 850, +"width": 0 } }, { "name": "LightWide", "layerName": "MutatorSansLightWide/foreground", "location": { -"width": 1000.0, -"weight": 150.0 +"weight": 150, +"width": 1000 } }, { "name": "BoldWide", "layerName": "MutatorSansBoldWide/foreground", "location": { -"width": 1000.0, -"weight": 850.0 +"weight": 850, +"width": 1000 } } ], "layers": { -"MutatorSansLightCondensed/foreground": { +"MutatorSansBoldCondensed/foreground": { "glyph": { "path": { "contours": [ { "points": [ { -"x": 500, -"y": 700 +"x": 877, +"y": 800 }, { -"x": 458, -"y": 700 +"x": 617, +"y": 800 }, { -"x": 371, -"y": 62 +"x": 569, +"y": 270 }, { -"x": 377, -"y": 62 +"x": 611, +"y": 270 }, { -"x": 283, -"y": 700 +"x": 561, +"y": 800 }, { -"x": 245, -"y": 700 +"x": 356, +"y": 800 }, { -"x": 150, -"y": 62 +"x": 311, +"y": 270 }, { -"x": 158, -"y": 62 +"x": 353, +"y": 270 }, { -"x": 65, -"y": 700 +"x": 299, +"y": 800 }, { -"x": 22, -"y": 700 +"x": 10, +"y": 800 }, { -"x": 129, +"x": 112, "y": 0 }, { -"x": 174, +"x": 400, "y": 0 }, { -"x": 263, -"y": 639 +"x": 446, +"y": 409 }, { -"x": 253, -"y": 639 +"x": 404, +"y": 409 }, { -"x": 348, +"x": 461, "y": 0 }, { -"x": 393, +"x": 778, "y": 0 } ], @@ -110,155 +110,155 @@ } ] }, -"xAdvance": 521 +"xAdvance": 887 } }, -"MutatorSansLightCondensed/support": { +"MutatorSansBoldWide/foreground": { "glyph": { "path": { "contours": [ { "points": [ { -"x": 22, -"y": 700 +"x": 1349, +"y": 800 }, { -"x": 129, -"y": 0 +"x": 971, +"y": 800 }, { -"x": 174, -"y": 0 +"x": 897, +"y": 270 }, { -"x": 269, -"y": 639 +"x": 921, +"y": 270 }, { -"x": 259, -"y": 639 +"x": 845, +"y": 800 }, { -"x": 348, -"y": 0 +"x": 570, +"y": 800 }, { -"x": 393, -"y": 0 +"x": 502, +"y": 270 }, { -"x": 500, -"y": 700 +"x": 526, +"y": 270 }, { -"x": 457, -"y": 700 +"x": 453, +"y": 800 }, { -"x": 364, -"y": 62 +"x": 20, +"y": 800 }, { -"x": 372, -"y": 62 +"x": 176, +"y": 0 }, { -"x": 277, -"y": 700 +"x": 618, +"y": 0 }, { -"x": 239, -"y": 700 +"x": 688, +"y": 469 }, { -"x": 145, -"y": 62 +"x": 624, +"y": 469 }, { -"x": 151, -"y": 62 +"x": 711, +"y": 0 }, { -"x": 64, -"y": 700 +"x": 1198, +"y": 0 } ], "isClosed": true } ] }, -"xAdvance": 521 +"xAdvance": 1369 } }, -"MutatorSansBoldCondensed/foreground": { +"MutatorSansLightCondensed/foreground": { "glyph": { "path": { "contours": [ { "points": [ { -"x": 877, -"y": 800 +"x": 500, +"y": 700 }, { -"x": 617, -"y": 800 +"x": 458, +"y": 700 }, { -"x": 569, -"y": 270 +"x": 371, +"y": 62 }, { -"x": 611, -"y": 270 +"x": 377, +"y": 62 }, { -"x": 561, -"y": 800 +"x": 283, +"y": 700 }, { -"x": 356, -"y": 800 +"x": 245, +"y": 700 }, { -"x": 311, -"y": 270 +"x": 150, +"y": 62 }, { -"x": 353, -"y": 270 +"x": 158, +"y": 62 }, { -"x": 299, -"y": 800 +"x": 65, +"y": 700 }, { -"x": 10, -"y": 800 +"x": 22, +"y": 700 }, { -"x": 112, +"x": 129, "y": 0 }, { -"x": 400, +"x": 174, "y": 0 }, { -"x": 446, -"y": 409 +"x": 263, +"y": 639 }, { -"x": 404, -"y": 409 +"x": 253, +"y": 639 }, { -"x": 461, +"x": 348, "y": 0 }, { -"x": 778, +"x": 393, "y": 0 } ], @@ -266,155 +266,155 @@ } ] }, -"xAdvance": 887 +"xAdvance": 521 } }, -"MutatorSansLightWide/foreground": { +"MutatorSansLightCondensed/support": { "glyph": { "path": { "contours": [ { "points": [ { -"x": 1324, -"y": 700 -}, -{ -"x": 1283, +"x": 22, "y": 700 }, { -"x": 986, -"y": 62 +"x": 129, +"y": 0 }, { -"x": 998, -"y": 62 +"x": 174, +"y": 0 }, { -"x": 693, -"y": 700 +"x": 269, +"y": 639 }, { -"x": 667, -"y": 700 +"x": 259, +"y": 639 }, { -"x": 376, -"y": 52 +"x": 348, +"y": 0 }, { "x": 393, -"y": 52 +"y": 0 }, { -"x": 83, +"x": 500, "y": 700 }, { -"x": 40, +"x": 457, "y": 700 }, { -"x": 373, -"y": 0 +"x": 364, +"y": 62 }, { -"x": 391, -"y": 0 +"x": 372, +"y": 62 }, { -"x": 684, -"y": 656 +"x": 277, +"y": 700 }, { -"x": 668, -"y": 655 +"x": 239, +"y": 700 }, { -"x": 983, -"y": 0 +"x": 145, +"y": 62 }, { -"x": 1000, -"y": 0 +"x": 151, +"y": 62 +}, +{ +"x": 64, +"y": 700 } ], "isClosed": true } ] }, -"xAdvance": 1367 +"xAdvance": 521 } }, -"MutatorSansBoldWide/foreground": { +"MutatorSansLightWide/foreground": { "glyph": { "path": { "contours": [ { "points": [ { -"x": 1349, -"y": 800 +"x": 1324, +"y": 700 }, { -"x": 971, -"y": 800 +"x": 1283, +"y": 700 }, { -"x": 897, -"y": 270 +"x": 986, +"y": 62 }, { -"x": 921, -"y": 270 +"x": 998, +"y": 62 }, { -"x": 845, -"y": 800 +"x": 693, +"y": 700 }, { -"x": 570, -"y": 800 +"x": 667, +"y": 700 }, { -"x": 502, -"y": 270 +"x": 376, +"y": 52 }, { -"x": 526, -"y": 270 +"x": 393, +"y": 52 }, { -"x": 453, -"y": 800 +"x": 83, +"y": 700 }, { -"x": 20, -"y": 800 +"x": 40, +"y": 700 }, { -"x": 176, +"x": 373, "y": 0 }, { -"x": 618, +"x": 391, "y": 0 }, { -"x": 688, -"y": 469 +"x": 684, +"y": 656 }, { -"x": 624, -"y": 469 +"x": 668, +"y": 655 }, { -"x": 711, +"x": 983, "y": 0 }, { -"x": 1198, +"x": 1000, "y": 0 } ], @@ -422,7 +422,7 @@ } ] }, -"xAdvance": 1369 +"xAdvance": 1367 } } } diff --git a/tests/data/MutatorSans.fontra/glyphs/X^1.json b/tests/data/MutatorSans.fontra/glyphs/X^1.json index 4d19da7..2f5bc83 100644 --- a/tests/data/MutatorSans.fontra/glyphs/X^1.json +++ b/tests/data/MutatorSans.fontra/glyphs/X^1.json @@ -5,65 +5,65 @@ "name": "LightCondensed", "layerName": "MutatorSansLightCondensed/foreground", "location": { -"width": 0.0, -"weight": 150.0 +"weight": 150, +"width": 0 } }, { "name": "BoldCondensed", "layerName": "MutatorSansBoldCondensed/foreground", "location": { -"width": 0.0, -"weight": 850.0 +"weight": 850, +"width": 0 } }, { "name": "LightWide", "layerName": "MutatorSansLightWide/foreground", "location": { -"width": 1000.0, -"weight": 150.0 +"weight": 150, +"width": 1000 } }, { "name": "BoldWide", "layerName": "MutatorSansBoldWide/foreground", "location": { -"width": 1000.0, -"weight": 850.0 +"weight": 850, +"width": 1000 } } ], "layers": { -"MutatorSansLightCondensed/foreground": { +"MutatorSansBoldCondensed/foreground": { "glyph": { "path": { "contours": [ { "points": [ { -"x": 337, +"x": 360, "y": 0 }, { -"x": 382, +"x": 740, "y": 0 }, { -"x": 213, -"y": 364 +"x": 501, +"y": 474 }, { -"x": 72, -"y": 700 +"x": 390, +"y": 800 }, { -"x": 27, -"y": 700 +"x": 10, +"y": 800 }, { -"x": 187, -"y": 337 +"x": 248, +"y": 350 } ], "isClosed": true @@ -71,74 +71,74 @@ { "points": [ { -"x": 20, +"x": 10, "y": 0 }, { -"x": 60, +"x": 240, "y": 0 }, { -"x": 202, -"y": 332 +"x": 325, +"y": 312 }, { -"x": 215, -"y": 336 +"x": 558, +"y": 346 }, { -"x": 370, -"y": 700 +"x": 740, +"y": 800 }, { -"x": 330, -"y": 700 +"x": 510, +"y": 800 }, { -"x": 200, -"y": 363 +"x": 421, +"y": 541 }, { -"x": 184, -"y": 357 +"x": 193, +"y": 491 } ], "isClosed": true } ] }, -"xAdvance": 400 +"xAdvance": 750 } }, -"MutatorSansBoldCondensed/foreground": { +"MutatorSansBoldWide/foreground": { "glyph": { "path": { "contours": [ { "points": [ { -"x": 360, +"x": 770, "y": 0 }, { -"x": 740, +"x": 1260, "y": 0 }, { -"x": 501, -"y": 474 +"x": 809, +"y": 478 }, { -"x": 390, +"x": 510, "y": 800 }, { -"x": 10, +"x": 20, "y": 800 }, { -"x": 248, -"y": 350 +"x": 449, +"y": 374 } ], "isClosed": true @@ -146,74 +146,74 @@ { "points": [ { -"x": 10, +"x": 20, "y": 0 }, { -"x": 240, +"x": 470, "y": 0 }, { -"x": 325, -"y": 312 +"x": 673, +"y": 321 }, { -"x": 558, -"y": 346 +"x": 799, +"y": 321 }, { -"x": 740, +"x": 1260, "y": 800 }, { -"x": 510, +"x": 810, "y": 800 }, { -"x": 421, -"y": 541 +"x": 587, +"y": 480 }, { -"x": 193, -"y": 491 +"x": 452, +"y": 480 } ], "isClosed": true } ] }, -"xAdvance": 750 +"xAdvance": 1280 } }, -"MutatorSansLightWide/foreground": { +"MutatorSansLightCondensed/foreground": { "glyph": { "path": { "contours": [ { "points": [ { -"x": 920, +"x": 337, "y": 0 }, { -"x": 980, +"x": 382, "y": 0 }, { -"x": 520, -"y": 369 +"x": 213, +"y": 364 }, { -"x": 110, +"x": 72, "y": 700 }, { -"x": 50, +"x": 27, "y": 700 }, { -"x": 495, -"y": 351 +"x": 187, +"y": 337 } ], "isClosed": true @@ -221,74 +221,74 @@ { "points": [ { -"x": 42, -"y": -2 +"x": 20, +"y": 0 }, { -"x": 90, +"x": 60, "y": 0 }, { -"x": 511, -"y": 351 +"x": 202, +"y": 332 }, { -"x": 523, -"y": 349 +"x": 215, +"y": 336 }, { -"x": 970, +"x": 370, "y": 700 }, { -"x": 920, +"x": 330, "y": 700 }, { -"x": 503, -"y": 368 +"x": 200, +"y": 363 }, { -"x": 491, -"y": 370 +"x": 184, +"y": 357 } ], "isClosed": true } ] }, -"xAdvance": 1020 +"xAdvance": 400 } }, -"MutatorSansBoldWide/foreground": { +"MutatorSansLightWide/foreground": { "glyph": { "path": { "contours": [ { "points": [ { -"x": 770, +"x": 920, "y": 0 }, { -"x": 1260, +"x": 980, "y": 0 }, { -"x": 809, -"y": 478 +"x": 520, +"y": 369 }, { -"x": 510, -"y": 800 +"x": 110, +"y": 700 }, { -"x": 20, -"y": 800 +"x": 50, +"y": 700 }, { -"x": 449, -"y": 374 +"x": 495, +"y": 351 } ], "isClosed": true @@ -296,43 +296,43 @@ { "points": [ { -"x": 20, -"y": 0 +"x": 42, +"y": -2 }, { -"x": 470, +"x": 90, "y": 0 }, { -"x": 673, -"y": 321 +"x": 511, +"y": 351 }, { -"x": 799, -"y": 321 +"x": 523, +"y": 349 }, { -"x": 1260, -"y": 800 +"x": 970, +"y": 700 }, { -"x": 810, -"y": 800 +"x": 920, +"y": 700 }, { -"x": 587, -"y": 480 +"x": 503, +"y": 368 }, { -"x": 452, -"y": 480 +"x": 491, +"y": 370 } ], "isClosed": true } ] }, -"xAdvance": 1280 +"xAdvance": 1020 } } } diff --git a/tests/data/MutatorSans.fontra/glyphs/Y^1.json b/tests/data/MutatorSans.fontra/glyphs/Y^1.json index 110ddcf..b62a1a6 100644 --- a/tests/data/MutatorSans.fontra/glyphs/Y^1.json +++ b/tests/data/MutatorSans.fontra/glyphs/Y^1.json @@ -5,57 +5,57 @@ "name": "LightCondensed", "layerName": "MutatorSansLightCondensed/foreground", "location": { -"width": 0.0, -"weight": 150.0 +"weight": 150, +"width": 0 } }, { "name": "BoldCondensed", "layerName": "MutatorSansBoldCondensed/foreground", "location": { -"width": 0.0, -"weight": 850.0 +"weight": 850, +"width": 0 } }, { "name": "LightWide", "layerName": "MutatorSansLightWide/foreground", "location": { -"width": 1000.0, -"weight": 150.0 +"weight": 150, +"width": 1000 } }, { "name": "BoldWide", "layerName": "MutatorSansBoldWide/foreground", "location": { -"width": 1000.0, -"weight": 850.0 +"weight": 850, +"width": 1000 } } ], "layers": { -"MutatorSansLightCondensed/foreground": { +"MutatorSansBoldCondensed/foreground": { "glyph": { "path": { "contours": [ { "points": [ { -"x": 400, -"y": 700 +"x": 730, +"y": 800 }, { -"x": 359, -"y": 700 +"x": 500, +"y": 800 }, { -"x": 205, -"y": 210 +"x": 330, +"y": 200 }, { -"x": 230, -"y": 210 +"x": 530, +"y": 200 } ], "isClosed": true @@ -63,20 +63,20 @@ { "points": [ { -"x": 67, -"y": 700 +"x": 359, +"y": 800 }, { -"x": 20, -"y": 700 +"x": 10, +"y": 800 }, { -"x": 190, -"y": 210 +"x": 210, +"y": 200 }, { -"x": 228, -"y": 210 +"x": 500, +"y": 200 } ], "isClosed": true @@ -84,19 +84,19 @@ { "points": [ { -"x": 230, -"y": 254 +"x": 530, +"y": 270 }, { -"x": 190, -"y": 254 +"x": 210, +"y": 270 }, { -"x": 190, +"x": 210, "y": 0 }, { -"x": 230, +"x": 530, "y": 0 } ], @@ -104,30 +104,30 @@ } ] }, -"xAdvance": 420 +"xAdvance": 740 } }, -"MutatorSansBoldCondensed/foreground": { +"MutatorSansBoldWide/foreground": { "glyph": { "path": { "contours": [ { "points": [ { -"x": 730, +"x": 1190, "y": 800 }, { -"x": 500, +"x": 840, "y": 800 }, { -"x": 330, -"y": 200 +"x": 535, +"y": 210 }, { -"x": 530, -"y": 200 +"x": 815, +"y": 210 } ], "isClosed": true @@ -135,20 +135,20 @@ { "points": [ { -"x": 359, +"x": 450, "y": 800 }, { -"x": 10, +"x": 20, "y": 800 }, { -"x": 210, -"y": 200 +"x": 395, +"y": 210 }, { -"x": 500, -"y": 200 +"x": 785, +"y": 210 } ], "isClosed": true @@ -156,19 +156,19 @@ { "points": [ { -"x": 530, -"y": 270 +"x": 815, +"y": 380 }, { -"x": 210, -"y": 270 +"x": 395, +"y": 380 }, { -"x": 210, +"x": 395, "y": 0 }, { -"x": 530, +"x": 815, "y": 0 } ], @@ -176,30 +176,30 @@ } ] }, -"xAdvance": 740 +"xAdvance": 1210 } }, -"MutatorSansLightWide/foreground": { +"MutatorSansLightCondensed/foreground": { "glyph": { "path": { "contours": [ { "points": [ { -"x": 960, +"x": 400, "y": 700 }, { -"x": 910, +"x": 359, "y": 700 }, { -"x": 494, -"y": 200 +"x": 205, +"y": 210 }, { -"x": 506, -"y": 171 +"x": 230, +"y": 210 } ], "isClosed": true @@ -207,20 +207,20 @@ { "points": [ { -"x": 80, +"x": 67, "y": 700 }, { -"x": 30, +"x": 20, "y": 700 }, { -"x": 481, -"y": 171 +"x": 190, +"y": 210 }, { -"x": 504, -"y": 200 +"x": 228, +"y": 210 } ], "isClosed": true @@ -228,19 +228,19 @@ { "points": [ { -"x": 515, -"y": 211 +"x": 230, +"y": 254 }, { -"x": 475, -"y": 211 +"x": 190, +"y": 254 }, { -"x": 475, +"x": 190, "y": 0 }, { -"x": 515, +"x": 230, "y": 0 } ], @@ -248,30 +248,30 @@ } ] }, -"xAdvance": 990 +"xAdvance": 420 } }, -"MutatorSansBoldWide/foreground": { +"MutatorSansLightWide/foreground": { "glyph": { "path": { "contours": [ { "points": [ { -"x": 1190, -"y": 800 +"x": 960, +"y": 700 }, { -"x": 840, -"y": 800 +"x": 910, +"y": 700 }, { -"x": 535, -"y": 210 +"x": 494, +"y": 200 }, { -"x": 815, -"y": 210 +"x": 506, +"y": 171 } ], "isClosed": true @@ -279,20 +279,20 @@ { "points": [ { -"x": 450, -"y": 800 +"x": 80, +"y": 700 }, { -"x": 20, -"y": 800 +"x": 30, +"y": 700 }, { -"x": 395, -"y": 210 +"x": 481, +"y": 171 }, { -"x": 785, -"y": 210 +"x": 504, +"y": 200 } ], "isClosed": true @@ -300,19 +300,19 @@ { "points": [ { -"x": 815, -"y": 380 +"x": 515, +"y": 211 }, { -"x": 395, -"y": 380 +"x": 475, +"y": 211 }, { -"x": 395, +"x": 475, "y": 0 }, { -"x": 815, +"x": 515, "y": 0 } ], @@ -320,7 +320,7 @@ } ] }, -"xAdvance": 1210 +"xAdvance": 990 } } } diff --git a/tests/data/MutatorSans.fontra/glyphs/Z^1.json b/tests/data/MutatorSans.fontra/glyphs/Z^1.json index 84b8c80..bd397e8 100644 --- a/tests/data/MutatorSans.fontra/glyphs/Z^1.json +++ b/tests/data/MutatorSans.fontra/glyphs/Z^1.json @@ -5,57 +5,57 @@ "name": "LightCondensed", "layerName": "MutatorSansLightCondensed/foreground", "location": { -"width": 0.0, -"weight": 150.0 +"weight": 150, +"width": 0 } }, { "name": "BoldCondensed", "layerName": "MutatorSansBoldCondensed/foreground", "location": { -"width": 0.0, -"weight": 850.0 +"weight": 850, +"width": 0 } }, { "name": "LightWide", "layerName": "MutatorSansLightWide/foreground", "location": { -"width": 1000.0, -"weight": 150.0 +"weight": 150, +"width": 1000 } }, { "name": "BoldWide", "layerName": "MutatorSansBoldWide/foreground", "location": { -"width": 1000.0, -"weight": 850.0 +"weight": 850, +"width": 1000 } } ], "layers": { -"MutatorSansLightCondensed/foreground": { +"MutatorSansBoldCondensed/foreground": { "glyph": { "path": { "contours": [ { "points": [ { -"x": 60, -"y": 36 +"x": 30, +"y": 250 }, { -"x": 95, -"y": 26 +"x": 380, +"y": 230 }, { -"x": 380, -"y": 664 +"x": 610, +"y": 550 }, { -"x": 345, -"y": 674 +"x": 260, +"y": 570 } ], "isClosed": true @@ -63,20 +63,20 @@ { "points": [ { -"x": 60, -"y": 664 +"x": 30, +"y": 550 }, { -"x": 380, -"y": 664 +"x": 610, +"y": 550 }, { -"x": 380, -"y": 700 +"x": 610, +"y": 800 }, { -"x": 60, -"y": 700 +"x": 30, +"y": 800 } ], "isClosed": true @@ -84,50 +84,50 @@ { "points": [ { -"x": 60, +"x": 30, "y": 0 }, { -"x": 380, +"x": 610, "y": 0 }, { -"x": 380, -"y": 36 +"x": 610, +"y": 250 }, { -"x": 60, -"y": 36 +"x": 30, +"y": 250 } ], "isClosed": true } ] }, -"xAdvance": 440 +"xAdvance": 640 } }, -"MutatorSansBoldCondensed/foreground": { +"MutatorSansBoldWide/foreground": { "glyph": { "path": { "contours": [ { "points": [ { -"x": 30, -"y": 250 +"x": 60, +"y": 280 }, { -"x": 380, -"y": 230 +"x": 580, +"y": 180 }, { -"x": 610, -"y": 550 +"x": 1220, +"y": 520 }, { -"x": 260, -"y": 570 +"x": 700, +"y": 620 } ], "isClosed": true @@ -135,19 +135,19 @@ { "points": [ { -"x": 30, -"y": 550 +"x": 60, +"y": 520 }, { -"x": 610, -"y": 550 +"x": 1220, +"y": 520 }, { -"x": 610, +"x": 1220, "y": 800 }, { -"x": 30, +"x": 60, "y": 800 } ], @@ -156,50 +156,50 @@ { "points": [ { -"x": 30, +"x": 60, "y": 0 }, { -"x": 610, +"x": 1220, "y": 0 }, { -"x": 610, -"y": 250 +"x": 1220, +"y": 280 }, { -"x": 30, -"y": 250 +"x": 60, +"y": 280 } ], "isClosed": true } ] }, -"xAdvance": 640 +"xAdvance": 1280 } }, -"MutatorSansLightWide/foreground": { +"MutatorSansLightCondensed/foreground": { "glyph": { "path": { "contours": [ { "points": [ { -"x": 120, +"x": 60, "y": 36 }, { -"x": 155, -"y": 16 +"x": 95, +"y": 26 }, { -"x": 1080, +"x": 380, "y": 664 }, { -"x": 1045, -"y": 684 +"x": 345, +"y": 674 } ], "isClosed": true @@ -207,19 +207,19 @@ { "points": [ { -"x": 120, +"x": 60, "y": 664 }, { -"x": 1080, +"x": 380, "y": 664 }, { -"x": 1080, +"x": 380, "y": 700 }, { -"x": 120, +"x": 60, "y": 700 } ], @@ -228,19 +228,19 @@ { "points": [ { -"x": 120, +"x": 60, "y": 0 }, { -"x": 1080, +"x": 380, "y": 0 }, { -"x": 1080, +"x": 380, "y": 36 }, { -"x": 120, +"x": 60, "y": 36 } ], @@ -248,30 +248,30 @@ } ] }, -"xAdvance": 1200 +"xAdvance": 440 } }, -"MutatorSansBoldWide/foreground": { +"MutatorSansLightWide/foreground": { "glyph": { "path": { "contours": [ { "points": [ { -"x": 60, -"y": 280 +"x": 120, +"y": 36 }, { -"x": 580, -"y": 180 +"x": 155, +"y": 16 }, { -"x": 1220, -"y": 520 +"x": 1080, +"y": 664 }, { -"x": 700, -"y": 620 +"x": 1045, +"y": 684 } ], "isClosed": true @@ -279,20 +279,20 @@ { "points": [ { -"x": 60, -"y": 520 +"x": 120, +"y": 664 }, { -"x": 1220, -"y": 520 +"x": 1080, +"y": 664 }, { -"x": 1220, -"y": 800 +"x": 1080, +"y": 700 }, { -"x": 60, -"y": 800 +"x": 120, +"y": 700 } ], "isClosed": true @@ -300,27 +300,27 @@ { "points": [ { -"x": 60, +"x": 120, "y": 0 }, { -"x": 1220, +"x": 1080, "y": 0 }, { -"x": 1220, -"y": 280 +"x": 1080, +"y": 36 }, { -"x": 60, -"y": 280 +"x": 120, +"y": 36 } ], "isClosed": true } ] }, -"xAdvance": 1280 +"xAdvance": 1200 } } } diff --git a/tests/data/MutatorSans.fontra/glyphs/acute.json b/tests/data/MutatorSans.fontra/glyphs/acute.json index 527e696..930f646 100644 --- a/tests/data/MutatorSans.fontra/glyphs/acute.json +++ b/tests/data/MutatorSans.fontra/glyphs/acute.json @@ -5,67 +5,67 @@ "name": "LightCondensed", "layerName": "MutatorSansLightCondensed/foreground", "location": { -"width": 0.0, -"weight": 150.0 +"weight": 150, +"width": 0 } }, { "name": "BoldCondensed", "layerName": "MutatorSansBoldCondensed/foreground", "location": { -"width": 0.0, -"weight": 850.0 +"weight": 850, +"width": 0 } }, { "name": "LightWide", "layerName": "MutatorSansLightWide/foreground", "location": { -"width": 1000.0, -"weight": 150.0 +"weight": 150, +"width": 1000 } }, { "name": "BoldWide", "layerName": "MutatorSansBoldWide/foreground", "location": { -"width": 1000.0, -"weight": 850.0 +"weight": 850, +"width": 1000 } } ], "layers": { -"MutatorSansLightCondensed/foreground": { +"MutatorSansBoldCondensed/foreground": { "glyph": { "path": { "contours": [ { "points": [ { -"x": 50, -"y": 730 +"x": 20, +"y": 830 }, { -"x": 200, -"y": 738 +"x": 290, +"y": 830 }, { -"x": 200, -"y": 770 +"x": 290, +"y": 950 }, { -"x": 50, -"y": 760 +"x": 20, +"y": 920 } ], "isClosed": true } ] }, -"xAdvance": 250 +"xAdvance": 310 } }, -"MutatorSansBoldCondensed/foreground": { +"MutatorSansBoldWide/foreground": { "glyph": { "path": { "contours": [ @@ -76,11 +76,11 @@ "y": 830 }, { -"x": 290, +"x": 370, "y": 830 }, { -"x": 290, +"x": 370, "y": 950 }, { @@ -92,29 +92,29 @@ } ] }, -"xAdvance": 310 +"xAdvance": 390 } }, -"MutatorSansLightWide/foreground": { +"MutatorSansLightCondensed/foreground": { "glyph": { "path": { "contours": [ { "points": [ { -"x": 30, +"x": 50, "y": 730 }, { -"x": 220, +"x": 200, "y": 738 }, { -"x": 220, +"x": 200, "y": 770 }, { -"x": 30, +"x": 50, "y": 760 } ], @@ -125,34 +125,34 @@ "xAdvance": 250 } }, -"MutatorSansBoldWide/foreground": { +"MutatorSansLightWide/foreground": { "glyph": { "path": { "contours": [ { "points": [ { -"x": 20, -"y": 830 +"x": 30, +"y": 730 }, { -"x": 370, -"y": 830 +"x": 220, +"y": 738 }, { -"x": 370, -"y": 950 +"x": 220, +"y": 770 }, { -"x": 20, -"y": 920 +"x": 30, +"y": 760 } ], "isClosed": true } ] }, -"xAdvance": 390 +"xAdvance": 250 } } } diff --git a/tests/data/MutatorSans.fontra/glyphs/arrowdown.json b/tests/data/MutatorSans.fontra/glyphs/arrowdown.json index 61a5418..aa65ced 100644 --- a/tests/data/MutatorSans.fontra/glyphs/arrowdown.json +++ b/tests/data/MutatorSans.fontra/glyphs/arrowdown.json @@ -5,57 +5,57 @@ "name": "LightCondensed", "layerName": "MutatorSansLightCondensed/foreground", "location": { -"width": 0.0, -"weight": 150.0 +"weight": 150, +"width": 0 } }, { "name": "BoldCondensed", "layerName": "MutatorSansBoldCondensed/foreground", "location": { -"width": 0.0, -"weight": 850.0 +"weight": 850, +"width": 0 } }, { "name": "LightWide", "layerName": "MutatorSansLightWide/foreground", "location": { -"width": 1000.0, -"weight": 150.0 +"weight": 150, +"width": 1000 } }, { "name": "BoldWide", "layerName": "MutatorSansBoldWide/foreground", "location": { -"width": 1000.0, -"weight": 850.0 +"weight": 850, +"width": 1000 } } ], "layers": { -"MutatorSansLightCondensed/foreground": { +"MutatorSansBoldCondensed/foreground": { "glyph": { "path": { "contours": [ { "points": [ { -"x": 137, -"y": 271 +"x": 216, +"y": 326 }, { -"x": 166, -"y": 271 +"x": 618, +"y": 326 }, { -"x": 172, -"y": 540 +"x": 624, +"y": 661 }, { -"x": 131, -"y": 540 +"x": 209, +"y": 661 } ], "isClosed": true @@ -63,26 +63,26 @@ { "points": [ { -"x": 100, -"y": 330 +"x": 10, +"y": 501 }, { -"x": 152, -"y": 140 +"x": 418, +"y": 75 }, { -"x": 202, -"y": 329 +"x": 822, +"y": 500 } ], "isClosed": true } ] }, -"xAdvance": 302 +"xAdvance": 832 } }, -"MutatorSansBoldCondensed/foreground": { +"MutatorSansBoldWide/foreground": { "glyph": { "path": { "contours": [ @@ -90,19 +90,19 @@ "points": [ { "x": 216, -"y": 326 +"y": 51 }, { "x": 618, -"y": 326 +"y": 51 }, { "x": 624, -"y": 661 +"y": 926 }, { "x": 209, -"y": 661 +"y": 926 } ], "isClosed": true @@ -111,15 +111,15 @@ "points": [ { "x": 10, -"y": 501 +"y": 226 }, { "x": 418, -"y": 75 +"y": -200 }, { "x": 822, -"y": 500 +"y": 225 } ], "isClosed": true @@ -129,7 +129,7 @@ "xAdvance": 832 } }, -"MutatorSansLightWide/foreground": { +"MutatorSansLightCondensed/foreground": { "glyph": { "path": { "contours": [ @@ -137,19 +137,19 @@ "points": [ { "x": 137, -"y": 21 +"y": 271 }, { "x": 166, -"y": 21 +"y": 271 }, { "x": 172, -"y": 790 +"y": 540 }, { "x": 131, -"y": 790 +"y": 540 } ], "isClosed": true @@ -158,15 +158,15 @@ "points": [ { "x": 100, -"y": 80 +"y": 330 }, { "x": 152, -"y": -110 +"y": 140 }, { "x": 202, -"y": 79 +"y": 329 } ], "isClosed": true @@ -176,27 +176,27 @@ "xAdvance": 302 } }, -"MutatorSansBoldWide/foreground": { +"MutatorSansLightWide/foreground": { "glyph": { "path": { "contours": [ { "points": [ { -"x": 216, -"y": 51 +"x": 137, +"y": 21 }, { -"x": 618, -"y": 51 +"x": 166, +"y": 21 }, { -"x": 624, -"y": 926 +"x": 172, +"y": 790 }, { -"x": 209, -"y": 926 +"x": 131, +"y": 790 } ], "isClosed": true @@ -204,23 +204,23 @@ { "points": [ { -"x": 10, -"y": 226 +"x": 100, +"y": 80 }, { -"x": 418, -"y": -200 +"x": 152, +"y": -110 }, { -"x": 822, -"y": 225 +"x": 202, +"y": 79 } ], "isClosed": true } ] }, -"xAdvance": 832 +"xAdvance": 302 } } } diff --git a/tests/data/MutatorSans.fontra/glyphs/arrowleft.json b/tests/data/MutatorSans.fontra/glyphs/arrowleft.json index 628ac5b..122c996 100644 --- a/tests/data/MutatorSans.fontra/glyphs/arrowleft.json +++ b/tests/data/MutatorSans.fontra/glyphs/arrowleft.json @@ -5,57 +5,57 @@ "name": "LightCondensed", "layerName": "MutatorSansLightCondensed/foreground", "location": { -"width": 0.0, -"weight": 150.0 +"weight": 150, +"width": 0 } }, { "name": "BoldCondensed", "layerName": "MutatorSansBoldCondensed/foreground", "location": { -"width": 0.0, -"weight": 850.0 +"weight": 850, +"width": 0 } }, { "name": "LightWide", "layerName": "MutatorSansLightWide/foreground", "location": { -"width": 1000.0, -"weight": 150.0 +"weight": 150, +"width": 1000 } }, { "name": "BoldWide", "layerName": "MutatorSansBoldWide/foreground", "location": { -"width": 1000.0, -"weight": 850.0 +"weight": 850, +"width": 1000 } } ], "layers": { -"MutatorSansLightCondensed/foreground": { +"MutatorSansBoldCondensed/foreground": { "glyph": { "path": { "contours": [ { "points": [ { -"x": 136, -"y": 371 +"x": 331, +"y": 638 }, { -"x": 136, -"y": 342 +"x": 331, +"y": 141 }, { -"x": 559, -"y": 336 +"x": 558, +"y": 135 }, { -"x": 559, -"y": 377 +"x": 558, +"y": 645 } ], "isClosed": true @@ -63,46 +63,46 @@ { "points": [ { -"x": 195, -"y": 408 +"x": 431, +"y": 806 }, { "x": 5, -"y": 356 +"y": 398 }, { -"x": 194, -"y": 306 +"x": 430, +"y": -6 } ], "isClosed": true } ] }, -"xAdvance": 569 +"xAdvance": 568 } }, -"MutatorSansBoldCondensed/foreground": { +"MutatorSansBoldWide/foreground": { "glyph": { "path": { "contours": [ { "points": [ { -"x": 331, -"y": 638 +"x": 256, +"y": 600 }, { -"x": 331, -"y": 141 +"x": 256, +"y": 198 }, { -"x": 558, -"y": 135 +"x": 1408, +"y": 192 }, { -"x": 558, -"y": 645 +"x": 1408, +"y": 607 } ], "isClosed": true @@ -126,10 +126,10 @@ } ] }, -"xAdvance": 568 +"xAdvance": 1418 } }, -"MutatorSansLightWide/foreground": { +"MutatorSansLightCondensed/foreground": { "glyph": { "path": { "contours": [ @@ -144,11 +144,11 @@ "y": 342 }, { -"x": 1059, +"x": 559, "y": 336 }, { -"x": 1059, +"x": 559, "y": 377 } ], @@ -173,30 +173,30 @@ } ] }, -"xAdvance": 1069 +"xAdvance": 569 } }, -"MutatorSansBoldWide/foreground": { +"MutatorSansLightWide/foreground": { "glyph": { "path": { "contours": [ { "points": [ { -"x": 256, -"y": 600 +"x": 136, +"y": 371 }, { -"x": 256, -"y": 198 +"x": 136, +"y": 342 }, { -"x": 1408, -"y": 192 +"x": 1059, +"y": 336 }, { -"x": 1408, -"y": 607 +"x": 1059, +"y": 377 } ], "isClosed": true @@ -204,23 +204,23 @@ { "points": [ { -"x": 431, -"y": 806 +"x": 195, +"y": 408 }, { "x": 5, -"y": 398 +"y": 356 }, { -"x": 430, -"y": -6 +"x": 194, +"y": 306 } ], "isClosed": true } ] }, -"xAdvance": 1418 +"xAdvance": 1069 } } } diff --git a/tests/data/MutatorSans.fontra/glyphs/arrowright.json b/tests/data/MutatorSans.fontra/glyphs/arrowright.json index 99c9059..44b3f6a 100644 --- a/tests/data/MutatorSans.fontra/glyphs/arrowright.json +++ b/tests/data/MutatorSans.fontra/glyphs/arrowright.json @@ -5,57 +5,57 @@ "name": "LightCondensed", "layerName": "MutatorSansLightCondensed/foreground", "location": { -"width": 0.0, -"weight": 150.0 +"weight": 150, +"width": 0 } }, { "name": "BoldCondensed", "layerName": "MutatorSansBoldCondensed/foreground", "location": { -"width": 0.0, -"weight": 850.0 +"weight": 850, +"width": 0 } }, { "name": "LightWide", "layerName": "MutatorSansLightWide/foreground", "location": { -"width": 1000.0, -"weight": 150.0 +"weight": 150, +"width": 1000 } }, { "name": "BoldWide", "layerName": "MutatorSansBoldWide/foreground", "location": { -"width": 1000.0, -"weight": 850.0 +"weight": 850, +"width": 1000 } } ], "layers": { -"MutatorSansLightCondensed/foreground": { +"MutatorSansBoldCondensed/foreground": { "glyph": { "path": { "contours": [ { "points": [ { -"x": 308, -"y": 345 +"x": 237, +"y": 162 }, { -"x": 308, -"y": 374 +"x": 237, +"y": 659 }, { "x": 10, -"y": 380 +"y": 665 }, { "x": 10, -"y": 339 +"y": 155 } ], "isClosed": true @@ -63,46 +63,46 @@ { "points": [ { -"x": 249, -"y": 308 +"x": 137, +"y": -6 }, { -"x": 439, -"y": 360 +"x": 563, +"y": 402 }, { -"x": 250, -"y": 410 +"x": 138, +"y": 806 } ], "isClosed": true } ] }, -"xAdvance": 444 +"xAdvance": 568 } }, -"MutatorSansBoldCondensed/foreground": { +"MutatorSansBoldWide/foreground": { "glyph": { "path": { "contours": [ { "points": [ { -"x": 237, -"y": 162 +"x": 1162, +"y": 200 }, { -"x": 237, -"y": 659 +"x": 1162, +"y": 602 }, { "x": 10, -"y": 665 +"y": 608 }, { "x": 10, -"y": 155 +"y": 193 } ], "isClosed": true @@ -110,15 +110,15 @@ { "points": [ { -"x": 137, +"x": 987, "y": -6 }, { -"x": 563, -"y": 402 +"x": 1413, +"y": 401 }, { -"x": 138, +"x": 988, "y": 806 } ], @@ -126,21 +126,21 @@ } ] }, -"xAdvance": 568 +"xAdvance": 1418 } }, -"MutatorSansLightWide/foreground": { +"MutatorSansLightCondensed/foreground": { "glyph": { "path": { "contours": [ { "points": [ { -"x": 933, +"x": 308, "y": 345 }, { -"x": 933, +"x": 308, "y": 374 }, { @@ -157,15 +157,15 @@ { "points": [ { -"x": 874, +"x": 249, "y": 308 }, { -"x": 1064, +"x": 439, "y": 360 }, { -"x": 875, +"x": 250, "y": 410 } ], @@ -173,30 +173,30 @@ } ] }, -"xAdvance": 1069 +"xAdvance": 444 } }, -"MutatorSansBoldWide/foreground": { +"MutatorSansLightWide/foreground": { "glyph": { "path": { "contours": [ { "points": [ { -"x": 1162, -"y": 200 +"x": 933, +"y": 345 }, { -"x": 1162, -"y": 602 +"x": 933, +"y": 374 }, { "x": 10, -"y": 608 +"y": 380 }, { "x": 10, -"y": 193 +"y": 339 } ], "isClosed": true @@ -204,23 +204,23 @@ { "points": [ { -"x": 987, -"y": -6 +"x": 874, +"y": 308 }, { -"x": 1413, -"y": 401 +"x": 1064, +"y": 360 }, { -"x": 988, -"y": 806 +"x": 875, +"y": 410 } ], "isClosed": true } ] }, -"xAdvance": 1418 +"xAdvance": 1069 } } } diff --git a/tests/data/MutatorSans.fontra/glyphs/arrowup.json b/tests/data/MutatorSans.fontra/glyphs/arrowup.json index 9682555..0ff7455 100644 --- a/tests/data/MutatorSans.fontra/glyphs/arrowup.json +++ b/tests/data/MutatorSans.fontra/glyphs/arrowup.json @@ -5,57 +5,57 @@ "name": "LightCondensed", "layerName": "MutatorSansLightCondensed/foreground", "location": { -"width": 0.0, -"weight": 150.0 +"weight": 150, +"width": 0 } }, { "name": "BoldCondensed", "layerName": "MutatorSansBoldCondensed/foreground", "location": { -"width": 0.0, -"weight": 850.0 +"weight": 850, +"width": 0 } }, { "name": "LightWide", "layerName": "MutatorSansLightWide/foreground", "location": { -"width": 1000.0, -"weight": 150.0 +"weight": 150, +"width": 1000 } }, { "name": "BoldWide", "layerName": "MutatorSansBoldWide/foreground", "location": { -"width": 1000.0, -"weight": 850.0 +"weight": 850, +"width": 1000 } } ], "layers": { -"MutatorSansLightCondensed/foreground": { +"MutatorSansBoldCondensed/foreground": { "glyph": { "path": { "contours": [ { "points": [ { -"x": 165, -"y": 409 +"x": 616, +"y": 455 }, { -"x": 136, -"y": 409 +"x": 214, +"y": 455 }, { -"x": 130, -"y": 140 +"x": 208, +"y": 120 }, { -"x": 171, -"y": 140 +"x": 623, +"y": 120 } ], "isClosed": true @@ -63,26 +63,26 @@ { "points": [ { -"x": 202, -"y": 350 +"x": 822, +"y": 280 }, { -"x": 150, -"y": 540 +"x": 414, +"y": 706 }, { -"x": 100, -"y": 351 +"x": 10, +"y": 281 } ], "isClosed": true } ] }, -"xAdvance": 302 +"xAdvance": 832 } }, -"MutatorSansBoldCondensed/foreground": { +"MutatorSansBoldWide/foreground": { "glyph": { "path": { "contours": [ @@ -90,19 +90,19 @@ "points": [ { "x": 616, -"y": 455 +"y": 675 }, { "x": 214, -"y": 455 +"y": 675 }, { "x": 208, -"y": 120 +"y": -200 }, { "x": 623, -"y": 120 +"y": -200 } ], "isClosed": true @@ -111,15 +111,15 @@ "points": [ { "x": 822, -"y": 280 +"y": 500 }, { "x": 414, -"y": 706 +"y": 926 }, { "x": 10, -"y": 281 +"y": 501 } ], "isClosed": true @@ -129,7 +129,7 @@ "xAdvance": 832 } }, -"MutatorSansLightWide/foreground": { +"MutatorSansLightCondensed/foreground": { "glyph": { "path": { "contours": [ @@ -137,19 +137,19 @@ "points": [ { "x": 165, -"y": 659 +"y": 409 }, { "x": 136, -"y": 659 +"y": 409 }, { "x": 130, -"y": -110 +"y": 140 }, { "x": 171, -"y": -110 +"y": 140 } ], "isClosed": true @@ -158,15 +158,15 @@ "points": [ { "x": 202, -"y": 600 +"y": 350 }, { "x": 150, -"y": 790 +"y": 540 }, { "x": 100, -"y": 601 +"y": 351 } ], "isClosed": true @@ -176,27 +176,27 @@ "xAdvance": 302 } }, -"MutatorSansBoldWide/foreground": { +"MutatorSansLightWide/foreground": { "glyph": { "path": { "contours": [ { "points": [ { -"x": 616, -"y": 675 +"x": 165, +"y": 659 }, { -"x": 214, -"y": 675 +"x": 136, +"y": 659 }, { -"x": 208, -"y": -200 +"x": 130, +"y": -110 }, { -"x": 623, -"y": -200 +"x": 171, +"y": -110 } ], "isClosed": true @@ -204,23 +204,23 @@ { "points": [ { -"x": 822, -"y": 500 +"x": 202, +"y": 600 }, { -"x": 414, -"y": 926 +"x": 150, +"y": 790 }, { -"x": 10, -"y": 501 +"x": 100, +"y": 601 } ], "isClosed": true } ] }, -"xAdvance": 832 +"xAdvance": 302 } } } diff --git a/tests/data/MutatorSans.fontra/glyphs/colon.json b/tests/data/MutatorSans.fontra/glyphs/colon.json index 0984870..1c7c730 100644 --- a/tests/data/MutatorSans.fontra/glyphs/colon.json +++ b/tests/data/MutatorSans.fontra/glyphs/colon.json @@ -5,53 +5,56 @@ "name": "LightCondensed", "layerName": "MutatorSansLightCondensed/foreground", "location": { -"width": 0.0, -"weight": 150.0 +"weight": 150, +"width": 0 } }, { "name": "BoldCondensed", "layerName": "MutatorSansBoldCondensed/foreground", "location": { -"width": 0.0, -"weight": 850.0 +"weight": 850, +"width": 0 } }, { "name": "LightWide", "layerName": "MutatorSansLightWide/foreground", "location": { -"width": 1000.0, -"weight": 150.0 +"weight": 150, +"width": 1000 } }, { "name": "BoldWide", "layerName": "MutatorSansBoldWide/foreground", "location": { -"width": 1000.0, -"weight": 850.0 +"weight": 850, +"width": 1000 } } ], "layers": { -"MutatorSansLightCondensed/foreground": { +"MutatorSansBoldCondensed/foreground": { "glyph": { "components": [ { -"name": "period" +"name": "period", +"transformation": { +"translateY": 2 +} }, { "name": "period", "transformation": { -"translateY": 360 +"translateY": 372 } } ], -"xAdvance": 170 +"xAdvance": 250 } }, -"MutatorSansBoldCondensed/foreground": { +"MutatorSansBoldWide/foreground": { "glyph": { "components": [ { @@ -67,10 +70,10 @@ } } ], -"xAdvance": 250 +"xAdvance": 310 } }, -"MutatorSansLightWide/foreground": { +"MutatorSansLightCondensed/foreground": { "glyph": { "components": [ { @@ -83,26 +86,23 @@ } } ], -"xAdvance": 290 +"xAdvance": 170 } }, -"MutatorSansBoldWide/foreground": { +"MutatorSansLightWide/foreground": { "glyph": { "components": [ { -"name": "period", -"transformation": { -"translateY": 2 -} +"name": "period" }, { "name": "period", "transformation": { -"translateY": 372 +"translateY": 360 } } ], -"xAdvance": 310 +"xAdvance": 290 } } } diff --git a/tests/data/MutatorSans.fontra/glyphs/comma.json b/tests/data/MutatorSans.fontra/glyphs/comma.json index 1dec3c6..3aba38e 100644 --- a/tests/data/MutatorSans.fontra/glyphs/comma.json +++ b/tests/data/MutatorSans.fontra/glyphs/comma.json @@ -5,118 +5,118 @@ "name": "LightCondensed", "layerName": "MutatorSansLightCondensed/foreground", "location": { -"width": 0.0, -"weight": 150.0 +"weight": 150, +"width": 0 } }, { "name": "BoldCondensed", "layerName": "MutatorSansBoldCondensed/foreground", "location": { -"width": 0.0, -"weight": 850.0 +"weight": 850, +"width": 0 } }, { "name": "LightWide", "layerName": "MutatorSansLightWide/foreground", "location": { -"width": 1000.0, -"weight": 150.0 +"weight": 150, +"width": 1000 } }, { "name": "BoldWide", "layerName": "MutatorSansBoldWide/foreground", "location": { -"width": 1000.0, -"weight": 850.0 +"weight": 850, +"width": 1000 } } ], "layers": { -"MutatorSansLightCondensed/foreground": { +"MutatorSansBoldCondensed/foreground": { "glyph": { "path": { "contours": [ { "points": [ { -"x": 111, +"x": 220, "y": 0 }, { -"x": 111, -"y": 120 +"x": 220, +"y": 300 }, { -"x": 61, -"y": 120 +"x": 30, +"y": 300 }, { -"x": 61, +"x": 30, "y": 0 }, { -"x": 93, -"y": -8 +"x": 109, +"y": -16 }, { -"x": 82, +"x": 101, "y": 12 }, { -"x": 60, -"y": -93 +"x": 79, +"y": -143 }, { -"x": 72, -"y": -95 +"x": 151, +"y": -145 } ], "isClosed": true } ] }, -"xAdvance": 171 +"xAdvance": 250 } }, -"MutatorSansBoldCondensed/foreground": { +"MutatorSansBoldWide/foreground": { "glyph": { "path": { "contours": [ { "points": [ { -"x": 220, +"x": 250, "y": 0 }, { -"x": 220, +"x": 250, "y": 300 }, { -"x": 30, +"x": 60, "y": 300 }, { -"x": 30, +"x": 60, "y": 0 }, { -"x": 109, +"x": 139, "y": -16 }, { -"x": 101, +"x": 131, "y": 12 }, { -"x": 79, +"x": 109, "y": -143 }, { -"x": 151, +"x": 181, "y": -145 } ], @@ -124,45 +124,45 @@ } ] }, -"xAdvance": 250 +"xAdvance": 310 } }, -"MutatorSansLightWide/foreground": { +"MutatorSansLightCondensed/foreground": { "glyph": { "path": { "contours": [ { "points": [ { -"x": 171, +"x": 111, "y": 0 }, { -"x": 171, -"y": 220 +"x": 111, +"y": 120 }, { -"x": 121, -"y": 220 +"x": 61, +"y": 120 }, { -"x": 121, +"x": 61, "y": 0 }, { -"x": 153, +"x": 93, "y": -8 }, { -"x": 142, +"x": 82, "y": 12 }, { -"x": 120, +"x": 60, "y": -93 }, { -"x": 132, +"x": 72, "y": -95 } ], @@ -170,53 +170,53 @@ } ] }, -"xAdvance": 291 +"xAdvance": 171 } }, -"MutatorSansBoldWide/foreground": { +"MutatorSansLightWide/foreground": { "glyph": { "path": { "contours": [ { "points": [ { -"x": 250, +"x": 171, "y": 0 }, { -"x": 250, -"y": 300 +"x": 171, +"y": 220 }, { -"x": 60, -"y": 300 +"x": 121, +"y": 220 }, { -"x": 60, +"x": 121, "y": 0 }, { -"x": 139, -"y": -16 +"x": 153, +"y": -8 }, { -"x": 131, +"x": 142, "y": 12 }, { -"x": 109, -"y": -143 +"x": 120, +"y": -93 }, { -"x": 181, -"y": -145 +"x": 132, +"y": -95 } ], "isClosed": true } ] }, -"xAdvance": 310 +"xAdvance": 291 } } } diff --git a/tests/data/MutatorSans.fontra/glyphs/dieresis.json b/tests/data/MutatorSans.fontra/glyphs/dieresis.json index bdcd646..51ed937 100644 --- a/tests/data/MutatorSans.fontra/glyphs/dieresis.json +++ b/tests/data/MutatorSans.fontra/glyphs/dieresis.json @@ -5,78 +5,78 @@ "name": "LightCondensed", "layerName": "MutatorSansLightCondensed/foreground", "location": { -"width": 0.0, -"weight": 150.0 +"weight": 150, +"width": 0 } }, { "name": "BoldCondensed", "layerName": "MutatorSansBoldCondensed/foreground", "location": { -"width": 0.0, -"weight": 850.0 +"weight": 850, +"width": 0 } }, { "name": "LightWide", "layerName": "MutatorSansLightWide/foreground", "location": { -"width": 1000.0, -"weight": 150.0 +"weight": 150, +"width": 1000 } }, { "name": "BoldWide", "layerName": "MutatorSansBoldWide/foreground", "location": { -"width": 1000.0, -"weight": 850.0 +"weight": 850, +"width": 1000 } } ], "layers": { -"MutatorSansLightCondensed/foreground": { +"MutatorSansBoldCondensed/foreground": { "glyph": { "components": [ { "name": "dot", "transformation": { +"translateX": -10, "translateY": -10 } }, { "name": "dot", "transformation": { -"translateX": 80, +"translateX": 220, "translateY": -10 } } ], -"xAdvance": 250 +"xAdvance": 520 } }, -"MutatorSansBoldCondensed/foreground": { +"MutatorSansBoldWide/foreground": { "glyph": { "components": [ { "name": "dot", "transformation": { -"translateX": -10, "translateY": -10 } }, { "name": "dot", "transformation": { -"translateX": 220, +"translateX": 250, "translateY": -10 } } ], -"xAdvance": 520 +"xAdvance": 560 } }, -"MutatorSansLightWide/foreground": { +"MutatorSansLightCondensed/foreground": { "glyph": { "components": [ { @@ -88,15 +88,15 @@ { "name": "dot", "transformation": { -"translateX": 205, +"translateX": 80, "translateY": -10 } } ], -"xAdvance": 345 +"xAdvance": 250 } }, -"MutatorSansBoldWide/foreground": { +"MutatorSansLightWide/foreground": { "glyph": { "components": [ { @@ -108,12 +108,12 @@ { "name": "dot", "transformation": { -"translateX": 250, +"translateX": 205, "translateY": -10 } } ], -"xAdvance": 560 +"xAdvance": 345 } } } diff --git a/tests/data/MutatorSans.fontra/glyphs/dot.json b/tests/data/MutatorSans.fontra/glyphs/dot.json index e1dfee3..a2a407f 100644 --- a/tests/data/MutatorSans.fontra/glyphs/dot.json +++ b/tests/data/MutatorSans.fontra/glyphs/dot.json @@ -5,67 +5,67 @@ "name": "LightCondensed", "layerName": "MutatorSansLightCondensed/foreground", "location": { -"width": 0.0, -"weight": 150.0 +"weight": 150, +"width": 0 } }, { "name": "BoldCondensed", "layerName": "MutatorSansBoldCondensed/foreground", "location": { -"width": 0.0, -"weight": 850.0 +"weight": 850, +"width": 0 } }, { "name": "LightWide", "layerName": "MutatorSansLightWide/foreground", "location": { -"width": 1000.0, -"weight": 150.0 +"weight": 150, +"width": 1000 } }, { "name": "BoldWide", "layerName": "MutatorSansBoldWide/foreground", "location": { -"width": 1000.0, -"weight": 850.0 +"weight": 850, +"width": 1000 } } ], "layers": { -"MutatorSansLightCondensed/foreground": { +"MutatorSansBoldCondensed/foreground": { "glyph": { "path": { "contours": [ { "points": [ { -"x": 50, -"y": 730 +"x": 60, +"y": 840 }, { -"x": 90, -"y": 730 +"x": 250, +"y": 840 }, { -"x": 90, -"y": 790 +"x": 250, +"y": 965 }, { -"x": 50, -"y": 790 +"x": 60, +"y": 965 } ], "isClosed": true } ] }, -"xAdvance": 140 +"xAdvance": 310 } }, -"MutatorSansBoldCondensed/foreground": { +"MutatorSansBoldWide/foreground": { "glyph": { "path": { "contours": [ @@ -95,7 +95,7 @@ "xAdvance": 310 } }, -"MutatorSansLightWide/foreground": { +"MutatorSansLightCondensed/foreground": { "glyph": { "path": { "contours": [ @@ -125,34 +125,34 @@ "xAdvance": 140 } }, -"MutatorSansBoldWide/foreground": { +"MutatorSansLightWide/foreground": { "glyph": { "path": { "contours": [ { "points": [ { -"x": 60, -"y": 840 +"x": 50, +"y": 730 }, { -"x": 250, -"y": 840 +"x": 90, +"y": 730 }, { -"x": 250, -"y": 965 +"x": 90, +"y": 790 }, { -"x": 60, -"y": 965 +"x": 50, +"y": 790 } ], "isClosed": true } ] }, -"xAdvance": 310 +"xAdvance": 140 } } } diff --git a/tests/data/MutatorSans.fontra/glyphs/em.json b/tests/data/MutatorSans.fontra/glyphs/em.json index 01e6007..afc1bd5 100644 --- a/tests/data/MutatorSans.fontra/glyphs/em.json +++ b/tests/data/MutatorSans.fontra/glyphs/em.json @@ -5,28 +5,28 @@ "name": "LightCondensed", "layerName": "MutatorSansLightCondensed/foreground", "location": { -"width": 0.0, -"weight": 150.0 +"weight": 150, +"width": 0 } }, { "name": "BoldWide", "layerName": "MutatorSansBoldWide/foreground", "location": { -"width": 1000.0, -"weight": 850.0 +"weight": 850, +"width": 1000 } } ], "layers": { -"MutatorSansLightCondensed/foreground": { +"MutatorSansBoldWide/foreground": { "glyph": { -"xAdvance": 500 +"xAdvance": 0 } }, -"MutatorSansBoldWide/foreground": { +"MutatorSansLightCondensed/foreground": { "glyph": { -"xAdvance": 0 +"xAdvance": 500 } } } diff --git a/tests/data/MutatorSans.fontra/glyphs/nlitest.json b/tests/data/MutatorSans.fontra/glyphs/nlitest.json index 6c46905..78a10b1 100644 --- a/tests/data/MutatorSans.fontra/glyphs/nlitest.json +++ b/tests/data/MutatorSans.fontra/glyphs/nlitest.json @@ -19,8 +19,8 @@ "name": "", "layerName": "", "location": { -"width": 0.0, -"weight": 150.0 +"weight": 150, +"width": 0 } }, { diff --git a/tests/data/MutatorSans.fontra/glyphs/period.json b/tests/data/MutatorSans.fontra/glyphs/period.json index 2d51e65..c96186b 100644 --- a/tests/data/MutatorSans.fontra/glyphs/period.json +++ b/tests/data/MutatorSans.fontra/glyphs/period.json @@ -5,184 +5,184 @@ "name": "LightCondensed", "layerName": "MutatorSansLightCondensed/foreground", "location": { -"width": 0.0, -"weight": 150.0 +"weight": 150, +"width": 0 } }, { "name": "BoldCondensed", "layerName": "MutatorSansBoldCondensed/foreground", "location": { -"width": 0.0, -"weight": 850.0 +"weight": 850, +"width": 0 } }, { "name": "LightWide", "layerName": "MutatorSansLightWide/foreground", "location": { -"width": 1000.0, -"weight": 150.0 +"weight": 150, +"width": 1000 } }, { "name": "BoldWide", "layerName": "MutatorSansBoldWide/foreground", "location": { -"width": 1000.0, -"weight": 850.0 +"weight": 850, +"width": 1000 } } ], "layers": { -"MutatorSansLightCondensed/foreground": { +"MutatorSansBoldCondensed/foreground": { "glyph": { "path": { "contours": [ { "points": [ { -"x": 60, +"x": 30, "y": 0 }, { -"x": 110, +"x": 220, "y": 0 }, { -"x": 110, -"y": 120 +"x": 220, +"y": 300 }, { -"x": 60, -"y": 120 +"x": 30, +"y": 300 } ], "isClosed": true } ] }, -"xAdvance": 170 +"xAdvance": 250 } }, -"MutatorSansLightCondensed/background": { +"MutatorSansBoldWide/foreground": { "glyph": { "path": { "contours": [ { "points": [ { -"x": 62, +"x": 60, "y": 0 }, { -"x": 112, +"x": 250, "y": 0 }, { -"x": 112, -"y": 120 +"x": 250, +"y": 300 }, { -"x": 62, -"y": 120 +"x": 60, +"y": 300 } ], "isClosed": true } ] }, -"xAdvance": 170 +"xAdvance": 310 } }, -"MutatorSansBoldCondensed/foreground": { +"MutatorSansLightCondensed/background": { "glyph": { "path": { "contours": [ { "points": [ { -"x": 30, +"x": 62, "y": 0 }, { -"x": 220, +"x": 112, "y": 0 }, { -"x": 220, -"y": 300 +"x": 112, +"y": 120 }, { -"x": 30, -"y": 300 +"x": 62, +"y": 120 } ], "isClosed": true } ] }, -"xAdvance": 250 +"xAdvance": 170 } }, -"MutatorSansLightWide/foreground": { +"MutatorSansLightCondensed/foreground": { "glyph": { "path": { "contours": [ { "points": [ { -"x": 120, +"x": 60, "y": 0 }, { -"x": 170, +"x": 110, "y": 0 }, { -"x": 170, -"y": 220 +"x": 110, +"y": 120 }, { -"x": 120, -"y": 220 +"x": 60, +"y": 120 } ], "isClosed": true } ] }, -"xAdvance": 290 +"xAdvance": 170 } }, -"MutatorSansBoldWide/foreground": { +"MutatorSansLightWide/foreground": { "glyph": { "path": { "contours": [ { "points": [ { -"x": 60, +"x": 120, "y": 0 }, { -"x": 250, +"x": 170, "y": 0 }, { -"x": 250, -"y": 300 +"x": 170, +"y": 220 }, { -"x": 60, -"y": 300 +"x": 120, +"y": 220 } ], "isClosed": true } ] }, -"xAdvance": 310 +"xAdvance": 290 } } } diff --git a/tests/data/MutatorSans.fontra/glyphs/quotedblbase.json b/tests/data/MutatorSans.fontra/glyphs/quotedblbase.json index e344fdf..5a4b7fb 100644 --- a/tests/data/MutatorSans.fontra/glyphs/quotedblbase.json +++ b/tests/data/MutatorSans.fontra/glyphs/quotedblbase.json @@ -5,37 +5,37 @@ "name": "LightCondensed", "layerName": "MutatorSansLightCondensed/foreground", "location": { -"width": 0.0, -"weight": 150.0 +"weight": 150, +"width": 0 } }, { "name": "BoldCondensed", "layerName": "MutatorSansBoldCondensed/foreground", "location": { -"width": 0.0, -"weight": 850.0 +"weight": 850, +"width": 0 } }, { "name": "LightWide", "layerName": "MutatorSansLightWide/foreground", "location": { -"width": 1000.0, -"weight": 150.0 +"weight": 150, +"width": 1000 } }, { "name": "BoldWide", "layerName": "MutatorSansBoldWide/foreground", "location": { -"width": 1000.0, -"weight": 850.0 +"weight": 850, +"width": 1000 } } ], "layers": { -"MutatorSansLightCondensed/foreground": { +"MutatorSansBoldCondensed/foreground": { "glyph": { "components": [ { @@ -44,30 +44,34 @@ { "name": "comma", "transformation": { -"translateX": 130 +"translateX": 230 } } ], -"xAdvance": 301 +"xAdvance": 480 } }, -"MutatorSansBoldCondensed/foreground": { +"MutatorSansBoldWide/foreground": { "glyph": { "components": [ { -"name": "comma" +"name": "comma", +"transformation": { +"translateY": 1 +} }, { "name": "comma", "transformation": { -"translateX": 230 +"translateX": 250, +"translateY": 1 } } ], -"xAdvance": 480 +"xAdvance": 560 } }, -"MutatorSansLightWide/foreground": { +"MutatorSansLightCondensed/foreground": { "glyph": { "components": [ { @@ -80,27 +84,23 @@ } } ], -"xAdvance": 421 +"xAdvance": 301 } }, -"MutatorSansBoldWide/foreground": { +"MutatorSansLightWide/foreground": { "glyph": { "components": [ { -"name": "comma", -"transformation": { -"translateY": 1 -} +"name": "comma" }, { "name": "comma", "transformation": { -"translateX": 250, -"translateY": 1 +"translateX": 130 } } ], -"xAdvance": 560 +"xAdvance": 421 } } } diff --git a/tests/data/MutatorSans.fontra/glyphs/quotedblleft.json b/tests/data/MutatorSans.fontra/glyphs/quotedblleft.json index 06ea309..b338217 100644 --- a/tests/data/MutatorSans.fontra/glyphs/quotedblleft.json +++ b/tests/data/MutatorSans.fontra/glyphs/quotedblleft.json @@ -5,134 +5,134 @@ "name": "LightCondensed", "layerName": "MutatorSansLightCondensed/foreground", "location": { -"width": 0.0, -"weight": 150.0 +"weight": 150, +"width": 0 } }, { "name": "BoldCondensed", "layerName": "MutatorSansBoldCondensed/foreground", "location": { -"width": 0.0, -"weight": 850.0 +"weight": 850, +"width": 0 } }, { "name": "LightWide", "layerName": "MutatorSansLightWide/foreground", "location": { -"width": 1000.0, -"weight": 150.0 +"weight": 150, +"width": 1000 } }, { "name": "BoldWide", "layerName": "MutatorSansBoldWide/foreground", "location": { -"width": 1000.0, -"weight": 850.0 +"weight": 850, +"width": 1000 } } ], "layers": { -"MutatorSansLightCondensed/foreground": { +"MutatorSansBoldCondensed/foreground": { "glyph": { "components": [ { "name": "comma", "transformation": { -"translateX": 171, -"translateY": 607, -"scaleX": -1.0, -"scaleY": -1.0 +"translateX": 250, +"translateY": 657, +"scaleX": -1, +"scaleY": -1 } }, { "name": "comma", "transformation": { -"translateX": 301, -"translateY": 607, -"scaleX": -1.0, -"scaleY": -1.0 +"translateX": 480, +"translateY": 657, +"scaleX": -1, +"scaleY": -1 } } ], -"xAdvance": 301 +"xAdvance": 480 } }, -"MutatorSansBoldCondensed/foreground": { +"MutatorSansBoldWide/foreground": { "glyph": { "components": [ { "name": "comma", "transformation": { -"translateX": 250, +"translateX": 310, "translateY": 657, -"scaleX": -1.0, -"scaleY": -1.0 +"scaleX": -1, +"scaleY": -1 } }, { "name": "comma", "transformation": { -"translateX": 480, +"translateX": 540, "translateY": 657, -"scaleX": -1.0, -"scaleY": -1.0 +"scaleX": -1, +"scaleY": -1 } } ], -"xAdvance": 480 +"xAdvance": 540 } }, -"MutatorSansLightWide/foreground": { +"MutatorSansLightCondensed/foreground": { "glyph": { "components": [ { "name": "comma", "transformation": { -"translateX": 291, +"translateX": 171, "translateY": 607, -"scaleX": -1.0, -"scaleY": -1.0 +"scaleX": -1, +"scaleY": -1 } }, { "name": "comma", "transformation": { -"translateX": 421, +"translateX": 301, "translateY": 607, -"scaleX": -1.0, -"scaleY": -1.0 +"scaleX": -1, +"scaleY": -1 } } ], -"xAdvance": 421 +"xAdvance": 301 } }, -"MutatorSansBoldWide/foreground": { +"MutatorSansLightWide/foreground": { "glyph": { "components": [ { "name": "comma", "transformation": { -"translateX": 310, -"translateY": 657, -"scaleX": -1.0, -"scaleY": -1.0 +"translateX": 291, +"translateY": 607, +"scaleX": -1, +"scaleY": -1 } }, { "name": "comma", "transformation": { -"translateX": 540, -"translateY": 657, -"scaleX": -1.0, -"scaleY": -1.0 +"translateX": 421, +"translateY": 607, +"scaleX": -1, +"scaleY": -1 } } ], -"xAdvance": 540 +"xAdvance": 421 } } } diff --git a/tests/data/MutatorSans.fontra/glyphs/quotedblright.json b/tests/data/MutatorSans.fontra/glyphs/quotedblright.json index 584d568..a774517 100644 --- a/tests/data/MutatorSans.fontra/glyphs/quotedblright.json +++ b/tests/data/MutatorSans.fontra/glyphs/quotedblright.json @@ -5,57 +5,57 @@ "name": "LightCondensed", "layerName": "MutatorSansLightCondensed/foreground", "location": { -"width": 0.0, -"weight": 150.0 +"weight": 150, +"width": 0 } }, { "name": "BoldCondensed", "layerName": "MutatorSansBoldCondensed/foreground", "location": { -"width": 0.0, -"weight": 850.0 +"weight": 850, +"width": 0 } }, { "name": "LightWide", "layerName": "MutatorSansLightWide/foreground", "location": { -"width": 1000.0, -"weight": 150.0 +"weight": 150, +"width": 1000 } }, { "name": "BoldWide", "layerName": "MutatorSansBoldWide/foreground", "location": { -"width": 1000.0, -"weight": 850.0 +"weight": 850, +"width": 1000 } } ], "layers": { -"MutatorSansLightCondensed/foreground": { +"MutatorSansBoldCondensed/foreground": { "glyph": { "components": [ { "name": "comma", "transformation": { -"translateY": 580 +"translateY": 500 } }, { "name": "comma", "transformation": { -"translateX": 130, -"translateY": 580 +"translateX": 230, +"translateY": 500 } } ], -"xAdvance": 301 +"xAdvance": 480 } }, -"MutatorSansBoldCondensed/foreground": { +"MutatorSansBoldWide/foreground": { "glyph": { "components": [ { @@ -72,47 +72,47 @@ } } ], -"xAdvance": 480 +"xAdvance": 540 } }, -"MutatorSansLightWide/foreground": { +"MutatorSansLightCondensed/foreground": { "glyph": { "components": [ { "name": "comma", "transformation": { -"translateY": 480 +"translateY": 580 } }, { "name": "comma", "transformation": { "translateX": 130, -"translateY": 480 +"translateY": 580 } } ], -"xAdvance": 421 +"xAdvance": 301 } }, -"MutatorSansBoldWide/foreground": { +"MutatorSansLightWide/foreground": { "glyph": { "components": [ { "name": "comma", "transformation": { -"translateY": 500 +"translateY": 480 } }, { "name": "comma", "transformation": { -"translateX": 230, -"translateY": 500 +"translateX": 130, +"translateY": 480 } } ], -"xAdvance": 540 +"xAdvance": 421 } } } diff --git a/tests/data/MutatorSans.fontra/glyphs/quotesinglbase.json b/tests/data/MutatorSans.fontra/glyphs/quotesinglbase.json index 47b84af..a037f9b 100644 --- a/tests/data/MutatorSans.fontra/glyphs/quotesinglbase.json +++ b/tests/data/MutatorSans.fontra/glyphs/quotesinglbase.json @@ -5,77 +5,77 @@ "name": "LightCondensed", "layerName": "MutatorSansLightCondensed/foreground", "location": { -"width": 0.0, -"weight": 150.0 +"weight": 150, +"width": 0 } }, { "name": "BoldCondensed", "layerName": "MutatorSansBoldCondensed/foreground", "location": { -"width": 0.0, -"weight": 850.0 +"weight": 850, +"width": 0 } }, { "name": "LightWide", "layerName": "MutatorSansLightWide/foreground", "location": { -"width": 1000.0, -"weight": 150.0 +"weight": 150, +"width": 1000 } }, { "name": "BoldWide", "layerName": "MutatorSansBoldWide/foreground", "location": { -"width": 1000.0, -"weight": 850.0 +"weight": 850, +"width": 1000 } } ], "layers": { -"MutatorSansLightCondensed/foreground": { +"MutatorSansBoldCondensed/foreground": { "glyph": { "components": [ { "name": "comma" } ], -"xAdvance": 171 +"xAdvance": 250 } }, -"MutatorSansBoldCondensed/foreground": { +"MutatorSansBoldWide/foreground": { "glyph": { "components": [ { -"name": "comma" +"name": "comma", +"transformation": { +"translateY": 2 +} } ], -"xAdvance": 250 +"xAdvance": 310 } }, -"MutatorSansLightWide/foreground": { +"MutatorSansLightCondensed/foreground": { "glyph": { "components": [ { "name": "comma" } ], -"xAdvance": 291 +"xAdvance": 171 } }, -"MutatorSansBoldWide/foreground": { +"MutatorSansLightWide/foreground": { "glyph": { "components": [ { -"name": "comma", -"transformation": { -"translateY": 2 -} +"name": "comma" } ], -"xAdvance": 310 +"xAdvance": 291 } } } diff --git a/tests/data/MutatorSans.fontra/glyphs/semicolon.json b/tests/data/MutatorSans.fontra/glyphs/semicolon.json index 8778754..47b00fc 100644 --- a/tests/data/MutatorSans.fontra/glyphs/semicolon.json +++ b/tests/data/MutatorSans.fontra/glyphs/semicolon.json @@ -5,53 +5,56 @@ "name": "LightCondensed", "layerName": "MutatorSansLightCondensed/foreground", "location": { -"width": 0.0, -"weight": 150.0 +"weight": 150, +"width": 0 } }, { "name": "BoldCondensed", "layerName": "MutatorSansBoldCondensed/foreground", "location": { -"width": 0.0, -"weight": 850.0 +"weight": 850, +"width": 0 } }, { "name": "LightWide", "layerName": "MutatorSansLightWide/foreground", "location": { -"width": 1000.0, -"weight": 150.0 +"weight": 150, +"width": 1000 } }, { "name": "BoldWide", "layerName": "MutatorSansBoldWide/foreground", "location": { -"width": 1000.0, -"weight": 850.0 +"weight": 850, +"width": 1000 } } ], "layers": { -"MutatorSansLightCondensed/foreground": { +"MutatorSansBoldCondensed/foreground": { "glyph": { "components": [ { -"name": "comma" +"name": "comma", +"transformation": { +"translateY": 2 +} }, { "name": "period", "transformation": { -"translateY": 360 +"translateY": 372 } } ], -"xAdvance": 171 +"xAdvance": 250 } }, -"MutatorSansBoldCondensed/foreground": { +"MutatorSansBoldWide/foreground": { "glyph": { "components": [ { @@ -67,10 +70,10 @@ } } ], -"xAdvance": 250 +"xAdvance": 310 } }, -"MutatorSansLightWide/foreground": { +"MutatorSansLightCondensed/foreground": { "glyph": { "components": [ { @@ -83,26 +86,23 @@ } } ], -"xAdvance": 291 +"xAdvance": 171 } }, -"MutatorSansBoldWide/foreground": { +"MutatorSansLightWide/foreground": { "glyph": { "components": [ { -"name": "comma", -"transformation": { -"translateY": 2 -} +"name": "comma" }, { "name": "period", "transformation": { -"translateY": 372 +"translateY": 360 } } ], -"xAdvance": 310 +"xAdvance": 291 } } } diff --git a/tests/data/MutatorSans.fontra/glyphs/space.json b/tests/data/MutatorSans.fontra/glyphs/space.json index 5641d88..622a632 100644 --- a/tests/data/MutatorSans.fontra/glyphs/space.json +++ b/tests/data/MutatorSans.fontra/glyphs/space.json @@ -5,52 +5,52 @@ "name": "LightCondensed", "layerName": "MutatorSansLightCondensed/foreground", "location": { -"width": 0.0, -"weight": 150.0 +"weight": 150, +"width": 0 } }, { "name": "BoldCondensed", "layerName": "MutatorSansBoldCondensed/foreground", "location": { -"width": 0.0, -"weight": 850.0 +"weight": 850, +"width": 0 } }, { "name": "LightWide", "layerName": "MutatorSansLightWide/foreground", "location": { -"width": 1000.0, -"weight": 150.0 +"weight": 150, +"width": 1000 } }, { "name": "BoldWide", "layerName": "MutatorSansBoldWide/foreground", "location": { -"width": 1000.0, -"weight": 850.0 +"weight": 850, +"width": 1000 } } ], "layers": { -"MutatorSansLightCondensed/foreground": { +"MutatorSansBoldCondensed/foreground": { "glyph": { "xAdvance": 250 } }, -"MutatorSansBoldCondensed/foreground": { +"MutatorSansBoldWide/foreground": { "glyph": { "xAdvance": 250 } }, -"MutatorSansLightWide/foreground": { +"MutatorSansLightCondensed/foreground": { "glyph": { "xAdvance": 250 } }, -"MutatorSansBoldWide/foreground": { +"MutatorSansLightWide/foreground": { "glyph": { "xAdvance": 250 } diff --git a/tests/data/MutatorSans.fontra/glyphs/varcotest1.json b/tests/data/MutatorSans.fontra/glyphs/varcotest1.json index 4e68c75..dbf6b82 100644 --- a/tests/data/MutatorSans.fontra/glyphs/varcotest1.json +++ b/tests/data/MutatorSans.fontra/glyphs/varcotest1.json @@ -5,16 +5,16 @@ "name": "LightCondensed", "layerName": "MutatorSansLightCondensed/foreground", "location": { -"width": 0.0, -"weight": 150.0 +"weight": 150, +"width": 0 } }, { "name": "weight=850", "layerName": "weight=850", "location": { -"width": 0.0, -"weight": 850.0 +"weight": 850, +"width": 0 } } ], @@ -44,8 +44,8 @@ "skewX": 20 }, "location": { -"flip": 70.0, -"flop": 30.0 +"flip": 70, +"flop": 30 } }, { @@ -60,7 +60,7 @@ }, "location": { "flip": 20, -"flop": 80.0 +"flop": 80 } } ], diff --git a/tests/data/MutatorSans.fontra/glyphs/varcotest2.json b/tests/data/MutatorSans.fontra/glyphs/varcotest2.json index b46b772..69c106c 100644 --- a/tests/data/MutatorSans.fontra/glyphs/varcotest2.json +++ b/tests/data/MutatorSans.fontra/glyphs/varcotest2.json @@ -19,8 +19,8 @@ "name": "LightCondensed", "layerName": "MutatorSansLightCondensed/foreground", "location": { -"width": 0.0, -"weight": 150.0 +"weight": 150, +"width": 0 } }, {