diff options
author | joey <joey@0fa5a96a-9a0e-0410-b3b2-a0fd24251071> | 2006-09-09 22:50:27 +0000 |
---|---|---|
committer | joey <joey@0fa5a96a-9a0e-0410-b3b2-a0fd24251071> | 2006-09-09 22:50:27 +0000 |
commit | dae0f48e91304afcb6ebe0936360e51b22a56548 (patch) | |
tree | 930090e4343087dac7ae6693d420d80b826c57f2 /IkiWiki/Plugin/smiley.pm | |
parent | d92142d09eaec9018c0cdc96f9ad3bd4a0c876a7 (diff) | |
download | ikiwiki-dae0f48e91304afcb6ebe0936360e51b22a56548.tar ikiwiki-dae0f48e91304afcb6ebe0936360e51b22a56548.tar.gz |
* Work on firming up the plugin interface:
- Plugins should not need to load IkiWiki::Render to get commonly
used functions, so moved some functions from there to IkiWiki.
- Picked out the set of functions and variables that most plugins
use, documented them, and made IkiWiki export them by default,
like a proper perl module should.
- Use the other functions at your own risk.
- This is not quite complete, I still have to decide whether to
export some other things.
* Changed all plugins included in ikiwiki to not use "IkiWiki::" when
referring to stuff now exported by the IkiWiki module.
* Anyone with a third-party ikiwiki plugin is strongly enrouraged
to make like changes to it and avoid use of non-exported symboles from
"IkiWiki::".
* Link debian/changelog and debian/news to NEWS and CHANGELOG.
* Support hyperestradier version 1.4.2, which adds a new required phraseform
setting.
Diffstat (limited to 'IkiWiki/Plugin/smiley.pm')
-rw-r--r-- | IkiWiki/Plugin/smiley.pm | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/IkiWiki/Plugin/smiley.pm b/IkiWiki/Plugin/smiley.pm index f49c9b62f..0c6f5d427 100644 --- a/IkiWiki/Plugin/smiley.pm +++ b/IkiWiki/Plugin/smiley.pm @@ -9,33 +9,33 @@ my %smileys; my $smiley_regexp; sub import { #{{{ - IkiWiki::hook(type => "checkconfig", id => "smiley", call => \&setup); + hook(type => "checkconfig", id => "smiley", call => \&setup); } # }}} sub setup () { #{{{ - my $list=IkiWiki::readfile(IkiWiki::srcfile("smileys.mdwn")); + my $list=readfile(srcfile("smileys.mdwn")); while ($list =~ m/^\s*\*\s+\\([^\s]+)\s+\[\[([^]]+)\]\]/mg) { $smileys{$1}=$2; } if (! %smileys) { - IkiWiki::debug("failed to parse any smileys, disabling plugin"); + debug("failed to parse any smileys, disabling plugin"); return; } - IkiWiki::hook(type => "filter", id => "smiley", call => \&filter); + 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 } reverse sort keys %smileys).')'; - #IkiWiki::debug($smiley_regexp); + #debug($smiley_regexp); } #}}} sub filter (@) { #{{{ my %params=@_; $params{content} =~ s{(?<=\s)(\\?)$smiley_regexp(?=\s)}{ - $1 ? $2 : IkiWiki::htmllink($params{page}, $params{page}, $smileys{$2}, 0, 0, $2) + $1 ? $2 : htmllink($params{page}, $params{page}, $smileys{$2}, 0, 0, $2) }egs; return $params{content}; |