rename hash and avoid unnecessary hash ref

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

diff --git a/IkiWiki/Plugin/format.pm b/IkiWiki/Plugin/format.pm
index a219190e820a4f579a389c223a536a371e357ef7..d54e7113198093a2a939315077f7f99d34c529a8 100644 (file)
--- a/IkiWiki/Plugin/format.pm
+++ b/IkiWiki/Plugin/format.pm
@@ -3,27 +3,50 @@ package IkiWiki::Plugin::format;
 
 use warnings;
 use strict;
 
 use warnings;
 use strict;

-use IkiWiki 2.00;
+use IkiWiki 3.00;

 
 

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

        hook(type => "preprocess", id => "format", call => \&preprocess);
        hook(type => "preprocess", id => "format", call => \&preprocess);

-} #}}}
+       hook(type => "getsetup",   id => "format", call => \&getsetup);
+}

 
 

-sub preprocess (@) { #{{{
-       my $format=$_[0];
-       shift; shift;
-       my $text=$_[0];
-       shift; shift;
+sub getsetup () {
+       return
+               plugin => {
+                       safe => 1,
+                       rebuild => undef,
+                       section => "widget",
+               },
+}
+
+sub preprocess (@) {

        my %params=@_;
        my %params=@_;

+       my $format=shift;
+       shift;
+       my $text=IkiWiki::preprocess($params{page}, $params{destpage}, shift);
+       shift;

 
        if (! defined $format || ! defined $text) {
                error(gettext("must specify format and text"));
        }
 
        if (! defined $format || ! defined $text) {
                error(gettext("must specify format and text"));
        }

-       elsif (! exists $IkiWiki::hooks{htmlize}{$format}) {
-               error(sprintf(gettext("unsupported page format %s"), $format));
+       elsif (exists $IkiWiki::hooks{htmlize}{$format}) {
+               return IkiWiki::htmlize($params{page}, $params{destpage},
+                                       $format, $text);

        }
        }

+       else {
+               # Other plugins can register htmlizefallback
+               # hooks to add support for page types
+               # not suitable for htmlize. Try them until
+               # one succeeds.
+               my $ret;
+               IkiWiki::run_hooks(htmlizefallback => sub {
+                       $ret=shift->($format, $text)
+                               unless defined $ret;
+               });
+               return $ret if defined $ret;

 
 

-       return IkiWiki::htmlize($params{page}, $params{destpage}, $format, $text);
-} #}}}
+               error(sprintf(gettext("unsupported page format %s"), $format));
+       }
+}

 
 1
 
 1