From 6948cdde4fa3e61548c9d089db2a859557df37b4 Mon Sep 17 00:00:00 2001
From: Brandon Dyck <brandon@dyck.us>
Date: Thu, 28 Mar 2019 21:00:53 -0600
Subject: [PATCH] Added WHATWG HTML5 element defs

---
 html5/defs.json     |  107 +++-
 html5/generated.go  | 1300 +++++++++++++++++++++++++++++++++++++++++++
 html5/html5.go      |    4 +-
 html5/html5_test.go |    2 +-
 4 files changed, 1409 insertions(+), 4 deletions(-)

diff --git a/html5/defs.json b/html5/defs.json
index 71c624f..5360de6 100644
--- a/html5/defs.json
+++ b/html5/defs.json
@@ -5,14 +5,119 @@
     {"name": "src", "type": "string"}
   ],
   "elements": [
+    {"name": "a"},
+    {"name": "abbr"},
+    {"name": "address"},
+    {"name": "area", "void": true},
+    {"name": "article"},
+    {"name": "aside"},
+    {"name": "audio"},
+    {"name": "b"},
+    {"name": "base", "void": true},
+    {"name": "bdi"},
+    {"name": "bdo"},
+    {"name": "blockquote"},
     {"name": "body"},
+    {"name": "br", "void": true},
+    {"name": "button"},
+    {"name": "canvas"},
+    {"name": "caption"},
+    {"name": "cite"},
+    {"name": "code"},
+    {"name": "col", "void": true},
+    {"name": "colgroup"},
+    {"name": "data"},
+    {"name": "datalist"},
+    {"name": "dd"},
+    {"name": "del"},
+    {"name": "details"},
+    {"name": "dfn"},
+    {"name": "dialog"},
     {"name": "div"},
+    {"name": "dl"},
+    {"name": "dt"},
+    {"name": "em"},
+    {"name": "embed", "void": true},
+    {"name": "fieldset"},
+    {"name": "figcaption"},
+    {"name": "figure"},
+    {"name": "footer"},
+    {"name": "form"},
+    {"name": "h1"},
+    {"name": "h2"},
+    {"name": "h3"},
+    {"name": "h4"},
+    {"name": "h5"},
+    {"name": "h6"},
     {"name": "head"},
+    {"name": "header"},
+    {"name": "hgroup"},
+    {"name": "hr", "void": true},
     {"name": "html"},
+    {"name": "i"},
+    {"name": "iframe"},
     {"name": "img", "void": true},
+    {"name": "input", "void": true},
+    {"name": "ins"},
+    {"name": "kbd"},
+    {"name": "label"},
+    {"name": "legend"},
     {"name": "li"},
+    {"name": "link", "void": true},
+    {"name": "main"},
+    {"name": "map"},
+    {"name": "mark"},
+    {"name": "math"},
+    {"name": "menu"},
+    {"name": "meta", "void": true},
+    {"name": "meter"},
+    {"name": "nav"},
+    {"name": "noscript"},
+    {"name": "object"},
+    {"name": "ol"},
+    {"name": "optgroup"},
+    {"name": "option"},
+    {"name": "output"},
+    {"name": "p"},
+    {"name": "param", "void": true},
+    {"name": "picture"},
+    {"name": "pre"},
+    {"name": "progress"},
+    {"name": "q"},
+    {"name": "rp"},
+    {"name": "rt"},
+    {"name": "ruby"},
+    {"name": "s"},
+    {"name": "samp"},
+    {"name": "script"},
+    {"name": "section"},
+    {"name": "select"},
+    {"name": "slot"},
+    {"name": "small"},
+    {"name": "source", "void": true},
     {"name": "span"},
+    {"name": "strong"},
+    {"name": "style"},
+    {"name": "sub"},
+    {"name": "summary"},
+    {"name": "sup"},
+    {"name": "svg"},
+    {"name": "table"},
+    {"name": "tbody"},
+    {"name": "td"},
+    {"name": "template"},
+    {"name": "textarea"},
+    {"name": "tfoot"},
+    {"name": "th"},
+    {"name": "thead"},
+    {"name": "time"},
     {"name": "title"},
-    {"name": "ul"}
+    {"name": "tr"},
+    {"name": "track", "void": true},
+    {"name": "u"},
+    {"name": "ul"},
+    {"name": "var"},
+    {"name": "video"},
+    {"name": "wbr", "void": true}
   ]
 }
diff --git a/html5/generated.go b/html5/generated.go
index b933091..affa45e 100644
--- a/html5/generated.go
+++ b/html5/generated.go
@@ -5,6 +5,152 @@ package html5
 
 import "gitlab.codemonkeysoftware.net/b/hatmill"
 
