web commit by joey

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

diff --git a/IkiWiki/Render.pm b/IkiWiki/Render.pm
index 1449b8931cc9ebf364d0daf7841f1d7577c358b6..2c1ea3eb7c0b73f507fb51c70499f01c10c51ccc 100644 (file)
--- a/IkiWiki/Render.pm
+++ b/IkiWiki/Render.pm
@@ -20,19 +20,26 @@ sub linkify ($$$) { #{{{
        return $content;
 } #}}}
 
        return $content;
 } #}}}
 

-sub htmlize ($$) { #{{{
+sub htmlize ($$$) { #{{{
+       my $page=shift;

        my $type=shift;
        my $content=shift;
        
        if (exists $hooks{htmlize}{$type}) {
        my $type=shift;
        my $content=shift;
        
        if (exists $hooks{htmlize}{$type}) {

-               $content=$hooks{htmlize}{$type}{call}->($content);
+               $content=$hooks{htmlize}{$type}{call}->(
+                       page => $page,
+                       content => $content,
+               );

        }
        else {
                error("htmlization of $type not supported");
        }
 
        run_hooks(sanitize => sub {
        }
        else {
                error("htmlization of $type not supported");
        }
 
        run_hooks(sanitize => sub {

-               $content=shift->($content);
+               $content=shift->(
+                       page => $page,
+                       content => $content,
+               );

        });
        
        return $content;
        });
        
        return $content;


@@ -74,7 +81,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 => pagetitle($dir) };
+                       unshift @ret, { url => $path.htmlpage($dir), page => pagetitle($dir) };

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


@@ -84,11 +91,11 @@ sub parentlinks ($) { #{{{
        return @ret;
 } #}}}
 
        return @ret;
 } #}}}
 

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

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


@@ -97,69 +104,67 @@ sub preprocess ($$$;$) { #{{{
                if (length $escape) {
                        return "[[$command $params]]";
                }
                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;
                elsif (exists $hooks{preprocess}{$command}) {
                        # Note: preserve order of params, some plugins may
                        # consider it significant.
                        my @params;

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

-                                       push @params, (defined $2 ? $2 : $3), '';
+                                       push @params, $val, '';

                                }
                        }
                                }
                        }

-                       return $hooks{preprocess}{$command}{call}->(
+                       if ($preprocessing{$page}++ > 3) {
+                               # Avoid loops of preprocessed pages preprocessing
+                               # other pages that preprocess them, etc.
+                               return "[[$command preprocessing loop detected on $page at depth $preprocessing{$page}]]";
+                       }
+                       my $ret=$hooks{preprocess}{$command}{call}->(

                                @params,
                                page => $page,
                                destpage => $destpage,
                        );
                                @params,
                                page => $page,
                                destpage => $destpage,
                        );

+                       $preprocessing{$page}--;
+                       return $ret;

                }
                else {
                }
                else {

-                       return "[[$command not processed]]";
+                       return "[[$command $params]]";

                }
        };
        
                }
        };
        

-       $content =~ s{(\\?)$config{wiki_processor_regexp}}{$handle->($1, $2, $3)}eg;
+       $content =~ s{(\\?)\[\[(\w+)\s+((?:(?:\w+=)?(?:""".*?"""|"[^"]+"|[^\s\]]+)\s*)*)\]\]}{$handle->($1, $2, $3)}seg;

        return $content;
 } #}}}
 
 sub add_depends ($$) { #{{{
        my $page=shift;
        return $content;
 } #}}}
 
 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;


@@ -201,14 +206,23 @@ sub genpage ($$$) { #{{{
                content => $content,
                backlinks => [backlinks($page)],
                mtime => displaytime($mtime),
                content => $content,
                backlinks => [backlinks($page)],
                mtime => displaytime($mtime),

-               styleurl => styleurl($page),
+               baseurl => baseurl($page),

        );
 
        run_hooks(pagetemplate => sub {
                shift->(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->(
+                       page => $page,
+                       content => $content,
+               );
+       });
+
+       return $content;

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


@@ -281,9 +295,9 @@ sub render ($) { #{{{
                
                $links{$page}=[findlinks($page, $content)];
                
                
                $links{$page}=[findlinks($page, $content)];
                

-               $content=linkify($page, $page, $content);

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

-               $content=htmlize($type, $content);
+               $content=linkify($page, $page, $content);
+               $content=htmlize($page, $type, $content);

                
                check_overwrite("$config{destdir}/".htmlpage($page), $page);
                writefile(htmlpage($page), $config{destdir},
                
                check_overwrite("$config{destdir}/".htmlpage($page), $page);
                writefile(htmlpage($page), $config{destdir},


@@ -373,6 +387,7 @@ sub refresh () { #{{{
                        debug("new page $page") unless exists $pagectime{$page};
                        push @add, $file;
                        $links{$page}=[];
                        debug("new page $page") unless exists $pagectime{$page};
                        push @add, $file;
                        $links{$page}=[];

+                       $pagecase{lc $page}=$page;

                        $pagesources{$page}=$file;
                        if ($config{getctime} && -e "$config{srcdir}/$file") {
                                $pagectime{$page}=rcs_getctime("$config{srcdir}/$file");
                        $pagesources{$page}=$file;
                        if ($config{getctime} && -e "$config{srcdir}/$file") {
                                $pagectime{$page}=rcs_getctime("$config{srcdir}/$file");


@@ -441,7 +456,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;