From dfc8073a7ed058a3bcf1c59e91024b5e6282a99e Mon Sep 17 00:00:00 2001 From: Aaron Ruan Date: Thu, 11 Apr 2024 19:56:46 +0800 Subject: [PATCH] 1.005update4 --- Makefile | 16 +- misc/scripts/copy_kern.py | 31 ++ src/InterNumeric.glyphspackage/fontinfo.plist | 416 ------------------ 3 files changed, 38 insertions(+), 425 deletions(-) create mode 100644 misc/scripts/copy_kern.py diff --git a/Makefile b/Makefile index 9c55d0a..bbcf7e7 100644 --- a/Makefile +++ b/Makefile @@ -13,12 +13,14 @@ init: requirements.txt build: build.stamp -# fontmake -g "src/InterNumeric.glyphspackage" -o variable --output-path "fonts/variable/InterNumeric[wght,RDNS].ttf" --filter DecomposeTransformedComponentsFilter --verbose DEBUG -# fontmake -g "src/InterNumeric.glyphspackage" -o variable-cff2 --output-path "fonts/variable/InterNumeric[wght,RDNS].otf" --filter DecomposeTransformedComponentsFilter --verbose DEBUG -# fontmake -g "src/InterNumeric.glyphspackage" -o otf --output-dir "fonts/static/" --filter DecomposeTransformedComponentsFilter -i +# fontmake -m "fonts-temp/master-ufo/InterNumeric.designspace" -o variable --output-path "fonts/variable/InterNumeric[wght,RDNS].ttf" --filter DecomposeTransformedComponentsFilter +# fontmake -m "fonts-temp/master-ufo/InterNumeric.designspace" -o variable-cff2 --output-path "fonts/variable/InterNumeric[wght,RDNS].otf" + build.stamp: init.stamp - fontmake -g "src/InterNumeric.glyphspackage" -o variable --output-path "fonts/variable/InterNumeric[wght,RDNS].ttf" --filter DecomposeTransformedComponentsFilter + fontmake -g "src/InterNumeric.glyphspackage" -o ufo --output-dir "fonts-temp/master-ufo" --filter DecomposeTransformedComponentsFilter + python misc/scripts/copy_kern.py + fontmake -m "fonts-temp/master-ufo/InterNumeric.designspace" -o variable --output-path "fonts/variable/InterNumeric[wght,RDNS].ttf" --filter DecomposeTransformedComponentsFilter python misc/scripts/stat.py touch build.stamp @@ -30,14 +32,10 @@ zip: build.stamp test: build.stamp fontbakery check-universal "fonts/variable/InterNumeric[wght,RDNS].ttf" -cleanbuild: +clean: rm -rf fonts rm -rf fonts-temp rm build.stamp -cleanufo: - rm -rf fonts-temp - rm ufo.stamp - update: pip install -Ur requirements.txt diff --git a/misc/scripts/copy_kern.py b/misc/scripts/copy_kern.py new file mode 100644 index 0000000..03badbc --- /dev/null +++ b/misc/scripts/copy_kern.py @@ -0,0 +1,31 @@ +import shutil, os + +# Paths to the UFOs +inter_numeric_Light_path = "fonts-temp/master-ufo/InterNumeric-Light.ufo" +inter_numeric_Regular_path = "fonts-temp/master-ufo/InterNumeric-Regular.ufo" +inter_numeric_Black_path = "fonts-temp/master-ufo/InterNumeric-Black.ufo" + +inter_numeric_LightSoftened_path = "fonts-temp/master-ufo/InterNumeric-LightSoftened.ufo" +inter_numeric_Softened_path = "fonts-temp/master-ufo/InterNumeric-Softened.ufo" +inter_numeric_BlackSoftened_path = "fonts-temp/master-ufo/InterNumeric-BlackSoftened.ufo" + +inter_numeric_LightRounded_path = "fonts-temp/master-ufo/InterNumeric-LightRounded.ufo" +inter_numeric_Rounded_path = "fonts-temp/master-ufo/InterNumeric-Rounded.ufo" +inter_numeric_BlackRounded_path = "fonts-temp/master-ufo/InterNumeric-BlackRounded.ufo" + +kerning_plist = "kerning.plist" + +shutil.copy(os.path.join(inter_numeric_Light_path, kerning_plist), + os.path.join(inter_numeric_LightSoftened_path, kerning_plist)) +shutil.copy(os.path.join(inter_numeric_Light_path, kerning_plist), + os.path.join(inter_numeric_LightRounded_path, kerning_plist)) + +shutil.copy(os.path.join(inter_numeric_Regular_path, kerning_plist), + os.path.join(inter_numeric_Softened_path, kerning_plist)) +shutil.copy(os.path.join(inter_numeric_Regular_path, kerning_plist), + os.path.join(inter_numeric_Rounded_path, kerning_plist)) + +shutil.copy(os.path.join(inter_numeric_Black_path, kerning_plist), + os.path.join(inter_numeric_BlackSoftened_path, kerning_plist)) +shutil.copy(os.path.join(inter_numeric_Black_path, kerning_plist), + os.path.join(inter_numeric_BlackRounded_path, kerning_plist)) \ No newline at end of file diff --git a/src/InterNumeric.glyphspackage/fontinfo.plist b/src/InterNumeric.glyphspackage/fontinfo.plist index 9afc59a..58d482c 100644 --- a/src/InterNumeric.glyphspackage/fontinfo.plist +++ b/src/InterNumeric.glyphspackage/fontinfo.plist @@ -1201,146 +1201,6 @@ slash = { backslash = 40; }; }; -m007 = { -"@MMK_L_D" = { -"@MMK_R_comma" = -90; -}; -"@MMK_L_comma" = { -"@MMK_R_C" = -90; -"@MMK_R_eight" = -30; -"@MMK_R_four" = -40; -"@MMK_R_nine.1" = -140; -"@MMK_R_one" = -160; -"@MMK_R_quotedbl" = -200; -"@MMK_R_seven" = -70; -"@MMK_R_six" = -80; -"@MMK_R_three" = -40; -}; -"@MMK_L_eight" = { -"@MMK_R_comma" = -70; -}; -"@MMK_L_four" = { -"@MMK_R_comma" = -80; -"@MMK_R_one" = -140; -"@MMK_R_seven" = -60; -}; -"@MMK_L_nine" = { -"@MMK_R_comma" = -80; -"@MMK_R_seven" = -40; -}; -"@MMK_L_nine.1" = { -"@MMK_R_comma" = -200; -"@MMK_R_four" = -130; -"@MMK_R_seven" = -80; -"@MMK_R_six.1" = -70; -}; -"@MMK_L_quotedbl" = { -"@MMK_R_comma" = -200; -"@MMK_R_four" = -120; -}; -"@MMK_L_seven" = { -"@MMK_R_colon" = -70; -"@MMK_R_comma" = -250; -"@MMK_R_eight" = -30; -"@MMK_R_four" = -120; -"@MMK_R_seven" = 40; -"@MMK_R_six" = -32; -"@MMK_R_six.1" = -200; -"@MMK_R_three" = -34; -five = -20; -nine = -20; -}; -"@MMK_L_six.1" = { -"@MMK_R_nine.1" = -110; -"@MMK_R_seven" = -60; -}; -"@MMK_L_two" = { -"@MMK_R_four" = -32; -}; -backslash = { -slash = 40; -}; -five = { -"@MMK_R_comma" = -70; -"@MMK_R_one" = -50; -}; -six = { -"@MMK_R_comma" = -70; -}; -slash = { -backslash = 40; -}; -}; -m005 = { -"@MMK_L_D" = { -"@MMK_R_comma" = -90; -}; -"@MMK_L_comma" = { -"@MMK_R_C" = -90; -"@MMK_R_eight" = -30; -"@MMK_R_four" = -40; -"@MMK_R_nine.1" = -140; -"@MMK_R_one" = -160; -"@MMK_R_quotedbl" = -200; -"@MMK_R_seven" = -70; -"@MMK_R_six" = -80; -"@MMK_R_three" = -40; -}; -"@MMK_L_eight" = { -"@MMK_R_comma" = -70; -}; -"@MMK_L_four" = { -"@MMK_R_comma" = -80; -"@MMK_R_one" = -140; -"@MMK_R_seven" = -60; -}; -"@MMK_L_nine" = { -"@MMK_R_comma" = -80; -"@MMK_R_seven" = -40; -}; -"@MMK_L_nine.1" = { -"@MMK_R_comma" = -200; -"@MMK_R_four" = -130; -"@MMK_R_seven" = -80; -"@MMK_R_six.1" = -70; -}; -"@MMK_L_quotedbl" = { -"@MMK_R_comma" = -200; -"@MMK_R_four" = -120; -}; -"@MMK_L_seven" = { -"@MMK_R_colon" = -70; -"@MMK_R_comma" = -250; -"@MMK_R_eight" = -30; -"@MMK_R_four" = -120; -"@MMK_R_seven" = 40; -"@MMK_R_six" = -32; -"@MMK_R_six.1" = -200; -"@MMK_R_three" = -34; -five = -20; -nine = -20; -}; -"@MMK_L_six.1" = { -"@MMK_R_nine.1" = -110; -"@MMK_R_seven" = -60; -}; -"@MMK_L_two" = { -"@MMK_R_four" = -32; -}; -backslash = { -slash = 40; -}; -five = { -"@MMK_R_comma" = -70; -"@MMK_R_one" = -50; -}; -six = { -"@MMK_R_comma" = -70; -}; -slash = { -backslash = 40; -}; -}; "B487E3D2-4ABF-4A2A-A195-DC6AACAFF568" = { "@MMK_L_D" = { "@MMK_R_comma" = -90; @@ -1413,150 +1273,6 @@ slash = { backslash = 40; }; }; -m008 = { -"@MMK_L_D" = { -"@MMK_R_comma" = -90; -}; -"@MMK_L_comma" = { -"@MMK_R_C" = -90; -"@MMK_R_eight" = -20; -"@MMK_R_nine.1" = -130; -"@MMK_R_one" = -200; -"@MMK_R_quotedbl" = -160; -"@MMK_R_seven" = -30; -"@MMK_R_six" = -50; -"@MMK_R_three" = -20; -"@MMK_R_two" = 10; -five = -30; -nine = -20; -}; -"@MMK_L_eight" = { -"@MMK_R_comma" = -50; -}; -"@MMK_L_four" = { -"@MMK_R_comma" = -70; -"@MMK_R_one" = -80; -"@MMK_R_seven" = -80; -}; -"@MMK_L_nine" = { -"@MMK_R_comma" = -50; -"@MMK_R_seven" = -40; -}; -"@MMK_L_nine.1" = { -"@MMK_R_comma" = -200; -"@MMK_R_four" = -100; -"@MMK_R_seven" = -80; -"@MMK_R_six.1" = -50; -}; -"@MMK_L_quotedbl" = { -"@MMK_R_comma" = -160; -"@MMK_R_four" = -120; -}; -"@MMK_L_seven" = { -"@MMK_R_colon" = -70; -"@MMK_R_comma" = -250; -"@MMK_R_eight" = -30; -"@MMK_R_four" = -120; -"@MMK_R_seven" = 40; -"@MMK_R_six" = -32; -"@MMK_R_six.1" = -180; -"@MMK_R_three" = -34; -five = -20; -nine = -20; -}; -"@MMK_L_six.1" = { -"@MMK_R_nine.1" = -60; -"@MMK_R_seven" = -80; -}; -"@MMK_L_two" = { -"@MMK_R_four" = -32; -}; -backslash = { -slash = 30; -}; -five = { -"@MMK_R_comma" = -60; -"@MMK_R_one" = -40; -}; -six = { -"@MMK_R_comma" = -50; -}; -slash = { -backslash = 30; -}; -}; -m004 = { -"@MMK_L_D" = { -"@MMK_R_comma" = -90; -}; -"@MMK_L_comma" = { -"@MMK_R_C" = -90; -"@MMK_R_eight" = -20; -"@MMK_R_nine.1" = -130; -"@MMK_R_one" = -200; -"@MMK_R_quotedbl" = -160; -"@MMK_R_seven" = -30; -"@MMK_R_six" = -50; -"@MMK_R_three" = -20; -"@MMK_R_two" = 10; -five = -30; -nine = -20; -}; -"@MMK_L_eight" = { -"@MMK_R_comma" = -50; -}; -"@MMK_L_four" = { -"@MMK_R_comma" = -70; -"@MMK_R_one" = -80; -"@MMK_R_seven" = -80; -}; -"@MMK_L_nine" = { -"@MMK_R_comma" = -50; -"@MMK_R_seven" = -40; -}; -"@MMK_L_nine.1" = { -"@MMK_R_comma" = -200; -"@MMK_R_four" = -100; -"@MMK_R_seven" = -80; -"@MMK_R_six.1" = -50; -}; -"@MMK_L_quotedbl" = { -"@MMK_R_comma" = -160; -"@MMK_R_four" = -120; -}; -"@MMK_L_seven" = { -"@MMK_R_colon" = -70; -"@MMK_R_comma" = -250; -"@MMK_R_eight" = -30; -"@MMK_R_four" = -120; -"@MMK_R_seven" = 40; -"@MMK_R_six" = -32; -"@MMK_R_six.1" = -180; -"@MMK_R_three" = -34; -five = -20; -nine = -20; -}; -"@MMK_L_six.1" = { -"@MMK_R_nine.1" = -60; -"@MMK_R_seven" = -80; -}; -"@MMK_L_two" = { -"@MMK_R_four" = -32; -}; -backslash = { -slash = 20; -}; -five = { -"@MMK_R_comma" = -60; -"@MMK_R_one" = -40; -}; -six = { -"@MMK_R_comma" = -50; -}; -slash = { -backslash = 20; -}; -}; m01 = { "@MMK_L_D" = { "@MMK_R_comma" = -90; @@ -1627,138 +1343,6 @@ slash = { backslash = 40; }; }; -m009 = { -"@MMK_L_comma" = { -"@MMK_R_eight" = -20; -"@MMK_R_nine.1" = -220; -"@MMK_R_one" = -240; -"@MMK_R_quotedbl" = -230; -"@MMK_R_seven" = -90; -"@MMK_R_six" = -60; -"@MMK_R_three" = -40; -nine = -40; -}; -"@MMK_L_eight" = { -"@MMK_R_comma" = -20; -}; -"@MMK_L_four" = { -"@MMK_R_comma" = -70; -"@MMK_R_one" = -130; -"@MMK_R_seven" = -120; -}; -"@MMK_L_nine" = { -"@MMK_R_comma" = -70; -"@MMK_R_seven" = -40; -}; -"@MMK_L_nine.1" = { -"@MMK_R_comma" = -230; -"@MMK_R_four" = -70; -"@MMK_R_seven" = -60; -"@MMK_R_six.1" = -20; -}; -"@MMK_L_quotedbl" = { -"@MMK_R_comma" = -230; -"@MMK_R_four" = -120; -}; -"@MMK_L_seven" = { -"@MMK_R_colon" = -70; -"@MMK_R_comma" = -250; -"@MMK_R_eight" = -30; -"@MMK_R_four" = -120; -"@MMK_R_seven" = 40; -"@MMK_R_six" = -32; -"@MMK_R_six.1" = -150; -"@MMK_R_three" = -34; -five = -20; -nine = -20; -}; -"@MMK_L_six.1" = { -"@MMK_R_nine.1" = -50; -"@MMK_R_seven" = -120; -}; -"@MMK_L_two" = { -"@MMK_R_four" = -32; -}; -backslash = { -slash = 30; -}; -five = { -"@MMK_R_comma" = -30; -"@MMK_R_one" = -40; -}; -six = { -"@MMK_R_comma" = -50; -}; -slash = { -backslash = 30; -}; -}; -m006 = { -"@MMK_L_comma" = { -"@MMK_R_eight" = -20; -"@MMK_R_nine.1" = -220; -"@MMK_R_one" = -240; -"@MMK_R_quotedbl" = -230; -"@MMK_R_seven" = -90; -"@MMK_R_six" = -60; -"@MMK_R_three" = -40; -nine = -40; -}; -"@MMK_L_eight" = { -"@MMK_R_comma" = -20; -}; -"@MMK_L_four" = { -"@MMK_R_comma" = -70; -"@MMK_R_one" = -130; -"@MMK_R_seven" = -120; -}; -"@MMK_L_nine" = { -"@MMK_R_comma" = -70; -"@MMK_R_seven" = -40; -}; -"@MMK_L_nine.1" = { -"@MMK_R_comma" = -230; -"@MMK_R_four" = -70; -"@MMK_R_seven" = -60; -"@MMK_R_six.1" = -20; -}; -"@MMK_L_quotedbl" = { -"@MMK_R_comma" = -230; -"@MMK_R_four" = -120; -}; -"@MMK_L_seven" = { -"@MMK_R_colon" = -70; -"@MMK_R_comma" = -250; -"@MMK_R_eight" = -30; -"@MMK_R_four" = -120; -"@MMK_R_seven" = 40; -"@MMK_R_six" = -32; -"@MMK_R_six.1" = -150; -"@MMK_R_three" = -34; -five = -20; -nine = -20; -}; -"@MMK_L_six.1" = { -"@MMK_R_nine.1" = -50; -"@MMK_R_seven" = -120; -}; -"@MMK_L_two" = { -"@MMK_R_four" = -32; -}; -backslash = { -slash = 10; -}; -five = { -"@MMK_R_comma" = -30; -"@MMK_R_one" = -40; -}; -six = { -"@MMK_R_comma" = -50; -}; -slash = { -backslash = 10; -}; -}; }; metrics = ( {