GitHubMirror/glamour-temp-MUTN
1
0
Fork 0
mirror of https://github.com/rwinkhart/glamour-temp-MUTN.git synced 2026-09-06 00:47:15 -04:00
Code Issues Packages Projects Releases Wiki Activity

Handle write buffers & cascading styles in BlockStack

Browse Source
This commit is contained in:
Christian Muehlhaeuser
2019-12-04 13:36:31 +01:00
parent 9134cddd48
commit 038f2dd684
7 changed files with 81 additions and 76 deletions
Download Patch File Download Diff File Expand all files Collapse all files
paragraph.go
+29 -25
View File
@@ -3,6 +3,7 @@ package gold
import (
"bytes"
"io"
"strings"
"github.com/muesli/reflow"
bf "gopkg.in/russross/blackfriday.v2"
@@ -12,19 +13,22 @@ type ParagraphElement struct {
}
func (e *ParagraphElement) Render(w io.Writer, node *bf.Node, tr *TermRenderer) error {
tr.paragraph = &bytes.Buffer{}
rules := tr.style[Paragraph]
tr.blockStyle.Push(rules)
var rules *ElementStyle
if node.Parent != nil && node.Parent.Type == bf.Item {
// list item
rules = tr.style[List]
} else {
rules = tr.style[Paragraph]
_, _ = w.Write([]byte("\n"))
be := BlockElement{
Block: &bytes.Buffer{},
Style: cascadeStyle(tr.blockStack.Current().Style, rules),
}
tr.blockStack.Push(be)
}
if rules != nil {
renderText(w, tr.blockStyle.Current(), rules.Prefix)
renderText(w, tr.blockStack.Current().Style, rules.Prefix)
}
return nil
}
@@ -33,22 +37,21 @@ func (e *ParagraphElement) Finish(w io.Writer, node *bf.Node, tr *TermRenderer)
var indent uint
var margin uint
var suffix string
rules := tr.blockStyle.Current()
rules := tr.blockStack.Current().Style
if node.Parent != nil && node.Parent.Type == bf.Item {
// remove indent & margin for list items
rules = tr.blockStack.Current().Style
}
if rules != nil {
indent = rules.Indent
margin = rules.Margin
suffix = rules.Suffix
if node.Parent != nil && node.Parent.Type == bf.Item {
// remove indent & margin for list items
indent = 0
margin = 0
}
}
renderText(tr.paragraph, rules, suffix)
renderText(tr.blockStack.Current().Block, rules, suffix)
pw := &PaddingWriter{
Padding: uint(tr.WordWrap - int(tr.blockStyle.Indent()) - int(tr.blockStyle.Margin()*2)),
Padding: uint(tr.WordWrap - int(tr.blockStack.Indent()) - int(tr.blockStack.Margin()*2)),
PadFunc: func(wr io.Writer) {
renderText(w, rules, " ")
},
@@ -59,24 +62,25 @@ func (e *ParagraphElement) Finish(w io.Writer, node *bf.Node, tr *TermRenderer)
iw := &IndentWriter{
Indent: indent + margin,
IndentFunc: func(wr io.Writer) {
renderText(w, tr.blockStyle.Parent(), " ")
renderText(w, tr.blockStack.Parent().Style, " ")
},
Forward: &AnsiWriter{
Forward: pw,
},
}
_, err := iw.Write(reflow.ReflowBytes(tr.paragraph.Bytes(), tr.WordWrap-int(tr.blockStyle.Indent())-int(tr.blockStyle.Margin())*2))
if err != nil {
return err
if len(strings.TrimSpace(tr.blockStack.Current().Block.String())) > 0 {
_, err := iw.Write(reflow.ReflowBytes(tr.blockStack.Current().Block.Bytes(), tr.WordWrap-int(tr.blockStack.Indent())-int(tr.blockStack.Margin())*2))
if err != nil {
return err
}
_, _ = pw.Write([]byte("\n"))
}
_, _ = pw.Write([]byte("\n"))
tr.paragraph.Reset()
tr.paragraph = nil
if rules != nil {
tr.blockStyle.Pop()
tr.blockStack.Current().Block.Reset()
if node.Parent != nil && node.Parent.Type == bf.Item {
} else {
tr.blockStack.Pop()
}
return nil
}