X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/88830016154d99a0155e1cee58582e9f32dcca51..ef165d652ebab1fc0f9944488ff796f0be9a3820:/IkiWiki/Plugin/meta.pm

diff --git a/IkiWiki/Plugin/meta.pm b/IkiWiki/Plugin/meta.pm
index bac163469..2e5fd7e76 100644
--- a/IkiWiki/Plugin/meta.pm
+++ b/IkiWiki/Plugin/meta.pm
@@ -8,14 +8,14 @@ use IkiWiki;
 
 my %meta;
 my %title;
+my %permalink;
+my %author;
+my %authorurl;
 
 sub import { #{{{
-	IkiWiki::hook(type => "preprocess", id => "meta", 
-		call => \&preprocess);
-	IkiWiki::hook(type => "filter", id => "meta", 
-		call => \&filter);
-	IkiWiki::hook(type => "pagetemplate", id => "meta", 
-		call => \&pagetemplate);
+	hook(type => "preprocess", id => "meta", call => \&preprocess, scan => 1);
+	hook(type => "filter", id => "meta", call => \&filter);
+	hook(type => "pagetemplate", id => "meta", call => \&pagetemplate);
 } # }}}
 
 sub filter (@) { #{{{
@@ -51,15 +51,25 @@ sub preprocess (@) { #{{{
 		}
 		else {
 			# hidden WikiLink
-			push @{$IkiWiki::links{$page}}, $value;
+			push @{$links{$page}}, $value;
 		}
 	}
 	elsif ($key eq 'title') {
 		$title{$page}=$value;
 	}
+	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).
 			"\" content=\"".encode_entities($value)."\" />\n";
+		if ($key eq 'author') {
+			$author{$page}=$value;
+		}
+		elsif ($key eq 'authorurl') {
+			$authorurl{$page}=$value;
+		}
 	}
 
 	return "";
@@ -72,8 +82,17 @@ 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");
+	
 } # }}}
 
 1