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

Support margins in block elements

Browse Source
This commit is contained in:
Christian Muehlhaeuser
2019-12-04 06:59:53 +01:00
parent 419fda75c9
commit f7244397d2
4 changed files with 19 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
codeblock.go
+3 -1
View File
@@ -15,14 +15,16 @@ type CodeBlockElement struct {
func (e *CodeBlockElement) Render(w io.Writer, node *bf.Node, tr *TermRenderer) error { func (e *CodeBlockElement) Render(w io.Writer, node *bf.Node, tr *TermRenderer) error {
var theme string var theme string
var indent uint var indent uint
var margin uint
rules := tr.style[CodeBlock] rules := tr.style[CodeBlock]
if rules != nil { if rules != nil {
indent = rules.Indent indent = rules.Indent
margin = rules.Margin
theme = rules.Theme theme = rules.Theme
} }
iw := &IndentWriter{ iw := &IndentWriter{
Indent: indent, Indent: indent + margin,
IndentFunc: func(wr io.Writer) { IndentFunc: func(wr io.Writer) {
renderText(w, tr.blockStyle.Parent(), " ") renderText(w, tr.blockStyle.Parent(), " ")
}, },
document.go
+5 -3
View File
@@ -20,14 +20,16 @@ func (e *DocumentElement) Render(w io.Writer, node *bf.Node, tr *TermRenderer) e
func (e *DocumentElement) Finish(w io.Writer, node *bf.Node, tr *TermRenderer) error { func (e *DocumentElement) Finish(w io.Writer, node *bf.Node, tr *TermRenderer) error {
var indent uint var indent uint
suffix := "" var margin uint
var suffix string
rules := tr.style[Document] rules := tr.style[Document]
if rules != nil { if rules != nil {
indent = rules.Indent indent = rules.Indent
margin = rules.Margin
suffix = rules.Suffix suffix = rules.Suffix
} }
pw := &PaddingWriter{ pw := &PaddingWriter{
Padding: uint(tr.WordWrap + int(indent*2)), Padding: uint(tr.WordWrap) - margin,
PadFunc: func(wr io.Writer) { PadFunc: func(wr io.Writer) {
renderText(w, rules, " ") renderText(w, rules, " ")
}, },
@@ -36,7 +38,7 @@ func (e *DocumentElement) Finish(w io.Writer, node *bf.Node, tr *TermRenderer) e
}, },
} }
iw := &IndentWriter{ iw := &IndentWriter{
Indent: indent, Indent: indent + margin,
Forward: &AnsiWriter{ Forward: &AnsiWriter{
Forward: pw, Forward: pw,
}, },
paragraph.go
+8 -5
View File
@@ -31,21 +31,24 @@ 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
suffix := "" var margin uint
var suffix string
rules := tr.blockStyle.Current() rules := tr.blockStyle.Current()
if rules != nil { if rules != nil {
indent = rules.Indent indent = rules.Indent
margin = rules.Margin
suffix = rules.Suffix suffix = rules.Suffix
if node.Prev == nil || (node.Parent != nil && node.Parent.Type == bf.Item) { if node.Prev == nil || (node.Parent != nil && node.Parent.Type == bf.Item) {
// remove indent for list items // remove indent & margin for list items
indent = 0 indent = 0
margin = 0
} }
} }
renderText(tr.paragraph, rules, suffix) renderText(tr.paragraph, rules, suffix)
pw := &PaddingWriter{ pw := &PaddingWriter{
Padding: uint(tr.WordWrap + int(indent) - int(tr.blockStyle.Indent())), Padding: uint(tr.WordWrap - int(tr.blockStyle.Indent()) - int(tr.blockStyle.Margin()*2)),
PadFunc: func(wr io.Writer) { PadFunc: func(wr io.Writer) {
renderText(w, rules, " ") renderText(w, rules, " ")
}, },
@@ -54,7 +57,7 @@ func (e *ParagraphElement) Finish(w io.Writer, node *bf.Node, tr *TermRenderer)
}, },
} }
iw := &IndentWriter{ iw := &IndentWriter{
Indent: indent, Indent: indent + margin,
IndentFunc: func(wr io.Writer) { IndentFunc: func(wr io.Writer) {
renderText(w, tr.blockStyle.Parent(), " ") renderText(w, tr.blockStyle.Parent(), " ")
}, },
@@ -63,7 +66,7 @@ func (e *ParagraphElement) Finish(w io.Writer, node *bf.Node, tr *TermRenderer)
}, },
} }
_, err := iw.Write(reflow.ReflowBytes(tr.paragraph.Bytes(), tr.WordWrap-int(tr.blockStyle.Indent()))) _, err := iw.Write(reflow.ReflowBytes(tr.paragraph.Bytes(), tr.WordWrap-int(tr.blockStyle.Indent())-int(tr.blockStyle.Margin())*2))
if err != nil { if err != nil {
return err return err
} }
table.go
+3 -1
View File
@@ -24,12 +24,14 @@ type TableCellElement struct {
func (e *TableElement) Render(w io.Writer, node *bf.Node, tr *TermRenderer) error { func (e *TableElement) Render(w io.Writer, node *bf.Node, tr *TermRenderer) error {
var indent uint var indent uint
var margin uint
rules := tr.style[Table] rules := tr.style[Table]
if rules != nil { if rules != nil {
indent = rules.Indent indent = rules.Indent
margin = rules.Margin
} }
iw := &IndentWriter{ iw := &IndentWriter{
Indent: indent, Indent: indent + margin,
IndentFunc: func(wr io.Writer) { IndentFunc: func(wr io.Writer) {
renderText(w, tr.blockStyle.Parent(), " ") renderText(w, tr.blockStyle.Parent(), " ")
}, },