test for Text::Markdown::[Mm]arkdown and use the available one

Markdown is such a splintered mess.. The current debian package provides
only Text::Markdown::Markdown, while all versions of Text::Markdown support
Text::Markdown::markdown, and old versions also support the capitalised version,
while new ones don't.

It's getting to the point where `grep /markdown/i %symbol_table` is the only
sane way to figure out what function to call..
master
Joey Hess 2008-03-04 20:29:52 -05:00
parent 0217eebf49
commit eec482aa65
2 changed files with 8 additions and 4 deletions

View File

@ -30,7 +30,12 @@ sub htmlize (@) { #{{{
else {
eval q{use Text::Markdown};
if (! $@) {
$markdown_sub=\&Text::Markdown::markdown;
if (Text::Markdown->can('markdown')) {
$markdown_sub=\&Text::Markdown::markdown;
}
else {
$markdown_sub=\&Text::Markdown::Markdown;
}
}
else {
do "/usr/bin/markdown" ||

5
debian/changelog vendored
View File

@ -14,9 +14,8 @@ ikiwiki (2.41) UNRELEASED; urgency=low
* rcs_diff is a new function that rcs modules should implement.
* Implemented rcs_diff for git, svn, and tla (tla version untested).
Mercurial and monotone still todo.
* Use Text::Markdown::markdown, since version 1.0.16 of Text::Markdown
no longer supports Text::Markdown::Markdown. All old versions of
Text::Markdown also support the lower-case version.
* Support Text::Markdown::markdown, which is the spelling used by
version 1.0.16 of Text::Markdown.
-- martin f. krafft <madduck@debian.org> Sun, 02 Mar 2008 17:46:38 +0100