luciano/d2
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

refactor to load all font sizes on demand

Browse source
This commit is contained in:
Gavin Nishizawa 2022-11-30 11:01:29 -08:00
parent 7e58edc436
commit 2f96210e77
No known key found for this signature in database
GPG key ID: AE3B177777CE55CD
2 changed files with 15 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
d2renderers/textmeasure/markdown.go
View file

@ -4,7 +4,6 @@ import (
"bytes" "bytes"
"math" "math"
"strings" "strings"
"unicode/utf8"
"github.com/PuerkitoBio/goquery" "github.com/PuerkitoBio/goquery"
"github.com/yuin/goldmark" "github.com/yuin/goldmark"
@ -212,20 +211,17 @@ func (ruler *Ruler) measureNode(depth int, n *html.Node, font d2fonts.Font) bloc
if strings.TrimSpace(n.Data) == "" { if strings.TrimSpace(n.Data) == "" {
return blockAttrs{} return blockAttrs{}
} }
spaceWidths := 0.
// consecutive leading/trailing spaces end up rendered as a single space
spaceRune, _ := utf8.DecodeRuneInString(" ")
// measure will not include leading or trailing whitespace, so we have to add in the space width
spaceWidth := ruler.atlases[font].glyph(spaceRune).advance
str := n.Data str := n.Data
isCode := parentElementType == "pre" || parentElementType == "code" isCode := parentElementType == "pre" || parentElementType == "code"
spaceWidths := 0.
if !isCode { if !isCode {
spaceWidth := ruler.spaceWidth(font)
// MeasurePrecise will not include leading or trailing whitespace, so we account for it here
str = strings.ReplaceAll(str, "\n", " ") str = strings.ReplaceAll(str, "\n", " ")
str = strings.ReplaceAll(str, "\t", " ") str = strings.ReplaceAll(str, "\t", " ")
if strings.HasPrefix(str, " ") { if strings.HasPrefix(str, " ") {
// consecutive leading/trailing spaces end up rendered as a single space
str = strings.TrimPrefix(str, " ") str = strings.TrimPrefix(str, " ")
if hasPrev(n) { if hasPrev(n) {
spaceWidths += spaceWidth spaceWidths += spaceWidth

19
d2renderers/textmeasure/textmeasure.go
View file

@ -127,10 +127,6 @@ func NewRuler() (*Ruler, error) {
} }
r.ttfs[font] = ttf r.ttfs[font] = ttf
} }
for _, fontSize := range d2fonts.FontSizes {
r.addFontSize(font, fontSize)
}
} }
} }
@ -139,13 +135,12 @@ func NewRuler() (*Ruler, error) {
return r, nil return r, nil
} }
func (r *Ruler) addFontSize(font d2fonts.Font, fontSize int) { func (r *Ruler) addFontSize(font d2fonts.Font) {
sizeless := font sizeless := font
sizeless.Size = 0 sizeless.Size = 0
face := truetype.NewFace(r.ttfs[sizeless], &truetype.Options{ face := truetype.NewFace(r.ttfs[sizeless], &truetype.Options{
Size: float64(fontSize), Size: float64(font.Size),
}) })
font.Size = fontSize
atlas := NewAtlas(face, ASCII) atlas := NewAtlas(face, ASCII)
r.atlases[font] = atlas r.atlases[font] = atlas
r.lineHeights[font] = atlas.lineHeight r.lineHeights[font] = atlas.lineHeight
@ -159,7 +154,7 @@ func (t *Ruler) Measure(font d2fonts.Font, s string) (width, height int) {
func (t *Ruler) MeasurePrecise(font d2fonts.Font, s string) (width, height float64) { func (t *Ruler) MeasurePrecise(font d2fonts.Font, s string) (width, height float64) {
if _, ok := t.atlases[font]; !ok { if _, ok := t.atlases[font]; !ok {
t.addFontSize(font, font.Size) t.addFontSize(font)
} }
t.clear() t.clear()
t.buf = append(t.buf, s...) t.buf = append(t.buf, s...)
@ -229,3 +224,11 @@ func (txt *Ruler) drawBuf(font d2fonts.Font) {
} }
} }
} }
func (ruler *Ruler) spaceWidth(font d2fonts.Font) float64 {
if _, has := ruler.atlases[font]; !has {
ruler.addFontSize(font)
}
spaceRune, _ := utf8.DecodeRuneInString(" ")
return ruler.atlases[font].glyph(spaceRune).advance
}