X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/fa52a730ff3b30c7d2cdd8cd5f9c8c25a0c0a2a5..468c1c4496eade7a1a4ff6fe22aa82f5eefd3164:/IkiWiki/Plugin/smiley.pm diff --git a/IkiWiki/Plugin/smiley.pm b/IkiWiki/Plugin/smiley.pm index 14b8cacf8..6f4f49d18 100644 --- a/IkiWiki/Plugin/smiley.pm +++ b/IkiWiki/Plugin/smiley.pm @@ -3,42 +3,105 @@ package IkiWiki::Plugin::smiley; use warnings; use strict; -use IkiWiki; +use IkiWiki 3.00; my %smileys; my $smiley_regexp; -sub import { #{{{ - hook(type => "checkconfig", id => "smiley", call => \&setup); -} # }}} +sub import { + add_underlay("smiley"); + hook(type => "getsetup", id => "smiley", call => \&getsetup); + hook(type => "sanitize", id => "smiley", call => \&sanitize); +} -sub setup () { #{{{ - 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) { - debug(gettext("failed to parse any smileys, disabling plugin")); + debug(gettext("failed to parse any smileys")); + $smiley_regexp=''; return; } - hook(type => "filter", id => "smiley", call => \&filter); # sort and reverse so that substrings come after longer strings # that contain them, in most cases. $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{page}, $smileys{$2}, linktext => $2) - }egs; + $_=$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