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

Decode style JSON into a typed struct

Browse Source
This commit is contained in:
Christian Muehlhaeuser
2019-12-13 03:04:48 +01:00
parent 219f21c4e7
commit 35342a2061
17 changed files with 184 additions and 249 deletions
Download Patch File Download Diff File Expand all files Collapse all files
paragraph.go
+6 -9
View File
@@ -13,9 +13,8 @@ type ParagraphElement struct {
func (e *ParagraphElement) Render(w io.Writer, ctx RenderContext) error {
bs := ctx.blockStack
var rules ElementStyle
rules := ctx.styles.Paragraph
rules = ctx.style[Paragraph]
_, _ = w.Write([]byte("\n"))
be := BlockElement{
Block: &bytes.Buffer{},
@@ -23,8 +22,8 @@ func (e *ParagraphElement) Render(w io.Writer, ctx RenderContext) error {
}
bs.Push(be)
renderText(w, bs.Parent().Style, rules.Prefix)
renderText(w, bs.Current().Style, rules.StyledPrefix)
renderText(w, bs.Parent().Style.StylePrimitive, rules.Prefix)
renderText(w, bs.Current().Style.StylePrimitive, rules.StyledPrefix)
return nil
}
@@ -32,12 +31,10 @@ func (e *ParagraphElement) Finish(w io.Writer, ctx RenderContext) error {
bs := ctx.blockStack
rules := bs.Current().Style
keepNewlines := false
mw := NewMarginWriter(ctx, w, rules)
if len(strings.TrimSpace(bs.Current().Block.String())) > 0 {
flow := reflow.NewReflow(int(bs.Width(ctx)))
flow.KeepNewlines = keepNewlines
flow.KeepNewlines = false
_, _ = flow.Write(bs.Current().Block.Bytes())
flow.Close()
@@ -48,8 +45,8 @@ 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)
renderText(w, bs.Current().Style.StylePrimitive, rules.StyledSuffix)
renderText(w, bs.Parent().Style.StylePrimitive, rules.Suffix)
bs.Current().Block.Reset()
bs.Pop()