mirror of
https://git.sr.ht/~eliasnaur/gio
synced 2026-07-01 07:35:40 +00:00
f77bf9a42c
This commit adds back support for loading font collections, which we
lost when switching to the harfbuzz-based shaper last January. In
addition, this commit takes advantage of our new font loading library's
metadata facilities to automatically construct text.FontFaces for all
fonts within a collection. This is significantly more ergonomic for
users, and can be used to load single fonts with automatic metadata
detection as well.
I've exposed a opentype.Face.Font() method that can be used to get the
font metadata for a given face as well, though you have to type assert to
see it:
var myFace text.Face
if asOpentype, ok := myFace.(opentype.Face); ok {
myFont := asOpentype.Font()
}
The one problem with this approach is that the font variant field always
be automatically populated. Mono font detection is supported, but
other variants like SmallCaps are more complicated and may need to be
expressed differently in the future (smallcaps is a feature that any font
file can have, not necessarily a separate font file). See this [0] upstream
issue for details.
Additionally, in order to avoid import cycles, I've moved the declarations
of font attributes to package font. You can fix your code automatically to
refer to the new definitions by running the following:
gofmt -w -r 'text.FontFace -> font.FontFace' .
gofmt -w -r 'text.Variant -> font.Variant' .
gofmt -w -r 'text.Style -> font.Style' .
gofmt -w -r 'text.Typeface -> font.Typeface' .
gofmt -w -r 'text.Font -> font.Font' .
gofmt -w -r 'text.Regular -> font.Regular' .
gofmt -w -r 'text.Italic -> font.Italic' .
gofmt -w -r 'text.Thin -> font.Thin' .
gofmt -w -r 'text.ExtraLight -> font.ExtraLight' .
gofmt -w -r 'text.Light -> font.Light' .
gofmt -w -r 'text.Normal -> font.Normal' .
gofmt -w -r 'text.Medium -> font.Medium' .
gofmt -w -r 'text.SemiBold -> font.SemiBold' .
gofmt -w -r 'text.Bold -> font.Bold' .
gofmt -w -r 'text.ExtraBold -> font.ExtraBold' .
gofmt -w -r 'text.Black -> font.Black' .
gofmt -w -r 'text.Hairline -> font.Thin' .
gofmt -w -r 'text.UltraLight -> font.ExtraLight' .
gofmt -w -r 'text.DemiBold -> font.SemiBold' .
gofmt -w -r 'text.UltraBold -> font.ExtraBold' .
gofmt -w -r 'text.Heavy -> font.Black' .
gofmt -w -r 'text.ExtraBlack -> font.Black+50' .
gofmt -w -r 'text.UltraBlack -> font.ExtraBlack' .
Make sure each affected file imports gioui.org/font.
[0] https://github.com/go-text/typesetting/issues/57
Signed-off-by: Chris Waldon <christopher.waldon.dev@gmail.com>
148 lines
3.8 KiB
Go
148 lines
3.8 KiB
Go
// SPDX-License-Identifier: Unlicense OR MIT
|
|
|
|
// Package opentype implements text layout and shaping for OpenType
|
|
// files.
|
|
//
|
|
// NOTE: the OpenType specification allows for fonts to include bitmap images
|
|
// in a variety of formats. In the interest of small binary sizes, the opentype
|
|
// package only automatically imports the PNG image decoder. If you have a font
|
|
// with glyphs in JPEG or TIFF formats, register those decoders with the image
|
|
// package in order to ensure those glyphs are visible in text.
|
|
package opentype
|
|
|
|
import (
|
|
"bytes"
|
|
"fmt"
|
|
_ "image/png"
|
|
|
|
giofont "gioui.org/font"
|
|
"github.com/go-text/typesetting/font"
|
|
fontapi "github.com/go-text/typesetting/opentype/api/font"
|
|
"github.com/go-text/typesetting/opentype/api/metadata"
|
|
"github.com/go-text/typesetting/opentype/loader"
|
|
)
|
|
|
|
// Face is a shapeable representation of a font.
|
|
type Face struct {
|
|
face font.Face
|
|
aspect metadata.Aspect
|
|
family string
|
|
variant string
|
|
}
|
|
|
|
// Parse constructs a Face from source bytes.
|
|
func Parse(src []byte) (Face, error) {
|
|
ld, err := loader.NewLoader(bytes.NewReader(src))
|
|
if err != nil {
|
|
return Face{}, err
|
|
}
|
|
face, aspect, family, variant, err := parseLoader(ld)
|
|
if err != nil {
|
|
return Face{}, fmt.Errorf("failed parsing truetype font: %w", err)
|
|
}
|
|
return Face{
|
|
face: face,
|
|
aspect: aspect,
|
|
family: family,
|
|
variant: variant,
|
|
}, nil
|
|
}
|
|
|
|
// ParseCollection parse an Opentype font file, with support for collections.
|
|
// Single font files are supported, returning a slice with length 1.
|
|
// The returned fonts are automatically wrapped in a text.FontFace with
|
|
// inferred font metadata.
|
|
// BUG(whereswaldon): the only Variant that can be detected automatically is
|
|
// "Mono".
|
|
func ParseCollection(src []byte) ([]giofont.FontFace, error) {
|
|
lds, err := loader.NewLoaders(bytes.NewReader(src))
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
out := make([]giofont.FontFace, len(lds))
|
|
for i, ld := range lds {
|
|
face, aspect, family, variant, err := parseLoader(ld)
|
|
if err != nil {
|
|
return nil, fmt.Errorf("reading font %d of collection: %s", i, err)
|
|
}
|
|
ff := Face{
|
|
face: face,
|
|
aspect: aspect,
|
|
family: family,
|
|
variant: variant,
|
|
}
|
|
out[i] = giofont.FontFace{
|
|
Face: ff,
|
|
Font: ff.Font(),
|
|
}
|
|
}
|
|
|
|
return out, nil
|
|
}
|
|
|
|
// parseLoader parses the contents of the loader into a face and its metadata.
|
|
func parseLoader(ld *loader.Loader) (_ font.Face, _ metadata.Aspect, family, variant string, _ error) {
|
|
ft, err := fontapi.NewFont(ld)
|
|
if err != nil {
|
|
return nil, metadata.Aspect{}, "", "", err
|
|
}
|
|
data := metadata.Metadata(ld)
|
|
if data.IsMonospace {
|
|
variant = "Mono"
|
|
}
|
|
return &fontapi.Face{Font: ft}, data.Aspect, data.Family, variant, nil
|
|
}
|
|
|
|
func (f Face) Face() font.Face {
|
|
return f.face
|
|
}
|
|
|
|
// FontFace returns a text.Font with populated font metadata for the
|
|
// font.
|
|
// BUG(whereswaldon): the only Variant that can be detected automatically is
|
|
// "Mono".
|
|
func (f Face) Font() giofont.Font {
|
|
return giofont.Font{
|
|
Typeface: giofont.Typeface(f.family),
|
|
Style: f.style(),
|
|
Weight: f.weight(),
|
|
Variant: giofont.Variant(f.variant),
|
|
}
|
|
}
|
|
|
|
func (f Face) style() giofont.Style {
|
|
switch f.aspect.Style {
|
|
case metadata.StyleItalic:
|
|
return giofont.Italic
|
|
case metadata.StyleNormal:
|
|
fallthrough
|
|
default:
|
|
return giofont.Regular
|
|
}
|
|
}
|
|
|
|
func (f Face) weight() giofont.Weight {
|
|
switch f.aspect.Weight {
|
|
case metadata.WeightThin:
|
|
return giofont.Thin
|
|
case metadata.WeightExtraLight:
|
|
return giofont.ExtraLight
|
|
case metadata.WeightLight:
|
|
return giofont.Light
|
|
case metadata.WeightNormal:
|
|
return giofont.Normal
|
|
case metadata.WeightMedium:
|
|
return giofont.Medium
|
|
case metadata.WeightSemibold:
|
|
return giofont.SemiBold
|
|
case metadata.WeightBold:
|
|
return giofont.Bold
|
|
case metadata.WeightExtraBold:
|
|
return giofont.ExtraBold
|
|
case metadata.WeightBlack:
|
|
return giofont.Black
|
|
default:
|
|
return giofont.Normal
|
|
}
|
|
}
|