feature: allow multiple ttf fonts at the same time

Makefile

@@ -27,7 +27,8 @@ TARGET = build/examples_epd.hex \
 		 build/examples_unicode_font_pyportal.hex \
 		 build/examples_unicode_font_wioterminal.hex \
 		 build/examples_unicode_font2_pyportal.hex \
-		 build/examples_unicode_font2_wioterminal.hex
+		 build/examples_unicode_font2_wioterminal.hex \
+		 build/examples_unicode_font3_const2bit_pyportal.hex
 .PHONY: smoke-test $(TARGET)
 smoke-test: clean $(TARGET)
 
@@ -70,3 +71,7 @@ build/examples_unicode_font2_pyportal.hex:
 build/examples_unicode_font2_wioterminal.hex:
 	$(TINYGO) build -size short -o $@ -target=wioterminal ./examples/unicode_font2
 	@$(MD5SUM) $@
+
+build/examples_unicode_font3_const2bit_pyportal.hex:
+	$(TINYGO) build -size short -o $@ -target=pyportal ./examples/unicode_font3_const2bit
+	@$(MD5SUM) $@

cmd/tinyfontgen-ttf/main.go

@@ -10,6 +10,7 @@ import (
 	"path/filepath"
 	"strings"
 
+	"golang.org/x/image/font"
 	"golang.org/x/image/font/opentype"
 	"golang.org/x/image/font/sfnt"
 	"golang.org/x/image/math/fixed"
@@ -85,46 +86,51 @@ func main() {
 		}
 	}
 
-	err := run(*sz, *dpi, fonts[0])
+	err := run(*sz, *dpi, fonts)
 	if err != nil {
 		log.Fatal(err)
 	}
 }
 
-func run(size, dpi int, fontfile string) error {
-	bb, err := ioutil.ReadFile(fontfile)
-	if err != nil {
-		return err
-	}
-
-	ft, err := opentype.Parse(bb)
-	if err != nil {
-		return err
-	}
-
-	face, err := opentype.NewFace(ft, &opentype.FaceOptions{Size: float64(size), DPI: float64(dpi)})
-	if err != nil {
-		return err
-	}
-
-	sfntBuf := &sfnt.Buffer{}
+func run(size, dpi int, fonts []string) error {
 	type xx struct {
 		Rune  rune
 		Index uint16
+		Face  font.Face
 	}
 	indexes := []xx{}
 
-	const runeMax = 0x3FFFF
-	for r := rune(0); r < runeMax; r++ {
-		idx, err := ft.GlyphIndex(sfntBuf, r)
+	for _, fontfile := range fonts {
+		bb, err := ioutil.ReadFile(fontfile)
 		if err != nil {
 			return err
 		}
-		if idx != 0 && (*all || runesMap[r]) {
-			indexes = append(indexes, xx{
-				Rune:  r,
-				Index: uint16(idx),
-			})
+
+		ft, err := opentype.Parse(bb)
+		if err != nil {
+			return err
+		}
+
+		face, err := opentype.NewFace(ft, &opentype.FaceOptions{Size: float64(size), DPI: float64(dpi)})
+		if err != nil {
+			return err
+		}
+
+		sfntBuf := &sfnt.Buffer{}
+
+		const runeMax = 0x3FFFF
+		for r := rune(0); r < runeMax; r++ {
+			idx, err := ft.GlyphIndex(sfntBuf, r)
+			if err != nil {
+				return err
+			}
+			if idx != 0 && (*all || runesMap[r]) {
+				indexes = append(indexes, xx{
+					Rune:  r,
+					Index: uint16(idx),
+					Face:  face,
+				})
+			}
 		}
 	}
 
@@ -133,7 +139,7 @@ func run(size, dpi int, fontfile string) error {
 		Glyphs: make([]Glyph, len(indexes)),
 	}
 	for i, xxx := range indexes {
-		dr, img, _, adv, ok := face.Glyph(fixed.Point26_6{}, xxx.Rune)
+		dr, img, _, adv, ok := xxx.Face.Glyph(fixed.Point26_6{}, xxx.Rune)
 		if !ok {
 			continue
 		}
@@ -215,7 +221,7 @@ func (f Font) SaveTo(w io.Writer) {
 	fontname := *fontname
 	yadv := *yadvance
 
-	fmt.Fprintf(w, "// ttfgen %s\n", strings.Join(os.Args[1:], " "))
+	fmt.Fprintf(w, "// tinyfnotgen-ttf %s\n", strings.Join(os.Args[1:], " "))
 	fmt.Fprintf(w, "\n")
 
 	fmt.Fprintf(w, "package %s\n", pkg)

examples/unicode_font3_const2bit/README.md

@@ -0,0 +1,20 @@
+# unicode\_font3\_const
+
+Testing with pyportal.  
+
+```
+$ tinygo build -o app.uf2 -target pyportal -size short ./examples/unicode_font3_const2bit
+```
+
+![](unicode_font3_const2bit.jpg)
+
+The font was created as follows.  
+
+```
+tinyfnotgen-ttf --size 12 --verbose --output ./font.go --string-file ./main.go --package main --fontname Notosans12pt ./NotoSansJP-Regular.otf ./NotoSansKR-Regular.ttf
+```
+
+You can download the original TTF/OTF fonts used with tinyfontgen-ttf from the following link. Please refer to the downloaded file for the license and other details.  
+
+* https://fonts.google.com/noto/specimen/Noto+Sans+JP
+* https://fonts.google.com/noto/specimen/Noto+Sans+KR