highlight: Ensure that other, more-specific format plugins, like txt are used in...

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

diff --git a/IkiWiki/Plugin/img.pm b/IkiWiki/Plugin/img.pm
index 63dfa901909f358daf20a9975f00386749dcc747..bd527c8c82c79eb5a8ef1a2ae6aa694f0279121d 100644 (file)
--- a/IkiWiki/Plugin/img.pm
+++ b/IkiWiki/Plugin/img.pm
@@ -39,7 +39,7 @@ sub preprocess (@) {
                }
        }
 
                }
        }
 

-       if (! exists $params{size}) {
+       if (! exists $params{size} || ! length $params{size}) {

                $params{size}='full';
        }
 
                $params{size}='full';
        }
 


@@ -121,7 +121,8 @@ sub preprocess (@) {
                                $r = $im->Resize(geometry => "${w}x${h}");
                                error sprintf(gettext("failed to resize: %s"), $r) if $r;
 
                                $r = $im->Resize(geometry => "${w}x${h}");
                                error sprintf(gettext("failed to resize: %s"), $r) if $r;
 

-                               # don't actually write file in preview mode
+                               # don't actually write resized file in preview mode;
+                               # rely on width and height settings

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


@@ -155,14 +156,22 @@ sub preprocess (@) {
                $imgurl="$config{url}/$imglink";
        }
 
                $imgurl="$config{url}/$imglink";
        }
 

+       if (! exists $params{class}) {
+               $params{class}="img";
+       }
+
+       my $attrs='';
+       foreach my $attr (qw{alt title class id hspace vspace}) {
+               if (exists $params{$attr}) {
+                       $attrs.=" $attr=\"$params{$attr}\"";
+               }
+       }
+       

        my $imgtag='<img src="'.$imgurl.
                '" width="'.$dwidth.
                '" height="'.$dheight.'"'.
        my $imgtag='<img src="'.$imgurl.
                '" width="'.$dwidth.
                '" height="'.$dheight.'"'.

-               (exists $params{alt} ? ' alt="'.$params{alt}.'"' : '').
-               (exists $params{title} ? ' title="'.$params{title}.'"' : '').
-               (exists $params{class} ? ' class="'.$params{class}.'"' : '').
+               $attrs.

                (exists $params{align} && ! exists $params{caption} ? ' align="'.$params{align}.'"' : '').
                (exists $params{align} && ! exists $params{caption} ? ' align="'.$params{align}.'"' : '').

-               (exists $params{id} ? ' id="'.$params{id}.'"' : '').

                ' />';
 
        my $link;
                ' />';
 
        my $link;