Merge branch 'master' into debian-jessie-backports

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

diff --git a/IkiWiki/Plugin/typography.pm b/IkiWiki/Plugin/typography.pm
index d613f873b146dd40c90324627ad0b8993b368df9..9389b24d428ba092915babf5f3cf7c98c3664058 100644 (file)
--- a/IkiWiki/Plugin/typography.pm
+++ b/IkiWiki/Plugin/typography.pm
@@ -4,17 +4,48 @@ package IkiWiki::Plugin::typography;
 
 use warnings;
 use strict;
 
 use warnings;
 use strict;

-use IkiWiki;
+use IkiWiki 3.00;

 
 

-sub import { #{{{
-       IkiWiki::hook(type => "sanitize", id => "typography", call => \&sanitize);
-} # }}}
+sub import {
+       hook(type => "getopt", id => "typography", call => \&getopt);
+       hook(type => "getsetup", id => "typography", call => \&getsetup);
+       hook(type => "sanitize", id => "typography", call => \&sanitize);
+}

 
 

-sub sanitize (@) { #{{{
+sub getopt () {
+       eval q{use Getopt::Long};
+       error($@) if $@;
+       Getopt::Long::Configure('pass_through');
+       GetOptions("typographyattributes=s" => \$config{typographyattributes});
+}
+
+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};
        my %params=@_;
 
        eval q{use Text::Typography};

-       return Text::Typography::typography($params{content});
-} # }}}
+       return $params{content} if $@;
+
+       my $attributes=defined $config{typographyattributes} ? $config{typographyattributes} : '3';
+       return Text::Typography::typography($params{content}, $attributes);
+}

 
 1
 
 1