diff --git a/kernel/util/font.go b/kernel/util/font.go index 643beee7d..3b9b6df71 100644 --- a/kernel/util/font.go +++ b/kernel/util/font.go @@ -121,15 +121,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 @@ -150,35 +158,38 @@ func parseTTFFontFamily(fontPath string) (ret string) { return } + if strings.Contains(fontPath, "04") { + logging.LogInfo(fontPath) + } + t, err := font.NameTable() if err != nil { logging.LogErrorf("get font [%s] name table failed: %s", fontPath, err) return } + var family, subfamily string for _, e := range t.List() { - if sfnt.NameFontFamily != e.NameID && sfnt.NamePreferredFamily != e.NameID { - continue - } - - if sfnt.PlatformLanguageID(1033) == e.LanguageID || sfnt.PlatformLanguageID(2052) == e.LanguageID { + if sfnt.NameFontFamily == e.NameID && (sfnt.PlatformLanguageID(1033) == e.LanguageID || sfnt.PlatformLanguageID(2052) == e.LanguageID) { v, _, err := transform.Bytes(textUnicode.UTF16(textUnicode.BigEndian, textUnicode.IgnoreBOM).NewDecoder(), e.Value) - if err != nil { - return "" + if err == nil { + family = strings.TrimSpace(string(v)) } - val := string(v) - if sfnt.NameFontFamily == e.NameID && "" != val { - ret = val - } - if sfnt.NamePreferredFamily == e.NameID && "" != val { - ret = val + } + if sfnt.NameFontSubfamily == e.NameID && (sfnt.PlatformLanguageID(1033) == e.LanguageID || sfnt.PlatformLanguageID(2052) == e.LanguageID) { + v, _, err := transform.Bytes(textUnicode.UTF16(textUnicode.BigEndian, textUnicode.IgnoreBOM).NewDecoder(), e.Value) + if err == nil { + subfamily = strings.TrimSpace(string(v)) } } } - ret = strings.TrimSpace(ret) - if strings.HasPrefix(ret, ".") { - return "" + if family != "" && !strings.HasPrefix(family, ".") { + if subfamily != "" && !strings.Contains(subfamily, "<") && !strings.EqualFold(subfamily, "Regular") { + ret = family + " " + subfamily // 例如 "PingFang SC Bold" + } else { + ret = family + } } return }