vg/{fonts,vgpdf}: remove vg/fonts package

Use embedded characted encoding table for embedded fonts. This relies on Go >= 1.16 for the "embed" package. Fixes gonum#696. Fixes gonum#637.
sbinet-gonum · Aug 13, 2021 · 9fca7f4 · 9fca7f4
1 parent 72c44e3
commit 9fca7f4
Show file tree

Hide file tree

Showing 5 changed files with 3 additions and 889 deletions.
diff --git a/vg/fonts/fonts.go b/vg/fonts/fonts.go
diff --git a/vg/fonts/liberation_fonts_generated.go b/vg/fonts/liberation_fonts_generated.go
diff --git a/vg/fonts/mk-fonts.go b/vg/fonts/mk-fonts.go
diff --git a/vg/fonts/cp1252.map → vg/vgpdf/cp1252.map b/vg/fonts/cp1252.map → vg/vgpdf/cp1252.map
diff --git a/vg/vgpdf/vgpdf.go b/vg/vgpdf/vgpdf.go
@@ -9,6 +9,7 @@ package vgpdf // import "gonum.org/v1/plot/vg/vgpdf"
 import (
 	"bufio"
 	"bytes"
+	_ "embed"
 	"fmt"
 	"image"
 	"image/color"
@@ -27,7 +28,6 @@ import (
 	"gonum.org/v1/plot/font"
 	"gonum.org/v1/plot/vg"
 	"gonum.org/v1/plot/vg/draw"
-	"gonum.org/v1/plot/vg/fonts"
 )
 
 // codePageEncoding holds informations about the characters encoding of TrueType
@@ -38,18 +38,14 @@ import (
 //
 // TODO: provide a Canvas-level func option to embed fonts with a user provided
 // code page schema?
+//
+//go:embed cp1252.map
 var codePageEncoding []byte
 
 func init() {
 	draw.RegisterFormat("pdf", func(w, h vg.Length) vg.CanvasWriterTo {
 		return New(w, h)
 	})
-
-	var err error
-	codePageEncoding, err = fonts.Asset("cp1252.map")
-	if err != nil {
-		panic(fmt.Errorf("vgpdf: could not load PDF charset encoding map: %+v", err))
-	}
 }
 
 // DPI is the nominal resolution of drawing in PDF.