* Add an img plugin, based on Christian Mock's img plugin, but stripped

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

diff --git a/IkiWiki/Plugin/meta.pm b/IkiWiki/Plugin/meta.pm
index b6226ed88a19deca8c72b49ad658263993bff8c0..5bcd658378f37c630fe4b389f7bf25dfc95faeb7 100644 (file)
--- a/IkiWiki/Plugin/meta.pm
+++ b/IkiWiki/Plugin/meta.pm
@@ -10,14 +10,12 @@ my %meta;
 my %title;
 my %permalink;
 my %author;
 my %title;
 my %permalink;
 my %author;

+my %authorurl;

 
 sub import { #{{{
 
 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);
+       hook(type => "filter", id => "meta", call => \&filter);
+       hook(type => "pagetemplate", id => "meta", call => \&pagetemplate);

 } # }}}
 
 sub filter (@) { #{{{
 } # }}}
 
 sub filter (@) { #{{{


@@ -53,7 +51,7 @@ sub preprocess (@) { #{{{
                }
                else {
                        # hidden WikiLink
                }
                else {
                        # hidden WikiLink

-                       push @{$IkiWiki::links{$page}}, $value;
+                       push @{$links{$page}}, $value;

                }
        }
        elsif ($key eq 'title') {
                }
        }
        elsif ($key eq 'title') {


@@ -61,6 +59,7 @@ sub preprocess (@) { #{{{
        }
        elsif ($key eq 'permalink') {
                $permalink{$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).
        }
        else {
                $meta{$page}.="<meta name=\"".encode_entities($key).


@@ -68,6 +67,9 @@ sub preprocess (@) { #{{{
                if ($key eq 'author') {
                        $author{$page}=$value;
                }
                if ($key eq 'author') {
                        $author{$page}=$value;
                }

+               elsif ($key eq 'authorurl') {
+                       $authorurl{$page}=$value;
+               }

        }
 
        return "";
        }
 
        return "";


@@ -80,12 +82,16 @@ sub pagetemplate (@) { #{{{
 
        $template->param(meta => $meta{$page})
                if exists $meta{$page} && $template->query(name => "meta");
 
        $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(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");

        
 } # }}}
 
        
 } # }}}