X-Git-Url: https://sipb.mit.edu/gitweb.cgi/ikiwiki.git/blobdiff_plain/b0e7e2e123079a2e68924cfb90d19c44571b1f65..f877845353e5f8cfe6d3bdad625b9c2bacee878e:/IkiWiki.pm?ds=sidebyside

diff --git a/IkiWiki.pm b/IkiWiki.pm
index a2af406a9..d7c082b1d 100644
--- a/IkiWiki.pm
+++ b/IkiWiki.pm
@@ -3,8 +3,8 @@
 package IkiWiki;
 use warnings;
 use strict;
-use File::Spec;
-use HTML::Template;
+use Encode;
+use open qw{:utf8 :std};
 
 use vars qw{%config %links %oldlinks %oldpagemtime %pagectime
             %renderedfiles %pagesources %depends %hooks};
@@ -16,7 +16,7 @@ sub defaultconfig () { #{{{
 	wiki_file_regexp => qr/(^[-[:alnum:]_.:\/+]+$)/,
 	verbose => 0,
 	wikiname => "wiki",
-	default_pageext => ".mdwn",
+	default_pageext => "mdwn",
 	cgi => 0,
 	rcs => 'svn',
 	notify => 0,
@@ -42,7 +42,7 @@ sub defaultconfig () { #{{{
 	setup => undef,
 	adminuser => undef,
 	adminemail => undef,
-	plugin => [qw{inline htmlscrubber}],
+	plugin => [qw{mdwn inline htmlscrubber}],
 	timeformat => '%c',
 } #}}}
 	    
@@ -123,12 +123,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 ($) { #{{{
@@ -136,7 +134,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;
 } #}}}
 
@@ -164,12 +162,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;
@@ -201,12 +194,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;
 } #}}}
@@ -304,6 +292,7 @@ sub htmllink ($$$;$$$) { #{{{
 			"\">?</a>$linktext</span>"
 	}
 	
+	require File::Spec;
 	$bestlink=File::Spec->abs2rel($bestlink, dirname($page));
 	
 	if (! $noimageinline && isinlinableimage($bestlink)) {
@@ -390,13 +379,26 @@ sub saveindex () { #{{{
 	close OUT;
 } #}}}
 
+sub template_params (@) { #{{{
+	my $filename=shift;
+	
+	require HTML::Template;
+	return filter => sub {
+			my $text_ref = shift;
+			$$text_ref=&Encode::decode_utf8($$text_ref);
+		},
+		filename => "$config{templatedir}/$filename", @_;
+} #}}}
+
+sub template ($;@) { #{{{
+	HTML::Template->new(template_params(@_));
+} #}}}
+
 sub misctemplate ($$) { #{{{
 	my $title=shift;
 	my $pagebody=shift;
 	
-	my $template=HTML::Template->new(
-		filename => "$config{templatedir}/misc.tmpl"
-	);
+	my $template=template("misc.tmpl");
 	$template->param(
 		title => $title,
 		indexlink => indexlink(),