web commit by joey

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

diff --git a/IkiWiki/Render.pm b/IkiWiki/Render.pm
index 54e409040ad119b8e6adf9bba850dbf21a255090..02dbd34bd53dd48183c461325b388bc42a21a92f 100644 (file)
--- a/IkiWiki/Render.pm
+++ b/IkiWiki/Render.pm
@@ -4,12 +4,12 @@ package IkiWiki;
 
 use warnings;
 use strict;
 
 use warnings;
 use strict;

-use File::Spec;

 use IkiWiki;
 use IkiWiki;

+use Encode;

 
 sub linkify ($$$) { #{{{
 
 sub linkify ($$$) { #{{{

-       my $lpage=shift;
-       my $page=shift;
+       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}}{
        my $content=shift;
 
        $content =~ s{(\\?)$config{wiki_link_regexp}}{


@@ -24,21 +24,8 @@ sub htmlize ($$) { #{{{
        my $type=shift;
        my $content=shift;
        
        my $type=shift;
        my $content=shift;
        

-       if (! $INC{"/usr/bin/markdown"}) {
-               no warnings 'once';
-               $blosxom::version="is a proper perl module too much to ask?";
-               use warnings 'all';
-               do "/usr/bin/markdown";
-               use Encode;
-       }
-       
-       if ($type eq '.mdwn') {
-               # Workaround for perl bug (#376329)
-               $content=Encode::encode_utf8($content);
-               $content=Encode::encode_utf8($content);
-               $content=Markdown::Markdown($content);
-               $content=Encode::decode_utf8($content);
-               $content=Encode::decode_utf8($content);
+       if (exists $hooks{htmlize}{$type}) {
+               $content=$hooks{htmlize}{$type}{call}->($content);

        }
        else {
                error("htmlization of $type not supported");
        }
        else {
                error("htmlization of $type not supported");


@@ -60,7 +47,7 @@ sub backlinks ($) { #{{{
        foreach my $p (keys %links) {
                next if bestlink($page, $p) eq $page;
                if (grep { length $_ && bestlink($p, $_) eq $page } @{$links{$p}}) {
        foreach my $p (keys %links) {
                next if bestlink($page, $p) eq $page;
                if (grep { length $_ && bestlink($p, $_) eq $page } @{$links{$p}}) {

-                       my $href=File::Spec->abs2rel(htmlpage($p), dirname($page));
+                       my $href=abs2rel(htmlpage($p), dirname($page));

                        
                        # Trim common dir prefixes from both pages.
                        my $p_trimmed=$p;
                        
                        # Trim common dir prefixes from both pages.
                        my $p_trimmed=$p;


@@ -85,6 +72,7 @@ sub parentlinks ($) { #{{{
        my $pagelink="";
        my $path="";
        my $skip=1;
        my $pagelink="";
        my $path="";
        my $skip=1;

+       return if $page eq 'index'; # toplevel

        foreach my $dir (reverse split("/", $page)) {
                if (! $skip) {
                        $path.="../";
        foreach my $dir (reverse split("/", $page)) {
                if (! $skip) {
                        $path.="../";


@@ -98,8 +86,9 @@ sub parentlinks ($) { #{{{
        return @ret;
 } #}}}
 
        return @ret;
 } #}}}
 

-sub preprocess ($$;$) { #{{{
-       my $page=shift;
+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 $content=shift;
        my $onlystrip=shift || 0; # strip directives without processing
 


@@ -117,10 +106,19 @@ sub preprocess ($$;$) { #{{{
                        # 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;

-                       while ($params =~ /(\w+)=\"?([^"]+)"?(\s+|$)/g) {
-                               push @params, $1, $2;
+                       while ($params =~ /(?:(\w+)=)?(?:"([^"]+)"|(\S+))(?:\s+|$)/g) {
+                               if (defined $1) {
+                                       push @params, $1, (defined $2 ? $2 : $3);
+                               }
+                               else {
+                                       push @params, (defined $2 ? $2 : $3), '';
+                               }

                        }
                        }

-                       return $hooks{preprocess}{$command}{call}->(@params, page => $page);
+                       return $hooks{preprocess}{$command}{call}->(
+                               @params,
+                               page => $page,
+                               destpage => $destpage,
+                       );

                }
                else {
                        return "[[$command not processed]]";
                }
                else {
                        return "[[$command not processed]]";


@@ -169,10 +167,7 @@ sub genpage ($$$) { #{{{
        my $content=shift;
        my $mtime=shift;
 
        my $content=shift;
        my $mtime=shift;
 

-       my $title=pagetitle(basename($page));
-       
-       my $template=HTML::Template->new(blind_cache => 1,
-               filename => "$config{templatedir}/page.tmpl");
+       my $template=template("page.tmpl", blind_cache => 1);

        my $actions=0;
 
        if (length $config{cgiurl}) {
        my $actions=0;
 
        if (length $config{cgiurl}) {


@@ -200,7 +195,9 @@ sub genpage ($$$) { #{{{
        }
 
        $template->param(
        }
 
        $template->param(

-               title => $title,
+               title => $page eq 'index' 
+                       ? $config{wikiname} 
+                       : pagetitle(basename($page)),

                wikiname => $config{wikiname},
                parentlinks => [parentlinks($page)],
                content => $content,
                wikiname => $config{wikiname},
                parentlinks => [parentlinks($page)],
                content => $content,


@@ -211,7 +208,11 @@ sub genpage ($$$) { #{{{
 
        if (exists $hooks{pagetemplate}) {
                foreach my $id (keys %{$hooks{pagetemplate}}) {
 
        if (exists $hooks{pagetemplate}) {
                foreach my $id (keys %{$hooks{pagetemplate}}) {

-                       $hooks{pagetemplate}{$id}{call}->($page, $template);
+                       $hooks{pagetemplate}{$id}{call}->(
+                               page => $page,
+                               destpage => $page,
+                               template => $template,
+                       );

                }
        }
        
                }
        }
        


@@ -225,10 +226,7 @@ sub check_overwrite ($$) { #{{{
        my $src=shift;
        
        if (! exists $renderedfiles{$src} && -e $dest && ! $config{rebuild}) {
        my $src=shift;
        
        if (! exists $renderedfiles{$src} && -e $dest && ! $config{rebuild}) {

-               error("$dest already exists and was rendered from ".
-                       join(" ",(grep { $renderedfiles{$_} eq $dest } keys
-                               %renderedfiles)).
-                       ", before, so not rendering from $src");
+               error("$dest already exists and was not rendered from $src before");

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


@@ -238,7 +236,7 @@ sub displaytime ($) { #{{{
        eval q{use POSIX};
        # strftime doesn't know about encodings, so make sure
        # its output is properly treated as utf8
        eval q{use POSIX};
        # strftime doesn't know about encodings, so make sure
        # its output is properly treated as utf8

-       return Encode::decode_utf8(POSIX::strftime(
+       return decode_utf8(POSIX::strftime(

                        $config{timeformat}, localtime($time)));
 } #}}}
 
                        $config{timeformat}, localtime($time)));
 } #}}}
 


@@ -266,29 +264,38 @@ sub findlinks ($$) { #{{{
        }
 } #}}}
 
        }
 } #}}}
 

+sub filter ($$) {
+       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
+                       );
+               }
+       }
+
+       return $content;
+}
+

 sub render ($) { #{{{
        my $file=shift;
        
        my $type=pagetype($file);
        my $srcfile=srcfile($file);
 sub render ($) { #{{{
        my $file=shift;
        
        my $type=pagetype($file);
        my $srcfile=srcfile($file);

-       if ($type ne 'unknown') {
+       if (defined $type) {

                my $content=readfile($srcfile);
                my $page=pagename($file);
                delete $depends{$page};
                
                my $content=readfile($srcfile);
                my $page=pagename($file);
                delete $depends{$page};
                

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

                
                $links{$page}=[findlinks($page, $content)];
                
                $content=linkify($page, $page, $content);
                
                $links{$page}=[findlinks($page, $content)];
                
                $content=linkify($page, $page, $content);

-               $content=preprocess($page, $content);
+               $content=preprocess($page, $page, $content);

                $content=htmlize($type, $content);
                
                check_overwrite("$config{destdir}/".htmlpage($page), $page);
                $content=htmlize($type, $content);
                
                check_overwrite("$config{destdir}/".htmlpage($page), $page);


@@ -326,6 +333,7 @@ sub refresh () { #{{{
        find({
                no_chdir => 1,
                wanted => sub {
        find({
                no_chdir => 1,
                wanted => sub {

+                       $_=decode_utf8($_);

                        if (/$config{wiki_file_prune_regexp}/) {
                                $File::Find::prune=1;
                        }
                        if (/$config{wiki_file_prune_regexp}/) {
                                $File::Find::prune=1;
                        }


@@ -345,6 +353,7 @@ sub refresh () { #{{{
        find({
                no_chdir => 1,
                wanted => sub {
        find({
                no_chdir => 1,
                wanted => sub {

+                       $_=decode_utf8($_);

                        if (/$config{wiki_file_prune_regexp}/) {
                                $File::Find::prune=1;
                        }
                        if (/$config{wiki_file_prune_regexp}/) {
                                $File::Find::prune=1;
                        }


@@ -404,7 +413,7 @@ sub refresh () { #{{{
                
                if (! exists $oldpagemtime{$page} ||
                    mtime(srcfile($file)) > $oldpagemtime{$page}) {
                
                if (! exists $oldpagemtime{$page} ||
                    mtime(srcfile($file)) > $oldpagemtime{$page}) {

-                       debug("rendering changed file $file");
+                       debug("rendering $file");

                        render($file);
                        $rendered{$file}=1;
                }
                        render($file);
                        $rendered{$file}=1;
                }