+// A creates a <a> element.
+func A(attribs ...hatmill.Attrib) func(children ...hatmill.Term) hatmill.ParentElement {
+	return func(children ...hatmill.Term) hatmill.ParentElement {
+		return hatmill.ParentElement{
+			VoidElement: hatmill.VoidElement{
+				TagName: "a",
+				Attribs: attribs,
+			},
+			Children: children,
+		}
+	}
+}
+
+// Abbr creates a <abbr> element.
+func Abbr(attribs ...hatmill.Attrib) func(children ...hatmill.Term) hatmill.ParentElement {
+	return func(children ...hatmill.Term) hatmill.ParentElement {
+		return hatmill.ParentElement{
+			VoidElement: hatmill.VoidElement{
+				TagName: "abbr",
+				Attribs: attribs,
+			},
+			Children: children,
+		}
+	}
+}
+
+// Address creates a <address> element.
+func Address(attribs ...hatmill.Attrib) func(children ...hatmill.Term) hatmill.ParentElement {
+	return func(children ...hatmill.Term) hatmill.ParentElement {
+		return hatmill.ParentElement{
+			VoidElement: hatmill.VoidElement{
+				TagName: "address",
+				Attribs: attribs,
+			},
+			Children: children,
+		}
+	}
+}
+
+// Area creates a <area> element.
+func Area(attribs ...hatmill.Attrib) hatmill.VoidElement {
+	return hatmill.VoidElement{
+		TagName: "area",
+		Attribs: attribs,
+	}
+}
+
+// Article creates a <article> element.
+func Article(attribs ...hatmill.Attrib) func(children ...hatmill.Term) hatmill.ParentElement {
+	return func(children ...hatmill.Term) hatmill.ParentElement {
+		return hatmill.ParentElement{
+			VoidElement: hatmill.VoidElement{
+				TagName: "article",
+				Attribs: attribs,
+			},
+			Children: children,
+		}
+	}
+}
+
+// Aside creates a <aside> element.
+func Aside(attribs ...hatmill.Attrib) func(children ...hatmill.Term) hatmill.ParentElement {
+	return func(children ...hatmill.Term) hatmill.ParentElement {
+		return hatmill.ParentElement{
+			VoidElement: hatmill.VoidElement{
+				TagName: "aside",
+				Attribs: attribs,
+			},
+			Children: children,
+		}
+	}
+}
+
+// Audio creates a <audio> element.
+func Audio(attribs ...hatmill.Attrib) func(children ...hatmill.Term) hatmill.ParentElement {
+	return func(children ...hatmill.Term) hatmill.ParentElement {
+		return hatmill.ParentElement{
+			VoidElement: hatmill.VoidElement{
+				TagName: "audio",
+				Attribs: attribs,
+			},
+			Children: children,
+		}
+	}
+}
+
+// B creates a <b> element.
+func B(attribs ...hatmill.Attrib) func(children ...hatmill.Term) hatmill.ParentElement {
+	return func(children ...hatmill.Term) hatmill.ParentElement {
+		return hatmill.ParentElement{
+			VoidElement: hatmill.VoidElement{
+				TagName: "b",
+				Attribs: attribs,
+			},
+			Children: children,
+		}
+	}
+}
+
+// Base creates a <base> element.
+func Base(attribs ...hatmill.Attrib) hatmill.VoidElement {
+	return hatmill.VoidElement{
+		TagName: "base",
+		Attribs: attribs,
+	}
+}
+
+// Bdi creates a <bdi> element.
+func Bdi(attribs ...hatmill.Attrib) func(children ...hatmill.Term) hatmill.ParentElement {
+	return func(children ...hatmill.Term) hatmill.ParentElement {
+		return hatmill.ParentElement{
+			VoidElement: hatmill.VoidElement{
+				TagName: "bdi",
+				Attribs: attribs,
+			},
+			Children: children,
+		}
+	}
+}
+
+// Bdo creates a <bdo> element.
+func Bdo(attribs ...hatmill.Attrib) func(children ...hatmill.Term) hatmill.ParentElement {
+	return func(children ...hatmill.Term) hatmill.ParentElement {
+		return hatmill.ParentElement{
+			VoidElement: hatmill.VoidElement{
+				TagName: "bdo",
+				Attribs: attribs,
+			},
+			Children: children,
+		}
+	}
+}
+
+// Blockquote creates a <blockquote> element.
+func Blockquote(attribs ...hatmill.Attrib) func(children ...hatmill.Term) hatmill.ParentElement {
+	return func(children ...hatmill.Term) hatmill.ParentElement {
+		return hatmill.ParentElement{
+			VoidElement: hatmill.VoidElement{
+				TagName: "blockquote",
+				Attribs: attribs,
+			},
+			Children: children,
+		}
+	}
+}
+
 // Body creates a <body> element.
 func Body(attribs ...hatmill.Attrib) func(children ...hatmill.Term) hatmill.ParentElement {
 	return func(children ...hatmill.Term) hatmill.ParentElement {
@@ -18,6 +164,191 @@ func Body(attribs ...hatmill.Attrib) func(children ...hatmill.Term) hatmill.Pare
 	}
 }
 
