add getsetup
Also, avoid dying with a fatal error if multimarkdown is enabled and the module doesh't load.master
parent
bf6198baf3
commit
cf6c2f142f
|
@ -7,9 +7,21 @@ use strict;
|
||||||
use IkiWiki 2.00;
|
use IkiWiki 2.00;
|
||||||
|
|
||||||
sub import { #{{{
|
sub import { #{{{
|
||||||
|
hook(type => "getsetup", id => "mdwn", call => \&getsetup);
|
||||||
hook(type => "htmlize", id => "mdwn", call => \&htmlize);
|
hook(type => "htmlize", id => "mdwn", call => \&htmlize);
|
||||||
} # }}}
|
} # }}}
|
||||||
|
|
||||||
|
sub getsetup () { #{{{
|
||||||
|
return
|
||||||
|
multimarkdown => {
|
||||||
|
type => "boolean",
|
||||||
|
default => 0,
|
||||||
|
description => "enable use of multimarkdown features",
|
||||||
|
safe => 1,
|
||||||
|
rebuild => 1,
|
||||||
|
},
|
||||||
|
} #}}}
|
||||||
|
|
||||||
my $markdown_sub;
|
my $markdown_sub;
|
||||||
sub htmlize (@) { #{{{
|
sub htmlize (@) { #{{{
|
||||||
my %params=@_;
|
my %params=@_;
|
||||||
|
@ -25,13 +37,13 @@ sub htmlize (@) { #{{{
|
||||||
if (exists $config{multimarkdown} && $config{multimarkdown}) {
|
if (exists $config{multimarkdown} && $config{multimarkdown}) {
|
||||||
eval q{use Text::MultiMarkdown};
|
eval q{use Text::MultiMarkdown};
|
||||||
if ($@) {
|
if ($@) {
|
||||||
error(gettext("multimarkdown is enabled, but Text::MultiMarkdown is not installed"));
|
debug(gettext("multimarkdown is enabled, but Text::MultiMarkdown is not installed"));
|
||||||
}
|
}
|
||||||
$markdown_sub=sub {
|
$markdown_sub=sub {
|
||||||
Text::MultiMarkdown::markdown(shift, {use_metadata => 0});
|
Text::MultiMarkdown::markdown(shift, {use_metadata => 0});
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
else {
|
if (! defined $markdown_sub) {
|
||||||
eval q{use Text::Markdown};
|
eval q{use Text::Markdown};
|
||||||
if (! $@) {
|
if (! $@) {
|
||||||
if (Text::Markdown->can('markdown')) {
|
if (Text::Markdown->can('markdown')) {
|
||||||
|
|
Loading…
Reference in New Issue