ceos/glow
1
0
Fork 0
mirror of https://github.com/charmbracelet/glow.git synced 2026-08-23 16:44:17 +02:00
Code Issues Projects Releases Packages Wiki Activity

Fix child element rendering

Browse source
This commit is contained in:
Toby Padilla 2019-11-12 15:53:11 -05:00
commit 985a7e5178
2 changed files with 24 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

6
cmd/gold/dark.json
View file

@ -12,5 +12,11 @@
},
"code_block": {
"color": "200"
},
"emph": {
"italic": true
},
"strong": {
"bold": true
}
}

21
gold.go
View file

@ -79,7 +79,7 @@ func NewElement(node *bf.Node) Element {
}
case bf.Heading:
return Element{
Token: fmt.Sprintf("%s ", strings.Repeat("#", node.HeadingData.Level)),
Token: fmt.Sprintf("%s %s", strings.Repeat("#", node.HeadingData.Level), node.FirstChild.Literal),
Pre: "",
Post: "\n",
}
@ -91,13 +91,13 @@ func NewElement(node *bf.Node) Element {
}
case bf.Emph:
return Element{
Token: string(node.Literal),
Token: string(node.FirstChild.Literal),
Pre: "",
Post: "",
}
case bf.Strong:
return Element{
Token: string(node.Literal),
Token: string(node.FirstChild.Literal),
Pre: "",
Post: "",
}
@ -251,6 +251,9 @@ func (tr *TermRenderer) RenderNode(w io.Writer, node *bf.Node, entering bool) bf
if !entering && el.Post != "" {
fmt.Fprintf(w, "%s", el.Post)
}
if isChild(node) {
return bf.GoToNext
}
if !entering {
return bf.GoToNext
}
@ -306,6 +309,18 @@ func (tr *TermRenderer) RenderHeader(w io.Writer, ast *bf.Node) {
func (tr *TermRenderer) RenderFooter(w io.Writer, ast *bf.Node) {
}
func isChild(node *bf.Node) bool {
if node.Parent == nil {
return false
}
switch node.Parent.Type {
case bf.Heading, bf.Link, bf.Emph, bf.Strong:
return true
default:
return false
}
}
func keyToType(key string) (bf.NodeType, error) {
switch key {
case "document":