X-Git-Url: https://sipb.mit.edu/gitweb.cgi/ikiwiki.git/blobdiff_plain/6652de5e1abcaac3ee2f4bf17e5a4b847fcadb0d..0cd2cfb0393d52cadf162b4f1062033ea728eedb:/IkiWiki/Render.pm

diff --git a/IkiWiki/Render.pm b/IkiWiki/Render.pm
index 9feaa6da7..d4e498188 100644
--- a/IkiWiki/Render.pm
+++ b/IkiWiki/Render.pm
@@ -7,13 +7,14 @@ use strict;
 use File::Spec;
 use IkiWiki;
 
-sub linkify ($$) { #{{{
-	my $content=shift;
+sub linkify ($$$) { #{{{
+	my $lpage=shift;
 	my $page=shift;
+	my $content=shift;
 
 	$content =~ s{(\\?)$config{wiki_link_regexp}}{
-		$2 ? ( $1 ? "[[$2|$3]]" : htmllink($page, titlepage($3), 0, 0, pagetitle($2)))
-		   : ( $1 ? "[[$3]]" :    htmllink($page, titlepage($3)))
+		$2 ? ( $1 ? "[[$2|$3]]" : htmllink($lpage, $page, titlepage($3), 0, 0, pagetitle($2)))
+		   : ( $1 ? "[[$3]]" :    htmllink($lpage, $page, titlepage($3)))
 	}eg;
 	
 	return $content;
@@ -28,10 +29,11 @@ sub htmlize ($$) { #{{{
 		$blosxom::version="is a proper perl module too much to ask?";
 		use warnings 'all';
 		do "/usr/bin/markdown";
+		use Encode;
 	}
 	
 	if ($type eq '.mdwn') {
-		$content=Markdown::Markdown($content);
+		$content=Encode::decode_utf8(Markdown::Markdown(Encode::encode_utf8($content)));
 	}
 	else {
 		error("htmlization of $type not supported");
@@ -91,9 +93,10 @@ sub parentlinks ($) { #{{{
 	return @ret;
 } #}}}
 
-sub preprocess ($$) { #{{{
+sub preprocess ($$;$) { #{{{
 	my $page=shift;
 	my $content=shift;
+	my $onlystrip=shift || 0; # strip directives without processing
 
 	my $handle=sub {
 		my $escape=shift;
@@ -102,12 +105,17 @@ sub preprocess ($$) { #{{{
 		if (length $escape) {
 			return "[[$command $params]]";
 		}
+		elsif ($onlystrip) {
+			return "";
+		}
 		elsif (exists $hooks{preprocess}{$command}) {
-			my %params;
-			while ($params =~ /(\w+)=\"([^"]+)"(\s+|$)/g) {
-				$params{$1}=$2;
+			# Note: preserve order of params, some plugins may
+			# consider it significant.
+			my @params;
+			while ($params =~ /(\w+)=\"?([^"]+)"?(\s+|$)/g) {
+				push @params, $1, $2;
 			}
-			return $hooks{preprocess}{$command}{call}->(page => $page, %params);
+			return $hooks{preprocess}{$command}{call}->(@params, page => $page);
 		}
 		else {
 			return "[[$command not processed]]";
@@ -152,29 +160,39 @@ sub globlist_merge ($$) { #{{{
 } #}}}
 
 sub genpage ($$$) { #{{{
-	my $content=shift;
 	my $page=shift;
+	my $content=shift;
 	my $mtime=shift;
 
 	my $title=pagetitle(basename($page));
 	
 	my $template=HTML::Template->new(blind_cache => 1,
 		filename => "$config{templatedir}/page.tmpl");
-	
+	my $actions=0;
+
 	if (length $config{cgiurl}) {
 		$template->param(editurl => cgiurl(do => "edit", page => $page));
 		$template->param(prefsurl => cgiurl(do => "prefs"));
 		if ($config{rcs}) {
 			$template->param(recentchangesurl => cgiurl(do => "recentchanges"));
 		}
+		$actions++;
 	}
 
 	if (length $config{historyurl}) {
 		my $u=$config{historyurl};
 		$u=~s/\[\[file\]\]/$pagesources{$page}/g;
 		$template->param(historyurl => $u);
+		$actions++;
+	}
+	if ($config{discussion}) {
+		$template->param(discussionlink => htmllink($page, $page, "Discussion", 1, 1));
+		$actions++;
+	}
+
+	if ($actions) {
+		$template->param(have_actions => 1);
 	}
-	$template->param(headercontent => $config{headercontent});
 
 	$template->param(
 		title => $title,
@@ -182,10 +200,15 @@ sub genpage ($$$) { #{{{
 		parentlinks => [parentlinks($page)],
 		content => $content,
 		backlinks => [backlinks($page)],
-		discussionlink => htmllink($page, "Discussion", 1, 1),
-		mtime => scalar(gmtime($mtime)),
+		mtime => displaytime($mtime),
 		styleurl => styleurl($page),
 	);
+
+	if (exists $hooks{pagetemplate}) {
+		foreach my $id (keys %{$hooks{pagetemplate}}) {
+			$hooks{pagetemplate}{$id}{call}->($page, $template);
+		}
+	}
 	
 	return $template->output;
 } #}}}
@@ -204,6 +227,18 @@ sub check_overwrite ($$) { #{{{
 	}
 } #}}}
 
+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));
+	}
+} #}}}
+
 sub mtime ($) { #{{{
 	my $file=shift;
 	
@@ -211,16 +246,21 @@ sub mtime ($) { #{{{
 } #}}}
 
 sub findlinks ($$) { #{{{
-	my $content=shift;
 	my $page=shift;
+	my $content=shift;
 
 	my @links;
 	while ($content =~ /(?<!\\)$config{wiki_link_regexp}/g) {
 		push @links, titlepage($2);
 	}
-	# Discussion links are a special case since they're not in the text
-	# of the page, but on its template.
-	return @links, "$page/discussion";
+	if ($config{discussion}) {
+		# Discussion links are a special case since they're not in the
+		# text of the page, but on its template.
+		return @links, "$page/discussion";
+	}
+	else {
+		return @links;
+	}
 } #}}}
 
 sub render ($) { #{{{
@@ -242,15 +282,15 @@ sub render ($) { #{{{
 			}
 		}
 		
-		$links{$page}=[findlinks($content, $page)];
+		$links{$page}=[findlinks($page, $content)];
 		
-		$content=linkify($content, $page);
+		$content=linkify($page, $page, $content);
 		$content=preprocess($page, $content);
 		$content=htmlize($type, $content);
 		
 		check_overwrite("$config{destdir}/".htmlpage($page), $page);
 		writefile(htmlpage($page), $config{destdir},
-			genpage($content, $page, mtime($srcfile)));
+			genpage($page, $content, mtime($srcfile)));
 		$oldpagemtime{$page}=time;
 		$renderedfiles{$page}=htmlpage($page);
 	}
@@ -335,8 +375,12 @@ sub refresh () { #{{{
 			push @add, $file;
 			$links{$page}=[];
 			$pagesources{$page}=$file;
-			$pagectime{$page}=mtime(srcfile($file))
-				unless exists $pagectime{$page};
+			if ($config{getctime} && -e "$config{srcdir}/$file") {
+				$pagectime{$page}=rcs_getctime("$config{srcdir}/$file");
+			}
+			elsif (! exists $pagectime{$page}) {
+				$pagectime{$page}=mtime(srcfile($file));
+			}
 		}
 	}
 	my @del;
@@ -386,7 +430,7 @@ FILE:		foreach my $file (@files) {
 	}
 
 	# Handle backlinks; if a page has added/removed links, update the
-	# pages it links to. Also handles rebuilding dependat pages.
+	# pages it links to. Also handles rebuilding dependant pages.
 	# TODO: inefficient; pages may get rendered above and again here;
 	# problem is the backlinks could be wrong in the first pass render
 	# above