Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update system.go windows match multi font name support #266

Closed
wants to merge 2 commits into from
Closed

Update system.go windows match multi font name support #266

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2d6f7d6
Update system.go windows match multi font name support
jilieryuyi Jan 9, 2024
2b9a2d0
Delete annotated code
jilieryuyi Jan 11, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
43 changes: 18 additions & 25 deletions font/system.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -270,12 +270,12 @@

type FontMetadata struct {
Filename string
Family string
Families []string
Style
}

func (metadata FontMetadata) String() string {
return fmt.Sprintf("%s (%v): %s", metadata.Family, metadata.Style, metadata.Filename)
return fmt.Sprintf("%s (%v): %s", strings.Join(metadata.Families, ","), metadata.Style, metadata.Filename)
}

type SystemFonts struct {
Expand Down Expand Up @@ -307,10 +307,12 @@
}

func (s *SystemFonts) Add(metadata FontMetadata) {
if _, ok := s.Fonts[metadata.Family]; !ok {
s.Fonts[metadata.Family] = map[Style]FontMetadata{}
for _, family := range metadata.Families {
if _, ok := s.Fonts[family]; !ok {
s.Fonts[family] = map[Style]FontMetadata{}
}
s.Fonts[family][metadata.Style] = metadata
}
s.Fonts[metadata.Family][metadata.Style] = metadata
}

func (s *SystemFonts) Match(name string, style Style) (FontMetadata, bool) {
Expand Down Expand Up @@ -438,27 +440,18 @@
return nil
}

var getMetadata func(io.ReadSeeker) (FontMetadata, error)
switch filepath.Ext(path) {
case ".ttf", ".otf":
getMetadata = getSFNTMetadata
// TODO: handle .ttc, .woff, .woff2, .eot
fontData, err := os.ReadFile(path)
if err != nil {
return nil
}

if getMetadata != nil {
f, err := os.Open(path)
if err != nil {
return nil
}
defer f.Close()

metadata, err := getMetadata(f)
if err != nil {
return nil
}
metadata.Filename = path
fonts.Add(metadata)

metadata, err := ParseMetadata(fontData, 0)

Check failure on line 448 in font/system.go

View workflow job for this annotation

GitHub Actions / build 

undefined: ParseMetadata
if err != nil {
return nil
}
metadata.Filename = path
fonts.Add(*metadata)

return nil
})
}
Expand Down Expand Up @@ -591,7 +584,7 @@
return FontMetadata{}, fmt.Errorf("unknown subfamily style: %s", subfamily)
}

metadata.Family = family
metadata.Families = []string{family}
metadata.Style = style
} else if version == 1 {
// TODO
Expand Down
Loading