Update fonts

Signed-off-by: Glenn Lewis <[email protected]>
gmlewis · Jul 8, 2024 · 75ed666 · 75ed666
1 parent 184f8d2
commit 75ed666
Show file tree

Hide file tree

Showing 88 changed files with 245 additions and 33 deletions.
diff --git a/README.md b/README.md
diff --git a/cmd/font2go/main.go b/cmd/font2go/main.go
@@ -32,11 +32,12 @@ var (
 
 	outTemp = template.Must(template.New("out").Funcs(funcMap).Parse(goTemplate))
 	funcMap = template.FuncMap{
-		"floats":     floats,
-		"orEmpty":    orEmpty,
-		"viewFilter": viewFilter,
+		"firstLetter": firstLetter,
+		"floats":      floats,
+		"orEmpty":     orEmpty,
+		"viewFilter":  viewFilter,
 	}
-	readmeTemp = template.Must(template.New("readme").Parse(readmeTemplate))
+	readmeTemp = template.Must(template.New("readme").Funcs(funcMap).Parse(readmeTemplate))
 
 	digitRE = regexp.MustCompile(`^\d`)
 )
@@ -56,12 +57,7 @@ func main() {
 			}
 		}
 
-		fontData.Font.ID = strings.ToLower(fontData.Font.ID)
-		fontData.Font.ID = strings.Replace(fontData.Font.ID, "-", "_", -1)
-		fontData.Font.ID = strings.TrimSuffix(fontData.Font.ID, "_")
-		if digitRE.MatchString(fontData.Font.ID) {
-			fontData.Font.ID = "f" + fontData.Font.ID
-		}
+		sanitizeFontName(fontData)
 
 		fontDir := filepath.Join(prefix, fontData.Font.ID)
 		if err := os.MkdirAll(fontDir, 0755); err != nil {
@@ -82,6 +78,16 @@ func main() {
 	fmt.Println("Done.")
 }
 
+func sanitizeFontName(fontData *webfont.FontData) {
+	fontData.Font.ID = strings.ToLower(fontData.Font.ID)
+	fontData.Font.ID = strings.Replace(fontData.Font.ID, "'", "", -1)
+	fontData.Font.ID = strings.Replace(fontData.Font.ID, "-", "_", -1)
+	fontData.Font.ID = strings.TrimSuffix(fontData.Font.ID, "_")
+	if digitRE.MatchString(fontData.Font.ID) {
+		fontData.Font.ID = "f" + fontData.Font.ID
+	}
+}
+
 // processor implements the webfont.Processor interface.
 type processor struct {
 	gs *glyphs.Glyphs
@@ -227,6 +233,10 @@ func orEmpty(s *string) string {
 	return fmt.Sprintf("%q", *s)
 }
 
+func firstLetter(s string) string {
+	return s[0:1]
+}
+
 func floats(f []float64) string {
 	return fmt.Sprintf("%#v", f)
 }
@@ -240,7 +250,7 @@ To use this font in your code, simply import it:
 ` + "```" + `go
 import (
   "github.com/gmlewis/go-fonts/fonts"
-  _ "github.com/gmlewis/go-fonts/fonts/{{ .ID }}"
+  _ "github.com/gmlewis/go-fonts-{{ .ID | firstLetter }}/fonts/{{ .ID }}"
 )
 
 func main() {

diff --git a/cmd/font2irmf/main.go b/cmd/font2irmf/main.go
@@ -48,12 +48,7 @@ func main() {
 			}
 		}
 
-		fontData.Font.ID = strings.ToLower(fontData.Font.ID)
-		fontData.Font.ID = strings.Replace(fontData.Font.ID, "-", "_", -1)
-		fontData.Font.ID = strings.TrimSuffix(fontData.Font.ID, "_")
-		if digitRE.MatchString(fontData.Font.ID) {
-			fontData.Font.ID = "f" + fontData.Font.ID
-		}
+		sanitizeFontName(fontData)
 
 		outFilename := fmt.Sprintf("%v.irmf", fontData.Font.ID)
 		w, err := os.Create(outFilename)
@@ -71,6 +66,16 @@ func main() {
 	fmt.Println("Done.")
 }
 
+func sanitizeFontName(fontData *webfont.FontData) {
+	fontData.Font.ID = strings.ToLower(fontData.Font.ID)
+	fontData.Font.ID = strings.Replace(fontData.Font.ID, "'", "", -1)
+	fontData.Font.ID = strings.Replace(fontData.Font.ID, "-", "_", -1)
+	fontData.Font.ID = strings.TrimSuffix(fontData.Font.ID, "_")
+	if digitRE.MatchString(fontData.Font.ID) {
+		fontData.Font.ID = "f" + fontData.Font.ID
+	}
+}
+
 func writeFont(w io.Writer, fontData *webfont.FontData, msg string) {
 	buf := &bytes.Buffer{}
 	rec := &recorder{f: buf, dedup: map[rune]*webfont.Glyph{}}

diff --git a/cmd/font2lua/main.go b/cmd/font2lua/main.go
@@ -56,19 +56,24 @@ func main() {
 			}
 		}
 
-		fontData.Font.ID = strings.ToLower(fontData.Font.ID)
-		fontData.Font.ID = strings.Replace(fontData.Font.ID, "-", "_", -1)
-		fontData.Font.ID = strings.TrimSuffix(fontData.Font.ID, "_")
-		if digitRE.MatchString(fontData.Font.ID) {
-			fontData.Font.ID = "f" + fontData.Font.ID
-		}
+		sanitizeFontName(fontData)
 
 		writeFont(fontData)
 	}
 
 	fmt.Println("Done.")
 }
 
