web commit by EdAvis

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

diff --git a/IkiWiki/Render.pm b/IkiWiki/Render.pm
index ddd14692230a749b0cee57b6396279e4f236e9bd..cef770c6784025d89c2b1d64ffeca2391d5c3749 100644 (file)
--- a/IkiWiki/Render.pm
+++ b/IkiWiki/Render.pm
@@ -104,12 +104,27 @@ 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+))(?:\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}->(
                                }
                        }
                        return $hooks{preprocess}{$command}{call}->(


@@ -123,7 +138,7 @@ sub preprocess ($$$;$) { #{{{
                }
        };
        
                }
        };
        

-       $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;
 } #}}}
 
        return $content;
 } #}}}
 


@@ -266,8 +281,8 @@ 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=linkify($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);