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

Fix reflowing nested lists

Browse Source
This commit is contained in:
Christian Muehlhaeuser
2019-12-05 22:28:34 +01:00
parent 08ffc82515
commit 8cbb296ffb
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
paragraph.go
+3 -1
View File
@@ -34,10 +34,12 @@ func (e *ParagraphElement) Render(w io.Writer, node *bf.Node, tr *TermRenderer)
func (e *ParagraphElement) Finish(w io.Writer, node *bf.Node, tr *TermRenderer) error { func (e *ParagraphElement) Finish(w io.Writer, node *bf.Node, tr *TermRenderer) error {
var indent uint var indent uint
var margin uint var margin uint
keepNewlines := false
rules := tr.blockStack.Current().Style rules := tr.blockStack.Current().Style
if node.Parent != nil && node.Parent.Type == bf.Item { if node.Parent != nil && node.Parent.Type == bf.Item {
// remove indent & margin for list items // remove indent & margin for list items
rules = tr.blockStack.Current().Style rules = tr.blockStack.Current().Style
keepNewlines = true
} }
if rules.Indent != nil { if rules.Indent != nil {
@@ -70,7 +72,7 @@ func (e *ParagraphElement) Finish(w io.Writer, node *bf.Node, tr *TermRenderer)
if len(strings.TrimSpace(tr.blockStack.Current().Block.String())) > 0 { if len(strings.TrimSpace(tr.blockStack.Current().Block.String())) > 0 {
flow := reflow.NewReflow(tr.WordWrap - int(tr.blockStack.Indent()) - int(tr.blockStack.Margin())*2) flow := reflow.NewReflow(tr.WordWrap - int(tr.blockStack.Indent()) - int(tr.blockStack.Margin())*2)
flow.KeepNewlines = false flow.KeepNewlines = keepNewlines
_, _ = flow.Write(tr.blockStack.Current().Block.Bytes()) _, _ = flow.Write(tr.blockStack.Current().Block.Bytes())
flow.Close() flow.Close()