diff options
author | Jonas Smedegaard <dr@jones.dk> | 2008-10-23 14:46:24 +0200 |
---|---|---|
committer | Jonas Smedegaard <dr@jones.dk> | 2008-10-23 14:46:24 +0200 |
commit | 678bc6f97405e150a3a575bd0cfc42fbb618c365 (patch) | |
tree | 57a1bb232fa00a966d9f283128ce3b08c1efa226 /perl | |
parent | b4fa3588d8e9fe4ab98c500f3e5a4469e0613026 (diff) | |
parent | ba197084b657f202d1e81424b8fdf71e191f6749 (diff) |
Merge branch 'master' into _nb
Conflicts (manually resolved):
ikiwiki_nb.setup
Diffstat (limited to 'perl')
-rw-r--r-- | perl/Locale/Po4a/Text.pm | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/perl/Locale/Po4a/Text.pm b/perl/Locale/Po4a/Text.pm index ee56046..32f9dec 100644 --- a/perl/Locale/Po4a/Text.pm +++ b/perl/Locale/Po4a/Text.pm @@ -247,7 +247,7 @@ sub parse { or $paragraph =~ /^\$(\S+[{}]\S*\s*)+/ms # Xapian macro or $paragraph =~ /<(?![a-z]+[:@])/ms # maybe html (tags but not wiki <URI>) or $paragraph =~ /^[^<]+>/ms # maybe html (tag with vertical space) - or $paragraph =~ /^\s*\[\[\!\S[^\]]+$/ms # macro begin + or $paragraph =~ /\[\[\!\S[^\]]+$/ms # macro begin ); } if ($end_of_paragraph) { |