Merge commit 'upstream/master' into pub/master

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

diff --git a/IkiWiki/Plugin/typography.pm b/IkiWiki/Plugin/typography.pm
index 8ae1f3445c966e39bef6dfea77cd8072326c0027..27089b39008455b92b24e69669627bc624fbf10d 100644 (file)
--- a/IkiWiki/Plugin/typography.pm
+++ b/IkiWiki/Plugin/typography.pm
@@ -24,11 +24,15 @@ sub getsetup () { #{{{
        error($@) if $@;
 
        return
        error($@) if $@;
 
        return

+               plugin => {
+                       safe => 1,
+                       rebuild => 1,
+               },

                typographyattributes => {
                        type => "string",
                typographyattributes => {
                        type => "string",

-                       default => "3",
-                       example => "tag",
+                       example => "3",

                        description => "Text::Typography attributes value",
                        description => "Text::Typography attributes value",

+                       advanced => 1,

                        safe => 1,
                        rebuild => 1,
                },
                        safe => 1,
                        rebuild => 1,
                },


@@ -38,7 +42,7 @@ sub sanitize (@) { #{{{
        my %params=@_;
 
        eval q{use Text::Typography};
        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);
 
        my $attributes=defined $config{typographyattributes} ? $config{typographyattributes} : '3';
        return Text::Typography::typography($params{content}, $attributes);