X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/88b5a0ece54c63129733adc2a4bb9c89df46a5f0..3096c8ea69783b1c1cfbf5b9f940d2939d2a33f5:/IkiWiki/Plugin/smiley.pm diff --git a/IkiWiki/Plugin/smiley.pm b/IkiWiki/Plugin/smiley.pm index fcf3048b2..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; + $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,16 +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;
@@ -60,11 +71,11 @@ MATCH:	while (m{(?:^|(?<=\s))(\\?)$smiley_regexp(?:(?=\s)|$)}g) {
 
 		if ($escape) {
 			# Remove escape.
-			substr($_, $-[1], 1)="";
+			substr($_, $epos, 1)="";
 		}
 		else {
 			# Replace the smiley with its expanded value.
-			substr($_, $-[2], length($smiley))=
+			substr($_, $spos, length($smiley))=
 				htmllink($params{page}, $params{destpage},
 				         $smileys{$smiley}, linktext => $smiley);
 		}