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

Use ElementStyle as a value instead of pointer, so we can drop all the annoying nil checks

Browse Source
This commit is contained in:
Christian Muehlhaeuser
2019-12-05 18:05:29 +01:00
parent 556c490ac4
commit 78e36a02d0
11 changed files with 147 additions and 176 deletions
Download Patch File Download Diff File Expand all files Collapse all files
paragraph.go
+8 -13
View File
@@ -13,7 +13,7 @@ type ParagraphElement struct {
}
func (e *ParagraphElement) Render(w io.Writer, node *bf.Node, tr *TermRenderer) error {
var rules *ElementStyle
var rules ElementStyle
if node.Parent != nil && node.Parent.Type == bf.Item {
// list item
rules = tr.style[List]
@@ -27,31 +27,26 @@ func (e *ParagraphElement) Render(w io.Writer, node *bf.Node, tr *TermRenderer)
tr.blockStack.Push(be)
}
if rules != nil {
renderText(w, tr.blockStack.Current().Style, rules.Prefix)
}
renderText(w, tr.blockStack.Current().Style, rules.Prefix)
return nil
}
func (e *ParagraphElement) 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 node.Parent != nil && node.Parent.Type == bf.Item {
// remove indent & margin for list items
rules = tr.blockStack.Current().Style
}
if rules != nil {
if rules.Indent != nil {
indent = *rules.Indent
}
if rules.Margin != nil {
margin = *rules.Margin
}
suffix = rules.Suffix
if rules.Indent != nil {
indent = *rules.Indent
}
if rules.Margin != nil {
margin = *rules.Margin
}
suffix := rules.Suffix
renderText(tr.blockStack.Current().Block, rules, suffix)
pw := &PaddingWriter{