Bump github.com/gmlewis/go-fonts from 0.0.13 to 0.18.0

Signed-off-by: Glenn Lewis <[email protected]>
gmlewis · Jul 1, 2024 · b67e9d8 · b67e9d8
1 parent 77df1b5
commit b67e9d8
Show file tree

Hide file tree

Showing 15 changed files with 28 additions and 22 deletions.
diff --git a/examples/bifilar-coil/main.go b/examples/bifilar-coil/main.go
@@ -11,7 +11,7 @@ import (
 	"os"
 	"runtime/pprof"
 
-	_ "github.com/gmlewis/go-fonts/fonts/freeserif"
+	_ "github.com/gmlewis/go-fonts-f/fonts/freeserif"
 	. "github.com/gmlewis/go-gerber/gerber"
 	"github.com/gmlewis/go-gerber/gerber/viewer"
 )

diff --git a/examples/bifilar-with-capacitor/main.go b/examples/bifilar-with-capacitor/main.go
@@ -25,7 +25,7 @@ import (
 	"runtime/pprof"
 	"strings"
 
-	_ "github.com/gmlewis/go-fonts/fonts/freeserif"
+	_ "github.com/gmlewis/go-fonts-f/fonts/freeserif"
 	. "github.com/gmlewis/go-gerber/gerber"
 	"github.com/gmlewis/go-gerber/gerber/viewer"
 )

diff --git a/examples/dual-bifilar-coil/main.go b/examples/dual-bifilar-coil/main.go
@@ -12,7 +12,7 @@ import (
 	"os"
 	"runtime/pprof"
 
-	_ "github.com/gmlewis/go-fonts/fonts/freeserif"
+	_ "github.com/gmlewis/go-fonts-f/fonts/freeserif"
 	. "github.com/gmlewis/go-gerber/gerber"
 	"github.com/gmlewis/go-gerber/gerber/viewer"
 )

diff --git a/examples/dual-capacitor/main.go b/examples/dual-capacitor/main.go
@@ -14,7 +14,7 @@ import (
 	"runtime/pprof"
 	"strings"
 
-	_ "github.com/gmlewis/go-fonts/fonts/freeserif"
+	_ "github.com/gmlewis/go-fonts-f/fonts/freeserif"
 	. "github.com/gmlewis/go-gerber/gerber"
 	"github.com/gmlewis/go-gerber/gerber/viewer"
 )

diff --git a/examples/hex-bifilar-coil/main.go b/examples/hex-bifilar-coil/main.go
@@ -12,7 +12,7 @@ import (
 	"os"
 	"runtime/pprof"
 
-	_ "github.com/gmlewis/go-fonts/fonts/freeserif"
+	_ "github.com/gmlewis/go-fonts-f/fonts/freeserif"
 	. "github.com/gmlewis/go-gerber/gerber"
 	"github.com/gmlewis/go-gerber/gerber/viewer"
 )

diff --git a/examples/hex-capacitor/main.go b/examples/hex-capacitor/main.go
@@ -10,7 +10,7 @@ import (
 	"os"
 	"runtime/pprof"
 
-	_ "github.com/gmlewis/go-fonts/fonts/freeserif"
+	_ "github.com/gmlewis/go-fonts-f/fonts/freeserif"
 	. "github.com/gmlewis/go-gerber/gerber"
 	"github.com/gmlewis/go-gerber/gerber/viewer"
 )

diff --git a/examples/icosi-bifilar-coil/main.go b/examples/icosi-bifilar-coil/main.go
@@ -12,7 +12,7 @@ import (
 	"os"
 	"runtime/pprof"
 
-	_ "github.com/gmlewis/go-fonts/fonts/freeserif"
+	_ "github.com/gmlewis/go-fonts-f/fonts/freeserif"
 	. "github.com/gmlewis/go-gerber/gerber"
 	"github.com/gmlewis/go-gerber/gerber/viewer"
 )

diff --git a/examples/n333-bifilar-coil/main.go b/examples/n333-bifilar-coil/main.go
@@ -10,7 +10,7 @@ import (
 	"os"
 	"runtime/pprof"
 
-	_ "github.com/gmlewis/go-fonts/fonts/freeserif"
+	_ "github.com/gmlewis/go-fonts-f/fonts/freeserif"
 	. "github.com/gmlewis/go-gerber/gerber"
 	"github.com/gmlewis/go-gerber/gerber/viewer"
 )

