Handle Lists as a block element, which supports margins & indents

elements.go

@@ -41,8 +41,10 @@ func (tr *TermRenderer) NewElement(node *bf.Node) Element {
 			},
 		}
 	case bf.List:
+		le := &ListElement{}
 		return Element{
-			Renderer: &ListElement{},
+			Renderer: le,
+			Finisher: le,
 		}
 	case bf.Item:
 		return Element{

list.go

@@ -1,8 +1,10 @@
 package gold
 
 import (
+	"bytes"
 	"io"
 
+	"github.com/muesli/reflow"
 	bf "gopkg.in/russross/blackfriday.v2"
 )
 
@@ -10,15 +12,60 @@ type ListElement struct {
 }
 
 func (e *ListElement) Render(w io.Writer, node *bf.Node, tr *TermRenderer) error {
-	pre := ""
+	rules := tr.style[List]
 	if node.Parent.Type != bf.Item {
-		pre = "\n"
+		_, _ = w.Write([]byte("\n"))
 	}
 
-	el := &BaseElement{
+	be := BlockElement{
-		Prefix: pre,
+		Block: &bytes.Buffer{},
-		Token:  string(node.Literal),
+		Style: cascadeStyle(tr.blockStack.Current().Style, rules),
-		Style:  List,
 	}
-	return el.Render(w, node, tr)
+	tr.blockStack.Push(be)
+
+	if rules != nil {
+		renderText(w, tr.blockStack.Current().Style, rules.Prefix)
+	}
+	return nil
+}
+
+func (e *ListElement) Finish(w io.Writer, node *bf.Node, tr *TermRenderer) error {
+	var indent uint
+	var margin uint
+	var suffix string
+	rules := tr.blockStack.Current().Style
+	if rules != nil {
+		indent = rules.Indent
+		margin = rules.Margin
+		suffix = rules.Suffix
+	}
+	renderText(tr.blockStack.Current().Block, rules, suffix)
+
+	pw := &PaddingWriter{
+		Padding: uint(tr.WordWrap - int(tr.blockStack.Indent()) - int(tr.blockStack.Margin()*2)),
+		PadFunc: func(wr io.Writer) {
+			renderText(w, rules, " ")
+		},
+		Forward: &AnsiWriter{
+			Forward: w,
+		},
+	}
+	iw := &IndentWriter{
+		Indent: indent + margin,
+		IndentFunc: func(wr io.Writer) {
+			renderText(w, tr.blockStack.Parent().Style, " ")
+		},
+		Forward: &AnsiWriter{
+			Forward: pw,
+		},
+	}
+
+	_, 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
+	}
+
+	tr.blockStack.Current().Block.Reset()
+	tr.blockStack.Pop()
+	return nil
 }

listitem.go

@@ -2,7 +2,6 @@ package gold
 
 import (
 	"io"
-	"strings"
 
 	bf "gopkg.in/russross/blackfriday.v2"
 )
@@ -11,19 +10,9 @@ type ItemElement struct {
 }
 
 func (e *ItemElement) Render(w io.Writer, node *bf.Node, tr *TermRenderer) error {
-	l := 0
-	n := node
-	for n.Parent != nil && (n.Parent.Type == bf.List || n.Parent.Type == bf.Item) {
-		if n.Parent.Type == bf.List {
-			l++
-		}
-		n = n.Parent
-	}
-
 	el := &BaseElement{
-		Prefix: strings.Repeat("  ", l-1),
+		Token: string(node.Literal),
-		Token:  string(node.Literal),
+		Style: Item,
-		Style:  Item,
 	}
 	return el.Render(w, node, tr)
 }