Fix drawer parsing
Found thx to trying out https://github.com/kaushalmodi/ox-hugo/blob/master/test/site/content-org/all-posts.org - handle properties without value (would normally begin a new drawer) - handle drawer at eof
This commit is contained in:
parent
7331d24452
commit
e9d9590d7a
1 changed files with 20 additions and 6 deletions
|
@ -26,12 +26,26 @@ func (d *Document) parseDrawer(i int, parentStop stopFn) (int, Node) {
|
||||||
drawer, start := Drawer{Name: strings.ToUpper(d.tokens[i].content)}, i
|
drawer, start := Drawer{Name: strings.ToUpper(d.tokens[i].content)}, i
|
||||||
i++
|
i++
|
||||||
stop := func(d *Document, i int) bool {
|
stop := func(d *Document, i int) bool {
|
||||||
return parentStop(d, i) || d.tokens[i].kind == "endDrawer" || d.tokens[i].kind == "headline"
|
if parentStop(d, i) {
|
||||||
|
return true
|
||||||
|
}
|
||||||
|
kind := d.tokens[i].kind
|
||||||
|
return kind == "beginDrawer" || kind == "endDrawer" || kind == "headline"
|
||||||
}
|
}
|
||||||
consumed, nodes := d.parseMany(i, stop)
|
for {
|
||||||
drawer.Children = nodes
|
consumed, nodes := d.parseMany(i, stop)
|
||||||
if d.tokens[i+consumed].kind == "endDrawer" {
|
i += consumed
|
||||||
consumed++
|
drawer.Children = append(drawer.Children, nodes...)
|
||||||
|
if i < len(d.tokens) && d.tokens[i].kind == "beginDrawer" {
|
||||||
|
p := Paragraph{[]Node{Text{d.tokens[i].content, false}}}
|
||||||
|
drawer.Children = append(drawer.Children, p)
|
||||||
|
i++
|
||||||
|
} else {
|
||||||
|
break
|
||||||
|
}
|
||||||
}
|
}
|
||||||
return i + consumed - start, drawer
|
if i < len(d.tokens) && d.tokens[i].kind == "endDrawer" {
|
||||||
|
i++
|
||||||
|
}
|
||||||
|
return i - start, drawer
|
||||||
}
|
}
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue