more html5

* htmlscrubber: Also allow html5 canvas tags.
* htmlscrubber: Round out html5 video support with the preload
  attribute and the source tag.

diff --git a/IkiWiki/Plugin/htmlscrubber.pm b/IkiWiki/Plugin/htmlscrubber.pm
index 1604d776a646af2487eeeb4dd7be8d6fc8c0d89e..cc00fd5ffa1f9414b605eb8129f7588d5034d4e1 100644 (file)
--- a/IkiWiki/Plugin/htmlscrubber.pm
+++ b/IkiWiki/Plugin/htmlscrubber.pm
@@ -83,8 +83,8 @@ sub scrubber {
                        span strike strong sub sup table tbody td textarea
                        tfoot th thead tr tt u ul var
 
                        span strike strong sub sup table tbody td textarea
                        tfoot th thead tr tt u ul var
 

-                       video audio section nav article aside hgroup header
-                       footer time mark
+                       video audio source section nav article aside hgroup
+                       header footer time mark canvas

                }],
                default => [undef, { (
                        map { $_ => 1 } qw{
                }],
                default => [undef, { (
                        map { $_ => 1 } qw{


@@ -101,7 +101,7 @@ sub scrubber {
                                tabindex target title type valign
                                value vspace width
 
                                tabindex target title type valign
                                value vspace width
 

-                               autoplay loopstart loopend end
+                               autoplay preload loopstart loopend end

                                playcount controls pubdate
                        } ),
                        "/" => 1, # emit proper <hr /> XHTML
                                playcount controls pubdate
                        } ),
                        "/" => 1, # emit proper <hr /> XHTML

diff --git a/debian/changelog b/debian/changelog
index 9a6cf68e3d688f9e2e3bfc9fb7d3990e72685377..9613d8b6d51b2ff542392b326887abac12f2c6c4 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,6 +7,9 @@ ikiwiki (3.20100428) UNRELEASED; urgency=low
     did not support building urls from utf-8 strings. Closes: #579713
   * htmlscrubber: Allow html5 semantic tags: section nav article aside hgroup
     header footer time mark
     did not support building urls from utf-8 strings. Closes: #579713
   * htmlscrubber: Allow html5 semantic tags: section nav article aside hgroup
     header footer time mark

+  * htmlscrubber: Also allow html5 canvas tags.
+  * htmlscrubber: Round out html5 video support with the preload
+    attribute and the source tag.

 
  -- Joey Hess <joeyh@debian.org>  Tue, 27 Apr 2010 12:10:51 -0400
 
 
  -- 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 a330d3ae6c605b5da1195b58f6a12548994e3663..c05208fbfff0309e21df6da4e75fb8605cfd98d5 100644 (file)
--- a/doc/bugs/html5_support.mdwn
+++ b/doc/bugs/html5_support.mdwn
@@ -65,6 +65,7 @@ HTML5](http://www.w3.org/TR/html5-diff/).
 > 
 > * Add pubdate attribute to time elements as appropriate.
 > * Use aside for the sidebar? Or for the [[templates/note]] template?
 > 
 > * Add pubdate attribute to time elements as appropriate.
 > * Use aside for the sidebar? Or for the [[templates/note]] template?

+> * Use nav for the actionbar

 > --[[Joey]] 
 
 # htmlscrubber.pm needs to not scrub new HTML5 elements
 > --[[Joey]] 
 
 # htmlscrubber.pm needs to not scrub new HTML5 elements


@@ -74,7 +75,7 @@ HTML5](http://www.w3.org/TR/html5-diff/).
 > Most of these can be supported trivially, since they are just semantic
 > markup. Make a list of these, and their attributes (and which attributes
 > can contain urls or other javascript injection mechanisms), and I can add
 > Most of these can be supported trivially, since they are just semantic
 > markup. Make a list of these, and their attributes (and which attributes
 > can contain urls or other javascript injection mechanisms), and I can add

-> them. (Added several now.) Others, like `embed`, and `canvas` are *scary*. --[[Joey]]
+> them. (Added several now.) Others, like `embed` are *scary*. --[[Joey]]

 
 # HTML5 Validation and t/html.t
 
 
 # HTML5 Validation and t/html.t