GitHubMirror/glamour-temp-MUTN
1
0
Fork 0
mirror of https://github.com/rwinkhart/glamour-temp-MUTN.git synced 2026-08-30 05:36:42 -04:00
Code Issues Packages Projects Releases Wiki Activity

Clean up pre/post ambiguity

Browse Source
This commit is contained in:
Christian Muehlhaeuser
2019-11-26 03:55:43 +01:00
parent c0d32b4fcb
commit 8f083a1043
9 changed files with 48 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files
baselement.go
+8 -8
View File
@@ -10,19 +10,19 @@ import (
)
type BaseElement struct {
Token string
Pre string
Post string
Style StyleType
Token string
Prefix string
Suffix string
Style StyleType
}
func (e *BaseElement) Render(w io.Writer, node *bf.Node, tr *TermRenderer) error {
if e.Pre != "" {
fmt.Fprintf(w, "%s", e.Pre)
if e.Prefix != "" {
fmt.Fprintf(w, "%s", e.Prefix)
}
defer func() {
if e.Post != "" {
fmt.Fprintf(w, "%s", e.Post)
if e.Suffix != "" {
fmt.Fprintf(w, "%s", e.Suffix)
}
}()
elements.go
+16 -16
View File
@@ -13,8 +13,8 @@ type ElementRenderer interface {
}
type Element struct {
Pre string
Post string
Entering string
Exiting string
Renderer ElementRenderer
}
@@ -28,8 +28,8 @@ func (tr *TermRenderer) NewElement(node *bf.Node) Element {
}
case bf.BlockQuote:
return Element{
Pre: "\n",
Post: "\n",
Entering: "\n",
Exiting: "\n",
Renderer: &BaseElement{
Token: string(node.Literal),
Style: BlockQuote,
@@ -45,18 +45,18 @@ func (tr *TermRenderer) NewElement(node *bf.Node) Element {
}
case bf.Paragraph:
return Element{
Post: "\n",
Exiting: "\n",
Renderer: &ParagraphElement{},
}
case bf.Heading:
return Element{
Post: "\n",
Exiting: "\n",
Renderer: &HeadingElement{},
}
case bf.HorizontalRule:
return Element{
Pre: "\n",
Post: "\n",
Entering: "\n",
Exiting: "\n",
Renderer: &BaseElement{
Token: "---",
Style: HorizontalRule,
@@ -107,8 +107,8 @@ func (tr *TermRenderer) NewElement(node *bf.Node) Element {
}
case bf.CodeBlock:
return Element{
Pre: "\n",
Post: "\n",
Entering: "\n",
Exiting: "\n",
Renderer: &CodeBlockElement{
Code: string(node.Literal),
Language: string(node.CodeBlockData.Info),
@@ -116,7 +116,7 @@ func (tr *TermRenderer) NewElement(node *bf.Node) Element {
}
case bf.Softbreak:
return Element{
Post: "\n",
Exiting: "\n",
Renderer: &BaseElement{
Token: string(node.Literal),
Style: Softbreak,
@@ -124,7 +124,7 @@ func (tr *TermRenderer) NewElement(node *bf.Node) Element {
}
case bf.Hardbreak:
return Element{
Post: "\n",
Exiting: "\n",
Renderer: &BaseElement{
Token: string(node.Literal),
Style: Hardbreak,
@@ -146,8 +146,8 @@ func (tr *TermRenderer) NewElement(node *bf.Node) Element {
}
case bf.Table:
return Element{
Pre: "\n",
Post: "\n",
Entering: "\n",
Exiting: "\n",
}
case bf.TableCell:
return Element{}
@@ -157,8 +157,8 @@ func (tr *TermRenderer) NewElement(node *bf.Node) Element {
return Element{}
case bf.TableRow:
return Element{
Pre: "\n",
Post: "\n",
Entering: "\n",
Exiting: "\n",
}
default:
gold.go
+4 -4
View File
@@ -82,11 +82,11 @@ func (tr *TermRenderer) RenderBytes(in []byte) []byte {
func (tr *TermRenderer) RenderNode(w io.Writer, node *bf.Node, entering bool) bf.WalkStatus {
// fmt.Fprintf(w, "%s %t", node.Type, entering)
e := tr.NewElement(node)
if entering && e.Pre != "" {
fmt.Fprintf(w, "%s", e.Pre)
if entering && e.Entering != "" {
fmt.Fprintf(w, "%s", e.Entering)
}
if !entering && e.Post != "" {
fmt.Fprintf(w, "%s", e.Post)
if !entering && e.Exiting != "" {
fmt.Fprintf(w, "%s", e.Exiting)
}
if isChild(node) {
return bf.GoToNext
heading.go
+3 -3
View File
@@ -18,9 +18,9 @@ func (e *HeadingElement) Render(w io.Writer, node *bf.Node, tr *TermRenderer) er
}
el := &BaseElement{
Pre: pre,
Token: fmt.Sprintf("%s %s", strings.Repeat("#", node.HeadingData.Level), node.FirstChild.Literal),
Style: Heading,
Prefix: pre,
Token: fmt.Sprintf("%s %s", strings.Repeat("#", node.HeadingData.Level), node.FirstChild.Literal),
Style: Heading,
}
return el.Render(w, node, tr)
}
image.go
+4 -4
View File
@@ -19,10 +19,10 @@ func (e *ImageElement) Render(w io.Writer, node *bf.Node, tr *TermRenderer) erro
}
if len(node.LinkData.Destination) > 0 {
el := &BaseElement{
Token: resolveRelativeURL(tr.BaseURL, string(node.LinkData.Destination)),
Pre: " [Image: ",
Post: "]",
Style: Link,
Token: resolveRelativeURL(tr.BaseURL, string(node.LinkData.Destination)),
Prefix: " [Image: ",
Suffix: "]",
Style: Link,
}
el.Render(w, node, tr)
}
link.go
+4 -4
View File
@@ -25,10 +25,10 @@ func (e *LinkElement) Render(w io.Writer, node *bf.Node, tr *TermRenderer) error
}
if len(node.LinkData.Destination) > 0 {
el := &BaseElement{
Token: resolveRelativeURL(tr.BaseURL, string(node.LinkData.Destination)),
Pre: " (",
Post: ")",
Style: Link,
Token: resolveRelativeURL(tr.BaseURL, string(node.LinkData.Destination)),
Prefix: " (",
Suffix: ")",
Style: Link,
}
el.Render(w, node, tr)
}
list.go
+3 -3
View File
@@ -16,9 +16,9 @@ func (e *ListElement) Render(w io.Writer, node *bf.Node, tr *TermRenderer) error
}
el := &BaseElement{
Pre: pre,
Token: string(node.Literal),
Style: List,
Prefix: pre,
Token: string(node.Literal),
Style: List,
}
return el.Render(w, node, tr)
}
listitem.go
+3 -3
View File
@@ -21,9 +21,9 @@ func (e *ItemElement) Render(w io.Writer, node *bf.Node, tr *TermRenderer) error
}
el := &BaseElement{
Pre: strings.Repeat(" ", l-1) + "• ",
Token: string(node.Literal),
Style: Item,
Prefix: strings.Repeat(" ", l-1) + "• ",
Token: string(node.Literal),
Style: Item,
}
return el.Render(w, node, tr)
}
paragraph.go
+3 -3
View File
@@ -16,9 +16,9 @@ func (e *ParagraphElement) Render(w io.Writer, node *bf.Node, tr *TermRenderer)
}
el := &BaseElement{
Pre: pre,
Token: string(node.Literal),
Style: Paragraph,
Prefix: pre,
Token: string(node.Literal),
Style: Paragraph,
}
return el.Render(w, node, tr)
}