brace style

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

diff --git a/IkiWiki/Plugin/img.pm b/IkiWiki/Plugin/img.pm
index 223b5a11f3e1250ae3dca43551f4601f47508894..83f0036291e29c5d767738c386ace4d2a5b6643b 100644 (file)
--- a/IkiWiki/Plugin/img.pm
+++ b/IkiWiki/Plugin/img.pm
@@ -44,6 +44,7 @@ sub preprocess (@) {
        }
 
        add_link($params{page}, $image);
+       add_depends($params{page}, $image);
 
        # optimisation: detect scan mode, and avoid generating the image
        if (! defined wantarray) {
@@ -69,8 +70,6 @@ sub preprocess (@) {
        my ($dwidth, $dheight);
 
        if ($params{size} ne 'full') {
-               add_depends($params{page}, $image);
-
                my ($w, $h) = ($params{size} =~ /^(\d*)x(\d*)$/);
                error sprintf(gettext('wrong size format "%s" (should be WxH)'), $params{size})
                        unless (defined $w && defined $h &&
@@ -156,30 +155,43 @@ 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>';
+               if (exists $params{caption} || !exists $params{align}) {
+                       $imgtag='<a href="'.$fileurl.'">'.$imgtag.'</a>';
+               }
+               else {
+                       $imgtag='<a href="'.$fileurl.'" class="align-'.$params{align}.'">'.$imgtag.'</a>';
+               }
        }
        elsif ($params{link} =~ /^\w+:\/\//) {
-               $imgtag='<a href="'.$params{link}.'">'.$imgtag.'</a>';
+               if (exists $params{caption} || !exists $params{align}) {
+                       $imgtag='<a href="'.$params{link}.'">'.$imgtag.'</a>';
+               }
+               else {
+                       $imgtag='<a href="'.$params{link}.'" class="align-'.$params{align}.'">'.$imgtag.'</a>';
+               }
        }
        else {
                my $b = bestlink($params{page}, $params{link});
        
                if (length $b) {
-                       add_depends($params{page}, $b);
+                       add_depends($params{page}, $b, deptype("presence"));
                        $imgtag=htmllink($params{page}, $params{destpage},
                                $params{link}, linktext => $imgtag,
-                               noimageinline => 1);
+                               noimageinline => 1,
+                               (exists $params{caption} || !exists $params{align}) ?
+                                       () : (class => 'align-'.$params{align}));
                }
        }
 
        if (exists $params{caption}) {
-               return '<table class="img">'.
+               return '<table class="img'.
+                       (exists $params{align} ? ' align-'.$params{align} : '').
+                       '">'.
                        '<caption>'.$params{caption}.'</caption>'.
                        '<tr><td>'.$imgtag.'</td></tr>'.
                        '</table>';