fix

[git.ikiwiki.info.git] / IkiWiki / Render.pm

diff --git a/IkiWiki/Render.pm b/IkiWiki/Render.pm
index e778ff20c93b25a5b28a297e418e71209b1b685a..40472693084d905b00373f504a57a1069aff871b 100644 (file)
--- a/IkiWiki/Render.pm
+++ b/IkiWiki/Render.pm
@@ -6,6 +6,7 @@ use warnings;
 use strict;
 use File::Spec;
 use IkiWiki;
+use Encode;
 
 sub linkify ($$$) { #{{{
        my $lpage=shift;
@@ -24,23 +25,8 @@ sub htmlize ($$) { #{{{
        my $type=shift;
        my $content=shift;
        
-       if (! $INC{"/usr/bin/markdown"}) {
-               # Note: a proper perl module is available in Debian
-               # for markdown, but not upstream yet.
-               no warnings 'once';
-               $blosxom::version="is a proper perl module too much to ask?";
-               use warnings 'all';
-               do "/usr/bin/markdown";
-               require Encode;
-       }
-       
-       if ($type eq '.mdwn') {
-               # Workaround for perl bug (#376329)
-               $content=Encode::encode_utf8($content);
-               $content=Encode::encode_utf8($content);
-               $content=Markdown::Markdown($content);
-               $content=Encode::decode_utf8($content);
-               $content=Encode::decode_utf8($content);
+       if (exists $hooks{htmlize}{$type}) {
+               $content=$hooks{htmlize}{$type}{call}->($content);
        }
        else {
                error("htmlization of $type not supported");
@@ -226,10 +212,7 @@ sub check_overwrite ($$) { #{{{
        my $src=shift;
        
        if (! exists $renderedfiles{$src} && -e $dest && ! $config{rebuild}) {
-               error("$dest already exists and was rendered from ".
-                       join(" ",(grep { $renderedfiles{$_} eq $dest } keys
-                               %renderedfiles)).
-                       ", before, so not rendering from $src");
+               error("$dest already exists and was not rendered from $src before");
        }
 } #}}}
 
@@ -272,7 +255,7 @@ sub render ($) { #{{{
        
        my $type=pagetype($file);
        my $srcfile=srcfile($file);
-       if ($type ne 'unknown') {
+       if (defined $type) {
                my $content=readfile($srcfile);
                my $page=pagename($file);
                delete $depends{$page};
@@ -324,7 +307,6 @@ sub refresh () { #{{{
        my %exists;
        my @files;
        eval q{use File::Find};
-       require Encode;
        find({
                no_chdir => 1,
                wanted => sub {