OrgWiki/go-org-orgwiki
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Allow blocks to contain paragraphs and other top level elements

Browse source
This commit is contained in:
Niklas Fasching 2018-12-03 15:45:27 +01:00
parent ed8764940f
commit 8f06883ec5
4 changed files with 36 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

25
org/block.go
View file

@ -28,17 +28,26 @@ func (d *Document) parseBlock(i int, parentStop stopFn) (int, Node) {
t, start, nodes := d.tokens[i], i, []Node{}
name, parameters := t.content, strings.Fields(t.matches[3])
trim := trimIndentUpTo(d.tokens[i].lvl)
for i++; !(d.tokens[i].kind == "endBlock" && d.tokens[i].content == name); i++ {
if parentStop(d, i) {
return 0, nil
stop := func(d *Document, i int) bool {
return parentStop(d, i) || (d.tokens[i].kind == "endBlock" && d.tokens[i].content == name)
}
if name == "SRC" || name == "EXAMPLE" {
for i++; !stop(d, i); i++ {
nodes = append(nodes, Line{[]Node{Text{trim(d.tokens[i].matches[0])}}})
}
text := trim(d.tokens[i].matches[0])
if name == "SRC" || name == "EXAMPLE" {
nodes = append(nodes, Line{[]Node{Text{text}}})
} else {
nodes = append(nodes, Line{d.parseInline(text)})
} else {
for i++; !stop(d, i); {
consumed, node := d.parseParagraph(i, stop)
if consumed == 0 {
break
}
i += consumed
nodes = append(nodes, node)
}
}
if parentStop(d, i) {
return 0, nil
}
return i + 1 - start, Block{name, parameters, nodes}
}