From f5efb39768d0f9c8c59f7db080625e69489bdaaa Mon Sep 17 00:00:00 2001 From: Aaron Ruan Date: Sat, 6 Apr 2024 17:00:11 +0800 Subject: [PATCH] 1.005update1 --- src/InterNumeric.glyphspackage/fontinfo.plist | 2 +- .../glyphs/A_.glyph | 276 +++++++++++++++-- .../glyphs/divide.case.glyph | 76 ++++- .../glyphs/divide.glyph | 289 +++++++++++++++++- .../glyphs/divide.tf.case.glyph | 75 ++++- .../glyphs/divide.tf.glyph | 75 ++++- .../glyphs/one.cv01.glyph | 88 +++--- src/InterNumeric.glyphspackage/order.plist | 6 +- version.txt | 2 +- 9 files changed, 781 insertions(+), 108 deletions(-) diff --git a/src/InterNumeric.glyphspackage/fontinfo.plist b/src/InterNumeric.glyphspackage/fontinfo.plist index 94b1b5d..5c62e1e 100644 --- a/src/InterNumeric.glyphspackage/fontinfo.plist +++ b/src/InterNumeric.glyphspackage/fontinfo.plist @@ -1839,5 +1839,5 @@ name = V; ); unitsPerEm = 2048; versionMajor = 1; -versionMinor = 4; +versionMinor = 5; } diff --git a/src/InterNumeric.glyphspackage/glyphs/A_.glyph b/src/InterNumeric.glyphspackage/glyphs/A_.glyph index 5269fc5..40fe2dc 100644 --- a/src/InterNumeric.glyphspackage/glyphs/A_.glyph +++ b/src/InterNumeric.glyphspackage/glyphs/A_.glyph @@ -5,15 +5,95 @@ kernLeft = A; kernRight = A; layers = ( { +background = { +shapes = ( +{ +closed = 1; +nodes = ( +(69,0,l), +(499,1154,ls), +(539,1261,o), +(578,1367,o), +(617,1474,c), +(599,1474,l), +(638,1367,o), +(677,1261,o), +(717,1154,cs), +(1149,0,l), +(1198,0,l), +(640,1490,l), +(577,1490,l), +(20,0,l) +); +} +); +}; layerId = "45635B2B-919A-4B12-975B-2FA0A7CA8B35"; +shapes = ( +{ +closed = 1; +nodes = ( +(59,0,ls), +(65,0,o), +(70,4,o), +(72,9,cs), +(499,1154,ls), +(539,1261,o), +(578,1367,o), +(617,1474,c), +(599,1474,l), +(638,1367,o), +(677,1261,o), +(717,1154,cs), +(1146,9,ls), +(1148,4,o), +(1153,0,o), +(1159,0,cs), +(1174,0,ls), +(1186,0,o), +(1193,12,o), +(1189,24,cs), +(643,1481,ls), +(641,1486,o), +(636,1490,o), +(630,1490,cs), +(587,1490,ls), +(581,1490,o), +(576,1486,o), +(574,1481,cs), +(29,24,ls), +(25,12,o), +(33,0,o), +(45,0,cs) +); +}, +{ +closed = 1; +nodes = ( +(977,491,l), +(977,537,l), +(241,537,l), +(241,491,l) +); +} +); width = 1218; }, { -layerId = m007; +background = { shapes = ( { closed = 1; nodes = ( +(977,491,l), +(977,537,l), +(241,537,l), +(241,491,l) +); +}, +{ +closed = 1; +nodes = ( (69,0,l), (499,1154,ls), (539,1261,o), @@ -29,6 +109,47 @@ nodes = ( (577,1490,l), (20,0,l) ); +} +); +}; +layerId = m007; +shapes = ( +{ +closed = 1; +nodes = ( +(59,0,ls), +(65,0,o), +(70,4,o), +(72,9,cs), +(499,1154,ls), +(539,1261,o), +(578,1367,o), +(617,1474,c), +(599,1474,l), +(638,1367,o), +(677,1261,o), +(717,1154,cs), +(1146,9,ls), +(1148,4,o), +(1153,0,o), +(1159,0,cs), +(1174,0,ls), +(1186,0,o), +(1193,12,o), +(1189,24,cs), +(643,1481,ls), +(641,1486,o), +(636,1490,o), +(630,1490,cs), +(587,1490,ls), +(581,1490,o), +(576,1486,o), +(574,1481,cs), +(29,24,ls), +(25,12,o), +(33,0,o), +(45,0,cs) +); }, { closed = 1; @@ -43,7 +164,116 @@ nodes = ( width = 1218; }, { +background = { +shapes = ( +{ +closed = 0; +nodes = ( +(570,1471,l), +(31,29,ls), +(26,16,o), +(35,-2,o), +(52,-2,cs), +(62,-2,o), +(71,5,o), +(74,13,cs), +(499,1154,ls), +(536,1252,o), +(571,1349,o), +(607,1446,cs), +(613,1463,o), +(613,1474,o), +(608,1474,cs), +(603,1474,o), +(603,1463,o), +(609,1446,cs), +(645,1349,o), +(680,1252,o), +(717,1154,cs), +(1144,13,ls), +(1147,5,o), +(1156,-2,o), +(1166,-2,cs), +(1183,-2,o), +(1192,16,o), +(1187,29,cs), +(647,1471,l) +); +}, +{ +closed = 1; +nodes = ( +(631,1414,o), +(650,1432,o), +(650,1455,cs), +(650,1461,o), +(649,1466,o), +(647,1471,cs), +(640,1486,o), +(625,1497,o), +(608,1497,cs), +(591,1497,o), +(576,1486,o), +(570,1471,cs), +(568,1466,o), +(567,1461,o), +(567,1455,cs), +(567,1432,o), +(585,1414,o), +(608,1414,cs) +); +} +); +}; layerId = m005; +shapes = ( +{ +closed = 1; +nodes = ( +(52,-2,ls), +(62,-2,o), +(71,5,o), +(74,13,cs), +(499,1154,ls), +(539,1261,o), +(578,1367,o), +(617,1474,c), +(599,1474,l), +(638,1367,o), +(677,1261,o), +(717,1154,cs), +(1144,13,ls), +(1147,5,o), +(1156,-2,o), +(1166,-2,cs), +(1166,-2,ls), +(1183,-2,o), +(1192,16,o), +(1187,29,cs), +(649,1466,ls), +(641,1486,o), +(625,1497,o), +(608,1497,cs), +(608,1497,ls), +(591,1497,o), +(576,1486,o), +(570,1471,cs), +(31,29,ls), +(26,16,o), +(35,-2,o), +(52,-2,cs) +); +}, +{ +closed = 1; +nodes = ( +(977,491,l), +(977,537,l), +(241,537,l), +(241,491,l) +); +} +); width = 1218; }, { @@ -51,6 +281,19 @@ layerId = "B487E3D2-4ABF-4A2A-A195-DC6AACAFF568"; width = 1338; }, { +background = { +shapes = ( +{ +closed = 1; +nodes = ( +(1034,418,l), +(1034,578,l), +(304,578,l), +(304,418,l) +); +} +); +}; layerId = m008; shapes = ( { @@ -71,15 +314,6 @@ nodes = ( (570,1490,l), (20,0,l) ); -}, -{ -closed = 1; -nodes = ( -(1034,418,l), -(1034,578,l), -(304,578,l), -(304,418,l) -); } ); width = 1338; @@ -93,6 +327,19 @@ layerId = m01; width = 1565; }, { +background = { +shapes = ( +{ +closed = 1; +nodes = ( +(1193,245,l), +(1193,565,l), +(373,565,l), +(373,245,l) +); +} +); +}; layerId = m009; shapes = ( { @@ -113,15 +360,6 @@ nodes = ( (500,1490,l), (0,0,l) ); -}, -{ -closed = 1; -nodes = ( -(1193,245,l), -(1193,565,l), -(373,565,l), -(373,245,l) -); } ); width = 1565; diff --git a/src/InterNumeric.glyphspackage/glyphs/divide.case.glyph b/src/InterNumeric.glyphspackage/glyphs/divide.case.glyph index 2e5dbff..cb55e65 100644 --- a/src/InterNumeric.glyphspackage/glyphs/divide.case.glyph +++ b/src/InterNumeric.glyphspackage/glyphs/divide.case.glyph @@ -1,42 +1,98 @@ { -export = 0; +color = 7; glyphname = divide.case; layers = ( { layerId = m008; -width = 600; +shapes = ( +{ +pos = (0,163); +ref = divide; +} +); +width = 1286; }, { layerId = "B487E3D2-4ABF-4A2A-A195-DC6AACAFF568"; -width = 600; +shapes = ( +{ +pos = (0,163); +ref = divide; +} +); +width = 1286; }, { layerId = m005; -width = 600; +shapes = ( +{ +pos = (0,163); +ref = divide; +} +); +width = 1176; }, { layerId = "45635B2B-919A-4B12-975B-2FA0A7CA8B35"; -width = 600; +shapes = ( +{ +pos = (0,163); +ref = divide; +} +); +width = 1176; }, { layerId = m01; -width = 600; +shapes = ( +{ +pos = (0,140); +ref = divide; +} +); +width = 1420; }, { layerId = m009; -width = 600; +shapes = ( +{ +pos = (0,140); +ref = divide; +} +); +width = 1420; }, { layerId = m006; -width = 600; +shapes = ( +{ +pos = (0,140); +ref = divide; +} +); +width = 1420; }, { layerId = m007; -width = 600; +shapes = ( +{ +pos = (0,163); +ref = divide; +} +); +width = 1176; }, { layerId = m004; -width = 600; +shapes = ( +{ +pos = (0,163); +ref = divide; +} +); +width = 1286; } ); +metricLeft = "=divide"; +metricRight = "=divide"; } diff --git a/src/InterNumeric.glyphspackage/glyphs/divide.glyph b/src/InterNumeric.glyphspackage/glyphs/divide.glyph index a5cd763..448684b 100644 --- a/src/InterNumeric.glyphspackage/glyphs/divide.glyph +++ b/src/InterNumeric.glyphspackage/glyphs/divide.glyph @@ -1,43 +1,312 @@ { -export = 0; +color = 4; glyphname = divide; layers = ( { layerId = m008; -width = 600; +shapes = ( +{ +ref = minus; +}, +{ +pos = (418,97); +ref = period; +}, +{ +alignment = -1; +pos = (418,851); +ref = period; +} +); +width = 1286; +}, +{ +background = { +shapes = ( +{ +closed = 1; +nodes = ( +(178,664,l), +(178,500,l), +(1108,500,l), +(1108,664,l) +); +}, +{ +closed = 1; +nodes = ( +(713,76,o), +(770,134,o), +(770,206,cs), +(770,276,o), +(713,334,o), +(642,334,cs), +(570,334,o), +(512,276,o), +(512,206,cs), +(512,134,o), +(570,76,o), +(642,76,cs) +); }, { +closed = 1; +nodes = ( +(713,829,o), +(770,887,o), +(770,960,cs), +(770,1030,o), +(713,1088,o), +(642,1088,cs), +(570,1088,o), +(512,1030,o), +(512,960,cs), +(512,887,o), +(570,829,o), +(642,830,cs) +); +} +); +}; layerId = "B487E3D2-4ABF-4A2A-A195-DC6AACAFF568"; -width = 600; +shapes = ( +{ +ref = minus; +}, +{ +pos = (418,97); +ref = period; +}, +{ +alignment = -1; +pos = (418,851); +ref = period; +} +); +width = 1286; }, { layerId = m005; -width = 600; +shapes = ( +{ +ref = minus; +}, +{ +pos = (388,204); +ref = period; +}, +{ +alignment = -1; +pos = (388,876); +ref = period; +} +); +width = 1176; +}, +{ +background = { +shapes = ( +{ +closed = 1; +nodes = ( +(166,605,l), +(166,559,l), +(1010,559,l), +(1010,605,l) +); }, { +closed = 1; +nodes = ( +(617,198,o), +(640,221,o), +(640,250,cs), +(640,279,o), +(617,302,o), +(588,302,cs), +(559,302,o), +(536,279,o), +(536,250,cs), +(536,221,o), +(559,198,o), +(588,198,cs) +); +}, +{ +closed = 1; +nodes = ( +(617,861,o), +(640,884,o), +(640,914,cs), +(640,943,o), +(617,966,o), +(588,966,cs), +(559,966,o), +(536,943,o), +(536,914,cs), +(536,884,o), +(559,861,o), +(588,862,cs) +); +} +); +}; layerId = "45635B2B-919A-4B12-975B-2FA0A7CA8B35"; -width = 600; +shapes = ( +{ +ref = minus; }, { +pos = (388,204); +ref = period; +}, +{ +alignment = -1; +pos = (388,876); +ref = period; +} +); +width = 1176; +}, +{ +background = { +shapes = ( +{ +closed = 1; +nodes = ( +(156,756,l), +(156,454,l), +(1232,454,l), +(1232,756,l) +); +}, +{ +closed = 1; +nodes = ( +(806,-23,o), +(898,68,o), +(898,184,cs), +(898,295,o), +(806,386,o), +(694,386,cs), +(579,386,o), +(488,295,o), +(488,184,cs), +(488,68,o), +(579,-23,o), +(694,-24,cs) +); +}, +{ +closed = 1; +nodes = ( +(807,823,o), +(898,916,o), +(898,1030,cs), +(898,1143,o), +(807,1234,o), +(694,1234,cs), +(580,1234,o), +(488,1143,o), +(488,1030,cs), +(488,916,o), +(580,823,o), +(694,824,cs) +); +} +); +}; layerId = m01; -width = 600; +shapes = ( +{ +ref = minus; +}, +{ +pos = (438,-5); +ref = period; +}, +{ +alignment = -1; +pos = (438,837); +ref = period; +} +); +width = 1420; }, { layerId = m009; -width = 600; +shapes = ( +{ +ref = minus; +}, +{ +pos = (438,-5); +ref = period; +}, +{ +alignment = -1; +pos = (438,837); +ref = period; +} +); +width = 1420; }, { layerId = m006; -width = 600; +shapes = ( +{ +ref = minus; +}, +{ +pos = (438,-5); +ref = period; +}, +{ +alignment = -1; +pos = (438,837); +ref = period; +} +); +width = 1420; }, { layerId = m007; -width = 600; +shapes = ( +{ +ref = minus; +}, +{ +pos = (388,204); +ref = period; +}, +{ +alignment = -1; +pos = (388,876); +ref = period; +} +); +width = 1176; }, { layerId = m004; -width = 600; +shapes = ( +{ +ref = minus; +}, +{ +pos = (418,97); +ref = period; +}, +{ +alignment = -1; +pos = (418,851); +ref = period; +} +); +width = 1286; } ); +metricLeft = "=minus"; +metricRight = "=minus"; unicode = 247; } diff --git a/src/InterNumeric.glyphspackage/glyphs/divide.tf.case.glyph b/src/InterNumeric.glyphspackage/glyphs/divide.tf.case.glyph index e333679..18ae4da 100644 --- a/src/InterNumeric.glyphspackage/glyphs/divide.tf.case.glyph +++ b/src/InterNumeric.glyphspackage/glyphs/divide.tf.case.glyph @@ -1,42 +1,97 @@ { -export = 0; +color = 7; glyphname = divide.tf.case; layers = ( { layerId = m008; -width = 600; +shapes = ( +{ +pos = (17,0); +ref = divide.case; +} +); +width = 1320; }, { layerId = "B487E3D2-4ABF-4A2A-A195-DC6AACAFF568"; -width = 600; +shapes = ( +{ +pos = (17,0); +ref = divide.case; +} +); +width = 1320; }, { layerId = m005; -width = 600; +shapes = ( +{ +pos = (72,0); +ref = divide.case; +} +); +width = 1320; }, { layerId = "45635B2B-919A-4B12-975B-2FA0A7CA8B35"; -width = 600; +shapes = ( +{ +pos = (72,0); +ref = divide.case; +} +); +width = 1320; }, { layerId = m01; -width = 600; +shapes = ( +{ +pos = (-50,0); +ref = divide.case; +} +); +width = 1320; }, { layerId = m009; -width = 600; +shapes = ( +{ +pos = (-50,0); +ref = divide.case; +} +); +width = 1320; }, { layerId = m006; -width = 600; +shapes = ( +{ +pos = (-50,0); +ref = divide.case; +} +); +width = 1320; }, { layerId = m007; -width = 600; +shapes = ( +{ +pos = (72,0); +ref = divide.case; +} +); +width = 1320; }, { layerId = m004; -width = 600; +shapes = ( +{ +pos = (17,0); +ref = divide.case; +} +); +width = 1320; } ); +metricWidth = zero.tf; } diff --git a/src/InterNumeric.glyphspackage/glyphs/divide.tf.glyph b/src/InterNumeric.glyphspackage/glyphs/divide.tf.glyph index 9c1a7ea..a9dbddb 100644 --- a/src/InterNumeric.glyphspackage/glyphs/divide.tf.glyph +++ b/src/InterNumeric.glyphspackage/glyphs/divide.tf.glyph @@ -1,42 +1,97 @@ { -export = 0; +color = 7; glyphname = divide.tf; layers = ( { layerId = m008; -width = 600; +shapes = ( +{ +pos = (17,0); +ref = divide; +} +); +width = 1320; }, { layerId = "B487E3D2-4ABF-4A2A-A195-DC6AACAFF568"; -width = 600; +shapes = ( +{ +pos = (17,0); +ref = divide; +} +); +width = 1320; }, { layerId = m005; -width = 600; +shapes = ( +{ +pos = (72,0); +ref = divide; +} +); +width = 1320; }, { layerId = "45635B2B-919A-4B12-975B-2FA0A7CA8B35"; -width = 600; +shapes = ( +{ +pos = (72,0); +ref = divide; +} +); +width = 1320; }, { layerId = m01; -width = 600; +shapes = ( +{ +pos = (-50,0); +ref = divide; +} +); +width = 1320; }, { layerId = m009; -width = 600; +shapes = ( +{ +pos = (-50,0); +ref = divide; +} +); +width = 1320; }, { layerId = m006; -width = 600; +shapes = ( +{ +pos = (-50,0); +ref = divide; +} +); +width = 1320; }, { layerId = m007; -width = 600; +shapes = ( +{ +pos = (72,0); +ref = divide; +} +); +width = 1320; }, { layerId = m004; -width = 600; +shapes = ( +{ +pos = (17,0); +ref = divide; +} +); +width = 1320; } ); +metricWidth = zero.tf; } diff --git a/src/InterNumeric.glyphspackage/glyphs/one.cv01.glyph b/src/InterNumeric.glyphspackage/glyphs/one.cv01.glyph index d93cc15..3b122d9 100644 --- a/src/InterNumeric.glyphspackage/glyphs/one.cv01.glyph +++ b/src/InterNumeric.glyphspackage/glyphs/one.cv01.glyph @@ -166,28 +166,28 @@ nodes = ( (765,0,o), (765,0,o), (765,0,cs), -(765,1488,ls), -(765,1488,o), -(765,1488,o), -(765,1488,cs), -(411,1488,ls), -(411,1488,o), -(411,1488,o), -(411,1488,cs), -(399,1316,o), -(277,1243,o), -(64,1243,cs), -(64,1243,o), -(64,1243,o), -(64,1243,cs), -(64,947,ls), -(64,947,o), -(64,947,o), -(64,947,cs), -(64,947,o), -(302,947,o), -(384,947,c), -(365,973,l) +(765,1490,ls), +(765,1490,o), +(765,1490,o), +(765,1490,cs), +(411,1490,ls), +(411,1490,o), +(411,1490,o), +(411,1490,cs), +(399,1318,o), +(277,1245,o), +(64,1245,cs), +(64,1245,o), +(64,1245,o), +(64,1245,cs), +(64,949,ls), +(64,949,o), +(64,949,o), +(64,949,cs), +(64,949,o), +(302,949,o), +(384,949,c), +(365,975,l) ); } ); @@ -314,28 +314,28 @@ nodes = ( (734,0,o), (765,31,o), (765,73,cs), -(765,1415,ls), -(765,1457,o), -(734,1488,o), -(692,1488,cs), -(471,1488,ls), -(435,1488,o), -(410,1464,o), -(402,1428,cs), -(372,1299,o), -(277,1243,o), -(137,1243,cs), -(95,1243,o), -(64,1212,o), -(64,1170,cs), -(64,1020,ls), -(64,978,o), -(95,947,o), -(137,947,cs), -(219,947,o), -(302,947,o), -(384,947,c), -(365,973,l) +(765,1417,ls), +(765,1459,o), +(734,1490,o), +(692,1490,cs), +(471,1490,ls), +(435,1490,o), +(410,1466,o), +(402,1430,cs), +(372,1301,o), +(277,1245,o), +(137,1245,cs), +(95,1245,o), +(64,1214,o), +(64,1172,cs), +(64,1022,ls), +(64,980,o), +(95,949,o), +(137,949,cs), +(219,949,o), +(302,949,o), +(384,949,c), +(365,975,l) ); } ); diff --git a/src/InterNumeric.glyphspackage/order.plist b/src/InterNumeric.glyphspackage/order.plist index 6366fc3..169d5c0 100644 --- a/src/InterNumeric.glyphspackage/order.plist +++ b/src/InterNumeric.glyphspackage/order.plist @@ -76,19 +76,19 @@ degree, plus, minus, multiply, +divide, percent, plus.case, minus.case, multiply.case, +divide.case, plus.tf, minus.tf, multiply.tf, +divide.tf, plus.tf.case, minus.tf.case, multiply.tf.case, -divide, -divide.case, -divide.tf, divide.tf.case, _zero_percent, _zero_percent1, diff --git a/version.txt b/version.txt index 036dc99..abbfc48 100644 --- a/version.txt +++ b/version.txt @@ -1 +1 @@ -1.004 \ No newline at end of file +1.005 \ No newline at end of file