Merge pull request #13 from MaruTama/fix_height_setting

Fix height setting for windows
MaruTama · Aug 20, 2023 · 987d129 · 987d129
2 parents 0305392 + 51aceb3
commit 987d129
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 14 deletions.
diff --git a/README.md b/README.md
@@ -4,8 +4,8 @@ OSS の多音字に対応した拼音フォント及びその作成ツールで
 **[Download/下载](https://github.com/MaruTama/pinyin-font-tools/releases)**  
 <!-- [![Download/下载](https://img.shields.io/badge/Download-↓-yellow.svg)](https://github.com/MaruTama/pinyin-font-tools/releases)   -->
 
-[![version](https://img.shields.io/badge/Version-1.02-brightgreen.svg)](https://github.com/nongthaihoang/custom_font_installer/releases/tag/v1.02) 
-![updated](https://img.shields.io/badge/Updated-Dec_19,_2020-green.svg) 
+[![version](https://img.shields.io/badge/Version-1.03-brightgreen.svg)](https://github.com/nongthaihoang/custom_font_installer/releases/tag/v1.03) 
+![updated](https://img.shields.io/badge/Updated-Aug_21,_2023-green.svg) 
 
 ![explain_han_serif](./imgs/explain_han_serif.png)  
 ![explain_handwritten](./imgs/explain_handwritten.png)  
@@ -72,6 +72,7 @@ You can also use Unicode IVS (ideographic variant selector) to switch other diff
 # 謝辞 / Acknowledgments
 Thank you to the following people and repositories. 
 - [@NightFurySL2001](https://github.com/NightFurySL2001)-san
+- [@lanyizi](https://github.com/lanyizi)-san
 - [BPMF IVS](https://github.com/ButTaiwan/bpmfvs)
 - [kose-font](https://github.com/lxgw/kose-font)
 - [SetoFontSP](https://ja.osdn.net/projects/setofont/releases/p14368)

diff --git a/outputs/Mengshen-Handwritten.ttf b/outputs/Mengshen-Handwritten.ttf
diff --git a/src/config.py b/src/config.py
@@ -26,9 +26,9 @@
 
 METADATA_FOR_HANDWRITTEN = {
     "pinyin_canvas":{
-        "width"    : 800,   # ピンイン表示部の幅
+        "width"    : 800, # ピンイン表示部の幅
         "height"   : 300, # ピンイン表示部の高さ
-        "base_line": 920,   # ベースラインからの高さ
+        "base_line": 880, # ベースラインからの高さ
         "tracking" : 5 # 拼音の標準空白幅： Tracking is about uniform spacing across a text selection.
     },
     "expected_hanzi_canvas":{

diff --git a/src/font.py b/src/font.py
@@ -305,12 +305,13 @@ def set_about_size(self):
         if advanceAddedPinyinHeight > self.marged_font["hhea"]["ascender"]:
             # 原点からグリフの上端までの距離
             self.marged_font["hhea"]["ascender"] = advanceAddedPinyinHeight
+            self.marged_font["OS_2"]["usWinAscent"] = advanceAddedPinyinHeight
         # 特定の言語のベースライン
         # self.marged_font["BASE"]["hani"]
 
     def set_copyright(self):
         # フォント製作者によるバージョン
-        self.marged_font["head"]["fontRevision"] = name_table.VISION
+        self.marged_font["head"]["fontRevision"] = name_table.VERSION
         # 作成日(基準日：1904/01/01 00:00 GMT)
         from datetime import datetime
         base_date = datetime.strptime("1904/01/01 00:00", "%Y/%m/%d %H:%M")

diff --git a/src/name_table.py b/src/name_table.py
@@ -2,7 +2,7 @@
 #!/usr/bin/env python'
 
 
-VISION = 1.02
+VERSION = 1.03
 
 '''
   platformID
@@ -66,7 +66,7 @@
     "languageID": 0,
     "nameID": 3, 
     # フォント識別子
-    "nameString": "{};MENGSHEN;Mengshen-HanSerif".format(VISION)
+    "nameString": "{};MENGSHEN;Mengshen-HanSerif".format(VERSION)
   },
   {
     "platformID": 1,
@@ -82,7 +82,7 @@
     "languageID": 0,
     "nameID": 5,
     # バージョン文字列
-    "nameString": "Version {}".format(VISION)
+    "nameString": "Version {}".format(VERSION)
   },
   {
     "platformID": 1,
@@ -178,7 +178,7 @@
     "languageID": 1033,
     "nameID": 3,
     # フォント識別子
-    "nameString": "{};MENGSHEN;Mengshen-HanSerif".format(VISION)
+    "nameString": "{};MENGSHEN;Mengshen-HanSerif".format(VERSION)
   },
   {
     "platformID": 3,
@@ -194,7 +194,7 @@
     "languageID": 1033,
     "nameID": 5,
     # バージョン文字列
-    "nameString": "Version {}".format(VISION)
+    "nameString": "Version {}".format(VERSION)
   },
   {
     "platformID": 3,
@@ -300,7 +300,7 @@
       "languageID": 0,
       "nameID": 3,
       # フォント識別子
-      "nameString": "{};MENGSHEN;Mengshen-Handwritten".format(VISION)
+      "nameString": "{};MENGSHEN;Mengshen-Handwritten".format(VERSION)
     },
     {
       "platformID": 1,
@@ -316,7 +316,7 @@
       "languageID": 0,
       "nameID": 5,
       # バージョン文字列
-      "nameString": "Version {}".format(VISION)
+      "nameString": "Version {}".format(VERSION)
     },
     {
       "platformID": 1,
@@ -381,7 +381,7 @@
       "languageID": 1033,
       "nameID": 3,
       # フォント識別子
-      "nameString": "{};MENGSHEN;Mengshen-Handwritten".format(VISION)
+      "nameString": "{};MENGSHEN;Mengshen-Handwritten".format(VERSION)
     },
     {
       "platformID": 3,
@@ -397,7 +397,7 @@
       "languageID": 1033,
       "nameID": 5,
       # バージョン文字列
-      "nameString": "Version {}".format(VISION)
+      "nameString": "Version {}".format(VERSION)
     },
     {
       "platformID": 3,