+// Br creates a <br> element.
+func Br(attribs ...hatmill.Attrib) hatmill.VoidElement {
+	return hatmill.VoidElement{
+		TagName: "br",
+		Attribs: attribs,
+	}
+}
+
+// Button creates a <button> element.
+func Button(attribs ...hatmill.Attrib) func(children ...hatmill.Term) hatmill.ParentElement {
+	return func(children ...hatmill.Term) hatmill.ParentElement {
+		return hatmill.ParentElement{
+			VoidElement: hatmill.VoidElement{
+				TagName: "button",
+				Attribs: attribs,
+			},
+			Children: children,
+		}
+	}
+}
+
+// Canvas creates a <canvas> element.
+func Canvas(attribs ...hatmill.Attrib) func(children ...hatmill.Term) hatmill.ParentElement {
+	return func(children ...hatmill.Term) hatmill.ParentElement {
+		return hatmill.ParentElement{
+			VoidElement: hatmill.VoidElement{
+				TagName: "canvas",
+				Attribs: attribs,
+			},
+			Children: children,
+		}
+	}
+}
+
+// Caption creates a <caption> element.
+func Caption(attribs ...hatmill.Attrib) func(children ...hatmill.Term) hatmill.ParentElement {
+	return func(children ...hatmill.Term) hatmill.ParentElement {
+		return hatmill.ParentElement{
+			VoidElement: hatmill.VoidElement{
+				TagName: "caption",
+				Attribs: attribs,
+			},
+			Children: children,
+		}
+	}
+}
+
+// Cite creates a <cite> element.
+func Cite(attribs ...hatmill.Attrib) func(children ...hatmill.Term) hatmill.ParentElement {
+	return func(children ...hatmill.Term) hatmill.ParentElement {
+		return hatmill.ParentElement{
+			VoidElement: hatmill.VoidElement{
+				TagName: "cite",
+				Attribs: attribs,
+			},
+			Children: children,
+		}
+	}
+}
+
+// Code creates a <code> element.
+func Code(attribs ...hatmill.Attrib) func(children ...hatmill.Term) hatmill.ParentElement {
+	return func(children ...hatmill.Term) hatmill.ParentElement {
+		return hatmill.ParentElement{
+			VoidElement: hatmill.VoidElement{
+				TagName: "code",
+				Attribs: attribs,
+			},
+			Children: children,
+		}
+	}
+}
+
+// Col creates a <col> element.
+func Col(attribs ...hatmill.Attrib) hatmill.VoidElement {
+	return hatmill.VoidElement{
+		TagName: "col",
+		Attribs: attribs,
+	}
+}
+
+// Colgroup creates a <colgroup> element.
+func Colgroup(attribs ...hatmill.Attrib) func(children ...hatmill.Term) hatmill.ParentElement {
+	return func(children ...hatmill.Term) hatmill.ParentElement {
+		return hatmill.ParentElement{
+			VoidElement: hatmill.VoidElement{
+				TagName: "colgroup",
+				Attribs: attribs,
+			},
+			Children: children,
+		}
+	}
+}
+
+// Data creates a <data> element.
+func Data(attribs ...hatmill.Attrib) func(children ...hatmill.Term) hatmill.ParentElement {
+	return func(children ...hatmill.Term) hatmill.ParentElement {
+		return hatmill.ParentElement{
+			VoidElement: hatmill.VoidElement{
+				TagName: "data",
+				Attribs: attribs,
+			},
+			Children: children,
+		}
+	}
+}
+
+// Datalist creates a <datalist> element.
+func Datalist(attribs ...hatmill.Attrib) func(children ...hatmill.Term) hatmill.ParentElement {
+	return func(children ...hatmill.Term) hatmill.ParentElement {
+		return hatmill.ParentElement{
+			VoidElement: hatmill.VoidElement{
+				TagName: "datalist",
+				Attribs: attribs,
+			},
+			Children: children,
+		}
+	}
+}
+
+// Dd creates a <dd> element.
+func Dd(attribs ...hatmill.Attrib) func(children ...hatmill.Term) hatmill.ParentElement {
+	return func(children ...hatmill.Term) hatmill.ParentElement {
+		return hatmill.ParentElement{
+			VoidElement: hatmill.VoidElement{
+				TagName: "dd",
+				Attribs: attribs,
+			},
+			Children: children,
+		}
+	}
+}
+
+// Del creates a <del> element.
+func Del(attribs ...hatmill.Attrib) func(children ...hatmill.Term) hatmill.ParentElement {
+	return func(children ...hatmill.Term) hatmill.ParentElement {
+		return hatmill.ParentElement{
+			VoidElement: hatmill.VoidElement{
+				TagName: "del",
+				Attribs: attribs,
+			},
+			Children: children,
+		}
+	}
+}
+
+// Details creates a <details> element.
+func Details(attribs ...hatmill.Attrib) func(children ...hatmill.Term) hatmill.ParentElement {
+	return func(children ...hatmill.Term) hatmill.ParentElement {
+		return hatmill.ParentElement{
+			VoidElement: hatmill.VoidElement{
+				TagName: "details",
+				Attribs: attribs,
+			},
+			Children: children,
+		}
+	}
+}
+
+// Dfn creates a <dfn> element.
+func Dfn(attribs ...hatmill.Attrib) func(children ...hatmill.Term) hatmill.ParentElement {
+	return func(children ...hatmill.Term) hatmill.ParentElement {
+		return hatmill.ParentElement{
+			VoidElement: hatmill.VoidElement{
+				TagName: "dfn",
+				Attribs: attribs,
+			},
+			Children: children,
+		}
+	}
+}
+
+// Dialog creates a <dialog> element.
+func Dialog(attribs ...hatmill.Attrib) func(children ...hatmill.Term) hatmill.ParentElement {
+	return func(children ...hatmill.Term) hatmill.ParentElement {
+		return hatmill.ParentElement{
+			VoidElement: hatmill.VoidElement{
+				TagName: "dialog",
+				Attribs: attribs,
+			},
+			Children: children,
+		}
+	}
+}
+
 // Div creates a <div> element.
 func Div(attribs ...hatmill.Attrib) func(children ...hatmill.Term) hatmill.ParentElement {
 	return func(children ...hatmill.Term) hatmill.ParentElement {
@@ -31,6 +362,196 @@ func Div(attribs ...hatmill.Attrib) func(children ...hatmill.Term) hatmill.Paren
 	}
 }
 
