X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/84c905ec2011ec846d3d8b27f21f5ffd53c73840..e9e75f5f29d78b0631f98d9b0fa93184fcb181fe:/IkiWiki/Plugin/typography.pm?ds=sidebyside

diff --git a/IkiWiki/Plugin/typography.pm b/IkiWiki/Plugin/typography.pm
index 8ae1f3445..f62be82bb 100644
--- 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);
-} # }}}
+}
 
-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