Andreas/siyuan
1
0
Fork 0
mirror of https://github.com/siyuan-note/siyuan.git synced 2025-09-22 00:20:47 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

🎨 Improve font loading https://github.com/siyuan-note/siyuan/issues/15879

Browse source 
Signed-off-by: Daniel <845765@qq.com>
This commit is contained in:
Daniel 2025-09-18 22:02:13 +08:00
parent f747739fd5
commit ea781d30ed
No known key found for this signature in database
GPG key ID: 86211BA83DF03017
1 changed files with 19 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

26
kernel/util/font.go
View file

@ -103,6 +103,10 @@ func existFont(family string, fonts []*Font) bool {
func parseTTCFontFamily(fontPath string) (ret []string) { func parseTTCFontFamily(fontPath string) (ret []string) {
defer logging.Recover() defer logging.Recover()
if strings.Contains(fontPath, "Alibaba") {
logging.LogInfo(fontPath)
}
data, err := os.ReadFile(fontPath) data, err := os.ReadFile(fontPath)
if err != nil { if err != nil {
//logging.LogErrorf("read font file [%s] failed: %s", fontPath, err) //logging.LogErrorf("read font file [%s] failed: %s", fontPath, err)
@ -121,15 +125,23 @@ func parseTTCFontFamily(fontPath string) (ret []string) {
continue continue
} }
family, _ := font.Name(nil, ttc.NameIDFamily) family, _ := font.Name(nil, ttc.NameIDFull)
if "" == family {
family, _ = font.Name(nil, ttc.NameIDTypographicFamily)
}
family = strings.TrimSpace(family) family = strings.TrimSpace(family)
if "" == family || strings.HasPrefix(family, ".") { if "" != family && !strings.HasPrefix(family, ".") {
continue ret = append(ret, family)
}
family, _ := font.Name(nil, ttc.NameIDFamily)
family = strings.TrimSpace(family)
if "" != family && !strings.HasPrefix(family, ".") {
ret = append(ret, family)
}
family, _ = font.Name(nil, ttc.NameIDTypographicFamily)
family = strings.TrimSpace(family)
if "" != family && !strings.HasPrefix(family, ".") {
ret = append(ret, family)
} }
ret = append(ret, family)
} }
ret = gulu.Str.RemoveDuplicatedElem(ret) ret = gulu.Str.RemoveDuplicatedElem(ret)
return return