* Allow html5 video and audio tags and their attributes in the htmlscrubber.

diff --git a/IkiWiki/Plugin/htmlscrubber.pm b/IkiWiki/Plugin/htmlscrubber.pm
index 540662c2b4d1fcc0cf1c8a0a89d08c3c0eabe280..4245c879cdefa12f127306a0136fdfdc1d00164f 100644 (file)
--- a/IkiWiki/Plugin/htmlscrubber.pm
+++ b/IkiWiki/Plugin/htmlscrubber.pm
@@ -21,6 +21,7 @@ sub scrubber { #{{{
        eval q{use HTML::Scrubber};
        error($@) if $@;
        # Lists based on http://feedparser.org/docs/html-sanitization.html
        eval q{use HTML::Scrubber};
        error($@) if $@;
        # Lists based on http://feedparser.org/docs/html-sanitization.html

+       # With html 5 video and audio tags added.

        $_scrubber = HTML::Scrubber->new(
                allow => [qw{
                        a abbr acronym address area b big blockquote br
        $_scrubber = HTML::Scrubber->new(
                allow => [qw{
                        a abbr acronym address area b big blockquote br


@@ -30,6 +31,7 @@ sub scrubber { #{{{
                        menu ol optgroup option p pre q s samp select small
                        span strike strong sub sup table tbody td textarea
                        tfoot th thead tr tt u ul var
                        menu ol optgroup option p pre q s samp select small
                        span strike strong sub sup table tbody td textarea
                        tfoot th thead tr tt u ul var

+                       video audio

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


@@ -45,6 +47,8 @@ sub scrubber { #{{{
                                selected shape size span src start summary
                                tabindex target title type usemap valign
                                value vspace width
                                selected shape size span src start summary
                                tabindex target title type usemap valign
                                value vspace width

+                               poster autoplay loopstart loopend end
+                               playcount controls 

                        } ),
                        "/" => 1, # emit proper <hr /> XHTML
                        }],
                        } ),
                        "/" => 1, # emit proper <hr /> XHTML
                        }],

diff --git a/debian/changelog b/debian/changelog
index ccfa808fe8952122f46ef1691e1357efbd49ef8c..4ee2f7c80801c2f2813c7127639cca6fdb93a7ec 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -23,6 +23,7 @@ ikiwiki (2.13) UNRELEASED; urgency=low
   * When usedirs is disabled, link direct to index.html files, not to
     directories, to improve browsing of file:// urls.
     Patch by Daniel Burrows. Closes: #451728
   * When usedirs is disabled, link direct to index.html files, not to
     directories, to improve browsing of file:// urls.
     Patch by Daniel Burrows. Closes: #451728

+  * Allow html5 video and audio tags and their attributes in the htmlscrubber.

 
  -- Joey Hess <joeyh@debian.org>  Sat, 17 Nov 2007 19:56:46 -0500
 
 
  -- Joey Hess <joeyh@debian.org>  Sat, 17 Nov 2007 19:56:46 -0500