mirror of
https://github.com/rwinkhart/glamour-temp-MUTN.git
synced 2026-09-06 00:47:15 -04:00
Use renderText even without an active style
This commit is contained in:
+3
-6
@@ -68,16 +68,13 @@ func (e *BaseElement) Render(w io.Writer, node *bf.Node, tr *TermRenderer) error
|
|||||||
renderText(w, tr.blockStyle.Current(), e.Suffix)
|
renderText(w, tr.blockStyle.Current(), e.Suffix)
|
||||||
}()
|
}()
|
||||||
|
|
||||||
rules := cascadeStyles(tr.blockStyle, tr.style[e.Style])
|
rules := tr.blockStyle.With(tr.style[e.Style])
|
||||||
if rules == nil {
|
if rules != nil {
|
||||||
_, _ = w.Write([]byte(e.Token))
|
|
||||||
return nil
|
|
||||||
}
|
|
||||||
|
|
||||||
renderText(w, rules, rules.Prefix)
|
renderText(w, rules, rules.Prefix)
|
||||||
defer func() {
|
defer func() {
|
||||||
renderText(w, rules, rules.Suffix)
|
renderText(w, rules, rules.Suffix)
|
||||||
}()
|
}()
|
||||||
|
}
|
||||||
|
|
||||||
renderText(w, rules, e.Token)
|
renderText(w, rules, e.Token)
|
||||||
return nil
|
return nil
|
||||||
|
|||||||
@@ -15,7 +15,6 @@ type CodeBlockElement struct {
|
|||||||
func (e *CodeBlockElement) Render(w io.Writer, node *bf.Node, tr *TermRenderer) error {
|
func (e *CodeBlockElement) Render(w io.Writer, node *bf.Node, tr *TermRenderer) error {
|
||||||
var theme string
|
var theme string
|
||||||
var indent uint
|
var indent uint
|
||||||
|
|
||||||
rules := tr.style[CodeBlock]
|
rules := tr.style[CodeBlock]
|
||||||
if rules != nil {
|
if rules != nil {
|
||||||
indent = rules.Indent
|
indent = rules.Indent
|
||||||
|
|||||||
+3
-1
@@ -13,6 +13,7 @@ type ParagraphElement struct {
|
|||||||
|
|
||||||
func (e *ParagraphElement) Render(w io.Writer, node *bf.Node, tr *TermRenderer) error {
|
func (e *ParagraphElement) Render(w io.Writer, node *bf.Node, tr *TermRenderer) error {
|
||||||
tr.paragraph = &bytes.Buffer{}
|
tr.paragraph = &bytes.Buffer{}
|
||||||
|
|
||||||
rules := tr.style[Paragraph]
|
rules := tr.style[Paragraph]
|
||||||
tr.blockStyle.Push(rules)
|
tr.blockStyle.Push(rules)
|
||||||
|
|
||||||
@@ -37,6 +38,7 @@ func (e *ParagraphElement) Finish(w io.Writer, node *bf.Node, tr *TermRenderer)
|
|||||||
suffix = rules.Suffix
|
suffix = rules.Suffix
|
||||||
|
|
||||||
if node.Prev == nil || (node.Parent != nil && node.Parent.Type == bf.Item) {
|
if node.Prev == nil || (node.Parent != nil && node.Parent.Type == bf.Item) {
|
||||||
|
// remove indent for list items
|
||||||
indent = 0
|
indent = 0
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -66,9 +68,9 @@ func (e *ParagraphElement) Finish(w io.Writer, node *bf.Node, tr *TermRenderer)
|
|||||||
|
|
||||||
tr.paragraph.Reset()
|
tr.paragraph.Reset()
|
||||||
tr.paragraph = nil
|
tr.paragraph = nil
|
||||||
|
|
||||||
if rules != nil {
|
if rules != nil {
|
||||||
tr.blockStyle.Pop()
|
tr.blockStyle.Pop()
|
||||||
}
|
}
|
||||||
|
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user