Many changes, sorry for the size

.gitleaks.toml

@@ -0,0 +1,8 @@
+title = "repo gitleaks config"
+
+[allowlist]
+description = "global allowlist"
+paths = [
+  '''^docs/''',
+  '''^testdata/'''
+]

.goreleaser.yml

@@ -0,0 +1,28 @@
+project_name: mdtohtml
+
+before:
+  hooks:
+    - go mod tidy
+
+builds:
+  - id: app
+    binary: mdtohtml
+    main: ./
+    env:
+      - CGO_ENABLED=0
+
+archives:
+  - formats: [tar.gz]
+    format_overrides:
+      - goos: windows
+        formats: [zip]
+
+checksum:
+  name_template: checksums.txt
+
+changelog:
+  sort: asc
+  filters:
+    exclude:
+      - '^docs:'
+      - '^test:'

README.md

@@ -3,12 +3,24 @@ Mdtohtml is a HTML generator from a Markdown file. This is implemented in Go. Th
 
 The syntax of Markdown follows [CommonMark](https://commonmark.org/) which version is [0.29 (2019-04-06)](https://spec.commonmark.org/). They have playground, [commonmark.js dingus](https://spec.commonmark.org/dingus/), for CommonMark grammar.
 
+## Install
+
+### GitHub Releases
+Download binaries from: https://github.com/mdtohtml/mdtohtml/releases
+
+### Go install
+go install github.com/mdtohtml/mdtohtml@latest
+
 ## Usage
 ```
-$ make mdtohtml & ./mdtohtml <markdown-filename>
+$ go run . <markdown-filename>
 
 // You can avoid to generate css file with -nocss flag in order to customize style.
-$ make mdtohtml & ./mdtohtml <markdown-filename> -nocss
+$ go run . <markdown-filename> -nocss
+
+// Alternatively, if you have installed the tool using `go install`:
+$ mdtohtml <markdown-filename>
+$ mdtohtml <markdown-filename> -nocss
 ```
 
 ## Current support notations (2019-10-14)
@@ -43,4 +55,4 @@ Newline = "\n" ;
 ```
 
 ## Test
-Supports test written in Go. You can test this tool just by `$ make test`.
+Supports test written in Go. You can test this tool just by `$ go test ./...`.

gen.go

@@ -46,15 +46,15 @@ func generate(lines []Line) string {
 				dep := l.dep - lines[i+1].dep
 				for dep > 0 {
 					html += "</ul>"
-					dep -= 1
+					dep--
 				}
 			}
 			// insert </ul> for the end of sublists when a document ends with lists
 			if i == len(lines)-1 {
 				dep := l.dep
 				for dep > 0 {
 					html += "</ul>"
-					dep -= 1
+					dep--
 				}
 			}
 
@@ -67,7 +67,9 @@ func generate(lines []Line) string {
 		default:
 			// insert a white space in a paragraph
 			if (i > 0 && lines[i-1].ty == P) && (i < len(lines)-1 && lines[i+1].ty == P) {
-				html += l.val
+				if !lines[i-1].hasBr {
+					html += " "
+				}
 			}
 		}
 	}

go.mod

@@ -0,0 +1,5 @@
+module github.com/mdtohtml/mdtohtml
+
+go 1.25.0
+
+require golang.org/x/tools v0.47.0

go.sum

@@ -0,0 +1,2 @@
+golang.org/x/tools v0.47.0 h1:7Kn5x/d1svx/PzryTsqeoZN4TZwqeH5pGWjefhLi/1Q=
+golang.org/x/tools v0.47.0/go.mod h1:dFHnyTvFWY212G+h7ZY4Vsp/K3U4/7W9TyVaAul8uCA=

main.go

@@ -4,34 +4,82 @@ import (
 	"bufio"
 	"fmt"
 	"os"
+	"path/filepath"
 	"strings"
 )
 
 func check(e error) {
 	if e != nil {
-		panic(e)
+		fmt.Fprintf(os.Stderr, "error: %v\n", e)
+		os.Exit(1)
 	}
 }
 
+func usage() {
+	fmt.Fprintf(os.Stderr, "Usage: %s <markdown-filename> [-nocss]\n", os.Args[0])
+	os.Exit(1)
+}
+
 func main() {
-	fname := os.Args[1]
-	name := strings.Split(fname, ".")
+	if len(os.Args) < 2 {
+		usage()
+	}
+
+	var fname string
+	var noCSS bool
 
-	if strings.Compare(strings.ToLower(name[len(name)-1]), "md") != 0 {
-		panic("input file must be a markdown file (.md)")
+	for _, arg := range os.Args[1:] {
+		if arg == "-h" || arg == "--help" || arg == "-help" {
+			usage()
+		} else if arg == "-nocss" {
+			noCSS = true
+		} else if strings.HasPrefix(arg, "-") {
+			fmt.Fprintf(os.Stderr, "error: unknown flag %s\n", arg)
+			usage()
+		} else if fname != "" {
+			fmt.Fprintf(os.Stderr, "error: multiple input files specified\n")
+			usage()
+		} else {
+			fname = arg
+		}
+	}
+
+	if fname == "" {
+		fmt.Fprintf(os.Stderr, "error: missing markdown filename\n")
+		usage()
 	}
 
-	wfile, err := os.Create(name[0] + ".html")
+	ext := filepath.Ext(fname)
+	if strings.ToLower(ext) != ".md" {
+		fmt.Fprintf(os.Stderr, "error: input file must be a markdown file (.md)\n")
+		os.Exit(1)
+	}
+
+	base := strings.TrimSuffix(fname, ext)
+
+	wfile, err := os.Create(base + ".html")
 	check(err)
-	defer wfile.Close()
+
+	defer func() {
+		if err := wfile.Close(); err != nil {
+			fmt.Fprintf(os.Stderr, "error: %v\n", err)
+			os.Exit(1)
+		}
+	}()
 	writer := bufio.NewWriter(wfile)
-	if len(os.Args) < 3 || os.Args[2] != "-nocss" {
-		fmt.Fprintln(writer, css())
+	if !noCSS {
+		_, err = fmt.Fprintln(writer, css())
+		check(err)
 	}
 
 	rfile, err := os.Open(fname)
 	check(err)
-	defer rfile.Close()
+
+	defer func() {
+		if err := rfile.Close(); err != nil {
+			fmt.Fprintf(os.Stderr, "error closing input file: %v\n", err)
+		}
+	}()
 	reader := bufio.NewReader(rfile)
 
 	lines := make([]Line, 0)
@@ -47,8 +95,9 @@ func main() {
 		lines = append(lines, convert(line))
 	}
 
-	writer.WriteString("<body>")
-	writer.WriteString(generate(lines))
-	writer.WriteString("</body>")
-	writer.Flush()
+	_, _ = writer.WriteString("<body>")
+	_, _ = writer.WriteString(generate(lines))
+	_, _ = writer.WriteString("</body>")
+	err = writer.Flush()
+	check(err)
 }

main_test.go

@@ -0,0 +1,72 @@
+package main
+
+import (
+	"embed"
+	"io/fs"
+	"path"
+	"strings"
+	"testing"
+	"testing/fstest"
+
+	"golang.org/x/tools/txtar"
+)
+
+//go:embed testdata/txtar/*.txtar
+var testdataFS embed.FS
+
+func SplitInputExpected(ar *txtar.Archive) (input, expected fstest.MapFS) {
+	input = fstest.MapFS{}
+	expected = fstest.MapFS{}
+
+	for _, f := range ar.Files {
+		switch f.Name {
+		case "input.txt":
+			input[f.Name] = &fstest.MapFile{Data: f.Data}
+		case "expected.html":
+			expected[f.Name] = &fstest.MapFile{Data: f.Data}
+		}
+	}
+	return input, expected
+}
+
+func TestTxtar(t *testing.T) {
+	entries, err := fs.Glob(testdataFS, "testdata/txtar/*.txtar")
+	if err != nil {
+		t.Fatalf("glob fixtures: %v", err)
+	}
+
+	for _, fixture := range entries {
+		fixture := fixture
+		t.Run(strings.TrimSuffix(path.Base(fixture), ".txtar"), func(t *testing.T) {
+			raw, err := testdataFS.ReadFile(fixture)
+			if err != nil {
+				t.Fatalf("read fixture %s: %v", fixture, err)
+			}
+			ar := txtar.Parse(raw)
+
+			inputFS, expectedFS := SplitInputExpected(ar)
+
+			inputRaw, err := fs.ReadFile(inputFS, "input.txt")
+			if err != nil {
+				t.Fatalf("read input.txt: %v", err)
+			}
+			input := strings.TrimSpace(string(inputRaw))
+
+			lines := make([]Line, 0)
+			for _, in := range strings.Split(input, "\n") {
+				lines = append(lines, convert(in))
+			}
+			html := generate(lines)
+
+			expectedRaw, err := fs.ReadFile(expectedFS, "expected.html")
+			if err != nil {
+				t.Fatalf("read expected.html: %v", err)
+			}
+			expected := strings.TrimSpace(string(expectedRaw))
+
+			if html != expected {
+				t.Errorf("%q => expected %q but got %q", input, expected, html)
+			}
+		})
+	}
+}