Make captions not suck

Signed-off-by: Miek Gieben <miek@miek.nl>

parser/block.go

@@ -907,8 +907,8 @@ func (p *Parser) fencedCodeBlock(data []byte, doRender bool) int {
 		if p.extensions&MmarkCaptions == 0 {
 			p.addBlock(codeBlock)
 			finalizeCodeBlock(codeBlock)
-
-		} else {
+			return beg
+		}
 
 		if captionContent, consumed := p.caption(data[beg:]); consumed > 0 {
 			figure := &ast.CaptionFigure{}
@@ -924,7 +924,6 @@ func (p *Parser) fencedCodeBlock(data []byte, doRender bool) int {
 			beg += consumed
 		}
 	}
-	}
 
 	return beg
 }
@@ -1184,8 +1183,6 @@ func (p *Parser) terminateBlockquote(data []byte, beg, end int) bool {
 
 // parse a blockquote fragment
 func (p *Parser) quote(data []byte) int {
-	quote := &ast.BlockQuote{}
-	block := p.addBlock(quote)
 	var raw bytes.Buffer
 	beg, end := 0, 0
 	for beg < len(data) {
@@ -1214,8 +1211,30 @@ func (p *Parser) quote(data []byte) int {
 		raw.Write(data[beg:end])
 		beg = end
 	}
+
+	if p.extensions&MmarkCaptions == 0 {
+		block := p.addBlock(&ast.BlockQuote{})
 		p.block(raw.Bytes())
 		p.finalize(block)
+		return end
+	}
+
+	if captionContent, consumed := p.caption(data[end:]); consumed > 0 {
+		figure := &ast.CaptionFigure{}
+		caption := &ast.Caption{}
+		p.inline(caption, captionContent)
+
+		p.addBlock(figure)
+		block := &ast.BlockQuote{}
+		p.addChild(block)
+		p.block(raw.Bytes())
+		p.finalize(block)
+
+		p.addChild(caption)
+		p.finalize(figure)
+
+		end += consumed
+	}
 
 	return end
 }

parser/parser.go

@@ -215,7 +215,7 @@ func canNodeContain(n ast.Node, v ast.Node) bool {
 		return ok
 	case *ast.CaptionFigure:
 		switch v.(type) {
-		case *ast.CodeBlock, *ast.Caption:
+		case *ast.CodeBlock, *ast.BlockQuote, *ast.Caption:
 			return true
 		default:
 			return false

testdata/mmark.test

@@ -41,4 +41,6 @@ Caption: Shakespeare.
 <figure>
 <blockquote>
 <p>To be, or not to be</p>
-</blockquote><figcaption>Shakespeare.</figcaption></figure>
+</blockquote>
+<figcaption>Shakespeare.</figcaption>
+</figure>