diff --git a/.gitignore b/.gitignore index d8d190c..2fbd3a9 100644 --- a/.gitignore +++ b/.gitignore @@ -2,5 +2,6 @@ Makefile __pycache__/ /source/shs/*.otf /build/ +/cache/ /out/ node_modules/ diff --git a/configure.py b/configure.py index e5911b4..399f47f 100644 --- a/configure.py +++ b/configure.py @@ -158,36 +158,36 @@ def LocalizedFamily(p): if "nameList" not in LocalizedFamily.__dict__: LocalizedFamily.nameList = { "Sans": { - 0x0409: "Nowar C² ", - 0x0804: "有爱锐方 ", - 0x0404: "有愛銳方 ", - 0x0C04: "有愛鋭方 ", - 0x0411: "有愛鋭方 ", - 0x0412: "有愛예방 ", + 0x0409: "Nowar C²", + 0x0804: "有爱锐方", + 0x0404: "有愛銳方", + 0x0C04: "有愛鋭方", + 0x0411: "有愛鋭方", + 0x0412: "有愛예방", }, "UI": { - 0x0409: "Nowar C² UI ", - 0x0804: "有爱锐方 UI ", - 0x0404: "有愛銳方 UI ", - 0x0C04: "有愛鋭方 UI ", - 0x0411: "有愛鋭方 UI ", - 0x0412: "有愛예방 UI ", + 0x0409: "Nowar C² UI", + 0x0804: "有爱锐方 UI", + 0x0404: "有愛銳方 UI", + 0x0C04: "有愛鋭方 UI", + 0x0411: "有愛鋭方 UI", + 0x0412: "有愛예방 UI", }, "WarcraftSans": { - 0x0409: "Nowar C² Warcraft ", - 0x0804: "有爱魔兽锐方 ", - 0x0404: "有愛魔獸銳方 ", - 0x0C04: "有愛魔獸鋭方 ", - 0x0411: "有愛鋭方ウォークラフト ", - 0x0412: "有愛예방 워크래프트 ", + 0x0409: "Nowar C² Warcraft", + 0x0804: "有爱魔兽锐方", + 0x0404: "有愛魔獸銳方", + 0x0C04: "有愛魔獸鋭方", + 0x0411: "有愛鋭方ウォークラフト", + 0x0412: "有愛예방 워크래프트", }, "WarcraftUI": { - 0x0409: "Nowar C² Warcraft UI ", - 0x0804: "有爱魔兽锐方 UI ", - 0x0404: "有愛魔獸銳方 UI ", - 0x0C04: "有愛魔獸黑體 UI ", - 0x0411: "有愛鋭方ウォークラフト UI ", - 0x0412: "有愛예방 워크래프트 UI ", + 0x0409: "Nowar C² Warcraft UI", + 0x0804: "有爱魔兽锐方 UI", + 0x0404: "有愛魔獸銳方 UI", + 0x0C04: "有愛魔獸黑體 UI", + 0x0411: "有愛鋭方ウォークラフト UI", + 0x0412: "有愛예방 워크래프트 UI", }, } diff --git a/merge.py b/merge.py index 07223a3..8fa2cc0 100644 --- a/merge.py +++ b/merge.py @@ -129,7 +129,7 @@ def NameFont(param, font): "encodingID": 1, "languageID": langId, "nameID": 16, - "nameString": family[langId] + "nameString": family[langId] + "; keep hinted, like DFKaiShu" if langId == 0x0409 else family[langId] }, ] for langId in langIdList], []