X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/88b5a0ece54c63129733adc2a4bb9c89df46a5f0..b752e7fec4d2bdd788a70722455018245900126b:/IkiWiki/Plugin/smiley.pm diff --git a/IkiWiki/Plugin/smiley.pm b/IkiWiki/Plugin/smiley.pm index fcf3048b2..6f4f49d18 100644 --- a/IkiWiki/Plugin/smiley.pm +++ b/IkiWiki/Plugin/smiley.pm @@ -3,20 +3,47 @@ package IkiWiki::Plugin::smiley; use warnings; use strict; -use IkiWiki 2.00; +use IkiWiki 3.00; my %smileys; my $smiley_regexp; -sub import { #{{{ +sub import { add_underlay("smiley"); - hook(type => "filter", id => "smiley", call => \&filter); -} # }}} + hook(type => "getsetup", id => "smiley", call => \&getsetup); + 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; +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 $srcfile = srcfile("smileys.mdwn", 1); + if (! defined $srcfile) { + print STDERR sprintf(gettext("smiley plugin will not work without %s"), + "smileys.mdwn")."\n"; + $smiley_regexp=''; + return; + } + my $list=readfile($srcfile); + 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; + $smileys{$smiley}=$file; } if (! %smileys) { @@ -30,26 +57,28 @@ 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}; 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;
@@ -57,20 +86,22 @@ MATCH:	while (m{(?:^|(?<=\s))(\\?)$smiley_regexp(?:(?=\s)|$)}g) {
 			# Reset pos back to where it was before this test.
 			pos=$pos;
 		}
-
+	
 		if ($escape) {
 			# Remove escape.
-			substr($_, $-[1], 1)="";
+			substr($_, $epos, 1)="";
+			pos=$epos+1;
 		}
 		else {
 			# Replace the smiley with its expanded value.
-			substr($_, $-[2], length($smiley))=
-				htmllink($params{page}, $params{destpage},
+			my $link=htmllink($params{page}, $params{destpage},
 				         $smileys{$smiley}, linktext => $smiley);
+			substr($_, $spos, length($smiley))=$link;
+			pos=$epos+length($link);
 		}
 	}
 
 	return $_;
-} # }}}
+}
 
 1