* Patch from Recai to fix utf8 issues in git backend.

[ikiwiki.git] / IkiWiki.pm

diff --git a/IkiWiki.pm b/IkiWiki.pm
index e86581415c9ff5ef12fe4fc6ca89174eb3646aa8..d8b2721250e924472d94d72dcc0c88e10dedbbbc 100644 (file)
--- a/IkiWiki.pm
+++ b/IkiWiki.pm
@@ -3,6 +3,12 @@
 package IkiWiki;
 use warnings;
 use strict;
+use Encode;
+use open qw{:utf8 :std};
+
+# Optimisation.
+use Memoize;
+memoize("abs2rel");
 
 use vars qw{%config %links %oldlinks %oldpagemtime %pagectime
             %renderedfiles %pagesources %depends %hooks};
@@ -14,7 +20,7 @@ sub defaultconfig () { #{{{
        wiki_file_regexp => qr/(^[-[:alnum:]_.:\/+]+$)/,
        verbose => 0,
        wikiname => "wiki",
-       default_pageext => ".mdwn",
+       default_pageext => "mdwn",
        cgi => 0,
        rcs => 'svn',
        notify => 0,
@@ -40,7 +46,7 @@ sub defaultconfig () { #{{{
        setup => undef,
        adminuser => undef,
        adminemail => undef,
-       plugin => [qw{inline htmlscrubber}],
+       plugin => [qw{mdwn inline htmlscrubber}],
        timeformat => '%c',
 } #}}}
            
@@ -121,12 +127,10 @@ sub dirname ($) { #{{{
 sub pagetype ($) { #{{{
        my $page=shift;
        
-       if ($page =~ /\.mdwn$/) {
-               return ".mdwn";
-       }
-       else {
-               return "unknown";
+       if ($page =~ /\.([^.]+)$/) {
+               return $1 if exists $hooks{htmlize}{$1};
        }
+       return undef;
 } #}}}
 
 sub pagename ($) { #{{{
@@ -134,7 +138,7 @@ sub pagename ($) { #{{{
 
        my $type=pagetype($file);
        my $page=$file;
-       $page=~s/\Q$type\E*$// unless $type eq 'unknown';
+       $page=~s/\Q.$type\E*$// if defined $type;
        return $page;
 } #}}}
 
@@ -162,12 +166,7 @@ sub readfile ($;$) { #{{{
        
        local $/=undef;
        open (IN, $file) || error("failed to read $file: $!");
-       if (! $binary) {
-               binmode(IN, ":utf8");
-       }
-       else {
-               binmode(IN);
-       }
+       binmode(IN) if ($binary);
        my $ret=<IN>;
        close IN;
        return $ret;
@@ -199,12 +198,7 @@ sub writefile ($$$;$) { #{{{
        }
        
        open (OUT, ">$destdir/$file") || error("failed to write $destdir/$file: $!");
-       if (! $binary) {
-               binmode(OUT, ":utf8");
-       }
-       else {
-               binmode(OUT);
-       }
+       binmode(OUT) if ($binary);
        print OUT $content;
        close OUT;
 } #}}}
@@ -270,6 +264,19 @@ sub styleurl (;$) { #{{{
        return $page."style.css";
 } #}}}
 
+sub abs2rel ($$) {
+       # Work around very innefficient behavior in File::Spec if abs2rel
+       # is passed two relative paths. It's much faster if paths are
+       # absolute!
+       my $path="/".shift;
+       my $base="/".shift;
+
+       require File::Spec;
+       my $ret=File::Spec->abs2rel($path, $base);
+       $ret=~s/^// if defined $ret;
+       return $ret;
+}
+
 sub htmllink ($$$;$$$) { #{{{
        my $lpage=shift; # the page doing the linking
        my $page=shift; # the page that will contain the link (different for inline)
@@ -302,8 +309,7 @@ sub htmllink ($$$;$$$) { #{{{
                        "\">?</a>$linktext</span>"
        }
        
-       require File::Spec;
-       $bestlink=File::Spec->abs2rel($bestlink, dirname($page));
+       $bestlink=abs2rel($bestlink, dirname($page));
        
        if (! $noimageinline && isinlinableimage($bestlink)) {
                return "<img src=\"$bestlink\" alt=\"$linktext\" />";
@@ -392,7 +398,6 @@ sub saveindex () { #{{{
 sub template_params (@) { #{{{
        my $filename=shift;
        
-       require Encode;
        require HTML::Template;
        return filter => sub {
                        my $text_ref = shift;