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

d2graph: check that font family is entirely loaded before using it

Browse source 
I tested this by removing the changes I added in `d2fonts`, which led to:
```
[21:23:54] info: compiling GetUniqueColumnName-fix.d2...
[21:23:54] err: failed to compile: ruler does not have entire font family SourceCodePro loaded, is a style missing?
```

The error was also rendered in the UI.
This commit is contained in:
Kevin David 2023-01-24 21:20:34 -05:00
parent 500e3e179e
commit 9ba1d85d21
No known key found for this signature in database
2 changed files with 25 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
d2graph/d2graph.go
View file

@ -1077,6 +1077,12 @@ func appendTextDedup(texts []*d2target.MText, t *d2target.MText) []*d2target.MTe
} }
func (g *Graph) SetDimensions(mtexts []*d2target.MText, ruler *textmeasure.Ruler, fontFamily *d2fonts.FontFamily) error { func (g *Graph) SetDimensions(mtexts []*d2target.MText, ruler *textmeasure.Ruler, fontFamily *d2fonts.FontFamily) error {
if ruler != nil && fontFamily != nil {
if ok := ruler.HasFontFamilyLoaded(fontFamily); !ok {
return fmt.Errorf("ruler does not have entire font family %s loaded, is a style missing?", *fontFamily)
}
}
for _, obj := range g.Objects { for _, obj := range g.Objects {
obj.Box = &geo.Box{} obj.Box = &geo.Box{}

27
lib/textmeasure/textmeasure.go
View file

@ -4,7 +4,6 @@
package textmeasure package textmeasure
import ( import (
"fmt"
"math" "math"
"unicode" "unicode"
"unicode/utf8" "unicode/utf8"
@ -16,6 +15,7 @@ import (
) )
const TAB_SIZE = 4 const TAB_SIZE = 4
const SIZELESS_FONT_SIZE = 0
// ASCII is a set of all ASCII runes. These runes are codepoints from 32 to 127 inclusive. // ASCII is a set of all ASCII runes. These runes are codepoints from 32 to 127 inclusive.
var ASCII []rune var ASCII []rune
@ -136,15 +136,26 @@ func NewRuler() (*Ruler, error) {
return r, nil return r, nil
} }
func (r *Ruler) addFontSize(font d2fonts.Font) { func (r *Ruler) HasFontFamilyLoaded(fontFamily *d2fonts.FontFamily) bool {
sizeless := font for _, fontStyle := range d2fonts.FontStyles {
sizeless.Size = 0 font := d2fonts.Font{
ttf := r.ttfs[sizeless] Family: *fontFamily,
if ttf == nil { Style: fontStyle,
panic(fmt.Errorf("sizeless font %s not found with style %s", font.Family, font.Style)) Size: SIZELESS_FONT_SIZE,
}
_, ok := r.ttfs[font]
if !ok {
return false
}
} }
face := truetype.NewFace(ttf, &truetype.Options{ return true
}
func (r *Ruler) addFontSize(font d2fonts.Font) {
sizeless := font
sizeless.Size = SIZELESS_FONT_SIZE
face := truetype.NewFace(r.ttfs[sizeless], &truetype.Options{
Size: float64(font.Size), Size: float64(font.Size),
}) })
atlas := NewAtlas(face, ASCII) atlas := NewAtlas(face, ASCII)