* Install the source of the examples into /usr/share/doc/ikiwiki/examples.

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

diff --git a/IkiWiki.pm b/IkiWiki.pm
index 168d800ba596523c9e9a598a0df3e09d69a1e205..a6869d454cb90389e22a3d60adca3d0507057094 100644 (file)
--- a/IkiWiki.pm
+++ b/IkiWiki.pm
@@ -14,7 +14,7 @@ use vars qw{%config %links %oldlinks %oldpagemtime %pagectime %pagecase
 use Exporter q{import};
 our @EXPORT = qw(hook debug error template htmlpage add_depends pagespec_match
                  bestlink htmllink readfile writefile pagetype srcfile pagename
 use Exporter q{import};
 our @EXPORT = qw(hook debug error template htmlpage add_depends pagespec_match
                  bestlink htmllink readfile writefile pagetype srcfile pagename

-                 displaytime
+                 displaytime will_render

                  %config %links %renderedfiles %pagesources);
 our $VERSION = 1.01; # plugin interface version
 
                  %config %links %renderedfiles %pagesources);
 our $VERSION = 1.01; # plugin interface version
 


@@ -264,6 +264,7 @@ sub writefile ($$$;$) { #{{{
        close OUT;
 } #}}}
 
        close OUT;
 } #}}}
 

+my %cleared;

 sub will_render ($$;$) { #{{{
        my $page=shift;
        my $dest=shift;
 sub will_render ($$;$) { #{{{
        my $page=shift;
        my $dest=shift;


@@ -275,11 +276,12 @@ sub will_render ($$;$) { #{{{
                error("$config{destdir}/$dest independently created, not overwriting with version from $page");
        }
 
                error("$config{destdir}/$dest independently created, not overwriting with version from $page");
        }
 

-       if (! $clear) {
+       if (! $clear || $cleared{$page}) {

                $renderedfiles{$page}=[$dest, grep { $_ ne $dest } @{$renderedfiles{$page}}];
        }
        else {
                $renderedfiles{$page}=[$dest];
                $renderedfiles{$page}=[$dest, grep { $_ ne $dest } @{$renderedfiles{$page}}];
        }
        else {
                $renderedfiles{$page}=[$dest];

+               $cleared{$page}=1;

        }
 } #}}}
 
        }
 } #}}}
 


@@ -444,10 +446,11 @@ sub linkify ($$$) { #{{{
 } #}}}
 
 my %preprocessing;
 } #}}}
 
 my %preprocessing;

-sub preprocess ($$$) { #{{{
+sub preprocess ($$$;$) { #{{{

        my $page=shift; # the page the data comes from
        my $destpage=shift; # the page the data will appear in (different for inline)
        my $content=shift;
        my $page=shift; # the page the data comes from
        my $destpage=shift; # the page the data will appear in (different for inline)
        my $content=shift;

+       my $scan=shift;

 
        my $handle=sub {
                my $escape=shift;
 
        my $handle=sub {
                my $escape=shift;


@@ -457,6 +460,7 @@ sub preprocess ($$$) { #{{{
                        return "[[$command $params]]";
                }
                elsif (exists $hooks{preprocess}{$command}) {
                        return "[[$command $params]]";
                }
                elsif (exists $hooks{preprocess}{$command}) {

+                       return "" if $scan && ! $hooks{preprocess}{$command}{scan};

                        # Note: preserve order of params, some plugins may
                        # consider it significant.
                        my @params;
                        # Note: preserve order of params, some plugins may
                        # consider it significant.
                        my @params;


@@ -641,6 +645,8 @@ sub hook (@) { # {{{
        if (! exists $param{type} || ! ref $param{call} || ! exists $param{id}) {
                error "hook requires type, call, and id parameters";
        }
        if (! exists $param{type} || ! ref $param{call} || ! exists $param{id}) {
                error "hook requires type, call, and id parameters";
        }

+
+       return if $param{no_override} && exists $hooks{$param{type}}{$param{id}};

        
        $hooks{$param{type}}{$param{id}}=\%param;
 } # }}}
        
        $hooks{$param{type}}{$param{id}}=\%param;
 } # }}}