add figure and figcaption

diff --git a/IkiWiki/Plugin/htmlscrubber.pm b/IkiWiki/Plugin/htmlscrubber.pm
index 479e10e7445a34cff1249f663e1a56eaf8e6af8c..0090b67b9d450c69b0fc682a0dc519bc5e9af49c 100644 (file)
--- a/IkiWiki/Plugin/htmlscrubber.pm
+++ b/IkiWiki/Plugin/htmlscrubber.pm
@@ -84,7 +84,7 @@ sub scrubber {
                        tfoot th thead tr tt u ul var
 
                        video audio source section nav article aside hgroup
                        tfoot th thead tr tt u ul var
 
                        video audio source section nav article aside hgroup

-                       header footer time mark canvas
+                       header footer figure figcaption time mark canvas

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

diff --git a/debian/changelog b/debian/changelog
index 12ef08a911117a91b98a9482d8d1819752098157..108764c39715049081e57058f7c72bd3c98b01a4 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,7 +6,7 @@ ikiwiki (3.20100428) UNRELEASED; urgency=low
   * Version dependency on liburi-perl to >= 1.36; previous versions
     did not support building urls from utf-8 strings. Closes: #579713
   * htmlscrubber: Allow html5 semantic tags: section nav article aside hgroup
   * Version dependency on liburi-perl to >= 1.36; previous versions
     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
+    header footer figure figcaption time mark

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