b61e49eb85
We want original whitespace to be rendered in some cases (e.g. verse blocks). This requires information about the original whitespace to be preserved during paragraph parsing. As html ignores (collapses) whitespace by default we don't have to adapt the html writer and can just selectively enable rendering of the preseverved whitespace wherever we want it using css (white-space: pre). To differentiate meaningful whitespace from document structure based indentation (i.e. list item base indentation) we need to introduce document.baseLvl. A paragraph by itself does not have enough information to differentiate both kinds of whitespace and needs this information as context [0]. As we're already touching list indentation i went along and improved (fixed?) descriptive list item indentation rendering in the org writer (it should match emacs tab behavior - i.e. indent subsequent lines up to the `:: `). [0] e.g. list items can contain blank lines - a paragraph starting with a blank line would not know that it is part of a list item / has a base indentation - the blank line would suggest a baseLvl of 0.
47 lines
1.4 KiB
Go
47 lines
1.4 KiB
Go
package org
|
|
|
|
import (
|
|
"math"
|
|
"regexp"
|
|
"strings"
|
|
)
|
|
|
|
type Paragraph struct{ Children []Node }
|
|
type HorizontalRule struct{}
|
|
|
|
var horizontalRuleRegexp = regexp.MustCompile(`^(\s*)-{5,}\s*$`)
|
|
var plainTextRegexp = regexp.MustCompile(`^(\s*)(.*)`)
|
|
|
|
func lexText(line string) (token, bool) {
|
|
if m := plainTextRegexp.FindStringSubmatch(line); m != nil {
|
|
return token{"text", len(m[1]), m[2], m}, true
|
|
}
|
|
return nilToken, false
|
|
}
|
|
|
|
func lexHorizontalRule(line string) (token, bool) {
|
|
if m := horizontalRuleRegexp.FindStringSubmatch(line); m != nil {
|
|
return token{"horizontalRule", len(m[1]), "", m}, true
|
|
}
|
|
return nilToken, false
|
|
}
|
|
|
|
func (d *Document) parseParagraph(i int, parentStop stopFn) (int, Node) {
|
|
lines, start := []string{d.tokens[i].content}, i
|
|
stop := func(d *Document, i int) bool {
|
|
return parentStop(d, i) || d.tokens[i].kind != "text" || d.tokens[i].content == ""
|
|
}
|
|
for i += 1; !stop(d, i); i++ {
|
|
lvl := math.Max(float64(d.tokens[i].lvl-d.baseLvl), 0)
|
|
lines = append(lines, strings.Repeat(" ", int(lvl))+d.tokens[i].content)
|
|
}
|
|
consumed := i - start
|
|
return consumed, Paragraph{d.parseInline(strings.Join(lines, "\n"))}
|
|
}
|
|
|
|
func (d *Document) parseHorizontalRule(i int, parentStop stopFn) (int, Node) {
|
|
return 1, HorizontalRule{}
|
|
}
|
|
|
|
func (n Paragraph) String() string { return orgWriter.WriteNodesAsString(n) }
|
|
func (n HorizontalRule) String() string { return orgWriter.WriteNodesAsString(n) }
|