summaryrefslogtreecommitdiff
path: root/IkiWiki
diff options
context:
space:
mode:
authorjoey <joey@0fa5a96a-9a0e-0410-b3b2-a0fd24251071>2006-09-16 01:50:29 +0000
committerjoey <joey@0fa5a96a-9a0e-0410-b3b2-a0fd24251071>2006-09-16 01:50:29 +0000
commit0df2ad5dfe1d896520eceabfe362891f68ed3165 (patch)
treed98d17cc42fa6329f424197d27192675c934087e /IkiWiki
parent2c74603157482ee4ed15c650ba5a818a5395c0da (diff)
* Support Text::Markdown from CPAN, which has a different interface from
the original markdown or the one in Debian.
Diffstat (limited to 'IkiWiki')
-rw-r--r--IkiWiki/Plugin/mdwn.pm22
1 files changed, 14 insertions, 8 deletions
diff --git a/IkiWiki/Plugin/mdwn.pm b/IkiWiki/Plugin/mdwn.pm
index 0fc077f5e..c871e2a4d 100644
--- a/IkiWiki/Plugin/mdwn.pm
+++ b/IkiWiki/Plugin/mdwn.pm
@@ -10,28 +10,34 @@ sub import { #{{{
hook(type => "htmlize", id => "mdwn", call => \&htmlize);
} # }}}
-my $markdown_loaded=0;
+my $markdown_sub;
sub htmlize (@) { #{{{
my %params=@_;
my $content = $params{content};
- if (! $markdown_loaded) {
- # Note: This hack to make markdown run as a proper perl
- # module. A proper perl module is available in Debian
- # for markdown, but not upstream yet.
+ if (! defined $markdown_sub) {
+ # Markdown is forked and splintered upstream and can be
+ # available in a variety of incompatible forms. Support
+ # them all.
no warnings 'once';
$blosxom::version="is a proper perl module too much to ask?";
use warnings 'all';
eval q{use Markdown};
- if ($@) {
+ if (! $@) {
+ $markdown_sub=\&Markdown::Markdown;
+ }
+ else {
eval q{use Text::Markdown};
- if ($@) {
+ if (! $@) {
+ $markdown_sub=\&Text::Markdown::Markdown;
+ }
+ else {
do "/usr/bin/markdown" ||
error("failed to load Markdown.pm perl module ($@) or /usr/bin/markdown ($!)");
+ $markdown_sub=\&Markdown::Markdown;
}
}
- $markdown_loaded=1;
require Encode;
}