X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/5a128f3d6333b16200512b33b5265b1b1e8f3837..32cc0b336ae830831787b2024b855ed7db0a1589:/IkiWiki/Plugin/shortcut.pm
diff --git a/IkiWiki/Plugin/shortcut.pm b/IkiWiki/Plugin/shortcut.pm
index 26385f3a6..7bfce586f 100644
--- a/IkiWiki/Plugin/shortcut.pm
+++ b/IkiWiki/Plugin/shortcut.pm
@@ -3,25 +3,37 @@ package IkiWiki::Plugin::shortcut;
use warnings;
use strict;
-use IkiWiki;
+use IkiWiki 2.00;
sub import { #{{{
- hook(type => "checkconfig", id => "shortcut", call => \&checkconfig);
+ hook(type => "getsetup", id => "shortcut", call => \&getsetup);
+ hook(type => "refresh", id => "shortcut", call => \&refresh);
hook(type => "preprocess", id => "shortcut", call => \&preprocess_shortcut);
} #}}}
-sub checkconfig () { #{{{
+sub getsetup () { #{{{
+ return
+ plugin => {
+ safe => 1,
+ rebuild => undef,
+ },
+} #}}}
+
+sub refresh () { #{{{
# Preprocess the shortcuts page to get all the available shortcuts
# defined before other pages are rendered.
- IkiWiki::preprocess("shortcuts", "shortcuts",
- readfile(srcfile("shortcuts.mdwn")));
+ my $srcfile=srcfile("shortcuts.mdwn", 1);
+ if (! defined $srcfile) {
+ error(gettext("shortcut plugin will not work without a shortcuts.mdwn"));
+ }
+ IkiWiki::preprocess("shortcuts", "shortcuts", readfile($srcfile));
} # }}}
sub preprocess_shortcut (@) { #{{{
my %params=@_;
if (! defined $params{name} || ! defined $params{url}) {
- return "[[".gettext("shortcut missing name or url parameter")."]]";
+ error gettext("missing name or url parameter");
}
hook(type => "preprocess", no_override => 1, id => $params{name},
@@ -30,7 +42,7 @@ sub preprocess_shortcut (@) { #{{{
#translators: This is used to display what shortcuts are defined.
#translators: First parameter is the name of the shortcut, the second
#translators: is an URL.
- return sprintf(gettext("shortcut %s points to %s"), $params{name}, $params{url});
+ return sprintf(gettext("shortcut %s points to %s"), $params{name}, $params{url});
} # }}}
sub shortcut_expand ($$@) { #{{{
@@ -54,7 +66,14 @@ sub shortcut_expand ($$@) { #{{{
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
+ }eg;
+
$text=~s/_/ /g;
+ if (defined $params{desc}) {
+ $desc=$params{desc};
+ }
if (defined $desc) {
$desc=~s/\%s/$text/g;
}
@@ -62,7 +81,6 @@ sub shortcut_expand ($$@) { #{{{
$desc=$text;
}
- $url=~s/\%s/$encoded_text/g;
return "$desc";
} #}}}