link changes

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

diff --git a/IkiWiki/Plugin/smiley.pm b/IkiWiki/Plugin/smiley.pm
index a8fed69e1ba12a021682a1d1e2b247b8e4c54e44..0d77916d0d3d633e7656d79527cce12647089d47 100644 (file)
--- a/IkiWiki/Plugin/smiley.pm
+++ b/IkiWiki/Plugin/smiley.pm
@@ -3,19 +3,30 @@ package IkiWiki::Plugin::smiley;
 
 use warnings;
 use strict;
 
 use warnings;
 use strict;

-use IkiWiki 2.00;
+use IkiWiki 3.00;

 
 my %smileys;
 my $smiley_regexp;
 
 
 my %smileys;
 my $smiley_regexp;
 

-sub import { #{{{
+sub import {

        add_underlay("smiley");
        add_underlay("smiley");

+       hook(type => "getsetup", id => "smiley", call => \&getsetup);

        hook(type => "sanitize", id => "smiley", call => \&sanitize);
        hook(type => "sanitize", id => "smiley", call => \&sanitize);

-} # }}}
+}

 
 

-sub build_regexp () { #{{{
+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"));
        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;
 


@@ -39,16 +50,16 @@ sub build_regexp () { #{{{
        $smiley_regexp='('.join('|', map { quotemeta }
                reverse sort keys %smileys).')';
        #debug($smiley_regexp);
        $smiley_regexp='('.join('|', map { quotemeta }
                reverse sort keys %smileys).')';
        #debug($smiley_regexp);

-} #}}}
+}

 
 

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

        my %params=@_;
 
        build_regexp() unless defined $smiley_regexp;
        
        $_=$params{content};
        return $_ unless length $smiley_regexp;
        my %params=@_;
 
        build_regexp() unless defined $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,20 +79,22 @@ 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.
                }
                else {
                        # Replace the smiley with its expanded value.

-                       substr($_, $spos, length($smiley))=
-                               htmllink($params{page}, $params{page},
+                       my $link=htmllink($params{page}, $params{destpage},

                                         $smileys{$smiley}, linktext => $smiley);
                                         $smileys{$smiley}, linktext => $smiley);

+                       substr($_, $spos, length($smiley))=$link;
+                       pos=$epos+length($link);

                }
        }
 
        return $_;
                }
        }
 
        return $_;

-} # }}}
+}

 
 1
 
 1