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

html: Improve block rendering

Browse source
This commit is contained in:
Niklas Fasching 2018-12-02 18:54:53 +01:00
parent d2d9dc0fc8
commit 4e2fb02b57
4 changed files with 64 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

38
org/html.go
View file

@ -33,7 +33,9 @@ var listTags = map[string][]string{
func NewHTMLWriter() *HTMLWriter {
return &HTMLWriter{
HighlightCodeBlock: func(source, lang string) string { return html.EscapeString(source) },
HighlightCodeBlock: func(source, lang string) string {
return fmt.Sprintf("<pre>%s<pre>", html.EscapeString(source))
},
}
}
@ -110,17 +112,31 @@ func (w *HTMLWriter) writeLines(lines []Node) {
}
func (w *HTMLWriter) writeBlock(b Block) {
w.WriteString("<code>")
lang := ""
if len(b.Parameters) >= 1 {
lang = b.Parameters[0]
switch b.Name {
case "SRC":
lines, lang := []string{}, "text"
if len(b.Parameters) >= 1 {
lang = b.Parameters[0]
}
for _, n := range b.Children {
lines = append(lines, n.(Line).Children[0].(Text).Content)
}
w.WriteString(fmt.Sprintf(`<code class="src src-%s">`, lang) + "\n")
w.WriteString(w.HighlightCodeBlock(strings.Join(lines, "\n"), lang))
w.WriteString("\n</code>\n")
case "EXAMPLE":
w.WriteString(`<pre class="example">` + "\n")
w.writeNodes(b.Children...)
w.WriteString("\n</pre>\n")
case "QUOTE":
w.WriteString("<blockquote>\n")
w.writeNodes(b.Children...)
w.WriteString("\n</blockquote>\n")
case "CENTER":
w.WriteString(`<div style="text-align: center; margin-left: auto; margin-right: auto;">` + "\n")
w.writeNodes(b.Children...)
w.WriteString("\n</div>\n")
}
lines := []string{}
for _, n := range b.Children {
lines = append(lines, n.(Line).Children[0].(Text).Content)
}
w.WriteString(w.HighlightCodeBlock(strings.Join(lines, "\n"), lang))
w.WriteString("</code>\n")
}
func (w *HTMLWriter) writeFootnoteDefinition(f FootnoteDefinition) {