Merge commit 'upstream/master'

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

diff --git a/IkiWiki/Plugin/txt.pm b/IkiWiki/Plugin/txt.pm
index a4df54b553590a475f9ba19ed15d88cb9d2a471c..e4c9e5d6a086ba59d0a826c0e7378e297454d734 100644 (file)
--- a/IkiWiki/Plugin/txt.pm
+++ b/IkiWiki/Plugin/txt.pm
@@ -10,36 +10,53 @@ use warnings;
 use strict;
 use IkiWiki 2.00;
 use HTML::Entities;
 use strict;
 use IkiWiki 2.00;
 use HTML::Entities;

-require URI::Find;
+
+my $findurl=0;

 
 sub import {
 
 sub import {

-        hook(type => "filter",  id => "txt", call => \&filter);
-        hook(type => "htmlize", id => "txt", call => \&htmlize);
+       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 (@) {
 # 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|<a href="$uri">$orig_uri</a>|;
-            });
-        $finder->find(\$content);
-        $content = "<pre>" . $content . "</pre>";
-    }
-    return $content;
+       my %params = @_;
+       my $content = $params{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|<a href="$uri">$orig_uri</a>|;
+                       });
+                       $finder->find(\$content);
+               }
+               $content = "<pre>" . $content . "</pre>";
+       }
+
+       return $content;

 }
 
 # We need this to register the .txt file extension
 sub htmlize (@) {
 }
 
 # We need this to register the .txt file extension
 sub htmlize (@) {

-    my %params=@_;
-    return $params{content};
+       my %params=@_;
+       return $params{content};

 }
 
 1
 }
 
 1