From eec482aa65ba5d6274cba803f527af974de35007 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Tue, 4 Mar 2008 20:29:52 -0500 Subject: [PATCH] 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.. --- IkiWiki/Plugin/mdwn.pm | 7 ++++++- debian/changelog | 5 ++--- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/IkiWiki/Plugin/mdwn.pm b/IkiWiki/Plugin/mdwn.pm index cabf44aa5..2ffe7bc3e 100644 --- a/IkiWiki/Plugin/mdwn.pm +++ b/IkiWiki/Plugin/mdwn.pm @@ -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" || diff --git a/debian/changelog b/debian/changelog index 1edab22fb..448de1723 100644 --- a/debian/changelog +++ b/debian/changelog @@ -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 Sun, 02 Mar 2008 17:46:38 +0100