Support attributes on any HTML tag

Author: k3a

html2text.go

@@ -15,7 +15,7 @@ const (
 )
 
 var legacyLBR = WIN_LBR
-var badTagnamesRE = regexp.MustCompile(`^(head|script|style|a)($|\s+)`)
+var badTagnamesRE = regexp.MustCompile(`^(head|script|style|a)$`)
 var linkTagRE = regexp.MustCompile(`^(?i:a)(?:$|\s).*(?i:href)\s*=\s*('([^']*?)'|"([^"]*?)"|([^\s"'` + "`" + `=<>]+))`)
 var badLinkHrefRE = regexp.MustCompile(`javascript:`)
 var headersRE = regexp.MustCompile(`^(\/)?h[1-6]`)
@@ -99,6 +99,15 @@ func parseHTMLEntity(entName string) (string, bool) {
 	return "", false
 }
 
+func firstWord(s string) string {
+	for i := 0; i < len(s); i++ {
+		if s[i] == ' ' {
+			return s[:i]
+		}
+	}
+	return s
+}
+
 // SetUnixLbr with argument true sets Unix-style line-breaks in output ("\n")
 // with argument false sets Windows-style line-breaks in output ("\r\n", the default)
 // Deprecated: Please use HTML2TextWithOptions(text, WithUnixLineBreak())
@@ -257,11 +266,12 @@ func HTML2TextWithOptions(html string, reqOpts ...Option) string {
 		case r == '>': // end of a tag
 			shouldOutput = true
 			tag := html[tagStart:i]
-			tagNameLowercase := strings.ToLower(tag)
+			tagContentLowercase := strings.ToLower(tag)
+			tagNameLowercase := firstWord(tagContentLowercase)
 
 			if tagNameLowercase == "/ul" || tagNameLowercase == "/ol" {
 				outBuf.WriteString(opts.lbr)
-			} else if tagNameLowercase == "li" || tagNameLowercase == "li/" || strings.HasPrefix(tagNameLowercase, "li ") {
+			} else if tagNameLowercase == "li" || tagNameLowercase == "li/" {
 				if opts.listPrefix != "" {
 					outBuf.WriteString(opts.lbr + opts.listPrefix)
 				} else {
@@ -289,7 +299,7 @@ func HTML2TextWithOptions(html string, reqOpts ...Option) string {
 					outBuf.WriteString(">")
 					hrefs = hrefs[1:]
 				}
-			} else if opts.linksInnerText && linkTagRE.MatchString(tagNameLowercase) {
+			} else if opts.linksInnerText && linkTagRE.MatchString(tagContentLowercase) {
 				// parse link href
 				// add special handling for a tags
 				m := linkTagRE.FindStringSubmatch(tag)

html2text_test.go

@@ -127,9 +127,10 @@ func TestHTML2Text(t *testing.T) {
 			So(HTML2Text(`list of items<ul><li>One</li><li>Two</li><li>Three</li></ul>`), ShouldEqual, "list of items\r\nOne\r\nTwo\r\nThree\r\n")
 		})
 
-		Convey("List with classes", func() {
+		Convey("Tags with attributes", func() {
 			So(HTML2Text(`list of items<ul><li class="menu-item">One</li><li class="menu-item">Two</li><li class="menu-item">Three</li></ul>`), ShouldEqual, "list of items\r\nOne\r\nTwo\r\nThree\r\n")
 			So(HTML2Text(`list of items<ol><li class="menu-item">One</li><li class="menu-item">Two</li><li class="menu-item">Three</li></ol>`), ShouldEqual, "list of items\r\nOne\r\nTwo\r\nThree\r\n")
+			So(HTML2Text(`<p class="content">content</p><div id="status">is ok</div>`), ShouldEqual, "content\r\n\r\nis ok")
 		})
 
 		Convey("Optional list support", func() {