web commit by MichaleR: asked for progress on the Moin conversion scripts

[git.ikiwiki.info.git] / IkiWiki / Plugin / meta.pm

diff --git a/IkiWiki/Plugin/meta.pm b/IkiWiki/Plugin/meta.pm
index f498398a28c13cce404b1ae08e9500e83f678f7c..938a28e59f83851f53e8d68c2776c2ee37e115f9 100644 (file)
--- 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);
@@ -90,7 +92,7 @@ sub preprocess (@) { #{{{
                $meta{$page}.='<link href="'.urlto($stylesheet, $page).
                        '" rel="'.encode_entities($rel).
                        '" title="'.encode_entities($title).
-                       "\" style=\"text/css\" />\n";
+                       "\" type=\"text/css\" />\n";
        }
        elsif ($key eq 'openid') {
                if (exists $params{server}) {
@@ -100,6 +102,14 @@ sub preprocess (@) { #{{{
                $meta{$page}.='<link href="'.encode_entities($value).
                        "\" rel=\"openid.delegate\" />\n";
        }
+       elsif ($key eq 'license') {
+               $meta{$page}.="<link rel=\"license\" href=\"#page_license\" />\n";
+               $license{$page}=$value;
+       }
+       elsif ($key eq 'copyright') {
+               $meta{$page}.="<link rel=\"copyright\" href=\"#page_copyright\" />\n";
+               $copyright{$page}=$value;
+       }
        else {
                $meta{$page}.=scrub("<meta name=\"".encode_entities($key).
                        "\" content=\"".encode_entities($value)."\" />\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