update

GuiWonder · Mar 20, 2023 · 4e86c7d · 4e86c7d
1 parent 494e085
commit 4e86c7d
Show file tree

Hide file tree

Showing 6 changed files with 1,310 additions and 70 deletions.
diff --git a/README.md b/README.md
@@ -14,11 +14,13 @@
   | msjh   | 微軟正黑體、微軟正黑體 UI |
   | mingliu | 細明體、新細明體、細明體_HKSCS |
   | simsun  | 宋体、新宋体 |
-  | yugoth  | Yu Gothic、Yu Gothic UI |
+  | simsun  | 黑体 |
   | msgothic | MS Gothic、MS UI Gothic、MS PGothic |
-  | malgun  | Malgun Gothic |
   | msmincho | MS Mincho、MS PMincho |
   | meiryo  | Meiryo、Meiryo UI |
+  | malgun  | Malgun Gothic |
+  | yugoth  | Yu Gothic、Yu Gothic UI |
+  | yumin  | Yu Mincho |
   | batang  | Batang、BatangChe、Gungsuh、GungsuhChe |
   | gulim  | Gulim、GulimChe、Dotum、DotumChe |
   | allsans  | 以上所有无衬线字体 |
@@ -30,7 +32,7 @@
   | mingliub   | 細明體-ExtB、新細明體-ExtB、細明體_HKSCS-ExtB |
   | simsunb   | 宋体-ExtB |
 
-- `-wt` 字重(Weight)，可选，可使用 `"Thin", "ExtraLight", "Light", "Semilight", "DemiLight", "Normal", "Regular", "Medium", "SemiBold", "Bold", "Black", "Heavy"`。如未指定字重，程序会自动判断字重。
+- `-wt` 字重(Weight)，可选，可使用 `"Thin", "ExtraLight", "Light", "Semilight", "DemiLight", "Normal", "Regular", "Medium", "Demibold", "SemiBold", "Bold", "Black", "Heavy"`。如未指定字重，程序会自动判断字重。
 - `-d` 字体保存目录(Output Directory)，可选，如未指定，则使用当前目录。
 - `-r` TTC 打包完成后移除 TTF，可选。
 

diff --git a/gui/toWinFonts/FormMain.Designer.cs b/gui/toWinFonts/FormMain.Designer.cs
diff --git a/gui/toWinFonts/FormMain.cs b/gui/toWinFonts/FormMain.cs
@@ -65,61 +65,8 @@ private void ButtonStart_Click(object sender, EventArgs e)
                 return;
             }
 
-            string tg = "";
-            switch (comboBox1.SelectedIndex)
-            {
-                case 0:
-                    tg = "msyh";
-                    break;
-                case 1:
-                    tg = "msjh";
-                    break;
-                case 2:
-                    tg = "mingliu";
-                    break;
-                case 3:
-                    tg = "simsun";
-                    break;
-                case 4:
-                    tg = "yugoth";
-                    break;
-                case 5:
-                    tg = "msgothic";
-                    break;
-                case 6:
-                    tg = "malgun";
-                    break;
-                case 7:
-                    tg = "msmincho";
-                    break;
-                case 8:
-                    tg = "meiryo";
-                    break;
-                case 9:
-                    tg = "batang";
-                    break;
-                case 10:
-                    tg = "gulim";
-                    break;
-                case 11:
-                    tg = "allsans";
-                    break;
-                case 12:
-                    tg = "allserif";
-                    break;
-                case 13:
-                    tg = "all";
-                    break;
-                case 14:
-                    tg = "mingliub";
-                    break;
-                case 15:
-                    tg = "simsunb";
-                    break;
-                default:
-                    break;
-            }
-
+            string[] tgs = { "msyh", "msjh", "mingliu", "simsun", "simhei", "msgothic", "msmincho", "meiryo", "malgun", "yugoth", "yumin", "batang", "gulim", "allsans", "allserif", "all", "mingliub", "simsunb" };
+            string tg = tgs[comboBox1.SelectedIndex];
             string pyfile = path + "winfont.py";
 
             pyfile = pyfile.Replace('\\', '/');