From 75c1852f53baca42e000a65531ee9dc09f6da7ac Mon Sep 17 00:00:00 2001 From: Christian Muehlhaeuser Date: Thu, 12 Dec 2019 21:55:36 +0100 Subject: [PATCH] Support styled prefix/suffix in ParagraphElement --- paragraph.go | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/paragraph.go b/paragraph.go index ef123ed..afc4581 100644 --- a/paragraph.go +++ b/paragraph.go @@ -23,7 +23,8 @@ func (e *ParagraphElement) Render(w io.Writer, ctx RenderContext) error { } bs.Push(be) - renderText(w, bs.Current().Style, rules.Prefix) + renderText(w, bs.Parent().Style, rules.Prefix) + renderText(w, bs.Current().Style, rules.StyledPrefix) return nil } @@ -33,8 +34,6 @@ func (e *ParagraphElement) Finish(w io.Writer, ctx RenderContext) error { keepNewlines := false - renderText(bs.Current().Block, rules, rules.Suffix) - mw := NewMarginWriter(ctx, w, rules) if len(strings.TrimSpace(bs.Current().Block.String())) > 0 { flow := reflow.NewReflow(int(bs.Width(ctx))) @@ -49,6 +48,9 @@ func (e *ParagraphElement) Finish(w io.Writer, ctx RenderContext) error { _, _ = mw.Write([]byte("\n")) } + renderText(w, bs.Current().Style, rules.StyledSuffix) + renderText(w, bs.Parent().Style, rules.Suffix) + bs.Current().Block.Reset() bs.Pop() return nil