typo

[git.ikiwiki.info.git] / IkiWiki / Plugin / smiley.pm

diff --git a/IkiWiki/Plugin/smiley.pm b/IkiWiki/Plugin/smiley.pm
index 7e0b54499d1edb70a57d42a959e56b0ed513f26f..6f4f49d18f4b3fb08d0d73a8ba877987fb12a94d 100644 (file)
--- 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/</&lt;/g;
+               $smiley=~s/>/&gt;/g;
+               $smileys{$smiley}=$file;
        }
        
        if (! %smileys) {
@@ -30,51 +57,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};
        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 <pre> or <code>.
-               # For each tag in turn, match forward to find <tag> or
-               # </tag>. If it's </tag>, then the smiley is inside the
-               # tag, and is not expanded. If it's <tag>, the smiley is
-               # outside the block.
+               # 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) {
-                               if (defined $1) {
-                                       # Inside tag, so do nothing.
-                                       # (Smiley hunting will continue after
-                                       # the tag.)
-                                       next MATCH;
-                               }
-                               else {
-                                       # Reset pos back to where it was before
-                                       # this test.
-                                       pos=$pos;
-                               }
+                       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 ($1) {
+       
+               if ($escape) {
                        # Remove escape.
-                       substr($_, $-[1], 1)="";
+                       substr($_, $epos, 1)="";
+                       pos=$epos+1;
                }
                else {
                        # Replace the smiley with its expanded value.
-                       substr($_, $-[2], length($2))=
-                               htmllink($params{page}, $params{destpage}, $smileys{$2}, linktext => $2);
+                       my $link=htmllink($params{page}, $params{destpage},
+                                        $smileys{$smiley}, linktext => $smiley);
+                       substr($_, $spos, length($smiley))=$link;
+                       pos=$epos+length($link);
                }
        }
 
        return $_;
-} # }}}
+}
 
 1