From 8a86b6d6be0bee5eea90dbe686cdbd259112df0a Mon Sep 17 00:00:00 2001
From: moshee <moshee@displaynone.us>
Date: Sun, 21 Oct 2012 21:23:44 -0700
Subject: [PATCH 1/2] HTML5 doctype, Wrap TOC with <nav>

<nav> makes the TOC more easily identifiable and workable with CSS.
---
 html.go | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/html.go b/html.go
index d3233ee..c787e9b 100644
--- a/html.go
+++ b/html.go
@@ -530,8 +530,7 @@ func (options *Html) DocumentHeader(out *bytes.Buffer) {
 		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 @@ func (options *Html) DocumentHeader(out *bytes.Buffer) {
 	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 @@ func (options *Html) DocumentFooter(out *bytes.Buffer) {
 		}
 
 		// 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 {

From e69cdde766460888f4aa096d13e5b2812a8410c9 Mon Sep 17 00:00:00 2001
From: moshee <moshee@displaynone.us>
Date: Sun, 21 Oct 2012 21:28:31 -0700
Subject: [PATCH 2/2] Add some HTML5

---
 markdown.go | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/markdown.go b/markdown.go
index 7d42a52..bb2232f 100644
--- a/markdown.go
+++ b/markdown.go
@@ -98,6 +98,20 @@ var blockTags = map[string]bool{
 	"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.
