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..

diff --git a/IkiWiki/Plugin/mdwn.pm b/IkiWiki/Plugin/mdwn.pm
index cabf44aa57ba11d7516ea3e110a7f39f0f3e450a..2ffe7bc3e6b8cc1656fcba3998cde0e81258fc55 100644 (file)
--- a/IkiWiki/Plugin/mdwn.pm
+++ b/IkiWiki/Plugin/mdwn.pm
@@ -30,7 +30,12 @@ sub htmlize (@) { #{{{
                else {
                        eval q{use Text::Markdown};
                        if (! $@) {
                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" ||
                        }
                        else {
                                do "/usr/bin/markdown" ||

diff --git a/debian/changelog b/debian/changelog
index 1edab22fb4165d5d6f75a98051f8705b77c3f97c..448de17237c0e7ea5e8c6f7c06ded4199dc7a5c5 100644 (file)
--- 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.
   * 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
 
 
  -- martin f. krafft <madduck@debian.org>  Sun, 02 Mar 2008 17:46:38 +0100