* Add a rawhtml plugin that allows copying raw html files from the srcdir.

diff --git a/IkiWiki/Plugin/rawhtml.pm b/IkiWiki/Plugin/rawhtml.pm
new file mode 100644 (file)
index 0000000..30e9715
--- /dev/null
+++ b/IkiWiki/Plugin/rawhtml.pm
@@ -0,0 +1,13 @@
+#!/usr/bin/perl
+# Copy html files raw.
+package IkiWiki::Plugin::rawhtml;
+
+use warnings;
+use strict;
+use IkiWiki;
+
+sub import { #{{{
+       $config{wiki_file_prune_regexps} = [ grep { !m/\\\.x\?html\?\$/ } @{$config{wiki_file_prune_regexps}} ];
+} # }}}
+
+1

diff --git a/debian/changelog b/debian/changelog
index 0b51d12f074c7318222a967d5c736e78d355f608..5e75dcbbebb0dc6d89b9ac5c1054f485e710c00a 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+ikiwiki (1.39) UNRELEASED; urgency=low
+
+  * Add a rawhtml plugin that allows copying raw html files from the srcdir.
+
+ -- Joey Hess <joeyh@debian.org>  Mon,  8 Jan 2007 15:53:25 -0500
+
 ikiwiki (1.38) unstable; urgency=low
 
   * Corrected a bum regexp in openid munging.

diff --git a/doc/plugins/html.mdwn b/doc/plugins/html.mdwn
index 4351ecdb546b7ab8bcbc0e4545323047bc435092..d19c99af8c74d119498ff93fd5ef5387cd7082b0 100644 (file)
--- a/doc/plugins/html.mdwn
+++ b/doc/plugins/html.mdwn
@@ -1,7 +1,7 @@
 [[template id=plugin name=html included=1 author="[[Joey]]"]]
 [[tag type/html type/format]]
 
-This plugin lets raw html pages be used as source pages for the wiki. The
+This plugin lets html pages be used as source pages for the wiki. The
 html pages will still be wrapped in the same html template as any other
 page, so for best results you should include only the page body in the html
 file. Also, if the htmlscrubber plugin is enabled, the html pages will be

diff --git a/doc/plugins/rawhtml.mdwn b/doc/plugins/rawhtml.mdwn
new file mode 100644 (file)
index 0000000..41f4a70
--- /dev/null
+++ b/doc/plugins/rawhtml.mdwn
@@ -0,0 +1,13 @@
+[[template id=plugin name=rawhtml included=1 author="[[Joey]]"]]
+[[tag type/html type/format]]
+
+This plugin changes how ikiwiki handles html files, making it treat html
+or xhtml files not as source files but as data files that are copied
+unchanged when the wiki is built. Compared with the [[html]] plugin, which
+treats html files as source files for the wiki, this plugin allows complete
+control over html pages. Note that this means that the html will not be
+sanitised of problimatic content such as javascript, so it can be insecure
+to enable this plugin if untrusted users have write access to your wiki's
+repository.
+
+This plugin is included in ikiwiki, but is not enabled by default.