diff --git a/ansi/heading.go b/ansi/heading.go index 46ff8ad9..9d5634cf 100644 --- a/ansi/heading.go +++ b/ansi/heading.go @@ -29,17 +29,17 @@ func (e *HeadingElement) Render(w io.Writer, ctx RenderContext) error { switch e.Level { case h1: - rules = cascadeStyles(true, rules, ctx.options.Styles.H1) + rules = cascadeStyles(rules, ctx.options.Styles.H1) case h2: - rules = cascadeStyles(true, rules, ctx.options.Styles.H2) + rules = cascadeStyles(rules, ctx.options.Styles.H2) case h3: - rules = cascadeStyles(true, rules, ctx.options.Styles.H3) + rules = cascadeStyles(rules, ctx.options.Styles.H3) case h4: - rules = cascadeStyles(true, rules, ctx.options.Styles.H4) + rules = cascadeStyles(rules, ctx.options.Styles.H4) case h5: - rules = cascadeStyles(true, rules, ctx.options.Styles.H5) + rules = cascadeStyles(rules, ctx.options.Styles.H5) case h6: - rules = cascadeStyles(true, rules, ctx.options.Styles.H6) + rules = cascadeStyles(rules, ctx.options.Styles.H6) } if !e.First { diff --git a/ansi/style.go b/ansi/style.go index 973243d5..fd521471 100644 --- a/ansi/style.go +++ b/ansi/style.go @@ -138,11 +138,11 @@ type StyleConfig struct { HTMLSpan StyleBlock `json:"html_span,omitempty"` } -func cascadeStyles(toBlock bool, s ...StyleBlock) StyleBlock { +func cascadeStyles(s ...StyleBlock) StyleBlock { var r StyleBlock for _, v := range s { - r = cascadeStyle(r, v, toBlock) + r = cascadeStyle(r, v, true) } return r } diff --git a/ansi/templatehelper.go b/ansi/templatehelper.go index a82d75c6..88af0470 100644 --- a/ansi/templatehelper.go +++ b/ansi/templatehelper.go @@ -29,6 +29,7 @@ var ( l = len(s) } + //nolint:gomnd if len(values) > 2 { r := values[2].(int) if r > len(s) { diff --git a/dracula.go b/dracula.go index c9f06a80..0b0eb56a 100644 --- a/dracula.go +++ b/dracula.go @@ -9,17 +9,17 @@ var DraculaStyleConfig = ansi.StyleConfig{ BlockSuffix: "\n", Color: stringPtr("#f8f8f2"), }, - Margin: uintPtr(2), + Margin: uintPtr(defaultMargin), }, BlockQuote: ansi.StyleBlock{ StylePrimitive: ansi.StylePrimitive{ Color: stringPtr("#f1fa8c"), Italic: boolPtr(true), }, - Indent: uintPtr(2), + Indent: uintPtr(defaultMargin), }, List: ansi.StyleList{ - LevelIndent: 2, + LevelIndent: defaultMargin, StyleBlock: ansi.StyleBlock{ StylePrimitive: ansi.StylePrimitive{ Color: stringPtr("#f8f8f2"), @@ -115,7 +115,7 @@ var DraculaStyleConfig = ansi.StyleConfig{ StylePrimitive: ansi.StylePrimitive{ Color: stringPtr("#ffb86c"), }, - Margin: uintPtr(2), + Margin: uintPtr(defaultMargin), }, Chroma: &ansi.Chroma{ Text: ansi.StylePrimitive{ diff --git a/styles.go b/styles.go index 70891458..a8c16f32 100644 --- a/styles.go +++ b/styles.go @@ -7,6 +7,7 @@ import ( ) const defaultListIndent = 2 +const defaultListLevelIndent = 4 const defaultMargin = 2 var ( @@ -31,7 +32,7 @@ var ( StyleBlock: ansi.StyleBlock{ StylePrimitive: ansi.StylePrimitive{}, }, - LevelIndent: 4, + LevelIndent: defaultListLevelIndent, }, Heading: ansi.StyleBlock{ StylePrimitive: ansi.StylePrimitive{