X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/c5919df5f3697e0f8968e2b8f49cd15c1e0aa412..e7ff9acf861fc6ae78af7a630a05d700dfab1ee6:/IkiWiki/Plugin/meta.pm?ds=inline

diff --git a/IkiWiki/Plugin/meta.pm b/IkiWiki/Plugin/meta.pm
index b6226ed88..9b026fffa 100644
--- a/IkiWiki/Plugin/meta.pm
+++ b/IkiWiki/Plugin/meta.pm
@@ -10,6 +10,7 @@ my %meta;
 my %title;
 my %permalink;
 my %author;
+my %authorurl;
 
 sub import { #{{{
 	IkiWiki::hook(type => "preprocess", id => "meta", 
@@ -61,6 +62,7 @@ sub preprocess (@) { #{{{
 	}
 	elsif ($key eq 'permalink') {
 		$permalink{$page}=$value;
+		$meta{$page}.="<link rel=\"bookmark\" href=\"".encode_entities($value)."\" />\n";
 	}
 	else {
 		$meta{$page}.="<meta name=\"".encode_entities($key).
@@ -68,6 +70,9 @@ sub preprocess (@) { #{{{
 		if ($key eq 'author') {
 			$author{$page}=$value;
 		}
+		elsif ($key eq 'authorurl') {
+			$authorurl{$page}=$value;
+		}
 	}
 
 	return "";
@@ -80,12 +85,16 @@ sub pagetemplate (@) { #{{{
 
 	$template->param(meta => $meta{$page})
 		if exists $meta{$page} && $template->query(name => "meta");
-	$template->param(title => $title{$page})
-		if exists $title{$page} && $template->query(name => "title");
+	if (exists $title{$page} && $template->query(name => "title")) {
+		$template->param(title => $title{$page});
+		$template->param(title_overridden => 1);
+	}
 	$template->param(permalink => $permalink{$page})
 		if exists $permalink{$page} && $template->query(name => "permalink");
 	$template->param(author => $author{$page})
 		if exists $author{$page} && $template->query(name => "author");
+	$template->param(authorurl => $authorurl{$page})
+		if exists $authorurl{$page} && $template->query(name => "authorurl");
 	
 } # }}}