Merge branch 'next'

[ikiwiki.git] / IkiWiki / Plugin / typography.pm

diff --git a/IkiWiki/Plugin/typography.pm b/IkiWiki/Plugin/typography.pm
index 5073d51d31a79858bfe68c3809a92f7c09a03ee0..f62be82bbea849090876053a4d81ee6c558260c6 100644 (file)
--- a/IkiWiki/Plugin/typography.pm
+++ b/IkiWiki/Plugin/typography.pm
@@ -4,21 +4,41 @@ package IkiWiki::Plugin::typography;
 
 use warnings;
 use strict;
-use IkiWiki 2.00;
+use IkiWiki 3.00;
 
-sub import { #{{{
+sub import {
        hook(type => "getopt", id => "typography", call => \&getopt);
+       hook(type => "getsetup", id => "typography", call => \&getsetup);
        IkiWiki::hook(type => "sanitize", id => "typography", call => \&sanitize);
-} # }}}
+}
 
-sub getopt () { #{{{
+sub getopt () {
        eval q{use Getopt::Long};
        error($@) if $@;
        Getopt::Long::Configure('pass_through');
        GetOptions("typographyattributes=s" => \$config{typographyattributes});
-} #}}}
+}
 
-sub sanitize (@) { #{{{
+sub getsetup () {
+       eval q{use Text::Typography};
+       error($@) if $@;
+
+       return
+               plugin => {
+                       safe => 1,
+                       rebuild => 1,
+               },
+               typographyattributes => {
+                       type => "string",
+                       example => "3",
+                       description => "Text::Typography attributes value",
+                       advanced => 1,
+                       safe => 1,
+                       rebuild => 1,
+               },
+}
+
+sub sanitize (@) {
        my %params=@_;
 
        eval q{use Text::Typography};
@@ -26,6 +46,6 @@ sub sanitize (@) { #{{{
 
        my $attributes=defined $config{typographyattributes} ? $config{typographyattributes} : '3';
        return Text::Typography::typography($params{content}, $attributes);
-} # }}}
+}
 
 1