danog/blackfriday
1
0
Fork 0
mirror of https://github.com/danog/blackfriday.git synced 2024-11-26 20:14:43 +01:00
Code Issues Projects Releases Wiki Activity

fix issue #45: 'Fenced Code Blocks without a blank line before'

Browse Source 
Add missing newline between paragraph and fenced code block within `firstPass()`.
This commit is contained in:
Mathias Leppich 2014-03-30 21:57:58 +02:00
parent a4274bba51
commit cd3fa08cb1
2 changed files with 21 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
block.go
View File

@ -101,7 +101,7 @@ func (p *parser) block(out *bytes.Buffer, data []byte) {
// }
// ```
if p.flags&EXTENSION_FENCED_CODE != 0 {
if i := p.fencedCode(out, data); i > 0 {
if i := p.fencedCode(out, data, true); i > 0 {
data = data[i:]
continue
}
@ -599,7 +599,7 @@ func (p *parser) isFencedCode(data []byte, syntax **string, oldmarker string) (s
return
}
func (p *parser) fencedCode(out *bytes.Buffer, data []byte) int {
func (p *parser) fencedCode(out *bytes.Buffer, data []byte, doRender bool) int {
var lang *string
beg, marker := p.isFencedCode(data, &lang, "")
if beg == 0 || beg >= len(data) {
@ -631,7 +631,9 @@ func (p *parser) fencedCode(out *bytes.Buffer, data []byte) int {
}
// verbatim copy to the working buffer
work.Write(data[beg:end])
if doRender {
work.Write(data[beg:end])
}
beg = end
}
@ -640,7 +642,9 @@ func (p *parser) fencedCode(out *bytes.Buffer, data []byte) int {
syntax = *lang
}
p.r.BlockCode(out, work.Bytes(), syntax)
if doRender {
p.r.BlockCode(out, work.Bytes(), syntax)
}
return beg
}

13
markdown.go
View File

@ -305,6 +305,7 @@ func Markdown(input []byte, renderer Renderer, extensions int) []byte {
// - expand tabs
// - normalize newlines
// - copy everything else
// - add missing newlines before fenced code blocks
func firstPass(p *parser, input []byte) []byte {
var out bytes.Buffer
tabSize := TAB_SIZE_DEFAULT
@ -312,6 +313,8 @@ func firstPass(p *parser, input []byte) []byte {
tabSize = TAB_SIZE_EIGHT
}
beg, end := 0, 0
lastLineWasBlank := false
lastFencedCodeBlockEnd := 0
for beg < len(input) { // iterate over lines
if end = isReference(p, input[beg:], tabSize); end > 0 {
beg += end
@ -321,6 +324,16 @@ func firstPass(p *parser, input []byte) []byte {
end++
}
// when last line was none blank and a fenced code block comes after
if !lastLineWasBlank && beg >= lastFencedCodeBlockEnd {
i := p.fencedCode(&out, append(input[beg:], '\n'), false)
if i > 0 {
out.WriteByte('\n') // need to inject additional linebreak
lastFencedCodeBlockEnd = beg + i
}
}
lastLineWasBlank = end == beg
// add the line body if present
if end > beg {
expandTabs(&out, input[beg:end], tabSize)