img: remove special case handling of link=yes

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

diff --git a/IkiWiki/Plugin/img.pm b/IkiWiki/Plugin/img.pm
index 32023fa97af8ba8e63192cacaff10a4677d20654..083061bf62b5cf5bcbc91b911dbf7452b4eed69e 100644 (file)
--- a/IkiWiki/Plugin/img.pm
+++ b/IkiWiki/Plugin/img.pm
@@ -155,16 +155,24 @@ sub preprocess (@) {
                '" height="'.$dheight.'"'.
                (exists $params{alt} ? ' alt="'.$params{alt}.'"' : '').
                (exists $params{title} ? ' title="'.$params{title}.'"' : '').
-               (exists $params{align} ? ' align="'.$params{align}.'"' : '').
                (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>';
+       my $alignclass=exists $params{align} ? "align-$params{align}" : "";
+
+       my $link;
+       if (! defined $params{link}) {
+               $link=$fileurl;
        }
        elsif ($params{link} =~ /^\w+:\/\//) {
-               $imgtag='<a href="'.$params{link}.'">'.$imgtag.'</a>';
+               $link=$params{link};
+       }
+
+       if (defined $link) {
+               $imgtag='<a href="'.$link.'"'.
+                       (!exists $params{caption} && $alignclass ? ' class="'.$alignclass.'"' : '').
+                       '>'.$imgtag.'</a>';
        }
        else {
                my $b = bestlink($params{page}, $params{link});
@@ -173,12 +181,17 @@ sub preprocess (@) {
                        add_depends($params{page}, $b, deptype("presence"));
                        $imgtag=htmllink($params{page}, $params{destpage},
                                $params{link}, linktext => $imgtag,
-                               noimageinline => 1);
+                               noimageinline => 1,
+                               (!exists $params{caption} && $alignclass) ?
+                                       (class => $alignclass) : (),
+                       );
                }
        }
 
        if (exists $params{caption}) {
-               return '<table class="img">'.
+               return '<table class="img'.
+                       ($alignclass ? ' '.$alignclass : '').
+                       '">'.
                        '<caption>'.$params{caption}.'</caption>'.
                        '<tr><td>'.$imgtag.'</td></tr>'.
                        '</table>';