diff options
Diffstat (limited to 'IkiWiki')
| -rw-r--r-- | IkiWiki/CGI.pm | 6 | ||||
| -rw-r--r-- | IkiWiki/Plugin/inline.pm | 4 | ||||
| -rw-r--r-- | IkiWiki/Plugin/sidebar.pm | 2 | ||||
| -rw-r--r-- | IkiWiki/Render.pm | 27 |
4 files changed, 28 insertions, 11 deletions
diff --git a/IkiWiki/CGI.pm b/IkiWiki/CGI.pm index 7d4ba146f..120e2fdee 100644 --- a/IkiWiki/CGI.pm +++ b/IkiWiki/CGI.pm @@ -411,8 +411,12 @@ sub cgi_editpage ($$) { #{{{ value => $content, force => 1); $form->field(name => "comments", value => $comments, force => 1); + $config{rss}=0; # avoid preview writing an rss feed! $form->tmpl_param("page_preview", - htmlize($type, linkify($page, "", filter($page, $content)))); + htmlize($type, + linkify($page, "", + preprocess($page, $page, + filter($page, $content))))); } else { $form->tmpl_param("page_preview", ""); diff --git a/IkiWiki/Plugin/inline.pm b/IkiWiki/Plugin/inline.pm index 935b86b58..c712f7bb4 100644 --- a/IkiWiki/Plugin/inline.pm +++ b/IkiWiki/Plugin/inline.pm @@ -116,8 +116,8 @@ sub preprocess_inline (@) { #{{{ my $type=pagetype($file); if (defined $type) { $ret.="\n". - preprocess($page, $params{page}, linkify($page, $params{page}, + preprocess($page, $params{page}, filter($page, readfile(srcfile($file))))); } @@ -145,8 +145,8 @@ sub get_inline_content ($$) { #{{{ my $type=pagetype($file); if (defined $type) { return htmlize($type, - preprocess($page, $destpage, linkify($page, $destpage, + preprocess($page, $destpage, filter($page, readfile(srcfile($file)))))); } diff --git a/IkiWiki/Plugin/sidebar.pm b/IkiWiki/Plugin/sidebar.pm index a68f5e1da..e0e81526f 100644 --- a/IkiWiki/Plugin/sidebar.pm +++ b/IkiWiki/Plugin/sidebar.pm @@ -29,8 +29,8 @@ sub sidebar_content ($) { #{{{ my $content=IkiWiki::readfile(IkiWiki::srcfile($sidebar_file)); return unless length $content; return IkiWiki::htmlize($sidebar_type, - IkiWiki::preprocess($sidebar_page, $page, IkiWiki::linkify($sidebar_page, $page, + IkiWiki::preprocess($sidebar_page, $page, IkiWiki::filter($sidebar_page, $content)))); } diff --git a/IkiWiki/Render.pm b/IkiWiki/Render.pm index 5351ee7ad..cef770c67 100644 --- a/IkiWiki/Render.pm +++ b/IkiWiki/Render.pm @@ -104,11 +104,24 @@ sub preprocess ($$$;$) { #{{{ # Note: preserve order of params, some plugins may # consider it significant. my @params; - while ($params =~ /(?:(\w+)=)?(?:"""\n?(.+)"""|"([^"]+)"|(\S+))(?:\s+|$)/sg) { - my $val=(defined $2 ? $2 : (defined $3 ? $3 : $4)); - chomp $val; - if (defined $1) { - push @params, $1, $val; + 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, ''; @@ -125,7 +138,7 @@ sub preprocess ($$$;$) { #{{{ } }; - $content =~ s{(\\?)\[\[(\w+)\s+((?:(?:\w+=)?(?:""".+"""|"[^"]+"|[^\s\]]+)\s*)*)\]\]}{$handle->($1, $2, $3)}eg; + $content =~ s{(\\?)\[\[(\w+)\s+((?:(?:\w+=)?(?:""".*?"""|"[^"]+"|[^\s\]]+)\s*)*)\]\]}{$handle->($1, $2, $3)}seg; return $content; } #}}} @@ -268,8 +281,8 @@ sub render ($) { #{{{ $links{$page}=[findlinks($page, $content)]; - $content=linkify($page, $page, $content); $content=preprocess($page, $page, $content); + $content=linkify($page, $page, $content); $content=htmlize($type, $content); check_overwrite("$config{destdir}/".htmlpage($page), $page); |