X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/a4d693f659b901557e596c41d3ab48bce804d7f6..a9e45d868b721de2edba958a41fafa05c548359c:/IkiWiki/Plugin/txt.pm?ds=inline diff --git a/IkiWiki/Plugin/txt.pm b/IkiWiki/Plugin/txt.pm index 2670e9b63..e157bf07e 100644 --- a/IkiWiki/Plugin/txt.pm +++ b/IkiWiki/Plugin/txt.pm @@ -10,27 +10,43 @@ use warnings; use strict; use IkiWiki 2.00; use HTML::Entities; -require URI::Find; + +my $findurl=0; sub import { - hook(type => "filter", id => "txt", call => \&filter); + hook(type => "getsetup", id => "txt", call => \&getsetup); + hook(type => "filter", id => "txt", call => \&filter); hook(type => "htmlize", id => "txt", call => \&htmlize); + + eval q{use URI::Find}; + if (! $@) { + $findurl=1; + } } +sub getsetup () { #{{{ + return + plugin => { + safe => 1, + rebuild => 1, # format plugin + }, +} #}}} + # We use filter to convert raw text to HTML # (htmlize is called after other plugins insert HTML) sub filter (@) { my %params = @_; my $content = $params{content}; - if ($pagesources{$params{page}} =~ /.txt$/) { - encode_entities($content); - my $finder = URI::Find->new( - sub { - my ($uri, $orig_uri) = @_; - return qq|$orig_uri|; - }); - $finder->find(\$content); + if (defined $pagesources{$params{page}} && $pagesources{$params{page}} =~ /\.txt$/) { + encode_entities($content, "<>&"); + if ($findurl) { + my $finder = URI::Find->new(sub { + my ($uri, $orig_uri) = @_; + return qq|$orig_uri|; + }); + $finder->find(\$content); + } $content = "
" . $content . ""; }