X-Git-Url: https://sipb.mit.edu/gitweb.cgi/ikiwiki.git/blobdiff_plain/d534483b9befc360b3d973091b1b7f5692f15a6e..8d4c474f3b92ed2d0e8f968e34a5c6d9d30921fe:/IkiWiki/Render.pm

diff --git a/IkiWiki/Render.pm b/IkiWiki/Render.pm
index 0dfa03cd4..404726930 100644
--- 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,18 +25,8 @@ sub htmlize ($$) { #{{{
 	my $type=shift;
 	my $content=shift;
 	
-	if (! $INC{"/usr/bin/markdown"}) {
-		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') {
-		# Markdown does character based stuff that does not work
-		# well with utf-8 strings.
-		$content=Encode::decode_utf8(Markdown::Markdown(Encode::encode_utf8($content)));
+	if (exists $hooks{htmlize}{$type}) {
+		$content=$hooks{htmlize}{$type}{call}->($content);
 	}
 	else {
 		error("htmlization of $type not supported");
@@ -168,8 +159,7 @@ sub genpage ($$$) { #{{{
 
 	my $title=pagetitle(basename($page));
 	
-	my $template=HTML::Template->new(blind_cache => 1,
-		filename => "$config{templatedir}/page.tmpl");
+	my $template=template("page.tmpl", blind_cache => 1);
 	my $actions=0;
 
 	if (length $config{cgiurl}) {
@@ -222,23 +212,18 @@ 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");
 	}
 } #}}}
 
 sub displaytime ($) { #{{{
 	my $time=shift;
 
-	if ($config{timeformat} eq '%c') {
-		return scalar(localtime($time)); # optimisation
-	}
-	else {
-		eval q{use POSIX};
-		return POSIX::strftime($config{timeformat}, localtime($time));
-	}
+	eval q{use POSIX};
+	# strftime doesn't know about encodings, so make sure
+	# its output is properly treated as utf8
+	return Encode::decode_utf8(POSIX::strftime(
+			$config{timeformat}, localtime($time)));
 } #}}}
 
 sub mtime ($) { #{{{
@@ -270,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};
@@ -325,6 +310,7 @@ sub refresh () { #{{{
 	find({
 		no_chdir => 1,
 		wanted => sub {
+			$_ = Encode::decode_utf8($_);
 			if (/$config{wiki_file_prune_regexp}/) {
 				$File::Find::prune=1;
 			}
@@ -344,6 +330,7 @@ sub refresh () { #{{{
 	find({
 		no_chdir => 1,
 		wanted => sub {
+			$_ = Encode::decode_utf8($_);
 			if (/$config{wiki_file_prune_regexp}/) {
 				$File::Find::prune=1;
 			}
@@ -403,7 +390,7 @@ sub refresh () { #{{{
 		
 		if (! exists $oldpagemtime{$page} ||
 		    mtime(srcfile($file)) > $oldpagemtime{$page}) {
-		    	debug("rendering changed file $file");
+		    	debug("rendering $file");
 			render($file);
 			$rendered{$file}=1;
 		}