From ea781d30edd5ecae536c1e0209fe5025575728f9 Mon Sep 17 00:00:00 2001 From: Daniel <845765@qq.com> Date: Thu, 18 Sep 2025 22:02:13 +0800 Subject: [PATCH] :art: Improve font loading https://github.com/siyuan-note/siyuan/issues/15879 Signed-off-by: Daniel <845765@qq.com> --- kernel/util/font.go | 26 +++++++++++++++++++------- 1 file changed, 19 insertions(+), 7 deletions(-) diff --git a/kernel/util/font.go b/kernel/util/font.go index 643beee7d..2047afdda 100644 --- a/kernel/util/font.go +++ b/kernel/util/font.go @@ -103,6 +103,10 @@ func existFont(family string, fonts []*Font) bool { func parseTTCFontFamily(fontPath string) (ret []string) { defer logging.Recover() + if strings.Contains(fontPath, "Alibaba") { + logging.LogInfo(fontPath) + } + data, err := os.ReadFile(fontPath) if err != nil { //logging.LogErrorf("read font file [%s] failed: %s", fontPath, err) @@ -121,15 +125,23 @@ func parseTTCFontFamily(fontPath string) (ret []string) { continue } - family, _ := font.Name(nil, ttc.NameIDFamily) - if "" == family { - family, _ = font.Name(nil, ttc.NameIDTypographicFamily) - } + family, _ := font.Name(nil, ttc.NameIDFull) family = strings.TrimSpace(family) - if "" == family || strings.HasPrefix(family, ".") { - continue + if "" != family && !strings.HasPrefix(family, ".") { + 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) return