Switched from blackfriday to goldmark.

Author: Kugelschieber

CHANGELOG.md

@@ -1,5 +1,9 @@
 # Changelog
 
+## 1.2.3
+
+* switched from blackfriday to goldmark
+
 ## 1.2.2
 
 * updated dependencies

demo/assets/entrypoint.js

@@ -1,3 +1,4 @@
+import "./mathjax";
 import {message} from "./import/vars";
 
 console.log(message);

demo/content/about/about.md

@@ -4,15 +4,24 @@
 
 Oogway is developed by the <a href="https://emvi.com" target="_blank">Emvi Software GmbH</a> based in Germany to simplify the process of developing custom websites.[^1]
 
-[^1]: Open-source and for free hosted on GitHub.
-
 * This is
-* a list.
+* a ~~list~~.
 
 1. And
 2. another
 3. list.
 
+| Table | Column |
+| - | - |
+| Hello | World! |
+
+- [ ] Check
+- [x] List
+
+\\[V_{sphere} = \frac{4}{3}\pi r^3\\]
+
+[^1]: Open-source and for free hosted on GitHub.
+
 {{end}}
 
 {{define "footer"}}

funcmap.go

@@ -3,14 +3,14 @@ package oogway
 import (
 	"bytes"
 	"fmt"
+	"github.com/Masterminds/sprig"
+	"github.com/yuin/goldmark"
+	"github.com/yuin/goldmark/extension"
 	"html/template"
 	"log"
 	"os"
 	"path/filepath"
 	tt "text/template"
-
-	"github.com/Masterminds/sprig"
-	"github.com/russross/blackfriday/v2"
 )
 
 var (
@@ -100,14 +100,22 @@ func renderMarkdownBlock(file, block string, data any) template.HTML {
 }
 
 func renderMarkdownContent(file, content, block string, data any) template.HTML {
-	tpl, err := tt.New("").Funcs(tt.FuncMap(tplFuncMap)).Parse(content)
+	tpl, err := tt.New("").Funcs(tplFuncMap).Parse(content)
 
 	if err != nil {
 		log.Printf("Error parsing markdown file '%s': %s", file, err)
 		return ""
 	}
 
-	var buffer bytes.Buffer
+	var buffer, out bytes.Buffer
+	converter := goldmark.New(
+		goldmark.WithExtensions(
+			extension.NewFootnote(),
+			extension.NewTable(),
+			extension.Strikethrough,
+			extension.TaskList,
+		),
+	)
 
 	if block != "" {
 		if _, err := tpl.Parse(fmt.Sprintf(`{{template "%s" .}}`, block)); err != nil {
@@ -120,17 +128,21 @@ func renderMarkdownContent(file, content, block string, data any) template.HTML
 			return ""
 		}
 
-		return template.HTML(blackfriday.Run(buffer.Bytes(),
-			blackfriday.WithExtensions(blackfriday.NoIntraEmphasis),
-			blackfriday.WithExtensions(blackfriday.Footnotes)))
+		if err := converter.Convert(buffer.Bytes(), &out); err != nil {
+			panic(err)
+		}
+
+		return template.HTML(out.String())
 	}
 
 	if err := tpl.Execute(&buffer, data); err != nil {
 		log.Printf("Error rendering markdown file '%s': %s", file, err)
 		return ""
 	}
 
-	return template.HTML(blackfriday.Run(buffer.Bytes(),
-		blackfriday.WithExtensions(blackfriday.NoIntraEmphasis),
-		blackfriday.WithExtensions(blackfriday.Footnotes)))
+	if err := converter.Convert(buffer.Bytes(), &out); err != nil {
+		panic(err)
+	}
+
+	return template.HTML(out.String())
 }

go.mod

@@ -11,8 +11,8 @@ require (
 	github.com/fsnotify/fsnotify v1.6.0
 	github.com/gorilla/mux v1.8.0
 	github.com/pirsch-analytics/pirsch-go-sdk v1.8.0
-	github.com/russross/blackfriday/v2 v2.1.0
 	github.com/stretchr/testify v1.8.2
+	github.com/yuin/goldmark v1.5.4
 )
 
 require (

go.sum

@@ -76,8 +76,6 @@ github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZN
 github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA=
 github.com/rogpeppe/go-internal v1.6.1 h1:/FiVV8dS/e+YqF2JvO3yXRFbBLTIuSDkuC7aBOAvL+k=
 github.com/rogpeppe/go-internal v1.6.1/go.mod h1:xXDCJY+GAPziupqXw64V24skbSoqbTEfhy4qGm1nDQc=
-github.com/russross/blackfriday/v2 v2.1.0 h1:JIOH55/0cWyOuilr9/qlrm0BSXldqnqwMsf35Ld67mk=
-github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM=
 github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
 github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw=
 github.com/stretchr/objx v0.5.0/go.mod h1:Yh+to48EsGEfYuaHDzXPcE3xhTkx73EhmCGUpEOglKo=
@@ -86,6 +84,8 @@ github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/
 github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU=
 github.com/stretchr/testify v1.8.2 h1:+h33VjcLVPDHtOdpUCuF+7gSuG3yGIftsP1YvFihtJ8=
 github.com/stretchr/testify v1.8.2/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4=
+github.com/yuin/goldmark v1.5.4 h1:2uY/xC0roWy8IBEGLgB1ywIoEJFGmRrX21YQcvGZzjU=
+github.com/yuin/goldmark v1.5.4/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY=
 golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
 golang.org/x/crypto v0.7.0 h1:AvwMYaRytfdeVt3u6mLaxYtErKYjxA2OXjJ1HHq6t3A=
 golang.org/x/crypto v0.7.0/go.mod h1:pYwdfH91IfpZVANVyUOhSIPZaFoJGxTFbZhFTx+dXZU=

oogway.go

@@ -23,7 +23,7 @@ const (
    \ \_______\ \_______\ \_______\ \____________\ \__\ \__\__/  / /    
     \|_______|\|_______|\|_______|\|____________|\|__|\|__|\___/ /     
                                                           \|___|/
-v1.2.2`
+v1.2.3`
 )
 
 var (