sadly still lost

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

diff --git a/IkiWiki/Plugin/shortcut.pm b/IkiWiki/Plugin/shortcut.pm
index c1e6a7eb304e8ac84643a95b03e17684a8235a2d..98df143ab27e34506217f770d40c03e554dcd386 100644 (file)
--- a/IkiWiki/Plugin/shortcut.pm
+++ b/IkiWiki/Plugin/shortcut.pm
@@ -16,11 +16,12 @@ sub getsetup () {
                plugin => {
                        safe => 1,
                        rebuild => undef,
                plugin => {
                        safe => 1,
                        rebuild => undef,

+                       section => "widget",

                },
 }
 
 sub checkconfig () {
                },
 }
 
 sub checkconfig () {

-       if (defined $config{srcdir}) {
+       if (defined $config{srcdir} && length $config{srcdir}) {

                # Preprocess the shortcuts page to get all the available shortcuts
                # defined before other pages are rendered.
                my $srcfile=srcfile("shortcuts.".$config{default_pageext}, 1);
                # Preprocess the shortcuts page to get all the available shortcuts
                # defined before other pages are rendered.
                my $srcfile=srcfile("shortcuts.".$config{default_pageext}, 1);


@@ -28,10 +29,12 @@ sub checkconfig () {
                        $srcfile=srcfile("shortcuts.mdwn", 1);
                }
                if (! defined $srcfile) {
                        $srcfile=srcfile("shortcuts.mdwn", 1);
                }
                if (! defined $srcfile) {

-                       error(sprintf(gettext("shortcut plugin will not work without %s"),
-                               "shortcuts.".$config{default_pageext}));
+                       print STDERR sprintf(gettext("shortcut plugin will not work without %s"),
+                               "shortcuts.".$config{default_pageext})."\n";
+               }
+               else {
+                       IkiWiki::preprocess("shortcuts", "shortcuts", readfile($srcfile));

                }
                }

-               IkiWiki::preprocess("shortcuts", "shortcuts", readfile($srcfile));

        }
 }
 
        }
 }
 


@@ -70,11 +73,21 @@ sub shortcut_expand ($$@) {
        add_depends($params{destpage}, "shortcuts");
 
        my $text=join(" ", @params);
        add_depends($params{destpage}, "shortcuts");
 
        my $text=join(" ", @params);

-       my $encoded_text=$text;
-       $encoded_text=~s/([^A-Za-z0-9])/sprintf("%%%02X", ord($1))/seg;

        
        

-       $url=~s{\%([sS])}{
-               $1 eq 's' ? $encoded_text : $text
+       $url=~s{\%([sSW])}{
+               if ($1 eq 's') {
+                       my $t=$text;
+                       $t=~s/([^A-Za-z0-9])/sprintf("%%%02X", ord($1))/seg;
+                       $t;
+               }
+               elsif ($1 eq 'S') {
+                       $text;
+               }
+               elsif ($1 eq 'W') {
+                       my $t=Encode::encode_utf8($text);
+                       $t=~s/([^A-Za-z0-9])/sprintf("%%%02X", ord($1))/seg;
+                       $t;
+               }

        }eg;
 
        $text=~s/_/ /g;
        }eg;
 
        $text=~s/_/ /g;