Merge remote branch 'davrieb/autotag' into autotag

[git.ikiwiki.info.git] / IkiWiki / Plugin / wmd.pm

diff --git a/IkiWiki/Plugin/wmd.pm b/IkiWiki/Plugin/wmd.pm
index 9e9f17f7f635edc87265f8b9be1e1fdbb99a1390..99b136281616f9ddbed16af6dee2fe3c6a84aad5 100644 (file)
--- a/IkiWiki/Plugin/wmd.pm
+++ b/IkiWiki/Plugin/wmd.pm
@@ -4,7 +4,6 @@ package IkiWiki::Plugin::wmd;
 use warnings;
 use strict;
 use IkiWiki 3.00;
-use POSIX;
 use Encode;
 
 sub import {
@@ -17,6 +16,8 @@ sub getsetup () {
        return
                plugin => {
                        safe => 1,
+                       rebuild => 0,
+                       section => "web",
                },
 }
 
@@ -37,9 +38,16 @@ sub formbuilder_setup (@) {
 sub include_javascript ($;$) {
        my $page=shift;
        my $absolute=shift;
-       
-       return '<script src="'.urlto("wmd.js", $page, $absolute).
-               '" type="text/javascript"></script>'."\n";
+
+       my $wmdjs=urlto("wmd/wmd.js", $page, $absolute);
+       return <<"EOF"
+<script type="text/javascript">
+wmd_options = {
+       output: "Markdown"
+};
+</script>
+<script src="$wmdjs" type="text/javascript"></script>
+EOF
 }
 
 1