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

diff --git a/IkiWiki/Render.pm b/IkiWiki/Render.pm
index d4e498188..308d60ed0 100644
--- a/IkiWiki/Render.pm
+++ b/IkiWiki/Render.pm
@@ -4,308 +4,256 @@ package IkiWiki;
 
 use warnings;
 use strict;
-use File::Spec;
 use IkiWiki;
-
-sub linkify ($$$) { #{{{
-	my $lpage=shift;
-	my $page=shift;
-	my $content=shift;
-
-	$content =~ s{(\\?)$config{wiki_link_regexp}}{
-		$2 ? ( $1 ? "[[$2|$3]]" : htmllink($lpage, $page, titlepage($3), 0, 0, pagetitle($2)))
-		   : ( $1 ? "[[$3]]" :    htmllink($lpage, $page, titlepage($3)))
-	}eg;
-	
-	return $content;
-} #}}}
-
-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";
-		use Encode;
-	}
-	
-	if ($type eq '.mdwn') {
-		$content=Encode::decode_utf8(Markdown::Markdown(Encode::encode_utf8($content)));
-	}
-	else {
-		error("htmlization of $type not supported");
-	}
-
-	if (exists $hooks{sanitize}) {
-		foreach my $id (keys %{$hooks{sanitize}}) {
-			$content=$hooks{sanitize}{$id}{call}->($content);
+use Encode;
+
+my (%backlinks, %rendered);
+our %brokenlinks;
+my $links_calculated=0;
+
+sub calculate_links () {
+	return if $links_calculated;
+	%backlinks=%brokenlinks=();
+	foreach my $page (keys %links) {
+		foreach my $link (@{$links{$page}}) {
+			my $bestlink=bestlink($page, $link);
+			if (length $bestlink) {
+				$backlinks{$bestlink}{$page}=1
+					if $bestlink ne $page;
+			}
+			else {
+				push @{$brokenlinks{$link}}, $page;
+			}
 		}
 	}
-	
-	return $content;
-} #}}}
+	$links_calculated=1;
+}
 
-sub backlinks ($) { #{{{
+sub backlink_pages ($) {
 	my $page=shift;
 
-	my @links;
-	foreach my $p (keys %links) {
-		next if bestlink($page, $p) eq $page;
-		if (grep { length $_ && bestlink($p, $_) eq $page } @{$links{$p}}) {
-			my $href=File::Spec->abs2rel(htmlpage($p), dirname($page));
-			
-			# Trim common dir prefixes from both pages.
-			my $p_trimmed=$p;
-			my $page_trimmed=$page;
-			my $dir;
-			1 while (($dir)=$page_trimmed=~m!^([^/]+/)!) &&
-			        defined $dir &&
-			        $p_trimmed=~s/^\Q$dir\E// &&
-			        $page_trimmed=~s/^\Q$dir\E//;
-				       
-			push @links, { url => $href, page => $p_trimmed };
-		}
-	}
-
-	return sort { $a->{page} cmp $b->{page} } @links;
-} #}}}
-
-sub parentlinks ($) { #{{{
-	my $page=shift;
-	
-	my @ret;
-	my $pagelink="";
-	my $path="";
-	my $skip=1;
-	foreach my $dir (reverse split("/", $page)) {
-		if (! $skip) {
-			$path.="../";
-			unshift @ret, { url => "$path$dir.html", page => $dir };
-		}
-		else {
-			$skip=0;
-		}
-	}
-	unshift @ret, { url => length $path ? $path : ".", page => $config{wikiname} };
-	return @ret;
-} #}}}
+	calculate_links();
 
-sub preprocess ($$;$) { #{{{
-	my $page=shift;
-	my $content=shift;
-	my $onlystrip=shift || 0; # strip directives without processing
-
-	my $handle=sub {
-		my $escape=shift;
-		my $command=shift;
-		my $params=shift;
-		if (length $escape) {
-			return "[[$command $params]]";
-		}
-		elsif ($onlystrip) {
-			return "";
-		}
-		elsif (exists $hooks{preprocess}{$command}) {
-			# 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}->(@params, page => $page);
-		}
-		else {
-			return "[[$command not processed]]";
-		}
-	};
-	
-	$content =~ s{(\\?)$config{wiki_processor_regexp}}{$handle->($1, $2, $3)}eg;
-	return $content;
-} #}}}
+	return keys %{$backlinks{$page}};
+}
 
-sub add_depends ($$) { #{{{
+sub backlinks ($) {
 	my $page=shift;
-	my $globlist=shift;
-	
-	if (! exists $depends{$page}) {
-		$depends{$page}=$globlist;
-	}
-	else {
-		$depends{$page}=globlist_merge($depends{$page}, $globlist);
-	}
-} # }}}
-
-sub globlist_merge ($$) { #{{{
-	my $a=shift;
-	my $b=shift;
 
-	my $ret="";
-	# Only add negated globs if they are not matched by the other globlist.
-	foreach my $i ((map { [ $a, $_ ] } split(" ", $b)), 
-	               (map { [ $b, $_ ] } split(" ", $a))) {
-		if ($i->[1]=~/^!(.*)/) {
-			if (! globlist_match($1, $i->[0])) {
-				$ret.=" ".$i->[1];
-			}
-		}
-		else {
-			$ret.=" ".$i->[1];
-		}
+	my @links;
+	foreach my $p (backlink_pages($page)) {
+		my $href=urlto($p, $page);
+                
+		# Trim common dir prefixes from both pages.
+		my $p_trimmed=$p;
+		my $page_trimmed=$page;
+		my $dir;
+		1 while (($dir)=$page_trimmed=~m!^([^/]+/)!) &&
+		        defined $dir &&
+		        $p_trimmed=~s/^\Q$dir\E// &&
+		        $page_trimmed=~s/^\Q$dir\E//;
+			       
+		push @links, { url => $href, page => pagetitle($p_trimmed) };
 	}
-	
-	return $ret;
-} #}}}
+	return @links;
+}
 
-sub genpage ($$$) { #{{{
+sub genpage ($$) {
 	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");
+	run_hooks(postscan => sub {
+		shift->(page => $page, content => $content);
+	});
+
+	my $templatefile;
+	run_hooks(templatefile => sub {
+		return if defined $templatefile;
+		my $file=shift->(page => $page);
+		if (defined $file && defined template_file($file)) {
+			$templatefile=$file;
+		}
+	});
+	my $template=template(defined $templatefile ? $templatefile : 'page.tmpl', blind_cache => 1);
 	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"));
-		}
+		$template->param(editurl => cgiurl(do => "edit", page => $page))
+			if IkiWiki->can("cgi_editpage");
+		$template->param(prefsurl => cgiurl(do => "prefs"))
+			if exists $hooks{auth};
 		$actions++;
 	}
-
-	if (length $config{historyurl}) {
+		
+	if (defined $config{historyurl} && 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 ($page !~ /.*\/\Q$config{discussionpage}\E$/ &&
+		   (length $config{cgiurl} ||
+		    exists $links{$page."/".$config{discussionpage}})) {
+			$template->param(discussionlink => htmllink($page, $page, $config{discussionpage}, noimageinline => 1, forcesubpage => 1));
+			$actions++;
+		}
 	}
 
 	if ($actions) {
 		$template->param(have_actions => 1);
 	}
 
+	my @backlinks=sort { $a->{page} cmp $b->{page} } backlinks($page);
+	my ($backlinks, $more_backlinks);
+	if (@backlinks <= $config{numbacklinks} || ! $config{numbacklinks}) {
+		$backlinks=\@backlinks;
+		$more_backlinks=[];
+	}
+	else {
+		$backlinks=[@backlinks[0..$config{numbacklinks}-1]];
+		$more_backlinks=[@backlinks[$config{numbacklinks}..$#backlinks]];
+	}
+
 	$template->param(
-		title => $title,
+		title => $page eq 'index' 
+			? $config{wikiname} 
+			: pagetitle(basename($page)),
 		wikiname => $config{wikiname},
-		parentlinks => [parentlinks($page)],
 		content => $content,
-		backlinks => [backlinks($page)],
-		mtime => displaytime($mtime),
-		styleurl => styleurl($page),
+		backlinks => $backlinks,
+		more_backlinks => $more_backlinks,
+		mtime => displaytime($pagemtime{$page}),
+		ctime => displaytime($pagectime{$page}),
+		baseurl => baseurl($page),
 	);
 
-	if (exists $hooks{pagetemplate}) {
-		foreach my $id (keys %{$hooks{pagetemplate}}) {
-			$hooks{pagetemplate}{$id}{call}->($page, $template);
-		}
-	}
+	run_hooks(pagetemplate => sub {
+		shift->(page => $page, destpage => $page, template => $template);
+	});
 	
-	return $template->output;
-} #}}}
-
-sub check_overwrite ($$) { #{{{
-	# Important security check. Make sure to call this before saving
-	# any files to the source directory.
-	my $dest=shift;
-	my $src=shift;
+	$content=$template->output;
 	
-	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");
-	}
-} #}}}
+	run_hooks(format => sub {
+		$content=shift->(
+			page => $page,
+			content => $content,
+		);
+	});
 
-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));
-	}
-} #}}}
+	return $content;
+}
 
