Skip to content

C
caddy
Commit 23478354 authored by Matthew Holt's avatar Matthew Holt
Browse files
Options

markdown: Enable tables, fenced code, and strikethrough (closes #294)

parent 94ff7dc6
Show whitespace changes
Inline Side-by-side
Showing with 10 additions and 11 deletions
middleware/markdown/markdown_test.go
View file @ 23478354
...@@ -92,7 +92,7 @@ func TestMarkdown(t *testing.T) { ...@@ -92,7 +92,7 @@ func TestMarkdown(t *testing.T) {
expectedBody := `<!DOCTYPE html> expectedBody := `<!DOCTYPE html>
<html> <html>
<head> <head>
<title>Markdown test</title> <title>Markdown test 1</title>
</head> </head>
<body> <body>
<h1>Header</h1> <h1>Header</h1>
...@@ -102,11 +102,10 @@ Welcome to A Caddy website! ...@@ -102,11 +102,10 @@ Welcome to A Caddy website!
<p>Body</p> <p>Body</p>
<p><code>go <pre><code class="language-go">func getTrue() bool {
func getTrue() bool {
return true return true
} }
</code></p> </code></pre>
</body> </body>
</html> </html>
...@@ -129,7 +128,7 @@ func getTrue() bool { ...@@ -129,7 +128,7 @@ func getTrue() bool {
expectedBody = `<!DOCTYPE html> expectedBody = `<!DOCTYPE html>
<html> <html>
<head> <head>
<title>Markdown test</title> <title>Markdown test 2</title>
<meta charset="utf-8"> <meta charset="utf-8">
<link rel="stylesheet" href="/resources/css/log.css"> <link rel="stylesheet" href="/resources/css/log.css">
<link rel="stylesheet" href="/resources/css/default.css"> <link rel="stylesheet" href="/resources/css/default.css">
...@@ -143,11 +142,10 @@ func getTrue() bool { ...@@ -143,11 +142,10 @@ func getTrue() bool {
<p>Body</p> <p>Body</p>
<p><code>go <pre><code class="language-go">func getTrue() bool {
func getTrue() bool {
return true return true
} }
</code></p> </code></pre>
</body> </body>
</html>` </html>`
......
middleware/markdown/process.go
View file @ 23478354
...@@ -65,7 +65,8 @@ func (md Markdown) Process(c *Config, requestPath string, b []byte, ctx middlewa ...@@ -65,7 +65,8 @@ func (md Markdown) Process(c *Config, requestPath string, b []byte, ctx middlewa
} }
// process markdown // process markdown
markdown = blackfriday.Markdown(markdown, c.Renderer, 0) extns := blackfriday.EXTENSION_TABLES | blackfriday.EXTENSION_FENCED_CODE | blackfriday.EXTENSION_STRIKETHROUGH
markdown = blackfriday.Markdown(markdown, c.Renderer, extns)
// set it as body for template // set it as body for template
metadata.Variables["body"] = string(markdown) metadata.Variables["body"] = string(markdown)
......
middleware/markdown/testdata/blog/test.md
View file @ 23478354
--- ---
title: Markdown test title: Markdown test 1
sitename: A Caddy website sitename: A Caddy website
--- ---
......
middleware/markdown/testdata/log/test.md
View file @ 23478354
--- ---
title: Markdown test title: Markdown test 2
sitename: A Caddy website sitename: A Caddy website
--- ---
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7