StarMirror/blackfriday
1
0
Fork 0
mirror of https://github.com/russross/blackfriday.git synced 2024-03-22 13:40:34 +08:00
Code Issues Projects Releases Wiki Activity

Use io.WriteString instead of w.Write([]byte(str))

Browse Source
This commit is contained in:
Vytautas Šaltenis 2017-07-10 19:11:30 +03:00
parent 479920a987
commit 427717f991
1 changed files with 35 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

70
html.go
View File

@ -831,7 +831,7 @@ func (r *HTMLRenderer) RenderFooter(w io.Writer, ast *Node) {
if r.Flags&CompletePage == 0 { if r.Flags&CompletePage == 0 {
return return
} }
w.Write([]byte("\n</body>\n</html>\n")) io.WriteString(w, "\n</body>\n</html>\n")
} }
func (r *HTMLRenderer) writeDocumentHeader(w io.Writer) { func (r *HTMLRenderer) writeDocumentHeader(w io.Writer) {
@ -840,46 +840,46 @@ func (r *HTMLRenderer) writeDocumentHeader(w io.Writer) {
} }
ending := "" ending := ""
if r.Flags&UseXHTML != 0 { if r.Flags&UseXHTML != 0 {
w.Write([]byte("<!DOCTYPE html PUBLIC \"-//W3C//DTD XHTML 1.0 Transitional//EN\" ")) io.WriteString(w, "<!DOCTYPE html PUBLIC \"-//W3C//DTD XHTML 1.0 Transitional//EN\" ")
w.Write([]byte("\"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd\">\n")) io.WriteString(w, "\"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd\">\n")
w.Write([]byte("<html xmlns=\"http://www.w3.org/1999/xhtml\">\n")) io.WriteString(w, "<html xmlns=\"http://www.w3.org/1999/xhtml\">\n")
ending = " /" ending = " /"
} else { } else {
w.Write([]byte("<!DOCTYPE html>\n")) io.WriteString(w, "<!DOCTYPE html>\n")
w.Write([]byte("<html>\n")) io.WriteString(w, "<html>\n")
} }
w.Write([]byte("<head>\n")) io.WriteString(w, "<head>\n")
w.Write([]byte(" <title>")) io.WriteString(w, " <title>")
if r.Flags&Smartypants != 0 { if r.Flags&Smartypants != 0 {
r.sr.Process(w, []byte(r.Title)) r.sr.Process(w, []byte(r.Title))
} else { } else {
escapeHTML(w, []byte(r.Title)) escapeHTML(w, []byte(r.Title))
} }
w.Write([]byte("</title>\n")) io.WriteString(w, "</title>\n")
w.Write([]byte(" <meta name=\"GENERATOR\" content=\"Blackfriday Markdown Processor v")) io.WriteString(w, " <meta name=\"GENERATOR\" content=\"Blackfriday Markdown Processor v")
w.Write([]byte(Version)) io.WriteString(w, Version)
w.Write([]byte("\"")) io.WriteString(w, "\"")
w.Write([]byte(ending)) io.WriteString(w, ending)
w.Write([]byte(">\n")) io.WriteString(w, ">\n")
w.Write([]byte(" <meta charset=\"utf-8\"")) io.WriteString(w, " <meta charset=\"utf-8\"")
w.Write([]byte(ending)) io.WriteString(w, ending)
w.Write([]byte(">\n")) io.WriteString(w, ">\n")
if r.CSS != "" { if r.CSS != "" {
w.Write([]byte(" <link rel=\"stylesheet\" type=\"text/css\" href=\"")) io.WriteString(w, " <link rel=\"stylesheet\" type=\"text/css\" href=\"")
escapeHTML(w, []byte(r.CSS)) escapeHTML(w, []byte(r.CSS))
w.Write([]byte("\"")) io.WriteString(w, "\"")
w.Write([]byte(ending)) io.WriteString(w, ending)
w.Write([]byte(">\n")) io.WriteString(w, ">\n")
} }
if r.Icon != "" { if r.Icon != "" {
w.Write([]byte(" <link rel=\"icon\" type=\"image/x-icon\" href=\"")) io.WriteString(w, " <link rel=\"icon\" type=\"image/x-icon\" href=\"")
escapeHTML(w, []byte(r.Icon)) escapeHTML(w, []byte(r.Icon))
w.Write([]byte("\"")) io.WriteString(w, "\"")
w.Write([]byte(ending)) io.WriteString(w, ending)
w.Write([]byte(">\n")) io.WriteString(w, ">\n")
} }
w.Write([]byte("</head>\n")) io.WriteString(w, "</head>\n")
w.Write([]byte("<body>\n\n")) io.WriteString(w, "<body>\n\n")
} }
func (r *HTMLRenderer) writeTOC(w io.Writer, ast *Node) { func (r *HTMLRenderer) writeTOC(w io.Writer, ast *Node) {
@ -895,24 +895,24 @@ func (r *HTMLRenderer) writeTOC(w io.Writer, ast *Node) {
if entering { if entering {
node.HeadingID = fmt.Sprintf("toc_%d", headingCount) node.HeadingID = fmt.Sprintf("toc_%d", headingCount)
if node.Level == tocLevel { if node.Level == tocLevel {
buf.Write([]byte("</li>\n\n<li>")) buf.WriteString("</li>\n\n<li>")
} else if node.Level < tocLevel { } else if node.Level < tocLevel {
for node.Level < tocLevel { for node.Level < tocLevel {
tocLevel-- tocLevel--
buf.Write([]byte("</li>\n</ul>")) buf.WriteString("</li>\n</ul>")
} }
buf.Write([]byte("</li>\n\n<li>")) buf.WriteString("</li>\n\n<li>")
} else { } else {
for node.Level > tocLevel { for node.Level > tocLevel {
tocLevel++ tocLevel++
buf.Write([]byte("\n<ul>\n<li>")) buf.WriteString("\n<ul>\n<li>")
} }
} }
fmt.Fprintf(&buf, `<a href="#toc_%d">`, headingCount) fmt.Fprintf(&buf, `<a href="#toc_%d">`, headingCount)
headingCount++ headingCount++
} else { } else {
buf.Write([]byte("</a>")) buf.WriteString("</a>")
} }
return GoToNext return GoToNext
} }
@ -925,13 +925,13 @@ func (r *HTMLRenderer) writeTOC(w io.Writer, ast *Node) {
}) })
for ; tocLevel > 0; tocLevel-- { for ; tocLevel > 0; tocLevel-- {
buf.Write([]byte("</li>\n</ul>")) buf.WriteString("</li>\n</ul>")
} }
if buf.Len() > 0 { if buf.Len() > 0 {
w.Write([]byte("<nav>\n")) io.WriteString(w, "<nav>\n")
w.Write(buf.Bytes()) w.Write(buf.Bytes())
w.Write([]byte("\n\n</nav>\n")) io.WriteString(w, "\n\n</nav>\n")
} }
r.lastOutputLen = buf.Len() r.lastOutputLen = buf.Len()
} }