Respond to Joey's most recent configurable_markdown_path comments.

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

diff --git a/IkiWiki/Plugin/mdwn.pm b/IkiWiki/Plugin/mdwn.pm
index 920d90e5e5eb8f81abf8560f402cd8d849e4c72b..b892eabee29be50387fa493baafd5dbd6d1024a8 100644 (file)
--- a/IkiWiki/Plugin/mdwn.pm
+++ b/IkiWiki/Plugin/mdwn.pm
@@ -4,26 +4,31 @@ package IkiWiki::Plugin::mdwn;
 
 use warnings;
 use strict;
 
 use warnings;
 use strict;

-use IkiWiki 2.00;
+use IkiWiki 3.00;

 
 

-sub import { #{{{
+sub import {

        hook(type => "getsetup", id => "mdwn", call => \&getsetup);
        hook(type => "getsetup", id => "mdwn", call => \&getsetup);

-       hook(type => "htmlize", id => "mdwn", call => \&htmlize);
-} # }}}
+       hook(type => "htmlize", id => "mdwn", call => \&htmlize, longname => "Markdown");
+}

 
 

-sub getsetup () { #{{{
+sub getsetup () {

        return
        return

+               plugin => {
+                       safe => 1,
+                       rebuild => 1, # format plugin
+                       section => "format",
+               },

                multimarkdown => {
                        type => "boolean",
                multimarkdown => {
                        type => "boolean",

-                       default => 0,
-                       description => "enable use of multimarkdown features",
+                       example => 0,
+                       description => "enable multimarkdown features?",

                        safe => 1,
                        rebuild => 1,
                },
                        safe => 1,
                        rebuild => 1,
                },

-} #}}}
+}

 
 my $markdown_sub;
 
 my $markdown_sub;

-sub htmlize (@) { #{{{
+sub htmlize (@) {

        my %params=@_;
        my $content = $params{content};
 
        my %params=@_;
        my $content = $params{content};
 


@@ -39,8 +44,10 @@ sub htmlize (@) { #{{{
                        if ($@) {
                                debug(gettext("multimarkdown is enabled, but Text::MultiMarkdown is not installed"));
                        }
                        if ($@) {
                                debug(gettext("multimarkdown is enabled, but Text::MultiMarkdown is not installed"));
                        }

-                       $markdown_sub=sub {
-                               Text::MultiMarkdown::markdown(shift, {use_metadata => 0});
+                       else {
+                               $markdown_sub=sub {
+                                       Text::MultiMarkdown::markdown(shift, {use_metadata => 0});
+                               }

                        }
                }
                if (! defined $markdown_sub) {
                        }
                }
                if (! defined $markdown_sub) {


@@ -79,6 +86,6 @@ sub htmlize (@) { #{{{
        $content=Encode::decode_utf8($content);
 
        return $content;
        $content=Encode::decode_utf8($content);
 
        return $content;

-} # }}}
+}

 
 1
 
 1