+// Dl creates a <dl> element.
+func Dl(attribs ...hatmill.Attrib) func(children ...hatmill.Term) hatmill.ParentElement {
+	return func(children ...hatmill.Term) hatmill.ParentElement {
+		return hatmill.ParentElement{
+			VoidElement: hatmill.VoidElement{
+				TagName: "dl",
+				Attribs: attribs,
+			},
+			Children: children,
+		}
+	}
+}
+
+// Dt creates a <dt> element.
+func Dt(attribs ...hatmill.Attrib) func(children ...hatmill.Term) hatmill.ParentElement {
+	return func(children ...hatmill.Term) hatmill.ParentElement {
+		return hatmill.ParentElement{
+			VoidElement: hatmill.VoidElement{
+				TagName: "dt",
+				Attribs: attribs,
+			},
+			Children: children,
+		}
+	}
+}
+
+// Em creates a <em> element.
+func Em(attribs ...hatmill.Attrib) func(children ...hatmill.Term) hatmill.ParentElement {
+	return func(children ...hatmill.Term) hatmill.ParentElement {
+		return hatmill.ParentElement{
+			VoidElement: hatmill.VoidElement{
+				TagName: "em",
+				Attribs: attribs,
+			},
+			Children: children,
+		}
+	}
+}
+
+// Embed creates a <embed> element.
+func Embed(attribs ...hatmill.Attrib) hatmill.VoidElement {
+	return hatmill.VoidElement{
+		TagName: "embed",
+		Attribs: attribs,
+	}
+}
+
+// Fieldset creates a <fieldset> element.
+func Fieldset(attribs ...hatmill.Attrib) func(children ...hatmill.Term) hatmill.ParentElement {
+	return func(children ...hatmill.Term) hatmill.ParentElement {
+		return hatmill.ParentElement{
+			VoidElement: hatmill.VoidElement{
+				TagName: "fieldset",
+				Attribs: attribs,
+			},
+			Children: children,
+		}
+	}
+}
+
+// Figcaption creates a <figcaption> element.
+func Figcaption(attribs ...hatmill.Attrib) func(children ...hatmill.Term) hatmill.ParentElement {
+	return func(children ...hatmill.Term) hatmill.ParentElement {
+		return hatmill.ParentElement{
+			VoidElement: hatmill.VoidElement{
+				TagName: "figcaption",
+				Attribs: attribs,
+			},
+			Children: children,
+		}
+	}
+}
+
+// Figure creates a <figure> element.
+func Figure(attribs ...hatmill.Attrib) func(children ...hatmill.Term) hatmill.ParentElement {
+	return func(children ...hatmill.Term) hatmill.ParentElement {
+		return hatmill.ParentElement{
+			VoidElement: hatmill.VoidElement{
+				TagName: "figure",
+				Attribs: attribs,
+			},
+			Children: children,
+		}
+	}
+}
+
+// Footer creates a <footer> element.
+func Footer(attribs ...hatmill.Attrib) func(children ...hatmill.Term) hatmill.ParentElement {
+	return func(children ...hatmill.Term) hatmill.ParentElement {
+		return hatmill.ParentElement{
+			VoidElement: hatmill.VoidElement{
+				TagName: "footer",
+				Attribs: attribs,
+			},
+			Children: children,
+		}
+	}
+}
+
+// Form creates a <form> element.
+func Form(attribs ...hatmill.Attrib) func(children ...hatmill.Term) hatmill.ParentElement {
+	return func(children ...hatmill.Term) hatmill.ParentElement {
+		return hatmill.ParentElement{
+			VoidElement: hatmill.VoidElement{
+				TagName: "form",
+				Attribs: attribs,
+			},
+			Children: children,
+		}
+	}
+}
+
+// H1 creates a <h1> element.
+func H1(attribs ...hatmill.Attrib) func(children ...hatmill.Term) hatmill.ParentElement {
+	return func(children ...hatmill.Term) hatmill.ParentElement {
+		return hatmill.ParentElement{
+			VoidElement: hatmill.VoidElement{
+				TagName: "h1",
+				Attribs: attribs,
+			},
+			Children: children,
+		}
+	}
+}
+
+// H2 creates a <h2> element.
+func H2(attribs ...hatmill.Attrib) func(children ...hatmill.Term) hatmill.ParentElement {
+	return func(children ...hatmill.Term) hatmill.ParentElement {
+		return hatmill.ParentElement{
+			VoidElement: hatmill.VoidElement{
+				TagName: "h2",
+				Attribs: attribs,
+			},
+			Children: children,
+		}
+	}
+}
+
+// H3 creates a <h3> element.
+func H3(attribs ...hatmill.Attrib) func(children ...hatmill.Term) hatmill.ParentElement {
+	return func(children ...hatmill.Term) hatmill.ParentElement {
+		return hatmill.ParentElement{
+			VoidElement: hatmill.VoidElement{
+				TagName: "h3",
+				Attribs: attribs,
+			},
+			Children: children,
+		}
+	}
+}
+
+// H4 creates a <h4> element.
+func H4(attribs ...hatmill.Attrib) func(children ...hatmill.Term) hatmill.ParentElement {
+	return func(children ...hatmill.Term) hatmill.ParentElement {
+		return hatmill.ParentElement{
+			VoidElement: hatmill.VoidElement{
+				TagName: "h4",
+				Attribs: attribs,
+			},
+			Children: children,
+		}
+	}
+}
+
+// H5 creates a <h5> element.
+func H5(attribs ...hatmill.Attrib) func(children ...hatmill.Term) hatmill.ParentElement {
+	return func(children ...hatmill.Term) hatmill.ParentElement {
+		return hatmill.ParentElement{
+			VoidElement: hatmill.VoidElement{
+				TagName: "h5",
+				Attribs: attribs,
+			},
+			Children: children,
+		}
+	}
+}
+
+// H6 creates a <h6> element.
+func H6(attribs ...hatmill.Attrib) func(children ...hatmill.Term) hatmill.ParentElement {
+	return func(children ...hatmill.Term) hatmill.ParentElement {
+		return hatmill.ParentElement{
+			VoidElement: hatmill.VoidElement{
+				TagName: "h6",
+				Attribs: attribs,
+			},
+			Children: children,
+		}
+	}
+}
+
 // Head creates a <head> element.
 func Head(attribs ...hatmill.Attrib) func(children ...hatmill.Term) hatmill.ParentElement {
 	return func(children ...hatmill.Term) hatmill.ParentElement {
@@ -44,6 +565,40 @@ func Head(attribs ...hatmill.Attrib) func(children ...hatmill.Term) hatmill.Pare
 	}
 }
 
+// Header creates a <header> element.
+func Header(attribs ...hatmill.Attrib) func(children ...hatmill.Term) hatmill.ParentElement {
+	return func(children ...hatmill.Term) hatmill.ParentElement {
+		return hatmill.ParentElement{
+			VoidElement: hatmill.VoidElement{
+				TagName: "header",
+				Attribs: attribs,
+			},
+			Children: children,
+		}
+	}
+}
+
+// Hgroup creates a <hgroup> element.
+func Hgroup(attribs ...hatmill.Attrib) func(children ...hatmill.Term) hatmill.ParentElement {
+	return func(children ...hatmill.Term) hatmill.ParentElement {
+		return hatmill.ParentElement{
+			VoidElement: hatmill.VoidElement{
+				TagName: "hgroup",
+				Attribs: attribs,
+			},
+			Children: children,
+		}
+	}
+}
+
+// Hr creates a <hr> element.
+func Hr(attribs ...hatmill.Attrib) hatmill.VoidElement {
+	return hatmill.VoidElement{
+		TagName: "hr",
+		Attribs: attribs,
+	}
+}
+
 // Html creates a <html> element.
 func Html(attribs ...hatmill.Attrib) func(children ...hatmill.Term) hatmill.ParentElement {
 	return func(children ...hatmill.Term) hatmill.ParentElement {
@@ -57,6 +612,32 @@ func Html(attribs ...hatmill.Attrib) func(children ...hatmill.Term) hatmill.Pare
 	}
 }
 
