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

Merge pull request #15 from moshee/master

Browse Source 
HTML5
This commit is contained in:
Russ Ross 2012-10-22 06:39:47 -07:00
commit 585af8ba49
2 changed files with 18 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
html.go
View File

@ -530,8 +530,7 @@ func (options *Html) DocumentHeader(out *bytes.Buffer) {
out.WriteString("<html xmlns=\"http://www.w3.org/1999/xhtml\">\n") out.WriteString("<html xmlns=\"http://www.w3.org/1999/xhtml\">\n")
ending = " /" ending = " /"
} else { } else {
out.WriteString("<!DOCTYPE html PUBLIC \"-//W3C//DTD HTML 4.01//EN\" ") out.WriteString("<!DOCTYPE html>\n")
out.WriteString("\"http://www.w3.org/TR/html4/strict.dtd\">\n")
out.WriteString("<html>\n") out.WriteString("<html>\n")
} }
out.WriteString("<head>\n") out.WriteString("<head>\n")
@ -543,7 +542,7 @@ func (options *Html) DocumentHeader(out *bytes.Buffer) {
out.WriteString("\"") out.WriteString("\"")
out.WriteString(ending) out.WriteString(ending)
out.WriteString(">\n") out.WriteString(">\n")
out.WriteString(" <meta http-equiv=\"Content-Type\" content=\"text/html; charset=utf-8\"") out.WriteString(" <meta charset=\"utf-8\"")
out.WriteString(ending) out.WriteString(ending)
out.WriteString(">\n") out.WriteString(">\n")
if options.css != "" { if options.css != "" {
@ -579,7 +578,9 @@ func (options *Html) DocumentFooter(out *bytes.Buffer) {
} }
// insert the table of contents // insert the table of contents
out.WriteString("<nav>\n")
out.Write(options.toc.Bytes()) out.Write(options.toc.Bytes())
out.WriteString("</nav>\n")
// corner case spacing issue // corner case spacing issue
if options.flags&HTML_COMPLETE_PAGE == 0 && options.flags&HTML_OMIT_CONTENTS == 0 { if options.flags&HTML_COMPLETE_PAGE == 0 && options.flags&HTML_OMIT_CONTENTS == 0 {

14
markdown.go
View File

@ -98,6 +98,20 @@ var blockTags = map[string]bool{
"fieldset": true, "fieldset": true,
"noscript": true, "noscript": true,
"blockquote": true, "blockquote": true,
// HTML5
"video": true,
"aside": true,
"canvas": true,
"figure": true,
"footer": true,
"header": true,
"hgroup": true,
"output": true,
"article": true,
"section": true,
"progress": true,
"figcaption": true,
} }
// Renderer is the rendering interface. // Renderer is the rendering interface.