From 580e1e542a32ba6566da7498a8826d3ea54a6617 Mon Sep 17 00:00:00 2001 From: Aaron Ruan Date: Fri, 12 Apr 2024 11:42:02 +0800 Subject: [PATCH] 1.006update1 --- .github/workflows/build_fonts.yaml | 1 + .gitignore | 1 + misc/scripts/get_ver.py | 18 + src/InterNumeric.glyphspackage/UIState.plist | 4 +- src/InterNumeric.glyphspackage/fontinfo.plist | 15 +- .../glyphs/H_.glyph | 1 + .../glyphs/_part.zeroslash.glyph | 31 +- .../glyphs/zero.cv05.glyph | 424 ++++++++++++++++++ .../glyphs/zero.slash.cv05.glyph | 118 +++++ .../glyphs/zero.tf.cv05.glyph | 106 +++++ .../glyphs/zero.tf.slash.cv05.glyph | 106 +++++ src/InterNumeric.glyphspackage/order.plist | 4 + version.txt | 1 - 13 files changed, 817 insertions(+), 13 deletions(-) create mode 100644 misc/scripts/get_ver.py create mode 100644 src/InterNumeric.glyphspackage/glyphs/zero.cv05.glyph create mode 100644 src/InterNumeric.glyphspackage/glyphs/zero.slash.cv05.glyph create mode 100644 src/InterNumeric.glyphspackage/glyphs/zero.tf.cv05.glyph create mode 100644 src/InterNumeric.glyphspackage/glyphs/zero.tf.slash.cv05.glyph delete mode 100644 version.txt diff --git a/.github/workflows/build_fonts.yaml b/.github/workflows/build_fonts.yaml index 95a1d16..b6728ca 100644 --- a/.github/workflows/build_fonts.yaml +++ b/.github/workflows/build_fonts.yaml @@ -60,6 +60,7 @@ jobs: - name: Define version (branch) if: ${{ ! startsWith(github.ref, 'refs/tags/v') }} run: | + python misc/scripts/get_ver.py GITSHA=${{ github.sha }} VERSION=$(cat version.txt) echo "InterNumeric_version=${VERSION}-${GITSHA:0:7}" >> $GITHUB_ENV diff --git a/.gitignore b/.gitignore index 8a0c3d3..25f2336 100644 --- a/.gitignore +++ b/.gitignore @@ -6,3 +6,4 @@ update.md fonts-temp src/InterNumeric（自动存储）.glyphs install.sh +version.txt diff --git a/misc/scripts/get_ver.py b/misc/scripts/get_ver.py new file mode 100644 index 0000000..5ef572c --- /dev/null +++ b/misc/scripts/get_ver.py @@ -0,0 +1,18 @@ +from fontTools.ufoLib import UFOReader +import os + +def get_font_version(ufo_path): + reader = UFOReader(ufo_path) + info = reader._readInfo(validate=False) + return info["versionMajor"], info["versionMinor"] + +inter_numeric_Regular_path = "fonts-temp/master-ufo/InterNumeric-Regular.ufo" +version_major, version_minor = get_font_version(inter_numeric_Regular_path) + +try: + os.remove("version1.txt") +except FileNotFoundError: + pass + +with open("version.txt", "w") as version_file: + version_file.write(f"{version_major}.{version_minor:03}") \ No newline at end of file diff --git a/src/InterNumeric.glyphspackage/UIState.plist b/src/InterNumeric.glyphspackage/UIState.plist index f8565a8..25be0fe 100644 --- a/src/InterNumeric.glyphspackage/UIState.plist +++ b/src/InterNumeric.glyphspackage/UIState.plist @@ -2,6 +2,8 @@ displayStrings = ( "’,/comma.tf", "2/two.tf", -"." +".", +"1/zero.cv05 23 +34:20" ); } diff --git a/src/InterNumeric.glyphspackage/fontinfo.plist b/src/InterNumeric.glyphspackage/fontinfo.plist index 58d482c..96fbe52 100644 --- a/src/InterNumeric.glyphspackage/fontinfo.plist +++ b/src/InterNumeric.glyphspackage/fontinfo.plist @@ -76,6 +76,7 @@ feature cv01; feature cv02; feature cv03; feature cv04; +feature cv05; "; tag = aalt; }, @@ -191,6 +192,16 @@ sub six.tf by six.tf.cv04; sub nine.tf by nine.tf.cv04; "; tag = cv04; +}, +{ +code = "cvParameters { FeatUILabelNameID { name \"Square Zero\"; }; }; + +sub zero by zero.cv05; +sub zero.slash by zero.slash.cv05; +sub zero.tf by zero.tf.cv05; +sub zero.tf.slash by zero.tf.slash.cv05; +"; +tag = cv05; } ); fontMaster = ( @@ -260,7 +271,7 @@ stemValues = ( 46 ); userData = { -GSCornerRadius = 15; +GSCornerRadius = 320; }; }, { @@ -1431,5 +1442,5 @@ name = V; ); unitsPerEm = 2048; versionMajor = 1; -versionMinor = 5; +versionMinor = 6; } diff --git a/src/InterNumeric.glyphspackage/glyphs/H_.glyph b/src/InterNumeric.glyphspackage/glyphs/H_.glyph index 84977e0..d389e2f 100644 --- a/src/InterNumeric.glyphspackage/glyphs/H_.glyph +++ b/src/InterNumeric.glyphspackage/glyphs/H_.glyph @@ -1,4 +1,5 @@ { +color = 4; glyphname = H; kernLeft = B; kernRight = H; diff --git a/src/InterNumeric.glyphspackage/glyphs/_part.zeroslash.glyph b/src/InterNumeric.glyphspackage/glyphs/_part.zeroslash.glyph index ec1ce15..226ae31 100644 --- a/src/InterNumeric.glyphspackage/glyphs/_part.zeroslash.glyph +++ b/src/InterNumeric.glyphspackage/glyphs/_part.zeroslash.glyph @@ -9,7 +9,7 @@ name = _center; pos = (541,745); } ); -layerId = "45635B2B-919A-4B12-975B-2FA0A7CA8B35"; +background = { shapes = ( { closed = 1; @@ -21,6 +21,19 @@ nodes = ( ); } ); +}; +layerId = "45635B2B-919A-4B12-975B-2FA0A7CA8B35"; +shapes = ( +{ +closed = 1; +nodes = ( +(859,1331,l), +(827,1369,l), +(223,163,l), +(252,118,l) +); +} +); width = 1082; }, { @@ -77,10 +90,10 @@ shapes = ( { closed = 1; nodes = ( -(849,1311,l), -(817,1349,l), -(233,183,l), -(262,138,l) +(859,1331,l), +(827,1369,l), +(223,163,l), +(252,118,l) ); } ); @@ -140,10 +153,10 @@ shapes = ( { closed = 1; nodes = ( -(849,1311,l), -(817,1349,l), -(233,183,l), -(262,138,l) +(859,1331,l), +(827,1369,l), +(223,163,l), +(252,118,l) ); } ); diff --git a/src/InterNumeric.glyphspackage/glyphs/zero.cv05.glyph b/src/InterNumeric.glyphspackage/glyphs/zero.cv05.glyph new file mode 100644 index 0000000..667487d --- /dev/null +++ b/src/InterNumeric.glyphspackage/glyphs/zero.cv05.glyph @@ -0,0 +1,424 @@ +{ +color = 9; +glyphname = zero.cv05; +layers = ( +{ +background = { +shapes = ( +{ +ref = zero; +} +); +}; +layerId = "45635B2B-919A-4B12-975B-2FA0A7CA8B35"; +shapes = ( +{ +closed = 1; +nodes = ( +(346.527,30,o), +(172,199,o), +(172,437,c), +(172,1053,l), +(172,1291,o), +(346.527,1460,o), +(569,1460,c), +(791.473,1460,o), +(966,1291,o), +(966,1053,c), +(966,437,l), +(966,199,o), +(791.473,30,o), +(569,30,c) +); +}, +{ +closed = 1; +nodes = ( +(813.527,-16,o), +(1012,177,o), +(1012,437,c), +(1012,1053,l), +(1012,1313,o), +(813.527,1506,o), +(569,1506,c), +(324.473,1506,o), +(126,1313,o), +(126,1053,c), +(126,437,l), +(126,177,o), +(324.473,-16,o), +(569,-16,c) +); +} +); +width = 1138; +}, +{ +background = { +shapes = ( +{ +ref = zero; +} +); +}; +layerId = "B487E3D2-4ABF-4A2A-A195-DC6AACAFF568"; +shapes = ( +{ +closed = 1; +nodes = ( +(431.857,136,o), +(293,270.426,o), +(293,486,c), +(293,1005,l), +(293,1220.574,o), +(431.857,1355,o), +(628,1355,c), +(824.143,1355,o), +(963,1220.574,o), +(963,1005,c), +(963,486,l), +(963,270.426,o), +(824.143,136,o), +(628,136,c) +); +}, +{ +closed = 1; +nodes = ( +(906.257,-24,o), +(1133,193.374,o), +(1133,486,c), +(1133,1005,l), +(1133,1297.626,o), +(906.257,1515,o), +(628,1515,c), +(349.743,1515,o), +(123,1297.626,o), +(123,1005,c), +(123,486,l), +(123,193.374,o), +(349.743,-24,o), +(628,-24,c) +); +} +); +width = 1256; +}, +{ +layerId = m005; +shapes = ( +{ +closed = 1; +nodes = ( +(346.527,30,o), +(172,204.527,o), +(172,427,c), +(172,1063,l), +(172,1285.473,o), +(346.527,1460,o), +(569,1460,c), +(791.473,1460,o), +(966,1285.473,o), +(966,1063,c), +(966,427,l), +(966,204.527,o), +(791.473,30,o), +(569,30,c) +); +}, +{ +closed = 1; +nodes = ( +(813.527,-16,o), +(1012,182.473,o), +(1012,427,c), +(1012,1063,l), +(1012,1307.527,o), +(813.527,1506,o), +(569,1506,c), +(324.473,1506,o), +(126,1307.527,o), +(126,1063,c), +(126,427,l), +(126,182.473,o), +(324.473,-16,o), +(569,-16,c) +); +} +); +width = 1138; +}, +{ +background = { +shapes = ( +{ +ref = zero; +} +); +}; +layerId = m01; +shapes = ( +{ +closed = 1; +nodes = ( +(566.558,296,o), +(488,374.558,o), +(488,546,c), +(488,944,l), +(488,1115.442,o), +(566.558,1194,o), +(698,1194,c), +(829.442,1194,o), +(908,1115.442,o), +(908,944,c), +(908,546,l), +(908,374.558,o), +(829.442,296,o), +(698,296,c) +); +}, +{ +closed = 1; +nodes = ( +(1016.2,-24,o), +(1308,214.442,o), +(1308,546,c), +(1308,944,l), +(1308,1275.558,o), +(1016.2,1514,o), +(698,1514,c), +(379.8,1514,o), +(88,1275.558,o), +(88,944,c), +(88,546,l), +(88,214.442,o), +(379.8,-24,o), +(698,-24,c) +); +} +); +width = 1396; +}, +{ +layerId = m009; +shapes = ( +{ +closed = 1; +nodes = ( +(566.558,296,o), +(488,374.558,o), +(488,546,c), +(488,944,l), +(488,1115.442,o), +(566.558,1194,o), +(698,1194,c), +(829.442,1194,o), +(908,1115.442,o), +(908,944,c), +(908,546,l), +(908,374.558,o), +(829.442,296,o), +(698,296,c) +); +}, +{ +closed = 1; +nodes = ( +(1016.2,-24,o), +(1308,214.442,o), +(1308,546,c), +(1308,944,l), +(1308,1275.558,o), +(1016.2,1514,o), +(698,1514,c), +(379.8,1514,o), +(88,1275.558,o), +(88,944,c), +(88,546,l), +(88,214.442,o), +(379.8,-24,o), +(698,-24,c) +); +} +); +width = 1396; +}, +{ +layerId = m006; +shapes = ( +{ +closed = 1; +nodes = ( +(566.558,296,o), +(488,374.558,o), +(488,546,c), +(488,944,l), +(488,1115.442,o), +(566.558,1194,o), +(698,1194,c), +(829.442,1194,o), +(908,1115.442,o), +(908,944,c), +(908,546,l), +(908,374.558,o), +(829.442,296,o), +(698,296,c) +); +}, +{ +closed = 1; +nodes = ( +(1016.2,-24,o), +(1308,214.442,o), +(1308,546,c), +(1308,944,l), +(1308,1275.558,o), +(1016.2,1514,o), +(698,1514,c), +(379.8,1514,o), +(88,1275.558,o), +(88,944,c), +(88,546,l), +(88,214.442,o), +(379.8,-24,o), +(698,-24,c) +); +} +); +width = 1396; +}, +{ +layerId = m007; +shapes = ( +{ +closed = 1; +nodes = ( +(346.527,30,o), +(172,204.527,o), +(172,427,c), +(172,1063,l), +(172,1285.473,o), +(346.527,1460,o), +(569,1460,c), +(791.473,1460,o), +(966,1285.473,o), +(966,1063,c), +(966,427,l), +(966,204.527,o), +(791.473,30,o), +(569,30,c) +); +}, +{ +closed = 1; +nodes = ( +(813.527,-16,o), +(1012,182.473,o), +(1012,427,c), +(1012,1063,l), +(1012,1307.527,o), +(813.527,1506,o), +(569,1506,c), +(324.473,1506,o), +(126,1307.527,o), +(126,1063,c), +(126,427,l), +(126,182.473,o), +(324.473,-16,o), +(569,-16,c) +); +} +); +width = 1138; +}, +{ +layerId = m004; +shapes = ( +{ +closed = 1; +nodes = ( +(431.857,136,o), +(293,270.426,o), +(293,486,c), +(293,1005,l), +(293,1220.574,o), +(431.857,1355,o), +(628,1355,c), +(824.143,1355,o), +(963,1220.574,o), +(963,1005,c), +(963,486,l), +(963,270.426,o), +(824.143,136,o), +(628,136,c) +); +}, +{ +closed = 1; +nodes = ( +(906.257,-24,o), +(1133,193.374,o), +(1133,486,c), +(1133,1005,l), +(1133,1297.626,o), +(906.257,1515,o), +(628,1515,c), +(349.743,1515,o), +(123,1297.626,o), +(123,1005,c), +(123,486,l), +(123,193.374,o), +(349.743,-24,o), +(628,-24,c) +); +} +); +width = 1256; +}, +{ +layerId = m008; +shapes = ( +{ +closed = 1; +nodes = ( +(431.857,136,o), +(293,270.426,o), +(293,486,c), +(293,1005,l), +(293,1220.574,o), +(431.857,1355,o), +(628,1355,c), +(824.143,1355,o), +(963,1220.574,o), +(963,1005,c), +(963,486,l), +(963,270.426,o), +(824.143,136,o), +(628,136,c) +); +}, +{ +closed = 1; +nodes = ( +(906.257,-24,o), +(1133,193.374,o), +(1133,486,c), +(1133,1005,l), +(1133,1297.626,o), +(906.257,1515,o), +(628,1515,c), +(349.743,1515,o), +(123,1297.626,o), +(123,1005,c), +(123,486,l), +(123,193.374,o), +(349.743,-24,o), +(628,-24,c) +); +} +); +width = 1256; +} +); +metricWidth = zero; +} diff --git a/src/InterNumeric.glyphspackage/glyphs/zero.slash.cv05.glyph b/src/InterNumeric.glyphspackage/glyphs/zero.slash.cv05.glyph new file mode 100644 index 0000000..e1ca90c --- /dev/null +++ b/src/InterNumeric.glyphspackage/glyphs/zero.slash.cv05.glyph @@ -0,0 +1,118 @@ +{ +color = 7; +glyphname = zero.slash.cv05; +layers = ( +{ +layerId = "45635B2B-919A-4B12-975B-2FA0A7CA8B35"; +shapes = ( +{ +ref = zero.cv05; +}, +{ +pos = (28,1); +ref = _part.zeroslash; +} +); +width = 1138; +}, +{ +layerId = "B487E3D2-4ABF-4A2A-A195-DC6AACAFF568"; +shapes = ( +{ +ref = zero.cv05; +}, +{ +ref = _part.zeroslash; +} +); +width = 1256; +}, +{ +layerId = m005; +shapes = ( +{ +ref = zero.cv05; +}, +{ +pos = (28,1); +ref = _part.zeroslash; +} +); +width = 1138; +}, +{ +layerId = m01; +shapes = ( +{ +ref = zero.cv05; +}, +{ +ref = _part.zeroslash; +} +); +width = 1396; +}, +{ +layerId = m009; +shapes = ( +{ +ref = zero.cv05; +}, +{ +ref = _part.zeroslash; +} +); +width = 1396; +}, +{ +layerId = m006; +shapes = ( +{ +ref = zero.cv05; +}, +{ +ref = _part.zeroslash; +} +); +width = 1396; +}, +{ +layerId = m007; +shapes = ( +{ +ref = zero.cv05; +}, +{ +pos = (28,1); +ref = _part.zeroslash; +} +); +width = 1138; +}, +{ +layerId = m004; +shapes = ( +{ +ref = zero.cv05; +}, +{ +ref = _part.zeroslash; +} +); +width = 1256; +}, +{ +layerId = m008; +shapes = ( +{ +ref = zero.cv05; +}, +{ +ref = _part.zeroslash; +} +); +width = 1256; +} +); +metricWidth = zero; +} diff --git a/src/InterNumeric.glyphspackage/glyphs/zero.tf.cv05.glyph b/src/InterNumeric.glyphspackage/glyphs/zero.tf.cv05.glyph new file mode 100644 index 0000000..7e847cf --- /dev/null +++ b/src/InterNumeric.glyphspackage/glyphs/zero.tf.cv05.glyph @@ -0,0 +1,106 @@ +{ +color = 7; +glyphname = zero.tf.cv05; +layers = ( +{ +layerId = "45635B2B-919A-4B12-975B-2FA0A7CA8B35"; +shapes = ( +{ +alignment = -1; +pos = (91,0); +ref = zero.cv05; +} +); +width = 1320; +}, +{ +layerId = "B487E3D2-4ABF-4A2A-A195-DC6AACAFF568"; +shapes = ( +{ +alignment = -1; +pos = (32,0); +ref = zero.cv05; +} +); +width = 1320; +}, +{ +layerId = m005; +shapes = ( +{ +alignment = -1; +pos = (91,0); +ref = zero.cv05; +} +); +width = 1320; +}, +{ +layerId = m01; +shapes = ( +{ +alignment = -1; +pos = (-38,0); +ref = zero.cv05; +} +); +width = 1320; +}, +{ +layerId = m009; +shapes = ( +{ +alignment = -1; +pos = (-38,0); +ref = zero.cv05; +} +); +width = 1320; +}, +{ +layerId = m006; +shapes = ( +{ +alignment = -1; +pos = (-38,0); +ref = zero.cv05; +} +); +width = 1320; +}, +{ +layerId = m007; +shapes = ( +{ +alignment = -1; +pos = (91,0); +ref = zero.cv05; +} +); +width = 1320; +}, +{ +layerId = m004; +shapes = ( +{ +alignment = -1; +pos = (32,0); +ref = zero.cv05; +} +); +width = 1320; +}, +{ +layerId = m008; +shapes = ( +{ +alignment = -1; +pos = (32,0); +ref = zero.cv05; +} +); +width = 1320; +} +); +metricWidth = zero.tf; +} diff --git a/src/InterNumeric.glyphspackage/glyphs/zero.tf.slash.cv05.glyph b/src/InterNumeric.glyphspackage/glyphs/zero.tf.slash.cv05.glyph new file mode 100644 index 0000000..93c421b --- /dev/null +++ b/src/InterNumeric.glyphspackage/glyphs/zero.tf.slash.cv05.glyph @@ -0,0 +1,106 @@ +{ +color = 7; +glyphname = zero.tf.slash.cv05; +layers = ( +{ +layerId = "45635B2B-919A-4B12-975B-2FA0A7CA8B35"; +shapes = ( +{ +alignment = -1; +pos = (91,0); +ref = zero.slash.cv05; +} +); +width = 1320; +}, +{ +layerId = "B487E3D2-4ABF-4A2A-A195-DC6AACAFF568"; +shapes = ( +{ +alignment = -1; +pos = (32,0); +ref = zero.slash.cv05; +} +); +width = 1320; +}, +{ +layerId = m005; +shapes = ( +{ +alignment = -1; +pos = (91,0); +ref = zero.slash.cv05; +} +); +width = 1320; +}, +{ +layerId = m01; +shapes = ( +{ +alignment = -1; +pos = (-38,0); +ref = zero.slash.cv05; +} +); +width = 1320; +}, +{ +layerId = m009; +shapes = ( +{ +alignment = -1; +pos = (-38,0); +ref = zero.slash.cv05; +} +); +width = 1320; +}, +{ +layerId = m006; +shapes = ( +{ +alignment = -1; +pos = (-38,0); +ref = zero.slash.cv05; +} +); +width = 1320; +}, +{ +layerId = m007; +shapes = ( +{ +alignment = -1; +pos = (91,0); +ref = zero.slash.cv05; +} +); +width = 1320; +}, +{ +layerId = m004; +shapes = ( +{ +alignment = -1; +pos = (32,0); +ref = zero.slash.cv05; +} +); +width = 1320; +}, +{ +layerId = m008; +shapes = ( +{ +alignment = -1; +pos = (32,0); +ref = zero.slash.cv05; +} +); +width = 1320; +} +); +metricWidth = zero.tf; +} diff --git a/src/InterNumeric.glyphspackage/order.plist b/src/InterNumeric.glyphspackage/order.plist index 9e7922c..25c6934 100644 --- a/src/InterNumeric.glyphspackage/order.plist +++ b/src/InterNumeric.glyphspackage/order.plist @@ -40,6 +40,7 @@ three.cv02, four.cv03, six.cv04, nine.cv04, +zero.cv05, zero.slash, zero.tf, one.tf, @@ -51,12 +52,15 @@ six.tf, seven.tf, eight.tf, nine.tf, +zero.slash.cv05, one.tf.cv01, three.tf.cv02, four.tf.cv03, six.tf.cv04, nine.tf.cv04, +zero.tf.cv05, zero.tf.slash, +zero.tf.slash.cv05, fraction, space, nbspace, diff --git a/version.txt b/version.txt deleted file mode 100644 index abbfc48..0000000 --- a/version.txt +++ /dev/null @@ -1 +0,0 @@ -1.005 \ No newline at end of file