+// I creates a <i> element.
+func I(attribs ...hatmill.Attrib) func(children ...hatmill.Term) hatmill.ParentElement {
+	return func(children ...hatmill.Term) hatmill.ParentElement {
+		return hatmill.ParentElement{
+			VoidElement: hatmill.VoidElement{
+				TagName: "i",
+				Attribs: attribs,
+			},
+			Children: children,
+		}
+	}
+}
+
+// Iframe creates a <iframe> element.
+func Iframe(attribs ...hatmill.Attrib) func(children ...hatmill.Term) hatmill.ParentElement {
+	return func(children ...hatmill.Term) hatmill.ParentElement {
+		return hatmill.ParentElement{
+			VoidElement: hatmill.VoidElement{
+				TagName: "iframe",
+				Attribs: attribs,
+			},
+			Children: children,
+		}
+	}
+}
+
 // Img creates a <img> element.
 func Img(attribs ...hatmill.Attrib) hatmill.VoidElement {
 	return hatmill.VoidElement{
@@ -65,6 +646,66 @@ func Img(attribs ...hatmill.Attrib) hatmill.VoidElement {
 	}
 }
 
+// Input creates a <input> element.
+func Input(attribs ...hatmill.Attrib) hatmill.VoidElement {
+	return hatmill.VoidElement{
+		TagName: "input",
+		Attribs: attribs,
+	}
+}
+
+// Ins creates a <ins> element.
+func Ins(attribs ...hatmill.Attrib) func(children ...hatmill.Term) hatmill.ParentElement {
+	return func(children ...hatmill.Term) hatmill.ParentElement {
+		return hatmill.ParentElement{
+			VoidElement: hatmill.VoidElement{
+				TagName: "ins",
+				Attribs: attribs,
+			},
+			Children: children,
+		}
+	}
+}
+
+// Kbd creates a <kbd> element.
+func Kbd(attribs ...hatmill.Attrib) func(children ...hatmill.Term) hatmill.ParentElement {
+	return func(children ...hatmill.Term) hatmill.ParentElement {
+		return hatmill.ParentElement{
+			VoidElement: hatmill.VoidElement{
+				TagName: "kbd",
+				Attribs: attribs,
+			},
+			Children: children,
+		}
+	}
+}
+
+// Label creates a <label> element.
+func Label(attribs ...hatmill.Attrib) func(children ...hatmill.Term) hatmill.ParentElement {
+	return func(children ...hatmill.Term) hatmill.ParentElement {
+		return hatmill.ParentElement{
+			VoidElement: hatmill.VoidElement{
+				TagName: "label",
+				Attribs: attribs,
+			},
+			Children: children,
+		}
+	}
+}
+
+// Legend creates a <legend> element.
+func Legend(attribs ...hatmill.Attrib) func(children ...hatmill.Term) hatmill.ParentElement {
+	return func(children ...hatmill.Term) hatmill.ParentElement {
+		return hatmill.ParentElement{
+			VoidElement: hatmill.VoidElement{
+				TagName: "legend",
+				Attribs: attribs,
+			},
+			Children: children,
+		}
+	}
+}
+
 // Li creates a <li> element.
 func Li(attribs ...hatmill.Attrib) func(children ...hatmill.Term) hatmill.ParentElement {
 	return func(children ...hatmill.Term) hatmill.ParentElement {
@@ -78,6 +719,402 @@ func Li(attribs ...hatmill.Attrib) func(children ...hatmill.Term) hatmill.Parent
 	}
 }
 
+// Link creates a <link> element.
+func Link(attribs ...hatmill.Attrib) hatmill.VoidElement {
+	return hatmill.VoidElement{
+		TagName: "link",
+		Attribs: attribs,
+	}
+}
+
+// Main creates a <main> element.
+func Main(attribs ...hatmill.Attrib) func(children ...hatmill.Term) hatmill.ParentElement {
+	return func(children ...hatmill.Term) hatmill.ParentElement {
+		return hatmill.ParentElement{
+			VoidElement: hatmill.VoidElement{
+				TagName: "main",
+				Attribs: attribs,
+			},
+			Children: children,
+		}
+	}
+}
+
+// Map creates a <map> element.
+func Map(attribs ...hatmill.Attrib) func(children ...hatmill.Term) hatmill.ParentElement {
+	return func(children ...hatmill.Term) hatmill.ParentElement {
+		return hatmill.ParentElement{
+			VoidElement: hatmill.VoidElement{
+				TagName: "map",
+				Attribs: attribs,
+			},
+			Children: children,
+		}
+	}
+}
+
+// Mark creates a <mark> element.
+func Mark(attribs ...hatmill.Attrib) func(children ...hatmill.Term) hatmill.ParentElement {
+	return func(children ...hatmill.Term) hatmill.ParentElement {
+		return hatmill.ParentElement{
+			VoidElement: hatmill.VoidElement{
+				TagName: "mark",
+				Attribs: attribs,
+			},
+			Children: children,
+		}
+	}
+}
+
+// Math creates a <math> element.
+func Math(attribs ...hatmill.Attrib) func(children ...hatmill.Term) hatmill.ParentElement {
+	return func(children ...hatmill.Term) hatmill.ParentElement {
+		return hatmill.ParentElement{
+			VoidElement: hatmill.VoidElement{
+				TagName: "math",
+				Attribs: attribs,
+			},
+			Children: children,
+		}
+	}
+}
+
+// Menu creates a <menu> element.
+func Menu(attribs ...hatmill.Attrib) func(children ...hatmill.Term) hatmill.ParentElement {
+	return func(children ...hatmill.Term) hatmill.ParentElement {
+		return hatmill.ParentElement{
+			VoidElement: hatmill.VoidElement{
+				TagName: "menu",
+				Attribs: attribs,
+			},
+			Children: children,
+		}
+	}
+}
+
+// Meta creates a <meta> element.
+func Meta(attribs ...hatmill.Attrib) hatmill.VoidElement {
+	return hatmill.VoidElement{
+		TagName: "meta",
+		Attribs: attribs,
+	}
+}
+
+// Meter creates a <meter> element.
+func Meter(attribs ...hatmill.Attrib) func(children ...hatmill.Term) hatmill.ParentElement {
+	return func(children ...hatmill.Term) hatmill.ParentElement {
+		return hatmill.ParentElement{
+			VoidElement: hatmill.VoidElement{
+				TagName: "meter",
+				Attribs: attribs,
+			},
+			Children: children,
+		}
+	}
+}
+
+// Nav creates a <nav> element.
+func Nav(attribs ...hatmill.Attrib) func(children ...hatmill.Term) hatmill.ParentElement {
+	return func(children ...hatmill.Term) hatmill.ParentElement {
+		return hatmill.ParentElement{
+			VoidElement: hatmill.VoidElement{
+				TagName: "nav",
+				Attribs: attribs,
+			},
+			Children: children,
+		}
+	}
+}
+
+// Noscript creates a <noscript> element.
+func Noscript(attribs ...hatmill.Attrib) func(children ...hatmill.Term) hatmill.ParentElement {
+	return func(children ...hatmill.Term) hatmill.ParentElement {
+		return hatmill.ParentElement{
+			VoidElement: hatmill.VoidElement{
+				TagName: "noscript",
+				Attribs: attribs,
+			},
+			Children: children,
+		}
+	}
+}
+
+// Object creates a <object> element.
+func Object(attribs ...hatmill.Attrib) func(children ...hatmill.Term) hatmill.ParentElement {
+	return func(children ...hatmill.Term) hatmill.ParentElement {
+		return hatmill.ParentElement{
+			VoidElement: hatmill.VoidElement{
+				TagName: "object",
+				Attribs: attribs,
+			},
+			Children: children,
+		}
+	}
+}
+
+// Ol creates a <ol> element.
+func Ol(attribs ...hatmill.Attrib) func(children ...hatmill.Term) hatmill.ParentElement {
+	return func(children ...hatmill.Term) hatmill.ParentElement {
+		return hatmill.ParentElement{
+			VoidElement: hatmill.VoidElement{
+				TagName: "ol",
+				Attribs: attribs,
+			},
+			Children: children,
+		}
+	}
+}
+
+// Optgroup creates a <optgroup> element.
+func Optgroup(attribs ...hatmill.Attrib) func(children ...hatmill.Term) hatmill.ParentElement {
+	return func(children ...hatmill.Term) hatmill.ParentElement {
+		return hatmill.ParentElement{
+			VoidElement: hatmill.VoidElement{
+				TagName: "optgroup",
+				Attribs: attribs,
+			},
+			Children: children,
+		}
+	}
+}
+
+// Option creates a <option> element.
+func Option(attribs ...hatmill.Attrib) func(children ...hatmill.Term) hatmill.ParentElement {
+	return func(children ...hatmill.Term) hatmill.ParentElement {
+		return hatmill.ParentElement{
+			VoidElement: hatmill.VoidElement{
+				TagName: "option",
+				Attribs: attribs,
+			},
+			Children: children,
+		}
+	}
+}
+
+// Output creates a <output> element.
+func Output(attribs ...hatmill.Attrib) func(children ...hatmill.Term) hatmill.ParentElement {
+	return func(children ...hatmill.Term) hatmill.ParentElement {
+		return hatmill.ParentElement{
+			VoidElement: hatmill.VoidElement{
+				TagName: "output",
+				Attribs: attribs,
+			},
+			Children: children,
+		}
+	}
+}
+
+// P creates a <p> element.
+func P(attribs ...hatmill.Attrib) func(children ...hatmill.Term) hatmill.ParentElement {
+	return func(children ...hatmill.Term) hatmill.ParentElement {
+		return hatmill.ParentElement{
+			VoidElement: hatmill.VoidElement{
+				TagName: "p",
+				Attribs: attribs,
+			},
+			Children: children,
+		}
+	}
+}
+
+// Param creates a <param> element.
+func Param(attribs ...hatmill.Attrib) hatmill.VoidElement {
+	return hatmill.VoidElement{
+		TagName: "param",
+		Attribs: attribs,
+	}
+}
+
+// Picture creates a <picture> element.
+func Picture(attribs ...hatmill.Attrib) func(children ...hatmill.Term) hatmill.ParentElement {
+	return func(children ...hatmill.Term) hatmill.ParentElement {
+		return hatmill.ParentElement{
+			VoidElement: hatmill.VoidElement{
+				TagName: "picture",
+				Attribs: attribs,
+			},
+			Children: children,
+		}
+	}
+}
+
+// Pre creates a <pre> element.
+func Pre(attribs ...hatmill.Attrib) func(children ...hatmill.Term) hatmill.ParentElement {
+	return func(children ...hatmill.Term) hatmill.ParentElement {
+		return hatmill.ParentElement{
+			VoidElement: hatmill.VoidElement{
+				TagName: "pre",
+				Attribs: attribs,
+			},
+			Children: children,
+		}
+	}
+}
+
+// Progress creates a <progress> element.
+func Progress(attribs ...hatmill.Attrib) func(children ...hatmill.Term) hatmill.ParentElement {
+	return func(children ...hatmill.Term) hatmill.ParentElement {
+		return hatmill.ParentElement{
+			VoidElement: hatmill.VoidElement{
+				TagName: "progress",
+				Attribs: attribs,
+			},
+			Children: children,
+		}
+	}
+}
+
+// Q creates a <q> element.
+func Q(attribs ...hatmill.Attrib) func(children ...hatmill.Term) hatmill.ParentElement {
+	return func(children ...hatmill.Term) hatmill.ParentElement {
+		return hatmill.ParentElement{
+			VoidElement: hatmill.VoidElement{
+				TagName: "q",
+				Attribs: attribs,
+			},
+			Children: children,
+		}
+	}
+}
+
+// Rp creates a <rp> element.
+func Rp(attribs ...hatmill.Attrib) func(children ...hatmill.Term) hatmill.ParentElement {
+	return func(children ...hatmill.Term) hatmill.ParentElement {
+		return hatmill.ParentElement{
+			VoidElement: hatmill.VoidElement{
+				TagName: "rp",
+				Attribs: attribs,
+			},
+			Children: children,
+		}
+	}
+}
+
+// Rt creates a <rt> element.
+func Rt(attribs ...hatmill.Attrib) func(children ...hatmill.Term) hatmill.ParentElement {
+	return func(children ...hatmill.Term) hatmill.ParentElement {
+		return hatmill.ParentElement{
+			VoidElement: hatmill.VoidElement{
+				TagName: "rt",
+				Attribs: attribs,
+			},
+			Children: children,
+		}
+	}
+}
+
+// Ruby creates a <ruby> element.
+func Ruby(attribs ...hatmill.Attrib) func(children ...hatmill.Term) hatmill.ParentElement {
+	return func(children ...hatmill.Term) hatmill.ParentElement {
+		return hatmill.ParentElement{
+			VoidElement: hatmill.VoidElement{
+				TagName: "ruby",
+				Attribs: attribs,
+			},
+			Children: children,
+		}
+	}
+}
+
+// S creates a <s> element.
+func S(attribs ...hatmill.Attrib) func(children ...hatmill.Term) hatmill.ParentElement {
+	return func(children ...hatmill.Term) hatmill.ParentElement {
+		return hatmill.ParentElement{
+			VoidElement: hatmill.VoidElement{
+				TagName: "s",
+				Attribs: attribs,
+			},
+			Children: children,
+		}
+	}
+}
+
+// Samp creates a <samp> element.
+func Samp(attribs ...hatmill.Attrib) func(children ...hatmill.Term) hatmill.ParentElement {
+	return func(children ...hatmill.Term) hatmill.ParentElement {
+		return hatmill.ParentElement{
+			VoidElement: hatmill.VoidElement{
+				TagName: "samp",
+				Attribs: attribs,
+			},
+			Children: children,
+		}
+	}
+}
+
+// Script creates a <script> element.
+func Script(attribs ...hatmill.Attrib) func(children ...hatmill.Term) hatmill.ParentElement {
+	return func(children ...hatmill.Term) hatmill.ParentElement {
+		return hatmill.ParentElement{
+			VoidElement: hatmill.VoidElement{
+				TagName: "script",
+				Attribs: attribs,
+			},
+			Children: children,
+		}
+	}
+}
+
+// Section creates a <section> element.
+func Section(attribs ...hatmill.Attrib) func(children ...hatmill.Term) hatmill.ParentElement {
+	return func(children ...hatmill.Term) hatmill.ParentElement {
+		return hatmill.ParentElement{
+			VoidElement: hatmill.VoidElement{
+				TagName: "section",
+				Attribs: attribs,
+			},
+			Children: children,
+		}
+	}
+}
+
+// Select creates a <select> element.
+func Select(attribs ...hatmill.Attrib) func(children ...hatmill.Term) hatmill.ParentElement {
+	return func(children ...hatmill.Term) hatmill.ParentElement {
+		return hatmill.ParentElement{
+			VoidElement: hatmill.VoidElement{
+				TagName: "select",
+				Attribs: attribs,
+			},
+			Children: children,
+		}
+	}
+}
+
+// Slot creates a <slot> element.
+func Slot(attribs ...hatmill.Attrib) func(children ...hatmill.Term) hatmill.ParentElement {
+	return func(children ...hatmill.Term) hatmill.ParentElement {
+		return hatmill.ParentElement{
+			VoidElement: hatmill.VoidElement{
+				TagName: "slot",
+				Attribs: attribs,
+			},
+			Children: children,
+		}
+	}
+}
+
+// Small creates a <small> element.
+func Small(attribs ...hatmill.Attrib) func(children ...hatmill.Term) hatmill.ParentElement {
+	return func(children ...hatmill.Term) hatmill.ParentElement {
+		return hatmill.ParentElement{
+			VoidElement: hatmill.VoidElement{
+				TagName: "small",
+				Attribs: attribs,
+			},
+			Children: children,
+		}
+	}
+}
+
+// Source creates a <source> element.
+func Source(attribs ...hatmill.Attrib) hatmill.VoidElement {
+	return hatmill.VoidElement{
+		TagName: "source",
+		Attribs: attribs,
+	}
+}
+
 // Span creates a <span> element.
 func Span(attribs ...hatmill.Attrib) func(children ...hatmill.Term) hatmill.ParentElement {
 	return func(children ...hatmill.Term) hatmill.ParentElement {
@@ -91,6 +1128,201 @@ func Span(attribs ...hatmill.Attrib) func(children ...hatmill.Term) hatmill.Pare
 	}
 }
 
+// Strong creates a <strong> element.
+func Strong(attribs ...hatmill.Attrib) func(children ...hatmill.Term) hatmill.ParentElement {
+	return func(children ...hatmill.Term) hatmill.ParentElement {
+		return hatmill.ParentElement{
+			VoidElement: hatmill.VoidElement{
+				TagName: "strong",
+				Attribs: attribs,
+			},
+			Children: children,
+		}
+	}
+}
+
+// Style creates a <style> element.
+func Style(attribs ...hatmill.Attrib) func(children ...hatmill.Term) hatmill.ParentElement {
+	return func(children ...hatmill.Term) hatmill.ParentElement {
+		return hatmill.ParentElement{
+			VoidElement: hatmill.VoidElement{
+				TagName: "style",
+				Attribs: attribs,
+			},
+			Children: children,
+		}
+	}
+}
+
+// Sub creates a <sub> element.
+func Sub(attribs ...hatmill.Attrib) func(children ...hatmill.Term) hatmill.ParentElement {
+	return func(children ...hatmill.Term) hatmill.ParentElement {
+		return hatmill.ParentElement{
+			VoidElement: hatmill.VoidElement{
+				TagName: "sub",
+				Attribs: attribs,
+			},
+			Children: children,
+		}
+	}
+}
+
+// Summary creates a <summary> element.
+func Summary(attribs ...hatmill.Attrib) func(children ...hatmill.Term) hatmill.ParentElement {
+	return func(children ...hatmill.Term) hatmill.ParentElement {
+		return hatmill.ParentElement{
+			VoidElement: hatmill.VoidElement{
+				TagName: "summary",
+				Attribs: attribs,
+			},
+			Children: children,
+		}
+	}
+}
+
+// Sup creates a <sup> element.
+func Sup(attribs ...hatmill.Attrib) func(children ...hatmill.Term) hatmill.ParentElement {
+	return func(children ...hatmill.Term) hatmill.ParentElement {
+		return hatmill.ParentElement{
+			VoidElement: hatmill.VoidElement{
+				TagName: "sup",
+				Attribs: attribs,
+			},
+			Children: children,
+		}
+	}
+}
+
+// Svg creates a <svg> element.
+func Svg(attribs ...hatmill.Attrib) func(children ...hatmill.Term) hatmill.ParentElement {
+	return func(children ...hatmill.Term) hatmill.ParentElement {
+		return hatmill.ParentElement{
+			VoidElement: hatmill.VoidElement{
+				TagName: "svg",
+				Attribs: attribs,
+			},
+			Children: children,
+		}
+	}
+}
+
+// Table creates a <table> element.
+func Table(attribs ...hatmill.Attrib) func(children ...hatmill.Term) hatmill.ParentElement {
+	return func(children ...hatmill.Term) hatmill.ParentElement {
+		return hatmill.ParentElement{
+			VoidElement: hatmill.VoidElement{
+				TagName: "table",
+				Attribs: attribs,
+			},
+			Children: children,
+		}
+	}
+}
+
+// Tbody creates a <tbody> element.
+func Tbody(attribs ...hatmill.Attrib) func(children ...hatmill.Term) hatmill.ParentElement {
+	return func(children ...hatmill.Term) hatmill.ParentElement {
+		return hatmill.ParentElement{
+			VoidElement: hatmill.VoidElement{
+				TagName: "tbody",
+				Attribs: attribs,
+			},
+			Children: children,
+		}
+	}
+}
+
+// Td creates a <td> element.
+func Td(attribs ...hatmill.Attrib) func(children ...hatmill.Term) hatmill.ParentElement {
+	return func(children ...hatmill.Term) hatmill.ParentElement {
+		return hatmill.ParentElement{
+			VoidElement: hatmill.VoidElement{
+				TagName: "td",
+				Attribs: attribs,
+			},
+			Children: children,
+		}
+	}
+}
+
+// Template creates a <template> element.
+func Template(attribs ...hatmill.Attrib) func(children ...hatmill.Term) hatmill.ParentElement {
+	return func(children ...hatmill.Term) hatmill.ParentElement {
+		return hatmill.ParentElement{
+			VoidElement: hatmill.VoidElement{
+				TagName: "template",
+				Attribs: attribs,
+			},
+			Children: children,
+		}
+	}
+}
+
+// Textarea creates a <textarea> element.
+func Textarea(attribs ...hatmill.Attrib) func(children ...hatmill.Term) hatmill.ParentElement {
+	return func(children ...hatmill.Term) hatmill.ParentElement {
+		return hatmill.ParentElement{
+			VoidElement: hatmill.VoidElement{
+				TagName: "textarea",
+				Attribs: attribs,
+			},
+			Children: children,
+		}
+	}
+}
+
+// Tfoot creates a <tfoot> element.
+func Tfoot(attribs ...hatmill.Attrib) func(children ...hatmill.Term) hatmill.ParentElement {
+	return func(children ...hatmill.Term) hatmill.ParentElement {
+		return hatmill.ParentElement{
+			VoidElement: hatmill.VoidElement{
+				TagName: "tfoot",
+				Attribs: attribs,
+			},
+			Children: children,
+		}
+	}
+}
+
+// Th creates a <th> element.
+func Th(attribs ...hatmill.Attrib) func(children ...hatmill.Term) hatmill.ParentElement {
+	return func(children ...hatmill.Term) hatmill.ParentElement {
+		return hatmill.ParentElement{
+			VoidElement: hatmill.VoidElement{
+				TagName: "th",
+				Attribs: attribs,
+			},
+			Children: children,
+		}
+	}
+}
+
+// Thead creates a <thead> element.
+func Thead(attribs ...hatmill.Attrib) func(children ...hatmill.Term) hatmill.ParentElement {
+	return func(children ...hatmill.Term) hatmill.ParentElement {
+		return hatmill.ParentElement{
+			VoidElement: hatmill.VoidElement{
+				TagName: "thead",
+				Attribs: attribs,
+			},
+			Children: children,
+		}
+	}
+}
+
+// Time creates a <time> element.
+func Time(attribs ...hatmill.Attrib) func(children ...hatmill.Term) hatmill.ParentElement {
+	return func(children ...hatmill.Term) hatmill.ParentElement {
+		return hatmill.ParentElement{
+			VoidElement: hatmill.VoidElement{
+				TagName: "time",
+				Attribs: attribs,
+			},
+			Children: children,
+		}
+	}
+}
+
 // Title creates a <title> element.
 func Title(attribs ...hatmill.Attrib) func(children ...hatmill.Term) hatmill.ParentElement {
 	return func(children ...hatmill.Term) hatmill.ParentElement {
@@ -104,6 +1336,40 @@ func Title(attribs ...hatmill.Attrib) func(children ...hatmill.Term) hatmill.Par
 	}
 }
 
+// Tr creates a <tr> element.
+func Tr(attribs ...hatmill.Attrib) func(children ...hatmill.Term) hatmill.ParentElement {
+	return func(children ...hatmill.Term) hatmill.ParentElement {
+		return hatmill.ParentElement{
+			VoidElement: hatmill.VoidElement{
+				TagName: "tr",
+				Attribs: attribs,
+			},
+			Children: children,
+		}
+	}
+}
+
+// Track creates a <track> element.
+func Track(attribs ...hatmill.Attrib) hatmill.VoidElement {
+	return hatmill.VoidElement{
+		TagName: "track",
+		Attribs: attribs,
+	}
+}
+
+// U creates a <u> element.
+func U(attribs ...hatmill.Attrib) func(children ...hatmill.Term) hatmill.ParentElement {
+	return func(children ...hatmill.Term) hatmill.ParentElement {
+		return hatmill.ParentElement{
+			VoidElement: hatmill.VoidElement{
+				TagName: "u",
+				Attribs: attribs,
+			},
+			Children: children,
+		}
+	}
+}
+
 // Ul creates a <ul> element.
 func Ul(attribs ...hatmill.Attrib) func(children ...hatmill.Term) hatmill.ParentElement {
 	return func(children ...hatmill.Term) hatmill.ParentElement {
@@ -117,6 +1383,40 @@ func Ul(attribs ...hatmill.Attrib) func(children ...hatmill.Term) hatmill.Parent
 	}
 }
 
+// Var creates a <var> element.
+func Var(attribs ...hatmill.Attrib) func(children ...hatmill.Term) hatmill.ParentElement {
+	return func(children ...hatmill.Term) hatmill.ParentElement {
+		return hatmill.ParentElement{
+			VoidElement: hatmill.VoidElement{
+				TagName: "var",
+				Attribs: attribs,
+			},
+			Children: children,
+		}
+	}
+}
+
+// Video creates a <video> element.
+func Video(attribs ...hatmill.Attrib) func(children ...hatmill.Term) hatmill.ParentElement {
+	return func(children ...hatmill.Term) hatmill.ParentElement {
+		return hatmill.ParentElement{
+			VoidElement: hatmill.VoidElement{
+				TagName: "video",
+				Attribs: attribs,
+			},
+			Children: children,
+		}
+	}
+}
+
+// Wbr creates a <wbr> element.
+func Wbr(attribs ...hatmill.Attrib) hatmill.VoidElement {
+	return hatmill.VoidElement{
+		TagName: "wbr",
+		Attribs: attribs,
+	}
+}
+
 // Disabled creates a "disabled" attribute
 func Disabled() hatmill.Attrib {
 	return hatmill.Attrib{
diff --git a/html5/html5.go b/html5/html5.go
index 4a3fa5f..aa267aa 100644
--- a/html5/html5.go
+++ b/html5/html5.go
@@ -4,8 +4,8 @@ package html5
 
 import "gitlab.codemonkeysoftware.net/b/hatmill"
 
-// Data creates an attribute of the form "data-suffix='value'".
-func Data(suffix, value string) hatmill.Attrib {
+// CustomData creates an attribute of the form data-suffix='value'.
+func CustomData(suffix, value string) hatmill.Attrib {
 	return hatmill.Attrib{
 		Key:   "data-" + suffix,
 		Value: value,
diff --git a/html5/html5_test.go b/html5/html5_test.go
index 7750007..23232a4 100644
--- a/html5/html5_test.go
+++ b/html5/html5_test.go
@@ -17,7 +17,7 @@ func Example() {
 			html5.Div()(
 				html5.Img(html5.Src("./me.jpg"), html5.Id("profile-photo")),
 				html5.Text(html.EscapeString(userInput)),
-				html5.Div(html5.Disabled(), html5.Data("coolness", "awesome"))(),
+				html5.Div(html5.Disabled(), html5.CustomData("coolness", "awesome"))(),
 			),
 		),
 	)