diff --git a/examples/oct-bifilar-coil/main.go b/examples/oct-bifilar-coil/main.go
@@ -12,7 +12,7 @@ import (
 	"os"
 	"runtime/pprof"
 
-	_ "github.com/gmlewis/go-fonts/fonts/freeserif"
+	_ "github.com/gmlewis/go-fonts-f/fonts/freeserif"
 	. "github.com/gmlewis/go-gerber/gerber"
 	"github.com/gmlewis/go-gerber/gerber/viewer"
 )

diff --git a/examples/quad-bifilar-coil/main.go b/examples/quad-bifilar-coil/main.go
@@ -12,7 +12,7 @@ import (
 	"os"
 	"runtime/pprof"
 
-	_ "github.com/gmlewis/go-fonts/fonts/freeserif"
+	_ "github.com/gmlewis/go-fonts-f/fonts/freeserif"
 	. "github.com/gmlewis/go-gerber/gerber"
 	"github.com/gmlewis/go-gerber/gerber/viewer"
 )

diff --git a/examples/quad-capacitor/main.go b/examples/quad-capacitor/main.go
@@ -10,7 +10,7 @@ import (
 	"os"
 	"runtime/pprof"
 
-	_ "github.com/gmlewis/go-fonts/fonts/freeserif"
+	_ "github.com/gmlewis/go-fonts-f/fonts/freeserif"
 	. "github.com/gmlewis/go-gerber/gerber"
 	"github.com/gmlewis/go-gerber/gerber/viewer"
 )

diff --git a/examples/test-fonts/main.go b/examples/test-fonts/main.go
@@ -3,8 +3,8 @@
 package main
 
 // To import any desired fonts, import them below:
