X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/cf35ee04cddd7b9b39636499dd24b689443c0e97..66e894c8771c5a5dfbd4cb92f826d4d397b2256f:/IkiWiki/Plugin/smiley.pm?ds=sidebyside diff --git a/IkiWiki/Plugin/smiley.pm b/IkiWiki/Plugin/smiley.pm index 96e714d3d..0d77916d0 100644 --- a/IkiWiki/Plugin/smiley.pm +++ b/IkiWiki/Plugin/smiley.pm @@ -3,19 +3,40 @@ package IkiWiki::Plugin::smiley; use warnings; use strict; -use IkiWiki 2.00; +use IkiWiki 3.00; my %smileys; my $smiley_regexp; -sub import { #{{{ - hook(type => "filter", id => "smiley", call => \&filter); -} # }}} +sub import { + add_underlay("smiley"); + hook(type => "getsetup", id => "smiley", call => \&getsetup); + hook(type => "sanitize", id => "smiley", call => \&sanitize); +} -sub build_regexp () { #{{{ +sub getsetup () { + return + plugin => { + safe => 1, + # force a rebuild because turning it off + # removes the smileys, which would break links + rebuild => 1, + }, +} + +sub build_regexp () { my $list=readfile(srcfile("smileys.mdwn")); - while ($list =~ m/^\s*\*\s+\\([^\s]+)\s+\[\[([^]]+)\]\]/mg) { - $smileys{$1}=$2; + while ($list =~ m/^\s*\*\s+\\\\([^\s]+)\s+\[\[([^]]+)\]\]/mg) { + 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) { @@ -29,17 +50,51 @@ sub build_regexp () { #{{{ $smiley_regexp='('.join('|', map { quotemeta } reverse sort keys %smileys).')'; #debug($smiley_regexp); -} #}}} +} -sub filter (@) { #{{{ +sub sanitize (@) { my %params=@_; - + build_regexp() unless defined $smiley_regexp; - $params{content} =~ s{(?:^|(?<=\s))(\\?)$smiley_regexp(?:(?=\s)|$)}{ - $1 ? $2 : htmllink($params{page}, $params{destpage}, $smileys{$2}, linktext => $2) - }egs if length $smiley_regexp; + + $_=$params{content}; + return $_ unless length $smiley_regexp; + +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) {
+ # 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 ($escape) {
+ # Remove escape.
+ substr($_, $epos, 1)="";
+ pos=$epos+1;
+ }
+ else {
+ # Replace the smiley with its expanded value.
+ my $link=htmllink($params{page}, $params{destpage},
+ $smileys{$smiley}, linktext => $smiley);
+ substr($_, $spos, length($smiley))=$link;
+ pos=$epos+length($link);
+ }
+ }
- return $params{content};
-} # }}}
+ return $_;
+}
1