dirk
/
honk
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

pull in updates from flak

This commit is contained in:
Ted Unangst 2020-05-26 01:42:34 -04:00
parent d561e65cdc
commit f0814d4781
2 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
markitzero.go
View File

@ -35,10 +35,12 @@ var re_zerolink = regexp.MustCompile(`\[([^]]*)\]\(([^)]*\)?)\)`)
var re_imgfix = regexp.MustCompile(`<img ([^>]*)>`) var re_imgfix = regexp.MustCompile(`<img ([^>]*)>`)
var re_lister = regexp.MustCompile(`((^|\n)(\+|-).*)+\n?`) var re_lister = regexp.MustCompile(`((^|\n)(\+|-).*)+\n?`)
var re_tabler = regexp.MustCompile(`((^|\n)\|.*)+\n?`) var re_tabler = regexp.MustCompile(`((^|\n)\|.*)+\n?`)
var re_header = regexp.MustCompile(`(^|\n)(#+) (.*)`) var re_header = regexp.MustCompile(`(^|\n)(#+) (.*)\n?`)
var lighter = synlight.New(synlight.Options{Format: synlight.HTML}) var lighter = synlight.New(synlight.Options{Format: synlight.HTML})
var allowInlineHtml = false
func markitzero(s string) string { func markitzero(s string) string {
// prepare the string // prepare the string
s = strings.TrimSpace(s) s = strings.TrimSpace(s)
@ -137,6 +139,7 @@ func markitzero(s string) string {
return r.String() return r.String()
}) })
s = re_header.ReplaceAllStringFunc(s, func(s string) string { s = re_header.ReplaceAllStringFunc(s, func(s string) string {
s = strings.TrimSpace(s)
m := re_header.FindStringSubmatch(s) m := re_header.FindStringSubmatch(s)
num := len(m[2]) num := len(m[2])
return fmt.Sprintf("<h%d>%s</h%d><p>", num, m[3], num) return fmt.Sprintf("<h%d>%s</h%d><p>", num, m[3], num)
@ -150,6 +153,9 @@ func markitzero(s string) string {
return img return img
}) })
s = strings.Replace(s, "\n\n", "<p>", -1)
s = strings.Replace(s, "\n", "<br>", -1)
// now restore the code blocks // now restore the code blocks
s = re_coder.ReplaceAllStringFunc(s, func(string) string { s = re_coder.ReplaceAllStringFunc(s, func(string) string {
code := lilcodes[0] code := lilcodes[0]
@ -158,6 +164,9 @@ func markitzero(s string) string {
code := bigcodes[0] code := bigcodes[0]
bigcodes = bigcodes[1:] bigcodes = bigcodes[1:]
m := re_bigcoder.FindStringSubmatch(code) m := re_bigcoder.FindStringSubmatch(code)
if allowInlineHtml && m[1] == "inlinehtml" {
return m[2]
}
return "<pre><code>" + lighter.HighlightString(m[2], m[1]) + "</code></pre><p>" return "<pre><code>" + lighter.HighlightString(m[2], m[1]) + "</code></pre><p>"
} }
code = html.EscapeString(code) code = html.EscapeString(code)
@ -167,7 +176,6 @@ func markitzero(s string) string {
s = re_coder.ReplaceAllString(s, "<code>$1</code>") s = re_coder.ReplaceAllString(s, "<code>$1</code>")
// some final fixups // some final fixups
s = strings.Replace(s, "\n", "<br>", -1)
s = strings.Replace(s, "<br><blockquote>", "<blockquote>", -1) s = strings.Replace(s, "<br><blockquote>", "<blockquote>", -1)
s = strings.Replace(s, "<br><cite></cite>", "", -1) s = strings.Replace(s, "<br><cite></cite>", "", -1)
s = strings.Replace(s, "<br><pre>", "<pre>", -1) s = strings.Replace(s, "<br><pre>", "<pre>", -1)

6
markitzero_test.go
View File

@ -32,19 +32,19 @@ func TestLinebreak1(t *testing.T) {
func TestLinebreak2(t *testing.T) { func TestLinebreak2(t *testing.T) {
input := "hello\n\n> a quote\n\na comment" input := "hello\n\n> a quote\n\na comment"
output := "hello<br><blockquote>a quote</blockquote><p>a comment" output := "hello<p><blockquote>a quote</blockquote><p>a comment"
doonezerotest(t, input, output) doonezerotest(t, input, output)
} }
func TestLinebreak3(t *testing.T) { func TestLinebreak3(t *testing.T) {
input := "hello\n\n```\nfunc(s string)\n```\n\ndoes it go?" input := "hello\n\n```\nfunc(s string)\n```\n\ndoes it go?"
output := "hello<br><pre><code>func(s string)</code></pre><p>does it go?" output := "hello<p><pre><code>func(s string)</code></pre><p>does it go?"
doonezerotest(t, input, output) doonezerotest(t, input, output)
} }
func TestCodeStyles(t *testing.T) { func TestCodeStyles(t *testing.T) {
input := "hello\n\n```go\nfunc(s string)\n```\n\ndoes it go?" input := "hello\n\n```go\nfunc(s string)\n```\n\ndoes it go?"
output := "hello<br><pre><code><span class=kw>func</span><span class=op>(</span>s <span class=tp>string</span><span class=op>)</span></code></pre><p>does it go?" output := "hello<p><pre><code><span class=kw>func</span><span class=op>(</span>s <span class=tp>string</span><span class=op>)</span></code></pre><p>does it go?"
doonezerotest(t, input, output) doonezerotest(t, input, output)
} }