fix plugin name

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

diff --git a/IkiWiki/Plugin/smiley.pm b/IkiWiki/Plugin/smiley.pm
index a8fed69e1ba12a021682a1d1e2b247b8e4c54e44..50f2686277afa2de60ef86bd88a870938f1c96e4 100644 (file)
--- a/IkiWiki/Plugin/smiley.pm
+++ b/IkiWiki/Plugin/smiley.pm
@@ -15,7 +15,7 @@ sub import { #{{{
 
 sub build_regexp () { #{{{
        my $list=readfile(srcfile("smileys.mdwn"));
 
 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;
 
                my $smiley=$1;
                my $file=$2;
 


@@ -48,7 +48,7 @@ sub sanitize (@) { #{{{
        
        $_=$params{content};
        return $_ unless length $smiley_regexp;
        
        $_=$params{content};
        return $_ unless length $smiley_regexp;

-       
+                       

 MATCH: while (m{(?:^|(?<=\s|>))(\\?)$smiley_regexp(?:(?=\s|<)|$)}g) {
                my $escape=$1;
                my $smiley=$2;
 MATCH: while (m{(?:^|(?<=\s|>))(\\?)$smiley_regexp(?:(?=\s|<)|$)}g) {
                my $escape=$1;
                my $smiley=$2;


@@ -68,17 +68,23 @@ MATCH:      while (m{(?:^|(?<=\s|>))(\\?)$smiley_regexp(?:(?=\s|<)|$)}g) {
                        # Reset pos back to where it was before this test.
                        pos=$pos;
                }
                        # Reset pos back to where it was before this test.
                        pos=$pos;
                }

-
+       

                if ($escape) {
                        # Remove escape.
                        substr($_, $epos, 1)="";
                if ($escape) {
                        # Remove escape.
                        substr($_, $epos, 1)="";

+                       pos=$epos+1;

                }
                else {
                        # Replace the smiley with its expanded value.
                        substr($_, $spos, length($smiley))=
                }
                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);
                                         $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 $_;
        }
 
        return $_;