Merge commit 'upstream/master'

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

diff --git a/IkiWiki/Plugin/img.pm b/IkiWiki/Plugin/img.pm
index 14a32f63542fb827e40ff926771982436e02f59a..7b89ab6730faed3693f2d0eb59afa38a5194e854 100644 (file)
--- a/IkiWiki/Plugin/img.pm
+++ b/IkiWiki/Plugin/img.pm
@@ -10,59 +10,81 @@ use IkiWiki 2.00;
 my %imgdefaults;
 
 sub import { #{{{
 my %imgdefaults;
 
 sub import { #{{{

+       hook(type => "getsetup", id => "img", call => \&getsetup);

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

+sub getsetup () { #{{{
+       return
+               plugin => {
+                       safe => 1,
+                       rebuild => undef,
+               },
+} #}}}
+

 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 '';
        }
 
        push @{$links{$params{page}}}, $image;
                return '';
        }
 
        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 $file = bestlink($params{page}, $image);

+       my $srcfile = srcfile($file, 1);
+       if (! length $file || ! defined $srcfile) {
+               return htmllink($params{page}, $params{destpage}, $image);
+       }

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

-       error($@) if $@;
+       error gettext("Image::Magick is not installed") if $@;

        my $im = Image::Magick->new;
        my $imglink;
        my $r;
 
        my $im = Image::Magick->new;
        my $imglink;
        my $r;
 

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

 
                my $outfile = "$config{destdir}/$dir/${w}x${h}-$base";
                $imglink = "$dir/${w}x${h}-$base";
                
                will_render($params{page}, $imglink);
 
 
                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)) {
+               if (-e $outfile && (-M $srcfile >= -M $outfile)) {

                        $r = $im->Read($outfile);
                        $r = $im->Read($outfile);

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

                }
                else {
                }
                else {

-                       $r = $im->Read(srcfile($file));
-                       return "[[img ".sprintf(gettext("failed to read %s: %s"), $file, $r)."]]" if $r;
+                       $r = $im->Read($srcfile);
+                       error 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 ".sprintf(gettext("failed to resize: %s"), $r)."]]" if $r;
+                       error 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}) {


@@ -75,8 +97,8 @@ sub preprocess (@) { #{{{
                }
        }
        else {
                }
        }
        else {

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

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


@@ -93,22 +115,36 @@ sub preprocess (@) { #{{{
        }
 
        if (! defined($im->Get("width")) || ! defined($im->Get("height"))) {
        }
 
        if (! defined($im->Get("width")) || ! defined($im->Get("height"))) {

-               return "[[img ".sprintf(gettext("failed to determine size of image %s"), $file)."]]";
+               error sprintf(gettext("failed to determine size of image %s"), $file)

        }
 
        my $imgtag='<img src="'.$imgurl.
        }
 
        my $imgtag='<img src="'.$imgurl.

-               '" alt="'.$alt.'" width="'.$im->Get("width").
+               '" alt="'.(exists $params{alt} ? $params{alt} : '').
+               '" width="'.$im->Get("width").

                '" height="'.$im->Get("height").'"'.
                '" 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') {
                (exists $params{class} ? ' class="'.$params{class}.'"' : '').
                (exists $params{id} ? ' id="'.$params{id}.'"' : '').
                ' />';
 
        if (! defined $params{link} || lc($params{link}) eq 'yes') {

-               return  '<a href="'.$fileurl.'">'.$imgtag.'</a>';
+               $imgtag='<a href="'.$fileurl.'">'.$imgtag.'</a>';
+       }
+       elsif ($params{link} =~ /^\w+:\/\//) {
+               $imgtag='<a href="'.$params{link}.'">'.$imgtag.'</a>';

        }
        elsif (length bestlink($params{page}, $params{link})) {
        }
        elsif (length bestlink($params{page}, $params{link})) {

-               return htmllink($params{page}, $params{destpage},
-                       $params{link}, linktext => $imgtag);
+               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;
        }
        else {
                return $imgtag;