From f1e2d0af123352b692e8e4efdb208e370a00d3c1 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Sat, 1 May 2010 19:11:03 -0400
Subject: more html5 attributes

---
 IkiWiki/Plugin/htmlscrubber.pm | 5 +++++
 debian/changelog               | 4 ++++
 doc/bugs/html5_support.mdwn    | 5 ++++-
 3 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/IkiWiki/Plugin/htmlscrubber.pm b/IkiWiki/Plugin/htmlscrubber.pm
index 7517c82c6..d52614a4d 100644
--- a/IkiWiki/Plugin/htmlscrubber.pm
+++ b/IkiWiki/Plugin/htmlscrubber.pm
@@ -85,6 +85,7 @@ sub scrubber {
 
 			video audio source section nav article aside hgroup
 			header footer figure figcaption time mark canvas
+			datalist
 		}],
 		default => [undef, { (
 			map { $_ => 1 } qw{
@@ -104,11 +105,15 @@ sub scrubber {
 				autofocus autoplay preload loopstart
 				loopend end playcount controls pubdate
 				placeholder min max step form required
+				autocomplete novalidate pattern list
+				formenctype formmethod formnovalidate
+				formtarget reversed
 			} ),
 			"/" => 1, # emit proper <hr /> XHTML
 			href => $safe_url_regexp,
 			src => $safe_url_regexp,
 			action => $safe_url_regexp,
+			formaction => $safe_url_regexp,
 			cite => $safe_url_regexp,
 			longdesc => $safe_url_regexp,
 			poster => $safe_url_regexp,
diff --git a/debian/changelog b/debian/changelog
index cdc79ae78..e0f506f29 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -12,6 +12,10 @@ ikiwiki (3.20100428) UNRELEASED; urgency=low
     attribute and the source tag.
   * htmlscrubber: Allow the html5 form attributes: placeholder autofocus,
     min, max, step, required, autocomplete, novalidate, pattern, and form.
+    (Also the form* override attributes for input and buttons.)
+  * htmlscrubber: Allow the html5 datalist element, and the form list
+    attribute.
+  * htmlscrubber: Allow the html5 reversed and spellcheck attributes.
 
  -- Joey Hess <joeyh@debian.org>  Tue, 27 Apr 2010 12:10:51 -0400
 
diff --git a/doc/bugs/html5_support.mdwn b/doc/bugs/html5_support.mdwn
index 7d9dc9f79..1ca45f46d 100644
--- a/doc/bugs/html5_support.mdwn
+++ b/doc/bugs/html5_support.mdwn
@@ -81,7 +81,10 @@ HTML5](http://www.w3.org/TR/html5-diff/).
 
 > I have not added the new `ping` attribute, because parsing a
 > space-separeated list of urls to avoid javascript injection is annoying, 
-> and the attribute seems generally dubious. --[[Joey]] 
+> and the attribute seems generally dubious.
+> 
+> Need to understand better the attributes contenteditabl, contextmenu,
+> data-*, draggable, hidden, role, aria-*. Have not added those. --[[Joey]] 
 
 # HTML5 Validation and t/html.t
 
-- 
cgit v1.2.3