X-Git-Url: https://sipb.mit.edu/gitweb.cgi/ikiwiki.git/blobdiff_plain/8fa477fa28afdee85a973ffe2447538d3371f025..88b5a0ece54c63129733adc2a4bb9c89df46a5f0:/IkiWiki/Plugin/smiley.pm

diff --git a/IkiWiki/Plugin/smiley.pm b/IkiWiki/Plugin/smiley.pm
index e85abbb85..fcf3048b2 100644
--- a/IkiWiki/Plugin/smiley.pm
+++ b/IkiWiki/Plugin/smiley.pm
@@ -3,12 +3,13 @@ package IkiWiki::Plugin::smiley;
 
 use warnings;
 use strict;
-use IkiWiki;
+use IkiWiki 2.00;
 
 my %smileys;
 my $smiley_regexp;
 
 sub import { #{{{
+	add_underlay("smiley");
 	hook(type => "filter", id => "smiley", call => \&filter);
 } # }}}
 
@@ -33,13 +34,43 @@ sub build_regexp () { #{{{
 
 sub filter (@) { #{{{
 	my %params=@_;
-	
+
 	build_regexp() unless defined $smiley_regexp;
-	$params{content} =~ s{(?:^|(?<=\s))(\\?)$smiley_regexp(?:(?=\s)|$)}{
-		$1 ? $2 : htmllink($params{page}, $params{page}, $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;
+
+		# Smilies are not allowed inside <pre> or <code>.
+		# For each tag in turn, match forward to find the next <tag>
+		# or </tag> after the smiley.
+		my $pos=pos;
+		foreach my $tag ("pre", "code") {
+			if (m/.*?<(\/)?\s*$tag\s*>/isg && defined $1) {
+				# </tag> 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($_, $-[1], 1)="";
+		}
+		else {
+			# Replace the smiley with its expanded value.
+			substr($_, $-[2], length($smiley))=
+				htmllink($params{page}, $params{destpage},
+				         $smileys{$smiley}, linktext => $smiley);
+		}
+	}
 
-	return $params{content};
+	return $_;
 } # }}}
 
 1