inline with template=albumitem useful in current form

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

diff --git a/IkiWiki/Plugin/typography.pm b/IkiWiki/Plugin/typography.pm
index 8ae1f3445c966e39bef6dfea77cd8072326c0027..9389b24d428ba092915babf5f3cf7c98c3664058 100644 (file)
--- a/IkiWiki/Plugin/typography.pm
+++ b/IkiWiki/Plugin/typography.pm
@@ -4,44 +4,48 @@ 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);
-} # }}}
+       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 getsetup () { #{{{
+sub getsetup () {
        eval q{use Text::Typography};
        error($@) if $@;
 
        return
+               plugin => {
+                       safe => 1,
+                       rebuild => 1,
+               },
                typographyattributes => {
                        type => "string",
-                       default => "3",
-                       example => "tag",
+                       example => "3",
                        description => "Text::Typography attributes value",
+                       advanced => 1,
                        safe => 1,
                        rebuild => 1,
                },
-} #}}}
+}
 
-sub sanitize (@) { #{{{
+sub sanitize (@) {
        my %params=@_;
 
        eval q{use Text::Typography};
-       error($@) if $@;
+       return $params{content} if $@;
 
        my $attributes=defined $config{typographyattributes} ? $config{typographyattributes} : '3';
        return Text::Typography::typography($params{content}, $attributes);
-} # }}}
+}
 
 1