fix typo

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

diff --git a/IkiWiki/Render.pm b/IkiWiki/Render.pm
index cef770c6784025d89c2b1d64ffeca2391d5c3749..c16877b3deb9117573962d7a061843ecf26e5067 100644 (file)
--- a/IkiWiki/Render.pm
+++ b/IkiWiki/Render.pm
@@ -7,37 +7,6 @@ use strict;
 use IkiWiki;
 use Encode;
 
-sub linkify ($$$) { #{{{
-       my $lpage=shift; # the page containing the links
-       my $page=shift; # the page the link will end up on (different for inline)
-       my $content=shift;
-
-       $content =~ s{(\\?)$config{wiki_link_regexp}}{
-               $2 ? ( $1 ? "[[$2|$3]]" : htmllink($lpage, $page, titlepage($3), 0, 0, pagetitle($2)))
-                  : ( $1 ? "[[$3]]" :    htmllink($lpage, $page, titlepage($3)))
-       }eg;
-       
-       return $content;
-} #}}}
-
-sub htmlize ($$) { #{{{
-       my $type=shift;
-       my $content=shift;
-       
-       if (exists $hooks{htmlize}{$type}) {
-               $content=$hooks{htmlize}{$type}{call}->($content);
-       }
-       else {
-               error("htmlization of $type not supported");
-       }
-
-       run_hooks(sanitize => sub {
-               $content=shift->($content);
-       });
-       
-       return $content;
-} #}}}
-
 sub backlinks ($) { #{{{
        my $page=shift;
 
@@ -84,76 +53,6 @@ sub parentlinks ($) { #{{{
        return @ret;
 } #}}}
 
-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 $onlystrip=shift || 0; # strip directives without processing
-
-       my $handle=sub {
-               my $escape=shift;
-               my $command=shift;
-               my $params=shift;
-               if (length $escape) {
-                       return "[[$command $params]]";
-               }
-               elsif ($onlystrip) {
-                       return "";
-               }
-               elsif (exists $hooks{preprocess}{$command}) {
-                       # Note: preserve order of params, some plugins may
-                       # consider it significant.
-                       my @params;
-                       while ($params =~ /(?:(\w+)=)?(?:"""(.*?)"""|"([^"]+)"|(\S+))(?:\s+|$)/sg) {
-                               my $key=$1;
-                               my $val;
-                               if (defined $2) {
-                                       $val=$2;
-                                       $val=~s/\r\n/\n/mg;
-                                       $val=~s/^\n+//g;
-                                       $val=~s/\n+$//g;
-                               }
-                               elsif (defined $3) {
-                                       $val=$3;
-                               }
-                               elsif (defined $4) {
-                                       $val=$4;
-                               }
-
-                               if (defined $key) {
-                                       push @params, $key, $val;
-                               }
-                               else {
-                                       push @params, $val, '';
-                               }
-                       }
-                       return $hooks{preprocess}{$command}{call}->(
-                               @params,
-                               page => $page,
-                               destpage => $destpage,
-                       );
-               }
-               else {
-                       return "[[$command not processed]]";
-               }
-       };
-       
-       $content =~ s{(\\?)\[\[(\w+)\s+((?:(?:\w+=)?(?:""".*?"""|"[^"]+"|[^\s\]]+)\s*)*)\]\]}{$handle->($1, $2, $3)}seg;
-       return $content;
-} #}}}
-
-sub add_depends ($$) { #{{{
-       my $page=shift;
-       my $pagespec=shift;
-       
-       if (! exists $depends{$page}) {
-               $depends{$page}=$pagespec;
-       }
-       else {
-               $depends{$page}=pagespec_merge($depends{$page}, $pagespec);
-       }
-} # }}}
-
 sub genpage ($$$) { #{{{
        my $page=shift;
        my $content=shift;
@@ -205,7 +104,10 @@ sub genpage ($$$) { #{{{
        $content=$template->output;
 
        run_hooks(format => sub {
-               $content=shift->($content);
+               $content=shift->(
+                       page => $page,
+                       content => $content,
+               );
        });
 
        return $content;
@@ -222,16 +124,6 @@ sub check_overwrite ($$) { #{{{
        }
 } #}}}
 
-sub displaytime ($) { #{{{
-       my $time=shift;
-
-       eval q{use POSIX};
-       # strftime doesn't know about encodings, so make sure
-       # its output is properly treated as utf8
-       return decode_utf8(POSIX::strftime(
-                       $config{timeformat}, localtime($time)));
-} #}}}
-
 sub mtime ($) { #{{{
        my $file=shift;
        
@@ -256,17 +148,6 @@ sub findlinks ($$) { #{{{
        }
 } #}}}
 
-sub filter ($$) {
-       my $page=shift;
-       my $content=shift;
-
-       run_hooks(filter => sub {
-               $content=shift->(page => $page, content => $content);
-       });
-
-       return $content;
-}
-
 sub render ($) { #{{{
        my $file=shift;
        
@@ -283,7 +164,7 @@ sub render ($) { #{{{
                
                $content=preprocess($page, $page, $content);
                $content=linkify($page, $page, $content);
-               $content=htmlize($type, $content);
+               $content=htmlize($page, $type, $content);
                
                check_overwrite("$config{destdir}/".htmlpage($page), $page);
                writefile(htmlpage($page), $config{destdir},