X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/44824dba1bc9e03499e91f15234764e8739fcff8..3096c8ea69783b1c1cfbf5b9f940d2939d2a33f5:/IkiWiki/Plugin/smiley.pm diff --git a/IkiWiki/Plugin/smiley.pm b/IkiWiki/Plugin/smiley.pm index 7e0b54499..51b32b28f 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,37 +49,35 @@ 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 or
- # . If it's , then the smiley is inside the
- # tag, and is not expanded. If it's , the smiley is
- # outside the block.
+ # 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) {
- if (defined $1) {
- # Inside tag, so do nothing.
- # (Smiley hunting will continue after
- # the tag.)
- next MATCH;
- }
- else {
- # Reset pos back to where it was before
- # this test.
- pos=$pos;
- }
+ if (m/<(\/)?\s*$tag\s*>/isg && defined $1) {
+ # found first, so the smiley is
+ # inside the tag, so do not expand it.
+ next MATCH;
}
+ # Reset pos back to where it was before this test.
+ pos=$pos;
}
- if ($1) {
+ if ($escape) {
# Remove escape.
- substr($_, $-[1], 1)="";
+ substr($_, $epos, 1)="";
}
else {
# Replace the smiley with its expanded value.
- substr($_, $-[2], length($2))=
- htmllink($params{page}, $params{destpage}, $smileys{$2}, linktext => $2);
+ substr($_, $spos, length($smiley))=
+ htmllink($params{page}, $params{destpage},
+ $smileys{$smiley}, linktext => $smiley);
}
}