+func sanitizeFontName(fontData *webfont.FontData) {
+	fontData.Font.ID = strings.ToLower(fontData.Font.ID)
+	fontData.Font.ID = strings.Replace(fontData.Font.ID, "'", "", -1)
+	fontData.Font.ID = strings.Replace(fontData.Font.ID, "-", "_", -1)
+	fontData.Font.ID = strings.TrimSuffix(fontData.Font.ID, "_")
+	if digitRE.MatchString(fontData.Font.ID) {
+		fontData.Font.ID = "f" + fontData.Font.ID
+	}
+}
+
 // processor implements the webfont.Processor interface.
 type processor struct {
 	current *glyphT

diff --git a/cmd/make-puzzle/go.mod b/cmd/make-puzzle/go.mod
@@ -3,7 +3,7 @@ module github.com/gmlewis/go-fonts/cmd/make-puzzle
 go 1.22.4
 
 require (
-	github.com/gmlewis/go-fonts v0.18.0
+	github.com/gmlewis/go-fonts v0.19.0
 	github.com/gmlewis/go-fonts-b/fonts/baloo v0.1.0
 )
 
@@ -17,6 +17,6 @@ require (
 	google.golang.org/protobuf v1.34.2 // indirect
 )
 
-replace github.com/gmlewis/go-fonts v0.18.0 => ../../
+replace github.com/gmlewis/go-fonts v0.19.0 => ../../
 
 replace github.com/gmlewis/go-fonts-b/fonts/baloo v0.1.0 => ../../../go-fonts-b/fonts/baloo
diff --git a/cmd/render-fonts/go.mod b/cmd/render-fonts/go.mod
@@ -3,7 +3,7 @@ module github.com/gmlewis/go-fonts/cmd/make-puzzle
 go 1.22.4
 
 require (
-	github.com/gmlewis/go-fonts v0.18.0
+	github.com/gmlewis/go-fonts v0.19.0
 	github.com/gmlewis/go-fonts/fonts/latoregular v0.0.0-20240626233958-3409c190883f
 )
 
@@ -17,6 +17,6 @@ require (
 	google.golang.org/protobuf v1.34.2 // indirect
 )
 
-replace github.com/gmlewis/go-fonts v0.18.0 => ../../
+replace github.com/gmlewis/go-fonts v0.19.0 => ../../
 
 replace github.com/gmlewis/go-fonts-l/fonts/latoregular v0.1.0 => ../../../go-fonts-l/fonts/latoregular
diff --git a/cmd/render-fonts/main.go b/cmd/render-fonts/main.go
@@ -15,8 +15,8 @@ import (
 	"sort"
 	"strings"
 
+	_ "github.com/gmlewis/go-fonts-l/fonts/latoregular"
 	. "github.com/gmlewis/go-fonts/fonts"
-	_ "github.com/gmlewis/go-fonts/fonts/latoregular"
 )
 
 var (

diff --git a/cmd/update-font-samples/main.go b/cmd/update-font-samples/main.go
@@ -0,0 +1,115 @@
+// update-font-samples is used by the maintainer of the repos to update the
+// README.md and images directories of all the go-fonts* repos.
+package main
+
+import (
+	"bytes"
+	"fmt"
+	"log"
+	"os"
+	"path/filepath"
+	"strings"
+	"text/template"
+)
+
+const (
+	fontDirs = "abcdefghijklmnopqrstuvwyz" // no 'x' fonts currently
+	splitStr = "## Font samples\n"
+)
+
+var (
+	samplesTemplate = template.Must(template.New("samplesTemplateStr").Funcs(funcMap).Parse(samplesTemplateStr))
+)
+
+func main() {
+	masterSamples, err := filepath.Glob("images/sample_*.png")
+	must(err)
+
+	if len(masterSamples) == 0 {
+		log.Fatal("No images/sample_*.png files found. Aborting.")
+	}
+
+	allFonts := make([]string, 0, len(masterSamples))
+	for _, sample := range masterSamples {
+		font := strings.TrimSuffix(strings.TrimPrefix(sample, "images/sample_"), ".png")
+		allFonts = append(allFonts, font)
+	}
+
+	var allSamples bytes.Buffer
+	must(samplesTemplate.Execute(&allSamples, allFonts))
+
+	c := &client{
+		allSamples:    allSamples.String(),
+		masterSamples: map[string]bool{},
+	}
+	for _, name := range masterSamples {
+		c.masterSamples[name] = true
+	}
+
+	c.updateReadme("README.md")
+
+	for _, r := range fontDirs {
+		c.updateFontDir("../go-fonts-" + string(r))
+	}
+}
+
+type client struct {
+	allSamples    string
+	masterSamples map[string]bool
+}
+
+func (c *client) updateFontDir(dirPrefix string) {
+	dirName := filepath.Join(dirPrefix, "images/sample_*.png")
+
+	c.updateReadme(filepath.Join(dirPrefix, "README.md"))
+
+	fontSamples, err := filepath.Glob(dirName)
+	must(err)
+
+	seen := map[string]bool{}
+	for _, fullname := range fontSamples {
+		filename := strings.TrimPrefix(fullname, dirPrefix+"/")
+		seen[filename] = true
+		if _, ok := c.masterSamples[filename]; !ok {
+			log.Fatalf("Found %v which is missing in go-fonts directory! Please fix this.", fullname)
+		}
+	}
+
+	for filename := range c.masterSamples {
+		if _, ok := seen[filename]; !ok {
+			log.Printf("Copying %v to %v/images ...", filename, dirPrefix)
+		}
+		b, err := os.ReadFile(filename)
+		must(err)
+		outFile := filepath.Join(dirPrefix, filename)
+		must(os.WriteFile(outFile, b, 0644))
+	}
+}
+
+func (c *client) updateReadme(filename string) {
+	b, err := os.ReadFile(filename)
+	must(err)
+	parts := strings.Split(string(b), splitStr)
+	if len(parts) != 2 {
+		log.Fatalf("Error parsing %v, got %v parts", filename, len(parts))
+	}
+	outStr := fmt.Sprintf("%v%v%v", parts[0], splitStr, c.allSamples)
+	must(os.WriteFile(filename, []byte(outStr), 0644))
+}
+
+func must(err error) {
+	if err != nil {
+		log.Fatal(err)
+	}
+}
+
+var funcMap = map[string]any{
+	"firstLetter": firstLetter,
+}
+
+func firstLetter(s string) string {
+	return s[0:1]
+}
+
+var samplesTemplateStr = `{{ range . }}[![{{ . }}](images/sample_{{ . }}.png)](https://github.com/gmlewis/go-fonts-{{ . | firstLetter }}/tree/master/fonts/{{ . }})
+{{ end }}`
diff --git a/examples/go.mod b/examples/go.mod
@@ -4,7 +4,7 @@ go 1.22.4
 
 require (
 	github.com/fogleman/gg v1.3.0
-	github.com/gmlewis/go-fonts v0.18.0
+	github.com/gmlewis/go-fonts v0.19.0
 	github.com/gmlewis/go-fonts-c/fonts/carrelectronicdingbats v0.1.0
 	github.com/gmlewis/go-fonts-f/fonts/freeserif v0.1.0
 	github.com/gmlewis/go-fonts-l/fonts/latoregular v0.1.0
@@ -27,7 +27,7 @@ require (
 	google.golang.org/protobuf v1.34.2 // indirect
 )
 
-replace github.com/gmlewis/go-fonts v0.18.0 => ../
+replace github.com/gmlewis/go-fonts v0.19.0 => ../
 
 replace github.com/gmlewis/go-fonts-c/fonts/carrelectronicdingbats v0.1.0 => ../../go-fonts-c/fonts/carrelectronicdingbats
 

diff --git a/go.mod b/go.mod
@@ -1,6 +1,6 @@
 module github.com/gmlewis/go-fonts
 
-go 1.22.4
+go 1.22.5
 
 require (
 	github.com/fogleman/gg v1.3.0

diff --git a/images/sample_actionjackson.png b/images/sample_actionjackson.png
diff --git a/images/sample_angstrom.png b/images/sample_angstrom.png
diff --git a/images/sample_antelopeh.png b/images/sample_antelopeh.png
diff --git a/images/sample_antimonyblue.png b/images/sample_antimonyblue.png
diff --git a/images/sample_boringboron.png b/images/sample_boringboron.png
diff --git a/images/sample_codon.png b/images/sample_codon.png
diff --git a/images/sample_colophondbz.png b/images/sample_colophondbz.png
diff --git a/images/sample_conventionalwisdom.png b/images/sample_conventionalwisdom.png
diff --git a/images/sample_cosinekatie.png b/images/sample_cosinekatie.png
diff --git a/images/sample_davis.png b/images/sample_davis.png
diff --git a/images/sample_dissonant_fractured.png b/images/sample_dissonant_fractured.png
diff --git a/images/sample_doctorazul.png b/images/sample_doctorazul.png
diff --git a/images/sample_donner.png b/images/sample_donner.png
diff --git a/images/sample_douglasadamshand.png b/images/sample_douglasadamshand.png
diff --git a/images/sample_dysprosium.png b/images/sample_dysprosium.png
diff --git a/images/sample_epilog.png b/images/sample_epilog.png
diff --git a/images/sample_f32768no.png b/images/sample_f32768no.png
diff --git a/images/sample_f7hours.png b/images/sample_f7hours.png
diff --git a/images/sample_faraday.png b/images/sample_faraday.png
diff --git a/images/sample_fresnel.png b/images/sample_fresnel.png
diff --git a/images/sample_gaussjordan.png b/images/sample_gaussjordan.png
diff --git a/images/sample_geodesic.png b/images/sample_geodesic.png
diff --git a/images/sample_germs.png b/images/sample_germs.png
diff --git a/images/sample_greenwichmeantime.png b/images/sample_greenwichmeantime.png
diff --git a/images/sample_guildofprofessionalactors.png b/images/sample_guildofprofessionalactors.png
diff --git a/images/sample_hockeyislif.png b/images/sample_hockeyislif.png
diff --git a/images/sample_hydrogenscore.png b/images/sample_hydrogenscore.png
diff --git a/images/sample_initial.png b/images/sample_initial.png
diff --git a/images/sample_isuckatgolf.png b/images/sample_isuckatgolf.png
diff --git a/images/sample_leland.png b/images/sample_leland.png
diff --git a/images/sample_lelandtext.png b/images/sample_lelandtext.png
diff --git a/images/sample_levity.png b/images/sample_levity.png
diff --git a/images/sample_lexographer.png b/images/sample_lexographer.png
diff --git a/images/sample_linear.png b/images/sample_linear.png
diff --git a/images/sample_mayqueen.png b/images/sample_mayqueen.png
diff --git a/images/sample_melaniegirly.png b/images/sample_melaniegirly.png
diff --git a/images/sample_metalanguage.png b/images/sample_metalanguage.png
diff --git a/images/sample_musicdbz.png b/images/sample_musicdbz.png
diff --git a/images/sample_naturallog.png b/images/sample_naturallog.png
diff --git a/images/sample_nonblockingsocket.png b/images/sample_nonblockingsocket.png
diff --git a/images/sample_nullpointer.png b/images/sample_nullpointer.png
diff --git a/images/sample_oneconstant.png b/images/sample_oneconstant.png
diff --git a/images/sample_opticbot.png b/images/sample_opticbot.png
diff --git a/images/sample_pinball_data.png b/images/sample_pinball_data.png
diff --git a/images/sample_potassiumscandal.png b/images/sample_potassiumscandal.png
diff --git a/images/sample_prefix.png b/images/sample_prefix.png
diff --git a/images/sample_progbot.png b/images/sample_progbot.png
diff --git a/images/sample_proteron.png b/images/sample_proteron.png
diff --git a/images/sample_ransom.png b/images/sample_ransom.png
diff --git a/images/sample_realbttsoief.png b/images/sample_realbttsoief.png
diff --git a/images/sample_resurgence.png b/images/sample_resurgence.png
diff --git a/images/sample_robotteacher.png b/images/sample_robotteacher.png
diff --git a/images/sample_secret_labs.png b/images/sample_secret_labs.png
diff --git a/images/sample_signaltonoise.png b/images/sample_signaltonoise.png
diff --git a/images/sample_snootorgpixel10.png b/images/sample_snootorgpixel10.png
diff --git a/images/sample_submerged.png b/images/sample_submerged.png
diff --git a/images/sample_technetium.png b/images/sample_technetium.png
diff --git a/images/sample_tetanus.png b/images/sample_tetanus.png
diff --git a/images/sample_thisboringparty.png b/images/sample_thisboringparty.png
diff --git a/images/sample_toast.png b/images/sample_toast.png
diff --git a/images/sample_tombats6.png b/images/sample_tombats6.png
diff --git a/images/sample_tombats7.png b/images/sample_tombats7.png
diff --git a/images/sample_tombats_one.png b/images/sample_tombats_one.png
diff --git a/images/sample_tombatsfour.png b/images/sample_tombatsfour.png
diff --git a/images/sample_tombatssmilies.png b/images/sample_tombatssmilies.png
diff --git a/images/sample_tombatsthree.png b/images/sample_tombatsthree.png
diff --git a/images/sample_tombots.png b/images/sample_tombots.png
diff --git a/images/sample_tommysfirstalphabet.png b/images/sample_tommysfirstalphabet.png
diff --git a/images/sample_toms_handwriting.png b/images/sample_toms_handwriting.png
diff --git a/images/sample_toms_newroman.png b/images/sample_toms_newroman.png
diff --git a/images/sample_tomsheadache.png b/images/sample_tomsheadache.png
diff --git a/images/sample_tuesday.png b/images/sample_tuesday.png
diff --git a/images/sample_two_turtledoves.png b/images/sample_two_turtledoves.png
diff --git a/images/sample_valium.png b/images/sample_valium.png
diff --git a/images/sample_wolveslower.png b/images/sample_wolveslower.png
diff --git a/images/sample_yikatu.png b/images/sample_yikatu.png
diff --git a/images/sample_zincboomerang.png b/images/sample_zincboomerang.png
diff --git a/update-font-samples.sh b/update-font-samples.sh
@@ -0,0 +1,2 @@
+#!/bin/bash -e
+go run cmd/update-font-samples/main.go