localstyle: New plugin, allows overrding the toplevel local.css with one that is...

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

diff --git a/IkiWiki/Plugin/meta.pm b/IkiWiki/Plugin/meta.pm
index 514b0936907ce58edabcbafcb44d5559a154eec9..6fe9cda3424a6b85ba92f1b975f568b5e7eaaa40 100644 (file)
--- a/IkiWiki/Plugin/meta.pm
+++ b/IkiWiki/Plugin/meta.pm
@@ -121,6 +121,10 @@ sub preprocess (@) {
                $pagestate{$page}{meta}{authorurl}=$value if safeurl($value);
                # fallthrough
        }
                $pagestate{$page}{meta}{authorurl}=$value if safeurl($value);
                # fallthrough
        }

+       elsif ($key eq 'permalink') {
+               $pagestate{$page}{meta}{permalink}=$value if safeurl($value);
+               # fallthrough
+       }

        elsif ($key eq 'date') {
                eval q{use Date::Parse};
                if (! $@) {
        elsif ($key eq 'date') {
                eval q{use Date::Parse};
                if (! $@) {


@@ -141,10 +145,9 @@ sub preprocess (@) {
                return;
        }
 
                return;
        }
 

-       # Metadata collection that happens only during preprocessing pass.
+       # Metadata handling that happens only during preprocessing pass.

        if ($key eq 'permalink') {
                if (safeurl($value)) {
        if ($key eq 'permalink') {
                if (safeurl($value)) {

-                       $pagestate{$page}{meta}{permalink}=$value;

                        push @{$metaheaders{$page}}, scrub('<link rel="bookmark" href="'.encode_entities($value).'" />', $destpage);
                }
        }
                        push @{$metaheaders{$page}}, scrub('<link rel="bookmark" href="'.encode_entities($value).'" />', $destpage);
                }
        }


@@ -195,7 +198,7 @@ sub preprocess (@) {
                        if (! length $link) {
                                error gettext("redir page not found")
                        }
                        if (! length $link) {
                                error gettext("redir page not found")
                        }

-                       add_depends($page, $link);
+                       add_depends($page, $link, deptype("presence"));

 
                        $value=urlto($link, $page);
                        $value.='#'.$redir_anchor if defined $redir_anchor;
 
                        $value=urlto($link, $page);
                        $value.='#'.$redir_anchor if defined $redir_anchor;


@@ -291,21 +294,21 @@ sub match {
 
        if (defined $val) {
                if ($val=~/^$re$/i) {
 
        if (defined $val) {
                if ($val=~/^$re$/i) {

-                       return IkiWiki::SuccessReason->new("$re matches $field of $page");
+                       return IkiWiki::SuccessReason->new("$re matches $field of $page", $page => $IkiWiki::DEPEND_CONTENT, "" => 1);

                }
                else {
                }
                else {

-                       return IkiWiki::FailReason->new("$re does not match $field of $page");
+                       return IkiWiki::FailReason->new("$re does not match $field of $page", "" => 1);

                }
        }
        else {
                }
        }
        else {

-               return IkiWiki::FailReason->new("$page does not have a $field");
+               return IkiWiki::FailReason->new("$page does not have a $field", "" => 1);

        }
 }
 
 package IkiWiki::PageSpec;
 
 sub match_title ($$;@) {
        }
 }
 
 package IkiWiki::PageSpec;
 
 sub match_title ($$;@) {

-       IkiWiki::Plugin::meta::match("title", @_);      
+       IkiWiki::Plugin::meta::match("title", @_);

 }
 
 sub match_author ($$;@) {
 }
 
 sub match_author ($$;@) {