Merge pull request #15 from moshee/master HTML5
Russ Ross russ@russross.com
Mon, 22 Oct 2012 06:39:47 -0700
2 files changed,
18 insertions(+),
3 deletions(-)
M
html.go
→
html.go
@@ -530,8 +530,7 @@ out.WriteString("\"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd\">\n")
out.WriteString("<html xmlns=\"http://www.w3.org/1999/xhtml\">\n") ending = " /" } else { - out.WriteString("<!DOCTYPE html PUBLIC \"-//W3C//DTD HTML 4.01//EN\" ") - out.WriteString("\"http://www.w3.org/TR/html4/strict.dtd\">\n") + out.WriteString("<!DOCTYPE html>\n") out.WriteString("<html>\n") } out.WriteString("<head>\n")@@ -543,7 +542,7 @@ out.WriteString(VERSION)
out.WriteString("\"") out.WriteString(ending) 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(">\n") if options.css != "" {@@ -579,7 +578,9 @@ out.WriteByte('\n')
} // insert the table of contents + out.WriteString("<nav>\n") out.Write(options.toc.Bytes()) + out.WriteString("</nav>\n") // corner case spacing issue if options.flags&HTML_COMPLETE_PAGE == 0 && options.flags&HTML_OMIT_CONTENTS == 0 {
M
markdown.go
→
markdown.go
@@ -98,6 +98,20 @@ "script": true,
"fieldset": true, "noscript": 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.