X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/bb0cbecbc377c3966f177b210fcfabe487d0452c..4bfdbd4858bc7842df97902e0bc9bd5d2bef861e:/IkiWiki/Plugin/img.pm?ds=sidebyside diff --git a/IkiWiki/Plugin/img.pm b/IkiWiki/Plugin/img.pm index 7e167240e..b6e7c9e41 100644 --- a/IkiWiki/Plugin/img.pm +++ b/IkiWiki/Plugin/img.pm @@ -10,7 +10,7 @@ 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,19 +31,15 @@ sub preprocess (@) { #{{{ return ''; } - my $file = bestlink($params{page}, $image); - if (! $file) { - # TODO: this may not be right, depending on where the file is - # created in the end - add_depends($params{page}, $image); - - return "[[img ".sprintf(gettext("%s not found"), $image)."]]"; - } - else { - add_depends($params{page}, $file); + push @{$links{$params{page}}}, $image; + # optimisation: detect scan mode, and avoid generating the image + if (! defined wantarray) { + return; } - my $dir = IkiWiki::dirname($file); + my $file = bestlink($params{page}, $image); + + my $dir = $params{page}; my $base = IkiWiki::basename($file); eval q{use Image::Magick}; @@ -59,7 +55,7 @@ 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)) { @@ -71,7 +67,7 @@ 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}) { @@ -105,9 +101,28 @@ sub preprocess (@) { #{{{ return "[[img ".sprintf(gettext("failed to determine size of image %s"), $file)."]]"; } - return ''.$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.''; + } + elsif ($params{link} =~ /^\w+:\/\//) { + return ''.$imgtag.''; + } + elsif (length bestlink($params{page}, $params{link})) { + add_depends($params{page}, $params{link}); + return htmllink($params{page}, $params{destpage}, + $params{link}, linktext => $imgtag, + noimageinline => 1); + } + else { + return $imgtag; + } } #}}} 1