add plugin safe/rebuild info (part 3 of 3)

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

diff --git a/IkiWiki/Plugin/smiley.pm b/IkiWiki/Plugin/smiley.pm
index a8fed69e1ba12a021682a1d1e2b247b8e4c54e44..7a9026025ed94f778aa4b6e666677b27595f605b 100644 (file)
--- a/IkiWiki/Plugin/smiley.pm
+++ b/IkiWiki/Plugin/smiley.pm
@@ -10,12 +10,23 @@ my $smiley_regexp;
 
 sub import { #{{{
        add_underlay("smiley");
+       hook(type => "getsetup", id => "smiley", call => \&getsetup);
        hook(type => "sanitize", id => "smiley", call => \&sanitize);
 } # }}}
 
+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 $list=readfile(srcfile("smileys.mdwn"));
-       while ($list =~ m/^\s*\*\s+\\([^\s]+)\s+\[\[([^]]+)\]\]/mg) {
+       while ($list =~ m/^\s*\*\s+\\\\([^\s]+)\s+\[\[([^]]+)\]\]/mg) {
                my $smiley=$1;
                my $file=$2;
 
@@ -48,7 +59,7 @@ sub sanitize (@) { #{{{
        
        $_=$params{content};
        return $_ unless length $smiley_regexp;
-       
+                       
 MATCH: while (m{(?:^|(?<=\s|>))(\\?)$smiley_regexp(?:(?=\s|<)|$)}g) {
                my $escape=$1;
                my $smiley=$2;
@@ -68,17 +79,23 @@ 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($_, $epos, 1)="";
+                       pos=$epos+1;
                }
                else {
                        # Replace the smiley with its expanded value.
                        substr($_, $spos, length($smiley))=
-                               htmllink($params{page}, $params{page},
+                               htmllink($params{page}, $params{destpage},
                                         $smileys{$smiley}, linktext => $smiley);
+                       pos=$epos+1;
                }
+
+               # Breaks out at end, otherwise it will scan through again,
+               # replacing de-escaped ones.
+               #last unless defined pos;
        }
 
        return $_;