X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/a0aca9f585d3a530dba0739a1ec2e7da8472f94d..a45647c765d42cae19aaddb828fb42e1f68b247e:/IkiWiki/Plugin/meta.pm diff --git a/IkiWiki/Plugin/meta.pm b/IkiWiki/Plugin/meta.pm index fd21432fa..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); @@ -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