Merge branch 'master'

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

diff --git a/IkiWiki/Plugin/img.pm b/IkiWiki/Plugin/img.pm
index 9135c688fae77cd4d028941b095083213bb90035..cc0e84b01f09a7527c341a99c8262eeebb34d106 100644 (file)
--- a/IkiWiki/Plugin/img.pm
+++ b/IkiWiki/Plugin/img.pm
@@ -5,36 +5,44 @@ package IkiWiki::Plugin::img;
 
 use warnings;
 use strict;
 
 use warnings;
 use strict;

-use IkiWiki;
+use IkiWiki 2.00;

 
 my %imgdefaults;
 
 sub import { #{{{
 
 my %imgdefaults;
 
 sub import { #{{{

-       hook(type => "preprocess", id => "img", call => \&preprocess);
+       hook(type => "preprocess", id => "img", call => \&preprocess, scan => 1);

 } #}}}
 
 sub preprocess (@) { #{{{
        my ($image) = $_[0] =~ /$config{wiki_file_regexp}/; # untaint
        my %params=@_;
 
 } #}}}
 
 sub preprocess (@) { #{{{
        my ($image) = $_[0] =~ /$config{wiki_file_regexp}/; # untaint
        my %params=@_;
 

-       if (! exists $imgdefaults{$params{page}}) {
-               $imgdefaults{$params{page}} = {};
+       if (exists $imgdefaults{$params{page}}) {
+               foreach my $key (keys %{$imgdefaults{$params{page}}}) {
+                       if (! exists $params{$key}) {
+                               $params{$key}=$imgdefaults{$params{page}}->{$key};
+                       }
+               }
+       }
+
+       if (! exists $params{size}) {
+               $params{size}='full';

        }
        }

-       my $size = $params{size} || $imgdefaults{$params{page}}->{size} || 'full';
-       my $alt = $params{alt} || $imgdefaults{$params{page}}->{alt} || '';

 
        if ($image eq 'defaults') {
 
        if ($image eq 'defaults') {

-               $imgdefaults{$params{page}} = {
-                       size => $size,
-                       alt => $alt,
-               };
+               $imgdefaults{$params{page}} = \%params;

                return '';
        }
 
                return '';
        }
 

-       add_depends($params{page}, $image);
-       my $file = bestlink($params{page}, $image) || return "[[img $image not found]]";
+       push @{$links{$params{page}}}, $image;
+       # optimisation: detect scan mode, and avoid generating the image
+       if (! defined wantarray) {
+               return;
+       }
+
+       my $file = bestlink($params{page}, $image);

 
 

-       my $dir = IkiWiki::dirname($file);
+       my $dir = $params{page};

        my $base = IkiWiki::basename($file);
 
        eval q{use Image::Magick};
        my $base = IkiWiki::basename($file);
 
        eval q{use Image::Magick};


@@ -43,27 +51,29 @@ sub preprocess (@) { #{{{
        my $imglink;
        my $r;
 
        my $imglink;
        my $r;
 

-       if ($size ne 'full') {
-               my ($w, $h) = ($size =~ /^(\d+)x(\d+)$/);
-               return "[[img bad size \"$size\"]]" unless (defined $w && defined $h);
+       if ($params{size} ne 'full') {
+               my ($w, $h) = ($params{size} =~ /^(\d+)x(\d+)$/);
+               return "[[img ".sprintf(gettext('bad size "%s"'), $params{size})."]]"
+                       unless (defined $w && defined $h);

 
                my $outfile = "$config{destdir}/$dir/${w}x${h}-$base";
                $imglink = "$dir/${w}x${h}-$base";
 
                my $outfile = "$config{destdir}/$dir/${w}x${h}-$base";
                $imglink = "$dir/${w}x${h}-$base";

+               
+               will_render($params{page}, $imglink);

 
                if (-e $outfile && (-M srcfile($file) >= -M $outfile)) {
                        $r = $im->Read($outfile);
 
                if (-e $outfile && (-M srcfile($file) >= -M $outfile)) {
                        $r = $im->Read($outfile);

-                       return "[[img failed to read $outfile: $r]]" if $r;
+                       return "[[img ".sprintf(gettext("failed to read %s: %s"), $outfile, $r)."]]" if $r;

                }
                else {
                        $r = $im->Read(srcfile($file));
                }
                else {
                        $r = $im->Read(srcfile($file));

-                       return "[[img failed to read $file: $r]]" if $r;
+                       return "[[img ".sprintf(gettext("failed to read %s: %s"), $file, $r)."]]" if $r;

 
                        $r = $im->Resize(geometry => "${w}x${h}");
 
                        $r = $im->Resize(geometry => "${w}x${h}");

-                       return "[[img failed to resize: $r]]" if $r;
+                       return "[[img ".sprintf(gettext("failed to resize: %s"), $r)."]]" if $r;

 
                        # don't actually write file in preview mode
                        if (! $params{preview}) {
 
                        # don't actually write file in preview mode
                        if (! $params{preview}) {

-                               will_render($params{page}, $imglink);

                                my @blob = $im->ImageToBlob();
                                writefile($imglink, $config{destdir}, $blob[0], 1);
                        }
                                my @blob = $im->ImageToBlob();
                                writefile($imglink, $config{destdir}, $blob[0], 1);
                        }


@@ -74,7 +84,7 @@ sub preprocess (@) { #{{{
        }
        else {
                $r = $im->Read(srcfile($file));
        }
        else {
                $r = $im->Read(srcfile($file));

-               return "[[img failed to read $file: $r]]" if $r;
+               return "[[img ".sprintf(gettext("failed to read %s: %s"), $file, $r)."]]" if $r;

                $imglink = $file;
        }
 
                $imglink = $file;
        }
 


@@ -82,17 +92,49 @@ sub preprocess (@) { #{{{
 
        my ($fileurl, $imgurl);
        if (! $params{preview}) {
 
        my ($fileurl, $imgurl);
        if (! $params{preview}) {

-               $fileurl=IkiWiki::abs2rel($file, IkiWiki::dirname($params{destpage}));
-               $imgurl=IkiWiki::abs2rel($imglink, IkiWiki::dirname($params{destpage}));
+               $fileurl=urlto($file, $params{destpage});
+               $imgurl=urlto($imglink, $params{destpage});

        }
        else {
                $fileurl="$config{url}/$file";
                $imgurl="$config{url}/$imglink";
        }
 
        }
        else {
                $fileurl="$config{url}/$file";
                $imgurl="$config{url}/$imglink";
        }
 

-       return '<a href="'.$fileurl.'"><img src="'.$imgurl.
-               '" alt="'.$alt.'" width="'.$im->Get("width").
-               '" height="'.$im->Get("height").'" /></a>';
+       if (! defined($im->Get("width")) || ! defined($im->Get("height"))) {
+               return "[[img ".sprintf(gettext("failed to determine size of image %s"), $file)."]]";
+       }
+
+       my $imgtag='<img src="'.$imgurl.
+               '" alt="'.(exists $params{alt} ? $params{alt} : '').
+               '" width="'.$im->Get("width").
+               '" height="'.$im->Get("height").'"'.
+               (exists $params{title} ? ' title="'.$params{title}.'"' : '').
+               (exists $params{class} ? ' class="'.$params{class}.'"' : '').
+               (exists $params{id} ? ' id="'.$params{id}.'"' : '').
+               ' />';
+
+       if (! defined $params{link} || lc($params{link}) eq 'yes') {
+               $imgtag='<a href="'.$fileurl.'">'.$imgtag.'</a>';
+       }
+       elsif ($params{link} =~ /^\w+:\/\//) {
+               $imgtag='<a href="'.$params{link}.'">'.$imgtag.'</a>';
+       }
+       elsif (length bestlink($params{page}, $params{link})) {
+               add_depends($params{page}, $params{link});
+               $imgtag=htmllink($params{page}, $params{destpage},
+                       $params{link}, linktext => $imgtag,
+                       noimageinline => 1);
+       }
+
+       if (exists $params{caption}) {
+               return '<table class="img">'.
+                       '<caption>'.$params{caption}.'</caption>'.
+                       '<tr><td>'.$imgtag.'</td></tr>'.
+                       '</table>';
+       }
+       else {
+               return $imgtag;
+       }

 } #}}}
 
 1
 } #}}}
 
 1