-sub mtime ($) { #{{{
+sub scan ($) {
 	my $file=shift;
-	
-	return (stat($file))[9];
-} #}}}
 
-sub findlinks ($$) { #{{{
-	my $page=shift;
-	my $content=shift;
+	debug(sprintf(gettext("scanning %s"), $file));
 
-	my @links;
-	while ($content =~ /(?<!\\)$config{wiki_link_regexp}/g) {
-		push @links, titlepage($2);
-	}
-	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";
+	my $type=pagetype($file);
+	if (defined $type) {
+		my $srcfile=srcfile($file);
+		my $content=readfile($srcfile);
+		my $page=pagename($file);
+		will_render($page, htmlpage($page), 1);
+
+		if ($config{discussion}) {
+			# Discussion links are a special case since they're
+			# not in the text of the page, but on its template.
+			$links{$page}=[ $page."/".lc($config{discussionpage}) ];
+		}
+		else {
+			$links{$page}=[];
+		}
+
+		run_hooks(scan => sub {
+			shift->(
+				page => $page,
+				content => $content,
+			);
+		});
+
+		# Preprocess in scan-only mode.
+		preprocess($page, $page, $content, 1);
 	}
 	else {
-		return @links;
+		will_render($file, $file, 1);
 	}
-} #}}}
+}
+
+sub fast_file_copy (@) {
+	my $srcfile=shift;
+	my $destfile=shift;
+	my $srcfd=shift;
+	my $destfd=shift;
+	my $cleanup=shift;
+
+	my $blksize = 16384;
+	my ($len, $buf, $written);
+	while ($len = sysread $srcfd, $buf, $blksize) {
+		if (! defined $len) {
+			next if $! =~ /^Interrupted/;
+			error("failed to read $srcfile: $!", $cleanup);
+		}
+		my $offset = 0;
+		while ($len) {
+			defined($written = syswrite $destfd, $buf, $len, $offset)
+				or error("failed to write $destfile: $!", $cleanup);
+			$len -= $written;
+			$offset += $written;
+		}
+	}
+}
 
