X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/cd6055a893287c0f6505f7ade7fb1ab61621a373..4a9567595a1e7daae0810986187391824db3f14a:/IkiWiki/Plugin/smiley.pm diff --git a/IkiWiki/Plugin/smiley.pm b/IkiWiki/Plugin/smiley.pm index 124245b68..a8fed69e1 100644 --- a/IkiWiki/Plugin/smiley.pm +++ b/IkiWiki/Plugin/smiley.pm @@ -10,13 +10,22 @@ my $smiley_regexp; sub import { #{{{ add_underlay("smiley"); - hook(type => "filter", id => "smiley", call => \&filter); + hook(type => "sanitize", id => "smiley", call => \&sanitize); } # }}} sub build_regexp () { #{{{ my $list=readfile(srcfile("smileys.mdwn")); while ($list =~ m/^\s*\*\s+\\([^\s]+)\s+\[\[([^]]+)\]\]/mg) { - $smileys{$1}=$2; + my $smiley=$1; + my $file=$2; + + $smileys{$smiley}=$file; + + # Add a version with < and > escaped, since they probably + # will be (by markdown) by the time the sanitize hook runs. + $smiley=~s/</g; + $smiley=~s/>/>/g; + $smileys{$smiley}=$file; } if (! %smileys) { @@ -32,7 +41,7 @@ sub build_regexp () { #{{{ #debug($smiley_regexp); } #}}} -sub filter (@) { #{{{ +sub sanitize (@) { #{{{ my %params=@_; build_regexp() unless defined $smiley_regexp; @@ -40,18 +49,18 @@ sub filter (@) { #{{{ $_=$params{content}; return $_ unless length $smiley_regexp; -MATCH: while (m{(?:^|(?<=\s))(\\?)$smiley_regexp(?:(?=\s)|$)}g) { +MATCH: while (m{(?:^|(?<=\s|>))(\\?)$smiley_regexp(?:(?=\s|<)|$)}g) { my $escape=$1; my $smiley=$2; my $epos=$-[1]; my $spos=$-[2]; - + # Smilies are not allowed inside
or .
# For each tag in turn, match forward to find the next
# or after the smiley.
my $pos=pos;
foreach my $tag ("pre", "code") {
- if (m/.*?<(\/)?\s*$tag\s*>/isg && defined $1) {
+ if (m/<(\/)?\s*$tag\s*>/isg && defined $1) {
# found first, so the smiley is
# inside the tag, so do not expand it.
next MATCH;
@@ -67,7 +76,7 @@ MATCH: while (m{(?:^|(?<=\s))(\\?)$smiley_regexp(?:(?=\s)|$)}g) {
else {
# Replace the smiley with its expanded value.
substr($_, $spos, length($smiley))=
- htmllink($params{page}, $params{destpage},
+ htmllink($params{page}, $params{page},
$smileys{$smiley}, linktext => $smiley);
}
}