X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/4d8b2d84d5635e0e718e9f66fcdf6e20587fbc2c..5b78246d11948e93f54ae32dd800e9adaf55a546:/IkiWiki/Plugin/img.pm?ds=inline diff --git a/IkiWiki/Plugin/img.pm b/IkiWiki/Plugin/img.pm index 0606f5001..c4e4a6f22 100644 --- a/IkiWiki/Plugin/img.pm +++ b/IkiWiki/Plugin/img.pm @@ -5,12 +5,12 @@ package IkiWiki::Plugin::img; use warnings; use strict; -use IkiWiki; +use IkiWiki 2.00; my %imgdefaults; sub import { #{{{ - hook(type => "preprocess", id => "img", call => \&preprocess); + hook(type => "preprocess", id => "img", call => \&preprocess, scan => 1); } #}}} sub preprocess (@) { #{{{ @@ -31,11 +31,10 @@ sub preprocess (@) { #{{{ return ''; } - add_depends($params{page}, $image); - my $file = bestlink($params{page}, $image) - || return "[[img ".sprintf(gettext("%s not found"), $image)."]]"; + push @{$links{$params{page}}}, $image; + 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}; @@ -51,6 +50,8 @@ sub preprocess (@) { #{{{ 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); @@ -61,11 +62,10 @@ sub preprocess (@) { #{{{ return "[[img ".sprintf(gettext("failed to read %s: %s"), $file, $r)."]]" if $r; $r = $im->Resize(geometry => "${w}x${h}"); - return "[[img ".sprinftf(gettext("failed to resize: %s"), $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}) { - will_render($params{page}, $imglink); my @blob = $im->ImageToBlob(); writefile($imglink, $config{destdir}, $blob[0], 1); } @@ -84,17 +84,31 @@ sub preprocess (@) { #{{{ 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"; } - return 'Get("height"))) { + return "[[img ".sprintf(gettext("failed to determine size of image %s"), $file)."]]"; + } + + my $imgtag=''.$alt.''; + '" height="'.$im->Get("height").'"'. + (exists $params{class} ? ' class="'.$params{class}.'"' : ''). + (exists $params{id} ? ' id="'.$params{id}.'"' : ''). + ' />'; + + if (! defined $params{link} || lc($params{link}) eq 'yes') { + return ''.$imgtag.''; + } + else { + return $imgtag; + } } #}}} 1