-// _ "github.com/gmlewis/go-fonts/fonts/ubuntumonoregular"
-// _ "github.com/gmlewis/go-fonts/fonts/znikomitno24"
+// _ "github.com/gmlewis/go-fonts-u/fonts/ubuntumonoregular"
+// _ "github.com/gmlewis/go-fonts-z/fonts/znikomitno24"
 // etc.
 
 import (
@@ -15,8 +15,8 @@ import (
 	"sort"
 	"strings"
 
+	_ "github.com/gmlewis/go-fonts-z/fonts/znikomitno24"
 	"github.com/gmlewis/go-fonts/fonts"
-	_ "github.com/gmlewis/go-fonts/fonts/znikomitno24"
 	. "github.com/gmlewis/go-gerber/gerber"
 )
 

diff --git a/gerber/text_test.go b/gerber/text_test.go
@@ -4,7 +4,7 @@ import (
 	"math"
 	"testing"
 
-	_ "github.com/gmlewis/go-fonts/fonts/freeserif"
+	_ "github.com/gmlewis/go-fonts-f/fonts/freeserif"
 )
 
 func TestTextT_Primitive(t *testing.T) {

diff --git a/go.mod b/go.mod
@@ -1,11 +1,13 @@
 module github.com/gmlewis/go-gerber
 
-go 1.21.3
+go 1.22.4
 
 require (
 	fyne.io/fyne/v2 v2.4.5
 	github.com/fogleman/gg v1.3.0
-	github.com/gmlewis/go-fonts v0.0.13
+	github.com/gmlewis/go-fonts v0.18.0
+	github.com/gmlewis/go-fonts-f/fonts/freeserif v0.0.0-20240628233602-f923b1251b49
+	github.com/gmlewis/go-fonts-z/fonts/znikomitno24 v0.0.0-20240628235854-19a342cac851
 	github.com/gmlewis/go3d v0.0.4
 )
 
@@ -38,7 +40,7 @@ require (
 	golang.org/x/net v0.23.0 // indirect
 	golang.org/x/sys v0.18.0 // indirect
 	golang.org/x/text v0.16.0 // indirect
-	google.golang.org/protobuf v1.33.0 // indirect
+	google.golang.org/protobuf v1.34.2 // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect
 	honnef.co/go/js/dom v0.0.0-20210725211120-f030747120f2 // indirect
 )
diff --git a/go.sum b/go.sum
@@ -86,8 +86,12 @@ github.com/fyne-io/glfw-js v0.0.0-20220120001248-ee7290d23504/go.mod h1:gLRWYfYn
 github.com/fyne-io/image v0.0.0-20220602074514-4956b0afb3d2 h1:hnLq+55b7Zh7/2IRzWCpiTcAvjv/P8ERF+N7+xXbZhk=
 github.com/fyne-io/image v0.0.0-20220602074514-4956b0afb3d2/go.mod h1:eO7W361vmlPOrykIg+Rsh1SZ3tQBaOsfzZhsIOb/Lm0=
 github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04=
-github.com/gmlewis/go-fonts v0.0.13 h1:1P4rVyd9kwY8YvJGm/Jj+J6qxtj+N1qPAKVuCbN1e08=
-github.com/gmlewis/go-fonts v0.0.13/go.mod h1:zEWa2GwJbCO5JRE0u+h4Du7c1vtHQIfratAFDPMZZ2c=
+github.com/gmlewis/go-fonts v0.18.0 h1:r0GsBn9L7E5Ij2WI/7maxbg2no7VFsDBxFRm5JBKrfI=
+github.com/gmlewis/go-fonts v0.18.0/go.mod h1:OSTvYq6t/sv7lzRUTBtiIu0sQ6SeTvF52XYuSIwm/Hs=
+github.com/gmlewis/go-fonts-f/fonts/freeserif v0.0.0-20240628233602-f923b1251b49 h1:qVbSqsBk8biJzVeQSqo982z1x3uBCKZD1TssGGZPoNA=
+github.com/gmlewis/go-fonts-f/fonts/freeserif v0.0.0-20240628233602-f923b1251b49/go.mod h1:pRiewuvJeQJpOfx7R67GRqX4IstH6j8gVSDUO010mjw=
+github.com/gmlewis/go-fonts-z/fonts/znikomitno24 v0.0.0-20240628235854-19a342cac851 h1:9UNHVfpMvyUi/kDJy2g5bhERl4824RyWqosvNPtujPk=
+github.com/gmlewis/go-fonts-z/fonts/znikomitno24 v0.0.0-20240628235854-19a342cac851/go.mod h1:B3MfHxGpedUUC655ZXdy1+j6o4uZdH1y3zEeCC/XM44=
 github.com/gmlewis/go3d v0.0.4 h1:2ymApzgFXKZJ0nFgItUAAXt2z8n5tPOz5Wtu/SGZ1As=
 github.com/gmlewis/go3d v0.0.4/go.mod h1:kmNbdpGuKWLQCUigppF9tBmoHDLrsymSy6se+eBUOVk=
 github.com/gmlewis/ponoko2d v0.0.0-20190404133045-d77d370bec9a h1:+f/EwY1eQ5vL78T1LwqOKSGoEGtZ3kkwAvONoJtDay0=
@@ -636,8 +640,8 @@ google.golang.org/protobuf v1.24.0/go.mod h1:r/3tXBNzIEhYS9I1OUVjXDlt8tc493IdKGj
 google.golang.org/protobuf v1.25.0/go.mod h1:9JNX74DMeImyA3h4bdi1ymwjUzf21/xIlbajtzgsN7c=
 google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw=
 google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc=
-google.golang.org/protobuf v1.33.0 h1:uNO2rsAINq/JlFpSdYEKIZ0uKD/R9cpdv0T+yoGwGmI=
-google.golang.org/protobuf v1.33.0/go.mod h1:c6P6GXX6sHbq/GpV6MGZEdwhWPcYBgnhAHhKbcUYpos=
+google.golang.org/protobuf v1.34.2 h1:6xV6lTsCfpGD21XK49h7MhtcApnLqkfYgPcdHftf6hg=
+google.golang.org/protobuf v1.34.2/go.mod h1:qYOHts0dSfpeUzUFpOMr/WGzszTmLH+DiWniOlNbLDw=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127 h1:qIbj1fsPNlZgppZ+VLlY7N33q108Sa+fhmuc+sWQYwY=
 gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=