X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/ee1ad53c4c2710aa7ded61bdc56f3a8cce514f22..e0b3590bd958675b833c5fc3e001c31e04417580:/IkiWiki/Plugin/meta.pm?ds=inline
diff --git a/IkiWiki/Plugin/meta.pm b/IkiWiki/Plugin/meta.pm
index 18e28a196..938a28e59 100644
--- a/IkiWiki/Plugin/meta.pm
+++ b/IkiWiki/Plugin/meta.pm
@@ -11,6 +11,8 @@ my %title;
my %permalink;
my %author;
my %authorurl;
+my %license;
+my %copyright;
sub import { #{{{
hook(type => "preprocess", id => "meta", call => \&preprocess, scan => 1);
@@ -65,7 +67,7 @@ sub preprocess (@) { #{{{
}
}
elsif ($key eq 'title') {
- $title{$page}=encode_entities($value);
+ $title{$page}=HTML::Entities::encode_numeric($value);
}
elsif ($key eq 'permalink') {
$permalink{$page}=$value;
@@ -87,10 +89,10 @@ sub preprocess (@) { #{{{
if (! length $stylesheet) {
return "[[meta ".gettext("stylesheet not found")."]]";
}
- $meta{$page}.='\n";
+ "\" type=\"text/css\" />\n";
}
elsif ($key eq 'openid') {
if (exists $params{server}) {
@@ -100,6 +102,14 @@ sub preprocess (@) { #{{{
$meta{$page}.='\n";
}
+ elsif ($key eq 'license') {
+ $meta{$page}.="\n";
+ $license{$page}=$value;
+ }
+ elsif ($key eq 'copyright') {
+ $meta{$page}.="\n";
+ $copyright{$page}=$value;
+ }
else {
$meta{$page}.=scrub("\n");
@@ -117,6 +127,7 @@ sub preprocess (@) { #{{{
sub pagetemplate (@) { #{{{
my %params=@_;
my $page=$params{page};
+ my $destpage=$params{destpage};
my $template=$params{template};
$template->param(meta => $meta{$page})
@@ -131,7 +142,26 @@ sub pagetemplate (@) { #{{{
if exists $author{$page} && $template->query(name => "author");
$template->param(authorurl => $authorurl{$page})
if exists $authorurl{$page} && $template->query(name => "authorurl");
-
+
+ if ($page ne $destpage &&
+ ((exists $license{$page} && ! exists $license{$destpage}) ||
+ (exists $copyright{$page} && ! exists $copyright{$destpage}))) {
+ # Force a scan of the destpage to get its copyright/license
+ # info. If the info is declared after an inline, it will
+ # otherwise not be available at this point.
+ IkiWiki::scan($pagesources{$destpage});
+ }
+
+ if (exists $license{$page} && $template->query(name => "license") &&
+ ($page eq $destpage || ! exists $license{$destpage} ||
+ $license{$page} ne $license{$destpage})) {
+ $template->param(license => IkiWiki::linkify($page, $destpage, $license{$page}));
+ }
+ if (exists $copyright{$page} && $template->query(name => "copyright") &&
+ ($page eq $destpage || ! exists $copyright{$destpage} ||
+ $copyright{$page} ne $copyright{$destpage})) {
+ $template->param(copyright => IkiWiki::linkify($page, $destpage, $copyright{$page}));
+ }
} # }}}
1