592be07cfd
I went through the issues of goorgeous and picked a few that seemed easy enough to add (and added some fore as todos for later). That helped a lot and showed some bugs / edge cases that required changes. - the org writer wrote a lot of eol spaces and just removed it whenever String() was actually called. That worked until now but did not bode with rendering an empty headline - by removing ALL eol space we would render "* " back as just "*" -> not a headline anymore. - the html writer had some special handling for line spacing inside paragraphs and list items - with the introduction of more blocks we need that handling everywhere. As browsers / html renderers are nice enough to collapse whitespace (and especially collapse "\s*\n" into " ") we can just write out the newlines and let the renderer take care of the rest.
52 lines
1.4 KiB
Go
52 lines
1.4 KiB
Go
package org
|
|
|
|
import (
|
|
"regexp"
|
|
"strings"
|
|
"unicode"
|
|
)
|
|
|
|
type Block struct {
|
|
Name string
|
|
Parameters []string
|
|
Children []Node
|
|
}
|
|
|
|
var beginBlockRegexp = regexp.MustCompile(`(?i)^(\s*)#\+BEGIN_(\w+)(.*)`)
|
|
var endBlockRegexp = regexp.MustCompile(`(?i)^(\s*)#\+END_(\w+)`)
|
|
|
|
func lexBlock(line string) (token, bool) {
|
|
if m := beginBlockRegexp.FindStringSubmatch(line); m != nil {
|
|
return token{"beginBlock", len(m[1]), strings.ToUpper(m[2]), m}, true
|
|
} else if m := endBlockRegexp.FindStringSubmatch(line); m != nil {
|
|
return token{"endBlock", len(m[1]), strings.ToUpper(m[2]), m}, true
|
|
}
|
|
return nilToken, false
|
|
}
|
|
|
|
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
|
|
}
|
|
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)})
|
|
}
|
|
}
|
|
return i + 1 - start, Block{name, parameters, nodes}
|
|
}
|
|
|
|
func trimIndentUpTo(max int) func(string) string {
|
|
return func(line string) string {
|
|
i := 0
|
|
for ; i < len(line) && i < max && unicode.IsSpace(rune(line[i])); i++ {
|
|
}
|
|
return line[i:]
|
|
}
|
|
}
|