-sub render ($) { #{{{
+sub render ($$) {
 	my $file=shift;
+	return if $rendered{$file};
+	debug(shift);
+	$rendered{$file}=1;
 	
 	my $type=pagetype($file);
 	my $srcfile=srcfile($file);
-	if ($type ne 'unknown') {
-		my $content=readfile($srcfile);
+	if (defined $type) {
 		my $page=pagename($file);
 		delete $depends{$page};
+		delete $depends_simple{$page};
+		will_render($page, htmlpage($page), 1);
+		return if $type=~/^_/;
 		
-		if (exists $hooks{filter}) {
-			foreach my $id (keys %{$hooks{filter}}) {
-				$content=$hooks{filter}{$id}{call}->(
-					page => $page,
-					content => $content
-				);
-			}
-		}
-		
-		$links{$page}=[findlinks($page, $content)];
-		
-		$content=linkify($page, $page, $content);
-		$content=preprocess($page, $content);
-		$content=htmlize($type, $content);
+		my $content=htmlize($page, $page, $type,
+			linkify($page, $page,
+			preprocess($page, $page,
+			filter($page, $page,
+			readfile($srcfile)))));
 		
-		check_overwrite("$config{destdir}/".htmlpage($page), $page);
-		writefile(htmlpage($page), $config{destdir},
-			genpage($page, $content, mtime($srcfile)));
-		$oldpagemtime{$page}=time;
-		$renderedfiles{$page}=htmlpage($page);
+		my $output=htmlpage($page);
+		writefile($output, $config{destdir}, genpage($page, $content));
 	}
 	else {
-		my $content=readfile($srcfile, 1);
-		$links{$file}=[];
 		delete $depends{$file};
-		check_overwrite("$config{destdir}/$file", $file);
-		writefile($file, $config{destdir}, $content, 1);
-		$oldpagemtime{$file}=time;
-		$renderedfiles{$file}=$file;
+		delete $depends_simple{$file};
+		will_render($file, $file, 1);
+		
+		if ($config{hardlink}) {
+			# only hardlink if owned by same user
+			my @stat=stat($srcfile);
+			if ($stat[4] == $>) {
+				prep_writefile($file, $config{destdir});
+				unlink($config{destdir}."/".$file);
+				if (link($srcfile, $config{destdir}."/".$file)) {
+					return;
+				}
+			}
+			# if hardlink fails, fall back to copying
+		}
+		
+		my $srcfd=readfile($srcfile, 1, 1);
+		writefile($file, $config{destdir}, undef, 1, sub {
+			fast_file_copy($srcfile, $file, $srcfd, @_);
+		});
 	}
-} #}}}
+}
 
-sub prune ($) { #{{{
+sub prune ($) {
 	my $file=shift;
 
 	unlink($file);
@@ -313,187 +261,448 @@ sub prune ($) { #{{{
 	while (rmdir($dir)) {
 		$dir=dirname($dir);
 	}
-} #}}}
+}
+
+sub srcdir_check () {
+	# security check, avoid following symlinks in the srcdir path by default
+	my $test=$config{srcdir};
+	while (length $test) {
+		if (-l $test && ! $config{allow_symlinks_before_srcdir}) {
+			error(sprintf(gettext("symlink found in srcdir path (%s) -- set allow_symlinks_before_srcdir to allow this"), $test));
+		}
+		unless ($test=~s/\/+$//) {
+			$test=dirname($test);
+		}
+	}
+	
+}
 
-sub refresh () { #{{{
-	# find existing pages
-	my %exists;
+sub find_src_files () {
 	my @files;
+	my %pages;
 	eval q{use File::Find};
+	error($@) if $@;
 	find({
 		no_chdir => 1,
 		wanted => sub {
-			if (/$config{wiki_file_prune_regexp}/) {
+			my $file=decode_utf8($_);
+			$file=~s/^\Q$config{srcdir}\E\/?//;
+			return if -l $_ || -d _ || ! length $file;
+			my $page = pagename($file);
+			if (! exists $pagesources{$page} &&
+			    file_pruned($file)) {
 				$File::Find::prune=1;
+				return;
 			}
-			elsif (! -d $_ && ! -l $_) {
-				my ($f)=/$config{wiki_file_regexp}/; # untaint
-				if (! defined $f) {
-					warn("skipping bad filename $_\n");
-				}
-				else {
-					$f=~s/^\Q$config{srcdir}\E\/?//;
-					push @files, $f;
-					$exists{pagename($f)}=1;
+
+			my ($f) = $file =~ /$config{wiki_file_regexp}/; # untaint
+			if (! defined $f) {
+				warn(sprintf(gettext("skipping bad filename %s"), $file)."\n");
+			}
+			else {
+				push @files, $f;
+				if ($pages{$page}) {
+					debug(sprintf(gettext("%s has multiple possible source pages"), $page));
 				}
+				$pages{$page}=1;
 			}
 		},
 	}, $config{srcdir});
-	find({
-		no_chdir => 1,
-		wanted => sub {
-			if (/$config{wiki_file_prune_regexp}/) {
-				$File::Find::prune=1;
-			}
-			elsif (! -d $_ && ! -l $_) {
-				my ($f)=/$config{wiki_file_regexp}/; # untaint
+	foreach my $dir (@{$config{underlaydirs}}, $config{underlaydir}) {
+		find({
+			no_chdir => 1,
+			wanted => sub {
+				my $file=decode_utf8($_);
+				$file=~s/^\Q$dir\E\/?//;
+				return if -l $_ || -d _ || ! length $file;
+				my $page=pagename($file);
+				if (! exists $pagesources{$page} &&
+				    file_pruned($file)) {
+					$File::Find::prune=1;
+					return;
+				}
+
+				my ($f) = $file =~ /$config{wiki_file_regexp}/; # untaint
 				if (! defined $f) {
-					warn("skipping bad filename $_\n");
+					warn(sprintf(gettext("skipping bad filename %s"), $file)."\n");
 				}
 				else {
-					# Don't add files that are in the
-					# srcdir.
-					$f=~s/^\Q$config{underlaydir}\E\/?//;
-					if (! -e "$config{srcdir}/$f" && 
-					    ! -l "$config{srcdir}/$f") {
-						push @files, $f;
-						$exists{pagename($f)}=1;
+					# avoid underlaydir override
+					# attacks; see security.mdwn
+					if (! -l "$config{srcdir}/$f" && 
+					    ! -e _) {
+						if (! $pages{$page}) {
+							push @files, $f;
+							$pages{$page}=1;
+						}
 					}
 				}
-			}
-		},
-	}, $config{underlaydir});
+			},
+		}, $dir);
+	};
+	return \@files, \%pages;
+}
 
-	my %rendered;
+sub find_new_files ($) {
+	my $files=shift;
+	my @new;
+	my @internal_new;
 
-	# check for added or removed pages
-	my @add;
-	foreach my $file (@files) {
+	foreach my $file (@$files) {
 		my $page=pagename($file);
-		if (! $oldpagemtime{$page}) {
-			debug("new page $page") unless exists $pagectime{$page};
-			push @add, $file;
-			$links{$page}=[];
-			$pagesources{$page}=$file;
-			if ($config{getctime} && -e "$config{srcdir}/$file") {
-				$pagectime{$page}=rcs_getctime("$config{srcdir}/$file");
+		if (exists $pagesources{$page} && $pagesources{$page} ne $file) {
+			# the page has changed its type
+			$forcerebuild{$page}=1;
+		}
+		$pagesources{$page}=$file;
+		if (! $pagemtime{$page}) {
+			if (isinternal($page)) {
+				push @internal_new, $file;
+			}
+			else {
+				push @new, $file;
+				if ($config{getctime} && -e "$config{srcdir}/$file") {
+					eval {
+						my $time=rcs_getctime("$config{srcdir}/$file");
+						$pagectime{$page}=$time;
+					};
+					if ($@) {
+						print STDERR $@;
+					}
+				}
 			}
-			elsif (! exists $pagectime{$page}) {
-				$pagectime{$page}=mtime(srcfile($file));
+			$pagecase{lc $page}=$page;
+			if (! exists $pagectime{$page}) {
+				$pagectime{$page}=(srcfile_stat($file))[10];
 			}
 		}
 	}
+
+	return \@new, \@internal_new;
+}
+
+sub find_del_files ($) {
+	my $pages=shift;
 	my @del;
-	foreach my $page (keys %oldpagemtime) {
-		if (! $exists{$page}) {
-			debug("removing old page $page");
-			push @del, $pagesources{$page};
-			prune($config{destdir}."/".$renderedfiles{$page});
-			delete $renderedfiles{$page};
-			$oldpagemtime{$page}=0;
-			delete $pagesources{$page};
+	my @internal_del;
+
+	foreach my $page (keys %pagemtime) {
+		if (! $pages->{$page}) {
+			if (isinternal($page)) {
+				push @internal_del, $pagesources{$page};
+			}
+			else {
+				push @del, $pagesources{$page};
+			}
+			$links{$page}=[];
+			$renderedfiles{$page}=[];
+			$pagemtime{$page}=0;
 		}
 	}
+
+	return \@del, \@internal_del;
+}
+
+sub remove_del (@) {
+	foreach my $file (@_) {
+		my $page=pagename($file);
+		if (! isinternal($page)) {
+			debug(sprintf(gettext("removing old page %s"), $page));
+		}
+	
+		foreach my $old (@{$oldrenderedfiles{$page}}) {
+			prune($config{destdir}."/".$old);
+		}
+
+		foreach my $source (keys %destsources) {
+			if ($destsources{$source} eq $page) {
+				delete $destsources{$source};
+			}
+		}
 	
-	# render any updated files
-	foreach my $file (@files) {
+		delete $pagecase{lc $page};
+		delete $pagesources{$page};
+	}
+}
+
+sub find_changed ($) {
+	my $files=shift;
+	my @changed;
+	my @internal_changed;
+	foreach my $file (@$files) {
 		my $page=pagename($file);
-		
-		if (! exists $oldpagemtime{$page} ||
-		    mtime(srcfile($file)) > $oldpagemtime{$page}) {
-		    	debug("rendering changed file $file");
-			render($file);
-			$rendered{$file}=1;
+		my ($srcfile, @stat)=srcfile_stat($file);
+		if (! exists $pagemtime{$page} ||
+		    $stat[9] > $pagemtime{$page} ||
+	    	    $forcerebuild{$page}) {
+			$pagemtime{$page}=$stat[9];
+
+			if (isinternal($page)) {
+				# Preprocess internal page in scan-only mode.
+				preprocess($page, $page, readfile($srcfile), 1);
+				push @internal_changed, $file;
+			}
+			else {
+				push @changed, $file;
+			}
 		}
 	}
-	
-	# if any files were added or removed, check to see if each page
-	# needs an update due to linking to them or inlining them.
-	# TODO: inefficient; pages may get rendered above and again here;
-	# problem is the bestlink may have changed and we won't know until
-	# now
-	if (@add || @del) {
-FILE:		foreach my $file (@files) {
-			my $page=pagename($file);
-			foreach my $f (@add, @del) {
-				my $p=pagename($f);
-				foreach my $link (@{$links{$page}}) {
-					if (bestlink($page, $link) eq $p) {
-		   				debug("rendering $file, which links to $p");
-						render($file);
-						$rendered{$file}=1;
-						next FILE;
-					}
-				}
+	return \@changed, \@internal_changed;
+}
+
+sub calculate_old_links ($$) {
+	my ($changed, $del)=@_;
+	my %oldlink_targets;
+	foreach my $file (@$changed, @$del) {
+		my $page=pagename($file);
+		if (exists $oldlinks{$page}) {
+			foreach my $l (@{$oldlinks{$page}}) {
+				$oldlink_targets{$page}{$l}=bestlink($page, $l);
 			}
 		}
 	}
+	return \%oldlink_targets;
+}
 
-	# Handle backlinks; if a page has added/removed links, update the
-	# 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
-	if (%rendered || @del) {
-		foreach my $f (@files) {
-			my $p=pagename($f);
-			if (exists $depends{$p}) {
-				foreach my $file (keys %rendered, @del) {
-					next if $f eq $file;
-					my $page=pagename($file);
-					if (globlist_match($page, $depends{$p})) {
-						debug("rendering $f, which depends on $page");
-						render($f);
-						$rendered{$f}=1;
-						last;
-					}
+sub derender_internal ($) {
+	my $file=shift;
+	my $page=pagename($file);
+	delete $depends{$page};
+	delete $depends_simple{$page};
+	foreach my $old (@{$renderedfiles{$page}}) {
+		delete $destsources{$old};
+	}
+	$renderedfiles{$page}=[];
+}
+
+sub render_linkers ($) {
+	my $f=shift;
+	my $p=pagename($f);
+	foreach my $page (keys %{$backlinks{$p}}) {
+		my $file=$pagesources{$page};
+		render($file, sprintf(gettext("building %s, which links to %s"), $file, $p));
+	}
+}
+
+sub remove_unrendered () {
+	foreach my $src (keys %rendered) {
+		my $page=pagename($src);
+		foreach my $file (@{$oldrenderedfiles{$page}}) {
+			if (! grep { $_ eq $file } @{$renderedfiles{$page}}) {
+				debug(sprintf(gettext("removing %s, no longer built by %s"), $file, $page));
+				prune($config{destdir}."/".$file);
+			}
+		}
+	}
+}
+
+sub calculate_changed_links ($$$) {
+	my ($changed, $del, $oldlink_targets)=@_;
+
+	my (%backlinkchanged, %linkchangers);
+
+	foreach my $file (@$changed, @$del) {
+		my $page=pagename($file);
+
+		if (exists $links{$page}) {
+			foreach my $l (@{$links{$page}}) {
+				my $target=bestlink($page, $l);
+				if (! exists $oldlink_targets->{$page}{$l} ||
+				    $target ne $oldlink_targets->{$page}{$l}) {
+					$backlinkchanged{$target}=1;
+					$linkchangers{lc($page)}=1;
 				}
+				delete $oldlink_targets->{$page}{$l};
 			}
 		}
-		
-		my %linkchanged;
-		foreach my $file (keys %rendered, @del) {
-			my $page=pagename($file);
-			
-			if (exists $links{$page}) {
-				foreach my $link (map { bestlink($page, $_) } @{$links{$page}}) {
-					if (length $link &&
-					    (! exists $oldlinks{$page} ||
-					     ! grep { bestlink($page, $_) eq $link } @{$oldlinks{$page}})) {
-						$linkchanged{$link}=1;
-					}
+		if (exists $oldlink_targets->{$page} &&
+		    %{$oldlink_targets->{$page}}) {
+			foreach my $target (values %{$oldlink_targets->{$page}}) {
+				$backlinkchanged{$target}=1;
+			}
+			$linkchangers{lc($page)}=1;
+		}
+	}
+
+	return \%backlinkchanged, \%linkchangers;
+}
+
+sub render_dependent ($$$$$$$) {
+	my ($files, $new, $internal_new, $del, $internal_del,
+		$internal_changed, $linkchangers)=@_;
+
+	my @changed=(keys %rendered, @$del);
+	my @exists_changed=(@$new, @$del);
+	
+	my %lc_changed = map { lc(pagename($_)) => 1 } @changed;
+	my %lc_exists_changed = map { lc(pagename($_)) => 1 } @exists_changed;
+	 
+	foreach my $f (@$files) {
+		next if $rendered{$f};
+		my $p=pagename($f);
+		my $reason = undef;
+	
+		if (exists $depends_simple{$p}) {
+			foreach my $d (keys %{$depends_simple{$p}}) {
+				if (($depends_simple{$p}{$d} & $IkiWiki::DEPEND_CONTENT &&
+				     $lc_changed{$d})
+				    ||
+				    ($depends_simple{$p}{$d} & $IkiWiki::DEPEND_PRESENCE &&
+				     $lc_exists_changed{$d})
+			     	    ||
+				    ($depends_simple{$p}{$d} & $IkiWiki::DEPEND_LINKS &&
+				     $linkchangers->{$d})
+		     		) {
+					$reason = $d;
+					last;
 				}
 			}
-			if (exists $oldlinks{$page}) {
-				foreach my $link (map { bestlink($page, $_) } @{$oldlinks{$page}}) {
-					if (length $link &&
-					    (! exists $links{$page} || 
-					     ! grep { bestlink($page, $_) eq $link } @{$links{$page}})) {
-						$linkchanged{$link}=1;
+		}
+	
+		if (exists $depends{$p} && ! defined $reason) {
+			foreach my $dep (keys %{$depends{$p}}) {
+				my $sub=pagespec_translate($dep);
+				next if $@ || ! defined $sub;
+
+				# only consider internal files
+				# if the page explicitly depends
+				# on such files
+				my $internal_dep=$dep =~ /internal\(/;
+
+				my $in=sub {
+					my $list=shift;
+					my $type=shift;
+					foreach my $file (@$list) {
+						next if $file eq $f;
+						my $page=pagename($file);
+						if ($sub->($page, location => $p)) {
+							if ($type == $IkiWiki::DEPEND_LINKS) {
+								next unless $linkchangers->{lc($page)};
+							}
+							return $page;
+						}
 					}
+					return undef;
+				};
+
+				if ($depends{$p}{$dep} & $IkiWiki::DEPEND_CONTENT) {
+					last if $reason =
+						$in->(\@changed, $IkiWiki::DEPEND_CONTENT);
+					last if $internal_dep && ($reason =
+						$in->($internal_new, $IkiWiki::DEPEND_CONTENT) ||
+						$in->($internal_del, $IkiWiki::DEPEND_CONTENT) ||
+						$in->($internal_changed, $IkiWiki::DEPEND_CONTENT));
+				}
+				if ($depends{$p}{$dep} & $IkiWiki::DEPEND_PRESENCE) {
+					last if $reason = 
+						$in->(\@exists_changed, $IkiWiki::DEPEND_PRESENCE);
+					last if $internal_dep && ($reason =
+						$in->($internal_new, $IkiWiki::DEPEND_PRESENCE) ||
+						$in->($internal_del, $IkiWiki::DEPEND_PRESENCE));
+				}
+				if ($depends{$p}{$dep} & $IkiWiki::DEPEND_LINKS) {
+					last if $reason =
+						$in->(\@changed, $IkiWiki::DEPEND_LINKS);
+					last if $internal_dep && ($reason =
+						$in->($internal_new, $IkiWiki::DEPEND_LINKS) ||
+						$in->($internal_del, $IkiWiki::DEPEND_LINKS) ||
+						$in->($internal_changed, $IkiWiki::DEPEND_LINKS));
 				}
 			}
 		}
-		foreach my $link (keys %linkchanged) {
-		    	my $linkfile=$pagesources{$link};
-			if (defined $linkfile) {
-				debug("rendering $linkfile, to update its backlinks");
-				render($linkfile);
-				$rendered{$linkfile}=1;
-			}
+	
+		if (defined $reason) {
+			render($f, sprintf(gettext("building %s, which depends on %s"), $f, $reason));
+			return 1;
 		}
 	}
 
-	if (@del && exists $hooks{delete}) {
-		foreach my $id (keys %{$hooks{delete}}) {
-			$hooks{delete}{$id}{call}->(@del);
+	return 0;
+}
+
+sub render_backlinks ($) {
+	my $backlinkchanged=shift;
+	foreach my $link (keys %$backlinkchanged) {
+		my $linkfile=$pagesources{$link};
+		if (defined $linkfile) {
+			render($linkfile, sprintf(gettext("building %s, to update its backlinks"), $linkfile));
 		}
 	}
-	if (%rendered && exists $hooks{change}) {
-		foreach my $id (keys %{$hooks{change}}) {
-			$hooks{change}{$id}{call}->(keys %rendered);
-		}
+}
+
+sub refresh () {
+	srcdir_check();
+	run_hooks(refresh => sub { shift->() });
+	my ($files, $pages)=find_src_files();
+	my ($new, $internal_new)=find_new_files($files);
+	my ($del, $internal_del)=find_del_files($pages);
+	my ($changed, $internal_changed)=find_changed($files);
+	run_hooks(needsbuild => sub { shift->($changed) });
+	my $oldlink_targets=calculate_old_links($changed, $del);
+
+	foreach my $file (@$changed) {
+		scan($file);
+	}
+
+	calculate_links();
+	
+	remove_del(@$del, @$internal_del);
+
+	foreach my $file (@$changed) {
+		render($file, sprintf(gettext("building %s"), $file));
+	}
+	foreach my $file (@$internal_new, @$internal_del, @$internal_changed) {
+		derender_internal($file);
+	}
+
+	my ($backlinkchanged, $linkchangers)=calculate_changed_links($changed,
+		$del, $oldlink_targets);
+
+	foreach my $file (@$new, @$del) {
+		render_linkers($file);
+	}
+	
+	if (@$changed || @$internal_changed ||
+	    @$del || @$internal_del || @$internal_new) {
+		1 while render_dependent($files, $new, $internal_new,
+			$del, $internal_del, $internal_changed,
+			$linkchangers);
+	}
+
+	render_backlinks($backlinkchanged);
+	remove_unrendered();
+
+	if (@$del) {
+		run_hooks(delete => sub { shift->(@$del) });
+	}
+	if (%rendered) {
+		run_hooks(change => sub { shift->(keys %rendered) });
 	}
-} #}}}
+}
+
+sub commandline_render () {
+	lockwiki();
+	loadindex();
+	unlockwiki();
+
+	my $srcfile=possibly_foolish_untaint($config{render});
+	my $file=$srcfile;
+	$file=~s/\Q$config{srcdir}\E\/?//;
+
+	my $type=pagetype($file);
+	die sprintf(gettext("ikiwiki: cannot build %s"), $srcfile)."\n" unless defined $type;
+	my $content=readfile($srcfile);
+	my $page=pagename($file);
+	$pagesources{$page}=$file;
+	$content=filter($page, $page, $content);
+	$content=preprocess($page, $page, $content);
+	$content=linkify($page, $page, $content);
+	$content=htmlize($page, $page, $type, $content);
+	$pagemtime{$page}=(stat($srcfile))[9];
+	$pagectime{$page}=$pagemtime{$page} if ! exists $pagectime{$page};
+
+	print genpage($page, $content);
+	exit 0;
+}
 
 1