mirror of
https://github.com/rwinkhart/glamour-temp-MUTN.git
synced 2026-08-29 21:26:44 -04:00
Initialize paragraph buffer in ParagraphElement
This commit is contained in:
@@ -98,9 +98,7 @@ func (tr *TermRenderer) RenderNode(w io.Writer, node *bf.Node, entering bool) bf
|
||||
_, _ = tr.document.Write([]byte(e.Entering))
|
||||
}
|
||||
|
||||
if node.Type == bf.Paragraph {
|
||||
tr.paragraph = &bytes.Buffer{}
|
||||
}
|
||||
// each paragraph gets rendered into a separate buffer
|
||||
if tr.paragraph != nil {
|
||||
writeTo = tr.paragraph
|
||||
}
|
||||
@@ -113,6 +111,8 @@ func (tr *TermRenderer) RenderNode(w io.Writer, node *bf.Node, entering bool) bf
|
||||
}
|
||||
}
|
||||
} else {
|
||||
// if we're finished rendering the entire document,
|
||||
// flush to the real writer
|
||||
if node.Type == bf.Document {
|
||||
writeTo = w
|
||||
}
|
||||
@@ -125,9 +125,6 @@ func (tr *TermRenderer) RenderNode(w io.Writer, node *bf.Node, entering bool) bf
|
||||
}
|
||||
}
|
||||
|
||||
if node.Type == bf.Paragraph {
|
||||
tr.paragraph = nil
|
||||
}
|
||||
if e.Exiting != "" {
|
||||
_, _ = tr.document.Write([]byte(e.Exiting))
|
||||
}
|
||||
|
||||
@@ -1,6 +1,7 @@
|
||||
package gold
|
||||
|
||||
import (
|
||||
"bytes"
|
||||
"io"
|
||||
|
||||
"github.com/muesli/reflow"
|
||||
@@ -11,6 +12,8 @@ type ParagraphElement struct {
|
||||
}
|
||||
|
||||
func (e *ParagraphElement) Render(w io.Writer, node *bf.Node, tr *TermRenderer) error {
|
||||
tr.paragraph = &bytes.Buffer{}
|
||||
|
||||
pre := "\n"
|
||||
if node.Prev == nil || (node.Parent != nil && node.Parent.Type == bf.Item) {
|
||||
pre = ""
|
||||
@@ -48,5 +51,6 @@ func (e *ParagraphElement) Finish(w io.Writer, node *bf.Node, tr *TermRenderer)
|
||||
|
||||
_, err := iw.Write(reflow.ReflowBytes(tr.paragraph.Bytes(), tr.WordWrap-int(indent)))
|
||||
tr.paragraph.Reset()
|
||||
tr.paragraph = nil
|
||||
return err
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user