WIP

Author: MichaelMure

html/html.go

@@ -1,7 +1,5 @@
 package html
 
-import . "golang.org/x/net/html"
-
 // WalkStatus allows NodeVisitor to have some control over the tree traversal.
 // It is returned from NodeVisitor and different values allow Node.Walk to
 // decide which node to go to next.
@@ -24,26 +22,14 @@ type NodeVisitor interface {
 }
 
 func Walk(n *Node, visitor NodeVisitor) WalkStatus {
-	isContainer := n.FirstChild != nil
-
-	// some special case that are container but can be self closing
-	if n.Type == ElementNode {
-		switch n.Data {
-		case "td":
-			isContainer = true
-		}
-	}
-
 	status := visitor.Visit(n, true)
 
 	if status == Terminate {
-		// even if terminating, close container node
-		if isContainer {
-			visitor.Visit(n, false)
-		}
+		// even if terminating, close node
+		visitor.Visit(n, false)
 	}
 
-	if isContainer && status != SkipChildren {
+	if status != SkipChildren {
 		child := n.FirstChild
 		for child != nil {
 			status = Walk(child, visitor)
@@ -54,11 +40,9 @@ func Walk(n *Node, visitor NodeVisitor) WalkStatus {
 		}
 	}
 
-	if isContainer {
-		status = visitor.Visit(n, false)
-		if status == Terminate {
-			return status
-		}
+	status = visitor.Visit(n, false)
+	if status == Terminate {
+		return status
 	}
 
 	return GoToNext

renderer.go

@@ -354,6 +354,9 @@ func (r *renderer) RenderNode(w io.Writer, node ast.Node, entering bool) ast.Wal
 	case *ast.HTMLBlock:
 		r.renderHTMLBlock(w, node)
 
+	case *ast.HTMLSpan:
+		r.renderHTMLSpan(node)
+
 	case *ast.CodeBlock:
 		r.renderCodeBlock(w, node)
 
@@ -367,9 +370,6 @@ func (r *renderer) RenderNode(w io.Writer, node ast.Node, entering bool) ast.Wal
 	case *ast.Code:
 		r.inlineAccumulator.WriteString(BlueBgItalic(string(node.Literal)))
 
-	case *ast.HTMLSpan:
-		r.inlineAccumulator.WriteString(Red(string(node.Literal)))
-
 	case *ast.Table:
 		if entering {
 			r.table = newTableRenderer()
@@ -502,6 +502,103 @@ func (r *renderer) renderFormattedCodeBlock(w io.Writer, code string) {
 	_, _ = fmt.Fprintf(w, "\n\n")
 }
 
+func (r *renderer) renderHTMLSpan(node *ast.HTMLSpan) {
+	doc, err := html.Parse(bytes.NewReader(node.Literal))
+	if err != nil {
+		// if there is a parsing error, fallback to a simple render
+		r.inlineAccumulator.WriteString(Red(string(node.Literal)))
+		return
+	}
+
+	htmlWalker.WalkFunc(doc, func(node *html.Node, entering bool) htmlWalker.WalkStatus {
+		switch node.Type {
+		case html.CommentNode, html.DoctypeNode:
+			// Not rendered
+
+		case html.DocumentNode:
+
+		case html.ElementNode:
+			switch node.Data {
+			case "html", "body":
+				return htmlWalker.GoToNext
+
+			case "head":
+				return htmlWalker.SkipChildren
+
+			case "a":
+				if entering {
+					r.inlineAccumulator.WriteString("[")
+				} else {
+					href, alt := getAHTMLAttr(node.Attr)
+					r.inlineAccumulator.WriteString("](")
+					r.inlineAccumulator.WriteString(Blue(href))
+					if len(alt) > 0 {
+						r.inlineAccumulator.WriteString(" ")
+						r.inlineAccumulator.WriteString(alt)
+					}
+					r.inlineAccumulator.WriteString(")")
+				}
+
+			case "strong", "b":
+				if entering {
+					r.inlineAccumulator.WriteString(boldOn)
+				} else {
+					// This is super silly but some terminals, instead of having
+					// the ANSI code SGR 21 do "bold off" like the logic would guide,
+					// do "double underline" instead. This is madness.
+
+					// To resolve that problem, we take a snapshot of the escape state,
+					// remove the bold, then output "reset all" + snapshot
+					es := text.EscapeState{}
+					es.Witness(r.inlineAccumulator.String())
+					es.Bold = false
+					r.inlineAccumulator.WriteString(resetAll)
+					r.inlineAccumulator.WriteString(es.String())
+				}
+
+			case "i", "em":
+				if entering {
+					r.inlineAccumulator.WriteString(italicOn)
+				} else {
+					r.inlineAccumulator.WriteString(italicOff)
+				}
+
+			case "s":
+				if entering {
+					r.inlineAccumulator.WriteString(crossedOutOn)
+				} else {
+					r.inlineAccumulator.WriteString(crossedOutOff)
+				}
+
+			case "kbd":
+				if entering {
+					r.inlineAccumulator.WriteString("⦏")
+				} else {
+					r.inlineAccumulator.WriteString("⦎")
+				}
+
+			default:
+				if entering {
+					r.inlineAccumulator.WriteString(Red(renderRawHtml(node)))
+				}
+				return htmlWalker.SkipChildren
+			}
+
+		case html.TextNode:
+			if entering {
+				t := strings.TrimSpace(node.Data)
+				t = strings.ReplaceAll(t, "\n", "")
+				r.inlineAccumulator.WriteString(t)
+			}
+
+		default:
+			panic("unhandled case")
+		}
+
+		return htmlWalker.GoToNext
+	})
+}
+
 func (r *renderer) renderHTMLBlock(w io.Writer, node *ast.HTMLBlock) {
 	var buf bytes.Buffer
 
@@ -586,14 +683,18 @@ func (r *renderer) renderHTMLBlock(w io.Writer, node *ast.HTMLBlock) {
 				}
 
 			case "img":
-				flushInline()
-				src, title := getImgHTMLAttr(node.Attr)
-				str, _ := r.renderImage(src, title, r.lineWidth-len(r.pad()))
-				r.inlineAccumulator.WriteString(str)
+				if entering {
+					flushInline()
+					src, title := getImgHTMLAttr(node.Attr)
+					str, _ := r.renderImage(src, title, r.lineWidth-len(r.pad()))
+					r.inlineAccumulator.WriteString(str)
+				}
 
 			case "hr":
-				flushInline()
-				r.renderHorizontalRule(&buf)
+				if entering {
+					flushInline()
+					r.renderHorizontalRule(&buf)
+				}
 
 			case "ul", "ol":
 				if !entering {
@@ -727,14 +828,26 @@ func (r *renderer) renderHTMLBlock(w io.Writer, node *ast.HTMLBlock) {
 					r.inlineAccumulator.WriteString(crossedOutOff)
 				}
 
+			case "kbd":
+				if entering {
+					r.inlineAccumulator.WriteString("⦏")
+				} else {
+					r.inlineAccumulator.WriteString("⦎")
+				}
+
 			default:
-				r.inlineAccumulator.WriteString(Red(renderRawHtml(node)))
+				if entering {
+					r.inlineAccumulator.WriteString(Red(renderRawHtml(node)))
+				}
+				return htmlWalker.SkipChildren
 			}
 
 		case html.TextNode:
-			t := strings.TrimSpace(node.Data)
-			t = strings.ReplaceAll(t, "\n", "")
-			r.inlineAccumulator.WriteString(t)
+			if entering {
+				t := strings.TrimSpace(node.Data)
+				t = strings.ReplaceAll(t, "\n", "")
+				r.inlineAccumulator.WriteString(t)
+			}
 
 		default:
 			panic("unhandled case")