From 39651a602107ca58f64b9c2368f277cf90993858 Mon Sep 17 00:00:00 2001
From: antanst <>
Date: Tue, 3 Jun 2025 12:38:41 +0300
Subject: [PATCH] Fix rendering bugs, update name

---
 .gitignore                                    |  3 ++
 Makefile                                      |  2 +-
 {pkg/gmi2html/assets => assets}/main.html     |  9 +++---
 cmd/gmi2html/main.go                          |  4 +--
 pkg/gmi2html/gmi2html.go => gmi2html.go       | 32 +++++++++++--------
 .../gmi2html_test.go => gmi2html_test.go      |  0
 go.mod                                        |  2 +-
 pkg/gmi2html/templates.go => templates.go     |  0
 8 files changed, 31 insertions(+), 21 deletions(-)
 create mode 100644 .gitignore
 rename {pkg/gmi2html/assets => assets}/main.html (90%)
 rename pkg/gmi2html/gmi2html.go => gmi2html.go (90%)
 rename pkg/gmi2html/gmi2html_test.go => gmi2html_test.go (100%)
 rename pkg/gmi2html/templates.go => templates.go (100%)

diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..22a9c53
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,3 @@
+/.idea
+/.vscode
+/dist
diff --git a/Makefile b/Makefile
index 026341f..8b79493 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,4 @@
-SHELL := /bin/env oksh
+SHELL := /bin/sh
 export PATH := $(PATH)
 
 all: fmt lintfix tidy test clean build
diff --git a/pkg/gmi2html/assets/main.html b/assets/main.html
similarity index 90%
rename from pkg/gmi2html/assets/main.html
rename to assets/main.html
index a05342b..3cebd7c 100644
--- a/pkg/gmi2html/assets/main.html
+++ b/assets/main.html
@@ -6,7 +6,7 @@
     <title>{{.Title}}</title>
 <link rel="preconnect" href="https://fonts.googleapis.com">
 <link rel="preconnect" href="https://fonts.gstatic.com" crossorigin>
-<link href="https://fonts.googleapis.com/css2?family=Source+Code+Pro:ital,wght@0,200..900;1,200..900&display=swap" rel="stylesheet">
+<link href="https://fonts.googleapis.com/css2?family=Source+Code+Pro:ital,wght@0,200..900;1,200..900&family=Source+Serif+4:ital,opsz,wght@0,8..60,200..900;1,8..60,200..900&display=swap" rel="stylesheet">
     <style>
       :root {
           --text-color: #eee;
@@ -20,9 +20,9 @@
       }
 
         body {
-            font-family: "Source Code Pro", monospace;
-            font-weight: 300;
-            font-size: 14px;
+            font-family: "Source Serif Pro", serif;
+            /* font-weight: 300; */
+            font-size: 16px;
             color: var(--text-color);
             background-color: var(--bg-color);
             max-width: 34rem;
@@ -97,6 +97,7 @@
         }
 
         .gemini-preformatted {
+	    font-family: "Source Code Pro", monospace !important;
             background-color: var(--pre-bg);
             border: 1px solid var(--pre-border);
             border-radius: 3px;
diff --git a/cmd/gmi2html/main.go b/cmd/gmi2html/main.go
index c26469d..e91b28e 100644
--- a/cmd/gmi2html/main.go
+++ b/cmd/gmi2html/main.go
@@ -6,7 +6,7 @@ import (
 	"io"
 	"os"
 
-	"github.com/antanst/gmi2html/pkg/gmi2html"
+	"git.antanst.com/antanst/gmi2html"
 )
 
 func main() {
@@ -15,7 +15,7 @@ func main() {
 	flag.Parse()
 	err := runApp(*noContainer, *replaceGmiExt)
 	if err != nil {
-		fmt.Println(err)
+		fmt.Fprintln(os.Stderr, err)
 		os.Exit(1)
 	}
 }
diff --git a/pkg/gmi2html/gmi2html.go b/gmi2html.go
similarity index 90%
rename from pkg/gmi2html/gmi2html.go
rename to gmi2html.go
index 3db14c9..95982fa 100644
--- a/pkg/gmi2html/gmi2html.go
+++ b/gmi2html.go
@@ -48,10 +48,7 @@ func convertGeminiContent(text string, replaceGmiExt bool) string {
 	normalMode := true
 
 	for _, line := range lines {
-		switch {
-		case strings.HasPrefix(line, "=>"):
-			handleLinkLine(&buffer, line, replaceGmiExt)
-		case strings.HasPrefix(line, "```"):
+		if strings.HasPrefix(line, "```") {
 			if normalMode {
 				err := preformattedTmplStart.Execute(&buffer, line)
 				if err != nil {
@@ -65,7 +62,21 @@ func convertGeminiContent(text string, replaceGmiExt bool) string {
 				}
 			}
 			normalMode = !normalMode
-			// Don't output the ``` line
+			// Don't output the ``` line itself
+			continue
+		}
+
+		if !normalMode {
+			// Inside preformatted block - output line directly with HTML escaping
+			buffer.WriteString(template.HTMLEscapeString(line))
+			buffer.WriteString("\n")
+			continue
+		}
+
+		// Normal mode - process gemini markup
+		switch {
+		case strings.HasPrefix(line, "=>"):
+			handleLinkLine(&buffer, line, replaceGmiExt)
 		case strings.HasPrefix(line, "###"):
 			content := strings.TrimSpace(strings.TrimPrefix(line, "###"))
 			err := h3Tmpl.Execute(&buffer, content)
@@ -97,14 +108,9 @@ func convertGeminiContent(text string, replaceGmiExt bool) string {
 				return ""
 			}
 		default:
-			if normalMode {
-				err := textLineTmpl.Execute(&buffer, line)
-				if err != nil {
-					return ""
-				}
-			} else {
-				buffer.WriteString(line)
-				buffer.WriteString("\n")
+			err := textLineTmpl.Execute(&buffer, line)
+			if err != nil {
+				return ""
 			}
 		}
 	}
diff --git a/pkg/gmi2html/gmi2html_test.go b/gmi2html_test.go
similarity index 100%
rename from pkg/gmi2html/gmi2html_test.go
rename to gmi2html_test.go
diff --git a/go.mod b/go.mod
index 18027bd..573ab69 100644
--- a/go.mod
+++ b/go.mod
@@ -1,3 +1,3 @@
-module github.com/antanst/gmi2html
+module git.antanst.com/antanst/gmi2html
 
 go 1.21
diff --git a/pkg/gmi2html/templates.go b/templates.go
similarity index 100%
rename from pkg/gmi2html/templates.go
rename to templates.go