fonts: fix subset cmap table length

ci/release/changelogs/next.md

@@ -13,3 +13,4 @@
 
 - Shadow is cut off when `--pad` is 0. Thank you @LeonardsonCC ! [#1326](https://github.com/terrastruct/d2/pull/1326)
 - Fixes grid layout overwriting label placements for nested objects. [#1345](https://github.com/terrastruct/d2/pull/1345)
+- Fixed an issue where fonts were not rendering correctly when svgs were embeded on certain platforms. [#1356](https://github.com/terrastruct/d2/pull/1356)

d2renderers/d2fonts/d2fonts.go

@@ -10,8 +10,7 @@ import (
 	"fmt"
 	"strings"
 
-	"github.com/jung-kurt/gofpdf"
-
+	"oss.terrastruct.com/d2/lib/font"
 	fontlib "oss.terrastruct.com/d2/lib/font"
 )
 
@@ -44,7 +43,7 @@ func (f Font) GetEncodedSubset(corpus string) string {
 
 	fontBuf := make([]byte, len(FontFaces[f]))
 	copy(fontBuf, FontFaces[f])
-	fontBuf = gofpdf.UTF8CutFont(fontBuf, uniqueChars)
+	fontBuf = font.UTF8CutFont(fontBuf, uniqueChars)
 
 	fontBuf, err := fontlib.Sfnt2Woff(fontBuf)
 	if err != nil {

d2renderers/d2fonts/d2fonts_test.go

@@ -4,8 +4,7 @@ import (
 	"path/filepath"
 	"testing"
 
-	"github.com/jung-kurt/gofpdf"
-
+	"oss.terrastruct.com/d2/lib/font"
 	"oss.terrastruct.com/util-go/assert"
 	"oss.terrastruct.com/util-go/diff"
 )
@@ -17,7 +16,7 @@ func TestCutFont(t *testing.T) {
 	}
 	fontBuf := make([]byte, len(FontFaces[f]))
 	copy(fontBuf, FontFaces[f])
-	fontBuf = gofpdf.UTF8CutFont(fontBuf, " 1")
+	fontBuf = font.UTF8CutFont(fontBuf, " 1")
 	err := diff.Testdata(filepath.Join("testdata", "d2fonts", "cut"), ".txt", fontBuf)
 	assert.Success(t, err)
 }