Disable handling of "bare" links by the creole plugin.

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

diff --git a/IkiWiki/Plugin/smiley.pm b/IkiWiki/Plugin/smiley.pm
index 14b8cacf8c3385dc01a351474c2119ac942d2d80..a8fed69e1ba12a021682a1d1e2b247b8e4c54e44 100644 (file)
--- a/IkiWiki/Plugin/smiley.pm
+++ b/IkiWiki/Plugin/smiley.pm
@@ -3,27 +3,37 @@ package IkiWiki::Plugin::smiley;
 
 use warnings;
 use strict;
 
 use warnings;
 use strict;

-use IkiWiki;
+use IkiWiki 2.00;

 
 my %smileys;
 my $smiley_regexp;
 
 sub import { #{{{
 
 my %smileys;
 my $smiley_regexp;
 
 sub import { #{{{

-       hook(type => "checkconfig", id => "smiley", call => \&setup);
+       add_underlay("smiley");
+       hook(type => "sanitize", id => "smiley", call => \&sanitize);

 } # }}}
 
 } # }}}
 

-sub setup () { #{{{
+sub build_regexp () { #{{{

        my $list=readfile(srcfile("smileys.mdwn"));
        while ($list =~ m/^\s*\*\s+\\([^\s]+)\s+\[\[([^]]+)\]\]/mg) {
        my $list=readfile(srcfile("smileys.mdwn"));
        while ($list =~ m/^\s*\*\s+\\([^\s]+)\s+\[\[([^]]+)\]\]/mg) {

-               $smileys{$1}=$2;
+               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) {
        }
        
        if (! %smileys) {

-               debug(gettext("failed to parse any smileys, disabling plugin"));
+               debug(gettext("failed to parse any smileys"));
+               $smiley_regexp='';

                return;
        }
        
                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 }
        # sort and reverse so that substrings come after longer strings
        # that contain them, in most cases.
        $smiley_regexp='('.join('|', map { quotemeta }


@@ -31,14 +41,47 @@ sub setup () { #{{{
        #debug($smiley_regexp);
 } #}}}
 
        #debug($smiley_regexp);
 } #}}}
 

-sub filter (@) { #{{{
+sub sanitize (@) { #{{{

        my %params=@_;
        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 <pre> or <code>.
+               # 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 && 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 ($escape) {
+                       # Remove escape.
+                       substr($_, $epos, 1)="";
+               }
+               else {
+                       # Replace the smiley with its expanded value.
+                       substr($_, $spos, length($smiley))=
+                               htmllink($params{page}, $params{page},
+                                        $smileys{$smiley}, linktext => $smiley);
+               }
+       }

 
 

-       return $params{content};
+       return $_;

 } # }}}
 
 1
 } # }}}
 
 1