joejulian/gio
1
0
Fork 1
mirror of https://git.sr.ht/~eliasnaur/gio synced 2026-07-01 07:35:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

text,font/gofont: replace text.Collection with slice of FontFaces

Browse Source 
A slice of FontFace pairs are simpler, and thread safe in case a client
wants to append or modify the font collection.

Signed-off-by: Elias Naur <mail@eliasnaur.com>
This commit is contained in:
Elias Naur
2020-06-21 21:41:20 +02:00
parent 424a728988
commit 9e3d3b6f58
3 changed files with 70 additions and 83 deletions
Download Patch File Download Diff File Expand all files Collapse all files
font/gofont/gofont.go
+21 -20
View File
@@ -29,35 +29,36 @@ import (
var (
once sync.Once
collection *text.Collection
collection []text.FontFace
)
func Collection() *text.Collection {
func Collection() []text.FontFace {
once.Do(func() {
c := new(text.Collection)
register(c, text.Font{}, goregular.TTF)
register(c, text.Font{Style: text.Italic}, goitalic.TTF)
register(c, text.Font{Weight: text.Bold}, gobold.TTF)
register(c, text.Font{Style: text.Italic, Weight: text.Bold}, gobolditalic.TTF)
register(c, text.Font{Weight: text.Medium}, gomedium.TTF)
register(c, text.Font{Weight: text.Medium, Style: text.Italic}, gomediumitalic.TTF)
register(c, text.Font{Variant: "Mono"}, gomono.TTF)
register(c, text.Font{Variant: "Mono", Weight: text.Bold}, gomonobold.TTF)
register(c, text.Font{Variant: "Mono", Weight: text.Bold, Style: text.Italic}, gomonobolditalic.TTF)
register(c, text.Font{Variant: "Mono", Style: text.Italic}, gomonoitalic.TTF)
register(c, text.Font{Variant: "Mono", Style: text.Italic}, gomonoitalic.TTF)
register(c, text.Font{Variant: "Smallcaps"}, gosmallcaps.TTF)
register(c, text.Font{Variant: "Smallcaps", Style: text.Italic}, gosmallcapsitalic.TTF)
collection = c
register(text.Font{}, goregular.TTF)
register(text.Font{Style: text.Italic}, goitalic.TTF)
register(text.Font{Weight: text.Bold}, gobold.TTF)
register(text.Font{Style: text.Italic, Weight: text.Bold}, gobolditalic.TTF)
register(text.Font{Weight: text.Medium}, gomedium.TTF)
register(text.Font{Weight: text.Medium, Style: text.Italic}, gomediumitalic.TTF)
register(text.Font{Variant: "Mono"}, gomono.TTF)
register(text.Font{Variant: "Mono", Weight: text.Bold}, gomonobold.TTF)
register(text.Font{Variant: "Mono", Weight: text.Bold, Style: text.Italic}, gomonobolditalic.TTF)
register(text.Font{Variant: "Mono", Style: text.Italic}, gomonoitalic.TTF)
register(text.Font{Variant: "Mono", Style: text.Italic}, gomonoitalic.TTF)
register(text.Font{Variant: "Smallcaps"}, gosmallcaps.TTF)
register(text.Font{Variant: "Smallcaps", Style: text.Italic}, gosmallcapsitalic.TTF)
// Ensure that any outside appends will not reuse the backing store.
n := len(collection)
collection = collection[:n:n]
})
return collection
}
func register(c *text.Collection, fnt text.Font, ttf []byte) {
func register(fnt text.Font, ttf []byte) {
face, err := opentype.Parse(ttf)
if err != nil {
panic(fmt.Sprintf("failed to parse font: %v", err))
panic(fmt.Errorf("failed to parse font: %v", err))
}
fnt.Typeface = "Go"
c.Register(fnt, face)
collection = append(collection, text.FontFace{Font: fnt, Face: face})
}