Prepare for Goldmark

This commmit prepares for the addition of Goldmark as the new Markdown renderer in Hugo.

This introduces a new `markup` package with some common interfaces and each implementation in its own package.

See #5963

2 files changed, 11 insertions, 11 deletions

diff --git a/tpl/transform/transform.go b/tpl/transform/transform.go
index 2aa0c1959..24eedc24f 100644
--- a/tpl/transform/transform.go
+++ b/tpl/transform/transform.go
@@ -97,19 +97,16 @@ func (ns *Namespace) Markdownify(s interface{}) (template.HTML, error) {
 		return "", err
 	}
 
-	m := ns.deps.ContentSpec.RenderBytes(
-		&helpers.RenderingContext{
-			Cfg:     ns.deps.Cfg,
-			Content: []byte(ss),
-			PageFmt: "markdown",
-			Config:  ns.deps.ContentSpec.BlackFriday,
-		},
-	)
+	b, err := ns.deps.ContentSpec.RenderMarkdown([]byte(ss))
+
+	if err != nil {
+		return "", err
+	}
 
 	// Strip if this is a short inline type of text.
-	m = ns.deps.ContentSpec.TrimShortHTML(m)
+	b = ns.deps.ContentSpec.TrimShortHTML(b)
 
-	return helpers.BytesToHTML(m), nil
+	return helpers.BytesToHTML(b), nil
 }
 
 // Plainify returns a copy of s with all HTML tags removed.
diff --git a/tpl/transform/transform_test.go b/tpl/transform/transform_test.go
index 10b020a0c..a6a3b793e 100644
--- a/tpl/transform/transform_test.go
+++ b/tpl/transform/transform_test.go
@@ -17,6 +17,9 @@ import (
 	"html/template"
 	"testing"
 
+	"github.com/gohugoio/hugo/common/loggers"
+	"github.com/spf13/afero"
+
 	qt "github.com/frankban/quicktest"
 	"github.com/gohugoio/hugo/config"
 	"github.com/gohugoio/hugo/deps"
@@ -239,7 +242,7 @@ func newDeps(cfg config.Provider) *deps.Deps {
 
 	l := langs.NewLanguage("en", cfg)
 
-	cs, err := helpers.NewContentSpec(l)
+	cs, err := helpers.NewContentSpec(l, loggers.NewErrorLogger(), afero.NewMemMapFs())
 	if err != nil {
 		panic(err)
 	}