From 0c1be8adcc4773ceb6927b4f38d62539077f8cc8 Mon Sep 17 00:00:00 2001 From: nsfisis Date: Wed, 27 Apr 2022 19:34:38 +0900 Subject: support gothic font --- main.go | 27 +++++++++++++++++++-------- 1 file changed, 19 insertions(+), 8 deletions(-) (limited to 'main.go') diff --git a/main.go b/main.go index 1a14810..5101d60 100644 --- a/main.go +++ b/main.go @@ -2,9 +2,9 @@ package main import ( "embed" + "flag" "image/png" "log" - "os" "github.com/gdamore/tcell/v2" "golang.org/x/text/encoding" @@ -204,7 +204,7 @@ func calcSquareSizeAndOffset(r *Renderer, banner Banner) (int, int, []int, int) squareW := scrW / gridWidthMax squareH := scrH / gridHeight if squareW > squareH*8 { - squareW = squareH*8 + squareW = squareH * 8 } if squareH > squareW { squareH = squareW @@ -348,14 +348,25 @@ func prepareFont(fileHW, fileFW string) (*Font, error) { } func main() { - if len(os.Args) <= 1 { + var fontType = flag.String("f", "mincho", "Font (mincho or gothic)") + flag.Parse() + var fontFileHW string + var fontFileFW string + if *fontType == "mincho" { + fontFileHW = "assets/misaki_gothic_2nd_4x8.png" + fontFileFW = "assets/misaki_mincho.png" + } else if *fontType == "gothic" { + fontFileHW = "assets/misaki_gothic_2nd_4x8.png" + fontFileFW = "assets/misaki_gothic_2nd.png" + } else { + log.Fatalf("Unknown font: %s", *fontType) + } + + if flag.NArg() == 0 { return } - font, err := prepareFont( - "assets/misaki_gothic_2nd_4x8.png", - "assets/misaki_mincho.png", - ) + font, err := prepareFont(fontFileHW, fontFileFW) if err != nil { log.Fatalf("%+v", err) } @@ -369,7 +380,7 @@ func main() { } defer r.Fini() - banner, err := NewBanner(os.Args[1:]) + banner, err := NewBanner(flag.Args()) if err != nil { log.Fatalf("%+v", err) } -- cgit v1.2.3-70-g09d2