X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/d9c118dbf1753abcbf081f532aecfe8cb6ce7de7..65ab5b372edb79b2463aa73ddb8a95aea0548f4e:/IkiWiki/Render.pm

diff --git a/IkiWiki/Render.pm b/IkiWiki/Render.pm
index e5a1679f8..caec7f1f0 100644
--- a/IkiWiki/Render.pm
+++ b/IkiWiki/Render.pm
@@ -8,8 +8,8 @@ use IkiWiki;
 use Encode;
 
 sub linkify ($$$) { #{{{
-	my $lpage=shift;
-	my $page=shift;
+	my $lpage=shift; # the page containing the links
+	my $page=shift; # the page the link will end up on (different for inline)
 	my $content=shift;
 
 	$content =~ s{(\\?)$config{wiki_link_regexp}}{
@@ -58,7 +58,7 @@ sub backlinks ($) { #{{{
 			        $p_trimmed=~s/^\Q$dir\E// &&
 			        $page_trimmed=~s/^\Q$dir\E//;
 				       
-			push @links, { url => $href, page => $p_trimmed };
+			push @links, { url => $href, page => pagetitle($p_trimmed) };
 		}
 	}
 
@@ -76,7 +76,7 @@ sub parentlinks ($) { #{{{
 	foreach my $dir (reverse split("/", $page)) {
 		if (! $skip) {
 			$path.="../";
-			unshift @ret, { url => "$path$dir.html", page => $dir };
+			unshift @ret, { url => "$path$dir.html", page => pagetitle($dir) };
 		}
 		else {
 			$skip=0;
@@ -86,8 +86,9 @@ sub parentlinks ($) { #{{{
 	return @ret;
 } #}}}
 
-sub preprocess ($$;$) { #{{{
-	my $page=shift;
+sub preprocess ($$$;$) { #{{{
+	my $page=shift; # the page the data comes from
+	my $destpage=shift; # the page the data will appear in (different for inline)
 	my $content=shift;
 	my $onlystrip=shift || 0; # strip directives without processing
 
@@ -105,10 +106,19 @@ sub preprocess ($$;$) { #{{{
 			# Note: preserve order of params, some plugins may
 			# consider it significant.
 			my @params;
-			while ($params =~ /(\w+)=\"?([^"]+)"?(\s+|$)/g) {
-				push @params, $1, $2;
+			while ($params =~ /(?:(\w+)=)?(?:"([^"]+)"|(\S+))(?:\s+|$)/g) {
+				if (defined $1) {
+					push @params, $1, (defined $2 ? $2 : $3);
+				}
+				else {
+					push @params, (defined $2 ? $2 : $3), '';
+				}
 			}
-			return $hooks{preprocess}{$command}{call}->(@params, page => $page);
+			return $hooks{preprocess}{$command}{call}->(
+				@params,
+				page => $page,
+				destpage => $destpage,
+			);
 		}
 		else {
 			return "[[$command not processed]]";
@@ -198,7 +208,11 @@ sub genpage ($$$) { #{{{
 
 	if (exists $hooks{pagetemplate}) {
 		foreach my $id (keys %{$hooks{pagetemplate}}) {
-			$hooks{pagetemplate}{$id}{call}->($page, $template);
+			$hooks{pagetemplate}{$id}{call}->(
+				page => $page,
+				destpage => $page,
+				template => $template,
+			);
 		}
 	}
 	
@@ -281,7 +295,7 @@ sub render ($) { #{{{
 		$links{$page}=[findlinks($page, $content)];
 		
 		$content=linkify($page, $page, $content);
-		$content=preprocess($page, $content);
+		$content=preprocess($page, $page, $content);
 		$content=htmlize($type, $content);
 		
 		check_overwrite("$config{destdir}/".htmlpage($page), $page);