viewcvs url also changed

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

diff --git a/IkiWiki/Render.pm b/IkiWiki/Render.pm
index 02dbd34bd53dd48183c461325b388bc42a21a92f..b855d2c8f86b02e5a25da3cf822bdd482700c773 100644 (file)
--- a/IkiWiki/Render.pm
+++ b/IkiWiki/Render.pm
@@ -31,11 +31,9 @@ sub htmlize ($$) { #{{{
                error("htmlization of $type not supported");
        }
 
                error("htmlization of $type not supported");
        }
 

-       if (exists $hooks{sanitize}) {
-               foreach my $id (keys %{$hooks{sanitize}}) {
-                       $content=$hooks{sanitize}{$id}{call}->($content);
-               }
-       }
+       run_hooks(sanitize => sub {
+               $content=shift->($content);
+       });

        
        return $content;
 } #}}}
        
        return $content;
 } #}}}


@@ -58,7 +56,7 @@ sub backlinks ($) { #{{{
                                $p_trimmed=~s/^\Q$dir\E// &&
                                $page_trimmed=~s/^\Q$dir\E//;
                                       
                                $p_trimmed=~s/^\Q$dir\E// &&
                                $page_trimmed=~s/^\Q$dir\E//;
                                       

-                       push @links, { url => $href, page => $p_trimmed };
+                       push @links, { url => $href, page => pagetitle($p_trimmed) };

                }
        }
 
                }
        }
 


@@ -76,7 +74,7 @@ sub parentlinks ($) { #{{{
        foreach my $dir (reverse split("/", $page)) {
                if (! $skip) {
                        $path.="../";
        foreach my $dir (reverse split("/", $page)) {
                if (! $skip) {
                        $path.="../";

-                       unshift @ret, { url => "$path$dir.html", page => $dir };
+                       unshift @ret, { url => $path.htmlpage($dir), page => pagetitle($dir) };

                }
                else {
                        $skip=0;
                }
                else {
                        $skip=0;


@@ -131,37 +129,16 @@ sub preprocess ($$$;$) { #{{{
 
 sub add_depends ($$) { #{{{
        my $page=shift;
 
 sub add_depends ($$) { #{{{
        my $page=shift;

-       my $globlist=shift;
+       my $pagespec=shift;

        
        if (! exists $depends{$page}) {
        
        if (! exists $depends{$page}) {

-               $depends{$page}=$globlist;
+               $depends{$page}=$pagespec;

        }
        else {
        }
        else {

-               $depends{$page}=globlist_merge($depends{$page}, $globlist);
+               $depends{$page}=pagespec_merge($depends{$page}, $pagespec);

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

-sub globlist_merge ($$) { #{{{
-       my $a=shift;
-       my $b=shift;
-
-       my $ret="";
-       # Only add negated globs if they are not matched by the other globlist.
-       foreach my $i ((map { [ $a, $_ ] } split(" ", $b)), 
-                      (map { [ $b, $_ ] } split(" ", $a))) {
-               if ($i->[1]=~/^!(.*)/) {
-                       if (! globlist_match($1, $i->[0])) {
-                               $ret.=" ".$i->[1];
-                       }
-               }
-               else {
-                       $ret.=" ".$i->[1];
-               }
-       }
-       
-       return $ret;
-} #}}}
-

 sub genpage ($$$) { #{{{
        my $page=shift;
        my $content=shift;
 sub genpage ($$$) { #{{{
        my $page=shift;
        my $content=shift;


@@ -206,17 +183,17 @@ sub genpage ($$$) { #{{{
                styleurl => styleurl($page),
        );
 
                styleurl => styleurl($page),
        );
 

-       if (exists $hooks{pagetemplate}) {
-               foreach my $id (keys %{$hooks{pagetemplate}}) {
-                       $hooks{pagetemplate}{$id}{call}->(
-                               page => $page,
-                               destpage => $page,
-                               template => $template,
-                       );
-               }
-       }
+       run_hooks(pagetemplate => sub {
+               shift->(page => $page, destpage => $page, template => $template);
+       });

        
        

-       return $template->output;
+       $content=$template->output;
+
+       run_hooks(format => sub {
+               $content=shift->($content);
+       });
+
+       return $content;

 } #}}}
 
 sub check_overwrite ($$) { #{{{
 } #}}}
 
 sub check_overwrite ($$) { #{{{


@@ -268,14 +245,9 @@ sub filter ($$) {
        my $page=shift;
        my $content=shift;
 
        my $page=shift;
        my $content=shift;
 

-       if (exists $hooks{filter}) {
-               foreach my $id (keys %{$hooks{filter}}) {
-                       $content=$hooks{filter}{$id}{call}->(
-                               page => $page,
-                               content => $content
-                       );
-               }
-       }
+       run_hooks(filter => sub {
+               $content=shift->(page => $page, content => $content);
+       });

 
        return $content;
 }
 
        return $content;
 }


@@ -412,7 +384,8 @@ sub refresh () { #{{{
                my $page=pagename($file);
                
                if (! exists $oldpagemtime{$page} ||
                my $page=pagename($file);
                
                if (! exists $oldpagemtime{$page} ||

-                   mtime(srcfile($file)) > $oldpagemtime{$page}) {
+                   mtime(srcfile($file)) > $oldpagemtime{$page} ||
+                   $forcerebuild{$page}) {

                        debug("rendering $file");
                        render($file);
                        $rendered{$file}=1;
                        debug("rendering $file");
                        render($file);
                        $rendered{$file}=1;


@@ -453,7 +426,7 @@ FILE:               foreach my $file (@files) {
                                foreach my $file (keys %rendered, @del) {
                                        next if $f eq $file;
                                        my $page=pagename($file);
                                foreach my $file (keys %rendered, @del) {
                                        next if $f eq $file;
                                        my $page=pagename($file);

-                                       if (globlist_match($page, $depends{$p})) {
+                                       if (pagespec_match($page, $depends{$p})) {

                                                debug("rendering $f, which depends on $page");
                                                render($f);
                                                $rendered{$f}=1;
                                                debug("rendering $f, which depends on $page");
                                                render($f);
                                                $rendered{$f}=1;


@@ -496,15 +469,11 @@ FILE:             foreach my $file (@files) {
                }
        }
 
                }
        }
 

-       if (@del && exists $hooks{delete}) {
-               foreach my $id (keys %{$hooks{delete}}) {
-                       $hooks{delete}{$id}{call}->(@del);
-               }
+       if (@del) {
+               run_hooks(delete => sub { shift->(@del) });

        }
        }

-       if (%rendered && exists $hooks{change}) {
-               foreach my $id (keys %{$hooks{change}}) {
-                       $hooks{change}{$id}{call}->(keys %rendered);
-               }
+       if (%rendered) {
+               run_hooks(change => sub { shift->(keys %rendered) });

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