diff options
| author | joey <joey@0fa5a96a-9a0e-0410-b3b2-a0fd24251071> | 2006-08-23 06:08:12 +0000 |
|---|---|---|
| committer | joey <joey@0fa5a96a-9a0e-0410-b3b2-a0fd24251071> | 2006-08-23 06:08:12 +0000 |
| commit | 7c66edacd864bdb1a7c657b6131f53666fc0675b (patch) | |
| tree | 3fd557fa6d253acbf0e81d28f496e507638f72f6 | |
| parent | f27bf9e4006c55b45624d6fbb47dc3c625f919b9 (diff) | |
update
| -rw-r--r-- | IkiWiki/Render.pm | 8 | ||||
| -rw-r--r-- | doc/index.mdwn | 3 |
2 files changed, 7 insertions, 4 deletions
diff --git a/IkiWiki/Render.pm b/IkiWiki/Render.pm index d988e0956..5351ee7ad 100644 --- a/IkiWiki/Render.pm +++ b/IkiWiki/Render.pm @@ -104,12 +104,14 @@ sub preprocess ($$$;$) { #{{{ # Note: preserve order of params, some plugins may # consider it significant. my @params; - while ($params =~ /(?:(\w+)=)?(?:"""(.+)"""|"([^"]+)"|(\S+))(?:\s+|$)/sg) { + while ($params =~ /(?:(\w+)=)?(?:"""\n?(.+)"""|"([^"]+)"|(\S+))(?:\s+|$)/sg) { + my $val=(defined $2 ? $2 : (defined $3 ? $3 : $4)); + chomp $val; if (defined $1) { - push @params, $1, (defined $2 ? $2 : (defined $3 ? $3 : $4)); + push @params, $1, $val; } else { - push @params, (defined $2 ? $2 : (defined $3 ? $3 : $4)), ''; + push @params, $val, ''; } } return $hooks{preprocess}{$command}{call}->( diff --git a/doc/index.mdwn b/doc/index.mdwn index 2f78f11aa..8f3911bd9 100644 --- a/doc/index.mdwn +++ b/doc/index.mdwn @@ -12,7 +12,8 @@ Instead it can use [[Subversion]] (or [[Git]]). and thoughts about ikiwiki to [[Discussion]]. [[template id=note text=""" -If you use ikiwiki, please list your wiki in [[IkiWikiUsers]]. Thanks! +If you use ikiwiki, please list your wiki in [[IkiWikiUsers]]. +Thanks! --[[Joey]] """]] * [[Setup]] has a tutorial for setting up ikiwiki, and [[Usage]] documents |